Skip to content
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.

Sign up for GitHub

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

Update to 1.20.4 #7

Merged
merged 4 commits into from
Feb 1, 2024
Merged

Update to 1.20.4 #7

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c3a49f1
Update Gradle + dependencies
unilock Feb 1, 2024
8ccd114
Update to 1.20.4
unilock Feb 1, 2024
b156f2a
Add Unique annotation where missing
unilock Feb 1, 2024
874e66f
Mark compatible with 1.20.3+
Ampflower Feb 1, 2024
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
16 changes: 15 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ build/
out/
classes/

# eclipse

*.launch

# idea

.idea/
Expand All @@ -20,7 +24,17 @@ bin/
.classpath
.project

# macos

*.DS_Store

# fabric

run/
remappedSrc

# java

hs_err_*.log
replay_*.log
*.hprof
*.jfr
Binary file modified gradle/wrapper/gradle-wrapper.jar
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
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.3-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
14 changes: 7 additions & 7 deletions gradlew
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,15 +145,15 @@ 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=SC3045
# 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=SC3045
# shellcheck disable=SC2039,SC3045
ulimit -n "$MAX_FD" ||
warn "Could not set maximum file descriptor limit to $MAX_FD"
esac
Expand Down Expand Up @@ -202,11 +202,11 @@ 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, 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.
# 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" \
Expand Down
10 changes: 5 additions & 5 deletions libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
[versions]

# Minecraft
minecraft_version = "1.20.2"
minecraft_required = "1.20.2-"
minecraft_compatible = "1.20.2"
minecraft_version = "1.20.4"
minecraft_required = "1.20.4-"
minecraft_compatible = "1.20.4"
Ampflower marked this conversation as resolved.
Show resolved Hide resolved

fabric_loader = "0.14.21"
fabric_loader = "0.14.25"

# Libraries
annotations = "24.0.1"
annotations = "24.1.0"

# Plugins
loom = "1.+"
Expand Down
2 changes: 2 additions & 0 deletions src/main/java/tfar/fastbench/mixin/CraftingContainerMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
import org.spongepowered.asm.mixin.Final;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.Unique;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Redirect;
import tfar.fastbench.interfaces.CraftingInventoryDuck;
Expand All @@ -42,6 +43,7 @@ public class CraftingContainerMixin implements CraftingInventoryDuck {
@Shadow
@Final
private AbstractContainerMenu menu;
@Unique
public boolean checkMatrixChanges = true;


Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/fabric.mod.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"quickbench.mixins.json"
],
"depends": {
"fabricloader": ">=0.7.2",
"fabricloader": "*",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not exactly a needed change; if anything it probably should be vbump'd forward rather than requiring any version of loader

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I agree that the change wasn't needed. It probably should've at least been bumped to >=0.14.0?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah; it'll do for now at least, nothing required in a terribly specific version of the loader.

"minecraft": ">=${minecraftRequired}"
},
"custom": {
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/quickbench.mixins.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"required": true,
"package": "tfar.fastbench.mixin",
"compatibilityLevel": "JAVA_16",
"compatibilityLevel": "JAVA_17",
"mixins": [
"ContainerAccessor",
"CraftingContainerMixin",
Expand Down
Loading