Skip to content

Commit 916adf6

Browse files
CalbootCalboot
committed
fix
1 parent 769b306 commit 916adf6

10 files changed

Lines changed: 42 additions & 41 deletions

File tree

‎.github/workflows/release.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
- v*.*.*
77

88
env:
9-
JAVA_VERSION: 21
9+
JAVA_VERSION: 25
1010
BUILD_RELEASE: "true"
1111
CURSEFORGE_TOKEN: ${{ secrets.CURSEFORGE_TOKEN }}
1212
MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }}
@@ -29,10 +29,10 @@ jobs:
2929

3030
- uses: actions/checkout@v6
3131

32-
- name: Set up JDK 21
32+
- name: Set up JDK
3333
uses: actions/setup-java@v5
3434
with:
35-
java-version: '21'
35+
java-version: ${{ env.JAVA_VERSION }}
3636
distribution: 'zulu'
3737

3838
- name: Make Gradle Wrapper Executable

‎.run/AuthlibProxyForServer [wrapper].run.xml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,18 @@
1111
<option name="taskNames">
1212
<list>
1313
<option value="wrapper"/>
14-
<option value="--gradle-version=9.2.1"/>
14+
<option value="--gradle-version=9.3.1"/>
1515
</list>
1616
</option>
1717
<option name="vmOptions"/>
1818
</ExternalSystemSettings>
1919
<ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
2020
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
21+
<ExternalSystemDebugDisabled>false</ExternalSystemDebugDisabled>
2122
<DebugAllEnabled>false</DebugAllEnabled>
2223
<RunAsTest>false</RunAsTest>
24+
<GradleProfilingDisabled>false</GradleProfilingDisabled>
25+
<GradleCoverageDisabled>false</GradleCoverageDisabled>
2326
<method v="2"/>
2427
</configuration>
2528
</component>

‎build.gradle.kts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,21 @@ import java.io.OutputStreamWriter
22
import java.net.HttpURLConnection
33

44
plugins {
5-
id("net.fabricmc.fabric-loom-remap") version ("1.15.0-alpha.22") apply (false)
6-
id("net.fabricmc.fabric-loom") version ("1.15.0-alpha.22") apply (false)
5+
id("net.fabricmc.fabric-loom-remap") version ("1.15-SNAPSHOT") apply (false)
6+
id("net.fabricmc.fabric-loom") version ("1.15-SNAPSHOT") apply (false)
77

88
// https://github.com/ReplayMod/preprocessor
99
// https://github.com/Fallen-Breath/preprocessor
1010
id("com.replaymod.preprocess") version ("c5abb4fb12")
1111

1212
// https://github.com/GradleUp/shadow
13-
id("com.gradleup.shadow") version ("9.3.0") apply (false)
13+
id("com.gradleup.shadow") version ("9.3.1") apply (false)
1414

1515
// https://github.com/hierynomus/license-gradle-plugin
1616
id("com.github.hierynomus.license") version ("0.16.1") apply (false)
1717

1818
// https://github.com/firstdarkdev/modpublisher
19-
id("com.hypherionmc.modutils.modpublisher") version ("2.1.8") apply (false)
19+
id("com.hypherionmc.modutils.modpublisher") version ("2.1.8+snapshot.4") apply (false)
2020

2121
`maven-publish`
2222
}

‎changelog.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,8 @@
11
### General
2+
3+
- Support for Minecraft 26.1-snapshot-9
24
- Requires Fabric Loader 0.18.3+
5+
6+
### Bug Fixes
7+
8+
- Unable to join the server in 1.21.11

‎common.gradle.kts‎

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,20 @@ import nl.javadude.gradle.plugins.license.header.HeaderDefinitionBuilder
33
import java.util.Calendar
44

55
plugins {
6-
id("net.fabricmc.fabric-loom") version ("1.15.0-alpha.22")
6+
id("net.fabricmc.fabric-loom") version ("1.15-SNAPSHOT")
77

88
// https://github.com/ReplayMod/preprocessor
99
// https://github.com/Fallen-Breath/preprocessor
1010
id("com.replaymod.preprocess") version ("c5abb4fb12")
1111

1212
// https://github.com/GradleUp/shadow
13-
id("com.gradleup.shadow") version ("9.3.0")
13+
id("com.gradleup.shadow") version ("9.3.1")
1414

1515
// https://github.com/hierynomus/license-gradle-plugin
1616
id("com.github.hierynomus.license") version ("0.16.1")
1717

1818
// https://github.com/firstdarkdev/modpublisher
19-
id("com.hypherionmc.modutils.modpublisher") version ("2.1.8")
19+
id("com.hypherionmc.modutils.modpublisher") version ("2.1.8+snapshot.4")
2020

2121
`maven-publish`
2222
}
@@ -66,23 +66,13 @@ val javaCompatibility = JavaVersion.VERSION_25
6666
val mixinCompatibility = javaCompatibility
6767

