mirror of
https://github.com/GTNewHorizons/Binnie.git
synced 2026-11-22 05:02:34 +00:00
update +sa
This commit is contained in:
8 files changed
+19
-21
No files matched your search
+2
-2
@@ -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')
|
||||
|
||||
Vendored
BIN
Binary file not shown.
+1
-1
@@ -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
|
||||
|
||||
+1
-1
@@ -17,5 +17,5 @@ pluginManagement {
|
||||
}
|
||||
|
||||
plugins {
|
||||
id 'com.gtnewhorizons.gtnhsettingsconvention' version '2.0.19'
|
||||
id 'com.gtnewhorizons.gtnhsettingsconvention' version '2.0.20'
|
||||
}
|
||||
@@ -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
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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();
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
package binnie.core.config;
|
||||
|
||||
import com.gtnewhorizon.gtnhlib.config.Config;
|
||||
|
||||
import binnie.core.BinnieCore;
|
||||
|
||||
@Config(modid = BinnieCore.CORE_MODID)
|
||||
|
||||
Reference in new issue
Block a user