diff --git a/assets/plugins/plugin-9patch-0.1.0.jar b/assets/plugins/plugin-9patch-0.1.0.jar index 2b463da6..75c022e5 100644 Binary files a/assets/plugins/plugin-9patch-0.1.0.jar and b/assets/plugins/plugin-9patch-0.1.0.jar differ diff --git a/assets/plugins/plugin-performance-0.1.0.jar b/assets/plugins/plugin-performance-0.1.0.jar index 42dea7c6..d636e027 100644 Binary files a/assets/plugins/plugin-performance-0.1.0.jar and b/assets/plugins/plugin-performance-0.1.0.jar differ diff --git a/assets/plugins/plugin-skin-composer-0.1.0.jar b/assets/plugins/plugin-skin-composer-0.1.0.jar index a62166e2..32cdc89e 100644 Binary files a/assets/plugins/plugin-skin-composer-0.1.0.jar and b/assets/plugins/plugin-skin-composer-0.1.0.jar differ diff --git a/assets/plugins/plugin-tiled-0.1.0.jar b/assets/plugins/plugin-tiled-0.1.0.jar index 631de437..16b98bae 100644 Binary files a/assets/plugins/plugin-tiled-0.1.0.jar and b/assets/plugins/plugin-tiled-0.1.0.jar differ diff --git a/plugin-9patch/src/main/java/games/rednblack/editor/plugin/ninepatch/MainPanelMediator.java b/plugin-9patch/src/main/java/games/rednblack/editor/plugin/ninepatch/MainPanelMediator.java index 365dd72f..121c56b8 100644 --- a/plugin-9patch/src/main/java/games/rednblack/editor/plugin/ninepatch/MainPanelMediator.java +++ b/plugin-9patch/src/main/java/games/rednblack/editor/plugin/ninepatch/MainPanelMediator.java @@ -100,12 +100,21 @@ public class MainPanelMediator extends Mediator { private void addSplitsToImageInAtlas(String textureRegionName, int[] splits) { FileHandle packAtlas = Gdx.files.internal(plugin.getAPI().getProjectPath() + "/assets/orig/pack/pack.atlas"); String content = packAtlas.readString(); - int regionIndex = content.indexOf(textureRegionName); - int splitEnd = content.indexOf("orig: ", regionIndex); - String splitStr = "split: "+splits[0]+", "+splits[1]+", "+splits[2]+", "+splits[3]+"\n "; - String newContent = content.substring(0, splitEnd) + splitStr + content.substring(splitEnd, content.length()); - File test = new File(plugin.getAPI().getProjectPath() + "/assets/orig/pack/pack.atlas"); - writeFile(newContent, test); + if (plugin.getAPI().getCurrentProjectVO().texturePackerVO.legacy) { + int regionIndex = content.indexOf(textureRegionName); + int splitEnd = content.indexOf("orig: ", regionIndex); + String splitStr = "split: "+splits[0]+", "+splits[1]+", "+splits[2]+", "+splits[3]+"\n "; + String newContent = content.substring(0, splitEnd) + splitStr + content.substring(splitEnd); + File test = new File(plugin.getAPI().getProjectPath() + "/assets/orig/pack/pack.atlas"); + writeFile(newContent, test); + } else { + int regionIndex = content.indexOf(textureRegionName); + String splitStr = "split: " + splits[0] + ", " + splits[1] + ", " + splits[2] + ", " + splits[3] + "\n\t"; + int splitEnd = content.indexOf("bounds: ", regionIndex); + String newContent = content.substring(0, splitEnd) + splitStr + content.substring(splitEnd); + File test = new File(plugin.getAPI().getProjectPath() + "/assets/orig/pack/pack.atlas"); + writeFile(newContent, test); + } } private void applyNewSplits(String textureRegionName, int[] splits) { @@ -120,11 +129,22 @@ public class MainPanelMediator extends Mediator { String content = packAtlas.readString(); int regionIndex = content.indexOf(textureRegionName); int splitStart = content.indexOf("split: ", regionIndex) + "split: ".length(); - int splitEnd = content.indexOf("orig: ", splitStart); - String splitStr = splits[0]+", "+splits[1]+", "+splits[2]+", "+splits[3]+"\n "; - String newContent = content.substring(0, splitStart) + splitStr + content.substring(splitEnd, content.length()); - File test = new File(plugin.getAPI().getProjectPath() + "/assets/orig/pack/pack.atlas"); - writeFile(newContent, test); + + if (plugin.getAPI().getCurrentProjectVO().texturePackerVO.legacy) { + int splitEnd = content.indexOf("orig: ", splitStart); + String splitStr = splits[0]+", "+splits[1]+", "+splits[2]+", "+splits[3]+"\n "; + String newContent = content.substring(0, splitStart) + splitStr + content.substring(splitEnd); + File test = new File(plugin.getAPI().getProjectPath() + "/assets/orig/pack/pack.atlas"); + writeFile(newContent, test); + } else { + String splitStr = splits[0] + ", " + splits[1] + ", " + splits[2] + ", " + splits[3]; + int splitEnd = content.indexOf("\n", splitStart); + String newContent = content.substring(0, splitStart) + splitStr; + if (splitEnd != -1) + newContent = newContent + content.substring(splitEnd); + File test = new File(plugin.getAPI().getProjectPath() + "/assets/orig/pack/pack.atlas"); + writeFile(newContent, test); + } // reload plugin.getAPI().reLoadProject(); diff --git a/src/main/java/games/rednblack/editor/utils/asset/impl/ImageAsset.java b/src/main/java/games/rednblack/editor/utils/asset/impl/ImageAsset.java index a0dfbfe7..c2f6bd88 100644 --- a/src/main/java/games/rednblack/editor/utils/asset/impl/ImageAsset.java +++ b/src/main/java/games/rednblack/editor/utils/asset/impl/ImageAsset.java @@ -84,7 +84,7 @@ public class ImageAsset extends Asset { } for (FileHandle handle : new Array.ArrayIterator<>(files)) { - projectManager.getCurrentProjectInfoVO().imagesPacks.get("main").regions.add(handle.nameWithoutExtension()); + projectManager.getCurrentProjectInfoVO().imagesPacks.get("main").regions.add(handle.nameWithoutExtension().replace(".9", "")); } }