From 1934796eb5ad5627c2189a05fd7504e4512644dd Mon Sep 17 00:00:00 2001 From: Draknyte1 Date: Mon, 7 Aug 2017 20:04:02 +1000 Subject: + Added Cyber_A and Cyber_B textures. % Cleaned up GT4Entity_ThermalBoiler.java. $ GregtechMetaTileEntity_Cyclotron.java now conforms to a proper tile entity. $ Fixed Cyclotron load declaration. --- .../xmod/gregtech/common/blocks/textures/CasingTextureHandler2.java | 2 +- .../xmod/gregtech/common/blocks/textures/TexturesGtBlock.java | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures') diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler2.java b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler2.java index 97b81b65d9..3d8b98fd7f 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler2.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler2.java @@ -38,7 +38,7 @@ public class CasingTextureHandler2 { return TexturesGtBlock._PlaceHolder.getIcon(); //Cyclotron Coil case 9: - return TexturesGtBlock.Casing_Machine_Metal_Panel_B.getIcon(); + return TexturesGtBlock.Overlay_Machine_Cyber_A.getIcon(); //Cyclotron External Casing case 10: return TexturesGtBlock.Casing_Material_HastelloyX.getIcon(); diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java index 2e0687a6a2..d4c4ffcc80 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java @@ -2,7 +2,6 @@ package gtPlusPlus.xmod.gregtech.common.blocks.textures; import gregtech.api.GregTech_API; import gregtech.api.interfaces.IIconContainer; -import gregtech.api.interfaces.ITexture; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.Utils; import net.minecraft.client.renderer.texture.TextureMap; @@ -149,6 +148,10 @@ public class TexturesGtBlock { public static final CustomIcon Casing_Machine_Metal_Sheet_A = Internal_Casing_Machine_Metal_Sheet_A; private static final CustomIcon Internal_Casing_Machine_Metal_Sheet_B = new CustomIcon("chrono/MetalSheet2"); public static final CustomIcon Casing_Machine_Metal_Sheet_B = Internal_Casing_Machine_Metal_Sheet_B; + private static final CustomIcon Internal_Overlay_Machine_Cyber_A = new CustomIcon("chrono/CyberPanel"); + public static final CustomIcon Overlay_Machine_Cyber_A = Internal_Overlay_Machine_Cyber_A; + private static final CustomIcon Internal_Overlay_Machine_Cyber_B = new CustomIcon("chrono/CyberPanel2"); + public static final CustomIcon Overlay_Machine_Cyber_B = Internal_Overlay_Machine_Cyber_B; //Overlays //Fan Textures -- cgit