diff options
| -rw-r--r-- | build.gradle | 2 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/core/item/base/cell/BaseItemCell.java | 11 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/core/item/base/ingots/BaseItemIngotHot.java | 29 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/core/lib/CORE.java | 3 | ||||
| -rw-r--r-- | src/resources/mcmod.info | 2 |
5 files changed, 41 insertions, 6 deletions
diff --git a/build.gradle b/build.gradle index 737d3e0588..4e89b952be 100644 --- a/build.gradle +++ b/build.gradle @@ -40,7 +40,7 @@ sourceCompatibility = 1.7 targetCompatibility = 1.7 archivesBaseName = "GT-PlusPlus" -version = "1.5.6-Pre-release" +version = "1.5.9-release" minecraft.version = "1.7.10-10.13.4.1448-1.7.10" task sourceJar(type: Jar) { diff --git a/src/Java/gtPlusPlus/core/item/base/cell/BaseItemCell.java b/src/Java/gtPlusPlus/core/item/base/cell/BaseItemCell.java index 9bbef4db15..43e170810b 100644 --- a/src/Java/gtPlusPlus/core/item/base/cell/BaseItemCell.java +++ b/src/Java/gtPlusPlus/core/item/base/cell/BaseItemCell.java @@ -29,8 +29,15 @@ public class BaseItemCell extends BaseItemComponent{ @Override public void registerIcons(final IIconRegister i) { - this.base = i.registerIcon(CORE.MODID + ":" + "item"+this.Cell.getComponent()); - this.overlay = i.registerIcon(CORE.MODID + ":" + "item"+this.Cell.getComponent()+"_Overlay"); + + if (CORE.configSwitches.useGregtechTextures){ + this.base = i.registerIcon("gregtech" + ":" + "materialicons/METALLIC/" + "cell"); + this.overlay = i.registerIcon("gregtech" + ":" + "materialicons/METALLIC/" + "cell_OVERLAY"); + } + else { + this.base = i.registerIcon(CORE.MODID + ":" + "item"+this.Cell.getComponent()); + this.overlay = i.registerIcon(CORE.MODID + ":" + "item"+this.Cell.getComponent()+"_Overlay"); + } //this.overlay = cellMaterial.getFluid(1000).getFluid().get } diff --git a/src/Java/gtPlusPlus/core/item/base/ingots/BaseItemIngotHot.java b/src/Java/gtPlusPlus/core/item/base/ingots/BaseItemIngotHot.java index a06cfc2a30..dc2e86197d 100644 --- a/src/Java/gtPlusPlus/core/item/base/ingots/BaseItemIngotHot.java +++ b/src/Java/gtPlusPlus/core/item/base/ingots/BaseItemIngotHot.java @@ -1,13 +1,16 @@ package gtPlusPlus.core.item.base.ingots; import gregtech.api.enums.GT_Values; +import gtPlusPlus.core.item.base.BaseItemComponent; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.material.Material; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.item.ItemUtils; +import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; import net.minecraft.util.DamageSource; +import net.minecraft.util.IIcon; import net.minecraft.world.World; public class BaseItemIngotHot extends BaseItemIngot{ @@ -16,6 +19,9 @@ public class BaseItemIngotHot extends BaseItemIngot{ private int tickCounter = 0; private final int tickCounterMax = 200; private final int mTier; + + private IIcon base; + private IIcon overlay; public BaseItemIngotHot(final Material material) { super(material, ComponentTypes.HOTINGOT); @@ -54,5 +60,28 @@ public class BaseItemIngotHot extends BaseItemIngot{ super.onUpdate(iStack, world, entityHolding, p_77663_4_, p_77663_5_); } + + @Override + public void registerIcons(final IIconRegister i) { + + if (CORE.configSwitches.useGregtechTextures){ + this.base = i.registerIcon("gregtech" + ":" + "materialicons/METALLIC/" + "ingotHot"); + this.overlay = i.registerIcon("gregtech" + ":" + "materialicons/METALLIC/" + "ingotHot_OVERLAY"); + } + else { + this.base = i.registerIcon(CORE.MODID + ":" + "item"+BaseItemComponent.ComponentTypes.HOTINGOT.getComponent()); + //this.overlay = i.registerIcon(CORE.MODID + ":" + "item"+BaseItemComponent.ComponentTypes.HOTINGOT.getComponent()+"_Overlay"); + } + //this.overlay = cellMaterial.getFluid(1000).getFluid().get + } + + @Override + public IIcon getIconFromDamageForRenderPass(final int damage, final int pass) { + if(pass == 0 || !CORE.configSwitches.useGregtechTextures) { + return this.base; + } + return this.overlay; + } + } diff --git a/src/Java/gtPlusPlus/core/lib/CORE.java b/src/Java/gtPlusPlus/core/lib/CORE.java index 8538f9aa8a..847a06bf33 100644 --- a/src/Java/gtPlusPlus/core/lib/CORE.java +++ b/src/Java/gtPlusPlus/core/lib/CORE.java @@ -14,7 +14,6 @@ import gtPlusPlus.xmod.gregtech.api.objects.XSTR; import gtPlusPlus.xmod.gregtech.common.Meta_GT_Proxy; import gtPlusPlus.xmod.gregtech.common.tileentities.automation.GT_MetaTileEntity_TesseractGenerator; import gtPlusPlus.xmod.gregtech.common.tileentities.automation.GT_MetaTileEntity_TesseractTerminal; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; import net.minecraftforge.common.config.Configuration; @@ -33,7 +32,7 @@ public class CORE { public static final String name = "GT++"; public static final String MODID = "miscutils"; - public static final String VERSION = "1.5.6-Pre-release"; + public static final String VERSION = "1.5.9-release"; public static final String MASTER_VERSION = NetworkUtils.getContentFromURL("https://raw.githubusercontent.com/draknyte1/GTplusplus/master/Recommended.txt").toLowerCase(); public static final String USER_COUNTRY = GeoUtils.determineUsersCountry(); public static boolean isModUpToDate = Utils.isModUpToDate(); diff --git a/src/resources/mcmod.info b/src/resources/mcmod.info index faa09969f2..9bcc0f3dd2 100644 --- a/src/resources/mcmod.info +++ b/src/resources/mcmod.info @@ -5,7 +5,7 @@ "description": "Adds a few various Multiblocks, Machines, etc to Gregtech and a plethora of other mods (Nearly 30!)", "credits": "", "logoFile": "", - "version": "1.5.6-Pre-release", + "version": "1.5.9-release", "mcversion": "1.7.10", "url": "https://github.com/draknyte1/GTplusplus/wiki", "updateUrl": "https://github.com/draknyte1/GTplusplus/releases/latest", |