Skip to content

upgradle etc, better remap = false usage #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
name: build
on: [ push, pull_request, workflow_dispatch ]
on:
push:
# ignores tags
branches:
- "**"
pull_request:
workflow_dispatch:

jobs:
build:
Expand All @@ -8,18 +14,12 @@ jobs:
- name: checkout repository
uses: actions/checkout@v4
- name: validate gradle wrapper
uses: gradle/wrapper-validation-action@v1
- name: setup java
uses: actions/setup-java@v4
with:
distribution: "temurin"
java-version: 17
uses: gradle/actions/wrapper-validation@v4
- name: build
run: |
chmod +x ./gradlew
./gradlew build
- name: upload artifacts
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
path: build/libs/

2 changes: 1 addition & 1 deletion 1.12/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
minecraft_version=1.12
yarn_build=542
yarn_build=566
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ private int setSpawnX(Random random, int bounds, Operation<Integer> original, @L

if (((MinecraftServerExtended) server).setspawnmod$shouldModifySpawn()) {
((MinecraftServerExtended) server).setspawnmod$setShouldModifySpawn(false);
seed.set(SetSpawn.findSeedObjectFromLong(server.method_0_6351().method_8412()));
seed.set(SetSpawn.findSeedObjectFromLong(server.getWorld().method_8412()));
}
Seed seedObject = seed.get();
if (seedObject == null) {
Expand Down
2 changes: 1 addition & 1 deletion 1.13.x/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
minecraft_version=1.13.2
yarn_build=541
yarn_build=565
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ private boolean checkIfNewWorld(boolean initialized) {
@Group
// method_3786 -> createWorlds
// LevelProperties#isInitialized
@ModifyExpressionValue(method = "method_3786(Lnet/minecraft/class_29;Lnet/minecraft/class_31;Lnet/minecraft/class_1940;Lnet/minecraft/class_3949;)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/class_31;method_222()Z", remap = false), require = 0)
@ModifyExpressionValue(method = "method_3786(Lnet/minecraft/class_29;Lnet/minecraft/class_31;Lnet/minecraft/class_1940;Lnet/minecraft/class_3949;)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/class_31;method_222()Z"), require = 0, remap = false)
private boolean checkIfNewWorld2(boolean initialized) {
this.shouldModifySpawn = !initialized;
return initialized;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ private void sendErrorMessage(CallbackInfo ci) {

@Dynamic
@Group
@Inject(method = "method_14235(Lnet/minecraft/class_1703;)V", at = @At("TAIL"), require = 0)
@Inject(method = "method_14235(Lnet/minecraft/class_1703;)V", at = @At("TAIL"), require = 0, remap = false)
private void sendErrorMessage2(CallbackInfo ci) {
if (this.setSpawnError != null) {
this.sendMessage(new LiteralText(this.setSpawnError + " This run is not verifiable.").formatted(Formatting.RED), false);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ private void failOnNonRandomSpawns(CallbackInfo ci, @Share("seed") LocalRef<Seed
@At(value = "INVOKE", target = "Lnet/minecraft/class_3218;method_8587(Lnet/minecraft/class_1297;Lnet/minecraft/class_238;)Z", ordinal = 1),
@At(value = "INVOKE", target = "Lnet/minecraft/class_3222;method_61274(Lnet/minecraft/class_3218;Lnet/minecraft/class_238;)Z", ordinal = 1)
},
require = 0, allow = 1
require = 0, allow = 1, remap = false
)
private void failOnNonRandomSpawns2(CallbackInfoReturnable<Boolean> cir, @Share("seed") LocalRef<Seed> seed, @Share("isRandomSpawn") LocalBooleanRef isRandomSpawn) {
if (!isRandomSpawn.get() && seed.get() != null) {
Expand Down
2 changes: 1 addition & 1 deletion 1.3-1.5.2/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
minecraft_version=1.3.2
yarn_build=541
yarn_build=565
2 changes: 1 addition & 1 deletion 1.6.x/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
minecraft_version=1.6.4
yarn_build=541
yarn_build=565
2 changes: 1 addition & 1 deletion 1.7.x/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
minecraft_version=1.7.10
yarn_build=541
yarn_build=565
2 changes: 1 addition & 1 deletion 1.8-1.12.2/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
minecraft_version=1.12.2
yarn_build=541
yarn_build=565
1 change: 0 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,4 @@ dependencies {
minecraft libs.minecraft
mappings variantOf(libs.yarn.mappings) { classifier "v2" }
modImplementation libs.fabric.loader
vineflowerDecompilerClasspath libs.vineflower
}
2 changes: 1 addition & 1 deletion buildSrc/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ repositories {
mavenCentral()
gradlePluginPortal()
maven { url "https://maven.fabricmc.net" }
maven { url "https://repo.legacyfabric.net/repository/legacyfabric" }
maven { url "https://maven.legacyfabric.net" }
}

dependencies {
Expand Down
4 changes: 2 additions & 2 deletions buildSrc/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
loom_version=1.7-SNAPSHOT
legacy_looming_version=1.7-SNAPSHOT
loom_version=1.10-SNAPSHOT
legacy_looming_version=1.10-SNAPSHOT
6 changes: 2 additions & 4 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
[versions]
minecraft = "1.16.1"
yarn_mappings = "1.16.1-build.22"
fabric_loader = "0.16.0"
vineflower = "1.10.1"
yarn_mappings = "1.16.1-build.28"
fabric_loader = "0.16.10"

[libraries]
minecraft = { module = "com.mojang:minecraft", version.ref = "minecraft" }
yarn_mappings = { module = "dev.tildejustin:yarn", version.ref = "yarn_mappings" }
fabric_loader = { module = "net.fabricmc:fabric-loader", version.ref = "fabric_loader" }
vineflower = { module = "org.vineflower:vineflower", version.ref = "vineflower" }
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-all.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
5 changes: 2 additions & 3 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,7 @@ done
# 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
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
Expand Down Expand Up @@ -206,7 +205,7 @@ fi
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,
# * DEFAULT_JVM_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.
Expand Down
2 changes: 0 additions & 2 deletions settings.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
pluginManagement {
repositories {
maven { url "https://maven.fabricmc.net" }
maven { url "https://repo.legacyfabric.net/repository/legacyfabric" }
maven { url "https://jitpack.io" }
mavenCentral()
gradlePluginPortal()
Expand Down