mirror/Slimefun4
mirror/Slimefun4
1
Fork 0
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-20 11:45:51 +00:00
Code Releases Activity

Fixed code inconsistencies

Browse Source
This commit is contained in:
ProfElements 2021-01-03 12:35:00 -06:00
parent c162e5194d
commit fe8b0c21f7
1 changed files with 22 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/BookBinder.java
View File

@ -19,15 +19,19 @@ import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.MachineRecip
import me.mrCookieSlime.Slimefun.api.SlimefunItemStack; import me.mrCookieSlime.Slimefun.api.SlimefunItemStack;
import me.mrCookieSlime.Slimefun.api.inventory.BlockMenu; import me.mrCookieSlime.Slimefun.api.inventory.BlockMenu;
/**
* Represents Book Binder, a machine that binds multiple enchantments books into one.
* @author ProfElements
*/
public class BookBinder extends AContainer { public class BookBinder extends AContainer {
private final ItemSetting<Boolean> deniesVanillaRules = new ItemSetting<>("denies-vanilla-rules", true); private final ItemSetting<Boolean> bypassMaxLevel = new ItemSetting<>("bypass-max-level", true);
@ParametersAreNonnullByDefault @ParametersAreNonnullByDefault
public BookBinder(Category category, SlimefunItemStack item, RecipeType recipeType, ItemStack[] recipe) { public BookBinder(Category category, SlimefunItemStack item, RecipeType recipeType, ItemStack[] recipe) {
super(category, item, recipeType, recipe); super(category, item, recipeType, recipe);
addItemSetting(deniesVanillaRules); addItemSetting(bypassMaxLevel);
} }
@Override @Override
@ -40,45 +44,41 @@ public class BookBinder extends AContainer {
} }
ItemStack item = menu.getItemInSlot(slot); ItemStack item = menu.getItemInSlot(slot);
if (item != null && item.getType() == Material.ENCHANTED_BOOK && target != null) { if (isCompatible(item) && isCompatible(target)) {
Map<Enchantment, Integer> enchantments = new HashMap<>(); Map<Enchantment, Integer> enchantments = new HashMap<>();
int amount = 0;
EnchantmentStorageMeta itemMeta = (EnchantmentStorageMeta) item.getItemMeta(); EnchantmentStorageMeta itemMeta = (EnchantmentStorageMeta) item.getItemMeta();
EnchantmentStorageMeta targetMeta = (EnchantmentStorageMeta) target.getItemMeta(); EnchantmentStorageMeta targetMeta = (EnchantmentStorageMeta) target.getItemMeta();
for(Map.Entry<Enchantment, Integer> e : itemMeta.getStoredEnchants().entrySet()) { Map<Enchantment, Integer> storedItemEnchantments = itemMeta.getStoredEnchants();
for (Map.Entry<Enchantment, Integer> e2 : targetMeta.getStoredEnchants().entrySet()) { Map<Enchantment, Integer> storedTargetEnchantments = targetMeta.getStoredEnchants();
if (e.getKey() == e2.getKey()) { enchantments.putAll(storedItemEnchantments);
if (e.getValue() == e2.getValue()) {
enchantments.put(e.getKey(), e.getValue()+1); for (Map.Entry<Enchantment, Integer> entry : storedTargetEnchantments.entrySet()) {
enchantments.merge(entry.getKey(), entry.getValue(), (a, b) -> {
if (a == b) {
return a + 1;
} else { } else {
enchantments.put(e.getKey(), e.getValue() > e2.getValue() ? e.getValue() : e2.getValue()); return Math.max(a, b);
} }
} });
enchantments.put(e2.getKey(), e2.getValue());
} }
amount++; if (enchantments.size() > 0) {
enchantments.put(e.getKey(), e.getValue());
}
if (amount > 0) {
ItemStack book = new ItemStack(Material.ENCHANTED_BOOK); ItemStack book = new ItemStack(Material.ENCHANTED_BOOK);
book.setAmount(1); book.setAmount(1);
EnchantmentStorageMeta enchantMeta = (EnchantmentStorageMeta) book.getItemMeta(); EnchantmentStorageMeta enchantMeta = (EnchantmentStorageMeta) book.getItemMeta();
for (Map.Entry<Enchantment, Integer> entry : enchantments.entrySet()) { for (Map.Entry<Enchantment, Integer> entry : enchantments.entrySet()) {
if(deniesVanillaRules.getValue()) { if (bypassMaxLevel.getValue()) {
enchantMeta.addStoredEnchant(entry.getKey(), entry.getValue(), true); enchantMeta.addStoredEnchant(entry.getKey(), entry.getValue(), true);
} else { } else {
enchantMeta.addStoredEnchant(entry.getKey(), entry.getValue(), false); enchantMeta.addStoredEnchant(entry.getKey(), entry.getValue(), false);
} }
} }
book.setItemMeta(enchantMeta); book.setItemMeta(enchantMeta);
MachineRecipe recipe = new MachineRecipe(50 * amount / this.getSpeed(), new ItemStack[] {target, item}, new ItemStack[] {book}); MachineRecipe recipe = new MachineRecipe(50 * enchantments.size() / this.getSpeed(), new ItemStack[] {target, item}, new ItemStack[] {book});
if (!InvUtils.fitAll(menu.toInventory(), recipe.getOutput(), getOutputSlots())) { if (!InvUtils.fitAll(menu.toInventory(), recipe.getOutput(), getOutputSlots())) {
return null; return null;
@ -102,8 +102,6 @@ public class BookBinder extends AContainer {
private boolean isCompatible(ItemStack item) { private boolean isCompatible(ItemStack item) {
if (item != null && item.getType() == Material.ENCHANTED_BOOK) { if (item != null && item.getType() == Material.ENCHANTED_BOOK) {
return true; return true;
//Figure out what to do with incompatible enchantments if we should allow it at all ex. Protection + Fire Protection
} }
return false; return false;