From f9d5c5789471549e30b79ceeafa3f87a40b058da Mon Sep 17 00:00:00 2001 From: StaffiX <32968022+StaffiX@users.noreply.github.com> Date: Sun, 19 Jan 2025 17:32:33 +0100 Subject: [PATCH 1/3] Add subtag for generating multi-plates --- .../java/gregtech/api/enums/Materials.java | 65 +++++++++++++++++++ .../java/gregtech/api/enums/OrePrefixes.java | 42 +++--------- src/main/java/gregtech/api/enums/SubTag.java | 5 ++ 3 files changed, 78 insertions(+), 34 deletions(-) diff --git a/src/main/java/gregtech/api/enums/Materials.java b/src/main/java/gregtech/api/enums/Materials.java index 85aeefdf905..7c21547ae0b 100644 --- a/src/main/java/gregtech/api/enums/Materials.java +++ b/src/main/java/gregtech/api/enums/Materials.java @@ -2295,6 +2295,71 @@ private static void initSubTags() { MaterialsUEVplus.HotExoHalkonite, MaterialsUEVplus.ExoHalkonite); + SubTag.MULTI_PLATE.addTo( + Adamantium, + Aluminium, + Beryllium, + BlackPlutonium, + BlackSteel, + Bronze, + Clay, + Cobalt, + Copper, + CosmicNeutronium, + CrystallinePinkSlime, + DarkSteel, + Duralumin, + Europium, + Gold, + HSSG, + HSSS, + Infinity, + InfinityCatalyst, + Iridium, + Iron, + Lead, + Magnesium, + MaterialsKevlar.Kevlar, + MaterialsKevlar.Kevlar, + MaterialsUEVplus.Eternity, + MaterialsUEVplus.ProtoHalkonite, + MaterialsUEVplus.SpaceTime, + MaterialsUEVplus.TranscendentMetal, + MelodicAlloy, + Mithril, + Naquadah, + NaquadahAlloy, + Naquadria, + Neutronium, + Nichrome, + Nickel, + NiobiumTitanium, + Oriharukon, + Osmiridium, + Osmium, + Palladium, + Paper, + Platinum, + Polybenzimidazole, + Polycaprolactam, + Polytetrafluoroethylene, + RadoxPolymer, + RedAlloy, + Shadow, + SiliconSG, + Silver, + StainlessSteel, + Steel, + Sunnarium, + Thaumium, + Tin, + Titanium, + Trinium, + Tungsten, + TungstenCarbide, + TungstenSteel, + Void); + SubTag.FOOD.addTo( MeatRaw, MeatCooked, diff --git a/src/main/java/gregtech/api/enums/OrePrefixes.java b/src/main/java/gregtech/api/enums/OrePrefixes.java index f5886e03b9e..cbd26d77399 100644 --- a/src/main/java/gregtech/api/enums/OrePrefixes.java +++ b/src/main/java/gregtech/api/enums/OrePrefixes.java @@ -671,19 +671,12 @@ public enum OrePrefixes { frame.mNotGeneratedItems.add(MaterialsUEVplus.Universium); frameGt.mNotGeneratedItems.add(MaterialsUEVplus.Universium); - plateDouble.mNotGeneratedItems.add(MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter); - plateTriple.mNotGeneratedItems.add(MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter); - plateQuadruple.mNotGeneratedItems.add(MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter); - plateQuintuple.mNotGeneratedItems.add(MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter); cell.mNotGeneratedItems.add(MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter); turbineBlade.mNotGeneratedItems.add(MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter); dust.mNotGeneratedItems.add(MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter); dustSmall.mNotGeneratedItems.add(MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter); dustTiny.mNotGeneratedItems.add(MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter); - plateTriple.mNotGeneratedItems.add(MaterialsUEVplus.HotProtoHalkonite); - plateQuadruple.mNotGeneratedItems.add(MaterialsUEVplus.HotProtoHalkonite); - plateQuintuple.mNotGeneratedItems.add(MaterialsUEVplus.HotProtoHalkonite); cell.mNotGeneratedItems.add(MaterialsUEVplus.HotProtoHalkonite);; turbineBlade.mNotGeneratedItems.add(MaterialsUEVplus.HotProtoHalkonite); dust.mNotGeneratedItems.add(MaterialsUEVplus.HotProtoHalkonite); @@ -694,9 +687,6 @@ public enum OrePrefixes { nugget.mNotGeneratedItems.add(MaterialsUEVplus.HotProtoHalkonite); itemCasing.mNotGeneratedItems.add(MaterialsUEVplus.HotProtoHalkonite); - plateTriple.mNotGeneratedItems.add(MaterialsUEVplus.ProtoHalkonite); - plateQuadruple.mNotGeneratedItems.add(MaterialsUEVplus.ProtoHalkonite); - plateQuintuple.mNotGeneratedItems.add(MaterialsUEVplus.ProtoHalkonite); cell.mNotGeneratedItems.add(MaterialsUEVplus.ProtoHalkonite); turbineBlade.mNotGeneratedItems.add(MaterialsUEVplus.ProtoHalkonite); dust.mNotGeneratedItems.add(MaterialsUEVplus.ProtoHalkonite); @@ -707,10 +697,6 @@ public enum OrePrefixes { nugget.mNotGeneratedItems.add(MaterialsUEVplus.ProtoHalkonite); itemCasing.mNotGeneratedItems.add(MaterialsUEVplus.ProtoHalkonite); - plateDouble.mNotGeneratedItems.add(MaterialsUEVplus.HotExoHalkonite); - plateTriple.mNotGeneratedItems.add(MaterialsUEVplus.HotExoHalkonite); - plateQuadruple.mNotGeneratedItems.add(MaterialsUEVplus.HotExoHalkonite); - plateQuintuple.mNotGeneratedItems.add(MaterialsUEVplus.HotExoHalkonite); cell.mNotGeneratedItems.add(MaterialsUEVplus.HotExoHalkonite); turbineBlade.mNotGeneratedItems.add(MaterialsUEVplus.HotExoHalkonite); dust.mNotGeneratedItems.add(MaterialsUEVplus.HotExoHalkonite); @@ -721,10 +707,6 @@ public enum OrePrefixes { nugget.mNotGeneratedItems.add(MaterialsUEVplus.HotExoHalkonite); itemCasing.mNotGeneratedItems.add(MaterialsUEVplus.HotExoHalkonite); - plateDouble.mNotGeneratedItems.add(MaterialsUEVplus.ExoHalkonite); - plateTriple.mNotGeneratedItems.add(MaterialsUEVplus.ExoHalkonite); - plateQuadruple.mNotGeneratedItems.add(MaterialsUEVplus.ExoHalkonite); - plateQuintuple.mNotGeneratedItems.add(MaterialsUEVplus.ExoHalkonite); cell.mNotGeneratedItems.add(MaterialsUEVplus.ExoHalkonite); turbineBlade.mNotGeneratedItems.add(MaterialsUEVplus.ExoHalkonite); dust.mNotGeneratedItems.add(MaterialsUEVplus.ExoHalkonite); @@ -925,22 +907,14 @@ public enum OrePrefixes { SubTag.MAGICAL, new ICondition.And<>(SubTag.TRANSPARENT, SubTag.HAS_COLOR)); - plateDouble.mCondition = new ICondition.Or<>( - SubTag.PAPER, - new ICondition.Not<>(SubTag.NO_SMASHING), - SubTag.STRETCHY); - plateTriple.mCondition = new ICondition.Or<>( - SubTag.PAPER, - new ICondition.Not<>(SubTag.NO_SMASHING), - SubTag.STRETCHY); - plateQuadruple.mCondition = new ICondition.Or<>( - SubTag.PAPER, - new ICondition.Not<>(SubTag.NO_SMASHING), - SubTag.STRETCHY); - plateQuintuple.mCondition = new ICondition.Or<>( - SubTag.PAPER, - new ICondition.Not<>(SubTag.NO_SMASHING), - SubTag.STRETCHY); + plateDouble.mCondition = new ICondition.And<>( + SubTag.MULTI_PLATE); + plateTriple.mCondition = new ICondition.And<>( + SubTag.MULTI_PLATE); + plateQuadruple.mCondition = new ICondition.And<>( + SubTag.MULTI_PLATE); + plateQuintuple.mCondition = new ICondition.And<>( + SubTag.MULTI_PLATE); 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); diff --git a/src/main/java/gregtech/api/enums/SubTag.java b/src/main/java/gregtech/api/enums/SubTag.java index a21197d1b1e..e511a380053 100644 --- a/src/main/java/gregtech/api/enums/SubTag.java +++ b/src/main/java/gregtech/api/enums/SubTag.java @@ -245,6 +245,11 @@ public final class SubTag implements ICondition { */ public static final SubTag BLACK_HOLE = getNewSubTag("BLACK_HOLE"); + /** + * If this material should generate Multi-plates (double, triple, quadruple, quintuple) + */ + public static final SubTag MULTI_PLATE = getNewSubTag("MULTI_PLATE"); + public final Collection mRelevantTaggedItems = new HashSet<>(1); private SubTag(String aName) { From 94d640e92736f56a26280d5fd95f6d8aa1fe1889 Mon Sep 17 00:00:00 2001 From: StaffiX <32968022+StaffiX@users.noreply.github.com> Date: Sun, 19 Jan 2025 17:57:30 +0100 Subject: [PATCH 2/3] add americium --- src/main/java/gregtech/api/enums/Materials.java | 1 + src/main/java/gregtech/api/enums/OrePrefixes.java | 12 ++++-------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/src/main/java/gregtech/api/enums/Materials.java b/src/main/java/gregtech/api/enums/Materials.java index 7c21547ae0b..bbc212db67e 100644 --- a/src/main/java/gregtech/api/enums/Materials.java +++ b/src/main/java/gregtech/api/enums/Materials.java @@ -2298,6 +2298,7 @@ private static void initSubTags() { SubTag.MULTI_PLATE.addTo( Adamantium, Aluminium, + Americium, Beryllium, BlackPlutonium, BlackSteel, diff --git a/src/main/java/gregtech/api/enums/OrePrefixes.java b/src/main/java/gregtech/api/enums/OrePrefixes.java index cbd26d77399..c3acb2f4f15 100644 --- a/src/main/java/gregtech/api/enums/OrePrefixes.java +++ b/src/main/java/gregtech/api/enums/OrePrefixes.java @@ -907,14 +907,10 @@ public enum OrePrefixes { SubTag.MAGICAL, new ICondition.And<>(SubTag.TRANSPARENT, SubTag.HAS_COLOR)); - plateDouble.mCondition = new ICondition.And<>( - SubTag.MULTI_PLATE); - plateTriple.mCondition = new ICondition.And<>( - SubTag.MULTI_PLATE); - plateQuadruple.mCondition = new ICondition.And<>( - SubTag.MULTI_PLATE); - plateQuintuple.mCondition = new ICondition.And<>( - SubTag.MULTI_PLATE); + plateDouble.mCondition = new ICondition.And<>(SubTag.MULTI_PLATE); + plateTriple.mCondition = new ICondition.And<>(SubTag.MULTI_PLATE); + plateQuadruple.mCondition = new ICondition.And<>(SubTag.MULTI_PLATE); + plateQuintuple.mCondition = new ICondition.And<>(SubTag.MULTI_PLATE); 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); From 0ae1ad884d7d2160da28dfbcd67e51c00e75e1fb Mon Sep 17 00:00:00 2001 From: StaffiX <32968022+StaffiX@users.noreply.github.com> Date: Sun, 19 Jan 2025 18:43:14 +0100 Subject: [PATCH 3/3] remove duplicate kevlar --- src/main/java/gregtech/api/enums/Materials.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/gregtech/api/enums/Materials.java b/src/main/java/gregtech/api/enums/Materials.java index bbc212db67e..3bb05ebdb12 100644 --- a/src/main/java/gregtech/api/enums/Materials.java +++ b/src/main/java/gregtech/api/enums/Materials.java @@ -2321,7 +2321,6 @@ private static void initSubTags() { Lead, Magnesium, MaterialsKevlar.Kevlar, - MaterialsKevlar.Kevlar, MaterialsUEVplus.Eternity, MaterialsUEVplus.ProtoHalkonite, MaterialsUEVplus.SpaceTime,