frogmc/FrogLoader
6
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

move maven group/package

Browse source
This commit is contained in:
moehreag 2024-06-02 16:42:13 +02:00
parent 36260356e2
commit a62114b201
43 changed files with 134 additions and 167 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
build.gradle.kts
View file

@ -5,17 +5,17 @@ plugins {
`maven-publish`
}
group = "org.ecorous.esnesnon"
group = "org.ecorous.frogmc"
version = "0.0.1-SNAPSHOT"
repositories {
maven {
name = "Esnesnon Maven/Snapshots"
url = uri("https://maven-esnesnon.ecorous.org/snapshots")
name = "FrogMC Maven/Snapshots"
url = uri("https://maven-frogmc.ecorous.org/snapshots")
}
maven {
name = "Esnesnon Maven/Releases"
url = uri("https://maven-esnesnon.ecorous.org/releases")
name = "FrogMC Maven/Releases"
url = uri("https://maven-frogmc.ecorous.org/releases")
}
maven("https://maven.fabricmc.net/")
maven("https://repo.spongepowered.org/maven")
@ -23,7 +23,7 @@ repositories {
}
dependencies {
implementation(libs.remapper){
implementation(libs.thyroxine){
isTransitive = false
}
compileOnly("org.apache.logging.log4j:log4j-slf4j2-impl:3.0.0-beta2")
@ -57,8 +57,8 @@ publishing {
repositories {
maven {
name = "EsnesnonSnapshotsMaven"
url = uri("https://maven-esnesnon.ecorous.org/snapshots")
name = "FrogMCSnapshotsMaven"
url = uri("https://maven-frogmc.ecorous.org/snapshots")
credentials(PasswordCredentials::class)
authentication {
create<BasicAuthentication>("basic")
@ -66,8 +66,8 @@ publishing {
}
maven {
name = "EsnesnonReleasesMaven"
url = uri("https://maven-esnesnon.ecorous.org/releases")
name = "FrogMCReleasesMaven"
url = uri("https://maven-frogmc.ecorous.org/releases")
credentials(PasswordCredentials::class)
authentication {
create<BasicAuthentication>("basic")

4
gradle/libs.versions.toml
View file

@ -1,13 +1,13 @@
[versions]
remapper = "1.0.0-SNAPSHOT"
thyroxine = "1.0.0-SNAPSHOT"
nightconfig = "3.7.2"
mixin = "0.13.4+mixin.0.8.5"
annotations = "24.1.0"
[libraries]
remapper = { module = "org.ecorous.esnesnon:nonsense-remapper", version.ref = "remapper" }
thyroxine = { module = "org.ecorous.frogmc:thyroxine", version.ref = "thyroxine" }
nightconfig = { module = "com.electronwill.night-config:toml", version.ref = "nightconfig" }
mixin = { module = "net.fabricmc:sponge-mixin", version.ref = "mixin" }
annotations = { module = "org.jetbrains:annotations", version.ref = "annotations" }

12
minecraft/build.gradle.kts
View file

@ -1,18 +1,18 @@
import org.ecorous.esnesnon.gradle.ext.minecraft
import org.ecorous.frogmc.phytotelma.ext.minecraft
plugins {
java
id("org.ecorous.esnesnon.phytotelma") version "0.0.1-SNAPSHOT"
id("org.ecorous.frogmc.phytotelma") version "0.0.1-SNAPSHOT"
}
repositories {
maven {
name = "Esnesnon Maven/Snapshots"
url = uri("https://maven-esnesnon.ecorous.org/snapshots")
name = "FrogMC Maven/Snapshots"
url = uri("https://maven-frogmc.ecorous.org/snapshots")
}
maven {
name = "Esnesnon Maven/Releases"
url = uri("https://maven-esnesnon.ecorous.org/releases")
name = "FrogMC Maven/Releases"
url = uri("https://maven-frogmc.ecorous.org/releases")
}
mavenCentral()
}

4
minecraft/src/main/java/org/ecorous/esnesnon/nonsense/loader/example/ExamplePreLaunchExtension.java → minecraft/src/main/java/org/ecorous/frogmc/frogloader/example/ExamplePreLaunchExtension.java
View file

@ -1,6 +1,6 @@
package org.ecorous.esnesnon.nonsense.loader.example;
package org.ecorous.frogmc.frogloader.example;
import org.ecorous.esnesnon.nonsense.loader.api.extensions.PreLaunchExtension;
import org.ecorous.frogmc.frogloader.api.extensions.PreLaunchExtension;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

2
minecraft/src/main/java/org/ecorous/esnesnon/nonsense/loader/example/mixin/TitleScreenMixin.java → minecraft/src/main/java/org/ecorous/frogmc/frogloader/example/mixin/TitleScreenMixin.java
View file

@ -1,4 +1,4 @@
package org.ecorous.esnesnon.nonsense.loader.example.mixin;
package org.ecorous.frogmc.frogloader.example.mixin;
import net.minecraft.client.gui.components.FocusableTextWidget;
import net.minecraft.client.gui.screens.Screen;

4
minecraft/src/main/resources/example_mod.mixins.json
View file

@ -1,11 +1,11 @@
{
"required": true,
"minVersion": "0.8",
"package": "org.ecorous.esnesnon.nonsense.loader.example.mixin",
"package": "org.ecorous.frogmc.frogloader.example.mixin",
"compatibilityLevel": "JAVA_21",
"mixins": [],
"client": [
"TitleScreenMixin"
"TitleScreenMixin"
],
"injectors": {
"defaultRequire": 1

2
minecraft/src/main/resources/frog.mod.toml
View file

@ -19,7 +19,7 @@ breaks = [
]
[frog.extensions]
pre_launch = "org.ecorous.esnesnon.nonsense.loader.example.ExamplePreLaunchExtension"
pre_launch = "example.org.ecorous.frogmc.frogloader.ExamplePreLaunchExtension"
mixin_config = "example_mod.mixins.json"
frog_aw = "example_mod.accesswidener"

8
settings.gradle.kts
View file

@ -1,12 +1,12 @@
pluginManagement {
repositories {
maven {
name = "Esnesnos Maven Releases"
url = uri("https://maven-esnesnon.ecorous.org/releases")
name = "FrogMC Maven Releases"
url = uri("https://maven-frogmc.ecorous.org/releases")
}
maven {
name = "Esnesnos Maven Snapshots"
url = uri("https://maven-esnesnon.ecorous.org/snapshots")
name = "FrogMC Maven Snapshots"
url = uri("https://maven-frogmc.ecorous.org/snapshots")
}
gradlePluginPortal()
}

37
src/main/java/org/ecorous/esnesnon/nonsense/loader/api/mod/ModCredits.java
View file

@ -1,37 +0,0 @@
package org.ecorous.esnesnon.nonsense.loader.api.mod;
import java.util.*;
import org.jetbrains.annotations.NotNull;
public final class ModCredits {
public static ModCredits of(Map<String, Collection<String>> credits){
return new ModCredits(credits);
}
private final Map<String, Collection<String>> credits;
private ModCredits(Map<String, Collection<String>> credits){
this.credits = credits;
}
public Collection<String> getEntries(){
return credits.keySet();
}
public Collection<String> getRoles(String name){
return credits.getOrDefault(name, Collections.emptySet());
}
public int size() {
return credits.size();
}
public boolean isEmpty() {
return credits.isEmpty();
}
public @NotNull Set<Map.Entry<String, Collection<String>>> entrySet() {
return credits.entrySet();
}
}

11
src/main/java/org/ecorous/esnesnon/nonsense/loader/impl/launch/client/NonsenseClient.java
View file

@ -1,11 +0,0 @@
package org.ecorous.esnesnon.nonsense.loader.impl.launch.client;
import org.ecorous.esnesnon.nonsense.loader.impl.launch.Launcher;
import org.ecorous.esnesnon.nonsense.loader.api.env.Env;
public class NonsenseClient {
public static void main(String[] args){
Launcher.run(args, Env.CLIENT);
}
}

11
src/main/java/org/ecorous/esnesnon/nonsense/loader/impl/launch/server/NonsenseServer.java
View file

@ -1,11 +0,0 @@
package org.ecorous.esnesnon.nonsense.loader.impl.launch.server;
import org.ecorous.esnesnon.nonsense.loader.impl.launch.Launcher;
import org.ecorous.esnesnon.nonsense.loader.api.env.Env;
public class NonsenseServer {
public static void main(String[] args){
Launcher.run(args, Env.SERVER);
}
}

14
src/main/java/org/ecorous/esnesnon/nonsense/loader/impl/mod/ModPropertiesImpl.java
View file

@ -1,14 +0,0 @@
package org.ecorous.esnesnon.nonsense.loader.impl.mod;
import java.util.Collection;
import java.util.Map;
import org.ecorous.esnesnon.nonsense.loader.api.mod.ModDependencies;
import org.ecorous.esnesnon.nonsense.loader.api.mod.ModExtensions;
import org.ecorous.esnesnon.nonsense.loader.api.mod.ModProperties;
import org.ecorous.esnesnon.nonsense.loader.api.mod.SemVer;
public record ModPropertiesImpl(String id, String name, SemVer version, String license,
Map<String, Collection<String>> credits, ModDependencies dependencies,
ModExtensions extensions) implements ModProperties {
}

10
src/main/java/org/ecorous/esnesnon/nonsense/loader/api/Loader.java → src/main/java/org/ecorous/frogmc/frogloader/api/Loader.java
View file

@ -1,13 +1,13 @@
package org.ecorous.esnesnon.nonsense.loader.api;
package org.ecorous.frogmc.frogloader.api;
import java.nio.file.Path;
import java.util.List;
import java.util.Optional;
import org.ecorous.esnesnon.nonsense.loader.api.env.Env;
import org.ecorous.esnesnon.nonsense.loader.api.mod.ModProperties;
import org.ecorous.esnesnon.nonsense.loader.impl.LoaderImpl;
import org.ecorous.esnesnon.nonsense.loader.impl.plugin.NonsensePlugin;
import org.ecorous.frogmc.frogloader.api.env.Env;
import org.ecorous.frogmc.frogloader.api.mod.ModProperties;
import org.ecorous.frogmc.frogloader.impl.LoaderImpl;
import org.ecorous.frogmc.frogloader.impl.plugin.NonsensePlugin;
public interface Loader {

2
src/main/java/org/ecorous/esnesnon/nonsense/loader/api/env/Env.java → src/main/java/org/ecorous/frogmc/frogloader/api/env/Env.java vendored
View file

@ -1,4 +1,4 @@
package org.ecorous.esnesnon.nonsense.loader.api.env;
package org.ecorous.frogmc.frogloader.api.env;
import lombok.AllArgsConstructor;
import lombok.Getter;

4
src/main/java/org/ecorous/esnesnon/nonsense/loader/api/extensions/PreLaunchExtension.java → src/main/java/org/ecorous/frogmc/frogloader/api/extensions/PreLaunchExtension.java
View file

@ -1,6 +1,6 @@
package org.ecorous.esnesnon.nonsense.loader.api.extensions;
package org.ecorous.frogmc.frogloader.api.extensions;
import org.ecorous.esnesnon.nonsense.loader.impl.mod.BuiltinExtensions;
import org.ecorous.frogmc.frogloader.impl.mod.BuiltinExtensions;
/**
* The Pre-Launch Extension.

2
src/main/java/org/ecorous/esnesnon/nonsense/loader/api/mod/ModDependencies.java → src/main/java/org/ecorous/frogmc/frogloader/api/mod/ModDependencies.java
View file

@ -1,4 +1,4 @@
package org.ecorous.esnesnon.nonsense.loader.api.mod;
package org.ecorous.frogmc.frogloader.api.mod;
import java.util.*;

2
src/main/java/org/ecorous/esnesnon/nonsense/loader/api/mod/ModExtensions.java → src/main/java/org/ecorous/frogmc/frogloader/api/mod/ModExtensions.java
View file

@ -1,4 +1,4 @@
package org.ecorous.esnesnon.nonsense.loader.api.mod;
package org.ecorous.frogmc.frogloader.api.mod;
import java.lang.invoke.MethodHandle;
import java.lang.invoke.MethodHandles;

2
src/main/java/org/ecorous/esnesnon/nonsense/loader/api/mod/ModProperties.java → src/main/java/org/ecorous/frogmc/frogloader/api/mod/ModProperties.java
View file

@ -1,4 +1,4 @@
package org.ecorous.esnesnon.nonsense.loader.api.mod;
package org.ecorous.frogmc.frogloader.api.mod;
import java.util.Collection;
import java.util.Map;

2
src/main/java/org/ecorous/esnesnon/nonsense/loader/api/mod/SemVer.java → src/main/java/org/ecorous/frogmc/frogloader/api/mod/SemVer.java
View file

@ -1,4 +1,4 @@
package org.ecorous.esnesnon.nonsense.loader.api.mod;
package org.ecorous.frogmc.frogloader.api.mod;
public interface SemVer extends Comparable<SemVer> {
int major();

2
src/main/java/org/ecorous/esnesnon/nonsense/loader/impl/Discovery.java → src/main/java/org/ecorous/frogmc/frogloader/impl/Discovery.java
View file

@ -1,4 +1,4 @@
package org.ecorous.esnesnon.nonsense.loader.impl;
package org.ecorous.frogmc.frogloader.impl;
import java.io.IOException;
import java.nio.file.FileVisitResult;

14
src/main/java/org/ecorous/esnesnon/nonsense/loader/impl/LoaderImpl.java → src/main/java/org/ecorous/frogmc/frogloader/impl/LoaderImpl.java
View file

@ -1,4 +1,4 @@
package org.ecorous.esnesnon.nonsense.loader.impl;
package org.ecorous.frogmc.frogloader.impl;
import java.io.*;
import java.lang.invoke.MethodHandle;
@ -11,12 +11,12 @@ import java.util.*;
import java.util.stream.Collectors;
import com.google.gson.Gson;
import org.ecorous.esnesnon.nonsense.loader.api.Loader;
import org.ecorous.esnesnon.nonsense.loader.api.env.Env;
import org.ecorous.esnesnon.nonsense.loader.api.mod.ModProperties;
import org.ecorous.esnesnon.nonsense.loader.impl.launch.MixinClassLoader;
import org.ecorous.esnesnon.nonsense.loader.impl.mod.ModUtil;
import org.ecorous.esnesnon.nonsense.loader.impl.plugin.NonsensePlugin;
import org.ecorous.frogmc.frogloader.api.Loader;
import org.ecorous.frogmc.frogloader.api.env.Env;
import org.ecorous.frogmc.frogloader.api.mod.ModProperties;
import org.ecorous.frogmc.frogloader.impl.launch.MixinClassLoader;
import org.ecorous.frogmc.frogloader.impl.mod.ModUtil;
import org.ecorous.frogmc.frogloader.impl.plugin.NonsensePlugin;
import lombok.Getter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

2
src/main/java/org/ecorous/esnesnon/nonsense/loader/impl/SemVerParseException.java → src/main/java/org/ecorous/frogmc/frogloader/impl/SemVerParseException.java
View file

@ -1,4 +1,4 @@
package org.ecorous.esnesnon.nonsense.loader.impl;
package org.ecorous.frogmc.frogloader.impl;
import java.io.IOException;

2
src/main/java/org/ecorous/esnesnon/nonsense/loader/impl/launch/AccessWidener.java → src/main/java/org/ecorous/frogmc/frogloader/impl/launch/AccessWidener.java
View file

@ -1,4 +1,4 @@
package org.ecorous.esnesnon.nonsense.loader.impl.launch;
package org.ecorous.frogmc.frogloader.impl.launch;
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;

8
src/main/java/org/ecorous/esnesnon/nonsense/loader/impl/launch/Launcher.java → src/main/java/org/ecorous/frogmc/frogloader/impl/launch/Launcher.java
View file

@ -1,4 +1,4 @@
package org.ecorous.esnesnon.nonsense.loader.impl.launch;
package org.ecorous.frogmc.frogloader.impl.launch;
import java.lang.invoke.MethodHandle;
import java.lang.invoke.MethodHandles;
@ -6,8 +6,8 @@ import java.lang.invoke.MethodType;
import java.util.HashMap;
import java.util.Map;
import org.ecorous.esnesnon.nonsense.loader.api.env.Env;
import org.ecorous.esnesnon.nonsense.loader.impl.mixin.NonsenseMixinService;
import org.ecorous.frogmc.frogloader.api.env.Env;
import org.ecorous.frogmc.frogloader.impl.mixin.NonsenseMixinService;
import lombok.Getter;
import org.spongepowered.asm.launch.MixinBootstrap;
import org.spongepowered.asm.service.IPropertyKey;
@ -49,7 +49,7 @@ public class Launcher {
MixinBootstrap.init();
try {
Class<?> clazz = targetClassLoader.findClass("org.ecorous.esnesnon.nonsense.loader.impl.LoaderImpl");
Class<?> clazz = targetClassLoader.findClass("impl.org.ecorous.frogmc.frogloader.LoaderImpl");
MethodHandle ctor = MethodHandles.publicLookup().findStatic(clazz, "run", MethodType.methodType(void.class, String[].class, Env.class));
ctor.invoke(args, env);
} catch (Throwable e) {

4
src/main/java/org/ecorous/esnesnon/nonsense/loader/impl/launch/MixinClassLoader.java → src/main/java/org/ecorous/frogmc/frogloader/impl/launch/MixinClassLoader.java
View file

@ -1,6 +1,6 @@
package org.ecorous.esnesnon.nonsense.loader.impl.launch;
package org.ecorous.frogmc.frogloader.impl.launch;
import org.ecorous.esnesnon.nonsense.loader.impl.mixin.NonsenseMixinService;
import org.ecorous.frogmc.frogloader.impl.mixin.NonsenseMixinService;
import org.jetbrains.annotations.Nullable;
import org.spongepowered.asm.mixin.MixinEnvironment;

11
src/main/java/org/ecorous/frogmc/frogloader/impl/launch/client/NonsenseClient.java Normal file
View file

@ -0,0 +1,11 @@
package org.ecorous.frogmc.frogloader.impl.launch.client;
import org.ecorous.frogmc.frogloader.impl.launch.Launcher;
import org.ecorous.frogmc.frogloader.api.env.Env;
public class NonsenseClient {
public static void main(String[] args){
Launcher.run(args, Env.CLIENT);
}
}

11
src/main/java/org/ecorous/frogmc/frogloader/impl/launch/server/NonsenseServer.java Normal file
View file

@ -0,0 +1,11 @@
package org.ecorous.frogmc.frogloader.impl.launch.server;
import org.ecorous.frogmc.frogloader.impl.launch.Launcher;
import org.ecorous.frogmc.frogloader.api.env.Env;
public class NonsenseServer {
public static void main(String[] args){
Launcher.run(args, Env.SERVER);
}
}

8
src/main/java/org/ecorous/esnesnon/nonsense/loader/impl/mixin/AWProcessor.java → src/main/java/org/ecorous/frogmc/frogloader/impl/mixin/AWProcessor.java
View file

@ -1,4 +1,4 @@
package org.ecorous.esnesnon.nonsense.loader.impl.mixin;
package org.ecorous.frogmc.frogloader.impl.mixin;
import java.io.BufferedReader;
import java.io.InputStreamReader;
@ -8,9 +8,9 @@ import java.util.concurrent.ConcurrentSkipListSet;
import java.util.function.Predicate;
import java.util.regex.Pattern;
import org.ecorous.esnesnon.nonsense.loader.api.mod.ModProperties;
import org.ecorous.esnesnon.nonsense.loader.impl.launch.AccessWidener;
import org.ecorous.esnesnon.nonsense.loader.impl.mod.BuiltinExtensions;
import org.ecorous.frogmc.frogloader.api.mod.ModProperties;
import org.ecorous.frogmc.frogloader.impl.launch.AccessWidener;
import org.ecorous.frogmc.frogloader.impl.mod.BuiltinExtensions;
public class AWProcessor {

4
src/main/java/org/ecorous/esnesnon/nonsense/loader/impl/mixin/NonsenseGlobalPropertyService.java → src/main/java/org/ecorous/frogmc/frogloader/impl/mixin/NonsenseGlobalPropertyService.java
View file

@ -1,6 +1,6 @@
package org.ecorous.esnesnon.nonsense.loader.impl.mixin;
package org.ecorous.frogmc.frogloader.impl.mixin;
import org.ecorous.esnesnon.nonsense.loader.impl.launch.Launcher;
import org.ecorous.frogmc.frogloader.impl.launch.Launcher;
import org.spongepowered.asm.service.IGlobalPropertyService;
import org.spongepowered.asm.service.IPropertyKey;

2
src/main/java/org/ecorous/esnesnon/nonsense/loader/impl/mixin/NonsenseMixinLogger.java → src/main/java/org/ecorous/frogmc/frogloader/impl/mixin/NonsenseMixinLogger.java
View file

@ -1,4 +1,4 @@
package org.ecorous.esnesnon.nonsense.loader.impl.mixin;
package org.ecorous.frogmc.frogloader.impl.mixin;
import java.util.Locale;
import java.util.Map;

4
src/main/java/org/ecorous/esnesnon/nonsense/loader/impl/mixin/NonsenseMixinService.java → src/main/java/org/ecorous/frogmc/frogloader/impl/mixin/NonsenseMixinService.java
View file

@ -1,4 +1,4 @@
package org.ecorous.esnesnon.nonsense.loader.impl.mixin;
package org.ecorous.frogmc.frogloader.impl.mixin;
import java.io.IOException;
import java.io.InputStream;
@ -8,7 +8,7 @@ import java.util.Collections;
import java.util.List;
import lombok.Getter;
import org.ecorous.esnesnon.nonsense.loader.impl.launch.Launcher;
import org.ecorous.frogmc.frogloader.impl.launch.Launcher;
import org.objectweb.asm.ClassReader;
import org.objectweb.asm.tree.ClassNode;
import org.spongepowered.asm.launch.platform.container.ContainerHandleVirtual;

2
src/main/java/org/ecorous/esnesnon/nonsense/loader/impl/mod/BuiltinExtensions.java → src/main/java/org/ecorous/frogmc/frogloader/impl/mod/BuiltinExtensions.java
View file

@ -1,4 +1,4 @@
package org.ecorous.esnesnon.nonsense.loader.impl.mod;
package org.ecorous.frogmc.frogloader.impl.mod;
import lombok.experimental.UtilityClass;

14
src/main/java/org/ecorous/frogmc/frogloader/impl/mod/ModPropertiesImpl.java Normal file
View file

@ -0,0 +1,14 @@
package org.ecorous.frogmc.frogloader.impl.mod;
import java.util.Collection;
import java.util.Map;
import org.ecorous.frogmc.frogloader.api.mod.ModDependencies;
import org.ecorous.frogmc.frogloader.api.mod.ModExtensions;
import org.ecorous.frogmc.frogloader.api.mod.ModProperties;
import org.ecorous.frogmc.frogloader.api.mod.SemVer;
public record ModPropertiesImpl(String id, String name, SemVer version, String license,
Map<String, Collection<String>> credits, ModDependencies dependencies,
ModExtensions extensions) implements ModProperties {
}

6
src/main/java/org/ecorous/esnesnon/nonsense/loader/impl/mod/ModPropertiesReader.java → src/main/java/org/ecorous/frogmc/frogloader/impl/mod/ModPropertiesReader.java
View file

@ -1,4 +1,4 @@
package org.ecorous.esnesnon.nonsense.loader.impl.mod;
package org.ecorous.frogmc.frogloader.impl.mod;
import java.io.IOException;
import java.io.UncheckedIOException;
@ -14,7 +14,9 @@ import com.electronwill.nightconfig.core.UnmodifiableConfig;
import com.electronwill.nightconfig.core.file.FileNotFoundAction;
import com.electronwill.nightconfig.toml.TomlParser;
import lombok.AllArgsConstructor;
import org.ecorous.esnesnon.nonsense.loader.api.mod.*;
import org.ecorous.frogmc.frogloader.api.mod.ModDependencies;
import org.ecorous.frogmc.frogloader.api.mod.ModExtensions;
import org.ecorous.frogmc.frogloader.api.mod.ModProperties;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

4
src/main/java/org/ecorous/esnesnon/nonsense/loader/impl/mod/ModUtil.java → src/main/java/org/ecorous/frogmc/frogloader/impl/mod/ModUtil.java
View file

@ -1,8 +1,8 @@
package org.ecorous.esnesnon.nonsense.loader.impl.mod;
package org.ecorous.frogmc.frogloader.impl.mod;
import java.util.Collection;
import org.ecorous.esnesnon.nonsense.loader.api.mod.ModProperties;
import org.ecorous.frogmc.frogloader.api.mod.ModProperties;
public class ModUtil {

6
src/main/java/org/ecorous/esnesnon/nonsense/loader/impl/mod/SemVerImpl.java → src/main/java/org/ecorous/frogmc/frogloader/impl/mod/SemVerImpl.java
View file

@ -1,4 +1,4 @@
package org.ecorous.esnesnon.nonsense.loader.impl.mod;
package org.ecorous.frogmc.frogloader.impl.mod;
import java.util.List;
import java.util.Objects;
@ -7,8 +7,8 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
import lombok.NonNull;
import org.ecorous.esnesnon.nonsense.loader.api.mod.SemVer;
import org.ecorous.esnesnon.nonsense.loader.impl.SemVerParseException;
import org.ecorous.frogmc.frogloader.api.mod.SemVer;
import org.ecorous.frogmc.frogloader.impl.SemVerParseException;
public record SemVerImpl(int major, int minor, int patch, String prerelease, String build) implements SemVer {
// Adapted from https://semver.org/#is-there-a-suggested-regular-expression-regex-to-check-a-semver-string

6
src/main/java/org/ecorous/esnesnon/nonsense/loader/impl/plugin/NonsensePlugin.java → src/main/java/org/ecorous/frogmc/frogloader/impl/plugin/NonsensePlugin.java
View file

@ -1,9 +1,9 @@
package org.ecorous.esnesnon.nonsense.loader.impl.plugin;
package org.ecorous.frogmc.frogloader.impl.plugin;
import java.util.Collection;
import org.ecorous.esnesnon.nonsense.loader.api.mod.ModProperties;
import org.ecorous.esnesnon.nonsense.loader.impl.LoaderImpl;
import org.ecorous.frogmc.frogloader.api.mod.ModProperties;
import org.ecorous.frogmc.frogloader.impl.LoaderImpl;
public interface NonsensePlugin extends Runnable {

26
src/main/java/org/ecorous/esnesnon/nonsense/loader/impl/plugin/game/minecraft/Minecraft.java → src/main/java/org/ecorous/frogmc/frogloader/impl/plugin/game/minecraft/Minecraft.java
View file

@ -1,4 +1,4 @@
package org.ecorous.esnesnon.nonsense.loader.impl.plugin.game.minecraft;
package org.ecorous.frogmc.frogloader.impl.plugin.game.minecraft;
import java.io.File;
import java.io.IOException;
@ -11,16 +11,18 @@ import java.nio.file.*;
import java.util.*;
import com.google.gson.JsonObject;
import org.ecorous.esnesnon.nonsense.loader.api.extensions.PreLaunchExtension;
import org.ecorous.esnesnon.nonsense.loader.api.mod.*;
import org.ecorous.esnesnon.nonsense.loader.impl.Discovery;
import org.ecorous.esnesnon.nonsense.loader.impl.LoaderImpl;
import org.ecorous.esnesnon.nonsense.loader.impl.mixin.AWProcessor;
import org.ecorous.esnesnon.nonsense.loader.impl.mod.BuiltinExtensions;
import org.ecorous.esnesnon.nonsense.loader.impl.mod.ModPropertiesImpl;
import org.ecorous.esnesnon.nonsense.loader.impl.mod.ModPropertiesReader;
import org.ecorous.esnesnon.nonsense.loader.impl.plugin.NonsensePlugin;
import org.ecorous.esnesnon.nonsense_remapper.NonsenseRemapper;
import org.ecorous.frogmc.frogloader.api.extensions.PreLaunchExtension;
import org.ecorous.frogmc.frogloader.impl.Discovery;
import org.ecorous.frogmc.frogloader.impl.LoaderImpl;
import org.ecorous.frogmc.frogloader.impl.mixin.AWProcessor;
import org.ecorous.frogmc.frogloader.impl.mod.BuiltinExtensions;
import org.ecorous.frogmc.frogloader.impl.mod.ModPropertiesImpl;
import org.ecorous.frogmc.frogloader.impl.mod.ModPropertiesReader;
import org.ecorous.frogmc.frogloader.impl.plugin.NonsensePlugin;
import org.ecorous.frogmc.thyroxine.Thyroxine;
import org.ecorous.frogmc.frogloader.api.mod.ModDependencies;
import org.ecorous.frogmc.frogloader.api.mod.ModExtensions;
import org.ecorous.frogmc.frogloader.api.mod.ModProperties;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.spongepowered.asm.mixin.Mixins;
@ -95,7 +97,7 @@ public class Minecraft implements NonsensePlugin {
if (!loader.isDevelopment()) {
if (!Files.exists(remappedGamePath)) {
NonsenseRemapper.run(version, gamePath, remappedGamePath, true, false);
Thyroxine.run(version, gamePath, remappedGamePath, true, false);
}
}

4
src/main/java/org/ecorous/esnesnon/nonsense/loader/impl/plugin/game/minecraft/MinecraftSemVerImpl.java → src/main/java/org/ecorous/frogmc/frogloader/impl/plugin/game/minecraft/MinecraftSemVerImpl.java
View file

@ -1,6 +1,6 @@
package org.ecorous.esnesnon.nonsense.loader.impl.plugin.game.minecraft;
package org.ecorous.frogmc.frogloader.impl.plugin.game.minecraft;
import org.ecorous.esnesnon.nonsense.loader.api.mod.SemVer;
import org.ecorous.frogmc.frogloader.api.mod.SemVer;
import org.jetbrains.annotations.NotNull;
public class MinecraftSemVerImpl implements SemVer {

1
src/main/resources/META-INF/services/org.ecorous.esnesnon.nonsense.loader.impl.plugin.NonsensePlugin
View file

@ -1 +0,0 @@
org.ecorous.esnesnon.nonsense.loader.impl.plugin.game.minecraft.Minecraft

1
src/main/resources/META-INF/services/org.ecorous.frogmc.frogloader.impl.plugin.NonsensePlugin Normal file
View file

@ -0,0 +1 @@
org.ecorous.frogmc.frogloader.impl.plugin.game.minecraft.Minecraft

2
src/main/resources/META-INF/services/org.spongepowered.asm.service.IGlobalPropertyService
View file

@ -1 +1 @@
org.ecorous.esnesnon.nonsense.loader.impl.mixin.NonsenseGlobalPropertyService
org.ecorous.frogmc.frogloader.impl.mixin.NonsenseGlobalPropertyService

4
src/main/resources/frog.mod.toml
View file

@ -3,10 +3,10 @@ format_version = "1.0.0"
[frog.mod]
id = "frogloader"
name = "Nonsense Loader"
name = "FrogLoader"
version = "${version}"
license = "Apache-2.0"
credits = [
{ name = "Nonsense Team", roles = ["author"] }
{ name = "FrogMC Team", roles = ["author"] }
]