From f08a69e19fa34650888b126ac5a1729a0d1c73d4 Mon Sep 17 00:00:00 2001
From: modmuss50 <modmuss50@gmail.com>
Date: Wed, 5 May 2021 19:53:16 +0100
Subject: [PATCH] 21w18a
---
build.gradle | 6 +++---
fabric-dimensions-v1/build.gradle | 2 +-
.../fabricmc/fabric/mixin/dimension/ServerBugfixMixin.java | 2 +-
fabric-object-builder-api-v1/build.gradle | 2 +-
fabric-registry-sync-v0/build.gradle | 2 +-
.../net/fabricmc/fabric/mixin/registry/sync/MixinMain.java | 2 +-
.../mixin/registry/sync/client/MixinMinecraftClient.java | 4 ++--
7 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/build.gradle b/build.gradle
index bc9299165..63ebf1a36 100644
--- a/build.gradle
+++ b/build.gradle
@@ -19,9 +19,9 @@ plugins {
def ENV = System.getenv()
class Globals {
- static def baseVersion = "0.34.1"
- static def mcVersion = "21w17a"
- static def yarnVersion = "+build.2"
+ static def baseVersion = "0.34.2"
+ static def mcVersion = "21w18a"
+ static def yarnVersion = "+build.3"
static def loaderVersion = "0.10.5+build.213"
static def preRelease = true
}
diff --git a/fabric-dimensions-v1/build.gradle b/fabric-dimensions-v1/build.gradle
index b201a4364..8d9b4e282 100644
--- a/fabric-dimensions-v1/build.gradle
+++ b/fabric-dimensions-v1/build.gradle
@@ -1,5 +1,5 @@
archivesBaseName = "fabric-dimensions-v1"
-version = getSubprojectVersion(project, "2.0.9")
+version = getSubprojectVersion(project, "2.0.10")
dependencies {
testmodCompile project(path: ':fabric-command-api-v1', configuration: 'dev')
diff --git a/fabric-dimensions-v1/src/main/java/net/fabricmc/fabric/mixin/dimension/ServerBugfixMixin.java b/fabric-dimensions-v1/src/main/java/net/fabricmc/fabric/mixin/dimension/ServerBugfixMixin.java
index e90290678..79c43c52d 100644
--- a/fabric-dimensions-v1/src/main/java/net/fabricmc/fabric/mixin/dimension/ServerBugfixMixin.java
+++ b/fabric-dimensions-v1/src/main/java/net/fabricmc/fabric/mixin/dimension/ServerBugfixMixin.java
@@ -73,7 +73,7 @@ public class ServerBugfixMixin {
return value;
}
- @ModifyVariable(at = @At(value = "INVOKE_ASSIGN", target = "Lnet/minecraft/util/dynamic/RegistryOps;of(Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/resource/ResourceManager;Lnet/minecraft/util/registry/DynamicRegistryManager;)Lnet/minecraft/util/dynamic/RegistryOps;"), method = "main", allow = 1)
+ @ModifyVariable(at = @At(value = "INVOKE_ASSIGN", target = "Lnet/minecraft/util/dynamic/RegistryOps;method_36574(Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/resource/ResourceManager;Lnet/minecraft/util/registry/DynamicRegistryManager;)Lnet/minecraft/util/dynamic/RegistryOps;"), method = "main", allow = 1)
private static RegistryOps<NbtElement> captureRegistryOps(RegistryOps<NbtElement> value) {
fabric_registryOps = value;
return value;
diff --git a/fabric-object-builder-api-v1/build.gradle b/fabric-object-builder-api-v1/build.gradle
index 7a92ed5c8..14150a81f 100644
--- a/fabric-object-builder-api-v1/build.gradle
+++ b/fabric-object-builder-api-v1/build.gradle
@@ -1,5 +1,5 @@
archivesBaseName = "fabric-object-builder-api-v1"
-version = getSubprojectVersion(project, "1.10.6")
+version = getSubprojectVersion(project, "1.10.7")
dependencies {
testmodCompile project(path: ':fabric-command-api-v1', configuration: 'dev')
diff --git a/fabric-registry-sync-v0/build.gradle b/fabric-registry-sync-v0/build.gradle
index b6744c763..a3438b29f 100644
--- a/fabric-registry-sync-v0/build.gradle
+++ b/fabric-registry-sync-v0/build.gradle
@@ -1,5 +1,5 @@
archivesBaseName = "fabric-registry-sync-v0"
-version = getSubprojectVersion(project, "0.7.8")
+version = getSubprojectVersion(project, "0.7.9")
moduleDependencies(project, [
'fabric-api-base',
diff --git a/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/mixin/registry/sync/MixinMain.java b/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/mixin/registry/sync/MixinMain.java
index efc8da14e..f987e4e9d 100644
--- a/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/mixin/registry/sync/MixinMain.java
+++ b/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/mixin/registry/sync/MixinMain.java
@@ -46,7 +46,7 @@ public class MixinMain {
return session;
}
- @Redirect(method = "main", at = @At(value = "INVOKE", target = "Lnet/minecraft/util/dynamic/RegistryOps;of(Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/resource/ResourceManager;Lnet/minecraft/util/registry/DynamicRegistryManager;)Lnet/minecraft/util/dynamic/RegistryOps;"))
+ @Redirect(method = "main", at = @At(value = "INVOKE", target = "Lnet/minecraft/util/dynamic/RegistryOps;method_36574(Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/resource/ResourceManager;Lnet/minecraft/util/registry/DynamicRegistryManager;)Lnet/minecraft/util/dynamic/RegistryOps;"))
private static RegistryOps<NbtElement> ofRegistryOps(DynamicOps<NbtElement> delegate, ResourceManager resourceManager, DynamicRegistryManager impl) {
RegistryOps<NbtElement> registryOps = RegistryOps.of(delegate, resourceManager, impl);
PersistentDynamicRegistryHandler.remapDynamicRegistries((DynamicRegistryManager.Impl) impl, fabric_saveDir);
diff --git a/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/mixin/registry/sync/client/MixinMinecraftClient.java b/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/mixin/registry/sync/client/MixinMinecraftClient.java
index 06ba45505..1a783e99b 100644
--- a/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/mixin/registry/sync/client/MixinMinecraftClient.java
+++ b/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/mixin/registry/sync/client/MixinMinecraftClient.java
@@ -57,14 +57,14 @@ public class MixinMinecraftClient {
}
}
- @Inject(method = "createSaveProperties", at = @At(value = "INVOKE_ASSIGN", target = "Lnet/minecraft/util/dynamic/RegistryOps;of(Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/resource/ResourceManager;Lnet/minecraft/util/registry/DynamicRegistryManager;)Lnet/minecraft/util/dynamic/RegistryOps;"))
+ @Inject(method = "createSaveProperties", at = @At(value = "INVOKE_ASSIGN", target = "Lnet/minecraft/util/dynamic/RegistryOps;method_36574(Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/resource/ResourceManager;Lnet/minecraft/util/registry/DynamicRegistryManager;)Lnet/minecraft/util/dynamic/RegistryOps;"))
private static void createSaveProperties(LevelStorage.Session session, DynamicRegistryManager.Impl impl, ResourceManager resourceManager, DataPackSettings dataPackSettings, CallbackInfoReturnable<SaveProperties> cir) {
Path saveDir = ((AccessorLevelStorageSession) session).getDirectory();
PersistentDynamicRegistryHandler.remapDynamicRegistries(impl, saveDir);
}
// synthetic in method_29607 just after RegistryOps.of
- @Inject(method = "method_31125", at = @At(value = "INVOKE_ASSIGN", target = "Lnet/minecraft/util/dynamic/RegistryOps;of(Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/resource/ResourceManager;Lnet/minecraft/util/registry/DynamicRegistryManager;)Lnet/minecraft/util/dynamic/RegistryOps;"))
+ @Inject(method = "method_31125", at = @At(value = "INVOKE_ASSIGN", target = "Lnet/minecraft/util/dynamic/RegistryOps;method_36574(Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/resource/ResourceManager;Lnet/minecraft/util/registry/DynamicRegistryManager;)Lnet/minecraft/util/dynamic/RegistryOps;"))
private static void method_31125(DynamicRegistryManager.Impl impl, GeneratorOptions generatorOptions, LevelInfo levelInfo, LevelStorage.Session session, DynamicRegistryManager.Impl impl2, ResourceManager resourceManager, DataPackSettings dataPackSettings, CallbackInfoReturnable<SaveProperties> cir) {
Path saveDir = ((AccessorLevelStorageSession) session).getDirectory();
PersistentDynamicRegistryHandler.remapDynamicRegistries(impl, saveDir);