diff --git a/src/main/java/dev/su5ed/sinytra/connector/ConnectorUtil.java b/src/main/java/org/sinytra/connector/ConnectorUtil.java similarity index 98% rename from src/main/java/dev/su5ed/sinytra/connector/ConnectorUtil.java rename to src/main/java/org/sinytra/connector/ConnectorUtil.java index 974f3fd1..ecebe7e3 100644 --- a/src/main/java/dev/su5ed/sinytra/connector/ConnectorUtil.java +++ b/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; diff --git a/src/main/java/dev/su5ed/sinytra/connector/loader/ConnectorEarlyLoader.java b/src/main/java/org/sinytra/connector/loader/ConnectorEarlyLoader.java similarity index 97% rename from src/main/java/dev/su5ed/sinytra/connector/loader/ConnectorEarlyLoader.java rename to src/main/java/org/sinytra/connector/loader/ConnectorEarlyLoader.java index 07e76623..8d46ca6f 100644 --- a/src/main/java/dev/su5ed/sinytra/connector/loader/ConnectorEarlyLoader.java +++ b/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; diff --git a/src/main/java/dev/su5ed/sinytra/connector/loader/ConnectorLoaderModMetadata.java b/src/main/java/org/sinytra/connector/loader/ConnectorLoaderModMetadata.java similarity index 98% rename from src/main/java/dev/su5ed/sinytra/connector/loader/ConnectorLoaderModMetadata.java rename to src/main/java/org/sinytra/connector/loader/ConnectorLoaderModMetadata.java index 8bca1b1b..13315892 100644 --- a/src/main/java/dev/su5ed/sinytra/connector/loader/ConnectorLoaderModMetadata.java +++ b/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; diff --git a/src/main/java/dev/su5ed/sinytra/connector/locator/ConnectorConfig.java b/src/main/java/org/sinytra/connector/locator/ConnectorConfig.java similarity index 97% rename from src/main/java/dev/su5ed/sinytra/connector/locator/ConnectorConfig.java rename to src/main/java/org/sinytra/connector/locator/ConnectorConfig.java index 1585c1e0..0a3e1d1f 100644 --- a/src/main/java/dev/su5ed/sinytra/connector/locator/ConnectorConfig.java +++ b/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; diff --git a/src/main/java/dev/su5ed/sinytra/connector/locator/ConnectorEarlyLocator.java b/src/main/java/org/sinytra/connector/locator/ConnectorEarlyLocator.java similarity index 97% rename from src/main/java/dev/su5ed/sinytra/connector/locator/ConnectorEarlyLocator.java rename to src/main/java/org/sinytra/connector/locator/ConnectorEarlyLocator.java index a24f1535..eda25e6a 100644 --- a/src/main/java/dev/su5ed/sinytra/connector/locator/ConnectorEarlyLocator.java +++ b/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; diff --git a/src/main/java/dev/su5ed/sinytra/connector/locator/ConnectorLocator.java b/src/main/java/org/sinytra/connector/locator/ConnectorLocator.java similarity index 97% rename from src/main/java/dev/su5ed/sinytra/connector/locator/ConnectorLocator.java rename to src/main/java/org/sinytra/connector/locator/ConnectorLocator.java index da30ef5e..3ac11e7e 100644 --- a/src/main/java/dev/su5ed/sinytra/connector/locator/ConnectorLocator.java +++ b/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 { diff --git a/src/main/java/dev/su5ed/sinytra/connector/locator/ConnectorModMetadataParser.java b/src/main/java/org/sinytra/connector/locator/ConnectorModMetadataParser.java similarity index 96% rename from src/main/java/dev/su5ed/sinytra/connector/locator/ConnectorModMetadataParser.java rename to src/main/java/org/sinytra/connector/locator/ConnectorModMetadataParser.java index 1a3b9494..5447e17d 100644 --- a/src/main/java/dev/su5ed/sinytra/connector/locator/ConnectorModMetadataParser.java +++ b/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; diff --git a/src/main/java/dev/su5ed/sinytra/connector/locator/DependencyResolver.java b/src/main/java/org/sinytra/connector/locator/DependencyResolver.java similarity index 98% rename from src/main/java/dev/su5ed/sinytra/connector/locator/DependencyResolver.java rename to src/main/java/org/sinytra/connector/locator/DependencyResolver.java index ffe3827e..26710884 100644 --- a/src/main/java/dev/su5ed/sinytra/connector/locator/DependencyResolver.java +++ b/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; diff --git a/src/main/java/dev/su5ed/sinytra/connector/locator/EmbeddedDependencies.java b/src/main/java/org/sinytra/connector/locator/EmbeddedDependencies.java similarity index 99% rename from src/main/java/dev/su5ed/sinytra/connector/locator/EmbeddedDependencies.java rename to src/main/java/org/sinytra/connector/locator/EmbeddedDependencies.java index 5070dd94..df3b11bc 100644 --- a/src/main/java/dev/su5ed/sinytra/connector/locator/EmbeddedDependencies.java +++ b/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; diff --git a/src/main/java/dev/su5ed/sinytra/connector/locator/ForgeModPackageFilter.java b/src/main/java/org/sinytra/connector/locator/ForgeModPackageFilter.java similarity index 98% rename from src/main/java/dev/su5ed/sinytra/connector/locator/ForgeModPackageFilter.java rename to src/main/java/org/sinytra/connector/locator/ForgeModPackageFilter.java index 406894c5..81477522 100644 --- a/src/main/java/dev/su5ed/sinytra/connector/locator/ForgeModPackageFilter.java +++ b/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; diff --git a/src/main/java/dev/su5ed/sinytra/connector/locator/PackageTracker.java b/src/main/java/org/sinytra/connector/locator/PackageTracker.java similarity index 97% rename from src/main/java/dev/su5ed/sinytra/connector/locator/PackageTracker.java rename to src/main/java/org/sinytra/connector/locator/PackageTracker.java index e4f94fec..2c6e9402 100644 --- a/src/main/java/dev/su5ed/sinytra/connector/locator/PackageTracker.java +++ b/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 . */ -package dev.su5ed.sinytra.connector.locator; +package org.sinytra.connector.locator; import java.util.Set; import java.util.function.BiPredicate; diff --git a/src/main/java/dev/su5ed/sinytra/connector/locator/SplitPackageMerger.java b/src/main/java/org/sinytra/connector/locator/SplitPackageMerger.java similarity index 97% rename from src/main/java/dev/su5ed/sinytra/connector/locator/SplitPackageMerger.java rename to src/main/java/org/sinytra/connector/locator/SplitPackageMerger.java index 4b1323b4..e8191938 100644 --- a/src/main/java/dev/su5ed/sinytra/connector/locator/SplitPackageMerger.java +++ b/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; diff --git a/src/main/java/dev/su5ed/sinytra/connector/service/ConnectorLoaderService.java b/src/main/java/org/sinytra/connector/service/ConnectorLoaderService.java similarity index 91% rename from src/main/java/dev/su5ed/sinytra/connector/service/ConnectorLoaderService.java rename to src/main/java/org/sinytra/connector/service/ConnectorLoaderService.java index 00acb461..d026c773 100644 --- a/src/main/java/dev/su5ed/sinytra/connector/service/ConnectorLoaderService.java +++ b/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); diff --git a/src/main/java/dev/su5ed/sinytra/connector/service/ConnectorPreLaunchPlugin.java b/src/main/java/org/sinytra/connector/service/ConnectorPreLaunchPlugin.java similarity index 92% rename from src/main/java/dev/su5ed/sinytra/connector/service/ConnectorPreLaunchPlugin.java rename to src/main/java/org/sinytra/connector/service/ConnectorPreLaunchPlugin.java index 3adceaba..4800999c 100644 --- a/src/main/java/dev/su5ed/sinytra/connector/service/ConnectorPreLaunchPlugin.java +++ b/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; diff --git a/src/main/java/dev/su5ed/sinytra/connector/service/FabricASMFixer.java b/src/main/java/org/sinytra/connector/service/FabricASMFixer.java similarity index 99% rename from src/main/java/dev/su5ed/sinytra/connector/service/FabricASMFixer.java rename to src/main/java/org/sinytra/connector/service/FabricASMFixer.java index f3372779..76430740 100644 --- a/src/main/java/dev/su5ed/sinytra/connector/service/FabricASMFixer.java +++ b/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; diff --git a/src/main/java/dev/su5ed/sinytra/connector/service/FabricMixinBootstrap.java b/src/main/java/org/sinytra/connector/service/FabricMixinBootstrap.java similarity index 98% rename from src/main/java/dev/su5ed/sinytra/connector/service/FabricMixinBootstrap.java rename to src/main/java/org/sinytra/connector/service/FabricMixinBootstrap.java index 89bb2e6d..28b4ca9a 100644 --- a/src/main/java/dev/su5ed/sinytra/connector/service/FabricMixinBootstrap.java +++ b/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; diff --git a/src/main/java/dev/su5ed/sinytra/connector/service/hacks/ConnectorForkJoinThreadFactory.java b/src/main/java/org/sinytra/connector/service/hacks/ConnectorForkJoinThreadFactory.java similarity index 92% rename from src/main/java/dev/su5ed/sinytra/connector/service/hacks/ConnectorForkJoinThreadFactory.java rename to src/main/java/org/sinytra/connector/service/hacks/ConnectorForkJoinThreadFactory.java index eb995cd9..47a65b4e 100644 --- a/src/main/java/dev/su5ed/sinytra/connector/service/hacks/ConnectorForkJoinThreadFactory.java +++ b/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(); diff --git a/src/main/java/dev/su5ed/sinytra/connector/service/hacks/LenientRuntimeEnumExtender.java b/src/main/java/org/sinytra/connector/service/hacks/LenientRuntimeEnumExtender.java similarity index 96% rename from src/main/java/dev/su5ed/sinytra/connector/service/hacks/LenientRuntimeEnumExtender.java rename to src/main/java/org/sinytra/connector/service/hacks/LenientRuntimeEnumExtender.java index a4b73b2e..41d25a1b 100644 --- a/src/main/java/dev/su5ed/sinytra/connector/service/hacks/LenientRuntimeEnumExtender.java +++ b/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; diff --git a/src/main/java/dev/su5ed/sinytra/connector/service/hacks/ModuleLayerMigrator.java b/src/main/java/org/sinytra/connector/service/hacks/ModuleLayerMigrator.java similarity index 99% rename from src/main/java/dev/su5ed/sinytra/connector/service/hacks/ModuleLayerMigrator.java rename to src/main/java/org/sinytra/connector/service/hacks/ModuleLayerMigrator.java index de70253d..cb1bb528 100644 --- a/src/main/java/dev/su5ed/sinytra/connector/service/hacks/ModuleLayerMigrator.java +++ b/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; diff --git a/src/main/java/dev/su5ed/sinytra/connector/service/hacks/ServiceProviderInheritanceWorkaround.java b/src/main/java/org/sinytra/connector/service/hacks/ServiceProviderInheritanceWorkaround.java similarity index 98% rename from src/main/java/dev/su5ed/sinytra/connector/service/hacks/ServiceProviderInheritanceWorkaround.java rename to src/main/java/org/sinytra/connector/service/hacks/ServiceProviderInheritanceWorkaround.java index 67189dac..51ad470b 100644 --- a/src/main/java/dev/su5ed/sinytra/connector/service/hacks/ServiceProviderInheritanceWorkaround.java +++ b/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; diff --git a/src/main/java/dev/su5ed/sinytra/connector/transformer/AccessWidenerTransformer.java b/src/main/java/org/sinytra/connector/transformer/AccessWidenerTransformer.java similarity index 97% rename from src/main/java/dev/su5ed/sinytra/connector/transformer/AccessWidenerTransformer.java rename to src/main/java/org/sinytra/connector/transformer/AccessWidenerTransformer.java index 92bcd21b..c27e1895 100644 --- a/src/main/java/dev/su5ed/sinytra/connector/transformer/AccessWidenerTransformer.java +++ b/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; diff --git a/src/main/java/dev/su5ed/sinytra/connector/transformer/AccessorRedirectTransformer.java b/src/main/java/org/sinytra/connector/transformer/AccessorRedirectTransformer.java similarity index 95% rename from src/main/java/dev/su5ed/sinytra/connector/transformer/AccessorRedirectTransformer.java rename to src/main/java/org/sinytra/connector/transformer/AccessorRedirectTransformer.java index f738e736..6c4174fe 100644 --- a/src/main/java/dev/su5ed/sinytra/connector/transformer/AccessorRedirectTransformer.java +++ b/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; diff --git a/src/main/java/dev/su5ed/sinytra/connector/transformer/FieldToMethodTransformer.java b/src/main/java/org/sinytra/connector/transformer/FieldToMethodTransformer.java similarity index 98% rename from src/main/java/dev/su5ed/sinytra/connector/transformer/FieldToMethodTransformer.java rename to src/main/java/org/sinytra/connector/transformer/FieldToMethodTransformer.java index f7135d87..3ba66859 100644 --- a/src/main/java/dev/su5ed/sinytra/connector/transformer/FieldToMethodTransformer.java +++ b/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; diff --git a/src/main/java/dev/su5ed/sinytra/connector/transformer/JarSignatureStripper.java b/src/main/java/org/sinytra/connector/transformer/JarSignatureStripper.java similarity index 95% rename from src/main/java/dev/su5ed/sinytra/connector/transformer/JarSignatureStripper.java rename to src/main/java/org/sinytra/connector/transformer/JarSignatureStripper.java index 00ea803f..1208e75f 100644 --- a/src/main/java/dev/su5ed/sinytra/connector/transformer/JarSignatureStripper.java +++ b/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; diff --git a/src/main/java/dev/su5ed/sinytra/connector/transformer/MixinPatchTransformer.java b/src/main/java/org/sinytra/connector/transformer/MixinPatchTransformer.java similarity index 98% rename from src/main/java/dev/su5ed/sinytra/connector/transformer/MixinPatchTransformer.java rename to src/main/java/org/sinytra/connector/transformer/MixinPatchTransformer.java index f9dd7714..7c1ad99e 100644 --- a/src/main/java/dev/su5ed/sinytra/connector/transformer/MixinPatchTransformer.java +++ b/src/main/java/org/sinytra/connector/transformer/MixinPatchTransformer.java @@ -1,4 +1,4 @@ -package dev.su5ed.sinytra.connector.transformer; +package org.sinytra.connector.transformer; import com.google.common.collect.ImmutableList; import com.google.gson.GsonBuilder; @@ -7,8 +7,8 @@ import com.google.gson.JsonObject; import com.google.gson.JsonParser; import com.mojang.logging.LogUtils; -import dev.su5ed.sinytra.connector.ConnectorUtil; -import dev.su5ed.sinytra.connector.transformer.patch.EnvironmentStripperTransformer; +import org.sinytra.connector.ConnectorUtil; +import org.sinytra.connector.transformer.patch.EnvironmentStripperTransformer; import net.minecraftforge.fart.api.Transformer; import net.minecraftforge.forgespi.locating.IModFile; import org.objectweb.asm.ClassReader; diff --git a/src/main/java/dev/su5ed/sinytra/connector/transformer/MixinPatches.java b/src/main/java/org/sinytra/connector/transformer/MixinPatches.java similarity index 99% rename from src/main/java/dev/su5ed/sinytra/connector/transformer/MixinPatches.java rename to src/main/java/org/sinytra/connector/transformer/MixinPatches.java index 61d2f80b..3fe0b755 100644 --- a/src/main/java/dev/su5ed/sinytra/connector/transformer/MixinPatches.java +++ b/src/main/java/org/sinytra/connector/transformer/MixinPatches.java @@ -1,4 +1,4 @@ -package dev.su5ed.sinytra.connector.transformer; +package org.sinytra.connector.transformer; import org.objectweb.asm.Opcodes; import org.objectweb.asm.Type; @@ -676,7 +676,7 @@ public static List getGeneratedClassPatches() { .inline(5, i -> { i.visitVarInsn(Opcodes.ALOAD, 1); i.visitVarInsn(Opcodes.ALOAD, 2); - i.invokestatic("dev/su5ed/sinytra/connector/mod/ConnectorMod", "itemToHand", "(Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/item/ItemStack;)Lnet/minecraft/world/InteractionHand;", false); + i.invokestatic("org/sinytra/connector/mod/ConnectorMod", "itemToHand", "(Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/item/ItemStack;)Lnet/minecraft/world/InteractionHand;", false); }) .withOffset()) .build() diff --git a/src/main/java/dev/su5ed/sinytra/connector/transformer/ModMetadataGenerator.java b/src/main/java/org/sinytra/connector/transformer/ModMetadataGenerator.java similarity index 93% rename from src/main/java/dev/su5ed/sinytra/connector/transformer/ModMetadataGenerator.java rename to src/main/java/org/sinytra/connector/transformer/ModMetadataGenerator.java index d81f6b6c..4b6ab8d9 100644 --- a/src/main/java/dev/su5ed/sinytra/connector/transformer/ModMetadataGenerator.java +++ b/src/main/java/org/sinytra/connector/transformer/ModMetadataGenerator.java @@ -1,7 +1,7 @@ -package dev.su5ed.sinytra.connector.transformer; +package org.sinytra.connector.transformer; import com.google.gson.JsonObject; -import dev.su5ed.sinytra.connector.ConnectorUtil; +import org.sinytra.connector.ConnectorUtil; import net.minecraftforge.fart.api.Transformer; import org.apache.commons.lang3.RandomStringUtils; import org.objectweb.asm.AnnotationVisitor; @@ -44,7 +44,7 @@ public Collection getExtras() { // Generate FML mod class // Include a random string for uniqueness, just in case - String className = "dev/su5ed/sinytra/generated/%s_%s/Entrypoint_%s".formatted(this.modid, RandomStringUtils.randomAlphabetic(5), this.modid); + String className = "org/sinytra/generated/%s_%s/Entrypoint_%s".formatted(this.modid, RandomStringUtils.randomAlphabetic(5), this.modid); byte[] classData = generateFMLModEntrypoint(className); extras.add(ClassEntry.create(className + ".class", ConnectorUtil.ZIP_TIME, classData)); diff --git a/src/main/java/dev/su5ed/sinytra/connector/transformer/OptimizedRenamingTransformer.java b/src/main/java/org/sinytra/connector/transformer/OptimizedRenamingTransformer.java similarity index 99% rename from src/main/java/dev/su5ed/sinytra/connector/transformer/OptimizedRenamingTransformer.java rename to src/main/java/org/sinytra/connector/transformer/OptimizedRenamingTransformer.java index 0cbdcb74..8cc50dfb 100644 --- a/src/main/java/dev/su5ed/sinytra/connector/transformer/OptimizedRenamingTransformer.java +++ b/src/main/java/org/sinytra/connector/transformer/OptimizedRenamingTransformer.java @@ -1,6 +1,6 @@ -package dev.su5ed.sinytra.connector.transformer; +package org.sinytra.connector.transformer; -import dev.su5ed.sinytra.connector.transformer.jar.IntermediateMapping; +import org.sinytra.connector.transformer.jar.IntermediateMapping; import net.minecraftforge.fart.api.ClassProvider; import net.minecraftforge.fart.internal.ClassProviderImpl; import net.minecraftforge.fart.internal.EnhancedClassRemapper; diff --git a/src/main/java/dev/su5ed/sinytra/connector/transformer/RefmapRemapper.java b/src/main/java/org/sinytra/connector/transformer/RefmapRemapper.java similarity index 98% rename from src/main/java/dev/su5ed/sinytra/connector/transformer/RefmapRemapper.java rename to src/main/java/org/sinytra/connector/transformer/RefmapRemapper.java index 2c5745d6..ffd1c06f 100644 --- a/src/main/java/dev/su5ed/sinytra/connector/transformer/RefmapRemapper.java +++ b/src/main/java/org/sinytra/connector/transformer/RefmapRemapper.java @@ -1,8 +1,8 @@ -package dev.su5ed.sinytra.connector.transformer; +package org.sinytra.connector.transformer; import com.google.gson.Gson; import com.mojang.logging.LogUtils; -import dev.su5ed.sinytra.connector.ConnectorUtil; +import org.sinytra.connector.ConnectorUtil; import net.minecraftforge.fart.api.Transformer; import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; diff --git a/src/main/java/dev/su5ed/sinytra/connector/transformer/SrgRemappingReferenceMapper.java b/src/main/java/org/sinytra/connector/transformer/SrgRemappingReferenceMapper.java similarity index 99% rename from src/main/java/dev/su5ed/sinytra/connector/transformer/SrgRemappingReferenceMapper.java rename to src/main/java/org/sinytra/connector/transformer/SrgRemappingReferenceMapper.java index fb4e8af6..206774bf 100644 --- a/src/main/java/dev/su5ed/sinytra/connector/transformer/SrgRemappingReferenceMapper.java +++ b/src/main/java/org/sinytra/connector/transformer/SrgRemappingReferenceMapper.java @@ -1,4 +1,4 @@ -package dev.su5ed.sinytra.connector.transformer; +package org.sinytra.connector.transformer; import com.google.common.collect.Maps; import com.google.gson.GsonBuilder; diff --git a/src/main/java/dev/su5ed/sinytra/connector/transformer/jar/BytecodeFixerUpperFrontend.java b/src/main/java/org/sinytra/connector/transformer/jar/BytecodeFixerUpperFrontend.java similarity index 97% rename from src/main/java/dev/su5ed/sinytra/connector/transformer/jar/BytecodeFixerUpperFrontend.java rename to src/main/java/org/sinytra/connector/transformer/jar/BytecodeFixerUpperFrontend.java index b800b010..4301ae25 100644 --- a/src/main/java/dev/su5ed/sinytra/connector/transformer/jar/BytecodeFixerUpperFrontend.java +++ b/src/main/java/org/sinytra/connector/transformer/jar/BytecodeFixerUpperFrontend.java @@ -1,10 +1,10 @@ -package dev.su5ed.sinytra.connector.transformer.jar; +package org.sinytra.connector.transformer.jar; import com.mojang.datafixers.util.Pair; import org.sinytra.adapter.patch.fixes.BytecodeFixerUpper; import org.sinytra.adapter.patch.fixes.SimpleTypeAdapter; import org.sinytra.adapter.patch.fixes.TypeAdapter; -import dev.su5ed.sinytra.connector.ConnectorUtil; +import org.sinytra.connector.ConnectorUtil; import net.minecraftforge.coremod.api.ASMAPI; import net.minecraftforge.forgespi.locating.IModFile; import org.objectweb.asm.Opcodes; diff --git a/src/main/java/dev/su5ed/sinytra/connector/transformer/jar/EarlyJSCoremodTransformer.java b/src/main/java/org/sinytra/connector/transformer/jar/EarlyJSCoremodTransformer.java similarity index 98% rename from src/main/java/dev/su5ed/sinytra/connector/transformer/jar/EarlyJSCoremodTransformer.java rename to src/main/java/org/sinytra/connector/transformer/jar/EarlyJSCoremodTransformer.java index ecc811de..0a65b129 100644 --- a/src/main/java/dev/su5ed/sinytra/connector/transformer/jar/EarlyJSCoremodTransformer.java +++ b/src/main/java/org/sinytra/connector/transformer/jar/EarlyJSCoremodTransformer.java @@ -1,4 +1,4 @@ -package dev.su5ed.sinytra.connector.transformer.jar; +package org.sinytra.connector.transformer.jar; import com.mojang.logging.LogUtils; import cpw.mods.modlauncher.ClassTransformer; diff --git a/src/main/java/dev/su5ed/sinytra/connector/transformer/jar/IntermediateMapping.java b/src/main/java/org/sinytra/connector/transformer/jar/IntermediateMapping.java similarity index 94% rename from src/main/java/dev/su5ed/sinytra/connector/transformer/jar/IntermediateMapping.java rename to src/main/java/org/sinytra/connector/transformer/jar/IntermediateMapping.java index 0442a9f4..72b1e99b 100644 --- a/src/main/java/dev/su5ed/sinytra/connector/transformer/jar/IntermediateMapping.java +++ b/src/main/java/org/sinytra/connector/transformer/jar/IntermediateMapping.java @@ -1,4 +1,4 @@ -package dev.su5ed.sinytra.connector.transformer.jar; +package org.sinytra.connector.transformer.jar; import com.mojang.logging.LogUtils; import net.fabricmc.loader.impl.FabricLoaderImpl; @@ -14,8 +14,6 @@ import java.util.Set; import java.util.stream.Stream; -import static dev.su5ed.sinytra.connector.transformer.jar.JarTransformer.TRANSFORM_MARKER; - public class IntermediateMapping { private static final Map INTERMEDIATE_MAPPINGS_CACHE = new HashMap<>(); // Filter out non-obfuscated method names used in mapping namespaces as those don't need @@ -39,7 +37,7 @@ public static IntermediateMapping get(String sourceNamespace) { return existing; } - LOGGER.debug(TRANSFORM_MARKER, "Creating flat intermediate mapping for namespace {}", sourceNamespace); + LOGGER.debug(JarTransformer.TRANSFORM_MARKER, "Creating flat intermediate mapping for namespace {}", sourceNamespace); // Intermediary sometimes contains duplicate names for different methods (why?). We exclude those. Collection prefixes = MAPPING_PREFIXES.get(sourceNamespace); MappingResolverImpl resolver = FabricLoaderImpl.INSTANCE.getMappingResolver(); diff --git a/src/main/java/dev/su5ed/sinytra/connector/transformer/jar/JarTransformInstance.java b/src/main/java/org/sinytra/connector/transformer/jar/JarTransformInstance.java similarity index 77% rename from src/main/java/dev/su5ed/sinytra/connector/transformer/jar/JarTransformInstance.java rename to src/main/java/org/sinytra/connector/transformer/jar/JarTransformInstance.java index ac2d089d..b68b252a 100644 --- a/src/main/java/dev/su5ed/sinytra/connector/transformer/jar/JarTransformInstance.java +++ b/src/main/java/org/sinytra/connector/transformer/jar/JarTransformInstance.java @@ -1,25 +1,25 @@ -package dev.su5ed.sinytra.connector.transformer.jar; +package org.sinytra.connector.transformer.jar; import com.google.common.base.Stopwatch; import com.google.gson.Gson; import com.google.gson.JsonElement; import com.mojang.logging.LogUtils; import com.mojang.serialization.JsonOps; -import dev.su5ed.sinytra.connector.locator.EmbeddedDependencies; -import dev.su5ed.sinytra.connector.service.FabricMixinBootstrap; -import dev.su5ed.sinytra.connector.transformer.AccessWidenerTransformer; -import dev.su5ed.sinytra.connector.transformer.AccessorRedirectTransformer; -import dev.su5ed.sinytra.connector.transformer.FieldToMethodTransformer; -import dev.su5ed.sinytra.connector.transformer.JarSignatureStripper; -import dev.su5ed.sinytra.connector.transformer.MixinPatchTransformer; -import dev.su5ed.sinytra.connector.transformer.ModMetadataGenerator; -import dev.su5ed.sinytra.connector.transformer.OptimizedRenamingTransformer; -import dev.su5ed.sinytra.connector.transformer.RefmapRemapper; -import dev.su5ed.sinytra.connector.transformer.SrgRemappingReferenceMapper; -import dev.su5ed.sinytra.connector.transformer.patch.ClassAnalysingTransformer; -import dev.su5ed.sinytra.connector.transformer.patch.ClassNodeTransformer; -import dev.su5ed.sinytra.connector.transformer.patch.ConnectorRefmapHolder; -import dev.su5ed.sinytra.connector.transformer.patch.ReflectionRenamingTransformer; +import org.sinytra.connector.locator.EmbeddedDependencies; +import org.sinytra.connector.service.FabricMixinBootstrap; +import org.sinytra.connector.transformer.AccessWidenerTransformer; +import org.sinytra.connector.transformer.AccessorRedirectTransformer; +import org.sinytra.connector.transformer.FieldToMethodTransformer; +import org.sinytra.connector.transformer.JarSignatureStripper; +import org.sinytra.connector.transformer.MixinPatchTransformer; +import org.sinytra.connector.transformer.ModMetadataGenerator; +import org.sinytra.connector.transformer.OptimizedRenamingTransformer; +import org.sinytra.connector.transformer.RefmapRemapper; +import org.sinytra.connector.transformer.SrgRemappingReferenceMapper; +import org.sinytra.connector.transformer.patch.ClassAnalysingTransformer; +import org.sinytra.connector.transformer.patch.ClassNodeTransformer; +import org.sinytra.connector.transformer.patch.ConnectorRefmapHolder; +import org.sinytra.connector.transformer.patch.ReflectionRenamingTransformer; import net.fabricmc.loader.impl.FabricLoaderImpl; import net.fabricmc.loader.impl.MappingResolverImpl; import net.minecraftforge.coremod.api.ASMAPI; @@ -55,7 +55,6 @@ import java.util.zip.ZipFile; import static cpw.mods.modlauncher.api.LamdbaExceptionUtils.uncheck; -import static dev.su5ed.sinytra.connector.transformer.jar.JarTransformer.*; public class JarTransformInstance { private static final String FABRIC_MAPPING_NAMESPACE = "Fabric-Mapping-Namespace"; @@ -72,9 +71,9 @@ public class JarTransformInstance { public JarTransformInstance(ClassProvider classProvider, Iterable loadedMods, List libs) { MappingResolverImpl resolver = FabricLoaderImpl.INSTANCE.getMappingResolver(); - resolver.getMap(OBF_NAMESPACE, SOURCE_NAMESPACE); - resolver.getMap(SOURCE_NAMESPACE, OBF_NAMESPACE); - this.remapper = new SrgRemappingReferenceMapper(resolver.getCurrentMap(SOURCE_NAMESPACE)); + resolver.getMap(JarTransformer.OBF_NAMESPACE, JarTransformer.SOURCE_NAMESPACE); + resolver.getMap(JarTransformer.SOURCE_NAMESPACE, JarTransformer.OBF_NAMESPACE); + this.remapper = new SrgRemappingReferenceMapper(resolver.getCurrentMap(JarTransformer.SOURCE_NAMESPACE)); Path patchDataPath = EmbeddedDependencies.getAdapterData(EmbeddedDependencies.ADAPTER_PATCH_DATA); try (Reader reader = Files.newBufferedReader(patchDataPath)) { @@ -94,9 +93,9 @@ public JarTransformInstance(ClassProvider classProvider, Iterable load } this.bfu = new BytecodeFixerUpperFrontend(); - IMappingFile mappingFile = FabricLoaderImpl.INSTANCE.getMappingResolver().getCurrentMap(SOURCE_NAMESPACE); + IMappingFile mappingFile = FabricLoaderImpl.INSTANCE.getMappingResolver().getCurrentMap(JarTransformer.SOURCE_NAMESPACE); ClassProvider intermediaryClassProvider = new OptimizedRenamingTransformer.IntermediaryClassProvider(classProvider, mappingFile, mappingFile.reverse(), s -> {}); - this.enhancedRemapper = new OptimizedRenamingTransformer.MixinAwareEnhancedRemapper(intermediaryClassProvider, mappingFile, IntermediateMapping.get(SOURCE_NAMESPACE), s -> {}); + this.enhancedRemapper = new OptimizedRenamingTransformer.MixinAwareEnhancedRemapper(intermediaryClassProvider, mappingFile, IntermediateMapping.get(JarTransformer.SOURCE_NAMESPACE), s -> {}); this.cleanClassLookup = createCleanClassLookup(); this.libs = libs; @@ -107,7 +106,7 @@ public BytecodeFixerUpperFrontend getBfu() { return bfu; } - public void transformJar(File input, Path output, FabricModFileMetadata metadata) throws IOException { + public void transformJar(File input, Path output, JarTransformer.FabricModFileMetadata metadata) throws IOException { Stopwatch stopwatch = Stopwatch.createStarted(); if (metadata.generated()) { @@ -116,19 +115,19 @@ public void transformJar(File input, Path output, FabricModFileMetadata metadata } String jarMapping = metadata.manifestAttributes().getValue(FABRIC_MAPPING_NAMESPACE); - if (jarMapping != null && !jarMapping.equals(SOURCE_NAMESPACE)) { - LOGGER.error("Found transformable jar with unsupported mapping {}, currently only {} is supported", jarMapping, SOURCE_NAMESPACE); + if (jarMapping != null && !jarMapping.equals(JarTransformer.SOURCE_NAMESPACE)) { + LOGGER.error("Found transformable jar with unsupported mapping {}, currently only {} is supported", jarMapping, JarTransformer.SOURCE_NAMESPACE); } MappingResolverImpl resolver = FabricLoaderImpl.INSTANCE.getMappingResolver(); RefmapRemapper.RefmapFiles refmap = RefmapRemapper.processRefmaps(input.toPath(), metadata.refmaps(), this.remapper, this.libs); - IMappingFile srgToIntermediary = resolver.getMap(OBF_NAMESPACE, SOURCE_NAMESPACE); - IMappingFile intermediaryToSrg = resolver.getCurrentMap(SOURCE_NAMESPACE); + IMappingFile srgToIntermediary = resolver.getMap(JarTransformer.OBF_NAMESPACE, JarTransformer.SOURCE_NAMESPACE); + IMappingFile intermediaryToSrg = resolver.getCurrentMap(JarTransformer.SOURCE_NAMESPACE); AccessorRedirectTransformer accessorRedirectTransformer = new AccessorRedirectTransformer(srgToIntermediary); List extraPatches = Stream.concat(this.adapterPatches.stream(), AccessorRedirectTransformer.PATCHES.stream()).toList(); ConnectorRefmapHolder refmapHolder = new ConnectorRefmapHolder(refmap.merged(), refmap.files()); - int fabricLVTCompatibility = FabricMixinBootstrap.MixinConfigDecorator.getMixinCompat(metadata.modMetadata()); + int fabricLVTCompatibility = FabricMixinBootstrap.MixinConfigDecorator.getMixinCompat(metadata.modMetadata()); PatchEnvironment environment = PatchEnvironment.create(refmapHolder, this.cleanClassLookup, this.bfu.unwrap(), fabricLVTCompatibility); MixinPatchTransformer patchTransformer = new MixinPatchTransformer(this.lvtOffsetsData, environment, extraPatches); RefmapRemapper refmapRemapper = new RefmapRemapper(metadata.visibleMixinConfigs(), refmap.files()); @@ -137,18 +136,18 @@ public void transformJar(File input, Path output, FabricModFileMetadata metadata .add(new ClassNodeTransformer( new FieldToMethodTransformer(metadata.modMetadata().getAccessWidener(), srgToIntermediary), accessorRedirectTransformer, - new ReflectionRenamingTransformer(intermediaryToSrg, IntermediateMapping.get(SOURCE_NAMESPACE)) + new ReflectionRenamingTransformer(intermediaryToSrg, IntermediateMapping.get(JarTransformer.SOURCE_NAMESPACE)) )) .add(new OptimizedRenamingTransformer(this.enhancedRemapper, false, metadata.refmaps().isEmpty())) .add(new ClassNodeTransformer(new ClassAnalysingTransformer())) .add(patchTransformer) .add(refmapRemapper) .add(new ModMetadataGenerator(metadata.modMetadata().getId())) - .logger(s -> LOGGER.trace(TRANSFORM_MARKER, s)) - .debug(s -> LOGGER.trace(TRANSFORM_MARKER, s)) + .logger(s -> LOGGER.trace(JarTransformer.TRANSFORM_MARKER, s)) + .debug(s -> LOGGER.trace(JarTransformer.TRANSFORM_MARKER, s)) .ignoreJarPathPrefix("assets/", "data/"); if (!metadata.containsAT()) { - builder.add(new AccessWidenerTransformer(metadata.modMetadata().getAccessWidener(), resolver, IntermediateMapping.get(SOURCE_NAMESPACE))); + builder.add(new AccessWidenerTransformer(metadata.modMetadata().getAccessWidener(), resolver, IntermediateMapping.get(JarTransformer.SOURCE_NAMESPACE))); } try (Renamer renamer = builder.build()) { accessorRedirectTransformer.analyze(input, metadata.mixinPackages(), environment); @@ -164,10 +163,10 @@ public void transformJar(File input, Path output, FabricModFileMetadata metadata } stopwatch.stop(); - LOGGER.debug(TRANSFORM_MARKER, "Jar {} transformed in {} ms", input.getName(), stopwatch.elapsed(TimeUnit.MILLISECONDS)); + LOGGER.debug(JarTransformer.TRANSFORM_MARKER, "Jar {} transformed in {} ms", input.getName(), stopwatch.elapsed(TimeUnit.MILLISECONDS)); } - private static void processGeneratedJar(File input, Path output, FabricModFileMetadata metadata, Stopwatch stopwatch) throws IOException { + private static void processGeneratedJar(File input, Path output, JarTransformer.FabricModFileMetadata metadata, Stopwatch stopwatch) throws IOException { Files.copy(input.toPath(), output); try (FileSystem fs = FileSystems.newFileSystem(output)) { Path packMetadata = fs.getPath(ModMetadataGenerator.RESOURCE); @@ -177,7 +176,7 @@ private static void processGeneratedJar(File input, Path output, FabricModFileMe } } stopwatch.stop(); - LOGGER.debug(TRANSFORM_MARKER, "Skipping transformation of jar {} after {} ms as it contains generated metadata, assuming it's a java library", input.getName(), stopwatch.elapsed(TimeUnit.MILLISECONDS)); + LOGGER.debug(JarTransformer.TRANSFORM_MARKER, "Skipping transformation of jar {} after {} ms as it contains generated metadata, assuming it's a java library", input.getName(), stopwatch.elapsed(TimeUnit.MILLISECONDS)); } private static ClassLookup createCleanClassLookup() { @@ -203,7 +202,7 @@ private static ClassLookup createCleanClassLookup() { .filter(Files::exists) .orElseThrow(() -> new RuntimeException("Could not determine clean minecraft artifact path")); ClassProvider obfProvider = ClassProvider.fromPaths(cleanPath); - IMappingFile mapping = FabricLoaderImpl.INSTANCE.getMappingResolver().getCurrentMap(OBF_NAMESPACE); + IMappingFile mapping = FabricLoaderImpl.INSTANCE.getMappingResolver().getCurrentMap(JarTransformer.OBF_NAMESPACE); return new RenamingClassLookup(obfProvider, mapping); } } diff --git a/src/main/java/dev/su5ed/sinytra/connector/transformer/jar/JarTransformer.java b/src/main/java/org/sinytra/connector/transformer/jar/JarTransformer.java similarity index 97% rename from src/main/java/dev/su5ed/sinytra/connector/transformer/jar/JarTransformer.java rename to src/main/java/org/sinytra/connector/transformer/jar/JarTransformer.java index 089e16d5..1883341e 100644 --- a/src/main/java/dev/su5ed/sinytra/connector/transformer/jar/JarTransformer.java +++ b/src/main/java/org/sinytra/connector/transformer/jar/JarTransformer.java @@ -1,4 +1,4 @@ -package dev.su5ed.sinytra.connector.transformer.jar; +package org.sinytra.connector.transformer.jar; import com.google.common.base.Stopwatch; import com.google.gson.JsonObject; @@ -6,10 +6,10 @@ import com.mojang.datafixers.util.Pair; import com.mojang.logging.LogUtils; import cpw.mods.modlauncher.serviceapi.ILaunchPluginService; -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.locator.DependencyResolver; +import org.sinytra.connector.ConnectorUtil; +import org.sinytra.connector.loader.ConnectorEarlyLoader; +import org.sinytra.connector.loader.ConnectorLoaderModMetadata; +import org.sinytra.connector.locator.DependencyResolver; import net.fabricmc.loader.api.FabricLoader; import net.fabricmc.loader.api.metadata.CustomValue; import net.fabricmc.loader.impl.metadata.LoaderModMetadata; diff --git a/src/main/java/dev/su5ed/sinytra/connector/transformer/jar/RenamingClassLookup.java b/src/main/java/org/sinytra/connector/transformer/jar/RenamingClassLookup.java similarity index 96% rename from src/main/java/dev/su5ed/sinytra/connector/transformer/jar/RenamingClassLookup.java rename to src/main/java/org/sinytra/connector/transformer/jar/RenamingClassLookup.java index be3e871d..ae80b82d 100644 --- a/src/main/java/dev/su5ed/sinytra/connector/transformer/jar/RenamingClassLookup.java +++ b/src/main/java/org/sinytra/connector/transformer/jar/RenamingClassLookup.java @@ -1,4 +1,4 @@ -package dev.su5ed.sinytra.connector.transformer.jar; +package org.sinytra.connector.transformer.jar; import org.sinytra.adapter.patch.util.provider.ClassLookup; import net.minecraftforge.fart.api.ClassProvider; diff --git a/src/main/java/dev/su5ed/sinytra/connector/transformer/patch/ClassAnalysingTransformer.java b/src/main/java/org/sinytra/connector/transformer/patch/ClassAnalysingTransformer.java similarity index 73% rename from src/main/java/dev/su5ed/sinytra/connector/transformer/patch/ClassAnalysingTransformer.java rename to src/main/java/org/sinytra/connector/transformer/patch/ClassAnalysingTransformer.java index f1731c2a..396ec113 100644 --- a/src/main/java/dev/su5ed/sinytra/connector/transformer/patch/ClassAnalysingTransformer.java +++ b/src/main/java/org/sinytra/connector/transformer/patch/ClassAnalysingTransformer.java @@ -1,4 +1,4 @@ -package dev.su5ed.sinytra.connector.transformer.patch; +package org.sinytra.connector.transformer.patch; import net.minecraftforge.coremod.api.ASMAPI; import org.objectweb.asm.Opcodes; @@ -14,13 +14,13 @@ public class ClassAnalysingTransformer implements ClassNodeTransformer.ClassProcessor { private static final Map REPLACEMENTS = Map.of( new MethodQualifier("Ljava/lang/Class;", "getResourceAsStream", "(Ljava/lang/String;)Ljava/io/InputStream;"), - new MethodQualifier("dev/su5ed/sinytra/connector/mod/ConnectorMod", "getModResourceAsStream", "(Ljava/lang/Class;Ljava/lang/String;)Ljava/io/InputStream;"), + new MethodQualifier("org/sinytra/connector/mod/ConnectorMod", "getModResourceAsStream", "(Ljava/lang/Class;Ljava/lang/String;)Ljava/io/InputStream;"), new MethodQualifier("Lnet/minecraft/world/level/storage/loot/LootDataType;", ASMAPI.mapMethod("m_278763_"), "(Lnet/minecraft/resources/ResourceLocation;Lcom/google/gson/JsonElement;)Ljava/util/Optional;"), - new MethodQualifier("dev/su5ed/sinytra/connector/mod/ConnectorMod", "deserializeLootTable", "(Lnet/minecraft/world/level/storage/loot/LootDataType;Lnet/minecraft/resources/ResourceLocation;Lcom/google/gson/JsonElement;)Ljava/util/Optional;"), + new MethodQualifier("org/sinytra/connector/mod/ConnectorMod", "deserializeLootTable", "(Lnet/minecraft/world/level/storage/loot/LootDataType;Lnet/minecraft/resources/ResourceLocation;Lcom/google/gson/JsonElement;)Ljava/util/Optional;"), new MethodQualifier("Lcom/electronwill/nightconfig/core/file/FileConfigBuilder;", "defaultResource", "(Ljava/lang/String;)Lcom/electronwill/nightconfig/core/file/GenericBuilder;"), - new MethodQualifier("dev/su5ed/sinytra/connector/mod/ConnectorMod", "useModConfigResource", "(Lcom/electronwill/nightconfig/core/file/FileConfigBuilder;Ljava/lang/String;)Lcom/electronwill/nightconfig/core/file/GenericBuilder;") + new MethodQualifier("org/sinytra/connector/mod/ConnectorMod", "useModConfigResource", "(Lcom/electronwill/nightconfig/core/file/FileConfigBuilder;Ljava/lang/String;)Lcom/electronwill/nightconfig/core/file/GenericBuilder;") ); @Override diff --git a/src/main/java/dev/su5ed/sinytra/connector/transformer/patch/ClassNodeTransformer.java b/src/main/java/org/sinytra/connector/transformer/patch/ClassNodeTransformer.java similarity index 96% rename from src/main/java/dev/su5ed/sinytra/connector/transformer/patch/ClassNodeTransformer.java rename to src/main/java/org/sinytra/connector/transformer/patch/ClassNodeTransformer.java index 74f46ab5..e74073cb 100644 --- a/src/main/java/dev/su5ed/sinytra/connector/transformer/patch/ClassNodeTransformer.java +++ b/src/main/java/org/sinytra/connector/transformer/patch/ClassNodeTransformer.java @@ -1,4 +1,4 @@ -package dev.su5ed.sinytra.connector.transformer.patch; +package org.sinytra.connector.transformer.patch; import org.sinytra.adapter.patch.api.Patch; import net.minecraftforge.fart.api.Transformer; diff --git a/src/main/java/dev/su5ed/sinytra/connector/transformer/patch/ConnectorRefmapHolder.java b/src/main/java/org/sinytra/connector/transformer/patch/ConnectorRefmapHolder.java similarity index 93% rename from src/main/java/dev/su5ed/sinytra/connector/transformer/patch/ConnectorRefmapHolder.java rename to src/main/java/org/sinytra/connector/transformer/patch/ConnectorRefmapHolder.java index 1f6b98cc..22e7d2fa 100644 --- a/src/main/java/dev/su5ed/sinytra/connector/transformer/patch/ConnectorRefmapHolder.java +++ b/src/main/java/org/sinytra/connector/transformer/patch/ConnectorRefmapHolder.java @@ -1,7 +1,7 @@ -package dev.su5ed.sinytra.connector.transformer.patch; +package org.sinytra.connector.transformer.patch; import org.sinytra.adapter.patch.api.RefmapHolder; -import dev.su5ed.sinytra.connector.transformer.SrgRemappingReferenceMapper; +import org.sinytra.connector.transformer.SrgRemappingReferenceMapper; import java.util.HashSet; import java.util.Map; diff --git a/src/main/java/dev/su5ed/sinytra/connector/transformer/patch/EnvironmentStripperTransformer.java b/src/main/java/org/sinytra/connector/transformer/patch/EnvironmentStripperTransformer.java similarity index 99% rename from src/main/java/dev/su5ed/sinytra/connector/transformer/patch/EnvironmentStripperTransformer.java rename to src/main/java/org/sinytra/connector/transformer/patch/EnvironmentStripperTransformer.java index 6ab196bb..aaca4513 100644 --- a/src/main/java/dev/su5ed/sinytra/connector/transformer/patch/EnvironmentStripperTransformer.java +++ b/src/main/java/org/sinytra/connector/transformer/patch/EnvironmentStripperTransformer.java @@ -1,4 +1,4 @@ -package dev.su5ed.sinytra.connector.transformer.patch; +package org.sinytra.connector.transformer.patch; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; diff --git a/src/main/java/dev/su5ed/sinytra/connector/transformer/patch/RedirectAccessorToMethod.java b/src/main/java/org/sinytra/connector/transformer/patch/RedirectAccessorToMethod.java similarity index 96% rename from src/main/java/dev/su5ed/sinytra/connector/transformer/patch/RedirectAccessorToMethod.java rename to src/main/java/org/sinytra/connector/transformer/patch/RedirectAccessorToMethod.java index 9aaf7bd9..acede2dc 100644 --- a/src/main/java/dev/su5ed/sinytra/connector/transformer/patch/RedirectAccessorToMethod.java +++ b/src/main/java/org/sinytra/connector/transformer/patch/RedirectAccessorToMethod.java @@ -1,4 +1,4 @@ -package dev.su5ed.sinytra.connector.transformer.patch; +package org.sinytra.connector.transformer.patch; import com.mojang.logging.LogUtils; import org.sinytra.adapter.patch.api.MethodContext; diff --git a/src/main/java/dev/su5ed/sinytra/connector/transformer/patch/ReflectionRenamingTransformer.java b/src/main/java/org/sinytra/connector/transformer/patch/ReflectionRenamingTransformer.java similarity index 97% rename from src/main/java/dev/su5ed/sinytra/connector/transformer/patch/ReflectionRenamingTransformer.java rename to src/main/java/org/sinytra/connector/transformer/patch/ReflectionRenamingTransformer.java index 7e3a3c83..d45db0d8 100644 --- a/src/main/java/dev/su5ed/sinytra/connector/transformer/patch/ReflectionRenamingTransformer.java +++ b/src/main/java/org/sinytra/connector/transformer/patch/ReflectionRenamingTransformer.java @@ -1,6 +1,6 @@ -package dev.su5ed.sinytra.connector.transformer.patch; +package org.sinytra.connector.transformer.patch; -import dev.su5ed.sinytra.connector.transformer.jar.IntermediateMapping; +import org.sinytra.connector.transformer.jar.IntermediateMapping; import net.minecraftforge.srgutils.IMappingFile; import org.jetbrains.annotations.Nullable; import org.objectweb.asm.Opcodes; diff --git a/src/main/resources/META-INF/services/cpw.mods.modlauncher.api.ITransformationService b/src/main/resources/META-INF/services/cpw.mods.modlauncher.api.ITransformationService index 451c0c95..b81d8f13 100644 --- a/src/main/resources/META-INF/services/cpw.mods.modlauncher.api.ITransformationService +++ b/src/main/resources/META-INF/services/cpw.mods.modlauncher.api.ITransformationService @@ -1 +1 @@ -dev.su5ed.sinytra.connector.service.ConnectorLoaderService \ No newline at end of file +org.sinytra.connector.service.ConnectorLoaderService diff --git a/src/main/resources/META-INF/services/net.minecraftforge.forgespi.locating.IDependencyLocator b/src/main/resources/META-INF/services/net.minecraftforge.forgespi.locating.IDependencyLocator index bd2ecb09..e684fb4d 100644 --- a/src/main/resources/META-INF/services/net.minecraftforge.forgespi.locating.IDependencyLocator +++ b/src/main/resources/META-INF/services/net.minecraftforge.forgespi.locating.IDependencyLocator @@ -1 +1 @@ -dev.su5ed.sinytra.connector.locator.ConnectorLocator \ No newline at end of file +org.sinytra.connector.locator.ConnectorLocator diff --git a/src/main/resources/META-INF/services/net.minecraftforge.forgespi.locating.IModLocator b/src/main/resources/META-INF/services/net.minecraftforge.forgespi.locating.IModLocator index 5ffe284f..22732387 100644 --- a/src/main/resources/META-INF/services/net.minecraftforge.forgespi.locating.IModLocator +++ b/src/main/resources/META-INF/services/net.minecraftforge.forgespi.locating.IModLocator @@ -1 +1 @@ -dev.su5ed.sinytra.connector.locator.ConnectorEarlyLocator \ No newline at end of file +org.sinytra.connector.locator.ConnectorEarlyLocator diff --git a/src/mod/java/dev/su5ed/sinytra/connector/mod/DummyTarget.java b/src/mod/java/dev/su5ed/sinytra/connector/mod/DummyTarget.java deleted file mode 100644 index f3fef2a3..00000000 --- a/src/mod/java/dev/su5ed/sinytra/connector/mod/DummyTarget.java +++ /dev/null @@ -1,4 +0,0 @@ -package dev.su5ed.sinytra.connector.mod; - -public class DummyTarget { -} diff --git a/src/mod/java/dev/su5ed/sinytra/connector/mod/ConnectorBootstrap.java b/src/mod/java/org/sinytra/connector/mod/ConnectorBootstrap.java similarity index 95% rename from src/mod/java/dev/su5ed/sinytra/connector/mod/ConnectorBootstrap.java rename to src/mod/java/org/sinytra/connector/mod/ConnectorBootstrap.java index 787247c8..3fe94d41 100644 --- a/src/mod/java/dev/su5ed/sinytra/connector/mod/ConnectorBootstrap.java +++ b/src/mod/java/org/sinytra/connector/mod/ConnectorBootstrap.java @@ -1,6 +1,6 @@ -package dev.su5ed.sinytra.connector.mod; +package org.sinytra.connector.mod; -import dev.su5ed.sinytra.connector.loader.ConnectorEarlyLoader; +import org.sinytra.connector.loader.ConnectorEarlyLoader; import net.minecraftforge.coremod.api.ASMAPI; import org.objectweb.asm.Opcodes; import org.objectweb.asm.tree.AbstractInsnNode; diff --git a/src/mod/java/dev/su5ed/sinytra/connector/mod/ConnectorLoader.java b/src/mod/java/org/sinytra/connector/mod/ConnectorLoader.java similarity index 92% rename from src/mod/java/dev/su5ed/sinytra/connector/mod/ConnectorLoader.java rename to src/mod/java/org/sinytra/connector/mod/ConnectorLoader.java index 6f2ee4e5..2f3dc5e6 100644 --- a/src/mod/java/dev/su5ed/sinytra/connector/mod/ConnectorLoader.java +++ b/src/mod/java/org/sinytra/connector/mod/ConnectorLoader.java @@ -1,8 +1,8 @@ -package dev.su5ed.sinytra.connector.mod; +package org.sinytra.connector.mod; import com.mojang.logging.LogUtils; -import dev.su5ed.sinytra.connector.loader.ConnectorEarlyLoader; -import dev.su5ed.sinytra.connector.mod.compat.LazyEntityAttributes; +import org.sinytra.connector.loader.ConnectorEarlyLoader; +import org.sinytra.connector.mod.compat.LazyEntityAttributes; import net.fabricmc.api.ClientModInitializer; import net.fabricmc.api.DedicatedServerModInitializer; import net.fabricmc.api.ModInitializer; diff --git a/src/mod/java/dev/su5ed/sinytra/connector/mod/ConnectorMod.java b/src/mod/java/org/sinytra/connector/mod/ConnectorMod.java similarity index 90% rename from src/mod/java/dev/su5ed/sinytra/connector/mod/ConnectorMod.java rename to src/mod/java/org/sinytra/connector/mod/ConnectorMod.java index cd147e99..b874b2f5 100644 --- a/src/mod/java/dev/su5ed/sinytra/connector/mod/ConnectorMod.java +++ b/src/mod/java/org/sinytra/connector/mod/ConnectorMod.java @@ -1,15 +1,15 @@ -package dev.su5ed.sinytra.connector.mod; +package org.sinytra.connector.mod; import com.electronwill.nightconfig.core.file.FileConfigBuilder; import com.electronwill.nightconfig.core.file.FileNotFoundAction; import com.electronwill.nightconfig.core.file.GenericBuilder; import com.google.gson.JsonElement; -import dev.su5ed.sinytra.connector.ConnectorUtil; -import dev.su5ed.sinytra.connector.mod.compat.DummyResourceManager; -import dev.su5ed.sinytra.connector.mod.compat.FluidHandlerCompat; -import dev.su5ed.sinytra.connector.mod.compat.LateRenderTypesInit; -import dev.su5ed.sinytra.connector.mod.compat.LateSheetsInit; -import dev.su5ed.sinytra.connector.mod.compat.LazyEntityAttributes; +import org.sinytra.connector.ConnectorUtil; +import org.sinytra.connector.mod.compat.DummyResourceManager; +import org.sinytra.connector.mod.compat.FluidHandlerCompat; +import org.sinytra.connector.mod.compat.LateRenderTypesInit; +import org.sinytra.connector.mod.compat.LateSheetsInit; +import org.sinytra.connector.mod.compat.LazyEntityAttributes; import net.minecraft.core.MappedRegistry; import net.minecraft.core.Registry; import net.minecraft.core.registries.BuiltInRegistries; diff --git a/src/mod/java/dev/su5ed/sinytra/connector/mod/CrashReportUpgrade.java b/src/mod/java/org/sinytra/connector/mod/CrashReportUpgrade.java similarity index 94% rename from src/mod/java/dev/su5ed/sinytra/connector/mod/CrashReportUpgrade.java rename to src/mod/java/org/sinytra/connector/mod/CrashReportUpgrade.java index 63edffbf..7ce17d98 100644 --- a/src/mod/java/dev/su5ed/sinytra/connector/mod/CrashReportUpgrade.java +++ b/src/mod/java/org/sinytra/connector/mod/CrashReportUpgrade.java @@ -1,7 +1,7 @@ -package dev.su5ed.sinytra.connector.mod; +package org.sinytra.connector.mod; -import dev.su5ed.sinytra.connector.ConnectorUtil; -import dev.su5ed.sinytra.connector.loader.ConnectorEarlyLoader; +import org.sinytra.connector.ConnectorUtil; +import org.sinytra.connector.loader.ConnectorEarlyLoader; import net.minecraftforge.fml.CrashReportCallables; import net.minecraftforge.forgespi.language.IModInfo; import org.apache.commons.lang3.StringUtils; diff --git a/src/mod/java/org/sinytra/connector/mod/DummyTarget.java b/src/mod/java/org/sinytra/connector/mod/DummyTarget.java new file mode 100644 index 00000000..68e845d7 --- /dev/null +++ b/src/mod/java/org/sinytra/connector/mod/DummyTarget.java @@ -0,0 +1,4 @@ +package org.sinytra.connector.mod; + +public class DummyTarget { +} diff --git a/src/mod/java/dev/su5ed/sinytra/connector/mod/compat/DummyResourceManager.java b/src/mod/java/org/sinytra/connector/mod/compat/DummyResourceManager.java similarity index 96% rename from src/mod/java/dev/su5ed/sinytra/connector/mod/compat/DummyResourceManager.java rename to src/mod/java/org/sinytra/connector/mod/compat/DummyResourceManager.java index 6d98f533..6471869d 100644 --- a/src/mod/java/dev/su5ed/sinytra/connector/mod/compat/DummyResourceManager.java +++ b/src/mod/java/org/sinytra/connector/mod/compat/DummyResourceManager.java @@ -1,4 +1,4 @@ -package dev.su5ed.sinytra.connector.mod.compat; +package org.sinytra.connector.mod.compat; import net.minecraft.resources.ResourceLocation; import net.minecraft.server.packs.PackResources; diff --git a/src/mod/java/dev/su5ed/sinytra/connector/mod/compat/FluidHandlerCompat.java b/src/mod/java/org/sinytra/connector/mod/compat/FluidHandlerCompat.java similarity index 98% rename from src/mod/java/dev/su5ed/sinytra/connector/mod/compat/FluidHandlerCompat.java rename to src/mod/java/org/sinytra/connector/mod/compat/FluidHandlerCompat.java index a8ffc91e..78c66446 100644 --- a/src/mod/java/dev/su5ed/sinytra/connector/mod/compat/FluidHandlerCompat.java +++ b/src/mod/java/org/sinytra/connector/mod/compat/FluidHandlerCompat.java @@ -1,7 +1,7 @@ -package dev.su5ed.sinytra.connector.mod.compat; +package org.sinytra.connector.mod.compat; import com.mojang.logging.LogUtils; -import dev.su5ed.sinytra.connector.loader.ConnectorEarlyLoader; +import org.sinytra.connector.loader.ConnectorEarlyLoader; import net.fabricmc.fabric.api.client.render.fluid.v1.FluidRenderHandler; import net.fabricmc.fabric.api.client.render.fluid.v1.FluidRenderHandlerRegistry; import net.fabricmc.fabric.api.transfer.v1.fluid.FluidVariant; diff --git a/src/mod/java/dev/su5ed/sinytra/connector/mod/compat/ItemStackExtensions.java b/src/mod/java/org/sinytra/connector/mod/compat/ItemStackExtensions.java similarity index 80% rename from src/mod/java/dev/su5ed/sinytra/connector/mod/compat/ItemStackExtensions.java rename to src/mod/java/org/sinytra/connector/mod/compat/ItemStackExtensions.java index 335b6958..06f24e14 100644 --- a/src/mod/java/dev/su5ed/sinytra/connector/mod/compat/ItemStackExtensions.java +++ b/src/mod/java/org/sinytra/connector/mod/compat/ItemStackExtensions.java @@ -1,4 +1,4 @@ -package dev.su5ed.sinytra.connector.mod.compat; +package org.sinytra.connector.mod.compat; import net.minecraft.world.InteractionResult; import net.minecraft.world.item.context.UseOnContext; diff --git a/src/mod/java/dev/su5ed/sinytra/connector/mod/compat/LateRenderTypesInit.java b/src/mod/java/org/sinytra/connector/mod/compat/LateRenderTypesInit.java similarity index 93% rename from src/mod/java/dev/su5ed/sinytra/connector/mod/compat/LateRenderTypesInit.java rename to src/mod/java/org/sinytra/connector/mod/compat/LateRenderTypesInit.java index cc6f72f5..c2ad1da2 100644 --- a/src/mod/java/dev/su5ed/sinytra/connector/mod/compat/LateRenderTypesInit.java +++ b/src/mod/java/org/sinytra/connector/mod/compat/LateRenderTypesInit.java @@ -1,4 +1,4 @@ -package dev.su5ed.sinytra.connector.mod.compat; +package org.sinytra.connector.mod.compat; import net.minecraft.client.renderer.RenderType; diff --git a/src/mod/java/dev/su5ed/sinytra/connector/mod/compat/LateSheetsInit.java b/src/mod/java/org/sinytra/connector/mod/compat/LateSheetsInit.java similarity index 95% rename from src/mod/java/dev/su5ed/sinytra/connector/mod/compat/LateSheetsInit.java rename to src/mod/java/org/sinytra/connector/mod/compat/LateSheetsInit.java index 6275fe2f..831c4916 100644 --- a/src/mod/java/dev/su5ed/sinytra/connector/mod/compat/LateSheetsInit.java +++ b/src/mod/java/org/sinytra/connector/mod/compat/LateSheetsInit.java @@ -1,4 +1,4 @@ -package dev.su5ed.sinytra.connector.mod.compat; +package org.sinytra.connector.mod.compat; import net.minecraft.client.renderer.Sheets; import net.minecraft.core.registries.BuiltInRegistries; diff --git a/src/mod/java/dev/su5ed/sinytra/connector/mod/compat/LazyEntityAttributes.java b/src/mod/java/org/sinytra/connector/mod/compat/LazyEntityAttributes.java similarity index 98% rename from src/mod/java/dev/su5ed/sinytra/connector/mod/compat/LazyEntityAttributes.java rename to src/mod/java/org/sinytra/connector/mod/compat/LazyEntityAttributes.java index 974136c1..cbcb8a10 100644 --- a/src/mod/java/dev/su5ed/sinytra/connector/mod/compat/LazyEntityAttributes.java +++ b/src/mod/java/org/sinytra/connector/mod/compat/LazyEntityAttributes.java @@ -1,4 +1,4 @@ -package dev.su5ed.sinytra.connector.mod.compat; +package org.sinytra.connector.mod.compat; import cpw.mods.modlauncher.api.LamdbaExceptionUtils; import net.minecraft.world.entity.EntityType; diff --git a/src/mod/java/dev/su5ed/sinytra/connector/mod/compat/PathPackResourcesExtensions.java b/src/mod/java/org/sinytra/connector/mod/compat/PathPackResourcesExtensions.java similarity index 64% rename from src/mod/java/dev/su5ed/sinytra/connector/mod/compat/PathPackResourcesExtensions.java rename to src/mod/java/org/sinytra/connector/mod/compat/PathPackResourcesExtensions.java index 8597d70a..feff2df8 100644 --- a/src/mod/java/dev/su5ed/sinytra/connector/mod/compat/PathPackResourcesExtensions.java +++ b/src/mod/java/org/sinytra/connector/mod/compat/PathPackResourcesExtensions.java @@ -1,4 +1,4 @@ -package dev.su5ed.sinytra.connector.mod.compat; +package org.sinytra.connector.mod.compat; public interface PathPackResourcesExtensions { boolean connector_isFabricMod(); diff --git a/src/mod/java/dev/su5ed/sinytra/connector/mod/compat/RegistryUtil.java b/src/mod/java/org/sinytra/connector/mod/compat/RegistryUtil.java similarity index 95% rename from src/mod/java/dev/su5ed/sinytra/connector/mod/compat/RegistryUtil.java rename to src/mod/java/org/sinytra/connector/mod/compat/RegistryUtil.java index 77667a3f..151927ee 100644 --- a/src/mod/java/dev/su5ed/sinytra/connector/mod/compat/RegistryUtil.java +++ b/src/mod/java/org/sinytra/connector/mod/compat/RegistryUtil.java @@ -1,9 +1,9 @@ -package dev.su5ed.sinytra.connector.mod.compat; +package org.sinytra.connector.mod.compat; import com.google.common.collect.BiMap; import com.mojang.datafixers.util.Pair; import com.mojang.logging.LogUtils; -import dev.su5ed.sinytra.connector.loader.ConnectorEarlyLoader; +import org.sinytra.connector.loader.ConnectorEarlyLoader; import net.fabricmc.fabric.impl.registry.sync.DynamicRegistriesImpl; import net.minecraft.resources.ResourceKey; import net.minecraft.resources.ResourceLocation; diff --git a/src/mod/java/dev/su5ed/sinytra/connector/mod/compat/TagConverter.java b/src/mod/java/org/sinytra/connector/mod/compat/TagConverter.java similarity index 99% rename from src/mod/java/dev/su5ed/sinytra/connector/mod/compat/TagConverter.java rename to src/mod/java/org/sinytra/connector/mod/compat/TagConverter.java index 6ff1490d..a8921d8b 100644 --- a/src/mod/java/dev/su5ed/sinytra/connector/mod/compat/TagConverter.java +++ b/src/mod/java/org/sinytra/connector/mod/compat/TagConverter.java @@ -1,4 +1,4 @@ -package dev.su5ed.sinytra.connector.mod.compat; +package org.sinytra.connector.mod.compat; import com.google.common.base.Stopwatch; import com.mojang.datafixers.util.Pair; diff --git a/src/mod/java/dev/su5ed/sinytra/connector/mod/compat/fieldtypes/FieldTypeUtil.java b/src/mod/java/org/sinytra/connector/mod/compat/fieldtypes/FieldTypeUtil.java similarity index 92% rename from src/mod/java/dev/su5ed/sinytra/connector/mod/compat/fieldtypes/FieldTypeUtil.java rename to src/mod/java/org/sinytra/connector/mod/compat/fieldtypes/FieldTypeUtil.java index a429f8cc..48a2a67d 100644 --- a/src/mod/java/dev/su5ed/sinytra/connector/mod/compat/fieldtypes/FieldTypeUtil.java +++ b/src/mod/java/org/sinytra/connector/mod/compat/fieldtypes/FieldTypeUtil.java @@ -1,4 +1,4 @@ -package dev.su5ed.sinytra.connector.mod.compat.fieldtypes; +package org.sinytra.connector.mod.compat.fieldtypes; import net.minecraft.core.IdMapper; diff --git a/src/mod/java/dev/su5ed/sinytra/connector/mod/compat/fieldtypes/RedirectingIdMapper.java b/src/mod/java/org/sinytra/connector/mod/compat/fieldtypes/RedirectingIdMapper.java similarity index 96% rename from src/mod/java/dev/su5ed/sinytra/connector/mod/compat/fieldtypes/RedirectingIdMapper.java rename to src/mod/java/org/sinytra/connector/mod/compat/fieldtypes/RedirectingIdMapper.java index 96e0de69..594324b5 100644 --- a/src/mod/java/dev/su5ed/sinytra/connector/mod/compat/fieldtypes/RedirectingIdMapper.java +++ b/src/mod/java/org/sinytra/connector/mod/compat/fieldtypes/RedirectingIdMapper.java @@ -1,4 +1,4 @@ -package dev.su5ed.sinytra.connector.mod.compat.fieldtypes; +package org.sinytra.connector.mod.compat.fieldtypes; import net.minecraft.core.IdMapper; import org.jetbrains.annotations.NotNull; diff --git a/src/mod/java/dev/su5ed/sinytra/connector/mod/compat/fieldtypes/RedirectingInt2ObjectMap.java b/src/mod/java/org/sinytra/connector/mod/compat/fieldtypes/RedirectingInt2ObjectMap.java similarity index 98% rename from src/mod/java/dev/su5ed/sinytra/connector/mod/compat/fieldtypes/RedirectingInt2ObjectMap.java rename to src/mod/java/org/sinytra/connector/mod/compat/fieldtypes/RedirectingInt2ObjectMap.java index 715f2f68..690e7859 100644 --- a/src/mod/java/dev/su5ed/sinytra/connector/mod/compat/fieldtypes/RedirectingInt2ObjectMap.java +++ b/src/mod/java/org/sinytra/connector/mod/compat/fieldtypes/RedirectingInt2ObjectMap.java @@ -1,4 +1,4 @@ -package dev.su5ed.sinytra.connector.mod.compat.fieldtypes; +package org.sinytra.connector.mod.compat.fieldtypes; import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import it.unimi.dsi.fastutil.ints.IntSet; diff --git a/src/mod/java/dev/su5ed/sinytra/connector/mod/compat/hud/GuiExtensions.java b/src/mod/java/org/sinytra/connector/mod/compat/hud/GuiExtensions.java similarity index 94% rename from src/mod/java/dev/su5ed/sinytra/connector/mod/compat/hud/GuiExtensions.java rename to src/mod/java/org/sinytra/connector/mod/compat/hud/GuiExtensions.java index 3b89b0bf..678a5308 100644 --- a/src/mod/java/dev/su5ed/sinytra/connector/mod/compat/hud/GuiExtensions.java +++ b/src/mod/java/org/sinytra/connector/mod/compat/hud/GuiExtensions.java @@ -1,4 +1,4 @@ -package dev.su5ed.sinytra.connector.mod.compat.hud; +package org.sinytra.connector.mod.compat.hud; import net.minecraft.client.gui.GuiGraphics; diff --git a/src/mod/java/dev/su5ed/sinytra/connector/mod/compat/hud/HudRenderInvoker.java b/src/mod/java/org/sinytra/connector/mod/compat/hud/HudRenderInvoker.java similarity index 91% rename from src/mod/java/dev/su5ed/sinytra/connector/mod/compat/hud/HudRenderInvoker.java rename to src/mod/java/org/sinytra/connector/mod/compat/hud/HudRenderInvoker.java index cf56358b..ed638dc7 100644 --- a/src/mod/java/dev/su5ed/sinytra/connector/mod/compat/hud/HudRenderInvoker.java +++ b/src/mod/java/org/sinytra/connector/mod/compat/hud/HudRenderInvoker.java @@ -1,6 +1,6 @@ -package dev.su5ed.sinytra.connector.mod.compat.hud; +package org.sinytra.connector.mod.compat.hud; -import dev.su5ed.sinytra.connector.ConnectorUtil; +import org.sinytra.connector.ConnectorUtil; import net.minecraft.client.Minecraft; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.client.event.RenderGuiEvent; diff --git a/src/mod/java/dev/su5ed/sinytra/connector/mod/mixin/CrashReportExtenderMixin.java b/src/mod/java/org/sinytra/connector/mod/mixin/CrashReportExtenderMixin.java similarity index 86% rename from src/mod/java/dev/su5ed/sinytra/connector/mod/mixin/CrashReportExtenderMixin.java rename to src/mod/java/org/sinytra/connector/mod/mixin/CrashReportExtenderMixin.java index 73358768..78e2aff0 100644 --- a/src/mod/java/dev/su5ed/sinytra/connector/mod/mixin/CrashReportExtenderMixin.java +++ b/src/mod/java/org/sinytra/connector/mod/mixin/CrashReportExtenderMixin.java @@ -1,6 +1,6 @@ -package dev.su5ed.sinytra.connector.mod.mixin; +package org.sinytra.connector.mod.mixin; -import dev.su5ed.sinytra.connector.mod.CrashReportUpgrade; +import org.sinytra.connector.mod.CrashReportUpgrade; import net.minecraft.CrashReport; import net.minecraftforge.logging.CrashReportExtender; import org.spongepowered.asm.mixin.Mixin; diff --git a/src/mod/java/dev/su5ed/sinytra/connector/mod/mixin/ForgeHooksClientMixin.java b/src/mod/java/org/sinytra/connector/mod/mixin/ForgeHooksClientMixin.java similarity index 96% rename from src/mod/java/dev/su5ed/sinytra/connector/mod/mixin/ForgeHooksClientMixin.java rename to src/mod/java/org/sinytra/connector/mod/mixin/ForgeHooksClientMixin.java index d65c90bc..05f8635f 100644 --- a/src/mod/java/dev/su5ed/sinytra/connector/mod/mixin/ForgeHooksClientMixin.java +++ b/src/mod/java/org/sinytra/connector/mod/mixin/ForgeHooksClientMixin.java @@ -1,4 +1,4 @@ -package dev.su5ed.sinytra.connector.mod.mixin; +package org.sinytra.connector.mod.mixin; import net.minecraft.client.gui.Font; import net.minecraft.client.gui.screens.inventory.tooltip.ClientTooltipComponent; diff --git a/src/mod/java/dev/su5ed/sinytra/connector/mod/mixin/ForgeHooksMixin.java b/src/mod/java/org/sinytra/connector/mod/mixin/ForgeHooksMixin.java similarity index 90% rename from src/mod/java/dev/su5ed/sinytra/connector/mod/mixin/ForgeHooksMixin.java rename to src/mod/java/org/sinytra/connector/mod/mixin/ForgeHooksMixin.java index 6da0f8ce..7e4dc510 100644 --- a/src/mod/java/dev/su5ed/sinytra/connector/mod/mixin/ForgeHooksMixin.java +++ b/src/mod/java/org/sinytra/connector/mod/mixin/ForgeHooksMixin.java @@ -1,9 +1,8 @@ -package dev.su5ed.sinytra.connector.mod.mixin; +package org.sinytra.connector.mod.mixin; import com.llamalad7.mixinextras.sugar.Local; -import dev.su5ed.sinytra.connector.ConnectorUtil; -import dev.su5ed.sinytra.connector.mod.ConnectorMod; -import dev.su5ed.sinytra.connector.mod.compat.FluidHandlerCompat; +import org.sinytra.connector.mod.ConnectorMod; +import org.sinytra.connector.mod.compat.FluidHandlerCompat; import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.ai.attributes.AttributeSupplier; diff --git a/src/mod/java/dev/su5ed/sinytra/connector/mod/mixin/HumanoidArmorLayerMixin.java b/src/mod/java/org/sinytra/connector/mod/mixin/HumanoidArmorLayerMixin.java similarity index 94% rename from src/mod/java/dev/su5ed/sinytra/connector/mod/mixin/HumanoidArmorLayerMixin.java rename to src/mod/java/org/sinytra/connector/mod/mixin/HumanoidArmorLayerMixin.java index 31321dcb..b123411c 100644 --- a/src/mod/java/dev/su5ed/sinytra/connector/mod/mixin/HumanoidArmorLayerMixin.java +++ b/src/mod/java/org/sinytra/connector/mod/mixin/HumanoidArmorLayerMixin.java @@ -1,4 +1,4 @@ -package dev.su5ed.sinytra.connector.mod.mixin; +package org.sinytra.connector.mod.mixin; import net.minecraft.client.renderer.entity.layers.HumanoidArmorLayer; import net.minecraft.resources.ResourceLocation; diff --git a/src/mod/java/dev/su5ed/sinytra/connector/mod/mixin/IForgeItemMixin.java b/src/mod/java/org/sinytra/connector/mod/mixin/IForgeItemMixin.java similarity index 93% rename from src/mod/java/dev/su5ed/sinytra/connector/mod/mixin/IForgeItemMixin.java rename to src/mod/java/org/sinytra/connector/mod/mixin/IForgeItemMixin.java index d2efb3b7..fbab3245 100644 --- a/src/mod/java/dev/su5ed/sinytra/connector/mod/mixin/IForgeItemMixin.java +++ b/src/mod/java/org/sinytra/connector/mod/mixin/IForgeItemMixin.java @@ -1,4 +1,4 @@ -package dev.su5ed.sinytra.connector.mod.mixin; +package org.sinytra.connector.mod.mixin; import net.minecraft.world.entity.monster.piglin.PiglinAi; import net.minecraft.world.item.ItemStack; diff --git a/src/mod/java/dev/su5ed/sinytra/connector/mod/mixin/ItemBlockRenderTypesMixin.java b/src/mod/java/org/sinytra/connector/mod/mixin/ItemBlockRenderTypesMixin.java similarity index 87% rename from src/mod/java/dev/su5ed/sinytra/connector/mod/mixin/ItemBlockRenderTypesMixin.java rename to src/mod/java/org/sinytra/connector/mod/mixin/ItemBlockRenderTypesMixin.java index 98a44d21..62f7161b 100644 --- a/src/mod/java/dev/su5ed/sinytra/connector/mod/mixin/ItemBlockRenderTypesMixin.java +++ b/src/mod/java/org/sinytra/connector/mod/mixin/ItemBlockRenderTypesMixin.java @@ -1,6 +1,6 @@ -package dev.su5ed.sinytra.connector.mod.mixin; +package org.sinytra.connector.mod.mixin; -import dev.su5ed.sinytra.connector.mod.ConnectorMod; +import org.sinytra.connector.mod.ConnectorMod; import net.minecraft.client.renderer.ItemBlockRenderTypes; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; diff --git a/src/mod/java/dev/su5ed/sinytra/connector/mod/mixin/ItemOverridesMixin.java b/src/mod/java/org/sinytra/connector/mod/mixin/ItemOverridesMixin.java similarity index 96% rename from src/mod/java/dev/su5ed/sinytra/connector/mod/mixin/ItemOverridesMixin.java rename to src/mod/java/org/sinytra/connector/mod/mixin/ItemOverridesMixin.java index 495caafb..75bbf1a4 100644 --- a/src/mod/java/dev/su5ed/sinytra/connector/mod/mixin/ItemOverridesMixin.java +++ b/src/mod/java/org/sinytra/connector/mod/mixin/ItemOverridesMixin.java @@ -1,4 +1,4 @@ -package dev.su5ed.sinytra.connector.mod.mixin; +package org.sinytra.connector.mod.mixin; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.block.model.ItemOverrides; diff --git a/src/mod/java/dev/su5ed/sinytra/connector/mod/mixin/OptionsMixin.java b/src/mod/java/org/sinytra/connector/mod/mixin/OptionsMixin.java similarity index 96% rename from src/mod/java/dev/su5ed/sinytra/connector/mod/mixin/OptionsMixin.java rename to src/mod/java/org/sinytra/connector/mod/mixin/OptionsMixin.java index f62ff9a0..3a893aeb 100644 --- a/src/mod/java/dev/su5ed/sinytra/connector/mod/mixin/OptionsMixin.java +++ b/src/mod/java/org/sinytra/connector/mod/mixin/OptionsMixin.java @@ -1,4 +1,4 @@ -package dev.su5ed.sinytra.connector.mod.mixin; +package org.sinytra.connector.mod.mixin; import it.unimi.dsi.fastutil.ints.IntOpenHashSet; import it.unimi.dsi.fastutil.ints.IntSet; diff --git a/src/mod/java/dev/su5ed/sinytra/connector/mod/mixin/PlayerListMixin.java b/src/mod/java/org/sinytra/connector/mod/mixin/PlayerListMixin.java similarity index 95% rename from src/mod/java/dev/su5ed/sinytra/connector/mod/mixin/PlayerListMixin.java rename to src/mod/java/org/sinytra/connector/mod/mixin/PlayerListMixin.java index 889d3fa2..86e8e60c 100644 --- a/src/mod/java/dev/su5ed/sinytra/connector/mod/mixin/PlayerListMixin.java +++ b/src/mod/java/org/sinytra/connector/mod/mixin/PlayerListMixin.java @@ -1,4 +1,4 @@ -package dev.su5ed.sinytra.connector.mod.mixin; +package org.sinytra.connector.mod.mixin; import net.minecraft.server.level.ServerPlayer; import net.minecraft.server.players.PlayerList; diff --git a/src/mod/java/dev/su5ed/sinytra/connector/mod/mixin/PoiTypesMixin.java b/src/mod/java/org/sinytra/connector/mod/mixin/PoiTypesMixin.java similarity index 96% rename from src/mod/java/dev/su5ed/sinytra/connector/mod/mixin/PoiTypesMixin.java rename to src/mod/java/org/sinytra/connector/mod/mixin/PoiTypesMixin.java index 620e2f89..846d5740 100644 --- a/src/mod/java/dev/su5ed/sinytra/connector/mod/mixin/PoiTypesMixin.java +++ b/src/mod/java/org/sinytra/connector/mod/mixin/PoiTypesMixin.java @@ -1,4 +1,4 @@ -package dev.su5ed.sinytra.connector.mod.mixin; +package org.sinytra.connector.mod.mixin; import net.minecraft.core.Holder; import net.minecraft.world.entity.ai.village.poi.PoiType; diff --git a/src/mod/java/dev/su5ed/sinytra/connector/mod/mixin/TagLoaderMixin.java b/src/mod/java/org/sinytra/connector/mod/mixin/TagLoaderMixin.java similarity index 87% rename from src/mod/java/dev/su5ed/sinytra/connector/mod/mixin/TagLoaderMixin.java rename to src/mod/java/org/sinytra/connector/mod/mixin/TagLoaderMixin.java index 478e7c1f..995daea5 100644 --- a/src/mod/java/dev/su5ed/sinytra/connector/mod/mixin/TagLoaderMixin.java +++ b/src/mod/java/org/sinytra/connector/mod/mixin/TagLoaderMixin.java @@ -1,6 +1,6 @@ -package dev.su5ed.sinytra.connector.mod.mixin; +package org.sinytra.connector.mod.mixin; -import dev.su5ed.sinytra.connector.mod.compat.TagConverter; +import org.sinytra.connector.mod.compat.TagConverter; import net.minecraft.resources.ResourceLocation; import net.minecraft.server.packs.resources.ResourceManager; import net.minecraft.tags.TagLoader; diff --git a/src/mod/java/dev/su5ed/sinytra/connector/mod/mixin/boot/MinecraftMixin.java b/src/mod/java/org/sinytra/connector/mod/mixin/boot/MinecraftMixin.java similarity index 86% rename from src/mod/java/dev/su5ed/sinytra/connector/mod/mixin/boot/MinecraftMixin.java rename to src/mod/java/org/sinytra/connector/mod/mixin/boot/MinecraftMixin.java index ea435419..63b6f662 100644 --- a/src/mod/java/dev/su5ed/sinytra/connector/mod/mixin/boot/MinecraftMixin.java +++ b/src/mod/java/org/sinytra/connector/mod/mixin/boot/MinecraftMixin.java @@ -1,6 +1,6 @@ -package dev.su5ed.sinytra.connector.mod.mixin.boot; +package org.sinytra.connector.mod.mixin.boot; -import dev.su5ed.sinytra.connector.mod.ConnectorLoader; +import org.sinytra.connector.mod.ConnectorLoader; import net.minecraft.client.Minecraft; import net.minecraft.client.main.GameConfig; import org.spongepowered.asm.mixin.Mixin; diff --git a/src/mod/java/dev/su5ed/sinytra/connector/mod/mixin/boot/ServerMainMixin.java b/src/mod/java/org/sinytra/connector/mod/mixin/boot/ServerMainMixin.java similarity index 83% rename from src/mod/java/dev/su5ed/sinytra/connector/mod/mixin/boot/ServerMainMixin.java rename to src/mod/java/org/sinytra/connector/mod/mixin/boot/ServerMainMixin.java index 22c60ef0..308b158b 100644 --- a/src/mod/java/dev/su5ed/sinytra/connector/mod/mixin/boot/ServerMainMixin.java +++ b/src/mod/java/org/sinytra/connector/mod/mixin/boot/ServerMainMixin.java @@ -1,6 +1,6 @@ -package dev.su5ed.sinytra.connector.mod.mixin.boot; +package org.sinytra.connector.mod.mixin.boot; -import dev.su5ed.sinytra.connector.mod.ConnectorLoader; +import org.sinytra.connector.mod.ConnectorLoader; import net.minecraft.server.Main; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; diff --git a/src/mod/java/dev/su5ed/sinytra/connector/mod/mixin/client/KeyMappingMixin.java b/src/mod/java/org/sinytra/connector/mod/mixin/client/KeyMappingMixin.java similarity index 98% rename from src/mod/java/dev/su5ed/sinytra/connector/mod/mixin/client/KeyMappingMixin.java rename to src/mod/java/org/sinytra/connector/mod/mixin/client/KeyMappingMixin.java index e3ea1532..bc1cce7e 100644 --- a/src/mod/java/dev/su5ed/sinytra/connector/mod/mixin/client/KeyMappingMixin.java +++ b/src/mod/java/org/sinytra/connector/mod/mixin/client/KeyMappingMixin.java @@ -1,4 +1,4 @@ -package dev.su5ed.sinytra.connector.mod.mixin.client; +package org.sinytra.connector.mod.mixin.client; import com.llamalad7.mixinextras.sugar.Local; import com.mojang.blaze3d.platform.InputConstants; diff --git a/src/mod/java/dev/su5ed/sinytra/connector/mod/mixin/fieldtypes/BlockColorsMixin.java b/src/mod/java/org/sinytra/connector/mod/mixin/fieldtypes/BlockColorsMixin.java similarity index 90% rename from src/mod/java/dev/su5ed/sinytra/connector/mod/mixin/fieldtypes/BlockColorsMixin.java rename to src/mod/java/org/sinytra/connector/mod/mixin/fieldtypes/BlockColorsMixin.java index 4320fea1..90fa9b79 100644 --- a/src/mod/java/dev/su5ed/sinytra/connector/mod/mixin/fieldtypes/BlockColorsMixin.java +++ b/src/mod/java/org/sinytra/connector/mod/mixin/fieldtypes/BlockColorsMixin.java @@ -1,6 +1,6 @@ -package dev.su5ed.sinytra.connector.mod.mixin.fieldtypes; +package org.sinytra.connector.mod.mixin.fieldtypes; -import dev.su5ed.sinytra.connector.mod.compat.fieldtypes.FieldTypeUtil; +import org.sinytra.connector.mod.compat.fieldtypes.FieldTypeUtil; import net.minecraft.client.color.block.BlockColor; import net.minecraft.client.color.block.BlockColors; import net.minecraft.core.Holder; diff --git a/src/mod/java/dev/su5ed/sinytra/connector/mod/mixin/fieldtypes/ItemColorsMixin.java b/src/mod/java/org/sinytra/connector/mod/mixin/fieldtypes/ItemColorsMixin.java similarity index 90% rename from src/mod/java/dev/su5ed/sinytra/connector/mod/mixin/fieldtypes/ItemColorsMixin.java rename to src/mod/java/org/sinytra/connector/mod/mixin/fieldtypes/ItemColorsMixin.java index b9814670..e0ece8b0 100644 --- a/src/mod/java/dev/su5ed/sinytra/connector/mod/mixin/fieldtypes/ItemColorsMixin.java +++ b/src/mod/java/org/sinytra/connector/mod/mixin/fieldtypes/ItemColorsMixin.java @@ -1,6 +1,6 @@ -package dev.su5ed.sinytra.connector.mod.mixin.fieldtypes; +package org.sinytra.connector.mod.mixin.fieldtypes; -import dev.su5ed.sinytra.connector.mod.compat.fieldtypes.FieldTypeUtil; +import org.sinytra.connector.mod.compat.fieldtypes.FieldTypeUtil; import net.minecraft.client.color.item.ItemColor; import net.minecraft.client.color.item.ItemColors; import net.minecraft.core.Holder; diff --git a/src/mod/java/dev/su5ed/sinytra/connector/mod/mixin/fieldtypes/ParticleEngineMixin.java b/src/mod/java/org/sinytra/connector/mod/mixin/fieldtypes/ParticleEngineMixin.java similarity index 89% rename from src/mod/java/dev/su5ed/sinytra/connector/mod/mixin/fieldtypes/ParticleEngineMixin.java rename to src/mod/java/org/sinytra/connector/mod/mixin/fieldtypes/ParticleEngineMixin.java index 1a4ba737..0cf5959b 100644 --- a/src/mod/java/dev/su5ed/sinytra/connector/mod/mixin/fieldtypes/ParticleEngineMixin.java +++ b/src/mod/java/org/sinytra/connector/mod/mixin/fieldtypes/ParticleEngineMixin.java @@ -1,6 +1,6 @@ -package dev.su5ed.sinytra.connector.mod.mixin.fieldtypes; +package org.sinytra.connector.mod.mixin.fieldtypes; -import dev.su5ed.sinytra.connector.mod.compat.fieldtypes.RedirectingInt2ObjectMap; +import org.sinytra.connector.mod.compat.fieldtypes.RedirectingInt2ObjectMap; import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import net.minecraft.client.particle.ParticleEngine; import net.minecraft.client.particle.ParticleProvider; diff --git a/src/mod/java/dev/su5ed/sinytra/connector/mod/mixin/hud/ForgeGuiMixin.java b/src/mod/java/org/sinytra/connector/mod/mixin/hud/ForgeGuiMixin.java similarity index 94% rename from src/mod/java/dev/su5ed/sinytra/connector/mod/mixin/hud/ForgeGuiMixin.java rename to src/mod/java/org/sinytra/connector/mod/mixin/hud/ForgeGuiMixin.java index bf602891..ba031d27 100644 --- a/src/mod/java/dev/su5ed/sinytra/connector/mod/mixin/hud/ForgeGuiMixin.java +++ b/src/mod/java/org/sinytra/connector/mod/mixin/hud/ForgeGuiMixin.java @@ -1,6 +1,6 @@ -package dev.su5ed.sinytra.connector.mod.mixin.hud; +package org.sinytra.connector.mod.mixin.hud; -import dev.su5ed.sinytra.connector.mod.compat.hud.GuiExtensions; +import org.sinytra.connector.mod.compat.hud.GuiExtensions; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiGraphics; import net.minecraftforge.client.gui.overlay.ForgeGui; diff --git a/src/mod/java/dev/su5ed/sinytra/connector/mod/mixin/hud/GuiMixin.java b/src/mod/java/org/sinytra/connector/mod/mixin/hud/GuiMixin.java similarity index 95% rename from src/mod/java/dev/su5ed/sinytra/connector/mod/mixin/hud/GuiMixin.java rename to src/mod/java/org/sinytra/connector/mod/mixin/hud/GuiMixin.java index 4092f4b2..49171938 100644 --- a/src/mod/java/dev/su5ed/sinytra/connector/mod/mixin/hud/GuiMixin.java +++ b/src/mod/java/org/sinytra/connector/mod/mixin/hud/GuiMixin.java @@ -1,6 +1,6 @@ -package dev.su5ed.sinytra.connector.mod.mixin.hud; +package org.sinytra.connector.mod.mixin.hud; -import dev.su5ed.sinytra.connector.mod.compat.hud.GuiExtensions; +import org.sinytra.connector.mod.compat.hud.GuiExtensions; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Gui; import net.minecraft.client.gui.GuiGraphics; diff --git a/src/mod/java/dev/su5ed/sinytra/connector/mod/mixin/item/ForgeHooksMixin.java b/src/mod/java/org/sinytra/connector/mod/mixin/item/ForgeHooksMixin.java similarity index 89% rename from src/mod/java/dev/su5ed/sinytra/connector/mod/mixin/item/ForgeHooksMixin.java rename to src/mod/java/org/sinytra/connector/mod/mixin/item/ForgeHooksMixin.java index ce30a344..da4ec5f1 100644 --- a/src/mod/java/dev/su5ed/sinytra/connector/mod/mixin/item/ForgeHooksMixin.java +++ b/src/mod/java/org/sinytra/connector/mod/mixin/item/ForgeHooksMixin.java @@ -1,6 +1,6 @@ -package dev.su5ed.sinytra.connector.mod.mixin.item; +package org.sinytra.connector.mod.mixin.item; -import dev.su5ed.sinytra.connector.mod.compat.ItemStackExtensions; +import org.sinytra.connector.mod.compat.ItemStackExtensions; import net.minecraft.world.InteractionResult; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.context.UseOnContext; diff --git a/src/mod/java/dev/su5ed/sinytra/connector/mod/mixin/item/ItemStackMixin.java b/src/mod/java/org/sinytra/connector/mod/mixin/item/ItemStackMixin.java similarity index 92% rename from src/mod/java/dev/su5ed/sinytra/connector/mod/mixin/item/ItemStackMixin.java rename to src/mod/java/org/sinytra/connector/mod/mixin/item/ItemStackMixin.java index bad46b61..14b10e3f 100644 --- a/src/mod/java/dev/su5ed/sinytra/connector/mod/mixin/item/ItemStackMixin.java +++ b/src/mod/java/org/sinytra/connector/mod/mixin/item/ItemStackMixin.java @@ -1,6 +1,6 @@ -package dev.su5ed.sinytra.connector.mod.mixin.item; +package org.sinytra.connector.mod.mixin.item; -import dev.su5ed.sinytra.connector.mod.compat.ItemStackExtensions; +import org.sinytra.connector.mod.compat.ItemStackExtensions; import net.minecraft.core.BlockPos; import net.minecraft.world.InteractionResult; import net.minecraft.world.entity.player.Player; diff --git a/src/mod/java/dev/su5ed/sinytra/connector/mod/mixin/item/LateItemStackMixin.java b/src/mod/java/org/sinytra/connector/mod/mixin/item/LateItemStackMixin.java similarity index 82% rename from src/mod/java/dev/su5ed/sinytra/connector/mod/mixin/item/LateItemStackMixin.java rename to src/mod/java/org/sinytra/connector/mod/mixin/item/LateItemStackMixin.java index e5f9023d..a73eae0c 100644 --- a/src/mod/java/dev/su5ed/sinytra/connector/mod/mixin/item/LateItemStackMixin.java +++ b/src/mod/java/org/sinytra/connector/mod/mixin/item/LateItemStackMixin.java @@ -1,4 +1,4 @@ -package dev.su5ed.sinytra.connector.mod.mixin.item; +package org.sinytra.connector.mod.mixin.item; import net.minecraft.world.item.ItemStack; import org.spongepowered.asm.mixin.Mixin; diff --git a/src/mod/java/dev/su5ed/sinytra/connector/mod/mixin/lang/PathPackResourcesAnonMixin.java b/src/mod/java/org/sinytra/connector/mod/mixin/lang/PathPackResourcesAnonMixin.java similarity index 85% rename from src/mod/java/dev/su5ed/sinytra/connector/mod/mixin/lang/PathPackResourcesAnonMixin.java rename to src/mod/java/org/sinytra/connector/mod/mixin/lang/PathPackResourcesAnonMixin.java index 572fc8aa..fbfb4940 100644 --- a/src/mod/java/dev/su5ed/sinytra/connector/mod/mixin/lang/PathPackResourcesAnonMixin.java +++ b/src/mod/java/org/sinytra/connector/mod/mixin/lang/PathPackResourcesAnonMixin.java @@ -1,7 +1,7 @@ -package dev.su5ed.sinytra.connector.mod.mixin.lang; +package org.sinytra.connector.mod.mixin.lang; -import dev.su5ed.sinytra.connector.loader.ConnectorEarlyLoader; -import dev.su5ed.sinytra.connector.mod.compat.PathPackResourcesExtensions; +import org.sinytra.connector.loader.ConnectorEarlyLoader; +import org.sinytra.connector.mod.compat.PathPackResourcesExtensions; import net.minecraftforge.forgespi.language.IModFileInfo; import net.minecraftforge.forgespi.language.IModInfo; import org.spongepowered.asm.mixin.Mixin; diff --git a/src/mod/java/dev/su5ed/sinytra/connector/mod/mixin/lang/PathPackResourcesMixin.java b/src/mod/java/org/sinytra/connector/mod/mixin/lang/PathPackResourcesMixin.java similarity index 91% rename from src/mod/java/dev/su5ed/sinytra/connector/mod/mixin/lang/PathPackResourcesMixin.java rename to src/mod/java/org/sinytra/connector/mod/mixin/lang/PathPackResourcesMixin.java index 5043e45a..626f1d6d 100644 --- a/src/mod/java/dev/su5ed/sinytra/connector/mod/mixin/lang/PathPackResourcesMixin.java +++ b/src/mod/java/org/sinytra/connector/mod/mixin/lang/PathPackResourcesMixin.java @@ -1,6 +1,6 @@ -package dev.su5ed.sinytra.connector.mod.mixin.lang; +package org.sinytra.connector.mod.mixin.lang; -import dev.su5ed.sinytra.connector.mod.compat.PathPackResourcesExtensions; +import org.sinytra.connector.mod.compat.PathPackResourcesExtensions; import net.minecraft.resources.ResourceLocation; import net.minecraft.server.packs.PackResources; import net.minecraft.server.packs.PackType; diff --git a/src/mod/java/dev/su5ed/sinytra/connector/mod/mixin/network/ConnectionTypeMixin.java b/src/mod/java/org/sinytra/connector/mod/mixin/network/ConnectionTypeMixin.java similarity index 92% rename from src/mod/java/dev/su5ed/sinytra/connector/mod/mixin/network/ConnectionTypeMixin.java rename to src/mod/java/org/sinytra/connector/mod/mixin/network/ConnectionTypeMixin.java index 0c0fb8b8..6e2260d4 100644 --- a/src/mod/java/dev/su5ed/sinytra/connector/mod/mixin/network/ConnectionTypeMixin.java +++ b/src/mod/java/org/sinytra/connector/mod/mixin/network/ConnectionTypeMixin.java @@ -1,4 +1,4 @@ -package dev.su5ed.sinytra.connector.mod.mixin.network; +package org.sinytra.connector.mod.mixin.network; import net.minecraftforge.network.ConnectionType; import org.spongepowered.asm.mixin.Mixin; diff --git a/src/mod/java/dev/su5ed/sinytra/connector/mod/mixin/network/HandshakeHandlerMixin.java b/src/mod/java/org/sinytra/connector/mod/mixin/network/HandshakeHandlerMixin.java similarity index 96% rename from src/mod/java/dev/su5ed/sinytra/connector/mod/mixin/network/HandshakeHandlerMixin.java rename to src/mod/java/org/sinytra/connector/mod/mixin/network/HandshakeHandlerMixin.java index 9cd1d834..734c48f5 100644 --- a/src/mod/java/dev/su5ed/sinytra/connector/mod/mixin/network/HandshakeHandlerMixin.java +++ b/src/mod/java/org/sinytra/connector/mod/mixin/network/HandshakeHandlerMixin.java @@ -1,4 +1,4 @@ -package dev.su5ed.sinytra.connector.mod.mixin.network; +package org.sinytra.connector.mod.mixin.network; import net.minecraft.network.Connection; import net.minecraftforge.network.HandshakeHandler; diff --git a/src/mod/java/dev/su5ed/sinytra/connector/mod/mixin/network/NetworkFiltersMixin.java b/src/mod/java/org/sinytra/connector/mod/mixin/network/NetworkFiltersMixin.java similarity index 94% rename from src/mod/java/dev/su5ed/sinytra/connector/mod/mixin/network/NetworkFiltersMixin.java rename to src/mod/java/org/sinytra/connector/mod/mixin/network/NetworkFiltersMixin.java index c109e1e7..1afbf6de 100644 --- a/src/mod/java/dev/su5ed/sinytra/connector/mod/mixin/network/NetworkFiltersMixin.java +++ b/src/mod/java/org/sinytra/connector/mod/mixin/network/NetworkFiltersMixin.java @@ -1,4 +1,4 @@ -package dev.su5ed.sinytra.connector.mod.mixin.network; +package org.sinytra.connector.mod.mixin.network; import io.netty.channel.ChannelPipeline; import net.minecraft.network.Connection; diff --git a/src/mod/java/dev/su5ed/sinytra/connector/mod/mixin/recipebook/RecipeBookCategoriesAccessor.java b/src/mod/java/org/sinytra/connector/mod/mixin/recipebook/RecipeBookCategoriesAccessor.java similarity index 90% rename from src/mod/java/dev/su5ed/sinytra/connector/mod/mixin/recipebook/RecipeBookCategoriesAccessor.java rename to src/mod/java/org/sinytra/connector/mod/mixin/recipebook/RecipeBookCategoriesAccessor.java index cada3f50..a284986f 100644 --- a/src/mod/java/dev/su5ed/sinytra/connector/mod/mixin/recipebook/RecipeBookCategoriesAccessor.java +++ b/src/mod/java/org/sinytra/connector/mod/mixin/recipebook/RecipeBookCategoriesAccessor.java @@ -1,4 +1,4 @@ -package dev.su5ed.sinytra.connector.mod.mixin.recipebook; +package org.sinytra.connector.mod.mixin.recipebook; import net.minecraft.client.RecipeBookCategories; import org.spongepowered.asm.mixin.Mixin; diff --git a/src/mod/java/dev/su5ed/sinytra/connector/mod/mixin/recipebook/RecipeBookCategoriesMixin.java b/src/mod/java/org/sinytra/connector/mod/mixin/recipebook/RecipeBookCategoriesMixin.java similarity index 95% rename from src/mod/java/dev/su5ed/sinytra/connector/mod/mixin/recipebook/RecipeBookCategoriesMixin.java rename to src/mod/java/org/sinytra/connector/mod/mixin/recipebook/RecipeBookCategoriesMixin.java index d360159d..a21946e8 100644 --- a/src/mod/java/dev/su5ed/sinytra/connector/mod/mixin/recipebook/RecipeBookCategoriesMixin.java +++ b/src/mod/java/org/sinytra/connector/mod/mixin/recipebook/RecipeBookCategoriesMixin.java @@ -1,4 +1,4 @@ -package dev.su5ed.sinytra.connector.mod.mixin.recipebook; +package org.sinytra.connector.mod.mixin.recipebook; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; diff --git a/src/mod/java/dev/su5ed/sinytra/connector/mod/mixin/recipebook/RecipeBookManagerMixin.java b/src/mod/java/org/sinytra/connector/mod/mixin/recipebook/RecipeBookManagerMixin.java similarity index 96% rename from src/mod/java/dev/su5ed/sinytra/connector/mod/mixin/recipebook/RecipeBookManagerMixin.java rename to src/mod/java/org/sinytra/connector/mod/mixin/recipebook/RecipeBookManagerMixin.java index 54d12127..ca7ff821 100644 --- a/src/mod/java/dev/su5ed/sinytra/connector/mod/mixin/recipebook/RecipeBookManagerMixin.java +++ b/src/mod/java/org/sinytra/connector/mod/mixin/recipebook/RecipeBookManagerMixin.java @@ -1,4 +1,4 @@ -package dev.su5ed.sinytra.connector.mod.mixin.recipebook; +package org.sinytra.connector.mod.mixin.recipebook; import net.minecraft.client.RecipeBookCategories; import net.minecraftforge.client.RecipeBookManager; @@ -32,4 +32,4 @@ private static void init(CallbackInfo ci) { bookCategories.addAll(mutableCategories); }); } -} \ No newline at end of file +} diff --git a/src/mod/java/dev/su5ed/sinytra/connector/mod/mixin/registries/BootstrapMixin.java b/src/mod/java/org/sinytra/connector/mod/mixin/registries/BootstrapMixin.java similarity index 95% rename from src/mod/java/dev/su5ed/sinytra/connector/mod/mixin/registries/BootstrapMixin.java rename to src/mod/java/org/sinytra/connector/mod/mixin/registries/BootstrapMixin.java index 06332fa3..067231b6 100644 --- a/src/mod/java/dev/su5ed/sinytra/connector/mod/mixin/registries/BootstrapMixin.java +++ b/src/mod/java/org/sinytra/connector/mod/mixin/registries/BootstrapMixin.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package dev.su5ed.sinytra.connector.mod.mixin.registries; +package org.sinytra.connector.mod.mixin.registries; import net.minecraft.server.Bootstrap; import org.spongepowered.asm.mixin.Mixin; diff --git a/src/mod/java/dev/su5ed/sinytra/connector/mod/mixin/registries/BuiltInRegistriesMixin.java b/src/mod/java/org/sinytra/connector/mod/mixin/registries/BuiltInRegistriesMixin.java similarity index 90% rename from src/mod/java/dev/su5ed/sinytra/connector/mod/mixin/registries/BuiltInRegistriesMixin.java rename to src/mod/java/org/sinytra/connector/mod/mixin/registries/BuiltInRegistriesMixin.java index ad3d5dca..6dcc5d98 100644 --- a/src/mod/java/dev/su5ed/sinytra/connector/mod/mixin/registries/BuiltInRegistriesMixin.java +++ b/src/mod/java/org/sinytra/connector/mod/mixin/registries/BuiltInRegistriesMixin.java @@ -1,4 +1,4 @@ -package dev.su5ed.sinytra.connector.mod.mixin.registries; +package org.sinytra.connector.mod.mixin.registries; import net.minecraft.core.Registry; import net.minecraft.core.registries.BuiltInRegistries; diff --git a/src/mod/java/dev/su5ed/sinytra/connector/mod/mixin/registries/ClientForgeRegistryMixin.java b/src/mod/java/org/sinytra/connector/mod/mixin/registries/ClientForgeRegistryMixin.java similarity index 87% rename from src/mod/java/dev/su5ed/sinytra/connector/mod/mixin/registries/ClientForgeRegistryMixin.java rename to src/mod/java/org/sinytra/connector/mod/mixin/registries/ClientForgeRegistryMixin.java index f5b4d0a2..91e67498 100644 --- a/src/mod/java/dev/su5ed/sinytra/connector/mod/mixin/registries/ClientForgeRegistryMixin.java +++ b/src/mod/java/org/sinytra/connector/mod/mixin/registries/ClientForgeRegistryMixin.java @@ -1,6 +1,6 @@ -package dev.su5ed.sinytra.connector.mod.mixin.registries; +package org.sinytra.connector.mod.mixin.registries; -import dev.su5ed.sinytra.connector.mod.compat.RegistryUtil; +import org.sinytra.connector.mod.compat.RegistryUtil; import net.minecraft.resources.ResourceLocation; import net.minecraftforge.registries.ForgeRegistry; import net.minecraftforge.registries.IForgeRegistry; diff --git a/src/mod/java/dev/su5ed/sinytra/connector/mod/mixin/registries/ForgeRegistryMixin.java b/src/mod/java/org/sinytra/connector/mod/mixin/registries/ForgeRegistryMixin.java similarity index 95% rename from src/mod/java/dev/su5ed/sinytra/connector/mod/mixin/registries/ForgeRegistryMixin.java rename to src/mod/java/org/sinytra/connector/mod/mixin/registries/ForgeRegistryMixin.java index d0f50918..bdcb2355 100644 --- a/src/mod/java/dev/su5ed/sinytra/connector/mod/mixin/registries/ForgeRegistryMixin.java +++ b/src/mod/java/org/sinytra/connector/mod/mixin/registries/ForgeRegistryMixin.java @@ -1,8 +1,8 @@ -package dev.su5ed.sinytra.connector.mod.mixin.registries; +package org.sinytra.connector.mod.mixin.registries; import com.google.common.collect.BiMap; import com.mojang.serialization.Lifecycle; -import dev.su5ed.sinytra.connector.mod.ConnectorLoader; +import org.sinytra.connector.mod.ConnectorLoader; import net.minecraft.core.Holder; import net.minecraft.core.MappedRegistry; import net.minecraftforge.registries.ForgeRegistry; diff --git a/src/mod/java/dev/su5ed/sinytra/connector/mod/mixin/registries/MappedRegistryMixin.java b/src/mod/java/org/sinytra/connector/mod/mixin/registries/MappedRegistryMixin.java similarity index 84% rename from src/mod/java/dev/su5ed/sinytra/connector/mod/mixin/registries/MappedRegistryMixin.java rename to src/mod/java/org/sinytra/connector/mod/mixin/registries/MappedRegistryMixin.java index edb50683..55af478d 100644 --- a/src/mod/java/dev/su5ed/sinytra/connector/mod/mixin/registries/MappedRegistryMixin.java +++ b/src/mod/java/org/sinytra/connector/mod/mixin/registries/MappedRegistryMixin.java @@ -1,6 +1,6 @@ -package dev.su5ed.sinytra.connector.mod.mixin.registries; +package org.sinytra.connector.mod.mixin.registries; -import dev.su5ed.sinytra.connector.mod.ConnectorMod; +import org.sinytra.connector.mod.ConnectorMod; import net.minecraft.core.MappedRegistry; import net.minecraft.core.Registry; import org.spongepowered.asm.mixin.Mixin; diff --git a/src/mod/java/dev/su5ed/sinytra/connector/mod/mixin/registries/MinecraftMixin.java b/src/mod/java/org/sinytra/connector/mod/mixin/registries/MinecraftMixin.java similarity index 89% rename from src/mod/java/dev/su5ed/sinytra/connector/mod/mixin/registries/MinecraftMixin.java rename to src/mod/java/org/sinytra/connector/mod/mixin/registries/MinecraftMixin.java index 42bbb575..2f3270cd 100644 --- a/src/mod/java/dev/su5ed/sinytra/connector/mod/mixin/registries/MinecraftMixin.java +++ b/src/mod/java/org/sinytra/connector/mod/mixin/registries/MinecraftMixin.java @@ -1,6 +1,6 @@ -package dev.su5ed.sinytra.connector.mod.mixin.registries; +package org.sinytra.connector.mod.mixin.registries; -import dev.su5ed.sinytra.connector.mod.ConnectorMod; +import org.sinytra.connector.mod.ConnectorMod; import net.minecraft.client.Minecraft; import net.minecraftforge.registries.GameData; import org.slf4j.Logger; diff --git a/src/mod/java/dev/su5ed/sinytra/connector/mod/mixin/registries/MinecraftServerMixin.java b/src/mod/java/org/sinytra/connector/mod/mixin/registries/MinecraftServerMixin.java similarity index 90% rename from src/mod/java/dev/su5ed/sinytra/connector/mod/mixin/registries/MinecraftServerMixin.java rename to src/mod/java/org/sinytra/connector/mod/mixin/registries/MinecraftServerMixin.java index c1331c4e..aa3ca026 100644 --- a/src/mod/java/dev/su5ed/sinytra/connector/mod/mixin/registries/MinecraftServerMixin.java +++ b/src/mod/java/org/sinytra/connector/mod/mixin/registries/MinecraftServerMixin.java @@ -1,6 +1,6 @@ -package dev.su5ed.sinytra.connector.mod.mixin.registries; +package org.sinytra.connector.mod.mixin.registries; -import dev.su5ed.sinytra.connector.mod.ConnectorMod; +import org.sinytra.connector.mod.ConnectorMod; import net.minecraft.server.MinecraftServer; import net.minecraftforge.registries.GameData; import org.slf4j.Logger; diff --git a/src/mod/java/dev/su5ed/sinytra/connector/mod/mixin/registries/NamespacedWrapperMixin.java b/src/mod/java/org/sinytra/connector/mod/mixin/registries/NamespacedWrapperMixin.java similarity index 91% rename from src/mod/java/dev/su5ed/sinytra/connector/mod/mixin/registries/NamespacedWrapperMixin.java rename to src/mod/java/org/sinytra/connector/mod/mixin/registries/NamespacedWrapperMixin.java index c8868035..008f12a3 100644 --- a/src/mod/java/dev/su5ed/sinytra/connector/mod/mixin/registries/NamespacedWrapperMixin.java +++ b/src/mod/java/org/sinytra/connector/mod/mixin/registries/NamespacedWrapperMixin.java @@ -1,4 +1,4 @@ -package dev.su5ed.sinytra.connector.mod.mixin.registries; +package org.sinytra.connector.mod.mixin.registries; import net.minecraftforge.registries.ILockableRegistry; import org.spongepowered.asm.mixin.Mixin; diff --git a/src/mod/java/dev/su5ed/sinytra/connector/mod/mixin/registries/RegistryDataLoaderMixin.java b/src/mod/java/org/sinytra/connector/mod/mixin/registries/RegistryDataLoaderMixin.java similarity index 96% rename from src/mod/java/dev/su5ed/sinytra/connector/mod/mixin/registries/RegistryDataLoaderMixin.java rename to src/mod/java/org/sinytra/connector/mod/mixin/registries/RegistryDataLoaderMixin.java index 4f44316d..786cdbaf 100644 --- a/src/mod/java/dev/su5ed/sinytra/connector/mod/mixin/registries/RegistryDataLoaderMixin.java +++ b/src/mod/java/org/sinytra/connector/mod/mixin/registries/RegistryDataLoaderMixin.java @@ -1,7 +1,7 @@ -package dev.su5ed.sinytra.connector.mod.mixin.registries; +package org.sinytra.connector.mod.mixin.registries; -import dev.su5ed.sinytra.connector.loader.ConnectorEarlyLoader; -import dev.su5ed.sinytra.connector.mod.compat.RegistryUtil; +import org.sinytra.connector.loader.ConnectorEarlyLoader; +import org.sinytra.connector.mod.compat.RegistryUtil; import net.minecraft.core.Registry; import net.minecraft.resources.FileToIdConverter; import net.minecraft.resources.RegistryDataLoader; diff --git a/src/mod/resources/META-INF/asm/injectFabricASM.js b/src/mod/resources/META-INF/asm/injectFabricASM.js index cc18c5c6..70698b0b 100644 --- a/src/mod/resources/META-INF/asm/injectFabricASM.js +++ b/src/mod/resources/META-INF/asm/injectFabricASM.js @@ -21,7 +21,7 @@ function initializeCoreMod() { }, 'transformer': function (node) { var insns = new InsnList(); - insns.add(new MethodInsnNode(Opcodes.INVOKESTATIC, 'dev/su5ed/sinytra/connector/service/FabricASMFixer', 'fishAddURL', '()Ljava/util/function/Consumer;')); + insns.add(new MethodInsnNode(Opcodes.INVOKESTATIC, 'org/sinytra/connector/service/FabricASMFixer', 'fishAddURL', '()Ljava/util/function/Consumer;')); insns.add(new InsnNode(Opcodes.ARETURN)); node.instructions.insert(insns); ASMAPI.log('DEBUG', 'Injected fishAddURL hook into FabricASM plugin'); @@ -38,7 +38,7 @@ function initializeCoreMod() { 'transformer': function (node) { var insns = new InsnList(); insns.add(new VarInsnNode(Opcodes.ALOAD, 1)); - insns.add(new MethodInsnNode(Opcodes.INVOKESTATIC, 'dev/su5ed/sinytra/connector/service/FabricASMFixer', 'flattenMixinClass', '(Ljava/lang/String;)Ljava/lang/String;')); + insns.add(new MethodInsnNode(Opcodes.INVOKESTATIC, 'org/sinytra/connector/service/FabricASMFixer', 'flattenMixinClass', '(Ljava/lang/String;)Ljava/lang/String;')); insns.add(new VarInsnNode(Opcodes.ASTORE, 1)); node.instructions.insert(insns); ASMAPI.log('DEBUG', 'Injected flattenMixinClass modifier into FabricASM Plugin$1'); @@ -56,7 +56,7 @@ function initializeCoreMod() { var insns = new InsnList(); insns.add(new VarInsnNode(Opcodes.ALOAD, 0)); insns.add(new VarInsnNode(Opcodes.ALOAD, 2)); - insns.add(new MethodInsnNode(Opcodes.INVOKESTATIC, 'dev/su5ed/sinytra/connector/service/FabricASMFixer', 'permitEnumSubclass', '(Lorg/objectweb/asm/tree/ClassNode;Ljava/lang/String;)V')); + insns.add(new MethodInsnNode(Opcodes.INVOKESTATIC, 'org/sinytra/connector/service/FabricASMFixer', 'permitEnumSubclass', '(Lorg/objectweb/asm/tree/ClassNode;Ljava/lang/String;)V')); node.instructions.insert(insns); ASMAPI.log('DEBUG', 'Injected permitEnumSubclass modifier into FabricASM EnumSubclasser'); return node; @@ -70,4 +70,4 @@ function initializeCoreMod() { } return transformers; -} \ No newline at end of file +} diff --git a/src/mod/resources/connectormod.mixins.json b/src/mod/resources/connectormod.mixins.json index 4e39c8bd..3bdb554e 100644 --- a/src/mod/resources/connectormod.mixins.json +++ b/src/mod/resources/connectormod.mixins.json @@ -2,9 +2,9 @@ "required": true, "minVersion": "0.8.4", "refmap": "mixins.connectormod.refmap.json", - "package": "dev.su5ed.sinytra.connector.mod.mixin", + "package": "org.sinytra.connector.mod.mixin", "compatibilityLevel": "JAVA_17", - "plugin": "dev.su5ed.sinytra.connector.mod.ConnectorBootstrap", + "plugin": "org.sinytra.connector.mod.ConnectorBootstrap", "mixins": [ "CrashReportExtenderMixin", "ForgeHooksMixin",