diff options
| author | Alkalus <3060479+draknyte1@users.noreply.github.com> | 2022-02-23 17:10:51 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-23 18:10:51 +0100 |
| commit | 2f79ba3a1dd0b96b7481bf7d2e149ba5f35318ad (patch) | |
| tree | 3cdac080977f06daebfaee638b208f20cc407e4b /src/main/java/gregtech/common/blocks | |
| parent | 8d8100a2c370f0b41f3e1bc80182fb7a3988a974 (diff) | |
| download | GT5-Unofficial-2f79ba3a1dd0b96b7481bf7d2e149ba5f35318ad.tar.gz GT5-Unofficial-2f79ba3a1dd0b96b7481bf7d2e149ba5f35318ad.tar.bz2 GT5-Unofficial-2f79ba3a1dd0b96b7481bf7d2e149ba5f35318ad.zip | |
Base work adding 3 new tiers of coils. (#885)
* Base work adding 4 new tiers of coils.
* Remove OPV tier.
Remove nonsensical coil tier tags. (Awak = UIV, really? No thanks)
Add proper texture for Hypogen, Infinity and Eternal coils.
* Revert avaratia dep via import by Alk. If someone can implement cosmic rendering here then great but that is well beyond me.
Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com>
Diffstat (limited to 'src/main/java/gregtech/common/blocks')
| -rw-r--r-- | src/main/java/gregtech/common/blocks/GT_Block_Casings5.java | 27 | ||||
| -rw-r--r-- | src/main/java/gregtech/common/blocks/GT_Item_Casings5.java | 4 |
2 files changed, 28 insertions, 3 deletions
diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Casings5.java b/src/main/java/gregtech/common/blocks/GT_Block_Casings5.java index 63645f3c3f..bfa4e40212 100644 --- a/src/main/java/gregtech/common/blocks/GT_Block_Casings5.java +++ b/src/main/java/gregtech/common/blocks/GT_Block_Casings5.java @@ -33,7 +33,11 @@ public class GT_Block_Casings5 extends GT_Block_Casings_Abstract implements IHea GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".8.name", "Awakened Draconium Coil Block"); GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".9.name", "HSS-S Coil Block"); GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".10.name", "Trinium Coil Block"); + GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".11.name", "Infinity Coil Block"); + GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".12.name", "Hypogen Coil Block"); + GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".13.name", "Eternal Coil Block"); + ItemList.Casing_Coil_Cupronickel.set(new ItemStack(this, 1, 0)); ItemList.Casing_Coil_Kanthal.set(new ItemStack(this, 1, 1)); ItemList.Casing_Coil_Nichrome.set(new ItemStack(this, 1, 2)); @@ -45,6 +49,9 @@ public class GT_Block_Casings5 extends GT_Block_Casings_Abstract implements IHea ItemList.Casing_Coil_AwakenedDraconium.set(new ItemStack(this, 1, 8)); ItemList.Casing_Coil_HSSS.set(new ItemStack(this, 1, 9)); ItemList.Casing_Coil_Trinium.set(new ItemStack(this, 1, 10)); + ItemList.Casing_Coil_Infinity.set(new ItemStack(this, 1, 11)); + ItemList.Casing_Coil_Hypogen.set(new ItemStack(this, 1, 12)); + ItemList.Casing_Coil_Eternal.set(new ItemStack(this, 1, 13)); } @Override @@ -73,6 +80,12 @@ public class GT_Block_Casings5 extends GT_Block_Casings_Abstract implements IHea return Textures.BlockIcons.MACHINE_COIL_HSSS.getIcon(); case 10: return Textures.BlockIcons.MACHINE_COIL_TRINIUM.getIcon(); + case 11: + return Textures.BlockIcons.MACHINE_COIL_INFINITY.getIcon(); + case 12: + return Textures.BlockIcons.MACHINE_COIL_HYPOGEN.getIcon(); + case 13: + return Textures.BlockIcons.MACHINE_COIL_ETERNAL.getIcon(); } return Textures.BlockIcons.MACHINE_COIL_CUPRONICKEL.getIcon(); } @@ -103,6 +116,12 @@ public class GT_Block_Casings5 extends GT_Block_Casings_Abstract implements IHea return LuV; case 10: return UHV; + case 11: + return UMV; + case 12: + return UXV; + case 13: + return MAX; default: return None; } @@ -132,10 +151,18 @@ public class GT_Block_Casings5 extends GT_Block_Casings_Abstract implements IHea return 9; case UHV: return 10; + case UMV: + return 11; + case UXV: + return 12; + case MAX: + return 13; default: return 0; } } + + @Override public HeatingCoilLevel getCoilHeat(int meta) { diff --git a/src/main/java/gregtech/common/blocks/GT_Item_Casings5.java b/src/main/java/gregtech/common/blocks/GT_Item_Casings5.java index f3e58d2acc..c93f8bb38c 100644 --- a/src/main/java/gregtech/common/blocks/GT_Item_Casings5.java +++ b/src/main/java/gregtech/common/blocks/GT_Item_Casings5.java @@ -17,7 +17,6 @@ public class GT_Item_Casings5 extends GT_Item_Casings_Abstract { protected static final String mCoilHeatTooltip = GT_LanguageManager.addStringLocalization("gt.coilheattooltip", "Base Heating Capacity = "); protected static final String mCoilUnitTooltip = GT_LanguageManager.addStringLocalization("gt.coilunittooltip", " Kelvin"); - protected static final String mCoilTierTooltip = GT_LanguageManager.addStringLocalization("gt.coiltiertooltip", "Coil Tier = "); @Override @SideOnly(Side.CLIENT) @@ -26,6 +25,5 @@ public class GT_Item_Casings5 extends GT_Item_Casings_Abstract { super.addInformation(aStack, aPlayer, aList, aF3_H); HeatingCoilLevel coilLevel = GT_Block_Casings5.getCoilHeatFromDamage(aStack.getItemDamage()); aList.add(mCoilHeatTooltip + coilLevel.getHeat() + mCoilUnitTooltip); - aList.add(mCoilTierTooltip + coilLevel.getTierName()); } -} +}
\ No newline at end of file |
