From 05d2066fd364ddff525b9ac4b38771d196641a5e Mon Sep 17 00:00:00 2001 From: Alkalus <3060479+draknyte1@users.noreply.github.com> Date: Sun, 6 Jan 2019 18:18:27 +0000 Subject: + Added a new Alloy. + Added Recipes for the Fusion MK4 Components and the Deep Earth Drilling Platform components. + Added additional feature support to all Assembly Line recipes when TecTech is found. + Added initial work for future particle science. % Initial functions added for Multiblock Requirements. % More work on Multiblock Blueprints and Layers. % Updated lead lined chest significantly. % Improved Fish trap inventory handling and general logic, it's now slightly faster with slightly better loot rates. % Changed texture of Fish trap. --- .../GregtechMetaTileEntity_Adv_Fusion_MK4.java | 4 ++-- .../production/GregtechMTE_NuclearReactor.java | 23 +++++++++++++++++----- 2 files changed, 20 insertions(+), 7 deletions(-) (limited to 'src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi') diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_Fusion_MK4.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_Fusion_MK4.java index 59123a9a6d..c7b4f166b4 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_Fusion_MK4.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_Fusion_MK4.java @@ -44,7 +44,7 @@ public class GregtechMetaTileEntity_Adv_Fusion_MK4 extends GT_MetaTileEntity_Fus @Override public int tier() { - return 8; + return 9; } @Override @@ -86,8 +86,8 @@ public class GregtechMetaTileEntity_Adv_Fusion_MK4 extends GT_MetaTileEntity_Fus "1-16 Output Hatches", "1-16 Energy Hatches", "All Hatches must be "+aTierName+" or better", - "32768 EU/t and 80mio EU Cap per Energy Hatch", CORE.GT_Tooltip}; + //"32768 EU/t and 80mio EU Cap per Energy Hatch" } @Override diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_NuclearReactor.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_NuclearReactor.java index fde2347c87..bcd1fe941b 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_NuclearReactor.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_NuclearReactor.java @@ -27,6 +27,7 @@ import gtPlusPlus.core.material.nuclear.NUCLIDE; import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.core.util.minecraft.FluidUtils; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase; +import gtPlusPlus.xmod.gregtech.common.blueprint.Blueprint_LFTR; import net.minecraft.item.ItemStack; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidStack; @@ -135,11 +136,23 @@ public class GregtechMTE_NuclearReactor extends GregtechMeta_MultiBlockBase { return "MatterFabricator"; } + private Blueprint_LFTR mBlueprint; + @Override public boolean checkMachine(final IGregTechTileEntity aBaseMetaTileEntity, final ItemStack aStack) { + + if (mBlueprint == null) { + mBlueprint = new Blueprint_LFTR(); + } + return mBlueprint.checkMachine(aBaseMetaTileEntity); + + + /* + + // Life Lessons from Greg. - /** + *//** [23:41:15] xdir and zdir are x2 and not x3 [23:41:26] thats you issue [23:44:33] mmm? @@ -154,7 +167,7 @@ public class GregtechMTE_NuclearReactor extends GregtechMeta_MultiBlockBase { [23:45:51] Ahh [23:45:57] and not 2 [23:46:06] Noted, thanks :D - */ + *//* final int xDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetX * 3; final int zDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetZ * 3; @@ -197,7 +210,7 @@ public class GregtechMTE_NuclearReactor extends GregtechMeta_MultiBlockBase { } //TODO - Add Carbon Moderation Rods - /* + else { //carbon moderation rods are at 1,1 & -1,-1 & 1,-1 & -1,1 if (aBaseMetaTileEntity.getBlockOffset(xDir + i, h, zDir + j) != ModBlocks.blockCasingsMisc) { Utils.LOG_WARNING("LFTR Casing(s) Missing from one of the top layers inner 3x3."); @@ -208,7 +221,7 @@ public class GregtechMTE_NuclearReactor extends GregtechMeta_MultiBlockBase { Utils.LOG_WARNING("LFTR Casing(s) Missing from one of the top layers inner 3x3."); return false; } - }*/ + } } @@ -319,7 +332,7 @@ public class GregtechMTE_NuclearReactor extends GregtechMeta_MultiBlockBase { this.turnCasingActive(false); Logger.INFO("Multiblock Formed."); return true; - } + */} @Override public boolean isCorrectMachinePart(final ItemStack aStack) { -- cgit