Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for 1.21.4 #262

Merged
merged 4 commits into from
Dec 9, 2024
Merged

Add support for 1.21.4 #262

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d71a030
Add 1.20.4 adapter
Jikoo Dec 6, 2024
1ef0183
Update resource pack to 1.21.4
Jikoo Dec 8, 2024
e81062b
Include empty textures
Jikoo Dec 8, 2024
058ea7d
Fix nag about unspecified particle texture
Jikoo Dec 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions internal/v1_21_R1/pom.xml → internal/v1_21_R3/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@
<version>5.1.4-SNAPSHOT</version>
</parent>

<artifactId>openinvadapter1_21_R1</artifactId>
<name>OpenInvAdapter1_21_R1</name>
<artifactId>openinvadapter1_21_R3</artifactId>
<name>OpenInvAdapter1_21_R3</name>

<properties>
<maven.compiler.system>21</maven.compiler.system>
<maven.compiler.release>21</maven.compiler.release>
<spigot.version>1.21.1-R0.1-SNAPSHOT</spigot.version>
<spigot.version>1.21.4-R0.1-SNAPSHOT</spigot.version>
</properties>

<dependencies>
Expand Down
14 changes: 7 additions & 7 deletions ...v/internal/v1_21_R1/InternalAccessor.java → ...v/internal/v1_21_R3/InternalAccessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
6 changes: 3 additions & 3 deletions ...1_21_R1/container/AnySilentContainer.java → ...1_21_R3/container/AnySilentContainer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

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;
Expand Down
14 changes: 7 additions & 7 deletions ...al/v1_21_R1/container/OpenEnderChest.java → ...al/v1_21_R3/container/OpenEnderChest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -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);
}
Expand Down
32 changes: 16 additions & 16 deletions ...nal/v1_21_R1/container/OpenInventory.java → ...nal/v1_21_R3/container/OpenInventory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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;
Expand Down
26 changes: 13 additions & 13 deletions ...rnal/v1_21_R1/container/Placeholders.java → ...rnal/v1_21_R3/container/Placeholders.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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;
Expand All @@ -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<GameType, ItemStack> BLOCKED_GAME_TYPE = new EnumMap<>(GameType.class);
public static @NotNull ItemStack craftingOutput = defaultCraftingOutput();
public static @NotNull ItemStack cursor = defaultCursor();
Expand Down Expand Up @@ -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<BannerPattern> 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<BannerPattern> 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),
Expand Down Expand Up @@ -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<BannerPattern> 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<BannerPattern> 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),
Expand Down
4 changes: 2 additions & 2 deletions .../container/bukkit/OpenDummyInventory.java → .../container/bukkit/OpenDummyInventory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
8 changes: 4 additions & 4 deletions ...container/bukkit/OpenPlayerInventory.java → ...container/bukkit/OpenPlayerInventory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ...ainer/bukkit/OpenPlayerInventorySelf.java → ...ainer/bukkit/OpenPlayerInventorySelf.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
10 changes: 5 additions & 5 deletions ...1_21_R1/container/menu/OpenChestMenu.java → ...1_21_R3/container/menu/OpenChestMenu.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ...R1/container/menu/OpenEnderChestMenu.java → ...R3/container/menu/OpenEnderChestMenu.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
18 changes: 9 additions & 9 deletions ..._R1/container/menu/OpenInventoryMenu.java → ..._R3/container/menu/OpenInventoryMenu.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...rnal/v1_21_R1/container/slot/Content.java → ...rnal/v1_21_R3/container/slot/Content.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ...21_R1/container/slot/ContentCrafting.java → ...21_R3/container/slot/ContentCrafting.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
8 changes: 4 additions & 4 deletions ...container/slot/ContentCraftingResult.java → ...container/slot/ContentCraftingResult.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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
Expand All @@ -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();
}
};
}
Expand Down
4 changes: 2 additions & 2 deletions ...1_21_R1/container/slot/ContentCursor.java → ...1_21_R3/container/slot/ContentCursor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
4 changes: 2 additions & 2 deletions .../v1_21_R1/container/slot/ContentDrop.java → .../v1_21_R3/container/slot/ContentDrop.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ...1_R1/container/slot/ContentEquipment.java → ...1_R3/container/slot/ContentEquipment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion .../v1_21_R1/container/slot/ContentList.java → .../v1_21_R3/container/slot/ContentList.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ..._21_R1/container/slot/ContentOffHand.java → ..._21_R3/container/slot/ContentOffHand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...21_R1/container/slot/ContentViewOnly.java → ...21_R3/container/slot/ContentViewOnly.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Loading
Loading