Compare commits

..

19 commits
v1.0.4 ... 1.20

Author SHA1 Message Date
166ef4a287
Update to 1.20.3/4 2024-01-07 21:45:35 -05:00
37997cde7d
Remove unnecessary Sodium mixin, update deps 2023-09-06 11:48:03 -04:00
tibs
6c4645fbf3
Clean up client side, fix sodium 0.5 compatibility
Fixes #9
2023-08-13 23:48:15 -04:00
tibs
a559d61ab7
Bump version 2023-06-08 16:51:23 -04:00
tibs
7616e3fe1c
Update to 1.20 2023-06-08 16:50:46 -04:00
tibs
cc3e6d19db
Update release workflow 2023-04-16 20:01:26 -04:00
tibs
44a74a67d9
Update Gradle to 8.0.2 2023-03-15 09:16:24 -04:00
tibs
1577d06067
Update to 1.19.4 2023-03-15 09:14:56 -04:00
tibs
a847ba5615
Bump version 2023-02-05 16:18:26 -05:00
tibs
db14a2e87a
Support Sodium 0.4.9, update deps 2023-02-05 16:18:15 -05:00
tibs
b2ec18685f
Bump version 2022-12-30 15:42:02 -05:00
tibs
90c58b9a43
Fix GitHub build badge 2022-12-30 15:34:21 -05:00
tibs
558df23f24
Fix unsafe cast to ServerWorld
Fixes #7
2022-12-30 15:28:53 -05:00
tibs
7fab2ce2a9
Bump version 2022-12-07 22:56:37 -05:00
tibs
6692009715
Aaaa I forgot to update the FMJ oops 2022-12-07 21:22:08 -05:00
tibs
3ac8c2c9b4
Version metadata is the bane of my existance 2022-12-07 15:37:29 -05:00
tibs
d22fa3d545
Bump version 2022-12-07 15:26:03 -05:00
tibs
355c13ea97
Update to 1.19.3 2022-12-07 15:15:01 -05:00
tibs
a966b104f1
Publishing is easier in the actions 2022-08-19 12:33:45 -04:00
20 changed files with 107 additions and 152 deletions

View file

@ -20,6 +20,7 @@ jobs:
uses: actions/cache@v3 uses: actions/cache@v3
with: with:
path: | path: |
.gradle
~/.gradle/caches ~/.gradle/caches
~/.gradle/wrapper ~/.gradle/wrapper
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }} key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}

View file

@ -23,6 +23,7 @@ jobs:
uses: actions/cache@v3 uses: actions/cache@v3
with: with:
path: | path: |
.gradle
~/.gradle/caches ~/.gradle/caches
~/.gradle/wrapper ~/.gradle/wrapper
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }} key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
@ -32,16 +33,20 @@ jobs:
uses: gradle/wrapper-validation-action@v1 uses: gradle/wrapper-validation-action@v1
- name: Build and publish with Gradle - name: Build and publish with Gradle
run: ./gradlew build modrinth curseforge run: ./gradlew build publish
env: env:
MAVEN_URL: ${{ secrets.MAVEN_URL }} MAVEN_URL: ${{ secrets.MAVEN_URL }}
MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }} MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }} MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
CURSEFORGE_TOKEN: ${{ secrets.CURSEFORGE_TOKEN }}
MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }}
- name: Upload build artifacts - name: Upload artifacts to Modrinth and GitHub
uses: AButler/upload-release-assets@v2.0 uses: Kir-Antipov/mc-publish@v3
with: with:
files: 'build/libs/!(*-sources).jar' modrinth-id: 5AgJnN8I
repo-token: ${{ secrets.GITHUB_TOKEN }} modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
github-token: ${{ secrets.GITHUB_TOKEN }}
files: build/libs/!(*-sources).jar
loaders: fabric quilt

View file

