Merge branch 'master' into godforge-encore

dependencies.gradle

@@ -40,16 +40,16 @@ dependencies {
     api("com.github.GTNewHorizons:NotEnoughIds:2.1.6:dev")
     api("com.github.GTNewHorizons:GTNHLib:0.5.11:dev")
     api("com.github.GTNewHorizons:ModularUI:1.2.8:dev")
-    api("com.github.GTNewHorizons:ModularUI2:2.1.11-1.7.10:dev")
+    api("com.github.GTNewHorizons:ModularUI2:2.1.12-1.7.10:dev")
     api("com.github.GTNewHorizons:waila:1.8.1:dev")
-    api("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-463-GTNH:dev")
+    api("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-464-GTNH:dev")
     api("com.github.GTNewHorizons:AE2FluidCraft-Rework:1.3.36-gtnh:dev")
     api('com.github.GTNewHorizons:Yamcl:0.6.0:dev')
     api("com.github.GTNewHorizons:Postea:1.0.13: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.13:dev")
+    compileOnlyApi("com.github.GTNewHorizons:Navigator:1.0.15: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}
@@ -69,7 +69,7 @@ dependencies {
     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.24:dev') { transitive = false }
+    compileOnly('com.github.GTNewHorizons:VisualProspecting:1.3.27:dev') { transitive = false }
     compileOnly("com.github.GTNewHorizons:Galaxy-Space-GTNH:1.1.94-GTNH:dev") { transitive = false }
 
     compileOnlyApi("com.github.GTNewHorizons:Galacticraft:3.2.5-GTNH:dev") { transitive = false }
@@ -80,7 +80,7 @@ dependencies {
     compileOnly rfg.deobf("curse.maven:cofh-core-69162:2388751")
     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 }
-    implementation("com.github.GTNewHorizons:Hodgepodge:2.5.70:dev")
+    implementation("com.github.GTNewHorizons:Hodgepodge:2.5.71:dev")
     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,7 +95,7 @@ dependencies {
     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.2:dev') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:Binnie:2.4.3:dev') {transitive = false}
     compileOnly('curse.maven:PlayerAPI-228969:2248928') {transitive=false}
     compileOnly('com.github.GTNewHorizons:BlockRenderer6343:1.2.14:dev'){transitive=false}
 
@@ -108,7 +108,7 @@ dependencies {
     // runtimeOnlyNonPublishable("com.github.GTNewHorizons:ForestryMC:4.9.16:dev")
     // runtimeOnlyNonPublishable('com.github.GTNewHorizons:neiaddons:1.16.0:dev')
     // runtimeOnlyNonPublishable('com.github.GTNewHorizons:MagicBees:2.8.5-GTNH:dev')
-    // runtimeOnlyNonPublishable('com.github.GTNewHorizons:Binnie:2.4.2:dev')
+    // runtimeOnlyNonPublishable('com.github.GTNewHorizons:Binnie:2.4.3:dev')
 
     testImplementation(platform('org.junit:junit-bom:5.9.2'))
     testImplementation('org.junit.jupiter:junit-jupiter')

src/main/java/bartworks/API/GlassTier.java

@@ -33,6 +33,7 @@ public static void addCustomGlass(String modname, String unlocalisedBlockName, i
     }
 
     public static void addCustomGlass(@NotNull Block block, int meta, int tier) {
+        Objects.requireNonNull(block, "Glass block cannot be null");
         GlassTier.glasses.put(new BlockMetaPair(block, (byte) meta), tier);
     }
 

src/main/java/bartworks/MainMod.java

@@ -45,7 +45,6 @@
 import bartworks.common.loaders.RegisterGlassTiers;
 import bartworks.common.loaders.RegisterServerCommands;
 import bartworks.common.loaders.StaticRecipeChangeLoaders;
-import bartworks.common.net.BWNetwork;
 import bartworks.server.EventHandler.ServerEventHandler;
 import bartworks.system.material.CircuitGeneration.CircuitImprintLoader;
 import bartworks.system.material.CircuitGeneration.CircuitPartLoader;
@@ -106,8 +105,6 @@ public final class MainMod {
     @Mod.Instance(MainMod.MOD_ID)
     public static MainMod instance;
 
-    public static BWNetwork BW_Network_instance = new BWNetwork();
-
     public MainMod() {
 
     }

src/main/java/bartworks/common/commands/ClearCraftingCache.java

@@ -17,7 +17,7 @@
 import net.minecraft.command.ICommandSender;
 import net.minecraft.util.ChatComponentText;
 
-import bartworks.hooks.BWCoreStaticReplacementMethodes;
+import gregtech.mixin.hooks.BWCoreStaticReplacementMethodes;
 
 public class ClearCraftingCache extends CommandBase {