move to domain namespace
This commit is contained in:
parent
ef6e0136f1
commit
9675b66276
|
@ -5,17 +5,17 @@ plugins {
|
||||||
`maven-publish`
|
`maven-publish`
|
||||||
}
|
}
|
||||||
|
|
||||||
group = "org.ecorous.esnesnon"
|
group = "dev.frogmc"
|
||||||
version = "0.0.1-SNAPSHOT"
|
version = "0.0.1-SNAPSHOT"
|
||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
maven {
|
maven {
|
||||||
name = "Esnesnon Maven/Snapshots"
|
name = "FrogMC Maven/Snapshots"
|
||||||
url = uri("https://maven-esnesnon.ecorous.org/snapshots")
|
url = uri("https://maven.frogmc.dev/snapshots")
|
||||||
}
|
}
|
||||||
maven {
|
maven {
|
||||||
name = "Esnesnon Maven/Releases"
|
name = "FrogMC Maven/Releases"
|
||||||
url = uri("https://maven-esnesnon.ecorous.org/releases")
|
url = uri("https://maven.frogmc.dev/releases")
|
||||||
}
|
}
|
||||||
maven("https://maven.fabricmc.net/")
|
maven("https://maven.fabricmc.net/")
|
||||||
maven("https://repo.spongepowered.org/maven")
|
maven("https://repo.spongepowered.org/maven")
|
||||||
|
@ -57,8 +57,8 @@ publishing {
|
||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
maven {
|
maven {
|
||||||
name = "EsnesnonSnapshotsMaven"
|
name = "FrogMCSnapshotsMaven"
|
||||||
url = uri("https://maven-esnesnon.ecorous.org/snapshots")
|
url = uri("https://maven.frogmc.dev/snapshots")
|
||||||
credentials(PasswordCredentials::class)
|
credentials(PasswordCredentials::class)
|
||||||
authentication {
|
authentication {
|
||||||
create<BasicAuthentication>("basic")
|
create<BasicAuthentication>("basic")
|
||||||
|
@ -66,8 +66,8 @@ publishing {
|
||||||
}
|
}
|
||||||
|
|
||||||
maven {
|
maven {
|
||||||
name = "EsnesnonReleasesMaven"
|
name = "FrogMCReleasesMaven"
|
||||||
url = uri("https://maven-esnesnon.ecorous.org/releases")
|
url = uri("https://maven.frogmc.dev/releases")
|
||||||
credentials(PasswordCredentials::class)
|
credentials(PasswordCredentials::class)
|
||||||
authentication {
|
authentication {
|
||||||
create<BasicAuthentication>("basic")
|
create<BasicAuthentication>("basic")
|
||||||
|
|
|
@ -7,7 +7,7 @@ annotations = "24.1.0"
|
||||||
|
|
||||||
[libraries]
|
[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" }
|
nightconfig = { module = "com.electronwill.night-config:toml", version.ref = "nightconfig" }
|
||||||
mixin = { module = "net.fabricmc:sponge-mixin", version.ref = "mixin" }
|
mixin = { module = "net.fabricmc:sponge-mixin", version.ref = "mixin" }
|
||||||
annotations = { module = "org.jetbrains:annotations", version.ref = "annotations" }
|
annotations = { module = "org.jetbrains:annotations", version.ref = "annotations" }
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
import org.ecorous.esnesnon.gradle.ext.minecraft
|
import dev.frogmc.phytotelma.ext.minecraft
|
||||||
|
|
||||||
plugins {
|
plugins {
|
||||||
java
|
java
|
||||||
id("org.ecorous.esnesnon.phytotelma") version "0.0.1-SNAPSHOT"
|
id("dev.frogmc.phytotelma") version "0.0.1-SNAPSHOT"
|
||||||
}
|
}
|
||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
|
|
|
@ -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.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
|
@ -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.components.FocusableTextWidget;
|
||||||
import net.minecraft.client.gui.screens.Screen;
|
import net.minecraft.client.gui.screens.Screen;
|
|
@ -1,7 +1,7 @@
|
||||||
{
|
{
|
||||||
"required": true,
|
"required": true,
|
||||||
"minVersion": "0.8",
|
"minVersion": "0.8",
|
||||||
"package": "org.ecorous.esnesnon.nonsense.loader.example.mixin",
|
"package": "dev.frogmc.frogloader.example.mixin",
|
||||||
"compatibilityLevel": "JAVA_21",
|
"compatibilityLevel": "JAVA_21",
|
||||||
"mixins": [],
|
"mixins": [],
|
||||||
"client": [
|
"client": [
|
||||||
|
|
|
@ -22,7 +22,7 @@ provides = [
|
||||||
]
|
]
|
||||||
|
|
||||||
[frog.extensions]
|
[frog.extensions]
|
||||||
pre_launch = "org.ecorous.esnesnon.nonsense.loader.example.ExamplePreLaunchExtension"
|
pre_launch = "dev.frogmc.frogloader.example.ExamplePreLaunchExtension"
|
||||||
mixin_config = "example_mod.mixins.json"
|
mixin_config = "example_mod.mixins.json"
|
||||||
frog_aw = "example_mod.accesswidener"
|
frog_aw = "example_mod.accesswidener"
|
||||||
|
|
||||||
|
|
|
@ -1,12 +1,12 @@
|
||||||
pluginManagement {
|
pluginManagement {
|
||||||
repositories {
|
repositories {
|
||||||
maven {
|
maven {
|
||||||
name = "Esnesnos Maven Releases"
|
name = "FrogMC Maven Releases"
|
||||||
url = uri("https://maven-esnesnon.ecorous.org/releases")
|
url = uri("https://maven.frogmc.dev/releases")
|
||||||
}
|
}
|
||||||
maven {
|
maven {
|
||||||
name = "Esnesnos Maven Snapshots"
|
name = "FrogMC Maven Snapshots"
|
||||||
url = uri("https://maven-esnesnon.ecorous.org/snapshots")
|
url = uri("https://maven.frogmc.dev/snapshots")
|
||||||
}
|
}
|
||||||
gradlePluginPortal()
|
gradlePluginPortal()
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,13 +1,13 @@
|
||||||
package org.ecorous.esnesnon.nonsense.loader.api;
|
package dev.frogmc.frogloader.api;
|
||||||
|
|
||||||
import java.nio.file.Path;
|
import java.nio.file.Path;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Optional;
|
import java.util.Optional;
|
||||||
|
|
||||||
import org.ecorous.esnesnon.nonsense.loader.api.env.Env;
|
import dev.frogmc.frogloader.api.env.Env;
|
||||||
import org.ecorous.esnesnon.nonsense.loader.api.mod.ModProperties;
|
import dev.frogmc.frogloader.api.mod.ModProperties;
|
||||||
import org.ecorous.esnesnon.nonsense.loader.impl.LoaderImpl;
|
import dev.frogmc.frogloader.impl.LoaderImpl;
|
||||||
import org.ecorous.esnesnon.nonsense.loader.api.plugin.NonsensePlugin;
|
import dev.frogmc.frogloader.api.plugin.NonsensePlugin;
|
||||||
|
|
||||||
public interface Loader {
|
public interface Loader {
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
package org.ecorous.esnesnon.nonsense.loader.api.env;
|
package dev.frogmc.frogloader.api.env;
|
||||||
|
|
||||||
import lombok.AllArgsConstructor;
|
import lombok.AllArgsConstructor;
|
||||||
import lombok.Getter;
|
import lombok.Getter;
|
|
@ -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.
|
* The Pre-Launch Extension.
|
|
@ -1,4 +1,4 @@
|
||||||
package org.ecorous.esnesnon.nonsense.loader.api.mod;
|
package dev.frogmc.frogloader.api.mod;
|
||||||
|
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
|
|
|
@ -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.MethodHandle;
|
||||||
import java.lang.invoke.MethodHandles;
|
import java.lang.invoke.MethodHandles;
|
|
@ -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.Collection;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
|
@ -1,4 +1,4 @@
|
||||||
package org.ecorous.esnesnon.nonsense.loader.api.mod;
|
package dev.frogmc.frogloader.api.mod;
|
||||||
|
|
||||||
public interface SemVer extends Comparable<SemVer> {
|
public interface SemVer extends Comparable<SemVer> {
|
||||||
int major();
|
int major();
|
|
@ -1,9 +1,9 @@
|
||||||
package org.ecorous.esnesnon.nonsense.loader.api.plugin;
|
package dev.frogmc.frogloader.api.plugin;
|
||||||
|
|
||||||
import java.util.Collection;
|
import java.util.Collection;
|
||||||
|
|
||||||
import org.ecorous.esnesnon.nonsense.loader.api.Loader;
|
import dev.frogmc.frogloader.api.Loader;
|
||||||
import org.ecorous.esnesnon.nonsense.loader.api.mod.ModProperties;
|
import dev.frogmc.frogloader.api.mod.ModProperties;
|
||||||
|
|
||||||
public interface NonsensePlugin extends Runnable {
|
public interface NonsensePlugin extends Runnable {
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
package org.ecorous.esnesnon.nonsense.loader.impl;
|
package dev.frogmc.frogloader.impl;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.nio.file.FileVisitResult;
|
import java.nio.file.FileVisitResult;
|
|
@ -1,4 +1,4 @@
|
||||||
package org.ecorous.esnesnon.nonsense.loader.impl;
|
package dev.frogmc.frogloader.impl;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.lang.invoke.MethodHandle;
|
import java.lang.invoke.MethodHandle;
|
||||||
|
@ -11,13 +11,13 @@ import java.util.*;
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
import com.google.gson.Gson;
|
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 lombok.Getter;
|
||||||
import org.ecorous.esnesnon.nonsense.loader.api.Loader;
|
import dev.frogmc.frogloader.api.env.Env;
|
||||||
import org.ecorous.esnesnon.nonsense.loader.api.env.Env;
|
import dev.frogmc.frogloader.api.mod.ModProperties;
|
||||||
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 org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
import org.spongepowered.asm.mixin.MixinEnvironment;
|
import org.spongepowered.asm.mixin.MixinEnvironment;
|
||||||
|
@ -26,7 +26,7 @@ public class LoaderImpl implements Loader {
|
||||||
public static final String MOD_FILE_EXTENSION = ".frogmod";
|
public static final String MOD_FILE_EXTENSION = ".frogmod";
|
||||||
@Getter
|
@Getter
|
||||||
private static LoaderImpl instance;
|
private static LoaderImpl instance;
|
||||||
private final boolean DEV_ENV = Boolean.getBoolean("nonsense.development");
|
private final boolean DEV_ENV = Boolean.getBoolean("frogmc.development");
|
||||||
@Getter
|
@Getter
|
||||||
private final String[] args;
|
private final String[] args;
|
||||||
@Getter
|
@Getter
|
|
@ -1,4 +1,4 @@
|
||||||
package org.ecorous.esnesnon.nonsense.loader.impl;
|
package dev.frogmc.frogloader.impl;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
package org.ecorous.esnesnon.nonsense.loader.impl.gui;
|
package dev.frogmc.frogloader.impl.gui;
|
||||||
|
|
||||||
import javax.swing.*;
|
import javax.swing.*;
|
||||||
|
|
||||||
|
@ -7,11 +7,11 @@ import java.awt.event.ActionEvent;
|
||||||
import java.net.URI;
|
import java.net.URI;
|
||||||
import java.util.function.BiConsumer;
|
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 lombok.AllArgsConstructor;
|
||||||
import org.ecorous.esnesnon.nonsense.loader.impl.LoaderImpl;
|
import dev.frogmc.frogloader.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;
|
|
||||||
|
|
||||||
public class LoaderGui {
|
public class LoaderGui {
|
||||||
|
|
||||||
|
@ -64,6 +64,7 @@ public class LoaderGui {
|
||||||
pane.setBorder(BorderFactory.createEmptyBorder(4, 4, 4, 4));
|
pane.setBorder(BorderFactory.createEmptyBorder(4, 4, 4, 4));
|
||||||
pane.add(title, BorderLayout.NORTH);
|
pane.add(title, BorderLayout.NORTH);
|
||||||
|
|
||||||
|
|
||||||
for (ModDependencyResolver.UnfulfilledDependencyException.Entry e : ex.getDependencies()) {
|
for (ModDependencyResolver.UnfulfilledDependencyException.Entry e : ex.getDependencies()) {
|
||||||
String descriptionText;
|
String descriptionText;
|
||||||
if (e.presentVersion() != null){
|
if (e.presentVersion() != null){
|
|
@ -1,4 +1,4 @@
|
||||||
package org.ecorous.esnesnon.nonsense.loader.impl.gui;
|
package dev.frogmc.frogloader.impl.gui;
|
||||||
|
|
||||||
import javax.swing.*;
|
import javax.swing.*;
|
||||||
import java.awt.*;
|
import java.awt.*;
|
|
@ -1,4 +1,4 @@
|
||||||
package org.ecorous.esnesnon.nonsense.loader.impl.launch;
|
package dev.frogmc.frogloader.impl.launch;
|
||||||
|
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
import java.util.concurrent.ConcurrentHashMap;
|
import java.util.concurrent.ConcurrentHashMap;
|
|
@ -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.MethodHandle;
|
||||||
import java.lang.invoke.MethodHandles;
|
import java.lang.invoke.MethodHandles;
|
||||||
|
@ -7,8 +7,8 @@ import java.util.HashMap;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
import lombok.Getter;
|
import lombok.Getter;
|
||||||
import org.ecorous.esnesnon.nonsense.loader.api.env.Env;
|
import dev.frogmc.frogloader.api.env.Env;
|
||||||
import org.ecorous.esnesnon.nonsense.loader.impl.mixin.NonsenseMixinService;
|
import dev.frogmc.frogloader.impl.mixin.NonsenseMixinService;
|
||||||
import org.spongepowered.asm.launch.MixinBootstrap;
|
import org.spongepowered.asm.launch.MixinBootstrap;
|
||||||
import org.spongepowered.asm.service.IPropertyKey;
|
import org.spongepowered.asm.service.IPropertyKey;
|
||||||
|
|
||||||
|
@ -34,8 +34,8 @@ public class Launcher {
|
||||||
targetClassLoader.excludePackage("org.slf4j");
|
targetClassLoader.excludePackage("org.slf4j");
|
||||||
targetClassLoader.excludePackage("org.spongepowered");
|
targetClassLoader.excludePackage("org.spongepowered");
|
||||||
targetClassLoader.excludePackage("org.apache.logging");
|
targetClassLoader.excludePackage("org.apache.logging");
|
||||||
targetClassLoader.excludePackage("org.ecorous.esnesnon.nonsense.loader.impl.launch");
|
targetClassLoader.excludePackage("dev.frogmc.frogloader.impl.launch");
|
||||||
targetClassLoader.excludePackage("org.ecorous.esnesnon.nonsense.loader.api.env");
|
targetClassLoader.excludePackage("dev.frogmc.frogloader.api.env");
|
||||||
|
|
||||||
Thread.currentThread().setContextClassLoader(targetClassLoader);
|
Thread.currentThread().setContextClassLoader(targetClassLoader);
|
||||||
|
|
||||||
|
@ -43,7 +43,7 @@ public class Launcher {
|
||||||
MixinBootstrap.init();
|
MixinBootstrap.init();
|
||||||
|
|
||||||
try {
|
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));
|
MethodHandle ctor = MethodHandles.publicLookup().findStatic(clazz, "run", MethodType.methodType(void.class, String[].class, Env.class));
|
||||||
ctor.invoke(args, env);
|
ctor.invoke(args, env);
|
||||||
} catch (Throwable e) {
|
} catch (Throwable e) {
|
|
@ -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.IOException;
|
||||||
import java.io.InputStream;
|
import java.io.InputStream;
|
||||||
|
@ -9,7 +9,7 @@ import java.util.Collections;
|
||||||
import java.util.Enumeration;
|
import java.util.Enumeration;
|
||||||
import java.util.List;
|
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.jetbrains.annotations.Nullable;
|
||||||
import org.spongepowered.asm.mixin.MixinEnvironment;
|
import org.spongepowered.asm.mixin.MixinEnvironment;
|
||||||
|
|
|
@ -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);
|
||||||
|
}
|
||||||
|
}
|
|
@ -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);
|
||||||
|
}
|
||||||
|
}
|
|
@ -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.BufferedReader;
|
||||||
import java.io.InputStreamReader;
|
import java.io.InputStreamReader;
|
||||||
|
@ -8,9 +8,9 @@ import java.util.concurrent.ConcurrentSkipListSet;
|
||||||
import java.util.function.Predicate;
|
import java.util.function.Predicate;
|
||||||
import java.util.regex.Pattern;
|
import java.util.regex.Pattern;
|
||||||
|
|
||||||
import org.ecorous.esnesnon.nonsense.loader.api.mod.ModProperties;
|
import dev.frogmc.frogloader.impl.launch.AccessWidener;
|
||||||
import org.ecorous.esnesnon.nonsense.loader.impl.launch.AccessWidener;
|
import dev.frogmc.frogloader.impl.mod.BuiltinExtensions;
|
||||||
import org.ecorous.esnesnon.nonsense.loader.impl.mod.BuiltinExtensions;
|
import dev.frogmc.frogloader.api.mod.ModProperties;
|
||||||
|
|
||||||
public class AWProcessor {
|
public class AWProcessor {
|
||||||
|
|
|
@ -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.IGlobalPropertyService;
|
||||||
import org.spongepowered.asm.service.IPropertyKey;
|
import org.spongepowered.asm.service.IPropertyKey;
|
||||||
|
|
|
@ -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.Locale;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
|
@ -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.IOException;
|
||||||
import java.io.InputStream;
|
import java.io.InputStream;
|
||||||
|
@ -7,8 +7,8 @@ import java.util.Collection;
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
import dev.frogmc.frogloader.impl.launch.Launcher;
|
||||||
import lombok.Getter;
|
import lombok.Getter;
|
||||||
import org.ecorous.esnesnon.nonsense.loader.impl.launch.Launcher;
|
|
||||||
import org.objectweb.asm.ClassReader;
|
import org.objectweb.asm.ClassReader;
|
||||||
import org.objectweb.asm.tree.ClassNode;
|
import org.objectweb.asm.tree.ClassNode;
|
||||||
import org.spongepowered.asm.launch.platform.container.ContainerHandleVirtual;
|
import org.spongepowered.asm.launch.platform.container.ContainerHandleVirtual;
|
|
@ -1,4 +1,4 @@
|
||||||
package org.ecorous.esnesnon.nonsense.loader.impl.mod;
|
package dev.frogmc.frogloader.impl.mod;
|
||||||
|
|
||||||
import lombok.experimental.UtilityClass;
|
import lombok.experimental.UtilityClass;
|
||||||
|
|
|
@ -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.Collections;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
import org.ecorous.esnesnon.nonsense.loader.api.mod.ModDependencies;
|
import dev.frogmc.frogloader.api.mod.ModDependencies;
|
||||||
import org.ecorous.esnesnon.nonsense.loader.api.mod.ModExtensions;
|
import dev.frogmc.frogloader.api.mod.ModExtensions;
|
||||||
import org.ecorous.esnesnon.nonsense.loader.api.mod.ModProperties;
|
import dev.frogmc.frogloader.api.mod.ModProperties;
|
||||||
import org.ecorous.esnesnon.nonsense.loader.impl.SemVerParseException;
|
import dev.frogmc.frogloader.impl.SemVerParseException;
|
||||||
|
|
||||||
public class JavaModProperties {
|
public class JavaModProperties {
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
package org.ecorous.esnesnon.nonsense.loader.impl.mod;
|
package dev.frogmc.frogloader.impl.mod;
|
||||||
|
|
||||||
import java.io.UncheckedIOException;
|
import java.io.UncheckedIOException;
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
|
@ -8,10 +8,10 @@ import java.util.stream.Collectors;
|
||||||
|
|
||||||
import lombok.AllArgsConstructor;
|
import lombok.AllArgsConstructor;
|
||||||
import lombok.Getter;
|
import lombok.Getter;
|
||||||
import org.ecorous.esnesnon.nonsense.loader.api.mod.ModDependencies;
|
import dev.frogmc.frogloader.api.mod.ModDependencies;
|
||||||
import org.ecorous.esnesnon.nonsense.loader.api.mod.ModProperties;
|
import dev.frogmc.frogloader.api.mod.ModProperties;
|
||||||
import org.ecorous.esnesnon.nonsense.loader.api.mod.SemVer;
|
import dev.frogmc.frogloader.api.mod.SemVer;
|
||||||
import org.ecorous.esnesnon.nonsense.loader.impl.SemVerParseException;
|
import dev.frogmc.frogloader.impl.SemVerParseException;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
import org.jetbrains.annotations.Nullable;
|
import org.jetbrains.annotations.Nullable;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
|
@ -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 {
|
||||||
|
}
|
|
@ -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.IOException;
|
||||||
import java.io.UncheckedIOException;
|
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.core.file.FileNotFoundAction;
|
||||||
import com.electronwill.nightconfig.toml.TomlParser;
|
import com.electronwill.nightconfig.toml.TomlParser;
|
||||||
import lombok.AllArgsConstructor;
|
import lombok.AllArgsConstructor;
|
||||||
import org.ecorous.esnesnon.nonsense.loader.api.mod.ModDependencies;
|
import dev.frogmc.frogloader.api.mod.ModDependencies;
|
||||||
import org.ecorous.esnesnon.nonsense.loader.api.mod.ModExtensions;
|
import dev.frogmc.frogloader.api.mod.ModExtensions;
|
||||||
import org.ecorous.esnesnon.nonsense.loader.api.mod.ModProperties;
|
import dev.frogmc.frogloader.api.mod.ModProperties;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
|
@ -1,13 +1,12 @@
|
||||||
package org.ecorous.esnesnon.nonsense.loader.impl.mod;
|
package dev.frogmc.frogloader.impl.mod;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.net.MalformedURLException;
|
|
||||||
import java.net.URI;
|
import java.net.URI;
|
||||||
import java.nio.file.Files;
|
import java.nio.file.Files;
|
||||||
import java.util.Collection;
|
import java.util.Collection;
|
||||||
|
|
||||||
import org.ecorous.esnesnon.nonsense.loader.api.Loader;
|
import dev.frogmc.frogloader.api.Loader;
|
||||||
import org.ecorous.esnesnon.nonsense.loader.api.mod.ModProperties;
|
import dev.frogmc.frogloader.api.mod.ModProperties;
|
||||||
|
|
||||||
public class ModUtil {
|
public class ModUtil {
|
||||||
|
|
|
@ -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.List;
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
|
@ -7,8 +7,8 @@ import java.util.regex.Matcher;
|
||||||
import java.util.regex.Pattern;
|
import java.util.regex.Pattern;
|
||||||
|
|
||||||
import lombok.NonNull;
|
import lombok.NonNull;
|
||||||
import org.ecorous.esnesnon.nonsense.loader.api.mod.SemVer;
|
import dev.frogmc.frogloader.api.mod.SemVer;
|
||||||
import org.ecorous.esnesnon.nonsense.loader.impl.SemVerParseException;
|
import dev.frogmc.frogloader.impl.SemVerParseException;
|
||||||
|
|
||||||
public record SemVerImpl(int major, int minor, int patch, String prerelease, String build) implements SemVer {
|
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
|
// Adapted from https://semver.org/#is-there-a-suggested-regular-expression-regex-to-check-a-semver-string
|
|
@ -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.File;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
@ -11,16 +11,17 @@ import java.nio.file.*;
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
|
|
||||||
import com.google.gson.JsonObject;
|
import com.google.gson.JsonObject;
|
||||||
import org.ecorous.esnesnon.nonsense.loader.api.Loader;
|
import dev.frogmc.frogloader.api.Loader;
|
||||||
import org.ecorous.esnesnon.nonsense.loader.api.extensions.PreLaunchExtension;
|
import dev.frogmc.frogloader.impl.gui.LoaderGui;
|
||||||
import org.ecorous.esnesnon.nonsense.loader.api.mod.ModDependencies;
|
import dev.frogmc.frogloader.impl.mod.*;
|
||||||
import org.ecorous.esnesnon.nonsense.loader.api.mod.ModExtensions;
|
import dev.frogmc.frogloader.api.extensions.PreLaunchExtension;
|
||||||
import org.ecorous.esnesnon.nonsense.loader.api.mod.ModProperties;
|
import dev.frogmc.frogloader.api.mod.ModDependencies;
|
||||||
import org.ecorous.esnesnon.nonsense.loader.api.plugin.NonsensePlugin;
|
import dev.frogmc.frogloader.api.mod.ModExtensions;
|
||||||
import org.ecorous.esnesnon.nonsense.loader.impl.Discovery;
|
import dev.frogmc.frogloader.api.mod.ModProperties;
|
||||||
import org.ecorous.esnesnon.nonsense.loader.impl.LoaderImpl;
|
import dev.frogmc.frogloader.api.plugin.NonsensePlugin;
|
||||||
import org.ecorous.esnesnon.nonsense.loader.impl.gui.LoaderGui;
|
import dev.frogmc.frogloader.impl.Discovery;
|
||||||
import org.ecorous.esnesnon.nonsense.loader.impl.mixin.AWProcessor;
|
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.loader.impl.mod.*;
|
||||||
import org.ecorous.esnesnon.nonsense_remapper.NonsenseRemapper;
|
import org.ecorous.esnesnon.nonsense_remapper.NonsenseRemapper;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
|
@ -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 dev.frogmc.frogloader.impl.mod.SemVerImpl;
|
||||||
import org.ecorous.esnesnon.nonsense.loader.impl.SemVerParseException;
|
import dev.frogmc.frogloader.api.mod.SemVer;
|
||||||
import org.ecorous.esnesnon.nonsense.loader.impl.mod.SemVerImpl;
|
import dev.frogmc.frogloader.impl.SemVerParseException;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
|
|
||||||
public class MinecraftSemVerImpl implements SemVer {
|
public class MinecraftSemVerImpl implements SemVer {
|
|
@ -1,4 +1,4 @@
|
||||||
package org.ecorous.esnesnon.nonsense.loader.impl.util;
|
package dev.frogmc.frogloader.impl.util;
|
||||||
|
|
||||||
import java.awt.*;
|
import java.awt.*;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
|
@ -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);
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -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);
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -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 {
|
|
||||||
}
|
|
|
@ -0,0 +1 @@
|
||||||
|
dev.frogmc.frogloader.impl.plugin.game.minecraft.Minecraft
|
|
@ -1 +0,0 @@
|
||||||
org.ecorous.esnesnon.nonsense.loader.impl.plugin.game.minecraft.Minecraft
|
|
|
@ -1 +1 @@
|
||||||
org.ecorous.esnesnon.nonsense.loader.impl.mixin.NonsenseGlobalPropertyService
|
dev.frogmc.frogloader.impl.mixin.NonsenseGlobalPropertyService
|
Loading…
Reference in a new issue