diff --git a/utilities/WoodenMaterialMaker.xml b/utilities/WoodenMaterialMaker.xml new file mode 100644 index 00000000..b40c2a5e --- /dev/null +++ b/utilities/WoodenMaterialMaker.xml @@ -0,0 +1,108 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/utilities/paulevs/wooden/Helper.java b/utilities/paulevs/wooden/Helper.java index 801dae37..dabe4309 100644 --- a/utilities/paulevs/wooden/Helper.java +++ b/utilities/paulevs/wooden/Helper.java @@ -6,7 +6,10 @@ public class Helper public static final String[] BLOCKSTATES = new String[] { "%name%_bark.json", + "%name%_barrel.json", "%name%_button.json", + "%name%_chest.json", + "%name%_crafting_table.json", "%name%_door.json", "%name%_fence.json", "%name%_gate.json", @@ -14,18 +17,12 @@ public class Helper "%name%_log.json", "%name%_planks.json", "%name%_plate.json", + "%name%_sign.json", "%name%_slab.json", "%name%_stairs.json", - "%name%_trapdoor.json", - "barrel_%name%.json", - "bar_stool_%name%.json", - "chair_%name%.json", - "chest_%name%.json", - "crafting_table_%name%.json", - "sign_%name%.json", - "striped_bark_%name%.json", - "striped_log_%name%.json", - "taburet_%name%.json" + "%name%_striped_bark.json", + "%name%_striped_log.json", + "%name%_trapdoor.json" }; public static final String[] BLOCKS = new String[] { @@ -64,7 +61,10 @@ public class Helper public static final String[] ITEMS = new String[] { "%name%_bark.json", + "%name%_barrel.json", "%name%_button.json", + "%name%_chest.json", + "%name%_crafting_table.json", "%name%_door.json", "%name%_fence.json", "%name%_gate.json", @@ -72,17 +72,11 @@ public class Helper "%name%_log.json", "%name%_planks.json", "%name%_plate.json", + "%name%_sign.json", "%name%_slab.json", "%name%_stairs.json", - "%name%_trapdoor.json", - "barrel_%name%.json", - "bar_stool_%name%.json", - "chair_%name%.json", - "chest_%name%.json", - "crafting_table_%name%.json", - "sign_%name%.json", - "striped_bark_%name%.json", - "striped_log_%name%.json", - "taburet_%name%.json" + "%name%_striped_bark.json", + "%name%_striped_log.json", + "%name%_trapdoor.json" }; } diff --git a/utilities/paulevs/wooden/ModelHelper.java b/utilities/paulevs/wooden/ModelHelper.java index 840d8819..1615176e 100644 --- a/utilities/paulevs/wooden/ModelHelper.java +++ b/utilities/paulevs/wooden/ModelHelper.java @@ -10,7 +10,7 @@ import java.io.InputStreamReader; public class ModelHelper { public static void main(String[] args) throws IOException { - new ModelHelper("nether_sakura"); + new ModelHelper(args[0]); } private ModelHelper(String name) throws IOException { @@ -22,12 +22,18 @@ public class ModelHelper { } private void clearOutput() { - for (File file: new File("./output/blockstates").listFiles()) - file.delete(); - for (File file: new File("./output/models/block").listFiles()) - file.delete(); - for (File file: new File("./output/models/item").listFiles()) - file.delete(); + File out = new File("./output"); + if (out.exists()) { + for (File file: new File("./output/blockstates").listFiles()) + file.delete(); + for (File file: new File("./output/models/block").listFiles()) + file.delete(); + for (File file: new File("./output/models/item").listFiles()) + file.delete(); + } + else { + out.mkdir(); + } } private void editBlockstates(String name) throws IOException { diff --git a/utility_res/blockstates/barrel_%name%.json b/utility_res/blockstates/%name%_barrel.json similarity index 55% rename from utility_res/blockstates/barrel_%name%.json rename to utility_res/blockstates/%name%_barrel.json index 7b8a8b94..4bb87d2b 100644 --- a/utility_res/blockstates/barrel_%name%.json +++ b/utility_res/blockstates/%name%_barrel.json @@ -2,55 +2,55 @@ "variants": { "facing=down,open=false": { "x": 180, - "model": "betternether:block/barrel_%name%" + "model": "betternether:block/%name%_barrel" }, "facing=down,open=true": { "x": 180, - "model": "betternether:block/barrel_%name%_open" + "model": "betternether:block/%name%_barrel_open" }, "facing=east,open=false": { "x": 90, "y": 90, - "model": "betternether:block/barrel_%name%" + "model": "betternether:block/%name%_barrel" }, "facing=east,open=true": { "x": 90, "y": 90, - "model": "betternether:block/barrel_%name%_open" + "model": "betternether:block/%name%_barrel_open" }, "facing=north,open=false": { "x": 90, - "model": "betternether:block/barrel_%name%" + "model": "betternether:block/%name%_barrel" }, "facing=north,open=true": { "x": 90, - "model": "betternether:block/barrel_%name%_open" + "model": "betternether:block/%name%_barrel_open" }, "facing=south,open=false": { "x": 90, "y": 180, - "model": "betternether:block/barrel_%name%" + "model": "betternether:block/%name%_barrel" }, "facing=south,open=true": { "x": 90, "y": 180, - "model": "betternether:block/barrel_%name%_open" + "model": "betternether:block/%name%_barrel_open" }, "facing=up,open=false": { - "model": "betternether:block/barrel_%name%" + "model": "betternether:block/%name%_barrel" }, "facing=up,open=true": { - "model": "betternether:block/barrel_%name%_open" + "model": "betternether:block/%name%_barrel_open" }, "facing=west,open=false": { "x": 90, "y": 270, - "model": "betternether:block/barrel_%name%" + "model": "betternether:block/%name%_barrel" }, "facing=west,open=true": { "x": 90, "y": 270, - "model": "betternether:block/barrel_%name%_open" + "model": "betternether:block/%name%_barrel_open" } } } \ No newline at end of file diff --git a/utility_res/blockstates/%name%_chest.json b/utility_res/blockstates/%name%_chest.json new file mode 100644 index 00000000..81a339e9 --- /dev/null +++ b/utility_res/blockstates/%name%_chest.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "betternether:block/%name%_empty" + } + } +} \ No newline at end of file diff --git a/utility_res/blockstates/%name%_crafting_table.json b/utility_res/blockstates/%name%_crafting_table.json new file mode 100644 index 00000000..9b82474d --- /dev/null +++ b/utility_res/blockstates/%name%_crafting_table.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "betternether:block/%name%_crafting_table" + } + } +} \ No newline at end of file diff --git a/utility_res/blockstates/sign_%name%.json b/utility_res/blockstates/%name%_sign.json similarity index 100% rename from utility_res/blockstates/sign_%name%.json rename to utility_res/blockstates/%name%_sign.json diff --git a/utility_res/blockstates/%name%_striped_bark.json b/utility_res/blockstates/%name%_striped_bark.json new file mode 100644 index 00000000..99794dbd --- /dev/null +++ b/utility_res/blockstates/%name%_striped_bark.json @@ -0,0 +1,7 @@ +{ + "variants": { + "axis=y": { "model": "betternether:block/%name%_striped_bark" }, + "axis=z": { "model": "betternether:block/%name%_striped_bark", "x": 90 }, + "axis=x": { "model": "betternether:block/%name%_striped_bark", "x": 90, "y": 90 } + } +} \ No newline at end of file diff --git a/utility_res/blockstates/%name%_striped_log.json b/utility_res/blockstates/%name%_striped_log.json new file mode 100644 index 00000000..f14f1980 --- /dev/null +++ b/utility_res/blockstates/%name%_striped_log.json @@ -0,0 +1,7 @@ +{ + "variants": { + "axis=y": { "model": "betternether:block/%name%_striped_log" }, + "axis=z": { "model": "betternether:block/%name%_striped_log", "x": 90 }, + "axis=x": { "model": "betternether:block/%name%_striped_log", "x": 90, "y": 90 } + } +} diff --git a/utility_res/blockstates/a.txt b/utility_res/blockstates/a.txt new file mode 100644 index 00000000..68438d6e --- /dev/null +++ b/utility_res/blockstates/a.txt @@ -0,0 +1,28 @@ + Том в устройстве D имеет метку Data + Серийный номер тома: C7B5-F673 + + Содержимое папки D:\BetterEnd\BetterEnd_1.16.3\utility_res\blockstates + +26.09.2020 17:02 . +26.09.2020 17:02 .. +26.09.2020 16:47 286 %name%_bark.json +26.09.2020 17:01 1 683 %name%_barrel.json +26.09.2020 16:47 3 177 %name%_button.json +26.09.2020 17:01 112 %name%_chest.json +26.09.2020 17:01 115 %name%_crafting_table.json +26.09.2020 16:47 4 155 %name%_door.json +26.09.2020 16:47 841 %name%_fence.json +26.09.2020 16:47 2 275 %name%_gate.json +26.09.2020 16:47 400 %name%_ladder.json +26.09.2020 16:47 285 %name%_log.json +26.09.2020 16:47 109 %name%_planks.json +26.09.2020 16:47 228 %name%_plate.json +26.09.2020 16:47 90 %name%_sign.json +26.09.2020 16:47 313 %name%_slab.json +26.09.2020 16:47 5 701 %name%_stairs.json +26.09.2020 17:02 310 %name%_striped_bark.json +26.09.2020 17:02 309 %name%_striped_log.json +26.09.2020 16:47 1 931 %name%_trapdoor.json +26.09.2020 17:02 0 a.txt + 19 файлов 22 320 байт + 2 папок 811 600 121 856 байт свободно diff --git a/utility_res/blockstates/bar_stool_%name%.json b/utility_res/blockstates/bar_stool_%name%.json deleted file mode 100644 index 00e5a5d8..00000000 --- a/utility_res/blockstates/bar_stool_%name%.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "variants": { - "facing=east": { "model": "betternether:block/bar_stool_%name%" }, - "facing=west": { "model": "betternether:block/bar_stool_%name%", "y": 180 }, - "facing=south": { "model": "betternether:block/bar_stool_%name%", "y": 90 }, - "facing=north": { "model": "betternether:block/bar_stool_%name%", "y": 270 } - } -} diff --git a/utility_res/blockstates/chair_%name%.json b/utility_res/blockstates/chair_%name%.json deleted file mode 100644 index e15f56f6..00000000 --- a/utility_res/blockstates/chair_%name%.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "variants": { - "facing=east,top=false": { "model": "betternether:block/chair_%name%", "y": 90 }, - "facing=west,top=false": { "model": "betternether:block/chair_%name%", "y": 270 }, - "facing=south,top=false": { "model": "betternether:block/chair_%name%", "y": 180 }, - "facing=north,top=false": { "model": "betternether:block/chair_%name%" }, - "top=true": { "model": "betternether:block/chair_%name%_top" } - } -} diff --git a/utility_res/blockstates/chest_%name%.json b/utility_res/blockstates/chest_%name%.json deleted file mode 100644 index 124b4eb1..00000000 --- a/utility_res/blockstates/chest_%name%.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "betternether:block/empty_%name%" - } - } -} \ No newline at end of file diff --git a/utility_res/blockstates/crafting_table_%name%.json b/utility_res/blockstates/crafting_table_%name%.json deleted file mode 100644 index 80bca2da..00000000 --- a/utility_res/blockstates/crafting_table_%name%.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "betternether:block/crafting_table_%name%" - } - } -} \ No newline at end of file diff --git a/utility_res/blockstates/striped_bark_%name%.json b/utility_res/blockstates/striped_bark_%name%.json deleted file mode 100644 index 51f8074c..00000000 --- a/utility_res/blockstates/striped_bark_%name%.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "axis=y": { "model": "betternether:block/striped_bark_%name%" }, - "axis=z": { "model": "betternether:block/striped_bark_%name%", "x": 90 }, - "axis=x": { "model": "betternether:block/striped_bark_%name%", "x": 90, "y": 90 } - } -} \ No newline at end of file diff --git a/utility_res/blockstates/striped_log_%name%.json b/utility_res/blockstates/striped_log_%name%.json deleted file mode 100644 index d034030d..00000000 --- a/utility_res/blockstates/striped_log_%name%.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "axis=y": { "model": "betternether:block/striped_log_%name%" }, - "axis=z": { "model": "betternether:block/striped_log_%name%", "x": 90 }, - "axis=x": { "model": "betternether:block/striped_log_%name%", "x": 90, "y": 90 } - } -} diff --git a/utility_res/blockstates/taburet_%name%.json b/utility_res/blockstates/taburet_%name%.json deleted file mode 100644 index 2e00d464..00000000 --- a/utility_res/blockstates/taburet_%name%.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "variants": { - "facing=east": { "model": "betternether:block/taburet_%name%" }, - "facing=west": { "model": "betternether:block/taburet_%name%", "y": 180 }, - "facing=south": { "model": "betternether:block/taburet_%name%", "y": 90 }, - "facing=north": { "model": "betternether:block/taburet_%name%", "y": 270 } - } -} diff --git a/utility_res/item/%name%_barrel.json b/utility_res/item/%name%_barrel.json index 8172a7aa..b3efec3f 100644 --- a/utility_res/item/%name%_barrel.json +++ b/utility_res/item/%name%_barrel.json @@ -1,3 +1,3 @@ { - "parent": "betternether:block/barrel_%name%" + "parent": "betternether:block/%name%_barrel" } \ No newline at end of file diff --git a/utility_res/item/%name%_crafting_table.json b/utility_res/item/%name%_crafting_table.json index 116d81b5..e97f5dec 100644 --- a/utility_res/item/%name%_crafting_table.json +++ b/utility_res/item/%name%_crafting_table.json @@ -1,3 +1,3 @@ { - "parent": "betternether:block/crafting_table_%name%" + "parent": "betternether:block/%name%_crafting_table" } diff --git a/utility_res/item/%name%_sign.json b/utility_res/item/%name%_sign.json index 28928af4..c6b9fd75 100644 --- a/utility_res/item/%name%_sign.json +++ b/utility_res/item/%name%_sign.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "betternether:item/sign_%name%" + "layer0": "betternether:item/%name%_sign" } } diff --git a/utility_res/item/%name%_striped_bark.json b/utility_res/item/%name%_striped_bark.json index 36c95026..79110822 100644 --- a/utility_res/item/%name%_striped_bark.json +++ b/utility_res/item/%name%_striped_bark.json @@ -1,3 +1,3 @@ { - "parent": "betternether:block/striped_bark_%name%" + "parent": "betternether:block/%name%_striped_bark" } diff --git a/utility_res/item/%name%_striped_log.json b/utility_res/item/%name%_striped_log.json index b0e2c35b..b020cded 100644 --- a/utility_res/item/%name%_striped_log.json +++ b/utility_res/item/%name%_striped_log.json @@ -1,3 +1,3 @@ { - "parent": "betternether:block/striped_log_%name%" + "parent": "betternether:block/%name%_striped_log" } diff --git a/utility_res/item/%name%_taburet.json b/utility_res/item/%name%_taburet.json deleted file mode 100644 index 8f01e8e0..00000000 --- a/utility_res/item/%name%_taburet.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "betternether:block/taburet_%name%" -} \ No newline at end of file