From 5a111ba290fe41385c600141f10e5a3517b43a4a Mon Sep 17 00:00:00 2001 From: Giovanni Harting <539@idlegandalf.com> Date: Mon, 12 Feb 2018 01:50:58 +0100 Subject: fixed #160: tooltips preventing server to start --- src/main/java/com/sosnitzka/taiga/traits/TraitBerserk.java | 1 - src/main/java/com/sosnitzka/taiga/traits/TraitCatcher.java | 4 +++- src/main/java/com/sosnitzka/taiga/traits/TraitCongenial.java | 3 +++ src/main/java/com/sosnitzka/taiga/traits/TraitCursed.java | 3 +++ src/main/java/com/sosnitzka/taiga/traits/TraitSoulEater.java | 3 +++ src/main/java/com/sosnitzka/taiga/traits/TraitSuperHeavy.java | 3 +++ src/main/java/com/sosnitzka/taiga/traits/TraitTantrum.java | 3 +++ src/main/java/com/sosnitzka/taiga/traits/TraitWhirl.java | 4 +++- 8 files changed, 21 insertions(+), 3 deletions(-) (limited to 'src/main/java/com/sosnitzka/taiga/traits') diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitBerserk.java b/src/main/java/com/sosnitzka/taiga/traits/TraitBerserk.java index 8ef3e0f..c2478d1 100644 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitBerserk.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitBerserk.java @@ -92,7 +92,6 @@ public class TraitBerserk extends TraitProgressiveStats { TagUtil.setEnchantEffect(root, false); TagUtil.setExtraTag(root, tag); data.write(tag); - } else { stat.durability -= 10; distributed.durability -= 10; diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitCatcher.java b/src/main/java/com/sosnitzka/taiga/traits/TraitCatcher.java index 1d01112..26a13be 100644 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitCatcher.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitCatcher.java @@ -17,6 +17,8 @@ import net.minecraftforge.event.entity.living.LivingDeathEvent; import net.minecraftforge.event.entity.player.ItemTooltipEvent; import net.minecraftforge.event.entity.player.PlayerInteractEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import slimeknights.mantle.util.RecipeMatch; import slimeknights.tconstruct.library.traits.AbstractTrait; import slimeknights.tconstruct.library.utils.TagUtil; @@ -109,7 +111,7 @@ public class TraitCatcher extends AbstractTrait { } } - + @SideOnly(Side.CLIENT) @SubscribeEvent public void onItemTooltip(ItemTooltipEvent e) { ItemStack tool = e.getItemStack(); diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitCongenial.java b/src/main/java/com/sosnitzka/taiga/traits/TraitCongenial.java index f832494..c62f2c9 100644 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitCongenial.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitCongenial.java @@ -13,6 +13,8 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingDeathEvent; import net.minecraftforge.event.entity.player.ItemTooltipEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import slimeknights.mantle.util.RecipeMatch; import slimeknights.tconstruct.library.traits.AbstractTrait; import slimeknights.tconstruct.library.utils.TagUtil; @@ -68,6 +70,7 @@ public class TraitCongenial extends AbstractTrait { return damage; } + @SideOnly(Side.CLIENT) @SubscribeEvent public void onItemTooltip(ItemTooltipEvent e) { ItemStack tool = e.getItemStack(); diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitCursed.java b/src/main/java/com/sosnitzka/taiga/traits/TraitCursed.java index 2e8c96b..b4ceab1 100644 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitCursed.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitCursed.java @@ -12,6 +12,8 @@ import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.ItemTooltipEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import slimeknights.mantle.util.RecipeMatch; import slimeknights.tconstruct.library.traits.AbstractTrait; import slimeknights.tconstruct.library.utils.TagUtil; @@ -44,6 +46,7 @@ public class TraitCursed extends AbstractTrait { TagUtil.setExtraTag(tool, tag); } + @SideOnly(Side.CLIENT) @SubscribeEvent public void onItemTooltip(ItemTooltipEvent e) { ItemStack tool = e.getItemStack(); diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitSoulEater.java b/src/main/java/com/sosnitzka/taiga/traits/TraitSoulEater.java index 88af4dd..0f3c680 100644 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitSoulEater.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitSoulEater.java @@ -13,6 +13,8 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingDeathEvent; import net.minecraftforge.event.entity.player.ItemTooltipEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import slimeknights.mantle.util.RecipeMatch; import slimeknights.tconstruct.library.traits.AbstractTrait; import slimeknights.tconstruct.library.utils.TagUtil; @@ -59,6 +61,7 @@ public class TraitSoulEater extends AbstractTrait { return newDamage + bonus; } + @SideOnly(Side.CLIENT) @SubscribeEvent public void onItemTooltip(ItemTooltipEvent e) { ItemStack tool = e.getItemStack(); diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitSuperHeavy.java b/src/main/java/com/sosnitzka/taiga/traits/TraitSuperHeavy.java index bcdd645..888cff5 100644 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitSuperHeavy.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitSuperHeavy.java @@ -14,6 +14,8 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.ItemTooltipEvent; import net.minecraftforge.event.entity.player.PlayerInteractEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import slimeknights.mantle.util.RecipeMatch; import slimeknights.tconstruct.library.utils.TagUtil; import slimeknights.tconstruct.library.utils.TinkerUtil; @@ -71,6 +73,7 @@ public class TraitSuperHeavy extends TraitProgressiveStats { TagUtil.setExtraTag(tool, tag); } + @SideOnly(Side.CLIENT) @SubscribeEvent public void onItemTooltip(ItemTooltipEvent e) { ItemStack tool = e.getItemStack(); diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitTantrum.java b/src/main/java/com/sosnitzka/taiga/traits/TraitTantrum.java index b490a28..e7975f3 100644 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitTantrum.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitTantrum.java @@ -13,6 +13,8 @@ import net.minecraftforge.event.entity.player.ItemTooltipEvent; import net.minecraftforge.event.entity.player.PlayerInteractEvent; import net.minecraftforge.event.world.BlockEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import slimeknights.mantle.util.RecipeMatch; import slimeknights.tconstruct.common.Sounds; import slimeknights.tconstruct.library.traits.AbstractTrait; @@ -82,6 +84,7 @@ public class TraitTantrum extends AbstractTrait { } } + @SideOnly(Side.CLIENT) @SubscribeEvent public void onItemTooltip(ItemTooltipEvent e) { ItemStack tool = e.getItemStack(); diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitWhirl.java b/src/main/java/com/sosnitzka/taiga/traits/TraitWhirl.java index 756480b..d3c0c50 100644 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitWhirl.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitWhirl.java @@ -15,6 +15,8 @@ import net.minecraftforge.common.util.FakePlayer; import net.minecraftforge.event.entity.player.ItemTooltipEvent; import net.minecraftforge.event.entity.player.PlayerInteractEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import slimeknights.mantle.util.RecipeMatch; import slimeknights.tconstruct.library.traits.AbstractTrait; import slimeknights.tconstruct.library.utils.TagUtil; @@ -88,7 +90,7 @@ public class TraitWhirl extends AbstractTrait { } } - + @SideOnly(Side.CLIENT) @SubscribeEvent public void onItemTooltip(ItemTooltipEvent e) { ItemStack tool = e.getItemStack(); -- cgit v1.2.3