From 6de1fe821c81227f363858d19a677e25730784aa Mon Sep 17 00:00:00 2001 From: TheBusyBiscuit Date: Wed, 14 Jul 2021 16:58:10 +0200 Subject: [PATCH] More progress on dough implementation --- .../slimefun4/core/networks/cargo/CargoUtils.java | 2 +- .../slimefun4/core/services/UpdaterService.java | 1 - .../implementation/items/electric/machines/AutoBrewer.java | 2 +- .../electric/machines/enchanting/AutoDisenchanter.java | 2 +- .../items/electric/machines/enchanting/AutoEnchanter.java | 2 +- .../items/electric/machines/enchanting/BookBinder.java | 2 +- .../implementation/items/multiblocks/AbstractSmeltery.java | 2 +- .../slimefun4/implementation/tasks/TickerTask.java | 4 ++-- .../github/thebusybiscuit/slimefun4/utils/ChargeUtils.java | 2 +- .../thebusybiscuit/slimefun4/utils/SlimefunUtils.java | 6 +++--- .../Objects/SlimefunItem/abstractItems/AContainer.java | 2 +- .../java/me/mrCookieSlime/Slimefun/api/BlockStorage.java | 6 +++--- .../me/mrCookieSlime/Slimefun/api/inventory/BlockMenu.java | 2 +- .../Slimefun/api/inventory/DirtyChestMenu.java | 6 +++--- .../Slimefun/api/inventory/UniversalBlockMenu.java | 2 +- 15 files changed, 21 insertions(+), 22 deletions(-) diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/networks/cargo/CargoUtils.java b/src/main/java/io/github/thebusybiscuit/slimefun4/core/networks/cargo/CargoUtils.java index 1b0fe9038..c5b3b9b52 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/networks/cargo/CargoUtils.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/core/networks/cargo/CargoUtils.java @@ -16,7 +16,7 @@ import org.bukkit.inventory.Inventory; import org.bukkit.inventory.InventoryHolder; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.cscorelib2.inventory.InvUtils; +import io.github.bakedlibs.dough.inventory.InvUtils; import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; import io.github.thebusybiscuit.slimefun4.utils.SlimefunUtils; import io.github.thebusybiscuit.slimefun4.utils.itemstack.ItemStackWrapper; diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/UpdaterService.java b/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/UpdaterService.java index afa4c7862..a180667b6 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/UpdaterService.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/UpdaterService.java @@ -10,7 +10,6 @@ import org.bukkit.plugin.Plugin; import io.github.bakedlibs.dough.config.Config; import io.github.bakedlibs.dough.updater.GitHubBuildsUpdater; import io.github.bakedlibs.dough.updater.PluginUpdater; -import io.github.thebusybiscuit.cscorelib2.updater.Updater; import io.github.thebusybiscuit.slimefun4.api.SlimefunBranch; import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; import io.github.thebusybiscuit.slimefun4.utils.PatternUtils; diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/AutoBrewer.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/AutoBrewer.java index eca5404c1..dcc6e3a88 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/AutoBrewer.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/AutoBrewer.java @@ -13,7 +13,7 @@ import org.bukkit.inventory.meta.PotionMeta; import org.bukkit.potion.PotionData; import org.bukkit.potion.PotionType; -import io.github.thebusybiscuit.cscorelib2.inventory.InvUtils; +import io.github.bakedlibs.dough.inventory.InvUtils; import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/enchanting/AutoDisenchanter.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/enchanting/AutoDisenchanter.java index 67c5fe3b9..87d476157 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/enchanting/AutoDisenchanter.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/enchanting/AutoDisenchanter.java @@ -14,7 +14,7 @@ import org.bukkit.inventory.meta.EnchantmentStorageMeta; import org.bukkit.inventory.meta.ItemMeta; import org.bukkit.inventory.meta.Repairable; -import io.github.thebusybiscuit.cscorelib2.inventory.InvUtils; +import io.github.bakedlibs.dough.inventory.InvUtils; import io.github.thebusybiscuit.slimefun4.api.events.AutoDisenchantEvent; import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/enchanting/AutoEnchanter.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/enchanting/AutoEnchanter.java index 649dbb1c2..405738a0a 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/enchanting/AutoEnchanter.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/enchanting/AutoEnchanter.java @@ -12,7 +12,7 @@ import org.bukkit.enchantments.Enchantment; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.EnchantmentStorageMeta; -import io.github.thebusybiscuit.cscorelib2.inventory.InvUtils; +import io.github.bakedlibs.dough.inventory.InvUtils; import io.github.thebusybiscuit.slimefun4.api.events.AsyncAutoEnchanterProcessEvent; import io.github.thebusybiscuit.slimefun4.api.events.AutoEnchantEvent; import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/enchanting/BookBinder.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/enchanting/BookBinder.java index 8c08ebbec..d1ead1b5e 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/enchanting/BookBinder.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/enchanting/BookBinder.java @@ -12,7 +12,7 @@ import org.bukkit.enchantments.Enchantment; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.EnchantmentStorageMeta; -import io.github.thebusybiscuit.cscorelib2.inventory.InvUtils; +import io.github.bakedlibs.dough.inventory.InvUtils; import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; import io.github.thebusybiscuit.slimefun4.api.items.ItemSetting; import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/AbstractSmeltery.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/AbstractSmeltery.java index b4d455252..83ae9f8d5 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/AbstractSmeltery.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/AbstractSmeltery.java @@ -14,7 +14,7 @@ import org.bukkit.entity.Player; import org.bukkit.inventory.Inventory; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.cscorelib2.inventory.InvUtils; +import io.github.bakedlibs.dough.inventory.InvUtils; import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/tasks/TickerTask.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/tasks/TickerTask.java index 248fb5597..d5fbc59b8 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/tasks/TickerTask.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/tasks/TickerTask.java @@ -19,8 +19,8 @@ import org.bukkit.Material; import org.bukkit.block.Block; import org.bukkit.scheduler.BukkitScheduler; -import io.github.thebusybiscuit.cscorelib2.blocks.BlockPosition; -import io.github.thebusybiscuit.cscorelib2.blocks.ChunkPosition; +import io.github.bakedlibs.dough.blocks.BlockPosition; +import io.github.bakedlibs.dough.blocks.ChunkPosition; import io.github.thebusybiscuit.slimefun4.api.ErrorReport; import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/utils/ChargeUtils.java b/src/main/java/io/github/thebusybiscuit/slimefun4/utils/ChargeUtils.java index d722f0716..9c23ff007 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/utils/ChargeUtils.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/utils/ChargeUtils.java @@ -15,7 +15,7 @@ import org.bukkit.inventory.meta.ItemMeta; import org.bukkit.persistence.PersistentDataContainer; import org.bukkit.persistence.PersistentDataType; -import io.github.thebusybiscuit.cscorelib2.chat.ChatColors; +import io.github.bakedlibs.dough.common.ChatColors; import io.github.thebusybiscuit.slimefun4.core.attributes.Rechargeable; import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/utils/SlimefunUtils.java b/src/main/java/io/github/thebusybiscuit/slimefun4/utils/SlimefunUtils.java index f57adc633..4576c7113 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/utils/SlimefunUtils.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/utils/SlimefunUtils.java @@ -25,7 +25,7 @@ import org.bukkit.metadata.FixedMetadataValue; import org.bukkit.persistence.PersistentDataContainer; import org.bukkit.persistence.PersistentDataType; -import io.github.thebusybiscuit.cscorelib2.item.ImmutableItemMeta; +import io.github.bakedlibs.dough.items.ItemMetaSnapshot; import io.github.thebusybiscuit.cscorelib2.skull.SkullItem; import io.github.thebusybiscuit.slimefun4.api.MinecraftVersion; import io.github.thebusybiscuit.slimefun4.api.events.SlimefunItemSpawnEvent; @@ -276,7 +276,7 @@ public final class SlimefunUtils { return id.get().equals(((SlimefunItemStack) sfitem).getItemId()); } - ImmutableItemMeta meta = ((SlimefunItemStack) sfitem).getItemMetaSnapshot(); + ItemMetaSnapshot meta = ((SlimefunItemStack) sfitem).getItemMetaSnapshot(); return equalsItemMeta(itemMeta, meta, checkLore); } else if (sfitem.hasItemMeta()) { return equalsItemMeta(itemMeta, sfitem.getItemMeta(), checkLore); @@ -288,7 +288,7 @@ public final class SlimefunUtils { } } - private static boolean equalsItemMeta(@Nonnull ItemMeta itemMeta, @Nonnull ImmutableItemMeta meta, boolean checkLore) { + private static boolean equalsItemMeta(@Nonnull ItemMeta itemMeta, @Nonnull ItemMetaSnapshot meta, boolean checkLore) { Optional displayName = meta.getDisplayName(); if (itemMeta.hasDisplayName() != displayName.isPresent()) { diff --git a/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/abstractItems/AContainer.java b/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/abstractItems/AContainer.java index 7d9ac4ad5..bc0e05853 100644 --- a/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/abstractItems/AContainer.java +++ b/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/abstractItems/AContainer.java @@ -17,8 +17,8 @@ import org.bukkit.event.inventory.InventoryClickEvent; import org.bukkit.inventory.Inventory; import org.bukkit.inventory.ItemStack; +import io.github.bakedlibs.dough.inventory.InvUtils; import io.github.bakedlibs.dough.items.CustomItemStack; -import io.github.thebusybiscuit.cscorelib2.inventory.InvUtils; import io.github.thebusybiscuit.slimefun4.api.SlimefunAddon; import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; import io.github.thebusybiscuit.slimefun4.api.items.ItemState; diff --git a/src/main/java/me/mrCookieSlime/Slimefun/api/BlockStorage.java b/src/main/java/me/mrCookieSlime/Slimefun/api/BlockStorage.java index fbb0eb879..b2f175c4f 100644 --- a/src/main/java/me/mrCookieSlime/Slimefun/api/BlockStorage.java +++ b/src/main/java/me/mrCookieSlime/Slimefun/api/BlockStorage.java @@ -251,7 +251,7 @@ public class BlockStorage { continue; } - io.github.thebusybiscuit.cscorelib2.config.Config cfg = new io.github.thebusybiscuit.cscorelib2.config.Config(file); + io.github.bakedlibs.dough.config.Config cfg = new io.github.bakedlibs.dough.config.Config(file); BlockMenuPreset preset = BlockMenuPreset.getPreset(cfg.getString("preset")); if (preset == null) { @@ -276,7 +276,7 @@ public class BlockStorage { for (File file : new File("data-storage/Slimefun/universal-inventories").listFiles()) { if (file.getName().endsWith(".sfi")) { try { - io.github.thebusybiscuit.cscorelib2.config.Config cfg = new io.github.thebusybiscuit.cscorelib2.config.Config(file); + io.github.bakedlibs.dough.config.Config cfg = new io.github.bakedlibs.dough.config.Config(file); BlockMenuPreset preset = BlockMenuPreset.getPreset(cfg.getString("preset")); if (preset != null) { @@ -572,7 +572,7 @@ public class BlockStorage { File file = new File(PATH_INVENTORIES + serializeLocation(l) + ".sfi"); if (file.exists()) { - BlockMenu inventory = new BlockMenu(preset, l, new io.github.thebusybiscuit.cscorelib2.config.Config(file)); + BlockMenu inventory = new BlockMenu(preset, l, new io.github.bakedlibs.dough.config.Config(file)); storage.inventories.put(l, inventory); } else { storage.loadInventory(l, preset); diff --git a/src/main/java/me/mrCookieSlime/Slimefun/api/inventory/BlockMenu.java b/src/main/java/me/mrCookieSlime/Slimefun/api/inventory/BlockMenu.java index 1015ebf0f..f270ba6ee 100644 --- a/src/main/java/me/mrCookieSlime/Slimefun/api/inventory/BlockMenu.java +++ b/src/main/java/me/mrCookieSlime/Slimefun/api/inventory/BlockMenu.java @@ -9,7 +9,7 @@ import org.bukkit.Location; import org.bukkit.block.Block; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.cscorelib2.config.Config; +import io.github.bakedlibs.dough.config.Config; import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; // This class will be deprecated, relocated and rewritten in a future version. diff --git a/src/main/java/me/mrCookieSlime/Slimefun/api/inventory/DirtyChestMenu.java b/src/main/java/me/mrCookieSlime/Slimefun/api/inventory/DirtyChestMenu.java index ed3513163..bf7cfee93 100644 --- a/src/main/java/me/mrCookieSlime/Slimefun/api/inventory/DirtyChestMenu.java +++ b/src/main/java/me/mrCookieSlime/Slimefun/api/inventory/DirtyChestMenu.java @@ -12,9 +12,9 @@ import org.bukkit.entity.Player; import org.bukkit.inventory.Inventory; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.cscorelib2.inventory.InvUtils; -import io.github.thebusybiscuit.cscorelib2.inventory.ItemUtils; -import io.github.thebusybiscuit.cscorelib2.item.CustomItem; +import io.github.bakedlibs.dough.inventory.InvUtils; +import io.github.bakedlibs.dough.items.CustomItemStack; +import io.github.bakedlibs.dough.items.ItemUtils; import io.github.thebusybiscuit.slimefun4.utils.itemstack.ItemStackWrapper; import me.mrCookieSlime.CSCoreLibPlugin.general.Inventory.ChestMenu; diff --git a/src/main/java/me/mrCookieSlime/Slimefun/api/inventory/UniversalBlockMenu.java b/src/main/java/me/mrCookieSlime/Slimefun/api/inventory/UniversalBlockMenu.java index 66a3d9d76..d3a72235a 100644 --- a/src/main/java/me/mrCookieSlime/Slimefun/api/inventory/UniversalBlockMenu.java +++ b/src/main/java/me/mrCookieSlime/Slimefun/api/inventory/UniversalBlockMenu.java @@ -2,7 +2,7 @@ package me.mrCookieSlime.Slimefun.api.inventory; import java.io.File; -import io.github.thebusybiscuit.cscorelib2.config.Config; +import io.github.bakedlibs.dough.config.Config; // This class will be deprecated, relocated and rewritten in a future version. public class UniversalBlockMenu extends DirtyChestMenu {