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: [PATCH] fixed #160: tooltips preventing server to start --- .../com/sosnitzka/taiga/MaterialTraits.java | 18 ++++++------------ .../sosnitzka/taiga/traits/TraitBerserk.java | 1 - .../sosnitzka/taiga/traits/TraitCatcher.java | 4 +++- .../sosnitzka/taiga/traits/TraitCongenial.java | 3 +++ .../sosnitzka/taiga/traits/TraitCursed.java | 3 +++ .../sosnitzka/taiga/traits/TraitSoulEater.java | 3 +++ .../taiga/traits/TraitSuperHeavy.java | 3 +++ .../sosnitzka/taiga/traits/TraitTantrum.java | 3 +++ .../com/sosnitzka/taiga/traits/TraitWhirl.java | 4 +++- .../sosnitzka/taiga/world/WorldGenMinable.java | 6 ------ 10 files changed, 27 insertions(+), 21 deletions(-) diff --git a/src/main/java/com/sosnitzka/taiga/MaterialTraits.java b/src/main/java/com/sosnitzka/taiga/MaterialTraits.java index 898e042..47b2bea 100644 --- a/src/main/java/com/sosnitzka/taiga/MaterialTraits.java +++ b/src/main/java/com/sosnitzka/taiga/MaterialTraits.java @@ -73,12 +73,10 @@ public class MaterialTraits { public static Material tiberium = new Material("tiberium", TextFormatting.GREEN).addTrait(instable); public static Material aurorium = new Material("aurorium", TextFormatting.RED).addTrait(arcane); - public static Material prometheum = new Material("prometheum", TextFormatting.DARK_PURPLE).addTrait(blind, - MaterialTypes.HANDLE).addTrait(catcher); + public static Material prometheum = new Material("prometheum", TextFormatting.DARK_PURPLE).addTrait(blind, MaterialTypes.HANDLE).addTrait(catcher); public static Material duranite = new Material("duranite", TextFormatting.YELLOW).addTrait(analysing); public static Material valyrium = new Material("valyrium", TextFormatting.DARK_GRAY).addTrait(congenial); - public static Material vibranium = new Material("vibranium", TextFormatting.GRAY).addTrait(resonance, - MaterialTypes.HANDLE).addTrait(heroic, MaterialTypes.HEAD); + public static Material vibranium = new Material("vibranium", TextFormatting.GRAY).addTrait(resonance, MaterialTypes.HANDLE).addTrait(heroic, MaterialTypes.HEAD); public static Material terrax = new Material("terrax", TextFormatting.DARK_GRAY).addTrait(slaughtering); public static Material palladium = new Material("palladium", TextFormatting.GOLD).addTrait(dark).addTrait(cursed); public static Material uru = new Material("uru", TextFormatting.DARK_RED).addTrait(diffuse); @@ -89,23 +87,19 @@ public class MaterialTraits { public static Material violium = new Material("violium", TextFormatting.DARK_PURPLE).addTrait(arcane); public static Material proxii = new Material("proxii", TextFormatting.LIGHT_PURPLE).addTrait(curvature); public static Material tritonite = new Material("tritonite", TextFormatting.GOLD).addTrait(whirl); - public static Material ignitz = new Material("ignitz", TextFormatting.RED).addTrait(melting).addTrait(garishly, - MaterialTypes.HANDLE); + public static Material ignitz = new Material("ignitz", TextFormatting.RED).addTrait(melting).addTrait(garishly, MaterialTypes.HANDLE); public static Material imperomite = new Material("imperomite", TextFormatting.DARK_RED).addTrait(hollow); - public static Material solarium = new Material("solarium", TextFormatting.YELLOW).addTrait(superheavy).addTrait - (crushing); + public static Material solarium = new Material("solarium", TextFormatting.YELLOW).addTrait(superheavy).addTrait(crushing); public static Material nihilite = new Material("nihilite", TextFormatting.DARK_GRAY).addTrait(souleater); public static Material adamant = new Material("adamant", TextFormatting.GOLD).addTrait(berserk); public static Material dyonite = new Material("dyonite", TextFormatting.GREEN).addTrait(tantrum); public static Material nucleum = new Material("nucleum", TextFormatting.YELLOW).addTrait(decay).addTrait(mutate); - public static Material lumix = new Material("lumix", TextFormatting.YELLOW).addTrait(bright, MaterialTypes - .HANDLE).addTrait(glimmer, MaterialTypes.HEAD); + public static Material lumix = new Material("lumix", TextFormatting.YELLOW).addTrait(bright, MaterialTypes.HANDLE).addTrait(glimmer, MaterialTypes.HEAD); public static Material seismum = new Material("seismum", TextFormatting.GREEN).addTrait(cascade); public static Material astrium = new Material("astrium", TextFormatting.DARK_PURPLE).addTrait(ported); public static Material niob = new Material("niob", TextFormatting.RED).addTrait(reviving); public static Material yrdeen = new Material("yrdeen", TextFormatting.RED).addTrait(naturebound); - public static Material meteorite = new Material("meteorite", TextFormatting.DARK_GREEN).addTrait(crumbling, - MaterialTypes.HEAD).addTrait(pulverizing); + public static Material meteorite = new Material("meteorite", TextFormatting.DARK_GREEN).addTrait(crumbling, MaterialTypes.HEAD).addTrait(pulverizing); public static Material obsidiorite = new Material("obsidiorite", obsidioriteFluid.getColor()).addTrait(alien); public static Material osram = new Material("osram", TextFormatting.GOLD); 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(); diff --git a/src/main/java/com/sosnitzka/taiga/world/WorldGenMinable.java b/src/main/java/com/sosnitzka/taiga/world/WorldGenMinable.java index 8d16120..e0981bf 100644 --- a/src/main/java/com/sosnitzka/taiga/world/WorldGenMinable.java +++ b/src/main/java/com/sosnitzka/taiga/world/WorldGenMinable.java @@ -2,8 +2,6 @@ package com.sosnitzka.taiga.world; import com.sosnitzka.taiga.util.StateMatcher; import net.minecraft.block.state.IBlockState; -import net.minecraft.block.state.pattern.BlockMatcher; -import net.minecraft.init.Blocks; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; @@ -20,10 +18,6 @@ public class WorldGenMinable extends net.minecraft.world.gen.feature.WorldGenMin private final int numberOfBlocks; private final Predicate predicate; - public WorldGenMinable(IBlockState state, int blockCount) { - this(state, blockCount, BlockMatcher.forBlock(Blocks.STONE)); - } - public WorldGenMinable(IBlockState state, int blockCount, Predicate predicate) { super(state, blockCount, predicate::test); this.oreBlock = state;