diff options
| author | evgengoldwar <69961523+evgengoldwar@users.noreply.github.com> | 2024-07-18 19:38:15 +0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-07-18 22:38:15 +0700 |
| commit | 5e6ba0d78c7130762f076f56c856752e40068307 (patch) | |
| tree | c1e40dc55712e58a74e7173d2f2641518e0ed2e9 /src/main/java/gregtech/api | |
| parent | 4f7a7257760cd271cfe33d0fab3d82f64d45543f (diff) | |
| download | GT5-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/api')
4 files changed, 18 insertions, 0 deletions
diff --git a/src/main/java/gregtech/api/enums/GT_Values.java b/src/main/java/gregtech/api/enums/GT_Values.java index 37caa7fc38..4d7f380656 100644 --- a/src/main/java/gregtech/api/enums/GT_Values.java +++ b/src/main/java/gregtech/api/enums/GT_Values.java @@ -656,6 +656,16 @@ public class GT_Values { + EnumChatFormatting.LIGHT_PURPLE + "ps"; + public static final String AuthorEvgenWarGold = "" + EnumChatFormatting.RED + + EnumChatFormatting.BOLD + + "Evgen" + + EnumChatFormatting.BLUE + + EnumChatFormatting.BOLD + + "War" + + EnumChatFormatting.GOLD + + EnumChatFormatting.BOLD + + "Gold"; + // 7.5F comes from GT_Tool_Turbine_Large#getBaseDamage() given huge turbines are the most efficient now. public static double getMaxPlasmaTurbineEfficiencyFromMaterial(Materials material) { return (5F + (7.5F + material.mToolQuality)) / 10.0; diff --git a/src/main/java/gregtech/api/enums/ItemList.java b/src/main/java/gregtech/api/enums/ItemList.java index d5ee302d6a..2d2b066825 100644 --- a/src/main/java/gregtech/api/enums/ItemList.java +++ b/src/main/java/gregtech/api/enums/ItemList.java @@ -852,6 +852,7 @@ public enum ItemList implements IItemContainer { Casing_Grate, Casing_Vent, Casing_Vent_T2, + WoodenCasing, Casing_RadiationProof, Casing_AdvancedRadiationProof, Casing_Firebox_Bronze, diff --git a/src/main/java/gregtech/api/enums/Textures.java b/src/main/java/gregtech/api/enums/Textures.java index 8eccbb050d..f4ce94c4f2 100644 --- a/src/main/java/gregtech/api/enums/Textures.java +++ b/src/main/java/gregtech/api/enums/Textures.java @@ -264,6 +264,9 @@ public class Textures { MACHINE_CASING_FUSION, MACHINE_CASING_FUSION_GLASS, MACHINE_CASING_FUSION_GLASS_YELLOW, + TEXTURE_METAL_PANEL_E, + TEXTURE_METAL_PANEL_E_A, + MACHINE_CASING_FUSION_GLASS_YELLOW_GLOW, MACHINE_CASING_FUSION_2, @@ -653,6 +656,8 @@ public class Textures { OVERLAY_FRONT_STEAM_MACERATOR_ACTIVE_GLOW, OVERLAY_FRONT_STEAM_WASHER, OVERLAY_FRONT_STEAM_WASHER_ACTIVE, + OVERLAY_FRONT_WATER_PUMP, + OVERLAY_FRONT_WATER_PUMP_ACTIVE, OVERLAY_FRONT_STEAM_CENTRIFUGE, OVERLAY_FRONT_STEAM_CENTRIFUGE_ACTIVE, OVERLAY_FRONT_STEAM_COMPRESSOR, diff --git a/src/main/java/gregtech/api/recipe/check/CheckRecipeResultRegistry.java b/src/main/java/gregtech/api/recipe/check/CheckRecipeResultRegistry.java index e141c39a67..7112b47886 100644 --- a/src/main/java/gregtech/api/recipe/check/CheckRecipeResultRegistry.java +++ b/src/main/java/gregtech/api/recipe/check/CheckRecipeResultRegistry.java @@ -108,6 +108,8 @@ public final class CheckRecipeResultRegistry { public static final CheckRecipeResult BACKFILLER_NO_CONCRETE = SimpleCheckRecipeResult .ofFailure("backfiller_no_concrete"); + public static final CheckRecipeResult NO_SEE_SKY = SimpleCheckRecipeResult.ofFailure("no_see_sky"); + /** * Cannot process recipe because the machine cannot handle required EUt. */ |