Improve glass pane rendering

dependencies.gradle

@@ -1,35 +1,35 @@
 // Add your dependencies here
 
 dependencies {
-    compileOnlyApi('com.github.GTNewHorizons:Angelica:2.1.15:api')
-    api("com.github.GTNewHorizons:Mantle:0.5.1:dev")
-    api("com.github.GTNewHorizons:ForgeMultipart:1.7.3:dev")
+    compileOnlyApi('com.github.GTNewHorizons:Angelica:2.1.29:api')
+    api("com.github.GTNewHorizons:Mantle:0.5.2:dev")
+    api("com.github.GTNewHorizons:ForgeMultipart:1.7.10:dev")
     // gtnhlib is compileOnlyApi by us, but needed at runtime by nei, so require the correct version
-    api("com.github.GTNewHorizons:GTNHLib:0.9.47:dev")
-    implementation("com.github.GTNewHorizons:NotEnoughItems:2.8.84-GTNH:dev")
+    api("com.github.GTNewHorizons:GTNHLib:0.11.4:dev")
+    implementation("com.github.GTNewHorizons:NotEnoughItems:2.8.100-GTNH:dev")
     compileOnlyApi("curse.maven:cofh-core-69162:2388751")
     compileOnly("com.github.GTNewHorizons:inventory-tweaks:1.7.1:api")
-    compileOnly("com.github.GTNewHorizons:waila:1.19.22:api")
+    compileOnly("com.github.GTNewHorizons:waila:1.19.29:api")
     compileOnly("com.github.GTNewHorizons:Battlegear2:1.4.3:api")
     compileOnly("curse.maven:minefactory-reloaded-66672:2366150")
     compileOnly("curse.maven:zelda-sword-skills-220540:2384889")
     compileOnly("curse.maven:dynamic-sword-skills-226360:2495462")
     compileOnly("curse.maven:notenoughkeys-224614:2276280")
     compileOnly("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev")
-    compileOnly("com.github.GTNewHorizons:Mobs-Info:0.5.10-GTNH:dev")
+    compileOnly("com.github.GTNewHorizons:Mobs-Info:0.5.15-GTNH:dev")
     compileOnlyApi("net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev")
-    compileOnlyApi("com.github.GTNewHorizons:Natura:2.8.17:dev")
-    compileOnly('com.github.GTNewHorizons:Baubles-Expanded:2.2.11-GTNH:dev')
-    compileOnly('com.github.GTNewHorizons:SpecialMobs:3.7.2')
+    compileOnlyApi("com.github.GTNewHorizons:Natura:2.8.19:dev")
+    compileOnly('com.github.GTNewHorizons:Baubles-Expanded:2.2.21-GTNH:dev')
+    compileOnly('com.github.GTNewHorizons:SpecialMobs:3.7.4')
     runtimeOnly('com.github.GTNewHorizons:TiC-Tooltips:1.4.1:dev'){transitive = false}
-    runtimeOnly("com.github.GTNewHorizons:ServerUtilities:2.2.20:dev")
+    runtimeOnly("com.github.GTNewHorizons:ServerUtilities:2.2.37:dev")
 
 
     // For testing scythe crop harvesting
     // devOnlyNonPublishable("net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev")
     // devOnlyNonPublishable("com.github.GTNewHorizons:harvestcraft:1.3.11-GTNH:dev")
     // devOnlyNonPublishable(deobfCurse("pams-harvest-the-nether-231262:2241397"))
-    // devOnlyNonPublishable("com.github.GTNewHorizons:Natura:2.8.17:dev")
-    // devOnlyNonPublishable("com.github.GTNewHorizons:EnderCore:0.5.12")
+    // devOnlyNonPublishable("com.github.GTNewHorizons:Natura:2.8.19:dev")
+    // devOnlyNonPublishable("com.github.GTNewHorizons:EnderCore:0.5.14")
 
 }

gradle/gradle-daemon-jvm.properties

@@ -1,12 +1,12 @@
 #This file is generated by updateDaemonJvm
-toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/1630f7ebef05444cb27a2709ea0249b3/redirect
-toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/cd495626d2ee49a75447e3fdc6afb287/redirect
-toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/1630f7ebef05444cb27a2709ea0249b3/redirect
-toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/cd495626d2ee49a75447e3fdc6afb287/redirect
-toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/d4fd992c9557644e637ebe98263e0ae7/redirect
-toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/faa12903720d410b387cc69ccafb1a74/redirect
-toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/1630f7ebef05444cb27a2709ea0249b3/redirect
-toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/cd495626d2ee49a75447e3fdc6afb287/redirect
-toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/a4c09dd2e2d7079373d30e524bbc2829/redirect
-toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/8e1d9ee5d0f13e442218f6884a306da1/redirect
+toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/cf726b4a1c84b50457225f9bba6d7650/redirect
+toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/fa1e318c287360478e3c83a9a3ef1007/redirect
+toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/cf726b4a1c84b50457225f9bba6d7650/redirect
+toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/fa1e318c287360478e3c83a9a3ef1007/redirect
+toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/c2dd35c9d0aaf0ba6ad0791320f99dfc/redirect
+toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/e5810bd7fd1f8a586644409d395a7e55/redirect
+toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/cf726b4a1c84b50457225f9bba6d7650/redirect
+toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/fa1e318c287360478e3c83a9a3ef1007/redirect
+toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/7b3c4877c0749019e6805bb61e421497/redirect
+toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/d76df094a9cbbabd3b08251f9e61444a/redirect
 toolchainVersion=25

settings.gradle

@@ -17,7 +17,7 @@ pluginManagement {
 }
 
 plugins {
-    id 'com.gtnewhorizons.gtnhsettingsconvention' version '2.0.24'
+    id 'com.gtnewhorizons.gtnhsettingsconvention' version '2.0.25'
 }
 
 

src/main/java/tconstruct/smeltery/SmelteryProxyClient.java

@@ -29,7 +29,6 @@
 import tconstruct.smeltery.model.CastingBlockRender;
 import tconstruct.smeltery.model.CastingTableSpecialRenderer;
 import tconstruct.smeltery.model.PaneConnectedRender;
-import tconstruct.smeltery.model.PaneRender;
 import tconstruct.smeltery.model.SmelteryRender;
 import tconstruct.smeltery.model.TankItemRenderer;
 import tconstruct.smeltery.model.TankRender;
@@ -49,7 +48,6 @@ void registerRenderer() {
         RenderingRegistry.registerBlockHandler(new TankRender());
         RenderingRegistry.registerBlockHandler(new CastingBlockRender());
         RenderingRegistry.registerBlockHandler(new DryingRackRender());
-        RenderingRegistry.registerBlockHandler(new PaneRender());
         RenderingRegistry.registerBlockHandler(new PaneConnectedRender());
         RenderingRegistry.registerBlockHandler(new RenderBlockFluid());
         RenderingRegistry.registerBlockHandler(new BlockRenderCastingChannel());

src/main/java/tconstruct/smeltery/TinkerSmeltery.java

@@ -48,7 +48,7 @@
 import tconstruct.smeltery.blocks.GlassBlockConnected;
 import tconstruct.smeltery.blocks.GlassBlockConnectedMeta;
 import tconstruct.smeltery.blocks.GlassPaneConnected;
-import tconstruct.smeltery.blocks.GlassPaneStained;
+import tconstruct.smeltery.blocks.GlassPaneConnectedMeta;
 import tconstruct.smeltery.blocks.GlueBlock;
 import tconstruct.smeltery.blocks.GlueFluid;
 import tconstruct.smeltery.blocks.LavaTankBlock;
@@ -511,7 +511,6 @@ public void preInit(FMLPreInitializationEvent event) {
 
         // Glass
         TinkerSmeltery.clearGlass = new GlassBlockConnected("clear", false).setBlockName("GlassBlock");
-        TinkerSmeltery.clearGlass.stepSound = Block.soundTypeGlass;
         TinkerSmeltery.glassPane = new GlassPaneConnected("clear", false);
         TinkerSmeltery.stainedGlassClear = new GlassBlockConnectedMeta(
                 "stained",
@@ -532,8 +531,25 @@ public void preInit(FMLPreInitializationEvent event) {
                 "green",
                 "red",
                 "black").setBlockName("GlassBlock.StainedClear");
-        TinkerSmeltery.stainedGlassClear.stepSound = Block.soundTypeGlass;
-        TinkerSmeltery.stainedGlassClearPane = new GlassPaneStained();
+        TinkerSmeltery.stainedGlassClearPane = new GlassPaneConnectedMeta(
+                "stained",
+                true,
+                "white",
+                "orange",
+                "magenta",
+                "light_blue",
+                "yellow",
+                "lime",
+                "pink",
+                "gray",
+                "light_gray",
+                "cyan",
+                "purple",
+                "blue",
+                "brown",
+                "green",
+                "red",
+                "black");
 
         GameRegistry.registerBlock(TinkerSmeltery.searedSlab, SearedSlabItem.class, "SearedSlab");
         GameRegistry.registerBlock(TinkerSmeltery.speedSlab, SpeedSlabItem.class, "SpeedSlab");