Skip to content

Commit

Permalink
Remove multi-ingot (GTNewHorizons#3815)
Browse files Browse the repository at this point in the history 
Co-authored-by: Martin Robertz <[email protected]>
Co-authored-by: Maya <[email protected]>
  • Loading branch information
@StaffiX @Dream-Master @serenibyss
3 people authored Jan 16, 2025
1 parent b41b94b commit a10cfa7
Show file tree
Hide file tree
Showing 364 changed files with 35 additions and 255 deletions.
5 changes: 0 additions & 5 deletions src/main/java/bartworks/system/material/Werkstoff.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -763,11 +763,6 @@ public static void initPrefixLogic() {
Werkstoff.GenerationFeatures.prefixLogic.put(OrePrefixes.plateQuadruple, 0x200);
Werkstoff.GenerationFeatures.prefixLogic.put(OrePrefixes.plateQuintuple, 0x200);
Werkstoff.GenerationFeatures.prefixLogic.put(OrePrefixes.plateDense, 0x200);
Werkstoff.GenerationFeatures.prefixLogic.put(OrePrefixes.ingotDouble, 0x200);
Werkstoff.GenerationFeatures.prefixLogic.put(OrePrefixes.ingotTriple, 0x200);
Werkstoff.GenerationFeatures.prefixLogic.put(OrePrefixes.ingotQuadruple, 0x200);
Werkstoff.GenerationFeatures.prefixLogic.put(OrePrefixes.ingotQuintuple, 0x200);

Werkstoff.GenerationFeatures.prefixLogic.put(OrePrefixes.blockCasing, 0x380);
Werkstoff.GenerationFeatures.prefixLogic.put(OrePrefixes.blockCasingAdvanced, 0x380);
}
Expand Down
10 changes: 1 addition & 9 deletions src/main/java/bartworks/system/material/WerkstoffLoader.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,7 @@
import static gregtech.api.enums.OrePrefixes.gemFlawed;
import static gregtech.api.enums.OrePrefixes.gemFlawless;
import static gregtech.api.enums.OrePrefixes.ingot;
import static gregtech.api.enums.OrePrefixes.ingotDouble;
import static gregtech.api.enums.OrePrefixes.ingotHot;
import static gregtech.api.enums.OrePrefixes.ingotQuadruple;
import static gregtech.api.enums.OrePrefixes.ingotQuintuple;
import static gregtech.api.enums.OrePrefixes.ingotTriple;
import static gregtech.api.enums.OrePrefixes.lens;
import static gregtech.api.enums.OrePrefixes.nugget;
import static gregtech.api.enums.OrePrefixes.ore;
Expand Down Expand Up @@ -1976,11 +1972,7 @@ private static void addItemsForGeneration() {
WerkstoffLoader.items.put(plateTriple, new BWMetaGeneratedItems(plateTriple));
WerkstoffLoader.items.put(plateQuadruple, new BWMetaGeneratedItems(plateQuadruple));
WerkstoffLoader.items.put(plateQuintuple, new BWMetaGeneratedItems(plateQuintuple));
WerkstoffLoader.items.put(plateDense, new BWMetaGeneratedItems(plateDense));
WerkstoffLoader.items.put(ingotDouble, new BWMetaGeneratedItems(ingotDouble));
WerkstoffLoader.items.put(ingotTriple, new BWMetaGeneratedItems(ingotTriple));
WerkstoffLoader.items.put(ingotQuadruple, new BWMetaGeneratedItems(ingotQuadruple));
WerkstoffLoader.items.put(ingotQuintuple, new BWMetaGeneratedItems(ingotQuintuple));
WerkstoffLoader.items.put(plateDense, new BWMetaGeneratedItems(plateDense));;
}
ENABLED_ORE_PREFIXES.addAll(WerkstoffLoader.items.keySet());
ENABLED_ORE_PREFIXES.add(ore);
Expand Down
43 changes: 3 additions & 40 deletions src/main/java/goodgenerator/util/MaterialFix.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ public static void MaterialFluidExtractionFix(Werkstoff material) {
public static void addRecipeForMultiItems() {
for (Werkstoff tMaterial : Werkstoff.werkstoffHashSet) {
if (tMaterial == null) continue;
if (tMaterial.hasItemType(OrePrefixes.plateDouble) && tMaterial.hasItemType(OrePrefixes.ingotDouble)) {
if (tMaterial.hasItemType(OrePrefixes.plateDouble)) {
GTValues.RA.stdBuilder()
.itemInputs(tMaterial.get(OrePrefixes.plate, 2), GTUtility.getIntegratedCircuit(2))
.itemOutputs(tMaterial.get(OrePrefixes.plateDouble, 1))
Expand All @@ -146,24 +146,11 @@ public static void addRecipeForMultiItems() {
1L) * TICKS)
.eut(TierEU.RECIPE_MV / 2)
.addTo(benderRecipes);
GTValues.RA.stdBuilder()
.itemInputs(tMaterial.get(OrePrefixes.ingotDouble, 1), GTUtility.getIntegratedCircuit(1))
.itemOutputs(tMaterial.get(OrePrefixes.plateDouble, 1))
.duration(
Math.max(
tMaterial.getStats()
.getMass(),
1L) * TICKS)
.eut(TierEU.RECIPE_MV / 2)
.addTo(benderRecipes);
GTModHandler.addCraftingRecipe(
tMaterial.get(OrePrefixes.plateDouble, 1),
new Object[] { "P", "P", "h", 'P', tMaterial.get(OrePrefixes.plate, 1) });
GTModHandler.addCraftingRecipe(
tMaterial.get(OrePrefixes.ingotDouble, 1),
new Object[] { "P", "P", "h", 'P', tMaterial.get(OrePrefixes.ingot, 1) });
}
if (tMaterial.hasItemType(OrePrefixes.plateTriple) && tMaterial.hasItemType(OrePrefixes.ingotTriple)) {
if (tMaterial.hasItemType(OrePrefixes.plateTriple)) {
GTValues.RA.stdBuilder()
.itemInputs(tMaterial.get(OrePrefixes.plate, 3), GTUtility.getIntegratedCircuit(3))
.itemOutputs(tMaterial.get(OrePrefixes.plateTriple, 1))
Expand All @@ -184,24 +171,10 @@ public static void addRecipeForMultiItems() {
1L) * TICKS)
.eut(TierEU.RECIPE_MV / 2)
.addTo(benderRecipes);
GTValues.RA.stdBuilder()
.itemInputs(tMaterial.get(OrePrefixes.ingotTriple, 1), GTUtility.getIntegratedCircuit(1))
.itemOutputs(tMaterial.get(OrePrefixes.plateTriple, 1))
.duration(
Math.max(
tMaterial.getStats()
.getMass(),
1L) * TICKS)
.eut(TierEU.RECIPE_MV / 2)
.addTo(benderRecipes);
GTModHandler.addCraftingRecipe(
tMaterial.get(OrePrefixes.plateTriple, 1),
new Object[] { "B", "P", "h", 'P', tMaterial.get(OrePrefixes.plate, 1), 'B',
tMaterial.get(OrePrefixes.plateDouble, 1) });
GTModHandler.addCraftingRecipe(
tMaterial.get(OrePrefixes.ingotTriple, 1),
new Object[] { "B", "P", "h", 'P', tMaterial.get(OrePrefixes.ingot, 1), 'B',
tMaterial.get(OrePrefixes.ingotDouble, 1) });
}
if (tMaterial.hasItemType(OrePrefixes.plateDense)) {
GTValues.RA.stdBuilder()
Expand All @@ -225,7 +198,7 @@ public static void addRecipeForMultiItems() {
.eut(TierEU.RECIPE_MV / 2)
.addTo(benderRecipes);

if (tMaterial.hasItemType(OrePrefixes.plateTriple) && tMaterial.hasItemType(OrePrefixes.ingotTriple)) {
if (tMaterial.hasItemType(OrePrefixes.plateTriple)) {
GTValues.RA.stdBuilder()
.itemInputs(tMaterial.get(OrePrefixes.plateTriple, 3), GTUtility.getIntegratedCircuit(3))
.itemOutputs(tMaterial.get(OrePrefixes.plateDense, 1))
Expand All @@ -236,16 +209,6 @@ public static void addRecipeForMultiItems() {
1L) * TICKS)
.eut(TierEU.RECIPE_MV / 2)
.addTo(benderRecipes);
GTValues.RA.stdBuilder()
.itemInputs(tMaterial.get(OrePrefixes.ingotTriple, 3), GTUtility.getIntegratedCircuit(3))
.itemOutputs(tMaterial.get(OrePrefixes.plateDense, 1))
.duration(
Math.max(
tMaterial.getStats()
.getMass() * 3,
1L) * TICKS)
.eut(TierEU.RECIPE_MV / 2)
.addTo(benderRecipes);
}
}
if (tMaterial.hasItemType(OrePrefixes.stickLong)) {
Expand Down
43 changes: 1 addition & 42 deletions src/main/java/gregtech/api/enums/OrePrefixes.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,18 +101,6 @@ public enum OrePrefixes {
64, -1),
dirtyGravel("Dirty Gravels", "", "", true, true, false, false, false, false, false, false, false, true, B[3], -1,
64, -1),
/** A quintuple Ingot. */
ingotQuintuple("5x Ingots", "Quintuple ", " Ingot", true, true, false, false, false, false, true, true, false,
false, B[1], M * 5, 64, 16),
/** A quadruple Ingot. */
ingotQuadruple("4x Ingots", "Quadruple ", " Ingot", true, true, false, false, false, false, true, true, false,
false, B[1], M * 4, 64, 15),
/** A triple Ingot. */
ingotTriple("3x Ingots", "Triple ", " Ingot", true, true, false, false, false, false, true, false, false, false,
B[1], M * 3, 64, 14),
/** A double Ingot. Introduced by TerraFirmaCraft */
ingotDouble("2x Ingots", "Double ", " Ingot", true, true, false, false, false, false, true, true, false, false,
B[1], M * 2, 64, 13),
/** A hot Ingot, which has to be cooled down by a Vacuum Freezer. */
ingotHot("Hot Ingots", "Hot ", " Ingot", true, true, false, false, false, false, false, true, false, false, B[1],
M * 1, 64, 12),
Expand Down Expand Up @@ -688,10 +676,6 @@ public enum OrePrefixes {
plateQuadruple.mNotGeneratedItems.add(MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter);
plateQuintuple.mNotGeneratedItems.add(MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter);
cell.mNotGeneratedItems.add(MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter);
ingotDouble.mNotGeneratedItems.add(MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter);
ingotTriple.mNotGeneratedItems.add(MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter);
ingotQuadruple.mNotGeneratedItems.add(MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter);
ingotQuintuple.mNotGeneratedItems.add(MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter);
turbineBlade.mNotGeneratedItems.add(MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter);
dust.mNotGeneratedItems.add(MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter);
dustSmall.mNotGeneratedItems.add(MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter);
Expand All @@ -700,11 +684,7 @@ public enum OrePrefixes {
plateTriple.mNotGeneratedItems.add(MaterialsUEVplus.HotProtoHalkonite);
plateQuadruple.mNotGeneratedItems.add(MaterialsUEVplus.HotProtoHalkonite);
plateQuintuple.mNotGeneratedItems.add(MaterialsUEVplus.HotProtoHalkonite);
cell.mNotGeneratedItems.add(MaterialsUEVplus.HotProtoHalkonite);
ingotDouble.mNotGeneratedItems.add(MaterialsUEVplus.HotProtoHalkonite);
ingotTriple.mNotGeneratedItems.add(MaterialsUEVplus.HotProtoHalkonite);
ingotQuadruple.mNotGeneratedItems.add(MaterialsUEVplus.HotProtoHalkonite);
ingotQuintuple.mNotGeneratedItems.add(MaterialsUEVplus.HotProtoHalkonite);
cell.mNotGeneratedItems.add(MaterialsUEVplus.HotProtoHalkonite);;
turbineBlade.mNotGeneratedItems.add(MaterialsUEVplus.HotProtoHalkonite);
dust.mNotGeneratedItems.add(MaterialsUEVplus.HotProtoHalkonite);
dustSmall.mNotGeneratedItems.add(MaterialsUEVplus.HotProtoHalkonite);
Expand All @@ -718,10 +698,6 @@ public enum OrePrefixes {
plateQuadruple.mNotGeneratedItems.add(MaterialsUEVplus.ProtoHalkonite);
plateQuintuple.mNotGeneratedItems.add(MaterialsUEVplus.ProtoHalkonite);
cell.mNotGeneratedItems.add(MaterialsUEVplus.ProtoHalkonite);
ingotDouble.mNotGeneratedItems.add(MaterialsUEVplus.ProtoHalkonite);
ingotTriple.mNotGeneratedItems.add(MaterialsUEVplus.ProtoHalkonite);
ingotQuadruple.mNotGeneratedItems.add(MaterialsUEVplus.ProtoHalkonite);
ingotQuintuple.mNotGeneratedItems.add(MaterialsUEVplus.ProtoHalkonite);
turbineBlade.mNotGeneratedItems.add(MaterialsUEVplus.ProtoHalkonite);
dust.mNotGeneratedItems.add(MaterialsUEVplus.ProtoHalkonite);
dustSmall.mNotGeneratedItems.add(MaterialsUEVplus.ProtoHalkonite);
Expand All @@ -736,10 +712,6 @@ public enum OrePrefixes {
plateQuadruple.mNotGeneratedItems.add(MaterialsUEVplus.HotExoHalkonite);
plateQuintuple.mNotGeneratedItems.add(MaterialsUEVplus.HotExoHalkonite);
cell.mNotGeneratedItems.add(MaterialsUEVplus.HotExoHalkonite);
ingotDouble.mNotGeneratedItems.add(MaterialsUEVplus.HotExoHalkonite);
ingotTriple.mNotGeneratedItems.add(MaterialsUEVplus.HotExoHalkonite);
ingotQuadruple.mNotGeneratedItems.add(MaterialsUEVplus.HotExoHalkonite);
ingotQuintuple.mNotGeneratedItems.add(MaterialsUEVplus.HotExoHalkonite);
turbineBlade.mNotGeneratedItems.add(MaterialsUEVplus.HotExoHalkonite);
dust.mNotGeneratedItems.add(MaterialsUEVplus.HotExoHalkonite);
dustSmall.mNotGeneratedItems.add(MaterialsUEVplus.HotExoHalkonite);
Expand All @@ -754,10 +726,6 @@ public enum OrePrefixes {
plateQuadruple.mNotGeneratedItems.add(MaterialsUEVplus.ExoHalkonite);
plateQuintuple.mNotGeneratedItems.add(MaterialsUEVplus.ExoHalkonite);
cell.mNotGeneratedItems.add(MaterialsUEVplus.ExoHalkonite);
ingotDouble.mNotGeneratedItems.add(MaterialsUEVplus.ExoHalkonite);
ingotTriple.mNotGeneratedItems.add(MaterialsUEVplus.ExoHalkonite);
ingotQuadruple.mNotGeneratedItems.add(MaterialsUEVplus.ExoHalkonite);
ingotQuintuple.mNotGeneratedItems.add(MaterialsUEVplus.ExoHalkonite);
turbineBlade.mNotGeneratedItems.add(MaterialsUEVplus.ExoHalkonite);
dust.mNotGeneratedItems.add(MaterialsUEVplus.ExoHalkonite);
dustSmall.mNotGeneratedItems.add(MaterialsUEVplus.ExoHalkonite);
Expand Down Expand Up @@ -977,11 +945,6 @@ public enum OrePrefixes {
plateDense.mCondition = new ICondition.Or<>(new ICondition.Not<>(SubTag.NO_SMASHING), SubTag.STRETCHY);
plateSuperdense.mCondition = new ICondition.Or<>(new ICondition.Not<>(SubTag.NO_SMASHING), SubTag.STRETCHY);

ingotDouble.mCondition = new ICondition.Or<>(new ICondition.Not<>(SubTag.NO_SMASHING), SubTag.STRETCHY);
ingotTriple.mCondition = new ICondition.Or<>(new ICondition.Not<>(SubTag.NO_SMASHING), SubTag.STRETCHY);
ingotQuadruple.mCondition = new ICondition.Or<>(new ICondition.Not<>(SubTag.NO_SMASHING), SubTag.STRETCHY);
ingotQuintuple.mCondition = new ICondition.Or<>(new ICondition.Not<>(SubTag.NO_SMASHING), SubTag.STRETCHY);

wireFine.mCondition = SubTag.METAL;

// -----
Expand Down Expand Up @@ -1058,10 +1021,6 @@ public enum OrePrefixes {
Arrays.asList(
OrePrefixes.gem,
OrePrefixes.ingotHot,
OrePrefixes.ingotDouble,
OrePrefixes.ingotTriple,
OrePrefixes.ingotQuadruple,
OrePrefixes.ingotQuintuple,
OrePrefixes.plate,
OrePrefixes.plateDouble,
OrePrefixes.plateTriple,
Expand Down
28 changes: 14 additions & 14 deletions src/main/java/gregtech/api/enums/TextureSet.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,22 +32,22 @@ public class TextureSet {
TextureType.ITEM, TextureType.ITEM, TextureType.ITEM, TextureType.ITEM, TextureType.ITEM, };
private static final String[] SUFFIXES = new String[] { "/dustTiny", "/dustSmall", "/dust", "/dustImpure",
"/dustPure", "/crushed", "/crushedPurified", "/crushedCentrifuged", "/gem", "/nugget", "/casingSmall", "/ingot",
"/ingotHot", "/ingotDouble", "/ingotTriple", "/ingotQuadruple", "/ingotQuintuple", "/plate", "/plateDouble",
"/plateTriple", "/plateQuadruple", "/plateQuintuple", "/plateDense", "/stick", "/lens", "/round", "/bolt",
"/screw", "/ring", "/foil", "/cell", "/cellPlasma", aTextVoidDir, aTextVoidDir, aTextVoidDir, aTextVoidDir,
aTextVoidDir, "/toolHeadHammer", "/toolHeadFile", "/toolHeadSaw", "/toolHeadDrill", "/toolHeadChainsaw",
"/toolHeadWrench", aTextVoidDir, aTextVoidDir, aTextVoidDir, aTextVoidDir, "/toolHeadScrewdriver",
"/toolHeadBuzzSaw", "/toolHeadSoldering", "/nanites", "/wireFine", "/gearGtSmall", "/rotor", "/stickLong",
"/springSmall", "/spring", "/arrowGtWood", "/arrowGtPlastic", "/gemChipped", "/gemFlawed", "/gemFlawless",
"/gemExquisite", "/gearGt", "/oreRaw", aTextVoidDir, aTextVoidDir, "/oreSmall", "/ore", "/wire", "/foil",
"/block1", "/block2", "/block3", "/block4", "/block5", "/block6", "/pipeSide", "/pipeTiny", "/pipeSmall",
"/pipeMedium", "/pipeLarge", "/pipeHuge", "/frameGt", "/pipeQuadruple", "/pipeNonuple", aTextVoidDir,
aTextVoidDir, aTextVoidDir, aTextVoidDir, aTextVoidDir, aTextVoidDir, aTextVoidDir, aTextVoidDir, aTextVoidDir,
aTextVoidDir, "/crateGtDust", "/crateGtIngot", "/crateGtGem", "/crateGtPlate", "/turbineBlade", aTextVoidDir,
"/ingotHot", aTextVoidDir, aTextVoidDir, aTextVoidDir, aTextVoidDir, "/plate", "/plateDouble", "/plateTriple",
"/plateQuadruple", "/plateQuintuple", "/plateDense", "/stick", "/lens", "/round", "/bolt", "/screw", "/ring",
"/foil", "/cell", "/cellPlasma", aTextVoidDir, aTextVoidDir, aTextVoidDir, aTextVoidDir, aTextVoidDir,
"/toolHeadHammer", "/toolHeadFile", "/toolHeadSaw", "/toolHeadDrill", "/toolHeadChainsaw", "/toolHeadWrench",
aTextVoidDir, aTextVoidDir, aTextVoidDir, aTextVoidDir, "/toolHeadScrewdriver", "/toolHeadBuzzSaw",
"/toolHeadSoldering", "/nanites", "/wireFine", "/gearGtSmall", "/rotor", "/stickLong", "/springSmall",
"/spring", "/arrowGtWood", "/arrowGtPlastic", "/gemChipped", "/gemFlawed", "/gemFlawless", "/gemExquisite",
"/gearGt", "/oreRaw", aTextVoidDir, aTextVoidDir, "/oreSmall", "/ore", "/wire", "/foil", "/block1", "/block2",
"/block3", "/block4", "/block5", "/block6", "/pipeSide", "/pipeTiny", "/pipeSmall", "/pipeMedium", "/pipeLarge",
"/pipeHuge", "/frameGt", "/pipeQuadruple", "/pipeNonuple", aTextVoidDir, aTextVoidDir, aTextVoidDir,
aTextVoidDir, aTextVoidDir, aTextVoidDir, aTextVoidDir, aTextVoidDir, aTextVoidDir, aTextVoidDir,
"/crateGtDust", "/crateGtIngot", "/crateGtGem", "/crateGtPlate", "/turbineBlade", aTextVoidDir, aTextVoidDir,
aTextVoidDir, aTextVoidDir, aTextVoidDir, aTextVoidDir, aTextVoidDir, aTextVoidDir, aTextVoidDir, aTextVoidDir,
aTextVoidDir, aTextVoidDir, aTextVoidDir, aTextVoidDir, aTextVoidDir, aTextVoidDir, aTextVoidDir, aTextVoidDir,
aTextVoidDir, aTextVoidDir, aTextVoidDir, aTextVoidDir, aTextVoidDir, aTextVoidDir, aTextVoidDir,
"/plateSuperdense", "/handleMallet", "/toolHeadMallet", };
aTextVoidDir, aTextVoidDir, aTextVoidDir, aTextVoidDir, aTextVoidDir, aTextVoidDir, "/plateSuperdense",
"/handleMallet", "/toolHeadMallet", };

public boolean is_custom = false;

Expand Down
8 changes: 4 additions & 4 deletions src/main/java/gregtech/common/items/MetaGeneratedItem01.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -584,10 +584,10 @@ public MetaGeneratedItem01() {
null,
OrePrefixes.ingot,
OrePrefixes.ingotHot,
OrePrefixes.ingotDouble,
OrePrefixes.ingotTriple,
OrePrefixes.ingotQuadruple,
OrePrefixes.ingotQuintuple,
OrePrefixes.___placeholder___,
OrePrefixes.___placeholder___,
OrePrefixes.___placeholder___,
OrePrefixes.___placeholder___,
OrePrefixes.plate,
OrePrefixes.plateDouble,
OrePrefixes.plateTriple,
Expand Down
Loading

0 comments on commit a10cfa7

Please sign in to comment.