gtl:合并fix
This commit is contained in:
parent
a4905c2a3f
commit
9f703d89dc
|
|
@ -79,7 +79,7 @@ dependencies {
|
||||||
//exendedae前置
|
//exendedae前置
|
||||||
modImplementation "curse.maven:glodium-957920:${glodium_version}"
|
modImplementation "curse.maven:glodium-957920:${glodium_version}"
|
||||||
//extendedAE
|
//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'])
|
modRuntimeOnly fileTree(dir: 'libs', includes: ['*.jar'])
|
||||||
|
|
||||||
//ae2
|
//ae2
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,7 @@ org.gradle.jvmargs=-Xmx1G
|
||||||
loom.platform = forge
|
loom.platform = forge
|
||||||
|
|
||||||
# Mod properties
|
# Mod properties
|
||||||
mod_version = 1.4.4-gtl-fix1
|
mod_version = 1.4.4-gtl-fix2
|
||||||
maven_group = com.extendedae_plus
|
maven_group = com.extendedae_plus
|
||||||
archives_name = extendedae_plus
|
archives_name = extendedae_plus
|
||||||
|
|
||||||
|
|
|
||||||
Binary file not shown.
|
|
@ -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 = "<init>",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;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -57,7 +57,6 @@
|
||||||
"ae2.autopattern.CraftingServiceGetProvidersMixin",
|
"ae2.autopattern.CraftingServiceGetProvidersMixin",
|
||||||
"ae2.autopattern.CraftingSimulationStateAccessor",
|
"ae2.autopattern.CraftingSimulationStateAccessor",
|
||||||
"ae2.autopattern.CraftingSimulationStateMixin",
|
"ae2.autopattern.CraftingSimulationStateMixin",
|
||||||
"ae2.autopattern.CraftingTreeProcessMixin",
|
|
||||||
"ae2.autopattern.PatternProviderLogicContainsRedirectMixin",
|
"ae2.autopattern.PatternProviderLogicContainsRedirectMixin",
|
||||||
"ae2.autopattern.gtceu.GTLCoreMEPatternBufferPartMachineMixin",
|
"ae2.autopattern.gtceu.GTLCoreMEPatternBufferPartMachineMixin",
|
||||||
"ae2.autopattern.gtceu.MEPatternBufferPartMachineMixin",
|
"ae2.autopattern.gtceu.MEPatternBufferPartMachineMixin",
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user