diff --git a/src/main/java/net/minecraftforge/common/FishingHooks.java b/src/main/java/net/minecraftforge/common/FishingHooks.java deleted file mode 100644 index 70c10185ad..0000000000 --- a/src/main/java/net/minecraftforge/common/FishingHooks.java +++ /dev/null @@ -1,113 +0,0 @@ -package net.minecraftforge.common; - -import java.util.ArrayList; -import java.util.Iterator; -import java.util.Random; - -import com.google.common.base.Predicate; - -import net.minecraft.entity.projectile.EntityFishHook; -import net.minecraft.item.ItemStack; -import net.minecraft.stats.StatBase; -import net.minecraft.stats.StatList; -import net.minecraft.util.MathHelper; -import net.minecraft.util.WeightedRandom; -import net.minecraft.util.WeightedRandomFishable; - -public class FishingHooks -{ - private static ArrayList fish = new ArrayList(); - private static ArrayList junk = new ArrayList(); - private static ArrayList treasure = new ArrayList(); - - public static void addFish(WeightedRandomFishable item) { fish.add(item); } - public static void addJunk(WeightedRandomFishable item) { junk.add(item); } - public static void addTreasure(WeightedRandomFishable item) { treasure.add(item); } - - public static void removeFish(Predicate test) { remove(fish.iterator(), test); } - public static void removeJunk(Predicate test) { remove(junk.iterator(), test); } - public static void removeTreasure(Predicate test) { remove(treasure.iterator(), test); } - - public static ItemStack getRandomFishable(Random rand, float chance) - { - return getRandomFishable(rand, chance, 0, 0); - } - - public static ItemStack getRandomFishable(Random rand, float chance, int luck, int speed) - { - float junkChance = 0.1F - luck * 0.025F - speed * 0.01F; - float treasureChance = 0.05F + luck * 0.01F - speed * 0.01F; - junkChance = MathHelper.clamp_float(junkChance, 0.0F, 1.0F); - treasureChance = MathHelper.clamp_float(treasureChance, 0.0F, 1.0F); - - if (chance < junkChance) - { - return ((WeightedRandomFishable)WeightedRandom.getRandomItem(rand, junk)).getItemStack(rand); - } - - chance -= junkChance; - if (chance < treasureChance) - { - return ((WeightedRandomFishable)WeightedRandom.getRandomItem(rand, treasure)).getItemStack(rand); - } - - chance -= treasureChance; - // this is done in EntityFishHook.func_146033_f. more loot types expected? - { - return ((WeightedRandomFishable)WeightedRandom.getRandomItem(rand, fish)).getItemStack(rand); - } - } - - public static FishableCategory getFishableCategory(float chance, int luck, int speed) - { - float junkChance = 0.1F - luck * 0.025F - speed * 0.01F; - float treasureChance = 0.05F + luck * 0.01F - speed * 0.01F; - junkChance = MathHelper.clamp_float(junkChance, 0.0F, 1.0F); - treasureChance = MathHelper.clamp_float(treasureChance, 0.0F, 1.0F); - - if (chance < junkChance) - { - return FishableCategory.JUNK; - } - - chance -= junkChance; - if (chance < treasureChance) - { - return FishableCategory.TREASURE; - } - - chance -= treasureChance; - // this is done in EntityFishHook.func_146033_f. more loot types expected? - { - return FishableCategory.FISH; - } - } - - private static void remove(Iterator iter, Predicate test) - { - while (iter.hasNext()) - if (!test.apply(iter.next())) - iter.remove(); - } - - static - { - fish.addAll(EntityFishHook.FISH); - junk.addAll(EntityFishHook.JUNK); - treasure.addAll(EntityFishHook.TREASURE); - } - - public static enum FishableCategory - { - JUNK(StatList.junkFishedStat), - TREASURE(StatList.treasureFishedStat), - FISH(StatList.fishCaughtStat); - - public final StatBase stat; - - FishableCategory(StatBase stat) - { - this.stat = stat; - } - } -} \ No newline at end of file