diff --git a/dependencies.gradle b/dependencies.gradle index 94bcffaa..34db903d 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -2,9 +2,9 @@ dependencies { api('com.github.GTNewHorizons:ForestryMC:4.11.4:dev') - implementation('com.github.GTNewHorizons:GTNHLib:0.9.13:dev') + implementation('com.github.GTNewHorizons:GTNHLib:0.9.20:dev') - devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.8.63-GTNH:dev') + devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.8.68-GTNH:dev') compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.55:api') compileOnly('net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev') diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index f8e1ee31..61285a65 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 23449a2b..37f78a6a 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/settings.gradle b/settings.gradle index 335f37c4..87b226a2 100644 --- a/settings.gradle +++ b/settings.gradle @@ -17,5 +17,5 @@ pluginManagement { } plugins { - id 'com.gtnewhorizons.gtnhsettingsconvention' version '2.0.19' + id 'com.gtnewhorizons.gtnhsettingsconvention' version '2.0.20' } diff --git a/src/main/java/binnie/botany/ceramic/BlockCeramicBrick.java b/src/main/java/binnie/botany/ceramic/BlockCeramicBrick.java index e8ada5cc..9bcca9e0 100644 --- a/src/main/java/binnie/botany/ceramic/BlockCeramicBrick.java +++ b/src/main/java/binnie/botany/ceramic/BlockCeramicBrick.java @@ -167,16 +167,16 @@ public class BlockCeramicBrick extends Block implements IBlockMetadata, IMultipa @Override @SideOnly(Side.CLIENT) public int getRenderColor(int meta) { - final BlockType type = this.getType(meta); - if (!MultipassBlockRenderer.isRendering()) { - return type.color1.getColor(false); - } + final BlockType type = this.getType(meta); + if (!MultipassBlockRenderer.isRendering()) { + return type.color1.getColor(false); + } - final int layer = MultipassBlockRenderer.getLayer(); - if (layer == 0) return 0xffffff; - if (layer == 1) return type.color1.getColor(false); - if (layer == 2) return type.color2.getColor(false); - return 0xffffff; + final int layer = MultipassBlockRenderer.getLayer(); + if (layer == 0) return 0xffffff; + if (layer == 1) return type.color1.getColor(false); + if (layer == 2) return type.color2.getColor(false); + return 0xffffff; } @Override diff --git a/src/main/java/binnie/core/BinnieCore.java b/src/main/java/binnie/core/BinnieCore.java index ba32b174..b4c615a1 100644 --- a/src/main/java/binnie/core/BinnieCore.java +++ b/src/main/java/binnie/core/BinnieCore.java @@ -9,13 +9,10 @@ import net.minecraft.server.MinecraftServer; import net.minecraftforge.client.event.TextureStitchEvent; import net.minecraftforge.common.MinecraftForge; -import com.gtnewhorizon.gtnhlib.config.ConfigException; -import com.gtnewhorizon.gtnhlib.config.ConfigurationManager; - import binnie.Binnie; import binnie.core.block.MultipassBlockRenderer; -import binnie.core.config.BCConfig; import binnie.core.block.TileEntityMetadata; +import binnie.core.config.BCConfig; import binnie.core.craftgui.minecraft.ModuleCraftGUI; import binnie.core.gui.BinnieCoreGUI; import binnie.core.gui.BinnieGUIHandler; diff --git a/src/main/java/binnie/core/block/MultipassBlockRenderer.java b/src/main/java/binnie/core/block/MultipassBlockRenderer.java index 76b5630e..bfe36dc3 100644 --- a/src/main/java/binnie/core/block/MultipassBlockRenderer.java +++ b/src/main/java/binnie/core/block/MultipassBlockRenderer.java @@ -40,19 +40,19 @@ public class MultipassBlockRenderer implements ISimpleBlockRenderingHandler { try { if (block instanceof IMultipassBlock) { try { - java.lang.reflect.Method m = block.getClass().getMethod("colorMultiplier", int.class); - Object out = m.invoke(block, Integer.valueOf(meta)); + java.lang.reflect.Method m = block.getClass().getMethod("colorMultiplier", int.class); + Object out = m.invoke(block, Integer.valueOf(meta)); if (out instanceof Integer) { return ((Integer) out).intValue(); } - } catch (Throwable ignored) { - } + } catch (Throwable ignored) {} } return block.getRenderColor(meta); } catch (Throwable t) { return 16777215; } } + @Override public void renderInventoryBlock(Block block, int meta, int modelID, RenderBlocks renderer) { block.setBlockBoundsForItemRender(); diff --git a/src/main/java/binnie/core/config/BCConfig.java b/src/main/java/binnie/core/config/BCConfig.java index c36e4675..18cafac5 100644 --- a/src/main/java/binnie/core/config/BCConfig.java +++ b/src/main/java/binnie/core/config/BCConfig.java @@ -1,6 +1,7 @@ package binnie.core.config; import com.gtnewhorizon.gtnhlib.config.Config; + import binnie.core.BinnieCore; @Config(modid = BinnieCore.CORE_MODID)