diff options
| author | Alkalus <3060479+draknyte1@users.noreply.github.com> | 2018-06-26 17:45:37 +1000 |
|---|---|---|
| committer | Alkalus <3060479+draknyte1@users.noreply.github.com> | 2018-06-26 17:45:37 +1000 |
| commit | 09b6e763945489bff95ac8bd46402c61b9471457 (patch) | |
| tree | 8240208852eaf2289324485a1c7ac71850128c5a /src/Java/gtPlusPlus | |
| parent | af9924a711d7070bedb80bb57adec4dad1e76657 (diff) | |
| download | GT5-Unofficial-09b6e763945489bff95ac8bd46402c61b9471457.tar.gz GT5-Unofficial-09b6e763945489bff95ac8bd46402c61b9471457.tar.bz2 GT5-Unofficial-09b6e763945489bff95ac8bd46402c61b9471457.zip | |
$ Fixes #319.
Diffstat (limited to 'src/Java/gtPlusPlus')
| -rw-r--r-- | src/Java/gtPlusPlus/everglades/GTplusplus_Everglades.java | 2 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechHiAmpTransformer.java | 28 |
2 files changed, 18 insertions, 12 deletions
diff --git a/src/Java/gtPlusPlus/everglades/GTplusplus_Everglades.java b/src/Java/gtPlusPlus/everglades/GTplusplus_Everglades.java index 9174442a43..c43a725065 100644 --- a/src/Java/gtPlusPlus/everglades/GTplusplus_Everglades.java +++ b/src/Java/gtPlusPlus/everglades/GTplusplus_Everglades.java @@ -28,7 +28,7 @@ import net.minecraftforge.common.DimensionManager; import net.minecraftforge.common.config.Configuration; @MCVersion(value = "1.7.10") -@Mod(modid = Everglades.MODID, name = Everglades.NAME, version = Everglades.VERSION, dependencies = "required-after:Forge; after:dreamcraft; after:IC2; after:ihl; required-after:gregtech; after:miscutils;") +@Mod(modid = Everglades.MODID, name = Everglades.NAME, version = Everglades.VERSION, dependencies = "required-after:Forge; after:dreamcraft; after:IC2; after:ihl; required-after:gregtech; required-after:miscutils;") public class GTplusplus_Everglades implements ActionListener { //Mod Instance diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechHiAmpTransformer.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechHiAmpTransformer.java index 35ef2fbc77..ee4f32c8ad 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechHiAmpTransformer.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechHiAmpTransformer.java @@ -8,7 +8,7 @@ import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_ModHandler; - +import gtPlusPlus.core.lib.CORE; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMetaTransformerHiAmp; @@ -21,28 +21,34 @@ public class GregtechHiAmpTransformer { | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED; int mID = 877; + String mHammerName = "Hammer"; + + if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK || CORE.GTNH) { + mHammerName = "Mallet"; + } + GregtechItemList.Transformer_HA_LV_ULV.set(new GregtechMetaTransformerHiAmp(mID++, "transformer.ha.tier.00", - "ULV Hi-Amp Transformer", 0, "LV -> ULV (Use Soft Hammer to invert)").getStackForm(1L)); + "ULV Hi-Amp Transformer", 0, "LV -> ULV (Use Soft "+mHammerName+" to invert)").getStackForm(1L)); GregtechItemList.Transformer_HA_MV_LV.set(new GregtechMetaTransformerHiAmp(mID++, "transformer.ha.tier.01", - "LV Hi-Amp Transformer", 1, "MV -> LV (Use Soft Hammer to invert)").getStackForm(1L)); + "LV Hi-Amp Transformer", 1, "MV -> LV (Use Soft "+mHammerName+" to invert)").getStackForm(1L)); GregtechItemList.Transformer_HA_HV_MV.set(new GregtechMetaTransformerHiAmp(mID++, "transformer.ha.tier.02", - "MV Hi-Amp Transformer", 2, "HV -> MV (Use Soft Hammer to invert)").getStackForm(1L)); + "MV Hi-Amp Transformer", 2, "HV -> MV (Use Soft "+mHammerName+" to invert)").getStackForm(1L)); GregtechItemList.Transformer_HA_EV_HV.set(new GregtechMetaTransformerHiAmp(mID++, "transformer.ha.tier.03", - "HV Hi-Amp Transformer", 3, "EV -> HV (Use Soft Hammer to invert)").getStackForm(1L)); + "HV Hi-Amp Transformer", 3, "EV -> HV (Use Soft "+mHammerName+" to invert)").getStackForm(1L)); GregtechItemList.Transformer_HA_IV_EV.set(new GregtechMetaTransformerHiAmp(mID++, "transformer.ha.tier.04", - "EV Hi-Amp Transformer", 4, "IV -> EV (Use Soft Hammer to invert)").getStackForm(1L)); + "EV Hi-Amp Transformer", 4, "IV -> EV (Use Soft "+mHammerName+" to invert)").getStackForm(1L)); GregtechItemList.Transformer_HA_LuV_IV.set(new GregtechMetaTransformerHiAmp(mID++, "transformer.ha.tier.05", - "IV Hi-Amp Transformer", 5, "LuV -> IV (Use Soft Hammer to invert)").getStackForm(1L)); + "IV Hi-Amp Transformer", 5, "LuV -> IV (Use Soft "+mHammerName+" to invert)").getStackForm(1L)); GregtechItemList.Transformer_HA_ZPM_LuV.set(new GregtechMetaTransformerHiAmp(mID++, "transformer.ha.tier.06", - "LuV Hi-Amp Transformer", 6, "ZPM -> LuV (Use Soft Hammer to invert)").getStackForm(1L)); + "LuV Hi-Amp Transformer", 6, "ZPM -> LuV (Use Soft "+mHammerName+" to invert)").getStackForm(1L)); GregtechItemList.Transformer_HA_UV_ZPM.set(new GregtechMetaTransformerHiAmp(mID++, "transformer.ha.tier.07", - "ZPM Hi-Amp Transformer", 7, "UV -> ZPM (Use Soft Hammer to invert)").getStackForm(1L)); + "ZPM Hi-Amp Transformer", 7, "UV -> ZPM (Use Soft "+mHammerName+" to invert)").getStackForm(1L)); if (!GTNH) { GregtechItemList.Transformer_HA_MAX_UV.set(new GregtechMetaTransformerHiAmp(mID++, "transformer.ha.tier.08", - "UV Hi-Amp Transformer", 8, "Any Voltage -> UV (Use Soft Hammer to invert)").getStackForm(1L)); + "UV Hi-Amp Transformer", 8, "Any Voltage -> UV (Use Soft "+mHammerName+" to invert)").getStackForm(1L)); } else { GregtechItemList.Transformer_HA_MAX_UV.set(new GregtechMetaTransformerHiAmp(mID++, "transformer.ha.tier.08", - "UV Hi-Amp Transformer", 8, "UHV -> UV (Use Soft Hammer to invert)").getStackForm(1L)); + "UV Hi-Amp Transformer", 8, "UHV -> UV (Use Soft "+mHammerName+" to invert)").getStackForm(1L)); } ItemStack mItem_1; ItemStack mItem_2; |