diff --git a/src/generated/resources/assets/botania/models/block/enchanted_soil.json b/src/generated/resources/assets/botania/models/block/enchanted_soil.json new file mode 100644 index 000000000..f2e881e16 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/enchanted_soil.json @@ -0,0 +1,8 @@ +{ + "parent": "block/cube_bottom_top", + "textures": { + "side": "botania:block/enchanted_soil_side", + "bottom": "block/dirt", + "top": "botania:block/enchanted_soil_top" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/forest_eye.json b/src/generated/resources/assets/botania/models/block/forest_eye.json similarity index 99% rename from src/main/resources/assets/botania/models/block/forest_eye.json rename to src/generated/resources/assets/botania/models/block/forest_eye.json index 138ba5fe7..2168ca47b 100644 --- a/src/main/resources/assets/botania/models/block/forest_eye.json +++ b/src/generated/resources/assets/botania/models/block/forest_eye.json @@ -8,4 +8,4 @@ "west": "botania:block/forest_eye_west", "east": "botania:block/forest_eye_east" } -} +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/light_launcher.json b/src/generated/resources/assets/botania/models/block/light_launcher.json new file mode 100644 index 000000000..bf60b0bee --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/light_launcher.json @@ -0,0 +1,8 @@ +{ + "parent": "botania:block/shapes/four_high_bottom_top", + "textures": { + "bottom": "botania:block/light_launcher_end", + "top": "botania:block/light_launcher_end", + "side": "botania:block/light_launcher_side" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/spark_changer.json b/src/generated/resources/assets/botania/models/block/spark_changer.json new file mode 100644 index 000000000..f61977223 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/spark_changer.json @@ -0,0 +1,8 @@ +{ + "parent": "botania:block/shapes/three_high_bottom_top", + "textures": { + "bottom": "botania:block/spark_changer_bottom", + "top": "botania:block/spark_changer_top", + "side": "botania:block/spark_changer_side" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/starfield.json b/src/generated/resources/assets/botania/models/block/starfield.json similarity index 99% rename from src/main/resources/assets/botania/models/block/starfield.json rename to src/generated/resources/assets/botania/models/block/starfield.json index 9c90be6f3..15a27ba16 100644 --- a/src/main/resources/assets/botania/models/block/starfield.json +++ b/src/generated/resources/assets/botania/models/block/starfield.json @@ -5,4 +5,4 @@ "top": "botania:block/starfield_top", "side": "botania:block/starfield_side" } -} +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/terra_plate.json b/src/generated/resources/assets/botania/models/block/terra_plate.json new file mode 100644 index 000000000..af5d52b6c --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/terra_plate.json @@ -0,0 +1,8 @@ +{ + "parent": "botania:block/shapes/three_high_bottom_top", + "textures": { + "bottom": "botania:block/terra_plate_bottom", + "top": "botania:block/terra_plate_top", + "side": "botania:block/terra_plate_side" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/tiny_planet_block.json b/src/generated/resources/assets/botania/models/block/tiny_planet_block.json similarity index 98% rename from src/main/resources/assets/botania/models/block/tiny_planet_block.json rename to src/generated/resources/assets/botania/models/block/tiny_planet_block.json index 6f517c277..33893c887 100644 --- a/src/main/resources/assets/botania/models/block/tiny_planet_block.json +++ b/src/generated/resources/assets/botania/models/block/tiny_planet_block.json @@ -3,4 +3,4 @@ "textures": { "all": "botania:block/tiny_planet_block" } -} +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/turntable.json b/src/generated/resources/assets/botania/models/block/turntable.json new file mode 100644 index 000000000..ad10f8cc3 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/turntable.json @@ -0,0 +1,8 @@ +{ + "parent": "block/cube_bottom_top", + "textures": { + "side": "botania:block/turntable_side", + "bottom": "botania:block/turntable_bottom", + "top": "botania:block/turntable_top" + } +} \ No newline at end of file diff --git a/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java b/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java index ad54fa91c..699ec2bb5 100644 --- a/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java +++ b/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java @@ -201,8 +201,8 @@ public class MiscellaneousIcons { evt.addSprite(prefix("block/luminizer_detector")); evt.addSprite(prefix("block/luminizer_fork")); evt.addSprite(prefix("block/luminizer_toggle")); - evt.addSprite(prefix("block/catalyst_alchemy_overlay")); - evt.addSprite(prefix("block/catalyst_conjuration_overlay")); + evt.addSprite(prefix("block/alchemy_catalyst_overlay")); + evt.addSprite(prefix("block/conjuration_catalyst_overlay")); evt.addSprite(prefix("block/enchanter_overlay")); evt.addSprite(prefix("block/mana_void_overlay")); evt.addSprite(prefix("block/mana_water")); @@ -238,8 +238,8 @@ public class MiscellaneousIcons { lightRelayWorldIconRed = get(evt.getMap(), "block/luminizer_detector"); lightRelayWorldIconGreen = get(evt.getMap(), "block/luminizer_fork"); lightRelayWorldIconPurple = get(evt.getMap(), "block/luminizer_toggle"); - alchemyCatalystOverlay = get(evt.getMap(), "block/catalyst_alchemy_overlay"); - conjurationCatalystOverlay = get(evt.getMap(), "block/catalyst_conjuration_overlay"); + alchemyCatalystOverlay = get(evt.getMap(), "block/alchemy_catalyst_overlay"); + conjurationCatalystOverlay = get(evt.getMap(), "block/conjuration_catalyst_overlay"); enchanterOverlay = get(evt.getMap(), "block/enchanter_overlay"); manaVoidOverlay = get(evt.getMap(), "block/mana_void_overlay"); manaWater = get(evt.getMap(), "block/mana_water"); diff --git a/src/main/java/vazkii/botania/data/BlockstateProvider.java b/src/main/java/vazkii/botania/data/BlockstateProvider.java index 89512282d..31ff85f01 100644 --- a/src/main/java/vazkii/botania/data/BlockstateProvider.java +++ b/src/main/java/vazkii/botania/data/BlockstateProvider.java @@ -120,16 +120,43 @@ public class BlockstateProvider extends BlockStateProvider { getVariantBuilder(elfGlass).partialState().setModels(elfGlassFiles); remainingBlocks.remove(elfGlass); + String enchSoilName = Registry.BLOCK.getKey(enchantedSoil).getPath(); + simpleBlock(enchantedSoil, models().cubeBottomTop(enchSoilName, + prefix("block/" + enchSoilName + "_side"), + new ResourceLocation("block/dirt"), + prefix("block/" + enchSoilName + "_top") + )); + remainingBlocks.remove(enchantedSoil); + 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(); + String forestEyeName = Registry.BLOCK.getKey(forestEye).getPath(); + ModelFile forestEyeFile = models().withExistingParent(forestEyeName, prefix("block/shapes/eightbyeight")) + .texture("bottom", prefix("block/" + forestEyeName + "_bottom")) + .texture("top", prefix("block/" + forestEyeName + "_top")) + .texture("north", prefix("block/" + forestEyeName + "_north")) + .texture("south", prefix("block/" + forestEyeName + "_south")) + .texture("west", prefix("block/" + forestEyeName + "_west")) + .texture("east", prefix("block/" + forestEyeName + "_east")); + simpleBlock(forestEye, forestEyeFile); + remainingBlocks.remove(forestEye); + + String plateName = Registry.BLOCK.getKey(incensePlate).getPath(); ModelFile plateFile = models().getExistingFile(prefix("block/" + plateName)); horizontalBlock(incensePlate, plateFile, 0); remainingBlocks.remove(incensePlate); + String lightLauncherName = Registry.BLOCK.getKey(lightLauncher).getPath(); + ModelFile lightLauncherFile = models().withExistingParent(lightLauncherName, prefix("block/shapes/four_high_bottom_top")) + .texture("bottom", prefix("block/" + lightLauncherName + "_end")) + .texture("top", prefix("block/" + lightLauncherName + "_end")) + .texture("side", prefix("block/" + lightLauncherName + "_side")); + simpleBlock(lightLauncher, lightLauncherFile); + remainingBlocks.remove(lightLauncher); + String openCrateName = Registry.BLOCK.getKey(openCrate).getPath(); ModelFile openCrateFile = models().withExistingParent(openCrateName, prefix("block/shapes/crate")) .texture("side", prefix("block/" + openCrateName)) @@ -137,6 +164,44 @@ public class BlockstateProvider extends BlockStateProvider { simpleBlock(openCrate, openCrateFile); remainingBlocks.remove(openCrate); + String sparkChangerName = Registry.BLOCK.getKey(sparkChanger).getPath(); + ModelFile sparkChangerFile = models().withExistingParent(sparkChangerName, prefix("block/shapes/three_high_bottom_top")) + .texture("bottom", prefix("block/" + sparkChangerName + "_bottom")) + .texture("top", prefix("block/" + sparkChangerName + "_top")) + .texture("side", prefix("block/" + sparkChangerName + "_side")); + simpleBlock(sparkChanger, sparkChangerFile); + remainingBlocks.remove(sparkChanger); + + String starfieldName = Registry.BLOCK.getKey(starfield).getPath(); + ModelFile starfieldFile = models().withExistingParent(starfieldName, prefix("block/shapes/four_high_bottom_top")) + .texture("bottom", prefix("block/" + starfieldName + "_bottom")) + .texture("top", prefix("block/" + starfieldName + "_top")) + .texture("side", prefix("block/" + starfieldName + "_side")); + simpleBlock(starfield, starfieldFile); + remainingBlocks.remove(starfield); + + String terraPlateName = Registry.BLOCK.getKey(terraPlate).getPath(); + ModelFile terraPlateFile = models().withExistingParent(terraPlateName, prefix("block/shapes/three_high_bottom_top")) + .texture("bottom", prefix("block/" + terraPlateName + "_bottom")) + .texture("top", prefix("block/" + terraPlateName + "_top")) + .texture("side", prefix("block/" + terraPlateName + "_side")); + simpleBlock(terraPlate, terraPlateFile); + remainingBlocks.remove(terraPlate); + + String tinyPlanetName = Registry.BLOCK.getKey(tinyPlanet).getPath(); + ModelFile tinyPlanetFile = models().withExistingParent(tinyPlanetName, prefix("block/shapes/tenbyten_all")) + .texture("all", prefix("block/" + tinyPlanetName)); + simpleBlock(tinyPlanet, tinyPlanetFile); + remainingBlocks.remove(tinyPlanet); + + String turnTableName = Registry.BLOCK.getKey(turntable).getPath(); + simpleBlock(turntable, models().cubeBottomTop(turnTableName, + prefix("block/" + turnTableName + "_side"), + prefix("block/" + turnTableName + "_bottom"), + prefix("block/" + turnTableName + "_top") + )); + remainingBlocks.remove(turntable); + fixedWallBlock((WallBlock) ModFluffBlocks.dreamwoodWall, prefix("block/dreamwood")); fixedWallBlock((WallBlock) ModFluffBlocks.livingrockWall, prefix("block/livingrock")); fixedWallBlock((WallBlock) ModFluffBlocks.livingwoodWall, prefix("block/livingwood")); diff --git a/src/main/resources/assets/botania/models/block/enchanted_soil.json b/src/main/resources/assets/botania/models/block/enchanted_soil.json deleted file mode 100644 index 81295335b..000000000 --- a/src/main/resources/assets/botania/models/block/enchanted_soil.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/cube_bottom_top", - "textures": { - "bottom": "minecraft:block/dirt", - "top": "botania:block/enchanted_soil_top", - "side": "botania:block/enchanted_soil_side" - } -} diff --git a/src/main/resources/assets/botania/models/block/light_launcher.json b/src/main/resources/assets/botania/models/block/light_launcher.json deleted file mode 100644 index fd99081cd..000000000 --- a/src/main/resources/assets/botania/models/block/light_launcher.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "botania:block/shapes/four_high_bottom_top", - "textures": { - "bottom": "botania:block/luminizer_launcher_top_bottom", - "top": "botania:block/luminizer_launcher_top_bottom", - "side": "botania:block/luminizer_launcher_side" - } -} diff --git a/src/main/resources/assets/botania/models/block/spark_changer.json b/src/main/resources/assets/botania/models/block/spark_changer.json deleted file mode 100644 index b42745625..000000000 --- a/src/main/resources/assets/botania/models/block/spark_changer.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "botania:block/shapes/three_high_bottom_top", - "textures": { - "bottom": "botania:block/spark_tinkerer_bottom", - "up": "botania:block/spark_tinkerer_top", - "side": "botania:block/spark_tinkerer_side" - } -} diff --git a/src/main/resources/assets/botania/models/block/terra_plate.json b/src/main/resources/assets/botania/models/block/terra_plate.json deleted file mode 100644 index 9307c2da6..000000000 --- a/src/main/resources/assets/botania/models/block/terra_plate.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "botania:block/shapes/three_high_bottom_top", - "textures": { - "bottom": "botania:block/terra_plate_bottom", - "up": "botania:block/terra_plate_top", - "side": "botania:block/terra_plate_side" - } -} diff --git a/src/main/resources/assets/botania/models/block/turntable.json b/src/main/resources/assets/botania/models/block/turntable.json deleted file mode 100644 index ff7eb098c..000000000 --- a/src/main/resources/assets/botania/models/block/turntable.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/cube_bottom_top", - "textures": { - "bottom": "botania:block/spreader_turntable_bottom", - "top": "botania:block/spreader_turntable_top", - "side": "botania:block/spreader_turntable" - } -} diff --git a/src/main/resources/assets/botania/textures/block/catalyst_alchemy.png b/src/main/resources/assets/botania/textures/block/alchemy_catalyst.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/catalyst_alchemy.png rename to src/main/resources/assets/botania/textures/block/alchemy_catalyst.png diff --git a/src/main/resources/assets/botania/textures/block/catalyst_alchemy_overlay.png b/src/main/resources/assets/botania/textures/block/alchemy_catalyst_overlay.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/catalyst_alchemy_overlay.png rename to src/main/resources/assets/botania/textures/block/alchemy_catalyst_overlay.png diff --git a/src/main/resources/assets/botania/textures/block/catalyst_conjuration.png b/src/main/resources/assets/botania/textures/block/conjuration_catalyst.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/catalyst_conjuration.png rename to src/main/resources/assets/botania/textures/block/conjuration_catalyst.png diff --git a/src/main/resources/assets/botania/textures/block/catalyst_conjuration_overlay.png b/src/main/resources/assets/botania/textures/block/conjuration_catalyst_overlay.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/catalyst_conjuration_overlay.png rename to src/main/resources/assets/botania/textures/block/conjuration_catalyst_overlay.png diff --git a/src/main/resources/assets/botania/textures/block/luminizer_launcher_top_bottom.png b/src/main/resources/assets/botania/textures/block/light_launcher_end.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/luminizer_launcher_top_bottom.png rename to src/main/resources/assets/botania/textures/block/light_launcher_end.png diff --git a/src/main/resources/assets/botania/textures/block/luminizer_launcher_side.png b/src/main/resources/assets/botania/textures/block/light_launcher_side.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/luminizer_launcher_side.png rename to src/main/resources/assets/botania/textures/block/light_launcher_side.png diff --git a/src/main/resources/assets/botania/textures/block/spark_tinkerer_bottom.png b/src/main/resources/assets/botania/textures/block/spark_changer_bottom.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/spark_tinkerer_bottom.png rename to src/main/resources/assets/botania/textures/block/spark_changer_bottom.png diff --git a/src/main/resources/assets/botania/textures/block/spark_tinkerer_side.png b/src/main/resources/assets/botania/textures/block/spark_changer_side.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/spark_tinkerer_side.png rename to src/main/resources/assets/botania/textures/block/spark_changer_side.png diff --git a/src/main/resources/assets/botania/textures/block/spark_tinkerer_top.png b/src/main/resources/assets/botania/textures/block/spark_changer_top.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/spark_tinkerer_top.png rename to src/main/resources/assets/botania/textures/block/spark_changer_top.png diff --git a/src/main/resources/assets/botania/textures/block/spreader_turntable_bottom.png b/src/main/resources/assets/botania/textures/block/turntable_bottom.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/spreader_turntable_bottom.png rename to src/main/resources/assets/botania/textures/block/turntable_bottom.png diff --git a/src/main/resources/assets/botania/textures/block/spreader_turntable.png b/src/main/resources/assets/botania/textures/block/turntable_side.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/spreader_turntable.png rename to src/main/resources/assets/botania/textures/block/turntable_side.png diff --git a/src/main/resources/assets/botania/textures/block/spreader_turntable_top.png b/src/main/resources/assets/botania/textures/block/turntable_top.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/spreader_turntable_top.png rename to src/main/resources/assets/botania/textures/block/turntable_top.png