update to 1.19.3

Author: TropheusJ

build.gradle

@@ -1,9 +1,8 @@
 //file:noinspection GroovyAssignabilityCheck
 //file:noinspection GroovyAccessibility
 plugins {
-	id "fabric-loom" version "0.12-SNAPSHOT"
+	id "fabric-loom" version "1.0.+"
 	id "io.github.juuxel.loom-quiltflower" version "1.+" // Quiltflower, a better decompiler
-//	id "org.quiltmc.quilt-mappings-on-loom" version "4.2.+" // Quilt Mappings, for parameters and javadoc. Also hashed mojmap.
 	id "io.github.p03w.machete" version "1.+" // automatic jar compressing on build
 	id "maven-publish"
 }
@@ -19,6 +18,7 @@ String patch = buildNumber != null ? buildNumber : "99999"
 version = project.mod_version.replace("<build>", patch)
 
 repositories {
+	maven { url = "https://maven.quiltmc.org/repository/release" }
 	maven { url = "https://api.modrinth.com/maven" }
 	maven { url = "https://maven.bai.lol" }
 	maven { url = "https://maven.terraformersmc.com/releases/" }
@@ -29,28 +29,24 @@ repositories {
 dependencies {
 	// dev environment
 	minecraft("com.mojang:minecraft:${project.minecraft_version}")
-	mappings loom.layered {
-//		it.addLayer(quiltMappings.mappings("org.quiltmc:quilt-mappings:${project.minecraft_version}+build.${project.qm_version}:v2"))
-//		it.parchment("org.parchmentmc.data:parchment-1.18.2:BLEEDING-20220423.075040-3@zip") // https://ldtteam.jfrog.io/ui/native/parchmentmc-public/org/parchmentmc/data/parchment-1.18.2/BLEEDING-SNAPSHOT
-		it.officialMojangMappings {
-			setNameSyntheticMembers(false)
-		}
-	}
+	mappings(loom.layered {
+		it.mappings("org.quiltmc:quilt-mappings:${project.minecraft_version}+build.${project.qm_version}:intermediary-v2")
+//			it.parchment("org.parchmentmc.data:parchment-${project.minecraft_version}:${project.parchment_version}@zip")
+		it.officialMojangMappings { nameSyntheticMembers = false }
+	})
 	modImplementation("net.fabricmc:fabric-loader:${project.loader_version}")
-	modLocalRuntime("maven.modrinth:lazydfu:0.1.2")
-	modLocalRuntime("maven.modrinth:suggestionproviderfabric:1.0.1")
-	modLocalRuntime("mcp.mobius.waila:wthit:fabric-${project.wthit_version}")
-	modLocalRuntime("maven.modrinth:badpackets:${project.bad_packets_version}")
-	modLocalRuntime("maven.modrinth:sodium:${project.sodium_version}") // rendering beware
-    localRuntime("org.joml:joml:1.10.4")
-	modLocalRuntime("maven.modrinth:lithium:${project.lithium_version}")
-	modLocalRuntime("maven.modrinth:iris:${project.iris_version}")
+	modLocalRuntime("maven.modrinth:lazydfu:0.1.3")
+//	modLocalRuntime("mcp.mobius.waila:wthit:${project.wthit_version}")
+//	modLocalRuntime("maven.modrinth:badpackets:${project.bad_packets_version}")
+//	modLocalRuntime("maven.modrinth:sodium:${project.sodium_version}") // rendering beware
+//	modLocalRuntime("maven.modrinth:lithium:${project.lithium_version}")
+//	modLocalRuntime("maven.modrinth:iris:${project.iris_version}")
 	modLocalRuntime("com.terraformersmc:modmenu:${project.modmenu_version}") { exclude group: "net.fabricmc"; exclude group: "net.fabricmc.fabric-api" }
 
 	// dependencies
 	modImplementation("net.fabricmc.fabric-api:fabric-api:${project.fabric_version}")
-	implementation(include("com.github.LlamaLad7:MixinExtras:0.0.10"))
-	annotationProcessor("com.github.LlamaLad7:MixinExtras:0.0.10")
+	implementation(include("com.github.LlamaLad7:MixinExtras:0.1.1"))
+	annotationProcessor("com.github.LlamaLad7:MixinExtras:0.1.1")
 }
 
 sourceSets {

gradle.properties

@@ -3,26 +3,30 @@ org.gradle.jvmargs=-Xmx2G
 maven_group = io.github.tropheusj
 archives_base_name = serialization_hooks
 # <build> is replaced at compile time with either GitHub Actions build number, or 99999 if not available.
-mod_version = 0.3.<build>
+mod_version = 0.4.<build>
 
 # https://fabricmc.net/develop
-minecraft_version = 1.18.2
-loader_version = 0.14.8
-fabric_version = 0.51.1+1.18.2
+minecraft_version = 1.19.3
+loader_version = 0.14.11
+fabric_version = 0.69.1+1.19.3
+
+# Mappings
 # https://lambdaurora.dev/tools/import_quilt.html
-qm_version = 24
+qm_version = 6
+# https://github.com/ParchmentMC/Parchment/wiki/Getting-Started
+parchment_version = 2022.10.16
 
 # dev env mods
 
 # https://modrinth.com/mod/sodium
-sodium_version = mc1.18.2-0.4.1
+sodium_version = mc1.19.3-0.4.6
 # https://modrinth.com/mod/lithium
-lithium_version = mc1.18.2-0.7.9
+lithium_version = mc1.19.3-0.10.4
 # https://modrinth.com/mod/iris
-iris_version = 1.18.x-v1.2.4
+iris_version = 1.19.3-v1.4.6
 # https://modrinth.com/mod/wthit
-wthit_version = 4.9.1
+wthit_version = fabric-6.1.1
 # https://modrinth.com/mod/modmenu
-modmenu_version = 3.2.1
+modmenu_version = 5.0.2
 # https://modrinth.com/mod/badpackets
-bad_packets_version = fabric-0.1.2
+bad_packets_version = fabric-0.3.4

src/main/java/io/github/tropheusj/serialization_hooks/ingredient/CustomIngredient.java

@@ -3,7 +3,7 @@
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.crafting.Ingredient;
 
-import javax.annotation.Nullable;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * This interface should be implemented onto all custom Ingredients.

src/main/java/io/github/tropheusj/serialization_hooks/ingredient/IngredientDeserializer.java

@@ -16,7 +16,7 @@
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.crafting.Ingredient;
 
-import javax.annotation.Nullable;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.ArrayList;
 import java.util.List;

src/main/java/io/github/tropheusj/serialization_hooks/mixin/IngredientMixin.java

@@ -7,17 +7,13 @@
 
 import com.google.gson.JsonSyntaxException;
 
-import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
-
 import com.llamalad7.mixinextras.injector.ModifyReturnValue;
 
 import io.github.tropheusj.serialization_hooks.ingredient.CombinedIngredient;
 import io.github.tropheusj.serialization_hooks.ingredient.CustomIngredient;
 import io.github.tropheusj.serialization_hooks.ingredient.IngredientDeserializer;
 import io.github.tropheusj.serialization_hooks.value.ValueDeserializer;
 import net.minecraft.network.FriendlyByteBuf;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.crafting.Ingredient;
 

src/main/java/io/github/tropheusj/serialization_hooks/value/ValueDeserializer.java

@@ -11,7 +11,7 @@
 import net.minecraft.world.item.crafting.Ingredient;
 import net.minecraft.world.item.crafting.Ingredient.Value;
 
-import javax.annotation.Nullable;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * A ValueDeserializer handles converting Json back to a Value.

src/testmod/java/io/github/tropheusj/serialization_hooks_test/ingredient/IdPrefixMatchingIngredient.java

@@ -6,7 +6,7 @@
 import io.github.tropheusj.serialization_hooks.ingredient.BaseCustomIngredient;
 import io.github.tropheusj.serialization_hooks.ingredient.IngredientDeserializer;
 import io.github.tropheusj.serialization_hooks_test.SerializationHooksTest;
-import net.minecraft.core.Registry;
+import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.util.GsonHelper;
@@ -29,7 +29,7 @@ public class IdPrefixMatchingIngredient extends BaseCustomIngredient {
 
 	public IdPrefixMatchingIngredient(String match) {
 		this.match = match;
-		matches = Registry.ITEM.entrySet().stream().filter(e -> e.getKey().location().getPath().startsWith(match)).map(Entry::getValue).toList();
+		matches = BuiltInRegistries.ITEM.entrySet().stream().filter(e -> e.getKey().location().getPath().startsWith(match)).map(Entry::getValue).toList();
 	}
 
 	@Override

src/testmod/java/io/github/tropheusj/serialization_hooks_test/value/TestValueDeserializer.java

@@ -3,7 +3,7 @@
 import com.google.gson.JsonObject;
 
 import io.github.tropheusj.serialization_hooks.value.ValueDeserializer;
-import net.minecraft.core.Registry;
+import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
@@ -12,7 +12,7 @@
 public class TestValueDeserializer implements ValueDeserializer {
 	@Override
 	public Value fromJson(JsonObject object) {
-		Item item = Registry.ITEM.get(new ResourceLocation(object.get("item").getAsString()));
+		Item item = BuiltInRegistries.ITEM.get(new ResourceLocation(object.get("item").getAsString()));
 		System.out.println("deserialized custom value");
 		return new AlwaysSpongeValue(new ItemStack(item));
 	}