6868
loom {
69-
var commonVmArgs = listOf("-Dmixin.debug.export=true")
7069
runConfigs.configureEach {
7170
runDir = "../../run/${mcVersionNumber}"
72-
vmArgs(commonVmArgs)
71+
vmArgs(listOf("-Dmixin.debug.export=true"))
7372
}
7473
runConfigs["server"].apply {
7574
ideConfigGenerated(true)
7675
}
77-
78-
runs {
79-
var auditVmArgs = commonVmArgs
80-
create("serverMixinAudit") {
81-
server()
82-
vmArgs(auditVmArgs)
83-
ideConfigGenerated(false)
84-
}
85-
}
8676
}
8777

8878
preprocess {

‎common.remap.gradle.kts‎

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,20 @@ import nl.javadude.gradle.plugins.license.header.HeaderDefinitionBuilder
33
import java.util.Calendar
44

55
plugins {
6-
id("net.fabricmc.fabric-loom-remap") version ("1.15.0-alpha.22")
6+
id("net.fabricmc.fabric-loom-remap") version ("1.15-SNAPSHOT")
77

88
// https://github.com/ReplayMod/preprocessor
99
// https://github.com/Fallen-Breath/preprocessor
1010
id("com.replaymod.preprocess") version ("c5abb4fb12")
1111

1212
// https://github.com/GradleUp/shadow
13-
id("com.gradleup.shadow") version ("9.3.0")
13+
id("com.gradleup.shadow") version ("9.3.1")
1414

1515
// https://github.com/hierynomus/license-gradle-plugin
1616
id("com.github.hierynomus.license") version ("0.16.1")
1717

1818
// https://github.com/firstdarkdev/modpublisher
19-
id("com.hypherionmc.modutils.modpublisher") version ("2.1.8")
19+
id("com.hypherionmc.modutils.modpublisher") version ("2.1.8+snapshot.4")
2020

2121
`maven-publish`
2222
}
@@ -75,24 +75,14 @@ val javaCompatibility = if (mcVersionNumber >= 12005) {
7575
val mixinCompatibility = javaCompatibility
7676

7777
loom {
78-
var commonVmArgs = listOf("-Dmixin.debug.export=true")
7978
runConfigs.configureEach {
8079
runDir = "../../run/${mcVersionNumber}"
81-
vmArgs(commonVmArgs)
80+
vmArgs(listOf("-Dmixin.debug.export=true"))
8281
}
8382
runConfigs["server"].apply {
8483
ideConfigGenerated(true)
8584
}
8685

87-
runs {
88-
var auditVmArgs = commonVmArgs
89-
create("serverMixinAudit") {
90-
server()
91-
vmArgs(auditVmArgs)
92-
ideConfigGenerated(false)
93-
}
94-
}
95-
9686
mixin.useLegacyMixinAp = true
9787
}
9888

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

‎settings.gradle.kts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@ pluginManagement {
1313
maven {
1414
url = uri("https://maven.firstdark.dev/releases") // For ModPublisher
1515
}
16+
maven {
17+
url = uri("https://maven.firstdark.dev/snapshots")
18+
}
1619
mavenCentral()
1720
gradlePluginPortal()
1821
}

‎src/main/java/com/ayakacraft/authlibproxyforserver/commands/AuthProxyCommand.java‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,11 @@
4646
import static net.minecraft.commands.Commands.argument;
4747
import static net.minecraft.commands.Commands.literal;
4848

49+
//#if MC>=12111
50+
import net.minecraft.commands.Commands;
51+
import net.minecraft.server.permissions.Permission;
52+
//#endif
53+
4954
public final class AuthProxyCommand {
5055

5156
private static final int TCPING_TIMES = 5;
@@ -61,7 +66,10 @@ private static Component li(String str) {
6166

6267
private static boolean hasOpPermissionLevel(CommandSourceStack source) {
6368
//#if MC>=12111
64-
return source.permissions().hasPermission(new net.minecraft.server.permissions.Permission.HasCommandLevel(source.getServer().operatorUserPermissions().level()));
69+
if (source.getServer() == null) { // I DONT UNDERSTAND WHY... MOJANG ALWAYS GIVES US SOME SURPRISES
70+
return Commands.hasPermission(Commands.LEVEL_GAMEMASTERS).test(source);
71+
}
72+
return source.permissions().hasPermission(new Permission.HasCommandLevel(source.getServer().operatorUserPermissions().level()));
6573
//#else
6674
//$$ return source.hasPermission(source.getServer().operatorUserPermissionLevel());
6775
//#endif

‎versions/26.1/gradle.properties‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
# Fabric Properties
2-
# check these on https://fallen-breath.github.io/fabric-versions/?&version=26.1-snapshot-1
3-
minecraft_version=26.1-snapshot-1
2+
# check these on https://fallen-breath.github.io/fabric-versions/?&version=26.1-snapshot-9
3+
minecraft_version=26.1-snapshot-9
44
# Fabric Mod Metadata
55
minecraft_dependency=>1.21.11
66
# Build Information
77
# The target mc versions for the mod during mod publishing, separated with \n
8-
game_versions=26.1
8+
game_versions=26.1-snapshot-9
9+
mod_version_type=beta
910
# Dependencies
1011
# fabric_api_version=0.135.0+1.21.10
1112
# Mod Dependency

0 commit comments

Comments
 (0)