diff options
author | Alkalus <3060479+draknyte1@users.noreply.github.com> | 2019-01-06 18:18:27 +0000 |
---|---|---|
committer | Alkalus <3060479+draknyte1@users.noreply.github.com> | 2019-01-06 18:18:27 +0000 |
commit | 05d2066fd364ddff525b9ac4b38771d196641a5e (patch) | |
tree | 11abbdf56d18c4cc542b9edeb6c73274c1675eee /src/Java/gtPlusPlus/xmod/gregtech/common | |
parent | ae46cb2fab01f82ab49b1e63172da88e0adde212 (diff) | |
download | GT5-Unofficial-05d2066fd364ddff525b9ac4b38771d196641a5e.tar.gz GT5-Unofficial-05d2066fd364ddff525b9ac4b38771d196641a5e.tar.bz2 GT5-Unofficial-05d2066fd364ddff525b9ac4b38771d196641a5e.zip |
+ 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.
Diffstat (limited to 'src/Java/gtPlusPlus/xmod/gregtech/common')
4 files changed, 168 insertions, 7 deletions
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/blueprint/Blueprint_LFTR.java b/src/Java/gtPlusPlus/xmod/gregtech/common/blueprint/Blueprint_LFTR.java new file mode 100644 index 0000000000..3551172904 --- /dev/null +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/blueprint/Blueprint_LFTR.java @@ -0,0 +1,137 @@ +package gtPlusPlus.xmod.gregtech.common.blueprint; + +import gregtech.api.enums.TAE; +import gtPlusPlus.core.block.ModBlocks; +import gtPlusPlus.xmod.gregtech.api.objects.MultiblockBlueprint; +import gtPlusPlus.xmod.gregtech.api.objects.MultiblockLayer; +import net.minecraft.block.Block; + +public class Blueprint_LFTR extends MultiblockBlueprint { + + public Blueprint_LFTR() { + super(7, 4, 7, 10, TAE.GTPP_INDEX(12)); + + + Block aCasingMain = ModBlocks.blockCasingsMisc; + int aMetaCasingMain = 12; + int aMetaCasingSecondary = 13; + + + + /** + * First Layer (All edges can be Hatches, controller is centered in the front) + */ + + MultiblockLayer a0 = new MultiblockLayer(7, 7); + for (int i = 0; i < 7; i++) { + a0.addBlockForPos(aCasingMain, aMetaCasingMain, i, 0, true); + } + for (int i = 0; i < 7; i++) { + for (int u = 1; u < 6; u++) { + a0.addBlockForPos(aCasingMain, aMetaCasingMain, i, u, i == 0 ? true : i == 6 ? true : false); + } + } + for (int i = 0; i < 7; i++) { + if (i != 3) { + a0.addBlockForPos(aCasingMain, aMetaCasingMain, i, 6, true); + } + else { + a0.addController(i, 6); + } + } + a0.lock(true); + + + + + /** + * Middle Layer(s) + */ + + MultiblockLayer a1 = new MultiblockLayer(7, 7); + for (int i = 0; i < 7; i++) { + a1.addBlockForPos(aCasingMain, aMetaCasingSecondary, i, 0, false); + } + for (int i = 0; i < 7; i++) { + for (int u = 1; u < 6; u++) { + if (i == 0 || i == 6) + a1.addBlockForPos(aCasingMain, aMetaCasingSecondary, i, u, false); + } + } + for (int i = 0; i < 7; i++) { + a1.addBlockForPos(aCasingMain, aMetaCasingSecondary, i, 6, false); + + } + a1.lock(true); + + + /** + * Top Layer (All edges can be Hatches, Mufflers required in inner 3x3) + */ + + MultiblockLayer a2 = new MultiblockLayer(7, 7); + for (int i = 0; i < 7; i++) { + a2.addBlockForPos(aCasingMain, aMetaCasingMain, i, 0, true); + } + for (int i = 0; i < 7; i++) { + for (int u = 1; u < 6; u++) { + if ((i == 2 || i == 3 || i == 4) && (u == 2 || u ==3 || u == 4)) { + a2.addMuffler(aCasingMain, aMetaCasingMain, i, u); + } + else { + a2.addBlockForPos(aCasingMain, aMetaCasingMain, i, u, true); + } + } + } + for (int i = 0; i < 7; i++) { + a2.addBlockForPos(aCasingMain, aMetaCasingMain, i, 6, true); + } + a2.lock(true); + + this.setLayer(a0, 0); + this.setLayer(a1, 1); + this.setLayer(a1, 2); + this.setLayer(a2, 3); + } + + @Override + public int getMinimumInputBus() { + return 0; + } + + @Override + public int getMinimumInputHatch() { + return 4; + } + + @Override + public int getMinimumOutputBus() { + return 0; + } + + @Override + public int getMinimumOutputHatch() { + return 4; + } + + @Override + public int getMinimumInputEnergy() { + return 0; + } + + @Override + public int getMinimumOutputEnergy() { + return 4; + } + + @Override + public int getMinimumMaintHatch() { + return 1; + } + + @Override + public int getMinimumMufflers() { + return 4; + } + +} diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/requirements/RequirementsBasicCubic.java b/src/Java/gtPlusPlus/xmod/gregtech/common/requirements/RequirementsBasicCubic.java new file mode 100644 index 0000000000..ba44acdcb5 --- /dev/null +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/requirements/RequirementsBasicCubic.java @@ -0,0 +1,11 @@ +package gtPlusPlus.xmod.gregtech.common.requirements; + +import gtPlusPlus.xmod.gregtech.api.objects.MultiblockRequirements; + +public class RequirementsBasicCubic extends MultiblockRequirements { + + public RequirementsBasicCubic( ) { + super(-1, -1, -1, -1, 1, 0, 1, null); + } + +} 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] <GregoriusTechneticies> xdir and zdir are x2 and not x3 [23:41:26] <GregoriusTechneticies> thats you issue [23:44:33] <Alkalus> mmm? @@ -154,7 +167,7 @@ public class GregtechMTE_NuclearReactor extends GregtechMeta_MultiBlockBase { [23:45:51] <Alkalus> Ahh [23:45:57] <GregoriusTechneticies> and not 2 [23:46:06] <Alkalus> 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) { |