Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove steam blender hatches #3293

Merged
merged 3 commits into from
Sep 28, 2024
Merged

Remove steam blender hatches #3293

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
30a42f7
Removed hatch/bus requirements for steam blender
RecursivePineapple Sep 27, 2024
635c371
applied spotless
RecursivePineapple Sep 27, 2024
1dee661
Changed anyOf back to atLeast
RecursivePineapple Sep 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 13 additions & 15 deletions ...Plus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamMixer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ public String getMachineType() {
return "Mixer";
}

private static final String STRUCTUR_PIECE_MAIN = "main";
private static final String STRUCTURE_PIECE_MAIN = "main";

private IStructureDefinition<MTESteamMixer> STRUCTURE_DEFINITION = null;
// spotless:off
Expand Down Expand Up @@ -181,7 +181,7 @@ public IStructureDefinition<MTESteamMixer> getStructureDefinition() {

STRUCTURE_DEFINITION = StructureDefinition.<MTESteamMixer>builder()

.addShape(STRUCTUR_PIECE_MAIN, transpose(shape))
.addShape(STRUCTURE_PIECE_MAIN, transpose(shape))
.addElement(
'B',
ofBlocksTiered(
Expand Down Expand Up @@ -230,14 +230,20 @@ public IStructureDefinition<MTESteamMixer> getStructureDefinition() {

@Override
public void construct(ItemStack stackSize, boolean hintsOnly) {
this.buildPiece(STRUCTUR_PIECE_MAIN, stackSize, hintsOnly, HORIZONTAL_OFF_SET, VERTICAL_OFF_SET, DEPTH_OFF_SET);
this.buildPiece(
STRUCTURE_PIECE_MAIN,
stackSize,
hintsOnly,
HORIZONTAL_OFF_SET,
VERTICAL_OFF_SET,
DEPTH_OFF_SET);
}

@Override
public int survivalConstruct(ItemStack stackSize, int elementBudget, ISurvivalBuildEnvironment env) {
if (this.mMachine) return -1;
return this.survivialBuildPiece(
STRUCTUR_PIECE_MAIN,
STRUCTURE_PIECE_MAIN,
stackSize,
HORIZONTAL_OFF_SET,
VERTICAL_OFF_SET,
Expand All @@ -254,28 +260,20 @@ public boolean checkMachine(IGregTechTileEntity aBaseMetaTileEntity, ItemStack a
tierPipeCasing = -1;
tierMachineCasing = -1;
tCountCasing = 0;
if (!checkPiece(STRUCTUR_PIECE_MAIN, HORIZONTAL_OFF_SET, VERTICAL_OFF_SET, DEPTH_OFF_SET)) return false;
if (!checkPiece(STRUCTURE_PIECE_MAIN, HORIZONTAL_OFF_SET, VERTICAL_OFF_SET, DEPTH_OFF_SET)) return false;
if (tierGearBoxCasing < 0 && tierPipeCasing < 0 && tierMachineCasing < 0) return false;
if (tierGearBoxCasing == 1 && tierPipeCasing == 1
&& tierMachineCasing == 1
&& tCountCasing >= 90
&& !mSteamInputFluids.isEmpty()
&& !mSteamInputs.isEmpty()
&& !mSteamOutputs.isEmpty()
&& !mInputHatches.isEmpty()
&& !mOutputHatches.isEmpty()) {
&& !mSteamInputFluids.isEmpty()) {
updateHatchTexture();
tierMachine = 1;
return true;
}
if (tierGearBoxCasing == 2 && tierPipeCasing == 2
&& tierMachineCasing == 2
&& tCountCasing >= 90
&& !mSteamInputFluids.isEmpty()
&& !mSteamInputs.isEmpty()
&& !mSteamOutputs.isEmpty()
&& !mInputHatches.isEmpty()
&& !mOutputHatches.isEmpty()) {
&& !mSteamInputFluids.isEmpty()) {
updateHatchTexture();
tierMachine = 2;
return true;
Expand Down