diff options
Diffstat (limited to 'src/Java/gtPlusPlus/xmod/growthcraft/fishtrap')
3 files changed, 40 insertions, 40 deletions
diff --git a/src/Java/gtPlusPlus/xmod/growthcraft/fishtrap/FishTrapHandler.java b/src/Java/gtPlusPlus/xmod/growthcraft/fishtrap/FishTrapHandler.java index 30c799d49b..bbbf8b96a7 100644 --- a/src/Java/gtPlusPlus/xmod/growthcraft/fishtrap/FishTrapHandler.java +++ b/src/Java/gtPlusPlus/xmod/growthcraft/fishtrap/FishTrapHandler.java @@ -9,15 +9,15 @@ import gtPlusPlus.core.util.item.ItemUtils; import net.minecraft.item.ItemStack; public class FishTrapHandler { - + private static final String[] fishTypes = {"fish", "junk", "treasure"}; - protected static void addFish(String lootType, ItemStack lootStack, int lootChance){ - - String GCVersion = LoadedMods.getModVersion("Growthcraft"); - - String[] versionString = GCVersion.split("//."); - + protected static void addFish(final String lootType, final ItemStack lootStack, final int lootChance){ + + final String GCVersion = LoadedMods.getModVersion("Growthcraft"); + + final String[] versionString = GCVersion.split("//."); + if (LoadedMods.getModVersion("Growthcraft").contains("2.3.1") || versionString[1].equals("3")){ if (lootType.equals(fishTypes[0])){ Growthcraft_Old.addTrapFish(lootStack, lootChance); @@ -52,43 +52,43 @@ public class FishTrapHandler { return; } } - + else { Utils.LOG_INFO("Extra Fish loot for Growthcraft Fishtraps disabled. Found V."+LoadedMods.getModVersion("Growthcraft")); } - + } - + final static String prefix = "food"; final static String suffix = "raw"; final static String seaweed = "cropSeaweed"; final static String greenheartFish = "Greenheartfish"; private static final String[] harvestcraftFish = { - "Anchovy", "Bass", "Carp", "Catfish", "Charr", "Clam", "Crab", "Crayfish", "Eel", "Frog", "Grouper", "Herring", - "Jellyfish", "Mudfish", "Octopus", "Perch", "Scallop", "Shrimp", "Snail", "Snapper", "Tilapia", "Trout", "Tuna", "Turtle", "Walleye"}; + "Anchovy", "Bass", "Carp", "Catfish", "Charr", "Clam", "Crab", "Crayfish", "Eel", "Frog", "Grouper", "Herring", + "Jellyfish", "Mudfish", "Octopus", "Perch", "Scallop", "Shrimp", "Snail", "Snapper", "Tilapia", "Trout", "Tuna", "Turtle", "Walleye"}; public static void pamsHarvestCraftCompat(){ for (int i = 0; i < harvestcraftFish.length; i++){ - String itemName = prefix+harvestcraftFish[i]+suffix; - int lootChance = getLootChance(harvestcraftFish[i]); + final String itemName = prefix+harvestcraftFish[i]+suffix; + final int lootChance = getLootChance(harvestcraftFish[i]); if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken(itemName, 1) != null){ - addFish("fish", ItemUtils.getItemStackOfAmountFromOreDict(itemName, 1), lootChance); + addFish("fish", ItemUtils.getItemStackOfAmountFromOreDict(itemName, 1), lootChance); addGregtechMaceratorRecipe(ItemUtils.getItemStackOfAmountFromOreDict(itemName, 1)); addGregtechCentrifugeRecipe(ItemUtils.getItemStackOfAmountFromOreDict(itemName, 1)); addGregtechFluidRecipe(ItemUtils.getItemStackOfAmountFromOreDict(itemName, 1)); } } if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken(greenheartFish, 1) != null){ - addFish("fish", ItemUtils.getItemStackOfAmountFromOreDict(greenheartFish, 1), getLootChance(greenheartFish)); + addFish("fish", ItemUtils.getItemStackOfAmountFromOreDict(greenheartFish, 1), getLootChance(greenheartFish)); addGregtechMaceratorRecipe(ItemUtils.getItemStackOfAmountFromOreDict(greenheartFish, 1)); addGregtechCentrifugeRecipe(ItemUtils.getItemStackOfAmountFromOreDict(greenheartFish, 1)); addGregtechFluidRecipe(ItemUtils.getItemStackOfAmountFromOreDict(greenheartFish, 1)); } if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken(seaweed, 1) != null){ - addFish("junk", ItemUtils.getItemStackOfAmountFromOreDict(seaweed, 1), getLootChance(seaweed)); + addFish("junk", ItemUtils.getItemStackOfAmountFromOreDict(seaweed, 1), getLootChance(seaweed)); } } - - private static int getLootChance(String name){ + + private static int getLootChance(final String name){ if (name.equals(harvestcraftFish[0])){ return 20; } @@ -168,23 +168,23 @@ public class FishTrapHandler { return 25; } } - - private static void addGregtechCentrifugeRecipe(ItemStack input){ + + private static void addGregtechCentrifugeRecipe(final ItemStack input){ if (LoadedMods.Gregtech){ - GT_Values.RA.addCentrifugeRecipe(input, null, null, FluidUtils.getFluidStack("methane", 96), null, null, null, null, null, null, null, 19*20, 5); - } + GT_Values.RA.addCentrifugeRecipe(input, null, null, FluidUtils.getFluidStack("methane", 96), null, null, null, null, null, null, null, 19*20, 5); + } } - - private static void addGregtechMaceratorRecipe(ItemStack input){ + + private static void addGregtechMaceratorRecipe(final ItemStack input){ if (LoadedMods.Gregtech){ GT_ModHandler.addPulverisationRecipe(input, ItemUtils.getItemStackOfAmountFromOreDict("dustMeatRaw", 1), ItemUtils.getItemStackOfAmountFromOreDict("dustTinyBone", 1), 0); } } - - private static void addGregtechFluidRecipe(ItemStack input){ + + private static void addGregtechFluidRecipe(final ItemStack input){ if (LoadedMods.Gregtech){ - GT_Values.RA.addFluidExtractionRecipe(input, null, FluidUtils.getFluidStack("fishoil", 4), 0, (64/4), 4); //4eu/t total eu used = 64 so time = 64/4 - } + GT_Values.RA.addFluidExtractionRecipe(input, null, FluidUtils.getFluidStack("fishoil", 4), 0, (64/4), 4); //4eu/t total eu used = 64 so time = 64/4 + } } - + } diff --git a/src/Java/gtPlusPlus/xmod/growthcraft/fishtrap/Growthcraft_New.java b/src/Java/gtPlusPlus/xmod/growthcraft/fishtrap/Growthcraft_New.java index 5b744623c7..4405709888 100644 --- a/src/Java/gtPlusPlus/xmod/growthcraft/fishtrap/Growthcraft_New.java +++ b/src/Java/gtPlusPlus/xmod/growthcraft/fishtrap/Growthcraft_New.java @@ -6,17 +6,17 @@ import net.minecraft.item.ItemStack; public class Growthcraft_New { - public static void addTrapJunk(ItemStack loot, int lootChance){ - FishTrapRegistry.instance().addTrapJunk(new FishTrapEntry(loot, lootChance)); + public static void addTrapJunk(final ItemStack loot, final int lootChance){ + FishTrapRegistry.instance().addTrapJunk(new FishTrapEntry(loot, lootChance)); } - public static void addTrapTreasure(ItemStack loot, int lootChance){ - FishTrapRegistry.instance().addTrapTreasure(new FishTrapEntry(loot, lootChance)); + public static void addTrapTreasure(final ItemStack loot, final int lootChance){ + FishTrapRegistry.instance().addTrapTreasure(new FishTrapEntry(loot, lootChance)); } - public static void addTrapFish(ItemStack loot, int lootChance){ + public static void addTrapFish(final ItemStack loot, final int lootChance){ FishTrapRegistry.instance().addTrapFish(new FishTrapEntry(loot, lootChance)); } diff --git a/src/Java/gtPlusPlus/xmod/growthcraft/fishtrap/Growthcraft_Old.java b/src/Java/gtPlusPlus/xmod/growthcraft/fishtrap/Growthcraft_Old.java index d7521fc579..f988abd53a 100644 --- a/src/Java/gtPlusPlus/xmod/growthcraft/fishtrap/Growthcraft_Old.java +++ b/src/Java/gtPlusPlus/xmod/growthcraft/fishtrap/Growthcraft_Old.java @@ -6,17 +6,17 @@ import net.minecraft.item.ItemStack; public class Growthcraft_Old { - public static void addTrapJunk(ItemStack loot, int lootChance){ - FishTrapRegistry.instance().addTrapJunk(new FishTrapEntry(loot, lootChance)); + public static void addTrapJunk(final ItemStack loot, final int lootChance){ + FishTrapRegistry.instance().addTrapJunk(new FishTrapEntry(loot, lootChance)); } - public static void addTrapTreasure(ItemStack loot, int lootChance){ - FishTrapRegistry.instance().addTrapTreasure(new FishTrapEntry(loot, lootChance)); + public static void addTrapTreasure(final ItemStack loot, final int lootChance){ + FishTrapRegistry.instance().addTrapTreasure(new FishTrapEntry(loot, lootChance)); } - public static void addTrapFish(ItemStack loot, int lootChance){ + public static void addTrapFish(final ItemStack loot, final int lootChance){ FishTrapRegistry.instance().addTrapFish(new FishTrapEntry(loot, lootChance)); } |