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/api | |
| 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/api')
4 files changed, 12 insertions, 18 deletions
diff --git a/src/main/java/gregtech/api/enums/GT_Values.java b/src/main/java/gregtech/api/enums/GT_Values.java index d922c2787c..a02699d8e1 100644 --- a/src/main/java/gregtech/api/enums/GT_Values.java +++ b/src/main/java/gregtech/api/enums/GT_Values.java @@ -127,8 +127,7 @@ public class GT_Values { "High Voltage", "Extreme Voltage", "Insane Voltage", "Ludicrous Voltage", "ZPM Voltage", "Ultimate Voltage", "Ultimate High Voltage", "Ultimate Extreme Voltage", "Ultimate Insane Voltage", - "Ultimate Mega Voltage", "Ultimate Extended Mega Voltage", "Overpowered Voltage", - "Maximum Voltage"}; + "Ultimate Mega Voltage", "Ultimate Extended Mega Voltage", "Maximum Voltage", "Error Voltage"}; public static final String[] TIER_COLORS = new String[]{ diff --git a/src/main/java/gregtech/api/enums/HeatingCoilLevel.java b/src/main/java/gregtech/api/enums/HeatingCoilLevel.java index 06ceedff53..085a798e9a 100644 --- a/src/main/java/gregtech/api/enums/HeatingCoilLevel.java +++ b/src/main/java/gregtech/api/enums/HeatingCoilLevel.java @@ -1,7 +1,5 @@ package gregtech.api.enums; -import net.minecraft.util.EnumChatFormatting; - public enum HeatingCoilLevel { None, // 0 ULV, //Not implemented 901 @@ -16,25 +14,15 @@ public enum HeatingCoilLevel { UHV, //TRINIUM 9001 UEV, //ELECTRUMFLUX 9901 UIV, //AWAKENEDDRACONIUM 10801 - //Not Implemented yet - UMV, - UXV, - OpV, - MAX, + UMV, //INFINITY 11701 + UXV, //HYPOGEN 12601 + MAX, //ETERNAL 13501 ; + private static final HeatingCoilLevel[] VALUES = values(); /** - * @return the Coils Tier Name - */ - public String getTierName() { - if (this.ordinal() < 1 || (this.ordinal()-1) >= GT_Values.VN.length) - return "ERROR!"; - return GT_Values.TIER_COLORS[this.ordinal() - 1] + GT_Values.VOLTAGE_NAMES[this.ordinal() - 1] + EnumChatFormatting.RESET; - } - - /** * @return the coil heat, used for recipes in the Electronic Blast Furnace for example */ public long getHeat() { diff --git a/src/main/java/gregtech/api/enums/ItemList.java b/src/main/java/gregtech/api/enums/ItemList.java index 54dd725f67..80388ad26c 100644 --- a/src/main/java/gregtech/api/enums/ItemList.java +++ b/src/main/java/gregtech/api/enums/ItemList.java @@ -1519,6 +1519,10 @@ public enum ItemList implements IItemContainer { Casing_Coil_NaquadahAlloy, Casing_Coil_ElectrumFlux, Casing_Coil_AwakenedDraconium, + Casing_Coil_CosmicNeutronium, + Casing_Coil_Infinity, + Casing_Coil_Hypogen, + Casing_Coil_Eternal, Casing_Tank_1, Casing_Tank_2, diff --git a/src/main/java/gregtech/api/enums/Textures.java b/src/main/java/gregtech/api/enums/Textures.java index 1d0234a8cf..e7fb1e9af8 100644 --- a/src/main/java/gregtech/api/enums/Textures.java +++ b/src/main/java/gregtech/api/enums/Textures.java @@ -327,6 +327,9 @@ public class Textures { MACHINE_COIL_AWAKENEDDRACONIUM, MACHINE_COIL_HSSS, MACHINE_COIL_TRINIUM, + MACHINE_COIL_INFINITY, + MACHINE_COIL_HYPOGEN, + MACHINE_COIL_ETERNAL, BOILER_SOLAR, BOILER_FRONT, BOILER_FRONT_GLOW, |