diff --git a/src/main/java/com/hbm/handler/GUIHandler.java b/src/main/java/com/hbm/handler/GUIHandler.java index c33b85512..01ea6306c 100644 --- a/src/main/java/com/hbm/handler/GUIHandler.java +++ b/src/main/java/com/hbm/handler/GUIHandler.java @@ -267,13 +267,6 @@ public class GUIHandler implements IGuiHandler { return null; } - case ModBlocks.guiID_machine_teleporter: { - if(entity instanceof TileEntityMachineTeleporter) { - // return new ContainerMachineTeleporter(player.inventory, (TileEntityMachineTeleporter) entity); - } - return null; - } - case ModBlocks.guiID_nuke_custom: { if(entity instanceof TileEntityNukeCustom) { return new ContainerNukeCustom(player.inventory, (TileEntityNukeCustom) entity); @@ -1057,13 +1050,6 @@ public class GUIHandler implements IGuiHandler { return null; } - case ModBlocks.guiID_machine_teleporter: { - if(entity instanceof TileEntityMachineTeleporter) { - return new GUIMachineTeleporter(player.inventory, (TileEntityMachineTeleporter) entity); - } - return null; - } - case ModBlocks.guiID_nuke_custom: { if(entity instanceof TileEntityNukeCustom) { return new GUINukeCustom(player.inventory, (TileEntityNukeCustom) entity); diff --git a/src/main/java/com/hbm/inventory/gui/GUIMachineTeleporter.java b/src/main/java/com/hbm/inventory/gui/GUIMachineTeleporter.java deleted file mode 100644 index 5b640e122..000000000 --- a/src/main/java/com/hbm/inventory/gui/GUIMachineTeleporter.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.hbm.inventory.gui; - -import org.lwjgl.opengl.GL11; - -import com.hbm.inventory.container.ContainerMachineTeleporter; -import com.hbm.lib.RefStrings; -import com.hbm.tileentity.machine.TileEntityMachineTeleporter; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.client.resources.I18n; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.util.ResourceLocation; - -public class GUIMachineTeleporter extends GuiContainer { - - private static ResourceLocation texture = new ResourceLocation( - RefStrings.MODID + ":textures/gui/gui_teleporter.png"); - private TileEntityMachineTeleporter diFurnace; - - public GUIMachineTeleporter(InventoryPlayer invPlayer, TileEntityMachineTeleporter tedf) { - super(new ContainerMachineTeleporter(invPlayer, tedf)); - diFurnace = tedf; - - this.xSize = 176; - this.ySize = 86; - } - - @Override - protected void drawGuiContainerForegroundLayer(int i, int j) { - String name = I18n.format("container.teleporter"); - - this.fontRendererObj.drawString(name, this.xSize / 2 - this.fontRendererObj.getStringWidth(name) / 2, 6, - 4210752); - this.fontRendererObj.drawString("Power: " + diFurnace.power + "HE/" + TileEntityMachineTeleporter.maxPower + "HE", 10, 20, - 13882323); - this.fontRendererObj.drawString("Mode: " + (diFurnace.mode ? "Send" : "Receive"), 10, 29, 13882323); - if (diFurnace.mode) { - this.fontRendererObj.drawString("Destination X: " + diFurnace.targetX, 10, 38, 13882323); - this.fontRendererObj.drawString("Destination Y: " + diFurnace.targetY, 10, 47, 13882323); - this.fontRendererObj.drawString("Destination Z: " + diFurnace.targetZ, 10, 56, 13882323); - } - } - - @Override - protected void drawGuiContainerBackgroundLayer(float p_146976_1_, int p_146976_2_, int p_146976_3_) { - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - Minecraft.getMinecraft().getTextureManager().bindTexture(texture); - drawTexturedModalRect(guiLeft, guiTop, 0, 0, xSize, ySize); - } -} diff --git a/src/main/java/com/hbm/main/MainRegistry.java b/src/main/java/com/hbm/main/MainRegistry.java index 571de590c..9086be4d2 100644 --- a/src/main/java/com/hbm/main/MainRegistry.java +++ b/src/main/java/com/hbm/main/MainRegistry.java @@ -991,6 +991,7 @@ public class MainRegistry { ignoreMappings.add("hbm:tile.test_conductor"); ignoreMappings.add("hbm:tile.dummy_block_fluidtank"); ignoreMappings.add("hbm:tile.dummy_port_fluidtank"); + ignoreMappings.add("hbm:item.telepad"); /// REMAP /// remapItems.put("hbm:item.gadget_explosive8", ModItems.early_explosive_lenses); diff --git a/src/main/java/com/hbm/render/block/RenderBoxDuct.java b/src/main/java/com/hbm/render/block/RenderBoxDuct.java index 6707b938c..cee356687 100644 --- a/src/main/java/com/hbm/render/block/RenderBoxDuct.java +++ b/src/main/java/com/hbm/render/block/RenderBoxDuct.java @@ -7,6 +7,7 @@ import com.hbm.inventory.fluid.FluidType; import com.hbm.inventory.fluid.Fluids; import com.hbm.lib.Library; import com.hbm.tileentity.network.TileEntityPipeBaseNT; +import com.hbm.util.ColorUtil; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import net.minecraft.block.Block; @@ -69,7 +70,7 @@ public class RenderBoxDuct implements ISimpleBlockRenderingHandler { TileEntityPipeBaseNT pipe = (TileEntityPipeBaseNT) te; type = pipe.getType(); if(meta % 3 == 2) { - FluidDuctBox.cachedColor = type.getColor(); + FluidDuctBox.cachedColor = ColorUtil.lightenColor(type.getColor(), 0.25D); //making very dark things not vantablack } } diff --git a/src/main/java/com/hbm/tileentity/machine/rbmk/RBMKDials.java b/src/main/java/com/hbm/tileentity/machine/rbmk/RBMKDials.java index faf810eea..a93498b6f 100644 --- a/src/main/java/com/hbm/tileentity/machine/rbmk/RBMKDials.java +++ b/src/main/java/com/hbm/tileentity/machine/rbmk/RBMKDials.java @@ -73,7 +73,7 @@ public class RBMKDials { * @return [0;1] */ public static double getColumnHeatFlow(World world) { - return MathHelper.clamp_double(GameRuleHelper.parseDouble(world.getGameRules().getGameRuleStringValue(KEY_COLUMN_HEAT_FLOW), 5.0D), 0.0D, 1.0D); + return MathHelper.clamp_double(GameRuleHelper.parseDouble(world.getGameRules().getGameRuleStringValue(KEY_COLUMN_HEAT_FLOW), 0.2D), 0.0D, 1.0D); } /** diff --git a/src/main/java/com/hbm/util/ColorUtil.java b/src/main/java/com/hbm/util/ColorUtil.java index 1cfcfe039..aec239b53 100644 --- a/src/main/java/com/hbm/util/ColorUtil.java +++ b/src/main/java/com/hbm/util/ColorUtil.java @@ -156,4 +156,30 @@ public class ColorUtil { public static int amplifyColor(int hex) { return amplifyColor(hex, 255); } + + /** + * Amplifies a given color by approaching all components to maximum by a given percentage. A percentage of 1 (100%) should always yield white. + * @param hex + * @param percent + * @return + */ + public static int lightenColor(int hex, double percent) { + Color color = new Color(hex); + int r = color.getRed(); + int g = color.getGreen(); + int b = color.getBlue(); + + r = (int) (r + (255 - r) * percent); + g = (int) (g + (255 - g) * percent); + b = (int) (b + (255 - b) * percent); + + return new Color(r, g, b).getRGB(); + } + + /** Converts a color into HSB and then returns the brightness component [] */ + public static double getColorBrightness(int hex) { + Color color = new Color(hex); + float[] hsb = Color.RGBtoHSB(color.getRed(), color.getGreen(), color.getBlue(), new float[3]); + return hsb[2]; + } }