mirror of
https://github.com/TibiNonEst/cauldron-dyeing.git
synced 2025-03-14 14:28:44 -05:00
Compare commits
No commits in common. "1.20" and "v1.0.4" have entirely different histories.
20 changed files with 152 additions and 107 deletions
1
.github/workflows/build-gradle.yml
vendored
1
.github/workflows/build-gradle.yml
vendored
|
@ -20,7 +20,6 @@ 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') }}
|
||||||
|
|
19
.github/workflows/build-release.yml
vendored
19
.github/workflows/build-release.yml
vendored
|
@ -23,7 +23,6 @@ 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') }}
|
||||||
|
@ -33,20 +32,16 @@ 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 publish
|
run: ./gradlew build modrinth curseforge
|
||||||
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 artifacts to Modrinth and GitHub
|
- name: Upload build artifacts
|
||||||
uses: Kir-Antipov/mc-publish@v3
|
uses: AButler/upload-release-assets@v2.0
|
||||||
with:
|
with:
|
||||||
modrinth-id: 5AgJnN8I
|
files: 'build/libs/!(*-sources).jar'
|
||||||
modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
|
repo-token: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
|
||||||
github-token: ${{ secrets.GITHUB_TOKEN }}
|
|
||||||
|
|
||||||
files: build/libs/!(*-sources).jar
|
|
||||||
|
|
||||||
loaders: fabric quilt
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
# Cauldron Dyeing
|
# Cauldron Dyeing
|
||||||

|

|
||||||

|

|
||||||

|

|
||||||
|
|
||||||
Bring Bedrock's cauldron-based armor dyeing to Java Edition.
|
Bring Bedrock's cauldron-based armor dyeing to Java Edition.
|
||||||
|
|
55
build.gradle
55
build.gradle
|
@ -1,26 +1,36 @@
|
||||||
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 = "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 {
|
loom {
|
||||||
|
@ -56,6 +66,33 @@ 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) {
|
||||||
|
@ -65,10 +102,10 @@ publishing {
|
||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
maven {
|
maven {
|
||||||
url = System.getenv("MAVEN_URL")
|
url = ENV.MAVEN_URL
|
||||||
credentials {
|
credentials {
|
||||||
username = System.getenv("MAVEN_USERNAME")
|
username = ENV.MAVEN_USERNAME
|
||||||
password = System.getenv("MAVEN_PASSWORD")
|
password = ENV.MAVEN_PASSWORD
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -86,7 +123,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
|
||||||
|
@ -96,7 +133,7 @@ def getMetadata() {
|
||||||
id += "-dirty"
|
id += "-dirty"
|
||||||
}
|
}
|
||||||
|
|
||||||
metadata += "+git.${id}"
|
metadata += "${id}"
|
||||||
}
|
}
|
||||||
|
|
||||||
return metadata
|
return metadata
|
||||||
|
|
|
@ -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.4
|
||||||
maven_group=me.tibinonest.mods
|
maven_group=me.tibinonest.mods
|
||||||
archives_base_name=cauldron-dyeing
|
archives_base_name=cauldron-dyeing
|
||||||
|
|
||||||
|
|
|
@ -1,12 +1,10 @@
|
||||||
[versions]
|
[versions]
|
||||||
minecraft = "1.20.3"
|
minecraft = "1.19.2"
|
||||||
quilt_mappings = "1.20.3+build.3"
|
quilt_mappings = "1.19.2+build.3"
|
||||||
fabric_loader = "0.15.3"
|
fabric_loader = "0.14.9"
|
||||||
|
|
||||||
fabric_api = "0.91.1+1.20.3"
|
fabric_api = "0.60.0+1.19.2"
|
||||||
|
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,12 @@ 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.+" }
|
||||||
|
minotaur = { id = "com.modrinth.minotaur", version = "2.+" }
|
||||||
|
cursegradle = { id = "com.matthewprenger.cursegradle", version = "1.+" }
|
||||||
|
|
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
Binary file not shown.
4
gradle/wrapper/gradle-wrapper.properties
vendored
4
gradle/wrapper/gradle-wrapper.properties
vendored
|
@ -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.5.1-bin.zip
|
||||||
networkTimeout=10000
|
|
||||||
validateDistributionUrl=true
|
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
zipStorePath=wrapper/dists
|
zipStorePath=wrapper/dists
|
||||||
|
|
35
gradlew
vendored
35
gradlew
vendored
|
@ -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" \
|
||||||
|
|
1
gradlew.bat
vendored
1
gradlew.bat
vendored
|
@ -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%
|
||||||
|
|
||||||
|
|
|
@ -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)
|
||||||
|
|
|
@ -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();
|
||||||
|
|
|
@ -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;
|
||||||
|
|
|
@ -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());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -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);
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -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) {
|
||||||
|
@ -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.map().put(dyeItem.getValue(), CauldronBehaviorExtended.DYE_WATER);
|
CauldronBehavior.WATER_CAULDRON_BEHAVIOR.put(dyeItem.getValue(), CauldronBehaviorExtended.DYE_WATER);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -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);
|
||||||
|
}
|
||||||
|
}
|
|
@ -1,5 +1,5 @@
|
||||||
accessWidener v1 named
|
accessWidener v1 named
|
||||||
|
|
||||||
accessible method net/minecraft/block/cauldron/AbstractCauldronBlock canBeFilledByDripstone (Lnet/minecraft/fluid/Fluid;)Z
|
accessible method net/minecraft/block/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;
|
||||||
|
|
|
@ -7,7 +7,8 @@
|
||||||
"CauldronBehaviorMixin"
|
"CauldronBehaviorMixin"
|
||||||
],
|
],
|
||||||
"client": [
|
"client": [
|
||||||
"BlockColorsMixin"
|
"BiomeColorsMixin",
|
||||||
|
"sodium.SodiumBlockRendererMixin"
|
||||||
],
|
],
|
||||||
"injectors": {
|
"injectors": {
|
||||||
"defaultRequire": 1
|
"defaultRequire": 1
|
||||||
|
|
|
@ -24,8 +24,11 @@
|
||||||
"cauldron-dyeing.mixins.json"
|
"cauldron-dyeing.mixins.json"
|
||||||
],
|
],
|
||||||
"depends": {
|
"depends": {
|
||||||
"minecraft": ">=1.20.3",
|
"minecraft": ">=1.18",
|
||||||
"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"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue