From 324369c7a6aaa8f8a61440f763350a7456fe8e01 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 7 Mar 2019 01:09:42 -0600 Subject: [PATCH] 'fix' teisrs --- .../client/render/entity/LayerGaiaHead.java | 3 +- .../client/render/tile/RenderTileBrewery.java | 12 +++++ .../tile/RenderTileCorporeaCrystalCube.java | 16 ++++++- .../render/tile/RenderTileCorporeaIndex.java | 13 +++++ .../render/tile/RenderTileGaiaHead.java | 48 +++++++++++-------- .../botania/common/block/BlockGaiaHead.java | 23 +-------- .../common/block/BlockGaiaHeadWall.java | 20 ++++++++ .../botania/common/block/ModBlocks.java | 11 +++-- .../corporea/BlockCorporeaCrystalCube.java | 23 --------- .../block/corporea/BlockCorporeaIndex.java | 10 +--- .../block/corporea/BlockCorporeaRetainer.java | 4 -- .../common/block/mana/BlockBrewery.java | 8 ---- .../botania/common/item/ItemGaiaHead.java | 7 --- .../vazkii/botania/common/item/ModItems.java | 3 +- .../botania/common/lib/LibBlockNames.java | 1 + 15 files changed, 103 insertions(+), 99 deletions(-) create mode 100644 src/main/java/vazkii/botania/common/block/BlockGaiaHeadWall.java diff --git a/src/main/java/vazkii/botania/client/render/entity/LayerGaiaHead.java b/src/main/java/vazkii/botania/client/render/entity/LayerGaiaHead.java index 431bf2909..9cae64a23 100644 --- a/src/main/java/vazkii/botania/client/render/entity/LayerGaiaHead.java +++ b/src/main/java/vazkii/botania/client/render/entity/LayerGaiaHead.java @@ -11,6 +11,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import vazkii.botania.client.core.helper.ShaderHelper; import vazkii.botania.client.render.tile.RenderTileGaiaHead; +import vazkii.botania.common.block.BlockGaiaHead; import vazkii.botania.common.block.tile.TileGaiaHead; import vazkii.botania.common.item.ModItems; @@ -88,7 +89,7 @@ public class LayerGaiaHead implements LayerRenderer { // Botania - use gaia TESR ShaderHelper.useShader(ShaderHelper.doppleganger, RenderDoppleganger.defaultCallback); ((RenderTileGaiaHead) (TileEntityRenderer) TileEntityRendererDispatcher.instance.getRenderer(TileGaiaHead.class)) - .renderSkull(-0.5F, 0.0F, -0.5F, EnumFacing.UP, 180.0F, 0, null, -1, limbSwing); + .render(-0.5F, 0.0F, -0.5F, EnumFacing.UP, 180.0F, BlockGaiaHead.GAIA_TYPE, null, -1, limbSwing); ShaderHelper.releaseShader(); GlStateManager.popMatrix(); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileBrewery.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileBrewery.java index 38ffe632b..40b3bb6b1 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileBrewery.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileBrewery.java @@ -14,17 +14,29 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.model.ItemCameraTransforms; import net.minecraft.client.renderer.texture.TextureMap; +import net.minecraft.client.renderer.tileentity.TileEntityItemStackRenderer; import net.minecraft.client.renderer.tileentity.TileEntityRenderer; +import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.lib.LibResources; import vazkii.botania.client.model.ModelBrewery; +import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.TileBrewery; import javax.annotation.Nullable; public class RenderTileBrewery extends TileEntityRenderer { + public static class TEISR extends TileEntityItemStackRenderer { + @Override + public void renderByItem(ItemStack stack) { + if(stack.getItem() == ModBlocks.brewery.asItem()) { + TileEntityRendererDispatcher.instance.getRenderer(TileBrewery.class) + .render(null, 0, 0, 0, 0, -1); + } + } + } private static final ResourceLocation texture = new ResourceLocation(LibResources.MODEL_BREWERY); final ModelBrewery model = new ModelBrewery(); 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 b6535ef74..15362d587 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaCrystalCube.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaCrystalCube.java @@ -20,7 +20,9 @@ import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.block.model.IBakedModel; import net.minecraft.client.renderer.entity.RenderEntityItem; import net.minecraft.client.renderer.texture.TextureMap; +import net.minecraft.client.renderer.tileentity.TileEntityItemStackRenderer; import net.minecraft.client.renderer.tileentity.TileEntityRenderer; +import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.entity.item.EntityItem; import net.minecraft.init.Blocks; @@ -38,17 +40,29 @@ import net.minecraftforge.common.property.Properties; import org.apache.commons.lang3.tuple.Pair; import org.lwjgl.opengl.GL11; import vazkii.botania.client.core.handler.ClientTickHandler; +import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.corporea.TileCorporeaCrystalCube; import javax.annotation.Nonnull; +import javax.annotation.Nullable; +// TODO 1.13 move this back to a normal tesr. Byebye animation API public class RenderTileCorporeaCrystalCube extends TileEntityRenderer { + public static class TEISR extends TileEntityItemStackRenderer { + @Override + public void renderByItem(ItemStack stack) { + if(stack.getItem() == ModBlocks.corporeaCrystalCube.asItem()) { + TileEntityRendererDispatcher.instance.getRenderer(TileCorporeaCrystalCube.class) + .render(null, 0, 0, 0, 0, -1); + } + } + } private EntityItem entity = null; private RenderEntityItem itemRenderer = null; @Override - public void render(@Nonnull TileCorporeaCrystalCube cube, double d0, double d1, double d2, float f, int digProgress) { + public void render(@Nullable TileCorporeaCrystalCube cube, double d0, double d1, double d2, float f, int digProgress) { ItemStack stack = ItemStack.EMPTY; if (cube != null) { if(entity == null) diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaIndex.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaIndex.java index 0e6c907eb..c2ca2a3b4 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaIndex.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaIndex.java @@ -13,15 +13,28 @@ package vazkii.botania.client.render.tile; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.entity.model.ModelEnderCrystal; +import net.minecraft.client.renderer.tileentity.TileEntityItemStackRenderer; import net.minecraft.client.renderer.tileentity.TileEntityRenderer; +import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; +import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.lib.LibResources; +import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.corporea.TileCorporeaIndex; import javax.annotation.Nullable; public class RenderTileCorporeaIndex extends TileEntityRenderer { + public static class TEISR extends TileEntityItemStackRenderer { + @Override + public void renderByItem(ItemStack stack) { + if(stack.getItem() == ModBlocks.corporeaIndex.asItem()) { + TileEntityRendererDispatcher.instance.getRenderer(TileCorporeaIndex.class) + .render(null, 0, 0, 0, 0, -1); + } + } + } private static final ResourceLocation texture = new ResourceLocation(LibResources.MODEL_CORPOREA_INDEX); private final ModelEnderCrystal crystal = new ModelEnderCrystal(0F, false); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileGaiaHead.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileGaiaHead.java index dd0a38a2b..48541a477 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileGaiaHead.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileGaiaHead.java @@ -11,7 +11,11 @@ package vazkii.botania.client.render.tile; import com.mojang.authlib.GameProfile; +import net.minecraft.block.BlockAbstractSkull; +import net.minecraft.block.BlockSkull; import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.tileentity.TileEntityItemStackRenderer; +import net.minecraft.client.renderer.tileentity.TileEntityRenderer; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.client.renderer.tileentity.TileEntitySkullRenderer; import net.minecraft.entity.Entity; @@ -22,26 +26,28 @@ import net.minecraft.entity.monster.EntitySkeleton; import net.minecraft.entity.monster.EntityWitherSkeleton; import net.minecraft.entity.monster.EntityZombie; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntitySkull; import net.minecraft.util.EnumFacing; import vazkii.botania.client.core.helper.ShaderHelper; import vazkii.botania.client.render.entity.RenderDoppleganger; +import vazkii.botania.common.block.BlockGaiaHead; +import vazkii.botania.common.block.tile.TileGaiaHead; +import vazkii.botania.common.item.ModItems; import javax.annotation.Nonnull; import javax.annotation.Nullable; public class RenderTileGaiaHead extends TileEntitySkullRenderer { - @Override - public void render(TileEntitySkull skull, double x, double y, double z, float partialTicks, int digProgress) { - ShaderHelper.useShader(ShaderHelper.doppleganger, RenderDoppleganger.defaultCallback); - - // Null-safe copy of super - renderSkull((float)x, (float)y, (float)z, - skull == null ? EnumFacing.NORTH : EnumFacing.byIndex(skull.getBlockMetadata() & 7), - skull == null ? 0 : skull.getSkullRotation() * 360 / 16.0F, - 3, null, digProgress, partialTicks); - - ShaderHelper.releaseShader(); + public static class TEISR extends TileEntityItemStackRenderer { + @Override + public void renderByItem(ItemStack stack) { + if(stack.getItem() == ModItems.gaiaHead) { + TileEntityRenderer ter = TileEntityRendererDispatcher.instance.getRenderer(TileGaiaHead.class); + ((RenderTileGaiaHead) ter).render(0.0F, 0.0F, 0.0F, null, 180.0F, BlockGaiaHead.GAIA_TYPE, null, -1, 0.0F); + } + } } @Override @@ -51,28 +57,30 @@ public class RenderTileGaiaHead extends TileEntitySkullRenderer { } @Override - public void renderSkull(float x, float y, float z, @Nonnull EnumFacing facing, float rotation, int skullType, @Nullable GameProfile profile, int destroyStage, float animateTicks) { + public void render(float x, float y, float z, @Nullable EnumFacing facing, float rotationIn, BlockSkull.ISkullType type, @Nullable GameProfile profile, int destroyStage, float animationProgress) { Minecraft mc = Minecraft.getInstance(); Entity view = mc.getRenderViewEntity(); profile = null; + type = BlockSkull.Types.PLAYER; if(view instanceof EntityPlayer) { - skullType = 3; profile = ((EntityPlayer) mc.getRenderViewEntity()).getGameProfile(); } else if (view instanceof EntitySkeleton) - skullType = 0; + type = BlockSkull.Types.SKELETON; else if(view instanceof EntityWitherSkeleton) - skullType = 1; + type = BlockSkull.Types.WITHER_SKELETON; else if(view instanceof EntityWither) - skullType = 1; + type = BlockSkull.Types.WITHER_SKELETON; else if(view instanceof EntityZombie) - skullType = 2; + type = BlockSkull.Types.ZOMBIE; else if(view instanceof EntityCreeper) - skullType = 4; + type = BlockSkull.Types.CREEPER; else if(view instanceof EntityDragon) - skullType = 5; + type = BlockSkull.Types.DRAGON; - super.renderSkull(x, y, z, facing, rotation, skullType, profile, destroyStage, animateTicks); + ShaderHelper.useShader(ShaderHelper.doppleganger, RenderDoppleganger.defaultCallback); + super.render(x, y, z, facing, rotationIn, type, profile, destroyStage, animationProgress); + ShaderHelper.releaseShader(); } } \ No newline at end of file diff --git a/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java b/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java index dddb41eae..1492cdc69 100644 --- a/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java +++ b/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java @@ -10,35 +10,14 @@ */ package vazkii.botania.common.block; -import net.minecraft.block.BlockAbstractSkull; import net.minecraft.block.BlockSkull; -import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.tileentity.TileEntitySkull; -import net.minecraft.util.NonNullList; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.IBlockReader; -import net.minecraft.world.World; -import net.minecraftforge.client.model.ModelLoader; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -import vazkii.botania.client.render.IModelRegister; import vazkii.botania.common.block.tile.TileGaiaHead; -import vazkii.botania.common.item.ModItems; -import vazkii.botania.common.lib.LibBlockNames; -import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; -import java.util.ArrayList; -import java.util.List; -import java.util.Random; -public class BlockGaiaHead extends BlockAbstractSkull { +public class BlockGaiaHead extends BlockSkull { public static final BlockSkull.ISkullType GAIA_TYPE = new BlockSkull.ISkullType() {}; public BlockGaiaHead(Properties builder) { diff --git a/src/main/java/vazkii/botania/common/block/BlockGaiaHeadWall.java b/src/main/java/vazkii/botania/common/block/BlockGaiaHeadWall.java new file mode 100644 index 000000000..96c3b4d3f --- /dev/null +++ b/src/main/java/vazkii/botania/common/block/BlockGaiaHeadWall.java @@ -0,0 +1,20 @@ +package vazkii.botania.common.block; + +import net.minecraft.block.BlockSkullWall; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.IBlockReader; +import vazkii.botania.common.block.tile.TileGaiaHead; + +import javax.annotation.Nonnull; + +public class BlockGaiaHeadWall extends BlockSkullWall { + public BlockGaiaHeadWall(Properties builder) { + super(BlockGaiaHead.GAIA_TYPE, builder); + } + + @Nonnull + @Override + public TileEntity createNewTileEntity(IBlockReader world) { + return new TileGaiaHead(); + } +} diff --git a/src/main/java/vazkii/botania/common/block/ModBlocks.java b/src/main/java/vazkii/botania/common/block/ModBlocks.java index 9b0726245..2cd3a84b7 100644 --- a/src/main/java/vazkii/botania/common/block/ModBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModBlocks.java @@ -32,6 +32,9 @@ import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.recipe.RecipeManaInfusion; import vazkii.botania.api.state.enums.LuminizerVariant; import vazkii.botania.api.subtile.SubTileEntity; +import vazkii.botania.client.render.tile.RenderTileBrewery; +import vazkii.botania.client.render.tile.RenderTileCorporeaCrystalCube; +import vazkii.botania.client.render.tile.RenderTileCorporeaIndex; import vazkii.botania.common.block.corporea.BlockCorporeaCrystalCube; import vazkii.botania.common.block.corporea.BlockCorporeaFunnel; import vazkii.botania.common.block.corporea.BlockCorporeaIndex; @@ -352,6 +355,7 @@ public final class ModBlocks { @ObjectHolder(LibBlockNames.CELL_BLOCK) public static Block cellBlock; @ObjectHolder(LibBlockNames.RED_STRING_INTERCEPTOR) public static Block redStringInterceptor; @ObjectHolder(LibBlockNames.GAIA_HEAD) public static Block gaiaHead; + @ObjectHolder(LibBlockNames.GAIA_WALL_HEAD) public static Block gaiaHeadWall; @ObjectHolder(LibBlockNames.CORPOREA_RETAINER) public static Block corporeaRetainer; @ObjectHolder(LibBlockNames.TERU_TERU_BOZU) public static Block teruTeruBozu; @ObjectHolder(LibBlockNames.SHIMMERROCK) public static Block shimmerrock; @@ -558,6 +562,7 @@ public final class ModBlocks { register(r, new BlockBellows(Block.Properties.create(Material.WOOD).hardnessAndResistance(2).sound(SoundType.WOOD)), LibBlockNames.BELLOWS); register(r, new BlockBifrostPerm(Block.Properties.create(Material.GLASS).hardnessAndResistance(0.3F).lightValue(15).sound(SoundType.GLASS)), LibBlockNames.BIFROST_PERM); register(r, new BlockCell(Block.Properties.create(Material.GOURD).sound(SoundType.CLOTH)), LibBlockNames.CELL_BLOCK); + register(r, new BlockGaiaHeadWall(Block.Properties.create(Material.CIRCUITS).hardnessAndResistance(1)), LibBlockNames.GAIA_WALL_HEAD); register(r, new BlockGaiaHead(Block.Properties.create(Material.CIRCUITS).hardnessAndResistance(1)), LibBlockNames.GAIA_HEAD); register(r, new BlockCorporeaRetainer(Block.Properties.create(Material.IRON).hardnessAndResistance(5.5F).sound(SoundType.METAL)), LibBlockNames.CORPOREA_RETAINER); register(r, new BlockTeruTeruBozu(Block.Properties.create(Material.CLOTH)), LibBlockNames.TERU_TERU_BOZU); @@ -697,7 +702,7 @@ public final class ModBlocks { r.register(new ItemBlockMod(starfield, props).setRegistryName(starfield.getRegistryName())); r.register(new ItemBlockMod(rfGenerator, props).setRegistryName(rfGenerator.getRegistryName())); r.register(new ItemBlockElven(elfGlass, props).setRegistryName(elfGlass.getRegistryName())); - r.register(new ItemBlockMod(brewery, props).setRegistryName(brewery.getRegistryName())); + r.register(new ItemBlockMod(brewery, ModItems.defaultBuilder().setTEISR(() -> RenderTileBrewery.TEISR::new)).setRegistryName(brewery.getRegistryName())); r.register(new ItemBlockMod(manaGlass, props).setRegistryName(manaGlass.getRegistryName())); r.register(new ItemBlockMod(terraPlate, props).setRegistryName(terraPlate.getRegistryName())); r.register(new ItemBlockMod(redStringContainer, props).setRegistryName(redStringContainer.getRegistryName())); @@ -724,7 +729,7 @@ public final class ModBlocks { r.register(new ItemBlockMod(petalBlockGreen, props).setRegistryName(petalBlockGreen.getRegistryName())); r.register(new ItemBlockMod(petalBlockRed, props).setRegistryName(petalBlockRed.getRegistryName())); r.register(new ItemBlockMod(petalBlockBlack, props).setRegistryName(petalBlockBlack.getRegistryName())); - r.register(new ItemBlockMod(corporeaIndex, props).setRegistryName(corporeaIndex.getRegistryName())); + r.register(new ItemBlockMod(corporeaIndex, ModItems.defaultBuilder().setTEISR(() -> RenderTileCorporeaIndex.TEISR::new)).setRegistryName(corporeaIndex.getRegistryName())); r.register(new ItemBlockMod(corporeaFunnel, props).setRegistryName(corporeaFunnel.getRegistryName())); r.register(new ItemBlockMod(mushroomWhite, props).setRegistryName(mushroomWhite.getRegistryName())); r.register(new ItemBlockMod(mushroomOrange, props).setRegistryName(mushroomOrange.getRegistryName())); @@ -761,7 +766,7 @@ public final class ModBlocks { r.register(new ItemBlockMod(doubleFlowerBlack, props).setRegistryName(doubleFlowerBlack.getRegistryName())); r.register(new ItemBlockBlaze(blazeBlock).setRegistryName(blazeBlock.getRegistryName())); r.register(new ItemBlockMod(corporeaInterceptor, props).setRegistryName(corporeaInterceptor.getRegistryName())); - r.register(new ItemBlockMod(corporeaCrystalCube, props).setRegistryName(corporeaCrystalCube.getRegistryName())); + r.register(new ItemBlockMod(corporeaCrystalCube, ModItems.defaultBuilder().setTEISR(() -> RenderTileCorporeaCrystalCube.TEISR::new)).setRegistryName(corporeaCrystalCube.getRegistryName())); r.register(new ItemBlockMod(incensePlate, props).setRegistryName(incensePlate.getRegistryName())); r.register(new ItemBlockMod(hourglass, props).setRegistryName(hourglass.getRegistryName())); r.register(new ItemBlockMod(ghostRail, props).setRegistryName(ghostRail.getRegistryName())); diff --git a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaCrystalCube.java b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaCrystalCube.java index b394465b7..03f06699d 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaCrystalCube.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaCrystalCube.java @@ -14,9 +14,7 @@ import net.minecraft.block.Block; import javax.annotation.Nonnull; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; -import net.minecraft.block.properties.IProperty; import net.minecraft.block.state.BlockFaceShape; -import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -30,7 +28,6 @@ import net.minecraft.world.IBlockReader; import net.minecraft.util.text.TextComponentTranslation; import net.minecraft.world.World; import net.minecraftforge.client.ForgeHooksClient; -import net.minecraftforge.common.property.ExtendedBlockState; import net.minecraftforge.common.property.IUnlistedProperty; import net.minecraftforge.common.property.Properties; import net.minecraftforge.api.distmarker.Dist; @@ -52,19 +49,6 @@ public class BlockCorporeaCrystalCube extends BlockCorporeaBase implements ILexi public BlockCorporeaCrystalCube(Block.Properties builder) { super(builder); - setDefaultState(stateContainer.getBaseState().with(Properties.StaticProperty, true)); - } - - @Nonnull - @Override - public void createBlockState() { - return new ExtendedBlockState(this, new IProperty[] { Properties.StaticProperty }, new IUnlistedProperty[] { Properties.AnimationProperty } ); - } - - @Nonnull - @Override - public IBlockState getActualState(@Nonnull IBlockState state, IBlockReader world, BlockPos pos) { - return state.with(Properties.StaticProperty, true); } @Override @@ -141,11 +125,4 @@ public class BlockCorporeaCrystalCube extends BlockCorporeaBase implements ILexi public BlockFaceShape getBlockFaceShape(IBlockReader world, IBlockState state, BlockPos pos, EnumFacing side) { return BlockFaceShape.UNDEFINED; } - - @OnlyIn(Dist.CLIENT) - @Override - public void registerModels() { - ModelHandler.registerInventoryVariant(this); - ForgeHooksClient.registerTESRItemStack(Item.getItemFromBlock(this), 0, TileCorporeaCrystalCube.class); - } } diff --git a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaIndex.java b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaIndex.java index bbe518496..f69e11198 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaIndex.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaIndex.java @@ -22,7 +22,6 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.particles.BlockParticleData; import net.minecraft.util.EnumBlockRenderType; -import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; import net.minecraft.world.IBlockReader; @@ -98,7 +97,7 @@ public class BlockCorporeaIndex extends BlockCorporeaBase implements ILexiconabl double d0 = pos.getX() + (j + 0.5D) / i; double d1 = pos.getY() + (k + 0.5D) / i; double d2 = pos.getZ() + (l + 0.5D) / i; - effectRenderer.addEffect(factory.makeParticle(new BlockParticleData(Particles.BLOCK, ModBlocks.elementiumBlock), world, d0, d1, d2, d0 - pos.getX() - 0.5D, d1 - pos.getY() - 0.5D, d2 - pos.getZ() - 0.5D)); + effectRenderer.addEffect(factory.makeParticle(new BlockParticleData(Particles.BLOCK, ModBlocks.elementiumBlock.getDefaultState()), world, d0, d1, d2, d0 - pos.getX() - 0.5D, d1 - pos.getY() - 0.5D, d2 - pos.getZ() - 0.5D)); } } } @@ -108,11 +107,4 @@ public class BlockCorporeaIndex extends BlockCorporeaBase implements ILexiconabl } } - @OnlyIn(Dist.CLIENT) - @Override - public void registerModels() { - ModelHandler.registerCustomItemblock(this, "corporea_index"); - ForgeHooksClient.registerTESRItemStack(Item.getItemFromBlock(this), 0, TileCorporeaIndex.class); - } - } diff --git a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaRetainer.java b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaRetainer.java index 532e5b064..2b051a780 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaRetainer.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaRetainer.java @@ -11,9 +11,6 @@ package vazkii.botania.common.block.corporea; import net.minecraft.block.Block; -import net.minecraft.block.SoundType; -import net.minecraft.block.material.Material; -import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -28,7 +25,6 @@ import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.block.tile.corporea.TileCorporeaRetainer; import vazkii.botania.common.lexicon.LexiconData; -import vazkii.botania.common.lib.LibBlockNames; import javax.annotation.Nonnull; diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java b/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java index 33f45a35d..547476a4c 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java @@ -137,14 +137,6 @@ public class BlockBrewery extends BlockMod implements ILexiconable, IWandHUD { ((TileBrewery) world.getTileEntity(pos)).renderHUD(mc); } - @OnlyIn(Dist.CLIENT) - @Override - public void registerModels() { - ModelLoader.setCustomStateMapper(this, new StateMap.Builder().ignore(BotaniaStateProps.POWERED).build()); - ForgeHooksClient.registerTESRItemStack(Item.getItemFromBlock(this), 0, TileBrewery.class); - ModelHandler.registerCustomItemblock(this, "brewery"); - } - @Nonnull @Override public BlockFaceShape getBlockFaceShape(IBlockReader world, IBlockState state, BlockPos pos, EnumFacing side) { diff --git a/src/main/java/vazkii/botania/common/item/ItemGaiaHead.java b/src/main/java/vazkii/botania/common/item/ItemGaiaHead.java index 2db916dbc..882bc0eee 100644 --- a/src/main/java/vazkii/botania/common/item/ItemGaiaHead.java +++ b/src/main/java/vazkii/botania/common/item/ItemGaiaHead.java @@ -56,11 +56,4 @@ public class ItemGaiaHead extends ItemWallOrFloor { public ModelBiped getArmorModel(EntityLivingBase entityLiving, ItemStack itemStack, EntityEquipmentSlot armorSlot, ModelBiped _default) { return (ModelBiped) Botania.proxy.getEmptyModelBiped(); } - - @OnlyIn(Dist.CLIENT) - @Override - public void registerModels() { - super.registerModels(); - ForgeHooksClient.registerTESRItemStack(this, 0, TileGaiaHead.class); - } } diff --git a/src/main/java/vazkii/botania/common/item/ModItems.java b/src/main/java/vazkii/botania/common/item/ModItems.java index 01145969e..c12128fd3 100644 --- a/src/main/java/vazkii/botania/common/item/ModItems.java +++ b/src/main/java/vazkii/botania/common/item/ModItems.java @@ -26,6 +26,7 @@ import vazkii.botania.api.item.IFloatingFlower; import vazkii.botania.api.mana.spark.SparkUpgradeType; import vazkii.botania.api.item.IAncientWillContainer; import vazkii.botania.api.state.enums.CratePattern; +import vazkii.botania.client.render.tile.RenderTileGaiaHead; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.core.handler.ModSounds; @@ -366,7 +367,7 @@ public final class ModItems { public static final Item manaweaveLegs = new ItemManaweaveArmor(EntityEquipmentSlot.LEGS, unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.MANAWEAVE_LEGS); public static final Item manaweaveBoots = new ItemManaweaveArmor(EntityEquipmentSlot.FEET, unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.MANAWEAVE_BOOTS); public static final Item autocraftingHalo = new ItemAutocraftingHalo(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.AUTOCRAFTING_HALO); - public static final Item gaiaHead = new ItemGaiaHead(); + public static final Item gaiaHead = new ItemGaiaHead(ModBlocks.gaiaHead, ModBlocks.gaiaHeadWall, defaultBuilder().setTEISR(() -> RenderTileGaiaHead.TEISR::new)); public static final Item sextant = new ItemSextant(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.SEXTANT); public static final Item speedUpBelt = new ItemSpeedUpBelt(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.SPEED_UP_BELT); public static final Item baubleBox = new ItemBaubleBox(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.BAUBLE_BOX); diff --git a/src/main/java/vazkii/botania/common/lib/LibBlockNames.java b/src/main/java/vazkii/botania/common/lib/LibBlockNames.java index eefa15d6c..e142cfaa5 100644 --- a/src/main/java/vazkii/botania/common/lib/LibBlockNames.java +++ b/src/main/java/vazkii/botania/common/lib/LibBlockNames.java @@ -128,6 +128,7 @@ public final class LibBlockNames { public static final String PAVEMENT_SUFFIX = "_pavement"; public static final String CELL_BLOCK = "cell_block"; public static final String GAIA_HEAD = "gaia_head"; + public static final String GAIA_WALL_HEAD = "gaia_wall_head"; public static final String CORPOREA_RETAINER = "corporea_retainer"; public static final String TERU_TERU_BOZU = "teru_teru_bozu"; public static final String SHIMMERROCK = "shimmerrock";