1.16.5-0.2.6a

Zuxelus · May 27, 2022 · 114b2b1 · 114b2b1
1 parent 1fbae2d
commit 114b2b1
Show file tree

Hide file tree

Showing 17 changed files with 108 additions and 59 deletions.
diff --git a/build.gradle b/build.gradle
@@ -11,7 +11,7 @@ apply plugin: 'net.minecraftforge.gradle'
 apply plugin: 'eclipse'
 apply plugin: 'maven-publish'
 
-version = '1.16.5-0.2.6'
+version = '1.16.5-0.2.6a'
 group = 'com.zuxelus.energycontrol'
 archivesBaseName = 'EnergyControl-forge'
 
@@ -73,25 +73,25 @@ repositories {
 }
 
 dependencies {
-    minecraft 'net.minecraftforge:forge:1.16.5-36.2.20'
+    minecraft 'net.minecraftforge:forge:1.16.5-36.2.35'
     compileOnly fg.deobf ("curse.maven:mekanism-268560:3659389")
     compileOnly fg.deobf ("curse.maven:mekanismgenerators-268566:3659391")
-    compileOnly fg.deobf ("curse.maven:ae2-223794:3455386")
+    compileOnly fg.deobf ("curse.maven:ae2-223794:3608871")
 
-    compileOnly fg.deobf ("curse.maven:botania-225643:3386883")
-    compileOnly fg.deobf ("curse.maven:curios-309927:3456953")
+    compileOnly fg.deobf ("curse.maven:botania-225643:3608755")
+    compileOnly fg.deobf ("curse.maven:curios-309927:3725386")
     compileOnly fg.deobf ("curse.maven:patchouli-306770:3459118")
 
-    compileOnly fg.deobf ("curse.maven:cctweaked-282001:3670779")
-    compileOnly fg.deobf ("curse.maven:jei-238222:3438494")
-    compileOnly fg.deobf ("curse.maven:extremereactors-250277:3426518")
-    compileOnly fg.deobf ("curse.maven:zerocore-247921:3426514")
+    compileOnly fg.deobf ("curse.maven:cctweaked-282001:3770722")
+    compileOnly fg.deobf ("curse.maven:jei-238222:3681294")
+    compileOnly fg.deobf ("curse.maven:extremereactors-250277:3768556")
+    compileOnly fg.deobf ("curse.maven:zerocore-247921:3768307")
     compileOnly fg.deobf ("curse.maven:biggerreactors-407780:3407098")
     compileOnly fg.deobf ("curse.maven:phosphophyllite-412551:3397407")
-    compileOnly fg.deobf ("curse.maven:thermal_expansion-69163:3607549");
-    compileOnly fg.deobf ("curse.maven:thermal_foundation-222880:3621736");
-    compileOnly fg.deobf ("curse.maven:cofh_core-69162:3407019");
-    compileOnly fg.deobf ("curse.maven:ImmersiveEngineering-231951:3431122");
+    compileOnly fg.deobf ("curse.maven:thermal_expansion-69163:3788892");
+    compileOnly fg.deobf ("curse.maven:thermal_foundation-222880:3788893");
+    compileOnly fg.deobf ("curse.maven:cofh_core-69162:3788884");
+    compileOnly fg.deobf ("curse.maven:ImmersiveEngineering-231951:3578181");
 }
 
 jar {
@@ -118,7 +118,7 @@ publishing {
     }
     repositories {
         maven {
-            url "file://${project.projectDir}/mcmodsrepo"
+            url "file:///${project.projectDir}/mcmodsrepo"
         }
     }
 }
diff --git a/src/main/java/com/zuxelus/energycontrol/ClientProxy.java b/src/main/java/com/zuxelus/energycontrol/ClientProxy.java
@@ -24,9 +24,10 @@ public class ClientProxy {
 	@SuppressWarnings("resource")
 	@SubscribeEvent
 	public static void onFMLClientSetupEvent(final FMLClientSetupEvent event) {
-		SoundHelper.initSound(Minecraft.getInstance().gameDirectory);
-		((IReloadableResourceManager) Minecraft.getInstance().getResourceManager()).registerReloadListener(new SoundHelper.SoundLoader());
-		SoundHelper.importSound();
+		SoundHelper.initSound(Minecraft.getInstance().getResourcePackDirectory());
+		IReloadableResourceManager manager = (IReloadableResourceManager) Minecraft.getInstance().getResourceManager();
+		manager.registerReloadListener(new SoundHelper.SoundLoader());
+		SoundHelper.importSound(manager);
 
 		ClientRegistry.bindTileEntityRenderer(ModTileEntityTypes.thermal_monitor.get(), TEThermalMonitorRenderer::new);
 		ClientRegistry.bindTileEntityRenderer(ModTileEntityTypes.remote_thermo.get(), TERemoteThermoRenderer::new);

diff --git a/src/main/java/com/zuxelus/energycontrol/containers/ContainerKitAssembler.java b/src/main/java/com/zuxelus/energycontrol/containers/ContainerKitAssembler.java
@@ -68,7 +68,9 @@ public void broadcastChanges() {
 				tag.putInt("time", te.getRecipeTime());
 				NetworkHelper.updateClientTileEntity(listener, te.getBlockPos(), tag);
 			}
-		lastEnergy = energy;
-		lastProduction = production;
+		if (listeners.size() > 0) {
+			lastEnergy = energy;
+			lastProduction = production;
+		}
 	}
 }
