Merge branch 'master' into fix-large-essentia-smelter-eu

GTNewHorizons · Sep 28, 2024 · 8d01d0e · 8d01d0e
2 parents 1222685 + 6a12f69
commit 8d01d0e
Showing 1 changed file with 13 additions and 15 deletions.
diff --git a/...Plus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamMixer.java b/...Plus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamMixer.java
@@ -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
@@ -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(
@@ -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,
@@ -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;