From 028b484af4e2bc400b726d17cd1335216dd5c3ba Mon Sep 17 00:00:00 2001 From: MuXiu1997 Date: Mon, 2 May 2022 01:30:23 +0800 Subject: [PATCH] Fix TravelUpgrade --- .editorconfig | 23 +++++++++++++++++++ .../item/darksteel/upgrade/TravelUpgrade.java | 19 ++++++++------- 2 files changed, 34 insertions(+), 8 deletions(-) create mode 100644 .editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000000..99d6c89454 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,23 @@ +# This is the universal Text Editor Configuration +# for all GTNewHorizons projects +# See: https://editorconfig.org/ + +root = true + +[*] +charset = utf-8 +end_of_line = lf +indent_size = 4 +indent_style = space +insert_final_newline = true +trim_trailing_whitespace = true + +[*.{bat,ini}] +end_of_line = crlf + +[*.{dtd,json,info,mcmeta,md,sh,svg,xml,xsd,xsl,yaml,yml}] +indent_size = 2 + +[*.java] +indent_size = 2 +ij_java_space_before_if_parentheses = false \ No newline at end of file diff --git a/src/main/java/crazypants/enderio/item/darksteel/upgrade/TravelUpgrade.java b/src/main/java/crazypants/enderio/item/darksteel/upgrade/TravelUpgrade.java index b41eb903e1..760fbed157 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/upgrade/TravelUpgrade.java +++ b/src/main/java/crazypants/enderio/item/darksteel/upgrade/TravelUpgrade.java @@ -7,9 +7,11 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import java.util.stream.Stream; + public class TravelUpgrade extends AbstractUpgrade { - private static String UPGRADE_NAME = "travel"; + private static final String UPGRADE_NAME = "travel"; public static final TravelUpgrade INSTANCE = new TravelUpgrade(); @@ -32,17 +34,18 @@ public TravelUpgrade(NBTTagCompound tag) { } public TravelUpgrade() { - super(UPGRADE_NAME, "enderio.darksteel.upgrade.travel", new ItemStack(EnderIO.itemMaterial,1,Material.ENDER_CRYSTAL.ordinal()), Config.darkSteelTravelCost); + super(UPGRADE_NAME, "enderio.darksteel.upgrade.travel", new ItemStack(EnderIO.itemMaterial, 1, Material.ENDER_CRYSTAL.ordinal()), Config.darkSteelTravelCost); } @Override public boolean canAddToItem(ItemStack stack) { - if(stack == null || (stack.getItem() != DarkSteelItems.itemDarkSteelSword && stack.getItem() != DarkSteelItems.itemEndSteelPickaxe && stack.getItem() != DarkSteelItems.itemEndSteelSword && stack.getItem() != DarkSteelItems.itemDarkSteelPickaxe)|| !EnergyUpgrade.itemHasAnyPowerUpgrade(stack)) { - return false; - } - TravelUpgrade up = loadFromItem(stack); - if(up == null) { - return true; + if(stack == null) return false; + if(Stream.of( + DarkSteelItems.itemDarkSteelSword, DarkSteelItems.itemEndSteelSword, DarkSteelItems.itemStellarSword, + DarkSteelItems.itemDarkSteelPickaxe, DarkSteelItems.itemEndSteelPickaxe, DarkSteelItems.itemStellarPickaxe, + DarkSteelItems.itemEndSteelAxe, DarkSteelItems.itemStellarAxe + ).anyMatch(item -> stack.getItem() == item)) { + return EnergyUpgrade.itemHasAnyPowerUpgrade(stack) && loadFromItem(stack) == null; } return false; }