Check slots before modification

shedaniel · Jul 22, 2024 · 7c00ea9 · 7c00ea9
1 parent d21610b
commit 7c00ea9
Show file tree

Hide file tree

Showing 8 changed files with 53 additions and 3 deletions.
diff --git a/api/src/main/java/me/shedaniel/rei/api/common/transfer/info/clean/InputCleanHandler.java b/api/src/main/java/me/shedaniel/rei/api/common/transfer/info/clean/InputCleanHandler.java
@@ -44,6 +44,10 @@ static void error(String translationKey) {
  static <T extends AbstractContainerMenu> void returnSlotsToPlayerInventory(MenuInfoContext<T, ?, ?> context, DumpHandler<T, ?> dumpHandler, SlotAccessor slotAccessor) {
  ItemStack stackToReturn = slotAccessor.getItemStack();
  if (!stackToReturn.isEmpty()) {
+ if (!slotAccessor.allowModification(context.getPlayerEntity())) {
+ error("rei.rei.no.slot.in.inv");
+ }
+
  for (; !(stackToReturn = slotAccessor.getItemStack()).isEmpty(); slotAccessor.takeStack(1)) {
  ItemStack stackToInsert = stackToReturn.copy();
  stackToInsert.setCount(1);

diff --git a/api/src/main/java/me/shedaniel/rei/api/common/transfer/info/simple/DumpHandler.java b/api/src/main/java/me/shedaniel/rei/api/common/transfer/info/simple/DumpHandler.java
@@ -36,7 +36,7 @@ public interface DumpHandler<T extends AbstractContainerMenu, D extends Display>
 
  static SlotAccessor getOccupiedSlotWithRoomForStack(ItemStack stack, Iterable<SlotAccessor> inventoryStacks) {
  for (SlotAccessor inventoryStack : inventoryStacks) {
- if (canStackAddMore(inventoryStack.getItemStack(), stack)) {
+ if (canStackAddMore(inventoryStack.getItemStack(), stack) && inventoryStack.canPlace(stack)) {
  return inventoryStack;
  }
  }

diff --git a/api/src/main/java/me/shedaniel/rei/api/common/transfer/info/stack/ContainerSlotAccessor.java b/api/src/main/java/me/shedaniel/rei/api/common/transfer/info/stack/ContainerSlotAccessor.java
@@ -24,6 +24,7 @@
 package me.shedaniel.rei.api.common.transfer.info.stack;
 
 import net.minecraft.world.Container;
+import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.ItemStack;
 
 /**
@@ -53,4 +54,14 @@ public void setItemStack(ItemStack stack) {
  public ItemStack takeStack(int amount) {
  return this.container.removeItem(index, amount);
  }
+
+ @Override
+ public boolean allowModification(Player player) {
+ return canPlace(getItemStack());
+ }
+
+ @Override
+ public boolean canPlace(ItemStack stack) {
+ return this.container.canPlaceItem(index, stack);
+ }
 }
diff --git a/api/src/main/java/me/shedaniel/rei/api/common/transfer/info/stack/SlotAccessor.java b/api/src/main/java/me/shedaniel/rei/api/common/transfer/info/stack/SlotAccessor.java
@@ -41,6 +41,14 @@ public interface SlotAccessor {
 
  ItemStack takeStack(int amount);
 
+ default boolean allowModification(Player player) {
+ return true;
+ }
+
+ default boolean canPlace(ItemStack stack) {
+ return true;
+ }
+
  static SlotAccessor fromSlot(Slot slot) {
  return new VanillaSlotAccessor(slot);
  }

diff --git a/api/src/main/java/me/shedaniel/rei/api/common/transfer/info/stack/VanillaSlotAccessor.java b/api/src/main/java/me/shedaniel/rei/api/common/transfer/info/stack/VanillaSlotAccessor.java
@@ -23,6 +23,7 @@
 
 package me.shedaniel.rei.api.common.transfer.info.stack;
 
+import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.inventory.Slot;
 import net.minecraft.world.item.ItemStack;
 
@@ -54,4 +55,14 @@ public ItemStack takeStack(int amount) {
  public Slot getSlot() {
  return slot;
  }
+
+ @Override
+ public boolean allowModification(Player player) {
+ return slot.allowModification(player);
+ }
+
+ @Override
+ public boolean canPlace(ItemStack stack) {
+ return slot.mayPlace(stack);
+ }
 }
diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/common/transfer/InputSlotCrafter.java b/runtime/src/main/java/me/shedaniel/rei/impl/common/transfer/InputSlotCrafter.java
@@ -117,6 +117,10 @@ protected void fillInputSlot(SlotAccessor slot, ItemStack toBeTakenStack) {
  }
 
  takenStack.setCount(1);
+ if (!slot.canPlace(takenStack)) {
+ return;
+ }
+
  if (slot.getItemStack().isEmpty()) {
  slot.setItemStack(takenStack);
  } else {
@@ -148,13 +152,22 @@ protected void fillInputSlots(RecipeFinder recipeFinder, NonNullList<Ingredient>
 
  @Nullable
  public SlotAccessor takeInventoryStack(ItemStack itemStack) {
+ boolean rejectedModification = false;
  for (SlotAccessor inventoryStack : inventoryStacks) {
  ItemStack itemStack1 = inventoryStack.getItemStack();
  if (!itemStack1.isEmpty() && areItemsEqual(itemStack, itemStack1) && !itemStack1.isDamaged() && !itemStack1.isEnchanted() && !itemStack1.hasCustomHoverName()) {
- return inventoryStack;
+ if (!inventoryStack.allowModification(player)) {
+ rejectedModification = true;
+ } else {
+ return inventoryStack;
+ }
  }
  }
 
+ if (rejectedModification) {
+ throw new IllegalStateException("Unable to take item from inventory due to slot not allowing modification! Item requested: " + itemStack);
+ }
+
  return null;
  }
 

diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/common/transfer/NewInputSlotCrafter.java b/runtime/src/main/java/me/shedaniel/rei/impl/common/transfer/NewInputSlotCrafter.java
@@ -77,6 +77,9 @@ protected void markDirty() {
  protected void cleanInputs() {
  for (SlotAccessor slot : getInputSlots()) {
  ItemStack stackToReturn = slot.getItemStack();
+ if (!slot.allowModification(player)) {
+ throw new IllegalStateException("Slot " + slot + " is not modifiable!");
+ }
  if (!stackToReturn.isEmpty()) {
  for (; !(stackToReturn = slot.getItemStack()).isEmpty(); slot.takeStack(1)) {
  ItemStack stackToInsert = stackToReturn.copy();

diff --git a/settings.gradle b/settings.gradle
@@ -2,8 +2,8 @@ pluginManagement {
  repositories {
  maven { url "https://maven.shedaniel.me/" }
  maven { url "https://maven.fabricmc.net/" }
- maven { url "https://files.minecraftforge.net/maven/" }
  gradlePluginPortal()
+ maven { url "https://files.minecraftforge.net/maven/" }
  }
 }