aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common
diff options
context:
space:
mode:
authorNotAPenguin <michiel.vandeginste@gmail.com>2024-08-13 21:40:49 +0200
committerGitHub <noreply@github.com>2024-08-13 21:40:49 +0200
commit77f9f7c1f90231d92afbb2ed08f3b203455e3ea2 (patch)
tree0490fe9c0b1d8508696ad5398e6f5d0ef611941e /src/main/java/gregtech/common
parent43dff7d6baf163dcc39b054a53f1442488a3e389 (diff)
downloadGT5-Unofficial-77f9f7c1f90231d92afbb2ed08f3b203455e3ea2.tar.gz
GT5-Unofficial-77f9f7c1f90231d92afbb2ed08f3b203455e3ea2.tar.bz2
GT5-Unofficial-77f9f7c1f90231d92afbb2ed08f3b203455e3ea2.zip
Final waterline visuals and small fix (#2864)
* try to add baryonic matter fluid texture * fix baryonic matter custom fluid * adjust purified water names * do not form waterline multis without positioned hatches to prevent crashes * final baryonic matter texture
Diffstat (limited to 'src/main/java/gregtech/common')
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/purification/GT_MetaTileEntity_PurificationUnitPhAdjustment.java2
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/purification/GT_MetaTileEntity_PurificationUnitPlasmaHeater.java2
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/purification/GT_MetaTileEntity_PurificationUnitUVTreatment.java5
3 files changed, 7 insertions, 2 deletions
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/purification/GT_MetaTileEntity_PurificationUnitPhAdjustment.java b/src/main/java/gregtech/common/tileentities/machines/multi/purification/GT_MetaTileEntity_PurificationUnitPhAdjustment.java
index c885a5f974..70be953443 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/purification/GT_MetaTileEntity_PurificationUnitPhAdjustment.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/purification/GT_MetaTileEntity_PurificationUnitPhAdjustment.java
@@ -555,6 +555,8 @@ public class GT_MetaTileEntity_PurificationUnitPhAdjustment
public boolean checkMachine(IGregTechTileEntity aBaseMetaTileEntity, ItemStack aStack) {
if (!checkPiece(STRUCTURE_PIECE_MAIN, STRUCTURE_X_OFFSET, STRUCTURE_Y_OFFSET, STRUCTURE_Z_OFFSET)) return false;
+ // Do not form without positioned hatches
+ if (acidInputHatch == null || alkalineInputBus == null) return false;
return super.checkMachine(aBaseMetaTileEntity, aStack);
}
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/purification/GT_MetaTileEntity_PurificationUnitPlasmaHeater.java b/src/main/java/gregtech/common/tileentities/machines/multi/purification/GT_MetaTileEntity_PurificationUnitPlasmaHeater.java
index 3fdd408ec1..f4e96d4466 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/purification/GT_MetaTileEntity_PurificationUnitPlasmaHeater.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/purification/GT_MetaTileEntity_PurificationUnitPlasmaHeater.java
@@ -560,6 +560,8 @@ public class GT_MetaTileEntity_PurificationUnitPlasmaHeater
casingCount = 0;
if (!checkPiece(STRUCTURE_PIECE_MAIN, STRUCTURE_X_OFFSET, STRUCTURE_Y_OFFSET, STRUCTURE_Z_OFFSET)) return false;
if (casingCount < MIN_CASING) return false;
+ // Do not form without positioned hatches
+ if (plasmaInputHatch == null || coolantInputHatch == null) return false;
return super.checkMachine(aBaseMetaTileEntity, aStack);
}
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/purification/GT_MetaTileEntity_PurificationUnitUVTreatment.java b/src/main/java/gregtech/common/tileentities/machines/multi/purification/GT_MetaTileEntity_PurificationUnitUVTreatment.java
index 86cdd4664f..fb83797e83 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/purification/GT_MetaTileEntity_PurificationUnitUVTreatment.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/purification/GT_MetaTileEntity_PurificationUnitUVTreatment.java
@@ -42,7 +42,6 @@ import gregtech.api.interfaces.ITexture;
import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_InputBus;
import gregtech.api.recipe.RecipeMap;
import gregtech.api.recipe.RecipeMaps;
import gregtech.api.recipe.check.CheckRecipeResult;
@@ -63,7 +62,7 @@ public class GT_MetaTileEntity_PurificationUnitUVTreatment
private static final int STRUCTURE_Y_OFFSET = 8;
private static final int STRUCTURE_Z_OFFSET = 0;
- private GT_MetaTileEntity_Hatch_InputBus lensInputBus;
+ private GT_MetaTileEntity_LensHousing lensInputBus;
private GT_MetaTileEntity_LensIndicator lensIndicator;
private UVTreatmentLensCycle lensCycle = null;
@@ -448,6 +447,8 @@ public class GT_MetaTileEntity_PurificationUnitUVTreatment
public boolean checkMachine(IGregTechTileEntity aBaseMetaTileEntity, ItemStack aStack) {
if (!checkPiece(STRUCTURE_PIECE_MAIN, STRUCTURE_X_OFFSET, STRUCTURE_Y_OFFSET, STRUCTURE_Z_OFFSET)) return false;
+ // Do not form without lens bus
+ if (lensInputBus == null) return false;
return super.checkMachine(aBaseMetaTileEntity, aStack);
}