diff options
5 files changed, 33 insertions, 10 deletions
diff --git a/src/Java/gtPlusPlus/core/config/ConfigHandler.java b/src/Java/gtPlusPlus/core/config/ConfigHandler.java index 3d6a60dc79..98c4320ce7 100644 --- a/src/Java/gtPlusPlus/core/config/ConfigHandler.java +++ b/src/Java/gtPlusPlus/core/config/ConfigHandler.java @@ -140,6 +140,8 @@ public class ConfigHandler { "gregtech", true, "Thermal Boiler from GT4. Can Filter Lava for resources."); enableMultiblock_IndustrialCuttingMachine = config.getBoolean("enableMultiblock_IndustrialCuttingMachine", "gregtech", true, "Very fast and efficient Cutting Machine."); + enableMultiblock_IndustrialFishingPort = config.getBoolean("enableMultiblock_IndustrialFishingPort", + "gregtech", true, "Fish the seas, except on land."); // Options rfPerEU = config.getInt("rfUsedPerEUForUniversalBatteries", "configurables", 4, 1, 1000, diff --git a/src/Java/gtPlusPlus/core/lib/CORE.java b/src/Java/gtPlusPlus/core/lib/CORE.java index 9f58f222aa..1e24ab510a 100644 --- a/src/Java/gtPlusPlus/core/lib/CORE.java +++ b/src/Java/gtPlusPlus/core/lib/CORE.java @@ -209,6 +209,7 @@ public class CORE { public static boolean enableMultiblock_LargeAutoCrafter = true; public static boolean enableMultiblock_ThermalBoiler = true; public static boolean enableMultiblock_IndustrialCuttingMachine = true; + public static boolean enableMultiblock_IndustrialFishingPort = true; //Visuals public static boolean enableTreeFarmerParticles = true; @@ -217,6 +218,7 @@ public class CORE { + } public static class Everglades{ diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java index a460d7ca59..d22567a5b7 100644 --- a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java +++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java @@ -1085,7 +1085,7 @@ public class RECIPES_Machines { "plateStainlessSteel",CI.emitter_ULV,"plateStainlessSteel", ItemUtils.getSimpleStack(ModBlocks.blockProjectTable)); } - + if (CORE.ConfigSwitches.enableMultiblock_IndustrialCuttingMachine){ ItemStack plate = ALLOY.MARAGING300.getPlate(1); RecipeUtils.recipeBuilder( @@ -1101,6 +1101,21 @@ public class RECIPES_Machines { GregtechItemList.Industrial_CuttingFactoryController.get(1)); } + if (CORE.ConfigSwitches.enableMultiblock_IndustrialFishingPort){ + ItemStack plate = ALLOY.INCONEL_792.getPlate(1); + RecipeUtils.recipeBuilder( + plate, CI.craftingToolHammer_Hard, plate, + "plateEglinSteel", "frameGtEglinSteel", "plateEglinSteel", + plate, CI.craftingToolWrench, plate, + GregtechItemList.Casing_FishPond.get(Casing_Amount)); + + RecipeUtils.recipeBuilder( + plate,CI.getTieredCircuit(3),plate, + "wireFineElectrum", ItemUtils.getSimpleStack(ModBlocks.blockFishTrap), "wireFineElectrum", + plate,CI.getTieredCircuit(2),plate, + GregtechItemList.Industrial_FishingPond.get(1)); + } + //Wireless Chargers RecipeUtils.addShapedGregtechRecipe( CI.emitter_LV, CI.circuitTier1, CI.emitter_LV, diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntityChunkLoader.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntityChunkLoader.java index df8f40e633..7bdc5ae2f2 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntityChunkLoader.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntityChunkLoader.java @@ -210,12 +210,14 @@ public class GregtechMetaTileEntityChunkLoader extends GT_MetaTileEntity_TieredM short mSize = (short) mChunkLoaderManagerMap.size(); this.mChunkLoaderMapID = mSize; if (this != null && this.getBaseMetaTileEntity() != null) { - if (!isRegistered()) { - BlockPos thisPos = new BlockPos(this.xCoord, this.yCoord, this.zCoord, this.getBaseMetaTileEntity().getWorld().provider.dimensionId); - Triplet<Integer, GregtechMetaTileEntityChunkLoader, DimChunkPos> loaderData = new Triplet<Integer, GregtechMetaTileEntityChunkLoader, DimChunkPos>((int) this.mChunkLoaderMapID, this, new DimChunkPos(this.getBaseMetaTileEntity().getWorld(), thisPos)); - mChunkLoaderManagerMap.put(thisPos, loaderData); - Logger.INFO("[Chunk Loader] Registered Chunk loader ["+this.mChunkLoaderMapID+"]"+thisPos.getLocationString()); - //mChunkLoaders.put(new BlockPos(this.xCoord, this.yCoord, this.zCoord, this.getBaseMetaTileEntity().getWorld().provider.dimensionId),this); + if (!isRegistered()) { + if (this.xCoord != 0 && this.yCoord != 0 && this.zCoord != 0) { + BlockPos thisPos = new BlockPos(this.xCoord, this.yCoord, this.zCoord, this.getBaseMetaTileEntity().getWorld().provider.dimensionId); + Triplet<Integer, GregtechMetaTileEntityChunkLoader, DimChunkPos> loaderData = new Triplet<Integer, GregtechMetaTileEntityChunkLoader, DimChunkPos>((int) this.mChunkLoaderMapID, this, new DimChunkPos(this.getBaseMetaTileEntity().getWorld(), thisPos)); + mChunkLoaderManagerMap.put(thisPos, loaderData); + Logger.INFO("[Chunk Loader] Registered Chunk loader ["+this.mChunkLoaderMapID+"]"+thisPos.getLocationString()); + //mChunkLoaders.put(new BlockPos(this.xCoord, this.yCoord, this.zCoord, this.getBaseMetaTileEntity().getWorld().provider.dimensionId),this); + } } } } @@ -341,7 +343,7 @@ public class GregtechMetaTileEntityChunkLoader extends GT_MetaTileEntity_TieredM if (!hasTicket) chunks = null; else { - if (this.mTier == 3) { + /*if (this.mTier == 3) { chunks = ChunkManager.getInstance().getChunksAround(this.getBaseMetaTileEntity().getXCoord() >> 4, this.getBaseMetaTileEntity().getZCoord() >> 4, ANCHOR_RADIUS); } else if (this.mTier == 4) { @@ -349,7 +351,8 @@ public class GregtechMetaTileEntityChunkLoader extends GT_MetaTileEntity_TieredM } else if (this.mTier == 5) { chunks = ChunkManager.getInstance().getChunksAround(this.getBaseMetaTileEntity().getXCoord() >> 4 >> 4 >> 4, ((this.getBaseMetaTileEntity().getZCoord() >> 4) >> 4) >> 4, ANCHOR_RADIUS); - } + } */ + chunks = ChunkManager.getInstance().getChunksAround(this.getBaseMetaTileEntity().getXCoord() >> 4, this.getBaseMetaTileEntity().getZCoord() >> 4, ANCHOR_RADIUS); } } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialFishingPond.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialFishingPond.java index b9e4fc2880..0c3dcf0903 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialFishingPond.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialFishingPond.java @@ -74,9 +74,10 @@ extends GregtechMeta_MultiBlockBase { "Controller (front centered)", "1x Output Bus (Any casing)", "1x Input Bus (Any casing)", - "1x Input Hatch (Any casing)", + "1x Input Hatch (Any casing, fill with water)", "1x Maintenance Hatch (Any casing)", "1x Energy Hatch (Any casing)", + "Aquatic Casings for the rest", CORE.GT_Tooltip }; } |