Compare commits

..

No commits in common. "1.20" and "v1.0.3" have entirely different histories.
1.20 ... v1.0.3

21 changed files with 162 additions and 209 deletions

View file

@ -5,35 +5,20 @@ on: [ push, pull_request ]
jobs: jobs:
build: build:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Checkout latest commit - uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Set up JDK 17 - name: Set up JDK 17
uses: actions/setup-java@v3 uses: actions/setup-java@v2
with: with:
distribution: temurin distribution: 'temurin'
java-version: 17 java-version: 17
- name: Restore Gradle cache
uses: actions/cache@v3
with:
path: |
.gradle
~/.gradle/caches
~/.gradle/wrapper
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
restore-keys: ${{ runner.os }}-gradle
- name: Validate Gradle wrapper
uses: gradle/wrapper-validation-action@v1
- name: Build with Gradle - name: Build with Gradle
run: ./gradlew build run: ./gradlew build
- name: Upload build artifacts - name: Upload build artifacts
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v2
with: with:
name: build-artifacts name: build-artifacts
path: ./build/libs path: ./build/libs

View file

@ -8,45 +8,20 @@ on:
jobs: jobs:
build: build:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Checkout latest commit - uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Set up JDK 17 - name: Set up JDK 17
uses: actions/setup-java@v3 uses: actions/setup-java@v2
with: with:
distribution: temurin distribution: 'temurin'
java-version: 17 java-version: 17
- name: Restore Gradle cache - name: Build with Gradle
uses: actions/cache@v3 run: ./gradlew build
- name: Upload build artifacts
uses: AButler/upload-release-assets@v2.0
with: with:
path: | files: 'build/libs/!(*-@(dev|sources)).jar'
.gradle repo-token: ${{ secrets.GITHUB_TOKEN }}
~/.gradle/caches
~/.gradle/wrapper
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
restore-keys: ${{ runner.os }}-gradle
- name: Validate Gradle wrapper
uses: gradle/wrapper-validation-action@v1
- name: Build and publish with Gradle
run: ./gradlew build publish
env:
MAVEN_URL: ${{ secrets.MAVEN_URL }}
MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
- name: Upload artifacts to Modrinth and GitHub
uses: Kir-Antipov/mc-publish@v3
with:
modrinth-id: 5AgJnN8I
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/actions/workflow/status/tibinonest/cauldron-dyeing/build-gradle.yml?branch=1.19.3) ![GitHub actions](https://img.shields.io/github/workflow/status/tibinonest/cauldron-dyeing/gradle-ci)
![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,43 +1,46 @@
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)
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 = "Quilt" name = 'Modrinth'
url = "https://maven.quiltmc.org/repository/release" url = 'https://api.modrinth.com/maven'
content {
includeGroup 'maven.modrinth'
}
} }
} }
dependencies { dependencies {
minecraft libs.minecraft minecraft libs.minecraft
mappings variantOf(libs.quilt.mappings) { classifier "intermediary-v2" } mappings loom.layered {
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 {
accessWidenerPath.set file("src/main/resources/cauldron-dyeing.accesswidener")
} }
processResources { processResources {
inputs.property "version", project.version inputs.property 'version', project.version
filteringCharset "UTF-8" filteringCharset 'UTF-8'
filesMatching("fabric.mod.json") { filesMatching('fabric.mod.json') {
expand "version": project.version expand 'version': project.version
} }
} }
tasks.withType(JavaCompile) { tasks.withType(JavaCompile) {
it.options.encoding = "UTF-8" it.options.encoding = 'UTF-8'
// Minecraft 1.18 (1.18-pre2) upwards uses Java 17. // Minecraft 1.18 (1.18-pre2) upwards uses Java 17.
it.options.release = 17 it.options.release = 17
} }
@ -51,52 +54,34 @@ java {
} }
jar { jar {
from("LICENSE") { from('LICENSE') {
rename { "${it}_${project.archivesBaseName}"} rename { "${it}_${project.archivesBaseName}"}
} }
} }
publishing {
publications {
mavenJava(MavenPublication) {
from components.java
}
}
repositories {
maven {
url = System.getenv("MAVEN_URL")
credentials {
username = System.getenv("MAVEN_USERNAME")
password = System.getenv("MAVEN_PASSWORD")
}
}
}
}
def getMetadata() { def getMetadata() {
def build_id = System.getenv("GITHUB_RUN_NUMBER") def build_id = System.getenv('GITHUB_RUN_NUMBER')
def workflow_id = System.getenv("GITHUB_WORKFLOW") def workflow_id = System.getenv('GITHUB_WORKFLOW')
def metadata = "" def metadata = libs.versions.minecraft.get()
// Release builds only // Release builds only
if (workflow_id == "build-release") { if (workflow_id == 'build-release') {
return metadata return metadata
} }
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
// Flag the build if the build tree is not clean // Flag the build if the build tree is not clean
if (!grgit.status().clean) { if (!grgit.status().clean) {
id += "-dirty" id += '-dirty'
} }
metadata += "+git.${id}" metadata += "-${id}"
} }
return metadata return metadata

View file

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

View file

@ -1,12 +1,10 @@
[versions] [versions]
minecraft = "1.20.3" minecraft = "1.19"
quilt_mappings = "1.20.3+build.3" quilt_mappings = "1.19+build.1"
fabric_loader = "0.15.3" fabric_loader = "0.14.6"
fabric_api = "0.91.1+1.20.3" fabric_api = "0.55.2+1.19"
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" }
@ -14,7 +12,10 @@ 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.ref = "fabric_loom" } fabric_loom = { id = "fabric-loom", version = "0.12.+" }
grgit = { id = "org.ajoberstar.grgit", version.ref = "grgit" } loom_quiltflower = { id = "io.github.juuxel.loom-quiltflower", version = "1.7.+" }
qmol = { id = "org.quiltmc.quilt-mappings-on-loom", version = "4.2.0" }
grgit = { id = "org.ajoberstar.grgit", version = "5.0.0" }

