Skip to content

Commit 459d6e5

Browse files
BacteriawaBacteriawa
committed
Update Leaavesclip
1 parent cfd8e3c commit 459d6e5

24 files changed

Lines changed: 60 additions & 41 deletions

‎build.gradle.kts‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,13 @@ publishing {
117117
}
118118

119119
repositories {
120-
maven("https://repo.menthamc.org/repository/maven-snapshots/") {
120+
val url = if (isSnapshot) {
121+
"https://repo.menthamc.org/repository/maven-snapshots/"
122+
} else {
123+
"https://repo.menthamc.org/repository/maven-releases/"
124+
}
125+
126+
maven(url) {
121127
name = "MenthaMC"
122128
credentials(PasswordCredentials::class) {
123129
username = System.getenv("PRIVATE_MAVEN_REPO_USERNAME")

‎gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
group = dev.menthamc
2-
version = 3.0.10-SNAPSHOT
2+
version = 3.0.11
33
description = Launcher for the Mint Minecraft server

‎java21/build.gradle.kts‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,17 @@ repositories {
2424
}
2525

2626
dependencies {
27+
@Suppress("VulnerableLibrariesLocal", "RedundantSuppression")
2728
implementation("io.sigpipe:jbsdiff:1.0")
2829
implementation("com.google.code.gson:gson:2.10.1")
2930
implementation("org.leavesmc:leaves-plugin-mixin-condition:1.0.0")
30-
implementation("io.github.llamalad7:mixinextras-common:0.4.1")
31+
implementation("io.github.llamalad7:mixinextras-common:0.5.0")
3132
implementation("net.fabricmc:access-widener:2.1.0")
32-
implementation("net.fabricmc:sponge-mixin:0.16.4+mixin.0.8.7") {
33+
implementation("net.fabricmc:sponge-mixin:0.16.5+mixin.0.8.7") {
3334
exclude(group = "com.google.code.gson", module = "gson")
3435
exclude(group = "com.google.guava", module = "guava")
3536
}
36-
implementation("com.google.code.gson:gson:2.13.1")
37+
implementation("com.google.code.gson:gson:2.13.2")
3738
implementation("org.jetbrains:annotations:15.0")
3839
}
3940

‎java21/src/main/java/dev/menthamc/lightclip/Lightclip.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ private static void overrideAsmVersion() {
187187
Class<?> asmClass = Class.forName("org.spongepowered.asm.util.asm.ASM");
188188
Field minorVersionField = asmClass.getDeclaredField("implMinorVersion");
189189
minorVersionField.setAccessible(true);
190-
minorVersionField.setInt(null, 5);
190+
minorVersionField.setInt(null, 8);
191191

192192
} catch (Exception e) {
193193
logger.error("Failed to override asm version", e);

‎java21/src/main/java/dev/menthamc/lightclip/PatchEntry.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
package dev.menthamc.lightclip;
1111

12-
import dev.menthamc.lightclip.integrated.leavesclip.mixin.MixinURLClassLoader;
12+
import org.leavesmc.leavesclip.mixin.MixinURLClassLoader;
1313
import io.sigpipe.jbsdiff.InvalidHeaderException;
1414
import io.sigpipe.jbsdiff.Patch;
1515
import java.io.BufferedOutputStream;

‎java21/src/main/java/dev/menthamc/lightclip/Util.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import com.google.gson.JsonObject;
44
import com.google.gson.JsonParser;
5-
import dev.menthamc.lightclip.integrated.leavesclip.mixin.MixinURLClassLoader;
5+
import org.leavesmc.leavesclip.mixin.MixinURLClassLoader;
66

77
import java.io.IOException;
88
import java.io.InputStream;

java21/src/main/java/dev/menthamc/lightclip/integrated/leavesclip/logger/Logger.java renamed to java21/src/main/java/org.leavesmc/leavesclip/logger/Logger.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package dev.menthamc.lightclip.integrated.leavesclip.logger;
1+
package org.leavesmc.leavesclip.logger;
22

33
import org.spongepowered.asm.logging.ILogger;
44

java21/src/main/java/dev/menthamc/lightclip/integrated/leavesclip/logger/SimpleLogger.java renamed to java21/src/main/java/org.leavesmc/leavesclip/logger/SimpleLogger.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package dev.menthamc.lightclip.integrated.leavesclip.logger;
1+
package org.leavesmc.leavesclip.logger;
22

33
import org.jetbrains.annotations.NotNull;
44
import org.spongepowered.asm.logging.Level;

java21/src/main/java/dev/menthamc/lightclip/integrated/leavesclip/mixin/AccessWidenerManager.java renamed to java21/src/main/java/org.leavesmc/leavesclip/mixin/AccessWidenerManager.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package dev.menthamc.lightclip.integrated.leavesclip.mixin;
1+
package org.leavesmc.leavesclip.mixin;
22

3-
import dev.menthamc.lightclip.integrated.leavesclip.logger.Logger;
4-
import dev.menthamc.lightclip.integrated.leavesclip.logger.SimpleLogger;
3+
import org.leavesmc.leavesclip.logger.Logger;
4+
import org.leavesmc.leavesclip.logger.SimpleLogger;
55
import net.fabricmc.accesswidener.AccessWidener;
66
import net.fabricmc.accesswidener.AccessWidenerClassVisitor;
77
import net.fabricmc.accesswidener.AccessWidenerReader;

java21/src/main/java/dev/menthamc/lightclip/integrated/leavesclip/mixin/LeavesPluginMeta.java renamed to java21/src/main/java/org.leavesmc/leavesclip/mixin/LeavesPluginMeta.java

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
package dev.menthamc.lightclip.integrated.leavesclip.mixin;
1+
package org.leavesmc.leavesclip.mixin;
22

33
import com.google.gson.annotations.SerializedName;
44

55
import java.io.File;
66
import java.util.List;
77

8-
import static dev.menthamc.lightclip.integrated.leavesclip.mixin.PluginResolver.MIXINS_DIRECTORY;
9-
import static dev.menthamc.lightclip.integrated.leavesclip.mixin.PluginResolver.MIXINS_JAR_SUFFIX;
8+
import static org.leavesmc.leavesclip.mixin.PluginResolver.MIXINS_DIRECTORY;
9+
import static org.leavesmc.leavesclip.mixin.PluginResolver.MIXINS_JAR_SUFFIX;
1010

1111
@SuppressWarnings("unused")
1212
public class LeavesPluginMeta {
@@ -66,5 +66,9 @@ public String getAccessWidener() {
6666
public void setAccessWidener(String accessWidener) {
6767
this.accessWidener = accessWidener;
6868
}
69+
70+
public boolean isValid() {
71+
return packageName != null;
72+
}
6973
}
7074
}

0 commit comments

Comments
 (0)