diff --git a/.github/workflows/build-gradle.yml b/.github/workflows/build-gradle.yml index e02e70d..d55c9a4 100644 --- a/.github/workflows/build-gradle.yml +++ b/.github/workflows/build-gradle.yml @@ -5,20 +5,35 @@ on: [ push, pull_request ] jobs: build: runs-on: ubuntu-latest + steps: - - uses: actions/checkout@v2 + - name: Checkout latest commit + uses: actions/checkout@v3 - name: Set up JDK 17 - uses: actions/setup-java@v2 + uses: actions/setup-java@v3 with: - distribution: 'temurin' + distribution: temurin 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 run: ./gradlew build - name: Upload build artifacts - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: build-artifacts path: ./build/libs diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml index 07b4fe3..b1ac613 100644 --- a/.github/workflows/build-release.yml +++ b/.github/workflows/build-release.yml @@ -8,20 +8,45 @@ on: jobs: build: runs-on: ubuntu-latest + steps: - - uses: actions/checkout@v2 + - name: Checkout latest commit + uses: actions/checkout@v3 - name: Set up JDK 17 - uses: actions/setup-java@v2 + uses: actions/setup-java@v3 with: - distribution: 'temurin' + distribution: temurin java-version: 17 - - name: Build with Gradle - run: ./gradlew build - - - name: Upload build artifacts - uses: AButler/upload-release-assets@v2.0 + - name: Restore Gradle cache + uses: actions/cache@v3 with: - files: 'build/libs/!(*-@(dev|sources)).jar' - repo-token: ${{ secrets.GITHUB_TOKEN }} + 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 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 diff --git a/README.md b/README.md index 4f5744f..456c93c 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # 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) Bring Bedrock's cauldron-based armor dyeing to Java Edition. @@ -12,19 +12,20 @@ The usage is the same as in Bedrock, right-clicking on a water cauldron with dye When you right-click on the dyed water cauldron with a dyeable item, it will add the current color in the cauldron to the item. Right-clicking on an un-dyed water cauldron with a dyed item to remove its color will still work. -![dyed water](https://imgur.com/Wn2Q27Y.png) +![dyed water](https://cdn.tibinonest.me/images/dyed-water.jpg) ## Usage -Fabric Loader version 12.x or newer is required to install this mod. The latest release is available on the [Modrinth](https://modrinth.com/mod/cauldron-dyeing) or [Github releases](https://github.com/TibiNonEst/cauldron-dyeing/releases). To install, just drag the mod jar into your mods folder. +Cauldron Dyeing requires Fabric or Quilt loader and [FAPI](https://modrinth.com/mod/fabric-api) or [QFAPI](https://modrinth.com/mod/qsl). +The latest release is available on the [Modrinth](https://modrinth.com/mod/cauldron-dyeing) or [Github releases](https://github.com/TibiNonEst/cauldron-dyeing/releases). +To install, just drag the mod jar into your mods folder along with either FAPI or QFAPI. ### Building Building the mod requires JDK 17+ on your system. To build, simply run `./gradlew build` and the artifacts will be available in `build/libs`. ## Compatibility +Cauldron Dyeing is ensured to be compatible with (Quilted) Fabric API, CaffeineMC mods, and Iris, if any incompatibility is found please report it on the [issue tracker](https://github.com/TibiNonEst/cauldron-dyeing/issues). -Cauldron Dyeing is ensured to be compatible with Fabric API, CaffineMC mods, and Iris, if any incompatibility is found please report it on the [issue tracker](https://github.com/TibiNonEst/cauldron-dyeing/issues). - -**Note:** The current method of displaying dyed water is not compatible with shaders that customize water color, such as Complementary. +**Note:** The current method of displaying dyed water is not compatible with shaders that customize water color such as Complementary's Realistic-ish and RTX-ish settings. ## Issues Report any bugs, crashes, or other issues that may arise on the [issue tracker](https://github.com/TibiNonEst/cauldron-dyeing/issues). diff --git a/build.gradle b/build.gradle index 374bc56..bf22eb2 100644 --- a/build.gradle +++ b/build.gradle @@ -1,81 +1,93 @@ plugins { - id 'fabric-loom' version '0.11.+' - id 'io.github.juuxel.loom-quiltflower' version '1.6.0' - id 'org.quiltmc.quilt-mappings-on-loom' version '4.0.0' - id 'org.ajoberstar.grgit' version '5.0.0' + alias(libs.plugins.fabric.loom) + alias(libs.plugins.grgit) + id "maven-publish" } -sourceCompatibility = '17' -targetCompatibility = '17' - archivesBaseName = project.archives_base_name -version = "${project.mod_version}+${getMetadata()}" +version = "${project.mod_version}${getMetadata()}" group = project.maven_group repositories { maven { - name = "Modrinth" - url = "https://api.modrinth.com/maven" - content { - includeGroup "maven.modrinth" - } + name = "Quilt" + url = "https://maven.quiltmc.org/repository/release" } } -var apiModules = [ - "fabric-api-base", - "fabric-networking-api-v1", - "fabric-object-builder-api-v1", - "fabric-registry-sync-v0", -] - dependencies { - // To change the versions see the gradle.properties file - minecraft "com.mojang:minecraft:${project.minecraft_version}" - mappings loom.layered { - it.mappings("net.fabricmc:yarn:${project.minecraft_version}+build.${project.yarn_mappings}:v2") - it.addLayer(quiltMappings.mappings("org.quiltmc:quilt-mappings:${project.minecraft_version}+build.${project.quilt_mappings}:v2")) - } - modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" + minecraft libs.minecraft + mappings variantOf(libs.quilt.mappings) { classifier "intermediary-v2" } + modImplementation libs.fabric.loader - // Fabric API - apiModules.forEach { - include modImplementation(fabricApi.module(it, project.fabric_version)) - } + modImplementation libs.fabric.api +} - // Sodium - modCompileOnly "maven.modrinth:sodium:${project.sodium_version}" +loom { + accessWidenerPath.set file("src/main/resources/cauldron-dyeing.accesswidener") } processResources { - inputs.property 'version', project.version - filteringCharset 'UTF-8' + inputs.property "version", project.version + filteringCharset "UTF-8" - filesMatching('fabric.mod.json') { - expand 'version': project.version + filesMatching("fabric.mod.json") { + expand "version": project.version } } tasks.withType(JavaCompile) { - it.options.encoding = 'UTF-8' + it.options.encoding = "UTF-8" + // Minecraft 1.18 (1.18-pre2) upwards uses Java 17. + it.options.release = 17 } java { + // Still required by IDEs such as Eclipse and Visual Studio Code + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 + withSourcesJar() } jar { - from('LICENSE') { + from("LICENSE") { 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 build_id = System.getenv("GITHUB_RUN_NUMBER") + def workflow_id = System.getenv("GITHUB_WORKFLOW") - def metadata = project.minecraft_version + def metadata = "" - if (grgit != null) { + // Release builds only + if (workflow_id == "build-release") { + return metadata + } + + if (build_id != null) { + metadata += "+build.${build_id}" + } else if (grgit != null) { def head = grgit.head() def id = head.abbreviatedId @@ -84,12 +96,7 @@ def getMetadata() { id += "-dirty" } - metadata += "-${id}" - } - - // CI builds only - if (build_id != null) { - metadata += ".${build_id}" + metadata += "+git.${id}" } return metadata diff --git a/gradle.properties b/gradle.properties index 712c737..aa96e3d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,18 +1,10 @@ -# Done to increase the memory available to gradle. -org.gradle.jvmargs=-Xmx1G - -# Fabric Properties -# check these on https://fabricmc.net/develop/ -minecraft_version=1.18.2 -quilt_mappings=17 -yarn_mappings=2 -loader_version=0.13.3 -fabric_version=0.48.0+1.18.2 +# Gradle Properties +org.gradle.jvmargs=-Xmx2G +org.gradle.parallel=true # Mod Properties -mod_version=1.0.1 +mod_version=1.0.12 maven_group=me.tibinonest.mods archives_base_name=cauldron-dyeing -# Dependencies -sodium_version=mc1.18.2-0.4.1 +# Dependencies are managed at gradle/libs.versions.toml diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml new file mode 100644 index 0000000..455bab0 --- /dev/null +++ b/gradle/libs.versions.toml @@ -0,0 +1,20 @@ +[versions] +minecraft = "1.20.3" +quilt_mappings = "1.20.3+build.3" +fabric_loader = "0.15.3" + +fabric_api = "0.91.1+1.20.3" + +fabric_loom = "1.4.+" +grgit = "5.2.+" + +[libraries] +minecraft = { module = "com.mojang:minecraft", version.ref = "minecraft" } +quilt_mappings = { module = "org.quiltmc:quilt-mappings", version.ref = "quilt_mappings" } +fabric_loader = { module = "net.fabricmc:fabric-loader", version.ref = "fabric_loader" } + +fabric_api = { module = "net.fabricmc.fabric-api:fabric-api", version.ref = "fabric_api" } + +[plugins] +fabric_loom = { id = "fabric-loom", version.ref = "fabric_loom" } +grgit = { id = "org.ajoberstar.grgit", version.ref = "grgit" } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 7454180..d64cd49 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 00e33ed..1af9e09 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 1b6c787..1aa94a4 100755 --- a/gradlew +++ b/gradlew @@ -55,7 +55,7 @@ # Darwin, MinGW, and NonStop. # # (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. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -80,13 +80,11 @@ do esac done -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -APP_NAME="Gradle" +# This is normally unused +# shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} - -# 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"' +# 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 # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -133,22 +131,29 @@ location of your Java installation." fi else 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 location of your Java installation." + fi fi # Increase the maximum file descriptors if we can. if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( 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 ) || warn "Could not query maximum file descriptor limit" esac case $MAX_FD in #( '' | 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" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -193,11 +198,15 @@ if "$cygwin" || "$msys" ; then done fi -# Collect all arguments for the java command; -# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of -# shell script including quotes and variable substitutions, so put them in -# double quotes to make sure that they get re-expanded; and -# * put everything else in single quotes, so that it's not re-expanded. + +# 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"' + +# 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 -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ @@ -205,6 +214,12 @@ set -- \ 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. # # With -n1 it outputs one arg per line, with the quotes and backslashes removed. diff --git a/gradlew.bat b/gradlew.bat index 107acd3..93e3f59 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,8 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/settings.gradle b/settings.gradle index b898111..6908847 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,17 +1,13 @@ pluginManagement { repositories { maven { - name 'Quilt' - url 'https://maven.quiltmc.org/repository/release' + name = 'Quilt' + url = 'https://maven.quiltmc.org/repository/release' } maven { name = 'Fabric' url = 'https://maven.fabricmc.net/' } - maven { - name = 'Cotton' - url = 'https://server.bbkr.space/artifactory/libs-release/' - } gradlePluginPortal() } } 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..a466188 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,31 @@ 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.client.color.world.BiomeColors; +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; +import net.minecraft.world.BlockRenderView; 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) + 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) 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 ca4cf2a..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,20 +5,22 @@ 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; 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; import net.minecraft.util.math.BlockPos; import org.jetbrains.annotations.Nullable; +import java.util.Arrays; + public class WaterCauldronBlockEntity extends BlockEntity { - private int[] color; + private static final int[] NULL_COLOR = new int[] {-1, -1, -1}; + private int[] color = NULL_COLOR; public WaterCauldronBlockEntity(BlockPos pos, BlockState state) { super(CauldronDyeing.WATER_CAULDRON_BLOCK_ENTITY, pos, state); - color = new int[]{-1, -1, -1}; } // Formula taken from https://minecraft.fandom.com/wiki/Dye#Dyeing_armor and DyeableItem#blendAndSetColor @@ -30,7 +32,7 @@ public class WaterCauldronBlockEntity extends BlockEntity { newColor[1] = (int) (colorComponents[1] * 255.0f); newColor[2] = (int) (colorComponents[2] * 255.0f); - if (hasColor()) { + if (!Arrays.equals(color, NULL_COLOR)) { var avgColor = new int[3]; avgColor[0] = (color[0] + newColor[0]) / 2; avgColor[1] = (color[1] + newColor[1]) / 2; @@ -51,16 +53,12 @@ public class WaterCauldronBlockEntity extends BlockEntity { markDirty(); } - public boolean hasColor() { - return color.length == 3 && color[0] != -1 && color[1] != -1 && color[2] != -1; - } - public int getColor() { - return hasColor() ? (color[0] << 16) + (color[1] << 8) + color[2] : -1; + return !Arrays.equals(color, NULL_COLOR) ? (color[0] << 16) + (color[1] << 8) + color[2] : -1; } public void resetColor() { - color = new int[]{-1, -1, -1}; + color = NULL_COLOR; markDirty(); } @@ -78,7 +76,7 @@ public class WaterCauldronBlockEntity extends BlockEntity { } @Override - public NbtCompound toInitialChunkDataNbt() { + public NbtCompound toSyncedNbt() { return toNbt(); } @@ -93,7 +91,7 @@ public class WaterCauldronBlockEntity extends BlockEntity { if (world != null) { if (world.isClient()) { CauldronDyeing.rebuildBlock(pos); - } else { + } else if (world instanceof ServerWorld) { ((ServerWorld) world).getChunkManager().markForUpdate(pos); } super.markDirty(); diff --git a/src/main/java/me/tibinonest/mods/cauldron_dyeing/mixin/LeveledCauldronBlockMixin.java b/src/main/java/me/tibinonest/mods/cauldron_dyeing/mixin/AbstractCauldronBlockMixin.java similarity index 54% rename from src/main/java/me/tibinonest/mods/cauldron_dyeing/mixin/LeveledCauldronBlockMixin.java rename to src/main/java/me/tibinonest/mods/cauldron_dyeing/mixin/AbstractCauldronBlockMixin.java index 048509a..47faca6 100644 --- a/src/main/java/me/tibinonest/mods/cauldron_dyeing/mixin/LeveledCauldronBlockMixin.java +++ b/src/main/java/me/tibinonest/mods/cauldron_dyeing/mixin/AbstractCauldronBlockMixin.java @@ -3,17 +3,22 @@ package me.tibinonest.mods.cauldron_dyeing.mixin; import me.tibinonest.mods.cauldron_dyeing.block.WaterCauldronBlockEntity; import net.minecraft.block.BlockEntityProvider; import net.minecraft.block.BlockState; -import net.minecraft.block.LeveledCauldronBlock; +import net.minecraft.block.cauldron.AbstractCauldronBlock; import net.minecraft.block.entity.BlockEntity; +import net.minecraft.fluid.Fluids; import net.minecraft.util.math.BlockPos; import org.jetbrains.annotations.Nullable; import org.spongepowered.asm.mixin.Mixin; -@Mixin(LeveledCauldronBlock.class) -public class LeveledCauldronBlockMixin implements BlockEntityProvider { +@Mixin(AbstractCauldronBlock.class) +public class AbstractCauldronBlockMixin implements BlockEntityProvider { @Nullable @Override public BlockEntity createBlockEntity(BlockPos pos, BlockState state) { - return state.getBlock().getLootTableId().getPath().equals("blocks/water_cauldron") ? new WaterCauldronBlockEntity(pos, state) : null; + if (state.getBlock() instanceof AbstractCauldronBlock cauldron && cauldron.canBeFilledByDripstone(Fluids.WATER)) { + return new WaterCauldronBlockEntity(pos, state); + } + + return null; } } diff --git a/src/main/java/me/tibinonest/mods/cauldron_dyeing/mixin/BiomeColorsMixin.java b/src/main/java/me/tibinonest/mods/cauldron_dyeing/mixin/BiomeColorsMixin.java deleted file mode 100644 index f46ce94..0000000 --- a/src/main/java/me/tibinonest/mods/cauldron_dyeing/mixin/BiomeColorsMixin.java +++ /dev/null @@ -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("RETURN"), cancellable = true) - private static void modifyWaterColor(BlockRenderView world, BlockPos pos, CallbackInfoReturnable cir) { - var blockEntity = world.getBlockEntity(pos); - - if (blockEntity instanceof WaterCauldronBlockEntity waterCauldron && waterCauldron.getColor() != -1) { - cir.setReturnValue(waterCauldron.getColor()); - } - } -} diff --git a/src/main/java/me/tibinonest/mods/cauldron_dyeing/mixin/BlockColorsMixin.java b/src/main/java/me/tibinonest/mods/cauldron_dyeing/mixin/BlockColorsMixin.java new file mode 100644 index 0000000..9e98780 --- /dev/null +++ b/src/main/java/me/tibinonest/mods/cauldron_dyeing/mixin/BlockColorsMixin.java @@ -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 cir, BlockColors blockColors) { + blockColors.registerColorProvider((state, world, pos, tintIndex) -> world != null && pos != null ? CauldronDyeing.getColor(world, pos) : -1, Blocks.WATER_CAULDRON); + } +} 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 ecdea0f..aff0684 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 @@ 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; @@ -25,8 +25,9 @@ import java.util.Map; @Mixin(CauldronBehavior.class) public interface CauldronBehaviorMixin { - @Inject(method = "m_ducbhfos", at = @At("HEAD"), cancellable = true) - private static void injectCleanDyeableItem(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, ItemStack stack, CallbackInfoReturnable cir) { + @SuppressWarnings("target") + @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 cir) { var blockEntity = world.getBlockEntity(pos); var item = stack.getItem(); @@ -41,8 +42,9 @@ public interface CauldronBehaviorMixin { } } - @Inject(method = "m_xrdlazrh", at = @At(value = "TAIL")) - private static void injectFillWithWater(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, ItemStack stack, CallbackInfoReturnable cir) { + @SuppressWarnings("target") + @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 cir) { var blockEntity = world.getBlockEntity(pos); if (blockEntity instanceof WaterCauldronBlockEntity waterCauldron) { waterCauldron.resetColor(); @@ -50,10 +52,9 @@ public interface CauldronBehaviorMixin { } @Inject(method = "registerBehavior", at = @At("TAIL")) - private static void injectRegisterBehavior(CallbackInfo ci) { - var dyeMap = DyeItemAccessor.getDyeMap(); - for (Map.Entry dyeItem : dyeMap.entrySet()) { - CauldronBehavior.WATER_CAULDRON_BEHAVIOR.put(dyeItem.getValue(), CauldronBehaviorExtended.DYE_WATER); + private static void cauldron_dyeing$injectRegisterBehavior(CallbackInfo ci) { + for (Map.Entry dyeItem : DyeItem.DYES.entrySet()) { + CauldronBehavior.WATER_CAULDRON_BEHAVIOR.map().put(dyeItem.getValue(), CauldronBehaviorExtended.DYE_WATER); } } } diff --git a/src/main/java/me/tibinonest/mods/cauldron_dyeing/mixin/DyeItemAccessor.java b/src/main/java/me/tibinonest/mods/cauldron_dyeing/mixin/DyeItemAccessor.java deleted file mode 100644 index f470fef..0000000 --- a/src/main/java/me/tibinonest/mods/cauldron_dyeing/mixin/DyeItemAccessor.java +++ /dev/null @@ -1,16 +0,0 @@ -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 getDyeMap() { - throw new AssertionError(); - } -} diff --git a/src/main/java/me/tibinonest/mods/cauldron_dyeing/mixin/sodium/SodiumBlockRendererMixin.java b/src/main/java/me/tibinonest/mods/cauldron_dyeing/mixin/sodium/SodiumBlockRendererMixin.java deleted file mode 100644 index b13e28e..0000000 --- a/src/main/java/me/tibinonest/mods/cauldron_dyeing/mixin/sodium/SodiumBlockRendererMixin.java +++ /dev/null @@ -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 int[] redirectGetColors(ColorBlender instance, BlockRenderView world, BlockPos pos, ModelQuadView quad, ColorSampler 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); - } -} diff --git a/src/main/resources/cauldron-dyeing.accesswidener b/src/main/resources/cauldron-dyeing.accesswidener new file mode 100644 index 0000000..d48d1c3 --- /dev/null +++ b/src/main/resources/cauldron-dyeing.accesswidener @@ -0,0 +1,5 @@ +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; diff --git a/src/main/resources/cauldron-dyeing.compat.sodium.mixins.json b/src/main/resources/cauldron-dyeing.compat.sodium.mixins.json deleted file mode 100644 index 597c520..0000000 --- a/src/main/resources/cauldron-dyeing.compat.sodium.mixins.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "package": "me.tibinonest.mods.cauldron_dyeing.mixin.sodium", - "required": false, - "compatibilityLevel": "JAVA_17", - "client": [ - "SodiumBlockRendererMixin" - ], - "injectors": { - "defaultRequire": 1 - } -} diff --git a/src/main/resources/cauldron-dyeing.mixins.json b/src/main/resources/cauldron-dyeing.mixins.json index d35b626..b424eb0 100644 --- a/src/main/resources/cauldron-dyeing.mixins.json +++ b/src/main/resources/cauldron-dyeing.mixins.json @@ -3,12 +3,11 @@ "required": true, "compatibilityLevel": "JAVA_17", "mixins": [ - "CauldronBehaviorMixin", - "DyeItemAccessor", - "LeveledCauldronBlockMixin" + "AbstractCauldronBlockMixin", + "CauldronBehaviorMixin" ], "client": [ - "BiomeColorsMixin" + "BlockColorsMixin" ], "injectors": { "defaultRequire": 1 diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 4a9b8ef..2f7e512 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -19,12 +19,12 @@ "me.tibinonest.mods.cauldron_dyeing.CauldronDyeing" ] }, + "accessWidener": "cauldron-dyeing.accesswidener", "mixins": [ - "cauldron-dyeing.mixins.json", - "cauldron-dyeing.compat.sodium.mixins.json" + "cauldron-dyeing.mixins.json" ], "depends": { - "minecraft": ">=1.18", + "minecraft": ">=1.20.3", "fabricloader": ">=0.12.0", "fabric-object-builder-api-v1": ">=0.1" }