Skip to content

Commit

Permalink
Refactor new internals slightly
Browse files Browse the repository at this point in the history 
Repackage inventory -> container (because internally Inventory is a player container)
Old classes -> 2 spaces

Will eventually update project style and add a .editorconfig, but not right now.
  • Loading branch information
@Jikoo
Jikoo committed Jul 12, 2024
1 parent 59fff35 commit 1f2c2b6
Show file tree
Hide file tree
Showing 22 changed files with 381 additions and 381 deletions.
8 changes: 4 additions & 4 deletions internal/v1_21_R1/src/main/java/com/lishid/openinv/internal/v1_21_R1/InternalAccessor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
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.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.util.lang.LanguageManager;
import net.minecraft.world.Container;
Expand Down
2 changes: 1 addition & 1 deletion ...1_21_R1/inventory/AnySilentContainer.java → ...1_21_R1/container/AnySilentContainer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

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

import com.lishid.openinv.internal.IAnySilentContainer;
import com.lishid.openinv.internal.v1_21_R1.player.PlayerManager;
Expand Down
4 changes: 2 additions & 2 deletions ...v1_21_R1/inventory/OpenContainerMenu.java → ...v1_21_R1/container/OpenContainerMenu.java
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.lishid.openinv.internal.v1_21_R1.inventory;
package com.lishid.openinv.internal.v1_21_R1.container;

import com.google.common.base.Suppliers;
import com.lishid.openinv.internal.v1_21_R1.inventory.slot.SlotPlaceholder;
import com.lishid.openinv.internal.v1_21_R1.container.slot.SlotPlaceholder;
import it.unimi.dsi.fastutil.ints.IntArrayList;
import it.unimi.dsi.fastutil.ints.IntList;
import net.minecraft.world.inventory.AbstractContainerMenu;
Expand Down
2 changes: 1 addition & 1 deletion ...al/v1_21_R1/inventory/OpenEnderChest.java → ...al/v1_21_R1/container/OpenEnderChest.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.lishid.openinv.internal.v1_21_R1.inventory;
package com.lishid.openinv.internal.v1_21_R1.container;

import com.lishid.openinv.internal.ISpecialEnderChest;
import com.lishid.openinv.internal.v1_21_R1.player.PlayerManager;
Expand Down
4 changes: 2 additions & 2 deletions ...1_21_R1/inventory/OpenEnderChestMenu.java → ...1_21_R1/container/OpenEnderChestMenu.java
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.lishid.openinv.internal.v1_21_R1.inventory;
package com.lishid.openinv.internal.v1_21_R1.container;

import com.lishid.openinv.internal.v1_21_R1.inventory.slot.SlotViewOnly;
import com.lishid.openinv.internal.v1_21_R1.container.slot.SlotViewOnly;
import com.lishid.openinv.util.Permissions;
import net.minecraft.server.level.ServerPlayer;
import net.minecraft.world.entity.player.Player;
Expand Down
22 changes: 11 additions & 11 deletions ...nal/v1_21_R1/inventory/OpenInventory.java → ...nal/v1_21_R1/container/OpenInventory.java
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
package com.lishid.openinv.internal.v1_21_R1.inventory;
package com.lishid.openinv.internal.v1_21_R1.container;

import com.lishid.openinv.internal.ISpecialPlayerInventory;
import com.lishid.openinv.internal.v1_21_R1.player.PlayerManager;
import com.lishid.openinv.internal.v1_21_R1.inventory.slot.Content;
import com.lishid.openinv.internal.v1_21_R1.inventory.slot.ContentCrafting;
import com.lishid.openinv.internal.v1_21_R1.inventory.slot.ContentCraftingResult;
import com.lishid.openinv.internal.v1_21_R1.inventory.slot.ContentCursor;
import com.lishid.openinv.internal.v1_21_R1.inventory.slot.ContentDrop;
import com.lishid.openinv.internal.v1_21_R1.inventory.slot.ContentEquipment;
import com.lishid.openinv.internal.v1_21_R1.inventory.slot.ContentList;
import com.lishid.openinv.internal.v1_21_R1.inventory.slot.ContentOffHand;
import com.lishid.openinv.internal.v1_21_R1.inventory.slot.ContentViewOnly;
import com.lishid.openinv.internal.v1_21_R1.inventory.slot.SlotViewOnly;
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 net.minecraft.ChatFormatting;
import net.minecraft.core.NonNullList;
import net.minecraft.network.chat.Component;
Expand Down
8 changes: 4 additions & 4 deletions ...v1_21_R1/inventory/OpenInventoryMenu.java → ...v1_21_R1/container/OpenInventoryMenu.java
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.lishid.openinv.internal.v1_21_R1.inventory;
package com.lishid.openinv.internal.v1_21_R1.container;

import com.lishid.openinv.internal.v1_21_R1.inventory.slot.ContentDrop;
import com.lishid.openinv.internal.v1_21_R1.inventory.slot.ContentEquipment;
import com.lishid.openinv.internal.v1_21_R1.inventory.slot.SlotViewOnly;
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.util.Permissions;
import net.minecraft.server.level.ServerPlayer;
import net.minecraft.world.entity.EquipmentSlot;
Expand Down
2 changes: 1 addition & 1 deletion ..._21_R1/inventory/OpenPlayerInventory.java → ..._21_R1/container/OpenPlayerInventory.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.lishid.openinv.internal.v1_21_R1.inventory;
package com.lishid.openinv.internal.v1_21_R1.container;

