From 1872d16ca11f3b67325c86600a33d0caba4ff8d5 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 17 Dec 2017 19:58:45 -0600 Subject: [PATCH] Make reach ring use the new forge attribute, and clean up some weirdness around the attribute modifying baubles --- .../api/item/IExtendedPlayerController.java | 28 ------------ .../core/handler/BotaniaPlayerController.java | 44 ------------------- .../client/core/proxy/ClientProxy.java | 44 ------------------- .../botania/common/core/proxy/IProxy.java | 2 - .../common/core/proxy/ServerProxy.java | 7 --- .../item/equipment/bauble/ItemBauble.java | 2 + .../equipment/bauble/ItemBaubleModifier.java | 7 +-- .../equipment/bauble/ItemKnockbackBelt.java | 2 +- .../item/equipment/bauble/ItemReachRing.java | 16 +++---- .../common/item/relic/ItemOdinRing.java | 8 ++-- 10 files changed, 14 insertions(+), 146 deletions(-) delete mode 100644 src/main/java/vazkii/botania/api/item/IExtendedPlayerController.java delete mode 100644 src/main/java/vazkii/botania/client/core/handler/BotaniaPlayerController.java diff --git a/src/main/java/vazkii/botania/api/item/IExtendedPlayerController.java b/src/main/java/vazkii/botania/api/item/IExtendedPlayerController.java deleted file mode 100644 index 707829eea..000000000 --- a/src/main/java/vazkii/botania/api/item/IExtendedPlayerController.java +++ /dev/null @@ -1,28 +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 @ [Aug 6, 2014, 6:02:29 PM (GMT)] - */ -package vazkii.botania.api.item; - -/** - * An interface that defines an instance of PlayerControllerMP with - * the ability to modify reach. See vazkii.botania.client.core.handler.BotaniaPlayerController - */ -public interface IExtendedPlayerController { - - /** - * Sets the extra reach the player should have. - */ - public void setReachDistanceExtension(float f); - - /** - * Gets the current reach extension. - */ - public float getReachDistanceExtension(); -} diff --git a/src/main/java/vazkii/botania/client/core/handler/BotaniaPlayerController.java b/src/main/java/vazkii/botania/client/core/handler/BotaniaPlayerController.java deleted file mode 100644 index 0877b5349..000000000 --- a/src/main/java/vazkii/botania/client/core/handler/BotaniaPlayerController.java +++ /dev/null @@ -1,44 +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 22, 2014, 3:33:25 PM (GMT)] - */ -package vazkii.botania.client.core.handler; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.multiplayer.PlayerControllerMP; -import net.minecraft.client.network.NetHandlerPlayClient; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; -import vazkii.botania.api.item.IExtendedPlayerController; - -@SideOnly(Side.CLIENT) -public class BotaniaPlayerController extends PlayerControllerMP implements IExtendedPlayerController { - - private float distance = 0F; - - public BotaniaPlayerController(Minecraft mc, NetHandlerPlayClient netHandler) { - super(mc, netHandler); - } - - @Override - public float getBlockReachDistance() { - return super.getBlockReachDistance() + distance; - } - - @Override - public void setReachDistanceExtension(float f) { - distance = f; - } - - @Override - public float getReachDistanceExtension() { - return distance; - } - -} diff --git a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java index 87224b990..a1a4930e1 100644 --- a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java @@ -12,10 +12,7 @@ package vazkii.botania.client.core.proxy; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; -import net.minecraft.client.entity.EntityPlayerSP; import net.minecraft.client.model.ModelBiped; -import net.minecraft.client.multiplayer.PlayerControllerMP; -import net.minecraft.client.network.NetHandlerPlayClient; import net.minecraft.client.renderer.entity.RenderPlayer; import net.minecraft.client.renderer.entity.RenderSnowball; import net.minecraft.client.renderer.tileentity.TileEntityItemStackRenderer; @@ -23,7 +20,6 @@ import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.client.renderer.vertex.VertexFormat; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; @@ -37,10 +33,8 @@ import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.common.event.FMLInitializationEvent; import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; -import net.minecraftforge.fml.relauncher.ReflectionHelper; import net.minecraftforge.fml.relauncher.Side; import vazkii.botania.api.boss.IBotaniaBoss; -import vazkii.botania.api.item.IExtendedPlayerController; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.lexicon.multiblock.IMultiblockRenderHook; import vazkii.botania.api.lexicon.multiblock.Multiblock; @@ -49,25 +43,16 @@ import vazkii.botania.api.lexicon.multiblock.component.AnyComponent; import vazkii.botania.api.wiki.IWikiProvider; import vazkii.botania.api.wiki.WikiHooks; import vazkii.botania.client.challenge.ModChallenges; -import vazkii.botania.client.core.handler.AstrolabePreviewHandler; import vazkii.botania.client.core.handler.BaubleRenderHandler; -import vazkii.botania.client.core.handler.BlockHighlightRenderHandler; import vazkii.botania.client.core.handler.BossBarHandler; -import vazkii.botania.client.core.handler.BotaniaPlayerController; import vazkii.botania.client.core.handler.BoundTileRenderer; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.core.handler.ColorHandler; import vazkii.botania.client.core.handler.ContributorFancinessHandler; import vazkii.botania.client.core.handler.CorporeaAutoCompleteHandler; -import vazkii.botania.client.core.handler.DebugHandler; -import vazkii.botania.client.core.handler.HUDHandler; -import vazkii.botania.client.core.handler.LightningHandler; import vazkii.botania.client.core.handler.MiscellaneousIcons; import vazkii.botania.client.core.handler.MultiblockRenderHandler; import vazkii.botania.client.core.handler.PersistentVariableHelper; -import vazkii.botania.client.core.handler.RenderLexicon; -import vazkii.botania.client.core.handler.TooltipAdditionDisplayHandler; -import vazkii.botania.client.core.handler.TooltipHandler; import vazkii.botania.client.core.helper.ShaderHelper; import vazkii.botania.client.fx.FXLightning; import vazkii.botania.client.fx.FXSparkle; @@ -86,10 +71,8 @@ import vazkii.botania.client.render.entity.RenderPoolMinecart; import vazkii.botania.client.render.entity.RenderSnowballStack; import vazkii.botania.client.render.entity.RenderSpark; import vazkii.botania.client.render.tile.*; -import vazkii.botania.client.render.world.SkyblockRenderEvents; import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; -import vazkii.botania.common.block.subtile.functional.BergamuteEventHandler; import vazkii.botania.common.block.tile.*; import vazkii.botania.common.block.tile.corporea.TileCorporeaCrystalCube; import vazkii.botania.common.block.tile.corporea.TileCorporeaIndex; @@ -104,7 +87,6 @@ import vazkii.botania.common.core.helper.MathHelper; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.core.proxy.IProxy; import vazkii.botania.common.core.version.AdaptorNotifier; -import vazkii.botania.common.core.version.VersionChecker; import vazkii.botania.common.entity.EntityBabylonWeapon; import vazkii.botania.common.entity.EntityCorporeaSpark; import vazkii.botania.common.entity.EntityDoppleganger; @@ -120,7 +102,6 @@ import vazkii.botania.common.item.ItemSextant.MultiblockSextant; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.bauble.ItemMonocle; import vazkii.botania.common.lexicon.LexiconData; -import vazkii.botania.common.lib.LibObfuscation; import java.awt.Desktop; import java.io.File; @@ -291,31 +272,6 @@ public class ClientProxy implements IProxy { return ItemMonocle.hasMonocle(Minecraft.getMinecraft().player); } - @Override - public void setExtraReach(EntityLivingBase entity, float reach) { - if(!entity.world.isRemote) { - if(entity instanceof EntityPlayerMP) - ((EntityPlayerMP) entity).interactionManager.setBlockReachDistance(Math.max(5, ((EntityPlayerMP) entity).interactionManager.getBlockReachDistance() + reach)); - } else { - Minecraft mc = Minecraft.getMinecraft(); - EntityPlayerSP player = mc.player; - if(entity == player) { - if(!(mc.playerController instanceof IExtendedPlayerController)) { - NetHandlerPlayClient net = player.connection; - BotaniaPlayerController controller = new BotaniaPlayerController(mc, net); - boolean isFlying = player.capabilities.isFlying; - boolean allowFlying = player.capabilities.allowFlying; - controller.setGameType(mc.playerController.getCurrentGameType()); - player.capabilities.isFlying = isFlying; - player.capabilities.allowFlying = allowFlying; - mc.playerController = controller; - } - - ((IExtendedPlayerController) mc.playerController).setReachDistanceExtension(Math.max(0, ((IExtendedPlayerController) mc.playerController).getReachDistanceExtension() + reach)); - } - } - } - @Override public boolean openWikiPage(World world, Block block, RayTraceResult pos) { IWikiProvider wiki = WikiHooks.getWikiFor(block); diff --git a/src/main/java/vazkii/botania/common/core/proxy/IProxy.java b/src/main/java/vazkii/botania/common/core/proxy/IProxy.java index 4fd6e4154..d47492069 100644 --- a/src/main/java/vazkii/botania/common/core/proxy/IProxy.java +++ b/src/main/java/vazkii/botania/common/core/proxy/IProxy.java @@ -34,8 +34,6 @@ public interface IProxy { String getLastVersion(); - void setExtraReach(EntityLivingBase entity, float reach); - boolean openWikiPage(World world, Block block, RayTraceResult pos); void setMultiblock(World world, int x, int y, int z, double radius, Block block); diff --git a/src/main/java/vazkii/botania/common/core/proxy/ServerProxy.java b/src/main/java/vazkii/botania/common/core/proxy/ServerProxy.java index f4d53aefe..76d2c6684 100644 --- a/src/main/java/vazkii/botania/common/core/proxy/ServerProxy.java +++ b/src/main/java/vazkii/botania/common/core/proxy/ServerProxy.java @@ -13,7 +13,6 @@ package vazkii.botania.common.core.proxy; import net.minecraft.block.Block; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; @@ -66,12 +65,6 @@ public class ServerProxy implements IProxy { return LibMisc.BUILD; } - @Override - public void setExtraReach(EntityLivingBase entity, float reach) { - if(entity instanceof EntityPlayerMP) - ((EntityPlayerMP) entity).interactionManager.setBlockReachDistance(Math.max(5, ((EntityPlayerMP) entity).interactionManager.getBlockReachDistance() + reach)); - } - @Override public boolean openWikiPage(World world, Block block, RayTraceResult pos) { return false; diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java index 339c2820b..f6ed4a9b5 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java @@ -79,6 +79,8 @@ public abstract class ItemBauble extends ItemMod implements IBauble, ICosmeticAt ItemStack stackInSlot = baubles.getStackInSlot(i); if(stackInSlot.isEmpty() || ((IBauble) stackInSlot.getItem()).canUnequip(stackInSlot, player)) { baubles.setStackInSlot(i, toEquip); + ((IBauble) toEquip.getItem()).onEquipped(toEquip, player); + stack.shrink(1); PlayerHelper.grantCriterion((EntityPlayerMP) player, new ResourceLocation(LibMisc.MOD_ID, "main/bauble_wear"), "code_triggered"); diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBaubleModifier.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBaubleModifier.java index df5de3fc8..310ce237c 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBaubleModifier.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBaubleModifier.java @@ -17,23 +17,20 @@ import net.minecraft.entity.ai.attributes.AttributeModifier; import net.minecraft.item.ItemStack; public abstract class ItemBaubleModifier extends ItemBauble { - - final Multimap attributes = HashMultimap.create(); - public ItemBaubleModifier(String name) { super(name); } @Override public void onEquippedOrLoadedIntoWorld(ItemStack stack, EntityLivingBase player) { - attributes.clear(); + Multimap attributes = HashMultimap.create(); fillModifiers(attributes, stack); player.getAttributeMap().applyAttributeModifiers(attributes); } @Override public void onUnequipped(ItemStack stack, EntityLivingBase player) { - attributes.clear(); + Multimap attributes = HashMultimap.create(); fillModifiers(attributes, stack); player.getAttributeMap().removeAttributeModifiers(attributes); } diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemKnockbackBelt.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemKnockbackBelt.java index 1321ac9de..32c99d640 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemKnockbackBelt.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemKnockbackBelt.java @@ -45,7 +45,7 @@ public class ItemKnockbackBelt extends ItemBaubleModifier implements IBaubleRend if(stack.isEmpty()) // workaround for Azanor/Baubles#156 return; - attributes.put(SharedMonsterAttributes.KNOCKBACK_RESISTANCE.getName(), new AttributeModifier(getBaubleUUID(stack), "Bauble modifier", 1, 0)); + attributes.put(SharedMonsterAttributes.KNOCKBACK_RESISTANCE.getName(), new AttributeModifier(getBaubleUUID(stack), "Knockback Belt", 1, 0).setSaved(false)); } @Override diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemReachRing.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemReachRing.java index 0ceefe5e9..b59c56771 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemReachRing.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemReachRing.java @@ -11,25 +11,21 @@ package vazkii.botania.common.item.equipment.bauble; import baubles.api.BaubleType; -import net.minecraft.entity.EntityLivingBase; +import com.google.common.collect.Multimap; +import net.minecraft.entity.ai.attributes.AttributeModifier; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import vazkii.botania.common.Botania; import vazkii.botania.common.lib.LibItemNames; -public class ItemReachRing extends ItemBauble { +public class ItemReachRing extends ItemBaubleModifier { public ItemReachRing() { super(LibItemNames.REACH_RING); } @Override - public void onEquippedOrLoadedIntoWorld(ItemStack stack, EntityLivingBase player) { - Botania.proxy.setExtraReach(player, 3.5F); - } - - @Override - public void onUnequipped(ItemStack stack, EntityLivingBase player) { - Botania.proxy.setExtraReach(player, -3.5F); + void fillModifiers(Multimap attributes, ItemStack stack) { + attributes.put(EntityPlayer.REACH_DISTANCE.getName(), new AttributeModifier(getBaubleUUID(stack), "Reach Ring", 3.5, 0).setSaved(false)); } @Override 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 7e7fe9eca..d79572050 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemOdinRing.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemOdinRing.java @@ -39,8 +39,6 @@ public class ItemOdinRing extends ItemRelicBauble { private static final List damageNegations = new ArrayList<>(); - private final Multimap attributes = HashMultimap.create(); - public ItemOdinRing() { super(LibItemNames.ODIN_RING); @@ -89,14 +87,14 @@ public class ItemOdinRing extends ItemRelicBauble { @Override public void onEquippedOrLoadedIntoWorld(ItemStack stack, EntityLivingBase player) { - attributes.clear(); + Multimap attributes = HashMultimap.create(); fillModifiers(attributes, stack); player.getAttributeMap().applyAttributeModifiers(attributes); } @Override public void onUnequipped(ItemStack stack, EntityLivingBase player) { - attributes.clear(); + Multimap attributes = HashMultimap.create(); fillModifiers(attributes, stack); player.getAttributeMap().removeAttributeModifiers(attributes); } @@ -105,7 +103,7 @@ public class ItemOdinRing extends ItemRelicBauble { if(stack.isEmpty()) // workaround for Azanor/Baubles#156 return; - attributes.put(SharedMonsterAttributes.MAX_HEALTH.getName(), new AttributeModifier(getBaubleUUID(stack), "Bauble modifier", 20, 0)); + attributes.put(SharedMonsterAttributes.MAX_HEALTH.getName(), new AttributeModifier(getBaubleUUID(stack), "Odin Ring", 20, 0).setSaved(false)); } @Override