diff options
9 files changed, 202 insertions, 95 deletions
diff --git a/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/NoDreamCraftMachineLoader.java b/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/NoDreamCraftMachineLoader.java index 53a64a52ae..0570299f4e 100644 --- a/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/NoDreamCraftMachineLoader.java +++ b/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/NoDreamCraftMachineLoader.java @@ -13,6 +13,7 @@ import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicHull; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_TieredMachineBlock; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Transformer; import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.StatCollector; import java.lang.reflect.Constructor; import java.lang.reflect.Field; @@ -21,7 +22,7 @@ import java.lang.reflect.Method; import static gregtech.api.GregTech_API.METATILEENTITIES; public class NoDreamCraftMachineLoader implements Runnable { - public final static String imagination=EnumChatFormatting.RESET + + public final static String imagination = EnumChatFormatting.RESET + "You just need " + EnumChatFormatting.DARK_PURPLE + "I" + EnumChatFormatting.LIGHT_PURPLE + "m" + EnumChatFormatting.DARK_RED + @@ -41,69 +42,84 @@ public class NoDreamCraftMachineLoader implements Runnable { try { CustomItemList.WetTransformer_LV_ULV.set(new GT_MetaTileEntity_WetTransformer( 12000, "wettransformer.tier.00", "Ultra Low Voltage Power Transformer", 0, - "LV -> ULV (Use Soft Mallet to invert)").getStackForm(1L)); - }catch (IllegalArgumentException e){ + //LV -> ULV (Use Soft Mallet to invert) + StatCollector.translateToLocal("gt.blockmachines.wetransformer.tier.00.desc")).getStackForm(1L)); + } catch (IllegalArgumentException e) { System.out.println(METATILEENTITIES[12000].getClass().getCanonicalName()); TecTech.LOGGER.error(e); e.printStackTrace(); - throw new Error(METATILEENTITIES[12000].getClass().getCanonicalName(),e); + throw new Error(METATILEENTITIES[12000].getClass().getCanonicalName(), e); } CustomItemList.WetTransformer_MV_LV.set(new GT_MetaTileEntity_WetTransformer( 12001, "wetransformer.tier.01", "Low Voltage Power Transformer", 1, - "MV -> LV (Use Soft Mallet to invert)").getStackForm(1L)); + //MV -> LV (Use Soft Mallet to invert) + StatCollector.translateToLocal("gt.blockmachines.wetransformer.tier.01.desc")).getStackForm(1L)); CustomItemList.WetTransformer_HV_MV.set(new GT_MetaTileEntity_WetTransformer( 12002, "wettransformer.tier.02", "Medium Voltage Power Transformer", 2, - "HV -> MV (Use Soft Mallet to invert)").getStackForm(1L)); + //HV -> MV (Use Soft Mallet to invert) + StatCollector.translateToLocal("gt.blockmachines.wetransformer.tier.02.desc")).getStackForm(1L)); CustomItemList.WetTransformer_EV_HV.set(new GT_MetaTileEntity_WetTransformer( 12003, "wettransformer.tier.03", "High Voltage Power Transformer", 3, - "EV -> HV (Use Soft Mallet to invert)").getStackForm(1L)); + //EV -> HV (Use Soft Mallet to invert) + StatCollector.translateToLocal("gt.blockmachines.wetransformer.tier.03.desc")).getStackForm(1L)); CustomItemList.WetTransformer_IV_EV.set(new GT_MetaTileEntity_WetTransformer( 12004, "wettransformer.tier.04", "Extreme Power Transformer", 4, - "IV -> EV (Use Soft Mallet to invert)").getStackForm(1L)); + //IV -> EV (Use Soft Mallet to invert) + StatCollector.translateToLocal("gt.blockmachines.wetransformer.tier.04.desc")).getStackForm(1L)); CustomItemList.WetTransformer_LuV_IV.set(new GT_MetaTileEntity_WetTransformer( 12005, "wettransformer.tier.05", "Insane Power Transformer", 5, - "LuV -> IV (Use Soft Mallet to invert)").getStackForm(1L)); + //LuV -> IV (Use Soft Mallet to invert) + StatCollector.translateToLocal("gt.blockmachines.wetransformer.tier.05.desc")).getStackForm(1L)); CustomItemList.WetTransformer_ZPM_LuV.set(new GT_MetaTileEntity_WetTransformer( 12006, "wettransformer.tier.06", "Ludicrous Power Transformer", 6, - "ZPM -> LuV (Use Soft Mallet to invert)").getStackForm(1L)); + //ZPM -> LuV (Use Soft Mallet to invert) + StatCollector.translateToLocal("gt.blockmachines.wetransformer.tier.06.desc")).getStackForm(1L)); CustomItemList.WetTransformer_UV_ZPM.set(new GT_MetaTileEntity_WetTransformer( 12007, "wettransformer.tier.07", "ZPM Voltage Power Transformer", 7, - "UV -> ZPM (Use Soft Mallet to invert)").getStackForm(1L)); + //UV -> ZPM (Use Soft Mallet to invert) + StatCollector.translateToLocal("gt.blockmachines.wetransformer.tier.07.desc")).getStackForm(1L)); CustomItemList.WetTransformer_UHV_UV.set(new GT_MetaTileEntity_WetTransformer( 12008, "wettransformer.tier.08", "Ultimate Power Transformer", 8, - "UHV -> UV (Use Soft Mallet to invert)").getStackForm(1L)); + //UHV -> UV (Use Soft Mallet to invert) + StatCollector.translateToLocal("gt.blockmachines.wetransformer.tier.08.desc")).getStackForm(1L)); CustomItemList.WetTransformer_UEV_UHV.set(new GT_MetaTileEntity_WetTransformer( 12009, "wettransformer.tier.09", "Highly Ultimate Power Transformer", 9, - "UEV -> UHV (Use Soft Mallet to invert)").getStackForm(1L)); + //UEV -> UHV (Use Soft Mallet to invert) + StatCollector.translateToLocal("gt.blockmachines.wetransformer.tier.09.desc")).getStackForm(1L)); CustomItemList.WetTransformer_UIV_UEV.set(new GT_MetaTileEntity_WetTransformer( 12010, "wettransformer.tier.10", "Extremely Ultimate Power Transformer", 10, - "UIV -> UEV (Use Soft Mallet to invert)").getStackForm(1L)); + //UIV -> UEV (Use Soft Mallet to invert) + StatCollector.translateToLocal("gt.blockmachines.wetransformer.tier.10.desc")).getStackForm(1L)); CustomItemList.WetTransformer_UMV_UIV.set(new GT_MetaTileEntity_WetTransformer( 12011, "wettransformer.tier.11", "Insanely Ultimate Power Transformer", 11, - "UMV -> UIV (Use Soft Mallet to invert)").getStackForm(1L)); + //UMV -> UIV (Use Soft Mallet to invert) + StatCollector.translateToLocal("gt.blockmachines.wetransformer.tier.11.desc")).getStackForm(1L)); CustomItemList.WetTransformer_UXV_UMV.set(new GT_MetaTileEntity_WetTransformer( 12012, "wettransformer.tier.12", "Mega Ultimate Power Transformer", 12, - "UXV -> UMV (Use Soft Mallet to invert)").getStackForm(1L)); + //UXV -> UMV (Use Soft Mallet to invert) + StatCollector.translateToLocal("gt.blockmachines.wetransformer.tier.12.desc")).getStackForm(1L)); CustomItemList.WetTransformer_OPV_UXV.set(new GT_MetaTileEntity_WetTransformer( 12013, "wettransformer.tier.13", "Extended Mega Ultimate Power Transformer", 13, - "OPV -> UXV (Use Soft Mallet to invert)").getStackForm(1L)); + //OPV -> UXV (Use Soft Mallet to invert) + StatCollector.translateToLocal("gt.blockmachines.wetransformer.tier.13.desc")).getStackForm(1L)); CustomItemList.WetTransformer_MAXV_OPV.set(new GT_MetaTileEntity_WetTransformer( 12014, "wettransformer.tier.14", "Overpowered Power Transformer", 14, - "MAX -> OPV (Use Soft Mallet to invert)").getStackForm(1L)); + //MAX -> OPV (Use Soft Mallet to invert) + StatCollector.translateToLocal("gt.blockmachines.wetransformer.tier.14.desc")).getStackForm(1L)); try { MetaTileEntity temp; @@ -117,7 +133,7 @@ public class NoDreamCraftMachineLoader implements Runnable { } temp = new GT_MetaTileEntity_BasicHull( - 11230, "hull.tier.10", "UEV Machine Hull",10, + 11230, "hull.tier.10", "UEV Machine Hull", 10, imagination); Util.setTier(10, temp); if (GT_Values.GT.isClientSide()) { @@ -126,7 +142,7 @@ public class NoDreamCraftMachineLoader implements Runnable { CustomItemList.Hull_UEV.set(temp.getStackForm(1L)); temp = new GT_MetaTileEntity_BasicHull( - 11231, "hull.tier.11", "UIV Machine Hull",11, + 11231, "hull.tier.11", "UIV Machine Hull", 11, imagination); Util.setTier(11, temp); if (GT_Values.GT.isClientSide()) { @@ -135,7 +151,7 @@ public class NoDreamCraftMachineLoader implements Runnable { CustomItemList.Hull_UIV.set(temp.getStackForm(1L)); temp = new GT_MetaTileEntity_BasicHull( - 11232, "hull.tier.12", "UMV Machine Hull",12, + 11232, "hull.tier.12", "UMV Machine Hull", 12, imagination); Util.setTier(12, temp); if (GT_Values.GT.isClientSide()) { @@ -144,7 +160,7 @@ public class NoDreamCraftMachineLoader implements Runnable { CustomItemList.Hull_UMV.set(temp.getStackForm(1L)); temp = new GT_MetaTileEntity_BasicHull( - 11233, "hull.tier.13", "UXV Machine Hull",13, + 11233, "hull.tier.13", "UXV Machine Hull", 13, imagination); Util.setTier(13, temp); if (GT_Values.GT.isClientSide()) { @@ -153,7 +169,7 @@ public class NoDreamCraftMachineLoader implements Runnable { CustomItemList.Hull_UXV.set(temp.getStackForm(1L)); temp = new GT_MetaTileEntity_BasicHull( - 11234, "hull.tier.14", "OPV Machine Hull",14, + 11234, "hull.tier.14", "OPV Machine Hull", 14, imagination); Util.setTier(14, temp); if (GT_Values.GT.isClientSide()) { @@ -162,7 +178,7 @@ public class NoDreamCraftMachineLoader implements Runnable { CustomItemList.Hull_OPV.set(temp.getStackForm(1L)); temp = new GT_MetaTileEntity_BasicHull( - 11235, "hull.tier.15", "MAX Machine Hull",15, + 11235, "hull.tier.15", "MAX Machine Hull", 15, imagination); Util.setTier(15, temp); if (GT_Values.GT.isClientSide()) { @@ -173,12 +189,14 @@ public class NoDreamCraftMachineLoader implements Runnable { temp = new GT_MetaTileEntity_Transformer( 11220, "transformer.tier.09", "Highly Ultimate Transformer", 9, - "UEV -> UHV (Use Soft Mallet to invert)"); + //UEV -> UHV (Use Soft Mallet to invert) + StatCollector.translateToLocal("gt.blockmachines.transformer.tier.09.desc")); CustomItemList.Transformer_UEV_UHV.set(temp.getStackForm(1L)); temp = new GT_MetaTileEntity_Transformer( 11221, "transformer.tier.10", "Extremely Ultimate Transformer", 10, - "UIV -> UEV (Use Soft Mallet to invert)"); + //UIV -> UEV (Use Soft Mallet to invert) + StatCollector.translateToLocal("gt.blockmachines.transformer.tier.10.desc")); Util.setTier(10, temp); if (GT_Values.GT.isClientSide()) { field.set(temp, method.invoke(temp, iTexture)); @@ -187,7 +205,8 @@ public class NoDreamCraftMachineLoader implements Runnable { temp = new GT_MetaTileEntity_Transformer( 11222, "transformer.tier.11", "Insanely Ultimate Transformer", 11, - "UMV -> UIV (Use Soft Mallet to invert)"); + //UMV -> UIV (Use Soft Mallet to invert) + StatCollector.translateToLocal("gt.blockmachines.transformer.tier.11.desc")); Util.setTier(11, temp); if (GT_Values.GT.isClientSide()) { field.set(temp, method.invoke(temp, iTexture)); @@ -196,7 +215,8 @@ public class NoDreamCraftMachineLoader implements Runnable { temp = new GT_MetaTileEntity_Transformer( 11223, "transformer.tier.12", "Mega Ultimate Transformer", 12, - "UXV -> UMV (Use Soft Mallet to invert)"); + //UXV -> UMV (Use Soft Mallet to invert) + StatCollector.translateToLocal("gt.blockmachines.transformer.tier.12.desc")); Util.setTier(12, temp); if (GT_Values.GT.isClientSide()) { field.set(temp, method.invoke(temp, iTexture)); @@ -205,7 +225,8 @@ public class NoDreamCraftMachineLoader implements Runnable { temp = new GT_MetaTileEntity_Transformer( 11224, "transformer.tier.13", "Extended Mega Ultimate Transformer", 13, - "OPV -> UXV (Use Soft Mallet to invert)"); + //OPV -> UXV (Use Soft Mallet to invert) + StatCollector.translateToLocal("gt.blockmachines.transformer.tier.13.desc")); Util.setTier(13, temp); if (GT_Values.GT.isClientSide()) { field.set(temp, method.invoke(temp, iTexture)); @@ -214,7 +235,8 @@ public class NoDreamCraftMachineLoader implements Runnable { temp = new GT_MetaTileEntity_Transformer( 11225, "transformer.tier.14", "Overpowered Transformer", 14, - "MAX -> OPV (Use Soft Mallet to invert)"); + //MAX -> OPV (Use Soft Mallet to invert) + StatCollector.translateToLocal("gt.blockmachines.transformer.tier.14.desc")); Util.setTier(14, temp); if (GT_Values.GT.isClientSide()) { field.set(temp, method.invoke(temp, iTexture)); @@ -228,12 +250,14 @@ public class NoDreamCraftMachineLoader implements Runnable { temp = constructor.newInstance( 11989, "transformer.ha.tier.09", "Highly Ultimate Hi-Amp Transformer", 9, - "UEV -> UHV (Use Soft Mallet to invert)"); + //UEV -> UHV (Use Soft Mallet to invert + StatCollector.translateToLocal("gt.blockmachines.transformer.ha.tier.09.desc")); CustomItemList.Transformer_HA_UEV_UHV.set(temp.getStackForm(1)); temp = constructor.newInstance( 11910, "transformer.ha.tier.10", "Extremely Ultimate Hi-Amp Transformer", 10, - "UIV -> UEV (Use Soft Mallet to invert)"); + //UIV -> UEV (Use Soft Mallet to invert) + StatCollector.translateToLocal("gt.blockmachines.transformer.ha.tier.10.desc")); Util.setTier(10, temp); if (GT_Values.GT.isClientSide()) { field.set(temp, method.invoke(temp, iTexture)); @@ -242,7 +266,8 @@ public class NoDreamCraftMachineLoader implements Runnable { temp = constructor.newInstance( 11911, "transformer.ha.tier.11", "Insanely Ultimate Hi-Amp Transformer", 11, - "UMV -> UIV (Use Soft Mallet to invert)"); + //UMV -> UIV (Use Soft Mallet to invert) + StatCollector.translateToLocal("gt.blockmachines.transformer.ha.tier.11.desc")); Util.setTier(11, temp); if (GT_Values.GT.isClientSide()) { field.set(temp, method.invoke(temp, iTexture)); @@ -251,7 +276,8 @@ public class NoDreamCraftMachineLoader implements Runnable { temp = constructor.newInstance( 11912, "transformer.ha.tier.12", "Mega Ultimate Hi-Amp Transformer", 12, - "UXV -> UMV (Use Soft Mallet to invert)"); + //UXV -> UMV (Use Soft Mallet to invert) + StatCollector.translateToLocal("gt.blockmachines.transformer.ha.tier.12.desc")); Util.setTier(12, temp); if (GT_Values.GT.isClientSide()) { field.set(temp, method.invoke(temp, iTexture)); @@ -260,7 +286,8 @@ public class NoDreamCraftMachineLoader implements Runnable { temp = constructor.newInstance( 11913, "transformer.ha.tier.13", "Extended Mega Ultimate Hi-Amp Transformer", 13, - "OPV -> UXV (Use Soft Mallet to invert)"); + //OPV -> UXV (Use Soft Mallet to invert) + StatCollector.translateToLocal("gt.blockmachines.transformer.ha.tier.13.desc")); Util.setTier(13, temp); if (GT_Values.GT.isClientSide()) { field.set(temp, method.invoke(temp, iTexture)); @@ -269,7 +296,8 @@ public class NoDreamCraftMachineLoader implements Runnable { temp = constructor.newInstance( 11914, "transformer.ha.tier.14", "Overpowered Hi-Amp Transformer", 14, - "MAX -> OPV (Use Soft Mallet to invert)"); + //MAX -> OPV (Use Soft Mallet to invert) + StatCollector.translateToLocal("gt.blockmachines.transformer.ha.tier.14.desc")); Util.setTier(14, temp); if (GT_Values.GT.isClientSide()) { field.set(temp, method.invoke(temp, iTexture)); diff --git a/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/TT_turret_loader.java b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/TT_turret_loader.java index d03f1bd1c6..d66232671a 100644 --- a/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/TT_turret_loader.java +++ b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/TT_turret_loader.java @@ -14,7 +14,7 @@ import net.minecraftforge.client.MinecraftForgeClient; public class TT_turret_loader implements Runnable { @Override public void run() { - TurretHeadRenderEM turretHeadRenderEM=new TurretHeadRenderEM(); + TurretHeadRenderEM turretHeadRenderEM = new TurretHeadRenderEM(); ClientRegistry.bindTileEntitySpecialRenderer(TileTurretHeadEM.class, turretHeadRenderEM); MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(TurretHeadEM.INSTANCE), new TurretHeadItemRenderEM(turretHeadRenderEM, new TileTurretHeadEM())); diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/dComplexAspectDefinition.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/dComplexAspectDefinition.java index 059ac44da3..d6c4553ed5 100644 --- a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/dComplexAspectDefinition.java +++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/dComplexAspectDefinition.java @@ -13,6 +13,7 @@ import com.github.technus.tectech.mechanics.elementalMatter.core.transformations import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.aOredictDequantizationInfo; import com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.eBosonDefinition; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.StatCollector; import java.util.ArrayList; @@ -58,12 +59,12 @@ public final class dComplexAspectDefinition extends cElementalDefinition impleme throw new tElementalException("Hadron Definition error"); } aspectStacks = aspects; - float mass=0; - for(cElementalDefinitionStack stack:aspects.values()){ - mass+=stack.getMass(); + float mass = 0; + for (cElementalDefinitionStack stack : aspects.values()) { + mass += stack.getMass(); } - this.mass=mass; - hash=super.hashCode(); + this.mass = mass; + hash = super.hashCode(); } //public but u can just try{}catch(){} the constructor it still calls this method @@ -75,18 +76,18 @@ public final class dComplexAspectDefinition extends cElementalDefinition impleme } amount += aspects.amount; } - return amount==2; + return amount == 2; } @Override public String getName() { - String name= AspectDefinitionCompat.aspectDefinitionCompat.getAspectTag(this); - if(name!=null){ - name=name.substring(0,1).toUpperCase()+name.substring(1); - }else{ - name=getSymbol(); + String name = AspectDefinitionCompat.aspectDefinitionCompat.getAspectTag(this); + if (name != null) { + name = name.substring(0, 1).toUpperCase() + name.substring(1); + } else { + name = getSymbol(); } - return "Aspect: "+name; + return StatCollector.translateToLocal("tt.keyword.Aspect") + ": " + name; } @Override @@ -195,7 +196,7 @@ public final class dComplexAspectDefinition extends cElementalDefinition impleme @Override public float getEnergyDiffBetweenStates(long currentEnergyLevel, long newEnergyLevel) { - return iElementalDefinition.DEFAULT_ENERGY_REQUIREMENT *(newEnergyLevel-currentEnergyLevel); + return iElementalDefinition.DEFAULT_ENERGY_REQUIREMENT * (newEnergyLevel - currentEnergyLevel); } @Override @@ -260,13 +261,13 @@ public final class dComplexAspectDefinition extends cElementalDefinition impleme public static void run() { try { - cElementalDefinition.addCreatorFromNBT(nbtType, dComplexAspectDefinition.class.getMethod("fromNBT", NBTTagCompound.class),(byte)-96); + cElementalDefinition.addCreatorFromNBT(nbtType, dComplexAspectDefinition.class.getMethod("fromNBT", NBTTagCompound.class), (byte) -96); } catch (Exception e) { if (DEBUG_MODE) { e.printStackTrace(); } } - if(DEBUG_MODE) { + if (DEBUG_MODE) { TecTech.LOGGER.info("Registered Elemental Matter Class: ComplexAspect " + nbtType + ' ' + -96); } } @@ -276,7 +277,7 @@ public final class dComplexAspectDefinition extends cElementalDefinition impleme return -96; } - public static byte getClassTypeStatic(){ + public static byte getClassTypeStatic() { return -96; } @@ -287,32 +288,32 @@ public final class dComplexAspectDefinition extends cElementalDefinition impleme @Override public void addScanShortSymbols(ArrayList<String> lines, int capabilities, long energyLevel) { - if(Util.areBitsSet(SCAN_GET_NOMENCLATURE|SCAN_GET_CHARGE|SCAN_GET_MASS, capabilities)) { + if (Util.areBitsSet(SCAN_GET_NOMENCLATURE | SCAN_GET_CHARGE | SCAN_GET_MASS, capabilities)) { lines.add(getShortSymbol()); } } @Override public void addScanResults(ArrayList<String> lines, int capabilities, long energyLevel) { - if(Util.areBitsSet(SCAN_GET_CLASS_TYPE, capabilities)) { - lines.add("CLASS = " + nbtType + ' ' + getClassType()); + if (Util.areBitsSet(SCAN_GET_CLASS_TYPE, capabilities)) { + lines.add(StatCollector.translateToLocal("tt.keyword.CLASS") + " = " + nbtType + ' ' + getClassType()); } - if(Util.areBitsSet(SCAN_GET_NOMENCLATURE|SCAN_GET_CHARGE|SCAN_GET_MASS, capabilities)) { - lines.add("NAME = "+getName()); + if (Util.areBitsSet(SCAN_GET_NOMENCLATURE | SCAN_GET_CHARGE | SCAN_GET_MASS, capabilities)) { + lines.add(StatCollector.translateToLocal("tt.keyword.NAME") + " = " + getName()); //lines.add("SYMBOL = "+getSymbol()); } - if(Util.areBitsSet(SCAN_GET_CHARGE,capabilities)) { - lines.add("CHARGE = " + getCharge() / 3f + " e"); + if (Util.areBitsSet(SCAN_GET_CHARGE, capabilities)) { + lines.add(StatCollector.translateToLocal("tt.keyword.CHARGE") + " = " + getCharge() / 3f + " e"); } - if(Util.areBitsSet(SCAN_GET_COLOR,capabilities)) { - lines.add(getColor() < 0 ? "COLORLESS" : "CARRIES COLOR"); + if (Util.areBitsSet(SCAN_GET_COLOR, capabilities)) { + lines.add(getColor() < 0 ? StatCollector.translateToLocal("tt.keyword.COLORLESS") : StatCollector.translateToLocal("tt.keyword.CARRIES_COLOR")); } - if(Util.areBitsSet(SCAN_GET_MASS,capabilities)) { - lines.add("MASS = " + getMass() + " eV/c\u00b2"); + if (Util.areBitsSet(SCAN_GET_MASS, capabilities)) { + lines.add(StatCollector.translateToLocal("tt.keyword.MASS") + " = " + getMass() + " eV/c\u00b2"); } - if(Util.areBitsSet(SCAN_GET_TIMESPAN_INFO, capabilities)){ - lines.add("LIFE TIME = "+getRawTimeSpan(energyLevel)+ " s"); - lines.add(" "+"At current energy level"); + if (Util.areBitsSet(SCAN_GET_TIMESPAN_INFO, capabilities)) { + lines.add(StatCollector.translateToLocal("tt.keyword.LIFE_TIME") + " = " + getRawTimeSpan(energyLevel) + " s"); + lines.add(" " + StatCollector.translateToLocal("tt.keyphrase.At_current_energy_level")); } } } diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/ePrimalAspectDefinition.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/ePrimalAspectDefinition.java index 7ca125cd5e..b31e7460c8 100644 --- a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/ePrimalAspectDefinition.java +++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/ePrimalAspectDefinition.java @@ -1,6 +1,7 @@ package com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.definitions; import com.github.technus.tectech.mechanics.elementalMatter.core.templates.cElementalPrimitive; +import net.minecraft.util.StatCollector; import static com.github.technus.tectech.mechanics.elementalMatter.core.cElementalDecay.noDecay; @@ -9,12 +10,12 @@ import static com.github.technus.tectech.mechanics.elementalMatter.core.cElement */ public final class ePrimalAspectDefinition extends cElementalPrimitive implements iElementalAspect { public static final ePrimalAspectDefinition - magic_air = new ePrimalAspectDefinition("Air", "a`", 1e1F, 35), - magic_earth = new ePrimalAspectDefinition("Earth", "e`", 1e9F, 34), - magic_fire = new ePrimalAspectDefinition("Fire", "f`", 1e3F, 33), - magic_water = new ePrimalAspectDefinition("Water", "w`", 1e7F, 32), - magic_order = new ePrimalAspectDefinition("Order", "o`", 1e5F, 30), - magic_entropy = new ePrimalAspectDefinition("Entropy", "e`", 1e5F, 31); + magic_air = new ePrimalAspectDefinition(StatCollector.translateToLocal("tt.keyword.Air"), "a`", 1e1F, 35), + magic_earth = new ePrimalAspectDefinition(StatCollector.translateToLocal("tt.keyword.Earth"), "e`", 1e9F, 34), + magic_fire = new ePrimalAspectDefinition(StatCollector.translateToLocal("tt.keyword.Fire"), "f`", 1e3F, 33), + magic_water = new ePrimalAspectDefinition(StatCollector.translateToLocal("tt.keyword.Water"), "w`", 1e7F, 32), + magic_order = new ePrimalAspectDefinition(StatCollector.translateToLocal("tt.keyword.Order"), "o`", 1e5F, 30), + magic_entropy = new ePrimalAspectDefinition(StatCollector.translateToLocal("tt.keyword.Entropy"), "e`", 1e5F, 31); private ePrimalAspectDefinition(String name, String symbol, float mass, int ID) { super(name, symbol, 0, mass, 0, -1, ID); @@ -31,7 +32,7 @@ public final class ePrimalAspectDefinition extends cElementalPrimitive implement @Override public String getName() { - return "Primal: " + name; + return StatCollector.translateToLocal("tt.keyword.Primal")+": " + name; } @Override @@ -43,5 +44,4 @@ public final class ePrimalAspectDefinition extends cElementalPrimitive implement public boolean isTimeSpanHalfLife() { return false; } -} - +}
\ No newline at end of file diff --git a/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilCapacitor.java b/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilCapacitor.java index 13b7f311d2..557b356d52 100644 --- a/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilCapacitor.java +++ b/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilCapacitor.java @@ -4,7 +4,6 @@ import com.github.technus.tectech.CommonValues; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import gregtech.api.util.GT_LanguageManager; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -28,12 +27,6 @@ public final class TeslaCoilCapacitor extends Item { setHasSubtypes(true); setUnlocalizedName("tm.teslaCoilCapacitor"); setTextureName(MODID + ":itemCapacitorLV"); - - GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".0.name", "LV Tesla Capacitor"); - GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".1.name", "MV Tesla Capacitor"); - GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".2.name", "HV Tesla Capacitor"); - GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".3.name", "EV Tesla Capacitor"); - GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".4.name", "IV Tesla Capacitor"); } @Override diff --git a/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilComponent.java b/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilComponent.java index 32b75ebce7..cfd6b3b653 100644 --- a/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilComponent.java +++ b/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilComponent.java @@ -4,7 +4,6 @@ import com.github.technus.tectech.CommonValues; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import gregtech.api.util.GT_LanguageManager; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -27,9 +26,6 @@ public final class TeslaCoilComponent extends Item { setHasSubtypes(true); setUnlocalizedName("tm.itemTeslaComponent"); setTextureName(MODID + ":itemTeslaComponent"); - - GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".0.name", "Electrum Tesla Windings"); - GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".1.name", "Superconductive Tesla Windings"); } @Override diff --git a/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilCover.java b/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilCover.java index cacdda56e1..2a1fff39a3 100644 --- a/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilCover.java +++ b/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilCover.java @@ -4,7 +4,6 @@ import com.github.technus.tectech.CommonValues; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import gregtech.api.util.GT_LanguageManager; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -27,9 +26,6 @@ public final class TeslaCoilCover extends Item { setHasSubtypes(true); setUnlocalizedName("tm.teslaCover"); setTextureName(MODID + ":itemTeslaCover"); - - GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".0.name", "Tesla Coil Cover"); - GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".1.name", "Tesla Coil Cover Rich Edition"); } @Override diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_TeslaCoil.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_TeslaCoil.java index b144902824..41d32bdcf2 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_TeslaCoil.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_TeslaCoil.java @@ -17,6 +17,7 @@ import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicBatteryBuffer;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.StatCollector;
import org.apache.commons.lang3.ArrayUtils;
import java.util.Arrays;
@@ -79,6 +80,7 @@ public class GT_MetaTileEntity_TeslaCoil extends GT_MetaTileEntity_BasicBatteryB String[] jargon = new String[3];
jargon[0] = CommonValues.BASS_MARK;
jargon[1] = "Your Tesla I/O machine of choice";
+ jargon[1] = StatCollector.translateToLocal("desc.test");
jargon[2] = EnumChatFormatting.AQUA + "Lightning stoves for the rich";
String[] sDesc = super.getDescription();
sDesc = Arrays.copyOfRange(sDesc, 1, sDesc.length);
diff --git a/src/main/resources/assets/tectech/lang/en_US.lang b/src/main/resources/assets/tectech/lang/en_US.lang index 59a0d720de..5f6af25f00 100644 --- a/src/main/resources/assets/tectech/lang/en_US.lang +++ b/src/main/resources/assets/tectech/lang/en_US.lang @@ -1,6 +1,9 @@ +#Creative Tab Name itemGroup.TecTech=TecTech Interdimensional +#Blocks tile.quantumGlass.name=Quantum Glass tile.quantumStuff.name=Quantum Stuff +#Items item.em.debugContainer.name=Debug EM Container item.em.definitionContainer.name=EM Recipe Hint item.em.definitionScanStorage.name=EM Scan Storage @@ -8,12 +11,100 @@ item.em.constructable.name=Multiblock Machine Blueprint item.em.frontRotate.name=Front Rotation Scrench item.em.parametrizerMemoryCard.name=Parametrizer Memory Card item.em.EuMeterGT.name=GT EU meter - +item.tm.teslaCover.0.name=Tesla Coil Cover +item.tm.teslaCover.1.name=Tesla Coil Cover Rich Edition +item.tm.teslaCoilCapacitor.0.name=LV Tesla Capacitor +item.tm.teslaCoilCapacitor.1.name=MV Tesla Capacitor +item.tm.teslaCoilCapacitor.2.name=HV Tesla Capacitor +item.tm.teslaCoilCapacitor.3.name=EV Tesla Capacitor +item.tm.teslaCoilCapacitor.4.name=IV Tesla Capacitor +item.tm.itemTeslaComponent.0.name=Electrum Tesla Windings +item.tm.itemTeslaComponent.1.name=Superconductive Tesla Windings +tile.turretHeadEM.name=Elemental Matter Turret +tile.turretBaseEM.name=Elemental Turret Base +#Death Messages death.attack.microwaving=%1$s was dehydrated by radiation. death.attack.microwaving.player=%1$s was dehydrated by radiation while fighting %2$s. - death.attack.elementalPollution=%1$s was vaping from the wrong hole. death.attack.elementalPollution.player=%1$s was vaping from the wrong hole while fighting %2$s. - death.attack.subspace=%1$s was N-th dimensionally displeased. -death.attack.subspace.player=%1$s N-th dimensionally displeased while fighting %2$s.
\ No newline at end of file +death.attack.subspace.player=%1$s N-th dimensionally displeased while fighting %2$s. +#Machines +gt.blockmachines.wetransformer.tier.00.name=Ultra Low Voltage Power Transformer +gt.blockmachines.wetransformer.tier.00.desc=LV -> ULV (Use Soft Mallet to invert) +gt.blockmachines.wetransformer.tier.01.name=Low Voltage Power Transformer +gt.blockmachines.wetransformer.tier.01.desc=MV -> LV (Use Soft Mallet to invert) +gt.blockmachines.wetransformer.tier.02.name=Medium Voltage Power Transformer +gt.blockmachines.wetransformer.tier.02.desc=HV -> MV (Use Soft Mallet to invert) +gt.blockmachines.wetransformer.tier.03.name=High Voltage Power Transformer +gt.blockmachines.wetransformer.tier.03.desc=EV -> HV (Use Soft Mallet to invert) +gt.blockmachines.wetransformer.tier.04.name=Extreme Power Transformer +gt.blockmachines.wetransformer.tier.04.desc=IV -> EV (Use Soft Mallet to invert) +gt.blockmachines.wetransformer.tier.05.name=Insane Power Transformer +gt.blockmachines.wetransformer.tier.05.desc=LuV -> IV (Use Soft Mallet to invert) +gt.blockmachines.wetransformer.tier.06.name=Ludicrous Power Transformer +gt.blockmachines.wetransformer.tier.06.desc=ZPM -> LuV (Use Soft Mallet to invert) +gt.blockmachines.wetransformer.tier.07.name=ZPM Voltage Power Transformer +gt.blockmachines.wetransformer.tier.07.desc=UV -> ZPM (Use Soft Mallet to invert) +gt.blockmachines.wetransformer.tier.08.name=Ultimate Power Transformer +gt.blockmachines.wetransformer.tier.08.desc=UHV -> UV (Use Soft Mallet to invert) +gt.blockmachines.wetransformer.tier.09.name=Highly Ultimate Power Transformer +gt.blockmachines.wetransformer.tier.09.desc=UEV -> UHV (Use Soft Mallet to invert) +gt.blockmachines.wetransformer.tier.10.name=Extremely Ultimate Power Transformer +gt.blockmachines.wetransformer.tier.10.desc=UIV -> UEV (Use Soft Mallet to invert) +gt.blockmachines.wetransformer.tier.11.name=Insanely Ultimate Power Transformer +gt.blockmachines.wetransformer.tier.11.desc=UMV -> UIV (Use Soft Mallet to invert) +gt.blockmachines.wetransformer.tier.12.name=Mega Ultimate Power Transformer +gt.blockmachines.wetransformer.tier.12.desc=UXV -> UMV (Use Soft Mallet to invert) +gt.blockmachines.wetransformer.tier.13.name=Extended Mega Ultimate Power Transformer +gt.blockmachines.wetransformer.tier.13.desc=OPV -> UXV (Use Soft Mallet to invert) +gt.blockmachines.wetransformer.tier.14.name=Overpowered Power Transformer +gt.blockmachines.wetransformer.tier.14.desc=MAX -> OPV (Use Soft Mallet to invert) +#The rainbow 'You just gotta use your Imagination' bit isn't ever translated anyway +gt.blockmachines.hull.tier.10.name=UEV Machine Hull +gt.blockmachines.hull.tier.11.name=UIV Machine Hull +gt.blockmachines.hull.tier.12.name=UMV Machine Hull +gt.blockmachines.hull.tier.13.name=UXV Machine Hull +gt.blockmachines.hull.tier.14.name=OPV Machine Hull +gt.blockmachines.hull.tier.15.name=MAX Machine Hull +gt.blockmachines.transformer.tier.09.name=Highly Ultimate Transformer +gt.blockmachines.transformer.tier.09.desc=UEV -> UHV (Use Soft Mallet to invert) +gt.blockmachines.transformer.tier.10.name=Extremely Ultimate Transformer +gt.blockmachines.transformer.tier.10.desc=UIV -> UEV (Use Soft Mallet to invert) +gt.blockmachines.transformer.tier.11.name=Insanely Ultimate Transformer +gt.blockmachines.transformer.tier.11.desc=UMV -> UIV (Use Soft Mallet to invert) +gt.blockmachines.transformer.tier.12.name=Mega Ultimate Transformer +gt.blockmachines.transformer.tier.12.desc=UXV -> UMV (Use Soft Mallet to invert) +gt.blockmachines.transformer.tier.13.name=Extended Mega Ultimate Transformer +gt.blockmachines.transformer.tier.13.desc=OPV -> UXV (Use Soft Mallet to invert) +gt.blockmachines.transformer.tier.14.name=Overpowered Transformer +gt.blockmachines.transformer.tier.14.desc=MAX -> OPV (Use Soft Mallet to invert) +gt.blockmachines.transformer.ha.tier.09.name=Highly Ultimate Hi-Amp Transformer +gt.blockmachines.transformer.ha.tier.09.desc=UEV -> UHV (Use Soft Mallet to invert +gt.blockmachines.transformer.ha.tier.10.name=Extremely Ultimate Hi-Amp Transformer +gt.blockmachines.transformer.ha.tier.10.desc=UIV -> UEV (Use Soft Mallet to invert) +gt.blockmachines.transformer.ha.tier.11.name=Insanely Ultimate Hi-Amp Transformer +gt.blockmachines.transformer.ha.tier.11.desc=UMV -> UIV (Use Soft Mallet to invert) +gt.blockmachines.transformer.ha.tier.12.name=Mega Ultimate Hi-Amp Transformer +gt.blockmachines.transformer.ha.tier.12.desc=UXV -> UMV (Use Soft Mallet to invert) +gt.blockmachines.transformer.ha.tier.13.name=Extended Mega Ultimate Hi-Amp Transformer +gt.blockmachines.transformer.ha.tier.13.desc=OPV -> UXV (Use Soft Mallet to invert) +gt.blockmachines.transformer.ha.tier.14.name=Overpowered Hi-Amp Transformer +gt.blockmachines.transformer.ha.tier.14.desc=MAX -> OPV (Use Soft Mallet to invert) +#Thaumcraft compatibility +tt.keyword.Air=Air +tt.keyword.Earth=Earth +tt.keyword.Fire=Fire +tt.keyword.Water=Water +tt.keyword.Order=Order +tt.keyword.Entropy=Entropy +tt.keyword.Primal=Primal +tt.keyword.Aspect=Aspect +tt.keyword.CLASS=CLASS +tt.keyword.NAME=NAME +tt.keyword.CHARGE=CHARGE +tt.keyword.COLORLESS=COLORLESS +tt.keyword.CARRIES_COLOR=CARRIES COLOR +tt.keyword.MASS=MASS +tt.keyword.LIFE_TIME=LIFE TIME +tt.keyphrase.At_current_energy_level=At current energy level
\ No newline at end of file |