tibs/cauldron-dyeing
1
0
Fork 0
mirror of https://github.com/TibiNonEst/cauldron-dyeing.git synced 2024-10-22 17:53:26 -05:00
Code Issues Projects Releases Packages Wiki Activity

Remove unnecessary Sodium mixin, update deps

Browse source
This commit is contained in:
tibs 2023-09-06 11:48:03 -04:00
parent 6c4645fbf3
commit 37997cde7d
Signed by: tibs
GPG key ID: 047833989F50F88F
9 changed files with 8 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
build.gradle
View file

@ -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 {

6
gradle/libs.versions.toml
View file

@ -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.+" }

2
src/main/java/me/tibinonest/mods/cauldron_dyeing/block/WaterCauldronBlockEntity.java
View file

@ -5,8 +5,8 @@ import me.tibinonest.mods.cauldron_dyeing.CauldronDyeing;
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;

2
src/main/java/me/tibinonest/mods/cauldron_dyeing/mixin/AbstractCauldronBlockMixin.java
View file

@ -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;

2
src/main/java/me/tibinonest/mods/cauldron_dyeing/mixin/CauldronBehaviorMixin.java
View file

@ -3,8 +3,8 @@ package me.tibinonest.mods.cauldron_dyeing.mixin;
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;

22
src/main/java/me/tibinonest/mods/cauldron_dyeing/mixin/sodium/ColorProviderRegistryMixin.java
View file

@ -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<BlockState> 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<BlockState> resolver, Block... blocks) {
this.registerBlocks(DefaultColorProviders.WaterColorProvider.BLOCKS, Blocks.WATER, Blocks.BUBBLE_COLUMN);
}
}

2
src/main/resources/cauldron-dyeing.accesswidener
View file

@ -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;

3
src/main/resources/cauldron-dyeing.mixins.json
View file

@ -7,8 +7,7 @@
"CauldronBehaviorMixin"
],
"client": [
"BlockColorsMixin",
"sodium.ColorProviderRegistryMixin"
"BlockColorsMixin"
],
"injectors": {
"defaultRequire": 1

2
src/main/resources/fabric.mod.json
View file

@ -29,6 +29,6 @@
"fabric-object-builder-api-v1": ">=0.1"
},
"breaks": {
"sodium": "<0.5.0"
"sodium": "<0.5.2"
}
}