aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/xmod/growthcraft/fishtrap/FishTrapHandler.java
diff options
context:
space:
mode:
authorDraknyte1 <Draknyte1@hotmail.com>2017-03-04 12:58:47 +1000
committerDraknyte1 <Draknyte1@hotmail.com>2017-03-04 12:58:47 +1000
commitae21012d216df71f31aed6fbc9d76215fc24ceed (patch)
treecc89accbe6ce5c04b72ed3c5e46b2a185f88be6a /src/Java/gtPlusPlus/xmod/growthcraft/fishtrap/FishTrapHandler.java
parentba89972a22a316030f8c3bd99974f915b1d7aefc (diff)
downloadGT5-Unofficial-ae21012d216df71f31aed6fbc9d76215fc24ceed.tar.gz
GT5-Unofficial-ae21012d216df71f31aed6fbc9d76215fc24ceed.tar.bz2
GT5-Unofficial-ae21012d216df71f31aed6fbc9d76215fc24ceed.zip
+ New texture for the slow builders ring.
+ Added the Alkalus Disk. $ Fixed Frame Box Assembler Recipes. $ Fixed Missing 7Li material. $ Fixed Tiered Tanks not showing their capacity in the tooltip. $ Fixed tooltips for alloys containing Bronze or Steel. $ Fixed Clay Pipe Extruder Recipes. - Removed a handful of Plasma cells for misc. materials. % Changed the Industrial Coke Oven's tooltip, to better describe the input/output requirements. % Cleaned up The Entire Project.
Diffstat (limited to 'src/Java/gtPlusPlus/xmod/growthcraft/fishtrap/FishTrapHandler.java')
-rw-r--r--src/Java/gtPlusPlus/xmod/growthcraft/fishtrap/FishTrapHandler.java60
1 files changed, 30 insertions, 30 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
+ }
}
-
+
}