From 15ccbed3c6be6f4f742709a5b9b5a88faa9d7905 Mon Sep 17 00:00:00 2001
From: BlayTheNinth <1933180+BlayTheNinth@users.noreply.github.com>
Date: Thu, 10 Oct 2024 21:41:14 +0200
Subject: [PATCH] feat: Update to Minecraft 1.21.2

---
 CHANGELOG.md                                  |  2 +-
 .../mixin/NetherPortalBlockMixin.java         |  2 +-
 gradle.properties                             | 16 ++++++++--------
 repositories.gradle                           | 19 +++++++++++++++++++
 settings.gradle                               |  4 ++--
 5 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2b42c9a..9e3c07f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1 +1 @@
-- Updated to Minecraft 1.21.1
\ No newline at end of file
+- Updated to Minecraft 1.21.2
diff --git a/common/src/main/java/net/blay09/mods/netherportalfix/mixin/NetherPortalBlockMixin.java b/common/src/main/java/net/blay09/mods/netherportalfix/mixin/NetherPortalBlockMixin.java
index a4792b2..a8acb36 100644
--- a/common/src/main/java/net/blay09/mods/netherportalfix/mixin/NetherPortalBlockMixin.java
+++ b/common/src/main/java/net/blay09/mods/netherportalfix/mixin/NetherPortalBlockMixin.java
@@ -19,7 +19,7 @@
 @Mixin(NetherPortalBlock.class)
 public class NetherPortalBlockMixin {
 
-    @ModifyExpressionValue(method = "getExitPortal(Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/Entity;Lnet/minecraft/core/BlockPos;Lnet/minecraft/core/BlockPos;ZLnet/minecraft/world/level/border/WorldBorder;)Lnet/minecraft/world/level/portal/DimensionTransition;", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/portal/PortalForcer;findClosestPortalPosition(Lnet/minecraft/core/BlockPos;ZLnet/minecraft/world/level/border/WorldBorder;)Ljava/util/Optional;"))
+    @ModifyExpressionValue(method = "getExitPortal(Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/Entity;Lnet/minecraft/core/BlockPos;Lnet/minecraft/core/BlockPos;ZLnet/minecraft/world/level/border/WorldBorder;)Lnet/minecraft/world/level/portal/TeleportTransition;", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/portal/PortalForcer;findClosestPortalPosition(Lnet/minecraft/core/BlockPos;ZLnet/minecraft/world/level/border/WorldBorder;)Ljava/util/Optional;"))
     public Optional<BlockPos> getExitPortal(Optional<BlockPos> original, ServerLevel level, Entity entity) {
         final var fromPos = entity.blockPosition();
         final ResourceKey<Level> fromDim = entity.level().dimension();
diff --git a/gradle.properties b/gradle.properties
index 47851ac..0c2364e 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,7 +3,7 @@ mod_id=netherportalfix
 mod_name=NetherPortalFix
 mod_main=NetherPortalFix
 description=Ensures correct destinations when travelling back and forth through Nether Portals in Multiplayer.
-version = 21.1.1
+version = 21.2.0
 group=net.blay09.mods
 homepage=https://mods.twelveiterations.com/mc/netherportalfix
 sources=https://github.com/TwelveIterationMods/NetherPortalFix
@@ -18,16 +18,16 @@ modrinth_release_type=release
 modrinth_project_id=nPZr02ET
 
 # Minecraft
-minecraft_version = 1.21.1
+minecraft_version = 1.21.2-pre1
 minimum_minecraft_version = 1.21
-minecraft_versions = 1.21,1.21.1
+minecraft_versions = 1.21,1.21.1,1.21.2-pre1
 minecraft_version_range = [1.21,)
 pack_format_number = 18
 java_version = 21
 
 # Balm
-balm_version = 21.0.14-SNAPSHOT
-balm_version_range = [21.0.0,)
+balm_version = 21.2.1-SNAPSHOT
+balm_version_range = [21.2.0,)
 
 # Forge
 forge_version = 52.0.2
@@ -40,8 +40,8 @@ neoforge_version_range = [21-beta,)
 neoforge_loader_version_range = [1,)
 
 # Fabric
-fabric_version = 0.102.1+1.21.1
-fabric_loader_version = 0.15.11
+fabric_version = 0.105.3+1.21.2
+fabric_loader_version = 0.16.5
 
 # Dependencies
 mixin_version=0.8.5
@@ -53,6 +53,6 @@ org.gradle.daemon=false
 mod_author = BlayTheNinth
 credits = BlayTheNinth
 kuma_version = [21.0,22)
-neo_form_version = 1.21.1-20240808.144430
+neo_form_version = 1.21.2-pre1-20241008.174159
 parchment_minecraft = 1.21
 parchment_version = 2024.06.23
\ No newline at end of file
diff --git a/repositories.gradle b/repositories.gradle
index 0fa21f4..d4e1b68 100644
--- a/repositories.gradle
+++ b/repositories.gradle
@@ -49,6 +49,7 @@ repositories {
         url = 'https://jitpack.io'
         content {
             includeGroup "com.github.BlueMap-Minecraft"
+            includeGroup "com.github.mattidragon"
         }
     }
 
@@ -65,4 +66,22 @@ repositories {
             includeGroup "de.siphalor"
         }
     }
+
+    maven {
+        url = "https://dl.cloudsmith.io/public/novamachina-mods/release/maven/"
+        content {
+            includeGroup "novamachina.novacore"
+            includeGroup "novamachina.exnihilosequentia"
+        }
+    }
+	
+    exclusiveContent {
+        forRepository {
+            maven {
+                name = 'Minecraft'
+                url = 'https://libraries.minecraft.net/'
+            }
+        }
+        filter { includeGroupAndSubgroups("com.mojang") }
+    }
 }
\ No newline at end of file
diff --git a/settings.gradle b/settings.gradle
index bce959e..f5a6464 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -45,5 +45,5 @@ plugins {
 
 include("common")
 include("fabric")
-include("neoforge")
-include("forge")
+//include("neoforge")
+//include("forge")