aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYasin <a.piri@hotmail.de>2024-07-23 00:02:36 +0200
committerKevinthegreat <92656833+kevinthegreat1@users.noreply.github.com>2024-07-26 15:09:00 +0800
commit7918e2102865bc804b25a20aa8caafd4765b54ad (patch)
tree50006672c78d9a2dfa40937c0e46b730e8a424bb
parent17639832d16a6de342c8ba2129cb5e7070643763 (diff)
downloadSkyblocker-7918e2102865bc804b25a20aa8caafd4765b54ad.tar.gz
Skyblocker-7918e2102865bc804b25a20aa8caafd4765b54ad.tar.bz2
Skyblocker-7918e2102865bc804b25a20aa8caafd4765b54ad.zip
fix skyblock recipe
thx to nea and vic we have our recipes back Co-Authored-By: viciscat <51047087+viciscat@users.noreply.github.com> Co-Authored-By: Linnea Gräf <nea@nea.moe>
-rw-r--r--gradle.properties2
-rw-r--r--src/main/java/de/hysky/skyblocker/compatibility/emi/SkyblockerEMIPlugin.java2
-rw-r--r--src/main/java/de/hysky/skyblocker/utils/NEURepoManager.java16
3 files changed, 18 insertions, 2 deletions
diff --git a/gradle.properties b/gradle.properties
index e97585c9..0e359e1d 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -21,7 +21,7 @@ mod_menu_version = 11.0.0-beta.1
## REI (https://modrinth.com/mod/rei/versions?l=fabric)
rei_version = 13.0.666
## EMI (https://modrinth.com/mod/emi/versions)
-emi_version = 1.0.22+1.20.2
+emi_version = 1.1.10+1.21
# Minecraft and Related Libraries
## McDev Annotations (https://central.sonatype.com/artifact/com.demonwav.mcdev/annotations)
diff --git a/src/main/java/de/hysky/skyblocker/compatibility/emi/SkyblockerEMIPlugin.java b/src/main/java/de/hysky/skyblocker/compatibility/emi/SkyblockerEMIPlugin.java
index c02300ec..9d5a2a46 100644
--- a/src/main/java/de/hysky/skyblocker/compatibility/emi/SkyblockerEMIPlugin.java
+++ b/src/main/java/de/hysky/skyblocker/compatibility/emi/SkyblockerEMIPlugin.java
@@ -24,7 +24,7 @@ public class SkyblockerEMIPlugin implements EmiPlugin {
public void register(EmiRegistry registry) {
ItemRepository.getItemsStream().map(EmiStack::of).forEach(emiStack -> {
registry.addEmiStack(emiStack);
- registry.setDefaultComparison(emiStack, Comparison.compareNbt());
+ registry.setDefaultComparison(emiStack, Comparison.compareComponents());
});
registry.addCategory(SKYBLOCK);
registry.addWorkstation(SKYBLOCK, EmiStack.of(Items.CRAFTING_TABLE));
diff --git a/src/main/java/de/hysky/skyblocker/utils/NEURepoManager.java b/src/main/java/de/hysky/skyblocker/utils/NEURepoManager.java
index f8716ca4..a86adc2b 100644
--- a/src/main/java/de/hysky/skyblocker/utils/NEURepoManager.java
+++ b/src/main/java/de/hysky/skyblocker/utils/NEURepoManager.java
@@ -2,6 +2,7 @@ package de.hysky.skyblocker.utils;
import com.mojang.brigadier.Command;
import de.hysky.skyblocker.SkyblockerMod;
+import de.hysky.skyblocker.events.SkyblockEvents;
import de.hysky.skyblocker.skyblock.itemlist.ItemRepository;
import de.hysky.skyblocker.utils.scheduler.Scheduler;
import io.github.moulberry.repo.NEURepository;
@@ -9,6 +10,7 @@ import net.fabricmc.fabric.api.client.command.v2.ClientCommandManager;
import net.fabricmc.fabric.api.client.command.v2.ClientCommandRegistrationCallback;
import net.minecraft.client.MinecraftClient;
import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.network.packet.s2c.play.SynchronizeRecipesS2CPacket;
import net.minecraft.text.Text;
import org.apache.commons.lang3.function.Consumers;
import org.eclipse.jgit.api.Git;
@@ -49,6 +51,20 @@ public class NEURepoManager {
}))
)
);
+ SkyblockEvents.JOIN.register(NEURepoManager::load);
+ }
+
+ private static void load() {
+ MinecraftClient client = MinecraftClient.getInstance();
+ if (client.world != null && client.getNetworkHandler() != null) {
+ SynchronizeRecipesS2CPacket packet = new SynchronizeRecipesS2CPacket(List.of());
+
+ try {
+ client.getNetworkHandler().onSynchronizeRecipes(packet);
+ } catch (Exception e) {
+ LOGGER.info("[Skyblocker] recipe sync error" , e);
+ }
+ }
}
public static boolean isLoading() {