v1.2.0 for 1.16

build.gradle

@@ -46,7 +46,9 @@ dependencies {
 	modCompile "carpet:fabric-carpet:${project.minecraft_version}-${project.carpet_core_version}"
 
 	modCompile "net.fabricmc.fabric-api:fabric-resource-loader-v0:${project.fabric_resource_loader_v0_version}"
-	include "net.fabricmc.fabric-api:fabric-resource-l0.3.1+facf3bbf950.3.1+facf3bbf950.3.1+facf3bbf950.3.1+facf3bbf950.3.1+facf3bbf95oader-v0:${project.fabric_resource_loader_v0_version}"
+	include "net.fabricmc.fabric-api:fabric-resource-loader-v0:${project.fabric_resource_loader_v0_version}"
+
+	modCompile "net.fabricmc.fabric-api:fabric-registry-sync-v0:${project.fabric_registry_sync_v0_version}"
 
 	// javax.annotation.Nullable/Nonnull
 	compileOnly "com.google.code.findbugs:jsr305:3.0.1"

gradle.properties

@@ -3,7 +3,7 @@ org.gradle.jvmargs=-Xmx1G
 
 
 # Mod Properties
-mod_version = 1.1.1
+mod_version = 1.2.0
 maven_group = carpet-extension
 archives_base_name = skyblock
 
@@ -15,3 +15,4 @@ fabric_version=0.22.1+build.409-1.16
 
 carpet_core_version=1.4.11+v200910
 fabric_resource_loader_v0_version=0.3.1+facf3bbf95
+fabric_registry_sync_v0_version=0.5.0+c1aa8ed895

src/main/java/skyblock/SkyBlockExtension.java

@@ -4,13 +4,21 @@
 import carpet.CarpetServer;
 import carpet.settings.SettingsManager;
 import net.fabricmc.api.ModInitializer;
+import net.minecraft.util.Identifier;
+import net.minecraft.util.registry.Registry;
 
 public class SkyBlockExtension implements CarpetExtension, ModInitializer
 {
-    private static SettingsManager mySettingManager = new SettingsManager(Build.VERSION, Build.ID, Build.NAME);
-
+    private static SettingsManager mySettingManager;
+
+    public static void noop() {}
+
     public SkyBlockExtension() {
-        CarpetServer.manageExtension(this);
+    }
+
+    static {
+        mySettingManager = new SettingsManager(Build.VERSION, Build.ID, Build.NAME);
+        CarpetServer.manageExtension(new SkyBlockExtension());
     }
 
     @Override
@@ -34,6 +42,12 @@ public SettingsManager customSettingsManager()
     @Override
     public String version()
     {
-        return "carpet-skyblock 1.1.1";
+        return "carpet-skyblock";
+    }
+
+    public static boolean isIgnoredForRegistrySync(Identifier registry, Identifier entry)
+    {
+        if (!Registry.POTION_KEY.getValue().equals(registry)) return false;
+        return entry.toString().startsWith("minecraft:super_");
     }
 }

src/main/java/skyblock/mixin/CrashReport_noopMixin.java

@@ -0,0 +1,18 @@
+package skyblock.mixin;
+
+import net.minecraft.util.crash.CrashReport;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import skyblock.SkyBlockExtension;
+
+@Mixin(CrashReport.class)
+public class CrashReport_noopMixin
+{
+    @Inject(method = "initCrashReport", at = @At("HEAD"))
+    private static void gameStarted(CallbackInfo ci)
+    {
+        SkyBlockExtension.noop();
+    }
+}

src/main/java/skyblock/mixin/RegistrySyncManagerMixin.java

@@ -0,0 +1,36 @@
+package skyblock.mixin;
+
+import net.fabricmc.fabric.impl.registry.sync.RegistrySyncManager;
+import net.minecraft.util.Identifier;
+import net.minecraft.util.registry.Registry;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Redirect;
+import skyblock.SkyBlockExtension;
+
+@Mixin(value = RegistrySyncManager.class)
+public class RegistrySyncManagerMixin
+{
+    private static final ThreadLocal<Identifier> currentRegistry = new ThreadLocal<>();
+
+    @Redirect(method = "toTag", at = @At(
+        value = "INVOKE",
+        target = "Lnet/minecraft/util/registry/Registry;get(Lnet/minecraft/util/Identifier;)Ljava/lang/Object;"
+    ))
+    private static <T> T redirectGetRegistry(Registry<T> registry, Identifier id)
+    {
+        currentRegistry.set(id);
+        return registry.get(id);
+    }
+
+    @Redirect(method = "toTag", at = @At(
+        value = "INVOKE",
+        target = "Lnet/minecraft/util/registry/Registry;getId(Ljava/lang/Object;)Lnet/minecraft/util/Identifier;"
+    ))
+    private static <T> Identifier redirectGetId(Registry<T> mutableRegistry, T entry)
+    {
+        Identifier id = mutableRegistry.getId(entry);
+        if (SkyBlockExtension.isIgnoredForRegistrySync(currentRegistry.get(), id)) return null;
+        return id;
+    }
+}

src/main/resources/skyblock.mixins.json

@@ -3,6 +3,8 @@
   "package": "skyblock.mixin",
   "compatibilityLevel": "JAVA_8",
   "mixins": [
+    "CrashReport_noopMixin",
+    "RegistrySyncManagerMixin",
     "BrewingRecipeRegistryAccessor",
     "BrewingRecipeRegistryMixin",
     "ChunkStatusMixin",