diff options
| author | Dream-Master <dream-master@gmx.net> | 2020-03-17 22:21:40 +0100 |
|---|---|---|
| committer | Dream-Master <dream-master@gmx.net> | 2020-03-17 22:21:40 +0100 |
| commit | 0f6b03f927b2c482100b2ba46964db72c96156a0 (patch) | |
| tree | 141bab113db4dbd76f6b3701d876f1c8e3f28b20 /src/main/java/gregtech/api/enums/Tier.java | |
| parent | 28ed289c626555dda9f369780b28651a8c5f442e (diff) | |
| parent | 5959633bc9eea56859e4e569c2aa8b8a427e5ea2 (diff) | |
| download | GT5-Unofficial-0f6b03f927b2c482100b2ba46964db72c96156a0.tar.gz GT5-Unofficial-0f6b03f927b2c482100b2ba46964db72c96156a0.tar.bz2 GT5-Unofficial-0f6b03f927b2c482100b2ba46964db72c96156a0.zip | |
Merge branch 'Refactor' into Bees
Diffstat (limited to 'src/main/java/gregtech/api/enums/Tier.java')
| -rw-r--r-- | src/main/java/gregtech/api/enums/Tier.java | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/src/main/java/gregtech/api/enums/Tier.java b/src/main/java/gregtech/api/enums/Tier.java index 4f0c946a9d..83a126cf6b 100644 --- a/src/main/java/gregtech/api/enums/Tier.java +++ b/src/main/java/gregtech/api/enums/Tier.java @@ -41,15 +41,24 @@ public class Tier { new Tier(SubTag.ENERGY_STEAM, 3, 512, 1, 1, 1, Materials.Titanium, OrePrefixes.frameGt.get(Materials.Titanium), OrePrefixes.pipeMedium.get(Materials.Titanium), OrePrefixes.pipeHuge.get(Materials.Titanium), OrePrefixes.pipeMedium.get(Materials.Titanium), OrePrefixes.pipeLarge.get(Materials.Titanium)), new Tier(SubTag.ENERGY_STEAM, 4, 2048, 1, 1, 1, Materials.TungstenSteel, OrePrefixes.frameGt.get(Materials.TungstenSteel), OrePrefixes.pipeMedium.get(Materials.TungstenSteel), OrePrefixes.pipeHuge.get(Materials.TungstenSteel), OrePrefixes.pipeMedium.get(Materials.TungstenSteel), OrePrefixes.pipeLarge.get(Materials.TungstenSteel)), new Tier(SubTag.ENERGY_STEAM, 5, 8192, 1, 1, 1, Materials.Iridium, OrePrefixes.frameGt.get(Materials.Iridium), OrePrefixes.pipeMedium.get(Materials.Iridium), OrePrefixes.pipeHuge.get(Materials.Iridium), OrePrefixes.pipeMedium.get(Materials.Iridium), OrePrefixes.pipeLarge.get(Materials.Iridium)), - new Tier(SubTag.ENERGY_STEAM, 9, Integer.MAX_VALUE-7, 1, 1, 1, Materials.Neutronium, OrePrefixes.frameGt.get(Materials.Neutronium), OrePrefixes.pipeMedium.get(Materials.Neutronium), OrePrefixes.pipeHuge.get(Materials.Neutronium), OrePrefixes.pipeMedium.get(Materials.Neutronium), OrePrefixes.pipeLarge.get(Materials.Neutronium)), + new Tier(SubTag.ENERGY_STEAM, 9, Integer.MAX_VALUE - 7, 1, 1, 1, Materials.Neutronium, OrePrefixes.frameGt.get(Materials.Neutronium), OrePrefixes.pipeMedium.get(Materials.Neutronium), OrePrefixes.pipeHuge.get(Materials.Neutronium), OrePrefixes.pipeMedium.get(Materials.Neutronium), OrePrefixes.pipeLarge.get(Materials.Neutronium)), }; /** * Used for Crafting Recipes */ - public final Object mHullObject, mConductingObject, mLargerConductingObject, mManagingObject, mBetterManagingObject; + public final Object + mHullObject, + mConductingObject, + mLargerConductingObject, + mManagingObject, + mBetterManagingObject; private final SubTag mType; private final byte mRank; - private final long mPrimaryValue, mSecondaryValue, mSpeedMultiplier, mEnergyCostMultiplier; + private final long + mPrimaryValue, + mSecondaryValue, + mSpeedMultiplier, + mEnergyCostMultiplier; private final Materials mMaterial; public Tier(SubTag aType, int aRank, long aPrimaryValue, long aSecondaryValue, long aSpeedMultiplier, long aEnergyCostMultiplier, Materials aMaterial, Object aHullObject, Object aConductingObject, Object aLargerConductingObject, Object aManagingObject, Object aBetterManagingObject) { |