From 5e6ba0d78c7130762f076f56c856752e40068307 Mon Sep 17 00:00:00 2001 From: evgengoldwar <69961523+evgengoldwar@users.noreply.github.com> Date: Thu, 18 Jul 2024 19:38:15 +0400 Subject: 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 --- src/main/resources/assets/gregtech/lang/en_US.lang | 2 ++ .../blocks/iconsets/OVERLAY_FRONT_WATER_PUMP.png | Bin 0 -> 308 bytes .../blocks/iconsets/OVERLAY_FRONT_WATER_PUMP_ACTIVE.png | Bin 0 -> 407 bytes .../textures/blocks/iconsets/TEXTURE_METAL_PANEL_E.png | Bin 0 -> 1254 bytes .../textures/blocks/iconsets/TEXTURE_METAL_PANEL_E_A.png | Bin 0 -> 874 bytes .../textures/blocks/metro/TEXTURE_METAL_PANEL_E.png | Bin 0 -> 1254 bytes .../textures/blocks/metro/TEXTURE_METAL_PANEL_E_A.png | Bin 0 -> 874 bytes 7 files changed, 2 insertions(+) create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_WATER_PUMP.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_WATER_PUMP_ACTIVE.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/TEXTURE_METAL_PANEL_E.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/TEXTURE_METAL_PANEL_E_A.png create mode 100644 src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_METAL_PANEL_E.png create mode 100644 src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_METAL_PANEL_E_A.png (limited to 'src/main/resources/assets') diff --git a/src/main/resources/assets/gregtech/lang/en_US.lang b/src/main/resources/assets/gregtech/lang/en_US.lang index 1136c50915..e529750871 100644 --- a/src/main/resources/assets/gregtech/lang/en_US.lang +++ b/src/main/resources/assets/gregtech/lang/en_US.lang @@ -649,6 +649,8 @@ GT5U.interface.coverTabs.east=East GT5U.steam_variant.bronze=Bronze GT5U.steam_variant.steel=Steel +GT5U.biomes.humidity=Humidity: + # NEI options nei.options.tools.dump.gt5u=GT5u nei.options.tools.dump.gt5u.metatileentity=MetaTileEntity diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_WATER_PUMP.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_WATER_PUMP.png new file mode 100644 index 0000000000..75662c10e9 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_WATER_PUMP.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_WATER_PUMP_ACTIVE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_WATER_PUMP_ACTIVE.png new file mode 100644 index 0000000000..a045862756 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_WATER_PUMP_ACTIVE.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/TEXTURE_METAL_PANEL_E.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/TEXTURE_METAL_PANEL_E.png new file mode 100644 index 0000000000..c6dd3ca33f Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/TEXTURE_METAL_PANEL_E.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/TEXTURE_METAL_PANEL_E_A.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/TEXTURE_METAL_PANEL_E_A.png new file mode 100644 index 0000000000..098f970848 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/TEXTURE_METAL_PANEL_E_A.png differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_METAL_PANEL_E.png b/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_METAL_PANEL_E.png new file mode 100644 index 0000000000..c6dd3ca33f Binary files /dev/null and b/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_METAL_PANEL_E.png differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_METAL_PANEL_E_A.png b/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_METAL_PANEL_E_A.png new file mode 100644 index 0000000000..098f970848 Binary files /dev/null and b/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_METAL_PANEL_E_A.png differ -- cgit