Fix grid crash and translucent cable config

This commit is contained in:
Raoul Van den Berge
2016-08-19 02:56:25 +02:00
parent 4c72f48dbb
commit 2e3f08a5e4
3 changed files with 12 additions and 1 deletions

View File

@@ -92,6 +92,8 @@ public final class RefinedStorage {
public int stackUpgradeUsage; public int stackUpgradeUsage;
public int interdimensionalUpgradeUsage; public int interdimensionalUpgradeUsage;
public boolean translucentCables;
@EventHandler @EventHandler
public void preInit(FMLPreInitializationEvent e) { public void preInit(FMLPreInitializationEvent e) {
PROXY.preInit(e); PROXY.preInit(e);
@@ -144,6 +146,8 @@ public final class RefinedStorage {
stackUpgradeUsage = config.getInt("stack", "upgrades", 12, 0, Integer.MAX_VALUE, "The additional energy used per Stack Upgrade"); stackUpgradeUsage = config.getInt("stack", "upgrades", 12, 0, Integer.MAX_VALUE, "The additional energy used per Stack Upgrade");
interdimensionalUpgradeUsage = config.getInt("interdimensional", "upgrades", 1000, 0, Integer.MAX_VALUE, "The additional energy used by the Interdimensional Upgrade"); interdimensionalUpgradeUsage = config.getInt("interdimensional", "upgrades", 1000, 0, Integer.MAX_VALUE, "The additional energy used by the Interdimensional Upgrade");
translucentCables = config.getBoolean("translucentCables", "misc", false, "For resource pack makers that want a translucent cable");
config.save(); config.save();
} }

View File

@@ -13,6 +13,7 @@ import net.minecraft.entity.EntityLivingBase;
import net.minecraft.inventory.InventoryHelper; import net.minecraft.inventory.InventoryHelper;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.BlockRenderLayer;
import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
@@ -336,4 +337,9 @@ public class BlockCable extends BlockCoverable {
return false; return false;
} }
@Override
public BlockRenderLayer getBlockLayer() {
return RefinedStorage.INSTANCE.translucentCables ? BlockRenderLayer.TRANSLUCENT : super.getBlockLayer();
}
} }

View File

@@ -2,6 +2,7 @@ package refinedstorage.gui.grid.stack;
import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBuf;
import joptsimple.internal.Strings; import joptsimple.internal.Strings;
import net.minecraft.client.Minecraft;
import net.minecraft.client.resources.I18n; import net.minecraft.client.resources.I18n;
import net.minecraft.item.Item; import net.minecraft.item.Item;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
@@ -49,7 +50,7 @@ public class ClientStackItem implements IClientStack {
@Override @Override
public String getTooltip() { public String getTooltip() {
return Strings.join(stack.getTooltip(null, true), "\n"); return Strings.join(stack.getTooltip(Minecraft.getMinecraft().thePlayer, true), "\n");
} }
@Override @Override