diff --git a/internal/v1_21_R1/pom.xml b/internal/v1_21_R3/pom.xml similarity index 94% rename from internal/v1_21_R1/pom.xml rename to internal/v1_21_R3/pom.xml index 8fcd01be..0a79bfb2 100644 --- a/internal/v1_21_R1/pom.xml +++ b/internal/v1_21_R3/pom.xml @@ -26,13 +26,13 @@ 5.1.4-SNAPSHOT - openinvadapter1_21_R1 - OpenInvAdapter1_21_R1 + openinvadapter1_21_R3 + OpenInvAdapter1_21_R3 21 21 - 1.21.1-R0.1-SNAPSHOT + 1.21.4-R0.1-SNAPSHOT diff --git a/internal/v1_21_R1/src/main/java/com/lishid/openinv/internal/v1_21_R1/InternalAccessor.java b/internal/v1_21_R3/src/main/java/com/lishid/openinv/internal/v1_21_R3/InternalAccessor.java similarity index 84% rename from internal/v1_21_R1/src/main/java/com/lishid/openinv/internal/v1_21_R1/InternalAccessor.java rename to internal/v1_21_R3/src/main/java/com/lishid/openinv/internal/v1_21_R3/InternalAccessor.java index 94588f9d..4b22c13c 100644 --- a/internal/v1_21_R1/src/main/java/com/lishid/openinv/internal/v1_21_R1/InternalAccessor.java +++ b/internal/v1_21_R3/src/main/java/com/lishid/openinv/internal/v1_21_R3/InternalAccessor.java @@ -1,19 +1,19 @@ -package com.lishid.openinv.internal.v1_21_R1; +package com.lishid.openinv.internal.v1_21_R3; import com.lishid.openinv.internal.Accessor; import com.lishid.openinv.internal.IAnySilentContainer; import com.lishid.openinv.internal.ISpecialEnderChest; import com.lishid.openinv.internal.ISpecialInventory; import com.lishid.openinv.internal.ISpecialPlayerInventory; -import com.lishid.openinv.internal.v1_21_R1.container.AnySilentContainer; -import com.lishid.openinv.internal.v1_21_R1.container.OpenEnderChest; -import com.lishid.openinv.internal.v1_21_R1.container.OpenInventory; -import com.lishid.openinv.internal.v1_21_R1.container.Placeholders; -import com.lishid.openinv.internal.v1_21_R1.player.PlayerManager; +import com.lishid.openinv.internal.v1_21_R3.container.AnySilentContainer; +import com.lishid.openinv.internal.v1_21_R3.container.OpenEnderChest; +import com.lishid.openinv.internal.v1_21_R3.container.OpenInventory; +import com.lishid.openinv.internal.v1_21_R3.container.Placeholders; +import com.lishid.openinv.internal.v1_21_R3.player.PlayerManager; import com.lishid.openinv.util.lang.LanguageManager; import net.minecraft.world.Container; import org.bukkit.configuration.ConfigurationSection; -import org.bukkit.craftbukkit.v1_21_R1.inventory.CraftInventory; +import org.bukkit.craftbukkit.v1_21_R3.inventory.CraftInventory; import org.bukkit.entity.Player; import org.bukkit.inventory.Inventory; import org.jetbrains.annotations.NotNull; diff --git a/internal/v1_21_R1/src/main/java/com/lishid/openinv/internal/v1_21_R1/container/AnySilentContainer.java b/internal/v1_21_R3/src/main/java/com/lishid/openinv/internal/v1_21_R3/container/AnySilentContainer.java similarity index 98% rename from internal/v1_21_R1/src/main/java/com/lishid/openinv/internal/v1_21_R1/container/AnySilentContainer.java rename to internal/v1_21_R3/src/main/java/com/lishid/openinv/internal/v1_21_R3/container/AnySilentContainer.java index f23f1edc..c2724bad 100644 --- a/internal/v1_21_R1/src/main/java/com/lishid/openinv/internal/v1_21_R1/container/AnySilentContainer.java +++ b/internal/v1_21_R3/src/main/java/com/lishid/openinv/internal/v1_21_R3/container/AnySilentContainer.java @@ -14,11 +14,11 @@ * along with this program. If not, see . */ -package com.lishid.openinv.internal.v1_21_R1.container; +package com.lishid.openinv.internal.v1_21_R3.container; import com.lishid.openinv.internal.AnySilentContainerBase; -import com.lishid.openinv.internal.v1_21_R1.container.menu.OpenChestMenu; -import com.lishid.openinv.internal.v1_21_R1.player.PlayerManager; +import com.lishid.openinv.internal.v1_21_R3.container.menu.OpenChestMenu; +import com.lishid.openinv.internal.v1_21_R3.player.PlayerManager; import com.lishid.openinv.util.ReflectionHelper; import com.lishid.openinv.util.lang.LanguageManager; import net.minecraft.core.BlockPos; diff --git a/internal/v1_21_R1/src/main/java/com/lishid/openinv/internal/v1_21_R1/container/OpenEnderChest.java b/internal/v1_21_R3/src/main/java/com/lishid/openinv/internal/v1_21_R3/container/OpenEnderChest.java similarity index 91% rename from internal/v1_21_R1/src/main/java/com/lishid/openinv/internal/v1_21_R1/container/OpenEnderChest.java rename to internal/v1_21_R3/src/main/java/com/lishid/openinv/internal/v1_21_R3/container/OpenEnderChest.java index 3d495735..eee8f317 100644 --- a/internal/v1_21_R1/src/main/java/com/lishid/openinv/internal/v1_21_R1/container/OpenEnderChest.java +++ b/internal/v1_21_R3/src/main/java/com/lishid/openinv/internal/v1_21_R3/container/OpenEnderChest.java @@ -1,22 +1,22 @@ -package com.lishid.openinv.internal.v1_21_R1.container; +package com.lishid.openinv.internal.v1_21_R3.container; import com.lishid.openinv.internal.ISpecialEnderChest; import com.lishid.openinv.internal.InternalOwned; -import com.lishid.openinv.internal.v1_21_R1.container.menu.OpenEnderChestMenu; -import com.lishid.openinv.internal.v1_21_R1.player.PlayerManager; +import com.lishid.openinv.internal.v1_21_R3.container.menu.OpenEnderChestMenu; +import com.lishid.openinv.internal.v1_21_R3.player.PlayerManager; import net.minecraft.core.NonNullList; import net.minecraft.network.chat.Component; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.Container; import net.minecraft.world.ContainerHelper; import net.minecraft.world.entity.player.Player; -import net.minecraft.world.entity.player.StackedContents; +import net.minecraft.world.entity.player.StackedItemContents; import net.minecraft.world.inventory.AbstractContainerMenu; import net.minecraft.world.inventory.StackedContentsCompatible; import net.minecraft.world.item.ItemStack; import org.bukkit.Location; -import org.bukkit.craftbukkit.v1_21_R1.entity.CraftHumanEntity; -import org.bukkit.craftbukkit.v1_21_R1.inventory.CraftInventory; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftHumanEntity; +import org.bukkit.craftbukkit.v1_21_R3.inventory.CraftInventory; import org.bukkit.entity.HumanEntity; import org.bukkit.event.inventory.InventoryType; import org.jetbrains.annotations.NotNull; @@ -174,7 +174,7 @@ public void clearContent() { } @Override - public void fillStackedContents(StackedContents stackedContents) { + public void fillStackedContents(StackedItemContents stackedContents) { for (ItemStack itemstack : items) { stackedContents.accountStack(itemstack); } diff --git a/internal/v1_21_R1/src/main/java/com/lishid/openinv/internal/v1_21_R1/container/OpenInventory.java b/internal/v1_21_R3/src/main/java/com/lishid/openinv/internal/v1_21_R3/container/OpenInventory.java similarity index 91% rename from internal/v1_21_R1/src/main/java/com/lishid/openinv/internal/v1_21_R1/container/OpenInventory.java rename to internal/v1_21_R3/src/main/java/com/lishid/openinv/internal/v1_21_R3/container/OpenInventory.java index 748038a6..8f227240 100644 --- a/internal/v1_21_R1/src/main/java/com/lishid/openinv/internal/v1_21_R1/container/OpenInventory.java +++ b/internal/v1_21_R3/src/main/java/com/lishid/openinv/internal/v1_21_R3/container/OpenInventory.java @@ -1,20 +1,20 @@ -package com.lishid.openinv.internal.v1_21_R1.container; +package com.lishid.openinv.internal.v1_21_R3.container; import com.lishid.openinv.internal.ISpecialPlayerInventory; import com.lishid.openinv.internal.InternalOwned; -import com.lishid.openinv.internal.v1_21_R1.container.bukkit.OpenPlayerInventory; -import com.lishid.openinv.internal.v1_21_R1.container.menu.OpenInventoryMenu; -import com.lishid.openinv.internal.v1_21_R1.container.slot.Content; -import com.lishid.openinv.internal.v1_21_R1.container.slot.ContentCrafting; -import com.lishid.openinv.internal.v1_21_R1.container.slot.ContentCraftingResult; -import com.lishid.openinv.internal.v1_21_R1.container.slot.ContentCursor; -import com.lishid.openinv.internal.v1_21_R1.container.slot.ContentDrop; -import com.lishid.openinv.internal.v1_21_R1.container.slot.ContentEquipment; -import com.lishid.openinv.internal.v1_21_R1.container.slot.ContentList; -import com.lishid.openinv.internal.v1_21_R1.container.slot.ContentOffHand; -import com.lishid.openinv.internal.v1_21_R1.container.slot.ContentViewOnly; -import com.lishid.openinv.internal.v1_21_R1.container.slot.SlotViewOnly; -import com.lishid.openinv.internal.v1_21_R1.player.PlayerManager; +import com.lishid.openinv.internal.v1_21_R3.container.bukkit.OpenPlayerInventory; +import com.lishid.openinv.internal.v1_21_R3.container.menu.OpenInventoryMenu; +import com.lishid.openinv.internal.v1_21_R3.container.slot.Content; +import com.lishid.openinv.internal.v1_21_R3.container.slot.ContentCrafting; +import com.lishid.openinv.internal.v1_21_R3.container.slot.ContentCraftingResult; +import com.lishid.openinv.internal.v1_21_R3.container.slot.ContentCursor; +import com.lishid.openinv.internal.v1_21_R3.container.slot.ContentDrop; +import com.lishid.openinv.internal.v1_21_R3.container.slot.ContentEquipment; +import com.lishid.openinv.internal.v1_21_R3.container.slot.ContentList; +import com.lishid.openinv.internal.v1_21_R3.container.slot.ContentOffHand; +import com.lishid.openinv.internal.v1_21_R3.container.slot.ContentViewOnly; +import com.lishid.openinv.internal.v1_21_R3.container.slot.SlotViewOnly; +import com.lishid.openinv.internal.v1_21_R3.player.PlayerManager; import net.minecraft.ChatFormatting; import net.minecraft.core.NonNullList; import net.minecraft.network.chat.Component; @@ -29,8 +29,8 @@ import net.minecraft.world.inventory.Slot; import net.minecraft.world.item.ItemStack; import org.bukkit.Location; -import org.bukkit.craftbukkit.v1_21_R1.entity.CraftHumanEntity; -import org.bukkit.craftbukkit.v1_21_R1.inventory.CraftInventory; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftHumanEntity; +import org.bukkit.craftbukkit.v1_21_R3.inventory.CraftInventory; import org.bukkit.entity.HumanEntity; import org.bukkit.event.inventory.InventoryType; import org.jetbrains.annotations.NotNull; diff --git a/internal/v1_21_R1/src/main/java/com/lishid/openinv/internal/v1_21_R1/container/Placeholders.java b/internal/v1_21_R3/src/main/java/com/lishid/openinv/internal/v1_21_R3/container/Placeholders.java similarity index 92% rename from internal/v1_21_R1/src/main/java/com/lishid/openinv/internal/v1_21_R1/container/Placeholders.java rename to internal/v1_21_R3/src/main/java/com/lishid/openinv/internal/v1_21_R3/container/Placeholders.java index c5f35d2d..7a95351c 100644 --- a/internal/v1_21_R1/src/main/java/com/lishid/openinv/internal/v1_21_R1/container/Placeholders.java +++ b/internal/v1_21_R3/src/main/java/com/lishid/openinv/internal/v1_21_R3/container/Placeholders.java @@ -1,4 +1,4 @@ -package com.lishid.openinv.internal.v1_21_R1.container; +package com.lishid.openinv.internal.v1_21_R3.container; import net.minecraft.core.Registry; import net.minecraft.core.RegistryAccess; @@ -20,7 +20,7 @@ import net.minecraft.world.level.block.entity.BannerPatternLayers; import net.minecraft.world.level.block.entity.BannerPatterns; import org.bukkit.configuration.ConfigurationSection; -import org.bukkit.craftbukkit.v1_21_R1.CraftRegistry; +import org.bukkit.craftbukkit.v1_21_R3.CraftRegistry; import org.jetbrains.annotations.NotNull; import java.util.EnumMap; @@ -29,7 +29,7 @@ public final class Placeholders { - private static final CustomModelData DEFAULT_CUSTOM_MODEL_DATA = new CustomModelData(9999); + private static final CustomModelData DEFAULT_CUSTOM_MODEL_DATA = new CustomModelData(List.of(), List.of(), List.of("openinv:custom"), List.of()); public static final @NotNull EnumMap BLOCKED_GAME_TYPE = new EnumMap<>(GameType.class); public static @NotNull ItemStack craftingOutput = defaultCraftingOutput(); public static @NotNull ItemStack cursor = defaultCursor(); @@ -103,10 +103,10 @@ private static ItemStack defaultCursor() { // Cursor-like banner with no tooltip ItemStack itemStack = new ItemStack(Items.WHITE_BANNER); RegistryAccess minecraftRegistry = CraftRegistry.getMinecraftRegistry(); - Registry bannerPatterns = minecraftRegistry.registryOrThrow(Registries.BANNER_PATTERN); - BannerPattern halfDiagBottomRight = bannerPatterns.getOrThrow(BannerPatterns.DIAGONAL_RIGHT); - BannerPattern downRight = bannerPatterns.getOrThrow(BannerPatterns.STRIPE_DOWNRIGHT); - BannerPattern border = bannerPatterns.getOrThrow(BannerPatterns.BORDER); + Registry bannerPatterns = minecraftRegistry.lookupOrThrow(Registries.BANNER_PATTERN); + BannerPattern halfDiagBottomRight = bannerPatterns.getOrThrow(BannerPatterns.DIAGONAL_RIGHT).value(); + BannerPattern downRight = bannerPatterns.getOrThrow(BannerPatterns.STRIPE_DOWNRIGHT).value(); + BannerPattern border = bannerPatterns.getOrThrow(BannerPatterns.BORDER).value(); itemStack.set(DataComponents.BANNER_PATTERNS, new BannerPatternLayers(List.of( new BannerPatternLayers.Layer(bannerPatterns.wrapAsHolder(halfDiagBottomRight), DyeColor.GRAY), @@ -140,12 +140,12 @@ private static ItemStack getEmptyShield() { ItemStack itemStack = new ItemStack(Items.SHIELD); itemStack.set(DataComponents.BASE_COLOR, DyeColor.MAGENTA); RegistryAccess minecraftRegistry = CraftRegistry.getMinecraftRegistry(); - Registry bannerPatterns = minecraftRegistry.registryOrThrow(Registries.BANNER_PATTERN); - BannerPattern halfLeft = bannerPatterns.getOrThrow(BannerPatterns.HALF_VERTICAL); - BannerPattern topLeft = bannerPatterns.getOrThrow(BannerPatterns.SQUARE_TOP_LEFT); - BannerPattern topRight = bannerPatterns.getOrThrow(BannerPatterns.SQUARE_TOP_RIGHT); - BannerPattern bottomLeft = bannerPatterns.getOrThrow(BannerPatterns.SQUARE_BOTTOM_LEFT); - BannerPattern bottomRight = bannerPatterns.getOrThrow(BannerPatterns.SQUARE_BOTTOM_RIGHT); + Registry bannerPatterns = minecraftRegistry.lookupOrThrow(Registries.BANNER_PATTERN); + BannerPattern halfLeft = bannerPatterns.getOrThrow(BannerPatterns.HALF_VERTICAL).value(); + BannerPattern topLeft = bannerPatterns.getOrThrow(BannerPatterns.SQUARE_TOP_LEFT).value(); + BannerPattern topRight = bannerPatterns.getOrThrow(BannerPatterns.SQUARE_TOP_RIGHT).value(); + BannerPattern bottomLeft = bannerPatterns.getOrThrow(BannerPatterns.SQUARE_BOTTOM_LEFT).value(); + BannerPattern bottomRight = bannerPatterns.getOrThrow(BannerPatterns.SQUARE_BOTTOM_RIGHT).value(); itemStack.set(DataComponents.BANNER_PATTERNS, new BannerPatternLayers(List.of( new BannerPatternLayers.Layer(bannerPatterns.wrapAsHolder(halfLeft), DyeColor.BLACK), diff --git a/internal/v1_21_R1/src/main/java/com/lishid/openinv/internal/v1_21_R1/container/bukkit/OpenDummyInventory.java b/internal/v1_21_R3/src/main/java/com/lishid/openinv/internal/v1_21_R3/container/bukkit/OpenDummyInventory.java similarity index 96% rename from internal/v1_21_R1/src/main/java/com/lishid/openinv/internal/v1_21_R1/container/bukkit/OpenDummyInventory.java rename to internal/v1_21_R3/src/main/java/com/lishid/openinv/internal/v1_21_R3/container/bukkit/OpenDummyInventory.java index c0eb1a38..0a140ae0 100644 --- a/internal/v1_21_R1/src/main/java/com/lishid/openinv/internal/v1_21_R1/container/bukkit/OpenDummyInventory.java +++ b/internal/v1_21_R3/src/main/java/com/lishid/openinv/internal/v1_21_R3/container/bukkit/OpenDummyInventory.java @@ -1,9 +1,9 @@ -package com.lishid.openinv.internal.v1_21_R1.container.bukkit; +package com.lishid.openinv.internal.v1_21_R3.container.bukkit; import com.lishid.openinv.internal.ViewOnly; import net.minecraft.world.Container; import org.bukkit.Material; -import org.bukkit.craftbukkit.v1_21_R1.inventory.CraftInventory; +import org.bukkit.craftbukkit.v1_21_R3.inventory.CraftInventory; import org.bukkit.inventory.ItemStack; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/internal/v1_21_R1/src/main/java/com/lishid/openinv/internal/v1_21_R1/container/bukkit/OpenPlayerInventory.java b/internal/v1_21_R3/src/main/java/com/lishid/openinv/internal/v1_21_R3/container/bukkit/OpenPlayerInventory.java similarity index 96% rename from internal/v1_21_R1/src/main/java/com/lishid/openinv/internal/v1_21_R1/container/bukkit/OpenPlayerInventory.java rename to internal/v1_21_R3/src/main/java/com/lishid/openinv/internal/v1_21_R3/container/bukkit/OpenPlayerInventory.java index de323f5a..7d612d77 100644 --- a/internal/v1_21_R1/src/main/java/com/lishid/openinv/internal/v1_21_R1/container/bukkit/OpenPlayerInventory.java +++ b/internal/v1_21_R3/src/main/java/com/lishid/openinv/internal/v1_21_R3/container/bukkit/OpenPlayerInventory.java @@ -1,12 +1,12 @@ -package com.lishid.openinv.internal.v1_21_R1.container.bukkit; +package com.lishid.openinv.internal.v1_21_R3.container.bukkit; import com.google.common.base.Preconditions; -import com.lishid.openinv.internal.v1_21_R1.container.OpenInventory; +import com.lishid.openinv.internal.v1_21_R3.container.OpenInventory; import net.minecraft.core.NonNullList; import net.minecraft.world.entity.EquipmentSlot; import net.minecraft.world.entity.player.Inventory; -import org.bukkit.craftbukkit.v1_21_R1.inventory.CraftInventory; -import org.bukkit.craftbukkit.v1_21_R1.inventory.CraftItemStack; +import org.bukkit.craftbukkit.v1_21_R3.inventory.CraftInventory; +import org.bukkit.craftbukkit.v1_21_R3.inventory.CraftItemStack; import org.bukkit.entity.Player; import org.bukkit.event.inventory.InventoryType; import org.bukkit.inventory.ItemStack; diff --git a/internal/v1_21_R1/src/main/java/com/lishid/openinv/internal/v1_21_R1/container/bukkit/OpenPlayerInventorySelf.java b/internal/v1_21_R3/src/main/java/com/lishid/openinv/internal/v1_21_R3/container/bukkit/OpenPlayerInventorySelf.java similarity index 80% rename from internal/v1_21_R1/src/main/java/com/lishid/openinv/internal/v1_21_R1/container/bukkit/OpenPlayerInventorySelf.java rename to internal/v1_21_R3/src/main/java/com/lishid/openinv/internal/v1_21_R3/container/bukkit/OpenPlayerInventorySelf.java index f9826ed1..a26e75c8 100644 --- a/internal/v1_21_R1/src/main/java/com/lishid/openinv/internal/v1_21_R1/container/bukkit/OpenPlayerInventorySelf.java +++ b/internal/v1_21_R3/src/main/java/com/lishid/openinv/internal/v1_21_R3/container/bukkit/OpenPlayerInventorySelf.java @@ -1,6 +1,6 @@ -package com.lishid.openinv.internal.v1_21_R1.container.bukkit; +package com.lishid.openinv.internal.v1_21_R3.container.bukkit; -import com.lishid.openinv.internal.v1_21_R1.container.OpenInventory; +import com.lishid.openinv.internal.v1_21_R3.container.OpenInventory; import org.bukkit.inventory.ItemStack; import org.jetbrains.annotations.NotNull; diff --git a/internal/v1_21_R1/src/main/java/com/lishid/openinv/internal/v1_21_R1/container/menu/OpenChestMenu.java b/internal/v1_21_R3/src/main/java/com/lishid/openinv/internal/v1_21_R3/container/menu/OpenChestMenu.java similarity index 97% rename from internal/v1_21_R1/src/main/java/com/lishid/openinv/internal/v1_21_R1/container/menu/OpenChestMenu.java rename to internal/v1_21_R3/src/main/java/com/lishid/openinv/internal/v1_21_R3/container/menu/OpenChestMenu.java index 512ab769..f6557c59 100644 --- a/internal/v1_21_R1/src/main/java/com/lishid/openinv/internal/v1_21_R1/container/menu/OpenChestMenu.java +++ b/internal/v1_21_R3/src/main/java/com/lishid/openinv/internal/v1_21_R3/container/menu/OpenChestMenu.java @@ -1,11 +1,11 @@ -package com.lishid.openinv.internal.v1_21_R1.container.menu; +package com.lishid.openinv.internal.v1_21_R3.container.menu; import com.google.common.base.Suppliers; import com.lishid.openinv.internal.ISpecialInventory; import com.lishid.openinv.internal.InternalOwned; -import com.lishid.openinv.internal.v1_21_R1.container.bukkit.OpenDummyInventory; -import com.lishid.openinv.internal.v1_21_R1.container.slot.SlotPlaceholder; -import com.lishid.openinv.internal.v1_21_R1.container.slot.SlotViewOnly; +import com.lishid.openinv.internal.v1_21_R3.container.bukkit.OpenDummyInventory; +import com.lishid.openinv.internal.v1_21_R3.container.slot.SlotPlaceholder; +import com.lishid.openinv.internal.v1_21_R3.container.slot.SlotViewOnly; import it.unimi.dsi.fastutil.ints.IntArrayList; import it.unimi.dsi.fastutil.ints.IntList; import net.minecraft.server.level.ServerPlayer; @@ -21,7 +21,7 @@ import net.minecraft.world.inventory.MenuType; import net.minecraft.world.inventory.Slot; import net.minecraft.world.item.ItemStack; -import org.bukkit.craftbukkit.v1_21_R1.inventory.CraftInventoryView; +import org.bukkit.craftbukkit.v1_21_R3.inventory.CraftInventoryView; import org.bukkit.event.inventory.InventoryType; import org.bukkit.inventory.Inventory; import org.bukkit.inventory.InventoryView; diff --git a/internal/v1_21_R1/src/main/java/com/lishid/openinv/internal/v1_21_R1/container/menu/OpenEnderChestMenu.java b/internal/v1_21_R3/src/main/java/com/lishid/openinv/internal/v1_21_R3/container/menu/OpenEnderChestMenu.java similarity index 91% rename from internal/v1_21_R1/src/main/java/com/lishid/openinv/internal/v1_21_R1/container/menu/OpenEnderChestMenu.java rename to internal/v1_21_R3/src/main/java/com/lishid/openinv/internal/v1_21_R3/container/menu/OpenEnderChestMenu.java index 172f42ea..075c0849 100644 --- a/internal/v1_21_R1/src/main/java/com/lishid/openinv/internal/v1_21_R1/container/menu/OpenEnderChestMenu.java +++ b/internal/v1_21_R3/src/main/java/com/lishid/openinv/internal/v1_21_R3/container/menu/OpenEnderChestMenu.java @@ -1,6 +1,6 @@ -package com.lishid.openinv.internal.v1_21_R1.container.menu; +package com.lishid.openinv.internal.v1_21_R3.container.menu; -import com.lishid.openinv.internal.v1_21_R1.container.OpenEnderChest; +import com.lishid.openinv.internal.v1_21_R3.container.OpenEnderChest; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.entity.player.Player; import net.minecraft.world.inventory.Slot; diff --git a/internal/v1_21_R1/src/main/java/com/lishid/openinv/internal/v1_21_R1/container/menu/OpenInventoryMenu.java b/internal/v1_21_R3/src/main/java/com/lishid/openinv/internal/v1_21_R3/container/menu/OpenInventoryMenu.java similarity index 93% rename from internal/v1_21_R1/src/main/java/com/lishid/openinv/internal/v1_21_R1/container/menu/OpenInventoryMenu.java rename to internal/v1_21_R3/src/main/java/com/lishid/openinv/internal/v1_21_R3/container/menu/OpenInventoryMenu.java index f0c75a6f..91732433 100644 --- a/internal/v1_21_R1/src/main/java/com/lishid/openinv/internal/v1_21_R1/container/menu/OpenInventoryMenu.java +++ b/internal/v1_21_R3/src/main/java/com/lishid/openinv/internal/v1_21_R3/container/menu/OpenInventoryMenu.java @@ -1,12 +1,12 @@ -package com.lishid.openinv.internal.v1_21_R1.container.menu; +package com.lishid.openinv.internal.v1_21_R3.container.menu; import com.google.common.base.Preconditions; -import com.lishid.openinv.internal.v1_21_R1.container.OpenInventory; -import com.lishid.openinv.internal.v1_21_R1.container.bukkit.OpenDummyInventory; -import com.lishid.openinv.internal.v1_21_R1.container.bukkit.OpenPlayerInventorySelf; -import com.lishid.openinv.internal.v1_21_R1.container.slot.ContentDrop; -import com.lishid.openinv.internal.v1_21_R1.container.slot.ContentEquipment; -import com.lishid.openinv.internal.v1_21_R1.container.slot.SlotViewOnly; +import com.lishid.openinv.internal.v1_21_R3.container.OpenInventory; +import com.lishid.openinv.internal.v1_21_R3.container.bukkit.OpenDummyInventory; +import com.lishid.openinv.internal.v1_21_R3.container.bukkit.OpenPlayerInventorySelf; +import com.lishid.openinv.internal.v1_21_R3.container.slot.ContentDrop; +import com.lishid.openinv.internal.v1_21_R3.container.slot.ContentEquipment; +import com.lishid.openinv.internal.v1_21_R3.container.slot.SlotViewOnly; import com.lishid.openinv.util.Permissions; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.entity.EquipmentSlot; @@ -15,8 +15,8 @@ import net.minecraft.world.inventory.MenuType; import net.minecraft.world.inventory.Slot; import net.minecraft.world.item.ItemStack; -import org.bukkit.craftbukkit.v1_21_R1.inventory.CraftInventoryView; -import org.bukkit.craftbukkit.v1_21_R1.inventory.CraftItemStack; +import org.bukkit.craftbukkit.v1_21_R3.inventory.CraftInventoryView; +import org.bukkit.craftbukkit.v1_21_R3.inventory.CraftItemStack; import org.bukkit.event.inventory.InventoryType; import org.bukkit.inventory.Inventory; import org.bukkit.inventory.InventoryView; diff --git a/internal/v1_21_R1/src/main/java/com/lishid/openinv/internal/v1_21_R1/container/slot/Content.java b/internal/v1_21_R3/src/main/java/com/lishid/openinv/internal/v1_21_R3/container/slot/Content.java similarity index 96% rename from internal/v1_21_R1/src/main/java/com/lishid/openinv/internal/v1_21_R1/container/slot/Content.java rename to internal/v1_21_R3/src/main/java/com/lishid/openinv/internal/v1_21_R3/container/slot/Content.java index d63536f0..fb290de4 100644 --- a/internal/v1_21_R1/src/main/java/com/lishid/openinv/internal/v1_21_R1/container/slot/Content.java +++ b/internal/v1_21_R3/src/main/java/com/lishid/openinv/internal/v1_21_R3/container/slot/Content.java @@ -1,4 +1,4 @@ -package com.lishid.openinv.internal.v1_21_R1.container.slot; +package com.lishid.openinv.internal.v1_21_R3.container.slot; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.Container; diff --git a/internal/v1_21_R1/src/main/java/com/lishid/openinv/internal/v1_21_R1/container/slot/ContentCrafting.java b/internal/v1_21_R3/src/main/java/com/lishid/openinv/internal/v1_21_R3/container/slot/ContentCrafting.java similarity index 96% rename from internal/v1_21_R1/src/main/java/com/lishid/openinv/internal/v1_21_R1/container/slot/ContentCrafting.java rename to internal/v1_21_R3/src/main/java/com/lishid/openinv/internal/v1_21_R3/container/slot/ContentCrafting.java index 3f2bdb98..0479ea8c 100644 --- a/internal/v1_21_R1/src/main/java/com/lishid/openinv/internal/v1_21_R1/container/slot/ContentCrafting.java +++ b/internal/v1_21_R3/src/main/java/com/lishid/openinv/internal/v1_21_R3/container/slot/ContentCrafting.java @@ -1,6 +1,6 @@ -package com.lishid.openinv.internal.v1_21_R1.container.slot; +package com.lishid.openinv.internal.v1_21_R3.container.slot; -import com.lishid.openinv.internal.v1_21_R1.container.Placeholders; +import com.lishid.openinv.internal.v1_21_R3.container.Placeholders; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.Container; import net.minecraft.world.ContainerHelper; diff --git a/internal/v1_21_R1/src/main/java/com/lishid/openinv/internal/v1_21_R1/container/slot/ContentCraftingResult.java b/internal/v1_21_R3/src/main/java/com/lishid/openinv/internal/v1_21_R3/container/slot/ContentCraftingResult.java similarity index 80% rename from internal/v1_21_R1/src/main/java/com/lishid/openinv/internal/v1_21_R1/container/slot/ContentCraftingResult.java rename to internal/v1_21_R3/src/main/java/com/lishid/openinv/internal/v1_21_R3/container/slot/ContentCraftingResult.java index 54fb0cdc..1fceaca0 100644 --- a/internal/v1_21_R1/src/main/java/com/lishid/openinv/internal/v1_21_R1/container/slot/ContentCraftingResult.java +++ b/internal/v1_21_R3/src/main/java/com/lishid/openinv/internal/v1_21_R3/container/slot/ContentCraftingResult.java @@ -1,6 +1,6 @@ -package com.lishid.openinv.internal.v1_21_R1.container.slot; +package com.lishid.openinv.internal.v1_21_R3.container.slot; -import com.lishid.openinv.internal.v1_21_R1.container.Placeholders; +import com.lishid.openinv.internal.v1_21_R3.container.Placeholders; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.Container; import net.minecraft.world.inventory.InventoryMenu; @@ -23,7 +23,7 @@ public ContentCraftingResult(@NotNull ServerPlayer holder) { @Override public ItemStack get() { InventoryMenu inventoryMenu = holder.inventoryMenu; - return inventoryMenu.getSlot(inventoryMenu.getResultSlotIndex()).getItem(); + return inventoryMenu.getResultSlot().getItem(); } @Override @@ -35,7 +35,7 @@ public ItemStack getOrDefault() { return Placeholders.survivalOnly(holder); } InventoryMenu inventoryMenu = holder.inventoryMenu; - return inventoryMenu.getSlot(inventoryMenu.getResultSlotIndex()).getItem(); + return inventoryMenu.getResultSlot().getItem(); } }; } diff --git a/internal/v1_21_R1/src/main/java/com/lishid/openinv/internal/v1_21_R1/container/slot/ContentCursor.java b/internal/v1_21_R3/src/main/java/com/lishid/openinv/internal/v1_21_R3/container/slot/ContentCursor.java similarity index 96% rename from internal/v1_21_R1/src/main/java/com/lishid/openinv/internal/v1_21_R1/container/slot/ContentCursor.java rename to internal/v1_21_R3/src/main/java/com/lishid/openinv/internal/v1_21_R3/container/slot/ContentCursor.java index 5401daca..46ea737e 100644 --- a/internal/v1_21_R1/src/main/java/com/lishid/openinv/internal/v1_21_R1/container/slot/ContentCursor.java +++ b/internal/v1_21_R3/src/main/java/com/lishid/openinv/internal/v1_21_R3/container/slot/ContentCursor.java @@ -1,6 +1,6 @@ -package com.lishid.openinv.internal.v1_21_R1.container.slot; +package com.lishid.openinv.internal.v1_21_R3.container.slot; -import com.lishid.openinv.internal.v1_21_R1.container.Placeholders; +import com.lishid.openinv.internal.v1_21_R3.container.Placeholders; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.Container; import net.minecraft.world.entity.player.Player; diff --git a/internal/v1_21_R1/src/main/java/com/lishid/openinv/internal/v1_21_R1/container/slot/ContentDrop.java b/internal/v1_21_R3/src/main/java/com/lishid/openinv/internal/v1_21_R3/container/slot/ContentDrop.java similarity index 93% rename from internal/v1_21_R1/src/main/java/com/lishid/openinv/internal/v1_21_R1/container/slot/ContentDrop.java rename to internal/v1_21_R3/src/main/java/com/lishid/openinv/internal/v1_21_R3/container/slot/ContentDrop.java index 9a083b33..5e1c5168 100644 --- a/internal/v1_21_R1/src/main/java/com/lishid/openinv/internal/v1_21_R1/container/slot/ContentDrop.java +++ b/internal/v1_21_R3/src/main/java/com/lishid/openinv/internal/v1_21_R3/container/slot/ContentDrop.java @@ -1,6 +1,6 @@ -package com.lishid.openinv.internal.v1_21_R1.container.slot; +package com.lishid.openinv.internal.v1_21_R3.container.slot; -import com.lishid.openinv.internal.v1_21_R1.container.Placeholders; +import com.lishid.openinv.internal.v1_21_R3.container.Placeholders; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.Container; import net.minecraft.world.inventory.Slot; diff --git a/internal/v1_21_R1/src/main/java/com/lishid/openinv/internal/v1_21_R1/container/slot/ContentEquipment.java b/internal/v1_21_R3/src/main/java/com/lishid/openinv/internal/v1_21_R3/container/slot/ContentEquipment.java similarity index 94% rename from internal/v1_21_R1/src/main/java/com/lishid/openinv/internal/v1_21_R1/container/slot/ContentEquipment.java rename to internal/v1_21_R3/src/main/java/com/lishid/openinv/internal/v1_21_R3/container/slot/ContentEquipment.java index 662d4d67..9fe03914 100644 --- a/internal/v1_21_R1/src/main/java/com/lishid/openinv/internal/v1_21_R1/container/slot/ContentEquipment.java +++ b/internal/v1_21_R3/src/main/java/com/lishid/openinv/internal/v1_21_R3/container/slot/ContentEquipment.java @@ -1,6 +1,6 @@ -package com.lishid.openinv.internal.v1_21_R1.container.slot; +package com.lishid.openinv.internal.v1_21_R3.container.slot; -import com.lishid.openinv.internal.v1_21_R1.container.Placeholders; +import com.lishid.openinv.internal.v1_21_R3.container.Placeholders; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.Container; import net.minecraft.world.entity.EquipmentSlot; diff --git a/internal/v1_21_R1/src/main/java/com/lishid/openinv/internal/v1_21_R1/container/slot/ContentList.java b/internal/v1_21_R3/src/main/java/com/lishid/openinv/internal/v1_21_R3/container/slot/ContentList.java similarity index 95% rename from internal/v1_21_R1/src/main/java/com/lishid/openinv/internal/v1_21_R1/container/slot/ContentList.java rename to internal/v1_21_R3/src/main/java/com/lishid/openinv/internal/v1_21_R3/container/slot/ContentList.java index 48e14ced..e9483b95 100644 --- a/internal/v1_21_R1/src/main/java/com/lishid/openinv/internal/v1_21_R1/container/slot/ContentList.java +++ b/internal/v1_21_R3/src/main/java/com/lishid/openinv/internal/v1_21_R3/container/slot/ContentList.java @@ -1,4 +1,4 @@ -package com.lishid.openinv.internal.v1_21_R1.container.slot; +package com.lishid.openinv.internal.v1_21_R3.container.slot; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.Container; diff --git a/internal/v1_21_R1/src/main/java/com/lishid/openinv/internal/v1_21_R1/container/slot/ContentOffHand.java b/internal/v1_21_R3/src/main/java/com/lishid/openinv/internal/v1_21_R3/container/slot/ContentOffHand.java similarity index 95% rename from internal/v1_21_R1/src/main/java/com/lishid/openinv/internal/v1_21_R1/container/slot/ContentOffHand.java rename to internal/v1_21_R3/src/main/java/com/lishid/openinv/internal/v1_21_R3/container/slot/ContentOffHand.java index 7b319041..df66fec8 100644 --- a/internal/v1_21_R1/src/main/java/com/lishid/openinv/internal/v1_21_R1/container/slot/ContentOffHand.java +++ b/internal/v1_21_R3/src/main/java/com/lishid/openinv/internal/v1_21_R3/container/slot/ContentOffHand.java @@ -1,4 +1,4 @@ -package com.lishid.openinv.internal.v1_21_R1.container.slot; +package com.lishid.openinv.internal.v1_21_R3.container.slot; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.Container; diff --git a/internal/v1_21_R1/src/main/java/com/lishid/openinv/internal/v1_21_R1/container/slot/ContentViewOnly.java b/internal/v1_21_R3/src/main/java/com/lishid/openinv/internal/v1_21_R3/container/slot/ContentViewOnly.java similarity index 95% rename from internal/v1_21_R1/src/main/java/com/lishid/openinv/internal/v1_21_R1/container/slot/ContentViewOnly.java rename to internal/v1_21_R3/src/main/java/com/lishid/openinv/internal/v1_21_R3/container/slot/ContentViewOnly.java index 5dec5b32..6d78e6e0 100644 --- a/internal/v1_21_R1/src/main/java/com/lishid/openinv/internal/v1_21_R1/container/slot/ContentViewOnly.java +++ b/internal/v1_21_R3/src/main/java/com/lishid/openinv/internal/v1_21_R3/container/slot/ContentViewOnly.java @@ -1,4 +1,4 @@ -package com.lishid.openinv.internal.v1_21_R1.container.slot; +package com.lishid.openinv.internal.v1_21_R3.container.slot; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.Container; diff --git a/internal/v1_21_R1/src/main/java/com/lishid/openinv/internal/v1_21_R1/container/slot/SlotPlaceholder.java b/internal/v1_21_R3/src/main/java/com/lishid/openinv/internal/v1_21_R3/container/slot/SlotPlaceholder.java similarity index 89% rename from internal/v1_21_R1/src/main/java/com/lishid/openinv/internal/v1_21_R1/container/slot/SlotPlaceholder.java rename to internal/v1_21_R3/src/main/java/com/lishid/openinv/internal/v1_21_R3/container/slot/SlotPlaceholder.java index c7a53a3a..7ec22a84 100644 --- a/internal/v1_21_R1/src/main/java/com/lishid/openinv/internal/v1_21_R1/container/slot/SlotPlaceholder.java +++ b/internal/v1_21_R3/src/main/java/com/lishid/openinv/internal/v1_21_R3/container/slot/SlotPlaceholder.java @@ -1,4 +1,4 @@ -package com.lishid.openinv.internal.v1_21_R1.container.slot; +package com.lishid.openinv.internal.v1_21_R3.container.slot; import net.minecraft.world.Container; import net.minecraft.world.inventory.Slot; diff --git a/internal/v1_21_R1/src/main/java/com/lishid/openinv/internal/v1_21_R1/container/slot/SlotViewOnly.java b/internal/v1_21_R3/src/main/java/com/lishid/openinv/internal/v1_21_R3/container/slot/SlotViewOnly.java similarity index 95% rename from internal/v1_21_R1/src/main/java/com/lishid/openinv/internal/v1_21_R1/container/slot/SlotViewOnly.java rename to internal/v1_21_R3/src/main/java/com/lishid/openinv/internal/v1_21_R3/container/slot/SlotViewOnly.java index 93975d51..76981cff 100644 --- a/internal/v1_21_R1/src/main/java/com/lishid/openinv/internal/v1_21_R1/container/slot/SlotViewOnly.java +++ b/internal/v1_21_R3/src/main/java/com/lishid/openinv/internal/v1_21_R3/container/slot/SlotViewOnly.java @@ -1,6 +1,6 @@ -package com.lishid.openinv.internal.v1_21_R1.container.slot; +package com.lishid.openinv.internal.v1_21_R3.container.slot; -import com.lishid.openinv.internal.v1_21_R1.container.Placeholders; +import com.lishid.openinv.internal.v1_21_R3.container.Placeholders; import net.minecraft.world.Container; import net.minecraft.world.entity.player.Player; import net.minecraft.world.inventory.Slot; diff --git a/internal/v1_21_R1/src/main/java/com/lishid/openinv/internal/v1_21_R1/player/OpenPlayer.java b/internal/v1_21_R3/src/main/java/com/lishid/openinv/internal/v1_21_R3/player/OpenPlayer.java similarity index 96% rename from internal/v1_21_R1/src/main/java/com/lishid/openinv/internal/v1_21_R1/player/OpenPlayer.java rename to internal/v1_21_R3/src/main/java/com/lishid/openinv/internal/v1_21_R3/player/OpenPlayer.java index c90d4e1e..4fd1cb72 100644 --- a/internal/v1_21_R1/src/main/java/com/lishid/openinv/internal/v1_21_R1/player/OpenPlayer.java +++ b/internal/v1_21_R3/src/main/java/com/lishid/openinv/internal/v1_21_R3/player/OpenPlayer.java @@ -1,4 +1,4 @@ -package com.lishid.openinv.internal.v1_21_R1.player; +package com.lishid.openinv.internal.v1_21_R3.player; import com.lishid.openinv.event.OpenEvents; import com.mojang.logging.LogUtils; @@ -9,8 +9,8 @@ import net.minecraft.nbt.Tag; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.level.storage.PlayerDataStorage; -import org.bukkit.craftbukkit.v1_21_R1.CraftServer; -import org.bukkit.craftbukkit.v1_21_R1.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_21_R3.CraftServer; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftPlayer; import org.jetbrains.annotations.Contract; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -51,6 +51,7 @@ public class OpenPlayer extends CraftPlayer { "SpawnAngle", "SpawnDimension", "raid_omen_position", + "ender_pearls", // Player#addAdditionalSaveData(CompoundTag) "ShoulderEntityLeft", "ShoulderEntityRight", diff --git a/internal/v1_21_R1/src/main/java/com/lishid/openinv/internal/v1_21_R1/player/PlayerManager.java b/internal/v1_21_R3/src/main/java/com/lishid/openinv/internal/v1_21_R3/player/PlayerManager.java similarity index 93% rename from internal/v1_21_R1/src/main/java/com/lishid/openinv/internal/v1_21_R1/player/PlayerManager.java rename to internal/v1_21_R3/src/main/java/com/lishid/openinv/internal/v1_21_R3/player/PlayerManager.java index 1eae5f04..ef44fbd1 100644 --- a/internal/v1_21_R1/src/main/java/com/lishid/openinv/internal/v1_21_R1/player/PlayerManager.java +++ b/internal/v1_21_R3/src/main/java/com/lishid/openinv/internal/v1_21_R3/player/PlayerManager.java @@ -1,8 +1,8 @@ -package com.lishid.openinv.internal.v1_21_R1.player; +package com.lishid.openinv.internal.v1_21_R3.player; import com.lishid.openinv.internal.ISpecialInventory; -import com.lishid.openinv.internal.v1_21_R1.container.OpenEnderChest; -import com.lishid.openinv.internal.v1_21_R1.container.OpenInventory; +import com.lishid.openinv.internal.v1_21_R3.container.OpenEnderChest; +import com.lishid.openinv.internal.v1_21_R3.container.OpenInventory; import com.mojang.authlib.GameProfile; import com.mojang.serialization.Dynamic; import net.minecraft.nbt.CompoundTag; @@ -11,6 +11,7 @@ import net.minecraft.network.protocol.game.ClientboundOpenScreenPacket; import net.minecraft.server.MinecraftServer; import net.minecraft.server.level.ClientInformation; +import net.minecraft.server.level.ParticleStatus; import net.minecraft.server.level.ServerLevel; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.entity.Entity; @@ -22,10 +23,10 @@ import org.bukkit.OfflinePlayer; import org.bukkit.Server; import org.bukkit.World; -import org.bukkit.craftbukkit.v1_21_R1.CraftServer; -import org.bukkit.craftbukkit.v1_21_R1.CraftWorld; -import org.bukkit.craftbukkit.v1_21_R1.entity.CraftPlayer; -import org.bukkit.craftbukkit.v1_21_R1.event.CraftEventFactory; +import org.bukkit.craftbukkit.v1_21_R3.CraftServer; +import org.bukkit.craftbukkit.v1_21_R3.CraftWorld; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_21_R3.event.CraftEventFactory; import org.bukkit.entity.Player; import org.bukkit.inventory.InventoryView; import org.jetbrains.annotations.NotNull; @@ -123,7 +124,8 @@ public PlayerManager(@NotNull Logger logger) { ServerPlayer.DEFAULT_MODEL_CUSTOMIZATION, ServerPlayer.DEFAULT_MAIN_HAND, true, - false // Don't list in player list (not that this player is in the list anyway). + false, // Don't list in player list (not that this player is in the list anyway). + ParticleStatus.MINIMAL ); ServerPlayer entity = new ServerPlayer(server, worldServer, profile, dummyInfo); diff --git a/plugin/pom.xml b/plugin/pom.xml index 44b31b17..e5a3ce62 100644 --- a/plugin/pom.xml +++ b/plugin/pom.xml @@ -46,13 +46,13 @@ com.lishid - openinvadapter1_21_R2 + openinvadapter1_21_R3 5.1.4-SNAPSHOT compile com.lishid - openinvadapter1_21_R1 + openinvadapter1_21_R2 5.1.4-SNAPSHOT compile diff --git a/plugin/src/main/java/com/lishid/openinv/util/InternalAccessor.java b/plugin/src/main/java/com/lishid/openinv/util/InternalAccessor.java index 4214eb7b..a29b0f13 100644 --- a/plugin/src/main/java/com/lishid/openinv/util/InternalAccessor.java +++ b/plugin/src/main/java/com/lishid/openinv/util/InternalAccessor.java @@ -40,10 +40,10 @@ public class InternalAccessor { public InternalAccessor(@NotNull Logger logger, @NotNull LanguageManager lang) { try { - if (BukkitVersions.MINECRAFT.equals(Version.of(1, 21, 3))) { + if (BukkitVersions.MINECRAFT.equals(Version.of(1, 21, 4))) { + internal = new com.lishid.openinv.internal.v1_21_R3.InternalAccessor(logger, lang); + } else if (BukkitVersions.MINECRAFT.equals(Version.of(1, 21, 3))) { internal = new com.lishid.openinv.internal.v1_21_R2.InternalAccessor(logger, lang); - } else if (BukkitVersions.MINECRAFT.equals(Version.of(1, 21, 1))) { - internal = new com.lishid.openinv.internal.v1_21_R1.InternalAccessor(logger, lang); } if (internal != null) { InventoryAccess.setProvider(internal::get); @@ -124,6 +124,9 @@ public String getReleasesLink() { if (BukkitVersions.MINECRAFT.lessThanOrEqual(Version.of(1, 21))) { // 1.20.4, 1.20.6, 1.21 return "https://github.com/Jikoo/OpenInv/releases/tag/5.1.2"; } + if (BukkitVersions.MINECRAFT.lessThanOrEqual(Version.of(1, 21, 2))) { + return "https://github.com/Jikoo/OpenInv/releases/tag/5.1.3"; + } return "https://github.com/Jikoo/OpenInv/releases"; } diff --git a/pom.xml b/pom.xml index 0fbe402f..2869f088 100644 --- a/pom.xml +++ b/pom.xml @@ -43,8 +43,8 @@ api addon/togglepersist common + internal/v1_21_R3 internal/v1_21_R2 - internal/v1_21_R1 plugin diff --git a/resource-pack/assets/minecraft/items/crafting_table.json b/resource-pack/assets/minecraft/items/crafting_table.json new file mode 100644 index 00000000..c77347e5 --- /dev/null +++ b/resource-pack/assets/minecraft/items/crafting_table.json @@ -0,0 +1,19 @@ +{ + "model": { + "type": "minecraft:select", + "cases": [ + { + "model": { + "type": "minecraft:model", + "model": "openinv:item/crafting_output" + }, + "when": "openinv:custom" + } + ], + "fallback": { + "type": "minecraft:model", + "model": "minecraft:block/crafting_table" + }, + "property": "minecraft:custom_model_data" + } +} diff --git a/resource-pack/assets/minecraft/items/dropper.json b/resource-pack/assets/minecraft/items/dropper.json new file mode 100644 index 00000000..8493cfa9 --- /dev/null +++ b/resource-pack/assets/minecraft/items/dropper.json @@ -0,0 +1,19 @@ +{ + "model": { + "type": "minecraft:select", + "cases": [ + { + "model": { + "type": "minecraft:model", + "model": "openinv:item/drop" + }, + "when": "openinv:custom" + } + ], + "fallback": { + "type": "minecraft:model", + "model": "minecraft:block/dropper" + }, + "property": "minecraft:custom_model_data" + } +} diff --git a/resource-pack/assets/minecraft/items/leather_boots.json b/resource-pack/assets/minecraft/items/leather_boots.json new file mode 100644 index 00000000..c6859113 --- /dev/null +++ b/resource-pack/assets/minecraft/items/leather_boots.json @@ -0,0 +1,174 @@ +{ + "model": { + "type": "minecraft:select", + "cases": [ + { + "model": { + "type": "minecraft:model", + "model": "openinv:item/empty_boots" + }, + "when": "openinv:custom" + } + ], + "fallback": { + "type": "minecraft:select", + "cases": [ + { + "model": { + "type": "minecraft:model", + "model": "minecraft:item/leather_boots_quartz_trim", + "tints": [ + { + "type": "minecraft:dye", + "default": -6265536 + } + ] + }, + "when": "minecraft:quartz" + }, + { + "model": { + "type": "minecraft:model", + "model": "minecraft:item/leather_boots_iron_trim", + "tints": [ + { + "type": "minecraft:dye", + "default": -6265536 + } + ] + }, + "when": "minecraft:iron" + }, + { + "model": { + "type": "minecraft:model", + "model": "minecraft:item/leather_boots_netherite_trim", + "tints": [ + { + "type": "minecraft:dye", + "default": -6265536 + } + ] + }, + "when": "minecraft:netherite" + }, + { + "model": { + "type": "minecraft:model", + "model": "minecraft:item/leather_boots_redstone_trim", + "tints": [ + { + "type": "minecraft:dye", + "default": -6265536 + } + ] + }, + "when": "minecraft:redstone" + }, + { + "model": { + "type": "minecraft:model", + "model": "minecraft:item/leather_boots_copper_trim", + "tints": [ + { + "type": "minecraft:dye", + "default": -6265536 + } + ] + }, + "when": "minecraft:copper" + }, + { + "model": { + "type": "minecraft:model", + "model": "minecraft:item/leather_boots_gold_trim", + "tints": [ + { + "type": "minecraft:dye", + "default": -6265536 + } + ] + }, + "when": "minecraft:gold" + }, + { + "model": { + "type": "minecraft:model", + "model": "minecraft:item/leather_boots_emerald_trim", + "tints": [ + { + "type": "minecraft:dye", + "default": -6265536 + } + ] + }, + "when": "minecraft:emerald" + }, + { + "model": { + "type": "minecraft:model", + "model": "minecraft:item/leather_boots_diamond_trim", + "tints": [ + { + "type": "minecraft:dye", + "default": -6265536 + } + ] + }, + "when": "minecraft:diamond" + }, + { + "model": { + "type": "minecraft:model", + "model": "minecraft:item/leather_boots_lapis_trim", + "tints": [ + { + "type": "minecraft:dye", + "default": -6265536 + } + ] + }, + "when": "minecraft:lapis" + }, + { + "model": { + "type": "minecraft:model", + "model": "minecraft:item/leather_boots_amethyst_trim", + "tints": [ + { + "type": "minecraft:dye", + "default": -6265536 + } + ] + }, + "when": "minecraft:amethyst" + }, + { + "model": { + "type": "minecraft:model", + "model": "minecraft:item/leather_boots_resin_trim", + "tints": [ + { + "type": "minecraft:dye", + "default": -6265536 + } + ] + }, + "when": "minecraft:resin" + } + ], + "fallback": { + "type": "minecraft:model", + "model": "minecraft:item/leather_boots", + "tints": [ + { + "type": "minecraft:dye", + "default": -6265536 + } + ] + }, + "property": "minecraft:trim_material" + }, + "property": "minecraft:custom_model_data" + } +} diff --git a/resource-pack/assets/minecraft/items/leather_chestplate.json b/resource-pack/assets/minecraft/items/leather_chestplate.json new file mode 100644 index 00000000..10e51d04 --- /dev/null +++ b/resource-pack/assets/minecraft/items/leather_chestplate.json @@ -0,0 +1,174 @@ +{ + "model": { + "type": "minecraft:select", + "cases": [ + { + "model": { + "type": "minecraft:model", + "model": "openinv:item/empty_chestplate" + }, + "when": "openinv:custom" + } + ], + "fallback": { + "type": "minecraft:select", + "cases": [ + { + "model": { + "type": "minecraft:model", + "model": "minecraft:item/leather_chestplate_quartz_trim", + "tints": [ + { + "type": "minecraft:dye", + "default": -6265536 + } + ] + }, + "when": "minecraft:quartz" + }, + { + "model": { + "type": "minecraft:model", + "model": "minecraft:item/leather_chestplate_iron_trim", + "tints": [ + { + "type": "minecraft:dye", + "default": -6265536 + } + ] + }, + "when": "minecraft:iron" + }, + { + "model": { + "type": "minecraft:model", + "model": "minecraft:item/leather_chestplate_netherite_trim", + "tints": [ + { + "type": "minecraft:dye", + "default": -6265536 + } + ] + }, + "when": "minecraft:netherite" + }, + { + "model": { + "type": "minecraft:model", + "model": "minecraft:item/leather_chestplate_redstone_trim", + "tints": [ + { + "type": "minecraft:dye", + "default": -6265536 + } + ] + }, + "when": "minecraft:redstone" + }, + { + "model": { + "type": "minecraft:model", + "model": "minecraft:item/leather_chestplate_copper_trim", + "tints": [ + { + "type": "minecraft:dye", + "default": -6265536 + } + ] + }, + "when": "minecraft:copper" + }, + { + "model": { + "type": "minecraft:model", + "model": "minecraft:item/leather_chestplate_gold_trim", + "tints": [ + { + "type": "minecraft:dye", + "default": -6265536 + } + ] + }, + "when": "minecraft:gold" + }, + { + "model": { + "type": "minecraft:model", + "model": "minecraft:item/leather_chestplate_emerald_trim", + "tints": [ + { + "type": "minecraft:dye", + "default": -6265536 + } + ] + }, + "when": "minecraft:emerald" + }, + { + "model": { + "type": "minecraft:model", + "model": "minecraft:item/leather_chestplate_diamond_trim", + "tints": [ + { + "type": "minecraft:dye", + "default": -6265536 + } + ] + }, + "when": "minecraft:diamond" + }, + { + "model": { + "type": "minecraft:model", + "model": "minecraft:item/leather_chestplate_lapis_trim", + "tints": [ + { + "type": "minecraft:dye", + "default": -6265536 + } + ] + }, + "when": "minecraft:lapis" + }, + { + "model": { + "type": "minecraft:model", + "model": "minecraft:item/leather_chestplate_amethyst_trim", + "tints": [ + { + "type": "minecraft:dye", + "default": -6265536 + } + ] + }, + "when": "minecraft:amethyst" + }, + { + "model": { + "type": "minecraft:model", + "model": "minecraft:item/leather_chestplate_resin_trim", + "tints": [ + { + "type": "minecraft:dye", + "default": -6265536 + } + ] + }, + "when": "minecraft:resin" + } + ], + "fallback": { + "type": "minecraft:model", + "model": "minecraft:item/leather_chestplate", + "tints": [ + { + "type": "minecraft:dye", + "default": -6265536 + } + ] + }, + "property": "minecraft:trim_material" + }, + "property": "minecraft:custom_model_data" + } +} diff --git a/resource-pack/assets/minecraft/items/leather_helmet.json b/resource-pack/assets/minecraft/items/leather_helmet.json new file mode 100644 index 00000000..27a56391 --- /dev/null +++ b/resource-pack/assets/minecraft/items/leather_helmet.json @@ -0,0 +1,174 @@ +{ + "model": { + "type": "minecraft:select", + "cases": [ + { + "model": { + "type": "minecraft:model", + "model": "openinv:item/empty_helmet" + }, + "when": "openinv:custom" + } + ], + "fallback": { + "type": "minecraft:select", + "cases": [ + { + "model": { + "type": "minecraft:model", + "model": "minecraft:item/leather_helmet_quartz_trim", + "tints": [ + { + "type": "minecraft:dye", + "default": -6265536 + } + ] + }, + "when": "minecraft:quartz" + }, + { + "model": { + "type": "minecraft:model", + "model": "minecraft:item/leather_helmet_iron_trim", + "tints": [ + { + "type": "minecraft:dye", + "default": -6265536 + } + ] + }, + "when": "minecraft:iron" + }, + { + "model": { + "type": "minecraft:model", + "model": "minecraft:item/leather_helmet_netherite_trim", + "tints": [ + { + "type": "minecraft:dye", + "default": -6265536 + } + ] + }, + "when": "minecraft:netherite" + }, + { + "model": { + "type": "minecraft:model", + "model": "minecraft:item/leather_helmet_redstone_trim", + "tints": [ + { + "type": "minecraft:dye", + "default": -6265536 + } + ] + }, + "when": "minecraft:redstone" + }, + { + "model": { + "type": "minecraft:model", + "model": "minecraft:item/leather_helmet_copper_trim", + "tints": [ + { + "type": "minecraft:dye", + "default": -6265536 + } + ] + }, + "when": "minecraft:copper" + }, + { + "model": { + "type": "minecraft:model", + "model": "minecraft:item/leather_helmet_gold_trim", + "tints": [ + { + "type": "minecraft:dye", + "default": -6265536 + } + ] + }, + "when": "minecraft:gold" + }, + { + "model": { + "type": "minecraft:model", + "model": "minecraft:item/leather_helmet_emerald_trim", + "tints": [ + { + "type": "minecraft:dye", + "default": -6265536 + } + ] + }, + "when": "minecraft:emerald" + }, + { + "model": { + "type": "minecraft:model", + "model": "minecraft:item/leather_helmet_diamond_trim", + "tints": [ + { + "type": "minecraft:dye", + "default": -6265536 + } + ] + }, + "when": "minecraft:diamond" + }, + { + "model": { + "type": "minecraft:model", + "model": "minecraft:item/leather_helmet_lapis_trim", + "tints": [ + { + "type": "minecraft:dye", + "default": -6265536 + } + ] + }, + "when": "minecraft:lapis" + }, + { + "model": { + "type": "minecraft:model", + "model": "minecraft:item/leather_helmet_amethyst_trim", + "tints": [ + { + "type": "minecraft:dye", + "default": -6265536 + } + ] + }, + "when": "minecraft:amethyst" + }, + { + "model": { + "type": "minecraft:model", + "model": "minecraft:item/leather_helmet_resin_trim", + "tints": [ + { + "type": "minecraft:dye", + "default": -6265536 + } + ] + }, + "when": "minecraft:resin" + } + ], + "fallback": { + "type": "minecraft:model", + "model": "minecraft:item/leather_helmet", + "tints": [ + { + "type": "minecraft:dye", + "default": -6265536 + } + ] + }, + "property": "minecraft:trim_material" + }, + "property": "minecraft:custom_model_data" + } +} diff --git a/resource-pack/assets/minecraft/items/leather_leggings.json b/resource-pack/assets/minecraft/items/leather_leggings.json new file mode 100644 index 00000000..4686e060 --- /dev/null +++ b/resource-pack/assets/minecraft/items/leather_leggings.json @@ -0,0 +1,174 @@ +{ + "model": { + "type": "minecraft:select", + "cases": [ + { + "model": { + "type": "minecraft:model", + "model": "openinv:item/empty_leggings" + }, + "when": "openinv:custom" + } + ], + "fallback": { + "type": "minecraft:select", + "cases": [ + { + "model": { + "type": "minecraft:model", + "model": "minecraft:item/leather_leggings_quartz_trim", + "tints": [ + { + "type": "minecraft:dye", + "default": -6265536 + } + ] + }, + "when": "minecraft:quartz" + }, + { + "model": { + "type": "minecraft:model", + "model": "minecraft:item/leather_leggings_iron_trim", + "tints": [ + { + "type": "minecraft:dye", + "default": -6265536 + } + ] + }, + "when": "minecraft:iron" + }, + { + "model": { + "type": "minecraft:model", + "model": "minecraft:item/leather_leggings_netherite_trim", + "tints": [ + { + "type": "minecraft:dye", + "default": -6265536 + } + ] + }, + "when": "minecraft:netherite" + }, + { + "model": { + "type": "minecraft:model", + "model": "minecraft:item/leather_leggings_redstone_trim", + "tints": [ + { + "type": "minecraft:dye", + "default": -6265536 + } + ] + }, + "when": "minecraft:redstone" + }, + { + "model": { + "type": "minecraft:model", + "model": "minecraft:item/leather_leggings_copper_trim", + "tints": [ + { + "type": "minecraft:dye", + "default": -6265536 + } + ] + }, + "when": "minecraft:copper" + }, + { + "model": { + "type": "minecraft:model", + "model": "minecraft:item/leather_leggings_gold_trim", + "tints": [ + { + "type": "minecraft:dye", + "default": -6265536 + } + ] + }, + "when": "minecraft:gold" + }, + { + "model": { + "type": "minecraft:model", + "model": "minecraft:item/leather_leggings_emerald_trim", + "tints": [ + { + "type": "minecraft:dye", + "default": -6265536 + } + ] + }, + "when": "minecraft:emerald" + }, + { + "model": { + "type": "minecraft:model", + "model": "minecraft:item/leather_leggings_diamond_trim", + "tints": [ + { + "type": "minecraft:dye", + "default": -6265536 + } + ] + }, + "when": "minecraft:diamond" + }, + { + "model": { + "type": "minecraft:model", + "model": "minecraft:item/leather_leggings_lapis_trim", + "tints": [ + { + "type": "minecraft:dye", + "default": -6265536 + } + ] + }, + "when": "minecraft:lapis" + }, + { + "model": { + "type": "minecraft:model", + "model": "minecraft:item/leather_leggings_amethyst_trim", + "tints": [ + { + "type": "minecraft:dye", + "default": -6265536 + } + ] + }, + "when": "minecraft:amethyst" + }, + { + "model": { + "type": "minecraft:model", + "model": "minecraft:item/leather_leggings_resin_trim", + "tints": [ + { + "type": "minecraft:dye", + "default": -6265536 + } + ] + }, + "when": "minecraft:resin" + } + ], + "fallback": { + "type": "minecraft:model", + "model": "minecraft:item/leather_leggings", + "tints": [ + { + "type": "minecraft:dye", + "default": -6265536 + } + ] + }, + "property": "minecraft:trim_material" + }, + "property": "minecraft:custom_model_data" + } +} diff --git a/resource-pack/assets/minecraft/items/shield.json b/resource-pack/assets/minecraft/items/shield.json new file mode 100644 index 00000000..cfac9c50 --- /dev/null +++ b/resource-pack/assets/minecraft/items/shield.json @@ -0,0 +1,33 @@ +{ + "model": { + "type": "minecraft:select", + "cases": [ + { + "model": { + "type": "minecraft:model", + "model": "openinv:item/empty_shield" + }, + "when": "openinv:custom" + } + ], + "fallback": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:special", + "base": "minecraft:item/shield", + "model": { + "type": "minecraft:shield" + } + }, + "on_true": { + "type": "minecraft:special", + "base": "minecraft:item/shield_blocking", + "model": { + "type": "minecraft:shield" + } + }, + "property": "minecraft:using_item" + }, + "property": "minecraft:custom_model_data" + } +} diff --git a/resource-pack/assets/minecraft/items/white_banner.json b/resource-pack/assets/minecraft/items/white_banner.json new file mode 100644 index 00000000..9f3d690e --- /dev/null +++ b/resource-pack/assets/minecraft/items/white_banner.json @@ -0,0 +1,23 @@ +{ + "model": { + "type": "minecraft:select", + "cases": [ + { + "model": { + "type": "minecraft:model", + "model": "openinv:item/cursor" + }, + "when": "openinv:custom" + } + ], + "fallback": { + "type": "minecraft:special", + "base": "minecraft:item/template_banner", + "model": { + "type": "minecraft:banner", + "color": "white" + } + }, + "property": "minecraft:custom_model_data" + } +} diff --git a/resource-pack/assets/minecraft/items/white_stained_glass_pane.json b/resource-pack/assets/minecraft/items/white_stained_glass_pane.json new file mode 100644 index 00000000..69561da0 --- /dev/null +++ b/resource-pack/assets/minecraft/items/white_stained_glass_pane.json @@ -0,0 +1,19 @@ +{ + "model": { + "type": "minecraft:select", + "cases": [ + { + "model": { + "type": "model", + "model": "openinv:item/not_a_slot" + }, + "when": "openinv:custom" + } + ], + "fallback": { + "type": "model", + "model": "item/white_stained_glass_pane" + }, + "property": "custom_model_data" + } +} diff --git a/resource-pack/assets/minecraft/models/item/crafting_table.json b/resource-pack/assets/minecraft/models/item/crafting_table.json deleted file mode 100644 index 230469c5..00000000 --- a/resource-pack/assets/minecraft/models/item/crafting_table.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "parent": "minecraft:block/crafting_table", - "overrides": [ - { - "model": "openinv:item/crafting_output", - "predicate": { - "custom_model_data": 9999 - } - } - ] -} diff --git a/resource-pack/assets/minecraft/models/item/dropper.json b/resource-pack/assets/minecraft/models/item/dropper.json deleted file mode 100644 index 0c8bb744..00000000 --- a/resource-pack/assets/minecraft/models/item/dropper.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "parent": "minecraft:block/dropper", - "overrides": [ - { - "model": "openinv:item/drop", - "predicate": { - "custom_model_data": 9999 - } - } - ] -} diff --git a/resource-pack/assets/minecraft/models/item/leather_boots.json b/resource-pack/assets/minecraft/models/item/leather_boots.json deleted file mode 100644 index f9cd4073..00000000 --- a/resource-pack/assets/minecraft/models/item/leather_boots.json +++ /dev/null @@ -1,75 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "overrides": [ - { - "model": "openinv:item/empty_boots", - "predicate": { - "custom_model_data": 9999 - } - }, - { - "model": "minecraft:item/leather_boots_quartz_trim", - "predicate": { - "trim_type": 0.1 - } - }, - { - "model": "minecraft:item/leather_boots_iron_trim", - "predicate": { - "trim_type": 0.2 - } - }, - { - "model": "minecraft:item/leather_boots_netherite_trim", - "predicate": { - "trim_type": 0.3 - } - }, - { - "model": "minecraft:item/leather_boots_redstone_trim", - "predicate": { - "trim_type": 0.4 - } - }, - { - "model": "minecraft:item/leather_boots_copper_trim", - "predicate": { - "trim_type": 0.5 - } - }, - { - "model": "minecraft:item/leather_boots_gold_trim", - "predicate": { - "trim_type": 0.6 - } - }, - { - "model": "minecraft:item/leather_boots_emerald_trim", - "predicate": { - "trim_type": 0.7 - } - }, - { - "model": "minecraft:item/leather_boots_diamond_trim", - "predicate": { - "trim_type": 0.8 - } - }, - { - "model": "minecraft:item/leather_boots_lapis_trim", - "predicate": { - "trim_type": 0.9 - } - }, - { - "model": "minecraft:item/leather_boots_amethyst_trim", - "predicate": { - "trim_type": 1.0 - } - } - ], - "textures": { - "layer0": "minecraft:item/leather_boots", - "layer1": "minecraft:item/leather_boots_overlay" - } -} diff --git a/resource-pack/assets/minecraft/models/item/leather_chestplate.json b/resource-pack/assets/minecraft/models/item/leather_chestplate.json deleted file mode 100644 index d6dc8c5f..00000000 --- a/resource-pack/assets/minecraft/models/item/leather_chestplate.json +++ /dev/null @@ -1,75 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "overrides": [ - { - "model": "openinv:item/empty_chestplate", - "predicate": { - "custom_model_data": 9999 - } - }, - { - "model": "minecraft:item/leather_chestplate_quartz_trim", - "predicate": { - "trim_type": 0.1 - } - }, - { - "model": "minecraft:item/leather_chestplate_iron_trim", - "predicate": { - "trim_type": 0.2 - } - }, - { - "model": "minecraft:item/leather_chestplate_netherite_trim", - "predicate": { - "trim_type": 0.3 - } - }, - { - "model": "minecraft:item/leather_chestplate_redstone_trim", - "predicate": { - "trim_type": 0.4 - } - }, - { - "model": "minecraft:item/leather_chestplate_copper_trim", - "predicate": { - "trim_type": 0.5 - } - }, - { - "model": "minecraft:item/leather_chestplate_gold_trim", - "predicate": { - "trim_type": 0.6 - } - }, - { - "model": "minecraft:item/leather_chestplate_emerald_trim", - "predicate": { - "trim_type": 0.7 - } - }, - { - "model": "minecraft:item/leather_chestplate_diamond_trim", - "predicate": { - "trim_type": 0.8 - } - }, - { - "model": "minecraft:item/leather_chestplate_lapis_trim", - "predicate": { - "trim_type": 0.9 - } - }, - { - "model": "minecraft:item/leather_chestplate_amethyst_trim", - "predicate": { - "trim_type": 1.0 - } - } - ], - "textures": { - "layer0": "minecraft:item/leather_chestplate", - "layer1": "minecraft:item/leather_chestplate_overlay" - } -} diff --git a/resource-pack/assets/minecraft/models/item/leather_helmet.json b/resource-pack/assets/minecraft/models/item/leather_helmet.json deleted file mode 100644 index 236ae610..00000000 --- a/resource-pack/assets/minecraft/models/item/leather_helmet.json +++ /dev/null @@ -1,75 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "overrides": [ - { - "model": "openinv:item/empty_helmet", - "predicate": { - "custom_model_data": 9999 - } - }, - { - "model": "minecraft:item/leather_helmet_quartz_trim", - "predicate": { - "trim_type": 0.1 - } - }, - { - "model": "minecraft:item/leather_helmet_iron_trim", - "predicate": { - "trim_type": 0.2 - } - }, - { - "model": "minecraft:item/leather_helmet_netherite_trim", - "predicate": { - "trim_type": 0.3 - } - }, - { - "model": "minecraft:item/leather_helmet_redstone_trim", - "predicate": { - "trim_type": 0.4 - } - }, - { - "model": "minecraft:item/leather_helmet_copper_trim", - "predicate": { - "trim_type": 0.5 - } - }, - { - "model": "minecraft:item/leather_helmet_gold_trim", - "predicate": { - "trim_type": 0.6 - } - }, - { - "model": "minecraft:item/leather_helmet_emerald_trim", - "predicate": { - "trim_type": 0.7 - } - }, - { - "model": "minecraft:item/leather_helmet_diamond_trim", - "predicate": { - "trim_type": 0.8 - } - }, - { - "model": "minecraft:item/leather_helmet_lapis_trim", - "predicate": { - "trim_type": 0.9 - } - }, - { - "model": "minecraft:item/leather_helmet_amethyst_trim", - "predicate": { - "trim_type": 1.0 - } - } - ], - "textures": { - "layer0": "minecraft:item/leather_helmet", - "layer1": "minecraft:item/leather_helmet_overlay" - } -} diff --git a/resource-pack/assets/minecraft/models/item/leather_leggings.json b/resource-pack/assets/minecraft/models/item/leather_leggings.json deleted file mode 100644 index eb9ddc89..00000000 --- a/resource-pack/assets/minecraft/models/item/leather_leggings.json +++ /dev/null @@ -1,75 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "overrides": [ - { - "model": "openinv:item/empty_leggings", - "predicate": { - "custom_model_data": 9999 - } - }, - { - "model": "minecraft:item/leather_leggings_quartz_trim", - "predicate": { - "trim_type": 0.1 - } - }, - { - "model": "minecraft:item/leather_leggings_iron_trim", - "predicate": { - "trim_type": 0.2 - } - }, - { - "model": "minecraft:item/leather_leggings_netherite_trim", - "predicate": { - "trim_type": 0.3 - } - }, - { - "model": "minecraft:item/leather_leggings_redstone_trim", - "predicate": { - "trim_type": 0.4 - } - }, - { - "model": "minecraft:item/leather_leggings_copper_trim", - "predicate": { - "trim_type": 0.5 - } - }, - { - "model": "minecraft:item/leather_leggings_gold_trim", - "predicate": { - "trim_type": 0.6 - } - }, - { - "model": "minecraft:item/leather_leggings_emerald_trim", - "predicate": { - "trim_type": 0.7 - } - }, - { - "model": "minecraft:item/leather_leggings_diamond_trim", - "predicate": { - "trim_type": 0.8 - } - }, - { - "model": "minecraft:item/leather_leggings_lapis_trim", - "predicate": { - "trim_type": 0.9 - } - }, - { - "model": "minecraft:item/leather_leggings_amethyst_trim", - "predicate": { - "trim_type": 1.0 - } - } - ], - "textures": { - "layer0": "minecraft:item/leather_leggings", - "layer1": "minecraft:item/leather_leggings_overlay" - } -} diff --git a/resource-pack/assets/minecraft/models/item/shield.json b/resource-pack/assets/minecraft/models/item/shield.json deleted file mode 100644 index 5ea7eddd..00000000 --- a/resource-pack/assets/minecraft/models/item/shield.json +++ /dev/null @@ -1,58 +0,0 @@ -{ - "parent": "builtin/entity", - "gui_light": "front", - "textures": { - "particle": "block/dark_oak_planks" - }, - "display": { - "thirdperson_righthand": { - "rotation": [ 0, 90, 0 ], - "translation": [ 10, 6, -4 ], - "scale": [ 1, 1, 1 ] - }, - "thirdperson_lefthand": { - "rotation": [ 0, 90, 0 ], - "translation": [ 10, 6, 12 ], - "scale": [ 1, 1, 1 ] - }, - "firstperson_righthand": { - "rotation": [ 0, 180, 5 ], - "translation": [ -10, 2, -10 ], - "scale": [ 1.25, 1.25, 1.25 ] - }, - "firstperson_lefthand": { - "rotation": [ 0, 180, 5 ], - "translation": [ 10, 0, -10 ], - "scale": [ 1.25, 1.25, 1.25 ] - }, - "gui": { - "rotation": [ 15, -25, -5 ], - "translation": [ 2, 3, 0 ], - "scale": [ 0.65, 0.65, 0.65 ] - }, - "fixed": { - "rotation": [ 0, 180, 0 ], - "translation": [ -4.5, 4.5, -5], - "scale":[ 0.55, 0.55, 0.55] - }, - "ground": { - "rotation": [ 0, 0, 0 ], - "translation": [ 2, 4, 2], - "scale":[ 0.25, 0.25, 0.25] - } - }, - "overrides": [ - { - "model": "openinv:item/empty_shield", - "predicate": { - "custom_model_data": 9999 - } - }, - { - "predicate": { - "blocking": 1 - }, - "model": "item/shield_blocking" - } - ] -} diff --git a/resource-pack/assets/minecraft/models/item/white_banner.json b/resource-pack/assets/minecraft/models/item/white_banner.json deleted file mode 100644 index bc6fadb8..00000000 --- a/resource-pack/assets/minecraft/models/item/white_banner.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "parent": "minecraft:item/template_banner", - "overrides": [ - { - "model": "openinv:item/cursor", - "predicate": { - "custom_model_data": 9999 - } - } - ] -} diff --git a/resource-pack/assets/minecraft/models/item/white_stained_glass_pane.json b/resource-pack/assets/minecraft/models/item/white_stained_glass_pane.json deleted file mode 100644 index e4edacdb..00000000 --- a/resource-pack/assets/minecraft/models/item/white_stained_glass_pane.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "minecraft:block/white_stained_glass" - }, - "overrides": [ - { - "model": "openinv:item/not_a_slot", - "predicate": { - "custom_model_data": 9999 - } - } - ] -} diff --git a/resource-pack/assets/openinv/models/item/crafting_output.json b/resource-pack/assets/openinv/models/item/crafting_output.json index 6c167cdc..482b3af9 100644 --- a/resource-pack/assets/openinv/models/item/crafting_output.json +++ b/resource-pack/assets/openinv/models/item/crafting_output.json @@ -1,7 +1,8 @@ { "texture_size": [ 16, 32 ], "textures": { - "layer0": "openinv:item/crafting_output" + "layer0": "openinv:item/crafting_output", + "particle": "minecraft:block/crafting_table_front" }, "elements": [ { diff --git a/resource-pack/assets/openinv/models/item/empty_boots.json b/resource-pack/assets/openinv/models/item/empty_boots.json index 5b3ddf27..bdb545f8 100644 --- a/resource-pack/assets/openinv/models/item/empty_boots.json +++ b/resource-pack/assets/openinv/models/item/empty_boots.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "minecraft:item/empty_armor_slot_boots" + "layer0": "openinv:item/empty_boots" } } diff --git a/resource-pack/assets/openinv/models/item/empty_chestplate.json b/resource-pack/assets/openinv/models/item/empty_chestplate.json index 4003d627..b407d98c 100644 --- a/resource-pack/assets/openinv/models/item/empty_chestplate.json +++ b/resource-pack/assets/openinv/models/item/empty_chestplate.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "minecraft:item/empty_armor_slot_chestplate" + "layer0": "openinv:item/empty_chestplate" } } diff --git a/resource-pack/assets/openinv/models/item/empty_helmet.json b/resource-pack/assets/openinv/models/item/empty_helmet.json index dda818a6..f7cc30f6 100644 --- a/resource-pack/assets/openinv/models/item/empty_helmet.json +++ b/resource-pack/assets/openinv/models/item/empty_helmet.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "minecraft:item/empty_armor_slot_helmet" + "layer0": "openinv:item/empty_helmet" } } diff --git a/resource-pack/assets/openinv/models/item/empty_leggings.json b/resource-pack/assets/openinv/models/item/empty_leggings.json index c74e7e2a..0467df35 100644 --- a/resource-pack/assets/openinv/models/item/empty_leggings.json +++ b/resource-pack/assets/openinv/models/item/empty_leggings.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "minecraft:item/empty_armor_slot_leggings" + "layer0": "openinv:item/empty_leggings" } } diff --git a/resource-pack/assets/openinv/models/item/empty_shield.json b/resource-pack/assets/openinv/models/item/empty_shield.json index 6e6b21c1..0cf9047a 100644 --- a/resource-pack/assets/openinv/models/item/empty_shield.json +++ b/resource-pack/assets/openinv/models/item/empty_shield.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "minecraft:item/empty_armor_slot_shield" + "layer0": "openinv:item/empty_shield" } } diff --git a/resource-pack/assets/openinv/textures/item/empty_boots.png b/resource-pack/assets/openinv/textures/item/empty_boots.png new file mode 100644 index 00000000..356e615b Binary files /dev/null and b/resource-pack/assets/openinv/textures/item/empty_boots.png differ diff --git a/resource-pack/assets/openinv/textures/item/empty_chestplate.png b/resource-pack/assets/openinv/textures/item/empty_chestplate.png new file mode 100644 index 00000000..be0e904a Binary files /dev/null and b/resource-pack/assets/openinv/textures/item/empty_chestplate.png differ diff --git a/resource-pack/assets/openinv/textures/item/empty_helmet.png b/resource-pack/assets/openinv/textures/item/empty_helmet.png new file mode 100644 index 00000000..59c44691 Binary files /dev/null and b/resource-pack/assets/openinv/textures/item/empty_helmet.png differ diff --git a/resource-pack/assets/openinv/textures/item/empty_leggings.png b/resource-pack/assets/openinv/textures/item/empty_leggings.png new file mode 100644 index 00000000..bea579e0 Binary files /dev/null and b/resource-pack/assets/openinv/textures/item/empty_leggings.png differ diff --git a/resource-pack/assets/openinv/textures/item/empty_shield.png b/resource-pack/assets/openinv/textures/item/empty_shield.png new file mode 100644 index 00000000..35e73102 Binary files /dev/null and b/resource-pack/assets/openinv/textures/item/empty_shield.png differ diff --git a/resource-pack/pack.mcmeta b/resource-pack/pack.mcmeta index 1f4db36b..786f9616 100644 --- a/resource-pack/pack.mcmeta +++ b/resource-pack/pack.mcmeta @@ -1,7 +1,7 @@ { "pack": { "description": "Improve OpenInv's legibility", - "pack_format": 42, - "supported_formats": [34, 42] + "pack_format": 46, + "supported_formats": [ 46 ] } }