diff --git a/src/main/java/com/zuxelus/energycontrol/crossmod/CrossMekanism.java b/src/main/java/com/zuxelus/energycontrol/crossmod/CrossMekanism.java
@@ -30,9 +30,9 @@
 import mekanism.common.util.MekanismUtils;
 import mekanism.common.util.UnitDisplayUtils.EnergyType;
 import mekanism.common.util.UnitDisplayUtils.TemperatureUnit;
-import net.minecraft.client.resources.I18n;
 import net.minecraft.nbt.CompoundNBT;
 import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.text.LanguageMap;
 import net.minecraftforge.energy.IEnergyStorage;
 import net.minecraftforge.fluids.IFluidTank;
 
@@ -392,14 +392,14 @@ public static void addTank(String name, CompoundNBT tag, IChemicalTank<?,?> tank
 		if (tank.isEmpty())
 			tag.putString(name, "N/A");
 		else
-			tag.putString(name, String.format("%s: %s mB", I18n.get(tank.getType().getTranslationKey()), tank.getStored()));
+			tag.putString(name, String.format("%s: %s mB", LanguageMap.getInstance().getOrDefault(tank.getType().getTranslationKey()), tank.getStored()));
 	}
 
 	public static void addTank(String name, CompoundNBT tag, IExtendedFluidTank tank) {
 		if (tank.isEmpty())
 			tag.putString(name, "N/A");
 		else
-			tag.putString(name, String.format("%s: %s mB", I18n.get(tank.getFluid().getTranslationKey()), tank.getFluidAmount()));
+			tag.putString(name, String.format("%s: %s mB", LanguageMap.getInstance().getOrDefault(tank.getFluid().getTranslationKey()), tank.getFluidAmount()));
 	}
 
 	public static void addTank(String name, CompoundNBT tag, MergedChemicalTank tank) { // MergedChemicalTank doesn't exist in 1.15

diff --git a/src/main/java/com/zuxelus/energycontrol/tileentities/ScreenManager.java b/src/main/java/com/zuxelus/energycontrol/tileentities/ScreenManager.java
@@ -37,9 +37,9 @@ private String getWorldKey(IWorld world) {
 
 	private void checkWorldLists(String key) {
 		if (!screens.containsKey(key))
-			screens.put(key, new ArrayList<Screen>());
+			screens.put(key, new ArrayList<>());
 		if (!unusedPanels.containsKey(key))
-			unusedPanels.put(key, new ArrayList<TileEntityInfoPanel>());
+			unusedPanels.put(key, new ArrayList<>());
 	}
 
 	public void clearWorld(IWorld world) {

diff --git a/src/main/java/com/zuxelus/energycontrol/tileentities/TileEntityEnergyCounter.java b/src/main/java/com/zuxelus/energycontrol/tileentities/TileEntityEnergyCounter.java
@@ -5,6 +5,7 @@
 import com.zuxelus.energycontrol.init.ModItems;
 import com.zuxelus.energycontrol.init.ModTileEntityTypes;
 import com.zuxelus.zlib.containers.EnergyStorage;
+import com.zuxelus.zlib.tileentities.ITilePacketHandler;
 import com.zuxelus.zlib.tileentities.TileEntityInventory;
 
 import net.minecraft.block.BlockState;

diff --git a/src/main/java/com/zuxelus/energycontrol/tileentities/TileEntityFluidControlValve.java b/src/main/java/com/zuxelus/energycontrol/tileentities/TileEntityFluidControlValve.java
@@ -6,6 +6,7 @@
 import com.zuxelus.energycontrol.crossmod.CrossModLoader;
 import com.zuxelus.energycontrol.init.ModItems;
 import com.zuxelus.energycontrol.init.ModTileEntityTypes;
+import com.zuxelus.zlib.tileentities.ITilePacketHandler;
 import com.zuxelus.zlib.tileentities.TileEntityFacing;
 
 import net.minecraft.block.BlockState;

diff --git a/src/main/java/com/zuxelus/energycontrol/tileentities/TileEntityHowlerAlarm.java b/src/main/java/com/zuxelus/energycontrol/tileentities/TileEntityHowlerAlarm.java
@@ -4,6 +4,7 @@
 import com.zuxelus.energycontrol.config.ConfigHandler;
 import com.zuxelus.energycontrol.init.ModTileEntityTypes;
 import com.zuxelus.energycontrol.utils.TileEntitySound;
+import com.zuxelus.zlib.tileentities.ITilePacketHandler;
 import com.zuxelus.zlib.tileentities.TileEntityFacing;
 
 import net.minecraft.block.BlockState;

diff --git a/src/main/java/com/zuxelus/energycontrol/tileentities/TileEntityInfoPanel.java b/src/main/java/com/zuxelus/energycontrol/tileentities/TileEntityInfoPanel.java
@@ -18,6 +18,7 @@
 import com.zuxelus.energycontrol.items.cards.ItemCardReader;
 import com.zuxelus.zlib.blocks.FacingBlockActive;
 import com.zuxelus.zlib.containers.slots.ISlotItemFilter;
+import com.zuxelus.zlib.tileentities.ITilePacketHandler;
 import com.zuxelus.zlib.tileentities.TileEntityInventory;
 
 import net.minecraft.block.BlockState;

diff --git a/src/main/java/com/zuxelus/energycontrol/tileentities/TileEntityKitAssembler.java b/src/main/java/com/zuxelus/energycontrol/tileentities/TileEntityKitAssembler.java
@@ -12,6 +12,7 @@
 import com.zuxelus.energycontrol.recipes.KitAssemblerRecipeType;
 import com.zuxelus.zlib.containers.EnergyStorage;
 import com.zuxelus.zlib.containers.slots.ISlotItemFilter;
+import com.zuxelus.zlib.tileentities.ITilePacketHandler;
 import com.zuxelus.zlib.tileentities.TileEntityItemHandler;
 
 import net.minecraft.block.Block;

diff --git a/src/main/java/com/zuxelus/energycontrol/tileentities/TileEntityRangeTrigger.java b/src/main/java/com/zuxelus/energycontrol/tileentities/TileEntityRangeTrigger.java
@@ -11,6 +11,7 @@
 import com.zuxelus.energycontrol.items.cards.ItemCardMain;
 import com.zuxelus.energycontrol.items.cards.ItemCardReader;
 import com.zuxelus.zlib.containers.slots.ISlotItemFilter;
+import com.zuxelus.zlib.tileentities.ITilePacketHandler;
 import com.zuxelus.zlib.tileentities.TileEntityInventory;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;

diff --git a/src/main/java/com/zuxelus/energycontrol/tileentities/TileEntityThermalMonitor.java b/src/main/java/com/zuxelus/energycontrol/tileentities/TileEntityThermalMonitor.java
@@ -5,6 +5,7 @@
 import com.zuxelus.energycontrol.config.ConfigHandler;
 import com.zuxelus.energycontrol.crossmod.CrossModLoader;
 import com.zuxelus.energycontrol.init.ModTileEntityTypes;
+import com.zuxelus.zlib.tileentities.ITilePacketHandler;
 import com.zuxelus.zlib.tileentities.TileEntityInventory;
 
 import net.minecraft.block.Block;

diff --git a/src/main/java/com/zuxelus/energycontrol/tileentities/TileEntityTimer.java b/src/main/java/com/zuxelus/energycontrol/tileentities/TileEntityTimer.java
@@ -4,6 +4,7 @@
 import com.zuxelus.energycontrol.containers.ContainerTimer;
 import com.zuxelus.energycontrol.init.ModItems;
 import com.zuxelus.energycontrol.init.ModTileEntityTypes;
+import com.zuxelus.zlib.tileentities.ITilePacketHandler;
 import com.zuxelus.zlib.tileentities.TileEntityFacing;
 
 import net.minecraft.block.Block;

diff --git a/src/main/java/com/zuxelus/energycontrol/utils/SoundExample.java b/src/main/java/com/zuxelus/energycontrol/utils/SoundExample.java
@@ -0,0 +1,27 @@
+package com.zuxelus.energycontrol.utils;
+
+public class SoundExample {
+	public static final String soundFile = 
+			"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";
+}