Skip to content

Commit

Permalink
Go to org.sinytra
Browse files Browse the repository at this point in the history
  • Loading branch information
Matyrobbrt committed May 2, 2024
1 parent 2f36163 commit 2430452
Show file tree
Hide file tree
Showing 106 changed files with 235 additions and 239 deletions.
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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;

Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* You should have received a copy of the GNU Lesser General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package dev.su5ed.sinytra.connector.locator;
package org.sinytra.connector.locator;

import java.util.Set;
import java.util.function.BiPredicate;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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;
Expand All @@ -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";
Expand Down Expand Up @@ -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);
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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();
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package dev.su5ed.sinytra.connector.transformer;
package org.sinytra.connector.transformer;

import net.minecraftforge.fart.api.Transformer;

Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -676,7 +676,7 @@ public static List<Patch> 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()
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -44,7 +44,7 @@ public Collection<? extends Entry> 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));

Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down

0 comments on commit 2430452

Please sign in to comment.