Initial Minecraft Renew Mod workspace
This commit is contained in:
6
create-limited-draining/.gitignore
vendored
Normal file
6
create-limited-draining/.gitignore
vendored
Normal file
@@ -0,0 +1,6 @@
|
||||
.gradle/
|
||||
build/
|
||||
run/
|
||||
run-data/
|
||||
out/
|
||||
*.log
|
||||
21
create-limited-draining/LICENSE
Normal file
21
create-limited-draining/LICENSE
Normal file
@@ -0,0 +1,21 @@
|
||||
MIT License
|
||||
|
||||
Copyright (c) 2024 Jasdew Starfield
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files (the "Software"), to deal
|
||||
in the Software without restriction, including without limitation the rights
|
||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
copies of the Software, and to permit persons to whom the Software is
|
||||
furnished to do so, subject to the following conditions:
|
||||
|
||||
The above copyright notice and this permission notice shall be included in all
|
||||
copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
SOFTWARE.
|
||||
11
create-limited-draining/NOTICE.md
Normal file
11
create-limited-draining/NOTICE.md
Normal file
@@ -0,0 +1,11 @@
|
||||
# Notice
|
||||
|
||||
This directory contains a port of Create: Limited Draining.
|
||||
|
||||
- Original repository: https://github.com/JasdewStarfield/CreateLimitedDraining
|
||||
- Original author: Jasdew Starfield
|
||||
- Original license: MIT License
|
||||
- Original copyright: Copyright (c) 2024 Jasdew Starfield
|
||||
- Port target: Minecraft 1.21.1, NeoForge, Create 6.0.10
|
||||
|
||||
The original MIT license text is kept in `LICENSE`. No publication or distribution is authorized from this repository without an explicit release review.
|
||||
35
create-limited-draining/PORTING.md
Normal file
35
create-limited-draining/PORTING.md
Normal file
@@ -0,0 +1,35 @@
|
||||
# Porting Notes
|
||||
|
||||
## Source and Target
|
||||
|
||||
- Original mod: Create: Limited Draining
|
||||
- Original repository: https://github.com/JasdewStarfield/CreateLimitedDraining
|
||||
- Original branch used as source basis: 1.20.1
|
||||
- Target: Minecraft 1.21.1, NeoForge 21.1.228, Create 6.0.10
|
||||
|
||||
## Main Changes
|
||||
|
||||
- Replaced ForgeGradle setup with NeoForge ModDevGradle.
|
||||
- Updated Java toolchain from 17 to 21.
|
||||
- Replaced Forge config/event imports with NeoForge equivalents.
|
||||
- Updated `mods.toml` metadata to generated `neoforge.mods.toml`.
|
||||
- Updated NBT mixin method signatures for Create/Minecraft 1.21.1 `HolderLookup.Provider` parameters.
|
||||
- Kept behavior minimal: rule-based restriction of Create Hose Pulley infinite draining.
|
||||
|
||||
## Verification
|
||||
|
||||
- `gradlew build`: successful.
|
||||
- `gradlew runClient`: successful startup; Create 6.0.10 and `createlimiteddraining` loaded.
|
||||
- `gradlew runServer`: dedicated server loaded Create and the port, generated a world, and reached `Done`; Java server processes were stopped after the smoke-test timeout.
|
||||
|
||||
## Expected Risk Areas
|
||||
|
||||
- Manual gameplay verification of Hose Pulley infinite-draining behavior is still pending.
|
||||
- Create internal method signatures are compile-verified, but the mixin behavior should be exercised in a test world.
|
||||
- The exact Create Maven artifact resolved as `create-1.21.1-6.0.10-280-slim.jar` and reports mod version `6.0.10` at runtime.
|
||||
|
||||
## Next Steps
|
||||
|
||||
- Create a test world and verify lava infinite draining is allowed in Nether biomes and denied outside configured biome rules.
|
||||
- Inspect the generated common config after changing `drainingRules` values.
|
||||
- Consider adding a lightweight GameTest or scripted manual QA notes for Hose Pulley behavior.
|
||||
50
create-limited-draining/README.md
Normal file
50
create-limited-draining/README.md
Normal file
@@ -0,0 +1,50 @@
|
||||
# Create: Limited Draining Port
|
||||
|
||||
This is a Minecraft Renew Mod porting workspace for Create: Limited Draining.
|
||||
|
||||
## Original Project
|
||||
|
||||
- Repository: https://github.com/JasdewStarfield/CreateLimitedDraining
|
||||
- License: MIT License
|
||||
- Copyright: Copyright (c) 2024 Jasdew Starfield
|
||||
- Starting point: published Minecraft 1.20.1 Forge source branch
|
||||
|
||||
## Target
|
||||
|
||||
- Minecraft: 1.21.1
|
||||
- Loader: NeoForge 21.1.x, preferred 21.1.228
|
||||
- Create: 6.0.10
|
||||
- Java: 21
|
||||
- Build: Gradle with ModDevGradle
|
||||
|
||||
## Setup
|
||||
|
||||
Use Java 21 and the project-local Gradle Wrapper.
|
||||
|
||||
```powershell
|
||||
java -version
|
||||
.\gradlew build
|
||||
```
|
||||
|
||||
## Run
|
||||
|
||||
```powershell
|
||||
.\gradlew runClient
|
||||
.\gradlew runServer
|
||||
```
|
||||
|
||||
## Current Status
|
||||
|
||||
This port is a minimal compatibility port. It updates the build system, metadata, NeoForge imports, config registration, and Create mixin method signatures for Minecraft 1.21.1/Create 6.0.10.
|
||||
|
||||
Verification status:
|
||||
|
||||
- `gradlew build`: successful
|
||||
- `gradlew runClient`: successful startup and clean stop in smoke test
|
||||
- `gradlew runServer`: server reached `Done`; stopped after timeout cleanup
|
||||
|
||||
## Known Limitations
|
||||
|
||||
- In-game Hose Pulley behavior still needs manual world testing.
|
||||
- The upstream 1.21.1 branch was checked only as reference and was not blindly copied.
|
||||
- The original logo asset is not included in this first workspace copy; no third-party publication is prepared.
|
||||
104
create-limited-draining/build.gradle
Normal file
104
create-limited-draining/build.gradle
Normal file
@@ -0,0 +1,104 @@
|
||||
plugins {
|
||||
id 'java-library'
|
||||
id 'idea'
|
||||
id 'net.neoforged.moddev' version '2.0.141'
|
||||
}
|
||||
|
||||
version = mod_version
|
||||
group = mod_group_id
|
||||
|
||||
base {
|
||||
archivesName = mod_id
|
||||
}
|
||||
|
||||
java.toolchain.languageVersion = JavaLanguageVersion.of(21)
|
||||
|
||||
repositories {
|
||||
maven { url = 'https://maven.createmod.net' }
|
||||
maven { url = 'https://maven.ithundxr.dev/snapshots' }
|
||||
mavenCentral()
|
||||
}
|
||||
|
||||
neoForge {
|
||||
version = neo_version
|
||||
|
||||
parchment {
|
||||
minecraftVersion = parchment_minecraft_version
|
||||
mappingsVersion = parchment_mappings_version
|
||||
}
|
||||
|
||||
runs {
|
||||
client {
|
||||
client()
|
||||
systemProperty 'neoforge.enabledGameTestNamespaces', project.mod_id
|
||||
}
|
||||
|
||||
server {
|
||||
server()
|
||||
programArgument '--nogui'
|
||||
systemProperty 'neoforge.enabledGameTestNamespaces', project.mod_id
|
||||
}
|
||||
|
||||
gameTestServer {
|
||||
type = 'gameTestServer'
|
||||
systemProperty 'neoforge.enabledGameTestNamespaces', project.mod_id
|
||||
}
|
||||
|
||||
data {
|
||||
data()
|
||||
programArguments.addAll '--mod', project.mod_id, '--all', '--output', file('src/generated/resources/').absolutePath, '--existing', file('src/main/resources/').absolutePath
|
||||
}
|
||||
|
||||
configureEach {
|
||||
systemProperty 'forge.logging.markers', 'REGISTRIES'
|
||||
logLevel = org.slf4j.event.Level.DEBUG
|
||||
}
|
||||
}
|
||||
|
||||
mods {
|
||||
"${mod_id}" {
|
||||
sourceSet(sourceSets.main)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
sourceSets.main.resources { srcDir 'src/generated/resources' }
|
||||
|
||||
configurations {
|
||||
runtimeClasspath.extendsFrom localRuntime
|
||||
}
|
||||
|
||||
dependencies {
|
||||
implementation("com.simibubi.create:create-${minecraft_version}:${create_version}:slim") { transitive = false }
|
||||
implementation("net.createmod.ponder:ponder-neoforge:${ponder_version}+mc${minecraft_version}")
|
||||
compileOnly("dev.engine-room.flywheel:flywheel-neoforge-api-${minecraft_version}:${flywheel_version}")
|
||||
runtimeOnly("dev.engine-room.flywheel:flywheel-neoforge-${minecraft_version}:${flywheel_version}")
|
||||
implementation("com.tterrag.registrate:Registrate:${registrate_version}")
|
||||
}
|
||||
|
||||
var generateModMetadata = tasks.register('generateModMetadata', ProcessResources) {
|
||||
var replaceProperties = [
|
||||
minecraft_version : minecraft_version,
|
||||
minecraft_version_range: minecraft_version_range,
|
||||
neo_version : neo_version,
|
||||
neo_version_range : neo_version_range,
|
||||
loader_version_range : loader_version_range,
|
||||
mod_id : mod_id,
|
||||
mod_name : mod_name,
|
||||
mod_license : mod_license,
|
||||
mod_version : mod_version,
|
||||
mod_authors : mod_authors,
|
||||
mod_description : mod_description
|
||||
]
|
||||
inputs.properties replaceProperties
|
||||
expand replaceProperties
|
||||
from 'src/main/templates'
|
||||
into 'build/generated/sources/modMetadata'
|
||||
}
|
||||
|
||||
sourceSets.main.resources.srcDir generateModMetadata
|
||||
neoForge.ideSyncTask generateModMetadata
|
||||
|
||||
tasks.withType(JavaCompile).configureEach {
|
||||
options.encoding = 'UTF-8'
|
||||
}
|
||||
27
create-limited-draining/gradle.properties
Normal file
27
create-limited-draining/gradle.properties
Normal file
@@ -0,0 +1,27 @@
|
||||
org.gradle.jvmargs=-Xmx3G
|
||||
org.gradle.daemon=false
|
||||
org.gradle.parallel=true
|
||||
org.gradle.caching=true
|
||||
org.gradle.configuration-cache=false
|
||||
|
||||
minecraft_version=1.21.1
|
||||
minecraft_version_range=[1.21.1,1.22)
|
||||
neo_version=21.1.228
|
||||
neo_version_range=[21.1.228,)
|
||||
loader_version_range=[4,)
|
||||
|
||||
parchment_minecraft_version=1.21.1
|
||||
parchment_mappings_version=2024.11.17
|
||||
|
||||
create_version=6.0.10-280
|
||||
ponder_version=1.0.82
|
||||
flywheel_version=1.0.6
|
||||
registrate_version=MC1.21-1.3.0+67
|
||||
|
||||
mod_id=createlimiteddraining
|
||||
mod_name=Create: Limited Draining
|
||||
mod_license=MIT
|
||||
mod_version=1.21.1-0.3.0-port.1
|
||||
mod_group_id=yourscraft.jasdewstarfield
|
||||
mod_authors=Jasdew Starfield; port maintained in Minecraft Renew Mod
|
||||
mod_description=A Create addon that allows pack authors to restrict infinite fluid draining by fluid and biome rules.
|
||||
BIN
create-limited-draining/gradle/wrapper/gradle-wrapper.jar
vendored
Normal file
BIN
create-limited-draining/gradle/wrapper/gradle-wrapper.jar
vendored
Normal file
Binary file not shown.
7
create-limited-draining/gradle/wrapper/gradle-wrapper.properties
vendored
Normal file
7
create-limited-draining/gradle/wrapper/gradle-wrapper.properties
vendored
Normal file
@@ -0,0 +1,7 @@
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
|
||||
networkTimeout=10000
|
||||
validateDistributionUrl=true
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
252
create-limited-draining/gradlew
vendored
Normal file
252
create-limited-draining/gradlew
vendored
Normal file
@@ -0,0 +1,252 @@
|
||||
#!/bin/sh
|
||||
|
||||
#
|
||||
# Copyright © 2015-2021 the original authors.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
# You may obtain a copy of the License at
|
||||
#
|
||||
# https://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
#
|
||||
# SPDX-License-Identifier: Apache-2.0
|
||||
#
|
||||
|
||||
##############################################################################
|
||||
#
|
||||
# Gradle start up script for POSIX generated by Gradle.
|
||||
#
|
||||
# Important for running:
|
||||
#
|
||||
# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
|
||||
# noncompliant, but you have some other compliant shell such as ksh or
|
||||
# bash, then to run this script, type that shell name before the whole
|
||||
# command line, like:
|
||||
#
|
||||
# ksh Gradle
|
||||
#
|
||||
# Busybox and similar reduced shells will NOT work, because this script
|
||||
# requires all of these POSIX shell features:
|
||||
# * functions;
|
||||
# * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
|
||||
# «${var#prefix}», «${var%suffix}», and «$( cmd )»;
|
||||
# * compound commands having a testable exit status, especially «case»;
|
||||
# * various built-in commands including «command», «set», and «ulimit».
|
||||
#
|
||||
# Important for patching:
|
||||
#
|
||||
# (2) This script targets any POSIX shell, so it avoids extensions provided
|
||||
# by Bash, Ksh, etc; in particular arrays are avoided.
|
||||
#
|
||||
# The "traditional" practice of packing multiple parameters into a
|
||||
# space-separated string is a well documented source of bugs and security
|
||||
# problems, so this is (mostly) avoided, by progressively accumulating
|
||||
# options in "$@", and eventually passing that to Java.
|
||||
#
|
||||
# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
|
||||
# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
|
||||
# see the in-line comments for details.
|
||||
#
|
||||
# There are tweaks for specific operating systems such as AIX, CygWin,
|
||||
# Darwin, MinGW, and NonStop.
|
||||
#
|
||||
# (3) This script is generated from the Groovy template
|
||||
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
|
||||
# within the Gradle project.
|
||||
#
|
||||
# You can find Gradle at https://github.com/gradle/gradle/.
|
||||
#
|
||||
##############################################################################
|
||||
|
||||
# Attempt to set APP_HOME
|
||||
|
||||
# Resolve links: $0 may be a link
|
||||
app_path=$0
|
||||
|
||||
# Need this for daisy-chained symlinks.
|
||||
while
|
||||
APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path
|
||||
[ -h "$app_path" ]
|
||||
do
|
||||
ls=$( ls -ld "$app_path" )
|
||||
link=${ls#*' -> '}
|
||||
case $link in #(
|
||||
/*) app_path=$link ;; #(
|
||||
*) app_path=$APP_HOME$link ;;
|
||||
esac
|
||||
done
|
||||
|
||||
# This is normally unused
|
||||
# shellcheck disable=SC2034
|
||||
APP_BASE_NAME=${0##*/}
|
||||
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
|
||||
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
|
||||
' "$PWD" ) || exit
|
||||
|
||||
# Use the maximum available, or set MAX_FD != -1 to use that value.
|
||||
MAX_FD=maximum
|
||||
|
||||
warn () {
|
||||
echo "$*"
|
||||
} >&2
|
||||
|
||||
die () {
|
||||
echo
|
||||
echo "$*"
|
||||
echo
|
||||
exit 1
|
||||
} >&2
|
||||
|
||||
# OS specific support (must be 'true' or 'false').
|
||||
cygwin=false
|
||||
msys=false
|
||||
darwin=false
|
||||
nonstop=false
|
||||
case "$( uname )" in #(
|
||||
CYGWIN* ) cygwin=true ;; #(
|
||||
Darwin* ) darwin=true ;; #(
|
||||
MSYS* | MINGW* ) msys=true ;; #(
|
||||
NONSTOP* ) nonstop=true ;;
|
||||
esac
|
||||
|
||||
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
|
||||
|
||||
|
||||
# Determine the Java command to use to start the JVM.
|
||||
if [ -n "$JAVA_HOME" ] ; then
|
||||
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
|
||||
# IBM's JDK on AIX uses strange locations for the executables
|
||||
JAVACMD=$JAVA_HOME/jre/sh/java
|
||||
else
|
||||
JAVACMD=$JAVA_HOME/bin/java
|
||||
fi
|
||||
if [ ! -x "$JAVACMD" ] ; then
|
||||
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
|
||||
|
||||
Please set the JAVA_HOME variable in your environment to match the
|
||||
location of your Java installation."
|
||||
fi
|
||||
else
|
||||
JAVACMD=java
|
||||
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
|
||||
fi
|
||||
|
||||
# Collect all arguments for the java command, stacking in reverse order:
|
||||
# * args from the command line
|
||||
# * the main class name
|
||||
# * -classpath
|
||||
# * -D...appname settings
|
||||
# * --module-path (only if needed)
|
||||
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
|
||||
|
||||
# For Cygwin or MSYS, switch paths to Windows format before running java
|
||||
if "$cygwin" || "$msys" ; then
|
||||
APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
|
||||
CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
|
||||
|
||||
JAVACMD=$( cygpath --unix "$JAVACMD" )
|
||||
|
||||
# Now convert the arguments - kludge to limit ourselves to /bin/sh
|
||||
for arg do
|
||||
if
|
||||
case $arg in #(
|
||||
-*) false ;; # don't mess with options #(
|
||||
/?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath
|
||||
[ -e "$t" ] ;; #(
|
||||
*) false ;;
|
||||
esac
|
||||
then
|
||||
arg=$( cygpath --path --ignore --mixed "$arg" )
|
||||
fi
|
||||
# Roll the args list around exactly as many times as the number of
|
||||
# args, so each arg winds up back in the position where it started, but
|
||||
# possibly modified.
|
||||
#
|
||||
# NB: a `for` loop captures its iteration list before it begins, so
|
||||
# changing the positional parameters here affects neither the number of
|
||||
# iterations, nor the values presented in `arg`.
|
||||
shift # remove old arg
|
||||
set -- "$@" "$arg" # push replacement arg
|
||||
done
|
||||
fi
|
||||
|
||||
|
||||
# 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" \
|
||||
-classpath "$CLASSPATH" \
|
||||
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.
|
||||
#
|
||||
# In Bash we could simply go:
|
||||
#
|
||||
# readarray ARGS < <( xargs -n1 <<<"$var" ) &&
|
||||
# set -- "${ARGS[@]}" "$@"
|
||||
#
|
||||
# but POSIX shell has neither arrays nor command substitution, so instead we
|
||||
# post-process each arg (as a line of input to sed) to backslash-escape any
|
||||
# character that might be a shell metacharacter, then use eval to reverse
|
||||
# that process (while maintaining the separation between arguments), and wrap
|
||||
# the whole thing up as a single "set" statement.
|
||||
#
|
||||
# This will of course break if any of these variables contains a newline or
|
||||
# an unmatched quote.
|
||||
#
|
||||
|
||||
eval "set -- $(
|
||||
printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
|
||||
xargs -n1 |
|
||||
sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
|
||||
tr '\n' ' '
|
||||
)" '"$@"'
|
||||
|
||||
exec "$JAVACMD" "$@"
|
||||
94
create-limited-draining/gradlew.bat
vendored
Normal file
94
create-limited-draining/gradlew.bat
vendored
Normal file
@@ -0,0 +1,94 @@
|
||||
@rem
|
||||
@rem Copyright 2015 the original author or authors.
|
||||
@rem
|
||||
@rem Licensed under the Apache License, Version 2.0 (the "License");
|
||||
@rem you may not use this file except in compliance with the License.
|
||||
@rem You may obtain a copy of the License at
|
||||
@rem
|
||||
@rem https://www.apache.org/licenses/LICENSE-2.0
|
||||
@rem
|
||||
@rem Unless required by applicable law or agreed to in writing, software
|
||||
@rem distributed under the License is distributed on an "AS IS" BASIS,
|
||||
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
@rem See the License for the specific language governing permissions and
|
||||
@rem limitations under the License.
|
||||
@rem
|
||||
@rem SPDX-License-Identifier: Apache-2.0
|
||||
@rem
|
||||
|
||||
@if "%DEBUG%"=="" @echo off
|
||||
@rem ##########################################################################
|
||||
@rem
|
||||
@rem Gradle startup script for Windows
|
||||
@rem
|
||||
@rem ##########################################################################
|
||||
|
||||
@rem Set local scope for the variables with windows NT shell
|
||||
if "%OS%"=="Windows_NT" setlocal
|
||||
|
||||
set DIRNAME=%~dp0
|
||||
if "%DIRNAME%"=="" set DIRNAME=.
|
||||
@rem This is normally unused
|
||||
set APP_BASE_NAME=%~n0
|
||||
set APP_HOME=%DIRNAME%
|
||||
|
||||
@rem Resolve any "." and ".." in APP_HOME to make it shorter.
|
||||
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
|
||||
|
||||
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
||||
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
|
||||
|
||||
@rem Find java.exe
|
||||
if defined JAVA_HOME goto findJavaFromJavaHome
|
||||
|
||||
set JAVA_EXE=java.exe
|
||||
%JAVA_EXE% -version >NUL 2>&1
|
||||
if %ERRORLEVEL% equ 0 goto execute
|
||||
|
||||
echo. 1>&2
|
||||
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
|
||||
echo. 1>&2
|
||||
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
|
||||
echo location of your Java installation. 1>&2
|
||||
|
||||
goto fail
|
||||
|
||||
:findJavaFromJavaHome
|
||||
set JAVA_HOME=%JAVA_HOME:"=%
|
||||
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
|
||||
|
||||
if exist "%JAVA_EXE%" goto execute
|
||||
|
||||
echo. 1>&2
|
||||
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
|
||||
echo. 1>&2
|
||||
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
|
||||
echo location of your Java installation. 1>&2
|
||||
|
||||
goto fail
|
||||
|
||||
:execute
|
||||
@rem Setup the command line
|
||||
|
||||
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
|
||||
|
||||
|
||||
@rem Execute Gradle
|
||||
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
|
||||
|
||||
:end
|
||||
@rem End local scope for the variables with windows NT shell
|
||||
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!
|
||||
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
|
||||
|
||||
:omega
|
||||
12
create-limited-draining/settings.gradle
Normal file
12
create-limited-draining/settings.gradle
Normal file
@@ -0,0 +1,12 @@
|
||||
pluginManagement {
|
||||
repositories {
|
||||
gradlePluginPortal()
|
||||
maven { url = 'https://maven.neoforged.net/releases' }
|
||||
}
|
||||
}
|
||||
|
||||
plugins {
|
||||
id 'org.gradle.toolchains.foojay-resolver-convention' version '0.8.0'
|
||||
}
|
||||
|
||||
rootProject.name = 'create-limited-draining-port'
|
||||
@@ -0,0 +1,31 @@
|
||||
package yourscraft.jasdewstarfield.createlimiteddraining;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import net.neoforged.bus.api.SubscribeEvent;
|
||||
import net.neoforged.fml.common.EventBusSubscriber;
|
||||
import net.neoforged.fml.event.config.ModConfigEvent;
|
||||
import net.neoforged.neoforge.common.ModConfigSpec;
|
||||
|
||||
@EventBusSubscriber(modid = Createlimiteddraining.MODID, bus = EventBusSubscriber.Bus.MOD)
|
||||
public class Config {
|
||||
private static final ModConfigSpec.Builder BUILDER = new ModConfigSpec.Builder();
|
||||
|
||||
public static final ModConfigSpec.ConfigValue<List<? extends String>> DRAINING_RULES = BUILDER
|
||||
.comment("Define infinite draining groups.")
|
||||
.comment("Format: 'Fluid1, Fluid2... ; Biome1, Biome2...'")
|
||||
.comment("If the fluid is in the left list and the biome is in the right list, it can be drained infinitely.")
|
||||
.comment("This rule is applied before Create's own infinite-draining rule.")
|
||||
.defineList("drainingRules",
|
||||
List.of("#minecraft:lava ; #minecraft:is_nether"),
|
||||
obj -> obj instanceof String);
|
||||
|
||||
static final ModConfigSpec SPEC = BUILDER.build();
|
||||
|
||||
public static List<? extends String> drainingRules = List.of();
|
||||
|
||||
@SubscribeEvent
|
||||
static void onLoad(final ModConfigEvent event) {
|
||||
drainingRules = DRAINING_RULES.get();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,14 @@
|
||||
package yourscraft.jasdewstarfield.createlimiteddraining;
|
||||
|
||||
import net.neoforged.fml.ModContainer;
|
||||
import net.neoforged.fml.common.Mod;
|
||||
import net.neoforged.fml.config.ModConfig;
|
||||
|
||||
@Mod(Createlimiteddraining.MODID)
|
||||
public class Createlimiteddraining {
|
||||
public static final String MODID = "createlimiteddraining";
|
||||
|
||||
public Createlimiteddraining(ModContainer modContainer) {
|
||||
modContainer.registerConfig(ModConfig.Type.COMMON, Config.SPEC);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,7 @@
|
||||
package yourscraft.jasdewstarfield.createlimiteddraining.common;
|
||||
|
||||
public interface HosePulleyAccessor {
|
||||
void createlimiteddraining$setBiomeCheckFailed(boolean failed);
|
||||
|
||||
boolean createlimiteddraining$isBiomeCheckFailed();
|
||||
}
|
||||
@@ -0,0 +1,98 @@
|
||||
package yourscraft.jasdewstarfield.createlimiteddraining.common;
|
||||
|
||||
import java.util.Objects;
|
||||
|
||||
import net.minecraft.core.registries.BuiltInRegistries;
|
||||
import net.minecraft.core.registries.Registries;
|
||||
import net.minecraft.resources.ResourceLocation;
|
||||
import net.minecraft.tags.TagKey;
|
||||
import net.minecraft.world.level.Level;
|
||||
import net.minecraft.world.level.biome.Biome;
|
||||
import net.minecraft.world.level.material.Fluid;
|
||||
import yourscraft.jasdewstarfield.createlimiteddraining.Config;
|
||||
|
||||
public class RuleHandler {
|
||||
public static boolean canDrain(Level level, Fluid fluid, Biome biome) {
|
||||
for (String rule : Config.drainingRules) {
|
||||
String[] parts = rule.split(";");
|
||||
if (parts.length != 2) {
|
||||
continue;
|
||||
}
|
||||
|
||||
String fluidPart = parts[0].trim();
|
||||
String biomePart = parts[1].trim();
|
||||
|
||||
if (matchAny(level, fluid, fluidPart, true)) {
|
||||
return matchAny(level, biome, biomePart, false);
|
||||
}
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
private static boolean matchAny(Level level, Object target, String patternStr, boolean isFluid) {
|
||||
String[] patterns = patternStr.split(",");
|
||||
|
||||
for (String pattern : patterns) {
|
||||
pattern = pattern.trim();
|
||||
if (pattern.isEmpty()) {
|
||||
continue;
|
||||
}
|
||||
|
||||
boolean matched = isFluid
|
||||
? checkFluid((Fluid) target, pattern)
|
||||
: checkBiome(level, (Biome) target, pattern);
|
||||
|
||||
if (matched) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
private static boolean checkFluid(Fluid fluid, String matcher) {
|
||||
if (fluid == null) {
|
||||
return false;
|
||||
}
|
||||
|
||||
if (matcher.startsWith("#")) {
|
||||
ResourceLocation loc = ResourceLocation.tryParse(matcher.substring(1));
|
||||
if (loc == null) {
|
||||
return false;
|
||||
}
|
||||
TagKey<Fluid> tag = TagKey.create(Registries.FLUID, loc);
|
||||
return fluid.builtInRegistryHolder().is(tag);
|
||||
}
|
||||
|
||||
ResourceLocation loc = ResourceLocation.tryParse(matcher);
|
||||
if (loc == null) {
|
||||
return false;
|
||||
}
|
||||
return Objects.equals(BuiltInRegistries.FLUID.getKey(fluid), loc);
|
||||
}
|
||||
|
||||
private static boolean checkBiome(Level level, Biome biome, String matcher) {
|
||||
if (biome == null) {
|
||||
return false;
|
||||
}
|
||||
|
||||
var registry = level.registryAccess().registryOrThrow(Registries.BIOME);
|
||||
|
||||
if (matcher.startsWith("#")) {
|
||||
ResourceLocation loc = ResourceLocation.tryParse(matcher.substring(1));
|
||||
if (loc == null) {
|
||||
return false;
|
||||
}
|
||||
TagKey<Biome> tag = TagKey.create(Registries.BIOME, loc);
|
||||
return registry.getResourceKey(biome)
|
||||
.map(key -> registry.getHolderOrThrow(key).is(tag))
|
||||
.orElse(false);
|
||||
}
|
||||
|
||||
ResourceLocation loc = ResourceLocation.tryParse(matcher);
|
||||
if (loc == null) {
|
||||
return false;
|
||||
}
|
||||
return Objects.equals(registry.getKey(biome), loc);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,36 @@
|
||||
package yourscraft.jasdewstarfield.createlimiteddraining.mixin;
|
||||
|
||||
import com.simibubi.create.content.fluids.transfer.FluidManipulationBehaviour;
|
||||
import net.minecraft.core.BlockPos;
|
||||
import net.minecraft.world.level.Level;
|
||||
import net.minecraft.world.level.biome.Biome;
|
||||
import net.minecraft.world.level.material.Fluid;
|
||||
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 yourscraft.jasdewstarfield.createlimiteddraining.common.HosePulleyAccessor;
|
||||
import yourscraft.jasdewstarfield.createlimiteddraining.common.RuleHandler;
|
||||
|
||||
@Mixin(value = FluidManipulationBehaviour.class, remap = false)
|
||||
public class FluidManipulationBehaviourMixin {
|
||||
@Inject(method = "canDrainInfinitely", at = @At("HEAD"), cancellable = true)
|
||||
private void createlimiteddraining$checkRules(Fluid fluid, CallbackInfoReturnable<Boolean> cir) {
|
||||
FluidManipulationBehaviour instance = (FluidManipulationBehaviour) (Object) this;
|
||||
Level world = instance.getWorld();
|
||||
BlockPos pos = instance.blockEntity.getBlockPos();
|
||||
Biome biome = world.getBiome(pos).value();
|
||||
|
||||
HosePulleyAccessor pulley = instance.blockEntity instanceof HosePulleyAccessor accessor ? accessor : null;
|
||||
boolean allowed = RuleHandler.canDrain(world, fluid, biome);
|
||||
|
||||
if (!allowed) {
|
||||
if (pulley != null) {
|
||||
pulley.createlimiteddraining$setBiomeCheckFailed(true);
|
||||
}
|
||||
cir.setReturnValue(false);
|
||||
} else if (pulley != null) {
|
||||
pulley.createlimiteddraining$setBiomeCheckFailed(false);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,55 @@
|
||||
package yourscraft.jasdewstarfield.createlimiteddraining.mixin;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import com.simibubi.create.content.fluids.hosePulley.HosePulleyBlockEntity;
|
||||
import com.simibubi.create.foundation.item.TooltipHelper;
|
||||
import net.minecraft.core.HolderLookup;
|
||||
import net.minecraft.nbt.CompoundTag;
|
||||
import net.minecraft.network.chat.Component;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.Unique;
|
||||
import org.spongepowered.asm.mixin.injection.At;
|
||||
import org.spongepowered.asm.mixin.injection.Inject;
|
||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
|
||||
import yourscraft.jasdewstarfield.createlimiteddraining.common.HosePulleyAccessor;
|
||||
|
||||
@Mixin(value = HosePulleyBlockEntity.class, remap = false)
|
||||
public class HosePulleyBlockEntityMixin implements HosePulleyAccessor {
|
||||
@Unique
|
||||
private boolean createlimiteddraining$biomeCheckFailed = false;
|
||||
|
||||
@Unique
|
||||
@Override
|
||||
public void createlimiteddraining$setBiomeCheckFailed(boolean failed) {
|
||||
this.createlimiteddraining$biomeCheckFailed = failed;
|
||||
}
|
||||
|
||||
@Unique
|
||||
@Override
|
||||
public boolean createlimiteddraining$isBiomeCheckFailed() {
|
||||
return this.createlimiteddraining$biomeCheckFailed;
|
||||
}
|
||||
|
||||
@Inject(method = "addToGoggleTooltip", at = @At("RETURN"))
|
||||
private void createlimiteddraining$addTooltip(List<Component> tooltip, boolean isPlayerSneaking, CallbackInfoReturnable<Boolean> cir) {
|
||||
if (createlimiteddraining$isBiomeCheckFailed()) {
|
||||
TooltipHelper.addHint(tooltip, "hint.hose_pulley.biome_check_failed");
|
||||
}
|
||||
}
|
||||
|
||||
@Inject(method = "write", at = @At("HEAD"))
|
||||
private void createlimiteddraining$write(CompoundTag compound, HolderLookup.Provider registries, boolean clientPacket, CallbackInfo ci) {
|
||||
if (clientPacket) {
|
||||
compound.putBoolean("BiomeCheckFailed", createlimiteddraining$biomeCheckFailed);
|
||||
}
|
||||
}
|
||||
|
||||
@Inject(method = "read", at = @At("HEAD"))
|
||||
private void createlimiteddraining$read(CompoundTag compound, HolderLookup.Provider registries, boolean clientPacket, CallbackInfo ci) {
|
||||
if (clientPacket) {
|
||||
createlimiteddraining$biomeCheckFailed = compound.getBoolean("BiomeCheckFailed");
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,4 @@
|
||||
{
|
||||
"create.hint.hose_pulley.biome_check_failed": "This fluid does not support infinite draining in the current biome",
|
||||
"create.hint.hose_pulley.biome_check_failed.title": "Cannot drain infinitely"
|
||||
}
|
||||
@@ -0,0 +1,14 @@
|
||||
{
|
||||
"required": true,
|
||||
"minVersion": "0.8",
|
||||
"package": "yourscraft.jasdewstarfield.createlimiteddraining.mixin",
|
||||
"compatibilityLevel": "JAVA_21",
|
||||
"mixins": [
|
||||
"FluidManipulationBehaviourMixin",
|
||||
"HosePulleyBlockEntityMixin"
|
||||
],
|
||||
"client": [],
|
||||
"injectors": {
|
||||
"defaultRequire": 1
|
||||
}
|
||||
}
|
||||
6
create-limited-draining/src/main/resources/pack.mcmeta
Normal file
6
create-limited-draining/src/main/resources/pack.mcmeta
Normal file
@@ -0,0 +1,6 @@
|
||||
{
|
||||
"pack": {
|
||||
"description": "Create: Limited Draining resources",
|
||||
"pack_format": 34
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,37 @@
|
||||
modLoader="javafml"
|
||||
loaderVersion="${loader_version_range}"
|
||||
license="${mod_license}"
|
||||
issueTrackerURL="https://github.com/JasdewStarfield/CreateLimitedDraining/issues"
|
||||
|
||||
[[mods]]
|
||||
modId="${mod_id}"
|
||||
version="${mod_version}"
|
||||
displayName="${mod_name}"
|
||||
displayURL="https://github.com/JasdewStarfield/CreateLimitedDraining"
|
||||
authors="${mod_authors}"
|
||||
description='''${mod_description}'''
|
||||
displayTest="IGNORE_SERVER_VERSION"
|
||||
|
||||
[[mixins]]
|
||||
config="${mod_id}.mixins.json"
|
||||
|
||||
[[dependencies.${mod_id}]]
|
||||
modId="neoforge"
|
||||
type="required"
|
||||
versionRange="${neo_version_range}"
|
||||
ordering="NONE"
|
||||
side="BOTH"
|
||||
|
||||
[[dependencies.${mod_id}]]
|
||||
modId="minecraft"
|
||||
type="required"
|
||||
versionRange="${minecraft_version_range}"
|
||||
ordering="NONE"
|
||||
side="BOTH"
|
||||
|
||||
[[dependencies.${mod_id}]]
|
||||
modId="create"
|
||||
type="required"
|
||||
versionRange="[6.0.10,6.1.0)"
|
||||
ordering="NONE"
|
||||
side="BOTH"
|
||||
Reference in New Issue
Block a user