Move to org.sinytra namespace

Sinytra · Mar 2, 2024 · 1344cb8 · 1344cb8
1 parent 8fe46dd
commit 1344cb8
Show file tree

Hide file tree

Showing 103 changed files with 497 additions and 534 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,18 +1,18 @@
-import dev.su5ed.sinytra.adapter.gradle.AdapterPlugin
+import org.sinytra.adapter.gradle.AdapterPlugin
 import java.time.LocalDateTime
 import java.time.format.DateTimeFormatter
 
 plugins {
     id("net.neoforged.gradle") version "[6.0,6.2)"
-    id("dev.su5ed.sinytra.adapter.gradle")
+    id("org.sinytra.adapter.gradle")
     `maven-publish`
 }
 
 val versionMc: String by project
 val versionForge: String by project
 val timestamp: String = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMdd.HHmmss"))
 
-group = "dev.su5ed.sinytra.adapter"
+group = "org.sinytra.adapter"
 version = "${AdapterPlugin.getDefinitionVersion()?.let { "$it-" } ?: ""}$versionMc-$timestamp"
 base {
     archivesName.set(project.name.lowercase())

diff --git a/definition/build.gradle.kts b/definition/build.gradle.kts
@@ -4,7 +4,7 @@ plugins {
     id("net.neoforged.gradleutils").version("3.0.0-alpha.10")
 }
 
-group = "dev.su5ed.sinytra.adapter"
+group = "org.sinytra.adapter"
 gradleutils.version {
     branches {
         suffixBranch()

diff --git a/...tra/adapter/patch/ClassPatchInstance.java → ...tra/adapter/patch/ClassPatchInstance.java b/...tra/adapter/patch/ClassPatchInstance.java → ...tra/adapter/patch/ClassPatchInstance.java
@@ -1,24 +1,24 @@
-package dev.su5ed.sinytra.adapter.patch;
+package org.sinytra.adapter.patch;
 
 import com.mojang.serialization.Codec;
 import com.mojang.serialization.DataResult;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
-import dev.su5ed.sinytra.adapter.patch.api.ClassTransform;
-import dev.su5ed.sinytra.adapter.patch.api.MethodTransform;
-import dev.su5ed.sinytra.adapter.patch.api.MixinConstants;
-import dev.su5ed.sinytra.adapter.patch.api.PatchEnvironment;
-import dev.su5ed.sinytra.adapter.patch.selector.AnnotationHandle;
-import dev.su5ed.sinytra.adapter.patch.selector.AnnotationValueHandle;
-import dev.su5ed.sinytra.adapter.patch.selector.InjectionPointMatcher;
-import dev.su5ed.sinytra.adapter.patch.selector.MethodMatcher;
-import dev.su5ed.sinytra.adapter.patch.serialization.MethodTransformSerialization;
-import dev.su5ed.sinytra.adapter.patch.transformer.*;
-import dev.su5ed.sinytra.adapter.patch.util.MethodQualifier;
 import org.objectweb.asm.commons.InstructionAdapter;
 import org.objectweb.asm.tree.AnnotationNode;
 import org.objectweb.asm.tree.InsnList;
 import org.objectweb.asm.tree.MethodInsnNode;
 import org.objectweb.asm.tree.MethodNode;
+import org.sinytra.adapter.patch.api.ClassTransform;
+import org.sinytra.adapter.patch.api.MethodTransform;
+import org.sinytra.adapter.patch.api.MixinConstants;
+import org.sinytra.adapter.patch.api.PatchEnvironment;
+import org.sinytra.adapter.patch.selector.AnnotationHandle;
+import org.sinytra.adapter.patch.selector.AnnotationValueHandle;
+import org.sinytra.adapter.patch.selector.InjectionPointMatcher;
+import org.sinytra.adapter.patch.selector.MethodMatcher;
+import org.sinytra.adapter.patch.serialization.MethodTransformSerialization;
+import org.sinytra.adapter.patch.transformer.*;
+import org.sinytra.adapter.patch.util.MethodQualifier;
 
 import java.util.*;
 import java.util.function.BiConsumer;

diff --git a/...adapter/patch/InterfacePatchInstance.java → ...adapter/patch/InterfacePatchInstance.java b/...adapter/patch/InterfacePatchInstance.java → ...adapter/patch/InterfacePatchInstance.java
@@ -1,20 +1,20 @@
-package dev.su5ed.sinytra.adapter.patch;
+package org.sinytra.adapter.patch;
 
 import com.mojang.serialization.Codec;
 import com.mojang.serialization.DataResult;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
-import dev.su5ed.sinytra.adapter.patch.api.ClassTransform;
-import dev.su5ed.sinytra.adapter.patch.api.MethodTransform;
-import dev.su5ed.sinytra.adapter.patch.api.MixinConstants;
-import dev.su5ed.sinytra.adapter.patch.api.PatchEnvironment;
-import dev.su5ed.sinytra.adapter.patch.selector.AnnotationHandle;
-import dev.su5ed.sinytra.adapter.patch.selector.FieldMatcher;
-import dev.su5ed.sinytra.adapter.patch.serialization.MethodTransformSerialization;
-import dev.su5ed.sinytra.adapter.patch.transformer.RedirectAccessor;
-import dev.su5ed.sinytra.adapter.patch.util.AdapterUtil;
 import org.objectweb.asm.Opcodes;
 import org.objectweb.asm.tree.ClassNode;
 import org.objectweb.asm.tree.MethodNode;
+import org.sinytra.adapter.patch.api.ClassTransform;
+import org.sinytra.adapter.patch.api.MethodTransform;
+import org.sinytra.adapter.patch.api.MixinConstants;
+import org.sinytra.adapter.patch.api.PatchEnvironment;
+import org.sinytra.adapter.patch.selector.AnnotationHandle;
+import org.sinytra.adapter.patch.selector.FieldMatcher;
+import org.sinytra.adapter.patch.serialization.MethodTransformSerialization;
+import org.sinytra.adapter.patch.transformer.RedirectAccessor;
+import org.sinytra.adapter.patch.util.AdapterUtil;
 
 import java.util.Collection;
 import java.util.HashSet;

diff --git a/...5ed/sinytra/adapter/patch/LVTOffsets.java → ...org/sinytra/adapter/patch/LVTOffsets.java b/...5ed/sinytra/adapter/patch/LVTOffsets.java → ...org/sinytra/adapter/patch/LVTOffsets.java
@@ -1,10 +1,10 @@
-package dev.su5ed.sinytra.adapter.patch;
+package org.sinytra.adapter.patch;
 
 import com.google.gson.JsonElement;
 import com.mojang.serialization.Codec;
 import com.mojang.serialization.JsonOps;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
-import dev.su5ed.sinytra.adapter.patch.util.MethodQualifier;
+import org.sinytra.adapter.patch.util.MethodQualifier;
 
 import java.util.List;
 import java.util.Map;

diff --git a/...ytra/adapter/patch/MethodContextImpl.java → ...ytra/adapter/patch/MethodContextImpl.java b/...ytra/adapter/patch/MethodContextImpl.java → ...ytra/adapter/patch/MethodContextImpl.java
@@ -1,18 +1,18 @@
-package dev.su5ed.sinytra.adapter.patch;
+package org.sinytra.adapter.patch;
 
 import com.mojang.logging.LogUtils;
-import dev.su5ed.sinytra.adapter.patch.api.MethodContext;
-import dev.su5ed.sinytra.adapter.patch.api.PatchContext;
-import dev.su5ed.sinytra.adapter.patch.selector.AnnotationHandle;
-import dev.su5ed.sinytra.adapter.patch.selector.AnnotationValueHandle;
-import dev.su5ed.sinytra.adapter.patch.util.AdapterUtil;
-import dev.su5ed.sinytra.adapter.patch.util.MethodQualifier;
-import dev.su5ed.sinytra.adapter.patch.util.MockMixinRuntime;
-import dev.su5ed.sinytra.adapter.patch.util.provider.ClassLookup;
 import org.jetbrains.annotations.Nullable;
 import org.objectweb.asm.Opcodes;
 import org.objectweb.asm.Type;
 import org.objectweb.asm.tree.*;
+import org.sinytra.adapter.patch.api.MethodContext;
+import org.sinytra.adapter.patch.api.PatchContext;
+import org.sinytra.adapter.patch.selector.AnnotationHandle;
+import org.sinytra.adapter.patch.selector.AnnotationValueHandle;
+import org.sinytra.adapter.patch.util.AdapterUtil;
+import org.sinytra.adapter.patch.util.MethodQualifier;
+import org.sinytra.adapter.patch.util.MockMixinRuntime;
+import org.sinytra.adapter.patch.util.provider.ClassLookup;
 import org.slf4j.Logger;
 import org.spongepowered.asm.mixin.injection.InjectionPoint;
 import org.spongepowered.asm.mixin.injection.code.ISliceContext;
@@ -28,8 +28,6 @@
 import java.util.function.Function;
 import java.util.stream.Stream;
 
-import static dev.su5ed.sinytra.adapter.patch.PatchInstance.MIXINPATCH;
-
 public record MethodContextImpl(AnnotationValueHandle<?> classAnnotation, AnnotationHandle methodAnnotation, @Nullable AnnotationHandle injectionPointAnnotation,
                                 List<Type> targetTypes, List<String> matchingTargets, PatchContext patchContext) implements MethodContext {
     private static final Logger LOGGER = LogUtils.getLogger();
@@ -116,7 +114,7 @@ public List<AbstractInsnNode> findInjectionTargetInsns(ClassNode classNode, Clas
     public void updateDescription(ClassNode classNode, MethodNode methodNode, List<Type> parameters) {
         Type returnType = Type.getReturnType(methodNode.desc);
         String newDesc = Type.getMethodDescriptor(returnType, parameters.toArray(Type[]::new));
-        LOGGER.info(MIXINPATCH, "Changing descriptor of method {}.{}{} to {}", classNode.name, methodNode.name, methodNode.desc, newDesc);
+        LOGGER.info(PatchInstance.MIXINPATCH, "Changing descriptor of method {}.{}{} to {}", classNode.name, methodNode.name, methodNode.desc, newDesc);
         methodNode.desc = newDesc;
         methodNode.signature = null;
     }

diff --git a/...dapter/patch/MixinClassGeneratorImpl.java → ...dapter/patch/MixinClassGeneratorImpl.java b/...dapter/patch/MixinClassGeneratorImpl.java → ...dapter/patch/MixinClassGeneratorImpl.java
@@ -1,12 +1,12 @@
-package dev.su5ed.sinytra.adapter.patch;
+package org.sinytra.adapter.patch;
 
-import dev.su5ed.sinytra.adapter.patch.api.MixinClassGenerator;
-import dev.su5ed.sinytra.adapter.patch.api.MixinConstants;
 import org.jetbrains.annotations.Nullable;
 import org.objectweb.asm.AnnotationVisitor;
 import org.objectweb.asm.Opcodes;
 import org.objectweb.asm.Type;
 import org.objectweb.asm.tree.ClassNode;
+import org.sinytra.adapter.patch.api.MixinClassGenerator;
+import org.sinytra.adapter.patch.api.MixinConstants;
 import org.spongepowered.asm.service.MixinService;
 
 import java.io.IOException;

diff --git a/...nytra/adapter/patch/PatchContextImpl.java → ...nytra/adapter/patch/PatchContextImpl.java b/...nytra/adapter/patch/PatchContextImpl.java → ...nytra/adapter/patch/PatchContextImpl.java
@@ -1,9 +1,9 @@
-package dev.su5ed.sinytra.adapter.patch;
+package org.sinytra.adapter.patch;
 
-import dev.su5ed.sinytra.adapter.patch.api.PatchContext;
-import dev.su5ed.sinytra.adapter.patch.api.PatchEnvironment;
 import org.objectweb.asm.Type;
 import org.objectweb.asm.tree.ClassNode;
+import org.sinytra.adapter.patch.api.PatchContext;
+import org.sinytra.adapter.patch.api.PatchEnvironment;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/...a/adapter/patch/PatchEnvironmentImpl.java → ...a/adapter/patch/PatchEnvironmentImpl.java b/...a/adapter/patch/PatchEnvironmentImpl.java → ...a/adapter/patch/PatchEnvironmentImpl.java
@@ -1,13 +1,13 @@
-package dev.su5ed.sinytra.adapter.patch;
+package org.sinytra.adapter.patch;
 
-import dev.su5ed.sinytra.adapter.patch.analysis.InheritanceHandler;
-import dev.su5ed.sinytra.adapter.patch.api.MixinClassGenerator;
-import dev.su5ed.sinytra.adapter.patch.api.PatchEnvironment;
-import dev.su5ed.sinytra.adapter.patch.api.RefmapHolder;
-import dev.su5ed.sinytra.adapter.patch.fixes.BytecodeFixerUpper;
-import dev.su5ed.sinytra.adapter.patch.util.AdapterUtil;
-import dev.su5ed.sinytra.adapter.patch.util.provider.ClassLookup;
 import org.jetbrains.annotations.Nullable;
+import org.sinytra.adapter.patch.analysis.InheritanceHandler;
+import org.sinytra.adapter.patch.api.MixinClassGenerator;
+import org.sinytra.adapter.patch.api.PatchEnvironment;
+import org.sinytra.adapter.patch.api.RefmapHolder;
+import org.sinytra.adapter.patch.fixes.BytecodeFixerUpper;
+import org.sinytra.adapter.patch.util.AdapterUtil;
+import org.sinytra.adapter.patch.util.provider.ClassLookup;
 
 public record PatchEnvironmentImpl(RefmapHolder refmapHolder, ClassLookup cleanClassLookup, @Nullable BytecodeFixerUpper bytecodeFixerUpper,
                                    MixinClassGenerator classGenerator, InheritanceHandler inheritanceHandler, int fabricLVTCompatibility) implements PatchEnvironment {

diff --git a/.../sinytra/adapter/patch/PatchInstance.java → .../sinytra/adapter/patch/PatchInstance.java b/.../sinytra/adapter/patch/PatchInstance.java → .../sinytra/adapter/patch/PatchInstance.java
@@ -1,16 +1,16 @@
-package dev.su5ed.sinytra.adapter.patch;
+package org.sinytra.adapter.patch;
 
 import com.mojang.serialization.Codec;
-import dev.su5ed.sinytra.adapter.patch.api.*;
-import dev.su5ed.sinytra.adapter.patch.selector.AnnotationHandle;
-import dev.su5ed.sinytra.adapter.patch.selector.AnnotationValueHandle;
-import dev.su5ed.sinytra.adapter.patch.transformer.*;
-import dev.su5ed.sinytra.adapter.patch.transformer.param.TransformParameters;
 import org.jetbrains.annotations.Nullable;
 import org.objectweb.asm.Type;
 import org.objectweb.asm.tree.AnnotationNode;
 import org.objectweb.asm.tree.ClassNode;
 import org.objectweb.asm.tree.MethodNode;
+import org.sinytra.adapter.patch.api.*;
+import org.sinytra.adapter.patch.selector.AnnotationHandle;
+import org.sinytra.adapter.patch.selector.AnnotationValueHandle;
+import org.sinytra.adapter.patch.transformer.*;
+import org.sinytra.adapter.patch.transformer.param.TransformParameters;
 import org.slf4j.Marker;
 import org.slf4j.MarkerFactory;
 

diff --git a/...er/patch/analysis/EnhancedParamsDiff.java → ...er/patch/analysis/EnhancedParamsDiff.java b/...er/patch/analysis/EnhancedParamsDiff.java → ...er/patch/analysis/EnhancedParamsDiff.java
@@ -1,4 +1,4 @@
-package dev.su5ed.sinytra.adapter.patch.analysis;
+package org.sinytra.adapter.patch.analysis;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.MapDifference;

diff --git a/...er/patch/analysis/InheritanceHandler.java → ...er/patch/analysis/InheritanceHandler.java b/...er/patch/analysis/InheritanceHandler.java → ...er/patch/analysis/InheritanceHandler.java
@@ -1,9 +1,9 @@
-package dev.su5ed.sinytra.adapter.patch.analysis;
+package org.sinytra.adapter.patch.analysis;
 
-import dev.su5ed.sinytra.adapter.patch.util.provider.ClassLookup;
 import org.objectweb.asm.Opcodes;
 import org.objectweb.asm.tree.ClassNode;
 import org.objectweb.asm.tree.MethodNode;
+import org.sinytra.adapter.patch.util.provider.ClassLookup;
 
 import java.util.*;
 

diff --git a/...er/patch/analysis/InstructionMatcher.java → ...er/patch/analysis/InstructionMatcher.java b/...er/patch/analysis/InstructionMatcher.java → ...er/patch/analysis/InstructionMatcher.java
@@ -1,10 +1,10 @@
-package dev.su5ed.sinytra.adapter.patch.analysis;
+package org.sinytra.adapter.patch.analysis;
 
-import dev.su5ed.sinytra.adapter.patch.util.InsnComparator;
 import org.jetbrains.annotations.Nullable;
 import org.objectweb.asm.tree.AbstractInsnNode;
 import org.objectweb.asm.tree.InsnList;
 import org.objectweb.asm.tree.MethodInsnNode;
+import org.sinytra.adapter.patch.util.InsnComparator;
 
 import java.util.List;
 

diff --git a/...pter/patch/analysis/LocalVarAnalyzer.java → ...pter/patch/analysis/LocalVarAnalyzer.java b/...pter/patch/analysis/LocalVarAnalyzer.java → ...pter/patch/analysis/LocalVarAnalyzer.java
@@ -1,7 +1,7 @@
-package dev.su5ed.sinytra.adapter.patch.analysis;
+package org.sinytra.adapter.patch.analysis;
 
-import dev.su5ed.sinytra.adapter.patch.util.OpcodeUtil;
 import org.objectweb.asm.tree.*;
+import org.sinytra.adapter.patch.util.OpcodeUtil;
 
 import java.util.Map;
 

diff --git a/...patch/analysis/LocalVarRearrangement.java → ...patch/analysis/LocalVarRearrangement.java b/...patch/analysis/LocalVarRearrangement.java → ...patch/analysis/LocalVarRearrangement.java
@@ -1,4 +1,4 @@
-package dev.su5ed.sinytra.adapter.patch.analysis;
+package org.sinytra.adapter.patch.analysis;
 
 import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.ListMultimap;

diff --git a/...er/patch/analysis/MethodCallAnalyzer.java → ...er/patch/analysis/MethodCallAnalyzer.java b/...er/patch/analysis/MethodCallAnalyzer.java → ...er/patch/analysis/MethodCallAnalyzer.java
@@ -1,14 +1,14 @@
-package dev.su5ed.sinytra.adapter.patch.analysis;
+package org.sinytra.adapter.patch.analysis;
 
 import com.google.common.collect.ImmutableMultimap;
 import com.google.common.collect.Multimap;
-import dev.su5ed.sinytra.adapter.patch.api.GlobalReferenceMapper;
-import dev.su5ed.sinytra.adapter.patch.util.MethodQualifier;
 import org.jetbrains.annotations.Nullable;
 import org.objectweb.asm.Opcodes;
 import org.objectweb.asm.Type;
 import org.objectweb.asm.tree.*;
 import org.objectweb.asm.tree.analysis.*;
+import org.sinytra.adapter.patch.api.GlobalReferenceMapper;
+import org.sinytra.adapter.patch.util.MethodQualifier;
 
 import java.util.*;
 import java.util.function.BiPredicate;

diff --git a/...dapter/patch/analysis/ParametersDiff.java → ...dapter/patch/analysis/ParametersDiff.java b/...dapter/patch/analysis/ParametersDiff.java → ...dapter/patch/analysis/ParametersDiff.java
@@ -1,15 +1,8 @@
-package dev.su5ed.sinytra.adapter.patch.analysis;
+package org.sinytra.adapter.patch.analysis;
 
 import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.ListMultimap;
 import com.mojang.datafixers.util.Pair;
-import dev.su5ed.sinytra.adapter.patch.api.MethodTransform;
-import dev.su5ed.sinytra.adapter.patch.transformer.ModifyMethodParams;
-import dev.su5ed.sinytra.adapter.patch.transformer.param.InjectParameterTransform;
-import dev.su5ed.sinytra.adapter.patch.transformer.param.ParameterTransformer;
-import dev.su5ed.sinytra.adapter.patch.transformer.param.TransformParameters;
-import dev.su5ed.sinytra.adapter.patch.util.AdapterUtil;
-import dev.su5ed.sinytra.adapter.patch.util.GeneratedVariables;
 import it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap;
 import it.unimi.dsi.fastutil.ints.Int2IntMap;
 import it.unimi.dsi.fastutil.objects.Object2IntMap;
@@ -19,6 +12,13 @@
 import org.objectweb.asm.Type;
 import org.objectweb.asm.tree.LocalVariableNode;
 import org.objectweb.asm.tree.MethodNode;
+import org.sinytra.adapter.patch.api.MethodTransform;
+import org.sinytra.adapter.patch.transformer.ModifyMethodParams;
+import org.sinytra.adapter.patch.transformer.param.InjectParameterTransform;
+import org.sinytra.adapter.patch.transformer.param.ParameterTransformer;
+import org.sinytra.adapter.patch.transformer.param.TransformParameters;
+import org.sinytra.adapter.patch.util.AdapterUtil;
+import org.sinytra.adapter.patch.util.GeneratedVariables;
 
 import java.util.ArrayList;
 import java.util.Comparator;

diff --git a/...tra/adapter/patch/api/ClassTransform.java → ...tra/adapter/patch/api/ClassTransform.java b/...tra/adapter/patch/api/ClassTransform.java → ...tra/adapter/patch/api/ClassTransform.java
@@ -1,9 +1,9 @@
-package dev.su5ed.sinytra.adapter.patch.api;
+package org.sinytra.adapter.patch.api;
 
-import dev.su5ed.sinytra.adapter.patch.api.Patch.Result;
-import dev.su5ed.sinytra.adapter.patch.selector.AnnotationValueHandle;
 import org.jetbrains.annotations.Nullable;
 import org.objectweb.asm.tree.ClassNode;
+import org.sinytra.adapter.patch.api.Patch.Result;
+import org.sinytra.adapter.patch.selector.AnnotationValueHandle;
 
 public interface ClassTransform {
     Result apply(ClassNode classNode, @Nullable AnnotationValueHandle<?> annotation, PatchContext context);

diff --git a/...pter/patch/api/GlobalReferenceMapper.java → ...pter/patch/api/GlobalReferenceMapper.java b/...pter/patch/api/GlobalReferenceMapper.java → ...pter/patch/api/GlobalReferenceMapper.java
@@ -1,4 +1,4 @@
-package dev.su5ed.sinytra.adapter.patch.api;
+package org.sinytra.adapter.patch.api;
 
 import java.util.function.Function;
 

diff --git a/...ytra/adapter/patch/api/MethodContext.java → ...ytra/adapter/patch/api/MethodContext.java b/...ytra/adapter/patch/api/MethodContext.java → ...ytra/adapter/patch/api/MethodContext.java
@@ -1,13 +1,13 @@
-package dev.su5ed.sinytra.adapter.patch.api;
+package org.sinytra.adapter.patch.api;
 
-import dev.su5ed.sinytra.adapter.patch.selector.AnnotationHandle;
-import dev.su5ed.sinytra.adapter.patch.selector.AnnotationValueHandle;
-import dev.su5ed.sinytra.adapter.patch.util.MethodQualifier;
 import org.jetbrains.annotations.Nullable;
 import org.objectweb.asm.Type;
 import org.objectweb.asm.tree.AbstractInsnNode;
 import org.objectweb.asm.tree.ClassNode;
 import org.objectweb.asm.tree.MethodNode;
+import org.sinytra.adapter.patch.selector.AnnotationHandle;
+import org.sinytra.adapter.patch.selector.AnnotationValueHandle;
+import org.sinytra.adapter.patch.util.MethodQualifier;
 
 import java.util.List;
 

diff --git a/...ra/adapter/patch/api/MethodTransform.java → ...ra/adapter/patch/api/MethodTransform.java b/...ra/adapter/patch/api/MethodTransform.java → ...ra/adapter/patch/api/MethodTransform.java
@@ -1,7 +1,6 @@
-package dev.su5ed.sinytra.adapter.patch.api;
+package org.sinytra.adapter.patch.api;
 
 import com.mojang.serialization.Codec;
-import dev.su5ed.sinytra.adapter.patch.api.Patch.Result;
 import org.objectweb.asm.tree.ClassNode;
 import org.objectweb.asm.tree.MethodNode;
 
@@ -17,5 +16,5 @@ default Collection<String> getAcceptedAnnotations() {
         return Set.of();
     }
 
-    Result apply(ClassNode classNode, MethodNode methodNode, MethodContext methodContext, PatchContext context);
+    Patch.Result apply(ClassNode classNode, MethodNode methodNode, MethodContext methodContext, PatchContext context);
 }
diff --git a/...dapter/patch/api/MixinClassGenerator.java → ...dapter/patch/api/MixinClassGenerator.java b/...dapter/patch/api/MixinClassGenerator.java → ...dapter/patch/api/MixinClassGenerator.java
@@ -1,4 +1,4 @@
-package dev.su5ed.sinytra.adapter.patch.api;
+package org.sinytra.adapter.patch.api;
 
 import org.jetbrains.annotations.Nullable;
 import org.objectweb.asm.tree.ClassNode;

diff --git a/...tra/adapter/patch/api/MixinConstants.java → ...tra/adapter/patch/api/MixinConstants.java b/...tra/adapter/patch/api/MixinConstants.java → ...tra/adapter/patch/api/MixinConstants.java
@@ -1,4 +1,4 @@
-package dev.su5ed.sinytra.adapter.patch.api;
+package org.sinytra.adapter.patch.api;
 
 public class MixinConstants {
     // Standard mixins