diff --git a/build.gradle b/build.gradle index 5fd4272..e4f54b3 100644 --- a/build.gradle +++ b/build.gradle @@ -50,7 +50,6 @@ task buildInfo { ext.buildNum = System.getenv().BUILD_NUMBER } - def cmd = "git log \$(git tag --sort=-refname | sed -n '2p')..\$(git tag --sort=-refname | sed -n '1p') --oneline" def proc = cmd.execute() proc.waitFor() @@ -64,7 +63,7 @@ task buildInfo { version = project.buildInfo.revision minecraft { - version = "1.12.2-14.23.2.2611" + version = "1.12.2-14.23.4.2705" runDir = "run" mappings = "snapshot_20170801" replace '@VERSION@', project.version diff --git a/src/main/java/com/sosnitzka/taiga/MaterialTraits.java b/src/main/java/com/sosnitzka/taiga/MaterialTraits.java index 47b2bea..eb97264 100644 --- a/src/main/java/com/sosnitzka/taiga/MaterialTraits.java +++ b/src/main/java/com/sosnitzka/taiga/MaterialTraits.java @@ -21,7 +21,6 @@ public class MaterialTraits { // Init of new traits public static final AbstractTrait instable = new TraitInstable(); public static final AbstractTrait naturebound = new TraitNatureBound(); - public static final AbstractTrait uncertain = new TraitUncertain(); public static final AbstractTrait softy = new TraitSofty(); public static final AbstractTrait curvature = new TraitCurvature(); public static final AbstractTrait resonance = new TraitResonance(); @@ -43,7 +42,6 @@ public class MaterialTraits { public static final AbstractTrait diffuse = new TraitDiffuse(); public static final AbstractTrait reviving = new TraitReviving(); public static final AbstractTrait melting = new TraitMelting(); - public static final AbstractTrait traditional = new TraitTraditional(); public static final AbstractTrait tantrum = new TraitTantrum(); public static final AbstractTrait catcher = new TraitCatcher(); public static final AbstractTrait congenial = new TraitCongenial(); @@ -53,12 +51,7 @@ public class MaterialTraits { public static final AbstractTrait decay = new TraitDecay(); public static final AbstractTrait whirl = new TraitWhirl(); public static final AbstractTrait superheavy = new TraitSuperHeavy(); - public static final AbstractTrait dev = new TraitDevelopement(); - public static final AbstractTrait carousel = new TraitCarousel(); public static final AbstractTrait berserk = new TraitBerserk(); - public static final AbstractTrait leveled1 = new TraitLeveled(1); - public static final AbstractTrait leveled2 = new TraitLeveled(2); - public static final AbstractTrait leveled3 = new TraitLeveled(3); public static final AbstractTrait crushing = new TraitCrushing(); public static final AbstractTrait mutate = new TraitMutate(); @@ -104,7 +97,6 @@ public class MaterialTraits { public static Material osram = new Material("osram", TextFormatting.GOLD); public static Material abyssum = new Material("abyssum", TextFormatting.GOLD); - public static Material iox = new Material("iox", TextFormatting.RED); public static Material ovium = new Material("ovium", TextFormatting.BLUE); public static Material jauxum = new Material("jauxum", TextFormatting.YELLOW); public static Material karmesine = new Material("karmesine", TextFormatting.RED); diff --git a/src/main/java/com/sosnitzka/taiga/TAIGA.java b/src/main/java/com/sosnitzka/taiga/TAIGA.java index 75edf2e..fff7321 100644 --- a/src/main/java/com/sosnitzka/taiga/TAIGA.java +++ b/src/main/java/com/sosnitzka/taiga/TAIGA.java @@ -97,36 +97,27 @@ public class TAIGA { */ private void registerTinkerMaterials() { BowMaterialStats shitty = new BowMaterialStats(0.2f, 0.4f, -1f); - - integrateMaterial("Tiberium", tiberium, tiberiumFluid, 80, 3.3f, 4f, 0.7f, -25, 50, DIAMOND, shitty, true, - false); +// + integrateMaterial("Tiberium", tiberium, tiberiumFluid, 80, 3.3f, 4f, 0.7f, -25, 50, DIAMOND, shitty, true, false); integrateMaterial("Aurorium", aurorium, auroriumFluid, 750, 3.6f, 3.78f, 0.77f, 25, 130, COBALT, 0.45f, 1f, 1); - integrateMaterial("Prometheum", prometheum, prometheumFluid, 844, 4.75f, 6.6f, 1.2f, 25, 50, DURANITE, 0.2f, - 0.6f, 3); - integrateMaterial("Duranite", duranite, duraniteFluid, 1550, 3.2f, 3.2f, 1.16f, 100, 100, DURANITE, 0.3f, - 1.4f, 2); - integrateMaterial("Valyrium", valyrium, valyriumFluid, 1111, 5.37f, 4.8f, 1.30f, 100, 100, VALYRIUM, 1.1f, - 1.2f, 4); - integrateMaterial("Vibranium", vibranium, vibraniumFluid, 1235, 7.62f, 8.1f, 1.3f, 100, 100, VIBRANIUM, 1.1f, - 1.8f, 4); + integrateMaterial("Prometheum", prometheum, prometheumFluid, 844, 4.75f, 6.6f, 1.2f, 25, 50, DURANITE, 0.2f, 0.6f, 3); + integrateMaterial("Duranite", duranite, duraniteFluid, 1550, 3.2f, 3.2f, 1.16f, 100, 100, DURANITE, 0.3f, 1.4f, 2); + integrateMaterial("Valyrium", valyrium, valyriumFluid, 1111, 5.37f, 4.8f, 1.30f, 100, 100, VALYRIUM, 1.1f, 1.2f, 4); + integrateMaterial("Vibranium", vibranium, vibraniumFluid, 1235, 7.62f, 8.1f, 1.3f, 100, 100, VIBRANIUM, 1.1f, 1.8f, 4); integrateMaterial("Terrax", terrax, terraxFluid, 444, 4.77f, 2.9f, 0.8f, 100, 50, COBALT, shitty, true, true); - integrateMaterial("Palladium", palladium, palladiumFluid, 797, 4.35f, 6.8f, 1.3f, 130, -50, DURANITE, .5f, - .2f, 3); + integrateMaterial("Palladium", palladium, palladiumFluid, 797, 4.35f, 6.8f, 1.3f, 130, -50, DURANITE, .5f, .2f, 3); integrateMaterial("Uru", uru, uruFluid, 877, 2f, 7.2f, 1.5f, -50, 175, VALYRIUM, 1.3f, 0.8f, 6); integrateMaterial("Eezo", eezo, eezoFluid, 50, 23f, 3.5f, .1f, 10, 10, COBALT, shitty, true, false); integrateMaterial("Basalt", basalt, basaltFluid, 200, 3, 2.5f, 0.5f, -25, 25, STONE, shitty, true, false); - integrateMaterial("Triberium", triberium, triberiumFluid, 223, 6.2f, 8.35f, 0.63f, 50, 50, DIAMOND, shitty, - true, true); + integrateMaterial("Triberium", triberium, triberiumFluid, 223, 6.2f, 8.35f, 0.63f, 50, 50, DIAMOND, shitty, true, true); integrateMaterial("Fractum", fractum, fractumFluid, 538, 5.71f, 6.93f, 0.88f, 58, 117, DIAMOND, shitty); integrateMaterial("Violium", violium, violiumFluid, 925, 3.8f, 3.75f, .90f, 175, 50, COBALT, .45f, .95f, 1); integrateMaterial("Proxii", proxii, proxiiFluid, 625, 6.8f, 4.21f, 1.25f, 80, 25, DURANITE, .35f, .5f, 3); integrateMaterial("Tritonite", tritonite, tritoniteFluid, 780, 8f, 3.3f, 1.45f, -25, 150, COBALT, shitty); integrateMaterial("Ignitz", ignitz, ignitzFluid, 350, 2f, 6.66f, .85f, 150, 250, COBALT, .8f, .8f, 3); - integrateMaterial("Imperomite", imperomite, imperomiteFluid, 1350, 4.65f, 5.9f, 1.15f, -100, 150, DURANITE, - 1.2f, 1.8f, 2); + integrateMaterial("Imperomite", imperomite, imperomiteFluid, 1350, 4.65f, 5.9f, 1.15f, -100, 150, DURANITE, 1.2f, 1.8f, 2); integrateMaterial("Solarium", solarium, solariumFluid, 1100, 24f, 7f, 1.25f, 150, 150, VIBRANIUM, .8f, 1.5f, 5); - integrateMaterial("Nihilite", nihilite, nihiliteFluid, 400, 2.8f, 4.50f, .77f, 350, 155, VALYRIUM, 1.5f, .8f, - 3); + integrateMaterial("Nihilite", nihilite, nihiliteFluid, 400, 2.8f, 4.50f, .77f, 350, 155, VALYRIUM, 1.5f, .8f, 3); integrateMaterial("Adamant", adamant, adamantFluid, 1750, 6f, 6f, 2f, 0, 0, VIBRANIUM, .35f, 1.85f, 8); integrateMaterial("Dyonite", dyonite, dyoniteFluid, 900, 6.45f, 5f, 0.66f, -50, 250, DURANITE, 2, .9f, -1); integrateMaterial("Nucleum", nucleum, nucleumFluid, 505, 17.5f, 9.5f, 1.05f, 100, 125, VALYRIUM, shitty); diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitAnalysing.java b/src/main/java/com/sosnitzka/taiga/traits/TraitAnalysing.java index 3c0db7a..195eab7 100644 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitAnalysing.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitAnalysing.java @@ -3,7 +3,6 @@ package com.sosnitzka.taiga.traits; import net.minecraft.entity.monster.EntityMob; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.NonNullList; import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; @@ -11,13 +10,10 @@ import net.minecraftforge.event.entity.living.LivingDropsEvent; import net.minecraftforge.event.entity.living.LivingExperienceDropEvent; import net.minecraftforge.event.world.BlockEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import slimeknights.mantle.util.RecipeMatch; import slimeknights.tconstruct.library.traits.AbstractTrait; import slimeknights.tconstruct.library.utils.TagUtil; import slimeknights.tconstruct.library.utils.TinkerUtil; -import java.util.Optional; - public class TraitAnalysing extends AbstractTrait { @@ -68,15 +64,4 @@ public class TraitAnalysing extends AbstractTrait { event.getDrops().clear(); } } - - /** - * Called with a set of itemstacks and returns a match which contains the items that match - * and how often the modifier can be applied with them - * - * @param stacks - */ - @Override - public Optional matches(NonNullList stacks) { - return null; - } } diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitArcane.java b/src/main/java/com/sosnitzka/taiga/traits/TraitArcane.java index 121d8b8..646e039 100644 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitArcane.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitArcane.java @@ -5,21 +5,17 @@ import net.minecraft.entity.EntityCreature; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingDeathEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import slimeknights.mantle.util.RecipeMatch; import slimeknights.tconstruct.library.traits.AbstractTrait; import slimeknights.tconstruct.library.utils.TagUtil; import slimeknights.tconstruct.library.utils.TinkerUtil; import slimeknights.tconstruct.library.utils.ToolHelper; -import java.util.Optional; - import static com.sosnitzka.taiga.util.Utils.isNight; public class TraitArcane extends AbstractTrait { @@ -61,9 +57,4 @@ public class TraitArcane extends AbstractTrait { } } } - - @Override - public Optional matches(NonNullList stacks) { - return null; - } } diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitBerserk.java b/src/main/java/com/sosnitzka/taiga/traits/TraitBerserk.java index c2478d1..b255b0f 100644 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitBerserk.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitBerserk.java @@ -5,21 +5,17 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.NonNullList; import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.util.FakePlayer; import net.minecraftforge.event.entity.player.PlayerInteractEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import slimeknights.mantle.util.RecipeMatch; import slimeknights.tconstruct.library.tools.ToolNBT; import slimeknights.tconstruct.library.utils.TagUtil; import slimeknights.tconstruct.library.utils.TinkerUtil; import slimeknights.tconstruct.library.utils.ToolHelper; -import java.util.Optional; - public class TraitBerserk extends TraitProgressiveStats { @@ -106,9 +102,4 @@ public class TraitBerserk extends TraitProgressiveStats { } } - - @Override - public Optional matches(NonNullList stacks) { - return null; - } } diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitBlind.java b/src/main/java/com/sosnitzka/taiga/traits/TraitBlind.java index 88ecc8a..740010f 100644 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitBlind.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitBlind.java @@ -5,15 +5,11 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.init.MobEffects; import net.minecraft.item.ItemStack; import net.minecraft.potion.PotionEffect; -import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; -import slimeknights.mantle.util.RecipeMatch; import slimeknights.tconstruct.library.traits.AbstractTrait; -import java.util.Optional; - import static com.sosnitzka.taiga.util.Utils.isNight; public class TraitBlind extends AbstractTrait { @@ -45,9 +41,4 @@ public class TraitBlind extends AbstractTrait { player.addPotionEffect(new PotionEffect(MobEffects.WEAKNESS, random.nextInt(400) + 200)); } } - - @Override - public Optional matches(NonNullList stacks) { - return null; - } } diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitBright.java b/src/main/java/com/sosnitzka/taiga/traits/TraitBright.java index 929bf32..a307c54 100644 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitBright.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitBright.java @@ -4,15 +4,11 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; import net.minecraft.potion.PotionEffect; -import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; -import slimeknights.mantle.util.RecipeMatch; import slimeknights.tconstruct.library.traits.AbstractTrait; -import java.util.Optional; - import static com.sosnitzka.taiga.util.Utils.isNight; import static net.minecraft.init.MobEffects.GLOWING; @@ -43,9 +39,4 @@ public class TraitBright extends AbstractTrait { player.addPotionEffect(new PotionEffect(GLOWING, 200)); } } - - @Override - public Optional matches(NonNullList stacks) { - return null; - } } diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitCarousel.java b/src/main/java/com/sosnitzka/taiga/traits/TraitCarousel.java deleted file mode 100644 index 8cf1cd6..0000000 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitCarousel.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.sosnitzka.taiga.traits; - -import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.item.ItemStack; -import net.minecraft.util.NonNullList; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import slimeknights.mantle.util.RecipeMatch; -import slimeknights.tconstruct.library.traits.AbstractTrait; - -import java.util.Optional; - - -public class TraitCarousel extends AbstractTrait { - - public static final int TICK = 24; - - public TraitCarousel() { - super(TraitCarousel.class.getSimpleName().toLowerCase().substring(5), 0xffcc5511); - } - - @Override - public void afterBlockBreak(ItemStack tool, World world, IBlockState state, BlockPos pos, EntityLivingBase - player, boolean wasEffective) { - - } - - @Override - public Optional matches(NonNullList stacks) { - return null; - } -} diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitCascade.java b/src/main/java/com/sosnitzka/taiga/traits/TraitCascade.java index fd17aa8..0d22826 100644 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitCascade.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitCascade.java @@ -3,16 +3,12 @@ package com.sosnitzka.taiga.traits; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; -import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; -import slimeknights.mantle.util.RecipeMatch; import slimeknights.tconstruct.library.traits.AbstractTrait; import slimeknights.tconstruct.library.utils.ToolHelper; -import java.util.Optional; - public class TraitCascade extends AbstractTrait { public TraitCascade() { @@ -51,9 +47,4 @@ public class TraitCascade extends AbstractTrait { } } } - - @Override - public Optional matches(NonNullList stacks) { - return null; - } } diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitCatcher.java b/src/main/java/com/sosnitzka/taiga/traits/TraitCatcher.java index 26a13be..1f17b46 100644 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitCatcher.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitCatcher.java @@ -8,7 +8,6 @@ import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.init.SoundEvents; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; @@ -19,14 +18,11 @@ 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; import slimeknights.tconstruct.library.utils.TinkerUtil; import slimeknights.tconstruct.library.utils.ToolHelper; -import java.util.Optional; - public class TraitCatcher extends AbstractTrait { @@ -124,11 +120,6 @@ public class TraitCatcher extends AbstractTrait { } } - @Override - public Optional matches(NonNullList stacks) { - return null; - } - public static class Data { String mobClass; String mobName; diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitCongenial.java b/src/main/java/com/sosnitzka/taiga/traits/TraitCongenial.java index c62f2c9..21ac249 100644 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitCongenial.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitCongenial.java @@ -6,7 +6,6 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.NonNullList; import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; @@ -15,13 +14,10 @@ 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; import slimeknights.tconstruct.library.utils.TinkerUtil; -import java.util.Optional; - public class TraitCongenial extends AbstractTrait { @@ -83,9 +79,4 @@ public class TraitCongenial extends AbstractTrait { } } } - - @Override - public Optional matches(NonNullList stacks) { - return null; - } } diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitCrushing.java b/src/main/java/com/sosnitzka/taiga/traits/TraitCrushing.java index 4d6405f..e88640d 100644 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitCrushing.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitCrushing.java @@ -3,14 +3,10 @@ package com.sosnitzka.taiga.traits; import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; -import net.minecraft.util.NonNullList; import net.minecraft.util.text.TextFormatting; import net.minecraftforge.event.world.BlockEvent; -import slimeknights.mantle.util.RecipeMatch; import slimeknights.tconstruct.library.traits.AbstractTrait; -import java.util.Optional; - public class TraitCrushing extends AbstractTrait { public TraitCrushing() { @@ -35,9 +31,4 @@ public class TraitCrushing extends AbstractTrait { } } } - - @Override - public Optional matches(NonNullList stacks) { - return null; - } } \ No newline at end of file diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitCursed.java b/src/main/java/com/sosnitzka/taiga/traits/TraitCursed.java index b4ceab1..a0a1444 100644 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitCursed.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitCursed.java @@ -6,7 +6,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.DamageSource; -import net.minecraft.util.NonNullList; import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; @@ -14,13 +13,10 @@ 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; import slimeknights.tconstruct.library.utils.TinkerUtil; -import java.util.Optional; - public class TraitCursed extends AbstractTrait { @@ -58,10 +54,4 @@ public class TraitCursed extends AbstractTrait { } } } - - - @Override - public Optional matches(NonNullList stacks) { - return null; - } } diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitCurvature.java b/src/main/java/com/sosnitzka/taiga/traits/TraitCurvature.java index 2f7eeac..09e5733 100644 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitCurvature.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitCurvature.java @@ -11,7 +11,6 @@ import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.init.SoundEvents; import net.minecraft.item.ItemStack; -import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.TextComponentString; import net.minecraft.util.text.TextFormatting; @@ -20,13 +19,11 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingDropsEvent; import net.minecraftforge.event.world.BlockEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import slimeknights.mantle.util.RecipeMatch; import slimeknights.tconstruct.library.traits.AbstractTrait; import slimeknights.tconstruct.library.utils.TagUtil; import slimeknights.tconstruct.library.utils.TinkerUtil; import java.util.List; -import java.util.Optional; public class TraitCurvature extends AbstractTrait { @@ -93,9 +90,4 @@ public class TraitCurvature extends AbstractTrait { player.setPosition(tp.getX(), tp.getY(), tp.getZ()); target.setPosition(pp.getX(), pp.getY(), pp.getZ()); } - - @Override - public Optional matches(NonNullList stacks) { - return null; - } } diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitDark.java b/src/main/java/com/sosnitzka/taiga/traits/TraitDark.java index c20fede..e892d7c 100644 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitDark.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitDark.java @@ -2,13 +2,9 @@ package com.sosnitzka.taiga.traits; import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; -import net.minecraft.util.NonNullList; import net.minecraft.util.text.TextFormatting; -import slimeknights.mantle.util.RecipeMatch; import slimeknights.tconstruct.library.traits.AbstractTrait; -import java.util.Optional; - import static com.sosnitzka.taiga.util.Utils.isNight; @@ -27,9 +23,4 @@ public class TraitDark extends AbstractTrait { } else newDamage = damage / (1 + random.nextFloat() / 3f); return super.damage(tool, player, target, damage, newDamage, isCritical); } - - @Override - public Optional matches(NonNullList stacks) { - return null; - } } diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitDecay.java b/src/main/java/com/sosnitzka/taiga/traits/TraitDecay.java index 2d1364c..3445672 100644 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitDecay.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitDecay.java @@ -4,17 +4,14 @@ import com.google.common.collect.ImmutableList; import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.NonNullList; import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; import net.minecraftforge.common.util.FakePlayer; -import slimeknights.mantle.util.RecipeMatch; import slimeknights.tconstruct.library.materials.HeadMaterialStats; import slimeknights.tconstruct.library.tools.ToolNBT; import slimeknights.tconstruct.library.utils.TagUtil; import java.util.List; -import java.util.Optional; /** * Gives the tool bonus stats on crafting. @@ -32,11 +29,6 @@ public class TraitDecay extends TraitProgressiveStats { super("decay", TextFormatting.GREEN); } - @Override - public Optional matches(NonNullList stacks) { - return null; - } - @Override public void applyEffect(NBTTagCompound rootCompound, NBTTagCompound modifierTag) { // check if we have stats already distributed, and if not add them diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitDeflection.java b/src/main/java/com/sosnitzka/taiga/traits/TraitDeflection.java deleted file mode 100644 index 77684e4..0000000 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitDeflection.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.sosnitzka.taiga.traits; - -import net.minecraft.item.ItemStack; -import net.minecraft.util.NonNullList; -import net.minecraftforge.common.MinecraftForge; -import slimeknights.mantle.util.RecipeMatch; -import slimeknights.tconstruct.library.traits.AbstractTraitLeveled; - -import java.util.Optional; - - -public class TraitDeflection extends AbstractTraitLeveled { - - - public TraitDeflection(int levels) { - super(TraitDeflection.class.getSimpleName().toLowerCase().substring(5), 0xFFFF5500, 3, levels); - MinecraftForge.EVENT_BUS.register(this); - } - - - @Override - public Optional matches(NonNullList stacks) { - return null; - } -} diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitDevelopement.java b/src/main/java/com/sosnitzka/taiga/traits/TraitDevelopement.java deleted file mode 100644 index 0f79c0e..0000000 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitDevelopement.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.sosnitzka.taiga.traits; - -import net.minecraft.block.BlockStone; -import net.minecraft.block.state.IBlockState; -import net.minecraft.item.ItemStack; -import net.minecraft.util.NonNullList; -import net.minecraft.util.text.TextFormatting; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.event.world.BlockEvent; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import slimeknights.mantle.util.RecipeMatch; -import slimeknights.tconstruct.library.traits.AbstractTrait; -import slimeknights.tconstruct.library.utils.TagUtil; -import slimeknights.tconstruct.library.utils.TinkerUtil; - -import java.util.Optional; - - -public class TraitDevelopement extends AbstractTrait { - - - public TraitDevelopement() { - super(TraitDevelopement.class.getSimpleName().toLowerCase().substring(5), TextFormatting.RED); - MinecraftForge.EVENT_BUS.register(this); - } - - @SubscribeEvent - public void onBreak(BlockEvent.BreakEvent e) { - IBlockState state = e.getState(); - ItemStack tool = e.getPlayer().getHeldItemMainhand(); - if (state.getBlock().equals(net.minecraft.init.Blocks.STONE) && TinkerUtil.hasTrait(TagUtil.getTagSafe(tool), - identifier)) - System.out.println("State.Variant: " + state.getValue(BlockStone.VARIANT)); - } - - - @Override - public Optional matches(NonNullList stacks) { - return null; - } -} diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitDiffuse.java b/src/main/java/com/sosnitzka/taiga/traits/TraitDiffuse.java index 7f5d276..b6a1d53 100644 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitDiffuse.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitDiffuse.java @@ -3,20 +3,16 @@ package com.sosnitzka.taiga.traits; import net.minecraft.entity.EntityCreature; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.NonNullList; import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingDropsEvent; import net.minecraftforge.event.world.BlockEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import slimeknights.mantle.util.RecipeMatch; import slimeknights.tconstruct.library.traits.AbstractTrait; import slimeknights.tconstruct.library.utils.TagUtil; import slimeknights.tconstruct.library.utils.TinkerUtil; -import java.util.Optional; - public class TraitDiffuse extends AbstractTrait { @@ -59,9 +55,4 @@ public class TraitDiffuse extends AbstractTrait { event.getDrops().clear(); } } - - @Override - public Optional matches(NonNullList stacks) { - return null; - } } diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitDissolving.java b/src/main/java/com/sosnitzka/taiga/traits/TraitDissolving.java index dbdd13f..ac8a213 100644 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitDissolving.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitDissolving.java @@ -1,19 +1,14 @@ package com.sosnitzka.taiga.traits; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.util.NonNullList; import net.minecraft.util.text.TextFormatting; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingExperienceDropEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import slimeknights.mantle.util.RecipeMatch; import slimeknights.tconstruct.library.traits.AbstractTrait; import slimeknights.tconstruct.library.utils.TagUtil; import slimeknights.tconstruct.library.utils.TinkerUtil; -import java.util.Optional; - public class TraitDissolving extends AbstractTrait { @@ -39,9 +34,4 @@ public class TraitDissolving extends AbstractTrait { } } } - - @Override - public Optional matches(NonNullList stacks) { - return null; - } } diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitFracture.java b/src/main/java/com/sosnitzka/taiga/traits/TraitFracture.java index 920f7b9..884e611 100644 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitFracture.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitFracture.java @@ -5,18 +5,14 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; -import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; -import slimeknights.mantle.util.RecipeMatch; import slimeknights.tconstruct.library.tools.ToolCore; import slimeknights.tconstruct.library.traits.AbstractTrait; import slimeknights.tconstruct.library.utils.ToolHelper; -import java.util.Optional; - public class TraitFracture extends AbstractTrait { public TraitFracture() { @@ -81,9 +77,4 @@ public class TraitFracture extends AbstractTrait { int maxDurability = ToolHelper.getMaxDurability(tool); return (0.4f) / (maxDurability - 50) * (durability) + 0.55f; } - - @Override - public Optional matches(NonNullList stacks) { - return null; - } } diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitFragile.java b/src/main/java/com/sosnitzka/taiga/traits/TraitFragile.java index 0902a4e..e962e8c 100644 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitFragile.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitFragile.java @@ -5,16 +5,12 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; -import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; -import slimeknights.mantle.util.RecipeMatch; import slimeknights.tconstruct.library.traits.AbstractTrait; import slimeknights.tconstruct.library.utils.ToolHelper; -import java.util.Optional; - public class TraitFragile extends AbstractTrait { public TraitFragile() { @@ -86,9 +82,4 @@ public class TraitFragile extends AbstractTrait { int maxDurability = ToolHelper.getMaxDurability(tool); return (0.4f) / (maxDurability - 50) * (durability) + 0.55f; } - - @Override - public Optional matches(NonNullList stacks) { - return null; - } } diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitGarishly.java b/src/main/java/com/sosnitzka/taiga/traits/TraitGarishly.java index 97fb0ec..0176538 100644 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitGarishly.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitGarishly.java @@ -7,21 +7,17 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.NonNullList; import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingDropsEvent; import net.minecraftforge.event.world.BlockEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import slimeknights.mantle.util.RecipeMatch; import slimeknights.tconstruct.library.traits.AbstractTrait; import slimeknights.tconstruct.library.utils.TagUtil; import slimeknights.tconstruct.library.utils.TinkerUtil; import slimeknights.tconstruct.library.utils.ToolHelper; -import java.util.Optional; - public class TraitGarishly extends AbstractTrait { public TraitGarishly() { @@ -68,12 +64,6 @@ public class TraitGarishly extends AbstractTrait { ToolHelper.damageTool(tool, random.nextInt(6) + 1, event.getHarvester()); } } - - - @Override - public Optional matches(NonNullList stacks) { - return null; - } } diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitGlimmer.java b/src/main/java/com/sosnitzka/taiga/traits/TraitGlimmer.java index fde853a..92c60f8 100644 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitGlimmer.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitGlimmer.java @@ -7,17 +7,13 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.MobEffects; import net.minecraft.item.ItemStack; import net.minecraft.potion.PotionEffect; -import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; -import slimeknights.mantle.util.RecipeMatch; import slimeknights.tconstruct.library.traits.AbstractTrait; import slimeknights.tconstruct.library.utils.TagUtil; import slimeknights.tconstruct.library.utils.TinkerUtil; -import java.util.Optional; - public class TraitGlimmer extends AbstractTrait { @@ -51,9 +47,4 @@ public class TraitGlimmer extends AbstractTrait { player.addPotionEffect(new PotionEffect(MobEffects.NIGHT_VISION, random.nextInt(600) + 300)); } } - - @Override - public Optional matches(NonNullList stacks) { - return null; - } } diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitHeroic.java b/src/main/java/com/sosnitzka/taiga/traits/TraitHeroic.java index f8588a9..c6b7138 100644 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitHeroic.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitHeroic.java @@ -2,14 +2,10 @@ package com.sosnitzka.taiga.traits; import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; -import net.minecraft.util.NonNullList; import net.minecraft.util.text.TextFormatting; -import slimeknights.mantle.util.RecipeMatch; import slimeknights.tconstruct.library.traits.AbstractTrait; import slimeknights.tconstruct.library.utils.ToolHelper; -import java.util.Optional; - public class TraitHeroic extends AbstractTrait { public TraitHeroic() { @@ -36,9 +32,4 @@ public class TraitHeroic extends AbstractTrait { return super.damage(tool, player, target, damage, calc, isCritical); } else return super.damage(tool, player, target, damage, newDamage * 0.9f, isCritical); } - - @Override - public Optional matches(NonNullList stacks) { - return null; - } } diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitHollow.java b/src/main/java/com/sosnitzka/taiga/traits/TraitHollow.java index 9db6c06..c563fdc 100644 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitHollow.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitHollow.java @@ -6,19 +6,15 @@ import net.minecraft.entity.monster.EntityMob; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.SoundEvents; import net.minecraft.item.ItemStack; -import net.minecraft.util.NonNullList; import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingDropsEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import slimeknights.mantle.util.RecipeMatch; import slimeknights.tconstruct.library.traits.AbstractTrait; import slimeknights.tconstruct.library.utils.TagUtil; import slimeknights.tconstruct.library.utils.TinkerUtil; -import java.util.Optional; - import static com.sosnitzka.taiga.util.Utils.isNight; public class TraitHollow extends AbstractTrait { @@ -53,9 +49,4 @@ public class TraitHollow extends AbstractTrait { } } } - - @Override - public Optional matches(NonNullList stacks) { - return null; - } } diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitInstable.java b/src/main/java/com/sosnitzka/taiga/traits/TraitInstable.java index fa59b38..d023f41 100644 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitInstable.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitInstable.java @@ -8,21 +8,17 @@ import net.minecraft.entity.monster.EntityMob; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; -import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingDropsEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import slimeknights.mantle.util.RecipeMatch; import slimeknights.tconstruct.library.traits.AbstractTrait; import slimeknights.tconstruct.library.utils.TagUtil; import slimeknights.tconstruct.library.utils.TinkerUtil; import slimeknights.tconstruct.library.utils.ToolHelper; -import java.util.Optional; - public class TraitInstable extends AbstractTrait { public TraitInstable() { @@ -74,9 +70,4 @@ public class TraitInstable extends AbstractTrait { private void explode(World w, Entity e, double x, double y, double z) { w.newExplosion(e, x, y, z, 1.2f + random.nextFloat() * 5, random.nextBoolean(), true); } - - @Override - public Optional matches(NonNullList stacks) { - return null; - } } diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitLeveled.java b/src/main/java/com/sosnitzka/taiga/traits/TraitLeveled.java deleted file mode 100644 index 86aba75..0000000 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitLeveled.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.sosnitzka.taiga.traits; - -import net.minecraft.item.ItemStack; -import net.minecraft.util.NonNullList; -import net.minecraftforge.common.MinecraftForge; -import slimeknights.mantle.util.RecipeMatch; -import slimeknights.tconstruct.library.traits.AbstractTraitLeveled; - -import java.util.Optional; - - -public class TraitLeveled extends AbstractTraitLeveled { - - - public TraitLeveled(int levels) { - super(TraitLeveled.class.getSimpleName().toLowerCase().substring(5), 0xFFFF5500, 3, levels); - MinecraftForge.EVENT_BUS.register(this); - } - - - @Override - public Optional matches(NonNullList stacks) { - return null; - } -} diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitMelting.java b/src/main/java/com/sosnitzka/taiga/traits/TraitMelting.java index c50821d..bae815f 100644 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitMelting.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitMelting.java @@ -2,19 +2,14 @@ package com.sosnitzka.taiga.traits; import net.minecraft.block.Block; import net.minecraft.init.Blocks; -import net.minecraft.item.ItemStack; -import net.minecraft.util.NonNullList; import net.minecraft.util.text.TextFormatting; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.world.BlockEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import slimeknights.mantle.util.RecipeMatch; import slimeknights.tconstruct.library.traits.AbstractTrait; import slimeknights.tconstruct.library.utils.TagUtil; import slimeknights.tconstruct.library.utils.TinkerUtil; -import java.util.Optional; - public class TraitMelting extends AbstractTrait { @@ -35,11 +30,6 @@ public class TraitMelting extends AbstractTrait { } } } - - @Override - public Optional matches(NonNullList stacks) { - return null; - } } diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitMutate.java b/src/main/java/com/sosnitzka/taiga/traits/TraitMutate.java index cb433c6..a6e2e4e 100644 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitMutate.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitMutate.java @@ -4,15 +4,12 @@ import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; -import net.minecraft.util.NonNullList; import net.minecraft.util.text.TextFormatting; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.world.BlockEvent; -import slimeknights.mantle.util.RecipeMatch; import slimeknights.tconstruct.library.traits.AbstractTrait; import java.util.List; -import java.util.Optional; import static com.google.common.collect.Lists.newArrayList; @@ -42,11 +39,6 @@ public class TraitMutate extends AbstractTrait { } } - - @Override - public Optional matches(NonNullList stacks) { - return null; - } } diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitNatureBound.java b/src/main/java/com/sosnitzka/taiga/traits/TraitNatureBound.java index 2e7675e..53f4d86 100644 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitNatureBound.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitNatureBound.java @@ -4,16 +4,12 @@ import net.minecraft.block.material.Material; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; -import net.minecraft.util.NonNullList; import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; -import slimeknights.mantle.util.RecipeMatch; import slimeknights.tconstruct.library.traits.AbstractTrait; import slimeknights.tconstruct.library.utils.ToolHelper; -import java.util.Optional; - public class TraitNatureBound extends AbstractTrait { @@ -39,9 +35,4 @@ public class TraitNatureBound extends AbstractTrait { } else ToolHelper.damageTool(tool, 1, (EntityLivingBase) entity); } } - - @Override - public Optional matches(NonNullList stacks) { - return null; - } } diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitPorted.java b/src/main/java/com/sosnitzka/taiga/traits/TraitPorted.java index 6f84263..25d1a4c 100644 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitPorted.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitPorted.java @@ -5,21 +5,17 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.init.Blocks; import net.minecraft.init.SoundEvents; import net.minecraft.item.ItemStack; -import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.PlayerInteractEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import slimeknights.mantle.util.RecipeMatch; import slimeknights.tconstruct.library.traits.AbstractTrait; import slimeknights.tconstruct.library.utils.TagUtil; import slimeknights.tconstruct.library.utils.TinkerUtil; import slimeknights.tconstruct.library.utils.ToolHelper; -import java.util.Optional; - public class TraitPorted extends AbstractTrait { public static int distance = 10; @@ -71,9 +67,4 @@ public class TraitPorted extends AbstractTrait { ToolHelper.damageTool(e.getHeldItemMainhand(), ToolHelper.getCurrentDurability(e.getHeldItemMainhand()) / 2 + 1, e); } - - @Override - public Optional matches(NonNullList stacks) { - return null; - } } diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitPulverizing.java b/src/main/java/com/sosnitzka/taiga/traits/TraitPulverizing.java index 665e1a4..17b7c9e 100644 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitPulverizing.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitPulverizing.java @@ -1,16 +1,12 @@ package com.sosnitzka.taiga.traits; import net.minecraft.item.ItemStack; -import net.minecraft.util.NonNullList; import net.minecraft.util.text.TextFormatting; import net.minecraftforge.event.entity.player.PlayerEvent; import net.minecraftforge.event.world.BlockEvent; -import slimeknights.mantle.util.RecipeMatch; import slimeknights.tconstruct.library.traits.AbstractTrait; import slimeknights.tconstruct.library.utils.ToolHelper; -import java.util.Optional; - public class TraitPulverizing extends AbstractTrait { public TraitPulverizing() { @@ -37,9 +33,4 @@ public class TraitPulverizing extends AbstractTrait { event.getDrops().clear(); } } - - @Override - public Optional matches(NonNullList stacks) { - return null; - } } diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitResonance.java b/src/main/java/com/sosnitzka/taiga/traits/TraitResonance.java index 6df6974..c4e41dd 100644 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitResonance.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitResonance.java @@ -2,13 +2,9 @@ package com.sosnitzka.taiga.traits; import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; -import net.minecraft.util.NonNullList; import net.minecraft.util.text.TextFormatting; -import slimeknights.mantle.util.RecipeMatch; import slimeknights.tconstruct.library.traits.AbstractTrait; -import java.util.Optional; - public class TraitResonance extends AbstractTrait { @@ -26,11 +22,6 @@ public class TraitResonance extends AbstractTrait { .posZ - target.posZ); } } - - @Override - public Optional matches(NonNullList stacks) { - return null; - } } diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitReviving.java b/src/main/java/com/sosnitzka/taiga/traits/TraitReviving.java index 32f1de2..1f48b57 100644 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitReviving.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitReviving.java @@ -5,21 +5,16 @@ import net.minecraft.entity.EntityCreature; import net.minecraft.entity.EntityList; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.SoundEvents; -import net.minecraft.item.ItemStack; -import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingDeathEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import slimeknights.mantle.util.RecipeMatch; import slimeknights.tconstruct.library.traits.AbstractTrait; import slimeknights.tconstruct.library.utils.TagUtil; import slimeknights.tconstruct.library.utils.TinkerUtil; -import java.util.Optional; - public class TraitReviving extends AbstractTrait { @@ -50,9 +45,4 @@ public class TraitReviving extends AbstractTrait { } } } - - @Override - public Optional matches(NonNullList stacks) { - return null; - } } diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitSlaughtering.java b/src/main/java/com/sosnitzka/taiga/traits/TraitSlaughtering.java index c3c4fba..44a281b 100644 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitSlaughtering.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitSlaughtering.java @@ -4,19 +4,15 @@ import net.minecraft.entity.EntityLiving; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.NonNullList; import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingDropsEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import slimeknights.mantle.util.RecipeMatch; import slimeknights.tconstruct.library.traits.AbstractTrait; import slimeknights.tconstruct.library.utils.TagUtil; import slimeknights.tconstruct.library.utils.TinkerUtil; -import java.util.Optional; - public class TraitSlaughtering extends AbstractTrait { public TraitSlaughtering() { @@ -40,9 +36,4 @@ public class TraitSlaughtering extends AbstractTrait { } } } - - @Override - public Optional matches(NonNullList stacks) { - return null; - } } diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitSofty.java b/src/main/java/com/sosnitzka/taiga/traits/TraitSofty.java index eee82b5..e78410c 100644 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitSofty.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitSofty.java @@ -2,21 +2,17 @@ package com.sosnitzka.taiga.traits; import net.minecraft.block.state.IBlockState; import net.minecraft.item.ItemStack; -import net.minecraft.util.NonNullList; import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.PlayerEvent; import net.minecraftforge.event.world.BlockEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import slimeknights.mantle.util.RecipeMatch; import slimeknights.tconstruct.library.traits.AbstractTrait; import slimeknights.tconstruct.library.utils.TagUtil; import slimeknights.tconstruct.library.utils.TinkerUtil; import slimeknights.tconstruct.library.utils.ToolHelper; -import java.util.Optional; - public class TraitSofty extends AbstractTrait { private static final float chance = 0.1f; @@ -50,11 +46,6 @@ public class TraitSofty extends AbstractTrait { } } } - - @Override - public Optional matches(NonNullList stacks) { - return null; - } } diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitSoulEater.java b/src/main/java/com/sosnitzka/taiga/traits/TraitSoulEater.java index 0f3c680..f3d54cd 100644 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitSoulEater.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitSoulEater.java @@ -6,7 +6,6 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.NonNullList; import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; @@ -15,18 +14,13 @@ 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; import slimeknights.tconstruct.library.utils.TinkerUtil; -import java.util.Optional; - public class TraitSoulEater extends AbstractTrait { - private static float divisor = 25000f; - public TraitSoulEater() { super(TraitSoulEater.class.getSimpleName().toLowerCase().substring(5), TextFormatting.RED); MinecraftForge.EVENT_BUS.register(this); @@ -43,6 +37,7 @@ public class TraitSoulEater extends AbstractTrait { float health = ((EntityLiving) event.getEntity()).getMaxHealth(); data.killcount += 1; data.health = health; + float divisor = 25000f; float bonus = Math.round(random.nextFloat() * health * 100) / divisor; data.bonus += bonus; data.bonus = (float) Math.round(data.bonus * 100f) / 100f; @@ -74,9 +69,4 @@ public class TraitSoulEater extends AbstractTrait { } } } - - @Override - public Optional matches(NonNullList stacks) { - return null; - } } diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitSuperHeavy.java b/src/main/java/com/sosnitzka/taiga/traits/TraitSuperHeavy.java index 888cff5..4371a20 100644 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitSuperHeavy.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitSuperHeavy.java @@ -6,7 +6,6 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; @@ -16,12 +15,9 @@ 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; -import java.util.Optional; - public class TraitSuperHeavy extends TraitProgressiveStats { @@ -84,9 +80,4 @@ public class TraitSuperHeavy extends TraitProgressiveStats { } } - - @Override - public Optional matches(NonNullList stacks) { - return null; - } } diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitTantrum.java b/src/main/java/com/sosnitzka/taiga/traits/TraitTantrum.java index e7975f3..77630b1 100644 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitTantrum.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitTantrum.java @@ -4,7 +4,6 @@ import com.sosnitzka.taiga.util.Utils; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; @@ -15,14 +14,11 @@ 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; import slimeknights.tconstruct.library.utils.TagUtil; import slimeknights.tconstruct.library.utils.TinkerUtil; -import java.util.Optional; - import static com.sosnitzka.taiga.Blocks.tiberiumOre; public class TraitTantrum extends AbstractTrait { @@ -95,11 +91,6 @@ public class TraitTantrum extends AbstractTrait { } } - @Override - public Optional matches(NonNullList stacks) { - return null; - } - public static class Data { float amount; @@ -114,5 +105,4 @@ public class TraitTantrum extends AbstractTrait { tag.setFloat("amount", amount); } } - } diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitTemplate.java b/src/main/java/com/sosnitzka/taiga/traits/TraitTemplate.java deleted file mode 100644 index ef776f2..0000000 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitTemplate.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.sosnitzka.taiga.traits; - -import net.minecraft.item.ItemStack; -import net.minecraft.util.NonNullList; -import net.minecraft.util.text.TextFormatting; -import net.minecraftforge.common.MinecraftForge; -import slimeknights.mantle.util.RecipeMatch; -import slimeknights.tconstruct.library.traits.AbstractTrait; - -import java.util.Optional; - - -public class TraitTemplate extends AbstractTrait { - - - public TraitTemplate() { - super(TraitTemplate.class.getSimpleName().toLowerCase().substring(5), TextFormatting.RED); - MinecraftForge.EVENT_BUS.register(this); - } - - @Override - public Optional matches(NonNullList stacks) { - return null; - } -} diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitTraditional.java b/src/main/java/com/sosnitzka/taiga/traits/TraitTraditional.java deleted file mode 100644 index 14ea41c..0000000 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitTraditional.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.sosnitzka.taiga.traits; - -import net.minecraft.entity.EntityCreature; -import net.minecraft.entity.EntityList; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.NonNullList; -import net.minecraft.world.World; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.event.entity.living.LivingDeathEvent; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import slimeknights.mantle.util.RecipeMatch; -import slimeknights.tconstruct.library.traits.AbstractTrait; -import slimeknights.tconstruct.library.utils.TagUtil; -import slimeknights.tconstruct.library.utils.TinkerUtil; - -import java.util.Optional; - - -public class TraitTraditional extends AbstractTrait { - - - public TraitTraditional() { - super("traditional", 0xff33ff); - MinecraftForge.EVENT_BUS.register(this); - } - - @SubscribeEvent - public void onEntityKill(LivingDeathEvent e) { - World w = e.getEntity().getEntityWorld(); - if (!w.isRemote && e.getSource().getTrueSource() instanceof EntityPlayer && e.getEntity() instanceof - EntityCreature) { - if (TinkerUtil.hasTrait(TagUtil.getTagSafe(((EntityPlayer) e.getSource().getTrueSource()) - .getHeldItemMainhand()), identifier)) { - String name = EntityList.getEntityString(e.getEntity()); - } - } - } - - @Override - public Optional matches(NonNullList stacks) { - return null; - } - - public static class Data { - - String mobname; - - public static Data read(NBTTagCompound tag) { - Data data = new Data(); - data.mobname = tag.getString("mob"); - return data; - } - - public void write(NBTTagCompound tag) { - tag.setString("amount", mobname); - } - } - -} diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitUncertain.java b/src/main/java/com/sosnitzka/taiga/traits/TraitUncertain.java deleted file mode 100644 index 9932a6e..0000000 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitUncertain.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.sosnitzka.taiga.traits; - -import net.minecraft.item.ItemStack; -import net.minecraft.util.NonNullList; -import net.minecraft.util.text.TextFormatting; -import net.minecraftforge.common.MinecraftForge; -import slimeknights.mantle.util.RecipeMatch; -import slimeknights.tconstruct.library.traits.AbstractTrait; - -import java.util.Optional; - - -public class TraitUncertain extends AbstractTrait { - - - public TraitUncertain() { - super(TraitUncertain.class.getName().toLowerCase().substring(4), TextFormatting.RED); - MinecraftForge.EVENT_BUS.register(this); - } - - @Override - public Optional matches(NonNullList stacks) { - return null; - } -} diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitVortex.java b/src/main/java/com/sosnitzka/taiga/traits/TraitVortex.java deleted file mode 100644 index d876e77..0000000 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitVortex.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.sosnitzka.taiga.traits; - -import net.minecraft.item.ItemStack; -import net.minecraft.util.NonNullList; -import net.minecraft.util.text.TextFormatting; -import net.minecraftforge.common.MinecraftForge; -import slimeknights.mantle.util.RecipeMatch; -import slimeknights.tconstruct.library.traits.AbstractTrait; - -import java.util.Optional; - - -public class TraitVortex extends AbstractTrait { - - - public TraitVortex() { - super(TraitVortex.class.getSimpleName().toLowerCase().substring(5), TextFormatting.DARK_PURPLE); - MinecraftForge.EVENT_BUS.register(this); - } - - - @Override - public Optional matches(NonNullList stacks) { - return null; - } -} diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitWhirl.java b/src/main/java/com/sosnitzka/taiga/traits/TraitWhirl.java index d3c0c50..41dc284 100644 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitWhirl.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitWhirl.java @@ -5,7 +5,6 @@ import net.minecraft.entity.Entity; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; import net.minecraft.util.text.TextFormatting; @@ -17,14 +16,11 @@ 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; import slimeknights.tconstruct.library.utils.TinkerUtil; import slimeknights.tconstruct.library.utils.ToolHelper; -import java.util.Optional; - public class TraitWhirl extends AbstractTrait { @@ -103,9 +99,4 @@ public class TraitWhirl extends AbstractTrait { } } } - - @Override - public Optional matches(NonNullList stacks) { - return null; - } }