move maven group/package
This commit is contained in:
parent
36260356e2
commit
a62114b201
|
@ -5,17 +5,17 @@ plugins {
|
||||||
`maven-publish`
|
`maven-publish`
|
||||||
}
|
}
|
||||||
|
|
||||||
group = "org.ecorous.esnesnon"
|
group = "org.ecorous.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.ecorous.org/snapshots")
|
||||||
}
|
}
|
||||||
maven {
|
maven {
|
||||||
name = "Esnesnon Maven/Releases"
|
name = "FrogMC Maven/Releases"
|
||||||
url = uri("https://maven-esnesnon.ecorous.org/releases")
|
url = uri("https://maven-frogmc.ecorous.org/releases")
|
||||||
}
|
}
|
||||||
maven("https://maven.fabricmc.net/")
|
maven("https://maven.fabricmc.net/")
|
||||||
maven("https://repo.spongepowered.org/maven")
|
maven("https://repo.spongepowered.org/maven")
|
||||||
|
@ -23,7 +23,7 @@ repositories {
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
implementation(libs.remapper){
|
implementation(libs.thyroxine){
|
||||||
isTransitive = false
|
isTransitive = false
|
||||||
}
|
}
|
||||||
compileOnly("org.apache.logging.log4j:log4j-slf4j2-impl:3.0.0-beta2")
|
compileOnly("org.apache.logging.log4j:log4j-slf4j2-impl:3.0.0-beta2")
|
||||||
|
@ -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.ecorous.org/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.ecorous.org/releases")
|
||||||
credentials(PasswordCredentials::class)
|
credentials(PasswordCredentials::class)
|
||||||
authentication {
|
authentication {
|
||||||
create<BasicAuthentication>("basic")
|
create<BasicAuthentication>("basic")
|
||||||
|
|
|
@ -1,13 +1,13 @@
|
||||||
[versions]
|
[versions]
|
||||||
|
|
||||||
remapper = "1.0.0-SNAPSHOT"
|
thyroxine = "1.0.0-SNAPSHOT"
|
||||||
nightconfig = "3.7.2"
|
nightconfig = "3.7.2"
|
||||||
mixin = "0.13.4+mixin.0.8.5"
|
mixin = "0.13.4+mixin.0.8.5"
|
||||||
annotations = "24.1.0"
|
annotations = "24.1.0"
|
||||||
|
|
||||||
[libraries]
|
[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" }
|
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,18 +1,18 @@
|
||||||
import org.ecorous.esnesnon.gradle.ext.minecraft
|
import org.ecorous.frogmc.phytotelma.ext.minecraft
|
||||||
|
|
||||||
plugins {
|
plugins {
|
||||||
java
|
java
|
||||||
id("org.ecorous.esnesnon.phytotelma") version "0.0.1-SNAPSHOT"
|
id("org.ecorous.frogmc.phytotelma") 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.ecorous.org/snapshots")
|
||||||
}
|
}
|
||||||
maven {
|
maven {
|
||||||
name = "Esnesnon Maven/Releases"
|
name = "FrogMC Maven/Releases"
|
||||||
url = uri("https://maven-esnesnon.ecorous.org/releases")
|
url = uri("https://maven-frogmc.ecorous.org/releases")
|
||||||
}
|
}
|
||||||
mavenCentral()
|
mavenCentral()
|
||||||
}
|
}
|
||||||
|
|
|
@ -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.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
|
@ -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.components.FocusableTextWidget;
|
||||||
import net.minecraft.client.gui.screens.Screen;
|
import net.minecraft.client.gui.screens.Screen;
|
|
@ -1,11 +1,11 @@
|
||||||
{
|
{
|
||||||
"required": true,
|
"required": true,
|
||||||
"minVersion": "0.8",
|
"minVersion": "0.8",
|
||||||
"package": "org.ecorous.esnesnon.nonsense.loader.example.mixin",
|
"package": "org.ecorous.frogmc.frogloader.example.mixin",
|
||||||
"compatibilityLevel": "JAVA_21",
|
"compatibilityLevel": "JAVA_21",
|
||||||
"mixins": [],
|
"mixins": [],
|
||||||
"client": [
|
"client": [
|
||||||
"TitleScreenMixin"
|
"TitleScreenMixin"
|
||||||
],
|
],
|
||||||
"injectors": {
|
"injectors": {
|
||||||
"defaultRequire": 1
|
"defaultRequire": 1
|
||||||
|
|
|
@ -19,7 +19,7 @@ breaks = [
|
||||||
]
|
]
|
||||||
|
|
||||||
[frog.extensions]
|
[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"
|
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.ecorous.org/releases")
|
||||||
}
|
}
|
||||||
maven {
|
maven {
|
||||||
name = "Esnesnos Maven Snapshots"
|
name = "FrogMC Maven Snapshots"
|
||||||
url = uri("https://maven-esnesnon.ecorous.org/snapshots")
|
url = uri("https://maven-frogmc.ecorous.org/snapshots")
|
||||||
}
|
}
|
||||||
gradlePluginPortal()
|
gradlePluginPortal()
|
||||||
}
|
}
|
||||||
|
|
|
@ -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();
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -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);
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -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);
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -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 {
|
|
||||||
}
|
|
|
@ -1,13 +1,13 @@
|
||||||
package org.ecorous.esnesnon.nonsense.loader.api;
|
package org.ecorous.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 org.ecorous.frogmc.frogloader.api.env.Env;
|
||||||
import org.ecorous.esnesnon.nonsense.loader.api.mod.ModProperties;
|
import org.ecorous.frogmc.frogloader.api.mod.ModProperties;
|
||||||
import org.ecorous.esnesnon.nonsense.loader.impl.LoaderImpl;
|
import org.ecorous.frogmc.frogloader.impl.LoaderImpl;
|
||||||
import org.ecorous.esnesnon.nonsense.loader.impl.plugin.NonsensePlugin;
|
import org.ecorous.frogmc.frogloader.impl.plugin.NonsensePlugin;
|
||||||
|
|
||||||
public interface Loader {
|
public interface Loader {
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
package org.ecorous.esnesnon.nonsense.loader.api.env;
|
package org.ecorous.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 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.
|
* The Pre-Launch Extension.
|
|
@ -1,4 +1,4 @@
|
||||||
package org.ecorous.esnesnon.nonsense.loader.api.mod;
|
package org.ecorous.frogmc.frogloader.api.mod;
|
||||||
|
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
|
|
|
@ -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.MethodHandle;
|
||||||
import java.lang.invoke.MethodHandles;
|
import java.lang.invoke.MethodHandles;
|
|
@ -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.Collection;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
|
@ -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> {
|
public interface SemVer extends Comparable<SemVer> {
|
||||||
int major();
|
int major();
|
|
@ -1,4 +1,4 @@
|
||||||
package org.ecorous.esnesnon.nonsense.loader.impl;
|
package org.ecorous.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 org.ecorous.frogmc.frogloader.impl;
|
||||||
|
|
||||||
import java.io.*;
|
import java.io.*;
|
||||||
import java.lang.invoke.MethodHandle;
|
import java.lang.invoke.MethodHandle;
|
||||||
|
@ -11,12 +11,12 @@ import java.util.*;
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
import com.google.gson.Gson;
|
import com.google.gson.Gson;
|
||||||
import org.ecorous.esnesnon.nonsense.loader.api.Loader;
|
import org.ecorous.frogmc.frogloader.api.Loader;
|
||||||
import org.ecorous.esnesnon.nonsense.loader.api.env.Env;
|
import org.ecorous.frogmc.frogloader.api.env.Env;
|
||||||
import org.ecorous.esnesnon.nonsense.loader.api.mod.ModProperties;
|
import org.ecorous.frogmc.frogloader.api.mod.ModProperties;
|
||||||
import org.ecorous.esnesnon.nonsense.loader.impl.launch.MixinClassLoader;
|
import org.ecorous.frogmc.frogloader.impl.launch.MixinClassLoader;
|
||||||
import org.ecorous.esnesnon.nonsense.loader.impl.mod.ModUtil;
|
import org.ecorous.frogmc.frogloader.impl.mod.ModUtil;
|
||||||
import org.ecorous.esnesnon.nonsense.loader.impl.plugin.NonsensePlugin;
|
import org.ecorous.frogmc.frogloader.impl.plugin.NonsensePlugin;
|
||||||
import lombok.Getter;
|
import lombok.Getter;
|
||||||
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.impl;
|
package org.ecorous.frogmc.frogloader.impl;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
|
|
@ -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.*;
|
||||||
import java.util.concurrent.ConcurrentHashMap;
|
import java.util.concurrent.ConcurrentHashMap;
|
|
@ -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.MethodHandle;
|
||||||
import java.lang.invoke.MethodHandles;
|
import java.lang.invoke.MethodHandles;
|
||||||
|
@ -6,8 +6,8 @@ import java.lang.invoke.MethodType;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
import org.ecorous.esnesnon.nonsense.loader.api.env.Env;
|
import org.ecorous.frogmc.frogloader.api.env.Env;
|
||||||
import org.ecorous.esnesnon.nonsense.loader.impl.mixin.NonsenseMixinService;
|
import org.ecorous.frogmc.frogloader.impl.mixin.NonsenseMixinService;
|
||||||
import lombok.Getter;
|
import lombok.Getter;
|
||||||
import org.spongepowered.asm.launch.MixinBootstrap;
|
import org.spongepowered.asm.launch.MixinBootstrap;
|
||||||
import org.spongepowered.asm.service.IPropertyKey;
|
import org.spongepowered.asm.service.IPropertyKey;
|
||||||
|
@ -49,7 +49,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("impl.org.ecorous.frogmc.frogloader.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,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.jetbrains.annotations.Nullable;
|
||||||
import org.spongepowered.asm.mixin.MixinEnvironment;
|
import org.spongepowered.asm.mixin.MixinEnvironment;
|
||||||
|
|
|
@ -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);
|
||||||
|
}
|
||||||
|
}
|
|
@ -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);
|
||||||
|
}
|
||||||
|
}
|
|
@ -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.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 org.ecorous.frogmc.frogloader.api.mod.ModProperties;
|
||||||
import org.ecorous.esnesnon.nonsense.loader.impl.launch.AccessWidener;
|
import org.ecorous.frogmc.frogloader.impl.launch.AccessWidener;
|
||||||
import org.ecorous.esnesnon.nonsense.loader.impl.mod.BuiltinExtensions;
|
import org.ecorous.frogmc.frogloader.impl.mod.BuiltinExtensions;
|
||||||
|
|
||||||
public class AWProcessor {
|
public class AWProcessor {
|
||||||
|
|
|
@ -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.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 org.ecorous.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 org.ecorous.frogmc.frogloader.impl.mixin;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.io.InputStream;
|
import java.io.InputStream;
|
||||||
|
@ -8,7 +8,7 @@ import java.util.Collections;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
import lombok.Getter;
|
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.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 org.ecorous.frogmc.frogloader.impl.mod;
|
||||||
|
|
||||||
import lombok.experimental.UtilityClass;
|
import lombok.experimental.UtilityClass;
|
||||||
|
|
|
@ -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 {
|
||||||
|
}
|
|
@ -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.IOException;
|
||||||
import java.io.UncheckedIOException;
|
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.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.*;
|
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.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
package org.ecorous.esnesnon.nonsense.loader.impl.mod;
|
package org.ecorous.frogmc.frogloader.impl.mod;
|
||||||
|
|
||||||
import java.util.Collection;
|
import java.util.Collection;
|
||||||
|
|
||||||
import org.ecorous.esnesnon.nonsense.loader.api.mod.ModProperties;
|
import org.ecorous.frogmc.frogloader.api.mod.ModProperties;
|
||||||
|
|
||||||
public class ModUtil {
|
public class ModUtil {
|
||||||
|
|
|
@ -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.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 org.ecorous.frogmc.frogloader.api.mod.SemVer;
|
||||||
import org.ecorous.esnesnon.nonsense.loader.impl.SemVerParseException;
|
import org.ecorous.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,9 +1,9 @@
|
||||||
package org.ecorous.esnesnon.nonsense.loader.impl.plugin;
|
package org.ecorous.frogmc.frogloader.impl.plugin;
|
||||||
|
|
||||||
import java.util.Collection;
|
import java.util.Collection;
|
||||||
|
|
||||||
import org.ecorous.esnesnon.nonsense.loader.api.mod.ModProperties;
|
import org.ecorous.frogmc.frogloader.api.mod.ModProperties;
|
||||||
import org.ecorous.esnesnon.nonsense.loader.impl.LoaderImpl;
|
import org.ecorous.frogmc.frogloader.impl.LoaderImpl;
|
||||||
|
|
||||||
public interface NonsensePlugin extends Runnable {
|
public interface NonsensePlugin extends Runnable {
|
||||||
|
|
|
@ -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.File;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
@ -11,16 +11,18 @@ 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.extensions.PreLaunchExtension;
|
import org.ecorous.frogmc.frogloader.api.extensions.PreLaunchExtension;
|
||||||
import org.ecorous.esnesnon.nonsense.loader.api.mod.*;
|
import org.ecorous.frogmc.frogloader.impl.Discovery;
|
||||||
import org.ecorous.esnesnon.nonsense.loader.impl.Discovery;
|
import org.ecorous.frogmc.frogloader.impl.LoaderImpl;
|
||||||
import org.ecorous.esnesnon.nonsense.loader.impl.LoaderImpl;
|
import org.ecorous.frogmc.frogloader.impl.mixin.AWProcessor;
|
||||||
import org.ecorous.esnesnon.nonsense.loader.impl.mixin.AWProcessor;
|
import org.ecorous.frogmc.frogloader.impl.mod.BuiltinExtensions;
|
||||||
import org.ecorous.esnesnon.nonsense.loader.impl.mod.BuiltinExtensions;
|
import org.ecorous.frogmc.frogloader.impl.mod.ModPropertiesImpl;
|
||||||
import org.ecorous.esnesnon.nonsense.loader.impl.mod.ModPropertiesImpl;
|
import org.ecorous.frogmc.frogloader.impl.mod.ModPropertiesReader;
|
||||||
import org.ecorous.esnesnon.nonsense.loader.impl.mod.ModPropertiesReader;
|
import org.ecorous.frogmc.frogloader.impl.plugin.NonsensePlugin;
|
||||||
import org.ecorous.esnesnon.nonsense.loader.impl.plugin.NonsensePlugin;
|
import org.ecorous.frogmc.thyroxine.Thyroxine;
|
||||||
import org.ecorous.esnesnon.nonsense_remapper.NonsenseRemapper;
|
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.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
import org.spongepowered.asm.mixin.Mixins;
|
import org.spongepowered.asm.mixin.Mixins;
|
||||||
|
@ -95,7 +97,7 @@ public class Minecraft implements NonsensePlugin {
|
||||||
|
|
||||||
if (!loader.isDevelopment()) {
|
if (!loader.isDevelopment()) {
|
||||||
if (!Files.exists(remappedGamePath)) {
|
if (!Files.exists(remappedGamePath)) {
|
||||||
NonsenseRemapper.run(version, gamePath, remappedGamePath, true, false);
|
Thyroxine.run(version, gamePath, remappedGamePath, true, false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -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;
|
import org.jetbrains.annotations.NotNull;
|
||||||
|
|
||||||
public class MinecraftSemVerImpl implements SemVer {
|
public class MinecraftSemVerImpl implements SemVer {
|
|
@ -1 +0,0 @@
|
||||||
org.ecorous.esnesnon.nonsense.loader.impl.plugin.game.minecraft.Minecraft
|
|
|
@ -0,0 +1 @@
|
||||||
|
org.ecorous.frogmc.frogloader.impl.plugin.game.minecraft.Minecraft
|
|
@ -1 +1 @@
|
||||||
org.ecorous.esnesnon.nonsense.loader.impl.mixin.NonsenseGlobalPropertyService
|
org.ecorous.frogmc.frogloader.impl.mixin.NonsenseGlobalPropertyService
|
|
@ -3,10 +3,10 @@ format_version = "1.0.0"
|
||||||
|
|
||||||
[frog.mod]
|
[frog.mod]
|
||||||
id = "frogloader"
|
id = "frogloader"
|
||||||
name = "Nonsense Loader"
|
name = "FrogLoader"
|
||||||
version = "${version}"
|
version = "${version}"
|
||||||
license = "Apache-2.0"
|
license = "Apache-2.0"
|
||||||
credits = [
|
credits = [
|
||||||
{ name = "Nonsense Team", roles = ["author"] }
|
{ name = "FrogMC Team", roles = ["author"] }
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue