Merge branch '1.19' into 1.18

# Conflicts: # build.gradle.kts # settings.gradle.kts # src/main/java/gripe/_90/aecapfix/mixin/ae2/ChestBlockEntityMixin.java
62832 · Dec 28, 2023 · f6a5f3f · f6a5f3f
2 parents ff2e793 + 8cb8958
commit f6a5f3f
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/src/main/java/gripe/_90/aecapfix/mixin/ae2/PatternProviderBlockEntityMixin.java b/src/main/java/gripe/_90/aecapfix/mixin/ae2/PatternProviderBlockEntityMixin.java
@@ -1,7 +1,7 @@
 package gripe._90.aecapfix.mixin.ae2;
 
 import appeng.blockentity.crafting.PatternProviderBlockEntity;
-import appeng.helpers.patternprovider.PatternProviderLogic;
+import appeng.helpers.iface.PatternProviderLogic;
 import gripe._90.aecapfix.AECapFix;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.block.entity.BlockEntity;

diff --git a/src/main/java/gripe/_90/aecapfix/mixin/ae2/PatternProviderLogicMixin.java b/src/main/java/gripe/_90/aecapfix/mixin/ae2/PatternProviderLogicMixin.java
@@ -1,7 +1,7 @@
 package gripe._90.aecapfix.mixin.ae2;
 
-import appeng.helpers.patternprovider.PatternProviderLogic;
-import appeng.helpers.patternprovider.PatternProviderReturnInventory;
+import appeng.helpers.iface.PatternProviderLogic;
+import appeng.helpers.iface.PatternProviderReturnInventory;
 import gripe._90.aecapfix.AECapFix;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;

diff --git a/src/main/java/gripe/_90/aecapfix/mixin/ae2/PatternProviderPartMixin.java b/src/main/java/gripe/_90/aecapfix/mixin/ae2/PatternProviderPartMixin.java
@@ -1,6 +1,6 @@
 package gripe._90.aecapfix.mixin.ae2;
 
-import appeng.helpers.patternprovider.PatternProviderLogic;
+import appeng.helpers.iface.PatternProviderLogic;
 import appeng.parts.crafting.PatternProviderPart;
 import gripe._90.aecapfix.AECapFix;
 import org.spongepowered.asm.mixin.Final;

diff --git a/src/main/java/gripe/_90/aecapfix/mixin/ae2/PatternProviderReturnInventoryMixin.java b/src/main/java/gripe/_90/aecapfix/mixin/ae2/PatternProviderReturnInventoryMixin.java
@@ -1,7 +1,7 @@
 package gripe._90.aecapfix.mixin.ae2;
 
 import appeng.api.behaviors.GenericInternalInventory;
-import appeng.helpers.patternprovider.PatternProviderReturnInventory;
+import appeng.helpers.iface.PatternProviderReturnInventory;
 import gripe._90.aecapfix.AECapFix;
 import net.minecraftforge.common.util.LazyOptional;
 import org.spongepowered.asm.mixin.Final;