From 644d6553d1b7b7d17796d970c2877cc03e80c936 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 18 Mar 2016 13:17:33 -0500 Subject: [PATCH] Large amounts of stuff in client --- .../core/handler/BoundTileRenderer.java | 18 +++++-- .../core/handler/ClientTickHandler.java | 14 ++---- .../handler/ContributorFancinessHandler.java | 2 +- .../client/core/handler/HUDHandler.java | 41 +++++++++------- .../core/handler/MiscellaneousIcons.java | 14 +++--- .../client/core/handler/ModelHandler.java | 4 +- .../core/handler/MultiblockRenderHandler.java | 1 - .../core/handler/RedStringRenderer.java | 3 +- .../client/core/handler/RenderLexicon.java | 3 +- .../java/vazkii/botania/client/fx/FXWisp.java | 18 +++---- .../botania/client/gui/bag/GuiFlowerBag.java | 3 +- .../client/model/FloatingFlowerModel.java | 4 +- .../botania/client/model/LexiconModel.java | 15 +++--- .../botania/client/model/PlatformModel.java | 39 ++++++--------- .../client/model/SpecialFlowerModel.java | 10 ++-- .../common/core/helper/PlayerHelper.java | 48 +++++++++++++++++++ 16 files changed, 138 insertions(+), 99 deletions(-) create mode 100644 src/main/java/vazkii/botania/common/core/helper/PlayerHelper.java diff --git a/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java b/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java index 22a1ccf07..5aa1470f2 100644 --- a/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java +++ b/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java @@ -14,6 +14,7 @@ import java.awt.Color; import java.util.List; import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; @@ -48,10 +49,16 @@ public final class BoundTileRenderer { // todo 1.8 Tessellator.renderingVertexBuffer = false; EntityPlayer player = Minecraft.getMinecraft().thePlayer; - ItemStack stack = player.getCurrentEquippedItem(); int color = Color.HSBtoRGB(ClientTickHandler.ticksInGame % 200 / 200F, 0.6F, 1F); - if(stack != null && stack.getItem() instanceof ICoordBoundItem) { - BlockPos coords = ((ICoordBoundItem) stack.getItem()).getBinding(stack); + + if(player.getHeldItemMainhand() != null && player.getHeldItemMainhand().getItem() instanceof ICoordBoundItem) { + BlockPos coords = ((ICoordBoundItem) player.getHeldItemMainhand().getItem()).getBinding(player.getHeldItemMainhand()); + if(coords != null) + renderBlockOutlineAt(coords, color); + } + + if(player.getHeldItemOffhand() != null && player.getHeldItemOffhand().getItem() instanceof ICoordBoundItem) { + BlockPos coords = ((ICoordBoundItem) player.getHeldItemOffhand().getItem()).getBinding(player.getHeldItemOffhand()); if(coords != null) renderBlockOutlineAt(coords, color); } @@ -112,14 +119,15 @@ public final class BoundTileRenderer { GL11.glColor4ub((byte) colorRGB.getRed(), (byte) colorRGB.getGreen(), (byte) colorRGB.getBlue(), (byte) 255); World world = Minecraft.getMinecraft().theWorld; - Block block = world.getBlockState(pos).getBlock(); + IBlockState state = world.getBlockState(pos); + Block block = state.getBlock(); drawWireframe : { if(block != null) { AxisAlignedBB axis; if(block instanceof IWireframeAABBProvider) axis = ((IWireframeAABBProvider) block).getWireframeAABB(world, pos); - else axis = block.getSelectedBoundingBox(world, pos); + else axis = state.getSelectedBoundingBox(world, pos); if(axis == null) break drawWireframe; diff --git a/src/main/java/vazkii/botania/client/core/handler/ClientTickHandler.java b/src/main/java/vazkii/botania/client/core/handler/ClientTickHandler.java index 7708a1f60..5a7577a76 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ClientTickHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ClientTickHandler.java @@ -10,13 +10,10 @@ */ package vazkii.botania.client.core.handler; -import java.util.ArrayList; -import java.util.List; - +import com.google.common.collect.ImmutableList; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import vazkii.botania.api.mana.IManaCollector; import vazkii.botania.api.mana.TileSignature; @@ -25,11 +22,12 @@ import vazkii.botania.client.gui.lexicon.GuiLexicon; import vazkii.botania.common.block.subtile.functional.SubTileVinculotus; import vazkii.botania.common.block.tile.corporea.TileCorporeaIndex; import vazkii.botania.common.core.handler.ManaNetworkHandler; -import vazkii.botania.common.item.ItemTwigWand; +import vazkii.botania.common.core.helper.PlayerHelper; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.gameevent.TickEvent.ClientTickEvent; import net.minecraftforge.fml.common.gameevent.TickEvent.Phase; import net.minecraftforge.fml.common.gameevent.TickEvent.RenderTickEvent; +import vazkii.botania.common.item.ModItems; public class ClientTickHandler { @@ -76,10 +74,8 @@ public class ClientTickHandler { EntityPlayer player = Minecraft.getMinecraft().thePlayer; if(player != null) { - ItemStack stack = player.getCurrentEquippedItem(); - if(stack != null && stack.getItem() instanceof ItemTwigWand) { - List list = new ArrayList<>(ManaNetworkHandler.instance.getAllCollectorsInWorld(Minecraft.getMinecraft().theWorld)); - for(TileSignature sig : list) { + if(PlayerHelper.hasHeldItemClass(player, ModItems.twigWand)) { + for(TileSignature sig : ImmutableList.copyOf(ManaNetworkHandler.instance.getAllCollectorsInWorld(Minecraft.getMinecraft().theWorld))) { if(!sig.remoteWorld) continue; diff --git a/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java b/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java index 9a2dfb5b5..b3f163c1f 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java @@ -180,7 +180,7 @@ public final class ContributorFancinessHandler implements LayerRenderer 0) { int alpha = Math.min(255, (int) (ticks * 256.0F / 10.0F)); int color = 0x00CC00 + (alpha << 24); - String disp = I18n.translateToLocal(ItemTwigWand.getModeString(mc.thePlayer.getCurrentEquippedItem())); + String disp = I18n.translateToLocal(ItemTwigWand.getModeString(stack)); int x = res.getScaledWidth() / 2 - mc.fontRendererObj.getStringWidth(disp) / 2; int y = res.getScaledHeight() - 70; @@ -332,8 +336,9 @@ public final class HUDHandler { profiler.endSection(); } - private void drawLexiconHUD(ItemStack stack, Block block, RayTraceResult pos, ScaledResolution res) { + private void drawLexiconHUD(ItemStack stack, IBlockState state, RayTraceResult pos, ScaledResolution res) { Minecraft mc = Minecraft.getMinecraft(); + Block block = state.getBlock(); Profiler profiler = mc.mcProfiler; profiler.startSection("lexicon"); @@ -348,7 +353,7 @@ public final class HUDHandler { int sy = res.getScaledHeight() / 2 + 2; if(block instanceof ILexiconable) { - LexiconEntry entry = ((ILexiconable) block).getEntry(mc.theWorld, pos.getBlockPos(), mc.thePlayer, mc.thePlayer.getCurrentEquippedItem()); + LexiconEntry entry = ((ILexiconable) block).getEntry(mc.theWorld, pos.getBlockPos(), mc.thePlayer, stack); if(entry != null) { if(!((ILexicon) stack.getItem()).isKnowledgeUnlocked(stack, entry.getKnowledgeType())) font = mc.standardGalacticFontRenderer; @@ -361,7 +366,7 @@ public final class HUDHandler { if(!draw && pos.entityHit == null) { profiler.startSection("wikiLookup"); - if(!block.isAir(mc.theWorld, pos.getBlockPos()) && !(block instanceof BlockLiquid)) { + if(!block.isAir(state, mc.theWorld, pos.getBlockPos()) && !(block instanceof BlockLiquid)) { IWikiProvider provider = WikiHooks.getWikiFor(block); String url = provider.getWikiURL(mc.theWorld, pos, mc.thePlayer); if(url != null && !url.isEmpty()) { 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 a30ba5339..0f620d535 100644 --- a/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java +++ b/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java @@ -99,19 +99,19 @@ public class MiscellaneousIcons { @SubscribeEvent public void onModelBake(ModelBakeEvent evt) { // Floating flowers - evt.modelRegistry.putObject(new ModelResourceLocation("botania:miniIsland", "normal"), FloatingFlowerModel.INSTANCE); - evt.modelRegistry.putObject(new ModelResourceLocation("botania:miniIsland", "inventory"), FloatingFlowerModel.INSTANCE); - evt.modelRegistry.putObject(new ModelResourceLocation("botania:floatingSpecialFlower", "normal"), FloatingFlowerModel.INSTANCE); - evt.modelRegistry.putObject(new ModelResourceLocation("botania:floatingSpecialFlower", "inventory"), FloatingFlowerModel.INSTANCE); + evt.getModelRegistry().putObject(new ModelResourceLocation("botania:miniIsland", "normal"), FloatingFlowerModel.INSTANCE); + evt.getModelRegistry().putObject(new ModelResourceLocation("botania:miniIsland", "inventory"), FloatingFlowerModel.INSTANCE); + evt.getModelRegistry().putObject(new ModelResourceLocation("botania:floatingSpecialFlower", "normal"), FloatingFlowerModel.INSTANCE); + evt.getModelRegistry().putObject(new ModelResourceLocation("botania:floatingSpecialFlower", "inventory"), FloatingFlowerModel.INSTANCE); // Pylon item model - evt.modelRegistry.putObject(new ModelResourceLocation("botania:pylon", "inventory"), new PylonItemModel()); + evt.getModelRegistry().putObject(new ModelResourceLocation("botania:pylon", "inventory"), new PylonItemModel()); // Platforms - evt.modelRegistry.putObject(new ModelResourceLocation("botania:platform", "normal"), new PlatformModel()); + evt.getModelRegistry().putObject(new ModelResourceLocation("botania:platform", "normal"), new PlatformModel()); // Lexicon - evt.modelRegistry.putObject(new ModelResourceLocation("botania:lexicon", "inventory"), new LexiconModel()); + evt.getModelRegistry().putObject(new ModelResourceLocation("botania:lexicon", "inventory"), new LexiconModel()); } @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 aa59fedd5..e44406288 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -710,8 +710,8 @@ public final class ModelHandler { ModelLoader.setCustomStateMapper(ModBlocks.platform, new StateMap.Builder().ignore(BotaniaStateProps.PLATFORM_VARIANT).build()); // Ignore vanilla facing, variant in double flower - ModelLoader.setCustomStateMapper(ModBlocks.doubleFlower1, (new StateMap.Builder()).ignore(BlockDoublePlant.VARIANT, BlockDoublePlant.field_181084_N).build()); - ModelLoader.setCustomStateMapper(ModBlocks.doubleFlower2, (new StateMap.Builder()).ignore(BlockDoublePlant.VARIANT, BlockDoublePlant.field_181084_N).build()); + ModelLoader.setCustomStateMapper(ModBlocks.doubleFlower1, (new StateMap.Builder()).ignore(BlockDoublePlant.VARIANT, BlockDoublePlant.FACING).build()); + ModelLoader.setCustomStateMapper(ModBlocks.doubleFlower2, (new StateMap.Builder()).ignore(BlockDoublePlant.VARIANT, BlockDoublePlant.FACING).build()); // Ignore color in unstable cube, mana beacon, special flower, and petals (handled by Block.colorMultiplier) ModelLoader.setCustomStateMapper(ModBlocks.unstableBlock, (new StateMap.Builder()).ignore(BotaniaStateProps.COLOR).build()); diff --git a/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java b/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java index 2fbfad3e7..c0ff9d6fb 100644 --- a/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java @@ -99,7 +99,6 @@ public final class MultiblockRenderHandler { public void onWorldRenderLast(RenderWorldLastEvent event) { Minecraft mc = Minecraft.getMinecraft(); if(mc.thePlayer != null && mc.objectMouseOver != null && mc.objectMouseOver.getBlockPos() != null && (!mc.thePlayer.isSneaking() || anchor != null)) { - mc.thePlayer.getCurrentEquippedItem(); renderPlayerLook(mc.thePlayer, mc.objectMouseOver); } } diff --git a/src/main/java/vazkii/botania/client/core/handler/RedStringRenderer.java b/src/main/java/vazkii/botania/client/core/handler/RedStringRenderer.java index 7a29e100d..4de67f6f2 100644 --- a/src/main/java/vazkii/botania/client/core/handler/RedStringRenderer.java +++ b/src/main/java/vazkii/botania/client/core/handler/RedStringRenderer.java @@ -25,6 +25,7 @@ import net.minecraft.util.EnumFacing; import org.lwjgl.opengl.GL11; import vazkii.botania.common.block.tile.string.TileRedString; +import vazkii.botania.common.core.helper.PlayerHelper; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.item.ModItems; @@ -58,7 +59,7 @@ public final class RedStringRenderer { public static void tick() { EntityPlayer player = Minecraft.getMinecraft().thePlayer; - boolean hasWand = player != null && player.getCurrentEquippedItem() != null && player.getCurrentEquippedItem().getItem() == ModItems.twigWand; + boolean hasWand = player != null && PlayerHelper.hasHeldItem(player, ModItems.twigWand); if(sizeAlpha > 0F && !hasWand) sizeAlpha -= 0.1F; else if(sizeAlpha < 1F &&hasWand) diff --git a/src/main/java/vazkii/botania/client/core/handler/RenderLexicon.java b/src/main/java/vazkii/botania/client/core/handler/RenderLexicon.java index c12eeecbe..ba76b54d7 100644 --- a/src/main/java/vazkii/botania/client/core/handler/RenderLexicon.java +++ b/src/main/java/vazkii/botania/client/core/handler/RenderLexicon.java @@ -21,6 +21,7 @@ import org.lwjgl.util.glu.Project; import vazkii.botania.client.gui.lexicon.GuiLexicon; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.core.handler.ConfigHandler; +import vazkii.botania.common.core.helper.PlayerHelper; import vazkii.botania.common.item.ItemLexicon; import vazkii.botania.common.item.ModItems; @@ -33,7 +34,7 @@ public class RenderLexicon { @SubscribeEvent public void renderItem(RenderHandEvent evt) { Minecraft mc = Minecraft.getMinecraft(); - if(!ConfigHandler.lexicon3dModel || mc.gameSettings.thirdPersonView != 0 || mc.thePlayer.getHeldItem() == null || mc.thePlayer.getHeldItem().getItem() != ModItems.lexicon) + if(!ConfigHandler.lexicon3dModel || mc.gameSettings.thirdPersonView != 0 || !PlayerHelper.hasHeldItem(mc.thePlayer, ModItems.lexicon)) return; evt.setCanceled(true); diff --git a/src/main/java/vazkii/botania/client/fx/FXWisp.java b/src/main/java/vazkii/botania/client/fx/FXWisp.java index df685a3aa..8a6d45513 100644 --- a/src/main/java/vazkii/botania/client/fx/FXWisp.java +++ b/src/main/java/vazkii/botania/client/fx/FXWisp.java @@ -52,7 +52,7 @@ public class FXWisp extends EntityFX { particleBlue = blue; particleAlpha = 0.5F; // So MC renders us on the alpha layer, value not actually used particleGravity = 0; - motionX = motionY = motionZ = 0; + xSpeed = ySpeed = zSpeed = 0; particleScale *= size; moteParticleScale = particleScale; particleMaxAge = (int)(28D / (Math.random() * 0.3D + 0.7D) * maxAgeMul); @@ -148,15 +148,15 @@ public class FXWisp extends EntityFX { prevPosZ = posZ; if (particleAge++ >= particleMaxAge) - setDead(); + setExpired(); - motionY -= 0.04D * particleGravity; - posX += motionX; - posY += motionY; - posZ += motionZ; - motionX *= 0.98000001907348633D; - motionY *= 0.98000001907348633D; - motionZ *= 0.98000001907348633D; + ySpeed -= 0.04D * particleGravity; + posX += xSpeed; + posY += ySpeed; + posZ += zSpeed; + xSpeed *= 0.98000001907348633D; + ySpeed *= 0.98000001907348633D; + zSpeed *= 0.98000001907348633D; } public void setGravity(float value) { diff --git a/src/main/java/vazkii/botania/client/gui/bag/GuiFlowerBag.java b/src/main/java/vazkii/botania/client/gui/bag/GuiFlowerBag.java index 417623f03..88e3ab856 100644 --- a/src/main/java/vazkii/botania/client/gui/bag/GuiFlowerBag.java +++ b/src/main/java/vazkii/botania/client/gui/bag/GuiFlowerBag.java @@ -15,7 +15,6 @@ import java.util.List; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.RenderHelper; -import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; @@ -37,7 +36,7 @@ public class GuiFlowerBag extends GuiContainer { protected void drawGuiContainerForegroundLayer(int p_146979_1_, int p_146979_2_) { String s = I18n.translateToLocal("item.botania:flowerBag.name"); fontRendererObj.drawString(s, xSize / 2 - fontRendererObj.getStringWidth(s) / 2, 6, 4210752); - fontRendererObj.drawString(I18n.format("container.inventory", new Object[0]), 8, ySize - 96 + 2, 4210752); + fontRendererObj.drawString(I18n.translateToLocal("container.inventory"), 8, ySize - 96 + 2, 4210752); } @Override diff --git a/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java b/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java index 48a3009ac..a6db60a7a 100644 --- a/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java +++ b/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java @@ -16,17 +16,15 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.block.model.BakedQuad; import net.minecraft.client.renderer.block.model.ItemCameraTransforms; +import net.minecraft.client.renderer.block.model.ModelManager; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.client.renderer.vertex.VertexFormatElement; import net.minecraft.client.resources.IResourceManager; import net.minecraft.client.resources.IResourceManagerReloadListener; import net.minecraft.client.renderer.block.model.IBakedModel; -import net.minecraft.client.resources.model.ModelManager; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; -import net.minecraftforge.client.model.ISmartBlockModel; -import net.minecraftforge.client.model.ISmartItemModel; import net.minecraftforge.client.model.TRSRTransformation; import net.minecraftforge.client.model.pipeline.IVertexConsumer; import net.minecraftforge.client.model.pipeline.UnpackedBakedQuad; diff --git a/src/main/java/vazkii/botania/client/model/LexiconModel.java b/src/main/java/vazkii/botania/client/model/LexiconModel.java index 5de57b240..94a039b7a 100644 --- a/src/main/java/vazkii/botania/client/model/LexiconModel.java +++ b/src/main/java/vazkii/botania/client/model/LexiconModel.java @@ -1,17 +1,15 @@ package vazkii.botania.client.model; import com.google.common.collect.ImmutableList; +import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.block.model.BakedQuad; import net.minecraft.client.renderer.block.model.ItemCameraTransforms; +import net.minecraft.client.renderer.block.model.ItemOverrideList; import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.client.renderer.vertex.DefaultVertexFormats; -import net.minecraft.client.renderer.vertex.VertexFormat; import net.minecraft.client.renderer.block.model.IBakedModel; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.util.EnumFacing; -import net.minecraftforge.client.model.Attributes; -import net.minecraftforge.client.model.IFlexibleBakedModel; import net.minecraftforge.client.model.IPerspectiveAwareModel; import org.apache.commons.lang3.tuple.Pair; import vazkii.botania.common.core.handler.ConfigHandler; @@ -25,19 +23,18 @@ public class LexiconModel implements IPerspectiveAwareModel { private static final ModelResourceLocation path = new ModelResourceLocation("botania:lexicon_default", "inventory"); @Override - public Pair handlePerspective(ItemCameraTransforms.TransformType cameraTransformType) { + public Pair handlePerspective(ItemCameraTransforms.TransformType cameraTransformType) { IBakedModel original = Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getModel(path); - if(cameraTransformType == ItemCameraTransforms.TransformType.FIRST_PERSON && ConfigHandler.lexicon3dModel) + if(cameraTransformType == ItemCameraTransforms.TransformType.FIRST_PERSON_RIGHT_HAND && ConfigHandler.lexicon3dModel) // todo 1.9 handedness return Pair.of(this, null); return ((IPerspectiveAwareModel) original).handlePerspective(cameraTransformType); } - @Override public VertexFormat getFormat() { return Attributes.DEFAULT_BAKED_FORMAT; } - @Override public List getFaceQuads(EnumFacing face) { return ImmutableList.of(); } - @Override public List getGeneralQuads() { return ImmutableList.of(); } + @Override public List getQuads(IBlockState state, EnumFacing side, long rand) { return ImmutableList.of(); } @Override public boolean isAmbientOcclusion() { return false; } @Override public boolean isGui3d() { return false; } @Override public boolean isBuiltInRenderer() { return false; } @Override public TextureAtlasSprite getParticleTexture() { return Minecraft.getMinecraft().getTextureMapBlocks().getAtlasSprite("botania:items/lexicon"); } @Override public ItemCameraTransforms getItemCameraTransforms() { return ItemCameraTransforms.DEFAULT; } + @Override public ItemOverrideList getOverrides() { return ItemOverrideList.NONE; } } diff --git a/src/main/java/vazkii/botania/client/model/PlatformModel.java b/src/main/java/vazkii/botania/client/model/PlatformModel.java index deb94a255..1995d7f6a 100644 --- a/src/main/java/vazkii/botania/client/model/PlatformModel.java +++ b/src/main/java/vazkii/botania/client/model/PlatformModel.java @@ -13,6 +13,7 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.block.model.BakedQuad; import net.minecraft.client.renderer.block.model.ItemCameraTransforms; +import net.minecraft.client.renderer.block.model.ItemOverrideList; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.block.model.IBakedModel; import net.minecraft.client.renderer.block.model.ModelResourceLocation; @@ -25,7 +26,6 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.WorldType; import net.minecraft.world.biome.BiomeGenBase; import net.minecraftforge.client.MinecraftForgeClient; -import net.minecraftforge.client.model.ISmartBlockModel; import net.minecraftforge.common.property.IExtendedBlockState; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.block.BlockCamo; @@ -34,12 +34,12 @@ import vazkii.botania.common.block.tile.TileCamo; import java.util.List; -public class PlatformModel implements ISmartBlockModel { +public class PlatformModel implements IBakedModel { @Override - public IBakedModel handleBlockState(IBlockState state) { + public List getQuads(IBlockState state, EnumFacing side, long rand) { if(state.getBlock() != ModBlocks.platform) - return Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getMissingModel(); + return Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getMissingModel().getQuads(state, side, rand); BlockRenderLayer layer = MinecraftForgeClient.getRenderLayer(); IBlockState heldState = ((IExtendedBlockState) state).getValue(BotaniaStateProps.HELD_STATE); @@ -47,14 +47,14 @@ public class PlatformModel implements ISmartBlockModel { BlockPos heldPos = ((IExtendedBlockState) state).getValue(BotaniaStateProps.HELD_POS); if (heldWorld == null || heldPos == null) { - return this; + return ImmutableList.of(); } Minecraft mc = Minecraft.getMinecraft(); if(heldState == null && layer == BlockRenderLayer.SOLID) { // No camo ModelResourceLocation path = new ModelResourceLocation("botania:platform", "variant=" + state.getValue(BotaniaStateProps.PLATFORM_VARIANT).getName()); - return mc.getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getModel(path); + return mc.getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getModel(path).getQuads(state, side, rand); } else if(heldState != null) { if(heldState.getBlock().canRenderInLayer(layer)) { IBlockState actual = heldState.getBlock().getActualState(heldState, new FakeBlockAccess(heldWorld), heldPos); @@ -62,27 +62,13 @@ public class PlatformModel implements ISmartBlockModel { // Steal camo's model IBakedModel model = mc.getBlockRendererDispatcher().getBlockModelShapes().getModelForState(actual); - if(model instanceof ISmartBlockModel) { - // Their model can be smart too - IBlockState extended = heldState.getBlock().getExtendedState(actual, new FakeBlockAccess(heldWorld), heldPos); - model = ((ISmartBlockModel) model).handleBlockState(extended); - } - - return model; + // Their model can be smart too + IBlockState extended = heldState.getBlock().getExtendedState(actual, new FakeBlockAccess(heldWorld), heldPos); + return model.getQuads(extended, side, rand); } } - return this; // This smart model has no quads as seen below, so nothing actually renders - } - - @Override - public List getFaceQuads(EnumFacing p_177551_1_) { - return ImmutableList.of(); - } - - @Override - public List getGeneralQuads() { - return ImmutableList.of(); + return ImmutableList.of(); // Nothing renders } @Override @@ -110,6 +96,11 @@ public class PlatformModel implements ISmartBlockModel { return ItemCameraTransforms.DEFAULT; } + @Override + public ItemOverrideList getOverrides() { + return ItemOverrideList.NONE; + } + private static class FakeBlockAccess implements IBlockAccess { private final IBlockAccess compose; diff --git a/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java b/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java index 93f49fb4a..d207fcc40 100644 --- a/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java +++ b/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java @@ -19,27 +19,23 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.block.model.BakedQuad; import net.minecraft.client.renderer.block.model.ItemCameraTransforms; +import net.minecraft.client.renderer.block.model.ModelManager; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.vertex.VertexFormat; import net.minecraft.client.resources.IResourceManager; import net.minecraft.client.renderer.block.model.IBakedModel; -import net.minecraft.client.resources.model.ModelManager; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.ICustomModelLoader; -import net.minecraftforge.client.model.IFlexibleBakedModel; import net.minecraftforge.client.model.IModel; import net.minecraftforge.client.model.IModelCustomData; import net.minecraftforge.client.model.IModelState; import net.minecraftforge.client.model.IPerspectiveAwareModel; -import net.minecraftforge.client.model.ISmartBlockModel; -import net.minecraftforge.client.model.ISmartItemModel; import net.minecraftforge.client.model.TRSRTransformation; import net.minecraftforge.common.property.IExtendedBlockState; import net.minecraftforge.fml.common.FMLLog; -import org.apache.commons.lang3.tuple.Pair; import vazkii.botania.api.BotaniaAPIClient; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.block.ModBlocks; @@ -51,7 +47,7 @@ import java.util.Collection; import java.util.List; import java.util.Map; -public class SpecialFlowerModel implements IModelCustomData { +public class SpecialFlowerModel implements IModelCustomData { // SpecialFlowerModel for when there are no blockModels registered for a subtile public static final SpecialFlowerModel INSTANCE = new SpecialFlowerModel(ImmutableMap., ModelResourceLocation>of(), ImmutableMap., ModelResourceLocation>of()); @@ -83,7 +79,7 @@ public class SpecialFlowerModel implements IModelCustomData } @Override - public IFlexibleBakedModel bake(IModelState state, VertexFormat format, Function bakedTextureGetter) { + public IBakedModel bake(IModelState state, VertexFormat format, Function bakedTextureGetter) { // "Bake" the SpecialFlowerModel (in reality, just create another wrapper for all the delegate blockModels) return new SpecialFlowerBakedModel(blockModels, itemModels, format, IPerspectiveAwareModel.MapWrapper.getTransforms(state)); } diff --git a/src/main/java/vazkii/botania/common/core/helper/PlayerHelper.java b/src/main/java/vazkii/botania/common/core/helper/PlayerHelper.java new file mode 100644 index 000000000..e612d93d3 --- /dev/null +++ b/src/main/java/vazkii/botania/common/core/helper/PlayerHelper.java @@ -0,0 +1,48 @@ +package vazkii.botania.common.core.helper; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; + +public final class PlayerHelper { + + public static boolean hasAnyHeldItem(EntityPlayer player) { + return player.getHeldItemMainhand() != null || player.getHeldItemOffhand() != null; + } + + public static boolean hasHeldItem(EntityPlayer player, Item item) { + return (player.getHeldItemMainhand() != null && player.getHeldItemMainhand().getItem() == item) + || (player.getHeldItemOffhand() != null && player.getHeldItemOffhand().getItem() == item); + } + + public static boolean hasHeldItemClass(EntityPlayer player, Item template) { + return hasHeldItemClass(player, template.getClass()); + } + + public static boolean hasHeldItemClass(EntityPlayer player, Class template) { + return (player.getHeldItemMainhand() != null && template.isAssignableFrom(player.getHeldItemMainhand().getItem().getClass())) + || (player.getHeldItemOffhand() != null && template.isAssignableFrom(player.getHeldItemOffhand().getItem().getClass())); + } + + public static ItemStack getFirstHeldItem(EntityPlayer player, Item item) { + ItemStack main = player.getHeldItemMainhand(); + ItemStack offhand = player.getHeldItemOffhand(); + if(main != null && item == main.getItem()) { + return main; + } else if(offhand != null && item == offhand.getItem()) { + return offhand; + } else return null; + } + + public static ItemStack getFirstHeldItemClass(EntityPlayer player, Class template) { + ItemStack main = player.getHeldItemMainhand(); + ItemStack offhand = player.getHeldItemOffhand(); + if(main != null && template.isAssignableFrom(main.getItem().getClass())) { + return main; + } else if(offhand != null && template.isAssignableFrom(offhand.getItem().getClass())) { + return offhand; + } else return null; + } + + private PlayerHelper() {} +}