Skip to content

Commit

Permalink
Merge branch 'master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
@Diamantino-Op
Diamantino-Op authored Jan 19, 2025
2 parents 4e2e2ec + e384960 commit b51b72d
Show file tree
Hide file tree
Showing 23 changed files with 308 additions and 152 deletions.
6 changes: 3 additions & 3 deletions dependencies.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@
dependencies {
api("com.github.GTNewHorizons:StructureLib:1.4.2:dev")
api("net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev")
api("com.github.GTNewHorizons:NotEnoughItems:2.7.22-GTNH:dev")
api("com.github.GTNewHorizons:NotEnoughItems:2.7.23-GTNH:dev")
api("com.github.GTNewHorizons:NotEnoughIds:2.1.6:dev")
api("com.github.GTNewHorizons:GTNHLib:0.6.2:dev")
api("com.github.GTNewHorizons:GTNHLib:0.6.3:dev")
api("com.github.GTNewHorizons:ModularUI:1.2.17:dev")
api("com.github.GTNewHorizons:ModularUI2:2.2.0-1.7.10:dev")
api("com.github.GTNewHorizons:waila:1.8.2:dev")
Expand Down Expand Up @@ -80,7 +80,7 @@ dependencies {
compileOnly rfg.deobf("curse.maven:cofh-core-69162:2388751")
compileOnly("com.github.GTNewHorizons:Nuclear-Control:2.6.7:dev") { transitive = false }
compileOnly("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev") { transitive = false }
implementation("com.github.GTNewHorizons:Hodgepodge:2.6.16:dev")
implementation("com.github.GTNewHorizons:Hodgepodge:2.6.17:dev")
compileOnly('com.github.GTNewHorizons:Botania:1.12.5-GTNH:dev') { transitive = false }
compileOnly('com.github.GTNewHorizons:HoloInventory:2.5.0-GTNH:dev') { transitive = false }
compileOnly rfg.deobf("curse.maven:extra-utilities-225561:2264384")
Expand Down
65 changes: 65 additions & 0 deletions src/main/java/gregtech/api/enums/Materials.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2295,6 +2295,71 @@ private static void initSubTags() {
MaterialsUEVplus.HotExoHalkonite,
MaterialsUEVplus.ExoHalkonite);

SubTag.MULTI_PLATE.addTo(
Adamantium,
Aluminium,
Americium,
Beryllium,
BlackPlutonium,
BlackSteel,
Bronze,
Clay,
Cobalt,
Copper,
CosmicNeutronium,
CrystallinePinkSlime,
DarkSteel,
Duralumin,
Europium,
Gold,
HSSG,
HSSS,
Infinity,
InfinityCatalyst,
Iridium,
Iron,
Lead,
Magnesium,
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,
Expand Down
38 changes: 4 additions & 34 deletions src/main/java/gregtech/api/enums/OrePrefixes.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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);
Expand All @@ -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);
Expand All @@ -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);
Expand Down Expand Up @@ -925,22 +907,10 @@ 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);
Expand Down
5 changes: 5 additions & 0 deletions src/main/java/gregtech/api/enums/SubTag.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -245,6 +245,11 @@ public final class SubTag implements ICondition<ISubTagContainer> {
*/
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<ISubTagContainer> mRelevantTaggedItems = new HashSet<>(1);

private SubTag(String aName) {
Expand Down
15 changes: 15 additions & 0 deletions src/main/java/gregtech/api/enums/Textures.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -890,6 +890,21 @@ public enum BlockIcons implements IIconContainer, Runnable {
OVERLAY_SIDE_INDUSTRIAL_APIARY_ACTIVE,
OVERLAY_SIDE_INDUSTRIAL_APIARY_ACTIVE_GLOW,

OVERLAY_TOP_RTG_ACTIVE,
OVERLAY_TOP_RTG_ACTIVE_GLOW,
OVERLAY_TOP_RTG,
OVERLAY_SIDE_RTG_ACTIVE,
OVERLAY_SIDE_RTG_ACTIVE_GLOW,
OVERLAY_SIDE_RTG,

OVERLAY_CHARCOAL_PIT,
OVERLAY_CHARCOAL_PIT_ACTIVE,
OVERLAY_CHARCOAL_PIT_ACTIVE_GLOW,

OVERLAY_FRONT_SEISMIC_PROSPECTOR,
OVERLAY_FRONT_SEISMIC_PROSPECTOR_ACTIVE,
OVERLAY_FRONT_SEISMIC_PROSPECTOR_ACTIVE_GLOW,

OVERLAY_ADV_PUMP,
OVERLAY_TELEPORTER,
OVERLAY_TELEPORTER_GLOW,
Expand Down
Loading

0 comments on commit b51b72d

Please sign in to comment.