revert 1.19.3 (backport to 1.19)

BlossomMods · Apr 6, 2023 · dfe56f6 · dfe56f6
1 parent e903725
commit dfe56f6
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/build.gradle b/build.gradle
@@ -4,7 +4,8 @@ plugins {
     id "com.modrinth.minotaur" version "2.+"
 }
 
-version = "${project.mod_version}+${project.supported_versions.split(";")[0]}"
+var mc_version = project.supported_versions.split(";")[0]
+version = "${project.mod_version}+${mc_version}"
 group = project.maven_group
 
 repositories {
@@ -25,7 +26,7 @@ dependencies {
     mappings "net.fabricmc:yarn:${project.minecraft_version}+${project.yarn_mappings}:v2"
     modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
 
-    modImplementation "dev.codedsakura.blossom:blossom-lib:${project.blossomlib_version}+${project.minecraft_version}"
+    modImplementation "dev.codedsakura.blossom:blossom-lib:${project.blossomlib_version}+${mc_version}"
 }
 
 processResources {

diff --git a/gradle.properties b/gradle.properties
@@ -6,11 +6,11 @@ mod_version=2.0.6
 maven_group=dev.codedsakura.blossom
 mod_slug=BlossomHomes
 archives_base_name=blossom-homes
-supported_versions=1.19.3;1.19.4
+supported_versions=1.19;1.19.1;1.19.2
 
 # Fabric Properties
 # check these on https://modmuss50.me/fabric.html
-minecraft_version=1.19.4
+minecraft_version=1.19.2
 yarn_mappings=build.1
 loader_version=0.14.17
 

diff --git a/src/main/java/dev/codedsakura/blossom/homes/HomeController.java b/src/main/java/dev/codedsakura/blossom/homes/HomeController.java
@@ -7,12 +7,12 @@
 import com.mojang.brigadier.suggestion.SuggestionsBuilder;
 import dev.codedsakura.blossom.lib.data.ListDataController;
 import dev.codedsakura.blossom.lib.teleport.TeleportUtils;
-import net.minecraft.registry.RegistryKey;
-import net.minecraft.registry.RegistryKeys;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.command.ServerCommandSource;
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.util.Identifier;
+import net.minecraft.util.registry.Registry;
+import net.minecraft.util.registry.RegistryKey;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -58,7 +58,7 @@ public String toString() {
 
     TeleportUtils.TeleportDestination toDestination(MinecraftServer server) {
         return new TeleportUtils.TeleportDestination(
-                server.getWorld(RegistryKey.of(RegistryKeys.WORLD, new Identifier(this.world))),
+                server.getWorld(RegistryKey.of(Registry.WORLD_KEY, new Identifier(this.world))),
                 x, y, z, yaw, pitch
         );
     }