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 a72826667..ac0c2a191 100644 --- a/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java +++ b/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java @@ -21,6 +21,7 @@ import vazkii.botania.client.model.FloatingFlowerModel; import vazkii.botania.client.model.GunModel; import vazkii.botania.client.model.LexiconModel; import vazkii.botania.client.model.PlatformModel; +import vazkii.botania.client.render.tile.RenderTileCorporeaCrystalCube; import vazkii.botania.common.Botania; import vazkii.botania.common.item.equipment.bauble.ItemFlightTiara; import vazkii.botania.common.item.relic.ItemKingKey; @@ -113,6 +114,8 @@ public class MiscellaneousIcons { ModelResourceLocation clipKey = new ModelResourceLocation("botania:mana_gun_clip", "inventory"); IBakedModel originalModelClip = evt.getModelRegistry().get(clipKey); evt.getModelRegistry().put(key, new GunModel(evt.getModelLoader(), originalModel, originalModelClip)); + + RenderTileCorporeaCrystalCube.cubeModel = evt.getModelRegistry().get(new ResourceLocation(LibMisc.MOD_ID, "block/corporea_crystal_cube_glass")); } @SubscribeEvent 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 acd515be2..6f02c21b1 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -13,6 +13,7 @@ import net.minecraft.client.renderer.entity.SpriteRenderer; import net.minecraft.client.renderer.entity.SpriteRenderer; import net.minecraft.client.renderer.model.ModelResourceLocation; import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.event.ModelRegistryEvent; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.client.model.animation.TileEntityRendererAnimation; @@ -64,6 +65,7 @@ public final class ModelHandler { ModelLoader.addSpecialModel(new ModelResourceLocation(LibMisc.MOD_ID + ":mana_gun_clip", "inventory")); ModelLoader.addSpecialModel(new ModelResourceLocation(LibMisc.MOD_ID + ":desu_gun", "inventory")); ModelLoader.addSpecialModel(new ModelResourceLocation(LibMisc.MOD_ID + ":desu_gun_clip", "inventory")); + ModelLoader.addSpecialModel(new ResourceLocation(LibMisc.MOD_ID, "block/corporea_crystal_cube_glass")); registerSubtiles(); RenderTileFloatingFlower renderTileFloatingFlower = new RenderTileFloatingFlower(); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaCrystalCube.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaCrystalCube.java index 70052408e..2ad15036f 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaCrystalCube.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaCrystalCube.java @@ -19,6 +19,7 @@ import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.ItemRenderer; import net.minecraft.client.renderer.entity.ItemRenderer; +import net.minecraft.client.renderer.model.IBakedModel; import net.minecraft.client.renderer.texture.AtlasTexture; import net.minecraft.client.renderer.tileentity.ItemStackTileEntityRenderer; import net.minecraft.client.renderer.tileentity.TileEntityRenderer; @@ -49,6 +50,8 @@ import javax.annotation.Nullable; // TODO 1.13 move this back to a normal tesr. Byebye animation API public class RenderTileCorporeaCrystalCube extends TileEntityRenderer { + // Ugly but there's no other way to get the model besides grabbing it from the event + public static IBakedModel cubeModel = null; private ItemEntity entity = null; private ItemRenderer itemRenderer = null; @@ -95,6 +98,11 @@ public class RenderTileCorporeaCrystalCube extends TileEntityRenderer asmCap; - public TileCorporeaCrystalCube() { super(TYPE); - if (FMLEnvironment.dist == Dist.CLIENT) { - asm = ModelLoaderRegistry.loadASM(new ResourceLocation("botania", "asms/block/corporeacrystalcube.json"), ImmutableMap.of()); - asmCap = LazyOptional.of(() -> asm); - } else { - asm = null; - asmCap = LazyOptional.empty(); - } } @Override @@ -174,13 +164,4 @@ public class TileCorporeaCrystalCube extends TileCorporeaBase implements ICorpor onUpdateCount(); } } - - @Override - @Nonnull - public LazyOptional getCapability(@Nonnull Capability cap, Direction side) { - if(cap == CapabilityAnimation.ANIMATION_CAPABILITY) { - return asmCap.cast(); - } else return super.getCapability(cap, side); - } - } diff --git a/src/main/resources/assets/botania/blockstates/corporea_crystal_cube.json b/src/main/resources/assets/botania/blockstates/corporea_crystal_cube.json index 7ad2ac91f..7e6f78da6 100644 --- a/src/main/resources/assets/botania/blockstates/corporea_crystal_cube.json +++ b/src/main/resources/assets/botania/blockstates/corporea_crystal_cube.json @@ -1,33 +1,5 @@ { - "forge_marker": 1, - "defaults": { - "textures": { - "cloth": "botania:blocks/corporea_crystal_cube_cloth", - "base": "botania:blocks/corporea_crystal_cube_base", - "glass": "botania:blocks/corporea_crystal_cube_glass", - "particle": "botania:blocks/corporea_crystal_cube_base" - } - }, - "variants": { - "static": { - "true": { - "model": "botania:block/corporea_crystal_cube_base" - }, - "false": { - "model": "botania:block/corporea_crystal_cube_glass" - } - }, - "inventory": [{ - "model": "botania:block/corporea_crystal_cube_base", - "transform": "forge:default-block", - "submodel": { - "cube": { - "model": "botania:block/corporea_crystal_cube_glass", - "transform": { - "translation": [ 0, 0.5, 0 ] - } - } - } - }] - } + "variants": { + "": { "model": "botania:block/corporea_crystal_cube_base" } + } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/corporea_crystal_cube_base.json b/src/main/resources/assets/botania/models/block/corporea_crystal_cube_base.json index f09fd56eb..fd93cc16c 100644 --- a/src/main/resources/assets/botania/models/block/corporea_crystal_cube_base.json +++ b/src/main/resources/assets/botania/models/block/corporea_crystal_cube_base.json @@ -1,5 +1,10 @@ { "comment": "Designed by Wiiv with Cubik Studio - https://cubik.studio", + "textures": { + "cloth": "botania:blocks/corporea_crystal_cube_cloth", + "base": "botania:blocks/corporea_crystal_cube_base", + "particle": "botania:blocks/corporea_crystal_cube_base" + }, "elements": [ { "__comment": "base", diff --git a/src/main/resources/assets/botania/models/block/corporea_crystal_cube_glass.json b/src/main/resources/assets/botania/models/block/corporea_crystal_cube_glass.json index 000a6e805..e9a643b34 100644 --- a/src/main/resources/assets/botania/models/block/corporea_crystal_cube_glass.json +++ b/src/main/resources/assets/botania/models/block/corporea_crystal_cube_glass.json @@ -1,6 +1,7 @@ { "textures": { - "particle": "#glass" + "glass": "botania:blocks/corporea_crystal_cube_glass", + "particle": "botania:blocks/corporea_crystal_cube_glass" }, "elements": [ { diff --git a/src/main/resources/assets/botania/models/item/corporea_crystal_cube.json b/src/main/resources/assets/botania/models/item/corporea_crystal_cube.json new file mode 100644 index 000000000..3326413b3 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/corporea_crystal_cube.json @@ -0,0 +1,35 @@ +{ + "parent": "builtin/entity", + "display": { + "gui": { + "rotation": [ 30, 225, 0 ], + "translation": [ 0, 0, 0], + "scale":[ 0.625, 0.625, 0.625 ] + }, + "ground": { + "rotation": [ 0, 0, 0 ], + "translation": [ 0, 3, 0], + "scale":[ 0.25, 0.25, 0.25 ] + }, + "fixed": { + "rotation": [ 0, 0, 0 ], + "translation": [ 0, 0, 0], + "scale":[ 0.5, 0.5, 0.5 ] + }, + "thirdperson_righthand": { + "rotation": [ 75, 45, 0 ], + "translation": [ 0, 2.5, 0], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "firstperson_righthand": { + "rotation": [ 0, 45, 0 ], + "translation": [ 0, 0, 0 ], + "scale": [ 0.40, 0.40, 0.40 ] + }, + "firstperson_lefthand": { + "rotation": [ 0, 225, 0 ], + "translation": [ 0, 0, 0 ], + "scale": [ 0.40, 0.40, 0.40 ] + } + } +} \ No newline at end of file