From 906dcb999d1141408ac3897bcf7d817b2b8f33c4 Mon Sep 17 00:00:00 2001 From: skyboy Date: Thu, 5 Jun 2014 20:35:28 -0400 Subject: [PATCH] Add FishingHooks --- .../projectile/EntityFishHook.java.patch | 37 +++++++ .../minecraftforge/common/FishingHooks.java | 98 +++++++++++++++++++ 2 files changed, 135 insertions(+) create mode 100644 patches/minecraft/net/minecraft/entity/projectile/EntityFishHook.java.patch create mode 100644 src/main/java/net/minecraftforge/common/FishingHooks.java diff --git a/patches/minecraft/net/minecraft/entity/projectile/EntityFishHook.java.patch b/patches/minecraft/net/minecraft/entity/projectile/EntityFishHook.java.patch new file mode 100644 index 0000000000..4346d15dc0 --- /dev/null +++ b/patches/minecraft/net/minecraft/entity/projectile/EntityFishHook.java.patch @@ -0,0 +1,37 @@ +--- ../src-base/minecraft/net/minecraft/entity/projectile/EntityFishHook.java ++++ ../src-work/minecraft/net/minecraft/entity/projectile/EntityFishHook.java +@@ -571,32 +571,8 @@ public class EntityFishHook extends Entity + float f = this.worldObj.rand.nextFloat(); + int i = EnchantmentHelper.func_151386_g(this.field_146042_b); + int j = EnchantmentHelper.func_151387_h(this.field_146042_b); +- float f1 = 0.1F - (float)i * 0.025F - (float)j * 0.01F; +- float f2 = 0.05F + (float)i * 0.01F - (float)j * 0.01F; +- f1 = MathHelper.clamp_float(f1, 0.0F, 1.0F); +- f2 = MathHelper.clamp_float(f2, 0.0F, 1.0F); +- +- if (f < f1) +- { +- this.field_146042_b.addStat(StatList.field_151183_A, 1); +- return ((WeightedRandomFishable)WeightedRandom.getRandomItem(this.rand, field_146039_d)).func_150708_a(this.rand); +- } +- else +- { +- f -= f1; +- +- if (f < f2) +- { +- this.field_146042_b.addStat(StatList.field_151184_B, 1); +- return ((WeightedRandomFishable)WeightedRandom.getRandomItem(this.rand, field_146041_e)).func_150708_a(this.rand); +- } +- else +- { +- float f3 = f - f2; +- this.field_146042_b.addStat(StatList.fishCaughtStat, 1); +- return ((WeightedRandomFishable)WeightedRandom.getRandomItem(this.rand, field_146036_f)).func_150708_a(this.rand); +- } +- } ++ this.field_146042_b.addStat(net.minecraftforge.common.FishingHooks.getFishableCategory(f, i, j).stat, 1); ++ return net.minecraftforge.common.FishingHooks.getRandomFishable(this.rand, f, i, j); + } + + /** diff --git a/src/main/java/net/minecraftforge/common/FishingHooks.java b/src/main/java/net/minecraftforge/common/FishingHooks.java new file mode 100644 index 0000000000..f9aa18b55f --- /dev/null +++ b/src/main/java/net/minecraftforge/common/FishingHooks.java @@ -0,0 +1,98 @@ +package net.minecraftforge.common; + +import java.util.ArrayList; +import java.util.Random; +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 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)).func_150708_a(rand); + } + + chance -= junkChance; + if (chance < treasureChance) + { + return ((WeightedRandomFishable)WeightedRandom.getRandomItem(rand, treasure)).func_150708_a(rand); + } + + chance -= treasureChance; + // this is done in EntityFishHook.func_146033_f. more loot types expected? + { + return ((WeightedRandomFishable)WeightedRandom.getRandomItem(rand, fish)).func_150708_a(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; + } + } + + public static enum FishableCategory + { + JUNK(StatList.field_151183_A), + TREASURE(StatList.field_151184_B), + FISH(StatList.fishCaughtStat); + + public final StatBase stat; + + FishableCategory(StatBase stat) + { + this.stat = stat; + } + } + + 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); } + + static + { + fish.addAll(EntityFishHook.field_146036_f); + junk.addAll(EntityFishHook.field_146039_d); + treasure.addAll(EntityFishHook.field_146041_e); + } +}