From 355c13ea9760c35f4fb604f6a89e2612b1c0ca5a Mon Sep 17 00:00:00 2001 From: tibs Date: Wed, 7 Dec 2022 15:15:01 -0500 Subject: [PATCH] Update to 1.19.3 --- build.gradle | 10 ++++++---- gradle/libs.versions.toml | 15 +++++++-------- gradle/wrapper/gradle-wrapper.properties | 2 +- .../mods/cauldron_dyeing/CauldronDyeing.java | 7 ++++--- .../block/WaterCauldronBlockEntity.java | 2 +- 5 files changed, 19 insertions(+), 17 deletions(-) diff --git a/build.gradle b/build.gradle index 4f6f239..2c4102d 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,6 @@ plugins { alias(libs.plugins.fabric.loom) alias(libs.plugins.loom.quiltflower) - alias(libs.plugins.qmol) alias(libs.plugins.grgit) id "maven-publish" } @@ -18,13 +17,16 @@ repositories { includeGroup "maven.modrinth" } } + + maven { + name = "Quilt" + url = "https://maven.quiltmc.org/repository/release" + } } dependencies { minecraft libs.minecraft - mappings loom.layered { - addLayer quiltMappings.mappings("org.quiltmc:quilt-mappings:${libs.versions.quilt.mappings.get()}:v2") - } + mappings variantOf(libs.quilt.mappings) { classifier "intermediary-v2" } modImplementation libs.fabric.loader modImplementation libs.fabric.api diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 9d7db8b..923b8cd 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,10 +1,10 @@ [versions] -minecraft = "1.19.2" -quilt_mappings = "1.19.2+build.3" -fabric_loader = "0.14.9" +minecraft = "1.19.3" +quilt_mappings = "1.19.3+build.1" +fabric_loader = "0.14.11" -fabric_api = "0.60.0+1.19.2" -sodium = "mc1.19-0.4.2" +fabric_api = "0.68.1+1.19.3" +sodium = "mc1.19.3-0.4.5" [libraries] minecraft = { module = "com.mojang:minecraft", version.ref = "minecraft" } @@ -15,7 +15,6 @@ fabric_api = { module = "net.fabricmc.fabric-api:fabric-api", version.ref = "fab sodium = { module = "maven.modrinth:sodium", version.ref = "sodium" } [plugins] -fabric_loom = { id = "fabric-loom", version = "0.12.+" } -loom_quiltflower = { id = "io.github.juuxel.loom-quiltflower", version = "1.7.+" } -qmol = { id = "org.quiltmc.quilt-mappings-on-loom", version = "4.2.0" } +fabric_loom = { id = "fabric-loom", version = "1.0.+" } +loom_quiltflower = { id = "io.github.juuxel.loom-quiltflower", version = "1.8.+" } grgit = { id = "org.ajoberstar.grgit", version = "5.+" } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ae04661..070cb70 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/main/java/me/tibinonest/mods/cauldron_dyeing/CauldronDyeing.java b/src/main/java/me/tibinonest/mods/cauldron_dyeing/CauldronDyeing.java index a157b4c..e25b773 100644 --- a/src/main/java/me/tibinonest/mods/cauldron_dyeing/CauldronDyeing.java +++ b/src/main/java/me/tibinonest/mods/cauldron_dyeing/CauldronDyeing.java @@ -8,18 +8,19 @@ import net.fabricmc.fabric.api.object.builder.v1.block.entity.FabricBlockEntityT import net.minecraft.block.Blocks; import net.minecraft.block.entity.BlockEntityType; import net.minecraft.client.MinecraftClient; +import net.minecraft.registry.Registries; +import net.minecraft.registry.Registry; import net.minecraft.util.Identifier; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.registry.Registry; public class CauldronDyeing implements ModInitializer { public static final String MOD_ID = "cauldron_dyeing"; - public static BlockEntityType WATER_CAULDRON_BLOCK_ENTITY = FabricBlockEntityTypeBuilder.create(WaterCauldronBlockEntity::new, Blocks.WATER_CAULDRON).build(); + public static final BlockEntityType WATER_CAULDRON_BLOCK_ENTITY = FabricBlockEntityTypeBuilder.create(WaterCauldronBlockEntity::new, Blocks.WATER_CAULDRON).build(); @Override public void onInitialize() { - Registry.register(Registry.BLOCK_ENTITY_TYPE, new Identifier(MOD_ID, "water_cauldron_entity"), WATER_CAULDRON_BLOCK_ENTITY); + Registry.register(Registries.BLOCK_ENTITY_TYPE, new Identifier(MOD_ID, "water_cauldron_entity"), WATER_CAULDRON_BLOCK_ENTITY); } @Environment(EnvType.CLIENT) diff --git a/src/main/java/me/tibinonest/mods/cauldron_dyeing/block/WaterCauldronBlockEntity.java b/src/main/java/me/tibinonest/mods/cauldron_dyeing/block/WaterCauldronBlockEntity.java index f52e1a9..2506d6a 100644 --- a/src/main/java/me/tibinonest/mods/cauldron_dyeing/block/WaterCauldronBlockEntity.java +++ b/src/main/java/me/tibinonest/mods/cauldron_dyeing/block/WaterCauldronBlockEntity.java @@ -76,7 +76,7 @@ public class WaterCauldronBlockEntity extends BlockEntity { } @Override - public NbtCompound toInitialChunkDataNbt() { + public NbtCompound toSyncedNbt() { return toNbt(); }