diff options
Diffstat (limited to 'src/Java')
3 files changed, 43 insertions, 7 deletions
diff --git a/src/Java/gtPlusPlus/core/lib/LoadedMods.java b/src/Java/gtPlusPlus/core/lib/LoadedMods.java index bb578f3a1a..e15e50ddf4 100644 --- a/src/Java/gtPlusPlus/core/lib/LoadedMods.java +++ b/src/Java/gtPlusPlus/core/lib/LoadedMods.java @@ -42,6 +42,7 @@ public class LoadedMods { public static boolean Computronics = false; //computronics public static boolean DreamCraft = false; //GT: New Horizons public static boolean BiomesOPlenty = false; + public static boolean PamsHarvestcraft = false; @@ -126,6 +127,11 @@ public class LoadedMods { Utils.LOG_INFO("Components enabled for: Extra_Utils"); totalMods++; } + if (Loader.isModLoaded("harvestcraft") == true){ + PamsHarvestcraft = true; + Utils.LOG_INFO("Components enabled for: PamsHarvestcraft"); + totalMods++; + } if (Loader.isModLoaded("PneumaticCraft") == true){ PneumaticCraft = true; Utils.LOG_INFO("Components enabled for: PneumaticCraft"); diff --git a/src/Java/gtPlusPlus/core/tileentities/general/TileEntityFishTrap.java b/src/Java/gtPlusPlus/core/tileentities/general/TileEntityFishTrap.java index 9191621bee..66aed3731e 100644 --- a/src/Java/gtPlusPlus/core/tileentities/general/TileEntityFishTrap.java +++ b/src/Java/gtPlusPlus/core/tileentities/general/TileEntityFishTrap.java @@ -2,6 +2,7 @@ package gtPlusPlus.core.tileentities.general; import gtPlusPlus.core.block.ModBlocks; import gtPlusPlus.core.inventories.InventoryFishTrap; +import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.item.ItemUtils; import gtPlusPlus.core.util.math.MathUtils; @@ -117,20 +118,30 @@ public class TileEntityFishTrap extends TileEntity{ private ItemStack generateLootForFishTrap() { final int lootWeight = MathUtils.randInt(0, 100); ItemStack loot; - if (lootWeight <= 10){ + if (lootWeight <= 5){ loot = ItemUtils.getSimpleStack(Items.slime_ball); } - else if (lootWeight <= 20){ + else if (lootWeight <= 15){ loot = ItemUtils.getSimpleStack(Items.bone); } - else if (lootWeight <= 40){ + else if (lootWeight <= 25){ loot = ItemUtils.getSimpleStack(Blocks.sand); } - else if (lootWeight <= 80){ - loot = ItemUtils.getSimpleStack(Items.fish); + else if (lootWeight <= 35){ + loot = ItemUtils.getItemStackOfAmountFromOreDictNoBroken(seaweed, 1); } + //Pam Fish + else if (lootWeight <= 70){ + if (LoadedMods.PamsHarvestcraft){ + loot = ItemUtils.getItemStackOfAmountFromOreDictNoBroken(prefix+harvestcraftFish[MathUtils.randInt(0, harvestcraftFish.length)]+suffix, 1); + } + else { + loot = ItemUtils.getSimpleStack(minecraftFish[MathUtils.randInt(0, minecraftFish.length)], 1); + } + } + //Minecraft Fish else if (lootWeight <= 100){ - loot = ItemUtils.getSimpleStack(Items.fish); + loot = ItemUtils.getSimpleStack(minecraftFish[MathUtils.randInt(0, minecraftFish.length)], 1); } else { loot = ItemUtils.getSimpleStack(Blocks.diamond_ore); @@ -222,5 +233,24 @@ public class TileEntityFishTrap extends TileEntity{ //Utils.LOG_INFO("Trying to read NBT data from TE."); this.inventoryContents.readFromNBT(nbt.getCompoundTag("ContentsChest")); } + + 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"}; + + private static final ItemStack[] minecraftFish = { + ItemUtils.getItemStack("minecraft:fish", 1), ItemUtils.getItemStack("minecraft:fish:1", 1), + ItemUtils.getItemStack("minecraft:fish:2", 1), ItemUtils.getItemStack("minecraft:fish:3", 1) + }; + + public static void pamsHarvestCraftCompat(){ + for (int i = 0; i < harvestcraftFish.length; i++){ + + } + } } diff --git a/src/Java/gtPlusPlus/xmod/growthcraft/fishtrap/FishTrapHandler.java b/src/Java/gtPlusPlus/xmod/growthcraft/fishtrap/FishTrapHandler.java index bbbf8b96a7..687a5afa3b 100644 --- a/src/Java/gtPlusPlus/xmod/growthcraft/fishtrap/FishTrapHandler.java +++ b/src/Java/gtPlusPlus/xmod/growthcraft/fishtrap/FishTrapHandler.java @@ -62,7 +62,7 @@ public class FishTrapHandler { final static String prefix = "food"; final static String suffix = "raw"; final static String seaweed = "cropSeaweed"; - final static String greenheartFish = "Greenheartfish"; + final static String greenheartFish = "foodGreenheartfish"; 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"}; |