fujin/Wizardry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

I can't string, and unboxing is weird

Browse Source
This commit is contained in:
Electroblob77
2020-02-21 17:55:45 +00:00
parent df8fd21c0b
commit 5d96f4d700
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/electroblob/wizardry/Settings.java
+1 -1
View File
@@ -1104,7 +1104,7 @@ public final class Settings {
try { try {
meta = Short.parseShort(itemArgs[itemArgs.length-1]); meta = Short.parseShort(itemArgs[itemArgs.length-1]);
item = String.join("", Arrays.copyOfRange(itemArgs, 0, itemArgs.length-2)); item = String.join(":", Arrays.copyOfRange(itemArgs, 0, itemArgs.length-1));
}catch(NumberFormatException e){ // If no metadata is specified }catch(NumberFormatException e){ // If no metadata is specified
meta = 0; meta = 0;
item = string; item = string;
src/main/java/electroblob/wizardry/spell/Divination.java
+1 -1
View File
@@ -72,7 +72,7 @@ public class Divination extends Spell {
|| block instanceof BlockRedstoneOre || block instanceof BlockRedstoneOre
|| block instanceof BlockCrystalOre || block instanceof BlockCrystalOre
|| Arrays.asList(Wizardry.settings.divinationOreWhitelist) || Arrays.asList(Wizardry.settings.divinationOreWhitelist)
.contains(Pair.of(block.getRegistryName(), block.getMetaFromState(world.getBlockState(b))))); .contains(Pair.of(block.getRegistryName(), (short)block.getMetaFromState(world.getBlockState(b)))));
}); });
Strength strength = Strength.NOTHING; Strength strength = Strength.NOTHING;
src/main/java/electroblob/wizardry/spell/ImbueWeapon.java
+2 -2
View File
@@ -82,12 +82,12 @@ public class ImbueWeapon extends Spell {
/** Returns true if the given item counts as a sword, i.e. it extends {@link ItemSword} or is in the whitelist. */ /** Returns true if the given item counts as a sword, i.e. it extends {@link ItemSword} or is in the whitelist. */
public static boolean isSword(ItemStack stack){ public static boolean isSword(ItemStack stack){
return stack.getItem() instanceof ItemSword || Arrays.asList(Wizardry.settings.swordItemWhitelist).contains(Pair.of(stack.getItem().getRegistryName(), stack.getMetadata())); return stack.getItem() instanceof ItemSword || Arrays.asList(Wizardry.settings.swordItemWhitelist).contains(Pair.of(stack.getItem().getRegistryName(), (short)stack.getMetadata()));
} }
/** Returns true if the given item counts as a bow, i.e. it extends {@link ItemBow} or is in the whitelist. */ /** Returns true if the given item counts as a bow, i.e. it extends {@link ItemBow} or is in the whitelist. */
public static boolean isBow(ItemStack stack){ public static boolean isBow(ItemStack stack){
return stack.getItem() instanceof ItemBow || Arrays.asList(Wizardry.settings.bowItemWhitelist).contains(Pair.of(stack.getItem().getRegistryName(), stack.getMetadata())); return stack.getItem() instanceof ItemBow || Arrays.asList(Wizardry.settings.bowItemWhitelist).contains(Pair.of(stack.getItem().getRegistryName(), (short)stack.getMetadata()));
} }
} }
src/main/java/electroblob/wizardry/spell/PocketFurnace.java
+1 -1
View File
@@ -40,7 +40,7 @@ public class PocketFurnace extends Spell {
if(!result.isEmpty() && !(stack.getItem() instanceof ItemTool) && !(stack.getItem() instanceof ItemSword) if(!result.isEmpty() && !(stack.getItem() instanceof ItemTool) && !(stack.getItem() instanceof ItemSword)
&& !(stack.getItem() instanceof ItemArmor) && !(stack.getItem() instanceof ItemArmor)
&& !Arrays.asList(Wizardry.settings.pocketFurnaceItemBlacklist).contains(Pair.of(stack.getItem().getRegistryName(), stack.getMetadata()))){ && !Arrays.asList(Wizardry.settings.pocketFurnaceItemBlacklist).contains(Pair.of(stack.getItem().getRegistryName(), (short)stack.getMetadata()))){
if(stack.getCount() <= usesLeft){ if(stack.getCount() <= usesLeft){
ItemStack stack2 = new ItemStack(result.getItem(), stack.getCount(), result.getItemDamage()); ItemStack stack2 = new ItemStack(result.getItem(), stack.getCount(), result.getItemDamage());