Merge branch 'master' into blackhole-finishing

GTNewHorizons · Sep 7, 2024 · 87be29d · 87be29d
2 parents d6d2e80 + 82604ea
commit 87be29d
Show file tree

Hide file tree

Showing 41 changed files with 319 additions and 1,212 deletions.
diff --git a/dependencies.gradle b/dependencies.gradle
@@ -99,6 +99,7 @@ dependencies {
  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 rfg.deobf("curse.maven:biomes-o-plenty-220318:2499612")
 
  compileOnly('com.github.GTNewHorizons:SC2:2.2.0:dev') {transitive=false}
  compileOnly('com.github.GTNewHorizons:Binnie:2.4.1:dev') {transitive = false}

diff --git a/src/main/java/bwcrossmod/galacticgreg/MTEVoidMinerBase.java b/src/main/java/bwcrossmod/galacticgreg/MTEVoidMinerBase.java
@@ -290,10 +290,10 @@ private void handleOutputs() {
  final List<ItemStack> inputOres = this.getStoredInputs()
  .stream()
  .filter(GTUtility::isOre)
- .collect(Collectors.toList());;
+ .collect(Collectors.toList());
  final ItemStack output = this.nextOre();
  output.stackSize = multiplier;
- if (inputOres.size() == 0 || this.mBlacklist && inputOres.stream()
+ if (inputOres.isEmpty() || this.mBlacklist && inputOres.stream()
  .noneMatch(is -> GTUtility.areStacksEqual(is, output))
  || !this.mBlacklist && inputOres.stream()
  .anyMatch(is -> GTUtility.areStacksEqual(is, output)))

diff --git a/src/main/java/goodgenerator/blocks/tileEntity/MTEYottaFluidTank.java b/src/main/java/goodgenerator/blocks/tileEntity/MTEYottaFluidTank.java
@@ -472,7 +472,7 @@ public boolean onRunningTick(ItemStack aStack) {
  if (tFluid == null) continue;
  if (isFluidLocked) {
  if (mLockedFluid != null) {
- if (!tFluid.isFluidEqual(mLockedFluid)) continue;;
+ if (!tFluid.isFluidEqual(mLockedFluid)) continue;
  } else {
  mLockedFluid = tFluid.copy();
  mLockedFluid.amount = 1;

diff --git a/src/main/java/gregtech/GTMod.java b/src/main/java/gregtech/GTMod.java
@@ -238,7 +238,7 @@ public class GTMod implements IGTMod {
  clientSide = "gregtech.common.GTClient",
  serverSide = "gregtech.common.GTServer")
  public static GTProxy gregtechproxy;
- public static final boolean DEBUG = Boolean.getBoolean("gt.debug");;
+ public static final boolean DEBUG = Boolean.getBoolean("gt.debug");
 
  public static int MAX_IC2 = 2147483647;
  public static GTAchievements achievements;

diff --git a/src/main/java/gregtech/api/enums/SoundResource.java b/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"),

diff --git a/src/main/java/gregtech/api/metatileentity/implementations/MTEWirelessEnergy.java b/src/main/java/gregtech/api/metatileentity/implementations/MTEWirelessEnergy.java
@@ -134,7 +134,7 @@ public void onFirstTick(IGregTechTileEntity aBaseMetaTileEntity) {
  // UUID of the owner.
  owner_uuid = aBaseMetaTileEntity.getOwnerUuid();
 
- SpaceProjectManager.checkOrCreateTeam(owner_uuid);;
+ SpaceProjectManager.checkOrCreateTeam(owner_uuid);
 
  tryFetchingEnergy();
  }

diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/MTEMultiAutoclave.java b/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;

diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/MTEMultiLathe.java b/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() {