From 67af75f37ad0313c0e94671e109bb483e73fe58c Mon Sep 17 00:00:00 2001 From: OmerBenGera Date: Sat, 13 Aug 2022 13:37:28 +0300 Subject: [PATCH] [CI SKIP] Changed remaps checker to be an external dependency rather than classes in code --- build.gradle | 2 + .../wildloaders/WildLoadersPlugin.java | 2 +- .../nms/mapping/MappingParser.java | 55 -------- .../wildloaders/nms/mapping/Remap.java | 30 ----- .../wildloaders/nms/mapping/RemapFailure.java | 9 -- .../wildloaders/nms/mapping/Remapped.java | 32 ----- .../wildloaders/nms/mapping/Remaps.java | 14 -- .../wildloaders/nms/mapping/TestRemaps.java | 127 ------------------ .../nms/v1_18_R1/ChunkLoaderNPC.java | 2 +- .../nms/v1_18_R1/EntityHolograms.java | 2 +- .../wildloaders/nms/v1_18_R1/NMSAdapter.java | 2 +- .../loader/TileEntityChunkLoader.java | 2 +- .../loader/TileEntityChunkLoaderTicker.java | 2 +- .../net/minecraft/core/BlockPosition.java | 2 +- .../net/minecraft/nbt/NBTTagCompound.java | 2 +- .../net/minecraft/world/entity/Entity.java | 2 +- .../net/minecraft/world/item/ItemStack.java | 2 +- .../world/level/ChunkCoordIntPair.java | 2 +- .../net/minecraft/world/level/World.java | 2 +- .../world/level/block/entity/TileEntity.java | 2 +- .../world/level/block/state/IBlockData.java | 2 +- .../minecraft/world/level/chunk/Chunk.java | 2 +- .../nms/v1_18_R2/ChunkLoaderNPC.java | 2 +- .../nms/v1_18_R2/EntityHolograms.java | 2 +- .../wildloaders/nms/v1_18_R2/NMSAdapter.java | 2 +- .../loader/TileEntityChunkLoader.java | 2 +- .../loader/TileEntityChunkLoaderTicker.java | 2 +- .../net/minecraft/core/BlockPosition.java | 2 +- .../net/minecraft/nbt/NBTTagCompound.java | 2 +- .../net/minecraft/world/entity/Entity.java | 2 +- .../net/minecraft/world/item/ItemStack.java | 2 +- .../world/level/ChunkCoordIntPair.java | 2 +- .../net/minecraft/world/level/World.java | 2 +- .../world/level/block/entity/TileEntity.java | 2 +- .../world/level/block/state/IBlockData.java | 2 +- .../minecraft/world/level/chunk/Chunk.java | 2 +- .../nms/v1_19_R1/ChunkLoaderNPC.java | 2 +- .../nms/v1_19_R1/EntityHolograms.java | 2 +- .../wildloaders/nms/v1_19_R1/NMSAdapter.java | 2 +- .../loader/TileEntityChunkLoader.java | 2 +- .../loader/TileEntityChunkLoaderTicker.java | 2 +- .../net/minecraft/core/BlockPosition.java | 2 +- .../net/minecraft/nbt/NBTTagCompound.java | 2 +- .../net/minecraft/world/entity/Entity.java | 2 +- .../net/minecraft/world/item/ItemStack.java | 2 +- .../world/level/ChunkCoordIntPair.java | 2 +- .../net/minecraft/world/level/World.java | 2 +- .../world/level/block/entity/TileEntity.java | 2 +- .../world/level/block/state/IBlockData.java | 2 +- .../minecraft/world/level/chunk/Chunk.java | 2 +- 50 files changed, 45 insertions(+), 310 deletions(-) delete mode 100644 src/main/java/com/bgsoftware/wildloaders/nms/mapping/MappingParser.java delete mode 100644 src/main/java/com/bgsoftware/wildloaders/nms/mapping/Remap.java delete mode 100644 src/main/java/com/bgsoftware/wildloaders/nms/mapping/RemapFailure.java delete mode 100644 src/main/java/com/bgsoftware/wildloaders/nms/mapping/Remapped.java delete mode 100644 src/main/java/com/bgsoftware/wildloaders/nms/mapping/Remaps.java delete mode 100644 src/main/java/com/bgsoftware/wildloaders/nms/mapping/TestRemaps.java diff --git a/build.gradle b/build.gradle index c154d69..f6ae4a8 100644 --- a/build.gradle +++ b/build.gradle @@ -35,6 +35,7 @@ allprojects { dependencies { compileOnly "com.bgsoftware.common.reflection:ReflectionUtils:latest" + compileOnly "com.bgsoftware.common.remaps:RemapsChecker:1.0.0" } task checkDebug() { @@ -66,6 +67,7 @@ dependencies { implementation 'com.bgsoftware.common.reflection:ReflectionUtils:latest' implementation 'com.bgsoftware.common.config:CommentedConfiguration:1.0.3' implementation 'com.bgsoftware.common.mappings:MappingsChecker:1.0.0' + implementation 'com.bgsoftware.common.remaps:RemapsChecker:1.0.0' // Spigot jars compileOnly "org.spigotmc:v1_8_R3:latest" diff --git a/src/main/java/com/bgsoftware/wildloaders/WildLoadersPlugin.java b/src/main/java/com/bgsoftware/wildloaders/WildLoadersPlugin.java index 3a67cd4..1e600c3 100644 --- a/src/main/java/com/bgsoftware/wildloaders/WildLoadersPlugin.java +++ b/src/main/java/com/bgsoftware/wildloaders/WildLoadersPlugin.java @@ -14,7 +14,7 @@ import com.bgsoftware.wildloaders.listeners.ChunksListener; import com.bgsoftware.wildloaders.listeners.PlayersListener; import com.bgsoftware.wildloaders.metrics.Metrics; import com.bgsoftware.wildloaders.nms.NMSAdapter; -import com.bgsoftware.wildloaders.nms.mapping.TestRemaps; +import com.bgsoftware.common.remaps.TestRemaps; import com.bgsoftware.wildloaders.utils.database.Database; import org.bukkit.Bukkit; import org.bukkit.plugin.java.JavaPlugin; diff --git a/src/main/java/com/bgsoftware/wildloaders/nms/mapping/MappingParser.java b/src/main/java/com/bgsoftware/wildloaders/nms/mapping/MappingParser.java deleted file mode 100644 index 9ba1896..0000000 --- a/src/main/java/com/bgsoftware/wildloaders/nms/mapping/MappingParser.java +++ /dev/null @@ -1,55 +0,0 @@ -package com.bgsoftware.wildloaders.nms.mapping; - -import java.io.BufferedReader; -import java.io.File; -import java.io.FileReader; -import java.io.IOException; -import java.util.HashMap; -import java.util.Map; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -public class MappingParser { - - private static final Pattern NEW_CLASS_REMAP_PATTERN = Pattern.compile("^([^ ]+) -> [^ ]+:$"); - private static final Pattern FIELD_REMAP_PATTERN = Pattern.compile("^[ ]{4}[^ ]+ ([^ (]+)+ -> ([^ ]+)$"); - private static final Pattern METHOD_REMAP_PATTERN = Pattern.compile("^[ ]{4}[^ ]+ ([^ ]+)\\(.*\\) -> ([^ ]+)$"); - - private MappingParser() { - - } - - public static Map parseRemappedMap(File mappingsFile) throws IOException { - Map remappedMap = new HashMap<>(); - - try (BufferedReader reader = new BufferedReader(new FileReader(mappingsFile))) { - Remapped currentRemapped = null; - String currentLine; - - while ((currentLine = reader.readLine()) != null) { - if (currentLine.startsWith("#")) // Comment - continue; - - Matcher matcher; - - if ((matcher = NEW_CLASS_REMAP_PATTERN.matcher(currentLine)).matches()) { - currentRemapped = new Remapped(); - remappedMap.put(matcher.group(1), currentRemapped); - } else if (currentRemapped != null) { - if ((matcher = FIELD_REMAP_PATTERN.matcher(currentLine)).matches()) { - String fieldName = matcher.group(1); - String obfuscatedName = matcher.group(2); - currentRemapped.put(Remap.Type.FIELD, fieldName, obfuscatedName); - } else if ((matcher = METHOD_REMAP_PATTERN.matcher(currentLine)).matches()) { - String methodName = matcher.group(1); - String obfuscatedName = matcher.group(2); - currentRemapped.put(Remap.Type.METHOD, methodName, obfuscatedName); - } - } - } - } - - return remappedMap; - } - -} diff --git a/src/main/java/com/bgsoftware/wildloaders/nms/mapping/Remap.java b/src/main/java/com/bgsoftware/wildloaders/nms/mapping/Remap.java deleted file mode 100644 index ddb8b4d..0000000 --- a/src/main/java/com/bgsoftware/wildloaders/nms/mapping/Remap.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.bgsoftware.wildloaders.nms.mapping; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Repeatable; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -@Target({ElementType.FIELD, ElementType.METHOD, ElementType.CONSTRUCTOR}) -@Retention(RetentionPolicy.RUNTIME) -@Repeatable(Remaps.class) -public @interface Remap { - - String classPath(); - - String name(); - - Type type(); - - String remappedName() default ""; - - enum Type { - - FIELD, - METHOD - - } - - -} diff --git a/src/main/java/com/bgsoftware/wildloaders/nms/mapping/RemapFailure.java b/src/main/java/com/bgsoftware/wildloaders/nms/mapping/RemapFailure.java deleted file mode 100644 index 99e1f49..0000000 --- a/src/main/java/com/bgsoftware/wildloaders/nms/mapping/RemapFailure.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.bgsoftware.wildloaders.nms.mapping; - -public class RemapFailure extends RuntimeException { - - public RemapFailure(String message) { - super(message); - } - -} diff --git a/src/main/java/com/bgsoftware/wildloaders/nms/mapping/Remapped.java b/src/main/java/com/bgsoftware/wildloaders/nms/mapping/Remapped.java deleted file mode 100644 index b0d31dc..0000000 --- a/src/main/java/com/bgsoftware/wildloaders/nms/mapping/Remapped.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.bgsoftware.wildloaders.nms.mapping; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.EnumMap; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -public class Remapped { - - private final EnumMap>> mappings = new EnumMap<>(Remap.Type.class); - - public List getObfuscatedNames(String name, Remap.Type type) { - Map> typeMappings = mappings.get(type); - - if (typeMappings != null) { - List obfuscatedNames = typeMappings.get(name); - if (obfuscatedNames != null) - return obfuscatedNames; - } - - return Collections.emptyList(); - } - - public void put(Remap.Type type, String name, String obfuscated) { - mappings.computeIfAbsent(type, t -> new HashMap<>()) - .computeIfAbsent(name, n -> new ArrayList<>()) - .add(obfuscated); - } - -} diff --git a/src/main/java/com/bgsoftware/wildloaders/nms/mapping/Remaps.java b/src/main/java/com/bgsoftware/wildloaders/nms/mapping/Remaps.java deleted file mode 100644 index da5af2b..0000000 --- a/src/main/java/com/bgsoftware/wildloaders/nms/mapping/Remaps.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.bgsoftware.wildloaders.nms.mapping; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -@Target({ElementType.FIELD, ElementType.METHOD, ElementType.CONSTRUCTOR}) -@Retention(RetentionPolicy.RUNTIME) -public @interface Remaps { - - Remap[] value(); - -} diff --git a/src/main/java/com/bgsoftware/wildloaders/nms/mapping/TestRemaps.java b/src/main/java/com/bgsoftware/wildloaders/nms/mapping/TestRemaps.java deleted file mode 100644 index 4bdcea8..0000000 --- a/src/main/java/com/bgsoftware/wildloaders/nms/mapping/TestRemaps.java +++ /dev/null @@ -1,127 +0,0 @@ -package com.bgsoftware.wildloaders.nms.mapping; - -import com.bgsoftware.common.reflection.ReflectField; -import com.bgsoftware.common.reflection.ReflectMethod; -import com.google.common.reflect.ClassPath; - -import javax.annotation.Nullable; -import java.io.File; -import java.io.IOException; -import java.lang.reflect.Field; -import java.lang.reflect.Method; -import java.lang.reflect.Modifier; -import java.util.List; -import java.util.Map; -import java.util.function.IntFunction; -import java.util.logging.Logger; - -public class TestRemaps { - - private static final Logger logger = Logger.getLogger("TestRemaps"); - - private static final ReflectField REFLECT_FIELD_INNER_FIELD = new ReflectField<>(ReflectField.class, Field.class, "field"); - private static final ReflectField REFLECT_METHOD_INNER_METHOD = new ReflectField<>(ReflectMethod.class, Method.class, "method"); - - private TestRemaps() { - - } - - @SuppressWarnings("UnstableApiUsage") - public static void testRemapsForClassesInPackage(File mappingsFile, ClassLoader classLoader, String packageName) throws - IllegalAccessException, NullPointerException, IOException, RemapFailure { - Class[] classes = ClassPath.from(classLoader) - .getAllClasses() - .stream() - .filter(clazz -> clazz.getPackageName().startsWith(packageName)) - .map(ClassPath.ClassInfo::load) - .toArray((IntFunction[]>) Class[]::new); - testRemapsForClasses(mappingsFile, classes); - } - - public static void testRemapsForClasses(File mappingsFile, Class... classes) throws - IllegalAccessException, NullPointerException, IOException, RemapFailure { - for (Class clazz : classes) { - logger.info("Starting remaps test for " + clazz.getName()); - - Map remappedMap = MappingParser.parseRemappedMap(mappingsFile); - - try { - for (Field field : clazz.getDeclaredFields()) { - if (Modifier.isStatic(field.getModifiers())) { - Remap[] remaps = field.getAnnotationsByType(Remap.class); - if (remaps.length > 0) { - logger.info("Testing field " + field.getName()); - for (Remap remap : remaps) { - try { - testRemap(remappedMap, remap, getRemappedName(field)); - } catch (Throwable error) { - error.printStackTrace(); - } - } - } - } - } - - for (Method method : clazz.getDeclaredMethods()) { - Remap[] remaps = method.getAnnotationsByType(Remap.class); - if (remaps.length > 0) { - logger.info("Testing method " + method.getName()); - for (Remap remap : remaps) { - try { - testRemap(remappedMap, remap, null); - } catch (Throwable error) { - error.printStackTrace(); - } - } - } - } - } catch (Throwable error) { - logger.info("Failed remaps test for " + clazz.getName() + ":"); - error.printStackTrace(); - } - - logger.info("Finished remaps tests for " + clazz.getName()); - } - } - - @Nullable - private static String getRemappedName(Field field) throws IllegalAccessException { - field.setAccessible(true); - Object fieldValue = field.get(null); - - if (fieldValue instanceof ReflectField) { - Field innerField = REFLECT_FIELD_INNER_FIELD.get(fieldValue); - if (innerField != null) - return innerField.getName(); - } else if (fieldValue instanceof ReflectMethod) { - Method innerMethod = REFLECT_METHOD_INNER_METHOD.get(fieldValue); - if (innerMethod != null) - return innerMethod.getName(); - } - - return null; - } - - private static void testRemap(Map remappedMap, Remap remap, @Nullable String remappedName) { - String classPath = remap.classPath(); - - Remapped remapped = remappedMap.get(classPath); - - if (remapped == null) - throw new NullPointerException("Cannot find remapped object for classPath " + classPath); - - String name = remap.name(); - Remap.Type type = remap.type(); - - List obfuscatedNames = remapped.getObfuscatedNames(name, type); - - if (obfuscatedNames.isEmpty()) - throw new NullPointerException("Cannot find obfuscated name for " + name + ":" + type); - - String remappedNameOrDefault = remappedName == null ? remap.remappedName() : remappedName; - - if (!obfuscatedNames.contains(remappedNameOrDefault)) - throw new RemapFailure("Incorrect remap: Expected " + obfuscatedNames + ", found " + remappedNameOrDefault); - } - -} diff --git a/v1_18_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_18_R1/ChunkLoaderNPC.java b/v1_18_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_18_R1/ChunkLoaderNPC.java index ca0982a..40b0609 100644 --- a/v1_18_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_18_R1/ChunkLoaderNPC.java +++ b/v1_18_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_18_R1/ChunkLoaderNPC.java @@ -2,7 +2,7 @@ package com.bgsoftware.wildloaders.nms.v1_18_R1; import com.bgsoftware.common.reflection.ReflectMethod; import com.bgsoftware.wildloaders.handlers.NPCHandler; -import com.bgsoftware.wildloaders.nms.mapping.Remap; +import com.bgsoftware.common.remaps.Remap; import com.bgsoftware.wildloaders.nms.v1_18_R1.mappings.net.minecraft.world.entity.Entity; import com.bgsoftware.wildloaders.nms.v1_18_R1.mappings.net.minecraft.world.level.World; import com.bgsoftware.wildloaders.npc.DummyChannel; diff --git a/v1_18_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_18_R1/EntityHolograms.java b/v1_18_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_18_R1/EntityHolograms.java index c64edf0..d3267fc 100644 --- a/v1_18_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_18_R1/EntityHolograms.java +++ b/v1_18_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_18_R1/EntityHolograms.java @@ -1,7 +1,7 @@ package com.bgsoftware.wildloaders.nms.v1_18_R1; import com.bgsoftware.wildloaders.api.holograms.Hologram; -import com.bgsoftware.wildloaders.nms.mapping.Remap; +import com.bgsoftware.common.remaps.Remap; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.chat.IChatBaseComponent; import net.minecraft.sounds.SoundEffect; diff --git a/v1_18_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_18_R1/NMSAdapter.java b/v1_18_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_18_R1/NMSAdapter.java index 901b431..a3d7abc 100644 --- a/v1_18_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_18_R1/NMSAdapter.java +++ b/v1_18_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_18_R1/NMSAdapter.java @@ -4,7 +4,7 @@ import com.bgsoftware.common.reflection.ReflectMethod; import com.bgsoftware.wildloaders.WildLoadersPlugin; import com.bgsoftware.wildloaders.api.loaders.ChunkLoader; import com.bgsoftware.wildloaders.loaders.ITileEntityChunkLoader; -import com.bgsoftware.wildloaders.nms.mapping.Remap; +import com.bgsoftware.common.remaps.Remap; import com.bgsoftware.wildloaders.nms.v1_18_R1.loader.TileEntityChunkLoader; import com.bgsoftware.wildloaders.nms.v1_18_R1.mappings.net.minecraft.core.BlockPosition; import com.bgsoftware.wildloaders.nms.v1_18_R1.mappings.net.minecraft.nbt.NBTTagCompound; diff --git a/v1_18_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_18_R1/loader/TileEntityChunkLoader.java b/v1_18_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_18_R1/loader/TileEntityChunkLoader.java index 1117c05..4cdcae5 100644 --- a/v1_18_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_18_R1/loader/TileEntityChunkLoader.java +++ b/v1_18_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_18_R1/loader/TileEntityChunkLoader.java @@ -4,7 +4,7 @@ import com.bgsoftware.wildloaders.api.holograms.Hologram; import com.bgsoftware.wildloaders.api.loaders.ChunkLoader; import com.bgsoftware.wildloaders.loaders.ITileEntityChunkLoader; import com.bgsoftware.wildloaders.loaders.WChunkLoader; -import com.bgsoftware.wildloaders.nms.mapping.Remap; +import com.bgsoftware.common.remaps.Remap; import com.bgsoftware.wildloaders.nms.v1_18_R1.EntityHolograms; import com.bgsoftware.wildloaders.nms.v1_18_R1.mappings.net.minecraft.core.BlockPosition; import com.bgsoftware.wildloaders.nms.v1_18_R1.mappings.net.minecraft.world.level.ChunkCoordIntPair; diff --git a/v1_18_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_18_R1/loader/TileEntityChunkLoaderTicker.java b/v1_18_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_18_R1/loader/TileEntityChunkLoaderTicker.java index 1c5f16f..71b5104 100644 --- a/v1_18_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_18_R1/loader/TileEntityChunkLoaderTicker.java +++ b/v1_18_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_18_R1/loader/TileEntityChunkLoaderTicker.java @@ -1,6 +1,6 @@ package com.bgsoftware.wildloaders.nms.v1_18_R1.loader; -import com.bgsoftware.wildloaders.nms.mapping.Remap; +import com.bgsoftware.common.remaps.Remap; import net.minecraft.core.BlockPosition; import net.minecraft.world.level.block.entity.TickingBlockEntity; import net.minecraft.world.level.block.entity.TileEntityTypes; diff --git a/v1_18_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_18_R1/mappings/net/minecraft/core/BlockPosition.java b/v1_18_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_18_R1/mappings/net/minecraft/core/BlockPosition.java index 6495c6e..152e73d 100644 --- a/v1_18_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_18_R1/mappings/net/minecraft/core/BlockPosition.java +++ b/v1_18_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_18_R1/mappings/net/minecraft/core/BlockPosition.java @@ -1,6 +1,6 @@ package com.bgsoftware.wildloaders.nms.v1_18_R1.mappings.net.minecraft.core; -import com.bgsoftware.wildloaders.nms.mapping.Remap; +import com.bgsoftware.common.remaps.Remap; import com.bgsoftware.wildloaders.nms.v1_18_R1.mappings.MappedObject; public class BlockPosition extends MappedObject { diff --git a/v1_18_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_18_R1/mappings/net/minecraft/nbt/NBTTagCompound.java b/v1_18_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_18_R1/mappings/net/minecraft/nbt/NBTTagCompound.java index c11b065..05778e4 100644 --- a/v1_18_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_18_R1/mappings/net/minecraft/nbt/NBTTagCompound.java +++ b/v1_18_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_18_R1/mappings/net/minecraft/nbt/NBTTagCompound.java @@ -1,6 +1,6 @@ package com.bgsoftware.wildloaders.nms.v1_18_R1.mappings.net.minecraft.nbt; -import com.bgsoftware.wildloaders.nms.mapping.Remap; +import com.bgsoftware.common.remaps.Remap; import com.bgsoftware.wildloaders.nms.v1_18_R1.mappings.MappedObject; import net.minecraft.nbt.NBTBase; diff --git a/v1_18_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_18_R1/mappings/net/minecraft/world/entity/Entity.java b/v1_18_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_18_R1/mappings/net/minecraft/world/entity/Entity.java index 23464cd..dd193a7 100644 --- a/v1_18_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_18_R1/mappings/net/minecraft/world/entity/Entity.java +++ b/v1_18_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_18_R1/mappings/net/minecraft/world/entity/Entity.java @@ -1,6 +1,6 @@ package com.bgsoftware.wildloaders.nms.v1_18_R1.mappings.net.minecraft.world.entity; -import com.bgsoftware.wildloaders.nms.mapping.Remap; +import com.bgsoftware.common.remaps.Remap; import com.bgsoftware.wildloaders.nms.v1_18_R1.mappings.MappedObject; import com.bgsoftware.wildloaders.nms.v1_18_R1.mappings.net.minecraft.world.level.World; diff --git a/v1_18_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_18_R1/mappings/net/minecraft/world/item/ItemStack.java b/v1_18_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_18_R1/mappings/net/minecraft/world/item/ItemStack.java index 2e96c9d..87416f6 100644 --- a/v1_18_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_18_R1/mappings/net/minecraft/world/item/ItemStack.java +++ b/v1_18_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_18_R1/mappings/net/minecraft/world/item/ItemStack.java @@ -1,6 +1,6 @@ package com.bgsoftware.wildloaders.nms.v1_18_R1.mappings.net.minecraft.world.item; -import com.bgsoftware.wildloaders.nms.mapping.Remap; +import com.bgsoftware.common.remaps.Remap; import com.bgsoftware.wildloaders.nms.v1_18_R1.mappings.MappedObject; import com.bgsoftware.wildloaders.nms.v1_18_R1.mappings.net.minecraft.nbt.NBTTagCompound; diff --git a/v1_18_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_18_R1/mappings/net/minecraft/world/level/ChunkCoordIntPair.java b/v1_18_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_18_R1/mappings/net/minecraft/world/level/ChunkCoordIntPair.java index 87b611f..8e532a7 100644 --- a/v1_18_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_18_R1/mappings/net/minecraft/world/level/ChunkCoordIntPair.java +++ b/v1_18_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_18_R1/mappings/net/minecraft/world/level/ChunkCoordIntPair.java @@ -1,6 +1,6 @@ package com.bgsoftware.wildloaders.nms.v1_18_R1.mappings.net.minecraft.world.level; -import com.bgsoftware.wildloaders.nms.mapping.Remap; +import com.bgsoftware.common.remaps.Remap; import com.bgsoftware.wildloaders.nms.v1_18_R1.mappings.MappedObject; public class ChunkCoordIntPair extends MappedObject { diff --git a/v1_18_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_18_R1/mappings/net/minecraft/world/level/World.java b/v1_18_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_18_R1/mappings/net/minecraft/world/level/World.java index 0d849a6..ecf4c88 100644 --- a/v1_18_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_18_R1/mappings/net/minecraft/world/level/World.java +++ b/v1_18_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_18_R1/mappings/net/minecraft/world/level/World.java @@ -1,6 +1,6 @@ package com.bgsoftware.wildloaders.nms.v1_18_R1.mappings.net.minecraft.world.level; -import com.bgsoftware.wildloaders.nms.mapping.Remap; +import com.bgsoftware.common.remaps.Remap; import com.bgsoftware.wildloaders.nms.v1_18_R1.mappings.MappedObject; import com.bgsoftware.wildloaders.nms.v1_18_R1.mappings.net.minecraft.world.level.block.state.IBlockData; import net.minecraft.core.BlockPosition; diff --git a/v1_18_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_18_R1/mappings/net/minecraft/world/level/block/entity/TileEntity.java b/v1_18_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_18_R1/mappings/net/minecraft/world/level/block/entity/TileEntity.java index 0187f4d..37de934 100644 --- a/v1_18_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_18_R1/mappings/net/minecraft/world/level/block/entity/TileEntity.java +++ b/v1_18_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_18_R1/mappings/net/minecraft/world/level/block/entity/TileEntity.java @@ -1,6 +1,6 @@ package com.bgsoftware.wildloaders.nms.v1_18_R1.mappings.net.minecraft.world.level.block.entity; -import com.bgsoftware.wildloaders.nms.mapping.Remap; +import com.bgsoftware.common.remaps.Remap; import com.bgsoftware.wildloaders.nms.v1_18_R1.mappings.MappedObject; import net.minecraft.world.level.MobSpawnerAbstract; import net.minecraft.world.level.block.entity.TileEntityMobSpawner; diff --git a/v1_18_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_18_R1/mappings/net/minecraft/world/level/block/state/IBlockData.java b/v1_18_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_18_R1/mappings/net/minecraft/world/level/block/state/IBlockData.java index bbd8f87..e947231 100644 --- a/v1_18_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_18_R1/mappings/net/minecraft/world/level/block/state/IBlockData.java +++ b/v1_18_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_18_R1/mappings/net/minecraft/world/level/block/state/IBlockData.java @@ -1,6 +1,6 @@ package com.bgsoftware.wildloaders.nms.v1_18_R1.mappings.net.minecraft.world.level.block.state; -import com.bgsoftware.wildloaders.nms.mapping.Remap; +import com.bgsoftware.common.remaps.Remap; import com.bgsoftware.wildloaders.nms.v1_18_R1.mappings.MappedObject; import net.minecraft.world.level.block.Block; diff --git a/v1_18_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_18_R1/mappings/net/minecraft/world/level/chunk/Chunk.java b/v1_18_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_18_R1/mappings/net/minecraft/world/level/chunk/Chunk.java index f2f0f58..1fb3ebd 100644 --- a/v1_18_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_18_R1/mappings/net/minecraft/world/level/chunk/Chunk.java +++ b/v1_18_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_18_R1/mappings/net/minecraft/world/level/chunk/Chunk.java @@ -1,6 +1,6 @@ package com.bgsoftware.wildloaders.nms.v1_18_R1.mappings.net.minecraft.world.level.chunk; -import com.bgsoftware.wildloaders.nms.mapping.Remap; +import com.bgsoftware.common.remaps.Remap; import com.bgsoftware.wildloaders.nms.v1_18_R1.mappings.MappedObject; import com.bgsoftware.wildloaders.nms.v1_18_R1.mappings.net.minecraft.world.level.ChunkCoordIntPair; import net.minecraft.core.BlockPosition; diff --git a/v1_18_R2/src/main/java/com/bgsoftware/wildloaders/nms/v1_18_R2/ChunkLoaderNPC.java b/v1_18_R2/src/main/java/com/bgsoftware/wildloaders/nms/v1_18_R2/ChunkLoaderNPC.java index ac1fea8..58c3f7f 100644 --- a/v1_18_R2/src/main/java/com/bgsoftware/wildloaders/nms/v1_18_R2/ChunkLoaderNPC.java +++ b/v1_18_R2/src/main/java/com/bgsoftware/wildloaders/nms/v1_18_R2/ChunkLoaderNPC.java @@ -2,7 +2,7 @@ package com.bgsoftware.wildloaders.nms.v1_18_R2; import com.bgsoftware.common.reflection.ReflectMethod; import com.bgsoftware.wildloaders.handlers.NPCHandler; -import com.bgsoftware.wildloaders.nms.mapping.Remap; +import com.bgsoftware.common.remaps.Remap; import com.bgsoftware.wildloaders.nms.v1_18_R2.mappings.net.minecraft.world.entity.Entity; import com.bgsoftware.wildloaders.nms.v1_18_R2.mappings.net.minecraft.world.level.World; import com.bgsoftware.wildloaders.npc.DummyChannel; diff --git a/v1_18_R2/src/main/java/com/bgsoftware/wildloaders/nms/v1_18_R2/EntityHolograms.java b/v1_18_R2/src/main/java/com/bgsoftware/wildloaders/nms/v1_18_R2/EntityHolograms.java index 998bc1a..95e40ba 100644 --- a/v1_18_R2/src/main/java/com/bgsoftware/wildloaders/nms/v1_18_R2/EntityHolograms.java +++ b/v1_18_R2/src/main/java/com/bgsoftware/wildloaders/nms/v1_18_R2/EntityHolograms.java @@ -1,7 +1,7 @@ package com.bgsoftware.wildloaders.nms.v1_18_R2; import com.bgsoftware.wildloaders.api.holograms.Hologram; -import com.bgsoftware.wildloaders.nms.mapping.Remap; +import com.bgsoftware.common.remaps.Remap; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.chat.IChatBaseComponent; import net.minecraft.sounds.SoundEffect; diff --git a/v1_18_R2/src/main/java/com/bgsoftware/wildloaders/nms/v1_18_R2/NMSAdapter.java b/v1_18_R2/src/main/java/com/bgsoftware/wildloaders/nms/v1_18_R2/NMSAdapter.java index 897f5e9..9dca674 100644 --- a/v1_18_R2/src/main/java/com/bgsoftware/wildloaders/nms/v1_18_R2/NMSAdapter.java +++ b/v1_18_R2/src/main/java/com/bgsoftware/wildloaders/nms/v1_18_R2/NMSAdapter.java @@ -4,7 +4,7 @@ import com.bgsoftware.common.reflection.ReflectMethod; import com.bgsoftware.wildloaders.WildLoadersPlugin; import com.bgsoftware.wildloaders.api.loaders.ChunkLoader; import com.bgsoftware.wildloaders.loaders.ITileEntityChunkLoader; -import com.bgsoftware.wildloaders.nms.mapping.Remap; +import com.bgsoftware.common.remaps.Remap; import com.bgsoftware.wildloaders.nms.v1_18_R2.loader.TileEntityChunkLoader; import com.bgsoftware.wildloaders.nms.v1_18_R2.mappings.net.minecraft.core.BlockPosition; import com.bgsoftware.wildloaders.nms.v1_18_R2.mappings.net.minecraft.nbt.NBTTagCompound; diff --git a/v1_18_R2/src/main/java/com/bgsoftware/wildloaders/nms/v1_18_R2/loader/TileEntityChunkLoader.java b/v1_18_R2/src/main/java/com/bgsoftware/wildloaders/nms/v1_18_R2/loader/TileEntityChunkLoader.java index 22872c2..e5d1c2b 100644 --- a/v1_18_R2/src/main/java/com/bgsoftware/wildloaders/nms/v1_18_R2/loader/TileEntityChunkLoader.java +++ b/v1_18_R2/src/main/java/com/bgsoftware/wildloaders/nms/v1_18_R2/loader/TileEntityChunkLoader.java @@ -4,7 +4,7 @@ import com.bgsoftware.wildloaders.api.holograms.Hologram; import com.bgsoftware.wildloaders.api.loaders.ChunkLoader; import com.bgsoftware.wildloaders.loaders.ITileEntityChunkLoader; import com.bgsoftware.wildloaders.loaders.WChunkLoader; -import com.bgsoftware.wildloaders.nms.mapping.Remap; +import com.bgsoftware.common.remaps.Remap; import com.bgsoftware.wildloaders.nms.v1_18_R2.EntityHolograms; import com.bgsoftware.wildloaders.nms.v1_18_R2.mappings.net.minecraft.core.BlockPosition; import com.bgsoftware.wildloaders.nms.v1_18_R2.mappings.net.minecraft.world.level.ChunkCoordIntPair; diff --git a/v1_18_R2/src/main/java/com/bgsoftware/wildloaders/nms/v1_18_R2/loader/TileEntityChunkLoaderTicker.java b/v1_18_R2/src/main/java/com/bgsoftware/wildloaders/nms/v1_18_R2/loader/TileEntityChunkLoaderTicker.java index def0454..62804a8 100644 --- a/v1_18_R2/src/main/java/com/bgsoftware/wildloaders/nms/v1_18_R2/loader/TileEntityChunkLoaderTicker.java +++ b/v1_18_R2/src/main/java/com/bgsoftware/wildloaders/nms/v1_18_R2/loader/TileEntityChunkLoaderTicker.java @@ -1,6 +1,6 @@ package com.bgsoftware.wildloaders.nms.v1_18_R2.loader; -import com.bgsoftware.wildloaders.nms.mapping.Remap; +import com.bgsoftware.common.remaps.Remap; import net.minecraft.core.BlockPosition; import net.minecraft.world.level.block.entity.TickingBlockEntity; import net.minecraft.world.level.block.entity.TileEntityTypes; diff --git a/v1_18_R2/src/main/java/com/bgsoftware/wildloaders/nms/v1_18_R2/mappings/net/minecraft/core/BlockPosition.java b/v1_18_R2/src/main/java/com/bgsoftware/wildloaders/nms/v1_18_R2/mappings/net/minecraft/core/BlockPosition.java index 230b955..b985d67 100644 --- a/v1_18_R2/src/main/java/com/bgsoftware/wildloaders/nms/v1_18_R2/mappings/net/minecraft/core/BlockPosition.java +++ b/v1_18_R2/src/main/java/com/bgsoftware/wildloaders/nms/v1_18_R2/mappings/net/minecraft/core/BlockPosition.java @@ -1,6 +1,6 @@ package com.bgsoftware.wildloaders.nms.v1_18_R2.mappings.net.minecraft.core; -import com.bgsoftware.wildloaders.nms.mapping.Remap; +import com.bgsoftware.common.remaps.Remap; import com.bgsoftware.wildloaders.nms.v1_18_R2.mappings.MappedObject; public class BlockPosition extends MappedObject { diff --git a/v1_18_R2/src/main/java/com/bgsoftware/wildloaders/nms/v1_18_R2/mappings/net/minecraft/nbt/NBTTagCompound.java b/v1_18_R2/src/main/java/com/bgsoftware/wildloaders/nms/v1_18_R2/mappings/net/minecraft/nbt/NBTTagCompound.java index 850944f..21df3b7 100644 --- a/v1_18_R2/src/main/java/com/bgsoftware/wildloaders/nms/v1_18_R2/mappings/net/minecraft/nbt/NBTTagCompound.java +++ b/v1_18_R2/src/main/java/com/bgsoftware/wildloaders/nms/v1_18_R2/mappings/net/minecraft/nbt/NBTTagCompound.java @@ -1,6 +1,6 @@ package com.bgsoftware.wildloaders.nms.v1_18_R2.mappings.net.minecraft.nbt; -import com.bgsoftware.wildloaders.nms.mapping.Remap; +import com.bgsoftware.common.remaps.Remap; import com.bgsoftware.wildloaders.nms.v1_18_R2.mappings.MappedObject; import net.minecraft.nbt.NBTBase; diff --git a/v1_18_R2/src/main/java/com/bgsoftware/wildloaders/nms/v1_18_R2/mappings/net/minecraft/world/entity/Entity.java b/v1_18_R2/src/main/java/com/bgsoftware/wildloaders/nms/v1_18_R2/mappings/net/minecraft/world/entity/Entity.java index 1307af7..97804d4 100644 --- a/v1_18_R2/src/main/java/com/bgsoftware/wildloaders/nms/v1_18_R2/mappings/net/minecraft/world/entity/Entity.java +++ b/v1_18_R2/src/main/java/com/bgsoftware/wildloaders/nms/v1_18_R2/mappings/net/minecraft/world/entity/Entity.java @@ -1,6 +1,6 @@ package com.bgsoftware.wildloaders.nms.v1_18_R2.mappings.net.minecraft.world.entity; -import com.bgsoftware.wildloaders.nms.mapping.Remap; +import com.bgsoftware.common.remaps.Remap; import com.bgsoftware.wildloaders.nms.v1_18_R2.mappings.MappedObject; import com.bgsoftware.wildloaders.nms.v1_18_R2.mappings.net.minecraft.world.level.World; diff --git a/v1_18_R2/src/main/java/com/bgsoftware/wildloaders/nms/v1_18_R2/mappings/net/minecraft/world/item/ItemStack.java b/v1_18_R2/src/main/java/com/bgsoftware/wildloaders/nms/v1_18_R2/mappings/net/minecraft/world/item/ItemStack.java index 71d6fb4..907ab6f 100644 --- a/v1_18_R2/src/main/java/com/bgsoftware/wildloaders/nms/v1_18_R2/mappings/net/minecraft/world/item/ItemStack.java +++ b/v1_18_R2/src/main/java/com/bgsoftware/wildloaders/nms/v1_18_R2/mappings/net/minecraft/world/item/ItemStack.java @@ -1,6 +1,6 @@ package com.bgsoftware.wildloaders.nms.v1_18_R2.mappings.net.minecraft.world.item; -import com.bgsoftware.wildloaders.nms.mapping.Remap; +import com.bgsoftware.common.remaps.Remap; import com.bgsoftware.wildloaders.nms.v1_18_R2.mappings.MappedObject; import com.bgsoftware.wildloaders.nms.v1_18_R2.mappings.net.minecraft.nbt.NBTTagCompound; diff --git a/v1_18_R2/src/main/java/com/bgsoftware/wildloaders/nms/v1_18_R2/mappings/net/minecraft/world/level/ChunkCoordIntPair.java b/v1_18_R2/src/main/java/com/bgsoftware/wildloaders/nms/v1_18_R2/mappings/net/minecraft/world/level/ChunkCoordIntPair.java index 99a5163..9b1df6d 100644 --- a/v1_18_R2/src/main/java/com/bgsoftware/wildloaders/nms/v1_18_R2/mappings/net/minecraft/world/level/ChunkCoordIntPair.java +++ b/v1_18_R2/src/main/java/com/bgsoftware/wildloaders/nms/v1_18_R2/mappings/net/minecraft/world/level/ChunkCoordIntPair.java @@ -1,6 +1,6 @@ package com.bgsoftware.wildloaders.nms.v1_18_R2.mappings.net.minecraft.world.level; -import com.bgsoftware.wildloaders.nms.mapping.Remap; +import com.bgsoftware.common.remaps.Remap; import com.bgsoftware.wildloaders.nms.v1_18_R2.mappings.MappedObject; public class ChunkCoordIntPair extends MappedObject { diff --git a/v1_18_R2/src/main/java/com/bgsoftware/wildloaders/nms/v1_18_R2/mappings/net/minecraft/world/level/World.java b/v1_18_R2/src/main/java/com/bgsoftware/wildloaders/nms/v1_18_R2/mappings/net/minecraft/world/level/World.java index 2261747..b975cfe 100644 --- a/v1_18_R2/src/main/java/com/bgsoftware/wildloaders/nms/v1_18_R2/mappings/net/minecraft/world/level/World.java +++ b/v1_18_R2/src/main/java/com/bgsoftware/wildloaders/nms/v1_18_R2/mappings/net/minecraft/world/level/World.java @@ -1,6 +1,6 @@ package com.bgsoftware.wildloaders.nms.v1_18_R2.mappings.net.minecraft.world.level; -import com.bgsoftware.wildloaders.nms.mapping.Remap; +import com.bgsoftware.common.remaps.Remap; import com.bgsoftware.wildloaders.nms.v1_18_R2.mappings.MappedObject; import com.bgsoftware.wildloaders.nms.v1_18_R2.mappings.net.minecraft.world.level.block.state.IBlockData; import net.minecraft.core.BlockPosition; diff --git a/v1_18_R2/src/main/java/com/bgsoftware/wildloaders/nms/v1_18_R2/mappings/net/minecraft/world/level/block/entity/TileEntity.java b/v1_18_R2/src/main/java/com/bgsoftware/wildloaders/nms/v1_18_R2/mappings/net/minecraft/world/level/block/entity/TileEntity.java index 47abbe9..bd2fe94 100644 --- a/v1_18_R2/src/main/java/com/bgsoftware/wildloaders/nms/v1_18_R2/mappings/net/minecraft/world/level/block/entity/TileEntity.java +++ b/v1_18_R2/src/main/java/com/bgsoftware/wildloaders/nms/v1_18_R2/mappings/net/minecraft/world/level/block/entity/TileEntity.java @@ -1,6 +1,6 @@ package com.bgsoftware.wildloaders.nms.v1_18_R2.mappings.net.minecraft.world.level.block.entity; -import com.bgsoftware.wildloaders.nms.mapping.Remap; +import com.bgsoftware.common.remaps.Remap; import com.bgsoftware.wildloaders.nms.v1_18_R2.mappings.MappedObject; import net.minecraft.world.level.MobSpawnerAbstract; import net.minecraft.world.level.block.entity.TileEntityMobSpawner; diff --git a/v1_18_R2/src/main/java/com/bgsoftware/wildloaders/nms/v1_18_R2/mappings/net/minecraft/world/level/block/state/IBlockData.java b/v1_18_R2/src/main/java/com/bgsoftware/wildloaders/nms/v1_18_R2/mappings/net/minecraft/world/level/block/state/IBlockData.java index aa2b47a..d2486e6 100644 --- a/v1_18_R2/src/main/java/com/bgsoftware/wildloaders/nms/v1_18_R2/mappings/net/minecraft/world/level/block/state/IBlockData.java +++ b/v1_18_R2/src/main/java/com/bgsoftware/wildloaders/nms/v1_18_R2/mappings/net/minecraft/world/level/block/state/IBlockData.java @@ -1,6 +1,6 @@ package com.bgsoftware.wildloaders.nms.v1_18_R2.mappings.net.minecraft.world.level.block.state; -import com.bgsoftware.wildloaders.nms.mapping.Remap; +import com.bgsoftware.common.remaps.Remap; import com.bgsoftware.wildloaders.nms.v1_18_R2.mappings.MappedObject; import net.minecraft.world.level.block.Block; diff --git a/v1_18_R2/src/main/java/com/bgsoftware/wildloaders/nms/v1_18_R2/mappings/net/minecraft/world/level/chunk/Chunk.java b/v1_18_R2/src/main/java/com/bgsoftware/wildloaders/nms/v1_18_R2/mappings/net/minecraft/world/level/chunk/Chunk.java index 51e10ec..1ab66cd 100644 --- a/v1_18_R2/src/main/java/com/bgsoftware/wildloaders/nms/v1_18_R2/mappings/net/minecraft/world/level/chunk/Chunk.java +++ b/v1_18_R2/src/main/java/com/bgsoftware/wildloaders/nms/v1_18_R2/mappings/net/minecraft/world/level/chunk/Chunk.java @@ -1,6 +1,6 @@ package com.bgsoftware.wildloaders.nms.v1_18_R2.mappings.net.minecraft.world.level.chunk; -import com.bgsoftware.wildloaders.nms.mapping.Remap; +import com.bgsoftware.common.remaps.Remap; import com.bgsoftware.wildloaders.nms.v1_18_R2.mappings.MappedObject; import com.bgsoftware.wildloaders.nms.v1_18_R2.mappings.net.minecraft.world.level.ChunkCoordIntPair; import net.minecraft.core.BlockPosition; diff --git a/v1_19_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_19_R1/ChunkLoaderNPC.java b/v1_19_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_19_R1/ChunkLoaderNPC.java index 4a686e0..1dc307a 100644 --- a/v1_19_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_19_R1/ChunkLoaderNPC.java +++ b/v1_19_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_19_R1/ChunkLoaderNPC.java @@ -2,7 +2,7 @@ package com.bgsoftware.wildloaders.nms.v1_19_R1; import com.bgsoftware.common.reflection.ReflectMethod; import com.bgsoftware.wildloaders.handlers.NPCHandler; -import com.bgsoftware.wildloaders.nms.mapping.Remap; +import com.bgsoftware.common.remaps.Remap; import com.bgsoftware.wildloaders.nms.v1_19_R1.mappings.net.minecraft.world.entity.Entity; import com.bgsoftware.wildloaders.nms.v1_19_R1.mappings.net.minecraft.world.level.World; import com.bgsoftware.wildloaders.npc.DummyChannel; diff --git a/v1_19_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_19_R1/EntityHolograms.java b/v1_19_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_19_R1/EntityHolograms.java index efafda5..a93273b 100644 --- a/v1_19_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_19_R1/EntityHolograms.java +++ b/v1_19_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_19_R1/EntityHolograms.java @@ -1,7 +1,7 @@ package com.bgsoftware.wildloaders.nms.v1_19_R1; import com.bgsoftware.wildloaders.api.holograms.Hologram; -import com.bgsoftware.wildloaders.nms.mapping.Remap; +import com.bgsoftware.common.remaps.Remap; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.chat.IChatBaseComponent; import net.minecraft.sounds.SoundEffect; diff --git a/v1_19_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_19_R1/NMSAdapter.java b/v1_19_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_19_R1/NMSAdapter.java index 9514d48..91b7c3b 100644 --- a/v1_19_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_19_R1/NMSAdapter.java +++ b/v1_19_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_19_R1/NMSAdapter.java @@ -4,7 +4,7 @@ import com.bgsoftware.common.reflection.ReflectMethod; import com.bgsoftware.wildloaders.WildLoadersPlugin; import com.bgsoftware.wildloaders.api.loaders.ChunkLoader; import com.bgsoftware.wildloaders.loaders.ITileEntityChunkLoader; -import com.bgsoftware.wildloaders.nms.mapping.Remap; +import com.bgsoftware.common.remaps.Remap; import com.bgsoftware.wildloaders.nms.v1_19_R1.loader.TileEntityChunkLoader; import com.bgsoftware.wildloaders.nms.v1_19_R1.mappings.net.minecraft.core.BlockPosition; import com.bgsoftware.wildloaders.nms.v1_19_R1.mappings.net.minecraft.nbt.NBTTagCompound; diff --git a/v1_19_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_19_R1/loader/TileEntityChunkLoader.java b/v1_19_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_19_R1/loader/TileEntityChunkLoader.java index ca5d648..1bc10ed 100644 --- a/v1_19_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_19_R1/loader/TileEntityChunkLoader.java +++ b/v1_19_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_19_R1/loader/TileEntityChunkLoader.java @@ -4,7 +4,7 @@ import com.bgsoftware.wildloaders.api.holograms.Hologram; import com.bgsoftware.wildloaders.api.loaders.ChunkLoader; import com.bgsoftware.wildloaders.loaders.ITileEntityChunkLoader; import com.bgsoftware.wildloaders.loaders.WChunkLoader; -import com.bgsoftware.wildloaders.nms.mapping.Remap; +import com.bgsoftware.common.remaps.Remap; import com.bgsoftware.wildloaders.nms.v1_19_R1.EntityHolograms; import com.bgsoftware.wildloaders.nms.v1_19_R1.mappings.net.minecraft.core.BlockPosition; import com.bgsoftware.wildloaders.nms.v1_19_R1.mappings.net.minecraft.world.level.ChunkCoordIntPair; diff --git a/v1_19_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_19_R1/loader/TileEntityChunkLoaderTicker.java b/v1_19_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_19_R1/loader/TileEntityChunkLoaderTicker.java index 99ded6b..cf5b3a2 100644 --- a/v1_19_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_19_R1/loader/TileEntityChunkLoaderTicker.java +++ b/v1_19_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_19_R1/loader/TileEntityChunkLoaderTicker.java @@ -1,6 +1,6 @@ package com.bgsoftware.wildloaders.nms.v1_19_R1.loader; -import com.bgsoftware.wildloaders.nms.mapping.Remap; +import com.bgsoftware.common.remaps.Remap; import net.minecraft.core.BlockPosition; import net.minecraft.world.level.block.entity.TickingBlockEntity; import net.minecraft.world.level.block.entity.TileEntityTypes; diff --git a/v1_19_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_19_R1/mappings/net/minecraft/core/BlockPosition.java b/v1_19_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_19_R1/mappings/net/minecraft/core/BlockPosition.java index a4428a9..ca30dae 100644 --- a/v1_19_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_19_R1/mappings/net/minecraft/core/BlockPosition.java +++ b/v1_19_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_19_R1/mappings/net/minecraft/core/BlockPosition.java @@ -1,6 +1,6 @@ package com.bgsoftware.wildloaders.nms.v1_19_R1.mappings.net.minecraft.core; -import com.bgsoftware.wildloaders.nms.mapping.Remap; +import com.bgsoftware.common.remaps.Remap; import com.bgsoftware.wildloaders.nms.v1_19_R1.mappings.MappedObject; public class BlockPosition extends MappedObject { diff --git a/v1_19_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_19_R1/mappings/net/minecraft/nbt/NBTTagCompound.java b/v1_19_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_19_R1/mappings/net/minecraft/nbt/NBTTagCompound.java index 4d79cef..e8a85f6 100644 --- a/v1_19_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_19_R1/mappings/net/minecraft/nbt/NBTTagCompound.java +++ b/v1_19_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_19_R1/mappings/net/minecraft/nbt/NBTTagCompound.java @@ -1,6 +1,6 @@ package com.bgsoftware.wildloaders.nms.v1_19_R1.mappings.net.minecraft.nbt; -import com.bgsoftware.wildloaders.nms.mapping.Remap; +import com.bgsoftware.common.remaps.Remap; import com.bgsoftware.wildloaders.nms.v1_19_R1.mappings.MappedObject; import net.minecraft.nbt.NBTBase; diff --git a/v1_19_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_19_R1/mappings/net/minecraft/world/entity/Entity.java b/v1_19_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_19_R1/mappings/net/minecraft/world/entity/Entity.java index d99ae30..4c7fedb 100644 --- a/v1_19_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_19_R1/mappings/net/minecraft/world/entity/Entity.java +++ b/v1_19_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_19_R1/mappings/net/minecraft/world/entity/Entity.java @@ -1,6 +1,6 @@ package com.bgsoftware.wildloaders.nms.v1_19_R1.mappings.net.minecraft.world.entity; -import com.bgsoftware.wildloaders.nms.mapping.Remap; +import com.bgsoftware.common.remaps.Remap; import com.bgsoftware.wildloaders.nms.v1_19_R1.mappings.MappedObject; import com.bgsoftware.wildloaders.nms.v1_19_R1.mappings.net.minecraft.world.level.World; diff --git a/v1_19_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_19_R1/mappings/net/minecraft/world/item/ItemStack.java b/v1_19_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_19_R1/mappings/net/minecraft/world/item/ItemStack.java index a06146c..cc06279 100644 --- a/v1_19_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_19_R1/mappings/net/minecraft/world/item/ItemStack.java +++ b/v1_19_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_19_R1/mappings/net/minecraft/world/item/ItemStack.java @@ -1,6 +1,6 @@ package com.bgsoftware.wildloaders.nms.v1_19_R1.mappings.net.minecraft.world.item; -import com.bgsoftware.wildloaders.nms.mapping.Remap; +import com.bgsoftware.common.remaps.Remap; import com.bgsoftware.wildloaders.nms.v1_19_R1.mappings.MappedObject; import com.bgsoftware.wildloaders.nms.v1_19_R1.mappings.net.minecraft.nbt.NBTTagCompound; diff --git a/v1_19_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_19_R1/mappings/net/minecraft/world/level/ChunkCoordIntPair.java b/v1_19_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_19_R1/mappings/net/minecraft/world/level/ChunkCoordIntPair.java index 5129405..3297e36 100644 --- a/v1_19_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_19_R1/mappings/net/minecraft/world/level/ChunkCoordIntPair.java +++ b/v1_19_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_19_R1/mappings/net/minecraft/world/level/ChunkCoordIntPair.java @@ -1,6 +1,6 @@ package com.bgsoftware.wildloaders.nms.v1_19_R1.mappings.net.minecraft.world.level; -import com.bgsoftware.wildloaders.nms.mapping.Remap; +import com.bgsoftware.common.remaps.Remap; import com.bgsoftware.wildloaders.nms.v1_19_R1.mappings.MappedObject; public class ChunkCoordIntPair extends MappedObject { diff --git a/v1_19_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_19_R1/mappings/net/minecraft/world/level/World.java b/v1_19_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_19_R1/mappings/net/minecraft/world/level/World.java index 269b705..db41689 100644 --- a/v1_19_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_19_R1/mappings/net/minecraft/world/level/World.java +++ b/v1_19_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_19_R1/mappings/net/minecraft/world/level/World.java @@ -1,6 +1,6 @@ package com.bgsoftware.wildloaders.nms.v1_19_R1.mappings.net.minecraft.world.level; -import com.bgsoftware.wildloaders.nms.mapping.Remap; +import com.bgsoftware.common.remaps.Remap; import com.bgsoftware.wildloaders.nms.v1_19_R1.mappings.MappedObject; import com.bgsoftware.wildloaders.nms.v1_19_R1.mappings.net.minecraft.world.level.block.state.IBlockData; import net.minecraft.core.BlockPosition; diff --git a/v1_19_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_19_R1/mappings/net/minecraft/world/level/block/entity/TileEntity.java b/v1_19_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_19_R1/mappings/net/minecraft/world/level/block/entity/TileEntity.java index c9f84c2..df67a6c 100644 --- a/v1_19_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_19_R1/mappings/net/minecraft/world/level/block/entity/TileEntity.java +++ b/v1_19_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_19_R1/mappings/net/minecraft/world/level/block/entity/TileEntity.java @@ -1,6 +1,6 @@ package com.bgsoftware.wildloaders.nms.v1_19_R1.mappings.net.minecraft.world.level.block.entity; -import com.bgsoftware.wildloaders.nms.mapping.Remap; +import com.bgsoftware.common.remaps.Remap; import com.bgsoftware.wildloaders.nms.v1_19_R1.mappings.MappedObject; import net.minecraft.world.level.MobSpawnerAbstract; import net.minecraft.world.level.block.entity.TileEntityMobSpawner; diff --git a/v1_19_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_19_R1/mappings/net/minecraft/world/level/block/state/IBlockData.java b/v1_19_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_19_R1/mappings/net/minecraft/world/level/block/state/IBlockData.java index be05d9c..90624cc 100644 --- a/v1_19_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_19_R1/mappings/net/minecraft/world/level/block/state/IBlockData.java +++ b/v1_19_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_19_R1/mappings/net/minecraft/world/level/block/state/IBlockData.java @@ -1,6 +1,6 @@ package com.bgsoftware.wildloaders.nms.v1_19_R1.mappings.net.minecraft.world.level.block.state; -import com.bgsoftware.wildloaders.nms.mapping.Remap; +import com.bgsoftware.common.remaps.Remap; import com.bgsoftware.wildloaders.nms.v1_19_R1.mappings.MappedObject; import net.minecraft.world.level.block.Block; diff --git a/v1_19_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_19_R1/mappings/net/minecraft/world/level/chunk/Chunk.java b/v1_19_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_19_R1/mappings/net/minecraft/world/level/chunk/Chunk.java index 3d66eab..cc422e5 100644 --- a/v1_19_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_19_R1/mappings/net/minecraft/world/level/chunk/Chunk.java +++ b/v1_19_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_19_R1/mappings/net/minecraft/world/level/chunk/Chunk.java @@ -1,6 +1,6 @@ package com.bgsoftware.wildloaders.nms.v1_19_R1.mappings.net.minecraft.world.level.chunk; -import com.bgsoftware.wildloaders.nms.mapping.Remap; +import com.bgsoftware.common.remaps.Remap; import com.bgsoftware.wildloaders.nms.v1_19_R1.mappings.MappedObject; import com.bgsoftware.wildloaders.nms.v1_19_R1.mappings.net.minecraft.world.level.ChunkCoordIntPair; import net.minecraft.core.BlockPosition;