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

Internalize view-only status #221

Merged
merged 2 commits into from
Jul 11, 2024
Merged

Internalize view-only status #221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fc521f0
Repackage internals, internalize view-only status
Jikoo Jul 11, 2024
3066775
Fix missed shade execution
Jikoo Jul 11, 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
2 changes: 2 additions & 0 deletions internal/v1_21_R1/src/main/java/com/lishid/openinv/internal/v1_21_R1/InternalAccessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,11 @@
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.inventory.AnySilentContainer;
import com.lishid.openinv.internal.v1_21_R1.inventory.OpenEnderChest;
import com.lishid.openinv.internal.v1_21_R1.inventory.OpenInventory;
import com.lishid.openinv.internal.v1_21_R1.inventory.Placeholders;
import com.lishid.openinv.internal.v1_21_R1.player.PlayerManager;
import com.lishid.openinv.util.lang.LanguageManager;
import net.minecraft.world.Container;
import org.bukkit.configuration.ConfigurationSection;
Expand Down
17 changes: 3 additions & 14 deletions ...internal/v1_21_R1/AnySilentContainer.java → ...1_21_R1/inventory/AnySilentContainer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,10 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

package com.lishid.openinv.internal.v1_21_R1;
package com.lishid.openinv.internal.v1_21_R1.inventory;

import com.lishid.openinv.internal.IAnySilentContainer;
import com.lishid.openinv.internal.v1_21_R1.player.PlayerManager;
import com.lishid.openinv.util.ReflectionHelper;
import com.lishid.openinv.util.lang.LanguageManager;
import net.minecraft.core.BlockPos;
Expand Down Expand Up @@ -74,18 +75,6 @@ public AnySilentContainer(@NotNull Logger logger, @NotNull LanguageManager lang)
}
}

public static @NotNull MenuType<?> getContainers(int inventorySize) {
return switch (inventorySize) {
case 9 -> MenuType.GENERIC_9x1;
case 18 -> MenuType.GENERIC_9x2;
case 36 -> MenuType.GENERIC_9x4;
case 45 -> MenuType.GENERIC_9x5;
case 54 -> MenuType.GENERIC_9x6;
// Default to 27-slot inventory
default -> MenuType.GENERIC_9x3;
};
}

@Override
public boolean activateContainer(
@NotNull final Player bukkitPlayer,
Expand Down Expand Up @@ -114,7 +103,7 @@ public boolean activateContainer(
PlayerEnderChestContainer enderChest = player.getEnderChestInventory();
enderChest.setActiveChest(enderChestTile);
player.openMenu(new SimpleMenuProvider((containerCounter, playerInventory, ignored) -> {
MenuType<?> containers = getContainers(enderChest.getContainerSize());
MenuType<?> containers = OpenContainerMenu.getContainers(enderChest.getContainerSize());
int rows = enderChest.getContainerSize() / 9;
return new ChestMenu(containers, containerCounter, playerInventory, enderChest, rows);
}, Component.translatable("container.enderchest")));
Expand Down
169 changes: 0 additions & 169 deletions ...main/java/com/lishid/openinv/internal/v1_21_R1/inventory/ContainerSlotUninteractable.java
View file
Open in desktop

This file was deleted.

Loading