Skip to content

Commit ce40528

Browse files
committed
update +sa
1 parent 1c4e9a0 commit ce40528

8 files changed

Lines changed: 20 additions & 22 deletions

File tree

dependencies.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
dependencies {
44
api('com.github.GTNewHorizons:ForestryMC:4.11.4:dev')
5-
implementation('com.github.GTNewHorizons:GTNHLib:0.9.13:dev')
5+
implementation('com.github.GTNewHorizons:GTNHLib:0.9.20:dev')
66

7-
devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.8.63-GTNH:dev')
7+
devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.8.68-GTNH:dev')
88

99
compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.55:api')
1010
compileOnly('net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev')

gradle/wrapper/gradle-wrapper.jar

542 Bytes
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

settings.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,5 @@ pluginManagement {
1717
}
1818

1919
plugins {
20-
id 'com.gtnewhorizons.gtnhsettingsconvention' version '2.0.19'
20+
id 'com.gtnewhorizons.gtnhsettingsconvention' version '2.0.20'
2121
}

src/main/java/binnie/botany/ceramic/BlockCeramicBrick.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -167,16 +167,16 @@ public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, i
167167
@Override
168168
@SideOnly(Side.CLIENT)
169169
public int getRenderColor(int meta) {
170-
final BlockType type = this.getType(meta);
171-
if (!MultipassBlockRenderer.isRendering()) {
172-
return type.color1.getColor(false);
173-
}
174-
175-
final int layer = MultipassBlockRenderer.getLayer();
176-
if (layer == 0) return 0xffffff;
177-
if (layer == 1) return type.color1.getColor(false);
178-
if (layer == 2) return type.color2.getColor(false);
179-
return 0xffffff;
170+
final BlockType type = this.getType(meta);
171+
if (!MultipassBlockRenderer.isRendering()) {
172+
return type.color1.getColor(false);
173+
}
174+
175+
final int layer = MultipassBlockRenderer.getLayer();
176+
if (layer == 0) return 0xffffff;
177+
if (layer == 1) return type.color1.getColor(false);
178+
if (layer == 2) return type.color2.getColor(false);
179+
return 0xffffff;
180180
}
181181

182182
@Override

src/main/java/binnie/core/BinnieCore.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,10 @@
99
import net.minecraftforge.client.event.TextureStitchEvent;
1010
import net.minecraftforge.common.MinecraftForge;
1111

12-
import com.gtnewhorizon.gtnhlib.config.ConfigException;
13-
import com.gtnewhorizon.gtnhlib.config.ConfigurationManager;
14-
1512
import binnie.Binnie;
1613
import binnie.core.block.MultipassBlockRenderer;
17-
import binnie.core.config.BCConfig;
1814
import binnie.core.block.TileEntityMetadata;
15+
import binnie.core.config.BCConfig;
1916
import binnie.core.craftgui.minecraft.ModuleCraftGUI;
2017
import binnie.core.gui.BinnieCoreGUI;
2118
import binnie.core.gui.BinnieGUIHandler;

src/main/java/binnie/core/block/MultipassBlockRenderer.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,19 +40,19 @@ private static int getColorSafe(Block block, int meta) {
4040
try {
4141
if (block instanceof IMultipassBlock) {
4242
try {
43-
java.lang.reflect.Method m = block.getClass().getMethod("colorMultiplier", int.class);
44-
Object out = m.invoke(block, Integer.valueOf(meta));
43+
java.lang.reflect.Method m = block.getClass().getMethod("colorMultiplier", int.class);
44+
Object out = m.invoke(block, Integer.valueOf(meta));
4545
if (out instanceof Integer) {
4646
return ((Integer) out).intValue();
4747
}
48-
} catch (Throwable ignored) {
49-
}
48+
} catch (Throwable ignored) {}
5049
}
5150
return block.getRenderColor(meta);
5251
} catch (Throwable t) {
5352
return 16777215;
5453
}
5554
}
55+
5656
@Override
5757
public void renderInventoryBlock(Block block, int meta, int modelID, RenderBlocks renderer) {
5858
block.setBlockBoundsForItemRender();

src/main/java/binnie/core/config/BCConfig.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package binnie.core.config;
22

33
import com.gtnewhorizon.gtnhlib.config.Config;
4+
45
import binnie.core.BinnieCore;
56

67
@Config(modid = BinnieCore.CORE_MODID)

0 commit comments

Comments
 (0)