Anvilcraft/GregTech4
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Misc fixes, old config removal

Browse source
This commit is contained in:
TheDarkDnKTv 2020-08-08 16:01:38 +03:00
parent 0679ae263b
commit 27979f3957
10 changed files with 31 additions and 77 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/main/java/gregtechmod/GT_Mod.java
View file

@ -206,12 +206,9 @@ public class GT_Mod implements IGT_Mod, IGT_RecipeAdder {
File tFile = new File(new File(aEvent.getModConfigurationDirectory(), "GregTech"), "GregTech.cfg");
Configuration tConfig1 = new Configuration(tFile);
tConfig1.load();
tFile = new File(new File(aEvent.getModConfigurationDirectory(), "GregTech"), "BlockItemIDs.cfg");
tFile = new File(new File(aEvent.getModConfigurationDirectory(), "GregTech"), "DynamicConfig.cfg");
Configuration tConfig2 = new Configuration(tFile);
tConfig2.load();
tFile = new File(new File(aEvent.getModConfigurationDirectory(), "GregTech"), "DynamicConfig.cfg");
Configuration tConfig3 = new Configuration(tFile);
tConfig3.load();
mDoNotInit = (!tFile.getAbsolutePath().toLowerCase().contains("voltz")) && (tFile.getAbsolutePath().toLowerCase().contains(".technic") || tFile.getAbsolutePath().toLowerCase().contains("tekkit"));
if (mDoNotInit) {
@ -246,7 +243,7 @@ public class GT_Mod implements IGT_Mod, IGT_RecipeAdder {
new GT_ConnectionHandler().run();
GT_Log.log.info("GT_Mod: Creating Config Object.");
GregTech_API.sConfiguration = new GT_Config(tConfig1, tConfig2, tConfig3);
GregTech_API.sConfiguration = new GT_Config(tConfig1, tConfig2);
GT_Log.log.info("GT_Mod: Setting Configs");
if (GT_Config.sConfigFileStandard.get("general", "TooEasyMode", false).getBoolean(false)) GregTech_API.sAfterGTPostload.add(new GT_TooEasyModeLoader());
@ -318,11 +315,6 @@ public class GT_Mod implements IGT_Mod, IGT_RecipeAdder {
GT_Log.log.info("GT_Mod: Saving Configs");
GT_Config.sConfigFileStandard.save();
GT_Config.sConfigFileIDs.save();
GT_Log.log.info("GT_Mod: Generating Lang-File"); // TODO move localization to resources
GT_LanguageManager.sLangFile = new Configuration(new File(new File(aEvent.getModConfigurationDirectory(), "GregTech"), "GregTech.lang"));
GT_LanguageManager.sLangFile.load();
GT_Log.log.info("GT_Mod: Removing all original Scrapbox Drops.");
try {

2
src/main/java/gregtechmod/api/gui/GT_Container.java
View file

@ -493,7 +493,7 @@ public class GT_Container extends Container {
@Override
public void putStacksInSlots(ItemStack[] par1ArrayOfItemStack) {
try {
super.putStacksInSlots(par1ArrayOfItemStack);
if (par1ArrayOfItemStack.length > 0) super.putStacksInSlots(par1ArrayOfItemStack);
} catch(Throwable e) {
GT_Log.log.catching(e);
}

7
src/main/java/gregtechmod/api/metatileentity/BaseMetaTileEntity.java
View file

@ -21,7 +21,9 @@ import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList;
import net.minecraft.network.NetworkManager;
import net.minecraft.network.Packet;
import net.minecraft.network.play.server.S35PacketUpdateTileEntity;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.IIcon;
import net.minecraft.world.EnumSkyBlock;
@ -501,6 +503,11 @@ public class BaseMetaTileEntity extends BaseTileEntity implements IGregTechTileE
mWorkUpdate = mInventoryChanged = mRunningThroughTick = false;
}
@Override
public void onDataPacket(NetworkManager manager, S35PacketUpdateTileEntity packet) {
// TODO ñèíõðîíèçàöèÿ
}
@Override
public Packet getDescriptionPacket() {
GT_Utility.sendPacketToAllPlayersInRange(getWorld(), getMetaTileEntityData(), getXCoord(), getZCoord());

4
src/main/java/gregtechmod/api/util/GT_BaseCrop.java
View file

@ -1,6 +1,5 @@
package gregtechmod.api.util;
import gregtechmod.api.GregTech_API;
import ic2.api.crops.CropCard;
import ic2.api.crops.Crops;
import ic2.api.crops.ICropTile;
@ -34,7 +33,6 @@ public class GT_BaseCrop extends CropCard {
*/
public GT_BaseCrop(int aID, String aCropName, String aDiscoveredBy, ItemStack aDrop, ItemStack[] aSpecialDrops, ItemStack aBaseSeed, int aTier, int aMaxSize, int aGrowthSpeed, int aAfterHarvestSize, int aHarvestSize, int aStatChemical, int aStatFood, int aStatDefensive, int aStatColor, int aStatWeed, String[] aAttributes) {
mName = aCropName;
aID = GregTech_API.sConfiguration.addIDConfig("crops", mName.replaceAll(" ", "_"), aID);
if (aDiscoveredBy != null && !aDiscoveredBy.equals("")) mDiscoveredBy = aDiscoveredBy;
if (aDrop != null && aID > 0 && aID < 256) {
mDrop = GT_Utility.copy(aDrop);
@ -51,7 +49,7 @@ public class GT_BaseCrop extends CropCard {
mStats[4] = aStatWeed;
mAttributes = aAttributes;
if (!Crops.instance.registerCrop(this, aID)) throw new GT_ItsNotMyFaultException("Make sure the Crop ID is valid!");
if (aBaseSeed != null) Crops.instance.registerCrop(this, aID); // Crops.instance.registerBaseSeed(aBaseSeed, aID, 1, 1, 1, 1);
if (aBaseSeed != null) Crops.instance.registerCrop(this, aID);
sCropList.add(this);
}
}

13
src/main/java/gregtechmod/api/util/GT_Config.java
View file

@ -11,12 +11,11 @@ public class GT_Config {
public static boolean system = false;
public static Configuration sConfigFileStandard, sConfigFileIDs, sConfigFileAdvRecipes;
public static Configuration sConfigFileStandard, sConfigFileAdvRecipes;
public GT_Config(Configuration aConfigFileStandard, Configuration aConfigFileIDs, Configuration aConfigFileAdvRecipes) {
public GT_Config(Configuration aConfigFileStandard, Configuration aConfigFileAdvRecipes) {
sConfigFileAdvRecipes = aConfigFileAdvRecipes;
sConfigFileStandard = aConfigFileStandard;
sConfigFileIDs = aConfigFileIDs;
}
public String getStackConfigName(ItemStack aStack) {
@ -27,14 +26,6 @@ public class GT_Config {
return aStack.getItem() + "." + aStack.getItemDamage();
}
public int addIDConfig(String aCategory, String aName, int aDefault) {
if (aName == null) return aDefault;
Property tProperty = sConfigFileIDs.get(aCategory, aName, aDefault);
int rResult = tProperty.getInt(aDefault);
if (!tProperty.wasRead()) sConfigFileIDs.save();
return rResult;
}
public boolean addAdvConfig(Object aCategory, ItemStack aStack, boolean aDefault) {
return addAdvConfig(aCategory, getStackConfigName(aStack), aDefault);
}

24
src/main/java/gregtechmod/api/util/GT_LanguageManager.java
View file

@ -1,36 +1,12 @@
package gregtechmod.api.util;
import cpw.mods.fml.common.registry.LanguageRegistry;
import net.minecraftforge.common.config.Configuration;
import net.minecraftforge.common.config.Property;
public class GT_LanguageManager {
public static volatile int VERSION = 404;
/** Yeah! I got a File for Slang! */
public static Configuration sLangFile;
public static String[] mNameList0 = {"Adv_Machine", "Fusioncoil", "Iridium_reinforced_Stone", "Block_of_Silver", "Block_of_Ruby", "Block_of_Sapphire", "LESU_Block", "Block_of_Aluminium", "Block_of_Titanium", "Block_of_Chrome", "Highly_Advanced_Machineblock", "Block_of_Steel", "Block_of_Brass", "Standard_Machine_Casing", "Reinforced_Machine_Casing", "Advanced_Machine_Casing"};
public static String[] mNameList1 = {"GT_BUG", "Fusionreactor", "Lightningrod", "Quantumchest", "GregTech_Computercube", "UUM_Assembler", "Sonictron", "Lapotronic_Energystorageunit", "Interdimensional_Energystorageunit", "Adjustable_Energystorageunit", "Charge_O_Mat", "Industrial_Centrifuge", "Superconductorwire", "Playerdetector", "Matterfabricator", "Supercondensator"};
public static String[] mNameList2 = {"GT_Ore", "Galena_Ore", "Iridium_Ore", "Ruby_Ore", "Sapphire_Ore", "Bauxite_Ore", "Pyrite_Ore", "Cinnabar_Ore", "Sphalerite_Ore", "Tungstate_Ore", "Cooperite_Ore", "Olivine_Ore", "Sodalite_Ore", "Tetrahedrite_Ore", "Cassiterite_Ore", "Nickel_Ore"};
public static String[] mNameList3 = {"GT_LeadBlock", "GT_ElectrumBlock", "GT_ZincBlock", "GT_OlivineBlock", "GT_GreenSapphireBlock", "GT_PlatinumBlock", "GT_TungstenBlock", "GT_NickelBlock", "GT_TungstenSteelWall", "GT_TungstenSteelIridiumWall", "GT_InvarBlock", "GT_OsmiumBlock", "GT_IridiumBlock", "GT_Bronze_Plated_Bricks", "GT_YellowGarnetBlock", "GT_RedGarnetBlock"};
public static String[] mNameList4 = {"GT_Black_Granite", "GT_Black_Granite_Cobble", "GT_Black_Granite_Cobble_Mossy", "GT_Black_Granite_Bricks", "GT_Black_Granite_Bricks_Cracked", "GT_Black_Granite_Bricks_Mossy", "GT_Black_Granite_Bricks_Chiseled", "GT_Black_Granite_Smooth", "GT_Red_Granite", "GT_Red_Granite_Cobble", "GT_Red_Granite_Cobble_Mossy", "GT_Red_Granite_Bricks", "GT_Red_Granite_Bricks_Cracked", "GT_Red_Granite_Bricks_Mossy", "GT_Red_Granite_Bricks_Chiseled", "GT_Red_Granite_Smooth"};
public static String[] mNameListItem = {"GT_MetaItem_00", "GT_MetaItem_01", "GT_MetaItem_02", "GT_MetaItem_03", "GT_MetaItem_04", "GT_MetaItem_05", "GT_MetaItem_06", "GT_MetaItem_07", "GT_MetaItem_08", "GT_MetaItem_09", "GT_MetaItem_10", "GT_MetaItem_11", "GT_MetaItem_12", "GT_MetaItem_13", "GT_MetaItem_14", "GT_MetaItem_15", "GregTech_Sensorcard", "GregTech_Sensorkit", "Ultimate_Cheat_Armor", "", "", "", "", "", "", "", "", "", "", "", "Iron_Mortar", "Flint_Mortar", "Sonictron", "Destructopack", "60k_Helium_Coolantcell", "180k_Helium_Coolantcell", "360k_Helium_Coolantcell", "Lapotronic_Energyorb", "Cloaking_Device", "Bronze_Jack_Hammer", "Iridium_Neutronreflector", "Steel_Jack_Hammer", "Diamond_Jack_Hammer", "Dataorb", "Lighthelmet", "Lapotronpack", "Rockcutter", "Teslastaff", "Thoriumcell", "Double_Thoriumcell", "Quad_Thoriumcell", "Plutoniumcell", "Double_Plutoniumcell", "Quad_Plutoniumcell", "Lithium_Reactor_Cell", "Debug_Scanner", "Lithium_Battery_Empty", "Lithium_Battery", "Lithium_Batpack", "Personal_Force_Field_Generator", "60k_NaK_Coolantcell", "180k_NaK_Coolantcell", "360k_NaK_Coolantcell", "GT_Scanner", "GT_Crowbar", "GT_Screwdriver", "GT_Wrench_Steel", "GT_Wrench_Iron", "GT_Wrench_TungstenSteel", "GT_Wrench_Bronze", "GT_Wrench_Electric", "GT_Wrench_Advanced", "GT_Hammer_Rubber", "GT_Hammer_Iron", "GT_Hammer_Bronze", "GT_Hammer_Steel", "GT_Hammer_Tungstensteel", "GT_SolderingTool", "GT_SolderingTin", "GT_SolderingLead", "GT_Turbine_Bronze", "GT_Turbine_Steel", "GT_Turbine_Magnalium", "GT_Turbine_Tungstensteel", "GT_Turbine_Carbon", "GT_Lava_Filter", "GT_File_Iron", "GT_File_Bronze", "GT_File_Steel", "GT_File_Tungstensteel", "GT_Spray_Bug", "GT_Spray_Ice", "GT_Spray_Hardener", "GT_Spray_Foam", "GT_Spray_Pepper", "GT_Spray_Hydration", "GT_Spray_00", "GT_Spray_01", "GT_Spray_02", "GT_Spray_03", "GT_Spray_04", "GT_Spray_05", "GT_Spray_06", "GT_Spray_07", "GT_Spray_08", "GT_Spray_09", "GT_Spray_10", "GT_Spray_11", "GT_Spray_12", "GT_Spray_13", "GT_Spray_14", "GT_Spray_15", "Empty_Electric_Wrench", "Empty_Advanced_Wrench", "Empty_Soldering_Tool", "GT_Saw_Iron", "GT_Saw_Bronze", "GT_Saw_Steel", "GT_Saw_Tungstensteel", "GT_Saw_Electric", "GT_Saw_Advanced", "Empty_Electric_Saw", "Empty_Advanced_Saw", "GT_Drill_Advanced", "GT_Flint_Sword", "GT_Flint_Pickaxe", "GT_Flint_Shovel", "GT_Flint_Axe", "GT_Flint_Hoe", "GT_Steel_Sword", "GT_Steel_Pickaxe", "GT_Steel_Shovel", "GT_Steel_Axe", "GT_Steel_Hoe", "GT_TungstenSteel_Sword", "GT_TungstenSteel_Pickaxe", "GT_TungstenSteel_Shovel", "GT_TungstenSteel_Axe", "GT_TungstenSteel_Hoe"};
public static String[] mRegionalNameList0 = {"Advanced Machine Block", "Fusion Coil", "Iridium Reinforced Stone", "Block of Silver", "Block of Ruby", "Block of Sapphire", "LESU-Block", "Block of Aluminium", "Block of Titanium", "Block of Chrome", "Highly Advanced Machineblock", "Block of Steel", "Block of Brass", "Standard Machine Casing", "Reinforced Machine Casing", "Advanced Machine Casing"};
public static String[] mRegionalNameList1 = {"You ran into a serious Bug, if you have legitly aquired this Block, please report it immidietly", "Fusion Reactor", "Lightning Rod", "Old Quantum Chest", "GregTech Computer Cube", "UUM-Assembler", "Sonictron", "Lapotronic Energy Storage Unit", "Interdimensional Energy Storage Unit", "Adjustable Energy Storage Unit", "Charge-O-Mat", "Industrial Centrifuge", "Superconductor Wire", "Player Detector", "Matter Fabricator", "Supercondensator"};
public static String[] mRegionalNameList2 = {"GT_Ore", "Galena Ore", "Iridium Ore", "Ruby Ore", "Sapphire Ore", "Bauxite Ore", "Pyrite Ore", "Cinnabar Ore", "Sphalerite Ore", "Tungstate Ore", "Sheldonite Ore", "Olivine Ore", "Sodalite Ore", "Tetrahedrite Ore", "Cassiterite Ore", "Nickel Ore"};
public static String[] mRegionalNameList3 = {"Block of Lead", "Block of Electrum", "Block of Zinc", "Block of Olivine", "Block of Green Sapphire", "Block of Platinum", "Block of Tungsten", "Block of Nickel", "Tungstensteel Block", "Iridium Reinforced Tungstensteel Block", "Block of Invar", "Block of Osmium", "Block of Iridium", "Bronze Plated Bricks", "Block of Yellow Garnet", "Block of Red Garnet"};
public static String[] mRegionalNameList4 = {"Black Granite", "Black Granite Cobblestone", "Mossy Black Granite Cobblestone", "Black Granite Bricks", "Cracked Black Granite Bricks", "Mossy Black Granite Bricks", "Chiseled Black Granite", "Smooth Black Granite", "Red Granite", "Red Granite Cobblestone", "Mossy Red Granite Cobblestone", "Red Granite Bricks", "Cracked Red Granite Bricks", "Mossy Red Granite Bricks", "Chiseled Red Granite", "Smooth Red Granite"};
public static String[] mRegionalNameListItem = {"GT_MetaItem_00", "GT_MetaItem_01", "GT_MetaItem_02", "GT_MetaItem_03", "GT_MetaItem_04", "GT_MetaItem_05", "GT_MetaItem_06", "GT_MetaItem_07", "GT_MetaItem_08", "GT_MetaItem_09", "GT_MetaItem_10", "GT_MetaItem_11", "GT_MetaItem_12", "GT_MetaItem_13", "GT_MetaItem_14", "GT_MetaItem_15", "GregTech Sensor Card", "GregTech Sensor Kit", "Ultimate Cheat Armor", "", "", "", "", "", "", "", "", "", "", "", "Iron Mortar", "Flint Mortar", "Sonictron", "Destructopack", "60k Helium Coolant Cell", "180k Helium Coolant Cell", "360k Helium Coolant Cell", "Lapotronic Energy Orb", "Cloaking Device", "Bronze Jack Hammer", "Iridium Neutron Reflector", "Steel Jack Hammer", "Diamond Jack Hammer", "Data Orb", "Light Helmet", "Lapotron Pack", "Rock Cutter", "Tesla Staff", "Thorium Cell", "Double Thorium Cell", "Quad Thorium Cell", "Plutonium Cell", "Double Plutonium Cell", "Quad Plutonium Cell", "Lithium Reactor Cell", "Debug Scanner", "Lithium-Battery", "Lithium-Battery", "Lithium-Batpack", "Personal Force Field Generator", "60k NaK Coolantcell", "180k NaK Coolantcell", "360k NaK Coolantcell", "Portable Scanner", "Crowbar", "Screwdriver", "Steel Wrench", "Iron Wrench", "Tungstensteel Wrench", "Bronze Wrench", "Electric Wrench", "Advanced Wrench", "Rubber Hammer", "Iron Hammer", "Bronze Hammer", "Steel Hammer", "Tungstensteel Hammer", "Electric Soldering Iron", "Soldering Tin", "Soldering Lead", "Bronze Turbine Rotor", "Steel Turbine Rotor", "Magnalium Turbine Rotor", "Tungstensteel Turbine Rotor", "Carbon Turbine Rotor", "Lava Filter", "Iron File", "Bronze File", "Steel File", "Tungstensteel File", "Bug Spray", "Freezing Spray", "Hardening Spray", "Construction Spray", "Pepper Spray", "Hydration Spray", "Spray Can (Black)", "Spray Can (Red)", "Spray Can (Green)", "Spray Can (Brown)", "Spray Can (Blue)", "Spray Can (Purple)", "Spray Can (Cyan)", "Spray Can (Light Gray)", "Spray Can (Gray)", "Spray Can (Pink)", "Spray Can (Lime)", "Spray Can (Yellow)", "Spray Can (Light Blue)", "Spray Can (Magenta)", "Spray Can (Orange)", "Spray Can (White)", "Empty Electric Wrench", "Empty Advanced Wrench", "Empty Soldering Iron", "Iron Saw", "Bronze Saw", "Steel Saw", "Tungstensteel Saw", "Electric Saw", "Advanced Saw", "Empty Electric Saw", "Empty Advanced Saw", "Advanced Drill", "Flint Sword", "Flint Pickaxe", "Flint Shovel", "Flint Axe", "Flint Hoe", "Steel Sword", "Steel Pickaxe", "Steel Shovel", "Steel Axe", "Steel Hoe", "Tungstensteel Sword", "Tungstensteel Pickaxe", "Tungstensteel Shovel", "Tungstensteel Axe", "Tungstensteel Hoe"};
@SuppressWarnings("deprecation")
public static String addStringLocalization(String aKey, String aValue) {
Property tProperty = sLangFile.get("LanguageFile", aKey, aValue);
if (sLangFile.get("EnableLangFile", "UseThisFileAsLanguageFile", false).getBoolean(false)) aValue = tProperty.getString();
if (!tProperty.wasRead()) sLangFile.save();
LanguageRegistry.instance().addStringLocalization(aKey, aValue);
return aValue;
}
}

6
src/main/java/gregtechmod/api/util/GT_Utility.java
View file

@ -625,11 +625,11 @@ public class GT_Utility {
sBookCount++;
ItemStack rStack = new ItemStack(Items.written_book, 1);
NBTTagCompound tNBT = new NBTTagCompound();
tNBT.setString("title", GT_LanguageManager.addStringLocalization("Book." + aTitle + ".Name", aTitle));
// tNBT.setString("title", GT_LanguageManager.addStringLocalization("Book." + aTitle + ".Name", aTitle)); TODO: LOCALE
tNBT.setString("author", aAuthor);
NBTTagList tNBTList = new NBTTagList();
for (byte i = 0; i < aPages.length; i++) {
aPages[i] = GT_LanguageManager.addStringLocalization("Book." + aTitle + ".Page" + ((i<10)?"0"+i:i), aPages[i]);
//aPages[i] = GT_LanguageManager.addStringLocalization("Book." + aTitle + ".Page" + ((i<10)?"0"+i:i), aPages[i]);
if (i < 48) {
if (aPages[i].length() < 256)
tNBTList.appendTag(new NBTTagString(aPages[i]));
@ -691,7 +691,7 @@ public class GT_Utility {
if (GregTech_API.gregtechmod.allowPacketToBeSent(aPacket, tPlayer)) {
Chunk tChunk = aWorld.getChunkFromBlockCoords(aX, aZ);
if (tPlayer.getServerForPlayer().getPlayerManager().isPlayerWatchingChunk(tPlayer, tChunk.xPosition, tChunk.zPosition)) {
if (GregTech_API.DEBUG_MODE) GT_Log.log.debug("sent Packet to " + tPlayer.getDisplayName());
if (GregTech_API.DEBUG_MODE) GT_Log.log.info("sent Packet to " + tPlayer.getDisplayName());
GT_PacketHandler.sendPacket(aPacket, tPlayer);
}
}

3
src/main/java/gregtechmod/common/GT_FluidRegistry.java
View file

@ -1,8 +1,6 @@
package gregtechmod.common;
import gregtechmod.api.enums.Materials;
import gregtechmod.api.util.GT_LanguageManager;
import java.util.ArrayList;
import net.minecraft.item.ItemStack;
@ -16,7 +14,6 @@ public class GT_FluidRegistry {
public static void addFluid(String aName, String aLocalized, Materials aMaterial, int aState, ItemStack aFullContainer, ItemStack aEmptyContainer) {
Fluid tFluid = new Fluid(aName.toLowerCase());
GT_LanguageManager.addStringLocalization(aName.toLowerCase(), aLocalized==null?aName:aLocalized);
if (FluidRegistry.registerFluid(tFluid)) {
sFluids.add(tFluid);

30
src/main/java/gregtechmod/common/items/GT_MetaMachine_Item.java
View file

@ -60,17 +60,17 @@ public class GT_MetaMachine_Item extends ItemBlock {
if (temp instanceof IGregTechTileEntity) {
IGregTechTileEntity tTileEntity = (IGregTechTileEntity)temp;
tTileEntity.setInitialValuesAsNBT(new NBTTagCompound(), (short)tDamage);
if (tTileEntity.getDescription() != null) mString0[tDamage] = GT_LanguageManager.addStringLocalization("TileEntity_DESCRIPTION_" + tDamage, tTileEntity.getDescription());
if (tTileEntity.getInputVoltage() > 0) mString1[tDamage] = GT_LanguageManager.addStringLocalization("TileEntity_EUp_IN", "Max EU/p IN: ") + tTileEntity.getInputVoltage(); else mString1[tDamage] = "";
if (tTileEntity.getDescription() != null) mString0[tDamage] = "LOCALE";//GT_LanguageManager.addStringLocalization("TileEntity_DESCRIPTION_" + tDamage, tTileEntity.getDescription());
if (tTileEntity.getInputVoltage() > 0) mString1[tDamage] = "LOCALE";//GT_LanguageManager.addStringLocalization("TileEntity_EUp_IN", "Max EU/p IN: ") + tTileEntity.getInputVoltage(); else mString1[tDamage] = "";
if (tTileEntity.getMetaTileEntity() == null || tTileEntity.getMetaTileEntity().getSpecialVoltageToolTip() == null) {
if (tTileEntity.getOutputVoltage() > 0) mString2[tDamage] = GT_LanguageManager.addStringLocalization("TileEntity_EUp_OUT", "Max EU/p OUT: ") + tTileEntity.getOutputVoltage(); else mString2[tDamage] = "";
if (tTileEntity.getOutputVoltage() > 0) mString2[tDamage] = "LOCALE";//GT_LanguageManager.addStringLocalization("TileEntity_EUp_OUT", "Max EU/p OUT: ") + tTileEntity.getOutputVoltage(); else mString2[tDamage] = "";
} else {
mString2[tDamage] = GT_LanguageManager.addStringLocalization("TileEntity_VoltageToolTip_" + tDamage, tTileEntity.getMetaTileEntity().getSpecialVoltageToolTip());
mString2[tDamage] = "LOCALE";//GT_LanguageManager.addStringLocalization("TileEntity_VoltageToolTip_" + tDamage, tTileEntity.getMetaTileEntity().getSpecialVoltageToolTip());
}
if (tTileEntity.getOutputAmperage() > 1) mString3[tDamage] = GT_LanguageManager.addStringLocalization("TileEntity_EUp_AMOUNT", "Amount of Output Packets: ") + tTileEntity.getOutputAmperage(); else mString3[tDamage] = "";
if (tTileEntity.getEUCapacity() > 10000) mString4[tDamage] = GT_LanguageManager.addStringLocalization("TileEntity_EUp_STORE", "EU Storage: ") + tTileEntity.getEUCapacity(); else mString4[tDamage] = "";
if (tTileEntity.getOutputAmperage() > 1) mString3[tDamage] = "LOCALE";//GT_LanguageManager.addStringLocalization("TileEntity_EUp_AMOUNT", "Amount of Output Packets: ") + tTileEntity.getOutputAmperage(); else mString3[tDamage] = "";
if (tTileEntity.getEUCapacity() > 10000) mString4[tDamage] = "LOCALE";//GT_LanguageManager.addStringLocalization("TileEntity_EUp_STORE", "EU Storage: ") + tTileEntity.getEUCapacity(); else mString4[tDamage] = "";
mString5[tDamage] = (tTileEntity.isOverclockerUpgradable()?"O ":"") + (tTileEntity.isTransformerUpgradable()?"T ":"") + (tTileEntity.isBatteryUpgradable(0, (byte)0)?"B ":"") + (tTileEntity.isMJConverterUpgradable()?"M ":"") + (tTileEntity.isSteamEngineUpgradable()?"S ":"");
if (!mString5[tDamage].equals("")) mString5[tDamage] = GT_LanguageManager.addStringLocalization("TileEntity_UPGRADES", "Possible Upgrades: ") + mString5[tDamage];
if (!mString5[tDamage].equals("")) mString5[tDamage] = "LOCALE";//GT_LanguageManager.addStringLocalization("TileEntity_UPGRADES", "Possible Upgrades: ") + mString5[tDamage];
mString6[tDamage] = "";
}
}
@ -88,14 +88,14 @@ public class GT_MetaMachine_Item extends ItemBlock {
NBTTagCompound aNBT = aStack.getTagCompound();
if (aNBT != null) {
if (aNBT.getBoolean("mMJConverter")) aList.add(GT_LanguageManager.addStringLocalization("TileEntity_MJCONVERTER", "has MJ-Converter"));
if (aNBT.getBoolean("mSteamConverter")) aList.add(GT_LanguageManager.addStringLocalization("TileEntity_STEAMCONVERTER", "has Steam Upgrade"));
int tAmount = 0;
if ((tAmount = aNBT.getByte("mOverclockers")) > 0) aList.add(tAmount + " " + GT_LanguageManager.addStringLocalization("TileEntity_OVERCLOCKERS", "Overclocker Upgrades"));
if ((tAmount = aNBT.getByte("mTransformers")) > 0) aList.add(tAmount + " " + GT_LanguageManager.addStringLocalization("TileEntity_TRANSFORMERS", "Transformer Upgrades"));
if ((tAmount = aNBT.getByte("mRSEnergyCells")) > 0) aList.add(tAmount + " " + GT_LanguageManager.addStringLocalization("TileEntity_ENERGYCELLS", "Energy Cell Upgrades"));
if ((tAmount = aNBT.getByte("mSteamTanks")) > 0) aList.add(tAmount + " " + GT_LanguageManager.addStringLocalization("TileEntity_STEAMTANKS", "Steam Tank Upgrades"));
if ((tAmount = aNBT.getInteger("mUpgradedStorage")) > 0) aList.add(tAmount + " " + GT_LanguageManager.addStringLocalization("TileEntity_EUSTORAGES", "Additional EU-Storage"));
// if (aNBT.getBoolean("mMJConverter")) aList.add(GT_LanguageManager.addStringLocalization("TileEntity_MJCONVERTER", "has MJ-Converter"));
// if (aNBT.getBoolean("mSteamConverter")) aList.add(GT_LanguageManager.addStringLocalization("TileEntity_STEAMCONVERTER", "has Steam Upgrade"));
// int tAmount = 0;
// if ((tAmount = aNBT.getByte("mOverclockers")) > 0) aList.add(tAmount + " " + GT_LanguageManager.addStringLocalization("TileEntity_OVERCLOCKERS", "Overclocker Upgrades"));
// if ((tAmount = aNBT.getByte("mTransformers")) > 0) aList.add(tAmount + " " + GT_LanguageManager.addStringLocalization("TileEntity_TRANSFORMERS", "Transformer Upgrades"));
// if ((tAmount = aNBT.getByte("mRSEnergyCells")) > 0) aList.add(tAmount + " " + GT_LanguageManager.addStringLocalization("TileEntity_ENERGYCELLS", "Energy Cell Upgrades"));
// if ((tAmount = aNBT.getByte("mSteamTanks")) > 0) aList.add(tAmount + " " + GT_LanguageManager.addStringLocalization("TileEntity_STEAMTANKS", "Steam Tank Upgrades"));
// if ((tAmount = aNBT.getInteger("mUpgradedStorage")) > 0) aList.add(tAmount + " " + GT_LanguageManager.addStringLocalization("TileEntity_EUSTORAGES", "Additional EU-Storage"));
}
} catch(Throwable e) {
GT_Log.log.catching(e);

7
src/main/java/gregtechmod/loaders/load/GT_ItemLoader.java
View file

@ -636,12 +636,5 @@ public class GT_ItemLoader implements Runnable {
codechicken.nei.api.API.hideItem(GT_ModHandler.getIC2Item("electricWrench", 1));
codechicken.nei.api.API.hideItem(GT_ModHandler.getIC2Item("chainsaw", 1));
} catch(Throwable e) {if (GregTech_API.DEBUG_MODE) GT_Log.log.catching(e);}
GT_Log.log.info("GT_Mod: Register regular Item Names.");
for (int i = 16; i < GregTech_API.sItemList.length; i++) {
if (GregTech_API.sItemList[i] != null) {
GT_LanguageManager.addStringLocalization(GregTech_API.sItemList[i].getUnlocalizedName() + ".name", GT_LanguageManager.mRegionalNameListItem[i]);
}
}
}
}