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

move to domain namespace

Browse source
This commit is contained in:
moehreag 2024-06-03 00:53:46 +02:00
parent ef6e0136f1
commit 9675b66276
46 changed files with 149 additions and 148 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
build.gradle.kts
View file

@ -5,17 +5,17 @@ plugins {
`maven-publish`
}
group = "org.ecorous.esnesnon"
group = "dev.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.dev/snapshots")
}
maven {
name = "Esnesnon Maven/Releases"
url = uri("https://maven-esnesnon.ecorous.org/releases")
name = "FrogMC Maven/Releases"
url = uri("https://maven.frogmc.dev/releases")
}
maven("https://maven.fabricmc.net/")
maven("https://repo.spongepowered.org/maven")
@ -57,8 +57,8 @@ publishing {
repositories {
maven {
name = "EsnesnonSnapshotsMaven"
url = uri("https://maven-esnesnon.ecorous.org/snapshots")
name = "FrogMCSnapshotsMaven"
url = uri("https://maven.frogmc.dev/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.dev/releases")
credentials(PasswordCredentials::class)
authentication {
create<BasicAuthentication>("basic")

2
gradle/libs.versions.toml
View file

@ -7,7 +7,7 @@ annotations = "24.1.0"
[libraries]
remapper = { module = "org.ecorous.esnesnon:nonsense-remapper", version.ref = "remapper" }
remapper = { module = "dev.frogmc:thyroxine", version.ref = "remapper" }
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" }

4
minecraft/build.gradle.kts
View file

@ -1,8 +1,8 @@
import org.ecorous.esnesnon.gradle.ext.minecraft
import dev.frogmc.phytotelma.ext.minecraft
plugins {
java
id("org.ecorous.esnesnon.phytotelma") version "0.0.1-SNAPSHOT"
id("dev.frogmc.phytotelma") version "0.0.1-SNAPSHOT"
}
repositories {

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

@ -1,6 +1,6 @@
package org.ecorous.esnesnon.nonsense.loader.example;
package dev.frogmc.frogloader.example;
import org.ecorous.esnesnon.nonsense.loader.api.extensions.PreLaunchExtension;
import dev.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/dev/frogmc/frogloader/example/mixin/TitleScreenMixin.java
View file

@ -1,4 +1,4 @@
package org.ecorous.esnesnon.nonsense.loader.example.mixin;
package dev.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": "dev.frogmc.frogloader.example.mixin",
"compatibilityLevel": "JAVA_21",
"mixins": [],
"client": [
"TitleScreenMixin"
"TitleScreenMixin"
],
"injectors": {
"defaultRequire": 1

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

@ -22,7 +22,7 @@ provides = [
]
[frog.extensions]
pre_launch = "org.ecorous.esnesnon.nonsense.loader.example.ExamplePreLaunchExtension"
pre_launch = "dev.frogmc.frogloader.example.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.dev/releases")
}
maven {
name = "Esnesnos Maven Snapshots"
url = uri("https://maven-esnesnon.ecorous.org/snapshots")
name = "FrogMC Maven Snapshots"
url = uri("https://maven.frogmc.dev/snapshots")
}
gradlePluginPortal()
}

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

@ -1,13 +1,13 @@
package org.ecorous.esnesnon.nonsense.loader.api;
package dev.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.api.plugin.NonsensePlugin;
import dev.frogmc.frogloader.api.env.Env;
import dev.frogmc.frogloader.api.mod.ModProperties;
import dev.frogmc.frogloader.impl.LoaderImpl;
import dev.frogmc.frogloader.api.plugin.NonsensePlugin;
public interface Loader {

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

@ -1,4 +1,4 @@
package org.ecorous.esnesnon.nonsense.loader.api.env;
package dev.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/dev/frogmc/frogloader/api/extensions/PreLaunchExtension.java
View file

@ -1,6 +1,6 @@
package org.ecorous.esnesnon.nonsense.loader.api.extensions;
package dev.frogmc.frogloader.api.extensions;
import org.ecorous.esnesnon.nonsense.loader.impl.mod.BuiltinExtensions;
import dev.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/dev/frogmc/frogloader/api/mod/ModDependencies.java
View file

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

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

@ -1,4 +1,4 @@
package org.ecorous.esnesnon.nonsense.loader.api.mod;
package dev.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/dev/frogmc/frogloader/api/mod/ModProperties.java
View file

@ -1,4 +1,4 @@
package org.ecorous.esnesnon.nonsense.loader.api.mod;
package dev.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/dev/frogmc/frogloader/api/mod/SemVer.java
View file

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

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

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

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

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

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

@ -1,4 +1,4 @@
package org.ecorous.esnesnon.nonsense.loader.impl;
package dev.frogmc.frogloader.impl;
import java.io.IOException;
import java.lang.invoke.MethodHandle;
@ -11,13 +11,13 @@ import java.util.*;
import java.util.stream.Collectors;
import com.google.gson.Gson;
import dev.frogmc.frogloader.api.Loader;
import dev.frogmc.frogloader.api.plugin.NonsensePlugin;
import dev.frogmc.frogloader.impl.launch.MixinClassLoader;
import dev.frogmc.frogloader.impl.mod.ModUtil;
import lombok.Getter;
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.api.plugin.NonsensePlugin;
import dev.frogmc.frogloader.api.env.Env;
import dev.frogmc.frogloader.api.mod.ModProperties;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.spongepowered.asm.mixin.MixinEnvironment;
@ -26,7 +26,7 @@ public class LoaderImpl implements Loader {
public static final String MOD_FILE_EXTENSION = ".frogmod";
@Getter
private static LoaderImpl instance;
private final boolean DEV_ENV = Boolean.getBoolean("nonsense.development");
private final boolean DEV_ENV = Boolean.getBoolean("frogmc.development");
@Getter
private final String[] args;
@Getter

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

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

11
src/main/java/org/ecorous/esnesnon/nonsense/loader/impl/gui/LoaderGui.java → src/main/java/dev/frogmc/frogloader/impl/gui/LoaderGui.java
View file

@ -1,4 +1,4 @@
package org.ecorous.esnesnon.nonsense.loader.impl.gui;
package dev.frogmc.frogloader.impl.gui;
import javax.swing.*;
@ -7,11 +7,11 @@ import java.awt.event.ActionEvent;
import java.net.URI;
import java.util.function.BiConsumer;
import dev.frogmc.frogloader.impl.mod.ModDependencyResolver;
import dev.frogmc.frogloader.impl.mod.ModUtil;
import dev.frogmc.frogloader.impl.util.URLUtil;
import lombok.AllArgsConstructor;
import org.ecorous.esnesnon.nonsense.loader.impl.LoaderImpl;
import org.ecorous.esnesnon.nonsense.loader.impl.mod.ModDependencyResolver;
import org.ecorous.esnesnon.nonsense.loader.impl.mod.ModUtil;
import org.ecorous.esnesnon.nonsense.loader.impl.util.URLUtil;
import dev.frogmc.frogloader.impl.LoaderImpl;
public class LoaderGui {
@ -64,6 +64,7 @@ public class LoaderGui {
pane.setBorder(BorderFactory.createEmptyBorder(4, 4, 4, 4));
pane.add(title, BorderLayout.NORTH);
for (ModDependencyResolver.UnfulfilledDependencyException.Entry e : ex.getDependencies()) {
String descriptionText;
if (e.presentVersion() != null){

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

@ -1,4 +1,4 @@
package org.ecorous.esnesnon.nonsense.loader.impl.gui;
package dev.frogmc.frogloader.impl.gui;
import javax.swing.*;
import java.awt.*;

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

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

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

@ -1,4 +1,4 @@
package org.ecorous.esnesnon.nonsense.loader.impl.launch;
package dev.frogmc.frogloader.impl.launch;
import java.lang.invoke.MethodHandle;
import java.lang.invoke.MethodHandles;
@ -7,8 +7,8 @@ import java.util.HashMap;
import java.util.Map;
import lombok.Getter;
import org.ecorous.esnesnon.nonsense.loader.api.env.Env;
import org.ecorous.esnesnon.nonsense.loader.impl.mixin.NonsenseMixinService;
import dev.frogmc.frogloader.api.env.Env;
import dev.frogmc.frogloader.impl.mixin.NonsenseMixinService;
import org.spongepowered.asm.launch.MixinBootstrap;
import org.spongepowered.asm.service.IPropertyKey;
@ -34,8 +34,8 @@ public class Launcher {
targetClassLoader.excludePackage("org.slf4j");
targetClassLoader.excludePackage("org.spongepowered");
targetClassLoader.excludePackage("org.apache.logging");
targetClassLoader.excludePackage("org.ecorous.esnesnon.nonsense.loader.impl.launch");
targetClassLoader.excludePackage("org.ecorous.esnesnon.nonsense.loader.api.env");
targetClassLoader.excludePackage("dev.frogmc.frogloader.impl.launch");
targetClassLoader.excludePackage("dev.frogmc.frogloader.api.env");
Thread.currentThread().setContextClassLoader(targetClassLoader);
@ -43,7 +43,7 @@ public class Launcher {
MixinBootstrap.init();
try {
Class<?> clazz = targetClassLoader.findClass("org.ecorous.esnesnon.nonsense.loader.impl.LoaderImpl");
Class<?> clazz = targetClassLoader.findClass("dev.frogmc.frogloader.impl.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/dev/frogmc/frogloader/impl/launch/MixinClassLoader.java
View file

@ -1,4 +1,4 @@
package org.ecorous.esnesnon.nonsense.loader.impl.launch;
package dev.frogmc.frogloader.impl.launch;
import java.io.IOException;
import java.io.InputStream;
@ -9,7 +9,7 @@ import java.util.Collections;
import java.util.Enumeration;
import java.util.List;
import org.ecorous.esnesnon.nonsense.loader.impl.mixin.NonsenseMixinService;
import dev.frogmc.frogloader.impl.mixin.NonsenseMixinService;
import org.jetbrains.annotations.Nullable;
import org.spongepowered.asm.mixin.MixinEnvironment;

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

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

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

@ -0,0 +1,11 @@
package dev.frogmc.frogloader.impl.launch.server;
import dev.frogmc.frogloader.api.env.Env;
import dev.frogmc.frogloader.impl.launch.Launcher;
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/dev/frogmc/frogloader/impl/mixin/AWProcessor.java
View file

@ -1,4 +1,4 @@
package org.ecorous.esnesnon.nonsense.loader.impl.mixin;
package dev.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 dev.frogmc.frogloader.impl.launch.AccessWidener;
import dev.frogmc.frogloader.impl.mod.BuiltinExtensions;
import dev.frogmc.frogloader.api.mod.ModProperties;
public class AWProcessor {

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

@ -1,6 +1,6 @@
package org.ecorous.esnesnon.nonsense.loader.impl.mixin;
package dev.frogmc.frogloader.impl.mixin;
import org.ecorous.esnesnon.nonsense.loader.impl.launch.Launcher;
import dev.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/dev/frogmc/frogloader/impl/mixin/NonsenseMixinLogger.java
View file

@ -1,4 +1,4 @@
package org.ecorous.esnesnon.nonsense.loader.impl.mixin;
package dev.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/dev/frogmc/frogloader/impl/mixin/NonsenseMixinService.java
View file

@ -1,4 +1,4 @@
package org.ecorous.esnesnon.nonsense.loader.impl.mixin;
package dev.frogmc.frogloader.impl.mixin;
import java.io.IOException;
import java.io.InputStream;
@ -7,8 +7,8 @@ import java.util.Collection;
import java.util.Collections;
import java.util.List;
import dev.frogmc.frogloader.impl.launch.Launcher;
import lombok.Getter;
import org.ecorous.esnesnon.nonsense.loader.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/dev/frogmc/frogloader/impl/mod/BuiltinExtensions.java
View file

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

10
src/main/java/org/ecorous/esnesnon/nonsense/loader/impl/mod/JavaModProperties.java → src/main/java/dev/frogmc/frogloader/impl/mod/JavaModProperties.java
View file

@ -1,12 +1,12 @@
package org.ecorous.esnesnon.nonsense.loader.impl.mod;
package dev.frogmc.frogloader.impl.mod;
import java.util.Collections;
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.impl.SemVerParseException;
import dev.frogmc.frogloader.api.mod.ModDependencies;
import dev.frogmc.frogloader.api.mod.ModExtensions;
import dev.frogmc.frogloader.api.mod.ModProperties;
import dev.frogmc.frogloader.impl.SemVerParseException;
public class JavaModProperties {

10
src/main/java/org/ecorous/esnesnon/nonsense/loader/impl/mod/ModDependencyResolver.java → src/main/java/dev/frogmc/frogloader/impl/mod/ModDependencyResolver.java
View file

@ -1,4 +1,4 @@
package org.ecorous.esnesnon.nonsense.loader.impl.mod;
package dev.frogmc.frogloader.impl.mod;
import java.io.UncheckedIOException;
import java.util.*;
@ -8,10 +8,10 @@ import java.util.stream.Collectors;
import lombok.AllArgsConstructor;
import lombok.Getter;
import org.ecorous.esnesnon.nonsense.loader.api.mod.ModDependencies;
import org.ecorous.esnesnon.nonsense.loader.api.mod.ModProperties;
import org.ecorous.esnesnon.nonsense.loader.api.mod.SemVer;
import org.ecorous.esnesnon.nonsense.loader.impl.SemVerParseException;
import dev.frogmc.frogloader.api.mod.ModDependencies;
import dev.frogmc.frogloader.api.mod.ModProperties;
import dev.frogmc.frogloader.api.mod.SemVer;
import dev.frogmc.frogloader.impl.SemVerParseException;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;

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

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

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

@ -1,4 +1,4 @@
package org.ecorous.esnesnon.nonsense.loader.impl.mod;
package dev.frogmc.frogloader.impl.mod;
import java.io.IOException;
import java.io.UncheckedIOException;
@ -14,9 +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.ModDependencies;
import org.ecorous.esnesnon.nonsense.loader.api.mod.ModExtensions;
import org.ecorous.esnesnon.nonsense.loader.api.mod.ModProperties;
import dev.frogmc.frogloader.api.mod.ModDependencies;
import dev.frogmc.frogloader.api.mod.ModExtensions;
import dev.frogmc.frogloader.api.mod.ModProperties;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

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

@ -1,13 +1,12 @@
package org.ecorous.esnesnon.nonsense.loader.impl.mod;
package dev.frogmc.frogloader.impl.mod;
import java.io.IOException;
import java.net.MalformedURLException;
import java.net.URI;
import java.nio.file.Files;
import java.util.Collection;
import org.ecorous.esnesnon.nonsense.loader.api.Loader;
import org.ecorous.esnesnon.nonsense.loader.api.mod.ModProperties;
import dev.frogmc.frogloader.api.Loader;
import dev.frogmc.frogloader.api.mod.ModProperties;
public class ModUtil {
@ -35,7 +34,7 @@ public class ModUtil {
public static void installMod(String url) {
try {
Files.copy(URI.create(url).toURL().openStream(), Loader.getInstance().getModsDir().resolve(url.substring(url.lastIndexOf("/"+1))));
Files.copy(URI.create(url).toURL().openStream(), Loader.getInstance().getModsDir().resolve(url.substring(url.lastIndexOf("/" + 1))));
} catch (IOException e) {
e.printStackTrace();
// TODO handle better than this

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

@ -1,4 +1,4 @@
package org.ecorous.esnesnon.nonsense.loader.impl.mod;
package dev.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 dev.frogmc.frogloader.api.mod.SemVer;
import dev.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

23
src/main/java/org/ecorous/esnesnon/nonsense/loader/impl/plugin/game/minecraft/Minecraft.java → src/main/java/dev/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 dev.frogmc.frogloader.impl.plugin.game.minecraft;
import java.io.File;
import java.io.IOException;
@ -11,16 +11,17 @@ import java.nio.file.*;
import java.util.*;
import com.google.gson.JsonObject;
import org.ecorous.esnesnon.nonsense.loader.api.Loader;
import org.ecorous.esnesnon.nonsense.loader.api.extensions.PreLaunchExtension;
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.plugin.NonsensePlugin;
import org.ecorous.esnesnon.nonsense.loader.impl.Discovery;
import org.ecorous.esnesnon.nonsense.loader.impl.LoaderImpl;
import org.ecorous.esnesnon.nonsense.loader.impl.gui.LoaderGui;
import org.ecorous.esnesnon.nonsense.loader.impl.mixin.AWProcessor;
import dev.frogmc.frogloader.api.Loader;
import dev.frogmc.frogloader.impl.gui.LoaderGui;
import dev.frogmc.frogloader.impl.mod.*;
import dev.frogmc.frogloader.api.extensions.PreLaunchExtension;
import dev.frogmc.frogloader.api.mod.ModDependencies;
import dev.frogmc.frogloader.api.mod.ModExtensions;
import dev.frogmc.frogloader.api.mod.ModProperties;
import dev.frogmc.frogloader.api.plugin.NonsensePlugin;
import dev.frogmc.frogloader.impl.Discovery;
import dev.frogmc.frogloader.impl.LoaderImpl;
import dev.frogmc.frogloader.impl.mixin.AWProcessor;
import org.ecorous.esnesnon.nonsense.loader.impl.mod.*;
import org.ecorous.esnesnon.nonsense_remapper.NonsenseRemapper;
import org.slf4j.Logger;

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

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

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

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

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.api.env.Env;
import org.ecorous.esnesnon.nonsense.loader.impl.launch.Launcher;
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.api.env.Env;
import org.ecorous.esnesnon.nonsense.loader.impl.launch.Launcher;
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, String icon, SemVer version, String license,
Map<String, Collection<String>> credits, ModDependencies dependencies,
ModExtensions extensions) implements ModProperties {
}

1
src/main/resources/META-INF/services/dev.frogmc.frogloader.api.plugin.NonsensePlugin Normal file
View file

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

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

@ -1 +0,0 @@
org.ecorous.esnesnon.nonsense.loader.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
dev.frogmc.frogloader.impl.mixin.NonsenseGlobalPropertyService