Mixin for reusable lens inventories

InventoryAdapter getInventory->getFabric
SpongePowered · Dec 1, 2017 · 7579b75 · 7579b75
1 parent 815c155
commit 7579b75
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/main/java/org/spongepowered/mod/mixin/core/item/inventory/MixinInvWrapper.java b/src/main/java/org/spongepowered/mod/mixin/core/item/inventory/MixinInvWrapper.java
@@ -114,7 +114,7 @@ public Inventory getChild(int index) {
         }
         Inventory child = this.children.get(index);
         if (child == null) {
-            child = this.getRootLens().getChildren().get(index).getAdapter(this.getInventory(), this);
+            child = this.getRootLens().getChildren().get(index).getAdapter(this.getFabric(), this);
             this.children.set(index, child);
         }
         return child;
@@ -134,15 +134,15 @@ public <T extends Inventory> Iterable<T> slots() {
 
     @Intrinsic
     public void inventory$clear() {
-        this.getInventory().clear();
+        this.getFabric().clear();
     }
 
     public Lens<IInventory, ItemStack> getRootLens() {
         this.init();
         return this.lens;
     }
 
-    public Fabric<IInventory> getInventory() {
+    public Fabric<IInventory> getFabric() {
         this.init();
         return ((Fabric) this.fabric);
     }

diff --git a/src/main/java/org/spongepowered/mod/mixin/core/item/inventory/MixinItemStackHandler.java b/src/main/java/org/spongepowered/mod/mixin/core/item/inventory/MixinItemStackHandler.java
@@ -114,7 +114,7 @@ public Inventory getChild(int index) {
         }
         Inventory child = this.children.get(index);
         if (child == null) {
-            child = this.getRootLens().getChildren().get(index).getAdapter(this.getInventory(), this);
+            child = this.getRootLens().getChildren().get(index).getAdapter(this.getFabric(), this);
             this.children.set(index, child);
         }
         return child;
@@ -134,15 +134,15 @@ public <T extends Inventory> Iterable<T> slots() {
 
     @Intrinsic
     public void inventory$clear() {
-        this.getInventory().clear();
+        this.getFabric().clear();
     }
 
     public Lens<IInventory, ItemStack> getRootLens() {
         this.init();
         return this.lens;
     }
 
-    public Fabric<IInventory> getInventory() {
+    public Fabric<IInventory> getFabric() {
         this.init();
         return ((Fabric) this.fabric);
     }