aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/core
diff options
context:
space:
mode:
authorAlkalus <3060479+draknyte1@users.noreply.github.com>2019-05-14 16:48:07 +1000
committerAlkalus <3060479+draknyte1@users.noreply.github.com>2019-05-14 16:48:07 +1000
commit014455279145d902618ed441a19c8ad0ece44387 (patch)
tree38aa61603f7826115574a65bf5b351dd0b0ecfd4 /src/Java/gtPlusPlus/core
parent6200f857ad6477eca6456d74a6d7044208bfb1e1 (diff)
downloadGT5-Unofficial-014455279145d902618ed441a19c8ad0ece44387.tar.gz
GT5-Unofficial-014455279145d902618ed441a19c8ad0ece44387.tar.bz2
GT5-Unofficial-014455279145d902618ed441a19c8ad0ece44387.zip
% Minor Adjustments.
$ Minor Fixes.
Diffstat (limited to 'src/Java/gtPlusPlus/core')
-rw-r--r--src/Java/gtPlusPlus/core/item/bauble/FireProtectionBauble.java22
1 files changed, 4 insertions, 18 deletions
diff --git a/src/Java/gtPlusPlus/core/item/bauble/FireProtectionBauble.java b/src/Java/gtPlusPlus/core/item/bauble/FireProtectionBauble.java
index c2ef0dfd2f..04467091c0 100644
--- a/src/Java/gtPlusPlus/core/item/bauble/FireProtectionBauble.java
+++ b/src/Java/gtPlusPlus/core/item/bauble/FireProtectionBauble.java
@@ -18,13 +18,11 @@ import net.minecraft.item.ItemStack;
import net.minecraft.potion.Potion;
import net.minecraft.potion.PotionEffect;
import net.minecraft.util.EnumChatFormatting;
-import net.minecraft.util.StatCollector;
import net.minecraft.world.World;
public class FireProtectionBauble extends BaseBauble {
- public static HashMap<UUID, Boolean> mDataMap = new HashMap<UUID, Boolean>();
-
+ public static HashMap<UUID, Boolean> mDataMap = new HashMap<UUID, Boolean>();
public static HashSet<UUID> mPlayerMap = new HashSet<UUID>();
private static Field isImmuneToFire;
@@ -39,8 +37,7 @@ public class FireProtectionBauble extends BaseBauble {
public static boolean setEntityImmuneToFire(Entity aEntity, boolean aImmune) {
return ReflectionUtils.setField(aEntity, isImmuneToFire, aImmune);
- }
-
+ }
public FireProtectionBauble() {
super(BaubleType.RING, "GTPP.bauble.fireprotection.0" + ".name", 0);
@@ -76,17 +73,6 @@ public class FireProtectionBauble extends BaseBauble {
@SuppressWarnings("unchecked")
@Override
public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) {
- list.add("");
- String aString1 = StatCollector.translateToLocal("GTPP.battpack.tooltip.1");
- String aString2 = StatCollector.translateToLocal("GTPP.battpack.tooltip.2");
- String aString3 = StatCollector.translateToLocal("GTPP.battpack.tooltip.3");
- String aString4 = StatCollector.translateToLocal("GTPP.battpack.tooltip.4");
-
- String aEU = StatCollector.translateToLocal("GTPP.info.eu");
- String aEUT = aEU+"/t";
-
- list.add(EnumChatFormatting.GREEN + aString1 + EnumChatFormatting.GRAY);
- list.add(EnumChatFormatting.GREEN + aString4 + EnumChatFormatting.GRAY);
super.addInformation(stack, aPlayer, list, bool);
}
@@ -133,14 +119,14 @@ public class FireProtectionBauble extends BaseBauble {
setEntityImmuneToFire(bPlayer, true);
}
if (!bPlayer.isPotionActive(Potion.fireResistance)) {
- bPlayer.addPotionEffect(new PotionEffect(Potion.fireResistance.id, 2, 4));
+ bPlayer.addPotionEffect(new PotionEffect(Potion.fireResistance.id, 100, 4));
}
}
}
}
public String getTextureNameForBauble() {
- return "chargepack/"+1;
+ return "baubles/itemFireProtectGlovesBetter";
}
}