aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaxim <maxim235@gmx.de>2023-05-28 17:53:23 +0200
committerGitHub <noreply@github.com>2023-05-28 17:53:23 +0200
commit8f1fcf5e2f37c1c8b6d3416f16aca2fce55d3604 (patch)
tree89e8f309903b54fcaf97a609674dc51879572a11
parente58f6b16831768bf6aadac2146567745309f06b0 (diff)
downloadGT5-Unofficial-8f1fcf5e2f37c1c8b6d3416f16aca2fce55d3604.tar.gz
GT5-Unofficial-8f1fcf5e2f37c1c8b6d3416f16aca2fce55d3604.tar.bz2
GT5-Unofficial-8f1fcf5e2f37c1c8b6d3416f16aca2fce55d3604.zip
Added higher explosion resistance to pipe casings (#216)
-rw-r--r--dependencies.gradle2
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/GT_MetaTileEntity_PipeBlock_Data.java19
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/GT_MetaTileEntity_PipeBlock_EM.java19
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/GT_MetaTileEntity_PipeBlock_Energy.java19
-rw-r--r--src/main/resources/assets/tectech/lang/en_US.lang2
5 files changed, 60 insertions, 1 deletions
diff --git a/dependencies.gradle b/dependencies.gradle
index 6e9a474de1..0d20d9d706 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -2,7 +2,7 @@
dependencies {
shadowImplementation('com.github.GTNewHorizons:AVRcore:1.0.1')
- api('com.github.GTNewHorizons:GT5-Unofficial:5.09.43.39:dev')
+ api('com.github.GTNewHorizons:GT5-Unofficial:5.09.43.59:dev')
api('com.github.GTNewHorizons:Yamcl:0.5.86:dev')
implementation('com.github.GTNewHorizons:GTNEIOrePlugin:1.0.29:dev')
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/GT_MetaTileEntity_PipeBlock_Data.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/GT_MetaTileEntity_PipeBlock_Data.java
index aed8ba71b7..9ba93f1dcc 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/GT_MetaTileEntity_PipeBlock_Data.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/GT_MetaTileEntity_PipeBlock_Data.java
@@ -1,7 +1,13 @@
package com.github.technus.tectech.thing.metaTileEntity.pipe;
+import static net.minecraft.util.StatCollector.translateToLocal;
+
import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.EnumChatFormatting;
import net.minecraft.world.World;
+import net.minecraftforge.common.util.ForgeDirection;
+
+import org.apache.commons.lang3.ArrayUtils;
import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
@@ -30,4 +36,17 @@ public class GT_MetaTileEntity_PipeBlock_Data extends GT_MetaTileEntity_Pipe_Dat
public float getThickNess() {
return 1f;
}
+
+ @Override
+ public float getExplosionResistance(ForgeDirection side) {
+ return 1000.0f;
+ }
+
+ @Override
+ public String[] getDescription() {
+ return ArrayUtils.add(
+ super.getDescription(),
+ EnumChatFormatting.DARK_AQUA.toString() + EnumChatFormatting.BOLD
+ + translateToLocal("gt.blockmachines.pipe.desc.4"));
+ }
}
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/GT_MetaTileEntity_PipeBlock_EM.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/GT_MetaTileEntity_PipeBlock_EM.java
index af23d7ff5c..c90e3fb796 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/GT_MetaTileEntity_PipeBlock_EM.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/GT_MetaTileEntity_PipeBlock_EM.java
@@ -1,7 +1,13 @@
package com.github.technus.tectech.thing.metaTileEntity.pipe;
+import static net.minecraft.util.StatCollector.translateToLocal;
+
import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.EnumChatFormatting;
import net.minecraft.world.World;
+import net.minecraftforge.common.util.ForgeDirection;
+
+import org.apache.commons.lang3.ArrayUtils;
import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
@@ -30,4 +36,17 @@ public class GT_MetaTileEntity_PipeBlock_EM extends GT_MetaTileEntity_Pipe_EM {
public float getThickNess() {
return 1f;
}
+
+ @Override
+ public float getExplosionResistance(ForgeDirection side) {
+ return 1000.0f;
+ }
+
+ @Override
+ public String[] getDescription() {
+ return ArrayUtils.add(
+ super.getDescription(),
+ EnumChatFormatting.DARK_AQUA.toString() + EnumChatFormatting.BOLD
+ + translateToLocal("gt.blockmachines.pipe.desc.4"));
+ }
}
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/GT_MetaTileEntity_PipeBlock_Energy.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/GT_MetaTileEntity_PipeBlock_Energy.java
index 052425dc0a..85b341b0e8 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/GT_MetaTileEntity_PipeBlock_Energy.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/GT_MetaTileEntity_PipeBlock_Energy.java
@@ -1,7 +1,13 @@
package com.github.technus.tectech.thing.metaTileEntity.pipe;
+import static net.minecraft.util.StatCollector.translateToLocal;
+
import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.EnumChatFormatting;
import net.minecraft.world.World;
+import net.minecraftforge.common.util.ForgeDirection;
+
+import org.apache.commons.lang3.ArrayUtils;
import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
@@ -30,4 +36,17 @@ public class GT_MetaTileEntity_PipeBlock_Energy extends GT_MetaTileEntity_Pipe_E
public float getThickNess() {
return 1f;
}
+
+ @Override
+ public float getExplosionResistance(ForgeDirection side) {
+ return 1000.0f;
+ }
+
+ @Override
+ public String[] getDescription() {
+ return ArrayUtils.add(
+ super.getDescription(),
+ EnumChatFormatting.DARK_AQUA.toString() + EnumChatFormatting.BOLD
+ + translateToLocal("gt.blockmachines.pipe.desc.4"));
+ }
}
diff --git a/src/main/resources/assets/tectech/lang/en_US.lang b/src/main/resources/assets/tectech/lang/en_US.lang
index 09885b758a..e4d070a4fe 100644
--- a/src/main/resources/assets/tectech/lang/en_US.lang
+++ b/src/main/resources/assets/tectech/lang/en_US.lang
@@ -884,6 +884,8 @@ gt.blockmachines.pipe.datastream.desc.1=Don't stare at the beam!
gt.blockmachines.pipe.datastream.desc.2=Must be painted to work
gt.blockmachines.pipe.datastream.desc.3=Do not cross or split
+gt.blockmachines.pipe.desc.4=Explosion proof
+
#Single blocks
gt.blockmachines.machine.tt.ownerdetector.name=Owner detector
gt.blockmachines.machine.tt.ownerdetector.desc.0=Screwdrive to change mode