Sangui/GT5-Unofficial
2
1
Fork 0
Code Issues 6 Pull requests Projects Releases Packages Wiki Activity Actions

Fixed issue with Modular Armor inventory not saving properly after removing the call to closeScreen

Browse source 
Added null and key checks when determining if a full radiation or electrical armor set is configured
This commit is contained in:
Doug Gabehart 2016-12-14 16:04:20 -06:00
parent b9ebe16655
commit 6ceff6d783
2 changed files with 71 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

79
src/main/java/gregtech/common/items/armor/ArmorData.java
View file

@ -258,11 +258,71 @@ public class ArmorData {
}
if (helmet != null && chestplate != null && leggings != null && boots != null) {
set(mBStat, StatType.FULLARMOR, true);
boolean helmHasFullRadiationDefence=false;
boolean chestplateHasFullRadiationDefence=false;
boolean leggingsHasFullRadiationDefence=false;
boolean bootsHasFullRadiationDefence=false;
boolean helmHasFullElectricalDefenceDefence=false;
boolean chestplateHasFullElectricalDefenceDefence=false;
boolean leggingsHasFullElectricalDefenceDefence=false;
boolean bootsHasFullElectricalDefenceDefence=false;
//Check each armor pieces for valid mStat value and verify that the Hash contains the StatType key
if(helmet.mStat!= null)
{
if(helmet.mStat.containsKey(StatType.RADIATIONDEFENCE))
{
helmHasFullRadiationDefence = helmet.mStat.get(StatType.RADIATIONDEFENCE)> 0.9f;
}
if(helmet.mStat.containsKey(StatType.ELECTRICALDEFENCE))
{
helmHasFullElectricalDefenceDefence = helmet.mStat.get(StatType.RADIATIONDEFENCE)> 0.9f;
}
}
if(chestplate.mStat!= null)
{
if(chestplate.mStat.containsKey(StatType.RADIATIONDEFENCE))
{
chestplateHasFullRadiationDefence = chestplate.mStat.get(StatType.RADIATIONDEFENCE)> 0.9f;
}
if(chestplate.mStat.containsKey(StatType.ELECTRICALDEFENCE))
{
chestplateHasFullElectricalDefenceDefence = chestplate.mStat.get(StatType.RADIATIONDEFENCE)> 0.9f;
}
}
if(leggings.mStat!= null)
{
if(leggings.mStat.containsKey(StatType.RADIATIONDEFENCE))
{
leggingsHasFullRadiationDefence = leggings.mStat.get(StatType.RADIATIONDEFENCE)> 0.9f;
}
if(leggings.mStat.containsKey(StatType.ELECTRICALDEFENCE))
{
leggingsHasFullElectricalDefenceDefence = leggings.mStat.get(StatType.RADIATIONDEFENCE)> 0.9f;
}
}
if(boots.mStat!= null)
{
if(boots.mStat.containsKey(StatType.RADIATIONDEFENCE))
{
bootsHasFullRadiationDefence = boots.mStat.get(StatType.RADIATIONDEFENCE)> 0.9f;
}
if(boots.mStat.containsKey(StatType.ELECTRICALDEFENCE))
{
bootsHasFullElectricalDefenceDefence = boots.mStat.get(StatType.RADIATIONDEFENCE)> 0.9f;
}
}
//Set Status of Full Armor types
set(mBStat, StatType.FULLRADIATIONARMOR, helmHasFullRadiationDefence&&chestplateHasFullRadiationDefence&&leggingsHasFullRadiationDefence &&bootsHasFullRadiationDefence);
set(mBStat, StatType.FULLELECTRICARMOR, helmHasFullElectricalDefenceDefence&&chestplateHasFullElectricalDefenceDefence&&leggingsHasFullElectricalDefenceDefence &&bootsHasFullElectricalDefenceDefence);
} else {
//Reset Full armor type status to false for all types if StatType.FULLARMOR is false
set(mBStat, StatType.FULLARMOR, false);
set(mBStat, StatType.FULLRADIATIONARMOR, false);
set(mBStat, StatType.FULLELECTRICARMOR, false);
}
set(mBStat, StatType.FULLRADIATIONARMOR, mBStat.get(StatType.FULLARMOR) && helmet.mStat.get(StatType.RADIATIONDEFENCE) > 0.9f && chestplate.mStat.get(StatType.RADIATIONDEFENCE) > 0.9f && leggings.mStat.get(StatType.RADIATIONDEFENCE) > 0.9f && boots.mStat.get(StatType.RADIATIONDEFENCE) > 0.9f);
set(mBStat, StatType.FULLELECTRICARMOR, mBStat.get(StatType.FULLARMOR) && chestplate.mStat.get(StatType.ELECTRICALDEFENCE) > 0.9f && chestplate.mStat.get(StatType.ELECTRICALDEFENCE) > 0.9f && leggings.mStat.get(StatType.ELECTRICALDEFENCE) > 0.9f && boots.mStat.get(StatType.ELECTRICALDEFENCE) > 0.9f);
set(mBStat, StatType.MAGNET, 0);
set(mBStat, StatType.THORNS, 0);
set(mBStat, StatType.PROCESSINGPOWER, 0);
@ -273,24 +333,15 @@ public class ArmorData {
}
if (chestplate != null) {
updateArmorStats(chestplate,updateArmorStatTypeList );
// change(mStat, StatType.MAGNET, chestplate.mStat.get(StatType.MAGNET));
// change(mStat, StatType.THORNS, chestplate.mStat.get(StatType.THORNS));
// change(mStat, StatType.PROCESSINGPOWER, chestplate.mStat.get(StatType.PROCESSINGPOWER));
// change(mStat, StatType.PROCESSINGPOWERUSED, chestplate.mStat.get(StatType.PROCESSINGPOWERUSED));
}
if (leggings != null) {
updateArmorStats(leggings,updateArmorStatTypeList );
// change(mStat, StatType.MAGNET, leggings.mStat.get(StatType.MAGNET));
// change(mStat, StatType.THORNS, leggings.mStat.get(StatType.THORNS));
// change(mStat, StatType.PROCESSINGPOWER, leggings.mStat.get(StatType.PROCESSINGPOWER));
// change(mStat, StatType.PROCESSINGPOWERUSED, leggings.mStat.get(StatType.PROCESSINGPOWERUSED));
}
if (boots != null) {
updateArmorStats(boots,updateArmorStatTypeList );
// change(mStat, StatType.MAGNET, boots.mStat.get(StatType.MAGNET));
// change(mStat, StatType.THORNS, boots.mStat.get(StatType.THORNS));
// change(mStat, StatType.PROCESSINGPOWER, boots.mStat.get(StatType.PROCESSINGPOWER));
// change(mStat, StatType.PROCESSINGPOWERUSED, boots.mStat.get(StatType.PROCESSINGPOWERUSED));
}
isTopItem = false;
if (type == 0) {

7
src/main/java/gregtech/common/items/armor/gui/GuiElectricArmor1.java
View file

@ -40,7 +40,12 @@ public class GuiElectricArmor1 extends GuiContainer {
cont = containerModularArmor;
tab = 0;
}
@Override
public void onGuiClosed()
{
cont.saveInventory(player);
super.onGuiClosed();
};
public String seperateNumber(long number){
DecimalFormat formatter = (DecimalFormat) NumberFormat.getInstance(Locale.US);
DecimalFormatSymbols symbols = formatter.getDecimalFormatSymbols();