aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech
diff options
context:
space:
mode:
authorevgengoldwar <69961523+evgengoldwar@users.noreply.github.com>2024-07-25 13:37:20 +0400
committerGitHub <noreply@github.com>2024-07-25 16:37:20 +0700
commit88812f7fcd8e33d0c7e57501dda7e043e0e14f47 (patch)
tree003bc95122df3d4b3ece0cca950b0341c09696cc /src/main/java/gregtech
parent766f62ec71f910970e672553c3086a20f7c12fd0 (diff)
downloadGT5-Unofficial-88812f7fcd8e33d0c7e57501dda7e043e0e14f47.tar.gz
GT5-Unofficial-88812f7fcd8e33d0c7e57501dda7e043e0e14f47.tar.bz2
GT5-Unofficial-88812f7fcd8e33d0c7e57501dda7e043e0e14f47.zip
Changed tooltips and some logic in Steam Multi (#2747)
* Change Steam Centrifuge * Change Steam Compressor * Change Steam Macerator * Change Steam Washer * Change Steam Water Pump * Added sounds for Steam Water Pump and Steam Washer * Change recipe ULV input and output hatch * Added sounds
Diffstat (limited to 'src/main/java/gregtech')
-rw-r--r--src/main/java/gregtech/api/enums/SoundResource.java3
-rw-r--r--src/main/java/gregtech/loaders/load/GT_Loader_MetaTileEntities_Recipes.java12
2 files changed, 13 insertions, 2 deletions
diff --git a/src/main/java/gregtech/api/enums/SoundResource.java b/src/main/java/gregtech/api/enums/SoundResource.java
index 23887aebbf..54a2162541 100644
--- a/src/main/java/gregtech/api/enums/SoundResource.java
+++ b/src/main/java/gregtech/api/enums/SoundResource.java
@@ -59,6 +59,9 @@ public enum SoundResource {
GT_MACHINES_FUSION_LOOP(230, GregTech.ID, "machines.FusionLoop"),
GT_MACHINES_DISTILLERY_LOOP(231, GregTech.ID, "machines.DistilleryLoop"),
GT_MACHINES_PLASMAFORGE_LOOP(232, GregTech.ID, "machines.PlasmaForgeLoop"),
+ GT_MACHINES_STEAM_WASHER_LOOP(233, GregTech.ID, "machines.SteamWasherLoop"),
+ GT_MACHINES_WATER_PUMP_LOOP(234, GregTech.ID, "machines.WaterPumpLoop"),
+ GT_MACHINES_STEAM_CENTRIFUGE_LOOP(235, GregTech.ID, "machines.SteamCentrifugeLoop"),
GUI_BUTTON_DOWN(-1, GregTech.ID, "gui.buttonDown"),
GUI_BUTTON_UP(-1, GregTech.ID, "gui.buttonUp"),
diff --git a/src/main/java/gregtech/loaders/load/GT_Loader_MetaTileEntities_Recipes.java b/src/main/java/gregtech/loaders/load/GT_Loader_MetaTileEntities_Recipes.java
index a85a2d60c1..8094938f7b 100644
--- a/src/main/java/gregtech/loaders/load/GT_Loader_MetaTileEntities_Recipes.java
+++ b/src/main/java/gregtech/loaders/load/GT_Loader_MetaTileEntities_Recipes.java
@@ -227,6 +227,7 @@ import static gregtech.api.enums.Mods.IndustrialCraft2;
import static gregtech.api.enums.Mods.NotEnoughItems;
import static gregtech.api.enums.Mods.Thaumcraft;
import static gregtech.api.recipe.RecipeMaps.assemblerRecipes;
+import static gregtech.api.util.GT_ModHandler.getModItem;
import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
import net.minecraft.init.Blocks;
@@ -4948,8 +4949,15 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable {
GT_ModHandler.addCraftingRecipe(
ItemList.Hatch_Output_ULV.get(1L),
bits,
- new Object[] { " S ", " F ", " P ", 'S', GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Empty, 1),
- 'F', ItemList.Hull_ULV.get(1), 'P', ItemList.IC2_Resin.get(1) });
+ new Object[] { "ASA", "AFA", "APA", 'S', getModItem(BuildCraftFactory.ID, "tankBlock", 1), 'F',
+ ItemList.Hull_ULV.get(1), "A", OrePrefixes.plate.get(Materials.Rubber), 'P',
+ OrePrefixes.ring.get(Materials.Rubber) });
+ GT_ModHandler.addCraftingRecipe(
+ ItemList.Hatch_Input_ULV.get(1L),
+ bits,
+ new Object[] { "ASA", "AFA", "APA", 'S', getModItem(BuildCraftFactory.ID, "tankBlock", 1), 'F',
+ ItemList.Hull_ULV.get(1), "A", OrePrefixes.plate.get(Materials.Rubber), 'P',
+ OrePrefixes.gear.get(Materials.Rubber) });
GT_ModHandler.addCraftingRecipe(
ItemList.Casing_Firebox_Steel.get(1L),
bits,