aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common
diff options
context:
space:
mode:
authorevgengoldwar <69961523+evgengoldwar@users.noreply.github.com>2024-07-18 19:38:15 +0400
committerGitHub <noreply@github.com>2024-07-18 22:38:15 +0700
commit5e6ba0d78c7130762f076f56c856752e40068307 (patch)
treec1e40dc55712e58a74e7173d2f2641518e0ed2e9 /src/main/java/gregtech/common
parent4f7a7257760cd271cfe33d0fab3d82f64d45543f (diff)
downloadGT5-Unofficial-5e6ba0d78c7130762f076f56c856752e40068307.tar.gz
GT5-Unofficial-5e6ba0d78c7130762f076f56c856752e40068307.tar.bz2
GT5-Unofficial-5e6ba0d78c7130762f076f56c856752e40068307.zip
Added Water Pump (#2694)
* Add Water Pump * Added check humidity * Apply spotless * Added tier 2 WaterPump * Added new textures and Fixed the display in nei * Optimizing imports * Fix tooltip * Added craft for Output hatch ULV, Wooden Casing, Water Pump * Apply spotless * sa+update deps * Delete the sky check method * sa * Rewrote WaterPump to SteamMultiBase. * Added a steam hatch to the structure and changed the tooltip * Spotless apply * Changed VoidProtection and calculate water generation * Remove star imports * Rename Wooden Casing to Primitive Wooden Casing * Remove enableMultiblock_WaterPump * Rename static variables * Change variables and tooltip * Sa --------- Co-authored-by: Dream Master <dream-master@gmx.net>
Diffstat (limited to 'src/main/java/gregtech/common')
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Block_Casings9.java6
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Cyclotron_Coils.java2
2 files changed, 6 insertions, 2 deletions
diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Casings9.java b/src/main/java/gregtech/common/blocks/GT_Block_Casings9.java
index bc6aca6255..4441885f30 100644
--- a/src/main/java/gregtech/common/blocks/GT_Block_Casings9.java
+++ b/src/main/java/gregtech/common/blocks/GT_Block_Casings9.java
@@ -16,14 +16,16 @@ import gregtech.api.util.GT_LanguageManager;
public class GT_Block_Casings9 extends GT_Block_Casings_Abstract {
public GT_Block_Casings9() {
- super(GT_Item_Casings9.class, "gt.blockcasings9", GT_Material_Casings.INSTANCE, 2);
+ super(GT_Item_Casings9.class, "gt.blockcasings9", GT_Material_Casings.INSTANCE, 16);
GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".0.name", "PBI Pipe Casing");
GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".1.name", "Advanced Filter Casing");
GT_LanguageManager
.addStringLocalization(getUnlocalizedName() + ".1.tooltip", "Less than five 0.1μm particles per m^3");
+ GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".2.name", "Primitive Wooden Casing");
ItemList.Casing_Pipe_Polybenzimidazole.set(new ItemStack(this, 1, 0));
ItemList.Casing_Vent_T2.set(new ItemStack(this, 1, 1));
+ ItemList.WoodenCasing.set(new ItemStack(this, 1, 2));
}
@Override
@@ -37,6 +39,8 @@ public class GT_Block_Casings9 extends GT_Block_Casings_Abstract {
return switch (aMeta) {
case 0 -> Textures.BlockIcons.MACHINE_CASING_PIPE_POLYBENZIMIDAZOLE.getIcon();
case 1 -> Textures.BlockIcons.MACHINE_CASING_VENT_T2.getIcon();
+ case 2 -> ordinalSide >= 2 ? Textures.BlockIcons.TEXTURE_METAL_PANEL_E.getIcon()
+ : Textures.BlockIcons.TEXTURE_METAL_PANEL_E_A.getIcon();
default -> Textures.BlockIcons.MACHINE_CASING_ROBUST_TUNGSTENSTEEL.getIcon();
};
}
diff --git a/src/main/java/gregtech/common/blocks/GT_Cyclotron_Coils.java b/src/main/java/gregtech/common/blocks/GT_Cyclotron_Coils.java
index 1a544f027f..75b3670895 100644
--- a/src/main/java/gregtech/common/blocks/GT_Cyclotron_Coils.java
+++ b/src/main/java/gregtech/common/blocks/GT_Cyclotron_Coils.java
@@ -40,7 +40,7 @@ public class GT_Cyclotron_Coils extends GT_Block_Casings_Abstract {
@Override // Magic numbers...
public int getTextureIndex(int aMeta) {
- return 192 + aMeta;
+ return 208 + aMeta;
}
@Override