From 0af2d25a715eb68d0e0d055b7484c18ebd2f1491 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 19 Mar 2016 11:38:16 -0500 Subject: [PATCH] Misc fixes, fix baked models --- .../api/item/IManaProficiencyArmor.java | 11 +- .../client/core/handler/RenderLexicon.java | 7 +- .../client/gui/lexicon/GuiLexicon.java | 3 +- .../gui/lexicon/button/GuiButtonLexicon.java | 3 +- .../client/model/FloatingFlowerModel.java | 107 ++++++------- .../botania/client/model/ModelPool.java | 58 ------- .../botania/client/model/ModelPylon.java | 32 ++-- .../client/model/ModelSpawnerClaw.java | 82 ---------- .../botania/client/model/PylonItemModel.java | 143 ++++++------------ .../client/model/SpecialFlowerModel.java | 75 ++++----- .../common/block/decor/BlockBuriedPetals.java | 2 +- .../common/block/mana/BlockDistributor.java | 6 +- .../common/block/mana/BlockEnchanter.java | 5 +- .../botania/common/block/mana/BlockPrism.java | 19 ++- .../common/block/mana/BlockRFGenerator.java | 1 + .../common/block/mana/BlockRuneAltar.java | 22 ++- .../common/block/mana/BlockTerraPlate.java | 18 ++- .../functional/SubTileTangleberrie.java | 3 +- .../common/block/tile/TileLightRelay.java | 32 ++-- .../common/core/BotaniaCreativeTab.java | 2 +- .../common/core/command/CommandOpen.java | 5 +- .../common/core/handler/ChestGenHandler.java | 4 +- .../common/core/handler/PixieHandler.java | 21 ++- .../botania/common/core/helper/Vector3.java | 10 +- .../common/core/proxy/CommonProxy.java | 4 +- .../common/core/version/VersionChecker.java | 3 +- .../common/entity/EntityCorporeaSpark.java | 73 ++++----- .../common/entity/EntityFallingStar.java | 7 +- .../botania/common/entity/EntityPixie.java | 19 ++- .../common/entity/EntitySignalFlare.java | 15 +- .../botania/common/entity/EntitySpark.java | 32 ++-- .../botania/common/item/ItemTwigWand.java | 21 +-- .../armor/elementium/ItemElementiumArmor.java | 3 +- .../armor/manaweave/ItemManaweaveHelm.java | 2 +- .../armor/terrasteel/ItemTerrasteelArmor.java | 4 +- .../equipment/bauble/ItemFlightTiara.java | 6 +- .../common/item/relic/ItemOdinRing.java | 2 +- .../common/item/rod/ItemExchangeRod.java | 2 +- .../common/lexicon/page/PageEntity.java | 2 +- .../common/lexicon/page/PageRecipe.java | 5 +- 40 files changed, 346 insertions(+), 525 deletions(-) delete mode 100644 src/main/java/vazkii/botania/client/model/ModelPool.java delete mode 100644 src/main/java/vazkii/botania/client/model/ModelSpawnerClaw.java diff --git a/src/main/java/vazkii/botania/api/item/IManaProficiencyArmor.java b/src/main/java/vazkii/botania/api/item/IManaProficiencyArmor.java index 595e800db..bce037fa3 100644 --- a/src/main/java/vazkii/botania/api/item/IManaProficiencyArmor.java +++ b/src/main/java/vazkii/botania/api/item/IManaProficiencyArmor.java @@ -11,6 +11,7 @@ package vazkii.botania.api.item; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -23,16 +24,18 @@ import net.minecraft.item.ItemStack; */ public interface IManaProficiencyArmor { - public boolean shouldGiveProficiency(ItemStack stack, int slot, EntityPlayer player); + public boolean shouldGiveProficiency(ItemStack stack, EntityEquipmentSlot slot, EntityPlayer player); public final static class Helper { public static boolean hasProficiency(EntityPlayer player) { - for(int i = 0; i < 4; i++) { - ItemStack armor = player.getCurrentArmor(i); + for(EntityEquipmentSlot e: EntityEquipmentSlot.values()) { + if(e.getSlotType() != EntityEquipmentSlot.Type.ARMOR) + continue; + ItemStack armor = player.getItemStackFromSlot(e); if(armor != null) { Item item = armor.getItem(); - if(item instanceof IManaProficiencyArmor && ((IManaProficiencyArmor) item).shouldGiveProficiency(armor, i, player)) + if(item instanceof IManaProficiencyArmor && ((IManaProficiencyArmor) item).shouldGiveProficiency(armor, e, player)) return true; } } 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 ba76b54d7..375108bcf 100644 --- a/src/main/java/vazkii/botania/client/core/handler/RenderLexicon.java +++ b/src/main/java/vazkii/botania/client/core/handler/RenderLexicon.java @@ -9,6 +9,8 @@ import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.entity.EntityLivingBase; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.TextFormatting; import net.minecraft.util.math.MathHelper; @@ -158,8 +160,9 @@ public class RenderLexicon { String title = ModItems.lexicon.getItemStackDisplayName(null); String origTitle = title; - if(Minecraft.getMinecraft().thePlayer.getCurrentEquippedItem() != null) - title = Minecraft.getMinecraft().thePlayer.getCurrentEquippedItem().getDisplayName(); + ItemStack stack = PlayerHelper.getFirstHeldItemClass(Minecraft.getMinecraft().thePlayer, Item.class); + if(stack != null) + title = stack.getDisplayName(); if(title.equals(origTitle) && bevo) title = I18n.translateToLocal("item.botania:lexicon.bevo"); if(title.equals(origTitle) && saice) diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java index 72273aa97..414b44484 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java @@ -43,6 +43,7 @@ import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.lexicon.BotaniaTutorialStartEvent; import vazkii.botania.api.lexicon.LexiconCategory; import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.api.sound.BotaniaSoundEvents; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.core.handler.PersistentVariableHelper; import vazkii.botania.client.core.helper.RenderHelper; @@ -576,7 +577,7 @@ public class GuiLexicon extends GuiScreen { if(par2 == KONAMI_CODE[konamiIndex]) { konamiIndex++; if(konamiIndex >= KONAMI_CODE.length) { - mc.getSoundHandler().playSound(PositionedSoundRecord.create(new ResourceLocation("botania:way"))); + mc.getSoundHandler().playSound(PositionedSoundRecord.getMasterRecord(BotaniaSoundEvents.way, 1.0F)); konamiIndex = 0; } } else konamiIndex = 0; diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonLexicon.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonLexicon.java index 56e717a22..896e9f488 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonLexicon.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonLexicon.java @@ -14,6 +14,7 @@ import net.minecraft.client.audio.PositionedSoundRecord; import net.minecraft.client.audio.SoundHandler; import net.minecraft.client.gui.GuiButton; import net.minecraft.util.ResourceLocation; +import vazkii.botania.api.sound.BotaniaSoundEvents; public class GuiButtonLexicon extends GuiButton { @@ -23,7 +24,7 @@ public class GuiButtonLexicon extends GuiButton { @Override public void playPressSound(SoundHandler p_146113_1_) { - p_146113_1_.playSound(PositionedSoundRecord.create(new ResourceLocation("botania:lexiconPage"), 1.0F)); + p_146113_1_.playSound(PositionedSoundRecord.getMasterRecord(BotaniaSoundEvents.lexiconPage, 1.0F)); } } diff --git a/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java b/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java index a6db60a7a..fb4f96672 100644 --- a/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java +++ b/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java @@ -16,6 +16,8 @@ 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.ItemOverride; +import net.minecraft.client.renderer.block.model.ItemOverrideList; import net.minecraft.client.renderer.block.model.ModelManager; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; @@ -23,8 +25,10 @@ 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.entity.EntityLivingBase; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; +import net.minecraft.world.World; import net.minecraftforge.client.model.TRSRTransformation; import net.minecraftforge.client.model.pipeline.IVertexConsumer; import net.minecraftforge.client.model.pipeline.UnpackedBakedQuad; @@ -43,7 +47,7 @@ import javax.vecmath.Vector4f; import java.util.List; import java.util.stream.Collectors; -public class FloatingFlowerModel implements ISmartItemModel, ISmartBlockModel, IResourceManagerReloadListener { +public class FloatingFlowerModel implements IBakedModel, IResourceManagerReloadListener { public static final FloatingFlowerModel INSTANCE = new FloatingFlowerModel(); private static final String MUNDANE_PREFIX = "botania:shimmeringFlower_"; @@ -81,26 +85,9 @@ public class FloatingFlowerModel implements ISmartItemModel, ISmartBlockModel, I } @Override - public IBakedModel handleItemState(ItemStack stack) { - // Items always have GRASS island - IFloatingFlower.IslandType islandType = IFloatingFlower.IslandType.GRASS; - String identifier; - - if(Block.getBlockFromItem(stack.getItem()) == ModBlocks.floatingSpecialFlower) { - // Magic flower - identifier = ItemBlockFloatingSpecialFlower.getType(stack); - } else { - // Mundane flower - identifier = MUNDANE_PREFIX + stack.getItemDamage(); - } - - return getModel(islandType, identifier); - } - - @Override - public IBakedModel handleBlockState(IBlockState state) { + public List getQuads(IBlockState state, EnumFacing face, long rand) { if(state.getBlock() != ModBlocks.floatingSpecialFlower && state.getBlock() != ModBlocks.floatingFlower) - return Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getMissingModel(); + return Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getMissingModel().getQuads(state, face, rand); IExtendedBlockState realState = ((IExtendedBlockState) state); IFloatingFlower.IslandType islandType = realState.getValue(BotaniaStateProps.ISLAND_TYPE); String identifier; @@ -113,7 +100,7 @@ public class FloatingFlowerModel implements ISmartItemModel, ISmartBlockModel, I identifier = MUNDANE_PREFIX + state.getValue(BotaniaStateProps.COLOR).getMetadata(); } - return getModel(islandType, identifier); + return getModel(islandType, identifier).getQuads(state, face, rand); } // Get the model for this islandtype + flower type combination. If it's not cached already, generate it. @@ -141,41 +128,16 @@ public class FloatingFlowerModel implements ISmartItemModel, ISmartBlockModel, I } } - // Dummy results @Override - public List getFaceQuads(EnumFacing p_177551_1_) { - return ImmutableList.of(); + public ItemOverrideList getOverrides() { + return ItemHandler.INSTANCE; } - @Override - public List getGeneralQuads() { - return ImmutableList.of(); - } - - @Override - public boolean isAmbientOcclusion() { - return false; - } - - @Override - public boolean isGui3d() { - return true; - } - - @Override - public boolean isBuiltInRenderer() { - return false; - } - - @Override - public TextureAtlasSprite getParticleTexture() { - return null; - } - - @Override - public ItemCameraTransforms getItemCameraTransforms() { - return ItemCameraTransforms.DEFAULT; - } + @Override public boolean isAmbientOcclusion() { return false; } + @Override public boolean isGui3d() { return true; } + @Override public boolean isBuiltInRenderer() { return false; } + @Override public TextureAtlasSprite getParticleTexture() { return null; } + @Override public ItemCameraTransforms getItemCameraTransforms() { return ItemCameraTransforms.DEFAULT; } private static class CompositeBakedModel implements IBakedModel { @@ -190,18 +152,18 @@ public class FloatingFlowerModel implements ISmartItemModel, ISmartBlockModel, I // Add flower quads, scaled and translated - for(BakedQuad quad : flower.getGeneralQuads()) { + for(BakedQuad quad : flower.getQuads(null, null, 0)) { genBuilder.add(transform(quad, transform)); } for(EnumFacing e : EnumFacing.VALUES) { - genBuilder.addAll(flower.getFaceQuads(e).stream().map(input -> transform(input, transform)).collect(Collectors.toList())); + genBuilder.addAll(flower.getQuads(null, e, 0).stream().map(input -> transform(input, transform)).collect(Collectors.toList())); } // Add island quads - genBuilder.addAll(island.getGeneralQuads()); + genBuilder.addAll(island.getQuads(null, null, 0)); for(EnumFacing e : EnumFacing.VALUES) { - genBuilder.addAll(island.getFaceQuads(e)); + genBuilder.addAll(island.getQuads(null, e, 0)); } genQuads = genBuilder.build(); @@ -209,15 +171,10 @@ public class FloatingFlowerModel implements ISmartItemModel, ISmartBlockModel, I // Forward all to flower model @Override - public List getGeneralQuads() { + public List getQuads(IBlockState state, EnumFacing face, long rand) { return genQuads; } - @Override - public List getFaceQuads(EnumFacing p_177551_1_) { - return ImmutableList.of(); - } - @Override public boolean isAmbientOcclusion() { return base.isAmbientOcclusion(); @@ -242,6 +199,30 @@ public class FloatingFlowerModel implements ISmartItemModel, ISmartBlockModel, I public ItemCameraTransforms getItemCameraTransforms() { return base.getItemCameraTransforms(); } + + @Override public ItemOverrideList getOverrides() { return ItemOverrideList.NONE; } + } + + private static class ItemHandler extends ItemOverrideList { + private static final ItemHandler INSTANCE = new ItemHandler(); + private ItemHandler() { super(ImmutableList.of()); } + + @Override + public IBakedModel handleItemState(IBakedModel model, ItemStack stack, World world, EntityLivingBase entity) { + // Items always have GRASS island + IFloatingFlower.IslandType islandType = IFloatingFlower.IslandType.GRASS; + String identifier; + + if(Block.getBlockFromItem(stack.getItem()) == ModBlocks.floatingSpecialFlower) { + // Magic flower + identifier = ItemBlockFloatingSpecialFlower.getType(stack); + } else { + // Mundane flower + identifier = MUNDANE_PREFIX + stack.getItemDamage(); + } + + return FloatingFlowerModel.INSTANCE.getModel(islandType, identifier); + } } } diff --git a/src/main/java/vazkii/botania/client/model/ModelPool.java b/src/main/java/vazkii/botania/client/model/ModelPool.java deleted file mode 100644 index 1cc52537a..000000000 --- a/src/main/java/vazkii/botania/client/model/ModelPool.java +++ /dev/null @@ -1,58 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [Jan 25, 2014, 1:53:32 PM (GMT)] - */ -package vazkii.botania.client.model; - -import net.minecraft.client.model.ModelBase; -import net.minecraft.client.model.ModelRenderer; - -public class ModelPool extends ModelBase { - - ModelRenderer base; - ModelRenderer side1; - ModelRenderer side2; - ModelRenderer side3; - ModelRenderer side4; - - public ModelPool() { - textureWidth = 64; - textureHeight = 32; - - base = new ModelRenderer(this, 0, 0); - base.addBox(0F, 0F, 0F, 16, 1, 16); - base.setRotationPoint(-8F, 23F, -8F); - base.setTextureSize(64, 32); - side1 = new ModelRenderer(this, 0, 0); - side1.addBox(0F, 0F, 0F, 16, 7, 1); - side1.setRotationPoint(-8F, 16F, 7F); - side1.setTextureSize(64, 32); - side2 = new ModelRenderer(this, 0, 0); - side2.addBox(0F, 0F, 0F, 16, 7, 1); - side2.setRotationPoint(-8F, 16F, -8F); - side2.setTextureSize(64, 32); - side3 = new ModelRenderer(this, 0, 0); - side3.addBox(0F, 0F, 0F, 1, 7, 14); - side3.setRotationPoint(-8F, 16F, -7F); - side3.setTextureSize(64, 32); - side4 = new ModelRenderer(this, 0, 0); - side4.addBox(0F, 0F, 0F, 1, 7, 14); - side4.setRotationPoint(7F, 16F, -7F); - side4.setTextureSize(64, 32); - } - - public void render() { - float f = 1F / 16F; - base.render(f); - side1.render(f); - side2.render(f); - side3.render(f); - side4.render(f); - } -} \ No newline at end of file diff --git a/src/main/java/vazkii/botania/client/model/ModelPylon.java b/src/main/java/vazkii/botania/client/model/ModelPylon.java index 5df6b1195..d597f7335 100644 --- a/src/main/java/vazkii/botania/client/model/ModelPylon.java +++ b/src/main/java/vazkii/botania/client/model/ModelPylon.java @@ -18,12 +18,13 @@ import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.VertexBuffer; import net.minecraft.client.renderer.block.model.BakedQuad; +import net.minecraft.client.renderer.block.model.IBakedModel; import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.crash.CrashReport; import net.minecraft.util.ReportedException; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.Attributes; -import net.minecraftforge.client.model.IFlexibleBakedModel; import net.minecraftforge.client.model.IModel; import net.minecraftforge.client.model.obj.OBJLoader; import net.minecraftforge.client.model.obj.OBJModel; @@ -31,21 +32,20 @@ import net.minecraftforge.client.model.pipeline.LightUtil; import org.lwjgl.opengl.GL11; import vazkii.botania.api.state.enums.PylonVariant; -import java.io.IOException; import java.util.List; public class ModelPylon implements IPylonModel { private static final Function TEXTUREGETTER = input -> Minecraft.getMinecraft().getTextureMapBlocks().getAtlasSprite(input.toString()); - private IFlexibleBakedModel manaCrystal; - private IFlexibleBakedModel manaRingsAndPanes; - private IFlexibleBakedModel manaGems; - private IFlexibleBakedModel naturaCrystal; - private IFlexibleBakedModel naturaRingsAndPanes; - private IFlexibleBakedModel naturaGems; - private IFlexibleBakedModel gaiaCrystal; - private IFlexibleBakedModel gaiaRingsAndPanes; - private IFlexibleBakedModel gaiaGems; + private IBakedModel manaCrystal; + private IBakedModel manaRingsAndPanes; + private IBakedModel manaGems; + private IBakedModel naturaCrystal; + private IBakedModel naturaRingsAndPanes; + private IBakedModel naturaGems; + private IBakedModel gaiaCrystal; + private IBakedModel gaiaRingsAndPanes; + private IBakedModel gaiaGems; public ModelPylon() { try { @@ -74,7 +74,7 @@ public class ModelPylon implements IPylonModel { manaGems = manaModel.bake(new OBJModel.OBJState(ImmutableList.of("Ring_Gem01", "Ring_Gem02", "Ring_Gem03", "Ring_Gem04"), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER); naturaGems = naturaModel.bake(new OBJModel.OBJState(ImmutableList.of("Ring_Gem01", "Ring_Gem02", "Ring_Gem03", "Ring_Gem04"), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER); gaiaGems = gaiaModel.bake(new OBJModel.OBJState(ImmutableList.of("Ring_Gem01", "Ring_Gem02", "Ring_Gem03", "Ring_Gem04"), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER); - } catch(IOException e) { + } catch(Exception e) { throw new ReportedException(new CrashReport("Error making pylon submodels for TESR!", e)); } } @@ -128,16 +128,16 @@ public class ModelPylon implements IPylonModel { GlStateManager.enableLighting(); } - private void renderModel(IFlexibleBakedModel model) { + private void renderModel(IBakedModel model) { renderModel(model, -1); } - private void renderModel(IFlexibleBakedModel model, int color) { + private void renderModel(IBakedModel model, int color) { Tessellator tessellator = Tessellator.getInstance(); VertexBuffer worldrenderer = tessellator.getBuffer(); - worldrenderer.begin(GL11.GL_QUADS, model.getFormat()); + worldrenderer.begin(GL11.GL_QUADS, DefaultVertexFormats.ITEM); - this.renderQuads(worldrenderer, model.getGeneralQuads(), color); + this.renderQuads(worldrenderer, model.getQuads(null, null, 0), color); tessellator.draw(); } diff --git a/src/main/java/vazkii/botania/client/model/ModelSpawnerClaw.java b/src/main/java/vazkii/botania/client/model/ModelSpawnerClaw.java deleted file mode 100644 index 4504ef8c6..000000000 --- a/src/main/java/vazkii/botania/client/model/ModelSpawnerClaw.java +++ /dev/null @@ -1,82 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [Jul 23, 2014, 5:46:38 PM (GMT)] - */ -package vazkii.botania.client.model; - -import net.minecraft.client.model.ModelBase; -import net.minecraft.client.model.ModelRenderer; - -public class ModelSpawnerClaw extends ModelBase { - ModelRenderer Plate; - ModelRenderer Claw1; - ModelRenderer Claw2; - ModelRenderer Claw3; - ModelRenderer Claw4; - ModelRenderer Claw5; - ModelRenderer Claw6; - ModelRenderer Claw7; - ModelRenderer Claw8; - - public ModelSpawnerClaw() { - textureWidth = 64; - textureHeight = 32; - - Plate = new ModelRenderer(this, 0, 0); - Plate.addBox(0F, 0F, 0F, 12, 1, 12); - Plate.setRotationPoint(-6F, 23F, -6F); - Plate.setTextureSize(64, 32); - Claw1 = new ModelRenderer(this, 0, 14); - Claw1.addBox(0F, 0F, 0F, 2, 1, 3); - Claw1.setRotationPoint(-1F, 23F, 6F); - Claw1.setTextureSize(64, 32); - Claw2 = new ModelRenderer(this, 11, 14); - Claw2.addBox(0F, 0F, 0F, 2, 1, 3); - Claw2.setRotationPoint(-1F, 23F, -9F); - Claw2.setTextureSize(64, 32); - Claw3 = new ModelRenderer(this, 0, 19); - Claw3.addBox(0F, 0F, 0F, 3, 1, 2); - Claw3.setRotationPoint(-9F, 23F, -1F); - Claw3.setTextureSize(64, 32); - Claw4 = new ModelRenderer(this, 11, 19); - Claw4.addBox(0F, 0F, 0F, 3, 1, 2); - Claw4.setRotationPoint(6F, 23F, -1F); - Claw4.setTextureSize(64, 32); - Claw5 = new ModelRenderer(this, 23, 16); - Claw5.addBox(0F, 0F, 0F, 2, 5, 1); - Claw5.setRotationPoint(-1F, 24F, 8F); - Claw5.setTextureSize(64, 32); - Claw6 = new ModelRenderer(this, 30, 16); - Claw6.addBox(0F, 0F, 0F, 1, 5, 2); - Claw6.setRotationPoint(8F, 24F, -1F); - Claw6.setTextureSize(64, 32); - Claw7 = new ModelRenderer(this, 37, 16); - Claw7.addBox(0F, 0F, 0F, 2, 5, 1); - Claw7.setRotationPoint(-1F, 24F, -9F); - Claw7.setTextureSize(64, 32); - Claw8 = new ModelRenderer(this, 44, 16); - Claw8.addBox(0F, 0F, 0F, 1, 5, 2); - Claw8.setRotationPoint(-9F, 24F, -1F); - Claw8.setTextureSize(64, 32); - } - - public void render() { - float f5 = 1F / 16F; - Plate.render(f5); - Claw1.render(f5); - Claw2.render(f5); - Claw3.render(f5); - Claw4.render(f5); - Claw5.render(f5); - Claw6.render(f5); - Claw7.render(f5); - Claw8.render(f5); - } - -} diff --git a/src/main/java/vazkii/botania/client/model/PylonItemModel.java b/src/main/java/vazkii/botania/client/model/PylonItemModel.java index b44ae3974..8d8539aca 100644 --- a/src/main/java/vazkii/botania/client/model/PylonItemModel.java +++ b/src/main/java/vazkii/botania/client/model/PylonItemModel.java @@ -11,20 +11,21 @@ package vazkii.botania.client.model; import com.google.common.base.Function; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; +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.VertexFormat; import net.minecraft.client.renderer.block.model.IBakedModel; +import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; +import net.minecraft.world.World; import net.minecraftforge.client.model.Attributes; -import net.minecraftforge.client.model.IFlexibleBakedModel; import net.minecraftforge.client.model.IModel; import net.minecraftforge.client.model.IPerspectiveAwareModel; -import net.minecraftforge.client.model.ISmartItemModel; import net.minecraftforge.client.model.TRSRTransformation; import net.minecraftforge.client.model.obj.OBJLoader; import net.minecraftforge.client.model.obj.OBJModel; @@ -38,37 +39,38 @@ import javax.vecmath.Vector3f; import java.io.IOException; import java.util.List; -public class PylonItemModel implements ISmartItemModel { +public class PylonItemModel implements IBakedModel { private IBakedModel mana; private IBakedModel natura; private IBakedModel gaia; private boolean cached = false; + private final ItemOverrideList itemHandler = new ItemOverrideList(ImmutableList.of()) { + @Override + public IBakedModel handleItemState(IBakedModel original, ItemStack stack, World world, EntityLivingBase living) { + if(!cached) { + cacheModels(); + } - @Override - public IBakedModel handleItemState(ItemStack stack) { - if(!cached) { - cacheModels(); + switch(stack.getItemDamage()) { + case 2: + return gaia; + case 1: + return natura; + case 0: + return mana; + default: + return Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getMissingModel(); + } } - - switch(stack.getItemDamage()) { - case 2: - return gaia; - case 1: - return natura; - case 0: - return mana; - default: - return Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getMissingModel(); - } - } + }; private void cacheModels() { // Load the OBJ OBJModel model = null; try { model = ((OBJModel) OBJLoader.instance.loadModel(new ResourceLocation("botania:models/block/pylon.obj"))); - } catch(IOException e) { + } catch(Exception e) { FMLLog.log(Level.ERROR, "[Botania]: Error loading pylon item model, substituting missing model"); mana = Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getMissingModel(); natura = Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getMissingModel(); @@ -98,102 +100,47 @@ public class PylonItemModel implements ISmartItemModel { cached = true; } - @Override - public List getFaceQuads(EnumFacing p_177551_1_) { - return ImmutableList.of(); - } + @Override public List getQuads(IBlockState state, EnumFacing face, long rand) { return ImmutableList.of(); } + @Override public boolean isAmbientOcclusion() { return false; } + @Override public boolean isGui3d() { return true; } + @Override public boolean isBuiltInRenderer() { return false; } + @Override public TextureAtlasSprite getParticleTexture() { return null; } + @Override public ItemCameraTransforms getItemCameraTransforms() { return ItemCameraTransforms.DEFAULT; } @Override - public List getGeneralQuads() { - return ImmutableList.of(); - } - - @Override - public boolean isAmbientOcclusion() { - return false; - } - - @Override - public boolean isGui3d() { - return true; - } - - @Override - public boolean isBuiltInRenderer() { - return false; - } - - @Override - public TextureAtlasSprite getParticleTexture() { - return null; - } - - @Override - public ItemCameraTransforms getItemCameraTransforms() { - return ItemCameraTransforms.DEFAULT; + public ItemOverrideList getOverrides() { + return itemHandler; } // Wrapper to transform the model before rendering it, so it looks right in the inventory private class PerspectiveWrapper implements IPerspectiveAwareModel { - private final IFlexibleBakedModel parent; + private final IBakedModel parent; public PerspectiveWrapper(IBakedModel pylonModel) { - this.parent = new IFlexibleBakedModel.Wrapper(pylonModel, Attributes.DEFAULT_BAKED_FORMAT); + this.parent = pylonModel; } @Override - public Pair handlePerspective(ItemCameraTransforms.TransformType cameraTransformType) { + public Pair handlePerspective(ItemCameraTransforms.TransformType cameraTransformType) { switch(cameraTransformType) { - case FIRST_PERSON: - return ImmutablePair.of(parent, new TRSRTransformation(new Vector3f(0, 0, 0.4F), null, new Vector3f(0.75F, 0.75F, 0.75F), null).getMatrix()); + // todo 1.9 case FIRST_PERSON: + // return ImmutablePair.of(parent, new TRSRTransformation(new Vector3f(0, 0, 0.4F), null, new Vector3f(0.75F, 0.75F, 0.75F), null).getMatrix()); case GUI: return ImmutablePair.of(parent, TRSRTransformation.blockCenterToCorner(new TRSRTransformation(new Vector3f(0.5F, 0.1F, 0), null, null, null)).getMatrix()); - case THIRD_PERSON: - return ImmutablePair.of(parent, new TRSRTransformation(new Vector3f(0, -0.2F, 0.5F), null, null, null).getMatrix()); + // case THIRD_PERSON: + // return ImmutablePair.of(parent, new TRSRTransformation(new Vector3f(0, -0.2F, 0.5F), null, null, null).getMatrix()); default: return ImmutablePair.of(parent, TRSRTransformation.identity().getMatrix()); } } - @Override - public VertexFormat getFormat() { - return Attributes.DEFAULT_BAKED_FORMAT; - } - - @Override - public List getFaceQuads(EnumFacing p_177551_1_) { - return parent.getFaceQuads(p_177551_1_); - } - - @Override - public List getGeneralQuads() { - return parent.getGeneralQuads(); - } - - @Override - public boolean isAmbientOcclusion() { - return parent.isAmbientOcclusion(); - } - - @Override - public boolean isGui3d() { - return parent.isGui3d(); - } - - @Override - public boolean isBuiltInRenderer() { - return parent.isBuiltInRenderer(); - } - - @Override - public TextureAtlasSprite getParticleTexture() { - return parent.getParticleTexture(); - } - - @Override - public ItemCameraTransforms getItemCameraTransforms() { - return parent.getItemCameraTransforms(); - } + @Override public List getQuads(IBlockState state, EnumFacing face, long rand) { return parent.getQuads(state, face, rand); } + @Override public boolean isAmbientOcclusion() { return parent.isAmbientOcclusion(); } + @Override public boolean isGui3d() { return parent.isGui3d(); } + @Override public boolean isBuiltInRenderer() { return parent.isBuiltInRenderer(); } + @Override public TextureAtlasSprite getParticleTexture() { return parent.getParticleTexture(); } + @Override public ItemCameraTransforms getItemCameraTransforms() { return parent.getItemCameraTransforms(); } + @Override public ItemOverrideList getOverrides() { return ItemOverrideList.NONE; } } } diff --git a/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java b/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java index d207fcc40..df5c455ab 100644 --- a/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java +++ b/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java @@ -19,15 +19,18 @@ 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.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.renderer.block.model.ModelResourceLocation; +import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; +import net.minecraft.world.World; import net.minecraftforge.client.model.ICustomModelLoader; import net.minecraftforge.client.model.IModel; import net.minecraftforge.client.model.IModelCustomData; @@ -36,6 +39,7 @@ import net.minecraftforge.client.model.IPerspectiveAwareModel; 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; @@ -145,7 +149,7 @@ public class SpecialFlowerModel implements IModelCustomData { } } - public static class SpecialFlowerBakedModel implements IPerspectiveAwareModel, ISmartBlockModel, ISmartItemModel { + public static class SpecialFlowerBakedModel implements IPerspectiveAwareModel { private final ImmutableMap transforms; private final ImmutableMap, ModelResourceLocation> blockModels; @@ -217,37 +221,48 @@ public class SpecialFlowerModel implements IModelCustomData { private ImmutableList buildQuads(Optional side) { ImmutableList.Builder builder = ImmutableList.builder(); + for(IBakedModel model : bakedBlockModels.values()) { - if(side.isPresent()) { - builder.addAll(model.getFaceQuads(side.get())); - } else { - builder.addAll(model.getGeneralQuads()); - } + builder.addAll(model.getQuads(null, side.orNull(), 0)); } for(IBakedModel model : bakedItemModels.values()) { - if(side.isPresent()) { - builder.addAll(model.getFaceQuads(side.get())); - } else { - builder.addAll(model.getGeneralQuads()); - } + builder.addAll(model.getQuads(null, side.orNull(), 0)); } return builder.build(); } @Override - public List getFaceQuads(EnumFacing side) { + public List getQuads(IBlockState state, EnumFacing face, long rand) { + if(state.getBlock() != ModBlocks.specialFlower) + return Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getMissingModel().getQuads(state, face, rand); refreshBakedModels(); - return quads.get(Optional.of(side)); + IExtendedBlockState extendedState = ((IExtendedBlockState) state); + IBakedModel ret = bakedBlockModels.get(extendedState.getValue(BotaniaStateProps.SUBTILE_ID)); + if(ret == null) + ret = Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getMissingModel(); + return ret.getQuads(state, face, rand); } @Override - public List getGeneralQuads() { - refreshBakedModels(); - return quads.get(Optional.absent()); + public ItemOverrideList getOverrides() { + return itemHandler; } + private final ItemOverrideList itemHandler = new ItemOverrideList(ImmutableList.of()) { + @Override + public IBakedModel handleItemState(IBakedModel original, ItemStack stack, World world, EntityLivingBase living) { + refreshBakedModels(); + IBakedModel item = bakedItemModels.get(ItemBlockSpecialFlower.getType(stack)); + if(item == null) { + item = bakedBlockModels.get(ItemBlockSpecialFlower.getType(stack)); + } + + return item == null ? Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getMissingModel() : item; + } + }; + @Override public boolean isAmbientOcclusion() { refreshBakedModels(); @@ -278,35 +293,9 @@ public class SpecialFlowerModel implements IModelCustomData { } @Override - public IBakedModel handleBlockState(IBlockState state) { - if(state.getBlock() != ModBlocks.specialFlower) - return Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getMissingModel(); - refreshBakedModels(); - IExtendedBlockState extendedState = ((IExtendedBlockState) state); - IBakedModel ret = bakedBlockModels.get(extendedState.getValue(BotaniaStateProps.SUBTILE_ID)); - return ret == null ? Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getMissingModel() : ret; - } - - @Override - public VertexFormat getFormat() { - return vertexFormat; - } - - @Override - public Pair handlePerspective(ItemCameraTransforms.TransformType cameraTransformType) { + public Pair handlePerspective(ItemCameraTransforms.TransformType cameraTransformType) { return IPerspectiveAwareModel.MapWrapper.handlePerspective(this, transforms, cameraTransformType); } - - @Override - public IBakedModel handleItemState(ItemStack stack) { - refreshBakedModels(); - IBakedModel item = bakedItemModels.get(ItemBlockSpecialFlower.getType(stack)); - if(item == null) { - item = bakedBlockModels.get(ItemBlockSpecialFlower.getType(stack)); - } - - return item == null ? Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getMissingModel() : item; - } } } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java b/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java index 6597d5401..74ef06b7c 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java @@ -49,7 +49,7 @@ public class BlockBuriedPetals extends BlockModFlower { } @Override - public void randomDisplayTick(World par1World, BlockPos pos, IBlockState state, Random par5Random) { + public void randomDisplayTick(IBlockState state, World par1World, BlockPos pos, Random par5Random) { EnumDyeColor color = state.getValue(BotaniaStateProps.COLOR); int hex = color.getMapColor().colorValue; int r = (hex & 0xFF0000) >> 16; diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockDistributor.java b/src/main/java/vazkii/botania/common/block/mana/BlockDistributor.java index 036c941de..077a15d1a 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockDistributor.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockDistributor.java @@ -10,6 +10,7 @@ */ package vazkii.botania.common.block.mana; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; @@ -34,11 +35,6 @@ public class BlockDistributor extends BlockMod implements ILexiconable { setUnlocalizedName(LibBlockNames.DISTRIBUTOR); } - @Override - public int getRenderType() { - return 3; - } - @Override public boolean hasTileEntity(IBlockState state) { return true; diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java b/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java index 323e990aa..c3f49a7d4 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java @@ -12,6 +12,7 @@ package vazkii.botania.common.block.mana; import java.util.Random; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; @@ -25,6 +26,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.TextComponentTranslation; import net.minecraft.util.EnumFacing; @@ -100,9 +102,8 @@ public class BlockEnchanter extends BlockMod implements IWandable, ILexiconable, } @Override - public boolean onBlockActivated(World par1World, BlockPos pos, IBlockState state, EntityPlayer par5EntityPlayer, EnumFacing side, float par7, float par8, float par9) { + public boolean onBlockActivated(World par1World, BlockPos pos, IBlockState state, EntityPlayer par5EntityPlayer, EnumHand hand, ItemStack stack, EnumFacing side, float par7, float par8, float par9) { TileEnchanter enchanter = (TileEnchanter) par1World.getTileEntity(pos); - ItemStack stack = par5EntityPlayer.getCurrentEquippedItem(); if(stack != null && stack.getItem() == ModItems.twigWand) return false; diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java b/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java index eddccd1ab..5f82b2be3 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java @@ -13,6 +13,7 @@ package vazkii.botania.common.block.mana; import java.util.Random; 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; @@ -21,10 +22,12 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumHand; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.BlockRenderLayer; +import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -42,7 +45,9 @@ import vazkii.botania.common.lib.LibBlockNames; public class BlockPrism extends BlockMod implements IManaTrigger, ILexiconable { - Random random; + private static final AxisAlignedBB AABB = new AxisAlignedBB(0.25, 0, 0.25, 0.75, 1, 0.75); + + private final Random random = new Random(); public BlockPrism() { super(Material.glass); @@ -51,12 +56,15 @@ public class BlockPrism extends BlockMod implements IManaTrigger, ILexiconable { setLightLevel(1.0F); setUnlocalizedName(LibBlockNames.PRISM); float f = 0.25F; - setBlockBounds(f, 0F, f, 1F - f, 1F, 1F - f); setDefaultState(blockState.getBaseState() .withProperty(BotaniaStateProps.POWERED, false) .withProperty(BotaniaStateProps.HAS_LENS, false) ); - random = new Random(); + } + + @Override + public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { + return AABB; } @Override @@ -83,7 +91,7 @@ public class BlockPrism extends BlockMod implements IManaTrigger, ILexiconable { } @Override - public AxisAlignedBB getCollisionBoundingBox(World p_149668_1_, BlockPos pos, IBlockState state) { + public AxisAlignedBB getCollisionBoundingBox(IBlockState state, World world, BlockPos pos) { return null; } @@ -98,14 +106,13 @@ public class BlockPrism extends BlockMod implements IManaTrigger, ILexiconable { } @Override - public boolean onBlockActivated(World par1World, BlockPos pos, IBlockState state, EntityPlayer par5EntityPlayer, EnumFacing side, float par7, float par8, float par9) { + public boolean onBlockActivated(World par1World, BlockPos pos, IBlockState state, EntityPlayer par5EntityPlayer, EnumHand hand, ItemStack heldItem, EnumFacing side, float par7, float par8, float par9) { TileEntity tile = par1World.getTileEntity(pos); if(!(tile instanceof TilePrism)) return false; TilePrism prism = (TilePrism) tile; ItemStack lens = prism.getItemHandler().getStackInSlot(0); - ItemStack heldItem = par5EntityPlayer.getCurrentEquippedItem(); boolean isHeldItemLens = heldItem != null && heldItem.getItem() instanceof ILens; if(lens == null && isHeldItemLens) { diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockRFGenerator.java b/src/main/java/vazkii/botania/common/block/mana/BlockRFGenerator.java index e7a8a7685..1c1fa7f72 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockRFGenerator.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockRFGenerator.java @@ -10,6 +10,7 @@ */ package vazkii.botania.common.block.mana; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java b/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java index 233346149..43368594c 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java @@ -12,6 +12,7 @@ package vazkii.botania.common.block.mana; import java.util.Random; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.item.EntityItem; @@ -19,8 +20,11 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumHand; +import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.lexicon.ILexiconable; @@ -34,19 +38,22 @@ import vazkii.botania.common.lib.LibBlockNames; public class BlockRuneAltar extends BlockMod implements IWandable, ILexiconable { - Random random; + private static final AxisAlignedBB AABB = new AxisAlignedBB(0, 0, 0, 1, 0.75, 1); + + private final Random random = new Random(); public BlockRuneAltar() { super(Material.rock); - setBlockBounds(0F, 0F, 0F, 1F, 0.75F, 1F); setHardness(2.0F); setResistance(10.0F); setSoundType(SoundType.STONE); setUnlocalizedName(LibBlockNames.RUNE_ALTAR); - BotaniaAPI.blacklistBlockFromMagnet(this, Short.MAX_VALUE); + } - random = new Random(); + @Override + public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { + return AABB; } @Override @@ -60,9 +67,8 @@ public class BlockRuneAltar extends BlockMod implements IWandable, ILexiconable } @Override - public boolean onBlockActivated(World par1World, BlockPos pos, IBlockState state, EntityPlayer par5EntityPlayer, EnumFacing side, float par7, float par8, float par9) { + public boolean onBlockActivated(World par1World, BlockPos pos, IBlockState state, EntityPlayer par5EntityPlayer, EnumHand hand, ItemStack stack, EnumFacing side, float par7, float par8, float par9) { TileRuneAltar altar = (TileRuneAltar) par1World.getTileEntity(pos); - ItemStack stack = par5EntityPlayer.getCurrentEquippedItem(); if(par5EntityPlayer.isSneaking()) { if(altar.manaToGet == 0) @@ -133,12 +139,12 @@ public class BlockRuneAltar extends BlockMod implements IWandable, ILexiconable } @Override - public boolean hasComparatorInputOverride() { + public boolean hasComparatorInputOverride(IBlockState state) { return true; } @Override - public int getComparatorInputOverride(World par1World, BlockPos pos) { + public int getComparatorInputOverride(IBlockState state, World par1World, BlockPos pos) { TileRuneAltar altar = (TileRuneAltar) par1World.getTileEntity(pos); return altar.signal; } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockTerraPlate.java b/src/main/java/vazkii/botania/common/block/mana/BlockTerraPlate.java index fb879b0ac..bbd0f13f2 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockTerraPlate.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockTerraPlate.java @@ -10,12 +10,15 @@ */ package vazkii.botania.common.block.mana; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumHand; +import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.IBlockAccess; @@ -33,9 +36,10 @@ import vazkii.botania.common.lib.LibObfuscation; public class BlockTerraPlate extends BlockMod implements ILexiconable { + private static final AxisAlignedBB AABB = new AxisAlignedBB(0, 0, 0, 1, 3.0/16, 1); + public BlockTerraPlate() { super(Material.iron); - setBlockBounds(0F, 0F, 0F, 1F, 3F / 16F, 1F); setHardness(3F); setResistance(10F); setSoundType(SoundType.METAL); @@ -46,8 +50,12 @@ public class BlockTerraPlate extends BlockMod implements ILexiconable { } @Override - public boolean onBlockActivated(World worldObj, BlockPos pos, IBlockState state, EntityPlayer player, EnumFacing s, float xs, float ys, float zs) { - ItemStack stack = player.getCurrentEquippedItem(); + public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { + return AABB; + } + + @Override + public boolean onBlockActivated(World worldObj, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack stack, EnumFacing s, float xs, float ys, float zs) { if(stack != null && stack.getItem() == ModItems.manaResource && stack.getItemDamage() < 3) { if(player == null || !player.capabilities.isCreativeMode) { stack.stackSize--; @@ -100,12 +108,12 @@ public class BlockTerraPlate extends BlockMod implements ILexiconable { } @Override - public boolean hasComparatorInputOverride() { + public boolean hasComparatorInputOverride(IBlockState state) { return true; } @Override - public int getComparatorInputOverride(World par1World, BlockPos pos) { + public int getComparatorInputOverride(IBlockState state, World par1World, BlockPos pos) { TileTerraPlate plate = (TileTerraPlate) par1World.getTileEntity(pos); int val = (int) ((double) plate.getCurrentMana() / (double) TileTerraPlate.MAX_MANA * 15.0); if(plate.getCurrentMana() > 0) diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTangleberrie.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTangleberrie.java index 5810e4d93..11c98158a 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTangleberrie.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTangleberrie.java @@ -13,7 +13,6 @@ package vazkii.botania.common.block.subtile.functional; import java.util.List; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.boss.IBossDisplayData; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.math.AxisAlignedBB; import vazkii.botania.api.lexicon.LexiconEntry; @@ -42,7 +41,7 @@ public class SubTileTangleberrie extends SubTileFunctional { List entities = supertile.getWorld().getEntitiesWithinAABB(EntityLivingBase.class, boundingBox); for(EntityLivingBase entity : entities) { - if(entity instanceof EntityPlayer || entity instanceof IBossDisplayData) + if(entity instanceof EntityPlayer || !entity.isNonBoss()) continue; double x2 = entity.posX; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java b/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java index a28d25aae..34e48f92c 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java @@ -21,12 +21,16 @@ import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.network.datasync.DataParameter; +import net.minecraft.network.datasync.DataSerializers; +import net.minecraft.network.datasync.EntityDataManager; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.DamageSource; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; +import vazkii.botania.api.sound.BotaniaSoundEvents; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.LuminizerVariant; import vazkii.botania.api.wand.IWandBindable; @@ -48,14 +52,14 @@ public class TileLightRelay extends TileMod implements IWandBindable { int ticksElapsed = 0; public void mountEntity(Entity e) { - if(e.ridingEntity != null || worldObj.isRemote || bindPos.getY() == -1 || !isValidBinding()) + if(e.isRiding() || worldObj.isRemote || bindPos.getY() == -1 || !isValidBinding()) return; EntityPlayerMover mover = new EntityPlayerMover(worldObj, pos, bindPos); worldObj.spawnEntityInWorld(mover); e.startRiding(mover); if(!(e instanceof EntityItem)) { - worldObj.playSoundAtEntity(mover, "botania:lightRelay", 0.2F, (float) Math.random() * 0.3F + 0.7F); + mover.playSound(BotaniaSoundEvents.lightRelay, 0.2F, (float) Math.random() * 0.3F + 0.7F); if(e instanceof EntityPlayer) ((EntityPlayer) e).addStat(ModAchievements.luminizerRide, 1); } @@ -178,6 +182,8 @@ public class TileLightRelay extends TileMod implements IWandBindable { private static final String TAG_EXIT_X = "exitX"; private static final String TAG_EXIT_Y = "exitY"; private static final String TAG_EXIT_Z = "exitZ"; + private static final DataParameter EXIT_POS = EntityDataManager.createKey(EntityPlayerMover.class, DataSerializers.BLOCK_POS); + public EntityPlayerMover(World world) { super(world); @@ -193,13 +199,7 @@ public class TileLightRelay extends TileMod implements IWandBindable { protected void entityInit() { setSize(0F, 0F); noClip = true; - - dataWatcher.addObject(20, 0); - dataWatcher.addObject(21, 0); - dataWatcher.addObject(22, 0); - dataWatcher.setObjectWatched(20); - dataWatcher.setObjectWatched(21); - dataWatcher.setObjectWatched(22); + dataWatcher.register(EXIT_POS, BlockPos.ORIGIN); } @Override @@ -211,9 +211,9 @@ public class TileLightRelay extends TileMod implements IWandBindable { return; } - boolean isItem = riddenByEntity instanceof EntityItem; + boolean isItem = getRidingEntity() instanceof EntityItem; if(!isItem && ticksExisted % 30 == 0) - worldObj.playSoundAtEntity(this, "botania:lightRelay", 0.05F, (float) Math.random() * 0.3F + 0.7F); + playSound(BotaniaSoundEvents.lightRelay, 0.05F, (float) Math.random() * 0.3F + 0.7F); BlockPos pos = new BlockPos(this); BlockPos exitPos = getExitPos(); @@ -283,17 +283,11 @@ public class TileLightRelay extends TileMod implements IWandBindable { } public BlockPos getExitPos() { - return new BlockPos( - dataWatcher.getWatchableObjectInt(20), - dataWatcher.getWatchableObjectInt(21), - dataWatcher.getWatchableObjectInt(22) - ); + return dataWatcher.get(EXIT_POS); } public void setExit(BlockPos pos) { - dataWatcher.updateObject(20, pos.getX()); - dataWatcher.updateObject(21, pos.getY()); - dataWatcher.updateObject(22, pos.getZ()); + dataWatcher.set(EXIT_POS, pos); } } diff --git a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java index 2787ae62c..c2b7cc223 100644 --- a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java +++ b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java @@ -52,7 +52,7 @@ public final class BotaniaCreativeTab extends CreativeTabs { } @Override - public void displayAllReleventItems(List list) { + public void displayAllRelevantItems(List list) { this.list = list; addItem(ModItems.lexicon); diff --git a/src/main/java/vazkii/botania/common/core/command/CommandOpen.java b/src/main/java/vazkii/botania/common/core/command/CommandOpen.java index 9814ed898..31d4a778f 100644 --- a/src/main/java/vazkii/botania/common/core/command/CommandOpen.java +++ b/src/main/java/vazkii/botania/common/core/command/CommandOpen.java @@ -19,6 +19,7 @@ import net.minecraft.util.text.Style; import net.minecraft.util.text.TextComponentTranslation; import net.minecraft.util.text.Style; import net.minecraft.util.text.TextFormatting; +import vazkii.botania.common.core.helper.PlayerHelper; import vazkii.botania.common.item.ItemLexicon; public class CommandOpen extends CommandBase { @@ -37,8 +38,8 @@ public class CommandOpen extends CommandBase { public void execute(MinecraftServer server, ICommandSender sender, String[] args) { if(sender instanceof EntityPlayer) { EntityPlayer player = (EntityPlayer) sender; - ItemStack stack = player.getCurrentEquippedItem(); - if(stack != null && stack.getItem() instanceof ItemLexicon) { + ItemStack stack = PlayerHelper.getFirstHeldItemClass(player, ItemLexicon.class); + if(stack != null) { ItemLexicon.setForcedPage(stack, args[0]); ItemLexicon.setQueueTicks(stack, 5); } else sender.addChatMessage(new TextComponentTranslation("botaniamisc.noLexicon").setChatStyle(new Style().setColor(TextFormatting.RED))); diff --git a/src/main/java/vazkii/botania/common/core/handler/ChestGenHandler.java b/src/main/java/vazkii/botania/common/core/handler/ChestGenHandler.java index b5b1315d9..4675c1958 100644 --- a/src/main/java/vazkii/botania/common/core/handler/ChestGenHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/ChestGenHandler.java @@ -12,12 +12,12 @@ package vazkii.botania.common.core.handler; import net.minecraft.item.ItemStack; import net.minecraft.util.WeightedRandomChestContent; -import net.minecraftforge.common.ChestGenHooks; import vazkii.botania.common.item.ModItems; public final class ChestGenHandler { public static void init() { + /* todo loot tables String c = ChestGenHooks.BONUS_CHEST; ChestGenHooks.addItem(c, new WeightedRandomChestContent(new ItemStack(ModItems.lexicon), 1, 1, 7)); ChestGenHooks.addItem(c, new WeightedRandomChestContent(new ItemStack(ModItems.blackLotus), 1, 1, 1)); @@ -48,7 +48,7 @@ public final class ChestGenHandler { ChestGenHooks.addItem(c, new WeightedRandomChestContent(new ItemStack(ModItems.overgrowthSeed), 1, 1, 2)); c = ChestGenHooks.VILLAGE_BLACKSMITH; - ChestGenHooks.addItem(c, new WeightedRandomChestContent(new ItemStack(ModItems.blackLotus), 1, 1, 6)); + ChestGenHooks.addItem(c, new WeightedRandomChestContent(new ItemStack(ModItems.blackLotus), 1, 1, 6));*/ } } diff --git a/src/main/java/vazkii/botania/common/core/handler/PixieHandler.java b/src/main/java/vazkii/botania/common/core/handler/PixieHandler.java index 770ae47d9..d317622a6 100644 --- a/src/main/java/vazkii/botania/common/core/handler/PixieHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/PixieHandler.java @@ -2,12 +2,14 @@ package vazkii.botania.common.core.handler; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.MobEffects; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraftforge.event.entity.living.LivingHurtEvent; import vazkii.botania.api.item.IPixieSpawner; +import vazkii.botania.common.core.helper.PlayerHelper; import vazkii.botania.common.entity.EntityPixie; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.armor.elementium.ItemElementiumHelm; @@ -21,7 +23,7 @@ public class PixieHandler { public void onDamageTaken(LivingHurtEvent event) { if(!event.entityLiving.worldObj.isRemote && event.entityLiving instanceof EntityPlayer && event.source.getEntity() != null && event.source.getEntity() instanceof EntityLivingBase) { EntityPlayer player = (EntityPlayer) event.entityLiving; - ItemStack stack = player.getCurrentEquippedItem(); + ItemStack stack = PlayerHelper.getFirstHeldItemClass(player, IPixieSpawner.class); float chance = getChance(stack); for (ItemStack element : player.inventory.armorInventory) @@ -36,11 +38,11 @@ public class PixieHandler { pixie.setPosition(player.posX, player.posY + 2, player.posZ); if(((ItemElementiumHelm) ModItems.elementiumHelm).hasArmorSet(player)) { - int[] potions = new int[] { - Potion.blindness.id, - Potion.wither.id, - Potion.moveSlowdown.id, - Potion.weakness.id + Potion[] potions = { + MobEffects.blindness, + MobEffects.wither, + MobEffects.moveSlowdown, + MobEffects.weakness }; pixie.setApplyPotionEffect(new PotionEffect(potions[event.entity.worldObj.rand.nextInt(potions.length)], 40, 0)); } @@ -58,12 +60,7 @@ public class PixieHandler { float getChance(ItemStack stack) { if(stack == null) return 0F; - - Item item = stack.getItem(); - if(item instanceof IPixieSpawner) - return ((IPixieSpawner) item).getPixieChance(stack); - - return 0F; + else return ((IPixieSpawner) stack.getItem()).getPixieChance(stack); } } diff --git a/src/main/java/vazkii/botania/common/core/helper/Vector3.java b/src/main/java/vazkii/botania/common/core/helper/Vector3.java index 7fd86921d..2e1f6e7fb 100644 --- a/src/main/java/vazkii/botania/common/core/helper/Vector3.java +++ b/src/main/java/vazkii/botania/common/core/helper/Vector3.java @@ -13,6 +13,7 @@ package vazkii.botania.common.core.helper; import java.math.BigDecimal; import java.math.MathContext; import java.math.RoundingMode; +import java.util.Objects; import net.minecraft.entity.Entity; import net.minecraft.tileentity.TileEntity; @@ -71,7 +72,7 @@ public class Vector3 } public static Vector3 fromEntityCenter(Entity e) { - return new Vector3(e.posX, e.posY - /*e.yOffset todo 1.8 */ 0 + e.height / 2, e.posZ); + return new Vector3(e.posX, e.posY - e.getYOffset() + e.height / 2, e.posZ); } public static Vector3 fromTileEntity(TileEntity e) { @@ -253,12 +254,10 @@ public class Vector3 return x == 0 ? y == 0 || z == 0 : y == 0 && z == 0; } - @SideOnly(Side.CLIENT) public Vector3f vector3f() { return new Vector3f((float)x, (float)y, (float)z); } - @SideOnly(Side.CLIENT) public Vector4f vector4f() { return new Vector4f((float)x, (float)y, (float)z, 1); } @@ -305,4 +304,9 @@ public class Vector3 Vector3 v = (Vector3)o; return x == v.x && y == v.y && z == v.z; } + + @Override + public int hashCode() { + return Objects.hash(x, y, z); + } } \ No newline at end of file diff --git a/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java b/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java index f083cd983..8972fac73 100644 --- a/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java +++ b/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java @@ -256,7 +256,7 @@ public class CommonProxy { public void setExtraReach(EntityLivingBase entity, float reach) { if(entity instanceof EntityPlayerMP) - ((EntityPlayerMP) entity).theItemInWorldManager.setBlockReachDistance(Math.max(5, ((EntityPlayerMP) entity).theItemInWorldManager.getBlockReachDistance() + reach)); + ((EntityPlayerMP) entity).interactionManager.setBlockReachDistance(Math.max(5, ((EntityPlayerMP) entity).interactionManager.getBlockReachDistance() + reach)); } public boolean openWikiPage(World world, Block block, RayTraceResult pos) { @@ -276,7 +276,7 @@ public class CommonProxy { } public long getWorldElapsedTicks() { - return MinecraftServer.getServer().worldServers[0].getTotalWorldTime(); + return FMLCommonHandler.instance().getMinecraftServerInstance().worldServers[0].getTotalWorldTime(); } public void setSparkleFXNoClip(boolean noclip) { diff --git a/src/main/java/vazkii/botania/common/core/version/VersionChecker.java b/src/main/java/vazkii/botania/common/core/version/VersionChecker.java index 4bd9d7884..265c4a6aa 100644 --- a/src/main/java/vazkii/botania/common/core/version/VersionChecker.java +++ b/src/main/java/vazkii/botania/common/core/version/VersionChecker.java @@ -17,6 +17,7 @@ import net.minecraft.util.text.Style; import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.translation.I18n; +import net.minecraftforge.common.MinecraftForge; import vazkii.botania.common.lib.LibMisc; import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; @@ -36,7 +37,7 @@ public final class VersionChecker { public void init() { new ThreadVersionChecker(); - FMLCommonHandler.instance().bus().register(this); + MinecraftForge.EVENT_BUS.register(this); } @SubscribeEvent diff --git a/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java b/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java index bca62ff86..fcb16afbb 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java +++ b/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java @@ -13,13 +13,19 @@ package vazkii.botania.common.entity; import java.util.ArrayList; import java.util.List; +import com.google.common.base.Optional; import com.google.common.base.Predicates; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.EnumDyeColor; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.network.datasync.DataParameter; +import net.minecraft.network.datasync.DataSerializers; +import net.minecraft.network.datasync.EntityDataManager; +import net.minecraft.util.EnumHand; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; @@ -38,12 +44,18 @@ public class EntityCorporeaSpark extends Entity implements ICorporeaSpark { private static final String TAG_NETWORK = "network"; private static final String TAG_INVIS = "invis"; - ICorporeaSpark master; - List connections = new ArrayList<>(); - List connectionsClient = new ArrayList<>(); - List relatives = new ArrayList<>(); - boolean firstUpdateClient = true; - boolean firstUpdateServer = true; + private static final DataParameter MASTER = EntityDataManager.createKey(EntityCorporeaSpark.class, DataSerializers.BOOLEAN); + private static final DataParameter NETWORK = EntityDataManager.createKey(EntityCorporeaSpark.class, DataSerializers.VARINT); + private static final DataParameter INVISIBILITY = EntityDataManager.createKey(EntityCorporeaSpark.class, DataSerializers.VARINT); + private static final DataParameter ITEM_DISPLAY_TICKS = EntityDataManager.createKey(EntityCorporeaSpark.class, DataSerializers.VARINT); + private static final DataParameter> DISPLAY_STACK = EntityDataManager.createKey(EntityCorporeaSpark.class, DataSerializers.OPTIONAL_ITEM_STACK); + + private ICorporeaSpark master; + private List connections = new ArrayList<>(); + private List connectionsClient = new ArrayList<>(); + private List relatives = new ArrayList<>(); + private boolean firstUpdateClient = true; + private boolean firstUpdateServer = true; public EntityCorporeaSpark(World world) { super(world); @@ -53,17 +65,11 @@ public class EntityCorporeaSpark extends Entity implements ICorporeaSpark { @Override protected void entityInit() { setSize(0.1F, 0.5F); - dataWatcher.addObject(EntitySpark.INVISIBILITY_DATA_WATCHER_KEY, 0); - dataWatcher.addObject(28, 0); - dataWatcher.addObject(29, 0); - dataWatcher.addObject(30, 0); - dataWatcher.addObject(31, new ItemStack(Blocks.stone, 0, 0)); - - dataWatcher.setObjectWatched(EntitySpark.INVISIBILITY_DATA_WATCHER_KEY); - dataWatcher.setObjectWatched(28); - dataWatcher.setObjectWatched(29); - dataWatcher.setObjectWatched(30); - dataWatcher.setObjectWatched(31); + dataWatcher.register(INVISIBILITY, 0); + dataWatcher.register(MASTER, false); + dataWatcher.register(NETWORK, 0); + dataWatcher.register(ITEM_DISPLAY_TICKS, 0); + dataWatcher.register(DISPLAY_STACK, Optional.absent()); } @Override @@ -222,42 +228,41 @@ public class EntityCorporeaSpark extends Entity implements ICorporeaSpark { } public void setMaster(boolean master) { - dataWatcher.updateObject(28, master ? 1 : 0); + dataWatcher.set(MASTER, master); } @Override public boolean isMaster() { - return dataWatcher.getWatchableObjectInt(28) == 1; + return dataWatcher.get(MASTER); } public void setNetwork(EnumDyeColor network) { - dataWatcher.updateObject(29, network.getMetadata()); + dataWatcher.set(NETWORK, network.getMetadata()); } @Override public EnumDyeColor getNetwork() { - return EnumDyeColor.byMetadata(dataWatcher.getWatchableObjectInt(29)); + return EnumDyeColor.byMetadata(dataWatcher.get(NETWORK)); } public int getItemDisplayTicks() { - return dataWatcher.getWatchableObjectInt(30); + return dataWatcher.get(ITEM_DISPLAY_TICKS); } public void setItemDisplayTicks(int ticks) { - dataWatcher.updateObject(30, ticks); + dataWatcher.set(ITEM_DISPLAY_TICKS, ticks); } - public ItemStack getDisplayedItem() { - return dataWatcher.getWatchableObjectItemStack(31); + public Optional getDisplayedItem() { + return dataWatcher.get(DISPLAY_STACK); } public void setDisplayedItem(ItemStack stack) { - dataWatcher.updateObject(31, stack); + dataWatcher.set(DISPLAY_STACK, Optional.fromNullable(stack)); } @Override - public boolean interactFirst(EntityPlayer player) { - ItemStack stack = player.getCurrentEquippedItem(); + public boolean processInitialInteract(EntityPlayer player, ItemStack stack, EnumHand hand) { if(stack != null) { if(stack.getItem() == ModItems.twigWand) { if(player.isSneaking()) { @@ -265,7 +270,7 @@ public class EntityCorporeaSpark extends Entity implements ICorporeaSpark { if(isMaster()) restartNetwork(); if(player.worldObj.isRemote) - player.swingItem(); + player.swingArm(hand); return true; } else { displayRelatives(new ArrayList<>(), master); @@ -282,7 +287,7 @@ public class EntityCorporeaSpark extends Entity implements ICorporeaSpark { stack.stackSize--; if(player.worldObj.isRemote) - player.swingItem(); + player.swingArm(hand); } } } @@ -292,8 +297,8 @@ public class EntityCorporeaSpark extends Entity implements ICorporeaSpark { public boolean doPhantomInk(ItemStack stack) { if(stack != null && stack.getItem() == ModItems.phantomInk && !worldObj.isRemote) { - int invis = dataWatcher.getWatchableObjectInt(EntitySpark.INVISIBILITY_DATA_WATCHER_KEY); - dataWatcher.updateObject(EntitySpark.INVISIBILITY_DATA_WATCHER_KEY, ~invis & 1); + int invis = dataWatcher.get(INVISIBILITY); + dataWatcher.set(INVISIBILITY, ~invis & 1); return true; } @@ -304,14 +309,14 @@ public class EntityCorporeaSpark extends Entity implements ICorporeaSpark { protected void readEntityFromNBT(NBTTagCompound cmp) { setMaster(cmp.getBoolean(TAG_MASTER)); setNetwork(EnumDyeColor.byMetadata(cmp.getInteger(TAG_NETWORK))); - dataWatcher.updateObject(EntitySpark.INVISIBILITY_DATA_WATCHER_KEY, cmp.getInteger(TAG_INVIS)); + dataWatcher.set(INVISIBILITY, cmp.getInteger(TAG_INVIS)); } @Override protected void writeEntityToNBT(NBTTagCompound cmp) { cmp.setBoolean(TAG_MASTER, isMaster()); cmp.setInteger(TAG_NETWORK, getNetwork().getMetadata()); - cmp.setInteger(TAG_INVIS, dataWatcher.getWatchableObjectInt(EntitySpark.INVISIBILITY_DATA_WATCHER_KEY)); + cmp.setInteger(TAG_INVIS, dataWatcher.get(INVISIBILITY)); } } diff --git a/src/main/java/vazkii/botania/common/entity/EntityFallingStar.java b/src/main/java/vazkii/botania/common/entity/EntityFallingStar.java index 00b329bfe..c7b74eddd 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityFallingStar.java +++ b/src/main/java/vazkii/botania/common/entity/EntityFallingStar.java @@ -13,6 +13,7 @@ package vazkii.botania.common.entity; import java.util.List; import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.math.AxisAlignedBB; @@ -75,9 +76,9 @@ public class EntityFallingStar extends EntityThrowableCopy { } if (pos.getBlockPos() != null) { - Block block = worldObj.getBlockState(pos.getBlockPos()).getBlock(); - if(ConfigHandler.blockBreakParticles && !block.isAir(worldObj, pos.getBlockPos())) - worldObj.playAuxSFX(2001, pos.getBlockPos(), Block.getStateId(worldObj.getBlockState(pos.getBlockPos()))); + IBlockState state = worldObj.getBlockState(pos.getBlockPos()); + if(ConfigHandler.blockBreakParticles && !state.getBlock().isAir(state, worldObj, pos.getBlockPos())) + worldObj.playAuxSFX(2001, pos.getBlockPos(), Block.getStateId(state)); } setDead(); diff --git a/src/main/java/vazkii/botania/common/entity/EntityPixie.java b/src/main/java/vazkii/botania/common/entity/EntityPixie.java index 0fe541d27..2ee61d8cf 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityPixie.java +++ b/src/main/java/vazkii/botania/common/entity/EntityPixie.java @@ -13,6 +13,9 @@ package vazkii.botania.common.entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.network.datasync.DataParameter; +import net.minecraft.network.datasync.DataSerializers; +import net.minecraft.network.datasync.EntityDataManager; import net.minecraft.potion.PotionEffect; import net.minecraft.util.DamageSource; import net.minecraft.world.World; @@ -20,9 +23,11 @@ import vazkii.botania.common.Botania; public class EntityPixie extends EntityFlyingCreature { - EntityLivingBase summoner = null; - float damage = 0; - PotionEffect effect = null; + private static final DataParameter TYPE = EntityDataManager.createKey(EntityPixie.class, DataSerializers.VARINT); + + private EntityLivingBase summoner = null; + private float damage = 0; + private PotionEffect effect = null; public EntityPixie(World world) { super(world); @@ -32,21 +37,21 @@ public class EntityPixie extends EntityFlyingCreature { @Override protected void entityInit() { super.entityInit(); - dataWatcher.addObject(20, 0); + dataWatcher.register(TYPE, 0); } @Override protected void applyEntityAttributes() { super.applyEntityAttributes(); - getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(2.0); + getEntityAttribute(SharedMonsterAttributes.MAX_HEALTH).setBaseValue(2.0); } public void setType(int type) { - dataWatcher.updateObject(20, type); + dataWatcher.set(TYPE, type); } public int getType() { - return dataWatcher.getWatchableObjectInt(20); + return dataWatcher.get(TYPE); } public void setProps(EntityLivingBase target, EntityLivingBase summoner, int type, float damage) { diff --git a/src/main/java/vazkii/botania/common/entity/EntitySignalFlare.java b/src/main/java/vazkii/botania/common/entity/EntitySignalFlare.java index f82c867d0..5326e95d0 100644 --- a/src/main/java/vazkii/botania/common/entity/EntitySignalFlare.java +++ b/src/main/java/vazkii/botania/common/entity/EntitySignalFlare.java @@ -11,25 +11,28 @@ package vazkii.botania.common.entity; import net.minecraft.entity.Entity; +import net.minecraft.init.SoundEvents; import net.minecraft.item.EnumDyeColor; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.network.datasync.DataParameter; +import net.minecraft.network.datasync.DataSerializers; +import net.minecraft.network.datasync.EntityDataManager; import net.minecraft.world.World; import vazkii.botania.common.Botania; public class EntitySignalFlare extends Entity { private static final String COLOR_TAG = "color"; + private static final DataParameter COLOR = EntityDataManager.createKey(EntitySignalFlare.class, DataSerializers.VARINT); public EntitySignalFlare(World par1World) { super(par1World); setSize(0F, 0F); - dataWatcher.addObject(30, 0); - dataWatcher.setObjectWatched(30); } @Override protected void entityInit() { - // NO-OP + dataWatcher.register(COLOR, 0); } @Override @@ -40,7 +43,7 @@ public class EntitySignalFlare extends Entity { if(!isDead) { if(ticksExisted % 10 == 0) - playSound("creeper.primed", 1F, 1F); + playSound(SoundEvents.entity_creeper_primed, 1F, 1F); int color = getColor(); if(color < 16 && color >= 0) { @@ -71,11 +74,11 @@ public class EntitySignalFlare extends Entity { } public void setColor(int color) { - dataWatcher.updateObject(30, color); + dataWatcher.set(COLOR, color); } public int getColor() { - return dataWatcher.getWatchableObjectInt(30); + return dataWatcher.get(COLOR); } } diff --git a/src/main/java/vazkii/botania/common/entity/EntitySpark.java b/src/main/java/vazkii/botania/common/entity/EntitySpark.java index 3cf3d49be..a14e79347 100644 --- a/src/main/java/vazkii/botania/common/entity/EntitySpark.java +++ b/src/main/java/vazkii/botania/common/entity/EntitySpark.java @@ -25,7 +25,11 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.network.datasync.DataParameter; +import net.minecraft.network.datasync.DataSerializers; +import net.minecraft.network.datasync.EntityDataManager; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; @@ -45,7 +49,8 @@ public class EntitySpark extends Entity implements ISparkEntity { private static final int TRANSFER_RATE = 1000; private static final String TAG_UPGRADE = "upgrade"; private static final String TAG_INVIS = "invis"; - public static final int INVISIBILITY_DATA_WATCHER_KEY = 27; + private static final DataParameter INVISIBILITY = EntityDataManager.createKey(EntitySpark.class, DataSerializers.VARINT); + private static final DataParameter UPGRADE = EntityDataManager.createKey(EntitySpark.class, DataSerializers.VARINT); Set transfers = Collections.newSetFromMap(new WeakHashMap<>()); @@ -60,10 +65,8 @@ public class EntitySpark extends Entity implements ISparkEntity { @Override protected void entityInit() { setSize(0.1F, 0.5F); - dataWatcher.addObject(INVISIBILITY_DATA_WATCHER_KEY, 0); - dataWatcher.addObject(28, 0); - dataWatcher.setObjectWatched(INVISIBILITY_DATA_WATCHER_KEY); - dataWatcher.setObjectWatched(28); + dataWatcher.register(INVISIBILITY, 0); + dataWatcher.register(UPGRADE, 0); } @Override @@ -250,8 +253,7 @@ public class EntitySpark extends Entity implements ISparkEntity { } @Override - public boolean interactFirst(EntityPlayer player) { - ItemStack stack = player.getCurrentEquippedItem(); + public boolean processInitialInteract(EntityPlayer player, ItemStack stack, EnumHand hand) { if(stack != null) { SparkUpgradeType upgrade = getUpgrade(); if(stack.getItem() == ModItems.twigWand) { @@ -265,7 +267,7 @@ public class EntitySpark extends Entity implements ISparkEntity { removeTransferants = 2; } else setDead(); if(player.worldObj.isRemote) - player.swingItem(); + player.swingArm(hand); return true; } else { List allSparks = SparkHelper.getSparksAround(worldObj, posX, posY, posZ); @@ -278,7 +280,7 @@ public class EntitySpark extends Entity implements ISparkEntity { setUpgrade(SparkUpgradeType.values()[newUpgrade]); stack.stackSize--; if(player.worldObj.isRemote) - player.swingItem(); + player.swingArm(hand); return true; } } @@ -288,8 +290,8 @@ public class EntitySpark extends Entity implements ISparkEntity { public boolean doPhantomInk(ItemStack stack) { if(stack != null && stack.getItem() == ModItems.phantomInk && !worldObj.isRemote) { - int invis = dataWatcher.getWatchableObjectInt(INVISIBILITY_DATA_WATCHER_KEY); - dataWatcher.updateObject(INVISIBILITY_DATA_WATCHER_KEY, ~invis & 1); + int invis = dataWatcher.get(INVISIBILITY); + dataWatcher.set(INVISIBILITY, ~invis & 1); return true; } @@ -299,13 +301,13 @@ public class EntitySpark extends Entity implements ISparkEntity { @Override protected void readEntityFromNBT(NBTTagCompound cmp) { setUpgrade(SparkUpgradeType.values()[cmp.getInteger(TAG_UPGRADE)]); - dataWatcher.updateObject(INVISIBILITY_DATA_WATCHER_KEY, cmp.getInteger(TAG_INVIS)); + dataWatcher.set(INVISIBILITY, cmp.getInteger(TAG_INVIS)); } @Override protected void writeEntityToNBT(NBTTagCompound cmp) { cmp.setInteger(TAG_UPGRADE, getUpgrade().ordinal()); - cmp.setInteger(TAG_INVIS, dataWatcher.getWatchableObjectInt(INVISIBILITY_DATA_WATCHER_KEY)); + cmp.setInteger(TAG_INVIS, dataWatcher.get(INVISIBILITY)); } @Override @@ -367,12 +369,12 @@ public class EntitySpark extends Entity implements ISparkEntity { @Override public SparkUpgradeType getUpgrade() { - return SparkUpgradeType.values()[dataWatcher.getWatchableObjectInt(28)]; + return SparkUpgradeType.values()[dataWatcher.get(UPGRADE)]; } @Override public void setUpgrade(SparkUpgradeType upgrade) { - dataWatcher.updateObject(28, upgrade.ordinal()); + dataWatcher.set(UPGRADE, upgrade.ordinal()); } @Override diff --git a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java b/src/main/java/vazkii/botania/common/item/ItemTwigWand.java index 15de9239a..02009115f 100644 --- a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java +++ b/src/main/java/vazkii/botania/common/item/ItemTwigWand.java @@ -30,6 +30,7 @@ import net.minecraft.util.math.RayTraceResult; import net.minecraft.util.text.translation.I18n; import net.minecraft.world.World; import vazkii.botania.api.internal.VanillaPacketDispatcher; +import vazkii.botania.api.sound.BotaniaSoundEvents; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.wand.ICoordBoundItem; import vazkii.botania.api.wand.ITileBound; @@ -61,7 +62,7 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem { } @Override - public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, BlockPos pos, EnumFacing side, float par8, float par9, float par10) { + public EnumActionResult onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, BlockPos pos, EnumHand hand, EnumFacing side, float par8, float par9, float par10) { Block block = par3World.getBlockState(pos).getBlock(); BlockPos boundTile = getBoundTile(par1ItemStack); @@ -82,7 +83,7 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem { } else if(par2EntityPlayer.isSneaking()) { block.rotateBlock(par3World, pos, side); if(par3World.isRemote) - par2EntityPlayer.swingItem(); + par2EntityPlayer.swingArm(hand); } if(block == Blocks.lapis_block && ConfigHandler.enchanterEnabled) { @@ -95,7 +96,7 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem { if(axis != null && !par3World.isRemote) { par3World.setBlockState(pos, ModBlocks.enchanter.getDefaultState().withProperty(BotaniaStateProps.ENCHANTER_DIRECTION, axis), 1 | 2); par2EntityPlayer.addStat(ModAchievements.enchanterMake, 1); - par3World.playSoundEffect(pos.getX(), pos.getY(), pos.getZ(), "botania:enchanterBlock", 0.5F, 0.6F); + par3World.playSound(null, pos, BotaniaSoundEvents.enchanterBlock, SoundCategory.BLOCKS, 0.5F, 0.6F); for(int i = 0; i < 50; i++) { float red = (float) Math.random(); float green = (float) Math.random(); @@ -121,14 +122,14 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem { else setBoundTile(par1ItemStack, pos); if(par3World.isRemote) - par2EntityPlayer.swingItem(); - par3World.playSoundAtEntity(par2EntityPlayer, "botania:ding", 0.1F, 1F); + par2EntityPlayer.swingArm(hand); + par3World.playSound(null, par2EntityPlayer.posX, par2EntityPlayer.posY, par2EntityPlayer.posZ, BotaniaSoundEvents.ding, SoundCategory.PLAYERS, 0.11F, 1F); wanded = true; } else { wanded = ((IWandable) block).onUsedByWand(par2EntityPlayer, par1ItemStack, par3World, pos, side); if(wanded && par3World.isRemote) - par2EntityPlayer.swingItem(); + par2EntityPlayer.swingArm(hand); } return wanded; @@ -140,7 +141,7 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem { BlockPistonRelay.mappedPositions.put(bindPos, currentPos); BlockPistonRelay.WorldData.get(par3World).markDirty(); - par3World.playSoundAtEntity(par2EntityPlayer, "botania:ding", 1F, 1F); + par3World.playSound(null, par2EntityPlayer.posX, par2EntityPlayer.posY, par2EntityPlayer.posZ, BotaniaSoundEvents.ding, SoundCategory.PLAYERS, 1F, 1F); } return false; @@ -180,13 +181,13 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem { } @Override - public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { + public ActionResult onItemRightClick(ItemStack stack, World world, EntityPlayer player, EnumHand hand) { if(!world.isRemote && player.isSneaking()) { setBindMode(stack, !getBindMode(stack)); - world.playSoundAtEntity(player, "botania:ding", 0.1F, 1F); + world.playSound(null, player.posX, player.posY, player.posZ, BotaniaSoundEvents.ding, SoundCategory.PLAYERS, 0.1F, 1F); } - return stack; + return ActionResult.newResult(EnumActionResult.SUCCESS, stack); } @Override diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumArmor.java b/src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumArmor.java index 20a8cf819..43b9938c2 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumArmor.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumArmor.java @@ -2,6 +2,7 @@ package vazkii.botania.common.item.equipment.armor.elementium; import java.util.List; +import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraft.client.model.ModelBiped; @@ -18,7 +19,7 @@ import vazkii.botania.common.item.equipment.armor.manasteel.ItemManasteelArmor; public abstract class ItemElementiumArmor extends ItemManasteelArmor implements IPixieSpawner { - public ItemElementiumArmor(int type, String name) { + public ItemElementiumArmor(EntityEquipmentSlot type, String name) { super(type, name, BotaniaAPI.elementiumArmorMaterial); } diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveHelm.java b/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveHelm.java index a0d7cdd3a..325b6989e 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveHelm.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveHelm.java @@ -36,7 +36,7 @@ public class ItemManaweaveHelm extends ItemManaweaveArmor implements IManaDiscou } @Override - public boolean shouldGiveProficiency(ItemStack stack, int slot, EntityPlayer player) { + public boolean shouldGiveProficiency(ItemStack stack, EntityEquipmentSlot slot, EntityPlayer player) { return hasArmorSet(player); } diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelArmor.java b/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelArmor.java index ce39c4c58..f0c0c2394 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelArmor.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelArmor.java @@ -52,14 +52,14 @@ public class ItemTerrasteelArmor extends ItemManasteelArmor { @Override public boolean getIsRepairable(ItemStack par1ItemStack, ItemStack par2ItemStack) { - return par2ItemStack.getItem() == ModItems.manaResource && par2ItemStack.getItemDamage() == 4 ? true : super.getIsRepairable(par1ItemStack, par2ItemStack); + return par2ItemStack.getItem() == ModItems.manaResource && par2ItemStack.getItemDamage() == 4 || super.getIsRepairable(par1ItemStack, par2ItemStack); } @Override public Multimap getAttributeModifiers(EntityEquipmentSlot slot, ItemStack stack) { Multimap multimap = HashMultimap.create(); UUID uuid = new UUID(getUnlocalizedName().hashCode(), 0); - multimap.put(SharedMonsterAttributes.KNOCKBACK_RESISTANCE.getAttributeUnlocalizedName(), new AttributeModifier(uuid, "Terrasteel modifier " + type, (double) getArmorDisplay(null, new ItemStack(this), type) / 20, 0)); + multimap.put(SharedMonsterAttributes.KNOCKBACK_RESISTANCE.getAttributeUnlocalizedName(), new AttributeModifier(uuid, "Terrasteel modifier " + type, (double) getArmorDisplay(null, new ItemStack(this), type.getIndex()) / 20, 0)); return multimap; } diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java index 971716bf2..1c0564804 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java @@ -36,6 +36,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.SoundCategory; import net.minecraft.util.text.translation.I18n; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent; @@ -46,6 +47,7 @@ import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.item.IBaubleRender; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; +import vazkii.botania.api.sound.BotaniaSoundEvents; import vazkii.botania.client.core.handler.MiscellaneousIcons; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.client.core.helper.RenderHelper; @@ -175,7 +177,7 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub if(!wasSprting && isSprinting && cooldown == 0) { p.motionX += look.x; p.motionZ += look.z; - p.worldObj.playSoundAtEntity(p, "botania:dash", 1F, 1F); + p.worldObj.playSound(null, p.posX, p.posY, p.posZ, BotaniaSoundEvents.dash, SoundCategory.PLAYERS, 1F, 1F); ItemNBTHelper.setInt(stack, TAG_DASH_COOLDOWN, maxCd); } else if(cooldown > 0) { if(maxCd - cooldown < 2) @@ -312,7 +314,7 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub if(armor != null && armor.getItem() == this) { int left = ItemNBTHelper.getInt(armor, TAG_TIME_LEFT, MAX_FLY_TIME); boolean flying = ItemNBTHelper.getBoolean(armor, TAG_FLYING, false); - return (left > (flying ? 0 : MAX_FLY_TIME / 10) || player.inventory.hasItem(ModItems.flugelEye)) && ManaItemHandler.requestManaExact(armor, player, getCost(armor, left), false); + return (left > (flying ? 0 : MAX_FLY_TIME / 10) || player.inventory.hasItemStack(new ItemStack(ModItems.flugelEye))) && ManaItemHandler.requestManaExact(armor, player, getCost(armor, left), false); } return false; diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemOdinRing.java b/src/main/java/vazkii/botania/common/item/relic/ItemOdinRing.java index 6e2a4f20e..93ddca992 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemOdinRing.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemOdinRing.java @@ -102,7 +102,7 @@ public class ItemOdinRing extends ItemRelicBauble { void fillModifiers(Multimap attributes, ItemStack stack) { - attributes.put(SharedMonsterAttributes.maxHealth.getAttributeUnlocalizedName(), new AttributeModifier(getBaubleUUID(stack), "Bauble modifier", 20, 0)); + attributes.put(SharedMonsterAttributes.MAX_HEALTH.getAttributeUnlocalizedName(), new AttributeModifier(getBaubleUUID(stack), "Bauble modifier", 20, 0)); } } diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java index 2c83192b9..89ade3110 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java @@ -78,7 +78,7 @@ public class ItemExchangeRod extends ItemMod implements IManaUsingItem, IWirefra if(par2EntityPlayer.isSneaking()) { TileEntity tile = par3World.getTileEntity(pos); if(tile == null) { - if(BlockCamo.isValidBlock(wstate.getBlock())) { + if(BlockCamo.isValidBlock(wstate)) { Item item = Item.getItemFromBlock(wstate.getBlock()); boolean set = setBlock(par1ItemStack, wstate.getBlock(), !item.getHasSubtypes() ? 0 : wstate.getBlock().getMetaFromState(wstate)); diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageEntity.java b/src/main/java/vazkii/botania/common/lexicon/page/PageEntity.java index 51405019e..90ade66e7 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageEntity.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageEntity.java @@ -89,7 +89,7 @@ public class PageEntity extends LexiconPage{ GlStateManager.rotate(rotation, 0.0F, 1.0F, 0.0F); RenderHelper.enableStandardItemLighting(); Minecraft.getMinecraft().getRenderManager().playerViewY = 180.0F; - Minecraft.getMinecraft().getRenderManager().renderEntityWithPosYaw(entity, 0.0D, 0.0D, 0.0D, 0.0F, 1.0F); + Minecraft.getMinecraft().getRenderManager().doRenderEntity(entity, 0.0D, 0.0D, 0.0D, 0.0F, 1.0F, false); GlStateManager.popMatrix(); RenderHelper.disableStandardItemLighting(); GlStateManager.disableRescaleNormal(); diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageRecipe.java b/src/main/java/vazkii/botania/common/lexicon/page/PageRecipe.java index 119d0f683..ec96d14f6 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageRecipe.java @@ -35,6 +35,7 @@ import vazkii.botania.api.lexicon.LexiconRecipeMappings.EntryData; import vazkii.botania.client.gui.lexicon.GuiLexiconEntry; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import vazkii.botania.common.core.helper.PlayerHelper; public class PageRecipe extends LexiconPage { @@ -160,9 +161,9 @@ public class PageRecipe extends LexiconPage { tooltipStack = stack; EntryData data = LexiconRecipeMappings.getDataForStack(tooltipStack); - ItemStack book = Minecraft.getMinecraft().thePlayer.getCurrentEquippedItem(); + ItemStack book = PlayerHelper.getFirstHeldItemClass(Minecraft.getMinecraft().thePlayer, ILexicon.class); - if(data != null && (data.entry != gui.getEntry() || data.page != gui.getPageOn()) && book != null && book.getItem() instanceof ILexicon && ((ILexicon) book.getItem()).isKnowledgeUnlocked(book, data.entry.getKnowledgeType())) { + if(data != null && (data.entry != gui.getEntry() || data.page != gui.getPageOn()) && book != null && ((ILexicon) book.getItem()).isKnowledgeUnlocked(book, data.entry.getKnowledgeType())) { tooltipEntry = true; if(!mouseDownLastTick && mouseDown && GuiScreen.isShiftKeyDown()) {