diff options
69 files changed, 10805 insertions, 1507 deletions
diff --git a/.github/test-scala-presence.toml b/.github/test-scala-presence.toml deleted file mode 100644 index ae0e9acd49..0000000000 --- a/.github/test-scala-presence.toml +++ /dev/null @@ -1,2 +0,0 @@ -[exclude] -"src/main/java/**/*.java" = "import scala."
\ No newline at end of file diff --git a/.github/workflows/test-forbidden-getmoditems.yml b/.github/workflows/test-forbidden-getmoditems.yml new file mode 100644 index 0000000000..ab683d26eb --- /dev/null +++ b/.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)"|(BartWorks|GalactiGreg|GGFab|GoodGenerator|GTNHLanthanides|GTPlusPlus|KekzTech|KubaTech|TecTech)\.ID)' src/main/java diff --git a/.github/workflows/test-scala-presence.yml b/.github/workflows/test-scala-presence.yml index 6b1091e1fd..5baca0bdc9 100644 --- a/.github/workflows/test-scala-presence.yml +++ b/.github/workflows/test-scala-presence.yml @@ -11,8 +11,9 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v2 - - name: Check file content - uses: mattsb42-meta/not-grep@1.0.0 - with: - config-file: ./.github/test-scala-presence.toml + uses: actions/checkout@v4 + - name: Detect scala presence + shell: bash + run: | + ! grep -E -r 'import scala\.' src/main/java + diff --git a/dependencies.gradle b/dependencies.gradle index 4fed0c334c..a8aca2eae3 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -54,7 +54,8 @@ dependencies { implementation('com.github.GTNewHorizons:GTNEIOrePlugin:1.3.3:dev') { transitive = false } compileOnlyApi("com.github.GTNewHorizons:Avaritia:1.51:dev") - compileOnlyApi("com.github.GTNewHorizons:ForestryMC:4.9.7:dev") { transitive = false } + // this is required because forestry is an hidden hard dep, revert this if you fixed the hidden hard dep + implementation("com.github.GTNewHorizons:ForestryMC:4.9.7:dev") { transitive = false } compileOnlyApi('com.github.GTNewHorizons:Angelica:1.0.0-beta4:api') { transitive = false } compileOnlyApi("com.github.GTNewHorizons:AppleCore:3.3.0:dev") { transitive = false } diff --git a/src/functionalTest/java/gregtech/test/GTRecipeTest.java b/src/functionalTest/java/gregtech/test/GTRecipeTest.java index 8cf7c36b84..104228992e 100644 --- a/src/functionalTest/java/gregtech/test/GTRecipeTest.java +++ b/src/functionalTest/java/gregtech/test/GTRecipeTest.java @@ -1,12 +1,11 @@ package gregtech.test; +import static gregtech.api.GregTech_API.sBlockOres1; import static gregtech.api.enums.GT_Values.RA; import static gregtech.api.enums.ItemList.Circuit_Parts_Crystal_Chip_Master; import static gregtech.api.enums.ItemList.IC2_LapotronCrystal; -import static gregtech.api.enums.Mods.GregTech; import static gregtech.api.enums.OrePrefixes.circuit; import static gregtech.api.enums.OrePrefixes.lens; -import static gregtech.api.util.GT_ModHandler.getModItem; import static gregtech.api.util.GT_OreDictUnificator.get; import static gregtech.api.util.GT_Utility.copyAmount; import static net.minecraft.init.Blocks.chest; @@ -69,7 +68,7 @@ class GTRecipeTest { .toArray(new GT_Recipe[0])[0]; RA.stdBuilder() - .itemInputs(getModItem(GregTech.ID, "gt.blockores", 1, 32)) + .itemInputs(new ItemStack(sBlockOres1, 1, 32)) .itemOutputs(new ItemStack(iron_ingot, 1)) .duration(0) .eut(0) @@ -227,7 +226,7 @@ class GTRecipeTest { // as mUnificationTarget is not set for circuits in GT5. // But it works in the same way; specific circuit -> GT ore block, unificated circuit -> vanilla ore block GT_Recipe recipeCorrectOre = recipeMap.findRecipeQuery() - .items(getModItem(GregTech.ID, "gt.blockores", 1, 32)) + .items(new ItemStack(sBlockOres1, 1, 32)) .find(); assertNotNull(recipeCorrectOre); diff --git a/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java b/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java index 19c258d429..140485c317 100644 --- a/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java +++ b/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java @@ -81,6 +81,8 @@ import static com.elisis.gtnhlanth.common.register.WerkstoffMaterialPool.Thulium import static com.elisis.gtnhlanth.common.register.WerkstoffMaterialPool.YtterbiumChlorideConcentrate; import static com.elisis.gtnhlanth.common.register.WerkstoffMaterialPool.YtterbiumExtractingNanoResin; import static com.elisis.gtnhlanth.common.register.WerkstoffMaterialPool.YtterbiumOreConcentrate; +import static gregtech.api.enums.Mods.NewHorizonsCoreMod; +import static gregtech.api.enums.Mods.PamsHarvestCraft; import static gregtech.api.enums.OrePrefixes.blockCasingAdvanced; import static gregtech.api.recipe.RecipeMaps.assemblerRecipes; import static gregtech.api.recipe.RecipeMaps.autoclaveRecipes; @@ -281,7 +283,7 @@ public class RecipeLoader { .eut(7680) .addTo(assemblerRecipes); - ItemStack insulator = GT_ModHandler.getModItem("dreamcraft", "item.MicaInsulatorSheet", 1); + ItemStack insulator = GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MicaInsulatorSheet", 1); // Coolant Delivery Casing @@ -629,7 +631,7 @@ public class RecipeLoader { .itemInputs( new ItemStack(LanthItemList.MASKED_MASK), MyMaterial.lithiumChloride.get(OrePrefixes.dust, 2), - GT_ModHandler.getModItem("dreamcraft", "item.PotassiumHydroxideDust", 4)) + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.PotassiumHydroxideDust", 4)) .itemOutputs(new ItemStack(LanthItemList.maskMap.get(MaskList.BLANK2))) .duration(25 * GT_RecipeBuilder.SECONDS) .eut(1920) @@ -948,7 +950,7 @@ public class RecipeLoader { // IODINE-START // SeaweedAsh GT_ModHandler.addSmeltingRecipe( - GT_ModHandler.getModItem("harvestcraft", "seaweedItem", 1), + GT_ModHandler.getModItem(PamsHarvestCraft.ID, "seaweedItem", 1), WerkstoffMaterialPool.SeaweedAsh.get(OrePrefixes.dustSmall, 1)); // SeaweedConcentrate @@ -985,7 +987,7 @@ public class RecipeLoader { GT_Values.RA.stdBuilder() .itemInputs( Materials.Pyrolusite.getDust(6), - GT_ModHandler.getModItem("dreamcraft", "item.PotassiumHydroxideDust", 6), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.PotassiumHydroxideDust", 6), WerkstoffMaterialPool.PotassiumChlorate.get(OrePrefixes.dust, 5)) .itemOutputs( WerkstoffMaterialPool.PotassiumPermanganate.get(OrePrefixes.dust, 12), @@ -1008,7 +1010,7 @@ public class RecipeLoader { // 6KOH + 6Cl = KClO3 + 5KCl + 3H2O GT_Values.RA.stdBuilder() .itemInputs( - GT_ModHandler.getModItem("dreamcraft", "item.PotassiumHydroxideDust", 18), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.PotassiumHydroxideDust", 18), GT_Utility.getIntegratedCircuit(3)) .itemOutputs( Materials.RockSalt.getDust(10), @@ -2224,7 +2226,7 @@ public class RecipeLoader { // Lanthanum GT_Values.RA.stdBuilder() .itemInputs( - GT_ModHandler.getModItem("dreamcraft", "item.MysteriousCrystalLens", 0), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MysteriousCrystalLens", 0), Materials.Lanthanum.getDust(1), Materials.Carbon.getNanite(1)) .fluidInputs(MyMaterial.P507.getFluidOrGas(4000)) @@ -2236,7 +2238,7 @@ public class RecipeLoader { // Praseodymium GT_Values.RA.stdBuilder() .itemInputs( - GT_ModHandler.getModItem("dreamcraft", "item.MysteriousCrystalLens", 0), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MysteriousCrystalLens", 0), Materials.Praseodymium.getDust(1), Materials.Carbon.getNanite(1)) .fluidInputs(MyMaterial.P507.getFluidOrGas(4000)) @@ -2248,7 +2250,7 @@ public class RecipeLoader { // Cerium GT_Values.RA.stdBuilder() .itemInputs( - GT_ModHandler.getModItem("dreamcraft", "item.MysteriousCrystalLens", 0), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MysteriousCrystalLens", 0), Materials.Cerium.getDust(1), Materials.Carbon.getNanite(1)) .fluidInputs(MyMaterial.P507.getFluidOrGas(4000)) @@ -2260,7 +2262,7 @@ public class RecipeLoader { // Neodymium GT_Values.RA.stdBuilder() .itemInputs( - GT_ModHandler.getModItem("dreamcraft", "item.MysteriousCrystalLens", 0), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MysteriousCrystalLens", 0), Materials.Neodymium.getDust(1), Materials.Carbon.getNanite(1)) .fluidInputs(MyMaterial.P507.getFluidOrGas(4000)) @@ -2272,7 +2274,7 @@ public class RecipeLoader { // Promethium GT_Values.RA.stdBuilder() .itemInputs( - GT_ModHandler.getModItem("dreamcraft", "item.MysteriousCrystalLens", 0), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MysteriousCrystalLens", 0), Materials.Promethium.getDust(1), Materials.Carbon.getNanite(1)) .fluidInputs(MyMaterial.P507.getFluidOrGas(4000)) @@ -2284,7 +2286,7 @@ public class RecipeLoader { // Sm GT_Values.RA.stdBuilder() .itemInputs( - GT_ModHandler.getModItem("dreamcraft", "item.MysteriousCrystalLens", 0), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MysteriousCrystalLens", 0), Materials.Samarium.getDust(1), Materials.Carbon.getNanite(1)) .fluidInputs(MyMaterial.P507.getFluidOrGas(4000)) @@ -2296,7 +2298,7 @@ public class RecipeLoader { // Europium GT_Values.RA.stdBuilder() .itemInputs( - GT_ModHandler.getModItem("dreamcraft", "item.MysteriousCrystalLens", 0), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MysteriousCrystalLens", 0), Materials.Europium.getDust(1), Materials.Carbon.getNanite(1)) .fluidInputs(MyMaterial.P507.getFluidOrGas(4000)) @@ -2308,7 +2310,7 @@ public class RecipeLoader { // Gadolinium GT_Values.RA.stdBuilder() .itemInputs( - GT_ModHandler.getModItem("dreamcraft", "item.MysteriousCrystalLens", 0), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MysteriousCrystalLens", 0), Materials.Gadolinium.getDust(1), Materials.Carbon.getNanite(1)) .fluidInputs(MyMaterial.P507.getFluidOrGas(4000)) @@ -2320,7 +2322,7 @@ public class RecipeLoader { // Terbium GT_Values.RA.stdBuilder() .itemInputs( - GT_ModHandler.getModItem("dreamcraft", "item.MysteriousCrystalLens", 0), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MysteriousCrystalLens", 0), Materials.Terbium.getDust(1), Materials.Carbon.getNanite(1)) .fluidInputs(MyMaterial.P507.getFluidOrGas(4000)) @@ -2332,7 +2334,7 @@ public class RecipeLoader { // Dysprosium GT_Values.RA.stdBuilder() .itemInputs( - GT_ModHandler.getModItem("dreamcraft", "item.MysteriousCrystalLens", 0), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MysteriousCrystalLens", 0), Materials.Dysprosium.getDust(1), Materials.Carbon.getNanite(1)) .fluidInputs(MyMaterial.P507.getFluidOrGas(4000)) @@ -2344,7 +2346,7 @@ public class RecipeLoader { // Holmium GT_Values.RA.stdBuilder() .itemInputs( - GT_ModHandler.getModItem("dreamcraft", "item.MysteriousCrystalLens", 0), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MysteriousCrystalLens", 0), Materials.Holmium.getDust(1), Materials.Carbon.getNanite(1)) .fluidInputs(MyMaterial.P507.getFluidOrGas(4000)) @@ -2356,7 +2358,7 @@ public class RecipeLoader { // Erbium GT_Values.RA.stdBuilder() .itemInputs( - GT_ModHandler.getModItem("dreamcraft", "item.MysteriousCrystalLens", 0), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MysteriousCrystalLens", 0), Materials.Erbium.getDust(1), Materials.Carbon.getNanite(1)) .fluidInputs(MyMaterial.P507.getFluidOrGas(4000)) @@ -2368,7 +2370,7 @@ public class RecipeLoader { // Thulium GT_Values.RA.stdBuilder() .itemInputs( - GT_ModHandler.getModItem("dreamcraft", "item.MysteriousCrystalLens", 0), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MysteriousCrystalLens", 0), Materials.Thulium.getDust(1), Materials.Carbon.getNanite(1)) .fluidInputs(MyMaterial.P507.getFluidOrGas(4000)) @@ -2380,7 +2382,7 @@ public class RecipeLoader { // Ytterbium GT_Values.RA.stdBuilder() .itemInputs( - GT_ModHandler.getModItem("dreamcraft", "item.MysteriousCrystalLens", 0), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MysteriousCrystalLens", 0), Materials.Ytterbium.getDust(1), Materials.Carbon.getNanite(1)) .fluidInputs(MyMaterial.P507.getFluidOrGas(4000)) @@ -2392,7 +2394,7 @@ public class RecipeLoader { // Lutetium GT_Values.RA.stdBuilder() .itemInputs( - GT_ModHandler.getModItem("dreamcraft", "item.MysteriousCrystalLens", 0), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MysteriousCrystalLens", 0), Materials.Lutetium.getDust(1), Materials.Carbon.getNanite(1)) .fluidInputs(MyMaterial.P507.getFluidOrGas(4000)) diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/configs/ConfigHandler.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/configs/ConfigHandler.java index 4378f87a96..27cf0f4fe6 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/configs/ConfigHandler.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/configs/ConfigHandler.java @@ -24,10 +24,8 @@ import com.github.bartimaeusnek.bartworks.API.API_ConfigValues; public class ConfigHandler { - private static final int IDU = 10 * 8 + 5; public static Configuration c; - public static int IDOffset = 12600; public static int megaMachinesMax = 256; public static int mbWaterperSec = 150; public static int ross128BID = -64; @@ -130,14 +128,6 @@ public class ConfigHandler { "If you wish to enable \"Shared Item Stack\" tooltips") .getBoolean(true); - ConfigHandler.IDOffset = ConfigHandler.c - .get( - "System", - "ID Offset", - 12600, - "ID Offset for this mod. This Mod uses " + ConfigHandler.IDU - + " IDs. DO NOT CHANGE IF YOU DONT KNOW WHAT THIS IS") - .getInt(12600); ConfigHandler.teslastaff = ConfigHandler.c .get( "System", @@ -238,18 +228,6 @@ public class ConfigHandler { "How much should the MBF produce pollution per tick per ingot. Then it'll be multiplied by the amount of ingots done in parallel") .getInt(ConfigHandler.basePollutionMBFSecond); - if (ConfigHandler.IDOffset == 0) { - ConfigHandler.IDOffset = 12600; - ConfigHandler.c - .get( - "System", - "ID Offset", - 12600, - "ID Offset for this mod. This Mod uses " + ConfigHandler.IDU - + " IDs. DO NOT CHANGE IF YOU DONT KNOW WHAT THIS IS") - .set(12600); - } - ConfigHandler.GTppLogDisabler = ConfigHandler.c .get("System", "Disable GT++ Logging", false, "Enables or Disables GT++ Logging.") .getBoolean(false); diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/ElectricImplosionCompressorRecipes.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/ElectricImplosionCompressorRecipes.java index 0e7614110b..dfc3ab7e83 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/ElectricImplosionCompressorRecipes.java +++ b/ |