import com.google.common.base.Preconditions;
import net.minecraft.core.NonNullList;
Expand Down
2 changes: 1 addition & 1 deletion ...rnal/v1_21_R1/inventory/Placeholders.java → ...rnal/v1_21_R1/container/Placeholders.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.lishid.openinv.internal.v1_21_R1.inventory;
package com.lishid.openinv.internal.v1_21_R1.container;

import net.minecraft.core.Registry;
import net.minecraft.core.RegistryAccess;
Expand Down
2 changes: 1 addition & 1 deletion ...rnal/v1_21_R1/inventory/slot/Content.java → ...rnal/v1_21_R1/container/slot/Content.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.lishid.openinv.internal.v1_21_R1.inventory.slot;
package com.lishid.openinv.internal.v1_21_R1.container.slot;

import net.minecraft.server.level.ServerPlayer;
import net.minecraft.world.Container;
Expand Down
4 changes: 2 additions & 2 deletions ...21_R1/inventory/slot/ContentCrafting.java → ...21_R1/container/slot/ContentCrafting.java
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.lishid.openinv.internal.v1_21_R1.inventory.slot;
package com.lishid.openinv.internal.v1_21_R1.container.slot;

import com.lishid.openinv.internal.v1_21_R1.inventory.Placeholders;
import com.lishid.openinv.internal.v1_21_R1.container.Placeholders;
import net.minecraft.server.level.ServerPlayer;
import net.minecraft.world.Container;
import net.minecraft.world.ContainerHelper;
Expand Down
4 changes: 2 additions & 2 deletions ...inventory/slot/ContentCraftingResult.java → ...container/slot/ContentCraftingResult.java
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.lishid.openinv.internal.v1_21_R1.inventory.slot;
package com.lishid.openinv.internal.v1_21_R1.container.slot;

import com.lishid.openinv.internal.v1_21_R1.inventory.Placeholders;
import com.lishid.openinv.internal.v1_21_R1.container.Placeholders;
import net.minecraft.server.level.ServerPlayer;
import net.minecraft.world.Container;
import net.minecraft.world.inventory.InventoryMenu;
Expand Down
4 changes: 2 additions & 2 deletions ...1_21_R1/inventory/slot/ContentCursor.java → ...1_21_R1/container/slot/ContentCursor.java
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.lishid.openinv.internal.v1_21_R1.inventory.slot;
package com.lishid.openinv.internal.v1_21_R1.container.slot;

import com.lishid.openinv.internal.v1_21_R1.inventory.Placeholders;
import com.lishid.openinv.internal.v1_21_R1.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/inventory/slot/ContentDrop.java → .../v1_21_R1/container/slot/ContentDrop.java
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.lishid.openinv.internal.v1_21_R1.inventory.slot;
package com.lishid.openinv.internal.v1_21_R1.container.slot;

import com.lishid.openinv.internal.v1_21_R1.inventory.Placeholders;
import com.lishid.openinv.internal.v1_21_R1.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/inventory/slot/ContentEquipment.java → ...1_R1/container/slot/ContentEquipment.java
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.lishid.openinv.internal.v1_21_R1.inventory.slot;
package com.lishid.openinv.internal.v1_21_R1.container.slot;

import com.lishid.openinv.internal.v1_21_R1.inventory.Placeholders;
import com.lishid.openinv.internal.v1_21_R1.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/inventory/slot/ContentList.java → .../v1_21_R1/container/slot/ContentList.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.lishid.openinv.internal.v1_21_R1.inventory.slot;
package com.lishid.openinv.internal.v1_21_R1.container.slot;

import net.minecraft.server.level.ServerPlayer;
import net.minecraft.world.Container;
Expand Down
2 changes: 1 addition & 1 deletion ..._21_R1/inventory/slot/ContentOffHand.java → ..._21_R1/container/slot/ContentOffHand.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.lishid.openinv.internal.v1_21_R1.inventory.slot;
package com.lishid.openinv.internal.v1_21_R1.container.slot;

import net.minecraft.server.level.ServerPlayer;
import net.minecraft.world.Container;
Expand Down
2 changes: 1 addition & 1 deletion ...21_R1/inventory/slot/ContentViewOnly.java → ...21_R1/container/slot/ContentViewOnly.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.lishid.openinv.internal.v1_21_R1.inventory.slot;
package com.lishid.openinv.internal.v1_21_R1.container.slot;

import net.minecraft.server.level.ServerPlayer;
import net.minecraft.world.Container;
Expand Down
2 changes: 1 addition & 1 deletion ...21_R1/inventory/slot/SlotPlaceholder.java → ...21_R1/container/slot/SlotPlaceholder.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.lishid.openinv.internal.v1_21_R1.inventory.slot;
package com.lishid.openinv.internal.v1_21_R1.container.slot;

import net.minecraft.world.Container;
import net.minecraft.world.inventory.Slot;
Expand Down
4 changes: 2 additions & 2 deletions ...v1_21_R1/inventory/slot/SlotViewOnly.java → ...v1_21_R1/container/slot/SlotViewOnly.java
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.lishid.openinv.internal.v1_21_R1.inventory.slot;
package com.lishid.openinv.internal.v1_21_R1.container.slot;

import com.lishid.openinv.internal.v1_21_R1.inventory.Placeholders;
import com.lishid.openinv.internal.v1_21_R1.container.Placeholders;
import net.minecraft.world.Container;
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.inventory.Slot;
Expand Down
Loading

0 comments on commit 1f2c2b6

Please sign in to comment.