aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gtPlusPlus/xmod/gregtech/registration
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/gtPlusPlus/xmod/gregtech/registration')
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSimpleWasher.java147
1 files changed, 75 insertions, 72 deletions
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSimpleWasher.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSimpleWasher.java
index d366482812..308b721d61 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSimpleWasher.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSimpleWasher.java
@@ -1,9 +1,12 @@
package gtPlusPlus.xmod.gregtech.registration.gregtech;
+import java.util.List;
+
import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.FluidStack;
import com.github.bartimaeusnek.bartworks.system.material.Werkstoff;
+import com.google.common.collect.ImmutableList;
import gregtech.api.enums.Materials;
import gregtech.api.enums.OrePrefixes;
@@ -12,6 +15,7 @@ import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachin
import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects;
import gregtech.api.util.GTPP_Recipe;
import gregtech.api.util.GT_OreDictUnificator;
+import gtPlusPlus.api.objects.data.Quad;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.util.minecraft.FluidUtils;
import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
@@ -23,88 +27,60 @@ public class GregtechSimpleWasher {
generateDirtyDustRecipes();
generateDirtyCrushedRecipes();
// Register the Simple Washer Entity.
- GregtechItemList.SimpleDustWasher_ULV.set(
- new GT_MetaTileEntity_BasicMachine_GT_Recipe(
- 767,
- "simplewasher.01.tier.01",
- "Simple Washer I",
- 0,
- new String[] { "It's like an automatic Cauldron for washing dusts.",
- CORE.GT_Tooltip.get() },
- GTPP_Recipe.GTPP_Recipe_Map.sSimpleWasherRecipes,
- 1,
- 1,
- true,
- SoundResource.NONE,
- false,
- false,
- SpecialEffects.NONE,
- "SIMPLE_WASHER",
- null).getStackForm(1L));
- // People want them in higher tiers apparently
- GregtechItemList.SimpleDustWasher_MV.set(
- new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+ // The unlocalized names here have inconsistent numbering because there only used to be a simple washer
+ // every other tier, and they were numbered numerically. In order to maintain backwards compatibility,
+ // the tier numbers need to stay as they were.
+ List<Quad<GregtechItemList, Integer, String, String>> washers = ImmutableList.of(
+ new Quad<>(
+ GregtechItemList.SimpleDustWasher_LV,
+ 31790,
+ "simplewasher.01.tier.06",
+ "Simple Washer I"),
+ new Quad<>(
+ GregtechItemList.SimpleDustWasher_MV,
31017,
"simplewasher.01.tier.02",
- "Simple Washer II",
- 2,
- new String[] { "It's like an automatic Cauldron for washing dusts.",
- CORE.GT_Tooltip.get() },
- GTPP_Recipe.GTPP_Recipe_Map.sSimpleWasherRecipes,
- 1,
- 1,
- true,
- SoundResource.NONE,
- false,
- false,
- SpecialEffects.NONE,
- "SIMPLE_WASHER",
- null).getStackForm(1L));
- GregtechItemList.SimpleDustWasher_EV.set(
- new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+ "Simple Washer II"),
+ new Quad<>(
+ GregtechItemList.SimpleDustWasher_HV,
+ 31791,
+ "simplewasher.01.tier.07",
+ "Simple Washer III"),
+ new Quad<>(
+ GregtechItemList.SimpleDustWasher_EV,
31018,
"simplewasher.01.tier.03",
- "Simple Washer III",
- 4,
- new String[] { "It's like an automatic Cauldron for washing dusts.",
- CORE.GT_Tooltip.get() },
- GTPP_Recipe.GTPP_Recipe_Map.sSimpleWasherRecipes,
- 1,
- 1,
- true,
- SoundResource.NONE,
- false,
- false,
- SpecialEffects.NONE,
- "SIMPLE_WASHER",
- null).getStackForm(1L));
- GregtechItemList.SimpleDustWasher_LuV.set(
- new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+ "Simple Washer IV"),
+ new Quad<>(
+ GregtechItemList.SimpleDustWasher_IV,
+ 31792,
+ "simplewasher.01.tier.08",
+ "Simple Washer V"),
+ new Quad<>(
+ GregtechItemList.SimpleDustWasher_LuV,
31019,
"simplewasher.01.tier.04",
- "Simple Washer IV",
- 6,
- new String[] { "It's like an automatic Cauldron for washing dusts.",
- CORE.GT_Tooltip.get() },
- GTPP_Recipe.GTPP_Recipe_Map.sSimpleWasherRecipes,
- 1,
- 1,
- true,
- SoundResource.NONE,
- false,
- false,
- SpecialEffects.NONE,
- "SIMPLE_WASHER",
- null).getStackForm(1L));
- GregtechItemList.SimpleDustWasher_UV.set(
- new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+ "Simple Washer VI"),
+ new Quad<>(
+ GregtechItemList.SimpleDustWasher_ZPM,
+ 31793,
+ "simplewasher.01.tier.09",
+ "Simple Washer VII"),
+ new Quad<>(
+ GregtechItemList.SimpleDustWasher_UV,
31020,
"simplewasher.01.tier.05",
- "Simple Washer V",
- 8,
+ "Simple Washer VIII"));
+
+ GregtechItemList.SimpleDustWasher_ULV.set(
+ new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+ 767,
+ "simplewasher.01.tier.01",
+ "Deprecated ULV Simple Washer",
+ 0,
new String[] { "It's like an automatic Cauldron for washing dusts.",
- CORE.GT_Tooltip.get() },
+ "§cDEPRECATED: No recipe.§r Make a Simple Washer I.", CORE.GT_Tooltip.get() },
GTPP_Recipe.GTPP_Recipe_Map.sSimpleWasherRecipes,
1,
1,
@@ -115,6 +91,28 @@ public class GregtechSimpleWasher {
SpecialEffects.NONE,
"SIMPLE_WASHER",
null).getStackForm(1L));
+
+ for (int i = 0; i < washers.size(); i++) {
+ Quad<GregtechItemList, Integer, String, String> washer = washers.get(i);
+ washer.getKey().set(
+ new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+ washer.getValue_1(),
+ washer.getValue_2(),
+ washer.getValue_3(),
+ i + 1,
+ new String[] { "It's like an automatic Cauldron for washing dusts.",
+ CORE.GT_Tooltip.get() },
+ GTPP_Recipe.GTPP_Recipe_Map.sSimpleWasherRecipes,
+ 1,
+ 1,
+ true,
+ SoundResource.NONE,
+ false,
+ false,
+ SpecialEffects.NONE,
+ "SIMPLE_WASHER",
+ null).getStackForm(1L));
+ }
}
}
@@ -123,6 +121,7 @@ public class GregtechSimpleWasher {
// Generate Recipe Map for the Dust Washer.
ItemStack dustClean;
ItemStack dustDirty;
+ ItemStack dustPure;
for (Materials v : Materials.values()) {
if (v == Materials.Platinum || v == Materials.Osmium
|| v == Materials.Iridium
@@ -132,13 +131,17 @@ public class GregtechSimpleWasher {
dustClean = GT_OreDictUnificator.get(OrePrefixes.dust, v, 1L);
dustDirty = GT_OreDictUnificator.get(OrePrefixes.dustImpure, v, 1L);
+ dustPure = GT_OreDictUnificator.get(OrePrefixes.dustPure, v, 1L);
addSimpleWashRecipe(dustDirty, dustClean);
+ addSimpleWashRecipe(dustPure, dustClean);
}
for (Werkstoff v : Werkstoff.werkstoffHashSet) {
dustClean = v.hasItemType(OrePrefixes.dust) ? v.get(OrePrefixes.dust) : null;
dustDirty = v.hasItemType(OrePrefixes.dustImpure) ? v.get(OrePrefixes.dustImpure) : null;
+ dustPure = v.hasItemType(OrePrefixes.dustPure) ? v.get(OrePrefixes.dustPure) : null;
addSimpleWashRecipe(dustDirty, dustClean);
+ addSimpleWashRecipe(dustPure, dustClean);
}
return GTPP_Recipe.GTPP_Recipe_Map.sSimpleWasherRecipes.mRecipeList.size() > mRecipeCount;
generated by cgit (git 2.46.0) at 2025-03-09 20:22:17 +0000