aboutsummaryrefslogtreecommitdiff
path: root/src/main/java
diff options
context:
space:
mode:
authorHoleFish <48403212+HoleFish@users.noreply.github.com>2024-01-13 03:29:39 +0800
committerGitHub <noreply@github.com>2024-01-12 20:29:39 +0100
commit152100954c37f4bcedc70830ae28f53a9b5d4dd9 (patch)
tree9bfc9d501ee412b6f29cfd252c6bd077292f45d2 /src/main/java
parentb74dd0f948bcf6ce1414b566788e60752b56cc14 (diff)
downloadGT5-Unofficial-152100954c37f4bcedc70830ae28f53a9b5d4dd9.tar.gz
GT5-Unofficial-152100954c37f4bcedc70830ae28f53a9b5d4dd9.tar.bz2
GT5-Unofficial-152100954c37f4bcedc70830ae28f53a9b5d4dd9.zip
Compact Fusions support buffer (#230)
* buffer * Update src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer3.java Co-authored-by: Raven Szewczyk <git@eigenraven.me> * Update src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer5.java Co-authored-by: Raven Szewczyk <git@eigenraven.me> * Update src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer4.java Co-authored-by: Raven Szewczyk <git@eigenraven.me> * Update src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer2.java Co-authored-by: Raven Szewczyk <git@eigenraven.me> * Update src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer1.java Co-authored-by: Raven Szewczyk <git@eigenraven.me> --------- Co-authored-by: Martin Robertz <dream-master@gmx.net> Co-authored-by: Raven Szewczyk <git@eigenraven.me>
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer1.java2
-rw-r--r--src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer2.java2
-rw-r--r--src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer3.java2
-rw-r--r--src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer4.java8
-rw-r--r--src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer5.java8
-rw-r--r--src/main/java/goodgenerator/blocks/tileEntity/base/LargeFusionComputer.java27
6 files changed, 34 insertions, 15 deletions
diff --git a/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer1.java b/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer1.java
index 1b18445f56..0f37f9c92e 100644
--- a/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer1.java
+++ b/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer1.java
@@ -58,7 +58,7 @@ public class LargeFusionComputer1 extends LargeFusionComputer {
.addCasingInfo("Naquadah Alloy Frame Boxes", 128)
.addCasingInfo("Rhodium-Plated Palladium Reinforced Borosilicate Glass Block", 63)
.addEnergyHatch("1-32, Hint block with dot 2", 2).addInputHatch("1-16, Hint block with dot 1", 1)
- .addOutputHatch("1-16, Hint block with dot 1", 1)
+ .addOutputHatch("1-16, Hint block with dot 1", 1).addStructureInfo("Supports Crafting Input Buffer")
.addStructureInfo(
"ALL Hatches must be " + GT_Utility.getColoredTierNameFromTier((byte) hatchTier())
+ EnumChatFormatting.GRAY
diff --git a/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer2.java b/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer2.java
index 381afb33d6..5d766d6012 100644
--- a/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer2.java
+++ b/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer2.java
@@ -59,7 +59,7 @@ public class LargeFusionComputer2 extends LargeFusionComputer {
.addCasingInfo("Duranium Frame Box", 128)
.addCasingInfo("Iridium Reinforced Borosilicate Glass Block", 63)
.addEnergyHatch("1-32, Hint block with dot 2", 2).addInputHatch("1-16, Hint block with dot 1", 1)
- .addOutputHatch("1-16, Hint block with dot 1", 1)
+ .addOutputHatch("1-16, Hint block with dot 1", 1).addStructureInfo("Supports Crafting Input Buffer")
.addStructureInfo(
"ALL Hatches must be " + GT_Utility.getColoredTierNameFromTier((byte) hatchTier())
+ EnumChatFormatting.GRAY
diff --git a/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer3.java b/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer3.java
index 334456e5b8..e706fb887c 100644
--- a/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer3.java
+++ b/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer3.java
@@ -60,7 +60,7 @@ public class LargeFusionComputer3 extends LargeFusionComputer {
.addCasingInfo("Neutronium Frame Box", 128)
.addCasingInfo("Osmium Reinforced Borosilicate Glass Block", 63)
.addEnergyHatch("1-32, Hint block with dot 2", 2).addInputHatch("1-16, Hint block with dot 1", 1)
- .addOutputHatch("1-16, Hint block with dot 1", 1)
+ .addOutputHatch("1-16, Hint block with dot 1", 1).addStructureInfo("Supports Crafting Input Buffer")
.addStructureInfo(
"ALL Hatches must be " + GT_Utility.getColoredTierNameFromTier((byte) hatchTier())
+ EnumChatFormatting.GRAY
diff --git a/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer4.java b/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer4.java
index a3924acf04..7f48fce8b2 100644
--- a/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer4.java
+++ b/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer4.java
@@ -26,6 +26,7 @@ import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Outpu
import gregtech.api.render.TextureFactory;
import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
import gregtech.api.util.GT_Utility;
+import gregtech.common.tileentities.machines.IDualInputHatch;
import gtPlusPlus.core.block.ModBlocks;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
@@ -64,7 +65,7 @@ public class LargeFusionComputer4 extends LargeFusionComputerPP {
.addCasingInfo("Infinity Catalyst Frame Box", 128)
.addCasingInfo("Neutronium Reinforced Borosilicate Glass Block", 63)
.addEnergyHatch("1-32, Hint block with dot 2", 2).addInputHatch("1-16, Hint block with dot 1", 1)
- .addOutputHatch("1-16, Hint block with dot 1", 1)
+ .addOutputHatch("1-16, Hint block with dot 1", 1).addStructureInfo("Supports Crafting Input Buffer")
.addStructureInfo(
"ALL Hatches must be " + GT_Utility.getColoredTierNameFromTier((byte) hatchTier())
+ EnumChatFormatting.GRAY
@@ -181,6 +182,11 @@ public class LargeFusionComputer4 extends LargeFusionComputerPP {
hatch.updateTexture(status ? TAE.getIndexFromPage(2, 14) : 53);
}
}
+ if (this.mDualInputHatches != null) {
+ for (IDualInputHatch hatch : this.mDualInputHatches) {
+ hatch.updateTexture(status ? TAE.getIndexFromPage(2, 14) : 53);
+ }
+ }
return true;
}
diff --git a/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer5.java b/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer5.java
index 4b12f4bc6a..63f005b9b2 100644
--- a/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer5.java
+++ b/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer5.java
@@ -26,6 +26,7 @@ import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Outpu
import gregtech.api.render.TextureFactory;
import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
import gregtech.api.util.GT_Utility;
+import gregtech.common.tileentities.machines.IDualInputHatch;
import gtPlusPlus.core.block.ModBlocks;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
@@ -64,7 +65,7 @@ public class LargeFusionComputer5 extends LargeFusionComputerPP {
.addCasingInfo("Compact Fusion Coil MK-II Finaltype", 560).addCasingInfo("Infinity Frame Box", 128)
.addCasingInfo("Cosmic Neutronium Reinforced Borosilicate Glass Block", 63)
.addEnergyHatch("1-32, Hint block with dot 2", 2).addInputHatch("1-16, Hint block with dot 1", 1)
- .addOutputHatch("1-16, Hint block with dot 1", 1)
+ .addOutputHatch("1-16, Hint block with dot 1", 1).addStructureInfo("Supports Crafting Input Buffer")
.addStructureInfo(
"ALL Hatches must be " + GT_Utility.getColoredTierNameFromTier((byte) hatchTier())
+ EnumChatFormatting.GRAY
@@ -182,6 +183,11 @@ public class LargeFusionComputer5 extends LargeFusionComputerPP {
hatch.updateTexture(status ? TAE.getIndexFromPage(3, 6) : 53);
}
}
+ if (this.mDualInputHatches != null) {
+ for (IDualInputHatch hatch : this.mDualInputHatches) {
+ hatch.updateTexture(status ? TAE.getIndexFromPage(3, 6) : 53);
+ }
+ }
return true;
}
diff --git a/src/main/java/goodgenerator/blocks/tileEntity/base/LargeFusionComputer.java b/src/main/java/goodgenerator/blocks/tileEntity/base/LargeFusionComputer.java
index 8fe09d5442..fa404311e8 100644
--- a/src/main/java/goodgenerator/blocks/tileEntity/base/LargeFusionComputer.java
+++ b/src/main/java/goodgenerator/blocks/tileEntity/base/LargeFusionComputer.java
@@ -41,7 +41,6 @@ import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
import gregtech.api.interfaces.tileentity.IOverclockDescriptionProvider;
import gregtech.api.logic.ProcessingLogic;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch;
import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Energy;
import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Input;
import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Output;
@@ -59,6 +58,7 @@ import gregtech.api.util.GT_OverclockCalculator;
import gregtech.api.util.GT_ParallelHelper;
import gregtech.api.util.GT_Recipe;
import gregtech.api.util.GT_Utility;
+import gregtech.common.tileentities.machines.IDualInputHatch;
public abstract class LargeFusionComputer extends GT_MetaTileEntity_TooltipMultiBlockBase_EM
implements IConstructable, ISurvivalConstructable, IOverclockDescriptionProvider {
@@ -81,7 +81,10 @@ public abstract class LargeFusionComputer extends GT_MetaTileEntity_TooltipMulti
'I',
lazy(
x -> GT_HatchElementBuilder.<LargeFusionComputer>builder()
- .atLeast(GT_HatchElement.InputHatch, GT_HatchElement.OutputHatch)
+ .atLeast(
+ GT_HatchElement.InputHatch,
+ GT_HatchElement.OutputHatch,
+ GT_HatchElement.InputBus)
.adder(LargeFusionComputer::addFluidIO).casingIndex(x.textureIndex()).dot(1)
.buildAndChain(x.getGlassBlock(), x.getGlassMeta())))
.addElement(
@@ -180,7 +183,7 @@ public abstract class LargeFusionComputer extends GT_MetaTileEntity_TooltipMulti
@Override
public boolean checkMachine_EM(IGregTechTileEntity aBaseMetaTileEntity, ItemStack aStack) {
this.eEnergyMulti.clear();
- if (structureCheck_EM(MAIN_NAME, 23, 3, 40) && !mInputHatches.isEmpty()
+ if (structureCheck_EM(MAIN_NAME, 23, 3, 40) && mInputHatches.size() + mDualInputHatches.size() != 0
&& !mOutputHatches.isEmpty()
&& (mEnergyHatches.size() + eEnergyMulti.size()) != 0) {
fixAllIssue();
@@ -371,6 +374,11 @@ public abstract class LargeFusionComputer extends GT_MetaTileEntity_TooltipMulti
hatch.updateTexture(status ? 52 : 53);
}
}
+ if (this.mDualInputHatches != null) {
+ for (IDualInputHatch hatch : this.mDualInputHatches) {
+ hatch.updateTexture(status ? 52 : 53);
+ }
+ }
return true;
}
@@ -510,22 +518,21 @@ public abstract class LargeFusionComputer extends GT_MetaTileEntity_TooltipMulti
private boolean addFluidIO(IGregTechTileEntity aBaseMetaTileEntity, int aBaseCasingIndex) {
IMetaTileEntity aMetaTileEntity = aBaseMetaTileEntity.getMetaTileEntity();
if (aMetaTileEntity == null) return false;
- if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch tHatch) {
- if (tHatch.getTierForStructure() < hatchTier()) {
- return false;
- }
- } else {
- return false;
- }
if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Input tInput) {
+ if (tInput.getTierForStructure() < hatchTier()) return false;
tInput.updateTexture(aBaseCasingIndex);
tInput.mRecipeMap = getRecipeMap();
return mInputHatches.add(tInput);
}
if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Output tOutput) {
+ if (tOutput.getTierForStructure() < hatchTier()) return false;
tOutput.updateTexture(aBaseCasingIndex);
return mOutputHatches.add(tOutput);
}
+ if (aMetaTileEntity instanceof IDualInputHatch tInput) {
+ tInput.updateTexture(aBaseCasingIndex);
+ return mDualInputHatches.add(tInput);
+ }
return false;
}
generated by cgit (git 2.46.0) at 2025-03-06 11:37:12 +0000