Port to Minecraft 1.19.3

Darkhax-Minecraft · Jan 8, 2023 · 3dd7c90 · 3dd7c90
1 parent 0a6897f
commit 3dd7c90
Show file tree

Hide file tree

Showing 9 changed files with 32 additions and 26 deletions.
diff --git a/Common/src/main/java/net/darkhax/toolstats/Constants.java b/Common/src/main/java/net/darkhax/toolstats/Constants.java
@@ -13,6 +13,5 @@ public class Constants {
     public static final String MOD_NAME = "Tool Stats";
     public static final Logger LOG = LogManager.getLogger(MOD_NAME);
     public static final DecimalFormat DECIMAL_FORMAT = new DecimalFormat("#.##");
-
     public static final Gson GSON = new GsonBuilder().setPrettyPrinting().create();
 }
diff --git a/Common/src/main/resources/pack.mcmeta b/Common/src/main/resources/pack.mcmeta
@@ -1,6 +1,8 @@
 {
   "pack": {
     "description": "${mod_description}",
-    "pack_format": 8
+    "pack_format": 10,
+    "forge:resource_pack_format": 12,
+    "forge:data_pack_format": 10
   }
 }
diff --git a/Fabric/build.gradle b/Fabric/build.gradle
@@ -1,6 +1,6 @@
 plugins {
-    id 'fabric-loom' version '0.12-SNAPSHOT'
-    id 'net.darkhax.curseforgegradle' version '1.0.7'
+    id 'fabric-loom' version '1.0-SNAPSHOT'
+    id 'net.darkhax.curseforgegradle' version '1.0.11'
     id 'net.darkhax.tweedle' version '1.0.5'
     id 'idea'
 }

diff --git a/Fabric/src/main/resources/fabric.mod.json b/Fabric/src/main/resources/fabric.mod.json
@@ -25,11 +25,11 @@
     ]
   },
   "depends": {
-    "fabricloader": ">=0.14.9",
+    "fabricloader": ">=0.14.12",
     "fabric": "*",
-    "minecraft": "1.19.x",
+    "minecraft": "1.19.3",
     "java": ">=17",
-    "bookshelf": ">=16"
+    "bookshelf": ">=17"
   },
   "custom": {
     "modmenu": {

diff --git a/Forge/build.gradle b/Forge/build.gradle
@@ -1,19 +1,19 @@
 buildscript {
     repositories {
-        maven { url 'https://maven.minecraftforge.net' }
-        maven { url 'https://plugins.gradle.org/m2/' }
-        maven { url 'https://repo.spongepowered.org/repository/maven-public' }
+        maven { url = 'https://repo.spongepowered.org/repository/maven-public/' }
         mavenCentral()
     }
     dependencies {
-        classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.1.+', changing: true
-        classpath group: 'org.spongepowered', name: 'mixingradle', version: '0.7-SNAPSHOT'
-        classpath group: 'net.darkhax.curseforgegradle', name: 'CurseForgeGradle', version: '1.0.7'
-        classpath group: 'net.darkhax.tweedle', name: 'Tweedle', version: '1.0.5'
+        classpath 'org.spongepowered:mixingradle:0.7-SNAPSHOT'
     }
 }
 
-apply plugin: 'net.minecraftforge.gradle'
+plugins {
+    id 'net.minecraftforge.gradle' version '5.1.+'
+    id 'net.darkhax.curseforgegradle' version '1.0.11'
+    id 'net.darkhax.tweedle' version '1.0.5'
+}
+
 apply from: '../gradle/patreon.gradle'
 
 archivesBaseName = "${mod_name}-Forge-${minecraft_version}"

diff --git a/Forge/src/main/java/net/darkhax/toolstats/ToolStatsForge.java b/Forge/src/main/java/net/darkhax/toolstats/ToolStatsForge.java
@@ -2,6 +2,7 @@
 
 import net.minecraft.core.HolderSet;
 import net.minecraft.core.Registry;
+import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.tags.TagKey;
 import net.minecraft.world.item.Item;
@@ -79,7 +80,7 @@ else if (vanillaTierLevels.containsKey(tier.getLevel())) {
 
     private static boolean isTagEmpty(TagKey<Block> key) {
 
-        final Optional<HolderSet.Named<Block>> holders = Registry.BLOCK.getTag(key);
+        final Optional<HolderSet.Named<Block>> holders = BuiltInRegistries.BLOCK.getTag(key);
         return holders == null || holders.isEmpty() || holders.get().size() <= 0;
     }
 }
diff --git a/Forge/src/main/resources/META-INF/mods.toml b/Forge/src/main/resources/META-INF/mods.toml
@@ -1,5 +1,5 @@
 modLoader = "javafml"
-loaderVersion = "[43,)"
+loaderVersion = "[44,)"
 license = "${mod_license}"
 issueTrackerURL = "${mod_issues}"
 
@@ -20,21 +20,21 @@ itemIcon = "minecraft:netherite_sword"
 [[dependencies.${ mod_id }]]
 modId = "forge"
 mandatory = true
-versionRange = "[43,)"
+versionRange = "[44,)"
 ordering = "NONE"
 side = "CLIENT"
 
 [[dependencies.${ mod_id }]]
 modId = "minecraft"
 mandatory = true
-versionRange = "[1.19.2,)"
+versionRange = "[1.19.3,)"
 ordering = "NONE"
 side = "CLIENT"
 
 [[dependencies.${ mod_id }]]
 modId = "bookshelf"
 mandatory = true
-versionRange = "[16,)"
+versionRange = "[17,)"
 ordering = "NONE"
 side = "CLIENT"
 
diff --git a/gradle.properties b/gradle.properties
@@ -1,17 +1,17 @@
 # Project
-version=12.0
+version=13.0
 group=net.darkhax.toolstats
 
 # Common
-minecraft_version=1.19.2
-bookshelf_version=16.1.4
+minecraft_version=1.19.3
+bookshelf_version=17.0.3
 
 # Forge
-forge_version=43.1.1
+forge_version=44.1.2
 
 # Fabric
-fabric_version=0.60.0+1.19.2
-fabric_loader_version=0.14.9
+fabric_version=0.72.0+1.19.3
+fabric_loader_version=0.14.12
 
 # Mod options
 mod_name=ToolStats

diff --git a/settings.gradle b/settings.gradle
@@ -1,6 +1,10 @@
 pluginManagement {
     repositories {
         gradlePluginPortal()
+        maven {
+            name = 'Forge'
+            url = 'https://maven.minecraftforge.net/'
+        }
         maven {
             name = 'Fabric'
             url = 'https://maven.fabricmc.net/'