Merge branch 'master' into fix-for-3044

.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

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")
@@ -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}

src/main/java/gregtech/api/enums/SoundResource.java

@@ -65,11 +65,14 @@ public enum SoundResource {
     GT_MACHINES_WATER_PUMP_LOOP(234, GregTech.ID, "machines.WaterPumpLoop"),
     GT_MACHINES_STEAM_CENTRIFUGE_LOOP(235, GregTech.ID, "machines.SteamCentrifugeLoop"),
 
-    GT_MACHINES_PURIFICATIONPLANT_LOOP(233, GregTech.ID, "machines.PurificationPlantLoop"),
-    GT_MACHINES_PURIFICATION_PH_LOOP(234, GregTech.ID, "machines.PurificationPhLoop"),
-    GT_MACHINES_COAGULATION_LOOP(235, GregTech.ID, "machines.PurificationCoagulationLoop"),
-    GT_MACHINES_OZONATION_LOOP(236, GregTech.ID, "machines.PurificationOzonationLoop"),
-    GT_MACHINES_PURIFICATION_PLASMA_LOOP(237, "machines.PurificationPlasmaLoop"),
+    GT_MACHINES_PURIFICATIONPLANT_LOOP(236, GregTech.ID, "machines.PurificationPlantLoop"),
+    GT_MACHINES_PURIFICATION_PH_LOOP(237, GregTech.ID, "machines.PurificationPhLoop"),
+    GT_MACHINES_COAGULATION_LOOP(238, GregTech.ID, "machines.PurificationCoagulationLoop"),
+    GT_MACHINES_OZONATION_LOOP(239, GregTech.ID, "machines.PurificationOzonationLoop"),
+    GT_MACHINES_PURIFICATION_PLASMA_LOOP(240, "machines.PurificationPlasmaLoop"),
+
+    GT_MACHINES_MULTI_LATHE_LOOP(241, GregTech.ID, "machines.MultiLatheLoop"),
+    GT_MACHINES_MULTI_AUTOCLAVE_LOOP(242, GregTech.ID, "machines.MultiAutoclaveLoop"),
 
     GUI_BUTTON_DOWN(-1, GregTech.ID, "gui.buttonDown"),
     GUI_BUTTON_UP(-1, GregTech.ID, "gui.buttonUp"),

src/main/java/gregtech/common/tileentities/machines/multi/MTEMultiAutoclave.java

@@ -32,6 +32,7 @@
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.StatCollector;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
@@ -44,9 +45,12 @@
 import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment;
 import com.gtnewhorizon.structurelib.structure.StructureDefinition;
 
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.api.GregTechAPI;
 import gregtech.api.enums.HeatingCoilLevel;
 import gregtech.api.enums.Materials;
+import gregtech.api.enums.SoundResource;
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
@@ -289,6 +293,12 @@ public int survivalConstruct(ItemStack stackSize, int elementBudget, ISurvivalBu
         return build;
     }
 
+    @SideOnly(Side.CLIENT)
+    @Override
+    protected ResourceLocation getActivitySoundLoop() {
+        return SoundResource.GT_MACHINES_MULTI_AUTOCLAVE_LOOP.resourceLocation;
+    }
+
     @Override
     public boolean isCorrectMachinePart(ItemStack aStack) {
         return true;

src/main/java/gregtech/common/tileentities/machines/multi/MTEMultiLathe.java

@@ -25,6 +25,7 @@
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.StatCollector;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
@@ -37,7 +38,10 @@
 import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment;
 import com.gtnewhorizon.structurelib.structure.StructureDefinition;
 
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.api.GregTechAPI;
+import gregtech.api.enums.SoundResource;
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
@@ -265,6 +269,12 @@ public int survivalConstruct(ItemStack stackSize, int elementBudget, ISurvivalBu
         return build;
     }
 
+    @SideOnly(Side.CLIENT)
+    @Override
+    protected ResourceLocation getActivitySoundLoop() {
+        return SoundResource.GT_MACHINES_MULTI_LATHE_LOOP.resourceLocation;
+    }
+
     private int mCasingAmount;
 
     private void onCasingAdded() {

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;

src/main/resources/assets/gregtech/sounds.json

@@ -123,5 +123,23 @@
         "stream": false
       }
     ]
+  },
+  "machines.MultiLatheLoop": {
+    "category": "block",
+    "sounds": [
+      {
+        "name": "MultiLatheLoop",
+        "stream": false
+      }
+    ]
+  },
+  "machines.MultiAutoclaveLoop": {
+    "category": "block",
+    "sounds": [
+      {
+        "name": "MultiAutoclaveLoop",
+        "stream": false
+      }
+    ]
   }
 }