diff --git a/build.gradle b/build.gradle index 7394979..3dd7ba2 100644 --- a/build.gradle +++ b/build.gradle @@ -166,11 +166,14 @@ dependencies { runtimeOnly "curse.maven:ex-pattern-provider-892005:6863556" //aea - implementation "curse.maven:advancedae-1084104:6921281" + implementation "curse.maven:advancedae-1084104:6932981" //geckolib runtimeOnly "curse.maven:geckolib-388172:7009924" + + runtimeOnly fileTree(dir: 'libs', includes: ['*.jar']) + // setup Xei (EMI/REI/JEI) using project property 'use_Xei' switch (project.findProperty('use_Xei') ?: 'emi') { case 'emi': diff --git a/src/main/java/com/extendedae_plus/network/ProvidersListS2CPacket.java b/src/main/java/com/extendedae_plus/network/ProvidersListS2CPacket.java index 0fa8184..2da91df 100644 --- a/src/main/java/com/extendedae_plus/network/ProvidersListS2CPacket.java +++ b/src/main/java/com/extendedae_plus/network/ProvidersListS2CPacket.java @@ -7,6 +7,8 @@ import net.minecraft.network.RegistryFriendlyByteBuf; import net.minecraft.network.codec.StreamCodec; import net.minecraft.network.protocol.common.custom.CustomPacketPayload; import net.minecraft.resources.ResourceLocation; +import net.neoforged.api.distmarker.Dist; +import net.neoforged.api.distmarker.OnlyIn; import net.neoforged.neoforge.network.handling.IPayloadContext; import java.util.ArrayList; @@ -58,11 +60,14 @@ public class ProvidersListS2CPacket implements CustomPacketPayload { } public static void handle(final ProvidersListS2CPacket msg, final IPayloadContext ctx) { - ctx.enqueueWork(() -> { - var mc = Minecraft.getInstance(); - if (mc == null) return; - var current = mc.screen; - mc.setScreen(new ProviderSelectScreen(current, msg.ids, msg.names, msg.emptySlots)); - }); + ctx.enqueueWork(() -> handleClient(msg)); + } + + @OnlyIn(Dist.CLIENT) + private static void handleClient(ProvidersListS2CPacket msg) { + var mc = Minecraft.getInstance(); + if (mc == null) return; + var current = mc.screen; + mc.setScreen(new ProviderSelectScreen(current, msg.ids, msg.names, msg.emptySlots)); } } diff --git a/src/main/resources/extendedae_plus.mixins.json b/src/main/resources/extendedae_plus.mixins.json index f7a85bd..034dc6d 100644 --- a/src/main/resources/extendedae_plus.mixins.json +++ b/src/main/resources/extendedae_plus.mixins.json @@ -14,7 +14,6 @@ "ae2.CraftingCalculationMixin", "ae2.CraftingCPUClusterMixin", "ae2.EncodedPatternItemMixin", - "ae2.QuartzCuttingKnifeItemMixin", "ae2.accessor.MEStorageMenuAccessor", "ae2.accessor.PatternEncodingTermMenuAccessor", "ae2.accessor.PatternProviderLogicAccessor", @@ -46,6 +45,7 @@ "accessor.ScreenAccessor", "advancedae.client.gui.AdvPatternProviderScreenMixin", "advancedae.client.gui.SmallAdvPatternProviderScreenMixin", + "ae2.QuartzCuttingKnifeItemMixin", "ae2.accessor.AEBaseScreenAccessor", "ae2.accessor.AEBaseScreenInvoker", "ae2.accessor.MEStorageScreenAccessor",