fixed a whole bunch of client side stuff

This commit is contained in:
Progwml6 committed 2014-01-08 00:45:09 -05:00
1 parent 9814eadaea
commit a5862aae20
42 files changed
+253 -658

No files matched your search

@@ -36,8 +36,8 @@ public class EnvironmentChecks
if (Loader.isModLoaded("gregtech_addon"))
{
TConstruct.logger.severe("Tinkers' Construct and GregTech are incompatible for the following reasons:");
TConstruct.logger.severe(modCompatDetails("GregTech", true));
TConstruct.logger.error("Tinkers' Construct and GregTech are incompatible for the following reasons:");
TConstruct.logger.error(modCompatDetails("GregTech", true));
modIds.add("gregtech_addon");
incompatibilities.add("GregTech");
}
@@ -36,8 +36,8 @@ public class EnvironmentGui extends GuiScreen
{
Keyboard.enableRepeatEvents(true);
this.buttonList.clear();
this.buttonList.add(new GuiButton(0, this.width / 2 - 175, this.height / 4 + 96 + 24, 350, 20, I18n.getString("I accept responsibility for all cross-mod bugs in this modpack.")));
this.buttonList.add(new GuiButton(1, this.width / 2 - 175, this.height / 4 + 120 + 24, 350, 20, I18n.getString("I do not want to run these mods together. (Exits Minecraft)")));
this.buttonList.add(new GuiButton(0, this.width / 2 - 175, this.height / 4 + 96 + 24, 350, 20, I18n.getStringParams("I accept responsibility for all cross-mod bugs in this modpack.")));
this.buttonList.add(new GuiButton(1, this.width / 2 - 175, this.height / 4 + 120 + 24, 350, 20, I18n.getStringParams("I do not want to run these mods together. (Exits Minecraft)")));
}
/**
@@ -59,7 +59,7 @@ public class EnvironmentGui extends GuiScreen
{
count++;
if (count >= mods.size())
this.mc.displayGuiScreen(this.parentGuiScreen);
this.field_146297_k.displayGuiScreen(this.parentGuiScreen);
}
if (button.id == 1)
{
@@ -76,12 +76,12 @@ public class EnvironmentGui extends GuiScreen
builder.setLength(0);
this.drawDefaultBackground();
String mod = mods.get(count);
this.drawCenteredString(this.fontRenderer, I18n.getString("Tinkers' Construct is not compatible with "+mod), this.width / 2, 20, 0xFFFFFF);
this.drawCenteredString(this.fontRenderer, I18n.getString("The following reasons are given:"), this.width / 2, 32, 0xFFFFFF);
fontRenderer.drawSplitString(I18n.getString(EnvironmentChecks.modCompatDetails(mod, false)), 20, 52, 400, 0xffffff);
this.drawCenteredString(this.field_146289_q, I18n.getStringParams("Tinkers' Construct is not compatible with "+mod), this.width / 2, 20, 0xFFFFFF);
this.drawCenteredString(this.field_146289_q, I18n.getStringParams("The following reasons are given:"), this.width / 2, 32, 0xFFFFFF);
field_146289_q.drawSplitString(I18n.getStringParams(EnvironmentChecks.modCompatDetails(mod, false)), 20, 52, 400, 0xffffff);
this.drawCenteredString(this.fontRenderer, I18n.getString("The Tinkers' Construct team will not accept bug reports with this mod installed."), this.width / 2, 153, 0xFFFFFF);
this.drawCenteredString(this.fontRenderer, I18n.getString("We apologize for any inconvenience this may cause you."), this.width / 2, 165, 0xFFFFFF);
this.drawCenteredString(this.field_146289_q, I18n.getStringParams("The Tinkers' Construct team will not accept bug reports with this mod installed."), this.width / 2, 153, 0xFFFFFF);
this.drawCenteredString(this.field_146289_q, I18n.getStringParams("We apologize for any inconvenience this may cause you."), this.width / 2, 165, 0xFFFFFF);
super.drawScreen(par1, par2, par3);
}
}
@@ -23,7 +23,7 @@ public class TCraftingHandler implements ICraftingHandler
{
if (itemID == TRepo.toolStationWood.blockID)
{
TPlayerStats stats = TConstruct.playerTracker.getPlayerStats(player.username);
TPlayerStats stats = TConstruct.playerTracker.getPlayerStats(player.getDisplayName());
NBTTagCompound tags = player.getEntityData().getCompoundTag("TConstruct");
if (!tags.getBoolean("materialManual") || !stats.materialManual)
{
@@ -34,7 +34,7 @@ public class TCraftingHandler implements ICraftingHandler
}
if (itemID == TRepo.smeltery.blockID || itemID == TRepo.lavaTank.blockID)
{
TPlayerStats stats = TConstruct.playerTracker.getPlayerStats(player.username);
TPlayerStats stats = TConstruct.playerTracker.getPlayerStats(player.getDisplayName());
NBTTagCompound tags = player.getEntityData().getCompoundTag("TConstruct");
if (!tags.getBoolean("smelteryManual") || !stats.smelteryManual)
{
@@ -78,7 +78,7 @@ public class DimensionBlacklist
config.load();
twilightForestDimensionID = config.get("dimension", "dimensionID", -100).getInt();
TConstruct.logger.fine("Twilight Forest Dim ID: " + twilightForestDimensionID);
TConstruct.logger.trace("Twilight Forest Dim ID: " + twilightForestDimensionID);
}
else twilightForestDimensionID = -100;
}
@@ -94,7 +94,7 @@ public class DimensionBlacklist
config.load();
promisedLandDimensionID = config.get("dimension settings", "Promised Land Dimension ID", -200).getInt();
TConstruct.logger.fine("Promised Lands Dim ID: " + promisedLandDimensionID);
TConstruct.logger.trace("Promised Lands Dim ID: " + promisedLandDimensionID);
}
else promisedLandDimensionID = -100;
}
@@ -19,11 +19,7 @@ public class PHConstruct
Configuration config = new Configuration(confFile);
/* Load the configuration file */
config.load();
/* Define the mod's IDs.
* Avoid values below 4096 for items and in the 250-450 range for blocks
*/
superfunWorld = config.get("Superfun", "All the world is Superfun", false).getBoolean(false);
keepHunger = config.get("Difficulty Changes", "Keep hunger on death", true).getBoolean(true);
@@ -55,209 +51,6 @@ public class PHConstruct
ingotsManyullynAlloy = config.get("Smeltery Output Modification", "Manyullyn ingot return", 1, "Number of ingots returned from smelting Manyullyn in the smeltery").getDouble(1);
ingotsPigironAlloy = config.get("Smeltery Output Modification", "Pig Iron ingot return", 1, "Number of ingots returned from smelting Pig Iron in the smeltery").getDouble(1);
//1467-1489
woodStation = config.getBlock("Wood Tool Station", 1471).getInt(1471);
heldItemBlock = config.getBlock("Held Item Block", 1472).getInt(1472);
lavaTank = config.getBlock("Lava Tank", 1473).getInt(1473);
smeltery = config.getBlock("Smeltery", 1474).getInt(1474);
oreSlag = config.getBlock("Ores Slag", 1475).getInt(1475);
craftedSoil = config.getBlock("Special Soil", 1476).getInt(1476);
searedTable = config.getBlock("Seared Table", 1477).getInt(1477);
metalBlock = config.getBlock("Metal Storage", 1478).getInt(1478);
/*metalFlowing = config.getBlock("Liquid Metal Flowing", 1479).getInt(1479);
metalStill = config.getBlock("Liquid Metal Still", 1480).getInt(1480);*/
multiBrick = config.getBlock("Multi Brick", 1481).getInt(1481);
stoneTorch = config.getBlock("Stone Torch", 1484).getInt(1484);
stoneLadder = config.getBlock("Stone Ladder", 1479).getInt(1479);
oreBerry = config.getBlock("Ore Berry One", 1485).getInt(1485);
oreBerrySecond = config.getBlock("Ore Berry Two", 1486).getInt(1486);
oreGravel = config.getBlock("Ores Gravel", 1488).getInt(1488);
speedBlock = config.getBlock("Speed Block", 1489).getInt(1489);
landmine = config.getBlock("Landmine", 1470).getInt(1470);
toolForge = config.getBlock("Tool Forge", 1468).getInt(1468);
multiBrickFancy = config.getBlock("Multi Brick Fancy", 1467).getInt(1467);
barricadeOak = config.getBlock("Oak Barricade", 1469).getInt(1469);
barricadeSpruce = config.getBlock("Spruce Barricade", 1482).getInt(1482);
barricadeBirch = config.getBlock("Birch Barricade", 1483).getInt(1483);
barricadeJungle = config.getBlock("Jungle Barricade", 1487).getInt(1487);
lavaTankNether = config.getBlock("Nether Lava Tank", 3186).getInt(3186);
smelteryNether = config.getBlock("Nether Smeltery", 3187).getInt(3187);
searedTableNether = config.getBlock("Nether Seared Block", 3188).getInt(3188);
bloodChannel = config.getBlock("Blood Channel", 3189).getInt(3189);
slimeChannel = config.getBlock("Slime Channel", 3190).getInt(3190);
slimePad = config.getBlock("Slime Pad", 3191).getInt(3191);
furnaceSlab = config.getBlock("Furnace Slab", 3192).getInt(3192);
//Thermal Expansion
moltenSilver = config.getBlock("Molten Silver", 3195).getInt(3195);
moltenLead = config.getBlock("Molten Lead", 3196).getInt(3196);
moltenNickel = config.getBlock("Molten Nickel", 3197).getInt(3197);
moltenShiny = config.getBlock("Molten Platinum", 3198).getInt(3198);
moltenInvar = config.getBlock("Molten Invar", 3199).getInt(3199);
moltenElectrum = config.getBlock("Molten Electrum", 3200).getInt(3200);
moltenIron = config.getBlock("Molten Iron", 3201).getInt(3201);
moltenGold = config.getBlock("Molten Gold", 3202).getInt(3202);
moltenCopper = config.getBlock("Molten Copper", 3203).getInt(3203);
moltenTin = config.getBlock("Molten Tin", 3204).getInt(3204);
moltenAluminum = config.getBlock("Molten Aluminum", 3205).getInt(3205);
moltenCobalt = config.getBlock("Molten Cobalt", 3206).getInt(3206);
moltenArdite = config.getBlock("Molten Ardite", 3207).getInt(3207);
moltenBronze = config.getBlock("Molten Bronze", 3208).getInt(3208);
moltenAlubrass = config.getBlock("Molten Aluminum Brass", 3209).getInt(3209);
moltenManyullyn = config.getBlock("Molten Manyullyn", 3210).getInt(3210);
moltenAlumite = config.getBlock("Molten Alumite", 3211).getInt(3211);
moltenObsidian = config.getBlock("Molten Obsidian", 3212).getInt(3212);
moltenSteel = config.getBlock("Molten Steel", 3213).getInt(3213);
moltenGlass = config.getBlock("Molten Glass", 3214).getInt(3214);
moltenStone = config.getBlock("Molten Stone", 3215).getInt(3215);
moltenEmerald = config.getBlock("Molten Emerald", 3216).getInt(3216);
blood = config.getBlock("Liquid Cow", 3217).getInt(3217);
moltenEnder = config.getBlock("Molten Ender", 3218).getInt(3218);
glueBlock = config.getBlock("Glue Block", 3219).getInt(3219);
glueFluidBlock = config.getBlock("Glue Fluid Block", 3220).getInt(3220);
// signalBus = config.getBlock("Signal Bus", 3221).getInt(3221);
// signalTerminal = config.getBlock("Signal Terminal", 3222).getInt(3222);
glass = config.getBlock("Clear Glass", 3223).getInt(3223);
stainedGlass = config.getBlock("Stained Glass", 3224).getInt(3224);
stainedGlassClear = config.getBlock("Clear Stained Glass", 3225).getInt(3225);
// redstoneMachine = config.getBlock("Redstone Machines", 3226).getInt(3226); // Migrated to TMechworks
dryingRack = config.getBlock("Drying Rack", 3227).getInt(3227);
glassPane = config.getBlock("Glass Pane", 3228).getInt(3228);
stainedGlassClearPane = config.getBlock("Clear Stained Glass Pane", 3229).getInt(3229);
searedSlab = config.getBlock("Seared Slab", 3230).getInt(3230);
speedSlab = config.getBlock("Speed Slab", 3231).getInt(3231);
punji = config.getBlock("Punji", 3232).getInt(3232);
woodCrafter = config.getBlock("Crafting Station", 3233).getInt(3233);
slimePoolBlue = config.getBlock("Liquid Blue Slime", 3235).getInt(3235);
slimeGel = config.getBlock("Congealed Slime", 3237).getInt(3237);
slimeGrass = config.getBlock("Slime Grass", 3238).getInt(3238);
slimeTallGrass = config.getBlock("Slime Tall Grass", 3239).getInt(3239);
slimeLeaves = config.getBlock("Slime Grass Leaves", 3240).getInt(3240);
slimeSapling = config.getBlock("Slime Tree Sapling", 3241).getInt(3241);
meatBlock = config.getBlock("Meat Block", 3242).getInt(3242);
woodCrafterSlab = config.getBlock("Crafting Slab", 3243).getInt(3243);
woolSlab1 = config.getBlock("Wool Slab 1", 3244).getInt(3244);
woolSlab2 = config.getBlock("Wool Slab 2", 3245).getInt(3245);
castingChannel = config.getBlock("Casting Channel", 3249).getInt(3249);
slimePoolBlue = config.getBlock("Liquid Blue Slime", 3235).getInt(3235);
slimeGel = config.getBlock("Congealed Slime", 3237).getInt(3237);
slimeGrass = config.getBlock("Slime Grass", 3238).getInt(3238);
slimeTallGrass = config.getBlock("Slime Tall Grass", 3239).getInt(3239);
slimeLeaves = config.getBlock("Slime Grass Leaves", 3240).getInt(3240);
slimeSapling = config.getBlock("Slime Tree Sapling", 3241).getInt(3241);
meatBlock = config.getBlock("Meat Block", 3242).getInt(3242);
woodCrafterSlab = config.getBlock("Crafting Slab", 3243).getInt(3243);
woolSlab1 = config.getBlock("Wool Slab 1", 3244).getInt(3244);
woolSlab2 = config.getBlock("Wool Slab 2", 3245).getInt(3245);
airTank = config.getBlock("Air Tank", 3246).getInt(3246);
slimeExplosive = config.getBlock("SDX", 3247).getInt(3247);
castingChannel = config.getBlock("Casting Channel", 3249).getInt(3249);
woodenRail = config.getBlock("Wooden Rail", 3250).getInt(3250);
//3251+ belongs to Natura. Go backwards!
manual = config.getItem("Patterns and Misc", "Tinker's Manual", 14018).getInt(14018);
blankPattern = config.getItem("Patterns and Misc", "Blank Patterns", 14019).getInt(14019);
materials = config.getItem("Patterns and Misc", "Materials", 14020).getInt(14020);
toolRod = config.getItem("Patterns and Misc", "Tool Rod", 14021).getInt(14021);
toolShard = config.getItem("Patterns and Misc", "Tool Shard", 14022).getInt(14022);
woodPattern = config.getItem("Patterns and Misc", "Wood Pattern", 14023).getInt(14023);
metalPattern = config.getItem("Patterns and Misc", "Metal Pattern", 14024).getInt(14024);
armorPattern = config.getItem("Patterns and Misc", "Armor Pattern", 14025).getInt(14025);
pickaxeHead = config.getItem("Tool Parts", "Pickaxe Head", 14026).getInt(14026);
shovelHead = config.getItem("Tool Parts", "Shovel Head", 14027).getInt(14027);
axeHead = config.getItem("Tool Parts", "Axe Head", 14028).getInt(14028);
hoeHead = config.getItem("Tool Parts", "Hoe Head", 14029).getInt(14029);
swordBlade = config.getItem("Tool Parts", "Sword Blade", 14030).getInt(14030);
largeGuard = config.getItem("Tool Parts", "Large Guard", 14031).getInt(14031);
medGuard = config.getItem("Tool Parts", "Medium Guard", 14032).getInt(14032);
crossbar = config.getItem("Tool Parts", "Crossbar", 14033).getInt(14033);
binding = config.getItem("Tool Parts", "Tool Binding", 14034).getInt(14034);
frypanHead = config.getItem("Tool Parts", "Frypan Head", 14035).getInt(14035);
signHead = config.getItem("Tool Parts", "Sign Head", 14036).getInt(14036);
lumberHead = config.getItem("Tool Parts", "Lumber Axe Head", 14037).getInt(14037);
knifeBlade = config.getItem("Tool Parts", "Knife Blade", 14038).getInt(14038);
chiselHead = config.getItem("Tool Parts", "Chisel Head", 14039).getInt(14039);
scytheBlade = config.getItem("Tool Parts", "Scythe Head", 14040).getInt(14040);
toughBinding = config.getItem("Tool Parts", "Tough Binding", 14041).getInt(14041);
toughRod = config.getItem("Tool Parts", "Tough Rod", 14042).getInt(14042);
largeSwordBlade = config.getItem("Tool Parts", "Large Sword Blade", 14043).getInt(14043);
largePlate = config.getItem("Tool Parts", "Large Plate", 14044).getInt(14044);
excavatorHead = config.getItem("Tool Parts", "Excavator Head", 14045).getInt(14045);
hammerHead = config.getItem("Tool Parts", "Hammer Head", 14046).getInt(14046);
fullGuard = config.getItem("Tool Parts", "Full Guard", 14047).getInt(14047);
bowstring = config.getItem("Tool Parts", "Bowstring", 14048).getInt(14048);
arrowhead = config.getItem("Tool Parts", "Arrowhead", 14049).getInt(14049);
fletching = config.getItem("Tool Parts", "Fletching", 14050).getInt(14050);
pickaxe = config.getItem("Tools", "Pickaxe", 14051).getInt(14051);
shovel = config.getItem("Tools", "Shovel", 14052).getInt(14052);
axe = config.getItem("Tools", "Axe", 14053).getInt(14053);
hoe = config.getItem("Tools", "Hoe", 14054).getInt(14054);
broadsword = config.getItem("Tools", "Broadsword", 14055).getInt(14055);
rapier = config.getItem("Tools", "Rapier", 14057).getInt(14057);
longsword = config.getItem("Tools", "Longsword", 14056).getInt(14056);
dagger = config.getItem("Tools", "Dagger", 14065).getInt(14065);
frypan = config.getItem("Tools", "Frying Pan", 14058).getInt(14058);
battlesign = config.getItem("Tools", "Battlesign", 14059).getInt(14059);
mattock = config.getItem("Tools", "Mattock", 14060).getInt(14060);
lumberaxe = config.getItem("Tools", "Lumber Axe", 14061).getInt(14061);
longbow = config.getItem("Tools", "Longbow", 14062).getInt(14062);
shortbow = config.getItem("Tools", "Shortbow", 14063).getInt(14063);
potionLauncher = config.getItem("Tools", "Potion Launcher", 14064).getInt(14064);
chisel = config.getItem("Tools", "Chisel", 14066).getInt(14066);
scythe = config.getItem("Tools", "Scythe", 14067).getInt(14067);
cleaver = config.getItem("Tools", "Cleaver", 14068).getInt(14068);
excavator = config.getItem("Tools", "Excavator", 14069).getInt(14069);
hammer = config.getItem("Tools", "Hammer", 14070).getInt(14070);
battleaxe = config.getItem("Tools", "Battleaxe", 14071).getInt(14071);
cutlass = config.getItem("Tools", "Cutlass", 14072).getInt(14072);
arrow = config.getItem("Tools", "Arrow", 14073).getInt(14073);
buckets = config.getItem("Patterns and Misc", "Buckets", 14101).getInt(14101);
uselessItem = config.getItem("Patterns and Misc", "Title Icon", 14102).getInt(14102);
slimefood = config.getItem("Patterns and Misc", "Strange Food", 14103).getInt(14103);
oreChunks = config.getItem("Patterns and Misc", "Ore Chunks", 14104).getInt(14104);
heartCanister = config.getItem("Equipables", "Heart Canister", 14105).getInt(14105);
diamondApple = config.getItem("Patterns and Misc", "Jeweled Apple", 14107).getInt(14107);
woodHelmet = config.getItem("Equipables", "Wooden Helmet", 14106).getInt(14106);
woodChestplate = config.getItem("Equipables", "Wooden Chestplate", 14108).getInt(14108);
woodPants = config.getItem("Equipables", "Wooden Pants", 14109).getInt(14109);
woodBoots = config.getItem("Equipables", "Wooden Boots", 14110).getInt(14110);
glove = config.getItem("Equipables", "Gloves", 14111).getInt(14111);
knapsack = config.getItem("Equipables", "Knapsack", 14112).getInt(14112);
goldHead = config.getItem("Patterns and Misc", "Golden Head", 14113).getInt(14113);
jerky = config.getItem("Patterns and Misc", "Jerky", 14115).getInt(14115);
exoGoggles = config.getItem("Equipables", "Exo-Goggles", 14116).getInt(14116);
exoChest = config.getItem("Equipables", "Exo-Chestpiece", 14117).getInt(14117);
exoPants = config.getItem("Equipables", "Exo-Legs", 14118).getInt(14118);
exoShoes = config.getItem("Equipables", "Exo-Boots", 14119).getInt(14119);
boolean ic2 = true;
boolean xycraft = true;
try
@@ -388,208 +181,6 @@ public class PHConstruct
}
}
//Blocks
public static int woodStation;
public static int toolForge;
public static int heldItemBlock;
public static int woodCrafter;
public static int woodCrafterSlab;
public static int furnaceSlab;
public static int ores;
public static int lavaTank;
public static int smeltery;
public static int searedTable;
public static int lavaTankNether;
public static int smelteryNether;
public static int searedTableNether;
public static int castingChannel;
public static int airTank;
public static int craftedSoil;
public static int oreSlag;
public static int oreGravel;
public static int metalBlock;
public static int redstoneMachine;
public static int dryingRack;
public static int woodenRail;
//Crops
public static int oreBerry;
public static int oreBerrySecond;
public static int netherOreBerry;
//Traps
public static int landmine;
public static int punji;
public static int barricadeOak;
public static int barricadeSpruce;
public static int barricadeBirch;
public static int barricadeJungle;
public static int slimeExplosive;
//InfiBlocks
public static int speedBlock;
public static int glass;
public static int glassPane;
public static int stainedGlass;
public static int stainedGlassClear;
public static int stainedGlassClearPane;
//Liquids
public static int metalFlowing;
public static int metalStill;
public static int moltenIron;
public static int moltenGold;
public static int moltenCopper;
public static int moltenTin;
public static int moltenAluminum;
public static int moltenCobalt;
public static int moltenArdite;
public static int moltenBronze;
public static int moltenAlubrass;
public static int moltenManyullyn;
public static int moltenAlumite;
public static int moltenObsidian;
public static int moltenSteel;
public static int moltenGlass;
public static int moltenStone;
public static int moltenEmerald;
public static int blood;
public static int moltenEnder;
public static int moltenSilver; //Thermal Expansion
public static int moltenLead;
public static int moltenNickel;
public static int moltenShiny;
public static int moltenInvar;
public static int moltenElectrum;
//Slime
public static int slimePoolBlue;
public static int slimeGel;
public static int slimeGrass;
public static int slimeTallGrass;
public static int slimeLeaves;
public static int slimeSapling;
public static int slimeChannel;
public static int slimePad;
public static int bloodChannel;
// Glue
public static int glueFluidBlock;
public static int glueBlock;
//Decoration
public static int stoneTorch;
public static int stoneLadder;
public static int multiBrick;
public static int multiBrickFancy;
public static int redstoneBallRepeater;
public static int searedSlab;
public static int speedSlab;
public static int meatBlock;
public static int woolSlab1;
public static int woolSlab2;
//Patterns and misc
public static int blankPattern;
public static int materials;
public static int toolRod;
public static int toolShard;
public static int woodPattern;
public static int metalPattern;
public static int armorPattern;
public static int manual;
public static int buckets;
public static int uselessItem;
public static int oreChunks;
//Food
public static int diamondApple;
public static int slimefood;
public static int jerky;
//Tools
public static int pickaxe;
public static int shovel;
public static int axe;
public static int hoe;
public static int broadsword;
public static int longsword;
public static int rapier;
public static int dagger;
public static int cutlass;
public static int frypan;
public static int battlesign;
public static int longbow;
public static int shortbow;
public static int potionLauncher;
public static int mattock;
public static int lumberaxe;
public static int scythe;
public static int cleaver;
public static int excavator;
public static int hammer;
public static int battleaxe;
public static int chisel;
public static int arrow;
//Tool parts
public static int swordBlade;
public static int largeGuard;
public static int medGuard;
public static int crossbar;
public static int knifeBlade;
public static int fullGuard;
public static int pickaxeHead;
public static int axeHead;
public static int shovelHead;
public static int hoeHead;
public static int frypanHead;
public static int signHead;
public static int chiselHead;
public static int scytheBlade;
public static int lumberHead;
public static int largeSwordBlade;
public static int excavatorHead;
public static int hammerHead;
public static int binding;
public static int toughBinding;
public static int toughRod;
public static int largePlate;
public static int bowstring;
public static int arrowhead;
public static int fletching;
//Wearables
public static int woodHelmet;
public static int woodChestplate;
public static int woodPants;
public static int woodBoots;
public static int glove;
public static int knapsack;
public static int heartCanister;
public static int exoGoggles;
public static int exoChest;
public static int exoPants;
public static int exoShoes;
//Ore values
public static boolean generateCopper;
public static boolean generateTin;
@@ -28,7 +28,7 @@ public class BehaviorExplosive extends Behavior
{
explodeStrenght = 4.0F * par5ItemStack.stackSize;
}
else if (par5ItemStack.itemID == Items.gunpowder.itemID)
else if (par5ItemStack.getItem() == Items.gunpowder)
{
explodeStrenght = 0.8F * par5ItemStack.stackSize;
}
@@ -44,7 +44,7 @@ public class BehaviorExplosive extends Behavior
{
str = "medium";
}
else if (par1ItemStack.itemID == Items.gunpowder.itemID)
else if (par1ItemStack.getItem() == Items.gunpowder)
{
str = "small";
}
@@ -43,10 +43,10 @@ public class BehaviorFirecharge extends Behavior
{
for (int j = par4 - 2; j <= (par4 + 2); j++)
{
if ((par1World.getBlockId(i, par3, j) == 0 || (Block.blocksList[par1World.getBlockId(i, par3, j)] != null && Block.blocksList[par1World.getBlockId(i, par3, j)].isBlockReplaceable(
if ((par1World.getBlockId(i, par3, j) == 0 || (par1World.getBlock(i, par3, j) != null && par1World.getBlock(i, par3, j).isBlockReplaceable(
par1World, i, par3, j))) && ItemBlockLandmine.getRandom().nextInt(5) == 0 && Blocks.fire.canPlaceBlockAt(par1World, i, par3, j))
{
par1World.setBlock(i, par3, j, Blocks.fire.blockID);
par1World.setBlock(i, par3, j, Blocks.fire);
}
}
}
@@ -63,7 +63,7 @@ public class ArmorExtended implements IInventory
inventory[slot] = null;
}
EntityPlayer player = parent.get();
TPlayerStats stats = TConstruct.playerTracker.getPlayerStats(player.username);
TPlayerStats stats = TConstruct.playerTracker.getPlayerStats(player.getDisplayName());
recalculateHealth(player, stats);
return split;
}
@@ -90,18 +90,18 @@ public class ArmorExtended implements IInventory
}
EntityPlayer player = parent.get();
TPlayerStats stats = TConstruct.playerTracker.getPlayerStats(player.username);
TPlayerStats stats = TConstruct.playerTracker.getPlayerStats(player.getDisplayName());
recalculateHealth(player, stats);
}
@Override
public String getInvName ()
public String func_145825_b ()
{
return "";
}
@Override
public boolean isInvNameLocalized ()
public boolean func_145818_k_ ()
{
return false;
}
@@ -116,7 +116,7 @@ public class ArmorExtended implements IInventory
public void onInventoryChanged ()
{
EntityPlayer player = parent.get();
TPlayerStats stats = TConstruct.playerTracker.getPlayerStats(player.username);
TPlayerStats stats = TConstruct.playerTracker.getPlayerStats(player.getDisplayName());
//recalculateSkills(player, stats);
recalculateHealth(player, stats);
@@ -83,13 +83,13 @@ public class KnapsackInventory implements IInventory
}
@Override
public String getInvName ()
public String func_145825_b ()
{
return "tconstruct.knapsack";
}
@Override
public boolean isInvNameLocalized ()
public boolean func_145818_k_ ()
{
return false;
}
@@ -194,4 +194,5 @@ public class KnapsackInventory implements IInventory
EntityItem entityitem = new EntityItem(dropper.worldObj, dropper.posX, dropper.posY, dropper.posZ, dropStack);
dropper.worldObj.spawnEntityInWorld(entityitem);
}
}
@@ -5,6 +5,7 @@ import java.lang.ref.WeakReference;
import java.util.Random;
import java.util.concurrent.ConcurrentHashMap;
import mantle.player.PlayerUtils;
import net.minecraft.entity.Entity;
import net.minecraft.entity.Entity.EnumEntitySize;
import net.minecraft.entity.player.EntityPlayer;
@@ -75,7 +76,7 @@ public class TPlayerHandler implements IPlayerTracker
}
}
if (entityplayer.username.toLowerCase().equals("fudgy_fetus"))
if (entityplayer.getDisplayName().toLowerCase().equals("fudgy_fetus"))
{
ItemStack pattern = new ItemStack(TRepo.woodPattern, 1, 22);
@@ -91,7 +92,7 @@ public class TPlayerHandler implements IPlayerTracker
AbilityHelper.spawnItemAtPlayer(entityplayer, pattern);
}
if (entityplayer.username.toLowerCase().equals("zerokyuuni"))
if (entityplayer.getDisplayName().toLowerCase().equals("zerokyuuni"))
{
ItemStack pattern = new ItemStack(Items.stick);
@@ -107,16 +108,16 @@ public class TPlayerHandler implements IPlayerTracker
}
}
playerStats.put(entityplayer.username, stats);
playerStats.put(entityplayer.getDisplayName(), stats);
if (PHConstruct.gregtech && Loader.isModLoaded("GregTech-Addon"))
{
PHConstruct.gregtech = false;
if (PHConstruct.lavaFortuneInteraction)
{
entityplayer.addChatMessage("Warning: Cross-mod Exploit Present!");
entityplayer.addChatMessage("Solution 1: Disable Reverse Smelting recipes from GregTech.");
entityplayer.addChatMessage("Solution 2: Disable Auto-Smelt/Fortune interaction from TConstruct.");
PlayerUtils.sendChatMessage(entityplayer,"Warning: Cross-mod Exploit Present!");
PlayerUtils.sendChatMessage(entityplayer,"Solution 1: Disable Reverse Smelting recipes from GregTech.");
PlayerUtils.sendChatMessage(entityplayer,"Solution 2: Disable Auto-Smelt/Fortune interaction from TConstruct.");
}
}
@@ -154,13 +155,13 @@ public class TPlayerHandler implements IPlayerTracker
{
if (player != null)
{
TPlayerStats stats = getPlayerStats(player.username);
TPlayerStats stats = getPlayerStats(player.getDisplayName());
if (stats != null && stats.armor != null)
{
stats.armor.saveToNBT(player);
stats.knapsack.saveToNBT(player);
if (clean)
playerStats.remove(player.username);
playerStats.remove(player.getDisplayName());
}
else
//Revalidate all players
@@ -174,7 +175,7 @@ public class TPlayerHandler implements IPlayerTracker
public void onPlayerRespawn (EntityPlayer entityplayer)
{
//Boom!
TPlayerStats stats = getPlayerStats(entityplayer.username);
TPlayerStats stats = getPlayerStats(entityplayer.getDisplayName());
stats.player = new WeakReference<EntityPlayer>(entityplayer);
stats.armor.recalculateHealth(entityplayer, stats);
@@ -217,7 +218,7 @@ public class TPlayerHandler implements IPlayerTracker
if (side == Side.CLIENT && evt.entityLiving instanceof EntityPlayer)
{
EntityPlayer player = (EntityPlayer) evt.entityLiving;
TPlayerStats stats = playerStats.get(player.username);
TPlayerStats stats = playerStats.get(player.getDisplayName());
if (player.onGround != stats.prevOnGround)
{
if (player.onGround)// && -stats.prevMotionY > 0.1)
@@ -235,7 +236,7 @@ public class TPlayerHandler implements IPlayerTracker
@SubscribeEvent
public void playerDrops (PlayerDropsEvent evt)
{
TPlayerStats stats = getPlayerStats(evt.entityPlayer.username);
TPlayerStats stats = getPlayerStats(evt.entityPlayer.getDisplayName());
stats.level = evt.entityPlayer.experienceLevel / 2;
//stats.health = 20;
int hunger = evt.entityPlayer.getFoodStats().getFoodLevel();