firstdarkdev/CraterLib
1
0
Fork 0
Code Issues 3 Pull Requests Actions Projects Activity

[DEV] Backport fixes from DEV branch.

Browse Source
This commit is contained in:
HypherionSA
2024-07-21 13:15:02 +02:00
parent 134dd86e99
commit 62e532fcc3
70 changed files with 510 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
1.20/Common/src/main/java/com/hypherionmc/craterlib/api/events/server/CraterPlayerEvent.java
View File

@@ -22,12 +22,12 @@ public class CraterPlayerEvent extends CraterEvent {
public PlayerLoggedIn(BridgedPlayer player, boolean isFromVanish) {
super(player);
this.isFromVanish = false;
this.isFromVanish = isFromVanish;
}
}
@Getter @Setter
@Getter
public static class PlayerLoggedOut extends CraterPlayerEvent {
private final boolean isFromVanish;
@@ -37,7 +37,7 @@ public class CraterPlayerEvent extends CraterEvent {
public PlayerLoggedOut(BridgedPlayer player, boolean isFromVanish) {
super(player);
this.isFromVanish = false;
this.isFromVanish = isFromVanish;
}
}

8
1.20/Common/src/main/java/com/hypherionmc/craterlib/core/platform/LoaderType.java Normal file
View File

@@ -0,0 +1,8 @@
package com.hypherionmc.craterlib.core.platform;
public enum LoaderType {
FABRIC,
FORGE,
NEOFORGE,
PAPER
}

3
1.20/Common/src/main/java/com/hypherionmc/craterlib/core/platform/ModloaderEnvironment.java
View File

@@ -12,8 +12,11 @@ public interface ModloaderEnvironment {
public final ModloaderEnvironment INSTANCE = InternalServiceUtil.load(ModloaderEnvironment.class);
@Deprecated(forRemoval = true, since = "2.0.2")
boolean isFabric();
LoaderType getLoaderType();
String getGameVersion();
File getGameFolder();

3
1.20/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java
View File

@@ -11,7 +11,6 @@ import net.minecraft.SharedConstants;
import net.minecraft.Util;
import net.minecraft.network.chat.Component;
import net.minecraft.network.chat.Style;
public class ChatUtils {
private static final GsonComponentSerializer adventureSerializer = GsonComponentSerializer.builder().options(
@@ -52,7 +51,7 @@ public class ChatUtils {
public static String resolve(net.kyori.adventure.text.Component component, boolean formatted) {
Component c = adventureToMojang(component);
String returnVal = ChatFormatting.stripFormatting(c.getString());
String returnVal = ChatFormatting.stripFormatting(DiscordMarkdownStripper.stripMarkdown(c.getString()));
if (formatted) {
returnVal = DiscordSerializer.INSTANCE.serialize(safeCopy(c).copy());

35
1.20/Common/src/main/java/com/hypherionmc/craterlib/utils/DiscordMarkdownStripper.java Normal file
View File

@@ -0,0 +1,35 @@
package com.hypherionmc.craterlib.utils;
import org.jetbrains.annotations.NotNull;
import java.util.regex.Pattern;
public class DiscordMarkdownStripper {
// Patterns for different markdown syntaxes
private static final Pattern BOLD = Pattern.compile("\\*\\*(.*?)\\*\\*");
private static final Pattern ITALIC_UNDERSCORE = Pattern.compile("_(.*?)_");
private static final Pattern ITALIC_ASTERISK = Pattern.compile("\\*(.*?)\\*");
private static final Pattern UNDERLINE = Pattern.compile("__(.*?)__");
private static final Pattern STRIKETHROUGH = Pattern.compile("~~(.*?)~~");
private static final Pattern CODE_BLOCK = Pattern.compile("```(.+?)```", Pattern.DOTALL);
private static final Pattern INLINE_CODE = Pattern.compile("`([^`]*)`");
private static final Pattern BLOCKQUOTE = Pattern.compile("^> (.*?$)", Pattern.MULTILINE);
private static final Pattern MARKDOWN_LINK = Pattern.compile("\\[(.*?)\\]\\((.*?)\\)");
private static final Pattern PLAIN_URL = Pattern.compile("\\b(https?|ftp|file)://[-a-zA-Z0-9+&@#/%?=~_|!:,.;]*[-a-zA-Z0-9+&@#/%=~_|]");
public static String stripMarkdown(@NotNull String text) {
text = BOLD.matcher(text).replaceAll("$1");
text = ITALIC_UNDERSCORE.matcher(text).replaceAll("$1");
text = ITALIC_ASTERISK.matcher(text).replaceAll("$1");
text = UNDERLINE.matcher(text).replaceAll("$1");
text = STRIKETHROUGH.matcher(text).replaceAll("$1");
text = CODE_BLOCK.matcher(text).replaceAll("$1");
text = INLINE_CODE.matcher(text).replaceAll("$1");
text = BLOCKQUOTE.matcher(text).replaceAll("$1");
text = MARKDOWN_LINK.matcher(text).replaceAll("$1");
text = PLAIN_URL.matcher(text).replaceAll("<$0>");
return text;
}
}

6
1.20/Fabric/src/main/java/com/hypherionmc/craterlib/common/FabricLoaderHelper.java
View File

@@ -1,6 +1,7 @@
package com.hypherionmc.craterlib.common;
import com.hypherionmc.craterlib.core.platform.Environment;
import com.hypherionmc.craterlib.core.platform.LoaderType;
import com.hypherionmc.craterlib.core.platform.ModloaderEnvironment;
import net.fabricmc.loader.api.FabricLoader;
import net.minecraft.SharedConstants;
@@ -19,6 +20,11 @@ public class FabricLoaderHelper implements ModloaderEnvironment {
return true;
}
@Override
public LoaderType getLoaderType() {
return LoaderType.FABRIC;
}
@Override
public String getGameVersion() {
return SharedConstants.VERSION_STRING;

6
1.20/Forge/src/main/java/com/hypherionmc/craterlib/common/ForgeLoaderHelper.java
View File

@@ -1,6 +1,7 @@
package com.hypherionmc.craterlib.common;
import com.hypherionmc.craterlib.core.platform.Environment;
import com.hypherionmc.craterlib.core.platform.LoaderType;
import com.hypherionmc.craterlib.core.platform.ModloaderEnvironment;
import net.minecraft.SharedConstants;
import net.minecraft.client.Minecraft;
@@ -23,6 +24,11 @@ public class ForgeLoaderHelper implements ModloaderEnvironment {
return false;
}
@Override
public LoaderType getLoaderType() {
return LoaderType.FORGE;
}
@Override
public String getGameVersion() {
return SharedConstants.VERSION_STRING;

4
1.20/gradle.properties
View File

@@ -1,8 +1,8 @@
#Project
version_major=2
version_minor=0
version_patch=1
version_build=1
version_patch=2
version_build=0
#Mod
mod_author=HypherionSA