@ -1,6 +1,6 @@
# Cauldron Dyeing # Cauldron Dyeing
![GitHub license](https://img.shields.io/github/license/tibinonest/cauldron-dyeing) ![GitHub license](https://img.shields.io/github/license/tibinonest/cauldron-dyeing)
![GitHub actions](https://img.shields.io/github/workflow/status/tibinonest/cauldron-dyeing/gradle-ci) ![GitHub actions](https://img.shields.io/github/actions/workflow/status/tibinonest/cauldron-dyeing/build-gradle.yml?branch=1.19.3)
![GitHub release](https://img.shields.io/github/v/release/tibinonest/cauldron-dyeing?display_name=tag&include_prereleases&sort=semver) ![GitHub release](https://img.shields.io/github/v/release/tibinonest/cauldron-dyeing?display_name=tag&include_prereleases&sort=semver)
Bring Bedrock's cauldron-based armor dyeing to Java Edition. Bring Bedrock's cauldron-based armor dyeing to Java Edition.

View file

@ -1,36 +1,26 @@
plugins { plugins {
alias(libs.plugins.fabric.loom) alias(libs.plugins.fabric.loom)
alias(libs.plugins.loom.quiltflower)
alias(libs.plugins.qmol)
alias(libs.plugins.grgit) alias(libs.plugins.grgit)
alias(libs.plugins.minotaur)
alias(libs.plugins.cursegradle)
id "maven-publish" id "maven-publish"
} }
archivesBaseName = project.archives_base_name archivesBaseName = project.archives_base_name
version = "${project.mod_version}+${getMetadata()}" version = "${project.mod_version}${getMetadata()}"
group = project.maven_group group = project.maven_group
repositories { repositories {
maven { maven {
name = "Modrinth" name = "Quilt"
url = "https://api.modrinth.com/maven" url = "https://maven.quiltmc.org/repository/release"
content {
includeGroup "maven.modrinth"
}
} }
} }
dependencies { dependencies {
minecraft libs.minecraft minecraft libs.minecraft
mappings loom.layered { mappings variantOf(libs.quilt.mappings) { classifier "intermediary-v2" }
addLayer quiltMappings.mappings("org.quiltmc:quilt-mappings:${libs.versions.quilt.mappings.get()}:v2")
}
modImplementation libs.fabric.loader modImplementation libs.fabric.loader
modImplementation libs.fabric.api modImplementation libs.fabric.api
modCompileOnly libs.sodium
} }
loom { loom {
@ -66,33 +56,6 @@ jar {
} }
} }
modrinth {
projectId = "5AgJnN8I"
uploadFile = remapJar
}
tasks.modrinth.dependsOn remapJar
def ENV = System.getenv()
curseforge {
if (ENV.CURSEFORGE_TOKEN) {
apiKey = ENV.CURSEFORGE_TOKEN
}
project {
id = "564870"
changelog = "No changelog provided"
releaseType = "release"
addGameVersion libs.versions.minecraft.get()
addGameVersion "Fabric"
addGameVersion "Quilt"
mainArtifact(jar) {
displayName = "Cauldron Dyeing ${project.mod_version}"
}
}
}
tasks.curseforge.dependsOn remapJar
publishing { publishing {
publications { publications {
mavenJava(MavenPublication) { mavenJava(MavenPublication) {
@ -102,10 +65,10 @@ publishing {
repositories { repositories {
maven { maven {
url = ENV.MAVEN_URL url = System.getenv("MAVEN_URL")
credentials { credentials {
username = ENV.MAVEN_USERNAME username = System.getenv("MAVEN_USERNAME")
password = ENV.MAVEN_PASSWORD password = System.getenv("MAVEN_PASSWORD")
} }
} }
} }
@ -123,7 +86,7 @@ def getMetadata() {
} }
if (build_id != null) { if (build_id != null) {
metadata += "build.${build_id}" metadata += "+build.${build_id}"
} else if (grgit != null) { } else if (grgit != null) {
def head = grgit.head() def head = grgit.head()
def id = head.abbreviatedId def id = head.abbreviatedId
@ -133,7 +96,7 @@ def getMetadata() {
id += "-dirty" id += "-dirty"
} }
metadata += "${id}" metadata += "+git.${id}"
} }
return metadata return metadata

View file

@ -1,9 +1,9 @@
# Gradle Properties # Gradle Properties
org.gradle.jvmargs = -Xmx1G org.gradle.jvmargs=-Xmx2G
org.gradle.parallel = true org.gradle.parallel=true
# Mod Properties # Mod Properties
mod_version=1.0.4 mod_version=1.0.12
maven_group=me.tibinonest.mods maven_group=me.tibinonest.mods
archives_base_name=cauldron-dyeing archives_base_name=cauldron-dyeing

View file

@ -1,10 +1,12 @@
[versions] [versions]
minecraft = "1.19.2" minecraft = "1.20.3"
quilt_mappings = "1.19.2+build.3" quilt_mappings = "1.20.3+build.3"
fabric_loader = "0.14.9" fabric_loader = "0.15.3"
fabric_api = "0.60.0+1.19.2" fabric_api = "0.91.1+1.20.3"
sodium = "mc1.19-0.4.2"
fabric_loom = "1.4.+"
grgit = "5.2.+"
[libraries] [libraries]
minecraft = { module = "com.mojang:minecraft", version.ref = "minecraft" } minecraft = { module = "com.mojang:minecraft", version.ref = "minecraft" }
@ -12,12 +14,7 @@ quilt_mappings = { module = "org.quiltmc:quilt-mappings", version.ref = "quilt_m
fabric_loader = { module = "net.fabricmc:fabric-loader", version.ref = "fabric_loader" } fabric_loader = { module = "net.fabricmc:fabric-loader", version.ref = "fabric_loader" }
fabric_api = { module = "net.fabricmc.fabric-api:fabric-api", version.ref = "fabric_api" } fabric_api = { module = "net.fabricmc.fabric-api:fabric-api", version.ref = "fabric_api" }
sodium = { module = "maven.modrinth:sodium", version.ref = "sodium" }
[plugins] [plugins]
fabric_loom = { id = "fabric-loom", version = "0.12.+" } fabric_loom = { id = "fabric-loom", version.ref = "fabric_loom" }
loom_quiltflower = { id = "io.github.juuxel.loom-quiltflower", version = "1.7.+" } grgit = { id = "org.ajoberstar.grgit", version.ref = "grgit" }
qmol = { id = "org.quiltmc.quilt-mappings-on-loom", version = "4.2.0" }
grgit = { id = "org.ajoberstar.grgit", version = "5.+" }
minotaur = { id = "com.modrinth.minotaur", version = "2.+" }
cursegradle = { id = "com.matthewprenger.cursegradle", version = "1.+" }

Binary file not shown.

View file

@ -1,5 +1,7 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

35
gradlew vendored
View file

@ -55,7 +55,7 @@
# Darwin, MinGW, and NonStop. # Darwin, MinGW, and NonStop.
# #
# (3) This script is generated from the Groovy template # (3) This script is generated from the Groovy template
# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# within the Gradle project. # within the Gradle project.
# #
# You can find Gradle at https://github.com/gradle/gradle/. # You can find Gradle at https://github.com/gradle/gradle/.
@ -80,13 +80,11 @@ do
esac esac
done done
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit # This is normally unused
# shellcheck disable=SC2034
APP_NAME="Gradle"
APP_BASE_NAME=${0##*/} APP_BASE_NAME=${0##*/}
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
# Use the maximum available, or set MAX_FD != -1 to use that value. # Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum MAX_FD=maximum
@ -133,22 +131,29 @@ location of your Java installation."
fi fi
else else
JAVACMD=java JAVACMD=java
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. if ! command -v java >/dev/null 2>&1
then
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Please set the JAVA_HOME variable in your environment to match the Please set the JAVA_HOME variable in your environment to match the
location of your Java installation." location of your Java installation."
fi
fi fi
# Increase the maximum file descriptors if we can. # Increase the maximum file descriptors if we can.
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
case $MAX_FD in #( case $MAX_FD in #(
max*) max*)
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC2039,SC3045
MAX_FD=$( ulimit -H -n ) || MAX_FD=$( ulimit -H -n ) ||
warn "Could not query maximum file descriptor limit" warn "Could not query maximum file descriptor limit"
esac esac
case $MAX_FD in #( case $MAX_FD in #(
'' | soft) :;; #( '' | soft) :;; #(
*) *)
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC2039,SC3045
ulimit -n "$MAX_FD" || ulimit -n "$MAX_FD" ||
warn "Could not set maximum file descriptor limit to $MAX_FD" warn "Could not set maximum file descriptor limit to $MAX_FD"
esac esac
@ -193,11 +198,15 @@ if "$cygwin" || "$msys" ; then
done done
fi fi
# Collect all arguments for the java command;
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
# shell script including quotes and variable substitutions, so put them in DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
# double quotes to make sure that they get re-expanded; and
# * put everything else in single quotes, so that it's not re-expanded. # Collect all arguments for the java command:
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
# and any embedded shellness will be escaped.
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
# treated as '${Hostname}' itself on the command line.
set -- \ set -- \
"-Dorg.gradle.appname=$APP_BASE_NAME" \ "-Dorg.gradle.appname=$APP_BASE_NAME" \

1
gradlew.bat vendored
View file

@ -26,6 +26,7 @@ if "%OS%"=="Windows_NT" setlocal
set DIRNAME=%~dp0 set DIRNAME=%~dp0
if "%DIRNAME%"=="" set DIRNAME=. if "%DIRNAME%"=="" set DIRNAME=.
@rem This is normally unused
set APP_BASE_NAME=%~n0 set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME% set APP_HOME=%DIRNAME%

View file

@ -8,18 +8,31 @@ import net.fabricmc.fabric.api.object.builder.v1.block.entity.FabricBlockEntityT
import net.minecraft.block.Blocks; import net.minecraft.block.Blocks;
import net.minecraft.block.entity.BlockEntityType; import net.minecraft.block.entity.BlockEntityType;
import net.minecraft.client.MinecraftClient; import net.minecraft.client.MinecraftClient;
import net.minecraft.client.color.world.BiomeColors;
import net.minecraft.registry.Registries;
import net.minecraft.registry.Registry;
import net.minecraft.util.Identifier; import net.minecraft.util.Identifier;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.util.registry.Registry; import net.minecraft.world.BlockRenderView;
public class CauldronDyeing implements ModInitializer { public class CauldronDyeing implements ModInitializer {
public static final String MOD_ID = "cauldron_dyeing"; public static final String MOD_ID = "cauldron_dyeing";
public static BlockEntityType<WaterCauldronBlockEntity> WATER_CAULDRON_BLOCK_ENTITY = FabricBlockEntityTypeBuilder.create(WaterCauldronBlockEntity::new, Blocks.WATER_CAULDRON).build(); public static final BlockEntityType<WaterCauldronBlockEntity> WATER_CAULDRON_BLOCK_ENTITY = FabricBlockEntityTypeBuilder.create(WaterCauldronBlockEntity::new, Blocks.WATER_CAULDRON).build();
@Override @Override
public void onInitialize() { 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)
public static int getColor(BlockRenderView world, BlockPos pos) {
var blockEntity = world.getBlockEntity(pos);
if (blockEntity instanceof WaterCauldronBlockEntity waterCauldron && waterCauldron.getColor() != -1) {
return waterCauldron.getColor();
}
return BiomeColors.getWaterColor(world, pos);
} }
@Environment(EnvType.CLIENT) @Environment(EnvType.CLIENT)

View file

@ -5,8 +5,8 @@ import me.tibinonest.mods.cauldron_dyeing.CauldronDyeing;
import net.minecraft.block.BlockState; import net.minecraft.block.BlockState;
import net.minecraft.block.entity.BlockEntity; import net.minecraft.block.entity.BlockEntity;
import net.minecraft.nbt.NbtCompound; import net.minecraft.nbt.NbtCompound;
import net.minecraft.network.Packet;
import net.minecraft.network.listener.ClientPlayPacketListener; import net.minecraft.network.listener.ClientPlayPacketListener;
import net.minecraft.network.packet.Packet;
import net.minecraft.network.packet.s2c.play.BlockEntityUpdateS2CPacket; import net.minecraft.network.packet.s2c.play.BlockEntityUpdateS2CPacket;
import net.minecraft.server.world.ServerWorld; import net.minecraft.server.world.ServerWorld;
import net.minecraft.util.DyeColor; import net.minecraft.util.DyeColor;
@ -16,7 +16,7 @@ import org.jetbrains.annotations.Nullable;
import java.util.Arrays; import java.util.Arrays;
public class WaterCauldronBlockEntity extends BlockEntity { public class WaterCauldronBlockEntity extends BlockEntity {
private final int[] NULL_COLOR = new int[] {-1, -1, -1}; private static final int[] NULL_COLOR = new int[] {-1, -1, -1};
private int[] color = NULL_COLOR; private int[] color = NULL_COLOR;
public WaterCauldronBlockEntity(BlockPos pos, BlockState state) { public WaterCauldronBlockEntity(BlockPos pos, BlockState state) {
@ -76,7 +76,7 @@ public class WaterCauldronBlockEntity extends BlockEntity {
} }
@Override @Override
public NbtCompound toInitialChunkDataNbt() { public NbtCompound toSyncedNbt() {
return toNbt(); return toNbt();
} }
@ -91,7 +91,7 @@ public class WaterCauldronBlockEntity extends BlockEntity {
if (world != null) { if (world != null) {
if (world.isClient()) { if (world.isClient()) {
CauldronDyeing.rebuildBlock(pos); CauldronDyeing.rebuildBlock(pos);
} else { } else if (world instanceof ServerWorld) {
((ServerWorld) world).getChunkManager().markForUpdate(pos); ((ServerWorld) world).getChunkManager().markForUpdate(pos);
} }
super.markDirty(); super.markDirty();

View file

@ -1,9 +1,9 @@
package me.tibinonest.mods.cauldron_dyeing.mixin; package me.tibinonest.mods.cauldron_dyeing.mixin;
import me.tibinonest.mods.cauldron_dyeing.block.WaterCauldronBlockEntity; import me.tibinonest.mods.cauldron_dyeing.block.WaterCauldronBlockEntity;
import net.minecraft.block.AbstractCauldronBlock;
import net.minecraft.block.BlockEntityProvider; import net.minecraft.block.BlockEntityProvider;
import net.minecraft.block.BlockState; import net.minecraft.block.BlockState;
import net.minecraft.block.cauldron.AbstractCauldronBlock;
import net.minecraft.block.entity.BlockEntity; import net.minecraft.block.entity.BlockEntity;
import net.minecraft.fluid.Fluids; import net.minecraft.fluid.Fluids;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;

View file

@ -1,22 +0,0 @@
package me.tibinonest.mods.cauldron_dyeing.mixin;
import me.tibinonest.mods.cauldron_dyeing.block.WaterCauldronBlockEntity;
import net.minecraft.client.color.world.BiomeColors;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.BlockRenderView;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
@Mixin(BiomeColors.class)
public class BiomeColorsMixin {
@Inject(method = "getWaterColor", at = @At("HEAD"), cancellable = true)
private static void cauldron_dyeing$modifyWaterColor(BlockRenderView world, BlockPos pos, CallbackInfoReturnable<Integer> cir) {
var blockEntity = world.getBlockEntity(pos);
if (blockEntity instanceof WaterCauldronBlockEntity waterCauldron && waterCauldron.getColor() != -1) {
cir.setReturnValue(waterCauldron.getColor());
}
}
}

View file

@ -0,0 +1,18 @@
package me.tibinonest.mods.cauldron_dyeing.mixin;
import me.tibinonest.mods.cauldron_dyeing.CauldronDyeing;
import net.minecraft.block.Blocks;
import net.minecraft.client.color.block.BlockColors;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
import org.spongepowered.asm.mixin.injection.callback.LocalCapture;
@Mixin(BlockColors.class)
public class BlockColorsMixin {
@Inject(method = "create", at = @At("TAIL"), locals = LocalCapture.CAPTURE_FAILHARD)
private static void cauldron_dyeing$modifyCreate(CallbackInfoReturnable<BlockColors> cir, BlockColors blockColors) {
blockColors.registerColorProvider((state, world, pos, tintIndex) -> world != null && pos != null ? CauldronDyeing.getColor(world, pos) : -1, Blocks.WATER_CAULDRON);
}
}

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.CauldronBehaviorExtended;
import me.tibinonest.mods.cauldron_dyeing.block.WaterCauldronBlockEntity; import me.tibinonest.mods.cauldron_dyeing.block.WaterCauldronBlockEntity;
import net.minecraft.block.BlockState; import net.minecraft.block.BlockState;
import net.minecraft.block.LeveledCauldronBlock;
import net.minecraft.block.cauldron.CauldronBehavior; import net.minecraft.block.cauldron.CauldronBehavior;
import net.minecraft.block.cauldron.LeveledCauldronBlock;
import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.item.DyeItem; import net.minecraft.item.DyeItem;
import net.minecraft.item.DyeableItem; import net.minecraft.item.DyeableItem;
@ -26,7 +26,7 @@ import java.util.Map;
@Mixin(CauldronBehavior.class) @Mixin(CauldronBehavior.class)
public interface CauldronBehaviorMixin { public interface CauldronBehaviorMixin {
@SuppressWarnings("target") @SuppressWarnings("target")
@Inject(method = "m_ducbhfos(Lnet/minecraft/block/BlockState;Lnet/minecraft/world/World;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/entity/player/PlayerEntity;Lnet/minecraft/util/Hand;Lnet/minecraft/item/ItemStack;)Lnet/minecraft/util/ActionResult;", at = @At("HEAD"), cancellable = true) @Inject(method = "method_32209", at = @At("HEAD"), cancellable = true)
private static void cauldron_dyeing$injectCleanDyeableItem(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, ItemStack stack, CallbackInfoReturnable<ActionResult> cir) { private static void cauldron_dyeing$injectCleanDyeableItem(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, ItemStack stack, CallbackInfoReturnable<ActionResult> cir) {
var blockEntity = world.getBlockEntity(pos); var blockEntity = world.getBlockEntity(pos);
var item = stack.getItem(); var item = stack.getItem();
@ -43,7 +43,7 @@ public interface CauldronBehaviorMixin {
} }
@SuppressWarnings("target") @SuppressWarnings("target")
@Inject(method = "m_xrdlazrh(Lnet/minecraft/block/BlockState;Lnet/minecraft/world/World;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/entity/player/PlayerEntity;Lnet/minecraft/util/Hand;Lnet/minecraft/item/ItemStack;)Lnet/minecraft/util/ActionResult;", at = @At(value = "TAIL")) @Inject(method = "method_32217", at = @At("TAIL"))
private static void cauldron_dyeing$injectFillWithWater(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, ItemStack stack, CallbackInfoReturnable<ActionResult> cir) { private static void cauldron_dyeing$injectFillWithWater(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, ItemStack stack, CallbackInfoReturnable<ActionResult> cir) {
var blockEntity = world.getBlockEntity(pos); var blockEntity = world.getBlockEntity(pos);
if (blockEntity instanceof WaterCauldronBlockEntity waterCauldron) { if (blockEntity instanceof WaterCauldronBlockEntity waterCauldron) {
@ -54,7 +54,7 @@ public interface CauldronBehaviorMixin {
@Inject(method = "registerBehavior", at = @At("TAIL")) @Inject(method = "registerBehavior", at = @At("TAIL"))
private static void cauldron_dyeing$injectRegisterBehavior(CallbackInfo ci) { private static void cauldron_dyeing$injectRegisterBehavior(CallbackInfo ci) {
for (Map.Entry<DyeColor, DyeItem> dyeItem : DyeItem.DYES.entrySet()) { for (Map.Entry<DyeColor, DyeItem> dyeItem : DyeItem.DYES.entrySet()) {
CauldronBehavior.WATER_CAULDRON_BEHAVIOR.put(dyeItem.getValue(), CauldronBehaviorExtended.DYE_WATER); CauldronBehavior.WATER_CAULDRON_BEHAVIOR.map().put(dyeItem.getValue(), CauldronBehaviorExtended.DYE_WATER);
} }
} }
} }

View file

@ -1,28 +0,0 @@
package me.tibinonest.mods.cauldron_dyeing.mixin.sodium;
import me.jellysquid.mods.sodium.client.model.quad.ModelQuadView;
import me.jellysquid.mods.sodium.client.model.quad.blender.ColorBlender;
import me.jellysquid.mods.sodium.client.model.quad.blender.ColorSampler;
import me.jellysquid.mods.sodium.client.model.quad.blender.FlatColorBlender;
import me.jellysquid.mods.sodium.client.render.pipeline.BlockRenderer;
import me.tibinonest.mods.cauldron_dyeing.block.WaterCauldronBlockEntity;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.BlockRenderView;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Redirect;
@Mixin(BlockRenderer.class)
public class SodiumBlockRendererMixin {
@Redirect(method = "renderQuad", at = @At(value = "INVOKE", target = "Lme/jellysquid/mods/sodium/client/model/quad/blender/ColorBlender;getColors(Lnet/minecraft/world/BlockRenderView;Lnet/minecraft/util/math/BlockPos;Lme/jellysquid/mods/sodium/client/model/quad/ModelQuadView;Lme/jellysquid/mods/sodium/client/model/quad/blender/ColorSampler;Ljava/lang/Object;)[I"))
private <T> int[] cauldron_dyeing$redirectGetColors(ColorBlender instance, BlockRenderView world, BlockPos pos, ModelQuadView quad, ColorSampler<T> sampler, T state) {
var blockEntity = world.getBlockEntity(pos);
if (blockEntity instanceof WaterCauldronBlockEntity) {
var flatBiomeColorBlender = new FlatColorBlender();
return flatBiomeColorBlender.getColors(world, pos, quad, sampler, state);
}
return instance.getColors(world, pos, quad, sampler, state);
}
}

View file

@ -1,5 +1,5 @@
accessWidener v1 named 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; accessible field net/minecraft/item/DyeItem DYES Ljava/util/Map;

View file

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

View file

@ -24,11 +24,8 @@
"cauldron-dyeing.mixins.json" "cauldron-dyeing.mixins.json"
], ],
"depends": { "depends": {
"minecraft": ">=1.18", "minecraft": ">=1.20.3",
"fabricloader": ">=0.12.0", "fabricloader": ">=0.12.0",
"fabric-object-builder-api-v1": ">=0.1" "fabric-object-builder-api-v1": ">=0.1"
},
"breaks": {
"sodium": "<0.4.1"
} }
} }