From d75df9fa6ab6c5e22b6b8e0ed732159338d734a0 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 17 Jan 2020 21:24:00 -0600 Subject: [PATCH] Datagenerate incense plate, pump, fel pumpkin, tiny potato --- .../botania/blockstates/fel_pumpkin.json | 19 +++++++++++++++++++ .../botania/blockstates/incense_plate.json | 19 +++++++++++++++++++ .../assets/botania/blockstates/pump.json | 19 +++++++++++++++++++ .../botania/blockstates/tiny_potato.json | 19 +++++++++++++++++++ .../core/handler/MiscellaneousIcons.java | 2 +- .../client/core/handler/ModelHandler.java | 2 +- .../client/model/FloatingFlowerModel.java | 4 +--- .../botania/data/BlockstateProvider.java | 11 ++++++++--- .../botania/blockstates/fel_pumpkin.json | 8 -------- .../botania/blockstates/incense_plate.json | 8 -------- .../assets/botania/blockstates/pump.json | 8 -------- .../botania/blockstates/tiny_potato.json | 8 -------- .../block/{mana_pump.json => pump.json} | 0 .../{mana_pump_head.json => pump_head.json} | 0 .../assets/botania/models/item/pump.json | 2 +- 15 files changed, 88 insertions(+), 41 deletions(-) create mode 100644 src/generated/resources/assets/botania/blockstates/fel_pumpkin.json create mode 100644 src/generated/resources/assets/botania/blockstates/incense_plate.json create mode 100644 src/generated/resources/assets/botania/blockstates/pump.json create mode 100644 src/generated/resources/assets/botania/blockstates/tiny_potato.json delete mode 100644 src/main/resources/assets/botania/blockstates/fel_pumpkin.json delete mode 100644 src/main/resources/assets/botania/blockstates/incense_plate.json delete mode 100644 src/main/resources/assets/botania/blockstates/pump.json delete mode 100644 src/main/resources/assets/botania/blockstates/tiny_potato.json rename src/main/resources/assets/botania/models/block/{mana_pump.json => pump.json} (100%) rename src/main/resources/assets/botania/models/block/{mana_pump_head.json => pump_head.json} (100%) diff --git a/src/generated/resources/assets/botania/blockstates/fel_pumpkin.json b/src/generated/resources/assets/botania/blockstates/fel_pumpkin.json new file mode 100644 index 000000000..da9415ad3 --- /dev/null +++ b/src/generated/resources/assets/botania/blockstates/fel_pumpkin.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=north": { + "model": "botania:block/fel_pumpkin" + }, + "facing=south": { + "model": "botania:block/fel_pumpkin", + "y": 180 + }, + "facing=west": { + "model": "botania:block/fel_pumpkin", + "y": 270 + }, + "facing=east": { + "model": "botania:block/fel_pumpkin", + "y": 90 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/blockstates/incense_plate.json b/src/generated/resources/assets/botania/blockstates/incense_plate.json new file mode 100644 index 000000000..a15d620a8 --- /dev/null +++ b/src/generated/resources/assets/botania/blockstates/incense_plate.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=north": { + "model": "botania:block/incense_plate", + "y": 180 + }, + "facing=south": { + "model": "botania:block/incense_plate" + }, + "facing=west": { + "model": "botania:block/incense_plate", + "y": 90 + }, + "facing=east": { + "model": "botania:block/incense_plate", + "y": 270 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/blockstates/pump.json b/src/generated/resources/assets/botania/blockstates/pump.json new file mode 100644 index 000000000..5cd04443c --- /dev/null +++ b/src/generated/resources/assets/botania/blockstates/pump.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=north": { + "model": "botania:block/pump" + }, + "facing=south": { + "model": "botania:block/pump", + "y": 180 + }, + "facing=west": { + "model": "botania:block/pump", + "y": 270 + }, + "facing=east": { + "model": "botania:block/pump", + "y": 90 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/blockstates/tiny_potato.json b/src/generated/resources/assets/botania/blockstates/tiny_potato.json new file mode 100644 index 000000000..45b45b4d5 --- /dev/null +++ b/src/generated/resources/assets/botania/blockstates/tiny_potato.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=north": { + "model": "botania:block/tiny_potato" + }, + "facing=south": { + "model": "botania:block/tiny_potato", + "y": 180 + }, + "facing=west": { + "model": "botania:block/tiny_potato", + "y": 270 + }, + "facing=east": { + "model": "botania:block/tiny_potato", + "y": 90 + } + } +} \ 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 c578bb3fe..7a03ade4a 100644 --- a/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java +++ b/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java @@ -146,7 +146,7 @@ public class MiscellaneousIcons { evt.getModelRegistry().put(key, new GunModel(evt.getModelLoader(), originalModel, originalModelClip)); RenderTileCorporeaCrystalCube.cubeModel = evt.getModelRegistry().get(prefix("block/corporea_crystal_cube_glass")); - RenderTilePump.headModel = evt.getModelRegistry().get(prefix("block/mana_pump_head")); + RenderTilePump.headModel = evt.getModelRegistry().get(prefix("block/pump_head")); // Icons goldfishModel = evt.getModelRegistry().get(prefix("icon/goldfish")); diff --git a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java index 5416ff118..15743bd4b 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -103,7 +103,7 @@ public final class ModelHandler { ModelLoader.addSpecialModel(new ModelResourceLocation(LibMisc.MOD_ID + ":desu_gun", "inventory")); ModelLoader.addSpecialModel(new ModelResourceLocation(LibMisc.MOD_ID + ":desu_gun_clip", "inventory")); ModelLoader.addSpecialModel(prefix("block/corporea_crystal_cube_glass")); - ModelLoader.addSpecialModel(prefix("block/mana_pump_head")); + ModelLoader.addSpecialModel(prefix("block/pump_head")); registerSubtiles(); ClientRegistry.bindTileEntityRenderer(TileAltar.TYPE, RenderTileAltar::new); diff --git a/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java b/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java index 4189c9ff2..815240064 100644 --- a/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java +++ b/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java @@ -1,6 +1,5 @@ package vazkii.botania.client.model; -import com.google.common.collect.ImmutableMap; import com.google.gson.JsonDeserializationContext; import com.google.gson.JsonObject; import com.mojang.blaze3d.matrix.MatrixStack; @@ -25,7 +24,6 @@ import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.BakedModelWrapper; import net.minecraftforge.client.model.IModelConfiguration; import net.minecraftforge.client.model.IModelLoader; -import net.minecraftforge.client.model.ModelLoaderRegistry; import net.minecraftforge.client.model.ModelTransformComposition; import net.minecraftforge.client.model.SimpleModelTransform; import net.minecraftforge.client.model.data.EmptyModelData; @@ -52,7 +50,7 @@ public class FloatingFlowerModel implements IModelGeometry private IUnbakedModel unbakedFlower; private final Map unbakedIslands = new HashMap<>(); - private FloatingFlowerModel(@Nullable IUnbakedModel flower) { + private FloatingFlowerModel(IUnbakedModel flower) { this.unbakedFlower = flower; } diff --git a/src/main/java/vazkii/botania/data/BlockstateProvider.java b/src/main/java/vazkii/botania/data/BlockstateProvider.java index 5d6f0a63b..e4757bdca 100644 --- a/src/main/java/vazkii/botania/data/BlockstateProvider.java +++ b/src/main/java/vazkii/botania/data/BlockstateProvider.java @@ -53,10 +53,9 @@ public class BlockstateProvider extends BlockStateProvider { protected void registerStatesAndModels() { Registry.BLOCK.stream().filter(b -> LibMisc.MOD_ID.equals(b.getRegistryName().getNamespace())) .forEach(b -> { - if (b == ModBlocks.tinyPotato - || b instanceof BlockRedString || b instanceof BlockFloatingFlower + if (b instanceof BlockRedString || b instanceof BlockFloatingFlower || b == ModBlocks.craftCrate || b == ModBlocks.ghostRail - || b == ModBlocks.pump || b == ModBlocks.incensePlate || b == ModBlocks.felPumpkin || b == ModBlocks.solidVines) + || b == ModBlocks.solidVines) return; String name = b.getRegistryName().getPath(); @@ -127,6 +126,12 @@ public class BlockstateProvider extends BlockStateProvider { ModelFile onFile = models().getExistingFile(prefix("block/" + name + "_powered")); getVariantBuilder(b).partialState().with(BotaniaStateProps.POWERED, false).setModels(new ConfiguredModel(offFile)); getVariantBuilder(b).partialState().with(BotaniaStateProps.POWERED, true).setModels(new ConfiguredModel(onFile)); + } else if (b == ModBlocks.tinyPotato || b == ModBlocks.felPumpkin || b == ModBlocks.pump) { + ModelFile file = models().getExistingFile(prefix("block/" + name)); + horizontalBlock(b, file); + } else if (b == ModBlocks.incensePlate) { + ModelFile file = models().getExistingFile(prefix("block/" + name)); + horizontalBlock(b, file, 0); } else { simpleBlock(b, models().getExistingFile(prefix("block/" + name))); } diff --git a/src/main/resources/assets/botania/blockstates/fel_pumpkin.json b/src/main/resources/assets/botania/blockstates/fel_pumpkin.json deleted file mode 100644 index 71f00bc98..000000000 --- a/src/main/resources/assets/botania/blockstates/fel_pumpkin.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "variants": { - "facing=north": { "model": "botania:block/fel_pumpkin" }, - "facing=south": { "model": "botania:block/fel_pumpkin", "y": 180 }, - "facing=west": { "model": "botania:block/fel_pumpkin", "y": 270 }, - "facing=east": { "model": "botania:block/fel_pumpkin", "y": 90 } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/incense_plate.json b/src/main/resources/assets/botania/blockstates/incense_plate.json deleted file mode 100644 index 9eadaf95a..000000000 --- a/src/main/resources/assets/botania/blockstates/incense_plate.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "variants": { - "facing=north": { "model": "botania:block/incense_plate", "y": 180 }, - "facing=south": { "model": "botania:block/incense_plate" }, - "facing=west": { "model": "botania:block/incense_plate", "y": 90 }, - "facing=east": { "model": "botania:block/incense_plate", "y": 270 } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/pump.json b/src/main/resources/assets/botania/blockstates/pump.json deleted file mode 100644 index c773fa9eb..000000000 --- a/src/main/resources/assets/botania/blockstates/pump.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "variants": { - "facing=north": { "model": "botania:block/mana_pump" }, - "facing=south": { "model": "botania:block/mana_pump","y": 180 }, - "facing=west": { "model": "botania:block/mana_pump","y": 270 }, - "facing=east": { "model": "botania:block/mana_pump","y": 90 } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/tiny_potato.json b/src/main/resources/assets/botania/blockstates/tiny_potato.json deleted file mode 100644 index 5e93bc48a..000000000 --- a/src/main/resources/assets/botania/blockstates/tiny_potato.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "variants": { - "facing=north": { "model": "botania:block/tiny_potato" }, - "facing=south": { "model": "botania:block/tiny_potato", "y": 180 }, - "facing=west": { "model": "botania:block/tiny_potato", "y": 270 }, - "facing=east": { "model": "botania:block/tiny_potato", "y": 90 } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/mana_pump.json b/src/main/resources/assets/botania/models/block/pump.json similarity index 100% rename from src/main/resources/assets/botania/models/block/mana_pump.json rename to src/main/resources/assets/botania/models/block/pump.json diff --git a/src/main/resources/assets/botania/models/block/mana_pump_head.json b/src/main/resources/assets/botania/models/block/pump_head.json similarity index 100% rename from src/main/resources/assets/botania/models/block/mana_pump_head.json rename to src/main/resources/assets/botania/models/block/pump_head.json diff --git a/src/main/resources/assets/botania/models/item/pump.json b/src/main/resources/assets/botania/models/item/pump.json index fd632fdc9..bd9fb46e1 100644 --- a/src/main/resources/assets/botania/models/item/pump.json +++ b/src/main/resources/assets/botania/models/item/pump.json @@ -1,5 +1,5 @@ { - "Comment0": "Combination of block/mana_pump and block/mana_pump_head", + "Comment0": "Combination of block/pump and block/pump_head", "Comment": "Designed by Wiiv with Cubik Studio - https://cubik.studio", "parent": "minecraft:block/block", "textures": {