feat: Update to Minecraft 1.21.2

TwelveIterationMods · Oct 10, 2024 · a107db9 · a107db9
1 parent 0623e50
commit a107db9
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 14 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1 +1,2 @@
-- Updated to Minecraft 1.21.1
+- Updated to Minecraft 1.21.2
+- 
diff --git a/common/src/main/java/net/blay09/mods/clienttweaks/tweak/NoOffhandFireworksWithElytra.java b/common/src/main/java/net/blay09/mods/clienttweaks/tweak/NoOffhandFireworksWithElytra.java
@@ -8,10 +8,8 @@
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.entity.EquipmentSlot;
-import net.minecraft.world.item.ElytraItem;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.Items;
-import net.minecraft.world.phys.BlockHitResult;
 import net.minecraft.world.phys.HitResult;
 
 public class NoOffhandFireworksWithElytra extends AbstractClientTweak {
@@ -35,7 +33,7 @@ public void onRightClick(UseItemInputEvent event) {
                 if (registryName != null) {
                     if (ClientTweaksConfig.getActive().customization.fireworkItems.contains(registryName.toString())) {
                         ItemStack wornChestItem = mc.player != null ? mc.player.getItemBySlot(EquipmentSlot.CHEST) : ItemStack.EMPTY;
-                        if (wornChestItem.is(Items.ELYTRA) && ElytraItem.isFlyEnabled(wornChestItem)) {
+                        if (wornChestItem.is(Items.ELYTRA) && !mc.player.isFallFlying()) {
                             event.setCanceled(true);
                         }
                     }

diff --git a/gradle.properties b/gradle.properties
@@ -3,7 +3,7 @@ mod_id = clienttweaks
 mod_name = Client Tweaks
 mod_main=ClientTweaks
 description=There, I fixed Minecraft for you. Various optional tweaks to improve Minecraft Quality of Life.
-version = 21.1.1
+version = 21.2.0
 group = net.blay09.mods
 homepage=https://mods.twelveiterations.com/mc/client-tweaks
 sources=https://github.com/TwelveIterationMods/ClientTweaks
@@ -18,16 +18,16 @@ modrinth_release_type = release
 modrinth_project_id = vPNqo58Q
 
 # 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
diff --git 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") }
+    }
 }
diff --git a/settings.gradle b/settings.gradle
@@ -45,5 +45,5 @@ plugins {
 
 include("common")
 include("fabric")
-include("neoforge")
-include("forge")
+//include("neoforge")
+//include("forge")