From 28582f64f1c3db1422b6555626463ef4bd36fae4 Mon Sep 17 00:00:00 2001 From: Martin Robertz Date: Fri, 6 Sep 2024 12:22:34 +0200 Subject: [PATCH 01/10] update --- dependencies.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies.gradle b/dependencies.gradle index c4b9d719167..9f618792105 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -42,7 +42,7 @@ dependencies { api("com.github.GTNewHorizons:ModularUI:1.2.2:dev") api("com.github.GTNewHorizons:ModularUI2:2.1.4-1.7.10:dev") api("com.github.GTNewHorizons:waila:1.8.1:dev") - api("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-450-GTNH:dev") + api("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-451-GTNH:dev") api("com.github.GTNewHorizons:AE2FluidCraft-Rework:1.3.35-gtnh:dev") api('com.github.GTNewHorizons:Yamcl:0.6.0:dev') api("com.github.GTNewHorizons:Postea:1.0.9:dev") From 390ef9105292beb789c97901042e85e1cd453f04 Mon Sep 17 00:00:00 2001 From: Martin Robertz Date: Fri, 6 Sep 2024 13:27:46 +0200 Subject: [PATCH 02/10] update TG mod --- dependencies.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies.gradle b/dependencies.gradle index 9f618792105..ea622fd8cdb 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -73,7 +73,7 @@ dependencies { compileOnlyApi("com.github.GTNewHorizons:ProjectRed:4.10.2-GTNH:dev") { transitive = false } compileOnlyApi("com.github.GTNewHorizons:Railcraft:9.15.12:dev") { transitive = false } - compileOnly("TGregworks:TGregworks:1.7.10-GTNH-1.0.26:deobf") {transitive = false} + compileOnly("TGregworks:TGregworks:1.7.10-GTNH-1.0.27:deobf") {transitive = false} compileOnly("com.github.GTNewHorizons:ThaumicBases:1.7.5:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:EnderCore:0.4.6:dev") { transitive = false } compileOnly('com.github.GTNewHorizons:VisualProspecting:1.3.13:dev') { transitive = false } From 2cf79a7513ae1d5893812fbc89b8f3119ce67099 Mon Sep 17 00:00:00 2001 From: Maya <10861407+serenibyss@users.noreply.github.com> Date: Fri, 6 Sep 2024 14:13:49 -0500 Subject: [PATCH 03/10] Fix NPE in log with laser mirror pipes (#3088) --- .../tectech/thing/metaTileEntity/pipe/MTEPipeEnergyMirror.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/tectech/thing/metaTileEntity/pipe/MTEPipeEnergyMirror.java b/src/main/java/tectech/thing/metaTileEntity/pipe/MTEPipeEnergyMirror.java index cb9ce4d13db..419c240096e 100644 --- a/src/main/java/tectech/thing/metaTileEntity/pipe/MTEPipeEnergyMirror.java +++ b/src/main/java/tectech/thing/metaTileEntity/pipe/MTEPipeEnergyMirror.java @@ -141,8 +141,9 @@ public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) { } public ForgeDirection getBendDirection(ForgeDirection dir) { + if (dir == null) return null; for (ForgeDirection bendDir : connectedSides) { - if (bendDir != dir) { + if (bendDir != null && bendDir != dir) { chainedFrontFacing = bendDir.getOpposite(); return bendDir; } From ab1349967d5d78a9361a2f2421b605984ac5a2ec Mon Sep 17 00:00:00 2001 From: Mary <33456283+FourIsTheNumber@users.noreply.github.com> Date: Fri, 6 Sep 2024 15:21:54 -0400 Subject: [PATCH 04/10] Deprecate Large Processing Factory (#3086) --- .../core/recipe/RecipesMachines.java | 32 ++++--------------- .../implementations/MTEHatchSolidifier.java | 6 ++-- .../processing/MTEIndustrialMultiMachine.java | 2 ++ 3 files changed, 10 insertions(+), 30 deletions(-) diff --git a/src/main/java/gtPlusPlus/core/recipe/RecipesMachines.java b/src/main/java/gtPlusPlus/core/recipe/RecipesMachines.java index fecf4fcde62..ae3817f1414 100644 --- a/src/main/java/gtPlusPlus/core/recipe/RecipesMachines.java +++ b/src/main/java/gtPlusPlus/core/recipe/RecipesMachines.java @@ -2874,29 +2874,21 @@ private static void runModRecipes() { CI.getTieredCircuit(5), "plateStaballoy", GregtechItemList.Industrial_Mixer.get(1)); - } - - if (GTPPCore.ConfigSwitches.enableMultiblock_IndustrialMultiMachine) { - ItemStack plate = MaterialsAlloy.STABALLOY.getPlate(1); - ItemStack o_Compressor = ItemList.Machine_IV_Compressor.get(1); - ItemStack o_Lathe = ItemList.Machine_IV_Lathe.get(1); - ItemStack o_Electromagnet = ItemList.Machine_IV_Polarizer.get(1); - ItemStack o_Fermenter = ItemList.Machine_IV_Fermenter.get(1); - ItemStack o_Distillery = ItemList.Machine_IV_FluidExtractor.get(1); - ItemStack o_Extractor = ItemList.Machine_IV_Extractor.get(1); + final ItemStack staballoyPlate = MaterialsAlloy.STABALLOY.getPlate(1); RecipeUtils.addShapedRecipe( - plate, + staballoyPlate, CI.craftingToolHammer_Hard, - plate, + staballoyPlate, "plateStainlessSteel", "frameGtZirconiumCarbide", "plateStainlessSteel", - plate, + staballoyPlate, CI.craftingToolWrench, - plate, + staballoyPlate, GregtechItemList.Casing_Multi_Use.get(1)); + GTValues.RA.stdBuilder() .itemInputs( MaterialsAlloy.STABALLOY.getPlate(4), @@ -2907,18 +2899,6 @@ private static void runModRecipes() { .duration(2 * SECONDS + 10 * TICKS) .eut(16) .addTo(assemblerRecipes); - - RecipeUtils.addShapedRecipe( - o_Compressor, - o_Lathe, - o_Electromagnet, - plate, - ItemUtils.getSimpleStack(ModBlocks.blockProjectTable), - plate, - o_Fermenter, - o_Distillery, - o_Extractor, - GregtechItemList.Industrial_MultiMachine.get(1)); } // Drilling Platform Casings diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchSolidifier.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchSolidifier.java index ce3337c34bf..c714f8a5acb 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchSolidifier.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchSolidifier.java @@ -39,10 +39,8 @@ public MTEHatchSolidifier(int aID, String aName, String aNameRegional, int aTier @Override public String[] getDescription() { return new String[] { - "Fluid Input with Mold for " + EnumChatFormatting.YELLOW - + "Large Processing Factory" - + EnumChatFormatting.RESET, - "#22 Circuit is imprinted in Hatch", "Capacity: " + GTUtility.formatNumbers(getCapacity()) + "L", + "Fluid Input with Mold for " + EnumChatFormatting.YELLOW + "Fluid Shaper" + EnumChatFormatting.RESET, + "Capacity: " + GTUtility.formatNumbers(getCapacity()) + "L", "Added by: " + EnumChatFormatting.AQUA + "Quetz4l" + " - " diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialMultiMachine.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialMultiMachine.java index 472b1f66fdf..974d72657dd 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialMultiMachine.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialMultiMachine.java @@ -127,6 +127,8 @@ protected MultiblockTooltipBuilder createTooltip() { MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType(getMachineType()) .addInfo("Controller Block for the Industrial Multi-Machine") + .addInfo(EnumChatFormatting.RED + "DEPRECATED! This machine will be removed in the next major update.") + .addInfo(EnumChatFormatting.RED + "A variety of multiblocks have been added to replace these machines!") .addInfo("250% faster than using single block machines of the same voltage") .addInfo("Only uses 80% of the EU/t normally required") .addInfo("Processes two items per voltage tier") From e2f1b58b737fa4d8b8bf813b5e4ca66a1f2ed456 Mon Sep 17 00:00:00 2001 From: KTech3020 <98096970+KTech3020@users.noreply.github.com> Date: Sat, 7 Sep 2024 02:50:00 +0700 Subject: [PATCH 05/10] Reducing Hypogen consumption in Naqfuel MK4 recipes (#3049) Co-authored-by: Martin Robertz --- src/main/java/goodgenerator/loader/FuelRecipeLoader.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/goodgenerator/loader/FuelRecipeLoader.java b/src/main/java/goodgenerator/loader/FuelRecipeLoader.java index 120c509d083..0f3ec09d515 100644 --- a/src/main/java/goodgenerator/loader/FuelRecipeLoader.java +++ b/src/main/java/goodgenerator/loader/FuelRecipeLoader.java @@ -111,7 +111,7 @@ public static void RegisterFuel() { GGMaterial.orundum.get(OrePrefixes.dust, 64)) .fluidInputs( GGMaterial.naquadahBasedFuelMkIII.getFluidOrGas(2000), - new FluidStack(FluidRegistry.getFluid("molten.hypogen"), 720)) + new FluidStack(FluidRegistry.getFluid("molten.hypogen"), 240)) .fluidOutputs(GGMaterial.naquadahBasedFuelMkIV.getFluidOrGas(500)) .duration(8 * SECONDS) .eut(75_000_000) @@ -129,7 +129,7 @@ public static void RegisterFuel() { .fluidInputs( GGMaterial.heavyNaquadahFuel.getFluidOrGas(4000), GGMaterial.lightNaquadahFuel.getFluidOrGas(5000), - new FluidStack(FluidRegistry.getFluid("molten.hypogen"), 360), + new FluidStack(FluidRegistry.getFluid("molten.hypogen"), 120), new FluidStack(FluidRegistry.getFluid("molten.chromaticglass"), 6480)) .fluidOutputs(GGMaterial.naquadahBasedFuelMkIV.getFluidOrGas(250)) .duration(10 * TICKS) From 02d4a8ba61386ce49e34a96948f7553a5ac3e6e3 Mon Sep 17 00:00:00 2001 From: Martin Robertz Date: Fri, 6 Sep 2024 23:20:42 +0200 Subject: [PATCH 06/10] update --- dependencies.gradle | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index ea622fd8cdb..f15c2959a06 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -40,16 +40,16 @@ dependencies { api("com.github.GTNewHorizons:NotEnoughIds:2.1.0:dev") api("com.github.GTNewHorizons:GTNHLib:0.5.5:dev") api("com.github.GTNewHorizons:ModularUI:1.2.2:dev") - api("com.github.GTNewHorizons:ModularUI2:2.1.4-1.7.10:dev") + api("com.github.GTNewHorizons:ModularUI2:2.1.5-1.7.10:dev") api("com.github.GTNewHorizons:waila:1.8.1:dev") - api("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-451-GTNH:dev") + api("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-452-GTNH:dev") api("com.github.GTNewHorizons:AE2FluidCraft-Rework:1.3.35-gtnh:dev") api('com.github.GTNewHorizons:Yamcl:0.6.0:dev') api("com.github.GTNewHorizons:Postea:1.0.9:dev") compileOnlyApi('com.github.GTNewHorizons:ThaumicTinkerer:2.10.1:dev') compileOnlyApi("com.github.GTNewHorizons:Mobs-Info:0.4.6-GTNH:dev") - compileOnlyApi("com.github.GTNewHorizons:Navigator:1.0.10:dev") + compileOnlyApi("com.github.GTNewHorizons:Navigator:1.0.11:dev") implementation('com.github.GTNewHorizons:Baubles:1.0.4:dev') {transitive=false} // Required to prevent an older bauble api from Extra Utilities from loading first in the javac classpath compileOnly('com.github.GTNewHorizons:Baubles:1.0.4:dev') {transitive=false} @@ -67,17 +67,17 @@ dependencies { implementation("com.github.GTNewHorizons:ForestryMC:4.9.10:dev") { transitive = false } compileOnlyApi('com.github.GTNewHorizons:Angelica:1.0.0-beta5:api') { transitive = false } - compileOnlyApi("com.github.GTNewHorizons:AppleCore:3.3.0:dev") { transitive = false } + compileOnlyApi("com.github.GTNewHorizons:AppleCore:3.3.1:dev") { transitive = false } compileOnlyApi("com.github.GTNewHorizons:BuildCraft:7.1.39:dev") { transitive = false } compileOnlyApi("com.github.GTNewHorizons:EnderIO:2.8.17:dev") { transitive = false } compileOnlyApi("com.github.GTNewHorizons:ProjectRed:4.10.2-GTNH:dev") { transitive = false } - compileOnlyApi("com.github.GTNewHorizons:Railcraft:9.15.12:dev") { transitive = false } + compileOnlyApi("com.github.GTNewHorizons:Railcraft:9.15.14:dev") { transitive = false } compileOnly("TGregworks:TGregworks:1.7.10-GTNH-1.0.27:deobf") {transitive = false} compileOnly("com.github.GTNewHorizons:ThaumicBases:1.7.5:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:EnderCore:0.4.6:dev") { transitive = false } compileOnly('com.github.GTNewHorizons:VisualProspecting:1.3.13:dev') { transitive = false } - compileOnly("com.github.GTNewHorizons:Galaxy-Space-GTNH:1.1.92-GTNH:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:Galaxy-Space-GTNH:1.1.93-GTNH:dev") { transitive = false } compileOnlyApi("com.github.GTNewHorizons:Galacticraft:3.2.4-GTNH:dev") { transitive = false } implementation("com.github.GTNewHorizons:TinkersConstruct:1.12.9-GTNH:dev") @@ -85,9 +85,9 @@ dependencies { compileOnly("com.github.GTNewHorizons:Chisel:2.15.2-GTNH:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:Translocators:1.2.1:dev") { transitive = false } compileOnly rfg.deobf("curse.maven:cofh-core-69162:2388751") - compileOnly("com.github.GTNewHorizons:Nuclear-Control:2.6.4:dev") { transitive = false } + 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 } - compileOnly("com.github.GTNewHorizons:Hodgepodge:2.5.57:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:Hodgepodge:2.5.60:dev") { transitive = false } compileOnly('com.github.GTNewHorizons:Botania:1.11.5-GTNH:dev') { transitive = false } compileOnly('com.github.GTNewHorizons:HoloInventory:2.4.12-GTNH:dev') { transitive = false } compileOnly rfg.deobf("curse.maven:extra-utilities-225561:2264384") @@ -95,15 +95,15 @@ dependencies { compileOnly("com.github.GTNewHorizons:OpenComputers:1.10.23-GTNH:dev") {transitive = false} // https://www.curseforge.com/minecraft/mc-mods/advancedsolarpanels compileOnlyApi rfg.deobf('curse.maven:advsolar-362768:2885953') - compileOnly('com.github.GTNewHorizons:ThaumicEnergistics:1.6.22-GTNH:dev') {transitive = false} - compileOnly("com.github.GTNewHorizons:BloodMagic:1.6.3:dev") { transitive = false } + compileOnly('com.github.GTNewHorizons:ThaumicEnergistics:1.6.23-GTNH:dev') {transitive = false} + compileOnly("com.github.GTNewHorizons:BloodMagic:1.6.5:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:CraftTweaker:3.4.0:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:BetterLoadingScreen:1.7.0-GTNH:dev") { transitive = false } compileOnly('com.github.GTNewHorizons:SC2:2.2.0:dev') {transitive=false} compileOnly('com.github.GTNewHorizons:Binnie:2.4.1:dev') {transitive = false} compileOnly('curse.maven:PlayerAPI-228969:2248928') {transitive=false} - compileOnly('com.github.GTNewHorizons:BlockRenderer6343:1.2.13:dev'){transitive=false} + compileOnly('com.github.GTNewHorizons:BlockRenderer6343:1.2.14:dev'){transitive=false} shadowImplementation('com.github.GTNewHorizons:AVRcore:1.0.1') From 32d06fa6abe4c219335c83d672a8d29bea3a561b Mon Sep 17 00:00:00 2001 From: Martin Robertz Date: Sat, 7 Sep 2024 00:05:03 +0200 Subject: [PATCH 07/10] update --- dependencies.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies.gradle b/dependencies.gradle index f15c2959a06..026eebe6cd7 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -49,7 +49,7 @@ dependencies { compileOnlyApi('com.github.GTNewHorizons:ThaumicTinkerer:2.10.1:dev') compileOnlyApi("com.github.GTNewHorizons:Mobs-Info:0.4.6-GTNH:dev") - compileOnlyApi("com.github.GTNewHorizons:Navigator:1.0.11:dev") + compileOnlyApi("com.github.GTNewHorizons:Navigator:1.0.12:dev") implementation('com.github.GTNewHorizons:Baubles:1.0.4:dev') {transitive=false} // Required to prevent an older bauble api from Extra Utilities from loading first in the javac classpath compileOnly('com.github.GTNewHorizons:Baubles:1.0.4:dev') {transitive=false} From 5a3064982ad9d1bed7b051af027414850d985770 Mon Sep 17 00:00:00 2001 From: Martin Robertz Date: Sat, 7 Sep 2024 00:39:40 +0200 Subject: [PATCH 08/10] backdate --- dependencies.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies.gradle b/dependencies.gradle index 026eebe6cd7..686bc508d10 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -40,7 +40,7 @@ dependencies { api("com.github.GTNewHorizons:NotEnoughIds:2.1.0:dev") api("com.github.GTNewHorizons:GTNHLib:0.5.5:dev") api("com.github.GTNewHorizons:ModularUI:1.2.2:dev") - api("com.github.GTNewHorizons:ModularUI2:2.1.5-1.7.10:dev") + api("com.github.GTNewHorizons:ModularUI2:2.1.4-1.7.10:dev") api("com.github.GTNewHorizons:waila:1.8.1:dev") api("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-452-GTNH:dev") api("com.github.GTNewHorizons:AE2FluidCraft-Rework:1.3.35-gtnh:dev") From 1395aa31df55ff4c4fa6f141ba9a120bfc7cee6d Mon Sep 17 00:00:00 2001 From: Martin Robertz Date: Sat, 7 Sep 2024 01:04:44 +0200 Subject: [PATCH 09/10] fix for use new mui2 version (#3091) Co-authored-by: boubou19 --- .../gtPlusPlus/core/block/machine/BlockDecayablesChest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/gtPlusPlus/core/block/machine/BlockDecayablesChest.java b/src/main/java/gtPlusPlus/core/block/machine/BlockDecayablesChest.java index 2bcd9afb5f0..cacfae76947 100644 --- a/src/main/java/gtPlusPlus/core/block/machine/BlockDecayablesChest.java +++ b/src/main/java/gtPlusPlus/core/block/machine/BlockDecayablesChest.java @@ -140,7 +140,7 @@ public boolean onBlockActivated(final World world, final int x, final int y, fin final TileEntity te = world.getTileEntity(x, y, z); if (te instanceof TileEntityDecayablesChest) { - TileEntityGuiFactory.open(player, x, y, z); + TileEntityGuiFactory.INSTANCE.open(player, x, y, z); return true; } return false; From 8e89aa4a70c42c3b104115a598bb3ce45528578c Mon Sep 17 00:00:00 2001 From: boubou19 Date: Sat, 7 Sep 2024 01:05:08 +0200 Subject: [PATCH 10/10] add label requirement (#3090) Co-authored-by: Martin Robertz --- .github/workflows/labels.yml | 41 ++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 .github/workflows/labels.yml diff --git a/.github/workflows/labels.yml b/.github/workflows/labels.yml new file mode 100644 index 00000000000..7f64d816241 --- /dev/null +++ b/.github/workflows/labels.yml @@ -0,0 +1,41 @@ +# Credit to TechLord22 for writting this for the GTCEu repo + +# Manages labels on PRs before allowing merging +name: Pull Request Labels + +on: + pull_request: + types: + - opened + - labeled + - unlabeled + - synchronize + +# if a second commit is pushed quickly after the first, cancel the first one's build +concurrency: + group: pr-labels-${{ github.head_ref }} + cancel-in-progress: true + +jobs: + Labels: + runs-on: ubuntu-latest + + permissions: + pull-requests: read # needed to utilize required-labels + + steps: + - name: Check for Merge-Blocking Labels # blocks merge if present + uses: mheap/github-action-required-labels@v5 + with: + mode: exactly + count: 0 + labels: 'ongoing freeze - do not merge' + exit_type: failure + + - name: Check for Required Labels # require at least one of these labels + uses: mheap/github-action-required-labels@v5 + with: + mode: minimum + count: 1 + labels: 'Affects Balance, bug fix, refactor, enhancement, MuTE, new feature, refactor' + exit_type: failure