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 34baddb11..c4ad1d90d 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -97,8 +97,14 @@ import vazkii.botania.common.block.subtile.generating.SubTileNightshade; import vazkii.botania.common.block.subtile.generating.SubTileRafflowsia; import vazkii.botania.common.block.subtile.generating.SubTileSpectrolus; import vazkii.botania.common.block.subtile.generating.SubTileThermalily; +import vazkii.botania.common.block.tile.TileAvatar; +import vazkii.botania.common.block.tile.TileBrewery; +import vazkii.botania.common.block.tile.TileGaiaHead; +import vazkii.botania.common.block.tile.TileTeruTeruBozu; import vazkii.botania.common.block.tile.corporea.TileCorporeaCrystalCube; import vazkii.botania.common.block.tile.corporea.TileCorporeaIndex; +import vazkii.botania.common.block.tile.mana.TileBellows; +import vazkii.botania.common.block.tile.mana.TilePump; import vazkii.botania.common.item.ItemManaGun; import vazkii.botania.common.item.ItemSpawnerMover; import vazkii.botania.common.item.brew.ItemBrewBase; @@ -583,9 +589,28 @@ public final class ModelHandler { // Only for models that absolutely can't be converted to JSON. Use VERY sparingly private static void registerTESRItems() { registerItemModel(ModBlocks.corporeaCrystalCube); - registerItemModel(ModBlocks.corporeaIndex); ForgeHooksClient.registerTESRItemStack(Item.getItemFromBlock(ModBlocks.corporeaCrystalCube), 0, TileCorporeaCrystalCube.class); + + registerItemModel(ModBlocks.corporeaIndex); ForgeHooksClient.registerTESRItemStack(Item.getItemFromBlock(ModBlocks.corporeaIndex), 0, TileCorporeaIndex.class); + + registerItemModel(ModBlocks.avatar); + ForgeHooksClient.registerTESRItemStack(Item.getItemFromBlock(ModBlocks.avatar), 0, TileAvatar.class); + + registerItemModel(ModBlocks.teruTeruBozu); + ForgeHooksClient.registerTESRItemStack(Item.getItemFromBlock(ModBlocks.teruTeruBozu), 0, TileTeruTeruBozu.class); + + registerItemModel(ModBlocks.brewery); + ForgeHooksClient.registerTESRItemStack(Item.getItemFromBlock(ModBlocks.brewery), 0, TileBrewery.class); + + registerItemModel(ModBlocks.gaiaHead); + ForgeHooksClient.registerTESRItemStack(Item.getItemFromBlock(ModBlocks.gaiaHead), 0, TileGaiaHead.class); + + registerItemModel(ModBlocks.bellows); + ForgeHooksClient.registerTESRItemStack(Item.getItemFromBlock(ModBlocks.bellows), 0, TileBellows.class); + + registerItemModel(ModBlocks.pump); + ForgeHooksClient.registerTESRItemStack(Item.getItemFromBlock(ModBlocks.pump), 0, TilePump.class); } private static void registerManaResources() { diff --git a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java index 43691fafb..9f0142f6a 100644 --- a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java @@ -224,65 +224,6 @@ public class ClientProxy extends CommonProxy { } private void initRenderers() { -// LibRenderIDs.idAltar = RenderingRegistry.getNextAvailableRenderId(); -// LibRenderIDs.idSpecialFlower = RenderingRegistry.getNextAvailableRenderId(); -// LibRenderIDs.idSpreader = RenderingRegistry.getNextAvailableRenderId(); -// LibRenderIDs.idPool = RenderingRegistry.getNextAvailableRenderId(); -// LibRenderIDs.idPylon = RenderingRegistry.getNextAvailableRenderId(); -// LibRenderIDs.idMiniIsland = RenderingRegistry.getNextAvailableRenderId(); -// LibRenderIDs.idTinyPotato = RenderingRegistry.getNextAvailableRenderId(); -// LibRenderIDs.idSpawnerClaw = RenderingRegistry.getNextAvailableRenderId(); -// LibRenderIDs.idBrewery = RenderingRegistry.getNextAvailableRenderId(); -// LibRenderIDs.idCorporeaIndex = RenderingRegistry.getNextAvailableRenderId(); -// LibRenderIDs.idPump = RenderingRegistry.getNextAvailableRenderId(); -// LibRenderIDs.idDoubleFlower = RenderingRegistry.getNextAvailableRenderId(); -// LibRenderIDs.idCorporeaCrystalCybe = RenderingRegistry.getNextAvailableRenderId(); -// LibRenderIDs.idIncensePlate = RenderingRegistry.getNextAvailableRenderId(); -// LibRenderIDs.idHourglass = RenderingRegistry.getNextAvailableRenderId(); -// LibRenderIDs.idCocoon = RenderingRegistry.getNextAvailableRenderId(); -// LibRenderIDs.idLightRelay = RenderingRegistry.getNextAvailableRenderId(); -// LibRenderIDs.idBellows = RenderingRegistry.getNextAvailableRenderId(); -// LibRenderIDs.idTeruTeruBozu = RenderingRegistry.getNextAvailableRenderId(); -// LibRenderIDs.idAvatar = RenderingRegistry.getNextAvailableRenderId(); -// -// RenderSpecialFlower specialFlowerRender = new RenderSpecialFlower(LibRenderIDs.idSpecialFlower); -// RenderingRegistry.registerBlockHandler(new RenderAltar()); -// RenderingRegistry.registerBlockHandler(specialFlowerRender); -// RenderingRegistry.registerBlockHandler(new RenderSpreader()); -// RenderingRegistry.registerBlockHandler(new RenderPool()); -// RenderingRegistry.registerBlockHandler(new RenderPylon()); -// RenderingRegistry.registerBlockHandler(new RenderFloatingFlower()); -// RenderingRegistry.registerBlockHandler(new RenderTinyPotato()); -// RenderingRegistry.registerBlockHandler(new RenderSpawnerClaw()); -// RenderingRegistry.registerBlockHandler(new RenderBrewery()); -// RenderingRegistry.registerBlockHandler(new RenderCorporeaIndex()); -// RenderingRegistry.registerBlockHandler(new RenderPump()); -// RenderingRegistry.registerBlockHandler(new RenderDoubleFlower()); -// RenderingRegistry.registerBlockHandler(new RenderCorporeaCrystalCube()); -// RenderingRegistry.registerBlockHandler(new RenderIncensePlate()); -// RenderingRegistry.registerBlockHandler(new RenderHourglass()); -// RenderingRegistry.registerBlockHandler(new RenderCocoon()); -// RenderingRegistry.registerBlockHandler(new RenderBellows()); -// RenderingRegistry.registerBlockHandler(new RenderTeruTeruBozu()); -// RenderingRegistry.registerBlockHandler(new RenderAvatar()); - -// IMultiblockRenderHook.renderHooks.put(ModBlocks.flower, specialFlowerRender); -// IMultiblockRenderHook.renderHooks.put(ModBlocks.shinyFlower, specialFlowerRender); - -// RenderTransparentItem renderTransparentItem = new RenderTransparentItem(); -// RenderFloatingFlowerItem renderFloatingFlower = new RenderFloatingFlowerItem(); -// RenderBow renderBow = new RenderBow(); -// -// MinecraftForgeClient.registerItemRenderer(ModItems.lens, new RenderLens()); -// if(ConfigHandler.lexicon3dModel) -// MinecraftForgeClient.registerItemRenderer(ModItems.lexicon, new RenderLexicon()); -// MinecraftForgeClient.registerItemRenderer(ModItems.glassPick, renderTransparentItem); -// MinecraftForgeClient.registerItemRenderer(ModItems.spark, renderTransparentItem); -// MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(ModBlocks.floatingFlower), renderFloatingFlower); -// MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(ModBlocks.floatingSpecialFlower), renderFloatingFlower); -// MinecraftForgeClient.registerItemRenderer(ModItems.livingwoodBow, renderBow); -// MinecraftForgeClient.registerItemRenderer(ModItems.crystalBow, renderBow); - RenderTileFloatingFlower renderTileFloatingFlower = new RenderTileFloatingFlower(); ClientRegistry.bindTileEntitySpecialRenderer(TileAltar.class, new RenderTileAltar()); ClientRegistry.bindTileEntitySpecialRenderer(TileSpreader.class, new RenderTileSpreader()); diff --git a/src/main/java/vazkii/botania/client/model/ModelBrewery.java b/src/main/java/vazkii/botania/client/model/ModelBrewery.java index 107b67c62..fadb4b32d 100644 --- a/src/main/java/vazkii/botania/client/model/ModelBrewery.java +++ b/src/main/java/vazkii/botania/client/model/ModelBrewery.java @@ -51,13 +51,14 @@ public class ModelBrewery extends ModelBase { float f = 1F / 16F; float offset = (float) Math.sin(time / 40) * 0.1F + 0.05F; - int plates = render.brewery.getSizeInventory() - 1; + boolean hasTile = render.brewery != null; + int plates = hasTile ? render.brewery.getSizeInventory() - 1 : 7; float deg = (float) time / 16F; float polerot = -deg * 25F; GlStateManager.translate(0F, offset, 0F); GlStateManager.rotate(polerot, 0F, 1F, 0F); - if(render.brewery.getStackInSlot(0) != null) { + if(hasTile && render.brewery.getStackInSlot(0) != null) { GlStateManager.rotate(180F, 1F, 0F, 0F); GlStateManager.translate(0, -0.45, 0); //GlStateManager.translate(-1F / 8F, -0.5F, 1F / 128F); @@ -80,7 +81,7 @@ public class ModelBrewery extends ModelBase { offset1 = 0F; GlStateManager.translate(0F, offset1, 0F); - if(render.brewery.getStackInSlot(i + 1) != null) { + if(hasTile && render.brewery.getStackInSlot(i + 1) != null) { float rot = Plate.rotateAngleY * 180F / (float) Math.PI; float transX = 0.3125F; float transY = 1.06F; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileAvatar.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileAvatar.java index 863814a29..03a2245ef 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileAvatar.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileAvatar.java @@ -52,13 +52,21 @@ public class RenderTileAvatar extends TileEntitySpecialRenderer { GlStateManager.translate(d0, d1, d2); Minecraft.getMinecraft().renderEngine.bindTexture(texture); - int meta = avatar.getWorld() != null ? avatar.getBlockMetadata() : 0; + int meta = avatar != null && avatar.getWorld() != null ? avatar.getBlockMetadata() : 0; GlStateManager.translate(0.5F, 1.6F, 0.5F); GlStateManager.scale(1F, -1F, -1F); GlStateManager.rotate(ROTATIONS[Math.max(Math.min(ROTATIONS.length - 1, meta - 2), 0)], 0F, 1F, 0F); model.render(); + if (avatar == null) { + GlStateManager.color(1F, 1F, 1F); + GlStateManager.scale(1F, -1F, -1F); + GlStateManager.enableRescaleNormal(); + GlStateManager.popMatrix(); + return; + } + ItemStack stack = avatar.getStackInSlot(0); if(stack != null) { GlStateManager.pushMatrix(); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileBellows.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileBellows.java index c031ad1d7..27e8ece74 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileBellows.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileBellows.java @@ -42,12 +42,12 @@ public class RenderTileBellows extends TileEntitySpecialRenderer { GlStateManager.translate(d0, d1, d2); Minecraft.getMinecraft().renderEngine.bindTexture(texture); - int meta = bellows.getWorld() != null ? bellows.getBlockMetadata() : 0; + int meta = bellows != null && bellows.getWorld() != null ? bellows.getBlockMetadata() : 0; GlStateManager.translate(0.5F, 1.5F, 0.5F); GlStateManager.scale(1F, -1F, -1F); GlStateManager.rotate(ROTATIONS[Math.max(Math.min(ROTATIONS.length, meta - 2), 0)], 0F, 1F, 0F); - model.render(Math.max(0.1F, 1F - (bellows.movePos + bellows.moving * f + 0.1F))); + model.render(Math.max(0.1F, 1F - (bellows == null ? 0 : (bellows.movePos + bellows.moving * f + 0.1F)))); GlStateManager.color(1F, 1F, 1F); GlStateManager.scale(1F, -1F, -1F); GlStateManager.enableRescaleNormal(); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java b/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java index 057b0d03f..4f5bac01e 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java @@ -84,7 +84,7 @@ public class RenderTilePool extends TileEntitySpecialRenderer { } model.render(); - GlStateManager.color(1F, 1F, 1F, a); + GL11.glColor4f(1F, 1F, 1F, a); // Use GL11 manually since we call color4ub above, and GlStateManager doesn't know that, so the color leaks GlStateManager.scale(1F, -1F, -1F); GlStateManager.enableRescaleNormal(); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTilePump.java b/src/main/java/vazkii/botania/client/render/tile/RenderTilePump.java index 890176f08..fa36755ed 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTilePump.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTilePump.java @@ -42,12 +42,12 @@ public class RenderTilePump extends TileEntitySpecialRenderer { GlStateManager.translate(d0, d1, d2); Minecraft.getMinecraft().renderEngine.bindTexture(texture); - int meta = pump.getWorld() != null ? pump.getBlockMetadata() : 0; + int meta = pump != null && pump.getWorld() != null ? pump.getBlockMetadata() : 0; GlStateManager.translate(0.5F, 0.5F, 0.5F); GlStateManager.scale(1F, -1F, -1F); GlStateManager.rotate(ROTATIONS[Math.max(Math.min(ROTATIONS.length - 1, meta - 2), 0)], 0F, 1F, 0F); - model.render(Math.max(0F, Math.min(8F, pump.innerRingPos + pump.moving * f))); + model.render(Math.max(0F, Math.min(8F, pump == null ? 8 : pump.innerRingPos + pump.moving * f))); GlStateManager.color(1F, 1F, 1F); GlStateManager.scale(1F, -1F, -1F); GlStateManager.enableRescaleNormal(); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileSkullOverride.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileSkullOverride.java index 78690645c..d3c0e74e5 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileSkullOverride.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileSkullOverride.java @@ -39,14 +39,15 @@ public class RenderTileSkullOverride extends TileEntitySkullRenderer { @Override public void renderTileEntityAt(TileEntitySkull p_147500_1_, double p_147500_2_, double p_147500_4_, double p_147500_6_, float p_147500_8_, int digProgress) { - if (p_147500_1_ instanceof TileEntitySkull) { - TileEntitySkull skull = ((TileEntitySkull) p_147500_1_); - render(skull, (float) p_147500_2_, (float) p_147500_4_, (float) p_147500_6_, EnumFacing.getFront(p_147500_1_.getBlockMetadata() & 7) /*todo 1.8*/, skull.getSkullRotation() * 360 / 16.0F, skull.getSkullType(), skull.getPlayerProfile(), digProgress); + if (p_147500_1_ != null) { + render(p_147500_1_, (float) p_147500_2_, (float) p_147500_4_, (float) p_147500_6_, EnumFacing.getFront(p_147500_1_.getBlockMetadata() & 7) /*todo 1.8*/, p_147500_1_.getSkullRotation() * 360 / 16.0F, p_147500_1_.getSkullType(), p_147500_1_.getPlayerProfile(), digProgress); + } else { + render(null, ((float) p_147500_2_), ((float) p_147500_4_), ((float) p_147500_6_), EnumFacing.NORTH, 0, 3, null, 0); } } public void render(TileEntitySkull skull, float par1, float par2, float par3, EnumFacing par4, float par5, int par6, GameProfile gameProfile, int digProgress) { - boolean gaia = skull instanceof TileGaiaHead; + boolean gaia = skull == null || skull instanceof TileGaiaHead; if(par6 == 3 || gaia) { ResourceLocation resourcelocation = DefaultPlayerSkin.getDefaultSkinLegacy(); Minecraft minecraft = Minecraft.getMinecraft(); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileTeruTeruBozu.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileTeruTeruBozu.java index 52e6f234e..b00be52f2 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileTeruTeruBozu.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileTeruTeruBozu.java @@ -44,7 +44,7 @@ public class RenderTileTeruTeruBozu extends TileEntitySpecialRenderer { Minecraft.getMinecraft().renderEngine.bindTexture(ClientProxy.dootDoot ? textureHalloween : texture); GlStateManager.rotate(180F, 1F, 0F, 0F); double time = Botania.proxy.getWorldElapsedTicks() + f; - boolean hasWorld = tileentity.getWorld() != null; + boolean hasWorld = tileentity != null && tileentity.getWorld() != null; if(hasWorld) time += new Random(tileentity.getPos().hashCode()).nextInt(1000); diff --git a/src/main/resources/assets/botania/models/item/avatar.json b/src/main/resources/assets/botania/models/item/avatar.json new file mode 100644 index 000000000..7960c6d70 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/avatar.json @@ -0,0 +1,3 @@ +{ + "parent": "builtin/entity" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/bellows.json b/src/main/resources/assets/botania/models/item/bellows.json new file mode 100644 index 000000000..7960c6d70 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/bellows.json @@ -0,0 +1,3 @@ +{ + "parent": "builtin/entity" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/brewery.json b/src/main/resources/assets/botania/models/item/brewery.json new file mode 100644 index 000000000..7960c6d70 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/brewery.json @@ -0,0 +1,3 @@ +{ + "parent": "builtin/entity" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/gaiaHead.json b/src/main/resources/assets/botania/models/item/gaiaHead.json new file mode 100644 index 000000000..7960c6d70 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/gaiaHead.json @@ -0,0 +1,3 @@ +{ + "parent": "builtin/entity" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/pump.json b/src/main/resources/assets/botania/models/item/pump.json new file mode 100644 index 000000000..7960c6d70 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/pump.json @@ -0,0 +1,3 @@ +{ + "parent": "builtin/entity" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/teruTeruBozu.json b/src/main/resources/assets/botania/models/item/teruTeruBozu.json new file mode 100644 index 000000000..7960c6d70 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/teruTeruBozu.json @@ -0,0 +1,3 @@ +{ + "parent": "builtin/entity" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/textures/model/spawnerClaw.png b/src/main/resources/assets/botania/textures/model/spawnerClaw.png index 44dd720e5..65a89b42a 100644 Binary files a/src/main/resources/assets/botania/textures/model/spawnerClaw.png and b/src/main/resources/assets/botania/textures/model/spawnerClaw.png differ