diff --git a/src/generated/resources/assets/botania/blockstates/crafty_crate.json b/src/generated/resources/assets/botania/blockstates/crafty_crate.json new file mode 100644 index 000000000..ecbb43c80 --- /dev/null +++ b/src/generated/resources/assets/botania/blockstates/crafty_crate.json @@ -0,0 +1,34 @@ +{ + "variants": { + "pattern=none": { + "model": "botania:block/crafty_crate" + }, + "pattern=crafty_1_1": { + "model": "botania:block/crafty_crate_1_1" + }, + "pattern=crafty_2_2": { + "model": "botania:block/crafty_crate_2_2" + }, + "pattern=crafty_1_2": { + "model": "botania:block/crafty_crate_1_2" + }, + "pattern=crafty_2_1": { + "model": "botania:block/crafty_crate_2_1" + }, + "pattern=crafty_1_3": { + "model": "botania:block/crafty_crate_1_3" + }, + "pattern=crafty_3_1": { + "model": "botania:block/crafty_crate_3_1" + }, + "pattern=crafty_2_3": { + "model": "botania:block/crafty_crate_2_3" + }, + "pattern=crafty_3_2": { + "model": "botania:block/crafty_crate_3_2" + }, + "pattern=crafty_donut": { + "model": "botania:block/crafty_crate_donut" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/crafty_crate.json b/src/generated/resources/assets/botania/models/block/crafty_crate.json new file mode 100644 index 000000000..0be4700dc --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/crafty_crate.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:block/shapes/crate", + "textures": { + "bottom": "botania:block/crafty_crate_bottom", + "side": "botania:block/crafty_crate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/crafty_crate_1_1.json b/src/generated/resources/assets/botania/models/block/crafty_crate_1_1.json new file mode 100644 index 000000000..ce6ac1d97 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/crafty_crate_1_1.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:block/shapes/crate", + "textures": { + "bottom": "botania:block/crafty_crate_bottom", + "side": "botania:block/crafty_crate_1_1" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/crafty_crate_1_2.json b/src/generated/resources/assets/botania/models/block/crafty_crate_1_2.json new file mode 100644 index 000000000..ef3658e4b --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/crafty_crate_1_2.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:block/shapes/crate", + "textures": { + "bottom": "botania:block/crafty_crate_bottom", + "side": "botania:block/crafty_crate_1_2" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/crafty_crate_1_3.json b/src/generated/resources/assets/botania/models/block/crafty_crate_1_3.json new file mode 100644 index 000000000..6eb8c7345 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/crafty_crate_1_3.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:block/shapes/crate", + "textures": { + "bottom": "botania:block/crafty_crate_bottom", + "side": "botania:block/crafty_crate_1_3" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/crafty_crate_2_1.json b/src/generated/resources/assets/botania/models/block/crafty_crate_2_1.json new file mode 100644 index 000000000..7fe983661 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/crafty_crate_2_1.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:block/shapes/crate", + "textures": { + "bottom": "botania:block/crafty_crate_bottom", + "side": "botania:block/crafty_crate_2_1" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/crafty_crate_2_2.json b/src/generated/resources/assets/botania/models/block/crafty_crate_2_2.json new file mode 100644 index 000000000..e6e9c4e10 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/crafty_crate_2_2.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:block/shapes/crate", + "textures": { + "bottom": "botania:block/crafty_crate_bottom", + "side": "botania:block/crafty_crate_2_2" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/crafty_crate_2_3.json b/src/generated/resources/assets/botania/models/block/crafty_crate_2_3.json new file mode 100644 index 000000000..0322b34be --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/crafty_crate_2_3.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:block/shapes/crate", + "textures": { + "bottom": "botania:block/crafty_crate_bottom", + "side": "botania:block/crafty_crate_2_3" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/crafty_crate_3_1.json b/src/generated/resources/assets/botania/models/block/crafty_crate_3_1.json new file mode 100644 index 000000000..b0f492fd7 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/crafty_crate_3_1.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:block/shapes/crate", + "textures": { + "bottom": "botania:block/crafty_crate_bottom", + "side": "botania:block/crafty_crate_3_1" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/crafty_crate_3_2.json b/src/generated/resources/assets/botania/models/block/crafty_crate_3_2.json new file mode 100644 index 000000000..3e0e5efdc --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/crafty_crate_3_2.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:block/shapes/crate", + "textures": { + "bottom": "botania:block/crafty_crate_bottom", + "side": "botania:block/crafty_crate_3_2" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/crafty_crate_donut.json b/src/generated/resources/assets/botania/models/block/crafty_crate_donut.json new file mode 100644 index 000000000..0cb90c090 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/crafty_crate_donut.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:block/shapes/crate", + "textures": { + "bottom": "botania:block/crafty_crate_bottom", + "side": "botania:block/crafty_crate_donut" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/drum_canopy.json b/src/generated/resources/assets/botania/models/block/drum_canopy.json similarity index 98% rename from src/main/resources/assets/botania/models/block/drum_canopy.json rename to src/generated/resources/assets/botania/models/block/drum_canopy.json index 5841ad55c..fb831c23a 100644 --- a/src/main/resources/assets/botania/models/block/drum_canopy.json +++ b/src/generated/resources/assets/botania/models/block/drum_canopy.json @@ -4,4 +4,4 @@ "top": "botania:block/drum_top", "side": "botania:block/drum_canopy" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/drum_gathering.json b/src/generated/resources/assets/botania/models/block/drum_gathering.json similarity index 98% rename from src/main/resources/assets/botania/models/block/drum_gathering.json rename to src/generated/resources/assets/botania/models/block/drum_gathering.json index b013df7b0..5c486de1f 100644 --- a/src/main/resources/assets/botania/models/block/drum_gathering.json +++ b/src/generated/resources/assets/botania/models/block/drum_gathering.json @@ -4,4 +4,4 @@ "top": "botania:block/drum_top", "side": "botania:block/drum_gathering" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/drum_wild.json b/src/generated/resources/assets/botania/models/block/drum_wild.json similarity index 98% rename from src/main/resources/assets/botania/models/block/drum_wild.json rename to src/generated/resources/assets/botania/models/block/drum_wild.json index ec548d9d2..0c380c204 100644 --- a/src/main/resources/assets/botania/models/block/drum_wild.json +++ b/src/generated/resources/assets/botania/models/block/drum_wild.json @@ -4,4 +4,4 @@ "top": "botania:block/drum_top", "side": "botania:block/drum_wild" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/elven_spreader.json b/src/generated/resources/assets/botania/models/block/elven_spreader.json similarity index 98% rename from src/main/resources/assets/botania/models/block/elven_spreader.json rename to src/generated/resources/assets/botania/models/block/elven_spreader.json index 63c4c796d..5e709b60e 100644 --- a/src/main/resources/assets/botania/models/block/elven_spreader.json +++ b/src/generated/resources/assets/botania/models/block/elven_spreader.json @@ -4,4 +4,4 @@ "side": "botania:block/elven_spreader_side", "material": "botania:block/dreamwood" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/elven_spreader_inside.json b/src/generated/resources/assets/botania/models/block/elven_spreader_inside.json similarity index 98% rename from src/main/resources/assets/botania/models/block/elven_spreader_inside.json rename to src/generated/resources/assets/botania/models/block/elven_spreader_inside.json index 8b2cf216e..769d22971 100644 --- a/src/main/resources/assets/botania/models/block/elven_spreader_inside.json +++ b/src/generated/resources/assets/botania/models/block/elven_spreader_inside.json @@ -3,4 +3,4 @@ "textures": { "inside": "botania:block/elven_spreader_inside" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/gaia_spreader.json b/src/generated/resources/assets/botania/models/block/gaia_spreader.json similarity index 98% rename from src/main/resources/assets/botania/models/block/gaia_spreader.json rename to src/generated/resources/assets/botania/models/block/gaia_spreader.json index 9a6b897db..057795904 100644 --- a/src/main/resources/assets/botania/models/block/gaia_spreader.json +++ b/src/generated/resources/assets/botania/models/block/gaia_spreader.json @@ -4,4 +4,4 @@ "side": "botania:block/gaia_spreader_side", "material": "botania:block/gaia_spreader_material" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/gaia_spreader_inside.json b/src/generated/resources/assets/botania/models/block/gaia_spreader_inside.json similarity index 98% rename from src/main/resources/assets/botania/models/block/gaia_spreader_inside.json rename to src/generated/resources/assets/botania/models/block/gaia_spreader_inside.json index ca3eb05fa..c2c5b54de 100644 --- a/src/main/resources/assets/botania/models/block/gaia_spreader_inside.json +++ b/src/generated/resources/assets/botania/models/block/gaia_spreader_inside.json @@ -3,4 +3,4 @@ "textures": { "inside": "botania:block/gaia_spreader_inside" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/mana_spreader.json b/src/generated/resources/assets/botania/models/block/mana_spreader.json similarity index 98% rename from src/main/resources/assets/botania/models/block/mana_spreader.json rename to src/generated/resources/assets/botania/models/block/mana_spreader.json index 39770db9e..bcc2e76e1 100644 --- a/src/main/resources/assets/botania/models/block/mana_spreader.json +++ b/src/generated/resources/assets/botania/models/block/mana_spreader.json @@ -4,4 +4,4 @@ "side": "botania:block/mana_spreader_side", "material": "botania:block/livingwood" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/mana_spreader_inside.json b/src/generated/resources/assets/botania/models/block/mana_spreader_inside.json similarity index 98% rename from src/main/resources/assets/botania/models/block/mana_spreader_inside.json rename to src/generated/resources/assets/botania/models/block/mana_spreader_inside.json index 395b17816..9086b2ff9 100644 --- a/src/main/resources/assets/botania/models/block/mana_spreader_inside.json +++ b/src/generated/resources/assets/botania/models/block/mana_spreader_inside.json @@ -3,4 +3,4 @@ "textures": { "inside": "botania:block/mana_spreader_inside" } -} +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/open_crate.json b/src/generated/resources/assets/botania/models/block/open_crate.json new file mode 100644 index 000000000..dbf54f71d --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/open_crate.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:block/shapes/crate", + "textures": { + "side": "botania:block/open_crate", + "bottom": "botania:block/open_crate_bottom" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/redstone_spreader.json b/src/generated/resources/assets/botania/models/block/redstone_spreader.json similarity index 98% rename from src/main/resources/assets/botania/models/block/redstone_spreader.json rename to src/generated/resources/assets/botania/models/block/redstone_spreader.json index d2c841cb8..2dbc8a4ac 100644 --- a/src/main/resources/assets/botania/models/block/redstone_spreader.json +++ b/src/generated/resources/assets/botania/models/block/redstone_spreader.json @@ -4,4 +4,4 @@ "side": "botania:block/redstone_spreader_side", "material": "botania:block/livingwood" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/redstone_spreader_inside.json b/src/generated/resources/assets/botania/models/block/redstone_spreader_inside.json similarity index 98% rename from src/main/resources/assets/botania/models/block/redstone_spreader_inside.json rename to src/generated/resources/assets/botania/models/block/redstone_spreader_inside.json index b600d3033..b20cf4451 100644 --- a/src/main/resources/assets/botania/models/block/redstone_spreader_inside.json +++ b/src/generated/resources/assets/botania/models/block/redstone_spreader_inside.json @@ -3,4 +3,4 @@ "textures": { "inside": "botania:block/redstone_spreader_inside" } -} +} \ No newline at end of file diff --git a/src/main/java/vazkii/botania/data/BlockstateProvider.java b/src/main/java/vazkii/botania/data/BlockstateProvider.java index 986b6edf0..89512282d 100644 --- a/src/main/java/vazkii/botania/data/BlockstateProvider.java +++ b/src/main/java/vazkii/botania/data/BlockstateProvider.java @@ -27,6 +27,7 @@ import net.minecraftforge.client.model.generators.MultiPartBlockStateBuilder; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.AlfPortalState; +import vazkii.botania.api.state.enums.CratePattern; import vazkii.botania.common.Botania; import vazkii.botania.common.block.*; import vazkii.botania.common.block.decor.BlockBuriedPetals; @@ -64,7 +65,6 @@ public class BlockstateProvider extends BlockStateProvider { .filter(b -> LibMisc.MOD_ID.equals(Registry.BLOCK.getKey(b).getNamespace())) .collect(Collectors.toSet()); // Manually written blockstate + models - remainingBlocks.remove(craftCrate); remainingBlocks.remove(ghostRail); remainingBlocks.remove(solidVines); @@ -98,6 +98,18 @@ public class BlockstateProvider extends BlockStateProvider { prefix("block/" + cacophoniumName + "_top"))); remainingBlocks.remove(cacophonium); + String craftCrateName = Registry.BLOCK.getKey(craftCrate).getPath(); + getVariantBuilder(craftCrate).forAllStates(s -> { + CratePattern pat = s.get(BotaniaStateProps.CRATE_PATTERN); + String suffix = pat == CratePattern.NONE ? "" : "_" + pat.func_176610_l().substring("crafty_".length()); + String name = craftCrateName + suffix; + ModelFile model = models().withExistingParent(name, prefix("block/shapes/crate")) + .texture("bottom", prefix("block/" + craftCrateName + "_bottom")) + .texture("side", prefix("block/" + name)); + return new ConfiguredModel[] { new ConfiguredModel(model) }; + }); + remainingBlocks.remove(craftCrate); + String elfGlassName = Registry.BLOCK.getKey(elfGlass).getPath(); ConfiguredModel[] elfGlassFiles = IntStream.rangeClosed(0, 3) .mapToObj(i -> { @@ -108,11 +120,23 @@ public class BlockstateProvider extends BlockStateProvider { getVariantBuilder(elfGlass).partialState().setModels(elfGlassFiles); remainingBlocks.remove(elfGlass); + String felName = Registry.BLOCK.getKey(felPumpkin).getPath(); + simpleBlock(felPumpkin, models().orientable(felName, new ResourceLocation("block/pumpkin_side"), prefix("block/" + felName), + new ResourceLocation("block/pumpkin_top"))); + remainingBlocks.remove(felPumpkin); + String plateName = Registry.BLOCK.getKey(ModBlocks.incensePlate).getPath(); ModelFile plateFile = models().getExistingFile(prefix("block/" + plateName)); horizontalBlock(incensePlate, plateFile, 0); remainingBlocks.remove(incensePlate); + String openCrateName = Registry.BLOCK.getKey(openCrate).getPath(); + ModelFile openCrateFile = models().withExistingParent(openCrateName, prefix("block/shapes/crate")) + .texture("side", prefix("block/" + openCrateName)) + .texture("bottom", prefix("block/" + openCrateName + "_bottom")); + simpleBlock(openCrate, openCrateFile); + remainingBlocks.remove(openCrate); + fixedWallBlock((WallBlock) ModFluffBlocks.dreamwoodWall, prefix("block/dreamwood")); fixedWallBlock((WallBlock) ModFluffBlocks.livingrockWall, prefix("block/livingrock")); fixedWallBlock((WallBlock) ModFluffBlocks.livingwoodWall, prefix("block/livingwood")); @@ -129,11 +153,6 @@ public class BlockstateProvider extends BlockStateProvider { remainingBlocks.remove(livingwoodFence); remainingBlocks.remove(livingwoodFenceGate); - String felName = Registry.BLOCK.getKey(felPumpkin).getPath(); - simpleBlock(felPumpkin, models().orientable(felName, new ResourceLocation("block/pumpkin_side"), prefix("block/" + felName), - new ResourceLocation("block/pumpkin_top"))); - remainingBlocks.remove(felPumpkin); - // TESRs with only particles particleOnly(remainingBlocks, animatedTorch, new ResourceLocation("block/redstone_torch")); particleOnly(remainingBlocks, avatar, prefix("block/livingwood")); @@ -171,6 +190,32 @@ public class BlockstateProvider extends BlockStateProvider { simpleBlock(b, models().cubeColumn(name, prefix("block/" + name + "_side"), prefix("block/" + name + "_end"))); }); + takeAll(remainingBlocks, gatheringDrum, canopyDrum, wildDrum).forEach(b -> { + String name = Registry.BLOCK.getKey(b).getPath(); + ModelFile model = models().withExistingParent(name, prefix("block/shapes/drum")) + .texture("top", prefix("block/drum_top")) + .texture("side", prefix("block/" + name)); + simpleBlock(b, model); + }); + + takeAll(remainingBlocks, manaSpreader, redstoneSpreader, gaiaSpreader, elvenSpreader).forEach(b -> { + String name = Registry.BLOCK.getKey(b).getPath(); + String material; + if (b == elvenSpreader) { + material = "dreamwood"; + } else if (b == gaiaSpreader) { + material = name + "_material"; + } else { + material = "livingwood"; + } + ModelFile model = models().withExistingParent(name, prefix("block/shapes/spreader")) + .texture("side", prefix("block/" + name + "_side")) + .texture("material", prefix("block/" + material)); + models().withExistingParent(name + "_inside", prefix("block/shapes/spreader_inside")) + .texture("inside", prefix("block/" + name + "_inside")); + simpleBlock(b, model); + }); + takeAll(remainingBlocks, manaPool, dilutedPool, fabulousPool, creativePool).forEach(b -> { String name = Registry.BLOCK.getKey(b).getPath(); ResourceLocation tex = b == manaPool || b == fabulousPool diff --git a/src/main/resources/assets/botania/blockstates/crafty_crate.json b/src/main/resources/assets/botania/blockstates/crafty_crate.json deleted file mode 100644 index 432db7c20..000000000 --- a/src/main/resources/assets/botania/blockstates/crafty_crate.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "variants": { - "pattern=none": { "model": "botania:block/crafty_crate" }, - "pattern=crafty_1_1": { "model": "botania:block/crafty_crate_1_1" }, - "pattern=crafty_2_2": { "model": "botania:block/crafty_crate_2_2" }, - "pattern=crafty_1_2": { "model": "botania:block/crafty_crate_1_2" }, - "pattern=crafty_2_1": { "model": "botania:block/crafty_crate_2_1" }, - "pattern=crafty_1_3": { "model": "botania:block/crafty_crate_1_3" }, - "pattern=crafty_3_1": { "model": "botania:block/crafty_crate_3_1" }, - "pattern=crafty_2_3": { "model": "botania:block/crafty_crate_2_3" }, - "pattern=crafty_3_2": { "model": "botania:block/crafty_crate_3_2" }, - "pattern=crafty_donut": { "model": "botania:block/crafty_crate_donut" } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/crafty_crate.json b/src/main/resources/assets/botania/models/block/crafty_crate.json deleted file mode 100644 index 0a7f21852..000000000 --- a/src/main/resources/assets/botania/models/block/crafty_crate.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "botania:block/shapes/crate", - "textures": { - "bottom": "botania:block/crate_crafty_bottom", - "side": "botania:block/crate_crafty" - } -} diff --git a/src/main/resources/assets/botania/models/block/crafty_crate_1_1.json b/src/main/resources/assets/botania/models/block/crafty_crate_1_1.json deleted file mode 100644 index 7fdff0967..000000000 --- a/src/main/resources/assets/botania/models/block/crafty_crate_1_1.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "botania:block/shapes/crate", - "textures": { - "bottom": "botania:block/crate_crafty_bottom", - "side": "botania:block/crate_crafty_pattern_0" - } -} diff --git a/src/main/resources/assets/botania/models/block/crafty_crate_1_2.json b/src/main/resources/assets/botania/models/block/crafty_crate_1_2.json deleted file mode 100644 index 7c31d9542..000000000 --- a/src/main/resources/assets/botania/models/block/crafty_crate_1_2.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "botania:block/shapes/crate", - "textures": { - "bottom": "botania:block/crate_crafty_bottom", - "side": "botania:block/crate_crafty_pattern_2" - } -} diff --git a/src/main/resources/assets/botania/models/block/crafty_crate_1_3.json b/src/main/resources/assets/botania/models/block/crafty_crate_1_3.json deleted file mode 100644 index ea9885a98..000000000 --- a/src/main/resources/assets/botania/models/block/crafty_crate_1_3.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "botania:block/shapes/crate", - "textures": { - "bottom": "botania:block/crate_crafty_bottom", - "side": "botania:block/crate_crafty_pattern_4" - } -} diff --git a/src/main/resources/assets/botania/models/block/crafty_crate_2_1.json b/src/main/resources/assets/botania/models/block/crafty_crate_2_1.json deleted file mode 100644 index 7746ae13e..000000000 --- a/src/main/resources/assets/botania/models/block/crafty_crate_2_1.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "botania:block/shapes/crate", - "textures": { - "bottom": "botania:block/crate_crafty_bottom", - "side": "botania:block/crate_crafty_pattern_3" - } -} diff --git a/src/main/resources/assets/botania/models/block/crafty_crate_2_2.json b/src/main/resources/assets/botania/models/block/crafty_crate_2_2.json deleted file mode 100644 index 1142c5cf5..000000000 --- a/src/main/resources/assets/botania/models/block/crafty_crate_2_2.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "botania:block/shapes/crate", - "textures": { - "bottom": "botania:block/crate_crafty_bottom", - "side": "botania:block/crate_crafty_pattern_1" - } -} diff --git a/src/main/resources/assets/botania/models/block/crafty_crate_2_3.json b/src/main/resources/assets/botania/models/block/crafty_crate_2_3.json deleted file mode 100644 index 6203efc81..000000000 --- a/src/main/resources/assets/botania/models/block/crafty_crate_2_3.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "botania:block/shapes/crate", - "textures": { - "bottom": "botania:block/crate_crafty_bottom", - "side": "botania:block/crate_crafty_pattern_6" - } -} diff --git a/src/main/resources/assets/botania/models/block/crafty_crate_3_1.json b/src/main/resources/assets/botania/models/block/crafty_crate_3_1.json deleted file mode 100644 index 1bc9dd955..000000000 --- a/src/main/resources/assets/botania/models/block/crafty_crate_3_1.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "botania:block/shapes/crate", - "textures": { - "bottom": "botania:block/crate_crafty_bottom", - "side": "botania:block/crate_crafty_pattern_5" - } -} diff --git a/src/main/resources/assets/botania/models/block/crafty_crate_3_2.json b/src/main/resources/assets/botania/models/block/crafty_crate_3_2.json deleted file mode 100644 index 4beeb3068..000000000 --- a/src/main/resources/assets/botania/models/block/crafty_crate_3_2.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "botania:block/shapes/crate", - "textures": { - "bottom": "botania:block/crate_crafty_bottom", - "side": "botania:block/crate_crafty_pattern_7" - } -} diff --git a/src/main/resources/assets/botania/models/block/crafty_crate_donut.json b/src/main/resources/assets/botania/models/block/crafty_crate_donut.json deleted file mode 100644 index 1d3405472..000000000 --- a/src/main/resources/assets/botania/models/block/crafty_crate_donut.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "botania:block/shapes/crate", - "textures": { - "bottom": "botania:block/crate_crafty_bottom", - "side": "botania:block/crate_crafty_pattern_8" - } -} diff --git a/src/main/resources/assets/botania/models/block/open_crate.json b/src/main/resources/assets/botania/models/block/open_crate.json deleted file mode 100644 index 12a473bd1..000000000 --- a/src/main/resources/assets/botania/models/block/open_crate.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "botania:block/shapes/crate", - "textures": { - "bottom": "botania:block/crate_open_bottom", - "side": "botania:block/crate_open" - } -} diff --git a/src/main/resources/assets/botania/textures/block/crate_crafty.png b/src/main/resources/assets/botania/textures/block/crafty_crate.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/crate_crafty.png rename to src/main/resources/assets/botania/textures/block/crafty_crate.png diff --git a/src/main/resources/assets/botania/textures/block/crate_crafty_pattern_0.png b/src/main/resources/assets/botania/textures/block/crafty_crate_1_1.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/crate_crafty_pattern_0.png rename to src/main/resources/assets/botania/textures/block/crafty_crate_1_1.png diff --git a/src/main/resources/assets/botania/textures/block/crate_crafty_pattern_2.png b/src/main/resources/assets/botania/textures/block/crafty_crate_1_2.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/crate_crafty_pattern_2.png rename to src/main/resources/assets/botania/textures/block/crafty_crate_1_2.png diff --git a/src/main/resources/assets/botania/textures/block/crate_crafty_pattern_4.png b/src/main/resources/assets/botania/textures/block/crafty_crate_1_3.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/crate_crafty_pattern_4.png rename to src/main/resources/assets/botania/textures/block/crafty_crate_1_3.png diff --git a/src/main/resources/assets/botania/textures/block/crate_crafty_pattern_3.png b/src/main/resources/assets/botania/textures/block/crafty_crate_2_1.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/crate_crafty_pattern_3.png rename to src/main/resources/assets/botania/textures/block/crafty_crate_2_1.png diff --git a/src/main/resources/assets/botania/textures/block/crate_crafty_pattern_1.png b/src/main/resources/assets/botania/textures/block/crafty_crate_2_2.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/crate_crafty_pattern_1.png rename to src/main/resources/assets/botania/textures/block/crafty_crate_2_2.png diff --git a/src/main/resources/assets/botania/textures/block/crate_crafty_pattern_6.png b/src/main/resources/assets/botania/textures/block/crafty_crate_2_3.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/crate_crafty_pattern_6.png rename to src/main/resources/assets/botania/textures/block/crafty_crate_2_3.png diff --git a/src/main/resources/assets/botania/textures/block/crate_crafty_pattern_5.png b/src/main/resources/assets/botania/textures/block/crafty_crate_3_1.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/crate_crafty_pattern_5.png rename to src/main/resources/assets/botania/textures/block/crafty_crate_3_1.png diff --git a/src/main/resources/assets/botania/textures/block/crate_crafty_pattern_7.png b/src/main/resources/assets/botania/textures/block/crafty_crate_3_2.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/crate_crafty_pattern_7.png rename to src/main/resources/assets/botania/textures/block/crafty_crate_3_2.png diff --git a/src/main/resources/assets/botania/textures/block/crate_crafty_bottom.png b/src/main/resources/assets/botania/textures/block/crafty_crate_bottom.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/crate_crafty_bottom.png rename to src/main/resources/assets/botania/textures/block/crafty_crate_bottom.png diff --git a/src/main/resources/assets/botania/textures/block/crate_crafty_pattern_8.png b/src/main/resources/assets/botania/textures/block/crafty_crate_donut.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/crate_crafty_pattern_8.png rename to src/main/resources/assets/botania/textures/block/crafty_crate_donut.png diff --git a/src/main/resources/assets/botania/textures/block/crate_open.png b/src/main/resources/assets/botania/textures/block/open_crate.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/crate_open.png rename to src/main/resources/assets/botania/textures/block/open_crate.png diff --git a/src/main/resources/assets/botania/textures/block/crate_open_bottom.png b/src/main/resources/assets/botania/textures/block/open_crate_bottom.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/crate_open_bottom.png rename to src/main/resources/assets/botania/textures/block/open_crate_bottom.png