Fix serverside access of client tooltip flags

KnightMiner · Jul 28, 2019 · 15bbf66 · 15bbf66
1 parent e512589
commit 15bbf66
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 19 deletions.
diff --git a/src/main/java/knightminer/inspirations/tools/ToolsClientProxy.java b/src/main/java/knightminer/inspirations/tools/ToolsClientProxy.java
@@ -1,16 +1,22 @@
 package knightminer.inspirations.tools;
 
 import knightminer.inspirations.common.ClientProxy;
+import knightminer.inspirations.common.Config;
 import knightminer.inspirations.tools.client.RenderModArrow;
 import knightminer.inspirations.tools.entity.EntityModArrow;
 import knightminer.inspirations.tools.item.ItemModArrow.ArrowType;
 import knightminer.inspirations.tools.item.ItemWaypointCompass;
 import knightminer.inspirations.utility.block.BlockRedstoneCharge;
 import net.minecraft.client.renderer.block.statemap.StateMap;
 import net.minecraft.client.renderer.color.ItemColors;
+import net.minecraft.init.Items;
 import net.minecraft.item.EnumDyeColor;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagList;
 import net.minecraftforge.client.event.ColorHandlerEvent;
 import net.minecraftforge.client.event.ModelRegistryEvent;
+import net.minecraftforge.event.entity.player.ItemTooltipEvent;
 import net.minecraftforge.fml.client.registry.RenderingRegistry;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 
@@ -65,4 +71,20 @@ public void registerItemColors(ColorHandlerEvent.Item event) {
 			return -1;
 		}, InspirationsTools.waypointCompass);
 	}
+
+	@SubscribeEvent
+	public static void fixShieldTooltip(ItemTooltipEvent event) {
+		if (!Config.fixShieldTooltip) {
+			return;
+		}
+		ItemStack stack = event.getItemStack();
+		if (stack.getItem() != Items.SHIELD) {
+			return;
+		}
+		NBTTagCompound tags = stack.getSubCompound("BlockEntityTag");
+		if (tags != null && tags.hasKey("Patterns") && stack.isItemEnchanted()) {
+			NBTTagList patterns = tags.getTagList("Patterns", 10);
+			event.getToolTip().add(patterns.tagCount()+1, "");
+		}
+	}
 }
diff --git a/src/main/java/knightminer/inspirations/tools/ToolsEvents.java b/src/main/java/knightminer/inspirations/tools/ToolsEvents.java
@@ -18,8 +18,6 @@
 import net.minecraft.item.ItemHoe;
 import net.minecraft.item.ItemShears;
 import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.nbt.NBTTagList;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.tileentity.TileEntityBeacon;
 import net.minecraft.util.DamageSource;
@@ -32,7 +30,6 @@
 import net.minecraft.world.LockCode;
 import net.minecraft.world.World;
 import net.minecraftforge.event.entity.living.LivingAttackEvent;
-import net.minecraftforge.event.entity.player.ItemTooltipEvent;
 import net.minecraftforge.event.entity.player.PlayerEvent.BreakSpeed;
 import net.minecraftforge.event.entity.player.PlayerInteractEvent.RightClickBlock;
 import net.minecraftforge.event.world.BlockEvent.BreakEvent;
@@ -367,20 +364,4 @@ public static void onShieldHit(LivingAttackEvent event) {
 			}
 		}
 	}
-
-	@SubscribeEvent
-	public static void fixShieldTooltip(ItemTooltipEvent event) {
-		if (!Config.fixShieldTooltip) {
-			return;
-		}
-		ItemStack stack = event.getItemStack();
-		if (stack.getItem() != Items.SHIELD) {
-			return;
-		}
-		NBTTagCompound tags = stack.getSubCompound("BlockEntityTag");
-		if (tags != null && tags.hasKey("Patterns") && stack.isItemEnchanted()) {
-			NBTTagList patterns = tags.getTagList("Patterns", 10);
-			event.getToolTip().add(patterns.tagCount()+1, "");
-		}
-	}
 }