move to domain namespace

This commit is contained in:
moehreag 2024-06-02 23:21:45 +02:00
parent f197ebca4b
commit 525d16b17d
40 changed files with 110 additions and 110 deletions

View file

@ -5,17 +5,17 @@ plugins {
`maven-publish`
}
group = "org.ecorous.frogmc"
group = "dev.frogmc"
version = "0.0.1-SNAPSHOT"
repositories {
maven {
name = "FrogMC Maven/Snapshots"
url = uri("https://maven-frogmc.ecorous.org/snapshots")
url = uri("https://maven.frogmc.dev/snapshots")
}
maven {
name = "FrogMC Maven/Releases"
url = uri("https://maven-frogmc.ecorous.org/releases")
url = uri("https://maven.frogmc.dev/releases")
}
maven("https://maven.fabricmc.net/")
maven("https://repo.spongepowered.org/maven")
@ -58,7 +58,7 @@ publishing {
repositories {
maven {
name = "FrogMCSnapshotsMaven"
url = uri("https://maven-frogmc.ecorous.org/snapshots")
url = uri("https://maven.frogmc.dev/snapshots")
credentials(PasswordCredentials::class)
authentication {
create<BasicAuthentication>("basic")
@ -67,7 +67,7 @@ publishing {
maven {
name = "FrogMCReleasesMaven"
url = uri("https://maven-frogmc.ecorous.org/releases")
url = uri("https://maven.frogmc.dev/releases")
credentials(PasswordCredentials::class)
authentication {
create<BasicAuthentication>("basic")

View file

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

View file

@ -1,4 +1,4 @@
import org.ecorous.frogmc.phytotelma.ext.minecraft
import dev.frogmc.phytotelma.ext.minecraft
plugins {
java

View file

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

View file

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

View file

@ -1,7 +1,7 @@
{
"required": true,
"minVersion": "0.8",
"package": "org.ecorous.frogmc.frogloader.example.mixin",
"package": "dev.frogmc.frogloader.example.mixin",
"compatibilityLevel": "JAVA_21",
"mixins": [],
"client": [

View file

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

View file

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

View file

@ -1,13 +1,13 @@
package org.ecorous.frogmc.frogloader.api;
package dev.frogmc.frogloader.api;
import java.nio.file.Path;
import java.util.List;
import java.util.Optional;
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;
import dev.frogmc.frogloader.api.env.Env;
import dev.frogmc.frogloader.api.mod.ModProperties;
import dev.frogmc.frogloader.impl.LoaderImpl;
import dev.frogmc.frogloader.impl.plugin.NonsensePlugin;
public interface Loader {

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -1,4 +1,4 @@
package org.ecorous.frogmc.frogloader.impl;
package dev.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.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 dev.frogmc.frogloader.api.Loader;
import dev.frogmc.frogloader.api.env.Env;
import dev.frogmc.frogloader.api.mod.ModProperties;
import dev.frogmc.frogloader.impl.launch.MixinClassLoader;
import dev.frogmc.frogloader.impl.mod.ModUtil;
import dev.frogmc.frogloader.impl.plugin.NonsensePlugin;
import lombok.Getter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

View file

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

View file

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

View file

@ -1,4 +1,4 @@
package org.ecorous.frogmc.frogloader.impl.launch;
package dev.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.frogmc.frogloader.api.env.Env;
import org.ecorous.frogmc.frogloader.impl.mixin.NonsenseMixinService;
import dev.frogmc.frogloader.api.env.Env;
import dev.frogmc.frogloader.impl.mixin.NonsenseMixinService;
import lombok.Getter;
import org.spongepowered.asm.launch.MixinBootstrap;
import org.spongepowered.asm.service.IPropertyKey;
@ -40,8 +40,8 @@ public class Launcher {
targetClassLoader.excludePackage("org.slf4j");
targetClassLoader.excludePackage("org.spongepowered");
targetClassLoader.excludePackage("org.apache.logging");
targetClassLoader.excludePackage("org.ecorous.frogmc.frogloader.impl.launch");
targetClassLoader.excludePackage("org.ecorous.frogmc.frogloader.api.env");
targetClassLoader.excludePackage("dev.frogmc.frogloader.impl.launch");
targetClassLoader.excludePackage("dev.frogmc.frogloader.api.env");
Thread.currentThread().setContextClassLoader(targetClassLoader);
@ -49,7 +49,7 @@ public class Launcher {
MixinBootstrap.init();
try {
Class<?> clazz = targetClassLoader.findClass("org.ecorous.frogmc.frogloader.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) {

View file

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

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);
}
}

View file

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

View file

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

View file

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

View file

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

View file

@ -1,4 +1,4 @@
package org.ecorous.frogmc.frogloader.impl.mixin;
package dev.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.frogmc.frogloader.impl.launch.Launcher;
import dev.frogmc.frogloader.impl.launch.Launcher;
import org.objectweb.asm.ClassReader;
import org.objectweb.asm.tree.ClassNode;
import org.spongepowered.asm.launch.platform.container.ContainerHandleVirtual;

View file

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

View file

@ -1,12 +1,12 @@
package org.ecorous.frogmc.frogloader.impl.mod;
package dev.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;
import dev.frogmc.frogloader.api.mod.ModDependencies;
import dev.frogmc.frogloader.api.mod.SemVer;
import dev.frogmc.frogloader.api.mod.ModExtensions;
import dev.frogmc.frogloader.api.mod.ModProperties;
public record ModPropertiesImpl(String id, String name, SemVer version, String license,
Map<String, Collection<String>> credits, ModDependencies dependencies,

View file

@ -1,4 +1,4 @@
package org.ecorous.frogmc.frogloader.impl.mod;
package dev.frogmc.frogloader.impl.mod;
import java.io.IOException;
import java.io.UncheckedIOException;
@ -13,10 +13,10 @@ import com.electronwill.nightconfig.core.CommentedConfig;
import com.electronwill.nightconfig.core.UnmodifiableConfig;
import com.electronwill.nightconfig.core.file.FileNotFoundAction;
import com.electronwill.nightconfig.toml.TomlParser;
import dev.frogmc.frogloader.api.mod.ModDependencies;
import dev.frogmc.frogloader.api.mod.ModProperties;
import lombok.AllArgsConstructor;
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 dev.frogmc.frogloader.api.mod.ModExtensions;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

View file

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

View file

@ -1,4 +1,4 @@
package org.ecorous.frogmc.frogloader.impl.mod;
package dev.frogmc.frogloader.impl.mod;
import java.util.List;
import java.util.Objects;
@ -6,9 +6,9 @@ import java.util.function.IntSupplier;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import dev.frogmc.frogloader.api.mod.SemVer;
import dev.frogmc.frogloader.impl.SemVerParseException;
import lombok.NonNull;
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

View file

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

View file

@ -1,4 +1,4 @@
package org.ecorous.frogmc.frogloader.impl.plugin.game.minecraft;
package dev.frogmc.frogloader.impl.plugin.game.minecraft;
import java.io.File;
import java.io.IOException;
@ -11,18 +11,18 @@ import java.nio.file.*;
import java.util.*;
import com.google.gson.JsonObject;
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 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.impl.Discovery;
import dev.frogmc.frogloader.impl.LoaderImpl;
import dev.frogmc.frogloader.impl.mixin.AWProcessor;
import dev.frogmc.frogloader.impl.mod.BuiltinExtensions;
import dev.frogmc.frogloader.impl.mod.ModPropertiesImpl;
import dev.frogmc.frogloader.impl.mod.ModPropertiesReader;
import dev.frogmc.frogloader.impl.plugin.NonsensePlugin;
import dev.frogmc.thyroxine.Thyroxine;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.spongepowered.asm.mixin.Mixins;

View file

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

View file

@ -1,11 +0,0 @@
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);
}
}

View file

@ -1,11 +0,0 @@
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);
}
}

View file

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

View file

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

View file

@ -1 +1 @@
org.ecorous.frogmc.frogloader.impl.mixin.NonsenseGlobalPropertyService
dev.frogmc.frogloader.impl.mixin.NonsenseGlobalPropertyService