Ellpeck/ActuallyAdditions
1
0
Fork 0
mirror of https://github.com/Ellpeck/ActuallyAdditions.git synced 2024-11-22 15:18:34 +01:00
Code Issues Projects Releases Wiki Activity

Something something filter.

Browse source
This commit is contained in:
Flanks255 2024-05-30 17:13:21 -05:00
parent 66e6123a5f
commit 9000eb3fab
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/main/java/de/ellpeck/actuallyadditions/mod/tile/FilterSettings.java
View file

@ -93,9 +93,9 @@ public class FilterSettings {
} }
private static boolean areEqualEnough(ItemStack first, ItemStack second, boolean mod, boolean damage, boolean nbt) { private static boolean areEqualEnough(ItemStack first, ItemStack second, boolean mod, boolean damage, boolean nbt) {
if (mod && checkMod(first, second) && checkDamage(first, second, damage)) { if (mod)
return true; return checkMod(first, second) && checkDamage(first, second, damage);
}
return checkItem(first, second, nbt) && checkDamage(first, second, damage); return checkItem(first, second, nbt) && checkDamage(first, second, damage);
} }

4
src/main/resources/assets/actuallyadditions/lang/en_us.json
View file

@ -440,7 +440,7 @@
"tooltip.actuallyadditions.playerProbe.notice": "Look out! Someone tried to probe you and strap you to a Player Interface, but they failed!", "tooltip.actuallyadditions.playerProbe.notice": "Look out! Someone tried to probe you and strap you to a Player Interface, but they failed!",
"tooltip.actuallyadditions.battery.discharge": "Charging other items in inventory", "tooltip.actuallyadditions.battery.discharge": "Charging other items in inventory",
"tooltip.actuallyadditions.battery.noDischarge": "Not charging other items in inventory", "tooltip.actuallyadditions.battery.noDischarge": "Not charging other items in inventory",
"tooltip.actuallyadditions.battery.changeMode": "Sneak-right-click to toggle.", "tooltip.actuallyadditions.battery.changeMode": "Sneak-right-click to toggle",
"tooltip.actuallyadditions.previouslyDoubleFurnace": "Previously \"Double Furnace\"", "tooltip.actuallyadditions.previouslyDoubleFurnace": "Previously \"Double Furnace\"",
"tooltip.actuallyadditions.previouslyBag": "Previously \"Bag\"", "tooltip.actuallyadditions.previouslyBag": "Previously \"Bag\"",
"tooltip.actuallyadditions.previouslyVoidBag": "Previously \"Void Bag\"", "tooltip.actuallyadditions.previouslyVoidBag": "Previously \"Void Bag\"",
@ -472,7 +472,7 @@
"info.actuallyadditions.gui.ignoreNBT": "Ignoring NBT Data", "info.actuallyadditions.gui.ignoreNBT": "Ignoring NBT Data",
"info.actuallyadditions.gui.ignoreMod": "Mod Mode Off", "info.actuallyadditions.gui.ignoreMod": "Mod Mode Off",
"info.actuallyadditions.gui.respectMod": "Mod Mode On", "info.actuallyadditions.gui.respectMod": "Mod Mode On",
"info.actuallyadditions.gui.respectModInfo": "If this is enabled, the filter will compare the mods items come from §cinstead of comparing the items themselves§r. This can be useful for storage systems with mod-based chests. Can also be combined with the other options, but that normally isn't very useful.", "info.actuallyadditions.gui.respectModInfo": "If this is enabled, the filter will compare the mods items come from §cinstead of comparing the items themselves§r. This can be useful for storage systems with mod-based chests. Can be combined with damage matching, but that normally isn't very useful.",
"info.actuallyadditions.gui.autosplititems.on": "Auto-Split Items On", "info.actuallyadditions.gui.autosplititems.on": "Auto-Split Items On",
"info.actuallyadditions.gui.autosplititems.off": "Auto-Split Items Off", "info.actuallyadditions.gui.autosplititems.off": "Auto-Split Items Off",
"info.actuallyadditions.gui.inbound": "INBOUND", "info.actuallyadditions.gui.inbound": "INBOUND",