Compare commits

...
3 Commits
Author SHA1 Message Date
Dream-Master 9a5bdf55ca update version 2020-03-14 13:04:55 +01:00
Martin Robertz 0a571dd576 Merge pull request #10 from Zoko061602/master
Fixed Armor again
2020-03-14 13:03:22 +01:00
Zoko061602 30befc896c Fixed Armor again 2020-03-14 13:01:08 +01:00
4 changed files with 5 additions and 5 deletions

No files matched your search

+1 -1
View File
@@ -2,7 +2,7 @@ minecraft_version=1.7.10
forge_version=10.13.4.1614-1.7.10
forgeDep_version=10.13.4.1614
mod_version=2.3.1.1_beta
mod_version=2.3.1.2_beta
#Comment out this line to get rid of the appendix
#mod_appendix=beta
@@ -4,7 +4,7 @@ public interface IDarkSteelItem {
int getIngotsRequiredForFullRepair();
public interface IEndSteelItem extends IDarkSteelItem{
public interface IEndSteelItem extends IDarkSteelItem {
}
@@ -293,7 +293,7 @@ public class ItemDarkSteelArmor extends ItemArmor implements IEnergyContainerIte
@Override
@Method(modid = "Thaumcraft")
public int getVisDiscount(ItemStack stack, EntityPlayer player, Aspect aspect) {
if(stack == null || stack.getItem() != DarkSteelItems.itemDarkSteelHelmet) {
if(stack == null || !DarkSteelItems.isArmorPart(stack.getItem(), 0)) {
return 0;
}
return GogglesOfRevealingUpgrade.isUpgradeEquipped(player) ? 5 : 0;
@@ -318,7 +318,7 @@ public class ItemDarkSteelArmor extends ItemArmor implements IEnergyContainerIte
@Override
@Method(modid = "Forestry")
public boolean canSeePollination(EntityPlayer player, ItemStack armor, boolean doSee) {
if(armor == null || armor.getItem() != DarkSteelItems.itemDarkSteelHelmet) {
if(armor == null || DarkSteelItems.isArmorPart(armor.getItem(), 0)) {
return false;
}
return NaturalistEyeUpgrade.isUpgradeEquipped(player);
@@ -67,7 +67,7 @@ public class ApiaristArmorUpgrade extends AbstractUpgrade {
@Override
public boolean hasUpgrade(ItemStack stack) {
return super.hasUpgrade(stack) && stack.getItem() instanceof ItemDarkSteelArmor;
return super.hasUpgrade(stack) && DarkSteelItems.isArmorPart(stack.getItem(), slot);
}
@Override