Merge branch 'master' into master

.github/workflows/test-forbidden-getmoditems.yml

@@ -0,0 +1,18 @@
+name: Forbidden getModItems
+
+on:
+ pull_request:
+ branches: [ master, main ]
+ push:
+ branches: [ master, main ]
+
+jobs:
+ test-forbidden-getmoditems:
+ runs-on: ubuntu-latest
+ steps:
+ - name: Checkout
+ uses: actions/checkout@v4
+ - name: Detect forbidden getModItem calls
+ shell: bash
+ run: |
+ ! grep -E -r 'getModItem\(("(bartworks|galacticgreg|ggfab|GoodGenerator|gregtech|gtnhlanth|miscutils|kekztech|kubatech|tectech|gtneioreplugin|dreamcraft)"|.*(BartWorks|GalactiGreg|GGFab|GoodGenerator|GregTech|GTNHLanthanides|GTPlusPlus|KekzTech|KubaTech|TecTech|NEIOrePlugin|NewHorizonsCoreMod)\.ID)' src/main/java

.github/workflows/test-forbidden-ismodloaded.yml

@@ -0,0 +1,18 @@
+name: Forbidden isModLoaded
+
+on:
+ pull_request:
+ branches: [ master, main ]
+ push:
+ branches: [ master, main ]
+
+jobs:
+ test-forbidden-isModLoaded:
+ runs-on: ubuntu-latest
+ steps:
+ - name: Checkout
+ uses: actions/checkout@v4
+ - name: Detect forbidden isModLoaded calls
+ shell: bash
+ run: |
+ ! grep -E -r '(BartWorks|GalactiGreg|GGFab|GoodGenerator|GTNHLanthanides|GregTech|GTPlusPlus|KekzTech|KubaTech|TecTech|NEIOrePlugin|NewHorizonsCoreMod)\.isModLoaded' src/main/java

.github/workflows/test-scala-presence.yml

@@ -0,0 +1,19 @@
+name: Test Scala Presence
+
+on:
+ pull_request:
+ branches: [ master, main ]
+ push:
+ branches: [ master, main ]
+
+jobs:
+ test-scala-presence:
+ runs-on: ubuntu-latest
+ steps:
+ - name: Checkout
+ uses: actions/checkout@v4
+ - name: Detect scala presence
+ shell: bash
+ run: |
+ ! grep -E -r 'import scala\.' src/main/java
+

dependencies.gradle

