Merge branch 'main' into 2.8

SymmetricDevs · Jan 22, 2024 · 6c8e571 · 6c8e571
2 parents 7f9263f + b8cdbe5
commit 6c8e571
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 3 deletions.
diff --git a/src/main/java/supersymmetry/common/blocks/BlockCoagulationTankWall.java b/src/main/java/supersymmetry/common/blocks/BlockCoagulationTankWall.java
@@ -5,7 +5,11 @@
 import gregtech.api.block.VariantBlock;
 import net.minecraft.block.SoundType;
 import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.EntityLiving;
 import net.minecraft.util.IStringSerializable;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.IBlockAccess;
+import org.jetbrains.annotations.NotNull;
 
 import javax.annotation.Nonnull;
 
@@ -20,6 +24,12 @@ public BlockCoagulationTankWall(){
         setDefaultState(getState(BlockCoagulationTankWall.CoagulationTankWallType.WOODEN_COAGULATION_TANK_WALL));
     }
 
+    @Override
+    public boolean canCreatureSpawn(@NotNull IBlockState state, @NotNull IBlockAccess world, @NotNull BlockPos pos,
+                                    @NotNull EntityLiving.SpawnPlacementType type) {
+        return false;
+    }
+
     public static enum CoagulationTankWallType implements IStringSerializable, IStateHarvestLevel {
         WOODEN_COAGULATION_TANK_WALL("wooden_coagulation_tank_wall", 1);
 

diff --git a/.../java/supersymmetry/common/metatileentities/multi/electric/MetaTileEntityMiningDrill.java b/.../java/supersymmetry/common/metatileentities/multi/electric/MetaTileEntityMiningDrill.java
@@ -125,6 +125,11 @@ public boolean canBeDistinct() {
         return false;
     }
 
+    @Override
+    public boolean getIsWeatherOrTerrainResistant() {
+        return true;
+    }
+
     public void addInformation(ItemStack stack, @Nullable World player, List<String> tooltip, boolean advanced) {
         super.addInformation(stack, player, tooltip, advanced);
         tooltip.add(TooltipHelper.RAINBOW_SLOW + I18n.format("gregtech.machine.perfect_oc", new Object[0]));

diff --git a/.../java/supersymmetry/common/metatileentities/multi/electric/MetaTileEntityOceanPumper.java b/.../java/supersymmetry/common/metatileentities/multi/electric/MetaTileEntityOceanPumper.java
@@ -322,7 +322,8 @@ public boolean isActive() {
         return isWorking;
     }
 
-
-
-
+    @Override
+    public boolean getIsWeatherOrTerrainResistant() {
+        return true;
+    }
 }
diff --git a/...etry/common/metatileentities/multi/electric/MetaTileEntityRailroadEngineeringStation.java b/...etry/common/metatileentities/multi/electric/MetaTileEntityRailroadEngineeringStation.java
@@ -447,6 +447,11 @@ public void invalidate() {
         }
     }
 
+    @Override
+    public boolean getIsWeatherOrTerrainResistant() {
+        return true;
+    }
+
     public void setStructureAABB() {
         // Had to make it overshoot a little :(
         net.minecraft.util.math.BlockPos offsetBottomLeft = new net.minecraft.util.math.BlockPos(9, -1, 2);