Binary file not shown.

View file

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

41
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/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # https://github.com/gradle/gradle/blob/master/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,11 +80,13 @@ do
esac esac
done done
# This is normally unused APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
# 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)
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
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
@ -131,29 +133,22 @@ location of your Java installation."
fi fi
else else
JAVACMD=java JAVACMD=java
if ! command -v java >/dev/null 2>&1 which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
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
@ -198,15 +193,11 @@ if "$cygwin" || "$msys" ; then
done done
fi fi
# Collect all arguments for the java command;
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. # * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # shell script including quotes and variable substitutions, so put them in
# double quotes to make sure that they get re-expanded; and
# Collect all arguments for the java command: # * put everything else in single quotes, so that it's not re-expanded.
# * 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" \
@ -214,12 +205,6 @@ set -- \
org.gradle.wrapper.GradleWrapperMain \ org.gradle.wrapper.GradleWrapperMain \
"$@" "$@"
# Stop when "xargs" is not available.
if ! command -v xargs >/dev/null 2>&1
then
die "xargs is not available"
fi
# Use "xargs" to parse quoted args. # Use "xargs" to parse quoted args.
# #
# With -n1 it outputs one arg per line, with the quotes and backslashes removed. # With -n1 it outputs one arg per line, with the quotes and backslashes removed.

11
gradlew.bat vendored
View file

@ -26,7 +26,6 @@ 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%
@ -41,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
set JAVA_EXE=java.exe set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1 %JAVA_EXE% -version >NUL 2>&1
if %ERRORLEVEL% equ 0 goto execute if "%ERRORLEVEL%" == "0" goto execute
echo. echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@ -76,15 +75,13 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
:end :end
@rem End local scope for the variables with windows NT shell @rem End local scope for the variables with windows NT shell
if %ERRORLEVEL% equ 0 goto mainEnd if "%ERRORLEVEL%"=="0" goto mainEnd
:fail :fail
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
rem the _cmd.exe /c_ return code! rem the _cmd.exe /c_ return code!
set EXIT_CODE=%ERRORLEVEL% if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
if %EXIT_CODE% equ 0 set EXIT_CODE=1 exit /b 1
if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
exit /b %EXIT_CODE%
:mainEnd :mainEnd
if "%OS%"=="Windows_NT" endlocal if "%OS%"=="Windows_NT" endlocal

View file