@@ -1,17 +1,16 @@
 // Add your dependencies here
 
 dependencies {
- api("com.github.GTNewHorizons:GT5-Unofficial:5.09.49.20:dev")
+ api("com.github.GTNewHorizons:GT5-Unofficial:5.09.49.45:dev")
  api("com.github.GTNewHorizons:Yamcl:0.6.0:dev")
  api("com.github.GTNewHorizons:Baubles:1.0.4:dev")
- implementation('com.github.GTNewHorizons:GTNEIOrePlugin:1.3.3:dev') { transitive = false }
 
  compileOnly("com.github.GTNewHorizons:AkashicTome:1.1.6:dev") { transitive = false }
  compileOnly("com.github.GTNewHorizons:Avaritia:1.51:dev") { transitive = false }
- compileOnly("com.github.GTNewHorizons:twilightforest:2.6.32:dev") { transitive = false }
- compileOnly("com.github.GTNewHorizons:GTNH-Intergalactic:1.4.6:dev") { transitive = false }
+ compileOnly("com.github.GTNewHorizons:twilightforest:2.6.33:dev") { transitive = false }
+ compileOnly("com.github.GTNewHorizons:GTNH-Intergalactic:1.4.9:dev") { transitive = false }
  compileOnly("com.github.GTNewHorizons:Mantle:0.4.1:dev") { transitive = false }
- compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.12.6-GTNH:dev") { transitive = false }
+ compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.12.8-GTNH:dev") { transitive = false }
  compileOnly("com.github.GTNewHorizons:WitcheryExtras:1.2.2:dev") { transitive = false }
  compileOnly("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev") { transitive = false }
  compileOnly rfg.deobf("curse.maven:witchery-69673:2234410")
@@ -22,9 +21,8 @@ dependencies {
  compileOnly("TGregworks:TGregworks:1.7.10-GTNH-1.0.26:deobf") { transitive = false }
  compileOnly("com.github.GTNewHorizons:amunra:0.6.0:dev") { transitive = false }
  compileOnly("com.github.GTNewHorizons:Galacticraft:3.2.1-GTNH:dev") { transitive = false }
- compileOnly("com.github.GTNewHorizons:ForestryMC:4.9.7:dev") { transitive = false }
- compileOnly("com.github.GTNewHorizons:DetravScannerMod:1.8.1:dev") { transitive = false }
- compileOnlyApi("com.github.GTNewHorizons:Mobs-Info:0.4.2-GTNH:dev")
+ compileOnly("com.github.GTNewHorizons:ForestryMC:4.9.10:dev") { transitive = false }
+ compileOnlyApi("com.github.GTNewHorizons:Mobs-Info:0.4.5-GTNH:dev")
 
  runtimeOnlyNonPublishable rfg.deobf("curse.maven:biomes-o-plenty-220318:2499612")
  runtimeOnlyNonPublishable("com.github.GTNewHorizons:WailaHarvestability:1.2.1-GTNH:dev")

src/main/java/com/dreammaster/auxiliary/NEIGTNewHorizonsConfig.java

@@ -1,6 +1,7 @@
 package com.dreammaster.auxiliary;
 
 import static com.dreammaster.scripts.IScriptLoader.missing;
+import static com.dreammaster.scripts.IScriptLoader.wildcard;
 import static gregtech.api.enums.Mods.*;
 
 import net.minecraft.init.Blocks;
@@ -113,22 +114,6 @@ public void loadConfig() {
  API.hideItem(GT_ModHandler.getModItem(AppliedEnergistics2.ID, "tile.BlockPaint", 1));
  }
 
- if (BartWorks.isModLoaded()) {
- API.hideItem(GT_ModHandler.getModItem(BartWorks.ID, "gt.bwMetaGeneratedGTEnhancementcapsule", 1, 477));
- API.hideItem(
- GT_ModHandler
- .getModItem(BartWorks.ID, "gt.bwMetaGeneratedGTEnhancementcapsule", 1, 32767, missing));
- API.hideItem(
- GT_ModHandler.getModItem(
- BartWorks.ID,
- "gt.bwMetaGeneratedGTEnhancementcapsuleMolten",
- 1,
- 32767,
- missing));
- API.hideItem(GT_ModHandler.getModItem(BartWorks.ID, "gt.bwMetaGeneratedcapsuleMolten", 1, 32767, missing));
- API.hideItem(GT_ModHandler.getModItem(BartWorks.ID, "gt.bwMetaGeneratedcapsule", 1, 32767, missing));
- }
-
  if (Chisel.isModLoaded()) {
  API.hideItem(GT_ModHandler.getModItem(Chisel.ID, "amber", 1));
  API.hideItem(GT_ModHandler.getModItem(Chisel.ID, "bloodBrick", 1));
@@ -157,8 +142,8 @@ public void loadConfig() {
  API.hideItem(GT_ModHandler.getModItem(BiomesOPlenty.ID, "misc", 1, 6, missing));
  }
  if (MagicBees.isModLoaded()) {
- API.hideItem(GT_ModHandler.getModItem(MagicBees.ID, "capsule.magic", 1, 32767, missing));
- API.hideItem(GT_ModHandler.getModItem(MagicBees.ID, "capsule.void", 1, 32767, missing));
+ API.hideItem(GT_ModHandler.getModItem(MagicBees.ID, "capsule.magic", 1, wildcard, missing));
+ API.hideItem(GT_ModHandler.getModItem(MagicBees.ID, "capsule.void", 1, wildcard, missing));
  }
 
  if (ForbiddenMagic.isModLoaded()) {

src/main/java/com/dreammaster/bartworksHandler/BW_RadHatchMaterial.java

@@ -2,7 +2,6 @@
 
 import static com.github.bartimaeusnek.bartworks.API.recipe.BartWorksRecipeMaps.radioHatchRecipes;
 import static com.github.bartimaeusnek.bartworks.util.BWRecipes.calcDecayTicks;
-import static gregtech.api.enums.Mods.GTPlusPlus;
 import static gregtech.api.util.GT_RecipeConstants.DECAY_TICKS;
 
 import net.minecraft.item.ItemStack;
@@ -14,10 +13,6 @@
 public class BW_RadHatchMaterial {
 
  public static void runRadHatchAdder() {
- if (!GTPlusPlus.isModLoaded()) {
- return;
- }
-
  ItemStack err = ItemUtils.getErrorStack(1);
 
  for (Material material : Material.mMaterialMap) {

src/main/java/com/dreammaster/bartworksHandler/BacteriaRegistry.java

@@ -34,7 +34,6 @@
 
 import com.dreammaster.fluids.FluidList;
 import com.dreammaster.gthandler.CustomItemList;
-import com.dreammaster.gthandler.GT_CoreModSupport;
 import com.github.bartimaeusnek.bartworks.common.loaders.BioItemList;
 import com.github.bartimaeusnek.bartworks.util.BioCulture;
 import com.github.bartimaeusnek.bartworks.util.BioDNA;
@@ -186,7 +185,7 @@ private void runLateBioOBJs() {
 
  private void runAdditionalFuelRecipes() {
  // XenoxRecycleRecipe
- GT_Values.RA.stdBuilder().itemOutputs(Ash.getDust(1)).fluidInputs(DelutedXenoxene.getFluid(1000))
+ GT_Values.RA.stdBuilder().itemOutputs(Ash.getDust(1)).fluidInputs(Materials.DilutedXenoxene.getFluid(1000))
  .fluidOutputs(Xenoxene.getFluid(250), RadoxLight.getGas(300)).duration(30 * SECONDS)
  .eut(TierEU.RECIPE_UV).addTo(distillationTowerRecipes);
 
@@ -214,10 +213,11 @@ private void runGTRecipes() {
  .itemInputs(
  GT_ModHandler.getModItem(GalaxySpace.ID, "barnardaClog", 64L),
  GT_Utility.getIntegratedCircuit(24))
- .itemOutputs(Ash.getDust(8)).fluidInputs(Xenoxene.getFluid(1000)).fluidOutputs(RawRadox.getFluid(1000))
- .duration(3 * MINUTES).eut(TierEU.RECIPE_UV).addTo(pyrolyseRecipes);
+ .itemOutputs(Ash.getDust(8)).fluidInputs(Materials.Xenoxene.getFluid(1000))
+ .fluidOutputs(Materials.RawRadox.getFluid(1000)).duration(3 * MINUTES).eut(TierEU.RECIPE_UV)
+ .addTo(pyrolyseRecipes);
 
- GT_Values.RA.stdBuilder().itemOutputs(Ash.getDust(5)).fluidInputs(RawRadox.getFluid(5000))
+ GT_Values.RA.stdBuilder().itemOutputs(Ash.getDust(5)).fluidInputs(Materials.RawRadox.getFluid(5000))
  .fluidOutputs(
  OilHeavy.getFluid(600),
  Oil.getFluid(300),
@@ -227,7 +227,7 @@ private void runGTRecipes() {
  FermentedBiomass.getFluid(50),
  RadoxSuperHeavy.getFluid(100),
  RadoxHeavy.getFluid(150),
- DelutedXenoxene.getFluid(50),
+ DilutedXenoxene.getFluid(50),
  RadoxLight.getGas(300),
  RadoxSuperLight.getGas(500))
  .duration(40 * SECONDS).eut(TierEU.RECIPE_UHV).addTo(distillationTowerRecipes);
@@ -255,8 +255,8 @@ private void runGTRecipes() {
 
  GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(2))
  .fluidInputs(RadoxGas.getGas(2160), Oxygen.getPlasma(7500L), Titanium.getPlasma(100L))
- .fluidOutputs(GT_CoreModSupport.RadoxPolymer.getMolten(720L)).duration(30 * SECONDS)
- .eut(TierEU.RECIPE_UV).addTo(multiblockChemicalReactorRecipes);
+ .fluidOutputs(Materials.RadoxPolymer.getMolten(720L)).duration(30 * SECONDS).eut(TierEU.RECIPE_UV)
+ .addTo(multiblockChemicalReactorRecipes);
 
  GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.cell, RadoxPolymer, 1L))
  .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.cellMolten, RadoxPolymer, 1L)).duration(30 * SECONDS)

src/main/java/com/dreammaster/bartworksHandler/BartWorksMaterials.java

@@ -11,6 +11,7 @@
 
 public class BartWorksMaterials {
 
+ @Deprecated
  public static Materials getBartWorksMaterialByVarName(String name) {
  Materials materials = Materials._NULL;
  try {
@@ -21,16 +22,19 @@ public static Materials getBartWorksMaterialByVarName(String name) {
  return materials;
  }
 
+ @Deprecated
  public static Materials getBartWorksMaterialByODName(String name) {
  return Werkstoff.werkstoffHashSet.stream().filter(e -> e.getVarName().equals(name)).findFirst()
  .map(Werkstoff::getBridgeMaterial).orElse(Materials._NULL);
  }
 
+ @Deprecated
  public static Materials getBartWorksMaterialByIGNName(String name) {
  return Optional.ofNullable(Werkstoff.werkstoffNameHashMap.get(name)).map(Werkstoff::getBridgeMaterial)
  .orElse(Materials._NULL);
  }
 
+ @Deprecated
  public static Materials getBartWorksMaterialByID(int id) {
  return Optional.ofNullable(Werkstoff.werkstoffHashMap.get((short) id)).map(Werkstoff::getBridgeMaterial)
  .orElse(Materials._NULL);