diff --git a/build.gradle b/build.gradle index 2875566..f7942ac 100644 --- a/build.gradle +++ b/build.gradle @@ -79,7 +79,7 @@ dependencies { //exendedae前置 modImplementation "curse.maven:glodium-957920:${glodium_version}" //extendedAE - modImplementation files('libs/ExtendedAE-1.20-1.4.7-forge.jar') + modImplementation files('libs/ExtendedAE-1.20-1.4.2-forge.jar') modRuntimeOnly fileTree(dir: 'libs', includes: ['*.jar']) //ae2 diff --git a/gradle.properties b/gradle.properties index 7c16d3f..df7d2f4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,7 +3,7 @@ org.gradle.jvmargs=-Xmx1G loom.platform = forge # Mod properties -mod_version = 1.4.4-gtl-fix1 +mod_version = 1.4.4-gtl-fix2 maven_group = com.extendedae_plus archives_name = extendedae_plus diff --git a/libs/ExtendedAE-1.20-1.4.7-forge.jar b/libs/ExtendedAE-1.20-1.4.7-forge.jar deleted file mode 100644 index 6cd5e65..0000000 Binary files a/libs/ExtendedAE-1.20-1.4.7-forge.jar and /dev/null differ diff --git a/src/main/java/com/extendedae_plus/mixin/ae2/autopattern/CraftingTreeNodeMixin.java b/src/main/java/com/extendedae_plus/mixin/ae2/autopattern/CraftingTreeNodeMixin.java deleted file mode 100644 index e69de29..0000000 diff --git a/src/main/java/com/extendedae_plus/mixin/ae2/autopattern/CraftingTreeProcessMixin.java b/src/main/java/com/extendedae_plus/mixin/ae2/autopattern/CraftingTreeProcessMixin.java deleted file mode 100644 index fe28216..0000000 --- a/src/main/java/com/extendedae_plus/mixin/ae2/autopattern/CraftingTreeProcessMixin.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.extendedae_plus.mixin.ae2.autopattern; - -import appeng.api.crafting.IPatternDetails; -import appeng.api.networking.crafting.ICraftingService; -import appeng.crafting.CraftingCalculation; -import appeng.crafting.CraftingTreeNode; -import appeng.crafting.CraftingTreeProcess; -import appeng.crafting.inv.CraftingSimulationState; -import com.extendedae_plus.api.smartDoubling.ICraftingSimulationStateExt; -import com.extendedae_plus.api.smartDoubling.ICraftingTreeProcessExt; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Unique; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; - -@SuppressWarnings({"AddedMixinMembersNamePattern"}) -@Mixin(value = CraftingTreeProcess.class, remap = false) -public class CraftingTreeProcessMixin implements ICraftingTreeProcessExt { - @Unique private ICraftingService craftingService; - - @Inject(method = "",at = @At("RETURN")) - private void init(ICraftingService cc, CraftingCalculation job, IPatternDetails details, CraftingTreeNode craftingTreeNode, CallbackInfo ci) { - this.craftingService = cc; - } - - @Inject( - method = "request", - at = @At("HEAD") - ) - private void bindSimulationState(CraftingSimulationState inv, long times, CallbackInfo ci) { - ((ICraftingSimulationStateExt) inv).setSourceProcess((CraftingTreeProcess) (Object) this); - } - - @Override - public ICraftingService getCraftingService() { - return this.craftingService; - } -} diff --git a/src/main/resources/extendedae_plus.mixins.json b/src/main/resources/extendedae_plus.mixins.json index 71fc82a..c819381 100644 --- a/src/main/resources/extendedae_plus.mixins.json +++ b/src/main/resources/extendedae_plus.mixins.json @@ -57,7 +57,6 @@ "ae2.autopattern.CraftingServiceGetProvidersMixin", "ae2.autopattern.CraftingSimulationStateAccessor", "ae2.autopattern.CraftingSimulationStateMixin", - "ae2.autopattern.CraftingTreeProcessMixin", "ae2.autopattern.PatternProviderLogicContainsRedirectMixin", "ae2.autopattern.gtceu.GTLCoreMEPatternBufferPartMachineMixin", "ae2.autopattern.gtceu.MEPatternBufferPartMachineMixin",