diff --git a/build.gradle b/build.gradle index 9c14fab..ce3cb9f 100644 --- a/build.gradle +++ b/build.gradle @@ -10,14 +10,6 @@ version = "${project.mod_version}${getMetadata()}" group = project.maven_group repositories { - maven { - name = "Modrinth" - url = "https://api.modrinth.com/maven" - content { - includeGroup "maven.modrinth" - } - } - maven { name = "Quilt" url = "https://maven.quiltmc.org/repository/release" @@ -30,7 +22,6 @@ dependencies { modImplementation libs.fabric.loader modImplementation libs.fabric.api - modCompileOnly libs.sodium } loom { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 4748b02..b0024ec 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,10 +1,9 @@ [versions] minecraft = "1.20.1" -quilt_mappings = "1.20.1+build.14" +quilt_mappings = "1.20.1+build.23" fabric_loader = "0.14.22" -fabric_api = "0.87.0+1.20.1" -sodium = "mc1.20.1-0.5.1" +fabric_api = "0.88.1+1.20.1" [libraries] minecraft = { module = "com.mojang:minecraft", version.ref = "minecraft" } @@ -12,7 +11,6 @@ quilt_mappings = { module = "org.quiltmc:quilt-mappings", version.ref = "quilt_m fabric_loader = { module = "net.fabricmc:fabric-loader", version.ref = "fabric_loader" } fabric_api = { module = "net.fabricmc.fabric-api:fabric-api", version.ref = "fabric_api" } -sodium = { module = "maven.modrinth:sodium", version.ref = "sodium" } [plugins] fabric_loom = { id = "fabric-loom", version = "1.2.+" } 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 3c3c478..5e6678f 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 @@ -5,8 +5,8 @@ import net.minecraft.block.BlockState; import net.minecraft.block.entity.BlockEntity; import net.minecraft.nbt.NbtCompound; -import net.minecraft.network.packet.Packet; import net.minecraft.network.listener.ClientPlayPacketListener; +import net.minecraft.network.packet.Packet; import net.minecraft.network.packet.s2c.play.BlockEntityUpdateS2CPacket; import net.minecraft.server.world.ServerWorld; import net.minecraft.util.DyeColor; diff --git a/src/main/java/me/tibinonest/mods/cauldron_dyeing/mixin/AbstractCauldronBlockMixin.java b/src/main/java/me/tibinonest/mods/cauldron_dyeing/mixin/AbstractCauldronBlockMixin.java index e9d1349..47faca6 100644 --- a/src/main/java/me/tibinonest/mods/cauldron_dyeing/mixin/AbstractCauldronBlockMixin.java +++ b/src/main/java/me/tibinonest/mods/cauldron_dyeing/mixin/AbstractCauldronBlockMixin.java @@ -1,9 +1,9 @@ package me.tibinonest.mods.cauldron_dyeing.mixin; import me.tibinonest.mods.cauldron_dyeing.block.WaterCauldronBlockEntity; -import net.minecraft.block.AbstractCauldronBlock; import net.minecraft.block.BlockEntityProvider; import net.minecraft.block.BlockState; +import net.minecraft.block.cauldron.AbstractCauldronBlock; import net.minecraft.block.entity.BlockEntity; import net.minecraft.fluid.Fluids; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/me/tibinonest/mods/cauldron_dyeing/mixin/CauldronBehaviorMixin.java b/src/main/java/me/tibinonest/mods/cauldron_dyeing/mixin/CauldronBehaviorMixin.java index acca06f..5851d01 100644 --- a/src/main/java/me/tibinonest/mods/cauldron_dyeing/mixin/CauldronBehaviorMixin.java +++ b/src/main/java/me/tibinonest/mods/cauldron_dyeing/mixin/CauldronBehaviorMixin.java @@ -3,8 +3,8 @@ import me.tibinonest.mods.cauldron_dyeing.block.CauldronBehaviorExtended; import me.tibinonest.mods.cauldron_dyeing.block.WaterCauldronBlockEntity; import net.minecraft.block.BlockState; -import net.minecraft.block.LeveledCauldronBlock; import net.minecraft.block.cauldron.CauldronBehavior; +import net.minecraft.block.cauldron.LeveledCauldronBlock; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.DyeItem; import net.minecraft.item.DyeableItem; diff --git a/src/main/java/me/tibinonest/mods/cauldron_dyeing/mixin/sodium/ColorProviderRegistryMixin.java b/src/main/java/me/tibinonest/mods/cauldron_dyeing/mixin/sodium/ColorProviderRegistryMixin.java deleted file mode 100644 index 1bf6556..0000000 --- a/src/main/java/me/tibinonest/mods/cauldron_dyeing/mixin/sodium/ColorProviderRegistryMixin.java +++ /dev/null @@ -1,22 +0,0 @@ -package me.tibinonest.mods.cauldron_dyeing.mixin.sodium; - -import me.jellysquid.mods.sodium.client.model.color.ColorProvider; -import me.jellysquid.mods.sodium.client.model.color.ColorProviderRegistry; -import me.jellysquid.mods.sodium.client.model.color.DefaultColorProviders; -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.block.Blocks; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Shadow; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Redirect; - -@Mixin(ColorProviderRegistry.class) -public abstract class ColorProviderRegistryMixin { - @Shadow protected abstract void registerBlocks(ColorProvider resolver, Block... blocks); - - @Redirect(method = "installOverrides", at = @At(value = "INVOKE", target = "Lme/jellysquid/mods/sodium/client/model/color/ColorProviderRegistry;registerBlocks(Lme/jellysquid/mods/sodium/client/model/color/ColorProvider;[Lnet/minecraft/block/Block;)V", ordinal = 2)) - private void cauldron_dyeing$modifyOverrides(ColorProviderRegistry instance, ColorProvider resolver, Block... blocks) { - this.registerBlocks(DefaultColorProviders.WaterColorProvider.BLOCKS, Blocks.WATER, Blocks.BUBBLE_COLUMN); - } -} diff --git a/src/main/resources/cauldron-dyeing.accesswidener b/src/main/resources/cauldron-dyeing.accesswidener index babbc75..d48d1c3 100644 --- a/src/main/resources/cauldron-dyeing.accesswidener +++ b/src/main/resources/cauldron-dyeing.accesswidener @@ -1,5 +1,5 @@ accessWidener v1 named -accessible method net/minecraft/block/AbstractCauldronBlock canBeFilledByDripstone (Lnet/minecraft/fluid/Fluid;)Z +accessible method net/minecraft/block/cauldron/AbstractCauldronBlock canBeFilledByDripstone (Lnet/minecraft/fluid/Fluid;)Z accessible field net/minecraft/item/DyeItem DYES Ljava/util/Map; diff --git a/src/main/resources/cauldron-dyeing.mixins.json b/src/main/resources/cauldron-dyeing.mixins.json index ceab565..b424eb0 100644 --- a/src/main/resources/cauldron-dyeing.mixins.json +++ b/src/main/resources/cauldron-dyeing.mixins.json @@ -7,8 +7,7 @@ "CauldronBehaviorMixin" ], "client": [ - "BlockColorsMixin", - "sodium.ColorProviderRegistryMixin" + "BlockColorsMixin" ], "injectors": { "defaultRequire": 1 diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index a0278a8..710516e 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -29,6 +29,6 @@ "fabric-object-builder-api-v1": ">=0.1" }, "breaks": { - "sodium": "<0.5.0" + "sodium": "<0.5.2" } }