@ -8,31 +8,18 @@ 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.world.BlockRenderView; import net.minecraft.util.registry.Registry;
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 final BlockEntityType<WaterCauldronBlockEntity> WATER_CAULDRON_BLOCK_ENTITY = FabricBlockEntityTypeBuilder.create(WaterCauldronBlockEntity::new, Blocks.WATER_CAULDRON).build(); public static BlockEntityType<WaterCauldronBlockEntity> WATER_CAULDRON_BLOCK_ENTITY = FabricBlockEntityTypeBuilder.create(WaterCauldronBlockEntity::new, Blocks.WATER_CAULDRON).build();
@Override @Override
public void onInitialize() { public void onInitialize() {
Registry.register(Registries.BLOCK_ENTITY_TYPE, new Identifier(MOD_ID, "water_cauldron_entity"), WATER_CAULDRON_BLOCK_ENTITY); Registry.register(Registry.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 static final int[] NULL_COLOR = new int[] {-1, -1, -1}; private 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 toSyncedNbt() { public NbtCompound toInitialChunkDataNbt() {
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 if (world instanceof ServerWorld) { } else {
((ServerWorld) world).getChunkManager().markForUpdate(pos); ((ServerWorld) world).getChunkManager().markForUpdate(pos);
} }
super.markDirty(); super.markDirty();

View file

@ -0,0 +1,22 @@
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

@ -1,18 +0,0 @@
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 = "method_32209", at = @At("HEAD"), cancellable = true) @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)
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 = "method_32217", at = @At("TAIL")) @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"))
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) {
@ -53,8 +53,9 @@ 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()) { var dyeMap = DyeItemAccessor.getDyeMap();
CauldronBehavior.WATER_CAULDRON_BEHAVIOR.map().put(dyeItem.getValue(), CauldronBehaviorExtended.DYE_WATER); for (Map.Entry<DyeColor, DyeItem> dyeItem : dyeMap.entrySet()) {
CauldronBehavior.WATER_CAULDRON_BEHAVIOR.put(dyeItem.getValue(), CauldronBehaviorExtended.DYE_WATER);
} }
} }
} }

View file

@ -0,0 +1,16 @@
package me.tibinonest.mods.cauldron_dyeing.mixin;
import net.minecraft.item.DyeItem;
import net.minecraft.util.DyeColor;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.gen.Accessor;
import java.util.Map;
@Mixin(DyeItem.class)
public interface DyeItemAccessor {
@Accessor("DYES")
static Map<DyeColor, DyeItem> getDyeMap() {
throw new AssertionError();
}
}

View file

@ -3,22 +3,17 @@ 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.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.LeveledCauldronBlock;
import net.minecraft.block.entity.BlockEntity; import net.minecraft.block.entity.BlockEntity;
import net.minecraft.fluid.Fluids;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
@Mixin(AbstractCauldronBlock.class) @Mixin(LeveledCauldronBlock.class)
public class AbstractCauldronBlockMixin implements BlockEntityProvider { public class LeveledCauldronBlockMixin implements BlockEntityProvider {
@Nullable @Nullable
@Override @Override
public BlockEntity createBlockEntity(BlockPos pos, BlockState state) { public BlockEntity createBlockEntity(BlockPos pos, BlockState state) {
if (state.getBlock() instanceof AbstractCauldronBlock cauldron && cauldron.canBeFilledByDripstone(Fluids.WATER)) { return state.getBlock().getLootTableId().getPath().equals("blocks/water_cauldron") ? new WaterCauldronBlockEntity(pos, state) : null;
return new WaterCauldronBlockEntity(pos, state);
}
return null;
} }
} }

View file

@ -0,0 +1,28 @@
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 +0,0 @@
accessWidener v1 named
accessible method net/minecraft/block/cauldron/AbstractCauldronBlock canBeFilledByDripstone (Lnet/minecraft/fluid/Fluid;)Z
accessible field net/minecraft/item/DyeItem DYES Ljava/util/Map;

View file

@ -3,11 +3,13 @@
"required": true, "required": true,
"compatibilityLevel": "JAVA_17", "compatibilityLevel": "JAVA_17",
"mixins": [ "mixins": [
"AbstractCauldronBlockMixin", "CauldronBehaviorMixin",
"CauldronBehaviorMixin" "DyeItemAccessor",
"LeveledCauldronBlockMixin"
], ],
"client": [ "client": [
"BlockColorsMixin" "BiomeColorsMixin",
"sodium.SodiumBlockRendererMixin"
], ],
"injectors": { "injectors": {
"defaultRequire": 1 "defaultRequire": 1

View file

@ -19,12 +19,11 @@
"me.tibinonest.mods.cauldron_dyeing.CauldronDyeing" "me.tibinonest.mods.cauldron_dyeing.CauldronDyeing"
] ]
}, },
"accessWidener": "cauldron-dyeing.accesswidener",
"mixins": [ "mixins": [
"cauldron-dyeing.mixins.json" "cauldron-dyeing.mixins.json"
], ],
"depends": { "depends": {
"minecraft": ">=1.20.3", "minecraft": ">=1.18.2",
"fabricloader": ">=0.12.0", "fabricloader": ">=0.12.0",
"fabric-object-builder-api-v1": ">=0.1" "fabric-object-builder-api-v1": ">=0.1"
} }