Develop beta 44 (#1053)

README.md

@@ -117,9 +117,9 @@ repositories {
 }
 dependencies {
     // Add Connector to the launch classpath
-    minecraftLibrary fg.deobf("dev.su5ed.sinytra:Connector:<version>")
+    minecraftLibrary fg.deobf("org.sinytra:Connector:<version>")
     // Add FFAPI dependency (if required)
-    runtimeOnly fg.deobf("dev.su5ed.sinytra.fabric-api:fabric-api:<version>")
+    runtimeOnly fg.deobf("org.sinytra.fabric-api:fabric-api:<version>")
     // Install desired Fabric mods 
     implementation "some.fabric:mod:<version>"
 }

build.gradle.kts

@@ -41,6 +41,7 @@ plugins {
 val versionConnector: String by project
 val versionAdapter: String by project
 val versionAdapterDefinition: String by project
+val versionAdapterRuntime: String by project
 val versionMc: String by project
 val versionForge: String by project
 val versionForgeAutoRenamingTool: String by project
@@ -61,7 +62,7 @@ val mixinextrasVersion: String by project
 
 val PUBLISH_RELEASE_TYPE: Provider<String> = providers.environmentVariable("PUBLISH_RELEASE_TYPE")
 
-group = "dev.su5ed.sinytra"
+group = "org.sinytra"
 version = "$versionConnector+$versionMc"
 // Append git commit hash for dev versions
 if (!PUBLISH_RELEASE_TYPE.isPresent) {
@@ -322,9 +323,12 @@ dependencies {
 
     annotationProcessor(group = "org.sinytra", name = "sponge-mixin", version = versionMixin)
     compileOnly(group = "org.sinytra", name = "sponge-mixin", version = versionMixin)
-    implementation(jarJar("io.github.llamalad7:mixinextras-forge:${mixinextrasVersion}")!!) {
+    implementation(jarJar("io.github.llamalad7:mixinextras-forge:$mixinextrasVersion")!!) {
         jarJar.ranged(this, "[${mixinextrasVersion},)")
     }
+    implementation(jarJar("org.sinytra.adapter:runtime:$versionAdapterRuntime+$versionMc")!!) {
+        jarJar.ranged(this, "[${versionAdapterRuntime},)")
+    }
     compileOnly(group = "dev.su5ed.sinytra.fabric-api", name = "fabric-api", version = versionFabricApi)
     runtimeOnly(fg.deobf("dev.su5ed.sinytra.fabric-api:fabric-api:$versionFabricApi"))
 
@@ -347,7 +351,7 @@ tasks {
                 "Implementation-Version" to project.version,
                 "Implementation-Vendor" to "Sinytra",
                 "Implementation-Timestamp" to LocalDateTime.now(),
-                "Automatic-Module-Name" to "dev.su5ed.sinytra.connector"
+                "Automatic-Module-Name" to "org.sinytra.connector"
             )
         }
 

gradle.properties

@@ -4,9 +4,10 @@ org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=true
 
 # Versions
-versionConnector=1.0.0-beta.43
+versionConnector=1.0.0-beta.44
 versionAdapter=1.11.55-1.20.1-20240428.153904
-versionAdapterDefinition=1.11.55
+versionAdapterDefinition=1.11.65
+versionAdapterRuntime=1.0.0
 
 versionMc=1.20.1
 versionForge=47.1.3

src/main/java/dev/su5ed/sinytra/connector/ConnectorUtil.java → src/main/java/org/sinytra/connector/ConnectorUtil.java

@@ -1,4 +1,4 @@
-package dev.su5ed.sinytra.connector;
+package org.sinytra.connector;
 
 import com.google.common.collect.ImmutableMultimap;
 import com.google.common.collect.Multimap;
@@ -7,7 +7,7 @@
 import com.google.gson.GsonBuilder;
 import cpw.mods.modlauncher.api.LamdbaExceptionUtils;
 import cpw.mods.modlauncher.api.ServiceRunner;
-import dev.su5ed.sinytra.connector.locator.EmbeddedDependencies;
+import org.sinytra.connector.locator.EmbeddedDependencies;
 import net.fabricmc.loader.api.FabricLoader;
 import net.fabricmc.loader.api.Version;
 import net.fabricmc.loader.impl.metadata.EntrypointMetadata;

src/main/java/dev/su5ed/sinytra/connector/loader/ConnectorEarlyLoader.java → src/main/java/org/sinytra/connector/loader/ConnectorEarlyLoader.java

@@ -1,8 +1,8 @@
-package dev.su5ed.sinytra.connector.loader;
+package org.sinytra.connector.loader;
 
 import com.mojang.logging.LogUtils;
-import dev.su5ed.sinytra.connector.ConnectorUtil;
-import dev.su5ed.sinytra.connector.locator.ConnectorConfig;
+import org.sinytra.connector.ConnectorUtil;
+import org.sinytra.connector.locator.ConnectorConfig;
 import net.fabricmc.loader.api.FabricLoader;
 import net.fabricmc.loader.api.entrypoint.PreLaunchEntrypoint;
 import net.fabricmc.loader.impl.FabricLoaderImpl;

src/main/java/dev/su5ed/sinytra/connector/loader/ConnectorLoaderModMetadata.java → src/main/java/org/sinytra/connector/loader/ConnectorLoaderModMetadata.java

@@ -1,6 +1,6 @@
-package dev.su5ed.sinytra.connector.loader;
+package org.sinytra.connector.loader;
 
-import dev.su5ed.sinytra.connector.ConnectorUtil;
+import org.sinytra.connector.ConnectorUtil;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.loader.api.Version;
 import net.fabricmc.loader.api.metadata.ContactInformation;

src/main/java/dev/su5ed/sinytra/connector/locator/ConnectorConfig.java → src/main/java/org/sinytra/connector/locator/ConnectorConfig.java

@@ -1,4 +1,4 @@
-package dev.su5ed.sinytra.connector.locator;
+package org.sinytra.connector.locator;
 
 import com.google.common.base.Suppliers;
 import com.google.common.collect.HashMultimap;
@@ -14,7 +14,7 @@
 import com.mojang.serialization.DataResult;
 import com.mojang.serialization.JsonOps;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
-import dev.su5ed.sinytra.connector.ConnectorUtil;
+import org.sinytra.connector.ConnectorUtil;
 import net.minecraftforge.fml.loading.FMLPaths;
 import org.slf4j.Logger;
 

src/main/java/dev/su5ed/sinytra/connector/locator/ConnectorEarlyLocator.java → src/main/java/org/sinytra/connector/locator/ConnectorEarlyLocator.java

@@ -1,7 +1,7 @@
-package dev.su5ed.sinytra.connector.locator;
+package org.sinytra.connector.locator;
 
 import com.mojang.logging.LogUtils;
-import dev.su5ed.sinytra.connector.loader.ConnectorEarlyLoader;
+import org.sinytra.connector.loader.ConnectorEarlyLoader;
 import net.minecraftforge.fml.loading.FMLLoader;
 import net.minecraftforge.fml.loading.moddiscovery.AbstractJarFileModLocator;
 import net.minecraftforge.fml.loading.moddiscovery.ModDiscoverer;

src/main/java/dev/su5ed/sinytra/connector/locator/ConnectorLocator.java → src/main/java/org/sinytra/connector/locator/ConnectorLocator.java

@@ -1,14 +1,14 @@
-package dev.su5ed.sinytra.connector.locator;
+package org.sinytra.connector.locator;
 
 import com.electronwill.nightconfig.core.file.FileConfig;
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.Multimap;
 import com.mojang.logging.LogUtils;
 import cpw.mods.jarhandling.SecureJar;
-import dev.su5ed.sinytra.connector.ConnectorUtil;
-import dev.su5ed.sinytra.connector.loader.ConnectorEarlyLoader;
-import dev.su5ed.sinytra.connector.loader.ConnectorLoaderModMetadata;
-import dev.su5ed.sinytra.connector.transformer.jar.JarTransformer;
+import org.sinytra.connector.ConnectorUtil;
+import org.sinytra.connector.loader.ConnectorEarlyLoader;
+import org.sinytra.connector.loader.ConnectorLoaderModMetadata;
+import org.sinytra.connector.transformer.jar.JarTransformer;
 import net.fabricmc.loader.impl.metadata.NestedJarEntry;
 import net.minecraftforge.fml.loading.ClasspathLocatorUtils;
 import net.minecraftforge.fml.loading.EarlyLoadingException;
@@ -56,7 +56,7 @@
 
 import static cpw.mods.modlauncher.api.LamdbaExceptionUtils.rethrowFunction;
 import static cpw.mods.modlauncher.api.LamdbaExceptionUtils.uncheck;
-import static dev.su5ed.sinytra.connector.transformer.jar.JarTransformer.cacheTransformableJar;
+import static org.sinytra.connector.transformer.jar.JarTransformer.cacheTransformableJar;
 import static net.minecraftforge.fml.loading.LogMarkers.SCAN;
 
 public class ConnectorLocator extends AbstractJarFileModProvider implements IDependencyLocator {

src/main/java/dev/su5ed/sinytra/connector/locator/ConnectorModMetadataParser.java → src/main/java/org/sinytra/connector/locator/ConnectorModMetadataParser.java

@@ -1,9 +1,9 @@
-package dev.su5ed.sinytra.connector.locator;
+package org.sinytra.connector.locator;
 
 import com.electronwill.nightconfig.core.Config;
 import com.mojang.logging.LogUtils;
-import dev.su5ed.sinytra.connector.ConnectorUtil;
-import dev.su5ed.sinytra.connector.loader.ConnectorLoaderModMetadata;
+import org.sinytra.connector.ConnectorUtil;
+import org.sinytra.connector.loader.ConnectorLoaderModMetadata;
 import net.fabricmc.loader.api.metadata.ContactInformation;
 import net.fabricmc.loader.api.metadata.Person;
 import net.minecraftforge.fml.loading.moddiscovery.ModFile;

src/main/java/dev/su5ed/sinytra/connector/locator/DependencyResolver.java → src/main/java/org/sinytra/connector/locator/DependencyResolver.java

@@ -1,12 +1,12 @@
-package dev.su5ed.sinytra.connector.locator;
+package org.sinytra.connector.locator;
 
 import com.google.common.base.Suppliers;
 import com.google.common.collect.BiMap;
 import com.google.common.collect.HashBiMap;
 import com.google.common.collect.Multimap;
 import com.mojang.logging.LogUtils;
-import dev.su5ed.sinytra.connector.loader.ConnectorEarlyLoader;
-import dev.su5ed.sinytra.connector.transformer.jar.JarTransformer;
+import org.sinytra.connector.loader.ConnectorEarlyLoader;
+import org.sinytra.connector.transformer.jar.JarTransformer;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.loader.api.FabricLoader;
 import net.fabricmc.loader.api.VersionParsingException;

src/main/java/dev/su5ed/sinytra/connector/locator/EmbeddedDependencies.java → src/main/java/org/sinytra/connector/locator/EmbeddedDependencies.java

@@ -1,4 +1,4 @@
-package dev.su5ed.sinytra.connector.locator;
+package org.sinytra.connector.locator;
 
 import com.google.common.base.Suppliers;
 import com.google.common.collect.ImmutableMap;

src/main/java/dev/su5ed/sinytra/connector/locator/ForgeModPackageFilter.java → src/main/java/org/sinytra/connector/locator/ForgeModPackageFilter.java

@@ -1,4 +1,4 @@
-package dev.su5ed.sinytra.connector.locator;
+package org.sinytra.connector.locator;
 
 import com.google.common.collect.Sets;
 import com.mojang.logging.LogUtils;

src/main/java/dev/su5ed/sinytra/connector/locator/PackageTracker.java → src/main/java/org/sinytra/connector/locator/PackageTracker.java

@@ -15,7 +15,7 @@
  *     You should have received a copy of the GNU Lesser General Public License
  *     along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package dev.su5ed.sinytra.connector.locator;
+package org.sinytra.connector.locator;
 
 import java.util.Set;
 import java.util.function.BiPredicate;

src/main/java/dev/su5ed/sinytra/connector/locator/SplitPackageMerger.java → src/main/java/org/sinytra/connector/locator/SplitPackageMerger.java

@@ -1,12 +1,12 @@
-package dev.su5ed.sinytra.connector.locator;
+package org.sinytra.connector.locator;
 
 import com.mojang.datafixers.util.Pair;
 import com.mojang.logging.LogUtils;
 import cpw.mods.jarhandling.SecureJar;
 import cpw.mods.modlauncher.Launcher;
 import cpw.mods.modlauncher.api.IModuleLayerManager;
-import dev.su5ed.sinytra.connector.transformer.jar.JarTransformer;
-import dev.su5ed.sinytra.connector.transformer.jar.JarTransformer.FabricModPath;
+import org.sinytra.connector.transformer.jar.JarTransformer;
+import org.sinytra.connector.transformer.jar.JarTransformer.FabricModPath;
 import net.minecraftforge.forgespi.locating.IModFile;
 import org.jetbrains.annotations.Nullable;
 import org.slf4j.Logger;

src/main/java/dev/su5ed/sinytra/connector/service/ConnectorLoaderService.java → src/main/java/org/sinytra/connector/service/ConnectorLoaderService.java

@@ -1,4 +1,4 @@
-package dev.su5ed.sinytra.connector.service;
+package org.sinytra.connector.service;
 
 import com.mojang.logging.LogUtils;
 import cpw.mods.modlauncher.LaunchPluginHandler;
@@ -8,10 +8,10 @@
 import cpw.mods.modlauncher.api.ITransformationService;
 import cpw.mods.modlauncher.api.ITransformer;
 import cpw.mods.modlauncher.serviceapi.ILaunchPluginService;
-import dev.su5ed.sinytra.connector.loader.ConnectorEarlyLoader;
-import dev.su5ed.sinytra.connector.service.hacks.ConnectorForkJoinThreadFactory;
-import dev.su5ed.sinytra.connector.service.hacks.LenientRuntimeEnumExtender;
-import dev.su5ed.sinytra.connector.service.hacks.ModuleLayerMigrator;
+import org.sinytra.connector.loader.ConnectorEarlyLoader;
+import org.sinytra.connector.service.hacks.ConnectorForkJoinThreadFactory;
+import org.sinytra.connector.service.hacks.LenientRuntimeEnumExtender;
+import org.sinytra.connector.service.hacks.ModuleLayerMigrator;
 import net.minecraftforge.fml.loading.ImmediateWindowHandler;
 import net.minecraftforge.fml.loading.ImmediateWindowProvider;
 import net.minecraftforge.fml.loading.LoadingModList;
@@ -32,7 +32,7 @@
 import java.util.function.Supplier;
 
 import static cpw.mods.modlauncher.api.LamdbaExceptionUtils.uncheck;
-import static dev.su5ed.sinytra.connector.service.hacks.ModuleLayerMigrator.TRUSTED_LOOKUP;
+import static org.sinytra.connector.service.hacks.ModuleLayerMigrator.TRUSTED_LOOKUP;
 
 public class ConnectorLoaderService implements ITransformationService {
     private static final String NAME = "connector_loader";
@@ -62,7 +62,7 @@ public void updateModuleReads(ModuleLayer layer) {
                 ConnectorEarlyLoader.setup();
                 // Invoke mixin on a dummy class to initialize mixin plugins
                 // Necessary to avoid duplicate class definition errors when a plugin loads the class that is being transformed
-                uncheck(() -> Class.forName("dev.su5ed.sinytra.connector.mod.DummyTarget", false, Thread.currentThread().getContextClassLoader()));
+                uncheck(() -> Class.forName("org.sinytra.connector.mod.DummyTarget", false, Thread.currentThread().getContextClassLoader()));
                 // Run preLaunch
                 ConnectorEarlyLoader.preLaunch();
                 original.updateModuleReads(layer);

src/main/java/dev/su5ed/sinytra/connector/service/ConnectorPreLaunchPlugin.java → src/main/java/org/sinytra/connector/service/ConnectorPreLaunchPlugin.java

@@ -1,9 +1,9 @@
-package dev.su5ed.sinytra.connector.service;
+package org.sinytra.connector.service;
 
 import cpw.mods.modlauncher.api.NamedPath;
 import cpw.mods.modlauncher.serviceapi.ILaunchPluginService;
-import dev.su5ed.sinytra.connector.loader.ConnectorEarlyLoader;
-import dev.su5ed.sinytra.connector.service.hacks.ServiceProviderInheritanceWorkaround;
+import org.sinytra.connector.loader.ConnectorEarlyLoader;
+import org.sinytra.connector.service.hacks.ServiceProviderInheritanceWorkaround;
 import org.objectweb.asm.Opcodes;
 import org.objectweb.asm.Type;
 import org.objectweb.asm.tree.ClassNode;

src/main/java/dev/su5ed/sinytra/connector/service/FabricASMFixer.java → src/main/java/org/sinytra/connector/service/FabricASMFixer.java

@@ -1,4 +1,4 @@
-package dev.su5ed.sinytra.connector.service;
+package org.sinytra.connector.service;
 
 import com.mojang.logging.LogUtils;
 import cpw.mods.jarhandling.SecureJar;

src/main/java/dev/su5ed/sinytra/connector/service/FabricMixinBootstrap.java → src/main/java/org/sinytra/connector/service/FabricMixinBootstrap.java

@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package dev.su5ed.sinytra.connector.service;
+package org.sinytra.connector.service;
 
 import com.mojang.logging.LogUtils;
-import dev.su5ed.sinytra.connector.loader.ConnectorEarlyLoader;
+import org.sinytra.connector.loader.ConnectorEarlyLoader;
 import net.fabricmc.loader.api.SemanticVersion;
 import net.fabricmc.loader.api.Version;
 import net.fabricmc.loader.api.metadata.ModDependency;

src/main/java/dev/su5ed/sinytra/connector/service/hacks/ConnectorForkJoinThreadFactory.java → src/main/java/org/sinytra/connector/service/hacks/ConnectorForkJoinThreadFactory.java

@@ -1,4 +1,4 @@
-package dev.su5ed.sinytra.connector.service.hacks;
+package org.sinytra.connector.service.hacks;
 
 import com.mojang.logging.LogUtils;
 import org.slf4j.Logger;
@@ -8,7 +8,7 @@
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.ForkJoinWorkerThread;
 
-import static dev.su5ed.sinytra.connector.service.hacks.ModuleLayerMigrator.TRUSTED_LOOKUP;
+import static org.sinytra.connector.service.hacks.ModuleLayerMigrator.TRUSTED_LOOKUP;
 
 public class ConnectorForkJoinThreadFactory implements ForkJoinPool.ForkJoinWorkerThreadFactory {
     private static final Logger LOGGER = LogUtils.getLogger();

src/main/java/dev/su5ed/sinytra/connector/service/hacks/LenientRuntimeEnumExtender.java → src/main/java/org/sinytra/connector/service/hacks/LenientRuntimeEnumExtender.java

@@ -1,4 +1,4 @@
-package dev.su5ed.sinytra.connector.service.hacks;
+package org.sinytra.connector.service.hacks;
 
 import net.minecraftforge.fml.common.asm.RuntimeEnumExtender;
 import org.objectweb.asm.Opcodes;

src/main/java/dev/su5ed/sinytra/connector/service/hacks/ModuleLayerMigrator.java → src/main/java/org/sinytra/connector/service/hacks/ModuleLayerMigrator.java

@@ -1,4 +1,4 @@
-package dev.su5ed.sinytra.connector.service.hacks;
+package org.sinytra.connector.service.hacks;
 
 import com.mojang.logging.LogUtils;
 import cpw.mods.jarhandling.SecureJar;

src/main/java/dev/su5ed/sinytra/connector/service/hacks/ServiceProviderInheritanceWorkaround.java → src/main/java/org/sinytra/connector/service/hacks/ServiceProviderInheritanceWorkaround.java

@@ -19,7 +19,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package dev.su5ed.sinytra.connector.service.hacks;
+package org.sinytra.connector.service.hacks;
 
 import cpw.mods.cl.ModuleClassLoader;
 import cpw.mods.modlauncher.Launcher;

src/main/java/dev/su5ed/sinytra/connector/transformer/AccessWidenerTransformer.java → src/main/java/org/sinytra/connector/transformer/AccessWidenerTransformer.java

@@ -1,7 +1,7 @@
-package dev.su5ed.sinytra.connector.transformer;
+package org.sinytra.connector.transformer;
 
-import dev.su5ed.sinytra.connector.ConnectorUtil;
-import dev.su5ed.sinytra.connector.transformer.jar.IntermediateMapping;
+import org.sinytra.connector.ConnectorUtil;
+import org.sinytra.connector.transformer.jar.IntermediateMapping;
 import net.fabricmc.accesswidener.AccessWidenerReader;
 import net.fabricmc.accesswidener.AccessWidenerVisitor;
 import net.fabricmc.loader.impl.MappingResolverImpl;

src/main/java/dev/su5ed/sinytra/connector/transformer/AccessorRedirectTransformer.java → src/main/java/org/sinytra/connector/transformer/AccessorRedirectTransformer.java

@@ -1,11 +1,11 @@
-package dev.su5ed.sinytra.connector.transformer;
+package org.sinytra.connector.transformer;
 
 import org.sinytra.adapter.patch.api.MethodContext;
 import org.sinytra.adapter.patch.api.Patch;
 import org.sinytra.adapter.patch.api.PatchContext;
 import org.sinytra.adapter.patch.api.PatchEnvironment;
-import dev.su5ed.sinytra.connector.transformer.patch.ClassNodeTransformer;
-import dev.su5ed.sinytra.connector.transformer.patch.RedirectAccessorToMethod;
+import org.sinytra.connector.transformer.patch.ClassNodeTransformer;
+import org.sinytra.connector.transformer.patch.RedirectAccessorToMethod;
 import net.minecraftforge.coremod.api.ASMAPI;
 import net.minecraftforge.srgutils.IMappingFile;
 import org.objectweb.asm.ClassReader;

src/main/java/dev/su5ed/sinytra/connector/transformer/FieldToMethodTransformer.java → src/main/java/org/sinytra/connector/transformer/FieldToMethodTransformer.java

@@ -1,9 +1,9 @@
-package dev.su5ed.sinytra.connector.transformer;
+package org.sinytra.connector.transformer;
 
 import com.google.common.collect.ImmutableMap;
 import com.mojang.logging.LogUtils;
 import org.sinytra.adapter.patch.api.Patch;
-import dev.su5ed.sinytra.connector.transformer.patch.ClassNodeTransformer;
+import org.sinytra.connector.transformer.patch.ClassNodeTransformer;
 import net.fabricmc.accesswidener.AccessWidenerReader;
 import net.fabricmc.accesswidener.AccessWidenerVisitor;
 import net.fabricmc.accesswidener.AccessWidenerWriter;

src/main/java/dev/su5ed/sinytra/connector/transformer/JarSignatureStripper.java → src/main/java/org/sinytra/connector/transformer/JarSignatureStripper.java

@@ -1,4 +1,4 @@
-package dev.su5ed.sinytra.connector.transformer;
+package org.sinytra.connector.transformer;
 
 import net.minecraftforge.fart.api.Transformer;