From fb8808168a7798484cfbc71b00d7c65e94398761 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 11 Jan 2020 13:54:41 -0600 Subject: [PATCH] switch water bowl to json system --- .../core/handler/MiscellaneousIcons.java | 8 +--- .../botania/models/item/water_bowl.json | 38 ++++++++++++++++--- 2 files changed, 33 insertions(+), 13 deletions(-) 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 5fa457284..c578bb3fe 100644 --- a/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java +++ b/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java @@ -107,12 +107,6 @@ public class MiscellaneousIcons { @SubscribeEvent public void onModelBake(ModelBakeEvent evt) { - // Water bowl - ModelDynBucket bowl = new ModelDynBucket(prefix("items/waterbowl_base"), prefix("items/waterbowl_fluid"), prefix("items/waterbowl_cover"), Fluids.WATER, false, true); - IModelState transform = ForgeBlockStateV1.Transforms.get("forge:default-item").get(); - IBakedModel bakedBowl = bowl.bake(evt.getModelLoader(), ModelLoader.defaultTextureGetter(), new BasicState(transform, false), DefaultVertexFormats.ITEM); - evt.getModelRegistry().put(new ModelResourceLocation(ModItems.waterBowl.getRegistryName(), "inventory"), bakedBowl); - // Floating flower item models for (Map.Entry e : evt.getModelRegistry().entrySet()) { if (e.getValue() instanceof FloatingFlowerModel.Baked) { @@ -253,7 +247,7 @@ public class MiscellaneousIcons { } private TextureAtlasSprite get(AtlasTexture map, String name) { - return map.getSprite(new ResourceLocation(LibMisc.MOD_ID, name)); + return map.getSprite(prefix(name)); } private MiscellaneousIcons() {} diff --git a/src/main/resources/assets/botania/models/item/water_bowl.json b/src/main/resources/assets/botania/models/item/water_bowl.json index cf7126818..5fc760d32 100644 --- a/src/main/resources/assets/botania/models/item/water_bowl.json +++ b/src/main/resources/assets/botania/models/item/water_bowl.json @@ -1,10 +1,36 @@ { - "__comment0": "Temporary 1.14 dummy, forces the textures to be loaded and stitched so we can construct", - "__comment1": "the ModelDynBucket in code. Should be migrated to the new model json system soon (tm).", - "parent": "minecraft:item/generated", + "loader": "forge:bucket", + "fluid": "water", + "applyTint": true, "textures": { - "layer0": "botania:items/waterbowl_base", - "layer1": "botania:items/waterbowl_fluid", - "layer2": "botania:items/waterbowl_cover" + "base": "botania:items/waterbowl_base", + "fluid": "botania:items/waterbowl_fluid", + "cover": "botania:items/waterbowl_cover" + }, + "display": { + "ground": { + "rotation": [ 0, 0, 0 ], + "translation": [ 0, 2, 0], + "scale":[ 0.5, 0.5, 0.5 ] + }, + "head": { + "rotation": [ 0, 180, 0 ], + "translation": [ 0, 13, 7], + "scale":[ 1, 1, 1] + }, + "thirdperson_righthand": { + "rotation": [ 0, 0, 0 ], + "translation": [ 0, 3, 1 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson_righthand": { + "rotation": [ 0, -90, 25 ], + "translation": [ 1.13, 3.2, 1.13], + "scale": [ 0.68, 0.68, 0.68 ] + }, + "fixed": { + "rotation": [ 0, 180, 0 ], + "scale": [ 1, 1, 1 ] + } } } \ No newline at end of file