diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index e6b189db..0e39dd11 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -30,22 +30,16 @@ jobs: with: path: ./.gradle key: ${{ runner.os }}-gradle-file - - name: Cache FG - uses: actions/cache@v1 - with: - path: ./arclight-coremod/build - key: ${{ runner.os }}-fg - - name: Clean - run: yes | rm -rf ./arclight-coremod/build/libs - name: Grant execute permission for gradlew run: chmod +x gradlew - - name: Setup workspace - run: ./gradlew idea remapSpigotJar --no-daemon -i - name: Build - run: ./gradlew build --no-daemon -i + run: | + ./gradlew cleanBuild idea remapSpigotJar --no-daemon -i --stacktrace + ./gradlew build --no-daemon -i --stacktrace + ./gradlew build collect --no-daemon -i --stacktrace - name: Upload Artifact uses: actions/upload-artifact@v2 with: name: Arclight - path: ./arclight-coremod/build/libs/*.* + path: ./build/libs/*.jar diff --git a/appveyor.yml b/appveyor.yml index f7d41778..e151c1ab 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -4,13 +4,13 @@ environment: cache: - C:/Users/appveyor/.gradle - ./.gradle - - ./arclight-coremod/build build_script: - cmd: | - IF EXIST arclight-coremod\build\libs ( del /S /Q arclight-coremod\build\libs ) - gradlew idea remapSpigotJar --no-daemon -i - gradlew build --no-daemon -i + gradlew cleanBuild idea remapSpigotJar --no-daemon -i --stacktrace + gradlew build --no-daemon -i --stacktrace + rem Due to a MixinGradle bug, we need to build it twice + gradlew build collect --no-daemon -i --stacktrace test: off artifacts: - - path: ./arclight-coremod/build/libs/*.* + - path: ./build/libs/*.jar name: . \ No newline at end of file diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/util/EnumHelper.java b/arclight-api/src/main/java/io/izzel/arclight/api/EnumHelper.java similarity index 62% rename from arclight-coremod/src/main/java/io/izzel/arclight/util/EnumHelper.java rename to arclight-api/src/main/java/io/izzel/arclight/api/EnumHelper.java index 53205ef0..8811953d 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/util/EnumHelper.java +++ b/arclight-api/src/main/java/io/izzel/arclight/api/EnumHelper.java @@ -1,42 +1,14 @@ -package io.izzel.arclight.util; - -import com.google.common.collect.ImmutableList; -import io.izzel.arclight.api.Unsafe; -import org.bukkit.Material; +package io.izzel.arclight.api; import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodType; import java.lang.reflect.Array; import java.lang.reflect.Field; +import java.util.ArrayList; import java.util.List; -import java.util.Map; public class EnumHelper { - private static Map BY_NAME; - - @SuppressWarnings("unchecked") - public static Material addMaterial(String name, final int id, final int stack, final int durability) { - if (BY_NAME == null) { - try { - Unsafe.ensureClassInitialized(Material.class); - Field field = Material.class.getDeclaredField("BY_NAME"); - Object materialByNameBase = Unsafe.staticFieldBase(field); - long materialByNameOffset = Unsafe.staticFieldOffset(field); - BY_NAME = (Map) Unsafe.getObject(materialByNameBase, materialByNameOffset); - } catch (NoSuchFieldException e) { - e.printStackTrace(); - } - } - Material material = addEnum( - Material.class, name, - ImmutableList.of(int.class, int.class, int.class), - ImmutableList.of(id, stack, durability) - ); - BY_NAME.put(name, material); - return material; - } - @SuppressWarnings("unchecked") public static T addEnum(Class cl, String name, List> ctorTypes, List ctorParams) { try { @@ -48,10 +20,7 @@ public class EnumHelper { T[] newArr = (T[]) Array.newInstance(cl, arr.length + 1); System.arraycopy(arr, 0, newArr, 0, arr.length); - List> ctor = ImmutableList.>builder().add(String.class, int.class).addAll(ctorTypes).build(); - MethodHandle constructor = Unsafe.lookup().findConstructor(cl, MethodType.methodType(void.class, ctor)); - List param = ImmutableList.builder().add(name, arr.length).addAll(ctorParams).build(); - T newInstance = (T) constructor.invokeWithArguments(param); + T newInstance = makeEnum(cl, name, arr.length, ctorTypes, ctorParams); newArr[arr.length] = newInstance; Unsafe.putObject(base, offset, newArr); @@ -85,9 +54,15 @@ public class EnumHelper { public static T makeEnum(Class cl, String name, int i, List> ctorTypes, List ctorParams) { try { Unsafe.ensureClassInitialized(cl); - List> ctor = ImmutableList.>builder().add(String.class, int.class).addAll(ctorTypes).build(); + List> ctor = new ArrayList<>(ctorTypes.size() + 2); + ctor.add(String.class); + ctor.add(int.class); + ctor.addAll(ctorTypes); MethodHandle constructor = Unsafe.lookup().findConstructor(cl, MethodType.methodType(void.class, ctor)); - List param = ImmutableList.builder().add(name, i).addAll(ctorParams).build(); + List param = new ArrayList<>(ctorParams.size() + 2); + param.add(name); + param.add(i); + param.addAll(ctorParams); return (T) constructor.invokeWithArguments(param); } catch (Throwable e) { e.printStackTrace(); diff --git a/arclight-common/arclight-common.iml b/arclight-common/arclight-common.iml new file mode 100644 index 00000000..a8e74b91 --- /dev/null +++ b/arclight-common/arclight-common.iml @@ -0,0 +1,840 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/arclight-common/build.gradle b/arclight-common/build.gradle index 017ef278..b1134ea9 100644 --- a/arclight-common/build.gradle +++ b/arclight-common/build.gradle @@ -1,11 +1,82 @@ -plugins { - id 'java' +buildscript { + repositories { + maven { url = 'https://files.minecraftforge.net/maven' } + maven { url = 'https://repo.spongepowered.org/maven' } + jcenter() + mavenCentral() + maven { url = 'https://jitpack.io' } + } + dependencies { + classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '3.+', changing: true + classpath 'org.spongepowered:mixingradle:0.7-SNAPSHOT' + classpath 'com.github.IzzelAliz:arclight-gradle-plugin:1.3' + } +} + +apply plugin: 'net.minecraftforge.gradle' +apply plugin: 'org.spongepowered.mixin' +apply plugin: 'java' +apply plugin: 'idea' +apply plugin: 'io.izzel.arclight' + +ext { + minecraftVersion = '1.14.4' + forgeVersion = '28.2.0' +} + +arclight { + mcVersion = minecraftVersion + forgeVersion = project.ext.forgeVersion + bukkitVersion = 'v1_14_R1' + wipeVersion = true + reobfVersion = false +} + +sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8' + +minecraft { + mappings channel: 'stable', version: "58-$minecraftVersion" + accessTransformer = project.file('src/main/resources/META-INF/accesstransformer.cfg') } repositories { - mavenCentral() + jcenter() + maven { url = 'https://repo.spongepowered.org/maven' } + maven { url = 'https://oss.sonatype.org/content/repositories/snapshots/' } + maven { url = 'https://hub.spigotmc.org/nexus/content/repositories/snapshots/' } + maven { url = 'https://repo.codemc.io/repository/nms/' } + maven { url = 'https://files.minecraftforge.net/maven/' } } dependencies { + minecraft "net.minecraftforge:forge:$minecraftVersion-$forgeVersion" + compile "org.spigotmc:spigot-api:$minecraftVersion-R0.1-SNAPSHOT@jar" + compile 'org.jetbrains:annotations:19.0.0' + compile 'org.spongepowered:mixin:0.8' + compile 'jline:jline:2.12.1' + compile 'net.md-5:SpecialSource:1.8.6' + compile 'org.apache.logging.log4j:log4j-jul:2.11.2' + compile 'net.md-5:bungeecord-chat:1.13-SNAPSHOT' + compile 'mysql:mysql-connector-java:5.1.47' + compile 'org.yaml:snakeyaml:1.23' compile project(':arclight-api') } + +remapSpigotJar { + includes.add('net/minecraft/block/ChestBlock$DoubleInventory') +} + +generateArclightMeta { + doFirst { + throw new StopExecutionException() + } +} + +mixin { + add sourceSets.main, 'mixins.arclight.refmap.json' +} + +compileJava { + options.compilerArgs << '-XDignore.symbol.file' << '-XDenableSunApiLintControl' + options.encoding = 'UTF-8' +} diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/advancement/AdvancementBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/advancement/AdvancementBridge.java similarity index 69% rename from arclight-coremod/src/main/java/io/izzel/arclight/bridge/advancement/AdvancementBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/advancement/AdvancementBridge.java index 23f85ed4..4f73669e 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/advancement/AdvancementBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/advancement/AdvancementBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.bridge.advancement; +package io.izzel.arclight.common.bridge.advancement; import org.bukkit.advancement.Advancement; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/block/BlockBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/block/BlockBridge.java similarity index 86% rename from arclight-coremod/src/main/java/io/izzel/arclight/bridge/block/BlockBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/block/BlockBridge.java index 3f731241..7c028802 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/block/BlockBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/block/BlockBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.bridge.block; +package io.izzel.arclight.common.bridge.block; import net.minecraft.block.BlockState; import net.minecraft.item.ItemStack; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/block/NetherPortalBlockBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/block/NetherPortalBlockBridge.java similarity index 71% rename from arclight-coremod/src/main/java/io/izzel/arclight/bridge/block/NetherPortalBlockBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/block/NetherPortalBlockBridge.java index c9b642a8..6c352a5f 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/block/NetherPortalBlockBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/block/NetherPortalBlockBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.bridge.block; +package io.izzel.arclight.common.bridge.block; public interface NetherPortalBlockBridge { diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/bukkit/JavaPluginLoaderBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/bukkit/JavaPluginLoaderBridge.java similarity index 85% rename from arclight-coremod/src/main/java/io/izzel/arclight/bridge/bukkit/JavaPluginLoaderBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/bukkit/JavaPluginLoaderBridge.java index 33e933e2..b4de094b 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/bukkit/JavaPluginLoaderBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/bukkit/JavaPluginLoaderBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.bridge.bukkit; +package io.izzel.arclight.common.bridge.bukkit; import java.net.URLClassLoader; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/bukkit/MaterialBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/bukkit/MaterialBridge.java similarity index 84% rename from arclight-coremod/src/main/java/io/izzel/arclight/bridge/bukkit/MaterialBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/bukkit/MaterialBridge.java index bf2f69ce..0dd18dad 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/bukkit/MaterialBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/bukkit/MaterialBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.bridge.bukkit; +package io.izzel.arclight.common.bridge.bukkit; import org.bukkit.NamespacedKey; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/command/CommandSourceBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/command/CommandSourceBridge.java similarity index 84% rename from arclight-coremod/src/main/java/io/izzel/arclight/bridge/command/CommandSourceBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/command/CommandSourceBridge.java index 961db6c4..2598d1d1 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/command/CommandSourceBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/command/CommandSourceBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.bridge.command; +package io.izzel.arclight.common.bridge.command; import com.mojang.brigadier.tree.CommandNode; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/command/ICommandSourceBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/command/ICommandSourceBridge.java similarity index 79% rename from arclight-coremod/src/main/java/io/izzel/arclight/bridge/command/ICommandSourceBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/command/ICommandSourceBridge.java index 9962030d..f2be5bb3 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/command/ICommandSourceBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/command/ICommandSourceBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.bridge.command; +package io.izzel.arclight.common.bridge.command; import net.minecraft.command.CommandSource; import org.bukkit.command.CommandSender; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/command/arguments/EntityArgumentBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/command/arguments/EntityArgumentBridge.java similarity index 84% rename from arclight-coremod/src/main/java/io/izzel/arclight/bridge/command/arguments/EntityArgumentBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/command/arguments/EntityArgumentBridge.java index 83b83fd7..830aff49 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/command/arguments/EntityArgumentBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/command/arguments/EntityArgumentBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.bridge.command.arguments; +package io.izzel.arclight.common.bridge.command.arguments; import com.mojang.brigadier.StringReader; import com.mojang.brigadier.exceptions.CommandSyntaxException; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/command/arguments/EntitySelectorParserBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/command/arguments/EntitySelectorParserBridge.java similarity index 85% rename from arclight-coremod/src/main/java/io/izzel/arclight/bridge/command/arguments/EntitySelectorParserBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/command/arguments/EntitySelectorParserBridge.java index b12d041d..a760cc2c 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/command/arguments/EntitySelectorParserBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/command/arguments/EntitySelectorParserBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.bridge.command.arguments; +package io.izzel.arclight.common.bridge.command.arguments; import com.mojang.brigadier.exceptions.CommandSyntaxException; import net.minecraft.command.arguments.EntitySelector; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/entity/AreaEffectCloudEntityBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/entity/AreaEffectCloudEntityBridge.java similarity index 79% rename from arclight-coremod/src/main/java/io/izzel/arclight/bridge/entity/AreaEffectCloudEntityBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/entity/AreaEffectCloudEntityBridge.java index fbc07579..be1086a4 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/entity/AreaEffectCloudEntityBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/entity/AreaEffectCloudEntityBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.bridge.entity; +package io.izzel.arclight.common.bridge.entity; public interface AreaEffectCloudEntityBridge { diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/entity/EntityBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/entity/EntityBridge.java similarity index 91% rename from arclight-coremod/src/main/java/io/izzel/arclight/bridge/entity/EntityBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/entity/EntityBridge.java index a0caf64e..5a3a83e7 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/entity/EntityBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/entity/EntityBridge.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.bridge.entity; +package io.izzel.arclight.common.bridge.entity; -import io.izzel.arclight.bridge.command.ICommandSourceBridge; +import io.izzel.arclight.common.bridge.command.ICommandSourceBridge; import net.minecraft.entity.Entity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.dimension.DimensionType; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/entity/EntityTypeBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/entity/EntityTypeBridge.java similarity index 93% rename from arclight-coremod/src/main/java/io/izzel/arclight/bridge/entity/EntityTypeBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/entity/EntityTypeBridge.java index c6943b17..d6a87a27 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/entity/EntityTypeBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/entity/EntityTypeBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.bridge.entity; +package io.izzel.arclight.common.bridge.entity; import net.minecraft.entity.Entity; import net.minecraft.entity.SpawnReason; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/entity/InternalEntityBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/entity/InternalEntityBridge.java similarity index 74% rename from arclight-coremod/src/main/java/io/izzel/arclight/bridge/entity/InternalEntityBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/entity/InternalEntityBridge.java index 3e828b5d..eba37e72 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/entity/InternalEntityBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/entity/InternalEntityBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.bridge.entity; +package io.izzel.arclight.common.bridge.entity; import org.bukkit.craftbukkit.v.entity.CraftEntity; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/entity/LivingEntityBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/entity/LivingEntityBridge.java similarity index 96% rename from arclight-coremod/src/main/java/io/izzel/arclight/bridge/entity/LivingEntityBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/entity/LivingEntityBridge.java index 5d15e917..2ff983f5 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/entity/LivingEntityBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/entity/LivingEntityBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.bridge.entity; +package io.izzel.arclight.common.bridge.entity; import net.minecraft.potion.Effect; import net.minecraft.potion.EffectInstance; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/entity/MobEntityBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/entity/MobEntityBridge.java similarity index 92% rename from arclight-coremod/src/main/java/io/izzel/arclight/bridge/entity/MobEntityBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/entity/MobEntityBridge.java index ba03a7ad..650b49d6 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/entity/MobEntityBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/entity/MobEntityBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.bridge.entity; +package io.izzel.arclight.common.bridge.entity; import net.minecraft.entity.LivingEntity; import net.minecraft.util.ResourceLocation; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/entity/ai/attributes/RangedAttributeBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/entity/ai/attributes/RangedAttributeBridge.java similarity index 61% rename from arclight-coremod/src/main/java/io/izzel/arclight/bridge/entity/ai/attributes/RangedAttributeBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/entity/ai/attributes/RangedAttributeBridge.java index f9928f20..a941dbcb 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/entity/ai/attributes/RangedAttributeBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/entity/ai/attributes/RangedAttributeBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.bridge.entity.ai.attributes; +package io.izzel.arclight.common.bridge.entity.ai.attributes; public interface RangedAttributeBridge { diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/entity/merchant/IMerchantBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/entity/merchant/IMerchantBridge.java similarity index 71% rename from arclight-coremod/src/main/java/io/izzel/arclight/bridge/entity/merchant/IMerchantBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/entity/merchant/IMerchantBridge.java index 0eba7c07..3f9eb659 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/entity/merchant/IMerchantBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/entity/merchant/IMerchantBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.bridge.entity.merchant; +package io.izzel.arclight.common.bridge.entity.merchant; import org.bukkit.craftbukkit.v.inventory.CraftMerchant; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/entity/monster/CreeperEntityBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/entity/monster/CreeperEntityBridge.java new file mode 100644 index 00000000..5117a5cb --- /dev/null +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/entity/monster/CreeperEntityBridge.java @@ -0,0 +1,8 @@ +package io.izzel.arclight.common.bridge.entity.monster; + +import io.izzel.arclight.common.bridge.entity.MobEntityBridge; + +public interface CreeperEntityBridge extends MobEntityBridge { + + void bridge$setPowered(boolean power); +} diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/entity/passive/AnimalEntityBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/entity/passive/AnimalEntityBridge.java similarity index 54% rename from arclight-coremod/src/main/java/io/izzel/arclight/bridge/entity/passive/AnimalEntityBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/entity/passive/AnimalEntityBridge.java index 06eca944..9d63603a 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/entity/passive/AnimalEntityBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/entity/passive/AnimalEntityBridge.java @@ -1,7 +1,7 @@ -package io.izzel.arclight.bridge.entity.passive; +package io.izzel.arclight.common.bridge.entity.passive; import net.minecraft.item.ItemStack; -import io.izzel.arclight.bridge.entity.MobEntityBridge; +import io.izzel.arclight.common.bridge.entity.MobEntityBridge; public interface AnimalEntityBridge extends MobEntityBridge { diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/entity/passive/FoxEntityBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/entity/passive/FoxEntityBridge.java similarity index 70% rename from arclight-coremod/src/main/java/io/izzel/arclight/bridge/entity/passive/FoxEntityBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/entity/passive/FoxEntityBridge.java index ffdbe12d..a3f56e56 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/entity/passive/FoxEntityBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/entity/passive/FoxEntityBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.bridge.entity.passive; +package io.izzel.arclight.common.bridge.entity.passive; import java.util.UUID; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/entity/passive/TurtleEntityBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/entity/passive/TurtleEntityBridge.java similarity index 79% rename from arclight-coremod/src/main/java/io/izzel/arclight/bridge/entity/passive/TurtleEntityBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/entity/passive/TurtleEntityBridge.java index 920f0cd2..3781f1e7 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/entity/passive/TurtleEntityBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/entity/passive/TurtleEntityBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.bridge.entity.passive; +package io.izzel.arclight.common.bridge.entity.passive; public interface TurtleEntityBridge extends AnimalEntityBridge { diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/entity/player/PlayerEntityBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/entity/player/PlayerEntityBridge.java similarity index 80% rename from arclight-coremod/src/main/java/io/izzel/arclight/bridge/entity/player/PlayerEntityBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/entity/player/PlayerEntityBridge.java index 9f2d1686..164c9be5 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/entity/player/PlayerEntityBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/entity/player/PlayerEntityBridge.java @@ -1,11 +1,11 @@ -package io.izzel.arclight.bridge.entity.player; +package io.izzel.arclight.common.bridge.entity.player; import com.mojang.datafixers.util.Either; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.util.Unit; import net.minecraft.util.math.BlockPos; import org.bukkit.craftbukkit.v.entity.CraftHumanEntity; -import io.izzel.arclight.bridge.entity.LivingEntityBridge; +import io.izzel.arclight.common.bridge.entity.LivingEntityBridge; public interface PlayerEntityBridge extends LivingEntityBridge { diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/entity/player/PlayerInventoryBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/entity/player/PlayerInventoryBridge.java similarity index 69% rename from arclight-coremod/src/main/java/io/izzel/arclight/bridge/entity/player/PlayerInventoryBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/entity/player/PlayerInventoryBridge.java index ed4a02e6..55462d9e 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/entity/player/PlayerInventoryBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/entity/player/PlayerInventoryBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.bridge.entity.player; +package io.izzel.arclight.common.bridge.entity.player; import net.minecraft.item.ItemStack; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/entity/player/ServerPlayerEntityBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/entity/player/ServerPlayerEntityBridge.java similarity index 94% rename from arclight-coremod/src/main/java/io/izzel/arclight/bridge/entity/player/ServerPlayerEntityBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/entity/player/ServerPlayerEntityBridge.java index 45504f7d..44667cc7 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/entity/player/ServerPlayerEntityBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/entity/player/ServerPlayerEntityBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.bridge.entity.player; +package io.izzel.arclight.common.bridge.entity.player; import net.minecraft.entity.Entity; import net.minecraft.util.math.BlockPos; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/entity/projectile/ArrowEntityBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/entity/projectile/ArrowEntityBridge.java similarity index 65% rename from arclight-coremod/src/main/java/io/izzel/arclight/bridge/entity/projectile/ArrowEntityBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/entity/projectile/ArrowEntityBridge.java index 78cf8c2f..e26a4a7f 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/entity/projectile/ArrowEntityBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/entity/projectile/ArrowEntityBridge.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.bridge.entity.projectile; +package io.izzel.arclight.common.bridge.entity.projectile; -import io.izzel.arclight.bridge.entity.EntityBridge; +import io.izzel.arclight.common.bridge.entity.EntityBridge; public interface ArrowEntityBridge extends EntityBridge { diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/entity/projectile/DamagingProjectileEntityBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/entity/projectile/DamagingProjectileEntityBridge.java similarity index 50% rename from arclight-coremod/src/main/java/io/izzel/arclight/bridge/entity/projectile/DamagingProjectileEntityBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/entity/projectile/DamagingProjectileEntityBridge.java index c01861f8..5de201da 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/entity/projectile/DamagingProjectileEntityBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/entity/projectile/DamagingProjectileEntityBridge.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.bridge.entity.projectile; +package io.izzel.arclight.common.bridge.entity.projectile; -import io.izzel.arclight.bridge.entity.EntityBridge; +import io.izzel.arclight.common.bridge.entity.EntityBridge; public interface DamagingProjectileEntityBridge extends EntityBridge { diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/entity/projectile/TridentEntityBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/entity/projectile/TridentEntityBridge.java similarity index 69% rename from arclight-coremod/src/main/java/io/izzel/arclight/bridge/entity/projectile/TridentEntityBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/entity/projectile/TridentEntityBridge.java index d5d66ca2..74e671ce 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/entity/projectile/TridentEntityBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/entity/projectile/TridentEntityBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.bridge.entity.projectile; +package io.izzel.arclight.common.bridge.entity.projectile; import net.minecraft.item.ItemStack; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/inventory/CraftingInventoryBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/inventory/CraftingInventoryBridge.java similarity index 84% rename from arclight-coremod/src/main/java/io/izzel/arclight/bridge/inventory/CraftingInventoryBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/inventory/CraftingInventoryBridge.java index 51febcf2..2abe9403 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/inventory/CraftingInventoryBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/inventory/CraftingInventoryBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.bridge.inventory; +package io.izzel.arclight.common.bridge.inventory; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.inventory.IInventory; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/inventory/IInventoryBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/inventory/IInventoryBridge.java similarity index 93% rename from arclight-coremod/src/main/java/io/izzel/arclight/bridge/inventory/IInventoryBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/inventory/IInventoryBridge.java index eaa5756b..4eb0bb6c 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/inventory/IInventoryBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/inventory/IInventoryBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.bridge.inventory; +package io.izzel.arclight.common.bridge.inventory; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/inventory/container/CartographyContainerBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/inventory/container/CartographyContainerBridge.java similarity index 73% rename from arclight-coremod/src/main/java/io/izzel/arclight/bridge/inventory/container/CartographyContainerBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/inventory/container/CartographyContainerBridge.java index a0d39fdf..43077989 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/inventory/container/CartographyContainerBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/inventory/container/CartographyContainerBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.bridge.inventory.container; +package io.izzel.arclight.common.bridge.inventory.container; import net.minecraft.util.IWorldPosCallable; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/inventory/container/ContainerBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/inventory/container/ContainerBridge.java similarity index 88% rename from arclight-coremod/src/main/java/io/izzel/arclight/bridge/inventory/container/ContainerBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/inventory/container/ContainerBridge.java index 3828455e..9632a0d0 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/inventory/container/ContainerBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/inventory/container/ContainerBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.bridge.inventory.container; +package io.izzel.arclight.common.bridge.inventory.container; import net.minecraft.inventory.container.Container; import net.minecraft.util.text.ITextComponent; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/inventory/container/EnchantmentContainerBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/inventory/container/EnchantmentContainerBridge.java similarity index 73% rename from arclight-coremod/src/main/java/io/izzel/arclight/bridge/inventory/container/EnchantmentContainerBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/inventory/container/EnchantmentContainerBridge.java index a3df7b44..f648d60f 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/inventory/container/EnchantmentContainerBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/inventory/container/EnchantmentContainerBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.bridge.inventory.container; +package io.izzel.arclight.common.bridge.inventory.container; import net.minecraft.util.IWorldPosCallable; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/inventory/container/GrindstoneContainerBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/inventory/container/GrindstoneContainerBridge.java similarity index 73% rename from arclight-coremod/src/main/java/io/izzel/arclight/bridge/inventory/container/GrindstoneContainerBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/inventory/container/GrindstoneContainerBridge.java index 1120048b..030f8e6c 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/inventory/container/GrindstoneContainerBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/inventory/container/GrindstoneContainerBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.bridge.inventory.container; +package io.izzel.arclight.common.bridge.inventory.container; import net.minecraft.util.IWorldPosCallable; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/inventory/container/LecternContainerBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/inventory/container/LecternContainerBridge.java similarity index 73% rename from arclight-coremod/src/main/java/io/izzel/arclight/bridge/inventory/container/LecternContainerBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/inventory/container/LecternContainerBridge.java index b2722545..cae435f6 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/inventory/container/LecternContainerBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/inventory/container/LecternContainerBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.bridge.inventory.container; +package io.izzel.arclight.common.bridge.inventory.container; import net.minecraft.entity.player.PlayerInventory; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/inventory/container/LoomContainerBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/inventory/container/LoomContainerBridge.java similarity index 72% rename from arclight-coremod/src/main/java/io/izzel/arclight/bridge/inventory/container/LoomContainerBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/inventory/container/LoomContainerBridge.java index 1a20be9a..24a90e16 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/inventory/container/LoomContainerBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/inventory/container/LoomContainerBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.bridge.inventory.container; +package io.izzel.arclight.common.bridge.inventory.container; import net.minecraft.util.IWorldPosCallable; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/inventory/container/WorkbenchContainerBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/inventory/container/WorkbenchContainerBridge.java similarity index 73% rename from arclight-coremod/src/main/java/io/izzel/arclight/bridge/inventory/container/WorkbenchContainerBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/inventory/container/WorkbenchContainerBridge.java index 9a6ecbbd..19108e94 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/inventory/container/WorkbenchContainerBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/inventory/container/WorkbenchContainerBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.bridge.inventory.container; +package io.izzel.arclight.common.bridge.inventory.container; import net.minecraft.util.IWorldPosCallable; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/item/ItemStackBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/item/ItemStackBridge.java similarity index 64% rename from arclight-coremod/src/main/java/io/izzel/arclight/bridge/item/ItemStackBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/item/ItemStackBridge.java index 02958a31..e2883053 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/item/ItemStackBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/item/ItemStackBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.bridge.item; +package io.izzel.arclight.common.bridge.item; public interface ItemStackBridge { diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/item/MerchantOfferBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/item/MerchantOfferBridge.java similarity index 76% rename from arclight-coremod/src/main/java/io/izzel/arclight/bridge/item/MerchantOfferBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/item/MerchantOfferBridge.java index f366a079..83d636a1 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/item/MerchantOfferBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/item/MerchantOfferBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.bridge.item; +package io.izzel.arclight.common.bridge.item; import org.bukkit.craftbukkit.v.inventory.CraftMerchantRecipe; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/item/crafting/IRecipeBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/item/crafting/IRecipeBridge.java similarity index 66% rename from arclight-coremod/src/main/java/io/izzel/arclight/bridge/item/crafting/IRecipeBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/item/crafting/IRecipeBridge.java index 75033457..49e07ed6 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/item/crafting/IRecipeBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/item/crafting/IRecipeBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.bridge.item.crafting; +package io.izzel.arclight.common.bridge.item.crafting; import org.bukkit.inventory.Recipe; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/item/crafting/IngredientBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/item/crafting/IngredientBridge.java similarity index 67% rename from arclight-coremod/src/main/java/io/izzel/arclight/bridge/item/crafting/IngredientBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/item/crafting/IngredientBridge.java index acf8356a..83eaa45d 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/item/crafting/IngredientBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/item/crafting/IngredientBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.bridge.item.crafting; +package io.izzel.arclight.common.bridge.item.crafting; public interface IngredientBridge { diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/item/crafting/RecipeManagerBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/item/crafting/RecipeManagerBridge.java similarity index 75% rename from arclight-coremod/src/main/java/io/izzel/arclight/bridge/item/crafting/RecipeManagerBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/item/crafting/RecipeManagerBridge.java index bccd13fe..6198fb8f 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/item/crafting/RecipeManagerBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/item/crafting/RecipeManagerBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.bridge.item.crafting; +package io.izzel.arclight.common.bridge.item.crafting; import net.minecraft.item.crafting.IRecipe; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/network/datasync/EntityDataManagerBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/network/datasync/EntityDataManagerBridge.java similarity index 72% rename from arclight-coremod/src/main/java/io/izzel/arclight/bridge/network/datasync/EntityDataManagerBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/network/datasync/EntityDataManagerBridge.java index 9b2d53c7..0f29b037 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/network/datasync/EntityDataManagerBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/network/datasync/EntityDataManagerBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.bridge.network.datasync; +package io.izzel.arclight.common.bridge.network.datasync; import net.minecraft.network.datasync.DataParameter; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/network/play/ServerPlayNetHandlerBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/network/play/ServerPlayNetHandlerBridge.java similarity index 84% rename from arclight-coremod/src/main/java/io/izzel/arclight/bridge/network/play/ServerPlayNetHandlerBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/network/play/ServerPlayNetHandlerBridge.java index 503f85bb..af2c7a1e 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/network/play/ServerPlayNetHandlerBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/network/play/ServerPlayNetHandlerBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.bridge.network.play; +package io.izzel.arclight.common.bridge.network.play; import org.bukkit.Location; import org.bukkit.event.player.PlayerTeleportEvent; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/network/rcon/RConConsoleSourceBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/network/rcon/RConConsoleSourceBridge.java similarity index 63% rename from arclight-coremod/src/main/java/io/izzel/arclight/bridge/network/rcon/RConConsoleSourceBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/network/rcon/RConConsoleSourceBridge.java index 0f9ea99a..3f138f37 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/network/rcon/RConConsoleSourceBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/network/rcon/RConConsoleSourceBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.bridge.network.rcon; +package io.izzel.arclight.common.bridge.network.rcon; public interface RConConsoleSourceBridge { diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/server/CustomServerBossInfoBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/server/CustomServerBossInfoBridge.java similarity index 73% rename from arclight-coremod/src/main/java/io/izzel/arclight/bridge/server/CustomServerBossInfoBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/server/CustomServerBossInfoBridge.java index c53c7fd2..57de723a 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/server/CustomServerBossInfoBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/server/CustomServerBossInfoBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.bridge.server; +package io.izzel.arclight.common.bridge.server; import org.bukkit.boss.KeyedBossBar; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/server/MinecraftServerBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/server/MinecraftServerBridge.java similarity index 91% rename from arclight-coremod/src/main/java/io/izzel/arclight/bridge/server/MinecraftServerBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/server/MinecraftServerBridge.java index 9cbab579..31009016 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/server/MinecraftServerBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/server/MinecraftServerBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.bridge.server; +package io.izzel.arclight.common.bridge.server; import org.bukkit.command.ConsoleCommandSender; import org.bukkit.command.RemoteConsoleCommandSender; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/server/management/BanEntryBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/server/management/BanEntryBridge.java similarity index 60% rename from arclight-coremod/src/main/java/io/izzel/arclight/bridge/server/management/BanEntryBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/server/management/BanEntryBridge.java index 7079579f..2739e310 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/server/management/BanEntryBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/server/management/BanEntryBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.bridge.server.management; +package io.izzel.arclight.common.bridge.server.management; import java.util.Date; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/server/management/PlayerInteractionManagerBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/server/management/PlayerInteractionManagerBridge.java similarity index 79% rename from arclight-coremod/src/main/java/io/izzel/arclight/bridge/server/management/PlayerInteractionManagerBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/server/management/PlayerInteractionManagerBridge.java index 149d649c..9b328831 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/server/management/PlayerInteractionManagerBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/server/management/PlayerInteractionManagerBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.bridge.server.management; +package io.izzel.arclight.common.bridge.server.management; public interface PlayerInteractionManagerBridge { diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/server/management/PlayerListBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/server/management/PlayerListBridge.java similarity index 84% rename from arclight-coremod/src/main/java/io/izzel/arclight/bridge/server/management/PlayerListBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/server/management/PlayerListBridge.java index 9764ba01..851918af 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/server/management/PlayerListBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/server/management/PlayerListBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.bridge.server.management; +package io.izzel.arclight.common.bridge.server.management; import net.minecraft.entity.player.ServerPlayerEntity; import org.bukkit.craftbukkit.v.CraftServer; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/server/management/UserListBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/server/management/UserListBridge.java similarity index 64% rename from arclight-coremod/src/main/java/io/izzel/arclight/bridge/server/management/UserListBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/server/management/UserListBridge.java index 6c1fa5b8..9a07c8f4 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/server/management/UserListBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/server/management/UserListBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.bridge.server.management; +package io.izzel.arclight.common.bridge.server.management; import java.util.Collection; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/tags/NetworkTagCollectionBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/tags/NetworkTagCollectionBridge.java similarity index 63% rename from arclight-coremod/src/main/java/io/izzel/arclight/bridge/tags/NetworkTagCollectionBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/tags/NetworkTagCollectionBridge.java index 80b9ffe7..dd8f847b 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/tags/NetworkTagCollectionBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/tags/NetworkTagCollectionBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.bridge.tags; +package io.izzel.arclight.common.bridge.tags; public interface NetworkTagCollectionBridge { diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/tileentity/AbstractFurnaceTileEntityBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/tileentity/AbstractFurnaceTileEntityBridge.java similarity index 80% rename from arclight-coremod/src/main/java/io/izzel/arclight/bridge/tileentity/AbstractFurnaceTileEntityBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/tileentity/AbstractFurnaceTileEntityBridge.java index 67b2ff1a..1954570b 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/tileentity/AbstractFurnaceTileEntityBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/tileentity/AbstractFurnaceTileEntityBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.bridge.tileentity; +package io.izzel.arclight.common.bridge.tileentity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/tileentity/BeaconTileEntityBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/tileentity/BeaconTileEntityBridge.java similarity index 77% rename from arclight-coremod/src/main/java/io/izzel/arclight/bridge/tileentity/BeaconTileEntityBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/tileentity/BeaconTileEntityBridge.java index 544609d7..17681d7c 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/tileentity/BeaconTileEntityBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/tileentity/BeaconTileEntityBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.bridge.tileentity; +package io.izzel.arclight.common.bridge.tileentity; import org.bukkit.potion.PotionEffect; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/tileentity/SignTileEntityBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/tileentity/SignTileEntityBridge.java similarity index 63% rename from arclight-coremod/src/main/java/io/izzel/arclight/bridge/tileentity/SignTileEntityBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/tileentity/SignTileEntityBridge.java index c8c8ca29..bd37156e 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/tileentity/SignTileEntityBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/tileentity/SignTileEntityBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.bridge.tileentity; +package io.izzel.arclight.common.bridge.tileentity; public interface SignTileEntityBridge { diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/tileentity/TileEntityBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/tileentity/TileEntityBridge.java similarity index 70% rename from arclight-coremod/src/main/java/io/izzel/arclight/bridge/tileentity/TileEntityBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/tileentity/TileEntityBridge.java index a6a3548e..d87f07e8 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/tileentity/TileEntityBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/tileentity/TileEntityBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.bridge.tileentity; +package io.izzel.arclight.common.bridge.tileentity; import org.bukkit.inventory.InventoryHolder; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/util/DamageSourceBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/util/DamageSourceBridge.java similarity index 76% rename from arclight-coremod/src/main/java/io/izzel/arclight/bridge/util/DamageSourceBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/util/DamageSourceBridge.java index 30a27386..39110b87 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/util/DamageSourceBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/util/DamageSourceBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.bridge.util; +package io.izzel.arclight.common.bridge.util; import net.minecraft.util.DamageSource; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/util/FoodStatsBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/util/FoodStatsBridge.java similarity index 76% rename from arclight-coremod/src/main/java/io/izzel/arclight/bridge/util/FoodStatsBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/util/FoodStatsBridge.java index 173e7b02..8fe5871c 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/util/FoodStatsBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/util/FoodStatsBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.bridge.util; +package io.izzel.arclight.common.bridge.util; import net.minecraft.entity.player.PlayerEntity; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/util/IWorldPosCallableBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/util/IWorldPosCallableBridge.java similarity index 80% rename from arclight-coremod/src/main/java/io/izzel/arclight/bridge/util/IWorldPosCallableBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/util/IWorldPosCallableBridge.java index 865b09ba..b7594b1b 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/util/IWorldPosCallableBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/util/IWorldPosCallableBridge.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.bridge.util; +package io.izzel.arclight.common.bridge.util; -import io.izzel.arclight.bridge.world.WorldBridge; +import io.izzel.arclight.common.bridge.world.WorldBridge; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import org.bukkit.Location; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/util/IndirectEntityDamageSourceBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/util/IndirectEntityDamageSourceBridge.java similarity index 78% rename from arclight-coremod/src/main/java/io/izzel/arclight/bridge/util/IndirectEntityDamageSourceBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/util/IndirectEntityDamageSourceBridge.java index f0f159cf..f82e4ed0 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/util/IndirectEntityDamageSourceBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/util/IndirectEntityDamageSourceBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.bridge.util; +package io.izzel.arclight.common.bridge.util; import net.minecraft.entity.Entity; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/world/ExplosionBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/world/ExplosionBridge.java similarity index 85% rename from arclight-coremod/src/main/java/io/izzel/arclight/bridge/world/ExplosionBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/world/ExplosionBridge.java index adabc20e..1b003fc0 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/world/ExplosionBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/world/ExplosionBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.bridge.world; +package io.izzel.arclight.common.bridge.world; import net.minecraft.entity.Entity; import net.minecraft.world.Explosion; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/world/IBlockReaderBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/world/IBlockReaderBridge.java similarity index 85% rename from arclight-coremod/src/main/java/io/izzel/arclight/bridge/world/IBlockReaderBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/world/IBlockReaderBridge.java index 154209a7..ea14b85f 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/world/IBlockReaderBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/world/IBlockReaderBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.bridge.world; +package io.izzel.arclight.common.bridge.world; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockRayTraceResult; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/world/IWorldWriterBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/world/IWorldWriterBridge.java similarity index 86% rename from arclight-coremod/src/main/java/io/izzel/arclight/bridge/world/IWorldWriterBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/world/IWorldWriterBridge.java index 16514131..c05b69ea 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/world/IWorldWriterBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/world/IWorldWriterBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.bridge.world; +package io.izzel.arclight.common.bridge.world; import net.minecraft.entity.Entity; import org.bukkit.event.entity.CreatureSpawnEvent; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/world/WorldBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/world/WorldBridge.java similarity index 90% rename from arclight-coremod/src/main/java/io/izzel/arclight/bridge/world/WorldBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/world/WorldBridge.java index 95d355fb..048dc295 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/world/WorldBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/world/WorldBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.bridge.world; +package io.izzel.arclight.common.bridge.world; import org.bukkit.craftbukkit.v.CraftServer; import org.bukkit.craftbukkit.v.CraftWorld; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/world/chunk/ChunkBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/world/chunk/ChunkBridge.java similarity index 89% rename from arclight-coremod/src/main/java/io/izzel/arclight/bridge/world/chunk/ChunkBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/world/chunk/ChunkBridge.java index f9816f75..a6967dfe 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/world/chunk/ChunkBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/world/chunk/ChunkBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.bridge.world.chunk; +package io.izzel.arclight.common.bridge.world.chunk; import net.minecraft.block.BlockState; import net.minecraft.util.math.BlockPos; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/world/chunk/storage/RegionFileCacheBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/world/chunk/storage/RegionFileCacheBridge.java similarity index 74% rename from arclight-coremod/src/main/java/io/izzel/arclight/bridge/world/chunk/storage/RegionFileCacheBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/world/chunk/storage/RegionFileCacheBridge.java index 25b21d96..31d41208 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/world/chunk/storage/RegionFileCacheBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/world/chunk/storage/RegionFileCacheBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.bridge.world.chunk.storage; +package io.izzel.arclight.common.bridge.world.chunk.storage; import net.minecraft.util.math.ChunkPos; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/world/dimension/DimensionBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/world/dimension/DimensionBridge.java similarity index 71% rename from arclight-coremod/src/main/java/io/izzel/arclight/bridge/world/dimension/DimensionBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/world/dimension/DimensionBridge.java index 454c691d..aac11140 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/world/dimension/DimensionBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/world/dimension/DimensionBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.bridge.world.dimension; +package io.izzel.arclight.common.bridge.world.dimension; import net.minecraft.world.dimension.DimensionType; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/world/raid/RaidBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/world/raid/RaidBridge.java similarity index 77% rename from arclight-coremod/src/main/java/io/izzel/arclight/bridge/world/raid/RaidBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/world/raid/RaidBridge.java index 5fadd661..367f8076 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/world/raid/RaidBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/world/raid/RaidBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.bridge.world.raid; +package io.izzel.arclight.common.bridge.world.raid; import net.minecraft.entity.monster.AbstractRaiderEntity; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/world/server/ChunkHolderBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/world/server/ChunkHolderBridge.java similarity index 73% rename from arclight-coremod/src/main/java/io/izzel/arclight/bridge/world/server/ChunkHolderBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/world/server/ChunkHolderBridge.java index 0d0a0560..48cc1cb9 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/world/server/ChunkHolderBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/world/server/ChunkHolderBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.bridge.world.server; +package io.izzel.arclight.common.bridge.world.server; import net.minecraft.world.chunk.Chunk; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/world/server/ChunkManagerBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/world/server/ChunkManagerBridge.java similarity index 62% rename from arclight-coremod/src/main/java/io/izzel/arclight/bridge/world/server/ChunkManagerBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/world/server/ChunkManagerBridge.java index 9d1d9d93..8a33cdef 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/world/server/ChunkManagerBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/world/server/ChunkManagerBridge.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.bridge.world.server; +package io.izzel.arclight.common.bridge.world.server; -import io.izzel.arclight.mod.util.ArclightCallbackExecutor; +import io.izzel.arclight.common.mod.util.ArclightCallbackExecutor; import java.util.function.BooleanSupplier; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/world/server/ServerChunkProviderBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/world/server/ServerChunkProviderBridge.java similarity index 85% rename from arclight-coremod/src/main/java/io/izzel/arclight/bridge/world/server/ServerChunkProviderBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/world/server/ServerChunkProviderBridge.java index 08e9837e..8c40aab5 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/world/server/ServerChunkProviderBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/world/server/ServerChunkProviderBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.bridge.world.server; +package io.izzel.arclight.common.bridge.world.server; import net.minecraft.world.server.ServerWorldLightManager; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/world/server/ServerWorldBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/world/server/ServerWorldBridge.java similarity index 89% rename from arclight-coremod/src/main/java/io/izzel/arclight/bridge/world/server/ServerWorldBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/world/server/ServerWorldBridge.java index 4ba86963..79a1b071 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/world/server/ServerWorldBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/world/server/ServerWorldBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.bridge.world.server; +package io.izzel.arclight.common.bridge.world.server; import net.minecraft.entity.Entity; import net.minecraft.entity.effect.LightningBoltEntity; @@ -7,7 +7,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import org.bukkit.event.entity.CreatureSpawnEvent; import org.bukkit.event.weather.LightningStrikeEvent; -import io.izzel.arclight.bridge.world.WorldBridge; +import io.izzel.arclight.common.bridge.world.WorldBridge; public interface ServerWorldBridge extends WorldBridge { diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/world/server/TicketManagerBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/world/server/TicketManagerBridge.java similarity index 93% rename from arclight-coremod/src/main/java/io/izzel/arclight/bridge/world/server/TicketManagerBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/world/server/TicketManagerBridge.java index df16bcd1..24f50142 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/world/server/TicketManagerBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/world/server/TicketManagerBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.bridge.world.server; +package io.izzel.arclight.common.bridge.world.server; import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap; import it.unimi.dsi.fastutil.objects.ObjectSortedSet; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/world/server/TicketTypeBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/world/server/TicketTypeBridge.java similarity index 60% rename from arclight-coremod/src/main/java/io/izzel/arclight/bridge/world/server/TicketTypeBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/world/server/TicketTypeBridge.java index 349228b9..722d1652 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/world/server/TicketTypeBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/world/server/TicketTypeBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.bridge.world.server; +package io.izzel.arclight.common.bridge.world.server; public interface TicketTypeBridge { diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/world/storage/MapDataBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/world/storage/MapDataBridge.java similarity index 69% rename from arclight-coremod/src/main/java/io/izzel/arclight/bridge/world/storage/MapDataBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/world/storage/MapDataBridge.java index a0e7799c..d6eec6d6 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/world/storage/MapDataBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/world/storage/MapDataBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.bridge.world.storage; +package io.izzel.arclight.common.bridge.world.storage; import org.bukkit.craftbukkit.v.map.CraftMapView; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/world/storage/SaveHandlerBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/world/storage/SaveHandlerBridge.java similarity index 83% rename from arclight-coremod/src/main/java/io/izzel/arclight/bridge/world/storage/SaveHandlerBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/world/storage/SaveHandlerBridge.java index 401b11a2..7d370a60 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/world/storage/SaveHandlerBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/world/storage/SaveHandlerBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.bridge.world.storage; +package io.izzel.arclight.common.bridge.world.storage; import net.minecraft.nbt.CompoundNBT; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/world/storage/WorldInfoBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/world/storage/WorldInfoBridge.java similarity index 72% rename from arclight-coremod/src/main/java/io/izzel/arclight/bridge/world/storage/WorldInfoBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/world/storage/WorldInfoBridge.java index 4fdc9850..6893407e 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/world/storage/WorldInfoBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/world/storage/WorldInfoBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.bridge.world.storage; +package io.izzel.arclight.common.bridge.world.storage; import net.minecraft.world.World; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/bukkit/BukkitCommandWrapperMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/bukkit/BukkitCommandWrapperMixin.java similarity index 93% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/bukkit/BukkitCommandWrapperMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/bukkit/BukkitCommandWrapperMixin.java index c20a13d5..8ce718c4 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/bukkit/BukkitCommandWrapperMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/bukkit/BukkitCommandWrapperMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mixin.bukkit; +package io.izzel.arclight.common.mixin.bukkit; import com.mojang.brigadier.context.CommandContext; import org.bukkit.craftbukkit.v.command.BukkitCommandWrapper; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/bukkit/ColouredConsoleSenderMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/bukkit/ColouredConsoleSenderMixin.java similarity index 93% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/bukkit/ColouredConsoleSenderMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/bukkit/ColouredConsoleSenderMixin.java index f09380d9..e88e7597 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/bukkit/ColouredConsoleSenderMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/bukkit/ColouredConsoleSenderMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mixin.bukkit; +package io.izzel.arclight.common.mixin.bukkit; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/bukkit/CommandNodeMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/bukkit/CommandNodeMixin.java similarity index 93% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/bukkit/CommandNodeMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/bukkit/CommandNodeMixin.java index 2c6398c2..0eb4242d 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/bukkit/CommandNodeMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/bukkit/CommandNodeMixin.java @@ -1,9 +1,9 @@ -package io.izzel.arclight.mixin.bukkit; +package io.izzel.arclight.common.mixin.bukkit; import com.mojang.brigadier.tree.ArgumentCommandNode; import com.mojang.brigadier.tree.CommandNode; import com.mojang.brigadier.tree.LiteralCommandNode; -import io.izzel.arclight.bridge.command.CommandSourceBridge; +import io.izzel.arclight.common.bridge.command.CommandSourceBridge; import net.minecraft.command.CommandSource; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/bukkit/CraftBlockStateMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/bukkit/CraftBlockStateMixin.java similarity index 89% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/bukkit/CraftBlockStateMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/bukkit/CraftBlockStateMixin.java index 959a7bc8..2da1dc83 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/bukkit/CraftBlockStateMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/bukkit/CraftBlockStateMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mixin.bukkit; +package io.izzel.arclight.common.mixin.bukkit; import net.minecraft.block.BlockState; import org.bukkit.craftbukkit.v.block.CraftBlockState; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/bukkit/CraftChunkMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/bukkit/CraftChunkMixin.java similarity index 93% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/bukkit/CraftChunkMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/bukkit/CraftChunkMixin.java index 7de8f51e..78cb98c4 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/bukkit/CraftChunkMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/bukkit/CraftChunkMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.bukkit; +package io.izzel.arclight.common.mixin.bukkit; -import io.izzel.arclight.bridge.entity.EntityBridge; +import io.izzel.arclight.common.bridge.entity.EntityBridge; import net.minecraft.world.chunk.Chunk; import org.bukkit.World; import org.bukkit.craftbukkit.v.CraftChunk; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/bukkit/CraftConsoleCommandSenderMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/bukkit/CraftConsoleCommandSenderMixin.java similarity index 94% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/bukkit/CraftConsoleCommandSenderMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/bukkit/CraftConsoleCommandSenderMixin.java index d9cf6fda..aefc0528 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/bukkit/CraftConsoleCommandSenderMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/bukkit/CraftConsoleCommandSenderMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mixin.bukkit; +package io.izzel.arclight.common.mixin.bukkit; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/bukkit/CraftEventFactoryMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/bukkit/CraftEventFactoryMixin.java similarity index 95% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/bukkit/CraftEventFactoryMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/bukkit/CraftEventFactoryMixin.java index 96ef83f0..03416a2a 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/bukkit/CraftEventFactoryMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/bukkit/CraftEventFactoryMixin.java @@ -1,7 +1,7 @@ -package io.izzel.arclight.mixin.bukkit; +package io.izzel.arclight.common.mixin.bukkit; import com.google.common.base.Function; -import io.izzel.arclight.mod.util.ArclightCaptures; +import io.izzel.arclight.common.mod.util.ArclightCaptures; import net.minecraft.entity.Entity; import net.minecraft.util.DamageSource; import net.minecraft.util.math.BlockPos; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/bukkit/CraftMagicNumbersMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/bukkit/CraftMagicNumbersMixin.java similarity index 78% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/bukkit/CraftMagicNumbersMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/bukkit/CraftMagicNumbersMixin.java index 1a19e5d8..c835fcc7 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/bukkit/CraftMagicNumbersMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/bukkit/CraftMagicNumbersMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mixin.bukkit; +package io.izzel.arclight.common.mixin.bukkit; import org.bukkit.craftbukkit.v.util.CraftMagicNumbers; import org.spongepowered.asm.mixin.Mixin; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/bukkit/CraftServerMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/bukkit/CraftServerMixin.java similarity index 98% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/bukkit/CraftServerMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/bukkit/CraftServerMixin.java index ecf14c6e..96339aee 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/bukkit/CraftServerMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/bukkit/CraftServerMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mixin.bukkit; +package io.izzel.arclight.common.mixin.bukkit; import jline.console.ConsoleReader; import net.minecraft.command.Commands; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/bukkit/JavaPluginLoaderMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/bukkit/JavaPluginLoaderMixin.java similarity index 84% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/bukkit/JavaPluginLoaderMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/bukkit/JavaPluginLoaderMixin.java index 05da909d..d9a3b761 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/bukkit/JavaPluginLoaderMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/bukkit/JavaPluginLoaderMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.bukkit; +package io.izzel.arclight.common.mixin.bukkit; -import io.izzel.arclight.bridge.bukkit.JavaPluginLoaderBridge; +import io.izzel.arclight.common.bridge.bukkit.JavaPluginLoaderBridge; import org.bukkit.plugin.java.JavaPluginLoader; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.gen.Accessor; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/bukkit/JavaPluginMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/bukkit/JavaPluginMixin.java similarity index 83% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/bukkit/JavaPluginMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/bukkit/JavaPluginMixin.java index 4eca3c0a..b911cd30 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/bukkit/JavaPluginMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/bukkit/JavaPluginMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mixin.bukkit; +package io.izzel.arclight.common.mixin.bukkit; import org.bukkit.plugin.Plugin; import org.bukkit.plugin.PluginLogger; @@ -6,7 +6,7 @@ import org.bukkit.plugin.java.JavaPlugin; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Redirect; -import io.izzel.arclight.mod.util.ArclightPluginLogger; +import io.izzel.arclight.common.mod.util.ArclightPluginLogger; @Mixin(JavaPlugin.class) public class JavaPluginMixin { diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/bukkit/MaterialMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/bukkit/MaterialMixin.java similarity index 96% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/bukkit/MaterialMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/bukkit/MaterialMixin.java index 60091493..1ca5e333 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/bukkit/MaterialMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/bukkit/MaterialMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.bukkit; +package io.izzel.arclight.common.mixin.bukkit; -import io.izzel.arclight.bridge.bukkit.MaterialBridge; +import io.izzel.arclight.common.bridge.bukkit.MaterialBridge; import org.bukkit.Material; import org.bukkit.NamespacedKey; import org.spongepowered.asm.mixin.Mixin; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/bukkit/PluginClassLoaderMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/bukkit/PluginClassLoaderMixin.java similarity index 95% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/bukkit/PluginClassLoaderMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/bukkit/PluginClassLoaderMixin.java index 16457a74..43139ab1 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/bukkit/PluginClassLoaderMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/bukkit/PluginClassLoaderMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mixin.bukkit; +package io.izzel.arclight.common.mixin.bukkit; import com.google.common.io.ByteStreams; import org.bukkit.Bukkit; @@ -8,8 +8,8 @@ import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Overwrite; import org.spongepowered.asm.mixin.Shadow; -import io.izzel.arclight.mod.util.remapper.ArclightRemapper; -import io.izzel.arclight.mod.util.remapper.PluginRemapper; +import io.izzel.arclight.common.mod.util.remapper.ArclightRemapper; +import io.izzel.arclight.common.mod.util.remapper.PluginRemapper; import java.io.IOException; import java.io.InputStream; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/advancements/AdvancementMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/advancements/AdvancementMixin.java similarity index 78% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/advancements/AdvancementMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/advancements/AdvancementMixin.java index 881d62cb..97753c26 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/advancements/AdvancementMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/advancements/AdvancementMixin.java @@ -1,9 +1,9 @@ -package io.izzel.arclight.mixin.core.advancements; +package io.izzel.arclight.common.mixin.core.advancements; import net.minecraft.advancements.Advancement; import org.bukkit.craftbukkit.v.advancement.CraftAdvancement; import org.spongepowered.asm.mixin.Mixin; -import io.izzel.arclight.bridge.advancement.AdvancementBridge; +import io.izzel.arclight.common.bridge.advancement.AdvancementBridge; @Mixin(Advancement.class) public class AdvancementMixin implements AdvancementBridge { diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/advancements/PlayerAdvancementsMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/advancements/PlayerAdvancementsMixin.java similarity index 85% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/advancements/PlayerAdvancementsMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/advancements/PlayerAdvancementsMixin.java index 4e7f2271..f21a4a21 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/advancements/PlayerAdvancementsMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/advancements/PlayerAdvancementsMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.advancements; +package io.izzel.arclight.common.mixin.core.advancements; -import io.izzel.arclight.bridge.entity.EntityBridge; +import io.izzel.arclight.common.bridge.entity.EntityBridge; import net.minecraft.advancements.Advancement; import net.minecraft.advancements.PlayerAdvancements; import net.minecraft.entity.player.ServerPlayerEntity; @@ -11,7 +11,7 @@ import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -import io.izzel.arclight.bridge.advancement.AdvancementBridge; +import io.izzel.arclight.common.bridge.advancement.AdvancementBridge; @Mixin(PlayerAdvancements.class) public class PlayerAdvancementsMixin { diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/AbstractButtonBlockMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/AbstractButtonBlockMixin.java similarity index 97% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/AbstractButtonBlockMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/AbstractButtonBlockMixin.java index 4694554f..c9312421 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/AbstractButtonBlockMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/AbstractButtonBlockMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.block; +package io.izzel.arclight.common.mixin.core.block; -import io.izzel.arclight.bridge.entity.EntityBridge; +import io.izzel.arclight.common.bridge.entity.EntityBridge; import net.minecraft.block.AbstractButtonBlock; import net.minecraft.block.BlockState; import net.minecraft.entity.Entity; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/AbstractPressurePlateBlockMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/AbstractPressurePlateBlockMixin.java similarity index 97% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/AbstractPressurePlateBlockMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/AbstractPressurePlateBlockMixin.java index 412f1de8..144e311b 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/AbstractPressurePlateBlockMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/AbstractPressurePlateBlockMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mixin.core.block; +package io.izzel.arclight.common.mixin.core.block; import net.minecraft.block.AbstractPressurePlateBlock; import net.minecraft.block.BlockState; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/BambooBlockMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/BambooBlockMixin.java similarity index 98% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/BambooBlockMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/BambooBlockMixin.java index ddd795ff..40b12c2f 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/BambooBlockMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/BambooBlockMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mixin.core.block; +package io.izzel.arclight.common.mixin.core.block; import net.minecraft.block.BambooBlock; import net.minecraft.block.BlockState; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/BambooSaplingBlockMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/BambooSaplingBlockMixin.java similarity index 94% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/BambooSaplingBlockMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/BambooSaplingBlockMixin.java index 0eb52499..cbe1ec9e 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/BambooSaplingBlockMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/BambooSaplingBlockMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mixin.core.block; +package io.izzel.arclight.common.mixin.core.block; import net.minecraft.block.BambooSaplingBlock; import net.minecraft.block.BlockState; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/BedBlockMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/BedBlockMixin.java similarity index 78% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/BedBlockMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/BedBlockMixin.java index b0607281..ef3f0360 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/BedBlockMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/BedBlockMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mixin.core.block; +package io.izzel.arclight.common.mixin.core.block; import net.minecraft.block.BedBlock; import org.spongepowered.asm.mixin.Mixin; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/BlockMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/BlockMixin.java similarity index 95% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/BlockMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/BlockMixin.java index 8658a3e2..e9af160a 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/BlockMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/BlockMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.block; +package io.izzel.arclight.common.mixin.core.block; -import io.izzel.arclight.bridge.block.BlockBridge; +import io.izzel.arclight.common.bridge.block.BlockBridge; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.entity.Entity; @@ -20,7 +20,7 @@ import net.minecraft.world.storage.loot.LootParameters; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Overwrite; import org.spongepowered.asm.mixin.Shadow; -import io.izzel.arclight.mod.util.ArclightCaptures; +import io.izzel.arclight.common.mod.util.ArclightCaptures; import javax.annotation.Nullable; import java.util.List; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/BlockStateMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/BlockStateMixin.java similarity index 88% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/BlockStateMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/BlockStateMixin.java index fab1a0cd..7335ddcd 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/BlockStateMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/BlockStateMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.block; +package io.izzel.arclight.common.mixin.core.block; -import io.izzel.arclight.mod.util.ArclightCaptures; +import io.izzel.arclight.common.mod.util.ArclightCaptures; import net.minecraft.block.BlockState; import net.minecraft.entity.Entity; import net.minecraft.util.math.BlockPos; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/BushBlockMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/BushBlockMixin.java similarity index 95% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/BushBlockMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/BushBlockMixin.java index 3ca02cc5..5878991b 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/BushBlockMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/BushBlockMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mixin.core.block; +package io.izzel.arclight.common.mixin.core.block; import net.minecraft.block.Block; import net.minecraft.block.BlockState; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/CactusBlockMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/CactusBlockMixin.java similarity index 96% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/CactusBlockMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/CactusBlockMixin.java index 3f3010bc..f6b59a2b 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/CactusBlockMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/CactusBlockMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mixin.core.block; +package io.izzel.arclight.common.mixin.core.block; import net.minecraft.block.BlockState; import net.minecraft.block.CactusBlock; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/CakeBlockMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/CakeBlockMixin.java similarity index 90% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/CakeBlockMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/CakeBlockMixin.java index 2ff7a7a2..fd1334a1 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/CakeBlockMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/CakeBlockMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.block; +package io.izzel.arclight.common.mixin.core.block; -import io.izzel.arclight.bridge.entity.player.ServerPlayerEntityBridge; +import io.izzel.arclight.common.bridge.entity.player.ServerPlayerEntityBridge; import net.minecraft.block.BlockState; import net.minecraft.block.CakeBlock; import net.minecraft.entity.player.PlayerEntity; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/CampfireBlockMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/CampfireBlockMixin.java similarity index 96% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/CampfireBlockMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/CampfireBlockMixin.java index 1a8009bd..72689fd9 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/CampfireBlockMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/CampfireBlockMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mixin.core.block; +package io.izzel.arclight.common.mixin.core.block; import net.minecraft.block.BlockState; import net.minecraft.block.CampfireBlock; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/CarvedPumpkinBlockMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/CarvedPumpkinBlockMixin.java similarity index 96% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/CarvedPumpkinBlockMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/CarvedPumpkinBlockMixin.java index 0ac774cc..f3f2f4e2 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/CarvedPumpkinBlockMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/CarvedPumpkinBlockMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.block; +package io.izzel.arclight.common.mixin.core.block; -import io.izzel.arclight.bridge.world.WorldBridge; +import io.izzel.arclight.common.bridge.world.WorldBridge; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.CarvedPumpkinBlock; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/CauldronBlockMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/CauldronBlockMixin.java similarity index 97% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/CauldronBlockMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/CauldronBlockMixin.java index 0c620c39..4369a19b 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/CauldronBlockMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/CauldronBlockMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.block; +package io.izzel.arclight.common.mixin.core.block; -import io.izzel.arclight.bridge.entity.EntityBridge; +import io.izzel.arclight.common.bridge.entity.EntityBridge; import net.minecraft.block.BlockState; import net.minecraft.block.CauldronBlock; import net.minecraft.entity.Entity; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/ChestBlock2Mixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/ChestBlock2Mixin.java similarity index 85% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/ChestBlock2Mixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/ChestBlock2Mixin.java index 2b984fe2..19a3bee1 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/ChestBlock2Mixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/ChestBlock2Mixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.block; +package io.izzel.arclight.common.mixin.core.block; -import io.izzel.arclight.mod.util.ChestBlockDoubleInventoryHacks; +import io.izzel.arclight.common.mod.util.ChestBlockDoubleInventoryHacks; import net.minecraft.inventory.DoubleSidedInventory; import net.minecraft.inventory.container.INamedContainerProvider; import net.minecraft.tileentity.ChestTileEntity; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/ChorusFlowerBlockMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/ChorusFlowerBlockMixin.java similarity index 99% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/ChorusFlowerBlockMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/ChorusFlowerBlockMixin.java index 911b91b8..1c04a8c6 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/ChorusFlowerBlockMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/ChorusFlowerBlockMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mixin.core.block; +package io.izzel.arclight.common.mixin.core.block; import net.minecraft.block.Block; import net.minecraft.block.BlockState; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/CocoaBlockMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/CocoaBlockMixin.java similarity index 93% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/CocoaBlockMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/CocoaBlockMixin.java index 0ee93bd6..029a220f 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/CocoaBlockMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/CocoaBlockMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mixin.core.block; +package io.izzel.arclight.common.mixin.core.block; import net.minecraft.block.BlockState; import net.minecraft.block.CocoaBlock; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/CommandBlockBlockMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/CommandBlockBlockMixin.java similarity index 97% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/CommandBlockBlockMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/CommandBlockBlockMixin.java index f0eec4e2..ccd30703 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/CommandBlockBlockMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/CommandBlockBlockMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mixin.core.block; +package io.izzel.arclight.common.mixin.core.block; import net.minecraft.block.Block; import net.minecraft.block.BlockState; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/ComparatorBlockMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/ComparatorBlockMixin.java similarity index 96% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/ComparatorBlockMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/ComparatorBlockMixin.java index a27c4a3a..f61fc5ac 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/ComparatorBlockMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/ComparatorBlockMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mixin.core.block; +package io.izzel.arclight.common.mixin.core.block; import net.minecraft.block.BlockState; import net.minecraft.block.ComparatorBlock; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/ComposterBlockMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/ComposterBlockMixin.java similarity index 88% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/ComposterBlockMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/ComposterBlockMixin.java index fd2c1297..03b4120f 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/ComposterBlockMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/ComposterBlockMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.block; +package io.izzel.arclight.common.mixin.core.block; -import io.izzel.arclight.bridge.inventory.IInventoryBridge; +import io.izzel.arclight.common.bridge.inventory.IInventoryBridge; import net.minecraft.block.BlockState; import net.minecraft.block.ComposterBlock; import net.minecraft.util.math.BlockPos; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/ComposterBlock_EmptyInventoryMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/ComposterBlock_EmptyInventoryMixin.java similarity index 84% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/ComposterBlock_EmptyInventoryMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/ComposterBlock_EmptyInventoryMixin.java index 0e2a2457..36c8f1f6 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/ComposterBlock_EmptyInventoryMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/ComposterBlock_EmptyInventoryMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.block; +package io.izzel.arclight.common.mixin.core.block; -import io.izzel.arclight.mixin.core.inventory.InventoryMixin; +import io.izzel.arclight.common.mixin.core.inventory.InventoryMixin; import net.minecraft.block.ComposterBlock; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IWorld; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/ComposterBlock_FullInventoryMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/ComposterBlock_FullInventoryMixin.java similarity index 89% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/ComposterBlock_FullInventoryMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/ComposterBlock_FullInventoryMixin.java index 524501c1..877bfcda 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/ComposterBlock_FullInventoryMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/ComposterBlock_FullInventoryMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.block; +package io.izzel.arclight.common.mixin.core.block; -import io.izzel.arclight.mixin.core.inventory.InventoryMixin; +import io.izzel.arclight.common.mixin.core.inventory.InventoryMixin; import net.minecraft.block.BlockState; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/ComposterBlock_PartialInventoryMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/ComposterBlock_PartialInventoryMixin.java similarity index 88% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/ComposterBlock_PartialInventoryMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/ComposterBlock_PartialInventoryMixin.java index dfe31826..d31ae7f6 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/ComposterBlock_PartialInventoryMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/ComposterBlock_PartialInventoryMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.block; +package io.izzel.arclight.common.mixin.core.block; -import io.izzel.arclight.mixin.core.inventory.InventoryMixin; +import io.izzel.arclight.common.mixin.core.inventory.InventoryMixin; import net.minecraft.block.BlockState; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IWorld; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/ConcretePowderBlockMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/ConcretePowderBlockMixin.java similarity index 98% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/ConcretePowderBlockMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/ConcretePowderBlockMixin.java index 3f04a664..757b06f1 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/ConcretePowderBlockMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/ConcretePowderBlockMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mixin.core.block; +package io.izzel.arclight.common.mixin.core.block; import net.minecraft.block.BlockState; import net.minecraft.block.ConcretePowderBlock; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/CoralBlockMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/CoralBlockMixin.java similarity index 95% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/CoralBlockMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/CoralBlockMixin.java index 0233718a..5054aa0e 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/CoralBlockMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/CoralBlockMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mixin.core.block; +package io.izzel.arclight.common.mixin.core.block; import net.minecraft.block.Block; import net.minecraft.block.BlockState; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/CoralFinBlockMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/CoralFinBlockMixin.java similarity index 96% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/CoralFinBlockMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/CoralFinBlockMixin.java index 202e4c59..3ca5ac81 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/CoralFinBlockMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/CoralFinBlockMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mixin.core.block; +package io.izzel.arclight.common.mixin.core.block; import net.minecraft.block.AbstractCoralPlantBlock; import net.minecraft.block.Block; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/CoralPlantBlockMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/CoralPlantBlockMixin.java similarity index 96% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/CoralPlantBlockMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/CoralPlantBlockMixin.java index 1749a974..acd69d69 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/CoralPlantBlockMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/CoralPlantBlockMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mixin.core.block; +package io.izzel.arclight.common.mixin.core.block; import net.minecraft.block.AbstractCoralPlantBlock; import net.minecraft.block.Block; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/CoralWallFanBlockMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/CoralWallFanBlockMixin.java similarity index 96% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/CoralWallFanBlockMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/CoralWallFanBlockMixin.java index 08976c10..de3a7758 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/CoralWallFanBlockMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/CoralWallFanBlockMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mixin.core.block; +package io.izzel.arclight.common.mixin.core.block; import net.minecraft.block.AbstractCoralPlantBlock; import net.minecraft.block.Block; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/CropsBlockMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/CropsBlockMixin.java similarity index 97% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/CropsBlockMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/CropsBlockMixin.java index 9c342975..67ae337d 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/CropsBlockMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/CropsBlockMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mixin.core.block; +package io.izzel.arclight.common.mixin.core.block; import net.minecraft.block.BlockState; import net.minecraft.block.CropsBlock; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/DaylightDetectorBlockMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/DaylightDetectorBlockMixin.java similarity index 94% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/DaylightDetectorBlockMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/DaylightDetectorBlockMixin.java index 02afe623..35cb36d9 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/DaylightDetectorBlockMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/DaylightDetectorBlockMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mixin.core.block; +package io.izzel.arclight.common.mixin.core.block; import net.minecraft.block.BlockState; import net.minecraft.block.DaylightDetectorBlock; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/DetectorRailBlockMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/DetectorRailBlockMixin.java similarity index 97% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/DetectorRailBlockMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/DetectorRailBlockMixin.java index c527253b..4ea52a2f 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/DetectorRailBlockMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/DetectorRailBlockMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mixin.core.block; +package io.izzel.arclight.common.mixin.core.block; import net.minecraft.block.BlockState; import net.minecraft.block.DetectorRailBlock; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/DispenserBlockMixin_Accessor.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/DispenserBlockMixin_Accessor.java similarity index 90% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/DispenserBlockMixin_Accessor.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/DispenserBlockMixin_Accessor.java index 95699b6c..da9dbe5c 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/DispenserBlockMixin_Accessor.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/DispenserBlockMixin_Accessor.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mixin.core.block; +package io.izzel.arclight.common.mixin.core.block; import net.minecraft.block.DispenserBlock; import net.minecraft.dispenser.IDispenseItemBehavior; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/DoorBlockMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/DoorBlockMixin.java similarity index 97% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/DoorBlockMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/DoorBlockMixin.java index 9230d5a5..7df9e623 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/DoorBlockMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/DoorBlockMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mixin.core.block; +package io.izzel.arclight.common.mixin.core.block; import net.minecraft.block.Block; import net.minecraft.block.BlockState; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/DoublePlantBlockMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/DoublePlantBlockMixin.java similarity index 94% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/DoublePlantBlockMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/DoublePlantBlockMixin.java index bc1158db..05b17160 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/DoublePlantBlockMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/DoublePlantBlockMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mixin.core.block; +package io.izzel.arclight.common.mixin.core.block; import net.minecraft.block.BlockState; import net.minecraft.block.DoublePlantBlock; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/DragonEggBlockMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/DragonEggBlockMixin.java similarity index 97% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/DragonEggBlockMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/DragonEggBlockMixin.java index cd3b3461..d8e68037 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/DragonEggBlockMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/DragonEggBlockMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mixin.core.block; +package io.izzel.arclight.common.mixin.core.block; import net.minecraft.block.BlockState; import net.minecraft.block.DragonEggBlock; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/DropperBlockMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/DropperBlockMixin.java similarity index 96% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/DropperBlockMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/DropperBlockMixin.java index a2696de3..94919938 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/DropperBlockMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/DropperBlockMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.block; +package io.izzel.arclight.common.mixin.core.block; -import io.izzel.arclight.bridge.inventory.IInventoryBridge; +import io.izzel.arclight.common.bridge.inventory.IInventoryBridge; import net.minecraft.block.DispenserBlock; import net.minecraft.block.DropperBlock; import net.minecraft.dispenser.IDispenseItemBehavior; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/EndPortalBlockMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/EndPortalBlockMixin.java similarity index 87% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/EndPortalBlockMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/EndPortalBlockMixin.java index cd966c6e..c0a6a588 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/EndPortalBlockMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/EndPortalBlockMixin.java @@ -1,8 +1,8 @@ -package io.izzel.arclight.mixin.core.block; +package io.izzel.arclight.common.mixin.core.block; -import io.izzel.arclight.bridge.entity.EntityBridge; -import io.izzel.arclight.bridge.entity.player.ServerPlayerEntityBridge; -import io.izzel.arclight.bridge.world.WorldBridge; +import io.izzel.arclight.common.bridge.entity.EntityBridge; +import io.izzel.arclight.common.bridge.entity.player.ServerPlayerEntityBridge; +import io.izzel.arclight.common.bridge.world.WorldBridge; import net.minecraft.block.BlockState; import net.minecraft.block.EndPortalBlock; import net.minecraft.entity.Entity; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/FallingBlockMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/FallingBlockMixin.java similarity index 92% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/FallingBlockMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/FallingBlockMixin.java index 3983453e..684b67de 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/FallingBlockMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/FallingBlockMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mixin.core.block; +package io.izzel.arclight.common.mixin.core.block; import net.minecraft.block.BlockState; import net.minecraft.block.FallingBlock; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/FarmlandBlockMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/FarmlandBlockMixin.java similarity index 96% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/FarmlandBlockMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/FarmlandBlockMixin.java index 2f0577d2..9a2cd3f9 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/FarmlandBlockMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/FarmlandBlockMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mixin.core.block; +package io.izzel.arclight.common.mixin.core.block; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/FireBlockMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/FireBlockMixin.java similarity index 98% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/FireBlockMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/FireBlockMixin.java index dcef5cac..94799142 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/FireBlockMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/FireBlockMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mixin.core.block; +package io.izzel.arclight.common.mixin.core.block; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/FlowingFluidBlockMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/FlowingFluidBlockMixin.java similarity index 96% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/FlowingFluidBlockMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/FlowingFluidBlockMixin.java index cf581a26..baa98550 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/FlowingFluidBlockMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/FlowingFluidBlockMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mixin.core.block; +package io.izzel.arclight.common.mixin.core.block; import net.minecraft.block.BlockState; import net.minecraft.block.FlowingFluidBlock; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/GrassBlockMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/GrassBlockMixin.java similarity index 93% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/GrassBlockMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/GrassBlockMixin.java index 1104b8f9..9070f9c3 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/GrassBlockMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/GrassBlockMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mixin.core.block; +package io.izzel.arclight.common.mixin.core.block; import net.minecraft.block.BlockState; import net.minecraft.block.GrassBlock; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/IceBlockMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/IceBlockMixin.java similarity index 94% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/IceBlockMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/IceBlockMixin.java index f4e4a488..b9e434c3 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/IceBlockMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/IceBlockMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mixin.core.block; +package io.izzel.arclight.common.mixin.core.block; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/KelpTopBlockMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/KelpTopBlockMixin.java similarity index 93% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/KelpTopBlockMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/KelpTopBlockMixin.java index fa637ad9..51b9d165 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/KelpTopBlockMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/KelpTopBlockMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mixin.core.block; +package io.izzel.arclight.common.mixin.core.block; import net.minecraft.block.BlockState; import net.minecraft.block.KelpTopBlock; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/LeavesBlockMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/LeavesBlockMixin.java similarity index 95% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/LeavesBlockMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/LeavesBlockMixin.java index 22d02cf6..cc042da4 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/LeavesBlockMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/LeavesBlockMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mixin.core.block; +package io.izzel.arclight.common.mixin.core.block; import net.minecraft.block.BlockState; import net.minecraft.block.LeavesBlock; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/LeverBlockMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/LeverBlockMixin.java similarity index 97% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/LeverBlockMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/LeverBlockMixin.java index a11dce8a..8621380e 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/LeverBlockMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/LeverBlockMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mixin.core.block; +package io.izzel.arclight.common.mixin.core.block; import net.minecraft.block.BlockState; import net.minecraft.block.LeverBlock; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/LilyPadBlockMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/LilyPadBlockMixin.java similarity index 95% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/LilyPadBlockMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/LilyPadBlockMixin.java index ab485bfa..018b67a8 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/LilyPadBlockMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/LilyPadBlockMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mixin.core.block; +package io.izzel.arclight.common.mixin.core.block; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/MagmaBlockMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/MagmaBlockMixin.java similarity index 95% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/MagmaBlockMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/MagmaBlockMixin.java index 1a7d6719..6042a1cc 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/MagmaBlockMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/MagmaBlockMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mixin.core.block; +package io.izzel.arclight.common.mixin.core.block; import net.minecraft.block.MagmaBlock; import net.minecraft.entity.Entity; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/MushroomBlockMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/MushroomBlockMixin.java similarity index 94% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/MushroomBlockMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/MushroomBlockMixin.java index 8d14a7ba..21967757 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/MushroomBlockMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/MushroomBlockMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mixin.core.block; +package io.izzel.arclight.common.mixin.core.block; import net.minecraft.block.BlockState; import net.minecraft.block.MushroomBlock; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/NetherPortalBlockMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/NetherPortalBlockMixin.java similarity index 90% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/NetherPortalBlockMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/NetherPortalBlockMixin.java index a2034665..272e6cb7 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/NetherPortalBlockMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/NetherPortalBlockMixin.java @@ -1,9 +1,9 @@ -package io.izzel.arclight.mixin.core.block; +package io.izzel.arclight.common.mixin.core.block; -import io.izzel.arclight.bridge.block.NetherPortalBlockBridge; -import io.izzel.arclight.bridge.entity.EntityBridge; -import io.izzel.arclight.bridge.entity.EntityTypeBridge; -import io.izzel.arclight.bridge.world.WorldBridge; +import io.izzel.arclight.common.bridge.block.NetherPortalBlockBridge; +import io.izzel.arclight.common.bridge.entity.EntityBridge; +import io.izzel.arclight.common.bridge.entity.EntityTypeBridge; +import io.izzel.arclight.common.bridge.world.WorldBridge; import net.minecraft.block.BlockState; import net.minecraft.block.NetherPortalBlock; import net.minecraft.entity.Entity; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/NetherPortalBlock_SizeMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/NetherPortalBlock_SizeMixin.java similarity index 96% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/NetherPortalBlock_SizeMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/NetherPortalBlock_SizeMixin.java index 5030dd30..3fb18de7 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/NetherPortalBlock_SizeMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/NetherPortalBlock_SizeMixin.java @@ -1,7 +1,7 @@ -package io.izzel.arclight.mixin.core.block; +package io.izzel.arclight.common.mixin.core.block; -import io.izzel.arclight.bridge.block.NetherPortalBlockBridge; -import io.izzel.arclight.bridge.world.WorldBridge; +import io.izzel.arclight.common.bridge.block.NetherPortalBlockBridge; +import io.izzel.arclight.common.bridge.world.WorldBridge; import net.minecraft.block.Block; import net.minecraft.block.Blocks; import net.minecraft.block.NetherPortalBlock; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/NetherWartBlockMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/NetherWartBlockMixin.java similarity index 94% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/NetherWartBlockMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/NetherWartBlockMixin.java index e92c32ae..e4014581 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/NetherWartBlockMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/NetherWartBlockMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mixin.core.block; +package io.izzel.arclight.common.mixin.core.block; import net.minecraft.block.BlockState; import net.minecraft.block.NetherWartBlock; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/NoteBlockMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/NoteBlockMixin.java similarity index 98% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/NoteBlockMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/NoteBlockMixin.java index 0850a094..e16e8815 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/NoteBlockMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/NoteBlockMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mixin.core.block; +package io.izzel.arclight.common.mixin.core.block; import net.minecraft.block.BlockState; import net.minecraft.block.NoteBlock; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/ObserverBlockMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/ObserverBlockMixin.java similarity index 96% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/ObserverBlockMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/ObserverBlockMixin.java index ed81f5c0..b3207d0d 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/ObserverBlockMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/ObserverBlockMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mixin.core.block; +package io.izzel.arclight.common.mixin.core.block; import net.minecraft.block.BlockState; import net.minecraft.block.ObserverBlock; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/PistonBlockMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/PistonBlockMixin.java similarity index 98% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/PistonBlockMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/PistonBlockMixin.java index 0c782b34..cdc8bb35 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/PistonBlockMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/PistonBlockMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mixin.core.block; +package io.izzel.arclight.common.mixin.core.block; import com.google.common.collect.ImmutableList; import net.minecraft.block.BlockState; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/PoweredRailBlockMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/PoweredRailBlockMixin.java similarity index 95% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/PoweredRailBlockMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/PoweredRailBlockMixin.java index b094a661..ddcd8a03 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/PoweredRailBlockMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/PoweredRailBlockMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mixin.core.block; +package io.izzel.arclight.common.mixin.core.block; import net.minecraft.block.Block; import net.minecraft.block.BlockState; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/PressurePlateBlockMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/PressurePlateBlockMixin.java similarity index 96% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/PressurePlateBlockMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/PressurePlateBlockMixin.java index 2cd626ea..ecc48c46 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/PressurePlateBlockMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/PressurePlateBlockMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.block; +package io.izzel.arclight.common.mixin.core.block; -import io.izzel.arclight.bridge.entity.EntityBridge; +import io.izzel.arclight.common.bridge.entity.EntityBridge; import net.minecraft.block.BlockState; import net.minecraft.block.PressurePlateBlock; import net.minecraft.entity.Entity; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/RedstoneDiodeBlockMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/RedstoneDiodeBlockMixin.java similarity index 96% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/RedstoneDiodeBlockMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/RedstoneDiodeBlockMixin.java index 2c2152f1..446ecbc1 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/RedstoneDiodeBlockMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/RedstoneDiodeBlockMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mixin.core.block; +package io.izzel.arclight.common.mixin.core.block; import net.minecraft.block.BlockState; import net.minecraft.block.RedstoneDiodeBlock; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/RedstoneLampBlockMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/RedstoneLampBlockMixin.java similarity index 95% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/RedstoneLampBlockMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/RedstoneLampBlockMixin.java index c2b45106..97204ac1 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/RedstoneLampBlockMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/RedstoneLampBlockMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mixin.core.block; +package io.izzel.arclight.common.mixin.core.block; import net.minecraft.block.Block; import net.minecraft.block.BlockState; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/RedstoneOreBlockMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/RedstoneOreBlockMixin.java similarity index 97% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/RedstoneOreBlockMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/RedstoneOreBlockMixin.java index d4f1d877..e5f5aee8 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/RedstoneOreBlockMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/RedstoneOreBlockMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.block; +package io.izzel.arclight.common.mixin.core.block; -import io.izzel.arclight.bridge.entity.EntityBridge; +import io.izzel.arclight.common.bridge.entity.EntityBridge; import net.minecraft.block.BlockState; import net.minecraft.block.RedstoneOreBlock; import net.minecraft.entity.Entity; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/RedstoneTorchBlockMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/RedstoneTorchBlockMixin.java similarity index 97% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/RedstoneTorchBlockMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/RedstoneTorchBlockMixin.java index a68c41e0..9a5ef987 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/RedstoneTorchBlockMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/RedstoneTorchBlockMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mixin.core.block; +package io.izzel.arclight.common.mixin.core.block; import net.minecraft.block.BlockState; import net.minecraft.block.RedstoneTorchBlock; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/RedstoneWireBlockMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/RedstoneWireBlockMixin.java similarity index 95% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/RedstoneWireBlockMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/RedstoneWireBlockMixin.java index 6ae9a004..17110011 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/RedstoneWireBlockMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/RedstoneWireBlockMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mixin.core.block; +package io.izzel.arclight.common.mixin.core.block; import net.minecraft.block.BlockState; import net.minecraft.block.RedstoneWireBlock; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/SaplingBlockMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/SaplingBlockMixin.java similarity index 91% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/SaplingBlockMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/SaplingBlockMixin.java index 236c8ff6..e3889868 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/SaplingBlockMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/SaplingBlockMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mixin.core.block; +package io.izzel.arclight.common.mixin.core.block; import net.minecraft.block.BlockState; import net.minecraft.block.SaplingBlock; @@ -14,8 +14,8 @@ import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Redirect; -import io.izzel.arclight.mod.util.ArclightBlockPopulator; -import io.izzel.arclight.mod.util.ArclightCaptures; +import io.izzel.arclight.common.mod.util.ArclightBlockPopulator; +import io.izzel.arclight.common.mod.util.ArclightCaptures; import java.util.List; import java.util.Random; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/ScaffoldingBlockMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/ScaffoldingBlockMixin.java similarity index 95% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/ScaffoldingBlockMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/ScaffoldingBlockMixin.java index cb7a12b0..f6ec6bc0 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/ScaffoldingBlockMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/ScaffoldingBlockMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mixin.core.block; +package io.izzel.arclight.common.mixin.core.block; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/SilverfishBlockMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/SilverfishBlockMixin.java similarity index 89% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/SilverfishBlockMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/SilverfishBlockMixin.java index 2ed9da46..baa5a2a0 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/SilverfishBlockMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/SilverfishBlockMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.block; +package io.izzel.arclight.common.mixin.core.block; -import io.izzel.arclight.bridge.world.WorldBridge; +import io.izzel.arclight.common.bridge.world.WorldBridge; import net.minecraft.block.BlockState; import net.minecraft.block.SilverfishBlock; import net.minecraft.item.ItemStack; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/SnowBlockMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/SnowBlockMixin.java similarity index 95% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/SnowBlockMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/SnowBlockMixin.java index e17457ac..5128605e 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/SnowBlockMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/SnowBlockMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mixin.core.block; +package io.izzel.arclight.common.mixin.core.block; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/SpongeBlockMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/SpongeBlockMixin.java similarity index 99% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/SpongeBlockMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/SpongeBlockMixin.java index 7f62e204..e8229b6e 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/SpongeBlockMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/SpongeBlockMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mixin.core.block; +package io.izzel.arclight.common.mixin.core.block; import com.google.common.collect.Lists; import net.minecraft.block.Block; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/SpreadableSnowyDirtBlockMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/SpreadableSnowyDirtBlockMixin.java similarity index 96% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/SpreadableSnowyDirtBlockMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/SpreadableSnowyDirtBlockMixin.java index bec034d9..f4881f3a 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/SpreadableSnowyDirtBlockMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/SpreadableSnowyDirtBlockMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mixin.core.block; +package io.izzel.arclight.common.mixin.core.block; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/StemBlockMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/StemBlockMixin.java similarity index 97% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/StemBlockMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/StemBlockMixin.java index c8313356..e8d4fbde 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/StemBlockMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/StemBlockMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mixin.core.block; +package io.izzel.arclight.common.mixin.core.block; import net.minecraft.block.BlockState; import net.minecraft.block.StemBlock; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/SugarCaneBlockMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/SugarCaneBlockMixin.java similarity index 93% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/SugarCaneBlockMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/SugarCaneBlockMixin.java index 0e646212..2e50f298 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/SugarCaneBlockMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/SugarCaneBlockMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mixin.core.block; +package io.izzel.arclight.common.mixin.core.block; import net.minecraft.block.BlockState; import net.minecraft.block.SugarCaneBlock; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/SweetBerryBushBlockMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/SweetBerryBushBlockMixin.java similarity index 97% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/SweetBerryBushBlockMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/SweetBerryBushBlockMixin.java index 10dba0d2..207b79e8 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/SweetBerryBushBlockMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/SweetBerryBushBlockMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mixin.core.block; +package io.izzel.arclight.common.mixin.core.block; import net.minecraft.block.BlockState; import net.minecraft.block.SweetBerryBushBlock; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/TNTBlockMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/TNTBlockMixin.java similarity index 95% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/TNTBlockMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/TNTBlockMixin.java index c36623f1..cf6f081b 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/TNTBlockMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/TNTBlockMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mixin.core.block; +package io.izzel.arclight.common.mixin.core.block; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/TrapDoorBlockMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/TrapDoorBlockMixin.java similarity index 96% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/TrapDoorBlockMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/TrapDoorBlockMixin.java index 0f0aac01..866b78f1 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/TrapDoorBlockMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/TrapDoorBlockMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mixin.core.block; +package io.izzel.arclight.common.mixin.core.block; import net.minecraft.block.Block; import net.minecraft.block.BlockState; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/TripWireBlockMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/TripWireBlockMixin.java similarity index 96% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/TripWireBlockMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/TripWireBlockMixin.java index c14b850a..35f775f7 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/TripWireBlockMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/TripWireBlockMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.block; +package io.izzel.arclight.common.mixin.core.block; -import io.izzel.arclight.bridge.entity.EntityBridge; +import io.izzel.arclight.common.bridge.entity.EntityBridge; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.TripWireBlock; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/TripWireHookBlockMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/TripWireHookBlockMixin.java similarity index 95% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/TripWireHookBlockMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/TripWireHookBlockMixin.java index 6d3faa55..330b79e5 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/TripWireHookBlockMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/TripWireHookBlockMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mixin.core.block; +package io.izzel.arclight.common.mixin.core.block; import net.minecraft.block.BlockState; import net.minecraft.block.TripWireHookBlock; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/TurtleEggBlockMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/TurtleEggBlockMixin.java similarity index 93% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/TurtleEggBlockMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/TurtleEggBlockMixin.java index 8d3364eb..a72a329e 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/TurtleEggBlockMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/TurtleEggBlockMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.block; +package io.izzel.arclight.common.mixin.core.block; -import io.izzel.arclight.bridge.entity.EntityBridge; +import io.izzel.arclight.common.bridge.entity.EntityBridge; import net.minecraft.block.TurtleEggBlock; import net.minecraft.entity.Entity; import net.minecraft.entity.player.PlayerEntity; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/VineBlockMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/VineBlockMixin.java similarity index 99% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/VineBlockMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/VineBlockMixin.java index cd3eb875..325b5086 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/VineBlockMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/VineBlockMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mixin.core.block; +package io.izzel.arclight.common.mixin.core.block; import net.minecraft.block.Block; import net.minecraft.block.BlockState; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/WeightedPressurePlateBlockMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/WeightedPressurePlateBlockMixin.java similarity index 93% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/WeightedPressurePlateBlockMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/WeightedPressurePlateBlockMixin.java index ee576b92..571b6ac7 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/WeightedPressurePlateBlockMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/WeightedPressurePlateBlockMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.block; +package io.izzel.arclight.common.mixin.core.block; -import io.izzel.arclight.bridge.entity.EntityBridge; +import io.izzel.arclight.common.bridge.entity.EntityBridge; import net.minecraft.block.WeightedPressurePlateBlock; import net.minecraft.entity.Entity; import net.minecraft.entity.player.PlayerEntity; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/WitherSkeletonSkullBlockMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/WitherSkeletonSkullBlockMixin.java similarity index 96% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/WitherSkeletonSkullBlockMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/WitherSkeletonSkullBlockMixin.java index f0a947e1..e506394b 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/WitherSkeletonSkullBlockMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/WitherSkeletonSkullBlockMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.block; +package io.izzel.arclight.common.mixin.core.block; -import io.izzel.arclight.bridge.world.WorldBridge; +import io.izzel.arclight.common.bridge.world.WorldBridge; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.WitherSkeletonSkullBlock; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/command/CommandSourceMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/command/CommandSourceMixin.java similarity index 92% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/command/CommandSourceMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/command/CommandSourceMixin.java index 492dfaef..ced6d0d3 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/command/CommandSourceMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/command/CommandSourceMixin.java @@ -1,8 +1,8 @@ -package io.izzel.arclight.mixin.core.command; +package io.izzel.arclight.common.mixin.core.command; import com.mojang.brigadier.tree.CommandNode; -import io.izzel.arclight.bridge.command.CommandSourceBridge; -import io.izzel.arclight.bridge.command.ICommandSourceBridge; +import io.izzel.arclight.common.bridge.command.CommandSourceBridge; +import io.izzel.arclight.common.bridge.command.ICommandSourceBridge; import net.minecraft.command.CommandSource; import net.minecraft.command.ICommandSource; import net.minecraft.world.server.ServerWorld; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/command/ICommandSourceMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/command/ICommandSourceMixin.java similarity index 76% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/command/ICommandSourceMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/command/ICommandSourceMixin.java index c40cafb8..8216574a 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/command/ICommandSourceMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/command/ICommandSourceMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.command; +package io.izzel.arclight.common.mixin.core.command; -import io.izzel.arclight.bridge.command.ICommandSourceBridge; +import io.izzel.arclight.common.bridge.command.ICommandSourceBridge; import net.minecraft.command.CommandSource; import net.minecraft.command.ICommandSource; import org.bukkit.command.CommandSender; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/command/arguments/EntityArgumentMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/command/arguments/EntityArgumentMixin.java similarity index 90% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/command/arguments/EntityArgumentMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/command/arguments/EntityArgumentMixin.java index afaeda6a..ef8e00fe 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/command/arguments/EntityArgumentMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/command/arguments/EntityArgumentMixin.java @@ -1,9 +1,9 @@ -package io.izzel.arclight.mixin.core.command.arguments; +package io.izzel.arclight.common.mixin.core.command.arguments; import com.mojang.brigadier.StringReader; import com.mojang.brigadier.exceptions.CommandSyntaxException; -import io.izzel.arclight.bridge.command.arguments.EntityArgumentBridge; -import io.izzel.arclight.bridge.command.arguments.EntitySelectorParserBridge; +import io.izzel.arclight.common.bridge.command.arguments.EntityArgumentBridge; +import io.izzel.arclight.common.bridge.command.arguments.EntitySelectorParserBridge; import net.minecraft.command.arguments.EntityArgument; import net.minecraft.command.arguments.EntitySelector; import net.minecraft.command.arguments.EntitySelectorParser; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/command/arguments/EntitySelectorMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/command/arguments/EntitySelectorMixin.java similarity index 83% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/command/arguments/EntitySelectorMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/command/arguments/EntitySelectorMixin.java index 8fd7ab9b..59f71d0f 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/command/arguments/EntitySelectorMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/command/arguments/EntitySelectorMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.command.arguments; +package io.izzel.arclight.common.mixin.core.command.arguments; -import io.izzel.arclight.bridge.command.CommandSourceBridge; +import io.izzel.arclight.common.bridge.command.CommandSourceBridge; import net.minecraft.command.CommandSource; import net.minecraft.command.arguments.EntitySelector; import org.spongepowered.asm.mixin.Mixin; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/command/arguments/EntitySelectorParserMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/command/arguments/EntitySelectorParserMixin.java similarity index 92% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/command/arguments/EntitySelectorParserMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/command/arguments/EntitySelectorParserMixin.java index 2b175e1e..78f75cc2 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/command/arguments/EntitySelectorParserMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/command/arguments/EntitySelectorParserMixin.java @@ -1,7 +1,7 @@ -package io.izzel.arclight.mixin.core.command.arguments; +package io.izzel.arclight.common.mixin.core.command.arguments; import com.mojang.brigadier.exceptions.CommandSyntaxException; -import io.izzel.arclight.bridge.command.arguments.EntitySelectorParserBridge; +import io.izzel.arclight.common.bridge.command.arguments.EntitySelectorParserBridge; import net.minecraft.command.arguments.EntitySelector; import net.minecraft.command.arguments.EntitySelectorParser; import org.spongepowered.asm.mixin.Mixin; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/command/impl/EffectCommandMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/command/impl/EffectCommandMixin.java similarity index 94% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/command/impl/EffectCommandMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/command/impl/EffectCommandMixin.java index 42dd0138..4d83fd62 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/command/impl/EffectCommandMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/command/impl/EffectCommandMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.command.impl; +package io.izzel.arclight.common.mixin.core.command.impl; -import io.izzel.arclight.bridge.entity.LivingEntityBridge; +import io.izzel.arclight.common.bridge.entity.LivingEntityBridge; import net.minecraft.command.CommandSource; import net.minecraft.command.impl.EffectCommand; import net.minecraft.entity.Entity; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/command/impl/SummonCommandMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/command/impl/SummonCommandMixin.java similarity index 89% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/command/impl/SummonCommandMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/command/impl/SummonCommandMixin.java index 6b28540c..1f05a84f 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/command/impl/SummonCommandMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/command/impl/SummonCommandMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.command.impl; +package io.izzel.arclight.common.mixin.core.command.impl; -import io.izzel.arclight.bridge.world.server.ServerWorldBridge; +import io.izzel.arclight.common.bridge.world.server.ServerWorldBridge; import net.minecraft.command.CommandSource; import net.minecraft.command.impl.SummonCommand; import net.minecraft.nbt.CompoundNBT; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/command/impl/TeleportCommandMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/command/impl/TeleportCommandMixin.java similarity index 93% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/command/impl/TeleportCommandMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/command/impl/TeleportCommandMixin.java index f1fe7129..b2b70c38 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/command/impl/TeleportCommandMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/command/impl/TeleportCommandMixin.java @@ -1,8 +1,8 @@ -package io.izzel.arclight.mixin.core.command.impl; +package io.izzel.arclight.common.mixin.core.command.impl; -import io.izzel.arclight.bridge.entity.EntityBridge; -import io.izzel.arclight.bridge.network.play.ServerPlayNetHandlerBridge; -import io.izzel.arclight.bridge.world.server.ServerWorldBridge; +import io.izzel.arclight.common.bridge.entity.EntityBridge; +import io.izzel.arclight.common.bridge.network.play.ServerPlayNetHandlerBridge; +import io.izzel.arclight.common.bridge.world.server.ServerWorldBridge; import net.minecraft.command.CommandSource; import net.minecraft.command.impl.TeleportCommand; import net.minecraft.entity.Entity; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/enchantment/DamageEnchantmentMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/enchantment/DamageEnchantmentMixin.java similarity index 87% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/enchantment/DamageEnchantmentMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/enchantment/DamageEnchantmentMixin.java index 5016e52a..92903287 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/enchantment/DamageEnchantmentMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/enchantment/DamageEnchantmentMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.enchantment; +package io.izzel.arclight.common.mixin.core.enchantment; -import io.izzel.arclight.bridge.entity.LivingEntityBridge; +import io.izzel.arclight.common.bridge.entity.LivingEntityBridge; import net.minecraft.enchantment.DamageEnchantment; import net.minecraft.entity.Entity; import net.minecraft.entity.LivingEntity; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/enchantment/FrostWalkerEnchantmentMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/enchantment/FrostWalkerEnchantmentMixin.java similarity index 97% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/enchantment/FrostWalkerEnchantmentMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/enchantment/FrostWalkerEnchantmentMixin.java index b80288f9..f177c092 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/enchantment/FrostWalkerEnchantmentMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/enchantment/FrostWalkerEnchantmentMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mixin.core.enchantment; +package io.izzel.arclight.common.mixin.core.enchantment; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/AgeableEntityMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/AgeableEntityMixin.java similarity index 94% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/AgeableEntityMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/AgeableEntityMixin.java index a3cb49b3..113f17d3 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/AgeableEntityMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/AgeableEntityMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.entity; +package io.izzel.arclight.common.mixin.core.entity; -import io.izzel.arclight.bridge.world.WorldBridge; +import io.izzel.arclight.common.bridge.world.WorldBridge; import net.minecraft.entity.AgeableEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.nbt.CompoundNBT; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/AreaEffectCloudEntityMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/AreaEffectCloudEntityMixin.java similarity index 98% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/AreaEffectCloudEntityMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/AreaEffectCloudEntityMixin.java index 5f297e57..814a3452 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/AreaEffectCloudEntityMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/AreaEffectCloudEntityMixin.java @@ -1,7 +1,7 @@ -package io.izzel.arclight.mixin.core.entity; +package io.izzel.arclight.common.mixin.core.entity; import com.google.common.collect.Lists; -import io.izzel.arclight.bridge.entity.LivingEntityBridge; +import io.izzel.arclight.common.bridge.entity.LivingEntityBridge; import net.minecraft.entity.AreaEffectCloudEntity; import net.minecraft.entity.Entity; import net.minecraft.entity.LivingEntity; @@ -24,7 +24,7 @@ import org.spongepowered.asm.mixin.Interface; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Overwrite; import org.spongepowered.asm.mixin.Shadow; -import io.izzel.arclight.bridge.entity.AreaEffectCloudEntityBridge; +import io.izzel.arclight.common.bridge.entity.AreaEffectCloudEntityBridge; import javax.annotation.Nullable; import java.util.Iterator; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/CreatureEntityMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/CreatureEntityMixin.java similarity index 93% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/CreatureEntityMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/CreatureEntityMixin.java index b6ddc604..807500cd 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/CreatureEntityMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/CreatureEntityMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mixin.core.entity; +package io.izzel.arclight.common.mixin.core.entity; import net.minecraft.entity.CreatureEntity; import org.bukkit.Bukkit; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/EntityMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/EntityMixin.java similarity index 98% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/EntityMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/EntityMixin.java index a092795a..a319bf8e 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/EntityMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/EntityMixin.java @@ -1,15 +1,15 @@ -package io.izzel.arclight.mixin.core.entity; +package io.izzel.arclight.common.mixin.core.entity; -import io.izzel.arclight.bridge.command.ICommandSourceBridge; -import io.izzel.arclight.bridge.entity.EntityBridge; -import io.izzel.arclight.bridge.entity.InternalEntityBridge; -import io.izzel.arclight.bridge.entity.LivingEntityBridge; -import io.izzel.arclight.bridge.entity.MobEntityBridge; -import io.izzel.arclight.bridge.entity.player.ServerPlayerEntityBridge; -import io.izzel.arclight.bridge.world.WorldBridge; -import io.izzel.arclight.bridge.world.server.ServerWorldBridge; -import io.izzel.arclight.bridge.world.storage.SaveHandlerBridge; -import io.izzel.arclight.mod.util.ArclightCaptures; +import io.izzel.arclight.common.bridge.command.ICommandSourceBridge; +import io.izzel.arclight.common.bridge.entity.EntityBridge; +import io.izzel.arclight.common.bridge.entity.InternalEntityBridge; +import io.izzel.arclight.common.bridge.entity.LivingEntityBridge; +import io.izzel.arclight.common.bridge.entity.MobEntityBridge; +import io.izzel.arclight.common.bridge.entity.player.ServerPlayerEntityBridge; +import io.izzel.arclight.common.bridge.world.WorldBridge; +import io.izzel.arclight.common.bridge.world.server.ServerWorldBridge; +import io.izzel.arclight.common.bridge.world.storage.SaveHandlerBridge; +import io.izzel.arclight.common.mod.util.ArclightCaptures; import net.minecraft.block.pattern.BlockPattern; import net.minecraft.command.CommandSource; import net.minecraft.entity.Entity; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/EntityTypeMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/EntityTypeMixin.java similarity index 92% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/EntityTypeMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/EntityTypeMixin.java index 2114e620..95998bf3 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/EntityTypeMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/EntityTypeMixin.java @@ -1,8 +1,8 @@ -package io.izzel.arclight.mixin.core.entity; +package io.izzel.arclight.common.mixin.core.entity; -import io.izzel.arclight.bridge.entity.EntityTypeBridge; -import io.izzel.arclight.bridge.world.IWorldWriterBridge; -import io.izzel.arclight.bridge.world.WorldBridge; +import io.izzel.arclight.common.bridge.entity.EntityTypeBridge; +import io.izzel.arclight.common.bridge.world.IWorldWriterBridge; +import io.izzel.arclight.common.bridge.world.WorldBridge; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityType; import net.minecraft.entity.MobEntity; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/LivingEntityMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/LivingEntityMixin.java similarity index 99% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/LivingEntityMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/LivingEntityMixin.java index 854c706d..c53e8e1a 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/LivingEntityMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/LivingEntityMixin.java @@ -1,12 +1,12 @@ -package io.izzel.arclight.mixin.core.entity; +package io.izzel.arclight.common.mixin.core.entity; import com.google.common.base.Function; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.mojang.datafixers.util.Either; -import io.izzel.arclight.bridge.entity.LivingEntityBridge; -import io.izzel.arclight.bridge.entity.player.ServerPlayerEntityBridge; -import io.izzel.arclight.bridge.world.WorldBridge; +import io.izzel.arclight.common.bridge.entity.LivingEntityBridge; +import io.izzel.arclight.common.bridge.entity.player.ServerPlayerEntityBridge; +import io.izzel.arclight.common.bridge.world.WorldBridge; import net.minecraft.advancements.CriteriaTriggers; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityType; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/MobEntityMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/MobEntityMixin.java similarity index 97% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/MobEntityMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/MobEntityMixin.java index be86d73a..30dd6363 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/MobEntityMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/MobEntityMixin.java @@ -1,8 +1,8 @@ -package io.izzel.arclight.mixin.core.entity; +package io.izzel.arclight.common.mixin.core.entity; -import io.izzel.arclight.bridge.entity.EntityBridge; -import io.izzel.arclight.bridge.entity.LivingEntityBridge; -import io.izzel.arclight.bridge.entity.MobEntityBridge; +import io.izzel.arclight.common.bridge.entity.EntityBridge; +import io.izzel.arclight.common.bridge.entity.LivingEntityBridge; +import io.izzel.arclight.common.bridge.entity.MobEntityBridge; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityType; import net.minecraft.entity.LivingEntity; @@ -37,7 +37,7 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.Redirect; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -import io.izzel.arclight.mod.ArclightMod; +import io.izzel.arclight.common.mod.ArclightMod; import javax.annotation.Nullable; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/ai/attributes/RangedAttributeMixin_Accessor.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/ai/attributes/RangedAttributeMixin_Accessor.java similarity index 71% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/ai/attributes/RangedAttributeMixin_Accessor.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/ai/attributes/RangedAttributeMixin_Accessor.java index 63c39de9..faf5f5d4 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/ai/attributes/RangedAttributeMixin_Accessor.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/ai/attributes/RangedAttributeMixin_Accessor.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.entity.ai.attributes; +package io.izzel.arclight.common.mixin.core.entity.ai.attributes; -import io.izzel.arclight.bridge.entity.ai.attributes.RangedAttributeBridge; +import io.izzel.arclight.common.bridge.entity.ai.attributes.RangedAttributeBridge; import net.minecraft.entity.ai.attributes.RangedAttribute; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.gen.Accessor; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/ai/brain/task/AssignProfessionTaskMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/ai/brain/task/AssignProfessionTaskMixin.java similarity index 95% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/ai/brain/task/AssignProfessionTaskMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/ai/brain/task/AssignProfessionTaskMixin.java index b64a08a0..a4843bb4 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/ai/brain/task/AssignProfessionTaskMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/ai/brain/task/AssignProfessionTaskMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mixin.core.entity.ai.brain.task; +package io.izzel.arclight.common.mixin.core.entity.ai.brain.task; import net.minecraft.entity.ai.brain.task.AssignProfessionTask; import net.minecraft.entity.merchant.villager.VillagerData; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/ai/brain/task/ChangeJobTaskMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/ai/brain/task/ChangeJobTaskMixin.java similarity index 95% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/ai/brain/task/ChangeJobTaskMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/ai/brain/task/ChangeJobTaskMixin.java index e9302cb6..c8c26301 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/ai/brain/task/ChangeJobTaskMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/ai/brain/task/ChangeJobTaskMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mixin.core.entity.ai.brain.task; +package io.izzel.arclight.common.mixin.core.entity.ai.brain.task; import net.minecraft.entity.ai.brain.task.ChangeJobTask; import net.minecraft.entity.merchant.villager.VillagerData; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/ai/brain/task/CreateBabyVillagerTaskMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/ai/brain/task/CreateBabyVillagerTaskMixin.java similarity index 94% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/ai/brain/task/CreateBabyVillagerTaskMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/ai/brain/task/CreateBabyVillagerTaskMixin.java index 9bf2bbef..4704d8af 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/ai/brain/task/CreateBabyVillagerTaskMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/ai/brain/task/CreateBabyVillagerTaskMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mixin.core.entity.ai.brain.task; +package io.izzel.arclight.common.mixin.core.entity.ai.brain.task; import net.minecraft.entity.ai.brain.task.CreateBabyVillagerTask; import net.minecraft.entity.merchant.villager.VillagerEntity; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/ai/brain/task/FarmTaskMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/ai/brain/task/FarmTaskMixin.java similarity index 86% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/ai/brain/task/FarmTaskMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/ai/brain/task/FarmTaskMixin.java index fe38c43e..2043663d 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/ai/brain/task/FarmTaskMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/ai/brain/task/FarmTaskMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mixin.core.entity.ai.brain.task; +package io.izzel.arclight.common.mixin.core.entity.ai.brain.task; import net.minecraft.entity.ai.brain.task.FarmTask; import net.minecraft.entity.merchant.villager.VillagerEntity; @@ -7,7 +7,7 @@ import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import io.izzel.arclight.mod.util.ArclightCaptures; +import io.izzel.arclight.common.mod.util.ArclightCaptures; @Mixin(FarmTask.class) public abstract class FarmTaskMixin { diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/ai/brain/task/InteractWithDoorTaskMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/ai/brain/task/InteractWithDoorTaskMixin.java similarity index 95% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/ai/brain/task/InteractWithDoorTaskMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/ai/brain/task/InteractWithDoorTaskMixin.java index f2b59d5c..95fedf4e 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/ai/brain/task/InteractWithDoorTaskMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/ai/brain/task/InteractWithDoorTaskMixin.java @@ -1,7 +1,7 @@ -package io.izzel.arclight.mixin.core.entity.ai.brain.task; +package io.izzel.arclight.common.mixin.core.entity.ai.brain.task; import com.google.common.collect.Sets; -import io.izzel.arclight.bridge.entity.LivingEntityBridge; +import io.izzel.arclight.common.bridge.entity.LivingEntityBridge; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.DoorBlock; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/ai/goal/BreakBlockGoalMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/ai/goal/BreakBlockGoalMixin.java similarity index 91% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/ai/goal/BreakBlockGoalMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/ai/goal/BreakBlockGoalMixin.java index 35d05317..97a179e8 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/ai/goal/BreakBlockGoalMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/ai/goal/BreakBlockGoalMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.entity.ai.goal; +package io.izzel.arclight.common.mixin.core.entity.ai.goal; -import io.izzel.arclight.bridge.entity.MobEntityBridge; +import io.izzel.arclight.common.bridge.entity.MobEntityBridge; import net.minecraft.entity.MobEntity; import net.minecraft.entity.ai.goal.BreakBlockGoal; import net.minecraft.util.math.BlockPos; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/ai/goal/BreakDoorGoalMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/ai/goal/BreakDoorGoalMixin.java similarity index 94% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/ai/goal/BreakDoorGoalMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/ai/goal/BreakDoorGoalMixin.java index 65e2273c..00e5e98a 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/ai/goal/BreakDoorGoalMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/ai/goal/BreakDoorGoalMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mixin.core.entity.ai.goal; +package io.izzel.arclight.common.mixin.core.entity.ai.goal; import net.minecraft.entity.MobEntity; import net.minecraft.entity.ai.goal.BreakDoorGoal; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/ai/goal/BreedGoalMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/ai/goal/BreedGoalMixin.java similarity index 93% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/ai/goal/BreedGoalMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/ai/goal/BreedGoalMixin.java index 094e1bd6..7ce6f76a 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/ai/goal/BreedGoalMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/ai/goal/BreedGoalMixin.java @@ -1,7 +1,7 @@ -package io.izzel.arclight.mixin.core.entity.ai.goal; +package io.izzel.arclight.common.mixin.core.entity.ai.goal; -import io.izzel.arclight.bridge.entity.LivingEntityBridge; -import io.izzel.arclight.bridge.entity.passive.AnimalEntityBridge; +import io.izzel.arclight.common.bridge.entity.LivingEntityBridge; +import io.izzel.arclight.common.bridge.entity.passive.AnimalEntityBridge; import net.minecraft.entity.AgeableEntity; import net.minecraft.entity.ai.goal.BreedGoal; import net.minecraft.entity.passive.AnimalEntity; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/ai/goal/DefendVillageTargetGoalMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/ai/goal/DefendVillageTargetGoalMixin.java similarity index 87% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/ai/goal/DefendVillageTargetGoalMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/ai/goal/DefendVillageTargetGoalMixin.java index 86561968..25e2afa2 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/ai/goal/DefendVillageTargetGoalMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/ai/goal/DefendVillageTargetGoalMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.entity.ai.goal; +package io.izzel.arclight.common.mixin.core.entity.ai.goal; -import io.izzel.arclight.bridge.entity.MobEntityBridge; +import io.izzel.arclight.common.bridge.entity.MobEntityBridge; import net.minecraft.entity.ai.goal.DefendVillageTargetGoal; import net.minecraft.entity.passive.IronGolemEntity; import org.bukkit.event.entity.EntityTargetEvent; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/ai/goal/EatGrassGoalMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/ai/goal/EatGrassGoalMixin.java similarity index 97% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/ai/goal/EatGrassGoalMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/ai/goal/EatGrassGoalMixin.java index 182323c8..fe65d648 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/ai/goal/EatGrassGoalMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/ai/goal/EatGrassGoalMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mixin.core.entity.ai.goal; +package io.izzel.arclight.common.mixin.core.entity.ai.goal; import net.minecraft.block.Blocks; import net.minecraft.entity.Entity; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/ai/goal/FollowOwnerGoalMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/ai/goal/FollowOwnerGoalMixin.java similarity index 94% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/ai/goal/FollowOwnerGoalMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/ai/goal/FollowOwnerGoalMixin.java index 949c9444..73c0e20c 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/ai/goal/FollowOwnerGoalMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/ai/goal/FollowOwnerGoalMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.entity.ai.goal; +package io.izzel.arclight.common.mixin.core.entity.ai.goal; -import io.izzel.arclight.bridge.entity.EntityBridge; +import io.izzel.arclight.common.bridge.entity.EntityBridge; import net.minecraft.entity.ai.goal.FollowOwnerGoal; import net.minecraft.entity.passive.TameableEntity; import org.bukkit.Bukkit; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/ai/goal/HurtByTargetGoalMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/ai/goal/HurtByTargetGoalMixin.java similarity index 89% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/ai/goal/HurtByTargetGoalMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/ai/goal/HurtByTargetGoalMixin.java index aa85821e..d1673694 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/ai/goal/HurtByTargetGoalMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/ai/goal/HurtByTargetGoalMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.entity.ai.goal; +package io.izzel.arclight.common.mixin.core.entity.ai.goal; -import io.izzel.arclight.bridge.entity.MobEntityBridge; +import io.izzel.arclight.common.bridge.entity.MobEntityBridge; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.MobEntity; import net.minecraft.entity.ai.goal.HurtByTargetGoal; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/ai/goal/NearestAttackableTargetGoalMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/ai/goal/NearestAttackableTargetGoalMixin.java similarity index 88% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/ai/goal/NearestAttackableTargetGoalMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/ai/goal/NearestAttackableTargetGoalMixin.java index 34a1bcbb..38d65574 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/ai/goal/NearestAttackableTargetGoalMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/ai/goal/NearestAttackableTargetGoalMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.entity.ai.goal; +package io.izzel.arclight.common.mixin.core.entity.ai.goal; -import io.izzel.arclight.bridge.entity.MobEntityBridge; +import io.izzel.arclight.common.bridge.entity.MobEntityBridge; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.ai.goal.NearestAttackableTargetGoal; import net.minecraft.entity.player.ServerPlayerEntity; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/ai/goal/OwnerHurtByTargetGoalMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/ai/goal/OwnerHurtByTargetGoalMixin.java similarity index 84% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/ai/goal/OwnerHurtByTargetGoalMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/ai/goal/OwnerHurtByTargetGoalMixin.java index 1cf69350..268bed58 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/ai/goal/OwnerHurtByTargetGoalMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/ai/goal/OwnerHurtByTargetGoalMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.entity.ai.goal; +package io.izzel.arclight.common.mixin.core.entity.ai.goal; -import io.izzel.arclight.bridge.entity.MobEntityBridge; +import io.izzel.arclight.common.bridge.entity.MobEntityBridge; import net.minecraft.entity.ai.goal.OwnerHurtByTargetGoal; import org.bukkit.event.entity.EntityTargetEvent; import org.spongepowered.asm.mixin.Mixin; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/ai/goal/OwnerHurtTargetGoalMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/ai/goal/OwnerHurtTargetGoalMixin.java similarity index 84% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/ai/goal/OwnerHurtTargetGoalMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/ai/goal/OwnerHurtTargetGoalMixin.java index c6e70ea6..097662f5 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/ai/goal/OwnerHurtTargetGoalMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/ai/goal/OwnerHurtTargetGoalMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.entity.ai.goal; +package io.izzel.arclight.common.mixin.core.entity.ai.goal; -import io.izzel.arclight.bridge.entity.MobEntityBridge; +import io.izzel.arclight.common.bridge.entity.MobEntityBridge; import net.minecraft.entity.ai.goal.OwnerHurtTargetGoal; import org.bukkit.event.entity.EntityTargetEvent; import org.spongepowered.asm.mixin.Mixin; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/ai/goal/TargetGoalMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/ai/goal/TargetGoalMixin.java similarity index 90% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/ai/goal/TargetGoalMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/ai/goal/TargetGoalMixin.java index 8342b7c5..dadd6a10 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/ai/goal/TargetGoalMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/ai/goal/TargetGoalMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.entity.ai.goal; +package io.izzel.arclight.common.mixin.core.entity.ai.goal; -import io.izzel.arclight.bridge.entity.MobEntityBridge; +import io.izzel.arclight.common.bridge.entity.MobEntityBridge; import net.minecraft.entity.MobEntity; import net.minecraft.entity.ai.goal.TargetGoal; import org.bukkit.event.entity.EntityTargetEvent; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/ai/goal/TemptGoalMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/ai/goal/TemptGoalMixin.java similarity index 97% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/ai/goal/TemptGoalMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/ai/goal/TemptGoalMixin.java index 89fa7253..42f457ea 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/ai/goal/TemptGoalMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/ai/goal/TemptGoalMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mixin.core.entity.ai.goal; +package io.izzel.arclight.common.mixin.core.entity.ai.goal; import net.minecraft.entity.CreatureEntity; import net.minecraft.entity.ai.goal.TemptGoal; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/ai/goal/TriggerSkeletonTrapGoalMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/ai/goal/TriggerSkeletonTrapGoalMixin.java similarity index 92% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/ai/goal/TriggerSkeletonTrapGoalMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/ai/goal/TriggerSkeletonTrapGoalMixin.java index 33354768..9f66472c 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/ai/goal/TriggerSkeletonTrapGoalMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/ai/goal/TriggerSkeletonTrapGoalMixin.java @@ -1,7 +1,7 @@ -package io.izzel.arclight.mixin.core.entity.ai.goal; +package io.izzel.arclight.common.mixin.core.entity.ai.goal; -import io.izzel.arclight.bridge.world.WorldBridge; -import io.izzel.arclight.bridge.world.server.ServerWorldBridge; +import io.izzel.arclight.common.bridge.world.WorldBridge; +import io.izzel.arclight.common.bridge.world.server.ServerWorldBridge; import net.minecraft.entity.ai.goal.TriggerSkeletonTrapGoal; import net.minecraft.entity.monster.SkeletonEntity; import net.minecraft.entity.passive.horse.AbstractHorseEntity; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/boss/WitherEntityMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/boss/WitherEntityMixin.java similarity index 98% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/boss/WitherEntityMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/boss/WitherEntityMixin.java index 58466f4a..9b2c12c3 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/boss/WitherEntityMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/boss/WitherEntityMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.entity.boss; +package io.izzel.arclight.common.mixin.core.entity.boss; -import io.izzel.arclight.mixin.core.entity.CreatureEntityMixin; +import io.izzel.arclight.common.mixin.core.entity.CreatureEntityMixin; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.entity.Entity; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/boss/dragon/EnderDragonEntityMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/boss/dragon/EnderDragonEntityMixin.java similarity index 97% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/boss/dragon/EnderDragonEntityMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/boss/dragon/EnderDragonEntityMixin.java index a5929310..7a3fbb9e 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/boss/dragon/EnderDragonEntityMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/boss/dragon/EnderDragonEntityMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.entity.boss.dragon; +package io.izzel.arclight.common.mixin.core.entity.boss.dragon; -import io.izzel.arclight.mixin.core.entity.MobEntityMixin; +import io.izzel.arclight.common.mixin.core.entity.MobEntityMixin; import net.minecraft.block.BlockState; import net.minecraft.block.material.Material; import net.minecraft.entity.boss.dragon.EnderDragonEntity; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/boss/dragon/phase/PhaseManagerMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/boss/dragon/phase/PhaseManagerMixin.java similarity index 94% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/boss/dragon/phase/PhaseManagerMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/boss/dragon/phase/PhaseManagerMixin.java index 196a5bef..00632ffd 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/boss/dragon/phase/PhaseManagerMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/boss/dragon/phase/PhaseManagerMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.entity.boss.dragon.phase; +package io.izzel.arclight.common.mixin.core.entity.boss.dragon.phase; -import io.izzel.arclight.bridge.entity.EntityBridge; +import io.izzel.arclight.common.bridge.entity.EntityBridge; import net.minecraft.entity.boss.dragon.EnderDragonEntity; import net.minecraft.entity.boss.dragon.phase.IPhase; import net.minecraft.entity.boss.dragon.phase.PhaseManager; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/effect/LightningBoltEntityMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/effect/LightningBoltEntityMixin.java similarity index 92% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/effect/LightningBoltEntityMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/effect/LightningBoltEntityMixin.java index 0bccaf60..44118334 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/effect/LightningBoltEntityMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/effect/LightningBoltEntityMixin.java @@ -1,7 +1,7 @@ -package io.izzel.arclight.mixin.core.entity.effect; +package io.izzel.arclight.common.mixin.core.entity.effect; -import io.izzel.arclight.mixin.core.entity.EntityMixin; -import io.izzel.arclight.mod.util.ArclightCaptures; +import io.izzel.arclight.common.mixin.core.entity.EntityMixin; +import io.izzel.arclight.common.mod.util.ArclightCaptures; import net.minecraft.block.BlockState; import net.minecraft.entity.effect.LightningBoltEntity; import net.minecraft.util.math.BlockPos; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/item/ArmorStandEntityMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/item/ArmorStandEntityMixin.java similarity index 97% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/item/ArmorStandEntityMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/item/ArmorStandEntityMixin.java index a87ecc9b..d7183695 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/item/ArmorStandEntityMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/item/ArmorStandEntityMixin.java @@ -1,8 +1,8 @@ -package io.izzel.arclight.mixin.core.entity.item; +package io.izzel.arclight.common.mixin.core.entity.item; import com.google.common.collect.Lists; -import io.izzel.arclight.bridge.entity.player.ServerPlayerEntityBridge; -import io.izzel.arclight.mixin.core.entity.LivingEntityMixin; +import io.izzel.arclight.common.bridge.entity.player.ServerPlayerEntityBridge; +import io.izzel.arclight.common.mixin.core.entity.LivingEntityMixin; import net.minecraft.entity.item.ArmorStandEntity; import net.minecraft.entity.item.ItemEntity; import net.minecraft.entity.player.PlayerEntity; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/item/BoatEntityMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/item/BoatEntityMixin.java similarity index 95% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/item/BoatEntityMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/item/BoatEntityMixin.java index 3fa61b21..9f80e667 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/item/BoatEntityMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/item/BoatEntityMixin.java @@ -1,8 +1,8 @@ -package io.izzel.arclight.mixin.core.entity.item; +package io.izzel.arclight.common.mixin.core.entity.item; -import io.izzel.arclight.bridge.entity.EntityBridge; -import io.izzel.arclight.bridge.world.WorldBridge; -import io.izzel.arclight.mixin.core.entity.EntityMixin; +import io.izzel.arclight.common.bridge.entity.EntityBridge; +import io.izzel.arclight.common.bridge.world.WorldBridge; +import io.izzel.arclight.common.mixin.core.entity.EntityMixin; import net.minecraft.entity.Entity; import net.minecraft.entity.item.BoatEntity; import net.minecraft.util.DamageSource; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/item/EnderCrystalEntityMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/item/EnderCrystalEntityMixin.java similarity index 95% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/item/EnderCrystalEntityMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/item/EnderCrystalEntityMixin.java index 9c408350..4c39343b 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/item/EnderCrystalEntityMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/item/EnderCrystalEntityMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.entity.item; +package io.izzel.arclight.common.mixin.core.entity.item; -import io.izzel.arclight.mixin.core.entity.EntityMixin; +import io.izzel.arclight.common.mixin.core.entity.EntityMixin; import net.minecraft.entity.Entity; import net.minecraft.entity.item.EnderCrystalEntity; import net.minecraft.util.DamageSource; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/item/EnderPearlEntityMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/item/EnderPearlEntityMixin.java similarity index 88% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/item/EnderPearlEntityMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/item/EnderPearlEntityMixin.java index f67312c0..5d4f1665 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/item/EnderPearlEntityMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/item/EnderPearlEntityMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.entity.item; +package io.izzel.arclight.common.mixin.core.entity.item; -import io.izzel.arclight.bridge.world.WorldBridge; +import io.izzel.arclight.common.bridge.world.WorldBridge; import net.minecraft.entity.item.EnderPearlEntity; import net.minecraft.util.math.RayTraceResult; import org.bukkit.craftbukkit.v.event.CraftEventFactory; @@ -9,7 +9,7 @@ import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import io.izzel.arclight.mixin.core.entity.projectile.ThrowableEntityMixin; +import io.izzel.arclight.common.mixin.core.entity.projectile.ThrowableEntityMixin; @Mixin(EnderPearlEntity.class) public abstract class EnderPearlEntityMixin extends ThrowableEntityMixin { diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/item/ExperienceBottleEntityMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/item/ExperienceBottleEntityMixin.java similarity index 92% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/item/ExperienceBottleEntityMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/item/ExperienceBottleEntityMixin.java index 32cadaad..688cc134 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/item/ExperienceBottleEntityMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/item/ExperienceBottleEntityMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.entity.item; +package io.izzel.arclight.common.mixin.core.entity.item; -import io.izzel.arclight.mixin.core.entity.EntityMixin; +import io.izzel.arclight.common.mixin.core.entity.EntityMixin; import net.minecraft.entity.item.ExperienceBottleEntity; import net.minecraft.entity.item.ExperienceOrbEntity; import net.minecraft.potion.PotionUtils; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/item/ExperienceOrbEntityMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/item/ExperienceOrbEntityMixin.java similarity index 98% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/item/ExperienceOrbEntityMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/item/ExperienceOrbEntityMixin.java index 300dfa87..5f461ba6 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/item/ExperienceOrbEntityMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/item/ExperienceOrbEntityMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.entity.item; +package io.izzel.arclight.common.mixin.core.entity.item; -import io.izzel.arclight.mixin.core.entity.EntityMixin; +import io.izzel.arclight.common.mixin.core.entity.EntityMixin; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.enchantment.Enchantments; import net.minecraft.entity.LivingEntity; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/item/FallingBlockEntityMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/item/FallingBlockEntityMixin.java similarity index 93% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/item/FallingBlockEntityMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/item/FallingBlockEntityMixin.java index 3d2142ef..dd6c1bf1 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/item/FallingBlockEntityMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/item/FallingBlockEntityMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.entity.item; +package io.izzel.arclight.common.mixin.core.entity.item; -import io.izzel.arclight.mixin.core.entity.EntityMixin; +import io.izzel.arclight.common.mixin.core.entity.EntityMixin; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.entity.item.FallingBlockEntity; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/item/FireworkRocketEntityMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/item/FireworkRocketEntityMixin.java similarity index 91% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/item/FireworkRocketEntityMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/item/FireworkRocketEntityMixin.java index 0200ec54..0049019e 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/item/FireworkRocketEntityMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/item/FireworkRocketEntityMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.entity.item; +package io.izzel.arclight.common.mixin.core.entity.item; -import io.izzel.arclight.mixin.core.entity.EntityMixin; +import io.izzel.arclight.common.mixin.core.entity.EntityMixin; import net.minecraft.entity.item.FireworkRocketEntity; import org.bukkit.craftbukkit.v.event.CraftEventFactory; import org.spongepowered.asm.mixin.Mixin; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/item/HangingEntityMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/item/HangingEntityMixin.java similarity index 95% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/item/HangingEntityMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/item/HangingEntityMixin.java index 3a7607c9..3c773a12 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/item/HangingEntityMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/item/HangingEntityMixin.java @@ -1,8 +1,8 @@ -package io.izzel.arclight.mixin.core.entity.item; +package io.izzel.arclight.common.mixin.core.entity.item; -import io.izzel.arclight.bridge.entity.EntityBridge; -import io.izzel.arclight.bridge.util.IndirectEntityDamageSourceBridge; -import io.izzel.arclight.mixin.core.entity.EntityMixin; +import io.izzel.arclight.common.bridge.entity.EntityBridge; +import io.izzel.arclight.common.bridge.util.IndirectEntityDamageSourceBridge; +import io.izzel.arclight.common.mixin.core.entity.EntityMixin; import net.minecraft.block.material.Material; import net.minecraft.entity.Entity; import net.minecraft.entity.MoverType; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/item/ItemEntityMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/item/ItemEntityMixin.java similarity index 92% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/item/ItemEntityMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/item/ItemEntityMixin.java index 6ebd6997..c2131178 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/item/ItemEntityMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/item/ItemEntityMixin.java @@ -1,11 +1,11 @@ -package io.izzel.arclight.mixin.core.entity.item; +package io.izzel.arclight.common.mixin.core.entity.item; import com.google.common.base.Preconditions; -import io.izzel.arclight.bridge.entity.LivingEntityBridge; -import io.izzel.arclight.bridge.entity.player.PlayerEntityBridge; -import io.izzel.arclight.bridge.entity.player.ServerPlayerEntityBridge; -import io.izzel.arclight.bridge.network.datasync.EntityDataManagerBridge; -import io.izzel.arclight.mixin.core.entity.EntityMixin; +import io.izzel.arclight.common.bridge.entity.LivingEntityBridge; +import io.izzel.arclight.common.bridge.entity.player.PlayerEntityBridge; +import io.izzel.arclight.common.bridge.entity.player.ServerPlayerEntityBridge; +import io.izzel.arclight.common.bridge.network.datasync.EntityDataManagerBridge; +import io.izzel.arclight.common.mixin.core.entity.EntityMixin; import net.minecraft.entity.item.ItemEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; @@ -26,7 +26,7 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.Redirect; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -import io.izzel.arclight.bridge.entity.player.PlayerInventoryBridge; +import io.izzel.arclight.common.bridge.entity.player.PlayerInventoryBridge; import java.util.UUID; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/item/ItemFrameEntityMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/item/ItemFrameEntityMixin.java similarity index 98% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/item/ItemFrameEntityMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/item/ItemFrameEntityMixin.java index c4c58561..e044b58a 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/item/ItemFrameEntityMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/item/ItemFrameEntityMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mixin.core.entity.item; +package io.izzel.arclight.common.mixin.core.entity.item; import net.minecraft.block.Blocks; import net.minecraft.entity.Entity; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/item/LeashKnotEntityMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/item/LeashKnotEntityMixin.java similarity index 98% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/item/LeashKnotEntityMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/item/LeashKnotEntityMixin.java index 0f58dcf5..7197b966 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/item/LeashKnotEntityMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/item/LeashKnotEntityMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mixin.core.entity.item; +package io.izzel.arclight.common.mixin.core.entity.item; import net.minecraft.entity.MobEntity; import net.minecraft.entity.item.LeashKnotEntity; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/item/PaintingEntityMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/item/PaintingEntityMixin.java similarity index 95% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/item/PaintingEntityMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/item/PaintingEntityMixin.java index b25d304c..b9f4be1a 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/item/PaintingEntityMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/item/PaintingEntityMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mixin.core.entity.item; +package io.izzel.arclight.common.mixin.core.entity.item; import com.google.common.collect.Lists; import net.minecraft.entity.EntityType; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/item/TNTEntityMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/item/TNTEntityMixin.java similarity index 95% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/item/TNTEntityMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/item/TNTEntityMixin.java index e19cc04e..85aab284 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/item/TNTEntityMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/item/TNTEntityMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.entity.item; +package io.izzel.arclight.common.mixin.core.entity.item; -import io.izzel.arclight.mixin.core.entity.EntityMixin; +import io.izzel.arclight.common.mixin.core.entity.EntityMixin; import net.minecraft.entity.EntityType; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.MoverType; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/item/minecart/AbstractMinecartEntityMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/item/minecart/AbstractMinecartEntityMixin.java similarity index 98% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/item/minecart/AbstractMinecartEntityMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/item/minecart/AbstractMinecartEntityMixin.java index ec70f7ce..25026fba 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/item/minecart/AbstractMinecartEntityMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/item/minecart/AbstractMinecartEntityMixin.java @@ -1,8 +1,8 @@ -package io.izzel.arclight.mixin.core.entity.item.minecart; +package io.izzel.arclight.common.mixin.core.entity.item.minecart; -import io.izzel.arclight.bridge.entity.EntityBridge; -import io.izzel.arclight.bridge.world.WorldBridge; -import io.izzel.arclight.mixin.core.entity.EntityMixin; +import io.izzel.arclight.common.bridge.entity.EntityBridge; +import io.izzel.arclight.common.bridge.world.WorldBridge; +import io.izzel.arclight.common.mixin.core.entity.EntityMixin; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.block.PoweredRailBlock; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/item/minecart/ContainerMinecartEntityMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/item/minecart/ContainerMinecartEntityMixin.java similarity index 95% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/item/minecart/ContainerMinecartEntityMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/item/minecart/ContainerMinecartEntityMixin.java index 8e2556df..2d0a2f14 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/item/minecart/ContainerMinecartEntityMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/item/minecart/ContainerMinecartEntityMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.entity.item.minecart; +package io.izzel.arclight.common.mixin.core.entity.item.minecart; -import io.izzel.arclight.bridge.inventory.IInventoryBridge; +import io.izzel.arclight.common.bridge.inventory.IInventoryBridge; import net.minecraft.entity.EntityType; import net.minecraft.entity.item.minecart.ContainerMinecartEntity; import net.minecraft.inventory.IInventory; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/item/minecart/MinecartCommandBlockEntity_MinecartCommandLogicMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/item/minecart/MinecartCommandBlockEntity_MinecartCommandLogicMixin.java similarity index 77% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/item/minecart/MinecartCommandBlockEntity_MinecartCommandLogicMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/item/minecart/MinecartCommandBlockEntity_MinecartCommandLogicMixin.java index 80494704..bda7fbc5 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/item/minecart/MinecartCommandBlockEntity_MinecartCommandLogicMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/item/minecart/MinecartCommandBlockEntity_MinecartCommandLogicMixin.java @@ -1,7 +1,7 @@ -package io.izzel.arclight.mixin.core.entity.item.minecart; +package io.izzel.arclight.common.mixin.core.entity.item.minecart; -import io.izzel.arclight.bridge.command.ICommandSourceBridge; -import io.izzel.arclight.bridge.entity.EntityBridge; +import io.izzel.arclight.common.bridge.command.ICommandSourceBridge; +import io.izzel.arclight.common.bridge.entity.EntityBridge; import net.minecraft.command.CommandSource; import net.minecraft.entity.item.minecart.MinecartCommandBlockEntity; import org.bukkit.command.CommandSender; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/merchant/IMerchantMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/merchant/IMerchantMixin.java similarity index 71% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/merchant/IMerchantMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/merchant/IMerchantMixin.java index c8cb2d9a..a21af7bb 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/merchant/IMerchantMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/merchant/IMerchantMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.entity.merchant; +package io.izzel.arclight.common.mixin.core.entity.merchant; -import io.izzel.arclight.bridge.entity.merchant.IMerchantBridge; +import io.izzel.arclight.common.bridge.entity.merchant.IMerchantBridge; import net.minecraft.entity.merchant.IMerchant; import org.bukkit.craftbukkit.v.inventory.CraftMerchant; import org.spongepowered.asm.mixin.Mixin; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/merchant/villager/AbstractVillagerEntityMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/merchant/villager/AbstractVillagerEntityMixin.java similarity index 87% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/merchant/villager/AbstractVillagerEntityMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/merchant/villager/AbstractVillagerEntityMixin.java index cf7c1f57..20edcc3b 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/merchant/villager/AbstractVillagerEntityMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/merchant/villager/AbstractVillagerEntityMixin.java @@ -1,8 +1,8 @@ -package io.izzel.arclight.mixin.core.entity.merchant.villager; +package io.izzel.arclight.common.mixin.core.entity.merchant.villager; -import io.izzel.arclight.bridge.entity.merchant.IMerchantBridge; -import io.izzel.arclight.bridge.inventory.IInventoryBridge; -import io.izzel.arclight.mixin.core.entity.CreatureEntityMixin; +import io.izzel.arclight.common.bridge.entity.merchant.IMerchantBridge; +import io.izzel.arclight.common.bridge.inventory.IInventoryBridge; +import io.izzel.arclight.common.mixin.core.entity.CreatureEntityMixin; import net.minecraft.entity.EntityType; import net.minecraft.entity.merchant.villager.AbstractVillagerEntity; import net.minecraft.inventory.Inventory; @@ -22,7 +22,7 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.Redirect; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import io.izzel.arclight.bridge.item.MerchantOfferBridge; +import io.izzel.arclight.common.bridge.item.MerchantOfferBridge; @Mixin(AbstractVillagerEntity.class) public abstract class AbstractVillagerEntityMixin extends CreatureEntityMixin implements IMerchantBridge { diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/merchant/villager/VillagerEntityMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/merchant/villager/VillagerEntityMixin.java similarity index 94% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/merchant/villager/VillagerEntityMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/merchant/villager/VillagerEntityMixin.java index c54a3629..7f55d9db 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/merchant/villager/VillagerEntityMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/merchant/villager/VillagerEntityMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.entity.merchant.villager; +package io.izzel.arclight.common.mixin.core.entity.merchant.villager; -import io.izzel.arclight.bridge.world.WorldBridge; +import io.izzel.arclight.common.bridge.world.WorldBridge; import net.minecraft.entity.effect.LightningBoltEntity; import net.minecraft.entity.merchant.villager.VillagerEntity; import net.minecraft.entity.monster.WitchEntity; @@ -20,7 +20,7 @@ import org.spongepowered.asm.mixin.injection.Redirect; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; import org.spongepowered.asm.mixin.injection.callback.LocalCapture; -import io.izzel.arclight.bridge.item.MerchantOfferBridge; +import io.izzel.arclight.common.bridge.item.MerchantOfferBridge; @Mixin(VillagerEntity.class) public abstract class VillagerEntityMixin extends AbstractVillagerEntityMixin { diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/merchant/villager/WanderingTraderEntityMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/merchant/villager/WanderingTraderEntityMixin.java similarity index 90% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/merchant/villager/WanderingTraderEntityMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/merchant/villager/WanderingTraderEntityMixin.java index 9411648d..38c2fb1b 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/merchant/villager/WanderingTraderEntityMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/merchant/villager/WanderingTraderEntityMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mixin.core.entity.merchant.villager; +package io.izzel.arclight.common.mixin.core.entity.merchant.villager; import net.minecraft.entity.merchant.villager.WanderingTraderEntity; import net.minecraft.item.MerchantOffer; @@ -10,7 +10,7 @@ import org.bukkit.event.entity.VillagerAcquireTradeEvent; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Redirect; -import io.izzel.arclight.bridge.item.MerchantOfferBridge; +import io.izzel.arclight.common.bridge.item.MerchantOfferBridge; @Mixin(WanderingTraderEntity.class) public abstract class WanderingTraderEntityMixin extends AbstractVillagerEntityMixin { diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/monster/AbstractRaiderEntity_FindTargetGoalMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/monster/AbstractRaiderEntity_FindTargetGoalMixin.java similarity index 91% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/monster/AbstractRaiderEntity_FindTargetGoalMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/monster/AbstractRaiderEntity_FindTargetGoalMixin.java index 67050dcf..c7d6d8c3 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/monster/AbstractRaiderEntity_FindTargetGoalMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/monster/AbstractRaiderEntity_FindTargetGoalMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.entity.monster; +package io.izzel.arclight.common.mixin.core.entity.monster; -import io.izzel.arclight.bridge.entity.MobEntityBridge; +import io.izzel.arclight.common.bridge.entity.MobEntityBridge; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.monster.AbstractRaiderEntity; import org.bukkit.event.entity.EntityTargetEvent; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/monster/AbstractSkeletonEntityMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/monster/AbstractSkeletonEntityMixin.java similarity index 89% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/monster/AbstractSkeletonEntityMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/monster/AbstractSkeletonEntityMixin.java index eebfde53..f97c481d 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/monster/AbstractSkeletonEntityMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/monster/AbstractSkeletonEntityMixin.java @@ -1,7 +1,7 @@ -package io.izzel.arclight.mixin.core.entity.monster; +package io.izzel.arclight.common.mixin.core.entity.monster; -import io.izzel.arclight.bridge.entity.EntityBridge; -import io.izzel.arclight.mixin.core.entity.CreatureEntityMixin; +import io.izzel.arclight.common.bridge.entity.EntityBridge; +import io.izzel.arclight.common.mixin.core.entity.CreatureEntityMixin; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.monster.AbstractSkeletonEntity; import net.minecraft.entity.projectile.AbstractArrowEntity; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/monster/CaveSpiderEntityMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/monster/CaveSpiderEntityMixin.java similarity index 87% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/monster/CaveSpiderEntityMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/monster/CaveSpiderEntityMixin.java index c8d52e36..e68272ab 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/monster/CaveSpiderEntityMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/monster/CaveSpiderEntityMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.entity.monster; +package io.izzel.arclight.common.mixin.core.entity.monster; -import io.izzel.arclight.bridge.entity.LivingEntityBridge; +import io.izzel.arclight.common.bridge.entity.LivingEntityBridge; import net.minecraft.entity.Entity; import net.minecraft.entity.monster.CaveSpiderEntity; import org.bukkit.event.entity.EntityPotionEffectEvent; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/monster/CreeperEntityMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/monster/CreeperEntityMixin.java similarity index 93% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/monster/CreeperEntityMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/monster/CreeperEntityMixin.java index e0b019ed..f2d4d24c 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/monster/CreeperEntityMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/monster/CreeperEntityMixin.java @@ -1,7 +1,7 @@ -package io.izzel.arclight.mixin.core.entity.monster; +package io.izzel.arclight.common.mixin.core.entity.monster; -import io.izzel.arclight.bridge.entity.monster.CreeperEntityBridge; -import io.izzel.arclight.bridge.world.WorldBridge; +import io.izzel.arclight.common.bridge.entity.monster.CreeperEntityBridge; +import io.izzel.arclight.common.bridge.world.WorldBridge; import net.minecraft.entity.AreaEffectCloudEntity; import net.minecraft.entity.effect.LightningBoltEntity; import net.minecraft.entity.monster.CreeperEntity; @@ -22,7 +22,7 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.spongepowered.asm.mixin.injection.callback.LocalCapture; -import io.izzel.arclight.mixin.core.entity.CreatureEntityMixin; +import io.izzel.arclight.common.mixin.core.entity.CreatureEntityMixin; import java.util.Collection; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/monster/ElderGuardianEntityMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/monster/ElderGuardianEntityMixin.java similarity index 81% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/monster/ElderGuardianEntityMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/monster/ElderGuardianEntityMixin.java index 2d3771b7..6b01a639 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/monster/ElderGuardianEntityMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/monster/ElderGuardianEntityMixin.java @@ -1,7 +1,7 @@ -package io.izzel.arclight.mixin.core.entity.monster; +package io.izzel.arclight.common.mixin.core.entity.monster; -import io.izzel.arclight.bridge.entity.player.ServerPlayerEntityBridge; -import io.izzel.arclight.mixin.core.entity.CreatureEntityMixin; +import io.izzel.arclight.common.bridge.entity.player.ServerPlayerEntityBridge; +import io.izzel.arclight.common.mixin.core.entity.CreatureEntityMixin; import net.minecraft.entity.monster.ElderGuardianEntity; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.potion.EffectInstance; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/monster/EndermanEntityMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/monster/EndermanEntityMixin.java similarity index 91% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/monster/EndermanEntityMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/monster/EndermanEntityMixin.java index 89bfc067..38dc71ce 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/monster/EndermanEntityMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/monster/EndermanEntityMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mixin.core.entity.monster; +package io.izzel.arclight.common.mixin.core.entity.monster; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.monster.EndermanEntity; @@ -8,7 +8,7 @@ import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import io.izzel.arclight.mixin.core.entity.CreatureEntityMixin; +import io.izzel.arclight.common.mixin.core.entity.CreatureEntityMixin; import javax.annotation.Nullable; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/monster/EndermanEntity_PlaceBlockGoalMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/monster/EndermanEntity_PlaceBlockGoalMixin.java similarity index 96% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/monster/EndermanEntity_PlaceBlockGoalMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/monster/EndermanEntity_PlaceBlockGoalMixin.java index b2b72189..c830cddb 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/monster/EndermanEntity_PlaceBlockGoalMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/monster/EndermanEntity_PlaceBlockGoalMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mixin.core.entity.monster; +package io.izzel.arclight.common.mixin.core.entity.monster; import net.minecraft.block.BlockState; import net.minecraft.entity.monster.EndermanEntity; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/monster/EndermanEntity_TakeBlockGoalMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/monster/EndermanEntity_TakeBlockGoalMixin.java similarity index 95% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/monster/EndermanEntity_TakeBlockGoalMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/monster/EndermanEntity_TakeBlockGoalMixin.java index a27592d2..977d9588 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/monster/EndermanEntity_TakeBlockGoalMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/monster/EndermanEntity_TakeBlockGoalMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mixin.core.entity.monster; +package io.izzel.arclight.common.mixin.core.entity.monster; import net.minecraft.block.Blocks; import net.minecraft.entity.monster.EndermanEntity; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/monster/GhastEntity_FireballAttackGoalMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/monster/GhastEntity_FireballAttackGoalMixin.java similarity index 86% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/monster/GhastEntity_FireballAttackGoalMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/monster/GhastEntity_FireballAttackGoalMixin.java index 7d77112a..4e74c261 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/monster/GhastEntity_FireballAttackGoalMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/monster/GhastEntity_FireballAttackGoalMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mixin.core.entity.monster; +package io.izzel.arclight.common.mixin.core.entity.monster; import net.minecraft.entity.Entity; import net.minecraft.entity.monster.GhastEntity; @@ -8,7 +8,7 @@ import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Redirect; -import io.izzel.arclight.bridge.entity.projectile.DamagingProjectileEntityBridge; +import io.izzel.arclight.common.bridge.entity.projectile.DamagingProjectileEntityBridge; @Mixin(targets = "net.minecraft.entity.monster.GhastEntity.FireballAttackGoal") public abstract class GhastEntity_FireballAttackGoalMixin { diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/monster/HuskEntityMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/monster/HuskEntityMixin.java similarity index 86% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/monster/HuskEntityMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/monster/HuskEntityMixin.java index b60b468b..10ce789f 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/monster/HuskEntityMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/monster/HuskEntityMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.entity.monster; +package io.izzel.arclight.common.mixin.core.entity.monster; -import io.izzel.arclight.bridge.entity.LivingEntityBridge; +import io.izzel.arclight.common.bridge.entity.LivingEntityBridge; import net.minecraft.entity.Entity; import net.minecraft.entity.monster.HuskEntity; import org.bukkit.event.entity.EntityPotionEffectEvent; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/monster/IllusionerEntity_BlindnessSpellGoalMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/monster/IllusionerEntity_BlindnessSpellGoalMixin.java similarity index 86% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/monster/IllusionerEntity_BlindnessSpellGoalMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/monster/IllusionerEntity_BlindnessSpellGoalMixin.java index 02496291..46b6270d 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/monster/IllusionerEntity_BlindnessSpellGoalMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/monster/IllusionerEntity_BlindnessSpellGoalMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.entity.monster; +package io.izzel.arclight.common.mixin.core.entity.monster; -import io.izzel.arclight.bridge.entity.LivingEntityBridge; +import io.izzel.arclight.common.bridge.entity.LivingEntityBridge; import net.minecraft.entity.monster.IllusionerEntity; import org.bukkit.event.entity.EntityPotionEffectEvent; import org.spongepowered.asm.mixin.Mixin; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/monster/IllusionerEntity_MirrorSpellGoalMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/monster/IllusionerEntity_MirrorSpellGoalMixin.java similarity index 86% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/monster/IllusionerEntity_MirrorSpellGoalMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/monster/IllusionerEntity_MirrorSpellGoalMixin.java index 3d674e91..0cdd2916 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/monster/IllusionerEntity_MirrorSpellGoalMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/monster/IllusionerEntity_MirrorSpellGoalMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.entity.monster; +package io.izzel.arclight.common.mixin.core.entity.monster; -import io.izzel.arclight.bridge.entity.LivingEntityBridge; +import io.izzel.arclight.common.bridge.entity.LivingEntityBridge; import net.minecraft.entity.monster.IllusionerEntity; import org.bukkit.event.entity.EntityPotionEffectEvent; import org.spongepowered.asm.mixin.Mixin; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/monster/PhantomEntity_AttackPlayerGoalMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/monster/PhantomEntity_AttackPlayerGoalMixin.java similarity index 88% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/monster/PhantomEntity_AttackPlayerGoalMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/monster/PhantomEntity_AttackPlayerGoalMixin.java index 2b061a07..c0e1cc7b 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/monster/PhantomEntity_AttackPlayerGoalMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/monster/PhantomEntity_AttackPlayerGoalMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.entity.monster; +package io.izzel.arclight.common.mixin.core.entity.monster; -import io.izzel.arclight.bridge.entity.MobEntityBridge; +import io.izzel.arclight.common.bridge.entity.MobEntityBridge; import net.minecraft.entity.monster.PhantomEntity; import org.bukkit.event.entity.EntityTargetEvent; import org.spongepowered.asm.mixin.Mixin; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/monster/PillagerEntityMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/monster/PillagerEntityMixin.java similarity index 86% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/monster/PillagerEntityMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/monster/PillagerEntityMixin.java index 8cdabd03..2ea26dc5 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/monster/PillagerEntityMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/monster/PillagerEntityMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.entity.monster; +package io.izzel.arclight.common.mixin.core.entity.monster; -import io.izzel.arclight.mixin.core.entity.CreatureEntityMixin; +import io.izzel.arclight.common.mixin.core.entity.CreatureEntityMixin; import net.minecraft.entity.monster.PillagerEntity; import net.minecraft.inventory.Inventory; import org.spongepowered.asm.mixin.Mixin; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/monster/RavagerEntityMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/monster/RavagerEntityMixin.java similarity index 87% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/monster/RavagerEntityMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/monster/RavagerEntityMixin.java index 89faf23d..c3e3c0bf 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/monster/RavagerEntityMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/monster/RavagerEntityMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.entity.monster; +package io.izzel.arclight.common.mixin.core.entity.monster; -import io.izzel.arclight.mixin.core.entity.CreatureEntityMixin; +import io.izzel.arclight.common.mixin.core.entity.CreatureEntityMixin; import net.minecraft.block.Blocks; import net.minecraft.entity.monster.RavagerEntity; import net.minecraft.util.math.BlockPos; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/monster/ShulkerEntityMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/monster/ShulkerEntityMixin.java similarity index 85% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/monster/ShulkerEntityMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/monster/ShulkerEntityMixin.java index 053a0751..a2aa2740 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/monster/ShulkerEntityMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/monster/ShulkerEntityMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.entity.monster; +package io.izzel.arclight.common.mixin.core.entity.monster; -import io.izzel.arclight.mixin.core.entity.CreatureEntityMixin; +import io.izzel.arclight.common.mixin.core.entity.CreatureEntityMixin; import net.minecraft.entity.monster.ShulkerEntity; import net.minecraft.network.datasync.DataParameter; import net.minecraft.world.server.ServerWorld; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/monster/SilverfishEntity_HideInStoneGoalMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/monster/SilverfishEntity_HideInStoneGoalMixin.java similarity index 96% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/monster/SilverfishEntity_HideInStoneGoalMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/monster/SilverfishEntity_HideInStoneGoalMixin.java index 4d8a2305..1cc7f250 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/monster/SilverfishEntity_HideInStoneGoalMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/monster/SilverfishEntity_HideInStoneGoalMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mixin.core.entity.monster; +package io.izzel.arclight.common.mixin.core.entity.monster; import net.minecraft.block.BlockState; import net.minecraft.block.SilverfishBlock; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/monster/SilverfishEntity_SummonSilverfishGoalMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/monster/SilverfishEntity_SummonSilverfishGoalMixin.java similarity index 97% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/monster/SilverfishEntity_SummonSilverfishGoalMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/monster/SilverfishEntity_SummonSilverfishGoalMixin.java index 16296999..064003ca 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/monster/SilverfishEntity_SummonSilverfishGoalMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/monster/SilverfishEntity_SummonSilverfishGoalMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mixin.core.entity.monster; +package io.izzel.arclight.common.mixin.core.entity.monster; import net.minecraft.block.Block; import net.minecraft.block.BlockState; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/monster/SlimeEntityMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/monster/SlimeEntityMixin.java similarity index 93% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/monster/SlimeEntityMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/monster/SlimeEntityMixin.java index 7f55818d..f1877c94 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/monster/SlimeEntityMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/monster/SlimeEntityMixin.java @@ -1,7 +1,7 @@ -package io.izzel.arclight.mixin.core.entity.monster; +package io.izzel.arclight.common.mixin.core.entity.monster; -import io.izzel.arclight.bridge.world.WorldBridge; -import io.izzel.arclight.mixin.core.entity.MobEntityMixin; +import io.izzel.arclight.common.bridge.world.WorldBridge; +import io.izzel.arclight.common.mixin.core.entity.MobEntityMixin; import net.minecraft.entity.EntityType; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.monster.SlimeEntity; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/monster/SpiderEntityMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/monster/SpiderEntityMixin.java similarity index 89% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/monster/SpiderEntityMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/monster/SpiderEntityMixin.java index ad5dfd83..bad7be13 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/monster/SpiderEntityMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/monster/SpiderEntityMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.entity.monster; +package io.izzel.arclight.common.mixin.core.entity.monster; -import io.izzel.arclight.bridge.world.WorldBridge; +import io.izzel.arclight.common.bridge.world.WorldBridge; import net.minecraft.entity.ILivingEntityData; import net.minecraft.entity.SpawnReason; import net.minecraft.entity.monster.SpiderEntity; @@ -13,7 +13,7 @@ import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -import io.izzel.arclight.mixin.core.entity.CreatureEntityMixin; +import io.izzel.arclight.common.mixin.core.entity.CreatureEntityMixin; @Mixin(SpiderEntity.class) public abstract class SpiderEntityMixin extends CreatureEntityMixin { diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/monster/VexEntity_CopyOwnerTargetGoalMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/monster/VexEntity_CopyOwnerTargetGoalMixin.java similarity index 86% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/monster/VexEntity_CopyOwnerTargetGoalMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/monster/VexEntity_CopyOwnerTargetGoalMixin.java index 86c6b252..653bd5bc 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/monster/VexEntity_CopyOwnerTargetGoalMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/monster/VexEntity_CopyOwnerTargetGoalMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.entity.monster; +package io.izzel.arclight.common.mixin.core.entity.monster; -import io.izzel.arclight.bridge.entity.MobEntityBridge; +import io.izzel.arclight.common.bridge.entity.MobEntityBridge; import net.minecraft.entity.monster.VexEntity; import org.bukkit.event.entity.EntityTargetEvent; import org.spongepowered.asm.mixin.Mixin; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/monster/WitchEntityMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/monster/WitchEntityMixin.java similarity index 84% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/monster/WitchEntityMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/monster/WitchEntityMixin.java index 273e20e7..9a719989 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/monster/WitchEntityMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/monster/WitchEntityMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.entity.monster; +package io.izzel.arclight.common.mixin.core.entity.monster; -import io.izzel.arclight.mixin.core.entity.CreatureEntityMixin; +import io.izzel.arclight.common.mixin.core.entity.CreatureEntityMixin; import net.minecraft.entity.monster.WitchEntity; import org.bukkit.event.entity.EntityPotionEffectEvent; import org.spongepowered.asm.mixin.Mixin; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/monster/WitherSkeletonEntityMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/monster/WitherSkeletonEntityMixin.java similarity index 87% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/monster/WitherSkeletonEntityMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/monster/WitherSkeletonEntityMixin.java index fd87fd3c..d21a3749 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/monster/WitherSkeletonEntityMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/monster/WitherSkeletonEntityMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.entity.monster; +package io.izzel.arclight.common.mixin.core.entity.monster; -import io.izzel.arclight.bridge.entity.LivingEntityBridge; +import io.izzel.arclight.common.bridge.entity.LivingEntityBridge; import net.minecraft.entity.Entity; import net.minecraft.entity.monster.WitherSkeletonEntity; import org.bukkit.event.entity.EntityPotionEffectEvent; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/monster/ZombieEntityMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/monster/ZombieEntityMixin.java similarity index 93% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/monster/ZombieEntityMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/monster/ZombieEntityMixin.java index f1aa729d..781ad85d 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/monster/ZombieEntityMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/monster/ZombieEntityMixin.java @@ -1,9 +1,9 @@ -package io.izzel.arclight.mixin.core.entity.monster; +package io.izzel.arclight.common.mixin.core.entity.monster; -import io.izzel.arclight.bridge.entity.EntityBridge; -import io.izzel.arclight.bridge.entity.MobEntityBridge; -import io.izzel.arclight.bridge.world.WorldBridge; -import io.izzel.arclight.mixin.core.entity.CreatureEntityMixin; +import io.izzel.arclight.common.bridge.entity.EntityBridge; +import io.izzel.arclight.common.bridge.entity.MobEntityBridge; +import io.izzel.arclight.common.bridge.world.WorldBridge; +import io.izzel.arclight.common.mixin.core.entity.CreatureEntityMixin; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityType; import net.minecraft.entity.ILivingEntityData; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/monster/ZombiePigmanEntityMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/monster/ZombiePigmanEntityMixin.java similarity index 94% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/monster/ZombiePigmanEntityMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/monster/ZombiePigmanEntityMixin.java index 6ea2f1d2..0173209c 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/monster/ZombiePigmanEntityMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/monster/ZombiePigmanEntityMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.entity.monster; +package io.izzel.arclight.common.mixin.core.entity.monster; -import io.izzel.arclight.bridge.entity.EntityBridge; +import io.izzel.arclight.common.bridge.entity.EntityBridge; import net.minecraft.entity.Entity; import net.minecraft.entity.monster.ZombiePigmanEntity; import net.minecraft.entity.player.PlayerEntity; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/monster/ZombiePigmanEntity_HurtByAggressorGoalMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/monster/ZombiePigmanEntity_HurtByAggressorGoalMixin.java similarity index 87% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/monster/ZombiePigmanEntity_HurtByAggressorGoalMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/monster/ZombiePigmanEntity_HurtByAggressorGoalMixin.java index 3d7bb109..c640e7b3 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/monster/ZombiePigmanEntity_HurtByAggressorGoalMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/monster/ZombiePigmanEntity_HurtByAggressorGoalMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.entity.monster; +package io.izzel.arclight.common.mixin.core.entity.monster; -import io.izzel.arclight.bridge.entity.MobEntityBridge; +import io.izzel.arclight.common.bridge.entity.MobEntityBridge; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.MobEntity; import org.bukkit.event.entity.EntityTargetEvent; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/monster/ZombieVillagerEntityMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/monster/ZombieVillagerEntityMixin.java similarity index 93% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/monster/ZombieVillagerEntityMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/monster/ZombieVillagerEntityMixin.java index 020b715b..f4f9f96b 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/monster/ZombieVillagerEntityMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/monster/ZombieVillagerEntityMixin.java @@ -1,7 +1,7 @@ -package io.izzel.arclight.mixin.core.entity.monster; +package io.izzel.arclight.common.mixin.core.entity.monster; -import io.izzel.arclight.bridge.entity.LivingEntityBridge; -import io.izzel.arclight.bridge.world.WorldBridge; +import io.izzel.arclight.common.bridge.entity.LivingEntityBridge; +import io.izzel.arclight.common.bridge.world.WorldBridge; import net.minecraft.entity.merchant.villager.VillagerEntity; import net.minecraft.entity.monster.ZombieVillagerEntity; import net.minecraft.world.server.ServerWorld; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/AnimalEntityMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/passive/AnimalEntityMixin.java similarity index 86% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/AnimalEntityMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/passive/AnimalEntityMixin.java index a7d12aff..1a0393ea 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/AnimalEntityMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/passive/AnimalEntityMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.entity.passive; +package io.izzel.arclight.common.mixin.core.entity.passive; -import io.izzel.arclight.bridge.entity.passive.AnimalEntityBridge; +import io.izzel.arclight.common.bridge.entity.passive.AnimalEntityBridge; import net.minecraft.entity.passive.AnimalEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; @@ -12,7 +12,7 @@ import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import io.izzel.arclight.mixin.core.entity.AgeableEntityMixin; +import io.izzel.arclight.common.mixin.core.entity.AgeableEntityMixin; @Mixin(AnimalEntity.class) public abstract class AnimalEntityMixin extends AgeableEntityMixin implements AnimalEntityBridge { diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/BatEntityMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/passive/BatEntityMixin.java similarity index 87% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/BatEntityMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/passive/BatEntityMixin.java index 97b9036c..99fc9860 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/BatEntityMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/passive/BatEntityMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.entity.passive; +package io.izzel.arclight.common.mixin.core.entity.passive; -import io.izzel.arclight.mixin.core.entity.MobEntityMixin; +import io.izzel.arclight.common.mixin.core.entity.MobEntityMixin; import net.minecraft.entity.passive.BatEntity; import org.bukkit.craftbukkit.v.event.CraftEventFactory; import org.spongepowered.asm.mixin.Mixin; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/CatEntityMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/passive/CatEntityMixin.java similarity index 92% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/CatEntityMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/passive/CatEntityMixin.java index 9816b103..fee34533 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/CatEntityMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/passive/CatEntityMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mixin.core.entity.passive; +package io.izzel.arclight.common.mixin.core.entity.passive; import net.minecraft.entity.passive.CatEntity; import net.minecraft.entity.player.PlayerEntity; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/ChickenEntityMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/passive/ChickenEntityMixin.java similarity index 95% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/ChickenEntityMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/passive/ChickenEntityMixin.java index 8890bb11..fb57558c 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/ChickenEntityMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/passive/ChickenEntityMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mixin.core.entity.passive; +package io.izzel.arclight.common.mixin.core.entity.passive; import net.minecraft.entity.passive.ChickenEntity; import org.spongepowered.asm.mixin.Mixin; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/CowEntityMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/passive/CowEntityMixin.java similarity index 96% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/CowEntityMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/passive/CowEntityMixin.java index c51c7246..0943191f 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/CowEntityMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/passive/CowEntityMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mixin.core.entity.passive; +package io.izzel.arclight.common.mixin.core.entity.passive; import net.minecraft.entity.passive.CowEntity; import net.minecraft.entity.player.PlayerEntity; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/DolphinEntityMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/passive/DolphinEntityMixin.java similarity index 88% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/DolphinEntityMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/passive/DolphinEntityMixin.java index acde8864..a5cb6b40 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/DolphinEntityMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/passive/DolphinEntityMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mixin.core.entity.passive; +package io.izzel.arclight.common.mixin.core.entity.passive; import net.minecraft.entity.item.ItemEntity; import net.minecraft.entity.passive.DolphinEntity; @@ -7,7 +7,7 @@ import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import io.izzel.arclight.mixin.core.entity.CreatureEntityMixin; +import io.izzel.arclight.common.mixin.core.entity.CreatureEntityMixin; @Mixin(DolphinEntity.class) public abstract class DolphinEntityMixin extends CreatureEntityMixin { diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/DolphinEntity_SwimWithPlayerGoalMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/passive/DolphinEntity_SwimWithPlayerGoalMixin.java similarity index 90% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/DolphinEntity_SwimWithPlayerGoalMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/passive/DolphinEntity_SwimWithPlayerGoalMixin.java index 9e867521..b30a6822 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/DolphinEntity_SwimWithPlayerGoalMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/passive/DolphinEntity_SwimWithPlayerGoalMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.entity.passive; +package io.izzel.arclight.common.mixin.core.entity.passive; -import io.izzel.arclight.bridge.entity.LivingEntityBridge; +import io.izzel.arclight.common.bridge.entity.LivingEntityBridge; import net.minecraft.entity.player.PlayerEntity; import org.bukkit.event.entity.EntityPotionEffectEvent; import org.spongepowered.asm.mixin.Mixin; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/FoxEntityMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/passive/FoxEntityMixin.java similarity index 89% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/FoxEntityMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/passive/FoxEntityMixin.java index 278762bb..5613f322 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/FoxEntityMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/passive/FoxEntityMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mixin.core.entity.passive; +package io.izzel.arclight.common.mixin.core.entity.passive; import net.minecraft.entity.item.ItemEntity; import net.minecraft.entity.passive.FoxEntity; @@ -8,7 +8,7 @@ import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.gen.Invoker; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Redirect; -import io.izzel.arclight.bridge.entity.passive.FoxEntityBridge; +import io.izzel.arclight.common.bridge.entity.passive.FoxEntityBridge; import java.util.UUID; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/FoxEntity_EatBerriesGoalMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/passive/FoxEntity_EatBerriesGoalMixin.java similarity index 95% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/FoxEntity_EatBerriesGoalMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/passive/FoxEntity_EatBerriesGoalMixin.java index b254e707..3fb8b14c 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/FoxEntity_EatBerriesGoalMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/passive/FoxEntity_EatBerriesGoalMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mixin.core.entity.passive; +package io.izzel.arclight.common.mixin.core.entity.passive; import net.minecraft.block.BlockState; import net.minecraft.block.SweetBerryBushBlock; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/FoxEntity_MateGoalMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/passive/FoxEntity_MateGoalMixin.java similarity index 90% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/FoxEntity_MateGoalMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/passive/FoxEntity_MateGoalMixin.java index ec937680..7abcf985 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/FoxEntity_MateGoalMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/passive/FoxEntity_MateGoalMixin.java @@ -1,8 +1,8 @@ -package io.izzel.arclight.mixin.core.entity.passive; +package io.izzel.arclight.common.mixin.core.entity.passive; -import io.izzel.arclight.bridge.entity.passive.AnimalEntityBridge; -import io.izzel.arclight.bridge.world.WorldBridge; -import io.izzel.arclight.mixin.core.entity.ai.goal.BreedGoalMixin; +import io.izzel.arclight.common.bridge.entity.passive.AnimalEntityBridge; +import io.izzel.arclight.common.bridge.world.WorldBridge; +import io.izzel.arclight.common.mixin.core.entity.ai.goal.BreedGoalMixin; import net.minecraft.advancements.CriteriaTriggers; import net.minecraft.entity.item.ExperienceOrbEntity; import net.minecraft.entity.passive.FoxEntity; @@ -14,7 +14,7 @@ import org.bukkit.event.entity.CreatureSpawnEvent; import org.bukkit.event.entity.EntityBreedEvent; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Overwrite; -import io.izzel.arclight.bridge.entity.passive.FoxEntityBridge; +import io.izzel.arclight.common.bridge.entity.passive.FoxEntityBridge; @Mixin(targets = "net.minecraft.entity.passive.FoxEntity.MateGoal") public class FoxEntity_MateGoalMixin extends BreedGoalMixin { diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/FoxEntity_RevengeGoalMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/passive/FoxEntity_RevengeGoalMixin.java similarity index 86% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/FoxEntity_RevengeGoalMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/passive/FoxEntity_RevengeGoalMixin.java index 4de50d72..ecca2c62 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/FoxEntity_RevengeGoalMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/passive/FoxEntity_RevengeGoalMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.entity.passive; +package io.izzel.arclight.common.mixin.core.entity.passive; -import io.izzel.arclight.bridge.entity.MobEntityBridge; +import io.izzel.arclight.common.bridge.entity.MobEntityBridge; import net.minecraft.entity.passive.FoxEntity; import org.bukkit.event.entity.EntityTargetEvent; import org.spongepowered.asm.mixin.Mixin; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/IronGolemEntityMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/passive/IronGolemEntityMixin.java similarity index 86% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/IronGolemEntityMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/passive/IronGolemEntityMixin.java index 49cf6149..ade22a86 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/IronGolemEntityMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/passive/IronGolemEntityMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.entity.passive; +package io.izzel.arclight.common.mixin.core.entity.passive; -import io.izzel.arclight.mixin.core.entity.CreatureEntityMixin; +import io.izzel.arclight.common.mixin.core.entity.CreatureEntityMixin; import net.minecraft.entity.Entity; import net.minecraft.entity.passive.IronGolemEntity; import org.bukkit.event.entity.EntityTargetEvent; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/MooshroomEntityMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/passive/MooshroomEntityMixin.java similarity index 94% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/MooshroomEntityMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/passive/MooshroomEntityMixin.java index c89e5008..b4241217 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/MooshroomEntityMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/passive/MooshroomEntityMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.entity.passive; +package io.izzel.arclight.common.mixin.core.entity.passive; -import io.izzel.arclight.bridge.world.WorldBridge; +import io.izzel.arclight.common.bridge.world.WorldBridge; import net.minecraft.entity.passive.CowEntity; import net.minecraft.entity.passive.MooshroomEntity; import net.minecraft.item.ItemStack; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/OcelotEntityMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/passive/OcelotEntityMixin.java similarity index 90% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/OcelotEntityMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/passive/OcelotEntityMixin.java index 9939c321..5d78c9b1 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/OcelotEntityMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/passive/OcelotEntityMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.entity.passive; +package io.izzel.arclight.common.mixin.core.entity.passive; -import io.izzel.arclight.bridge.world.WorldBridge; +import io.izzel.arclight.common.bridge.world.WorldBridge; import net.minecraft.entity.passive.OcelotEntity; import org.bukkit.event.entity.CreatureSpawnEvent; import org.spongepowered.asm.mixin.Mixin; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/PandaEntityMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/passive/PandaEntityMixin.java similarity index 95% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/PandaEntityMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/passive/PandaEntityMixin.java index 1021469c..ff97eea7 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/PandaEntityMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/passive/PandaEntityMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mixin.core.entity.passive; +package io.izzel.arclight.common.mixin.core.entity.passive; import net.minecraft.entity.item.ItemEntity; import net.minecraft.entity.passive.PandaEntity; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/PandaEntity_MateGoalMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/passive/PandaEntity_MateGoalMixin.java similarity index 88% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/PandaEntity_MateGoalMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/passive/PandaEntity_MateGoalMixin.java index bebdbf73..ce1677b2 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/PandaEntity_MateGoalMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/passive/PandaEntity_MateGoalMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.entity.passive; +package io.izzel.arclight.common.mixin.core.entity.passive; -import io.izzel.arclight.bridge.entity.MobEntityBridge; +import io.izzel.arclight.common.bridge.entity.MobEntityBridge; import net.minecraft.entity.passive.PandaEntity; import org.bukkit.event.entity.EntityTargetEvent; import org.spongepowered.asm.mixin.Final; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/PandaEntity_RevengeGoalMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/passive/PandaEntity_RevengeGoalMixin.java similarity index 87% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/PandaEntity_RevengeGoalMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/passive/PandaEntity_RevengeGoalMixin.java index d4370f4b..514def20 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/PandaEntity_RevengeGoalMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/passive/PandaEntity_RevengeGoalMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.entity.passive; +package io.izzel.arclight.common.mixin.core.entity.passive; -import io.izzel.arclight.bridge.entity.MobEntityBridge; +import io.izzel.arclight.common.bridge.entity.MobEntityBridge; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.MobEntity; import org.bukkit.event.entity.EntityTargetEvent; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/ParrotEntityMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/passive/ParrotEntityMixin.java similarity index 95% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/ParrotEntityMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/passive/ParrotEntityMixin.java index 1f69ff4c..3c722434 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/ParrotEntityMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/passive/ParrotEntityMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mixin.core.entity.passive; +package io.izzel.arclight.common.mixin.core.entity.passive; import net.minecraft.entity.ai.goal.SitGoal; import net.minecraft.entity.passive.ParrotEntity; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/PigEntityMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/passive/PigEntityMixin.java similarity index 91% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/PigEntityMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/passive/PigEntityMixin.java index 801d608a..12ba8fcf 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/PigEntityMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/passive/PigEntityMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.entity.passive; +package io.izzel.arclight.common.mixin.core.entity.passive; -import io.izzel.arclight.bridge.world.WorldBridge; +import io.izzel.arclight.common.bridge.world.WorldBridge; import net.minecraft.entity.effect.LightningBoltEntity; import net.minecraft.entity.monster.ZombiePigmanEntity; import net.minecraft.entity.passive.PigEntity; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/RabbitEntityMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/passive/RabbitEntityMixin.java similarity index 87% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/RabbitEntityMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/passive/RabbitEntityMixin.java index b981fc7b..e82d167a 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/RabbitEntityMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/passive/RabbitEntityMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mixin.core.entity.passive; +package io.izzel.arclight.common.mixin.core.entity.passive; import net.minecraft.entity.passive.RabbitEntity; import org.spongepowered.asm.mixin.Mixin; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/RabbitEntity_RaidFarmGoalMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/passive/RabbitEntity_RaidFarmGoalMixin.java similarity index 96% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/RabbitEntity_RaidFarmGoalMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/passive/RabbitEntity_RaidFarmGoalMixin.java index 10466377..8dcdeb5d 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/RabbitEntity_RaidFarmGoalMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/passive/RabbitEntity_RaidFarmGoalMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mixin.core.entity.passive; +package io.izzel.arclight.common.mixin.core.entity.passive; import net.minecraft.block.Block; import net.minecraft.block.BlockState; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/SheepEntity1Mixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/passive/SheepEntity1Mixin.java similarity index 69% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/SheepEntity1Mixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/passive/SheepEntity1Mixin.java index 00b8bb51..0fe54f3f 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/SheepEntity1Mixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/passive/SheepEntity1Mixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.entity.passive; +package io.izzel.arclight.common.mixin.core.entity.passive; -import io.izzel.arclight.bridge.inventory.container.ContainerBridge; +import io.izzel.arclight.common.bridge.inventory.container.ContainerBridge; import org.bukkit.inventory.InventoryView; import org.spongepowered.asm.mixin.Mixin; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/SheepEntityMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/passive/SheepEntityMixin.java similarity index 94% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/SheepEntityMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/passive/SheepEntityMixin.java index f7ef58ba..04bdb544 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/SheepEntityMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/passive/SheepEntityMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.entity.passive; +package io.izzel.arclight.common.mixin.core.entity.passive; -import io.izzel.arclight.bridge.inventory.CraftingInventoryBridge; +import io.izzel.arclight.common.bridge.inventory.CraftingInventoryBridge; import net.minecraft.entity.passive.SheepEntity; import net.minecraft.inventory.CraftResultInventory; import net.minecraft.inventory.CraftingInventory; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/SnowGolemEntityMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/passive/SnowGolemEntityMixin.java similarity index 89% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/SnowGolemEntityMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/passive/SnowGolemEntityMixin.java index 67c60335..caa68f22 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/SnowGolemEntityMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/passive/SnowGolemEntityMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mixin.core.entity.passive; +package io.izzel.arclight.common.mixin.core.entity.passive; import net.minecraft.block.BlockState; import net.minecraft.entity.passive.SnowGolemEntity; @@ -9,7 +9,7 @@ import org.bukkit.craftbukkit.v.event.CraftEventFactory; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Redirect; -import io.izzel.arclight.mixin.core.entity.CreatureEntityMixin; +import io.izzel.arclight.common.mixin.core.entity.CreatureEntityMixin; @Mixin(SnowGolemEntity.class) public abstract class SnowGolemEntityMixin extends CreatureEntityMixin { diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/TameableEntityMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/passive/TameableEntityMixin.java similarity index 84% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/TameableEntityMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/passive/TameableEntityMixin.java index 20fe2f9d..e7ae9ee7 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/TameableEntityMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/passive/TameableEntityMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mixin.core.entity.passive; +package io.izzel.arclight.common.mixin.core.entity.passive; import net.minecraft.entity.passive.TameableEntity; import org.spongepowered.asm.mixin.Mixin; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/TurtleEntityMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/passive/TurtleEntityMixin.java similarity index 93% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/TurtleEntityMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/passive/TurtleEntityMixin.java index 8ede8f15..f9f621bd 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/TurtleEntityMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/passive/TurtleEntityMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.entity.passive; +package io.izzel.arclight.common.mixin.core.entity.passive; -import io.izzel.arclight.bridge.entity.passive.TurtleEntityBridge; +import io.izzel.arclight.common.bridge.entity.passive.TurtleEntityBridge; import net.minecraft.entity.effect.LightningBoltEntity; import net.minecraft.entity.passive.TurtleEntity; import org.bukkit.craftbukkit.v.event.CraftEventFactory; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/TurtleEntity_LayEggGoalMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/passive/TurtleEntity_LayEggGoalMixin.java similarity index 94% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/TurtleEntity_LayEggGoalMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/passive/TurtleEntity_LayEggGoalMixin.java index 3606d4ee..98ada778 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/TurtleEntity_LayEggGoalMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/passive/TurtleEntity_LayEggGoalMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.entity.passive; +package io.izzel.arclight.common.mixin.core.entity.passive; -import io.izzel.arclight.bridge.entity.passive.TurtleEntityBridge; +import io.izzel.arclight.common.bridge.entity.passive.TurtleEntityBridge; import net.minecraft.block.Blocks; import net.minecraft.block.TurtleEggBlock; import net.minecraft.entity.CreatureEntity; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/WolfEntityMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/passive/WolfEntityMixin.java similarity index 97% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/WolfEntityMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/passive/WolfEntityMixin.java index 15fa686f..534c162c 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/WolfEntityMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/passive/WolfEntityMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mixin.core.entity.passive; +package io.izzel.arclight.common.mixin.core.entity.passive; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.ai.goal.SitGoal; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/fish/AbstractFishEntityMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/passive/fish/AbstractFishEntityMixin.java similarity index 85% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/fish/AbstractFishEntityMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/passive/fish/AbstractFishEntityMixin.java index 7438384e..8697b040 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/fish/AbstractFishEntityMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/passive/fish/AbstractFishEntityMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.entity.passive.fish; +package io.izzel.arclight.common.mixin.core.entity.passive.fish; -import io.izzel.arclight.mixin.core.entity.CreatureEntityMixin; +import io.izzel.arclight.common.mixin.core.entity.CreatureEntityMixin; import net.minecraft.entity.passive.fish.AbstractFishEntity; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Overwrite; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/fish/PufferfishEntityMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/passive/fish/PufferfishEntityMixin.java similarity index 86% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/fish/PufferfishEntityMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/passive/fish/PufferfishEntityMixin.java index 47fc7f35..52d98cf1 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/fish/PufferfishEntityMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/passive/fish/PufferfishEntityMixin.java @@ -1,7 +1,7 @@ -package io.izzel.arclight.mixin.core.entity.passive.fish; +package io.izzel.arclight.common.mixin.core.entity.passive.fish; -import io.izzel.arclight.bridge.entity.LivingEntityBridge; -import io.izzel.arclight.bridge.entity.MobEntityBridge; +import io.izzel.arclight.common.bridge.entity.LivingEntityBridge; +import io.izzel.arclight.common.bridge.entity.MobEntityBridge; import net.minecraft.entity.MobEntity; import net.minecraft.entity.passive.fish.PufferfishEntity; import net.minecraft.entity.player.PlayerEntity; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/horse/AbstractHorseEntityMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/passive/horse/AbstractHorseEntityMixin.java similarity index 94% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/horse/AbstractHorseEntityMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/passive/horse/AbstractHorseEntityMixin.java index 22ea2507..fd464b05 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/horse/AbstractHorseEntityMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/passive/horse/AbstractHorseEntityMixin.java @@ -1,7 +1,7 @@ -package io.izzel.arclight.mixin.core.entity.passive.horse; +package io.izzel.arclight.common.mixin.core.entity.passive.horse; -import io.izzel.arclight.bridge.inventory.IInventoryBridge; -import io.izzel.arclight.mixin.core.entity.passive.AnimalEntityMixin; +import io.izzel.arclight.common.bridge.inventory.IInventoryBridge; +import io.izzel.arclight.common.mixin.core.entity.passive.AnimalEntityMixin; import net.minecraft.entity.EntityType; import net.minecraft.entity.passive.horse.AbstractHorseEntity; import net.minecraft.entity.player.PlayerEntity; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/horse/TraderLlamaEntity_FollowTraderGoalMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/passive/horse/TraderLlamaEntity_FollowTraderGoalMixin.java similarity index 77% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/horse/TraderLlamaEntity_FollowTraderGoalMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/passive/horse/TraderLlamaEntity_FollowTraderGoalMixin.java index 3d334ab1..397067d9 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/horse/TraderLlamaEntity_FollowTraderGoalMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/passive/horse/TraderLlamaEntity_FollowTraderGoalMixin.java @@ -1,7 +1,7 @@ -package io.izzel.arclight.mixin.core.entity.passive.horse; +package io.izzel.arclight.common.mixin.core.entity.passive.horse; -import io.izzel.arclight.bridge.entity.MobEntityBridge; -import io.izzel.arclight.mixin.core.entity.ai.goal.TargetGoalMixin; +import io.izzel.arclight.common.bridge.entity.MobEntityBridge; +import io.izzel.arclight.common.mixin.core.entity.ai.goal.TargetGoalMixin; import net.minecraft.entity.passive.horse.TraderLlamaEntity; import org.bukkit.event.entity.EntityTargetEvent; import org.spongepowered.asm.mixin.Mixin; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/player/PlayerEntityMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/player/PlayerEntityMixin.java similarity index 97% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/player/PlayerEntityMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/player/PlayerEntityMixin.java index fc2232a8..1a1c6f1c 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/player/PlayerEntityMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/player/PlayerEntityMixin.java @@ -1,14 +1,14 @@ -package io.izzel.arclight.mixin.core.entity.player; +package io.izzel.arclight.common.mixin.core.entity.player; import com.mojang.authlib.GameProfile; import com.mojang.datafixers.util.Either; -import io.izzel.arclight.bridge.entity.EntityBridge; -import io.izzel.arclight.bridge.entity.InternalEntityBridge; -import io.izzel.arclight.bridge.entity.player.PlayerEntityBridge; -import io.izzel.arclight.bridge.entity.player.ServerPlayerEntityBridge; -import io.izzel.arclight.bridge.util.FoodStatsBridge; -import io.izzel.arclight.bridge.world.WorldBridge; -import io.izzel.arclight.bridge.world.server.ServerWorldBridge; +import io.izzel.arclight.common.bridge.entity.EntityBridge; +import io.izzel.arclight.common.bridge.entity.InternalEntityBridge; +import io.izzel.arclight.common.bridge.entity.player.PlayerEntityBridge; +import io.izzel.arclight.common.bridge.entity.player.ServerPlayerEntityBridge; +import io.izzel.arclight.common.bridge.util.FoodStatsBridge; +import io.izzel.arclight.common.bridge.world.WorldBridge; +import io.izzel.arclight.common.bridge.world.server.ServerWorldBridge; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.CreatureAttribute; import net.minecraft.entity.Entity; @@ -80,8 +80,8 @@ import org.spongepowered.asm.mixin.injection.Redirect; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; import org.spongepowered.asm.mixin.injection.callback.LocalCapture; -import io.izzel.arclight.bridge.util.DamageSourceBridge; -import io.izzel.arclight.mixin.core.entity.LivingEntityMixin; +import io.izzel.arclight.common.bridge.util.DamageSourceBridge; +import io.izzel.arclight.common.mixin.core.entity.LivingEntityMixin; import java.util.List; import java.util.Optional; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/player/PlayerInventoryMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/player/PlayerInventoryMixin.java similarity index 94% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/player/PlayerInventoryMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/player/PlayerInventoryMixin.java index 6b5e7e4b..467498bc 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/player/PlayerInventoryMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/player/PlayerInventoryMixin.java @@ -1,8 +1,8 @@ -package io.izzel.arclight.mixin.core.entity.player; +package io.izzel.arclight.common.mixin.core.entity.player; -import io.izzel.arclight.bridge.entity.player.PlayerEntityBridge; -import io.izzel.arclight.bridge.entity.player.PlayerInventoryBridge; -import io.izzel.arclight.bridge.inventory.IInventoryBridge; +import io.izzel.arclight.common.bridge.entity.player.PlayerEntityBridge; +import io.izzel.arclight.common.bridge.entity.player.PlayerInventoryBridge; +import io.izzel.arclight.common.bridge.inventory.IInventoryBridge; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.inventory.IInventory; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/player/ServerPlayerEntityMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/player/ServerPlayerEntityMixin.java similarity index 98% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/player/ServerPlayerEntityMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/player/ServerPlayerEntityMixin.java index ca72357d..656c2f7e 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/player/ServerPlayerEntityMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/player/ServerPlayerEntityMixin.java @@ -1,14 +1,14 @@ -package io.izzel.arclight.mixin.core.entity.player; +package io.izzel.arclight.common.mixin.core.entity.player; import com.google.common.collect.Lists; import com.mojang.datafixers.util.Either; -import io.izzel.arclight.bridge.entity.EntityBridge; -import io.izzel.arclight.bridge.entity.InternalEntityBridge; -import io.izzel.arclight.bridge.entity.player.ServerPlayerEntityBridge; -import io.izzel.arclight.bridge.inventory.container.ContainerBridge; -import io.izzel.arclight.bridge.util.FoodStatsBridge; -import io.izzel.arclight.bridge.world.WorldBridge; -import io.izzel.arclight.mod.util.ChestBlockDoubleInventoryHacks; +import io.izzel.arclight.common.bridge.entity.EntityBridge; +import io.izzel.arclight.common.bridge.entity.InternalEntityBridge; +import io.izzel.arclight.common.bridge.entity.player.ServerPlayerEntityBridge; +import io.izzel.arclight.common.bridge.inventory.container.ContainerBridge; +import io.izzel.arclight.common.bridge.util.FoodStatsBridge; +import io.izzel.arclight.common.bridge.world.WorldBridge; +import io.izzel.arclight.common.mod.util.ChestBlockDoubleInventoryHacks; import net.minecraft.advancements.CriteriaTriggers; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/projectile/AbstractArrowEntityMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/projectile/AbstractArrowEntityMixin.java similarity index 92% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/projectile/AbstractArrowEntityMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/projectile/AbstractArrowEntityMixin.java index 0035f092..e428cfc7 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/projectile/AbstractArrowEntityMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/projectile/AbstractArrowEntityMixin.java @@ -1,8 +1,8 @@ -package io.izzel.arclight.mixin.core.entity.projectile; +package io.izzel.arclight.common.mixin.core.entity.projectile; -import io.izzel.arclight.bridge.entity.EntityBridge; -import io.izzel.arclight.bridge.entity.player.ServerPlayerEntityBridge; -import io.izzel.arclight.mixin.core.entity.EntityMixin; +import io.izzel.arclight.common.bridge.entity.EntityBridge; +import io.izzel.arclight.common.bridge.entity.player.ServerPlayerEntityBridge; +import io.izzel.arclight.common.mixin.core.entity.EntityMixin; import net.minecraft.entity.Entity; import net.minecraft.entity.item.ItemEntity; import net.minecraft.entity.player.PlayerEntity; @@ -25,7 +25,7 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.Redirect; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import io.izzel.arclight.bridge.entity.player.PlayerInventoryBridge; +import io.izzel.arclight.common.bridge.entity.player.PlayerInventoryBridge; import javax.annotation.Nullable; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/projectile/ArrowEntityMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/projectile/ArrowEntityMixin.java similarity index 92% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/projectile/ArrowEntityMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/projectile/ArrowEntityMixin.java index 58b49419..fdd64ec7 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/projectile/ArrowEntityMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/projectile/ArrowEntityMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.entity.projectile; +package io.izzel.arclight.common.mixin.core.entity.projectile; -import io.izzel.arclight.bridge.entity.LivingEntityBridge; +import io.izzel.arclight.common.bridge.entity.LivingEntityBridge; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.projectile.ArrowEntity; import net.minecraft.network.datasync.DataParameter; @@ -19,7 +19,7 @@ import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import io.izzel.arclight.bridge.entity.projectile.ArrowEntityBridge; +import io.izzel.arclight.common.bridge.entity.projectile.ArrowEntityBridge; import java.util.Set; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/projectile/DamagingProjectileEntityMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/projectile/DamagingProjectileEntityMixin.java similarity index 93% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/projectile/DamagingProjectileEntityMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/projectile/DamagingProjectileEntityMixin.java index 5d6950d1..c70b7322 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/projectile/DamagingProjectileEntityMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/projectile/DamagingProjectileEntityMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.entity.projectile; +package io.izzel.arclight.common.mixin.core.entity.projectile; -import io.izzel.arclight.mixin.core.entity.EntityMixin; +import io.izzel.arclight.common.mixin.core.entity.EntityMixin; import net.minecraft.entity.EntityType; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.projectile.DamagingProjectileEntity; @@ -16,7 +16,7 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; import org.spongepowered.asm.mixin.injection.callback.LocalCapture; -import io.izzel.arclight.bridge.entity.projectile.DamagingProjectileEntityBridge; +import io.izzel.arclight.common.bridge.entity.projectile.DamagingProjectileEntityBridge; @Mixin(DamagingProjectileEntity.class) public abstract class DamagingProjectileEntityMixin extends EntityMixin implements DamagingProjectileEntityBridge { diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/projectile/EggEntityMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/projectile/EggEntityMixin.java similarity index 91% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/projectile/EggEntityMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/projectile/EggEntityMixin.java index b5647f08..858709ae 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/projectile/EggEntityMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/projectile/EggEntityMixin.java @@ -1,8 +1,8 @@ -package io.izzel.arclight.mixin.core.entity.projectile; +package io.izzel.arclight.common.mixin.core.entity.projectile; -import io.izzel.arclight.bridge.entity.EntityBridge; -import io.izzel.arclight.bridge.entity.player.ServerPlayerEntityBridge; -import io.izzel.arclight.bridge.world.WorldBridge; +import io.izzel.arclight.common.bridge.entity.EntityBridge; +import io.izzel.arclight.common.bridge.entity.player.ServerPlayerEntityBridge; +import io.izzel.arclight.common.bridge.world.WorldBridge; import net.minecraft.entity.Entity; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.entity.projectile.EggEntity; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/projectile/EvokerFangsEntityMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/projectile/EvokerFangsEntityMixin.java similarity index 89% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/projectile/EvokerFangsEntityMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/projectile/EvokerFangsEntityMixin.java index c3869fea..c89cbd8b 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/projectile/EvokerFangsEntityMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/projectile/EvokerFangsEntityMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.entity.projectile; +package io.izzel.arclight.common.mixin.core.entity.projectile; -import io.izzel.arclight.mixin.core.entity.EntityMixin; +import io.izzel.arclight.common.mixin.core.entity.EntityMixin; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.projectile.EvokerFangsEntity; import org.bukkit.craftbukkit.v.event.CraftEventFactory; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/projectile/FireballEntityMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/projectile/FireballEntityMixin.java similarity index 97% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/projectile/FireballEntityMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/projectile/FireballEntityMixin.java index 275f5613..ae1c7d09 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/projectile/FireballEntityMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/projectile/FireballEntityMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mixin.core.entity.projectile; +package io.izzel.arclight.common.mixin.core.entity.projectile; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityType; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/projectile/FishingBobberEntityMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/projectile/FishingBobberEntityMixin.java similarity index 96% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/projectile/FishingBobberEntityMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/projectile/FishingBobberEntityMixin.java index 5cf66f9f..e524205c 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/projectile/FishingBobberEntityMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/projectile/FishingBobberEntityMixin.java @@ -1,8 +1,8 @@ -package io.izzel.arclight.mixin.core.entity.projectile; +package io.izzel.arclight.common.mixin.core.entity.projectile; -import io.izzel.arclight.bridge.entity.EntityBridge; -import io.izzel.arclight.bridge.entity.player.ServerPlayerEntityBridge; -import io.izzel.arclight.mixin.core.entity.EntityMixin; +import io.izzel.arclight.common.bridge.entity.EntityBridge; +import io.izzel.arclight.common.bridge.entity.player.ServerPlayerEntityBridge; +import io.izzel.arclight.common.mixin.core.entity.EntityMixin; import net.minecraft.advancements.CriteriaTriggers; import net.minecraft.entity.Entity; import net.minecraft.entity.item.ExperienceOrbEntity; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/projectile/LlamaSpitEntityMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/projectile/LlamaSpitEntityMixin.java similarity index 84% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/projectile/LlamaSpitEntityMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/projectile/LlamaSpitEntityMixin.java index 2f086b1e..6faa4fc8 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/projectile/LlamaSpitEntityMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/projectile/LlamaSpitEntityMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.entity.projectile; +package io.izzel.arclight.common.mixin.core.entity.projectile; -import io.izzel.arclight.mixin.core.entity.EntityMixin; +import io.izzel.arclight.common.mixin.core.entity.EntityMixin; import net.minecraft.entity.projectile.LlamaSpitEntity; import net.minecraft.util.math.RayTraceResult; import org.bukkit.craftbukkit.v.event.CraftEventFactory; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/projectile/PotionEntityMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/projectile/PotionEntityMixin.java similarity index 96% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/projectile/PotionEntityMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/projectile/PotionEntityMixin.java index 6c1dc3fc..def8925d 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/projectile/PotionEntityMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/projectile/PotionEntityMixin.java @@ -1,7 +1,7 @@ -package io.izzel.arclight.mixin.core.entity.projectile; +package io.izzel.arclight.common.mixin.core.entity.projectile; -import io.izzel.arclight.bridge.entity.LivingEntityBridge; -import io.izzel.arclight.bridge.world.WorldBridge; +import io.izzel.arclight.common.bridge.entity.LivingEntityBridge; +import io.izzel.arclight.common.bridge.world.WorldBridge; import net.minecraft.entity.AreaEffectCloudEntity; import net.minecraft.entity.Entity; import net.minecraft.entity.LivingEntity; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/projectile/ShulkerBulletEntityMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/projectile/ShulkerBulletEntityMixin.java similarity index 92% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/projectile/ShulkerBulletEntityMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/projectile/ShulkerBulletEntityMixin.java index 0541147f..921838b6 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/projectile/ShulkerBulletEntityMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/projectile/ShulkerBulletEntityMixin.java @@ -1,7 +1,7 @@ -package io.izzel.arclight.mixin.core.entity.projectile; +package io.izzel.arclight.common.mixin.core.entity.projectile; -import io.izzel.arclight.bridge.entity.LivingEntityBridge; -import io.izzel.arclight.mixin.core.entity.EntityMixin; +import io.izzel.arclight.common.bridge.entity.LivingEntityBridge; +import io.izzel.arclight.common.mixin.core.entity.EntityMixin; import net.minecraft.entity.Entity; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.projectile.ShulkerBulletEntity; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/projectile/SmallFireballEntityMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/projectile/SmallFireballEntityMixin.java similarity index 96% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/projectile/SmallFireballEntityMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/projectile/SmallFireballEntityMixin.java index 46215a0a..3a116681 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/projectile/SmallFireballEntityMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/projectile/SmallFireballEntityMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.entity.projectile; +package io.izzel.arclight.common.mixin.core.entity.projectile; -import io.izzel.arclight.bridge.entity.EntityBridge; +import io.izzel.arclight.common.bridge.entity.EntityBridge; import net.minecraft.block.Blocks; import net.minecraft.entity.Entity; import net.minecraft.entity.LivingEntity; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/projectile/SpectralArrowEntityMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/projectile/SpectralArrowEntityMixin.java similarity index 86% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/projectile/SpectralArrowEntityMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/projectile/SpectralArrowEntityMixin.java index 77a7a9af..04d9e47f 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/projectile/SpectralArrowEntityMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/projectile/SpectralArrowEntityMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.entity.projectile; +package io.izzel.arclight.common.mixin.core.entity.projectile; -import io.izzel.arclight.bridge.entity.LivingEntityBridge; +import io.izzel.arclight.common.bridge.entity.LivingEntityBridge; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.projectile.SpectralArrowEntity; import org.bukkit.event.entity.EntityPotionEffectEvent; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/projectile/ThrowableEntityMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/projectile/ThrowableEntityMixin.java similarity index 89% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/projectile/ThrowableEntityMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/projectile/ThrowableEntityMixin.java index 6cc5fc25..ec2a0317 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/projectile/ThrowableEntityMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/projectile/ThrowableEntityMixin.java @@ -1,7 +1,7 @@ -package io.izzel.arclight.mixin.core.entity.projectile; +package io.izzel.arclight.common.mixin.core.entity.projectile; -import io.izzel.arclight.bridge.entity.LivingEntityBridge; -import io.izzel.arclight.mixin.core.entity.EntityMixin; +import io.izzel.arclight.common.bridge.entity.LivingEntityBridge; +import io.izzel.arclight.common.mixin.core.entity.EntityMixin; import net.minecraft.entity.EntityType; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.projectile.ThrowableEntity; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/projectile/TridentEntityMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/projectile/TridentEntityMixin.java similarity index 84% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/projectile/TridentEntityMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/projectile/TridentEntityMixin.java index 0f45ff82..22051592 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/projectile/TridentEntityMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/projectile/TridentEntityMixin.java @@ -1,7 +1,7 @@ -package io.izzel.arclight.mixin.core.entity.projectile; +package io.izzel.arclight.common.mixin.core.entity.projectile; -import io.izzel.arclight.bridge.entity.projectile.TridentEntityBridge; -import io.izzel.arclight.bridge.world.server.ServerWorldBridge; +import io.izzel.arclight.common.bridge.entity.projectile.TridentEntityBridge; +import io.izzel.arclight.common.bridge.world.server.ServerWorldBridge; import net.minecraft.entity.projectile.TridentEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.math.EntityRayTraceResult; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/projectile/WitherSkullEntityMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/projectile/WitherSkullEntityMixin.java similarity index 94% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/projectile/WitherSkullEntityMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/projectile/WitherSkullEntityMixin.java index acfd27f7..9c2e5b89 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/projectile/WitherSkullEntityMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/projectile/WitherSkullEntityMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.entity.projectile; +package io.izzel.arclight.common.mixin.core.entity.projectile; -import io.izzel.arclight.bridge.entity.LivingEntityBridge; +import io.izzel.arclight.common.bridge.entity.LivingEntityBridge; import net.minecraft.entity.Entity; import net.minecraft.entity.projectile.WitherSkullEntity; import net.minecraft.util.math.EntityRayTraceResult; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/fluid/FlowingFluidMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/fluid/FlowingFluidMixin.java similarity index 99% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/fluid/FlowingFluidMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/fluid/FlowingFluidMixin.java index 6f0ef463..0d91d365 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/fluid/FlowingFluidMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/fluid/FlowingFluidMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mixin.core.fluid; +package io.izzel.arclight.common.mixin.core.fluid; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/fluid/LavaFluidMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/fluid/LavaFluidMixin.java similarity index 98% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/fluid/LavaFluidMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/fluid/LavaFluidMixin.java index 98064769..dd54f675 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/fluid/LavaFluidMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/fluid/LavaFluidMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mixin.core.fluid; +package io.izzel.arclight.common.mixin.core.fluid; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/CraftResultInventoryMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/inventory/CraftResultInventoryMixin.java similarity index 93% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/CraftResultInventoryMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/inventory/CraftResultInventoryMixin.java index 19f08dba..6eec3c5d 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/CraftResultInventoryMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/inventory/CraftResultInventoryMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.inventory; +package io.izzel.arclight.common.mixin.core.inventory; -import io.izzel.arclight.bridge.inventory.IInventoryBridge; +import io.izzel.arclight.common.bridge.inventory.IInventoryBridge; import net.minecraft.inventory.CraftResultInventory; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/CraftingInventoryMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/inventory/CraftingInventoryMixin.java similarity index 89% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/CraftingInventoryMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/inventory/CraftingInventoryMixin.java index 91b24ff1..1fae2433 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/CraftingInventoryMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/inventory/CraftingInventoryMixin.java @@ -1,9 +1,9 @@ -package io.izzel.arclight.mixin.core.inventory; +package io.izzel.arclight.common.mixin.core.inventory; -import io.izzel.arclight.bridge.entity.player.PlayerEntityBridge; -import io.izzel.arclight.bridge.inventory.IInventoryBridge; -import io.izzel.arclight.bridge.inventory.container.WorkbenchContainerBridge; -import io.izzel.arclight.bridge.util.IWorldPosCallableBridge; +import io.izzel.arclight.common.bridge.entity.player.PlayerEntityBridge; +import io.izzel.arclight.common.bridge.inventory.IInventoryBridge; +import io.izzel.arclight.common.bridge.inventory.container.WorkbenchContainerBridge; +import io.izzel.arclight.common.bridge.util.IWorldPosCallableBridge; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.inventory.CraftingInventory; import net.minecraft.inventory.IInventory; @@ -20,7 +20,7 @@ import org.bukkit.inventory.InventoryHolder; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; -import io.izzel.arclight.bridge.inventory.CraftingInventoryBridge; +import io.izzel.arclight.common.bridge.inventory.CraftingInventoryBridge; import java.util.ArrayList; import java.util.List; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/DoubleSidedInventoryMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/inventory/DoubleSidedInventoryMixin.java similarity index 95% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/DoubleSidedInventoryMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/inventory/DoubleSidedInventoryMixin.java index daa88dd6..cc81d0c7 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/DoubleSidedInventoryMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/inventory/DoubleSidedInventoryMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.inventory; +package io.izzel.arclight.common.mixin.core.inventory; -import io.izzel.arclight.bridge.inventory.IInventoryBridge; +import io.izzel.arclight.common.bridge.inventory.IInventoryBridge; import net.minecraft.inventory.DoubleSidedInventory; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/EnderChestInventoryMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/inventory/EnderChestInventoryMixin.java similarity index 87% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/EnderChestInventoryMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/inventory/EnderChestInventoryMixin.java index 25d70def..d2bd2920 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/EnderChestInventoryMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/inventory/EnderChestInventoryMixin.java @@ -1,7 +1,7 @@ -package io.izzel.arclight.mixin.core.inventory; +package io.izzel.arclight.common.mixin.core.inventory; -import io.izzel.arclight.bridge.entity.player.PlayerEntityBridge; -import io.izzel.arclight.bridge.inventory.IInventoryBridge; +import io.izzel.arclight.common.bridge.entity.player.PlayerEntityBridge; +import io.izzel.arclight.common.bridge.inventory.IInventoryBridge; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.inventory.EnderChestInventory; import net.minecraft.inventory.IInventory; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/IInventoryMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/inventory/IInventoryMixin.java similarity index 90% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/IInventoryMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/inventory/IInventoryMixin.java index c79d6925..bba219dd 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/IInventoryMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/inventory/IInventoryMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.inventory; +package io.izzel.arclight.common.mixin.core.inventory; -import io.izzel.arclight.bridge.inventory.IInventoryBridge; +import io.izzel.arclight.common.bridge.inventory.IInventoryBridge; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/InventoryMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/inventory/InventoryMixin.java similarity index 94% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/InventoryMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/inventory/InventoryMixin.java index b816213c..15b2738e 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/InventoryMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/inventory/InventoryMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.inventory; +package io.izzel.arclight.common.mixin.core.inventory; -import io.izzel.arclight.bridge.inventory.IInventoryBridge; +import io.izzel.arclight.common.bridge.inventory.IInventoryBridge; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Inventory; import net.minecraft.item.ItemStack; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/MerchantInventoryMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/inventory/MerchantInventoryMixin.java similarity index 92% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/MerchantInventoryMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/inventory/MerchantInventoryMixin.java index 2b5de056..065b1905 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/MerchantInventoryMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/inventory/MerchantInventoryMixin.java @@ -1,7 +1,7 @@ -package io.izzel.arclight.mixin.core.inventory; +package io.izzel.arclight.common.mixin.core.inventory; -import io.izzel.arclight.bridge.entity.EntityBridge; -import io.izzel.arclight.bridge.inventory.IInventoryBridge; +import io.izzel.arclight.common.bridge.entity.EntityBridge; +import io.izzel.arclight.common.bridge.inventory.IInventoryBridge; import net.minecraft.entity.merchant.IMerchant; import net.minecraft.entity.merchant.villager.AbstractVillagerEntity; import net.minecraft.inventory.IInventory; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/AbstractFurnaceContainerMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/inventory/container/AbstractFurnaceContainerMixin.java similarity index 94% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/AbstractFurnaceContainerMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/inventory/container/AbstractFurnaceContainerMixin.java index 8ea91065..96a65084 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/AbstractFurnaceContainerMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/inventory/container/AbstractFurnaceContainerMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.inventory.container; +package io.izzel.arclight.common.mixin.core.inventory.container; -import io.izzel.arclight.bridge.entity.player.PlayerEntityBridge; +import io.izzel.arclight.common.bridge.entity.player.PlayerEntityBridge; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.inventory.IInventory; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/BeaconContainerMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/inventory/container/BeaconContainerMixin.java similarity index 94% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/BeaconContainerMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/inventory/container/BeaconContainerMixin.java index fc3462f0..d429dc62 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/BeaconContainerMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/inventory/container/BeaconContainerMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.inventory.container; +package io.izzel.arclight.common.mixin.core.inventory.container; -import io.izzel.arclight.bridge.entity.player.PlayerEntityBridge; +import io.izzel.arclight.common.bridge.entity.player.PlayerEntityBridge; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.inventory.IInventory; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/BrewingStandContainerMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/inventory/container/BrewingStandContainerMixin.java similarity index 93% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/BrewingStandContainerMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/inventory/container/BrewingStandContainerMixin.java index 7de8d415..f6ed071c 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/BrewingStandContainerMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/inventory/container/BrewingStandContainerMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.inventory.container; +package io.izzel.arclight.common.mixin.core.inventory.container; -import io.izzel.arclight.bridge.entity.player.PlayerEntityBridge; +import io.izzel.arclight.common.bridge.entity.player.PlayerEntityBridge; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.inventory.IInventory; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/CartographyContainer2Mixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/inventory/container/CartographyContainer2Mixin.java similarity index 68% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/CartographyContainer2Mixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/inventory/container/CartographyContainer2Mixin.java index 5528f2af..30d1f514 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/CartographyContainer2Mixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/inventory/container/CartographyContainer2Mixin.java @@ -1,8 +1,8 @@ -package io.izzel.arclight.mixin.core.inventory.container; +package io.izzel.arclight.common.mixin.core.inventory.container; -import io.izzel.arclight.bridge.inventory.IInventoryBridge; -import io.izzel.arclight.bridge.inventory.container.CartographyContainerBridge; -import io.izzel.arclight.bridge.util.IWorldPosCallableBridge; +import io.izzel.arclight.common.bridge.inventory.IInventoryBridge; +import io.izzel.arclight.common.bridge.inventory.container.CartographyContainerBridge; +import io.izzel.arclight.common.bridge.util.IWorldPosCallableBridge; import net.minecraft.inventory.container.CartographyContainer; import org.bukkit.Location; import org.spongepowered.asm.mixin.Mixin; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/CartographyContainerMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/inventory/container/CartographyContainerMixin.java similarity index 91% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/CartographyContainerMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/inventory/container/CartographyContainerMixin.java index 3e8bcc7c..59e424c6 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/CartographyContainerMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/inventory/container/CartographyContainerMixin.java @@ -1,7 +1,7 @@ -package io.izzel.arclight.mixin.core.inventory.container; +package io.izzel.arclight.common.mixin.core.inventory.container; -import io.izzel.arclight.bridge.entity.player.ServerPlayerEntityBridge; -import io.izzel.arclight.bridge.inventory.container.CartographyContainerBridge; +import io.izzel.arclight.common.bridge.entity.player.ServerPlayerEntityBridge; +import io.izzel.arclight.common.bridge.inventory.container.CartographyContainerBridge; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.inventory.CraftResultInventory; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/ChestContainerMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/inventory/container/ChestContainerMixin.java similarity index 95% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/ChestContainerMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/inventory/container/ChestContainerMixin.java index f804fbd4..9331308c 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/ChestContainerMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/inventory/container/ChestContainerMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.inventory.container; +package io.izzel.arclight.common.mixin.core.inventory.container; -import io.izzel.arclight.bridge.entity.player.PlayerEntityBridge; +import io.izzel.arclight.common.bridge.entity.player.PlayerEntityBridge; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.inventory.DoubleSidedInventory; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/ContainerMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/inventory/container/ContainerMixin.java similarity index 91% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/ContainerMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/inventory/container/ContainerMixin.java index d5ec2c94..1e934be6 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/ContainerMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/inventory/container/ContainerMixin.java @@ -1,8 +1,8 @@ -package io.izzel.arclight.mixin.core.inventory.container; +package io.izzel.arclight.common.mixin.core.inventory.container; import com.google.common.base.Preconditions; -import io.izzel.arclight.bridge.inventory.IInventoryBridge; -import io.izzel.arclight.bridge.inventory.container.ContainerBridge; +import io.izzel.arclight.common.bridge.inventory.IInventoryBridge; +import io.izzel.arclight.common.bridge.inventory.container.ContainerBridge; import net.minecraft.inventory.container.Container; import net.minecraft.util.text.ITextComponent; import org.bukkit.craftbukkit.v.entity.CraftHumanEntity; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/ContainerTypeMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/inventory/container/ContainerTypeMixin.java similarity index 88% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/ContainerTypeMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/inventory/container/ContainerTypeMixin.java index a0cd6943..6c6151fe 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/ContainerTypeMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/inventory/container/ContainerTypeMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.inventory.container; +package io.izzel.arclight.common.mixin.core.inventory.container; -import io.izzel.arclight.bridge.inventory.container.LecternContainerBridge; +import io.izzel.arclight.common.bridge.inventory.container.LecternContainerBridge; import net.minecraft.inventory.container.Container; import net.minecraft.inventory.container.ContainerType; import net.minecraft.inventory.container.LecternContainer; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/DispenserContainerMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/inventory/container/DispenserContainerMixin.java similarity index 93% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/DispenserContainerMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/inventory/container/DispenserContainerMixin.java index 0f1d83d6..6a67054b 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/DispenserContainerMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/inventory/container/DispenserContainerMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.inventory.container; +package io.izzel.arclight.common.mixin.core.inventory.container; -import io.izzel.arclight.bridge.entity.player.PlayerEntityBridge; +import io.izzel.arclight.common.bridge.entity.player.PlayerEntityBridge; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.inventory.IInventory; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/EnchantmentContainer1Mixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/inventory/container/EnchantmentContainer1Mixin.java similarity index 68% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/EnchantmentContainer1Mixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/inventory/container/EnchantmentContainer1Mixin.java index fe90a2d1..adc7f0e8 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/EnchantmentContainer1Mixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/inventory/container/EnchantmentContainer1Mixin.java @@ -1,8 +1,8 @@ -package io.izzel.arclight.mixin.core.inventory.container; +package io.izzel.arclight.common.mixin.core.inventory.container; -import io.izzel.arclight.bridge.inventory.container.EnchantmentContainerBridge; -import io.izzel.arclight.bridge.util.IWorldPosCallableBridge; -import io.izzel.arclight.mixin.core.inventory.InventoryMixin; +import io.izzel.arclight.common.bridge.inventory.container.EnchantmentContainerBridge; +import io.izzel.arclight.common.bridge.util.IWorldPosCallableBridge; +import io.izzel.arclight.common.mixin.core.inventory.InventoryMixin; import net.minecraft.inventory.container.EnchantmentContainer; import org.bukkit.Location; import org.spongepowered.asm.mixin.Mixin; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/EnchantmentContainerMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/inventory/container/EnchantmentContainerMixin.java similarity index 97% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/EnchantmentContainerMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/inventory/container/EnchantmentContainerMixin.java index b328230e..26e3d364 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/EnchantmentContainerMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/inventory/container/EnchantmentContainerMixin.java @@ -1,8 +1,8 @@ -package io.izzel.arclight.mixin.core.inventory.container; +package io.izzel.arclight.common.mixin.core.inventory.container; -import io.izzel.arclight.bridge.entity.player.PlayerEntityBridge; -import io.izzel.arclight.bridge.inventory.container.EnchantmentContainerBridge; -import io.izzel.arclight.bridge.util.IWorldPosCallableBridge; +import io.izzel.arclight.common.bridge.entity.player.PlayerEntityBridge; +import io.izzel.arclight.common.bridge.inventory.container.EnchantmentContainerBridge; +import io.izzel.arclight.common.bridge.util.IWorldPosCallableBridge; import net.minecraft.advancements.CriteriaTriggers; import net.minecraft.enchantment.EnchantmentData; import net.minecraft.enchantment.EnchantmentHelper; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/FurnaceResultSlotMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/inventory/container/FurnaceResultSlotMixin.java similarity index 87% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/FurnaceResultSlotMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/inventory/container/FurnaceResultSlotMixin.java index 2b588636..a847b86c 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/FurnaceResultSlotMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/inventory/container/FurnaceResultSlotMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mixin.core.inventory.container; +package io.izzel.arclight.common.mixin.core.inventory.container; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.inventory.container.FurnaceResultSlot; @@ -8,7 +8,7 @@ import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Redirect; -import io.izzel.arclight.bridge.tileentity.AbstractFurnaceTileEntityBridge; +import io.izzel.arclight.common.bridge.tileentity.AbstractFurnaceTileEntityBridge; @Mixin(FurnaceResultSlot.class) public class FurnaceResultSlotMixin { diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/GrindstoneContainer1Mixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/inventory/container/GrindstoneContainer1Mixin.java similarity index 68% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/GrindstoneContainer1Mixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/inventory/container/GrindstoneContainer1Mixin.java index df3eae2a..43af6806 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/GrindstoneContainer1Mixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/inventory/container/GrindstoneContainer1Mixin.java @@ -1,12 +1,12 @@ -package io.izzel.arclight.mixin.core.inventory.container; +package io.izzel.arclight.common.mixin.core.inventory.container; -import io.izzel.arclight.bridge.util.IWorldPosCallableBridge; -import io.izzel.arclight.mixin.core.inventory.InventoryMixin; +import io.izzel.arclight.common.bridge.util.IWorldPosCallableBridge; +import io.izzel.arclight.common.mixin.core.inventory.InventoryMixin; import net.minecraft.inventory.container.GrindstoneContainer; import org.bukkit.Location; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; -import io.izzel.arclight.bridge.inventory.container.GrindstoneContainerBridge; +import io.izzel.arclight.common.bridge.inventory.container.GrindstoneContainerBridge; @Mixin(targets = "net/minecraft/inventory/container/GrindstoneContainer$1") public abstract class GrindstoneContainer1Mixin extends InventoryMixin { diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/GrindstoneContainerMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/inventory/container/GrindstoneContainerMixin.java similarity index 89% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/GrindstoneContainerMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/inventory/container/GrindstoneContainerMixin.java index b2039fd6..b3695d59 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/GrindstoneContainerMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/inventory/container/GrindstoneContainerMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.inventory.container; +package io.izzel.arclight.common.mixin.core.inventory.container; -import io.izzel.arclight.bridge.entity.player.PlayerEntityBridge; +import io.izzel.arclight.common.bridge.entity.player.PlayerEntityBridge; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.container.Container; @@ -15,7 +15,7 @@ import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import io.izzel.arclight.bridge.inventory.container.GrindstoneContainerBridge; +import io.izzel.arclight.common.bridge.inventory.container.GrindstoneContainerBridge; @Mixin(GrindstoneContainer.class) public class GrindstoneContainerMixin extends ContainerMixin implements GrindstoneContainerBridge { diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/HopperContainerMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/inventory/container/HopperContainerMixin.java similarity index 93% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/HopperContainerMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/inventory/container/HopperContainerMixin.java index 6b278700..dae46828 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/HopperContainerMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/inventory/container/HopperContainerMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.inventory.container; +package io.izzel.arclight.common.mixin.core.inventory.container; -import io.izzel.arclight.bridge.entity.player.PlayerEntityBridge; +import io.izzel.arclight.common.bridge.entity.player.PlayerEntityBridge; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.inventory.IInventory; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/HorseInventoryContainerMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/inventory/container/HorseInventoryContainerMixin.java similarity index 88% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/HorseInventoryContainerMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/inventory/container/HorseInventoryContainerMixin.java index e0d05270..44651113 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/HorseInventoryContainerMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/inventory/container/HorseInventoryContainerMixin.java @@ -1,7 +1,7 @@ -package io.izzel.arclight.mixin.core.inventory.container; +package io.izzel.arclight.common.mixin.core.inventory.container; -import io.izzel.arclight.bridge.entity.player.PlayerEntityBridge; -import io.izzel.arclight.bridge.inventory.IInventoryBridge; +import io.izzel.arclight.common.bridge.entity.player.PlayerEntityBridge; +import io.izzel.arclight.common.bridge.inventory.IInventoryBridge; import net.minecraft.entity.passive.horse.AbstractHorseEntity; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.inventory.IInventory; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/LecternContainerMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/inventory/container/LecternContainerMixin.java similarity index 93% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/LecternContainerMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/inventory/container/LecternContainerMixin.java index 3cde0abb..5d5e9e7b 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/LecternContainerMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/inventory/container/LecternContainerMixin.java @@ -1,7 +1,7 @@ -package io.izzel.arclight.mixin.core.inventory.container; +package io.izzel.arclight.common.mixin.core.inventory.container; -import io.izzel.arclight.bridge.entity.player.ServerPlayerEntityBridge; -import io.izzel.arclight.bridge.inventory.container.LecternContainerBridge; +import io.izzel.arclight.common.bridge.entity.player.ServerPlayerEntityBridge; +import io.izzel.arclight.common.bridge.inventory.container.LecternContainerBridge; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.inventory.IInventory; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/LoomContainer1Mixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/inventory/container/LoomContainer1Mixin.java similarity index 67% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/LoomContainer1Mixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/inventory/container/LoomContainer1Mixin.java index f8867f6f..7cde55dc 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/LoomContainer1Mixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/inventory/container/LoomContainer1Mixin.java @@ -1,12 +1,12 @@ -package io.izzel.arclight.mixin.core.inventory.container; +package io.izzel.arclight.common.mixin.core.inventory.container; import net.minecraft.inventory.container.LoomContainer; import org.bukkit.Location; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; -import io.izzel.arclight.bridge.inventory.container.LoomContainerBridge; -import io.izzel.arclight.bridge.util.IWorldPosCallableBridge; -import io.izzel.arclight.mixin.core.inventory.InventoryMixin; +import io.izzel.arclight.common.bridge.inventory.container.LoomContainerBridge; +import io.izzel.arclight.common.bridge.util.IWorldPosCallableBridge; +import io.izzel.arclight.common.mixin.core.inventory.InventoryMixin; @Mixin(targets = "net/minecraft/inventory/container/LoomContainer$1") public abstract class LoomContainer1Mixin extends InventoryMixin { diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/LoomContainer2Mixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/inventory/container/LoomContainer2Mixin.java similarity index 67% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/LoomContainer2Mixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/inventory/container/LoomContainer2Mixin.java index 33176a49..6d0baab0 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/LoomContainer2Mixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/inventory/container/LoomContainer2Mixin.java @@ -1,12 +1,12 @@ -package io.izzel.arclight.mixin.core.inventory.container; +package io.izzel.arclight.common.mixin.core.inventory.container; import net.minecraft.inventory.container.LoomContainer; import org.bukkit.Location; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; -import io.izzel.arclight.bridge.inventory.container.LoomContainerBridge; -import io.izzel.arclight.bridge.util.IWorldPosCallableBridge; -import io.izzel.arclight.mixin.core.inventory.InventoryMixin; +import io.izzel.arclight.common.bridge.inventory.container.LoomContainerBridge; +import io.izzel.arclight.common.bridge.util.IWorldPosCallableBridge; +import io.izzel.arclight.common.mixin.core.inventory.InventoryMixin; @Mixin(targets = "net/minecraft/inventory/container/LoomContainer$2") public abstract class LoomContainer2Mixin extends InventoryMixin { diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/LoomContainerMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/inventory/container/LoomContainerMixin.java similarity index 91% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/LoomContainerMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/inventory/container/LoomContainerMixin.java index 70429b65..730d1c51 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/LoomContainerMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/inventory/container/LoomContainerMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.inventory.container; +package io.izzel.arclight.common.mixin.core.inventory.container; -import io.izzel.arclight.bridge.entity.player.PlayerEntityBridge; +import io.izzel.arclight.common.bridge.entity.player.PlayerEntityBridge; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.inventory.IInventory; @@ -18,7 +18,7 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -import io.izzel.arclight.bridge.inventory.container.LoomContainerBridge; +import io.izzel.arclight.common.bridge.inventory.container.LoomContainerBridge; @Mixin(LoomContainer.class) public class LoomContainerMixin extends ContainerMixin implements LoomContainerBridge { diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/MerchantContainerMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/inventory/container/MerchantContainerMixin.java similarity index 93% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/MerchantContainerMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/inventory/container/MerchantContainerMixin.java index 663fc92f..a891179f 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/MerchantContainerMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/inventory/container/MerchantContainerMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.inventory.container; +package io.izzel.arclight.common.mixin.core.inventory.container; -import io.izzel.arclight.bridge.entity.player.PlayerEntityBridge; +import io.izzel.arclight.common.bridge.entity.player.PlayerEntityBridge; import net.minecraft.entity.Entity; import net.minecraft.entity.merchant.IMerchant; import net.minecraft.entity.player.PlayerInventory; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/PlayerContainerMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/inventory/container/PlayerContainerMixin.java similarity index 89% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/PlayerContainerMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/inventory/container/PlayerContainerMixin.java index 2f49938a..a02d6209 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/PlayerContainerMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/inventory/container/PlayerContainerMixin.java @@ -1,8 +1,8 @@ -package io.izzel.arclight.mixin.core.inventory.container; +package io.izzel.arclight.common.mixin.core.inventory.container; -import io.izzel.arclight.bridge.entity.player.PlayerEntityBridge; -import io.izzel.arclight.bridge.inventory.CraftingInventoryBridge; -import io.izzel.arclight.mod.util.ArclightCaptures; +import io.izzel.arclight.common.bridge.entity.player.PlayerEntityBridge; +import io.izzel.arclight.common.bridge.inventory.CraftingInventoryBridge; +import io.izzel.arclight.common.mod.util.ArclightCaptures; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.inventory.CraftResultInventory; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/RepairContainerMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/inventory/container/RepairContainerMixin.java similarity index 98% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/RepairContainerMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/inventory/container/RepairContainerMixin.java index 6d0ca2b0..93a64a31 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/RepairContainerMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/inventory/container/RepairContainerMixin.java @@ -1,7 +1,7 @@ -package io.izzel.arclight.mixin.core.inventory.container; +package io.izzel.arclight.common.mixin.core.inventory.container; -import io.izzel.arclight.bridge.entity.player.PlayerEntityBridge; -import io.izzel.arclight.bridge.util.IWorldPosCallableBridge; +import io.izzel.arclight.common.bridge.entity.player.PlayerEntityBridge; +import io.izzel.arclight.common.bridge.util.IWorldPosCallableBridge; import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.player.PlayerEntity; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/ShulkerBoxContainerMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/inventory/container/ShulkerBoxContainerMixin.java similarity index 92% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/ShulkerBoxContainerMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/inventory/container/ShulkerBoxContainerMixin.java index 49fbc806..d8cae61c 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/ShulkerBoxContainerMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/inventory/container/ShulkerBoxContainerMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.inventory.container; +package io.izzel.arclight.common.mixin.core.inventory.container; -import io.izzel.arclight.bridge.entity.player.PlayerEntityBridge; +import io.izzel.arclight.common.bridge.entity.player.PlayerEntityBridge; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.container.Container; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/StonecutterContainerMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/inventory/container/StonecutterContainerMixin.java similarity index 93% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/StonecutterContainerMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/inventory/container/StonecutterContainerMixin.java index 49239d34..aad9050e 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/StonecutterContainerMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/inventory/container/StonecutterContainerMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.inventory.container; +package io.izzel.arclight.common.mixin.core.inventory.container; -import io.izzel.arclight.bridge.entity.player.ServerPlayerEntityBridge; +import io.izzel.arclight.common.bridge.entity.player.ServerPlayerEntityBridge; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.inventory.CraftResultInventory; import net.minecraft.inventory.IInventory; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/WorkbenchContainerMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/inventory/container/WorkbenchContainerMixin.java similarity index 91% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/WorkbenchContainerMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/inventory/container/WorkbenchContainerMixin.java index 8941073b..fee27096 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/WorkbenchContainerMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/inventory/container/WorkbenchContainerMixin.java @@ -1,8 +1,8 @@ -package io.izzel.arclight.mixin.core.inventory.container; +package io.izzel.arclight.common.mixin.core.inventory.container; -import io.izzel.arclight.bridge.entity.player.PlayerEntityBridge; -import io.izzel.arclight.bridge.inventory.container.ContainerBridge; -import io.izzel.arclight.bridge.inventory.container.WorkbenchContainerBridge; +import io.izzel.arclight.common.bridge.entity.player.PlayerEntityBridge; +import io.izzel.arclight.common.bridge.inventory.container.ContainerBridge; +import io.izzel.arclight.common.bridge.inventory.container.WorkbenchContainerBridge; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.entity.player.ServerPlayerEntity; @@ -30,8 +30,8 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -import io.izzel.arclight.bridge.inventory.CraftingInventoryBridge; -import io.izzel.arclight.mod.util.ArclightCaptures; +import io.izzel.arclight.common.bridge.inventory.CraftingInventoryBridge; +import io.izzel.arclight.common.mod.util.ArclightCaptures; import java.util.Optional; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/ArmorStandItemMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/ArmorStandItemMixin.java similarity index 96% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/ArmorStandItemMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/ArmorStandItemMixin.java index f6fc02a7..1d7cff52 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/ArmorStandItemMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/ArmorStandItemMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mixin.core.item; +package io.izzel.arclight.common.mixin.core.item; import net.minecraft.entity.item.ArmorStandEntity; import net.minecraft.item.ArmorStandItem; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/BlockItemMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/BlockItemMixin.java similarity index 95% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/BlockItemMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/BlockItemMixin.java index ea770b06..6c0fadea 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/BlockItemMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/BlockItemMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.item; +package io.izzel.arclight.common.mixin.core.item; -import io.izzel.arclight.bridge.entity.player.ServerPlayerEntityBridge; +import io.izzel.arclight.common.bridge.entity.player.ServerPlayerEntityBridge; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/BoatItemMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/BoatItemMixin.java similarity index 97% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/BoatItemMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/BoatItemMixin.java index 8a8c2f5a..043cf55d 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/BoatItemMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/BoatItemMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mixin.core.item; +package io.izzel.arclight.common.mixin.core.item; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.BoatItem; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/BowItemMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/BowItemMixin.java similarity index 96% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/BowItemMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/BowItemMixin.java index 64b6da34..5544a03a 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/BowItemMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/BowItemMixin.java @@ -1,7 +1,7 @@ -package io.izzel.arclight.mixin.core.item; +package io.izzel.arclight.common.mixin.core.item; -import io.izzel.arclight.bridge.entity.EntityBridge; -import io.izzel.arclight.bridge.entity.player.ServerPlayerEntityBridge; +import io.izzel.arclight.common.bridge.entity.EntityBridge; +import io.izzel.arclight.common.bridge.entity.player.ServerPlayerEntityBridge; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.enchantment.Enchantments; import net.minecraft.entity.LivingEntity; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/ChorusFruitItemMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/ChorusFruitItemMixin.java similarity index 95% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/ChorusFruitItemMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/ChorusFruitItemMixin.java index c3d9a34a..26fd828e 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/ChorusFruitItemMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/ChorusFruitItemMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.item; +package io.izzel.arclight.common.mixin.core.item; -import io.izzel.arclight.bridge.entity.player.ServerPlayerEntityBridge; +import io.izzel.arclight.common.bridge.entity.player.ServerPlayerEntityBridge; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.ServerPlayerEntity; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/CrossbowItemMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/CrossbowItemMixin.java similarity index 94% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/CrossbowItemMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/CrossbowItemMixin.java index 3a411230..e8c25d2f 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/CrossbowItemMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/CrossbowItemMixin.java @@ -1,7 +1,7 @@ -package io.izzel.arclight.mixin.core.item; +package io.izzel.arclight.common.mixin.core.item; -import io.izzel.arclight.bridge.entity.EntityBridge; -import io.izzel.arclight.bridge.entity.player.ServerPlayerEntityBridge; +import io.izzel.arclight.common.bridge.entity.EntityBridge; +import io.izzel.arclight.common.bridge.entity.player.ServerPlayerEntityBridge; import net.minecraft.entity.Entity; import net.minecraft.entity.IProjectile; import net.minecraft.entity.LivingEntity; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/DyeItemMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/DyeItemMixin.java similarity index 94% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/DyeItemMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/DyeItemMixin.java index e53be45f..7e7bd394 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/DyeItemMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/DyeItemMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.item; +package io.izzel.arclight.common.mixin.core.item; -import io.izzel.arclight.bridge.entity.LivingEntityBridge; +import io.izzel.arclight.common.bridge.entity.LivingEntityBridge; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.passive.SheepEntity; import net.minecraft.entity.player.PlayerEntity; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/EnderCrystalItemMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/EnderCrystalItemMixin.java similarity index 96% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/EnderCrystalItemMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/EnderCrystalItemMixin.java index a9caa238..9d727f78 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/EnderCrystalItemMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/EnderCrystalItemMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mixin.core.item; +package io.izzel.arclight.common.mixin.core.item; import net.minecraft.entity.item.EnderCrystalEntity; import net.minecraft.item.EnderCrystalItem; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/EnderPearlItemMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/EnderPearlItemMixin.java similarity index 94% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/EnderPearlItemMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/EnderPearlItemMixin.java index d3a3a47e..d9076bc6 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/EnderPearlItemMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/EnderPearlItemMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.item; +package io.izzel.arclight.common.mixin.core.item; -import io.izzel.arclight.bridge.entity.player.ServerPlayerEntityBridge; +import io.izzel.arclight.common.bridge.entity.player.ServerPlayerEntityBridge; import net.minecraft.entity.item.EnderPearlEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.EnderPearlItem; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/FilledMapItemMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/FilledMapItemMixin.java similarity index 91% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/FilledMapItemMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/FilledMapItemMixin.java index 230af849..0430a055 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/FilledMapItemMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/FilledMapItemMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mixin.core.item; +package io.izzel.arclight.common.mixin.core.item; import net.minecraft.item.FilledMapItem; import net.minecraft.item.ItemStack; @@ -12,7 +12,7 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; import org.spongepowered.asm.mixin.injection.callback.LocalCapture; -import io.izzel.arclight.bridge.world.storage.MapDataBridge; +import io.izzel.arclight.common.bridge.world.storage.MapDataBridge; @Mixin(FilledMapItem.class) public class FilledMapItemMixin { diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/FireChargeItemMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/FireChargeItemMixin.java similarity index 96% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/FireChargeItemMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/FireChargeItemMixin.java index 69506e71..c6389457 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/FireChargeItemMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/FireChargeItemMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mixin.core.item; +package io.izzel.arclight.common.mixin.core.item; import net.minecraft.item.FireChargeItem; import net.minecraft.item.ItemUseContext; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/FishingRodItemMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/FishingRodItemMixin.java similarity index 94% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/FishingRodItemMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/FishingRodItemMixin.java index baa4fd6d..c7b65bc7 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/FishingRodItemMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/FishingRodItemMixin.java @@ -1,7 +1,7 @@ -package io.izzel.arclight.mixin.core.item; +package io.izzel.arclight.common.mixin.core.item; -import io.izzel.arclight.bridge.entity.EntityBridge; -import io.izzel.arclight.bridge.entity.player.ServerPlayerEntityBridge; +import io.izzel.arclight.common.bridge.entity.EntityBridge; +import io.izzel.arclight.common.bridge.entity.player.ServerPlayerEntityBridge; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.projectile.FishingBobberEntity; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/FlintAndSteelItemMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/FlintAndSteelItemMixin.java similarity index 97% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/FlintAndSteelItemMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/FlintAndSteelItemMixin.java index 884d13cf..71dee754 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/FlintAndSteelItemMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/FlintAndSteelItemMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mixin.core.item; +package io.izzel.arclight.common.mixin.core.item; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.FlintAndSteelItem; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/HangingEntityItemMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/HangingEntityItemMixin.java similarity index 91% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/HangingEntityItemMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/HangingEntityItemMixin.java index aa62538b..36fac346 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/HangingEntityItemMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/HangingEntityItemMixin.java @@ -1,7 +1,7 @@ -package io.izzel.arclight.mixin.core.item; +package io.izzel.arclight.common.mixin.core.item; -import io.izzel.arclight.bridge.entity.EntityBridge; -import io.izzel.arclight.bridge.entity.player.PlayerEntityBridge; +import io.izzel.arclight.common.bridge.entity.EntityBridge; +import io.izzel.arclight.common.bridge.entity.player.PlayerEntityBridge; import net.minecraft.entity.item.HangingEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.HangingEntityItem; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/ItemStackMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/ItemStackMixin.java similarity index 86% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/ItemStackMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/ItemStackMixin.java index 230adb00..701123f0 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/ItemStackMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/ItemStackMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.item; +package io.izzel.arclight.common.mixin.core.item; -import io.izzel.arclight.bridge.item.ItemStackBridge; +import io.izzel.arclight.common.bridge.item.ItemStackBridge; import net.minecraft.item.ItemStack; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/LeadItemMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/LeadItemMixin.java similarity index 92% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/LeadItemMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/LeadItemMixin.java index 1b09ce15..7aed3167 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/LeadItemMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/LeadItemMixin.java @@ -1,7 +1,7 @@ -package io.izzel.arclight.mixin.core.item; +package io.izzel.arclight.common.mixin.core.item; -import io.izzel.arclight.bridge.entity.EntityBridge; -import io.izzel.arclight.bridge.entity.player.PlayerEntityBridge; +import io.izzel.arclight.common.bridge.entity.EntityBridge; +import io.izzel.arclight.common.bridge.entity.player.PlayerEntityBridge; import net.minecraft.entity.MobEntity; import net.minecraft.entity.item.LeashKnotEntity; import net.minecraft.entity.player.PlayerEntity; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/MerchantOfferMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/MerchantOfferMixin.java similarity index 91% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/MerchantOfferMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/MerchantOfferMixin.java index 13b06616..c2cf4f36 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/MerchantOfferMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/MerchantOfferMixin.java @@ -1,10 +1,10 @@ -package io.izzel.arclight.mixin.core.item; +package io.izzel.arclight.common.mixin.core.item; import net.minecraft.item.ItemStack; import net.minecraft.item.MerchantOffer; import org.bukkit.craftbukkit.v.inventory.CraftMerchantRecipe; import org.spongepowered.asm.mixin.Mixin; -import io.izzel.arclight.bridge.item.MerchantOfferBridge; +import io.izzel.arclight.common.bridge.item.MerchantOfferBridge; @Mixin(MerchantOffer.class) public class MerchantOfferMixin implements MerchantOfferBridge { diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/MilkBucketItemMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/MilkBucketItemMixin.java similarity index 88% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/MilkBucketItemMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/MilkBucketItemMixin.java index a1947017..fd4542cf 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/MilkBucketItemMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/MilkBucketItemMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.item; +package io.izzel.arclight.common.mixin.core.item; -import io.izzel.arclight.bridge.entity.LivingEntityBridge; +import io.izzel.arclight.common.bridge.entity.LivingEntityBridge; import net.minecraft.entity.LivingEntity; import net.minecraft.item.ItemStack; import net.minecraft.item.MilkBucketItem; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/MinecartItemMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/MinecartItemMixin.java similarity index 98% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/MinecartItemMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/MinecartItemMixin.java index ce92478c..3fe2a914 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/MinecartItemMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/MinecartItemMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mixin.core.item; +package io.izzel.arclight.common.mixin.core.item; import net.minecraft.block.AbstractRailBlock; import net.minecraft.block.BlockState; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/PotionItemMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/PotionItemMixin.java similarity index 88% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/PotionItemMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/PotionItemMixin.java index cad94a74..c53f9f23 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/PotionItemMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/PotionItemMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.item; +package io.izzel.arclight.common.mixin.core.item; -import io.izzel.arclight.bridge.entity.LivingEntityBridge; +import io.izzel.arclight.common.bridge.entity.LivingEntityBridge; import net.minecraft.entity.LivingEntity; import net.minecraft.item.ItemStack; import net.minecraft.item.PotionItem; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/ShearsItemMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/ShearsItemMixin.java similarity index 87% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/ShearsItemMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/ShearsItemMixin.java index 64e51d7f..d77fa8f3 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/ShearsItemMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/ShearsItemMixin.java @@ -1,7 +1,7 @@ -package io.izzel.arclight.mixin.core.item; +package io.izzel.arclight.common.mixin.core.item; -import io.izzel.arclight.bridge.entity.EntityBridge; -import io.izzel.arclight.bridge.entity.player.ServerPlayerEntityBridge; +import io.izzel.arclight.common.bridge.entity.EntityBridge; +import io.izzel.arclight.common.bridge.entity.player.ServerPlayerEntityBridge; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/SnowballItemMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/SnowballItemMixin.java similarity index 93% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/SnowballItemMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/SnowballItemMixin.java index 99279a54..2a9f4a23 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/SnowballItemMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/SnowballItemMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.item; +package io.izzel.arclight.common.mixin.core.item; -import io.izzel.arclight.bridge.entity.player.ServerPlayerEntityBridge; +import io.izzel.arclight.common.bridge.entity.player.ServerPlayerEntityBridge; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.entity.projectile.SnowballEntity; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/TridentItemMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/TridentItemMixin.java similarity index 93% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/TridentItemMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/TridentItemMixin.java index 69dc3e37..97cca262 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/TridentItemMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/TridentItemMixin.java @@ -1,7 +1,7 @@ -package io.izzel.arclight.mixin.core.item; +package io.izzel.arclight.common.mixin.core.item; -import io.izzel.arclight.bridge.entity.player.ServerPlayerEntityBridge; -import io.izzel.arclight.bridge.entity.projectile.TridentEntityBridge; +import io.izzel.arclight.common.bridge.entity.player.ServerPlayerEntityBridge; +import io.izzel.arclight.common.bridge.entity.projectile.TridentEntityBridge; import net.minecraft.entity.Entity; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.ServerPlayerEntity; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/crafting/ArmorDyeRecipeMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/crafting/ArmorDyeRecipeMixin.java similarity index 80% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/crafting/ArmorDyeRecipeMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/crafting/ArmorDyeRecipeMixin.java index 99771919..a8501cb9 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/crafting/ArmorDyeRecipeMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/crafting/ArmorDyeRecipeMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.item.crafting; +package io.izzel.arclight.common.mixin.core.item.crafting; -import io.izzel.arclight.bridge.item.crafting.IRecipeBridge; +import io.izzel.arclight.common.bridge.item.crafting.IRecipeBridge; import net.minecraft.item.Items; import net.minecraft.item.crafting.ArmorDyeRecipe; import net.minecraft.item.crafting.Ingredient; @@ -10,7 +10,7 @@ import org.bukkit.Material; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.Recipe; import org.spongepowered.asm.mixin.Mixin; -import io.izzel.arclight.mod.util.ArclightSpecialRecipe; +import io.izzel.arclight.common.mod.util.ArclightSpecialRecipe; @Mixin(ArmorDyeRecipe.class) public abstract class ArmorDyeRecipeMixin extends SpecialRecipe implements IRecipeBridge { diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/crafting/BannerDuplicateRecipeMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/crafting/BannerDuplicateRecipeMixin.java similarity index 81% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/crafting/BannerDuplicateRecipeMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/crafting/BannerDuplicateRecipeMixin.java index ca1dc247..f0e26c7b 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/crafting/BannerDuplicateRecipeMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/crafting/BannerDuplicateRecipeMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.item.crafting; +package io.izzel.arclight.common.mixin.core.item.crafting; -import io.izzel.arclight.bridge.item.crafting.IRecipeBridge; +import io.izzel.arclight.common.bridge.item.crafting.IRecipeBridge; import net.minecraft.item.Items; import net.minecraft.item.crafting.BannerDuplicateRecipe; import net.minecraft.item.crafting.Ingredient; @@ -10,7 +10,7 @@ import org.bukkit.Material; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.Recipe; import org.spongepowered.asm.mixin.Mixin; -import io.izzel.arclight.mod.util.ArclightSpecialRecipe; +import io.izzel.arclight.common.mod.util.ArclightSpecialRecipe; @Mixin(BannerDuplicateRecipe.class) public abstract class BannerDuplicateRecipeMixin extends SpecialRecipe implements IRecipeBridge { diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/crafting/BlastingRecipeMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/crafting/BlastingRecipeMixin.java similarity index 91% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/crafting/BlastingRecipeMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/crafting/BlastingRecipeMixin.java index ca1c47be..64ab1ec3 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/crafting/BlastingRecipeMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/crafting/BlastingRecipeMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.item.crafting; +package io.izzel.arclight.common.mixin.core.item.crafting; -import io.izzel.arclight.bridge.item.crafting.IRecipeBridge; +import io.izzel.arclight.common.bridge.item.crafting.IRecipeBridge; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.AbstractCookingRecipe; import net.minecraft.item.crafting.BlastingRecipe; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/crafting/BookCloningRecipeMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/crafting/BookCloningRecipeMixin.java similarity index 76% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/crafting/BookCloningRecipeMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/crafting/BookCloningRecipeMixin.java index a67d935a..37950a6a 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/crafting/BookCloningRecipeMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/crafting/BookCloningRecipeMixin.java @@ -1,7 +1,7 @@ -package io.izzel.arclight.mixin.core.item.crafting; +package io.izzel.arclight.common.mixin.core.item.crafting; -import io.izzel.arclight.bridge.item.crafting.IRecipeBridge; -import io.izzel.arclight.mod.util.ArclightSpecialRecipe; +import io.izzel.arclight.common.bridge.item.crafting.IRecipeBridge; +import io.izzel.arclight.common.mod.util.ArclightSpecialRecipe; import net.minecraft.item.Items; import net.minecraft.item.crafting.BookCloningRecipe; import net.minecraft.item.crafting.IRecipe; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/crafting/CampfireCookingRecipeMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/crafting/CampfireCookingRecipeMixin.java similarity index 91% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/crafting/CampfireCookingRecipeMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/crafting/CampfireCookingRecipeMixin.java index 2e52bbb2..98670dbe 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/crafting/CampfireCookingRecipeMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/crafting/CampfireCookingRecipeMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.item.crafting; +package io.izzel.arclight.common.mixin.core.item.crafting; -import io.izzel.arclight.bridge.item.crafting.IRecipeBridge; +import io.izzel.arclight.common.bridge.item.crafting.IRecipeBridge; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.AbstractCookingRecipe; import net.minecraft.item.crafting.CampfireCookingRecipe; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/crafting/FireworkRocketRecipeMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/crafting/FireworkRocketRecipeMixin.java similarity index 81% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/crafting/FireworkRocketRecipeMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/crafting/FireworkRocketRecipeMixin.java index 06715e7c..98a61aa7 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/crafting/FireworkRocketRecipeMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/crafting/FireworkRocketRecipeMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.item.crafting; +package io.izzel.arclight.common.mixin.core.item.crafting; -import io.izzel.arclight.bridge.item.crafting.IRecipeBridge; +import io.izzel.arclight.common.bridge.item.crafting.IRecipeBridge; import net.minecraft.item.Items; import net.minecraft.item.crafting.FireworkRocketRecipe; import net.minecraft.item.crafting.Ingredient; @@ -10,7 +10,7 @@ import org.bukkit.Material; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.Recipe; import org.spongepowered.asm.mixin.Mixin; -import io.izzel.arclight.mod.util.ArclightSpecialRecipe; +import io.izzel.arclight.common.mod.util.ArclightSpecialRecipe; @Mixin(FireworkRocketRecipe.class) public abstract class FireworkRocketRecipeMixin extends SpecialRecipe implements IRecipeBridge { diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/crafting/FireworkStarFadeRecipeMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/crafting/FireworkStarFadeRecipeMixin.java similarity index 81% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/crafting/FireworkStarFadeRecipeMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/crafting/FireworkStarFadeRecipeMixin.java index e63b39d3..d2395ca6 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/crafting/FireworkStarFadeRecipeMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/crafting/FireworkStarFadeRecipeMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.item.crafting; +package io.izzel.arclight.common.mixin.core.item.crafting; -import io.izzel.arclight.bridge.item.crafting.IRecipeBridge; +import io.izzel.arclight.common.bridge.item.crafting.IRecipeBridge; import net.minecraft.item.Items; import net.minecraft.item.crafting.FireworkStarFadeRecipe; import net.minecraft.item.crafting.Ingredient; @@ -10,7 +10,7 @@ import org.bukkit.Material; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.Recipe; import org.spongepowered.asm.mixin.Mixin; -import io.izzel.arclight.mod.util.ArclightSpecialRecipe; +import io.izzel.arclight.common.mod.util.ArclightSpecialRecipe; @Mixin(FireworkStarFadeRecipe.class) public abstract class FireworkStarFadeRecipeMixin extends SpecialRecipe implements IRecipeBridge { diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/crafting/FireworkStarRecipeMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/crafting/FireworkStarRecipeMixin.java similarity index 80% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/crafting/FireworkStarRecipeMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/crafting/FireworkStarRecipeMixin.java index 20b29058..f8185664 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/crafting/FireworkStarRecipeMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/crafting/FireworkStarRecipeMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.item.crafting; +package io.izzel.arclight.common.mixin.core.item.crafting; -import io.izzel.arclight.bridge.item.crafting.IRecipeBridge; +import io.izzel.arclight.common.bridge.item.crafting.IRecipeBridge; import net.minecraft.item.Items; import net.minecraft.item.crafting.FireworkStarRecipe; import net.minecraft.item.crafting.Ingredient; @@ -10,7 +10,7 @@ import org.bukkit.Material; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.Recipe; import org.spongepowered.asm.mixin.Mixin; -import io.izzel.arclight.mod.util.ArclightSpecialRecipe; +import io.izzel.arclight.common.mod.util.ArclightSpecialRecipe; @Mixin(FireworkStarRecipe.class) public abstract class FireworkStarRecipeMixin extends SpecialRecipe implements IRecipeBridge { diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/crafting/FurnaceRecipeMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/crafting/FurnaceRecipeMixin.java similarity index 91% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/crafting/FurnaceRecipeMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/crafting/FurnaceRecipeMixin.java index 24281829..5a99a51e 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/crafting/FurnaceRecipeMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/crafting/FurnaceRecipeMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.item.crafting; +package io.izzel.arclight.common.mixin.core.item.crafting; -import io.izzel.arclight.bridge.item.crafting.IRecipeBridge; +import io.izzel.arclight.common.bridge.item.crafting.IRecipeBridge; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.AbstractCookingRecipe; import net.minecraft.item.crafting.FurnaceRecipe; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/crafting/IRecipeMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/crafting/IRecipeMixin.java similarity index 78% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/crafting/IRecipeMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/crafting/IRecipeMixin.java index 04c81d09..a032651a 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/crafting/IRecipeMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/crafting/IRecipeMixin.java @@ -1,7 +1,7 @@ -package io.izzel.arclight.mixin.core.item.crafting; +package io.izzel.arclight.common.mixin.core.item.crafting; -import io.izzel.arclight.bridge.item.crafting.IRecipeBridge; -import io.izzel.arclight.mod.util.ArclightSpecialRecipe; +import io.izzel.arclight.common.bridge.item.crafting.IRecipeBridge; +import io.izzel.arclight.common.mod.util.ArclightSpecialRecipe; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import org.bukkit.craftbukkit.v.inventory.CraftItemStack; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/crafting/IngredientMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/crafting/IngredientMixin.java similarity index 92% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/crafting/IngredientMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/crafting/IngredientMixin.java index be60fa63..c65687d6 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/crafting/IngredientMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/crafting/IngredientMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.item.crafting; +package io.izzel.arclight.common.mixin.core.item.crafting; -import io.izzel.arclight.bridge.item.crafting.IngredientBridge; +import io.izzel.arclight.common.bridge.item.crafting.IngredientBridge; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.Ingredient; import org.spongepowered.asm.mixin.Final; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/crafting/MapCloningRecipeMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/crafting/MapCloningRecipeMixin.java similarity index 80% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/crafting/MapCloningRecipeMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/crafting/MapCloningRecipeMixin.java index 1f0fb320..d826d279 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/crafting/MapCloningRecipeMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/crafting/MapCloningRecipeMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.item.crafting; +package io.izzel.arclight.common.mixin.core.item.crafting; -import io.izzel.arclight.bridge.item.crafting.IRecipeBridge; +import io.izzel.arclight.common.bridge.item.crafting.IRecipeBridge; import net.minecraft.item.Items; import net.minecraft.item.crafting.Ingredient; import net.minecraft.item.crafting.MapCloningRecipe; @@ -10,7 +10,7 @@ import org.bukkit.Material; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.Recipe; import org.spongepowered.asm.mixin.Mixin; -import io.izzel.arclight.mod.util.ArclightSpecialRecipe; +import io.izzel.arclight.common.mod.util.ArclightSpecialRecipe; @Mixin(MapCloningRecipe.class) public abstract class MapCloningRecipeMixin extends SpecialRecipe implements IRecipeBridge { diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/crafting/RecipeManagerMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/crafting/RecipeManagerMixin.java similarity index 96% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/crafting/RecipeManagerMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/crafting/RecipeManagerMixin.java index 90228dee..7b7a80b1 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/crafting/RecipeManagerMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/crafting/RecipeManagerMixin.java @@ -1,11 +1,11 @@ -package io.izzel.arclight.mixin.core.item.crafting; +package io.izzel.arclight.common.mixin.core.item.crafting; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; import com.google.gson.JsonObject; import com.google.gson.JsonParseException; -import io.izzel.arclight.bridge.inventory.IInventoryBridge; -import io.izzel.arclight.bridge.item.crafting.RecipeManagerBridge; +import io.izzel.arclight.common.bridge.inventory.IInventoryBridge; +import io.izzel.arclight.common.bridge.item.crafting.RecipeManagerBridge; import it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenHashMap; import net.minecraft.inventory.IInventory; import net.minecraft.item.crafting.IRecipe; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/crafting/RepairItemRecipeMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/crafting/RepairItemRecipeMixin.java similarity index 80% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/crafting/RepairItemRecipeMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/crafting/RepairItemRecipeMixin.java index 403448bd..454307b1 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/crafting/RepairItemRecipeMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/crafting/RepairItemRecipeMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.item.crafting; +package io.izzel.arclight.common.mixin.core.item.crafting; -import io.izzel.arclight.bridge.item.crafting.IRecipeBridge; +import io.izzel.arclight.common.bridge.item.crafting.IRecipeBridge; import net.minecraft.item.Items; import net.minecraft.item.crafting.Ingredient; import net.minecraft.item.crafting.RepairItemRecipe; @@ -10,7 +10,7 @@ import org.bukkit.Material; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.Recipe; import org.spongepowered.asm.mixin.Mixin; -import io.izzel.arclight.mod.util.ArclightSpecialRecipe; +import io.izzel.arclight.common.mod.util.ArclightSpecialRecipe; @Mixin(RepairItemRecipe.class) public abstract class RepairItemRecipeMixin extends SpecialRecipe implements IRecipeBridge { diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/crafting/ServerRecipeBookMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/crafting/ServerRecipeBookMixin.java similarity index 95% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/crafting/ServerRecipeBookMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/crafting/ServerRecipeBookMixin.java index 8e764044..8670acb2 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/crafting/ServerRecipeBookMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/crafting/ServerRecipeBookMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mixin.core.item.crafting; +package io.izzel.arclight.common.mixin.core.item.crafting; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.item.crafting.IRecipe; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/crafting/ShapedRecipeMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/crafting/ShapedRecipeMixin.java similarity index 95% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/crafting/ShapedRecipeMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/crafting/ShapedRecipeMixin.java index 327d99ee..023ac2d4 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/crafting/ShapedRecipeMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/crafting/ShapedRecipeMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.item.crafting; +package io.izzel.arclight.common.mixin.core.item.crafting; -import io.izzel.arclight.bridge.item.crafting.IRecipeBridge; +import io.izzel.arclight.common.bridge.item.crafting.IRecipeBridge; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.Ingredient; import net.minecraft.item.crafting.ShapedRecipe; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/crafting/ShapelessRecipeMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/crafting/ShapelessRecipeMixin.java similarity index 90% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/crafting/ShapelessRecipeMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/crafting/ShapelessRecipeMixin.java index 6e5e224d..304e4ab0 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/crafting/ShapelessRecipeMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/crafting/ShapelessRecipeMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.item.crafting; +package io.izzel.arclight.common.mixin.core.item.crafting; -import io.izzel.arclight.bridge.item.crafting.IRecipeBridge; +import io.izzel.arclight.common.bridge.item.crafting.IRecipeBridge; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.Ingredient; import net.minecraft.item.crafting.ShapelessRecipe; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/crafting/ShieldRecipesMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/crafting/ShieldRecipesMixin.java similarity index 81% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/crafting/ShieldRecipesMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/crafting/ShieldRecipesMixin.java index 14b69670..5f3ade46 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/crafting/ShieldRecipesMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/crafting/ShieldRecipesMixin.java @@ -1,7 +1,7 @@ -package io.izzel.arclight.mixin.core.item.crafting; +package io.izzel.arclight.common.mixin.core.item.crafting; -import io.izzel.arclight.bridge.item.crafting.IRecipeBridge; -import io.izzel.arclight.mod.util.ArclightSpecialRecipe; +import io.izzel.arclight.common.bridge.item.crafting.IRecipeBridge; +import io.izzel.arclight.common.mod.util.ArclightSpecialRecipe; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; import net.minecraft.item.crafting.Ingredient; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/crafting/ShulkerBoxColoringRecipeMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/crafting/ShulkerBoxColoringRecipeMixin.java similarity index 82% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/crafting/ShulkerBoxColoringRecipeMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/crafting/ShulkerBoxColoringRecipeMixin.java index 7fd87d1a..9dadb96c 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/crafting/ShulkerBoxColoringRecipeMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/crafting/ShulkerBoxColoringRecipeMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.item.crafting; +package io.izzel.arclight.common.mixin.core.item.crafting; -import io.izzel.arclight.bridge.item.crafting.IRecipeBridge; +import io.izzel.arclight.common.bridge.item.crafting.IRecipeBridge; import net.minecraft.block.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; @@ -11,7 +11,7 @@ import net.minecraft.util.ResourceLocation; import org.bukkit.craftbukkit.v.inventory.CraftItemStack; import org.bukkit.inventory.Recipe; import org.spongepowered.asm.mixin.Mixin; -import io.izzel.arclight.mod.util.ArclightSpecialRecipe; +import io.izzel.arclight.common.mod.util.ArclightSpecialRecipe; @Mixin(ShulkerBoxColoringRecipe.class) public abstract class ShulkerBoxColoringRecipeMixin extends SpecialRecipe implements IRecipeBridge { diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/crafting/SmokingRecipeMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/crafting/SmokingRecipeMixin.java similarity index 91% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/crafting/SmokingRecipeMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/crafting/SmokingRecipeMixin.java index ebac5b66..cca3969b 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/crafting/SmokingRecipeMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/crafting/SmokingRecipeMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.item.crafting; +package io.izzel.arclight.common.mixin.core.item.crafting; -import io.izzel.arclight.bridge.item.crafting.IRecipeBridge; +import io.izzel.arclight.common.bridge.item.crafting.IRecipeBridge; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.AbstractCookingRecipe; import net.minecraft.item.crafting.IRecipeType; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/crafting/StonecuttingRecipeMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/crafting/StonecuttingRecipeMixin.java similarity index 91% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/crafting/StonecuttingRecipeMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/crafting/StonecuttingRecipeMixin.java index 919ab061..daa53759 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/crafting/StonecuttingRecipeMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/crafting/StonecuttingRecipeMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.item.crafting; +package io.izzel.arclight.common.mixin.core.item.crafting; -import io.izzel.arclight.bridge.item.crafting.IRecipeBridge; +import io.izzel.arclight.common.bridge.item.crafting.IRecipeBridge; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipeSerializer; import net.minecraft.item.crafting.IRecipeType; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/crafting/SuspiciousStewRecipeMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/crafting/SuspiciousStewRecipeMixin.java similarity index 80% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/crafting/SuspiciousStewRecipeMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/crafting/SuspiciousStewRecipeMixin.java index 3a87c31b..a34c0fce 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/crafting/SuspiciousStewRecipeMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/crafting/SuspiciousStewRecipeMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.item.crafting; +package io.izzel.arclight.common.mixin.core.item.crafting; -import io.izzel.arclight.bridge.item.crafting.IRecipeBridge; +import io.izzel.arclight.common.bridge.item.crafting.IRecipeBridge; import net.minecraft.item.Items; import net.minecraft.item.crafting.Ingredient; import net.minecraft.item.crafting.SpecialRecipe; @@ -10,7 +10,7 @@ import org.bukkit.Material; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.Recipe; import org.spongepowered.asm.mixin.Mixin; -import io.izzel.arclight.mod.util.ArclightSpecialRecipe; +import io.izzel.arclight.common.mod.util.ArclightSpecialRecipe; @Mixin(SuspiciousStewRecipe.class) public abstract class SuspiciousStewRecipeMixin extends SpecialRecipe implements IRecipeBridge { diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/crafting/TippedArrowRecipeMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/crafting/TippedArrowRecipeMixin.java similarity index 86% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/crafting/TippedArrowRecipeMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/crafting/TippedArrowRecipeMixin.java index 94dc6f8a..2aaa211c 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/crafting/TippedArrowRecipeMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/crafting/TippedArrowRecipeMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.item.crafting; +package io.izzel.arclight.common.mixin.core.item.crafting; -import io.izzel.arclight.bridge.item.crafting.IRecipeBridge; +import io.izzel.arclight.common.bridge.item.crafting.IRecipeBridge; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; import net.minecraft.item.crafting.Ingredient; @@ -10,7 +10,7 @@ import net.minecraft.util.ResourceLocation; import org.bukkit.craftbukkit.v.inventory.CraftItemStack; import org.bukkit.inventory.Recipe; import org.spongepowered.asm.mixin.Mixin; -import io.izzel.arclight.mod.util.ArclightSpecialRecipe; +import io.izzel.arclight.common.mod.util.ArclightSpecialRecipe; @Mixin(TippedArrowRecipe.class) public abstract class TippedArrowRecipeMixin extends SpecialRecipe implements IRecipeBridge { diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/network/datasync/EntityDataManagerMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/network/datasync/EntityDataManagerMixin.java similarity index 84% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/network/datasync/EntityDataManagerMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/network/datasync/EntityDataManagerMixin.java index b620e670..1343b2e5 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/network/datasync/EntityDataManagerMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/network/datasync/EntityDataManagerMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.network.datasync; +package io.izzel.arclight.common.mixin.core.network.datasync; -import io.izzel.arclight.bridge.network.datasync.EntityDataManagerBridge; +import io.izzel.arclight.common.bridge.network.datasync.EntityDataManagerBridge; import net.minecraft.network.datasync.DataParameter; import net.minecraft.network.datasync.EntityDataManager; import org.spongepowered.asm.mixin.Mixin; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/network/login/ServerLoginNetHandler1Mixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/network/login/ServerLoginNetHandler1Mixin.java similarity index 98% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/network/login/ServerLoginNetHandler1Mixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/network/login/ServerLoginNetHandler1Mixin.java index 4bf39f16..04d58bff 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/network/login/ServerLoginNetHandler1Mixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/network/login/ServerLoginNetHandler1Mixin.java @@ -1,7 +1,7 @@ -package io.izzel.arclight.mixin.core.network.login; +package io.izzel.arclight.common.mixin.core.network.login; import com.mojang.authlib.GameProfile; -import io.izzel.arclight.bridge.server.MinecraftServerBridge; +import io.izzel.arclight.common.bridge.server.MinecraftServerBridge; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.network.NetworkManager; import net.minecraft.network.login.ServerLoginNetHandler; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/network/play/ServerPlayNetHandlerMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/network/play/ServerPlayNetHandlerMixin.java similarity index 99% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/network/play/ServerPlayNetHandlerMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/network/play/ServerPlayNetHandlerMixin.java index 6dedcdf8..5f0a28d1 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/network/play/ServerPlayNetHandlerMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/network/play/ServerPlayNetHandlerMixin.java @@ -1,12 +1,12 @@ -package io.izzel.arclight.mixin.core.network.play; +package io.izzel.arclight.common.mixin.core.network.play; import com.google.common.base.Charsets; -import io.izzel.arclight.bridge.entity.EntityBridge; -import io.izzel.arclight.bridge.entity.player.ServerPlayerEntityBridge; -import io.izzel.arclight.bridge.inventory.container.ContainerBridge; -import io.izzel.arclight.bridge.network.play.ServerPlayNetHandlerBridge; -import io.izzel.arclight.bridge.server.MinecraftServerBridge; -import io.izzel.arclight.bridge.server.management.PlayerInteractionManagerBridge; +import io.izzel.arclight.common.bridge.entity.EntityBridge; +import io.izzel.arclight.common.bridge.entity.player.ServerPlayerEntityBridge; +import io.izzel.arclight.common.bridge.inventory.container.ContainerBridge; +import io.izzel.arclight.common.bridge.network.play.ServerPlayNetHandlerBridge; +import io.izzel.arclight.common.bridge.server.MinecraftServerBridge; +import io.izzel.arclight.common.bridge.server.management.PlayerInteractionManagerBridge; import io.netty.util.concurrent.Future; import io.netty.util.concurrent.GenericFutureListener; import it.unimi.dsi.fastutil.ints.Int2ShortMap; @@ -127,9 +127,9 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.Redirect; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.spongepowered.asm.mixin.injection.callback.LocalCapture; -import io.izzel.arclight.bridge.tileentity.SignTileEntityBridge; -import io.izzel.arclight.mod.ArclightConstants; -import io.izzel.arclight.mod.util.ArclightCaptures; +import io.izzel.arclight.common.bridge.tileentity.SignTileEntityBridge; +import io.izzel.arclight.common.mod.ArclightConstants; +import io.izzel.arclight.common.mod.util.ArclightCaptures; import java.util.Collections; import java.util.Objects; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/network/play/client/CCloseWindowPacketMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/network/play/client/CCloseWindowPacketMixin.java similarity index 87% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/network/play/client/CCloseWindowPacketMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/network/play/client/CCloseWindowPacketMixin.java index e55e5a8f..386991f1 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/network/play/client/CCloseWindowPacketMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/network/play/client/CCloseWindowPacketMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mixin.core.network.play.client; +package io.izzel.arclight.common.mixin.core.network.play.client; import net.minecraft.network.play.client.CCloseWindowPacket; import org.spongepowered.asm.mixin.Mixin; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/network/play/server/SChatPacketMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/network/play/server/SChatPacketMixin.java similarity index 94% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/network/play/server/SChatPacketMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/network/play/server/SChatPacketMixin.java index 667e006a..f5d305cd 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/network/play/server/SChatPacketMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/network/play/server/SChatPacketMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mixin.core.network.play.server; +package io.izzel.arclight.common.mixin.core.network.play.server; import net.md_5.bungee.api.chat.BaseComponent; import net.md_5.bungee.chat.ComponentSerializer; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/network/rcon/RConConsoleSourceMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/network/rcon/RConConsoleSourceMixin.java similarity index 79% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/network/rcon/RConConsoleSourceMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/network/rcon/RConConsoleSourceMixin.java index b3138fbd..06054499 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/network/rcon/RConConsoleSourceMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/network/rcon/RConConsoleSourceMixin.java @@ -1,8 +1,8 @@ -package io.izzel.arclight.mixin.core.network.rcon; +package io.izzel.arclight.common.mixin.core.network.rcon; -import io.izzel.arclight.bridge.command.ICommandSourceBridge; -import io.izzel.arclight.bridge.network.rcon.RConConsoleSourceBridge; -import io.izzel.arclight.bridge.server.MinecraftServerBridge; +import io.izzel.arclight.common.bridge.command.ICommandSourceBridge; +import io.izzel.arclight.common.bridge.network.rcon.RConConsoleSourceBridge; +import io.izzel.arclight.common.bridge.server.MinecraftServerBridge; import net.minecraft.command.CommandSource; import net.minecraft.network.rcon.RConConsoleSource; import net.minecraft.server.MinecraftServer; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/potion/EffectMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/potion/EffectMixin.java similarity index 94% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/potion/EffectMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/potion/EffectMixin.java index f0d238dc..1608ee56 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/potion/EffectMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/potion/EffectMixin.java @@ -1,7 +1,7 @@ -package io.izzel.arclight.mixin.core.potion; +package io.izzel.arclight.common.mixin.core.potion; -import io.izzel.arclight.bridge.entity.LivingEntityBridge; -import io.izzel.arclight.bridge.entity.player.ServerPlayerEntityBridge; +import io.izzel.arclight.common.bridge.entity.LivingEntityBridge; +import io.izzel.arclight.common.bridge.entity.player.ServerPlayerEntityBridge; import net.minecraft.entity.Entity; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/server/CustomServerBossInfoMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/CustomServerBossInfoMixin.java similarity index 83% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/server/CustomServerBossInfoMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/CustomServerBossInfoMixin.java index 3b5d50c2..a1c8b277 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/server/CustomServerBossInfoMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/CustomServerBossInfoMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.server; +package io.izzel.arclight.common.mixin.core.server; -import io.izzel.arclight.bridge.server.CustomServerBossInfoBridge; +import io.izzel.arclight.common.bridge.server.CustomServerBossInfoBridge; import net.minecraft.server.CustomServerBossInfo; import org.bukkit.boss.KeyedBossBar; import org.bukkit.craftbukkit.v.boss.CraftKeyedBossbar; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/server/MinecraftServerMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/MinecraftServerMixin.java similarity index 97% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/server/MinecraftServerMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/MinecraftServerMixin.java index fc03ad2c..038358fd 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/server/MinecraftServerMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/MinecraftServerMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mixin.core.server; +package io.izzel.arclight.common.mixin.core.server; import com.google.common.io.Files; import com.google.gson.JsonElement; @@ -6,12 +6,12 @@ import com.mojang.authlib.GameProfileRepository; import com.mojang.authlib.minecraft.MinecraftSessionService; import com.mojang.authlib.yggdrasil.YggdrasilAuthenticationService; import com.mojang.datafixers.DataFixer; -import io.izzel.arclight.bridge.command.ICommandSourceBridge; -import io.izzel.arclight.bridge.server.MinecraftServerBridge; -import io.izzel.arclight.bridge.world.WorldBridge; -import io.izzel.arclight.mod.ArclightConstants; -import io.izzel.arclight.mod.server.BukkitRegistry; -import io.izzel.arclight.mod.util.BukkitOptionParser; +import io.izzel.arclight.common.bridge.command.ICommandSourceBridge; +import io.izzel.arclight.common.bridge.server.MinecraftServerBridge; +import io.izzel.arclight.common.bridge.world.WorldBridge; +import io.izzel.arclight.common.mod.ArclightConstants; +import io.izzel.arclight.common.mod.server.BukkitRegistry; +import io.izzel.arclight.common.mod.util.BukkitOptionParser; import joptsimple.OptionParser; import joptsimple.OptionSet; import net.minecraft.command.CommandSource; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/server/dedicated/DedicatedServerMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/dedicated/DedicatedServerMixin.java similarity index 92% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/server/dedicated/DedicatedServerMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/dedicated/DedicatedServerMixin.java index d5a17d18..f87d5bdf 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/server/dedicated/DedicatedServerMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/dedicated/DedicatedServerMixin.java @@ -1,7 +1,7 @@ -package io.izzel.arclight.mixin.core.server.dedicated; +package io.izzel.arclight.common.mixin.core.server.dedicated; -import io.izzel.arclight.mixin.core.server.MinecraftServerMixin; -import io.izzel.arclight.mod.server.BukkitRegistry; +import io.izzel.arclight.common.mixin.core.server.MinecraftServerMixin; +import io.izzel.arclight.common.mod.server.BukkitRegistry; import net.minecraft.network.rcon.RConConsoleSource; import net.minecraft.server.dedicated.DedicatedServer; import net.minecraft.util.text.ITextComponent; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/server/management/BanEntryMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/management/BanEntryMixin.java similarity index 79% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/server/management/BanEntryMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/management/BanEntryMixin.java index ece0ad2a..6926dae0 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/server/management/BanEntryMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/management/BanEntryMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.server.management; +package io.izzel.arclight.common.mixin.core.server.management; -import io.izzel.arclight.bridge.server.management.BanEntryBridge; +import io.izzel.arclight.common.bridge.server.management.BanEntryBridge; import net.minecraft.server.management.BanEntry; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/server/management/PlayerInteractionManagerMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/management/PlayerInteractionManagerMixin.java similarity index 98% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/server/management/PlayerInteractionManagerMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/management/PlayerInteractionManagerMixin.java index 1ea6af2e..10926229 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/server/management/PlayerInteractionManagerMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/management/PlayerInteractionManagerMixin.java @@ -1,7 +1,7 @@ -package io.izzel.arclight.mixin.core.server.management; +package io.izzel.arclight.common.mixin.core.server.management; -import io.izzel.arclight.bridge.entity.player.ServerPlayerEntityBridge; -import io.izzel.arclight.bridge.server.management.PlayerInteractionManagerBridge; +import io.izzel.arclight.common.bridge.entity.player.ServerPlayerEntityBridge; +import io.izzel.arclight.common.bridge.server.management.PlayerInteractionManagerBridge; import net.minecraft.block.BlockState; import net.minecraft.block.CakeBlock; import net.minecraft.block.DoorBlock; @@ -40,7 +40,7 @@ import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -import io.izzel.arclight.mod.util.ArclightCaptures; +import io.izzel.arclight.common.mod.util.ArclightCaptures; import java.util.List; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/server/management/PlayerListMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/management/PlayerListMixin.java similarity index 97% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/server/management/PlayerListMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/management/PlayerListMixin.java index f2ca8bb2..7407aac8 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/server/management/PlayerListMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/management/PlayerListMixin.java @@ -1,13 +1,13 @@ -package io.izzel.arclight.mixin.core.server.management; +package io.izzel.arclight.common.mixin.core.server.management; import com.google.common.collect.Lists; import com.mojang.authlib.GameProfile; -import io.izzel.arclight.bridge.entity.player.PlayerEntityBridge; -import io.izzel.arclight.bridge.entity.player.ServerPlayerEntityBridge; -import io.izzel.arclight.bridge.server.MinecraftServerBridge; -import io.izzel.arclight.bridge.server.management.PlayerListBridge; -import io.izzel.arclight.bridge.world.WorldBridge; -import io.izzel.arclight.mod.server.BukkitRegistry; +import io.izzel.arclight.common.bridge.entity.player.PlayerEntityBridge; +import io.izzel.arclight.common.bridge.entity.player.ServerPlayerEntityBridge; +import io.izzel.arclight.common.bridge.server.MinecraftServerBridge; +import io.izzel.arclight.common.bridge.server.management.PlayerListBridge; +import io.izzel.arclight.common.bridge.world.WorldBridge; +import io.izzel.arclight.common.mod.server.BukkitRegistry; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.network.IPacket; @@ -64,8 +64,8 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.Redirect; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import io.izzel.arclight.mod.ArclightMod; -import io.izzel.arclight.mod.util.ArclightCaptures; +import io.izzel.arclight.common.mod.ArclightMod; +import io.izzel.arclight.common.mod.util.ArclightCaptures; import javax.annotation.Nullable; import java.io.File; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/server/management/UserListMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/management/UserListMixin.java similarity index 83% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/server/management/UserListMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/management/UserListMixin.java index 8413e1be..d0dd99d5 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/server/management/UserListMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/management/UserListMixin.java @@ -1,11 +1,11 @@ -package io.izzel.arclight.mixin.core.server.management; +package io.izzel.arclight.common.mixin.core.server.management; import net.minecraft.server.management.UserList; import net.minecraft.server.management.UserListEntry; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; -import io.izzel.arclight.bridge.server.management.UserListBridge; +import io.izzel.arclight.common.bridge.server.management.UserListBridge; import java.util.Collection; import java.util.Map; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/state/IntegerPropertyMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/state/IntegerPropertyMixin.java similarity index 91% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/state/IntegerPropertyMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/state/IntegerPropertyMixin.java index 1769e2cc..7455f3f0 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/state/IntegerPropertyMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/state/IntegerPropertyMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mixin.core.state; +package io.izzel.arclight.common.mixin.core.state; import net.minecraft.state.IntegerProperty; import org.spongepowered.asm.mixin.Mixin; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/stats/StatisticsManagerMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/stats/StatisticsManagerMixin.java similarity index 95% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/stats/StatisticsManagerMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/stats/StatisticsManagerMixin.java index 14179883..ffb5f9f6 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/stats/StatisticsManagerMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/stats/StatisticsManagerMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mixin.core.stats; +package io.izzel.arclight.common.mixin.core.stats; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.stats.Stat; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/tags/NetworkTagCollectionMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/tags/NetworkTagCollectionMixin.java similarity index 72% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/tags/NetworkTagCollectionMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/tags/NetworkTagCollectionMixin.java index 0bf53d6b..770995b2 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/tags/NetworkTagCollectionMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/tags/NetworkTagCollectionMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.tags; +package io.izzel.arclight.common.mixin.core.tags; -import io.izzel.arclight.bridge.tags.NetworkTagCollectionBridge; +import io.izzel.arclight.common.bridge.tags.NetworkTagCollectionBridge; import net.minecraft.tags.NetworkTagCollection; import org.spongepowered.asm.mixin.Mixin; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/tileentity/AbstractFurnaceTileEntityMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/tileentity/AbstractFurnaceTileEntityMixin.java similarity index 97% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/tileentity/AbstractFurnaceTileEntityMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/tileentity/AbstractFurnaceTileEntityMixin.java index c4032451..093b9e77 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/tileentity/AbstractFurnaceTileEntityMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/tileentity/AbstractFurnaceTileEntityMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.tileentity; +package io.izzel.arclight.common.mixin.core.tileentity; -import io.izzel.arclight.bridge.entity.player.ServerPlayerEntityBridge; +import io.izzel.arclight.common.bridge.entity.player.ServerPlayerEntityBridge; import net.minecraft.block.Blocks; import net.minecraft.entity.item.ExperienceOrbEntity; import net.minecraft.entity.player.PlayerEntity; @@ -27,7 +27,7 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.Redirect; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import io.izzel.arclight.bridge.tileentity.AbstractFurnaceTileEntityBridge; +import io.izzel.arclight.common.bridge.tileentity.AbstractFurnaceTileEntityBridge; import javax.annotation.Nullable; import java.util.ArrayList; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/tileentity/BarrelTileEntityMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/tileentity/BarrelTileEntityMixin.java similarity index 92% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/tileentity/BarrelTileEntityMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/tileentity/BarrelTileEntityMixin.java index 27dec8e8..4c65c684 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/tileentity/BarrelTileEntityMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/tileentity/BarrelTileEntityMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.tileentity; +package io.izzel.arclight.common.mixin.core.tileentity; -import io.izzel.arclight.bridge.inventory.IInventoryBridge; +import io.izzel.arclight.common.bridge.inventory.IInventoryBridge; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.BarrelTileEntity; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/tileentity/BeaconTileEntityMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/tileentity/BeaconTileEntityMixin.java similarity index 94% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/tileentity/BeaconTileEntityMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/tileentity/BeaconTileEntityMixin.java index f67748ec..3b1046f6 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/tileentity/BeaconTileEntityMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/tileentity/BeaconTileEntityMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mixin.core.tileentity; +package io.izzel.arclight.common.mixin.core.tileentity; import net.minecraft.nbt.CompoundNBT; import net.minecraft.potion.Effect; @@ -11,7 +11,7 @@ import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import io.izzel.arclight.bridge.tileentity.BeaconTileEntityBridge; +import io.izzel.arclight.common.bridge.tileentity.BeaconTileEntityBridge; import javax.annotation.Nullable; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/tileentity/BrewingStandTileEntityMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/tileentity/BrewingStandTileEntityMixin.java similarity index 98% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/tileentity/BrewingStandTileEntityMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/tileentity/BrewingStandTileEntityMixin.java index 4bf3c9d2..11c0f70b 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/tileentity/BrewingStandTileEntityMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/tileentity/BrewingStandTileEntityMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mixin.core.tileentity; +package io.izzel.arclight.common.mixin.core.tileentity; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.BrewingStandTileEntity; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/tileentity/CampfireTileEntityMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/tileentity/CampfireTileEntityMixin.java similarity index 98% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/tileentity/CampfireTileEntityMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/tileentity/CampfireTileEntityMixin.java index 5cc2ceee..27aa751b 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/tileentity/CampfireTileEntityMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/tileentity/CampfireTileEntityMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mixin.core.tileentity; +package io.izzel.arclight.common.mixin.core.tileentity; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Inventory; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/tileentity/ChestTileEntityMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/tileentity/ChestTileEntityMixin.java similarity index 96% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/tileentity/ChestTileEntityMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/tileentity/ChestTileEntityMixin.java index bdb16eda..3f30ed24 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/tileentity/ChestTileEntityMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/tileentity/ChestTileEntityMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.tileentity; +package io.izzel.arclight.common.mixin.core.tileentity; -import io.izzel.arclight.bridge.inventory.IInventoryBridge; +import io.izzel.arclight.common.bridge.inventory.IInventoryBridge; import net.minecraft.block.Blocks; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/tileentity/CommandBlockLogicMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/tileentity/CommandBlockLogicMixin.java similarity index 93% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/tileentity/CommandBlockLogicMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/tileentity/CommandBlockLogicMixin.java index 8ade5e58..03b7c583 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/tileentity/CommandBlockLogicMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/tileentity/CommandBlockLogicMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mixin.core.tileentity; +package io.izzel.arclight.common.mixin.core.tileentity; import net.minecraft.tileentity.CommandBlockLogic; import net.minecraft.util.text.ITextComponent; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/tileentity/CommandBlockTileEntity1Mixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/tileentity/CommandBlockTileEntity1Mixin.java similarity index 85% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/tileentity/CommandBlockTileEntity1Mixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/tileentity/CommandBlockTileEntity1Mixin.java index f6eb3d0e..86736306 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/tileentity/CommandBlockTileEntity1Mixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/tileentity/CommandBlockTileEntity1Mixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.tileentity; +package io.izzel.arclight.common.mixin.core.tileentity; -import io.izzel.arclight.bridge.command.ICommandSourceBridge; +import io.izzel.arclight.common.bridge.command.ICommandSourceBridge; import net.minecraft.command.CommandSource; import net.minecraft.tileentity.CommandBlockTileEntity; import org.bukkit.command.CommandSender; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/tileentity/ConduitTileEntityMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/tileentity/ConduitTileEntityMixin.java similarity index 93% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/tileentity/ConduitTileEntityMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/tileentity/ConduitTileEntityMixin.java index bd5b0167..ce06244e 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/tileentity/ConduitTileEntityMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/tileentity/ConduitTileEntityMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.tileentity; +package io.izzel.arclight.common.mixin.core.tileentity; -import io.izzel.arclight.bridge.entity.player.PlayerEntityBridge; +import io.izzel.arclight.common.bridge.entity.player.PlayerEntityBridge; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.tileentity.ConduitTileEntity; import net.minecraft.util.math.AxisAlignedBB; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/tileentity/DispenserTileEntityMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/tileentity/DispenserTileEntityMixin.java similarity index 96% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/tileentity/DispenserTileEntityMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/tileentity/DispenserTileEntityMixin.java index 9de0f840..31481b8d 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/tileentity/DispenserTileEntityMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/tileentity/DispenserTileEntityMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mixin.core.tileentity; +package io.izzel.arclight.common.mixin.core.tileentity; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.DispenserTileEntity; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/tileentity/EndGatewayTileEntityMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/tileentity/EndGatewayTileEntityMixin.java similarity index 87% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/tileentity/EndGatewayTileEntityMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/tileentity/EndGatewayTileEntityMixin.java index 6ff4adad..4189bb4f 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/tileentity/EndGatewayTileEntityMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/tileentity/EndGatewayTileEntityMixin.java @@ -1,8 +1,8 @@ -package io.izzel.arclight.mixin.core.tileentity; +package io.izzel.arclight.common.mixin.core.tileentity; -import io.izzel.arclight.bridge.entity.player.ServerPlayerEntityBridge; -import io.izzel.arclight.bridge.network.play.ServerPlayNetHandlerBridge; -import io.izzel.arclight.bridge.world.WorldBridge; +import io.izzel.arclight.common.bridge.entity.player.ServerPlayerEntityBridge; +import io.izzel.arclight.common.bridge.network.play.ServerPlayNetHandlerBridge; +import io.izzel.arclight.common.bridge.world.WorldBridge; import net.minecraft.entity.Entity; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.tileentity.EndGatewayTileEntity; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/tileentity/HopperTileEntityMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/tileentity/HopperTileEntityMixin.java similarity index 97% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/tileentity/HopperTileEntityMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/tileentity/HopperTileEntityMixin.java index 7b117144..2eee1616 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/tileentity/HopperTileEntityMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/tileentity/HopperTileEntityMixin.java @@ -1,7 +1,7 @@ -package io.izzel.arclight.mixin.core.tileentity; +package io.izzel.arclight.common.mixin.core.tileentity; -import io.izzel.arclight.bridge.entity.EntityBridge; -import io.izzel.arclight.bridge.inventory.IInventoryBridge; +import io.izzel.arclight.common.bridge.entity.EntityBridge; +import io.izzel.arclight.common.bridge.inventory.IInventoryBridge; import net.minecraft.entity.item.ItemEntity; import net.minecraft.entity.item.minecart.HopperMinecartEntity; import net.minecraft.inventory.DoubleSidedInventory; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/tileentity/LecternTileEntity1Mixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/tileentity/LecternTileEntity1Mixin.java similarity index 90% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/tileentity/LecternTileEntity1Mixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/tileentity/LecternTileEntity1Mixin.java index ba72b718..a656eef5 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/tileentity/LecternTileEntity1Mixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/tileentity/LecternTileEntity1Mixin.java @@ -1,7 +1,7 @@ -package io.izzel.arclight.mixin.core.tileentity; +package io.izzel.arclight.common.mixin.core.tileentity; -import io.izzel.arclight.bridge.inventory.IInventoryBridge; -import io.izzel.arclight.bridge.world.WorldBridge; +import io.izzel.arclight.common.bridge.inventory.IInventoryBridge; +import io.izzel.arclight.common.bridge.world.WorldBridge; import net.minecraft.block.LecternBlock; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; @@ -13,7 +13,7 @@ import org.bukkit.entity.HumanEntity; import org.bukkit.inventory.InventoryHolder; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; -import io.izzel.arclight.bridge.tileentity.TileEntityBridge; +import io.izzel.arclight.common.bridge.tileentity.TileEntityBridge; import java.util.ArrayList; import java.util.Collections; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/tileentity/LecternTileEntityMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/tileentity/LecternTileEntityMixin.java similarity index 91% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/tileentity/LecternTileEntityMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/tileentity/LecternTileEntityMixin.java index 5b88f9de..84be7792 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/tileentity/LecternTileEntityMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/tileentity/LecternTileEntityMixin.java @@ -1,7 +1,7 @@ -package io.izzel.arclight.mixin.core.tileentity; +package io.izzel.arclight.common.mixin.core.tileentity; -import io.izzel.arclight.bridge.command.ICommandSourceBridge; -import io.izzel.arclight.bridge.entity.EntityBridge; +import io.izzel.arclight.common.bridge.command.ICommandSourceBridge; +import io.izzel.arclight.common.bridge.entity.EntityBridge; import net.minecraft.command.CommandSource; import net.minecraft.command.ICommandSource; import net.minecraft.entity.Entity; @@ -26,7 +26,7 @@ import org.spongepowered.asm.mixin.Overwrite; import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Redirect; -import io.izzel.arclight.bridge.inventory.container.LecternContainerBridge; +import io.izzel.arclight.common.bridge.inventory.container.LecternContainerBridge; import javax.annotation.Nullable; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/tileentity/LockableTileEntityMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/tileentity/LockableTileEntityMixin.java similarity index 84% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/tileentity/LockableTileEntityMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/tileentity/LockableTileEntityMixin.java index 73c2e6f7..664f9476 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/tileentity/LockableTileEntityMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/tileentity/LockableTileEntityMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.tileentity; +package io.izzel.arclight.common.mixin.core.tileentity; -import io.izzel.arclight.bridge.inventory.IInventoryBridge; +import io.izzel.arclight.common.bridge.inventory.IInventoryBridge; import net.minecraft.inventory.IInventory; import net.minecraft.item.crafting.IRecipe; import net.minecraft.tileentity.LockableTileEntity; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/tileentity/ShulkerBoxTileEntityMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/tileentity/ShulkerBoxTileEntityMixin.java similarity index 96% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/tileentity/ShulkerBoxTileEntityMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/tileentity/ShulkerBoxTileEntityMixin.java index 39845053..1bc21d4a 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/tileentity/ShulkerBoxTileEntityMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/tileentity/ShulkerBoxTileEntityMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mixin.core.tileentity; +package io.izzel.arclight.common.mixin.core.tileentity; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.ShulkerBoxTileEntity; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/tileentity/SignTileEntityMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/tileentity/SignTileEntityMixin.java similarity index 91% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/tileentity/SignTileEntityMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/tileentity/SignTileEntityMixin.java index f88d43c2..c2f97dc0 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/tileentity/SignTileEntityMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/tileentity/SignTileEntityMixin.java @@ -1,7 +1,7 @@ -package io.izzel.arclight.mixin.core.tileentity; +package io.izzel.arclight.common.mixin.core.tileentity; -import io.izzel.arclight.bridge.command.ICommandSourceBridge; -import io.izzel.arclight.bridge.entity.EntityBridge; +import io.izzel.arclight.common.bridge.command.ICommandSourceBridge; +import io.izzel.arclight.common.bridge.entity.EntityBridge; import net.minecraft.command.CommandSource; import net.minecraft.command.ICommandSource; import net.minecraft.entity.Entity; @@ -21,7 +21,7 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.Redirect; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -import io.izzel.arclight.bridge.tileentity.SignTileEntityBridge; +import io.izzel.arclight.common.bridge.tileentity.SignTileEntityBridge; import javax.annotation.Nullable; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/tileentity/SkullTileEntityMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/tileentity/SkullTileEntityMixin.java similarity index 95% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/tileentity/SkullTileEntityMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/tileentity/SkullTileEntityMixin.java index 8b4d746c..e2379d9e 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/tileentity/SkullTileEntityMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/tileentity/SkullTileEntityMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mixin.core.tileentity; +package io.izzel.arclight.common.mixin.core.tileentity; import com.google.common.base.Predicate; import com.google.common.base.Throwables; @@ -9,8 +9,8 @@ import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ThreadFactoryBuilder; import com.mojang.authlib.GameProfile; import com.mysql.jdbc.StringUtils; -import io.izzel.arclight.bridge.server.MinecraftServerBridge; -import io.izzel.arclight.mod.util.ArclightHeadLoader; +import io.izzel.arclight.common.bridge.server.MinecraftServerBridge; +import io.izzel.arclight.common.mod.util.ArclightHeadLoader; import net.minecraft.tileentity.SkullTileEntity; import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v.CraftServer; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/tileentity/TileEntityMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/tileentity/TileEntityMixin.java similarity index 95% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/tileentity/TileEntityMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/tileentity/TileEntityMixin.java index ac0e3609..6ac414cc 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/tileentity/TileEntityMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/tileentity/TileEntityMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mixin.core.tileentity; +package io.izzel.arclight.common.mixin.core.tileentity; import net.minecraft.block.BlockState; import net.minecraft.nbt.CompoundNBT; @@ -15,7 +15,7 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -import io.izzel.arclight.bridge.tileentity.TileEntityBridge; +import io.izzel.arclight.common.bridge.tileentity.TileEntityBridge; import javax.annotation.Nullable; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/util/BootstrapMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/util/BootstrapMixin.java similarity index 97% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/util/BootstrapMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/util/BootstrapMixin.java index 5da989cb..0fe8f3cf 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/util/BootstrapMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/util/BootstrapMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mixin.core.util; +package io.izzel.arclight.common.mixin.core.util; import net.minecraft.util.registry.Bootstrap; import org.bukkit.craftbukkit.v.util.CraftLegacy; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/util/DamageSourceMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/util/DamageSourceMixin.java similarity index 87% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/util/DamageSourceMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/util/DamageSourceMixin.java index a75b3bc0..8c8a722d 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/util/DamageSourceMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/util/DamageSourceMixin.java @@ -1,10 +1,10 @@ -package io.izzel.arclight.mixin.core.util; +package io.izzel.arclight.common.mixin.core.util; import net.minecraft.entity.Entity; import net.minecraft.util.DamageSource; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; -import io.izzel.arclight.bridge.util.DamageSourceBridge; +import io.izzel.arclight.common.bridge.util.DamageSourceBridge; import javax.annotation.Nullable; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/util/FoodStatsMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/util/FoodStatsMixin.java similarity index 92% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/util/FoodStatsMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/util/FoodStatsMixin.java index a8a8dc8c..f13140d9 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/util/FoodStatsMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/util/FoodStatsMixin.java @@ -1,8 +1,8 @@ -package io.izzel.arclight.mixin.core.util; +package io.izzel.arclight.common.mixin.core.util; -import io.izzel.arclight.bridge.entity.LivingEntityBridge; -import io.izzel.arclight.bridge.entity.player.ServerPlayerEntityBridge; -import io.izzel.arclight.bridge.util.FoodStatsBridge; +import io.izzel.arclight.common.bridge.entity.LivingEntityBridge; +import io.izzel.arclight.common.bridge.entity.player.ServerPlayerEntityBridge; +import io.izzel.arclight.common.bridge.util.FoodStatsBridge; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.item.Food; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/util/IWorldPosCallableMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/util/IWorldPosCallableMixin.java similarity index 92% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/util/IWorldPosCallableMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/util/IWorldPosCallableMixin.java index 5eae9070..087c70df 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/util/IWorldPosCallableMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/util/IWorldPosCallableMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.util; +package io.izzel.arclight.common.mixin.core.util; -import io.izzel.arclight.bridge.util.IWorldPosCallableBridge; +import io.izzel.arclight.common.bridge.util.IWorldPosCallableBridge; import net.minecraft.util.IWorldPosCallable; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/util/IndirectEntityDamageSourceMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/util/IndirectEntityDamageSourceMixin.java similarity index 79% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/util/IndirectEntityDamageSourceMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/util/IndirectEntityDamageSourceMixin.java index 0f74201e..7cf84a57 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/util/IndirectEntityDamageSourceMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/util/IndirectEntityDamageSourceMixin.java @@ -1,9 +1,9 @@ -package io.izzel.arclight.mixin.core.util; +package io.izzel.arclight.common.mixin.core.util; import net.minecraft.entity.Entity; import net.minecraft.util.IndirectEntityDamageSource; import org.spongepowered.asm.mixin.Mixin; -import io.izzel.arclight.bridge.util.IndirectEntityDamageSourceBridge; +import io.izzel.arclight.common.bridge.util.IndirectEntityDamageSourceBridge; @Mixin(IndirectEntityDamageSource.class) public class IndirectEntityDamageSourceMixin extends DamageSourceMixin implements IndirectEntityDamageSourceBridge { diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/village/VillageSiegeMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/village/VillageSiegeMixin.java similarity index 86% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/village/VillageSiegeMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/village/VillageSiegeMixin.java index c4e4a359..2e1a0277 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/village/VillageSiegeMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/village/VillageSiegeMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.village; +package io.izzel.arclight.common.mixin.core.village; -import io.izzel.arclight.bridge.world.server.ServerWorldBridge; +import io.izzel.arclight.common.bridge.world.server.ServerWorldBridge; import net.minecraft.village.VillageSiege; import net.minecraft.world.server.ServerWorld; import org.bukkit.event.entity.CreatureSpawnEvent; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/ExplosionMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/ExplosionMixin.java similarity index 98% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/ExplosionMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/ExplosionMixin.java index ca368274..756979e1 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/ExplosionMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/ExplosionMixin.java @@ -1,10 +1,10 @@ -package io.izzel.arclight.mixin.core.world; +package io.izzel.arclight.common.mixin.core.world; import com.google.common.collect.Lists; import com.google.common.collect.Sets; -import io.izzel.arclight.bridge.entity.EntityBridge; -import io.izzel.arclight.bridge.world.ExplosionBridge; -import io.izzel.arclight.bridge.world.WorldBridge; +import io.izzel.arclight.common.bridge.entity.EntityBridge; +import io.izzel.arclight.common.bridge.world.ExplosionBridge; +import io.izzel.arclight.common.bridge.world.WorldBridge; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/IBlockReaderMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/IBlockReaderMixin.java similarity index 94% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/IBlockReaderMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/IBlockReaderMixin.java index dc3c66fe..7d819e3b 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/IBlockReaderMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/IBlockReaderMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.world; +package io.izzel.arclight.common.mixin.core.world; -import io.izzel.arclight.bridge.world.IBlockReaderBridge; +import io.izzel.arclight.common.bridge.world.IBlockReaderBridge; import net.minecraft.block.BlockState; import net.minecraft.fluid.IFluidState; import net.minecraft.util.math.BlockPos; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/IWorldWriterMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/IWorldWriterMixin.java similarity index 77% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/IWorldWriterMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/IWorldWriterMixin.java index f93e0494..8aed3353 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/IWorldWriterMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/IWorldWriterMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.world; +package io.izzel.arclight.common.mixin.core.world; -import io.izzel.arclight.bridge.world.IWorldWriterBridge; +import io.izzel.arclight.common.bridge.world.IWorldWriterBridge; import net.minecraft.entity.Entity; import net.minecraft.world.IWorldWriter; import org.bukkit.event.entity.CreatureSpawnEvent; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/ServerMultiWorldMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/ServerMultiWorldMixin.java similarity index 93% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/ServerMultiWorldMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/ServerMultiWorldMixin.java index 8dce574f..1ed8da79 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/ServerMultiWorldMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/ServerMultiWorldMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.world; +package io.izzel.arclight.common.mixin.core.world; -import io.izzel.arclight.mixin.core.world.server.ServerWorldMixin; +import io.izzel.arclight.common.mixin.core.world.server.ServerWorldMixin; import net.minecraft.profiler.IProfiler; import net.minecraft.server.MinecraftServer; import net.minecraft.world.ServerMultiWorld; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/TeleporterMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/TeleporterMixin.java similarity index 91% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/TeleporterMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/TeleporterMixin.java index f33a6161..015c180d 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/TeleporterMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/TeleporterMixin.java @@ -1,8 +1,8 @@ -package io.izzel.arclight.mixin.core.world; +package io.izzel.arclight.common.mixin.core.world; -import io.izzel.arclight.bridge.entity.EntityBridge; -import io.izzel.arclight.bridge.world.WorldBridge; -import io.izzel.arclight.mod.util.ArclightBlockPopulator; +import io.izzel.arclight.common.bridge.entity.EntityBridge; +import io.izzel.arclight.common.bridge.world.WorldBridge; +import io.izzel.arclight.common.mod.util.ArclightBlockPopulator; import net.minecraft.block.BlockState; import net.minecraft.entity.Entity; import net.minecraft.util.math.BlockPos; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/TrackedEntityMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/TrackedEntityMixin.java similarity index 99% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/TrackedEntityMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/TrackedEntityMixin.java index 4761fe1f..2c7147ef 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/TrackedEntityMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/TrackedEntityMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.world; +package io.izzel.arclight.common.mixin.core.world; -import io.izzel.arclight.bridge.entity.player.ServerPlayerEntityBridge; +import io.izzel.arclight.common.bridge.entity.player.ServerPlayerEntityBridge; import net.minecraft.entity.Entity; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.ai.attributes.AttributeMap; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/WorldMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/WorldMixin.java similarity index 97% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/WorldMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/WorldMixin.java index 59905951..0c1d949e 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/WorldMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/WorldMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.world; +package io.izzel.arclight.common.mixin.core.world; -import io.izzel.arclight.bridge.world.WorldBridge; +import io.izzel.arclight.common.bridge.world.WorldBridge; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.entity.Entity; @@ -34,7 +34,7 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; import org.spongepowered.asm.mixin.injection.callback.LocalCapture; -import io.izzel.arclight.mod.util.ArclightCaptures; +import io.izzel.arclight.common.mod.util.ArclightCaptures; import javax.annotation.Nullable; import java.util.function.BiFunction; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/chunk/ChunkMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/chunk/ChunkMixin.java similarity index 97% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/chunk/ChunkMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/chunk/ChunkMixin.java index 710ca615..181f0e63 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/chunk/ChunkMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/chunk/ChunkMixin.java @@ -1,7 +1,7 @@ -package io.izzel.arclight.mixin.core.world.chunk; +package io.izzel.arclight.common.mixin.core.world.chunk; -import io.izzel.arclight.bridge.world.WorldBridge; -import io.izzel.arclight.bridge.world.chunk.ChunkBridge; +import io.izzel.arclight.common.bridge.world.WorldBridge; +import io.izzel.arclight.common.bridge.world.chunk.ChunkBridge; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.fluid.Fluid; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/chunk/storage/RegionFileCacheMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/chunk/storage/RegionFileCacheMixin.java similarity index 92% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/chunk/storage/RegionFileCacheMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/chunk/storage/RegionFileCacheMixin.java index 8cd34e49..32f1a6de 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/chunk/storage/RegionFileCacheMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/chunk/storage/RegionFileCacheMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.world.chunk.storage; +package io.izzel.arclight.common.mixin.core.world.chunk.storage; -import io.izzel.arclight.bridge.world.chunk.storage.RegionFileCacheBridge; +import io.izzel.arclight.common.bridge.world.chunk.storage.RegionFileCacheBridge; import it.unimi.dsi.fastutil.longs.Long2ObjectLinkedOpenHashMap; import net.minecraft.util.math.ChunkPos; import net.minecraft.world.chunk.storage.RegionFile; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/dimension/DimensionMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/dimension/DimensionMixin.java similarity index 75% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/dimension/DimensionMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/dimension/DimensionMixin.java index 78e7a7b1..c82d1d5a 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/dimension/DimensionMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/dimension/DimensionMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.world.dimension; +package io.izzel.arclight.common.mixin.core.world.dimension; -import io.izzel.arclight.bridge.world.dimension.DimensionBridge; +import io.izzel.arclight.common.bridge.world.dimension.DimensionBridge; import net.minecraft.world.dimension.Dimension; import net.minecraft.world.dimension.DimensionType; import org.spongepowered.asm.mixin.Mixin; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/dimension/DimensionTypeMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/dimension/DimensionTypeMixin.java similarity index 94% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/dimension/DimensionTypeMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/dimension/DimensionTypeMixin.java index 2657863f..340be523 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/dimension/DimensionTypeMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/dimension/DimensionTypeMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mixin.core.world.dimension; +package io.izzel.arclight.common.mixin.core.world.dimension; import net.minecraft.world.World; import net.minecraft.world.dimension.Dimension; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/gen/WorldGenRegionMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/gen/WorldGenRegionMixin.java similarity index 85% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/gen/WorldGenRegionMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/gen/WorldGenRegionMixin.java index d611d5b4..dea69bd9 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/gen/WorldGenRegionMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/gen/WorldGenRegionMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.world.gen; +package io.izzel.arclight.common.mixin.core.world.gen; -import io.izzel.arclight.bridge.world.IWorldWriterBridge; +import io.izzel.arclight.common.bridge.world.IWorldWriterBridge; import net.minecraft.entity.Entity; import net.minecraft.world.gen.WorldGenRegion; import org.bukkit.event.entity.CreatureSpawnEvent; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/gen/feature/structure/SwampHutPieceMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/gen/feature/structure/SwampHutPieceMixin.java similarity index 87% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/gen/feature/structure/SwampHutPieceMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/gen/feature/structure/SwampHutPieceMixin.java index 6c8c1d41..1b2d9012 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/gen/feature/structure/SwampHutPieceMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/gen/feature/structure/SwampHutPieceMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.world.gen.feature.structure; +package io.izzel.arclight.common.mixin.core.world.gen.feature.structure; -import io.izzel.arclight.bridge.world.IWorldWriterBridge; +import io.izzel.arclight.common.bridge.world.IWorldWriterBridge; import net.minecraft.util.math.ChunkPos; import net.minecraft.util.math.MutableBoundingBox; import net.minecraft.world.IWorld; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/raid/RaidManagerMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/raid/RaidManagerMixin.java similarity index 96% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/raid/RaidManagerMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/raid/RaidManagerMixin.java index ad1ead98..74c03d68 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/raid/RaidManagerMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/raid/RaidManagerMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mixin.core.world.raid; +package io.izzel.arclight.common.mixin.core.world.raid; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.potion.Effects; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/raid/RaidMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/raid/RaidMixin.java similarity index 95% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/raid/RaidMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/raid/RaidMixin.java index fccee5b0..e58313c1 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/raid/RaidMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/raid/RaidMixin.java @@ -1,8 +1,8 @@ -package io.izzel.arclight.mixin.core.world.raid; +package io.izzel.arclight.common.mixin.core.world.raid; -import io.izzel.arclight.bridge.entity.player.ServerPlayerEntityBridge; -import io.izzel.arclight.bridge.world.WorldBridge; -import io.izzel.arclight.bridge.world.raid.RaidBridge; +import io.izzel.arclight.common.bridge.entity.player.ServerPlayerEntityBridge; +import io.izzel.arclight.common.bridge.world.WorldBridge; +import io.izzel.arclight.common.bridge.world.raid.RaidBridge; import net.minecraft.advancements.criterion.PositionTrigger; import net.minecraft.entity.monster.AbstractRaiderEntity; import net.minecraft.entity.player.ServerPlayerEntity; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/server/ChunkHolderMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/server/ChunkHolderMixin.java similarity index 94% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/server/ChunkHolderMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/server/ChunkHolderMixin.java index 6f7617a4..bc882284 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/server/ChunkHolderMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/server/ChunkHolderMixin.java @@ -1,9 +1,9 @@ -package io.izzel.arclight.mixin.core.world.server; +package io.izzel.arclight.common.mixin.core.world.server; import com.mojang.datafixers.util.Either; -import io.izzel.arclight.bridge.world.chunk.ChunkBridge; -import io.izzel.arclight.bridge.world.server.ChunkHolderBridge; -import io.izzel.arclight.bridge.world.server.ChunkManagerBridge; +import io.izzel.arclight.common.bridge.world.chunk.ChunkBridge; +import io.izzel.arclight.common.bridge.world.server.ChunkHolderBridge; +import io.izzel.arclight.common.bridge.world.server.ChunkManagerBridge; import net.minecraft.world.chunk.Chunk; import net.minecraft.world.chunk.ChunkStatus; import net.minecraft.world.chunk.IChunk; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/server/ChunkManagerMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/server/ChunkManagerMixin.java similarity index 76% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/server/ChunkManagerMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/server/ChunkManagerMixin.java index 95414546..2207bba5 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/server/ChunkManagerMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/server/ChunkManagerMixin.java @@ -1,10 +1,10 @@ -package io.izzel.arclight.mixin.core.world.server; +package io.izzel.arclight.common.mixin.core.world.server; -import io.izzel.arclight.bridge.world.server.ChunkManagerBridge; +import io.izzel.arclight.common.bridge.world.server.ChunkManagerBridge; import net.minecraft.world.server.ChunkManager; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.gen.Invoker; -import io.izzel.arclight.mod.util.ArclightCallbackExecutor; +import io.izzel.arclight.common.mod.util.ArclightCallbackExecutor; import java.util.function.BooleanSupplier; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/server/ServerChunkProviderMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/server/ServerChunkProviderMixin.java similarity index 93% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/server/ServerChunkProviderMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/server/ServerChunkProviderMixin.java index 0df09adc..2dc42ce1 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/server/ServerChunkProviderMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/server/ServerChunkProviderMixin.java @@ -1,10 +1,10 @@ -package io.izzel.arclight.mixin.core.world.server; +package io.izzel.arclight.common.mixin.core.world.server; import com.mojang.datafixers.util.Either; -import io.izzel.arclight.bridge.world.server.ChunkHolderBridge; -import io.izzel.arclight.bridge.world.server.ChunkManagerBridge; -import io.izzel.arclight.bridge.world.server.ServerChunkProviderBridge; -import io.izzel.arclight.bridge.world.server.TicketManagerBridge; +import io.izzel.arclight.common.bridge.world.server.ChunkHolderBridge; +import io.izzel.arclight.common.bridge.world.server.ChunkManagerBridge; +import io.izzel.arclight.common.bridge.world.server.ServerChunkProviderBridge; +import io.izzel.arclight.common.bridge.world.server.TicketManagerBridge; import net.minecraft.profiler.IProfiler; import net.minecraft.util.math.ChunkPos; import net.minecraft.world.chunk.ChunkStatus; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/server/ServerChunkProvider_ChunkExecutorMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/server/ServerChunkProvider_ChunkExecutorMixin.java similarity index 86% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/server/ServerChunkProvider_ChunkExecutorMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/server/ServerChunkProvider_ChunkExecutorMixin.java index fc9f2402..9c0f730d 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/server/ServerChunkProvider_ChunkExecutorMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/server/ServerChunkProvider_ChunkExecutorMixin.java @@ -1,7 +1,7 @@ -package io.izzel.arclight.mixin.core.world.server; +package io.izzel.arclight.common.mixin.core.world.server; -import io.izzel.arclight.bridge.world.server.ChunkManagerBridge; -import io.izzel.arclight.bridge.world.server.ServerChunkProviderBridge; +import io.izzel.arclight.common.bridge.world.server.ChunkManagerBridge; +import io.izzel.arclight.common.bridge.world.server.ServerChunkProviderBridge; import net.minecraft.util.concurrent.ThreadTaskExecutor; import net.minecraft.world.server.ServerChunkProvider; import org.spongepowered.asm.mixin.Final; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/server/ServerWorldMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/server/ServerWorldMixin.java similarity index 96% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/server/ServerWorldMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/server/ServerWorldMixin.java index cfdfb54b..2545c919 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/server/ServerWorldMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/server/ServerWorldMixin.java @@ -1,11 +1,11 @@ -package io.izzel.arclight.mixin.core.world.server; +package io.izzel.arclight.common.mixin.core.world.server; import com.google.common.collect.Lists; -import io.izzel.arclight.bridge.entity.EntityBridge; -import io.izzel.arclight.bridge.inventory.IInventoryBridge; -import io.izzel.arclight.bridge.world.ExplosionBridge; -import io.izzel.arclight.bridge.world.server.ServerWorldBridge; -import io.izzel.arclight.bridge.world.storage.WorldInfoBridge; +import io.izzel.arclight.common.bridge.entity.EntityBridge; +import io.izzel.arclight.common.bridge.inventory.IInventoryBridge; +import io.izzel.arclight.common.bridge.world.ExplosionBridge; +import io.izzel.arclight.common.bridge.world.server.ServerWorldBridge; +import io.izzel.arclight.common.bridge.world.storage.WorldInfoBridge; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; @@ -53,8 +53,8 @@ import org.spongepowered.asm.mixin.injection.Redirect; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; import org.spongepowered.asm.mixin.injection.callback.LocalCapture; -import io.izzel.arclight.bridge.world.storage.MapDataBridge; -import io.izzel.arclight.mixin.core.world.WorldMixin; +import io.izzel.arclight.common.bridge.world.storage.MapDataBridge; +import io.izzel.arclight.common.mixin.core.world.WorldMixin; import javax.annotation.Nonnull; import javax.annotation.Nullable; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/server/TicketManagerMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/server/TicketManagerMixin.java similarity index 97% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/server/TicketManagerMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/server/TicketManagerMixin.java index 5183f2b3..b368994f 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/server/TicketManagerMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/server/TicketManagerMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.world.server; +package io.izzel.arclight.common.mixin.core.world.server; -import io.izzel.arclight.bridge.world.server.TicketManagerBridge; +import io.izzel.arclight.common.bridge.world.server.TicketManagerBridge; import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap; import it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator; import it.unimi.dsi.fastutil.objects.ObjectSortedSet; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/server/TicketTypeMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/server/TicketTypeMixin.java similarity index 75% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/server/TicketTypeMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/server/TicketTypeMixin.java index 5d66d630..27aca7b2 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/server/TicketTypeMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/server/TicketTypeMixin.java @@ -1,12 +1,12 @@ -package io.izzel.arclight.mixin.core.world.server; +package io.izzel.arclight.common.mixin.core.world.server; -import io.izzel.arclight.bridge.world.server.TicketTypeBridge; +import io.izzel.arclight.common.bridge.world.server.TicketTypeBridge; import net.minecraft.util.Unit; import net.minecraft.world.server.TicketType; import org.bukkit.plugin.Plugin; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.gen.Accessor; -import io.izzel.arclight.mod.ArclightConstants; +import io.izzel.arclight.common.mod.ArclightConstants; @Mixin(TicketType.class) public abstract class TicketTypeMixin implements TicketTypeBridge { diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/spawner/AbstractSpawnerMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/spawner/AbstractSpawnerMixin.java similarity index 91% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/spawner/AbstractSpawnerMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/spawner/AbstractSpawnerMixin.java index d1d4c4e4..8f1ba311 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/spawner/AbstractSpawnerMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/spawner/AbstractSpawnerMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.world.spawner; +package io.izzel.arclight.common.mixin.core.world.spawner; -import io.izzel.arclight.bridge.world.WorldBridge; +import io.izzel.arclight.common.bridge.world.WorldBridge; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityType; import net.minecraft.util.WeightedSpawnerEntity; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/spawner/PatrolSpawnerMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/spawner/PatrolSpawnerMixin.java similarity index 88% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/spawner/PatrolSpawnerMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/spawner/PatrolSpawnerMixin.java index f9a0b797..5fd22415 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/spawner/PatrolSpawnerMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/spawner/PatrolSpawnerMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.world.spawner; +package io.izzel.arclight.common.mixin.core.world.spawner; -import io.izzel.arclight.bridge.world.WorldBridge; +import io.izzel.arclight.common.bridge.world.WorldBridge; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraft.world.spawner.PatrolSpawner; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/spawner/PhantomSpawnerMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/spawner/PhantomSpawnerMixin.java similarity index 87% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/spawner/PhantomSpawnerMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/spawner/PhantomSpawnerMixin.java index ec50031a..89b86350 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/spawner/PhantomSpawnerMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/spawner/PhantomSpawnerMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.world.spawner; +package io.izzel.arclight.common.mixin.core.world.spawner; -import io.izzel.arclight.bridge.world.WorldBridge; +import io.izzel.arclight.common.bridge.world.WorldBridge; import net.minecraft.world.server.ServerWorld; import net.minecraft.world.spawner.PhantomSpawner; import org.bukkit.event.entity.CreatureSpawnEvent; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/spawner/WanderingTraderSpawnerMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/spawner/WanderingTraderSpawnerMixin.java similarity index 94% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/spawner/WanderingTraderSpawnerMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/spawner/WanderingTraderSpawnerMixin.java index 983916b7..1effdddf 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/spawner/WanderingTraderSpawnerMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/spawner/WanderingTraderSpawnerMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.world.spawner; +package io.izzel.arclight.common.mixin.core.world.spawner; -import io.izzel.arclight.bridge.world.WorldBridge; +import io.izzel.arclight.common.bridge.world.WorldBridge; import net.minecraft.entity.merchant.villager.WanderingTraderEntity; import net.minecraft.world.server.ServerWorld; import net.minecraft.world.spawner.WanderingTraderSpawner; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/spawner/WorldEntitySpawnerMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/spawner/WorldEntitySpawnerMixin.java similarity index 89% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/spawner/WorldEntitySpawnerMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/spawner/WorldEntitySpawnerMixin.java index 82667284..0cf28ae6 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/spawner/WorldEntitySpawnerMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/spawner/WorldEntitySpawnerMixin.java @@ -1,7 +1,7 @@ -package io.izzel.arclight.mixin.core.world.spawner; +package io.izzel.arclight.common.mixin.core.world.spawner; -import io.izzel.arclight.bridge.world.IWorldWriterBridge; -import io.izzel.arclight.bridge.world.WorldBridge; +import io.izzel.arclight.common.bridge.world.IWorldWriterBridge; +import io.izzel.arclight.common.bridge.world.WorldBridge; import net.minecraft.entity.EntityClassification; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IWorld; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/storage/MapDataMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/storage/MapDataMixin.java similarity index 95% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/storage/MapDataMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/storage/MapDataMixin.java index f11d3171..749ad484 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/storage/MapDataMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/storage/MapDataMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mixin.core.world.storage; +package io.izzel.arclight.common.mixin.core.world.storage; import net.minecraft.nbt.CompoundNBT; import net.minecraft.world.dimension.DimensionType; @@ -15,8 +15,8 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.Redirect; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -import io.izzel.arclight.bridge.world.storage.MapDataBridge; -import io.izzel.arclight.mod.ArclightConstants; +import io.izzel.arclight.common.bridge.world.storage.MapDataBridge; +import io.izzel.arclight.common.mod.ArclightConstants; import java.util.UUID; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/storage/MapData_MapInfoMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/storage/MapData_MapInfoMixin.java similarity index 92% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/storage/MapData_MapInfoMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/storage/MapData_MapInfoMixin.java index feb2b7d0..49c12384 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/storage/MapData_MapInfoMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/storage/MapData_MapInfoMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.world.storage; +package io.izzel.arclight.common.mixin.core.world.storage; -import io.izzel.arclight.bridge.entity.player.ServerPlayerEntityBridge; +import io.izzel.arclight.common.bridge.entity.player.ServerPlayerEntityBridge; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.FilledMapItem; import net.minecraft.item.ItemStack; @@ -15,7 +15,7 @@ import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Overwrite; import org.spongepowered.asm.mixin.Shadow; -import io.izzel.arclight.bridge.world.storage.MapDataBridge; +import io.izzel.arclight.common.bridge.world.storage.MapDataBridge; import javax.annotation.Nullable; import java.util.ArrayList; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/storage/SaveHandlerMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/storage/SaveHandlerMixin.java similarity index 95% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/storage/SaveHandlerMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/storage/SaveHandlerMixin.java index a7036fc3..d180ff25 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/storage/SaveHandlerMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/storage/SaveHandlerMixin.java @@ -1,7 +1,7 @@ -package io.izzel.arclight.mixin.core.world.storage; +package io.izzel.arclight.common.mixin.core.world.storage; -import io.izzel.arclight.bridge.entity.player.ServerPlayerEntityBridge; -import io.izzel.arclight.bridge.world.storage.SaveHandlerBridge; +import io.izzel.arclight.common.bridge.entity.player.ServerPlayerEntityBridge; +import io.izzel.arclight.common.bridge.world.storage.SaveHandlerBridge; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.nbt.CompoundNBT; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/storage/WorldInfoMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/storage/WorldInfoMixin.java similarity index 94% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/storage/WorldInfoMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/storage/WorldInfoMixin.java index 1899f3df..5911062e 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/storage/WorldInfoMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/storage/WorldInfoMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.world.storage; +package io.izzel.arclight.common.mixin.core.world.storage; -import io.izzel.arclight.bridge.world.storage.WorldInfoBridge; +import io.izzel.arclight.common.bridge.world.storage.WorldInfoBridge; import net.minecraft.world.World; import net.minecraft.world.storage.WorldInfo; import org.bukkit.Bukkit; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/storage/loot/LootParametersMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/storage/loot/LootParametersMixin.java similarity index 72% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/storage/loot/LootParametersMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/storage/loot/LootParametersMixin.java index d33532c8..b37b6973 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/storage/loot/LootParametersMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/storage/loot/LootParametersMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.world.storage.loot; +package io.izzel.arclight.common.mixin.core.world.storage.loot; -import io.izzel.arclight.mod.ArclightConstants; +import io.izzel.arclight.common.mod.ArclightConstants; import net.minecraft.world.storage.loot.LootParameter; import net.minecraft.world.storage.loot.LootParameters; import org.spongepowered.asm.mixin.Mixin; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/storage/loot/conditions/RandomChanceWithLootingMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/storage/loot/conditions/RandomChanceWithLootingMixin.java similarity index 87% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/storage/loot/conditions/RandomChanceWithLootingMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/storage/loot/conditions/RandomChanceWithLootingMixin.java index 0e7690e6..e56492a5 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/storage/loot/conditions/RandomChanceWithLootingMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/storage/loot/conditions/RandomChanceWithLootingMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mixin.core.world.storage.loot.conditions; +package io.izzel.arclight.common.mixin.core.world.storage.loot.conditions; -import io.izzel.arclight.mod.ArclightConstants; +import io.izzel.arclight.common.mod.ArclightConstants; import net.minecraft.world.storage.loot.LootContext; import net.minecraft.world.storage.loot.conditions.RandomChanceWithLooting; import org.spongepowered.asm.mixin.Final; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/storage/loot/conditions/SurvivesExplosionMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/storage/loot/conditions/SurvivesExplosionMixin.java similarity index 91% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/storage/loot/conditions/SurvivesExplosionMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/storage/loot/conditions/SurvivesExplosionMixin.java index 4dee1f56..5ec0ffe7 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/storage/loot/conditions/SurvivesExplosionMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/storage/loot/conditions/SurvivesExplosionMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mixin.core.world.storage.loot.conditions; +package io.izzel.arclight.common.mixin.core.world.storage.loot.conditions; import net.minecraft.world.storage.loot.LootContext; import net.minecraft.world.storage.loot.LootParameters; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/storage/loot/functions/LootingEnchantBonusMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/storage/loot/functions/LootingEnchantBonusMixin.java similarity index 92% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/storage/loot/functions/LootingEnchantBonusMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/storage/loot/functions/LootingEnchantBonusMixin.java index 2ff65920..6af83669 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/storage/loot/functions/LootingEnchantBonusMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/storage/loot/functions/LootingEnchantBonusMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mixin.core.world.storage.loot.functions; +package io.izzel.arclight.common.mixin.core.world.storage.loot.functions; import net.minecraft.entity.Entity; import net.minecraft.entity.LivingEntity; @@ -11,7 +11,7 @@ import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Overwrite; import org.spongepowered.asm.mixin.Shadow; -import io.izzel.arclight.mod.ArclightConstants; +import io.izzel.arclight.common.mod.ArclightConstants; @Mixin(LootingEnchantBonus.class) public abstract class LootingEnchantBonusMixin { diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/forge/DimensionManagerMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/forge/DimensionManagerMixin.java similarity index 92% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/forge/DimensionManagerMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/forge/DimensionManagerMixin.java index 087be7bc..cf9a8dc8 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/forge/DimensionManagerMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/forge/DimensionManagerMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mixin.forge; +package io.izzel.arclight.common.mixin.forge; import net.minecraftforge.common.DimensionManager; import org.spongepowered.asm.mixin.Mixin; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/forge/ForgeEventFactoryMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/forge/ForgeEventFactoryMixin.java similarity index 91% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/forge/ForgeEventFactoryMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/forge/ForgeEventFactoryMixin.java index 02ba782e..983db461 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/forge/ForgeEventFactoryMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/forge/ForgeEventFactoryMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mixin.forge; +package io.izzel.arclight.common.mixin.forge; import net.minecraft.entity.Entity; import net.minecraft.util.Direction; @@ -8,7 +8,7 @@ import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -import io.izzel.arclight.mod.util.ArclightCaptures; +import io.izzel.arclight.common.mod.util.ArclightCaptures; import java.util.List; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/forge/ForgeHooksMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/forge/ForgeHooksMixin.java similarity index 93% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/forge/ForgeHooksMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/forge/ForgeHooksMixin.java index b1949cf2..70ae0213 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/forge/ForgeHooksMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/forge/ForgeHooksMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mixin.forge; +package io.izzel.arclight.common.mixin.forge; import net.minecraft.entity.LivingEntity; import net.minecraft.item.ItemUseContext; @@ -12,7 +12,7 @@ import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -import io.izzel.arclight.mod.util.ArclightCaptures; +import io.izzel.arclight.common.mod.util.ArclightCaptures; @Mixin(ForgeHooks.class) public class ForgeHooksMixin { diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/optimization/IndirectMergerMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/optimization/IndirectMergerMixin.java similarity index 98% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/optimization/IndirectMergerMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/optimization/IndirectMergerMixin.java index 7c65a800..f09bd57c 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/optimization/IndirectMergerMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/optimization/IndirectMergerMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mixin.optimization; +package io.izzel.arclight.common.mixin.optimization; import it.unimi.dsi.fastutil.doubles.DoubleArrayList; import it.unimi.dsi.fastutil.doubles.DoubleList; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/optimization/VoxelShapesMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/optimization/VoxelShapesMixin.java similarity index 97% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/optimization/VoxelShapesMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/optimization/VoxelShapesMixin.java index 6de92ace..58035cc8 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/optimization/VoxelShapesMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/optimization/VoxelShapesMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mixin.optimization; +package io.izzel.arclight.common.mixin.optimization; import com.google.common.annotations.VisibleForTesting; import it.unimi.dsi.fastutil.doubles.DoubleList; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/optimization/stream/GoalSelectorMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/optimization/stream/GoalSelectorMixin.java similarity index 98% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/optimization/stream/GoalSelectorMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/optimization/stream/GoalSelectorMixin.java index f459a2c7..508fe08f 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/optimization/stream/GoalSelectorMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/optimization/stream/GoalSelectorMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mixin.optimization.stream; +package io.izzel.arclight.common.mixin.optimization.stream; import net.minecraft.entity.ai.goal.Goal; import net.minecraft.entity.ai.goal.GoalSelector; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/optimization/stream/IWorldReaderMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/optimization/stream/IWorldReaderMixin.java similarity index 94% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/optimization/stream/IWorldReaderMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/optimization/stream/IWorldReaderMixin.java index 3f639bca..0f27d6a0 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/optimization/stream/IWorldReaderMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/optimization/stream/IWorldReaderMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mixin.optimization.stream; +package io.izzel.arclight.common.mixin.optimization.stream; import net.minecraft.entity.Entity; import net.minecraft.util.math.AxisAlignedBB; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/optimization/stream/PathFinderMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/optimization/stream/PathFinderMixin.java similarity index 98% rename from arclight-coremod/src/main/java/io/izzel/arclight/mixin/optimization/stream/PathFinderMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/optimization/stream/PathFinderMixin.java index 6589737b..34d0b62a 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/optimization/stream/PathFinderMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/optimization/stream/PathFinderMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mixin.optimization.stream; +package io.izzel.arclight.common.mixin.optimization.stream; import net.minecraft.pathfinding.FlaggedPathPoint; import net.minecraft.pathfinding.NodeProcessor; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mod/ArclightConfig.java b/arclight-common/src/main/java/io/izzel/arclight/common/mod/ArclightConfig.java similarity index 96% rename from arclight-coremod/src/main/java/io/izzel/arclight/mod/ArclightConfig.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mod/ArclightConfig.java index 2a6a6cd2..d2689e39 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mod/ArclightConfig.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mod/ArclightConfig.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mod; +package io.izzel.arclight.common.mod; import org.yaml.snakeyaml.Yaml; import org.yaml.snakeyaml.constructor.Constructor; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mod/ArclightConnector.java b/arclight-common/src/main/java/io/izzel/arclight/common/mod/ArclightConnector.java similarity index 96% rename from arclight-coremod/src/main/java/io/izzel/arclight/mod/ArclightConnector.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mod/ArclightConnector.java index bb7a9775..b03eb54b 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mod/ArclightConnector.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mod/ArclightConnector.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mod; +package io.izzel.arclight.common.mod; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mod/ArclightConstants.java b/arclight-common/src/main/java/io/izzel/arclight/common/mod/ArclightConstants.java similarity index 92% rename from arclight-coremod/src/main/java/io/izzel/arclight/mod/ArclightConstants.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mod/ArclightConstants.java index 2382fde1..17410ec9 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mod/ArclightConstants.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mod/ArclightConstants.java @@ -1,7 +1,7 @@ -package io.izzel.arclight.mod; +package io.izzel.arclight.common.mod; import com.google.common.collect.ImmutableList; -import io.izzel.arclight.util.EnumHelper; +import io.izzel.arclight.api.EnumHelper; import net.minecraft.util.ResourceLocation; import net.minecraft.util.Unit; import net.minecraft.world.server.TicketType; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mod/ArclightLocator.java b/arclight-common/src/main/java/io/izzel/arclight/common/mod/ArclightLocator.java similarity index 97% rename from arclight-coremod/src/main/java/io/izzel/arclight/mod/ArclightLocator.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mod/ArclightLocator.java index d3809da1..9641e61e 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mod/ArclightLocator.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mod/ArclightLocator.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mod; +package io.izzel.arclight.common.mod; import com.google.common.collect.ImmutableList; import net.minecraftforge.fml.loading.moddiscovery.AbstractJarFileLocator; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mod/ArclightMixinPlugin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mod/ArclightMixinPlugin.java similarity index 99% rename from arclight-coremod/src/main/java/io/izzel/arclight/mod/ArclightMixinPlugin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mod/ArclightMixinPlugin.java index 1341605f..d126f53e 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mod/ArclightMixinPlugin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mod/ArclightMixinPlugin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mod; +package io.izzel.arclight.common.mod; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mod/ArclightMod.java b/arclight-common/src/main/java/io/izzel/arclight/common/mod/ArclightMod.java similarity index 88% rename from arclight-coremod/src/main/java/io/izzel/arclight/mod/ArclightMod.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mod/ArclightMod.java index 52fbe86a..db9ba0f5 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mod/ArclightMod.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mod/ArclightMod.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mod; +package io.izzel.arclight.common.mod; -import io.izzel.arclight.mod.server.event.ArclightEventDispatcherRegistry; +import io.izzel.arclight.common.mod.server.event.ArclightEventDispatcherRegistry; import net.minecraftforge.fml.CrashReportExtender; import net.minecraftforge.fml.ExtensionPoint; import net.minecraftforge.fml.ModLoadingContext; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mod/server/BukkitRegistry.java b/arclight-common/src/main/java/io/izzel/arclight/common/mod/server/BukkitRegistry.java similarity index 95% rename from arclight-coremod/src/main/java/io/izzel/arclight/mod/server/BukkitRegistry.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mod/server/BukkitRegistry.java index dc9369e3..d510e674 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mod/server/BukkitRegistry.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mod/server/BukkitRegistry.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mod.server; +package io.izzel.arclight.common.mod.server; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; @@ -15,10 +15,10 @@ import org.bukkit.craftbukkit.v.util.CraftMagicNumbers; import org.bukkit.craftbukkit.v.util.CraftNamespacedKey; import org.bukkit.enchantments.Enchantment; import org.bukkit.potion.PotionEffectType; -import io.izzel.arclight.bridge.bukkit.MaterialBridge; -import io.izzel.arclight.mod.ArclightMod; -import io.izzel.arclight.mod.util.potion.ArclightPotionEffect; -import io.izzel.arclight.util.EnumHelper; +import io.izzel.arclight.common.bridge.bukkit.MaterialBridge; +import io.izzel.arclight.common.mod.ArclightMod; +import io.izzel.arclight.common.mod.util.potion.ArclightPotionEffect; +import io.izzel.arclight.api.EnumHelper; import io.izzel.arclight.api.Unsafe; import java.lang.reflect.Field; @@ -45,16 +45,18 @@ public class BukkitRegistry { } private static void loadEnchantments() { + int origin = Enchantment.values().length; int size = ForgeRegistries.ENCHANTMENTS.getEntries().size(); putBool(Enchantment.class, "acceptingNew", true); for (Map.Entry entry : ForgeRegistries.ENCHANTMENTS.getEntries()) { Enchantment.registerEnchantment(new CraftEnchantment(entry.getValue())); } Enchantment.stopAcceptingRegistrations(); - ArclightMod.LOGGER.info("Registered {} new enchantments", size - 37); + ArclightMod.LOGGER.info("Registered {} new enchantments", size - origin); } private static void loadPotions() { + int origin = PotionEffectType.values().length; int size = ForgeRegistries.POTIONS.getEntries().size(); PotionEffectType[] types = new PotionEffectType[size + 1]; putStatic(PotionEffectType.class, "byId", types); @@ -66,7 +68,7 @@ public class BukkitRegistry { ArclightMod.LOGGER.debug("Registered {}: {} as potion", entry.getKey(), effect); } PotionEffectType.stopAcceptingRegistrations(); - ArclightMod.LOGGER.info("Registered {} new potion effect types", size - 32); + ArclightMod.LOGGER.info("Registered {} new potion effect types", size - origin); } private static void loadMaterials() { diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mod/server/event/ArclightEventDispatcherRegistry.java b/arclight-common/src/main/java/io/izzel/arclight/common/mod/server/event/ArclightEventDispatcherRegistry.java similarity index 89% rename from arclight-coremod/src/main/java/io/izzel/arclight/mod/server/event/ArclightEventDispatcherRegistry.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mod/server/event/ArclightEventDispatcherRegistry.java index 6657a88c..2c74a62f 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mod/server/event/ArclightEventDispatcherRegistry.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mod/server/event/ArclightEventDispatcherRegistry.java @@ -1,7 +1,7 @@ -package io.izzel.arclight.mod.server.event; +package io.izzel.arclight.common.mod.server.event; import net.minecraftforge.common.MinecraftForge; -import io.izzel.arclight.mod.ArclightMod; +import io.izzel.arclight.common.mod.ArclightMod; public abstract class ArclightEventDispatcherRegistry { diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mod/server/event/ArclightEventFactory.java b/arclight-common/src/main/java/io/izzel/arclight/common/mod/server/event/ArclightEventFactory.java new file mode 100644 index 00000000..c29fccf6 --- /dev/null +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mod/server/event/ArclightEventFactory.java @@ -0,0 +1,55 @@ +package io.izzel.arclight.common.mod.server.event; + +import io.izzel.arclight.common.bridge.entity.LivingEntityBridge; +import net.minecraft.entity.LivingEntity; +import org.bukkit.Bukkit; +import org.bukkit.craftbukkit.v.entity.CraftLivingEntity; +import org.bukkit.entity.Entity; +import org.bukkit.event.Event; +import org.bukkit.event.entity.EntityDeathEvent; +import org.bukkit.event.entity.EntityDropItemEvent; +import org.bukkit.event.entity.EntityRegainHealthEvent; +import org.bukkit.event.entity.EntityResurrectEvent; +import org.bukkit.inventory.ItemStack; + +import java.util.List; + +public abstract class ArclightEventFactory { + + public static void callEvent(Event event) { + Bukkit.getPluginManager().callEvent(event); + } + + public static EntityRegainHealthEvent callEntityRegainHealthEvent(Entity entity, float amount, EntityRegainHealthEvent.RegainReason regainReason) { + EntityRegainHealthEvent event = new EntityRegainHealthEvent(entity, amount, regainReason); + callEvent(event); + return event; + } + + public static EntityResurrectEvent callEntityResurrectEvent(org.bukkit.entity.LivingEntity livingEntity) { + EntityResurrectEvent event = new EntityResurrectEvent(livingEntity); + callEvent(event); + return event; + } + + public static void callEntityDeathEvent(LivingEntity entity, List drops) { + CraftLivingEntity craftLivingEntity = ((LivingEntityBridge) entity).bridge$getBukkitEntity(); + EntityDeathEvent event = new EntityDeathEvent(craftLivingEntity, drops, ((LivingEntityBridge) entity).bridge$getExpReward()); + callEvent(event); + ((LivingEntityBridge) entity).bridge$setExpToDrop(event.getDroppedExp()); + } + + public static EntityDeathEvent callEntityDeathEvent(org.bukkit.entity.LivingEntity entity, List drops, int droppedExp) { + EntityDeathEvent event = new EntityDeathEvent(entity, drops, droppedExp); + callEvent(event); + return event; + } + + public static EntityDropItemEvent callEntityDropItemEvent(org.bukkit.entity.Entity entity, org.bukkit.entity.Item drop) { + EntityDropItemEvent bukkitEvent = new EntityDropItemEvent(entity, drop); + callEvent(bukkitEvent); + return bukkitEvent; + } + + +} diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mod/server/event/BlockBreakEventDispatcher.java b/arclight-common/src/main/java/io/izzel/arclight/common/mod/server/event/BlockBreakEventDispatcher.java similarity index 90% rename from arclight-coremod/src/main/java/io/izzel/arclight/mod/server/event/BlockBreakEventDispatcher.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mod/server/event/BlockBreakEventDispatcher.java index f9aea27b..f011939b 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mod/server/event/BlockBreakEventDispatcher.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mod/server/event/BlockBreakEventDispatcher.java @@ -1,7 +1,7 @@ -package io.izzel.arclight.mod.server.event; +package io.izzel.arclight.common.mod.server.event; -import io.izzel.arclight.bridge.entity.EntityBridge; -import io.izzel.arclight.bridge.entity.player.ServerPlayerEntityBridge; +import io.izzel.arclight.common.bridge.entity.EntityBridge; +import io.izzel.arclight.common.bridge.entity.player.ServerPlayerEntityBridge; import net.minecraft.block.Blocks; import net.minecraft.entity.Entity; import net.minecraft.entity.player.PlayerEntity; @@ -14,7 +14,7 @@ import org.bukkit.event.Cancellable; import org.bukkit.event.block.Action; import org.bukkit.event.block.BlockBreakEvent; import org.bukkit.event.entity.EntityInteractEvent; -import io.izzel.arclight.mod.util.ArclightCaptures; +import io.izzel.arclight.common.mod.util.ArclightCaptures; public class BlockBreakEventDispatcher { diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mod/server/event/BlockPlaceEventDispatcher.java b/arclight-common/src/main/java/io/izzel/arclight/common/mod/server/event/BlockPlaceEventDispatcher.java similarity index 96% rename from arclight-coremod/src/main/java/io/izzel/arclight/mod/server/event/BlockPlaceEventDispatcher.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mod/server/event/BlockPlaceEventDispatcher.java index 30d7cfcf..5887ba58 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mod/server/event/BlockPlaceEventDispatcher.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mod/server/event/BlockPlaceEventDispatcher.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mod.server.event; +package io.izzel.arclight.common.mod.server.event; import net.minecraft.entity.Entity; import net.minecraft.entity.player.ServerPlayerEntity; @@ -16,8 +16,8 @@ import org.bukkit.event.block.BlockMultiPlaceEvent; import org.bukkit.event.block.BlockPlaceEvent; import org.bukkit.inventory.EquipmentSlot; import org.bukkit.inventory.ItemStack; -import io.izzel.arclight.mod.util.ArclightBlockSnapshot; -import io.izzel.arclight.mod.util.ArclightCaptures; +import io.izzel.arclight.common.mod.util.ArclightBlockSnapshot; +import io.izzel.arclight.common.mod.util.ArclightCaptures; import java.util.ArrayList; import java.util.List; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mod/server/event/EntityEventDispatcher.java b/arclight-common/src/main/java/io/izzel/arclight/common/mod/server/event/EntityEventDispatcher.java similarity index 94% rename from arclight-coremod/src/main/java/io/izzel/arclight/mod/server/event/EntityEventDispatcher.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mod/server/event/EntityEventDispatcher.java index 0165d4bf..3461c7da 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mod/server/event/EntityEventDispatcher.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mod/server/event/EntityEventDispatcher.java @@ -1,7 +1,7 @@ -package io.izzel.arclight.mod.server.event; +package io.izzel.arclight.common.mod.server.event; import com.google.common.collect.Lists; -import io.izzel.arclight.mod.util.ArclightCaptures; +import io.izzel.arclight.common.mod.util.ArclightCaptures; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.item.ItemEntity; import net.minecraft.entity.player.ServerPlayerEntity; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mod/server/event/EntityPotionEffectEventDispatcher.java b/arclight-common/src/main/java/io/izzel/arclight/common/mod/server/event/EntityPotionEffectEventDispatcher.java similarity index 89% rename from arclight-coremod/src/main/java/io/izzel/arclight/mod/server/event/EntityPotionEffectEventDispatcher.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mod/server/event/EntityPotionEffectEventDispatcher.java index a19a4581..1eedfb6f 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mod/server/event/EntityPotionEffectEventDispatcher.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mod/server/event/EntityPotionEffectEventDispatcher.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mod.server.event; +package io.izzel.arclight.common.mod.server.event; -import io.izzel.arclight.bridge.entity.LivingEntityBridge; +import io.izzel.arclight.common.bridge.entity.LivingEntityBridge; import net.minecraftforge.event.entity.living.PotionEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import org.bukkit.craftbukkit.v.event.CraftEventFactory; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mod/server/event/EntityRegainHealthEventDispatcher.java b/arclight-common/src/main/java/io/izzel/arclight/common/mod/server/event/EntityRegainHealthEventDispatcher.java similarity index 85% rename from arclight-coremod/src/main/java/io/izzel/arclight/mod/server/event/EntityRegainHealthEventDispatcher.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mod/server/event/EntityRegainHealthEventDispatcher.java index 9aa57f7a..fd790e73 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mod/server/event/EntityRegainHealthEventDispatcher.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mod/server/event/EntityRegainHealthEventDispatcher.java @@ -1,7 +1,7 @@ -package io.izzel.arclight.mod.server.event; +package io.izzel.arclight.common.mod.server.event; -import io.izzel.arclight.bridge.entity.EntityBridge; -import io.izzel.arclight.bridge.world.WorldBridge; +import io.izzel.arclight.common.bridge.entity.EntityBridge; +import io.izzel.arclight.common.bridge.world.WorldBridge; import net.minecraftforge.event.entity.living.LivingHealEvent; import net.minecraftforge.event.world.WorldEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mod/server/event/EntityTeleportEventDispatcher.java b/arclight-common/src/main/java/io/izzel/arclight/common/mod/server/event/EntityTeleportEventDispatcher.java similarity index 91% rename from arclight-coremod/src/main/java/io/izzel/arclight/mod/server/event/EntityTeleportEventDispatcher.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mod/server/event/EntityTeleportEventDispatcher.java index 5587c808..b3c85940 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mod/server/event/EntityTeleportEventDispatcher.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mod/server/event/EntityTeleportEventDispatcher.java @@ -1,7 +1,7 @@ -package io.izzel.arclight.mod.server.event; +package io.izzel.arclight.common.mod.server.event; -import io.izzel.arclight.bridge.entity.EntityBridge; -import io.izzel.arclight.bridge.entity.player.ServerPlayerEntityBridge; +import io.izzel.arclight.common.bridge.entity.EntityBridge; +import io.izzel.arclight.common.bridge.entity.player.ServerPlayerEntityBridge; import net.minecraft.entity.monster.EndermanEntity; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraftforge.event.entity.living.EnderTeleportEvent; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mod/server/event/ItemEntityEventDispatcher.java b/arclight-common/src/main/java/io/izzel/arclight/common/mod/server/event/ItemEntityEventDispatcher.java similarity index 89% rename from arclight-coremod/src/main/java/io/izzel/arclight/mod/server/event/ItemEntityEventDispatcher.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mod/server/event/ItemEntityEventDispatcher.java index cef3b618..89b385a7 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mod/server/event/ItemEntityEventDispatcher.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mod/server/event/ItemEntityEventDispatcher.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mod.server.event; +package io.izzel.arclight.common.mod.server.event; import net.minecraftforge.event.entity.item.ItemExpireEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mod/server/event/NetworkEventDispatcher.java b/arclight-common/src/main/java/io/izzel/arclight/common/mod/server/event/NetworkEventDispatcher.java similarity index 83% rename from arclight-coremod/src/main/java/io/izzel/arclight/mod/server/event/NetworkEventDispatcher.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mod/server/event/NetworkEventDispatcher.java index ad82900f..2ddb8063 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mod/server/event/NetworkEventDispatcher.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mod/server/event/NetworkEventDispatcher.java @@ -1,8 +1,8 @@ -package io.izzel.arclight.mod.server.event; +package io.izzel.arclight.common.mod.server.event; import net.minecraftforge.event.TagsUpdatedEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; -import io.izzel.arclight.bridge.tags.NetworkTagCollectionBridge; +import io.izzel.arclight.common.bridge.tags.NetworkTagCollectionBridge; public class NetworkEventDispatcher { diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mod/util/ArclightBlockPopulator.java b/arclight-common/src/main/java/io/izzel/arclight/common/mod/util/ArclightBlockPopulator.java similarity index 99% rename from arclight-coremod/src/main/java/io/izzel/arclight/mod/util/ArclightBlockPopulator.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mod/util/ArclightBlockPopulator.java index fcd9095e..bb35fcd0 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mod/util/ArclightBlockPopulator.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mod/util/ArclightBlockPopulator.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mod.util; +package io.izzel.arclight.common.mod.util; import net.minecraft.block.Block; import net.minecraft.block.BlockState; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mod/util/ArclightBlockSnapshot.java b/arclight-common/src/main/java/io/izzel/arclight/common/mod/util/ArclightBlockSnapshot.java similarity index 99% rename from arclight-coremod/src/main/java/io/izzel/arclight/mod/util/ArclightBlockSnapshot.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mod/util/ArclightBlockSnapshot.java index 65d78493..e323a993 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mod/util/ArclightBlockSnapshot.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mod/util/ArclightBlockSnapshot.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mod.util; +package io.izzel.arclight.common.mod.util; import net.minecraft.block.BlockState; import net.minecraft.tileentity.TileEntity; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mod/util/ArclightCallbackExecutor.java b/arclight-common/src/main/java/io/izzel/arclight/common/mod/util/ArclightCallbackExecutor.java similarity index 92% rename from arclight-coremod/src/main/java/io/izzel/arclight/mod/util/ArclightCallbackExecutor.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mod/util/ArclightCallbackExecutor.java index 321643a9..d32a234d 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mod/util/ArclightCallbackExecutor.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mod/util/ArclightCallbackExecutor.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mod.util; +package io.izzel.arclight.common.mod.util; import java.util.concurrent.Executor; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mod/util/ArclightCaptures.java b/arclight-common/src/main/java/io/izzel/arclight/common/mod/util/ArclightCaptures.java similarity index 98% rename from arclight-coremod/src/main/java/io/izzel/arclight/mod/util/ArclightCaptures.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mod/util/ArclightCaptures.java index a581cae8..9a50c8f0 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mod/util/ArclightCaptures.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mod/util/ArclightCaptures.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mod.util; +package io.izzel.arclight.common.mod.util; -import io.izzel.arclight.mod.ArclightConstants; +import io.izzel.arclight.common.mod.ArclightConstants; import net.minecraft.entity.Entity; import net.minecraft.entity.item.ItemEntity; import net.minecraft.inventory.container.Container; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mod/util/ArclightHeadLoader.java b/arclight-common/src/main/java/io/izzel/arclight/common/mod/util/ArclightHeadLoader.java similarity index 97% rename from arclight-coremod/src/main/java/io/izzel/arclight/mod/util/ArclightHeadLoader.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mod/util/ArclightHeadLoader.java index 3f9b61a9..f384d9b1 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mod/util/ArclightHeadLoader.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mod/util/ArclightHeadLoader.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mod.util; +package io.izzel.arclight.common.mod.util; import com.google.common.cache.CacheLoader; import com.google.common.collect.Iterables; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mod/util/ArclightLoggerAdapter.java b/arclight-common/src/main/java/io/izzel/arclight/common/mod/util/ArclightLoggerAdapter.java similarity index 99% rename from arclight-coremod/src/main/java/io/izzel/arclight/mod/util/ArclightLoggerAdapter.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mod/util/ArclightLoggerAdapter.java index d302276c..22cae003 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mod/util/ArclightLoggerAdapter.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mod/util/ArclightLoggerAdapter.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mod.util; +package io.izzel.arclight.common.mod.util; import org.apache.logging.log4j.jul.ApiLogger; import org.apache.logging.log4j.jul.CoreLoggerAdapter; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mod/util/ArclightPluginLogger.java b/arclight-common/src/main/java/io/izzel/arclight/common/mod/util/ArclightPluginLogger.java similarity index 93% rename from arclight-coremod/src/main/java/io/izzel/arclight/mod/util/ArclightPluginLogger.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mod/util/ArclightPluginLogger.java index aa6505bb..c33dfa20 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mod/util/ArclightPluginLogger.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mod/util/ArclightPluginLogger.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mod.util; +package io.izzel.arclight.common.mod.util; import org.bukkit.plugin.Plugin; import org.bukkit.plugin.PluginLogger; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mod/util/ArclightSpecialRecipe.java b/arclight-common/src/main/java/io/izzel/arclight/common/mod/util/ArclightSpecialRecipe.java similarity index 96% rename from arclight-coremod/src/main/java/io/izzel/arclight/mod/util/ArclightSpecialRecipe.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mod/util/ArclightSpecialRecipe.java index 58c854d9..44bce909 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mod/util/ArclightSpecialRecipe.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mod/util/ArclightSpecialRecipe.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mod.util; +package io.izzel.arclight.common.mod.util; -import io.izzel.arclight.bridge.item.crafting.RecipeManagerBridge; +import io.izzel.arclight.common.bridge.item.crafting.RecipeManagerBridge; import net.minecraft.item.crafting.IRecipe; import net.minecraft.item.crafting.Ingredient; import net.minecraft.item.crafting.SpecialRecipe; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mod/util/BukkitOptionParser.java b/arclight-common/src/main/java/io/izzel/arclight/common/mod/util/BukkitOptionParser.java similarity index 98% rename from arclight-coremod/src/main/java/io/izzel/arclight/mod/util/BukkitOptionParser.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mod/util/BukkitOptionParser.java index c914bf27..16e6d607 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mod/util/BukkitOptionParser.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mod/util/BukkitOptionParser.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mod.util; +package io.izzel.arclight.common.mod.util; import joptsimple.OptionParser; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mod/util/ChestBlockDoubleInventoryHacks.java b/arclight-common/src/main/java/io/izzel/arclight/common/mod/util/ChestBlockDoubleInventoryHacks.java similarity index 97% rename from arclight-coremod/src/main/java/io/izzel/arclight/mod/util/ChestBlockDoubleInventoryHacks.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mod/util/ChestBlockDoubleInventoryHacks.java index 6a5c8c31..93b3f757 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mod/util/ChestBlockDoubleInventoryHacks.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mod/util/ChestBlockDoubleInventoryHacks.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mod.util; +package io.izzel.arclight.common.mod.util; import io.izzel.arclight.api.Unsafe; import net.minecraft.inventory.DoubleSidedInventory; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mod/util/potion/ArclightPotionEffect.java b/arclight-common/src/main/java/io/izzel/arclight/common/mod/util/potion/ArclightPotionEffect.java similarity index 91% rename from arclight-coremod/src/main/java/io/izzel/arclight/mod/util/potion/ArclightPotionEffect.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mod/util/potion/ArclightPotionEffect.java index 614fa1ea..177faffa 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mod/util/potion/ArclightPotionEffect.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mod/util/potion/ArclightPotionEffect.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mod.util.potion; +package io.izzel.arclight.common.mod.util.potion; import net.minecraft.potion.Effect; import org.bukkit.craftbukkit.v.potion.CraftPotionEffectType; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mod/util/remapper/ArclightInterfaceInvokerGen.java b/arclight-common/src/main/java/io/izzel/arclight/common/mod/util/remapper/ArclightInterfaceInvokerGen.java similarity index 97% rename from arclight-coremod/src/main/java/io/izzel/arclight/mod/util/remapper/ArclightInterfaceInvokerGen.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mod/util/remapper/ArclightInterfaceInvokerGen.java index a76a5a14..915dd310 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mod/util/remapper/ArclightInterfaceInvokerGen.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mod/util/remapper/ArclightInterfaceInvokerGen.java @@ -1,7 +1,7 @@ -package io.izzel.arclight.mod.util.remapper; +package io.izzel.arclight.common.mod.util.remapper; import com.google.common.collect.Maps; -import io.izzel.arclight.mod.ArclightMod; +import io.izzel.arclight.common.mod.ArclightMod; import net.md_5.specialsource.provider.InheritanceProvider; import net.md_5.specialsource.repo.ClassRepo; import org.objectweb.asm.Opcodes; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mod/util/remapper/ArclightRedirectAdapter.java b/arclight-common/src/main/java/io/izzel/arclight/common/mod/util/remapper/ArclightRedirectAdapter.java similarity index 98% rename from arclight-coremod/src/main/java/io/izzel/arclight/mod/util/remapper/ArclightRedirectAdapter.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mod/util/remapper/ArclightRedirectAdapter.java index 26d17b08..fe9ac3d2 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mod/util/remapper/ArclightRedirectAdapter.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mod/util/remapper/ArclightRedirectAdapter.java @@ -1,7 +1,7 @@ -package io.izzel.arclight.mod.util.remapper; +package io.izzel.arclight.common.mod.util.remapper; import com.google.common.collect.ImmutableMap; -import io.izzel.arclight.mod.util.remapper.generated.ArclightReflectionHandler; +import io.izzel.arclight.common.mod.util.remapper.generated.ArclightReflectionHandler; import org.objectweb.asm.Opcodes; import org.objectweb.asm.Type; import org.objectweb.asm.tree.AbstractInsnNode; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mod/util/remapper/ArclightRemapper.java b/arclight-common/src/main/java/io/izzel/arclight/common/mod/util/remapper/ArclightRemapper.java similarity index 98% rename from arclight-coremod/src/main/java/io/izzel/arclight/mod/util/remapper/ArclightRemapper.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mod/util/remapper/ArclightRemapper.java index 60fc8f11..195fcd1c 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mod/util/remapper/ArclightRemapper.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mod/util/remapper/ArclightRemapper.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mod.util.remapper; +package io.izzel.arclight.common.mod.util.remapper; import com.google.common.collect.BiMap; import com.google.common.collect.HashBiMap; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mod/util/remapper/PluginClassRepo.java b/arclight-common/src/main/java/io/izzel/arclight/common/mod/util/remapper/PluginClassRepo.java similarity index 89% rename from arclight-coremod/src/main/java/io/izzel/arclight/mod/util/remapper/PluginClassRepo.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mod/util/remapper/PluginClassRepo.java index 88eafcb8..756ff7ac 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mod/util/remapper/PluginClassRepo.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mod/util/remapper/PluginClassRepo.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.mod.util.remapper; +package io.izzel.arclight.common.mod.util.remapper; -import io.izzel.arclight.bridge.bukkit.JavaPluginLoaderBridge; +import io.izzel.arclight.common.bridge.bukkit.JavaPluginLoaderBridge; import net.md_5.specialsource.repo.ClassRepo; import org.bukkit.plugin.java.JavaPluginLoader; import org.objectweb.asm.tree.ClassNode; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mod/util/remapper/PluginInheritanceProvider.java b/arclight-common/src/main/java/io/izzel/arclight/common/mod/util/remapper/PluginInheritanceProvider.java similarity index 97% rename from arclight-coremod/src/main/java/io/izzel/arclight/mod/util/remapper/PluginInheritanceProvider.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mod/util/remapper/PluginInheritanceProvider.java index 469d52e2..4578eb51 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mod/util/remapper/PluginInheritanceProvider.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mod/util/remapper/PluginInheritanceProvider.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.mod.util.remapper; +package io.izzel.arclight.common.mod.util.remapper; import com.google.common.collect.ImmutableSet; import net.md_5.specialsource.provider.InheritanceProvider; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mod/util/remapper/PluginRemapper.java b/arclight-common/src/main/java/io/izzel/arclight/common/mod/util/remapper/PluginRemapper.java similarity index 99% rename from arclight-coremod/src/main/java/io/izzel/arclight/mod/util/remapper/PluginRemapper.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mod/util/remapper/PluginRemapper.java index 8148746b..d2e3b232 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mod/util/remapper/PluginRemapper.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mod/util/remapper/PluginRemapper.java @@ -1,10 +1,10 @@ -package io.izzel.arclight.mod.util.remapper; +package io.izzel.arclight.common.mod.util.remapper; import com.google.common.base.Preconditions; import com.google.common.collect.BiMap; import com.google.common.collect.HashBiMap; import com.google.common.collect.Maps; -import io.izzel.arclight.mod.util.remapper.generated.ArclightReflectionHandler; +import io.izzel.arclight.common.mod.util.remapper.generated.ArclightReflectionHandler; import io.izzel.arclight.api.Unsafe; import net.md_5.specialsource.JarMapping; import net.md_5.specialsource.JarRemapper; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mod/util/remapper/SharedClassRepo.java b/arclight-common/src/main/java/io/izzel/arclight/common/mod/util/remapper/SharedClassRepo.java similarity index 96% rename from arclight-coremod/src/main/java/io/izzel/arclight/mod/util/remapper/SharedClassRepo.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mod/util/remapper/SharedClassRepo.java index 9a1d93cb..7cb703b6 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mod/util/remapper/SharedClassRepo.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mod/util/remapper/SharedClassRepo.java @@ -1,8 +1,8 @@ -package io.izzel.arclight.mod.util.remapper; +package io.izzel.arclight.common.mod.util.remapper; import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; -import io.izzel.arclight.bridge.bukkit.JavaPluginLoaderBridge; +import io.izzel.arclight.common.bridge.bukkit.JavaPluginLoaderBridge; import net.md_5.specialsource.repo.ClassRepo; import org.bukkit.plugin.java.JavaPluginLoader; import org.objectweb.asm.ClassReader; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mod/util/remapper/generated/ArclightReflectionHandler.java b/arclight-common/src/main/java/io/izzel/arclight/common/mod/util/remapper/generated/ArclightReflectionHandler.java similarity index 98% rename from arclight-coremod/src/main/java/io/izzel/arclight/mod/util/remapper/generated/ArclightReflectionHandler.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mod/util/remapper/generated/ArclightReflectionHandler.java index e9fd6083..38169b5e 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mod/util/remapper/generated/ArclightReflectionHandler.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mod/util/remapper/generated/ArclightReflectionHandler.java @@ -1,7 +1,7 @@ -package io.izzel.arclight.mod.util.remapper.generated; +package io.izzel.arclight.common.mod.util.remapper.generated; import org.objectweb.asm.Type; -import io.izzel.arclight.mod.util.remapper.PluginRemapper; +import io.izzel.arclight.common.mod.util.remapper.PluginRemapper; import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles; diff --git a/arclight-coremod/src/main/resources/META-INF/accesstransformer.cfg b/arclight-common/src/main/resources/META-INF/accesstransformer.cfg similarity index 100% rename from arclight-coremod/src/main/resources/META-INF/accesstransformer.cfg rename to arclight-common/src/main/resources/META-INF/accesstransformer.cfg diff --git a/arclight-common/src/main/resources/META-INF/services/net.minecraftforge.forgespi.locating.IModLocator b/arclight-common/src/main/resources/META-INF/services/net.minecraftforge.forgespi.locating.IModLocator new file mode 100644 index 00000000..6fe0525f --- /dev/null +++ b/arclight-common/src/main/resources/META-INF/services/net.minecraftforge.forgespi.locating.IModLocator @@ -0,0 +1 @@ +io.izzel.arclight.common.mod.ArclightLocator \ No newline at end of file diff --git a/arclight-coremod/src/main/resources/arclight.yml b/arclight-common/src/main/resources/arclight.yml similarity index 100% rename from arclight-coremod/src/main/resources/arclight.yml rename to arclight-common/src/main/resources/arclight.yml diff --git a/arclight-coremod/src/main/resources/log4j2.xml b/arclight-common/src/main/resources/log4j2.xml similarity index 100% rename from arclight-coremod/src/main/resources/log4j2.xml rename to arclight-common/src/main/resources/log4j2.xml diff --git a/arclight-coremod/src/main/resources/mixins.arclight.bukkit.json b/arclight-common/src/main/resources/mixins.arclight.bukkit.json similarity index 90% rename from arclight-coremod/src/main/resources/mixins.arclight.bukkit.json rename to arclight-common/src/main/resources/mixins.arclight.bukkit.json index 0982e66f..f32bceba 100644 --- a/arclight-coremod/src/main/resources/mixins.arclight.bukkit.json +++ b/arclight-common/src/main/resources/mixins.arclight.bukkit.json @@ -1,7 +1,7 @@ { "required": true, "minVersion": "0.8", - "package": "io.izzel.arclight.mixin.bukkit", + "package": "io.izzel.arclight.common.mixin.bukkit", "target": "@env(DEFAULT)", "refmap": "mixins.arclight.refmap.json", "setSourceFile": true, diff --git a/arclight-coremod/src/main/resources/mixins.arclight.core.json b/arclight-common/src/main/resources/mixins.arclight.core.json similarity index 99% rename from arclight-coremod/src/main/resources/mixins.arclight.core.json rename to arclight-common/src/main/resources/mixins.arclight.core.json index bc523251..81c909d9 100644 --- a/arclight-coremod/src/main/resources/mixins.arclight.core.json +++ b/arclight-common/src/main/resources/mixins.arclight.core.json @@ -1,11 +1,11 @@ { "required": true, "minVersion": "0.8", - "package": "io.izzel.arclight.mixin.core", + "package": "io.izzel.arclight.common.mixin.core", "target": "@env(DEFAULT)", "refmap": "mixins.arclight.refmap.json", "setSourceFile": true, - "plugin": "io.izzel.arclight.mod.ArclightMixinPlugin", + "plugin": "io.izzel.arclight.common.mod.ArclightMixinPlugin", "injectors": { "maxShiftBy": 2 }, diff --git a/arclight-coremod/src/main/resources/mixins.arclight.forge.json b/arclight-common/src/main/resources/mixins.arclight.forge.json similarity index 82% rename from arclight-coremod/src/main/resources/mixins.arclight.forge.json rename to arclight-common/src/main/resources/mixins.arclight.forge.json index c9ed8df1..1e8bedc3 100644 --- a/arclight-coremod/src/main/resources/mixins.arclight.forge.json +++ b/arclight-common/src/main/resources/mixins.arclight.forge.json @@ -1,7 +1,7 @@ { "required": true, "minVersion": "0.8", - "package": "io.izzel.arclight.mixin.forge", + "package": "io.izzel.arclight.common.mixin.forge", "target": "@env(DEFAULT)", "refmap": "mixins.arclight.refmap.json", "setSourceFile": true, diff --git a/arclight-coremod/src/main/resources/mixins.arclight.optimization.json b/arclight-common/src/main/resources/mixins.arclight.optimization.json similarity index 57% rename from arclight-coremod/src/main/resources/mixins.arclight.optimization.json rename to arclight-common/src/main/resources/mixins.arclight.optimization.json index 93b623e4..96756d24 100644 --- a/arclight-coremod/src/main/resources/mixins.arclight.optimization.json +++ b/arclight-common/src/main/resources/mixins.arclight.optimization.json @@ -1,9 +1,9 @@ { "minVersion": "0.8", - "package": "io.izzel.arclight.mixin.optimization", + "package": "io.izzel.arclight.common.mixin.optimization", "target": "@env(DEFAULT)", "refmap": "mixins.arclight.refmap.json", - "plugin": "io.izzel.arclight.mod.ArclightMixinPlugin", + "plugin": "io.izzel.arclight.common.mod.ArclightMixinPlugin", "mixins": [ "IndirectMergerMixin", "VoxelShapesMixin" diff --git a/arclight-coremod/src/main/resources/mixins.arclight.optimization.stream.json b/arclight-common/src/main/resources/mixins.arclight.optimization.stream.json similarity index 73% rename from arclight-coremod/src/main/resources/mixins.arclight.optimization.stream.json rename to arclight-common/src/main/resources/mixins.arclight.optimization.stream.json index 9308c449..76a52ecd 100644 --- a/arclight-coremod/src/main/resources/mixins.arclight.optimization.stream.json +++ b/arclight-common/src/main/resources/mixins.arclight.optimization.stream.json @@ -1,6 +1,6 @@ { "minVersion": "0.8", - "package": "io.izzel.arclight.mixin.optimization.stream", + "package": "io.izzel.arclight.common.mixin.optimization.stream", "target": "@env(DEFAULT)", "refmap": "mixins.arclight.refmap.json", "mixins": [ diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/entity/monster/CreeperEntityBridge.java b/arclight-coremod/src/main/java/io/izzel/arclight/bridge/entity/monster/CreeperEntityBridge.java deleted file mode 100644 index 56132f29..00000000 --- a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/entity/monster/CreeperEntityBridge.java +++ /dev/null @@ -1,8 +0,0 @@ -package io.izzel.arclight.bridge.entity.monster; - -import io.izzel.arclight.bridge.entity.MobEntityBridge; - -public interface CreeperEntityBridge extends MobEntityBridge { - - void bridge$setPowered(boolean power); -} diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mod/server/event/ArclightEventFactory.java b/arclight-coremod/src/main/java/io/izzel/arclight/mod/server/event/ArclightEventFactory.java deleted file mode 100644 index 231704aa..00000000 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mod/server/event/ArclightEventFactory.java +++ /dev/null @@ -1,91 +0,0 @@ -package io.izzel.arclight.mod.server.event; - -import io.izzel.arclight.bridge.entity.LivingEntityBridge; -import net.minecraft.entity.LivingEntity; -import net.minecraft.potion.EffectInstance; -import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v.entity.CraftLivingEntity; -import org.bukkit.entity.Entity; -import org.bukkit.event.Event; -import org.bukkit.event.entity.EntityDeathEvent; -import org.bukkit.event.entity.EntityDropItemEvent; -import org.bukkit.event.entity.EntityPotionEffectEvent; -import org.bukkit.event.entity.EntityRegainHealthEvent; -import org.bukkit.event.entity.EntityResurrectEvent; -import org.bukkit.inventory.ItemStack; -import org.bukkit.potion.PotionEffect; -import io.izzel.arclight.mod.util.potion.ArclightPotionUtil; - -import javax.annotation.Nullable; -import java.util.List; - -public abstract class ArclightEventFactory { - - public static void callEvent(Event event) { - Bukkit.getPluginManager().callEvent(event); - } - - public static EntityPotionEffectEvent callEntityPotionEffectChangeEvent(LivingEntity entity, @Nullable EffectInstance oldEffect, @Nullable EffectInstance newEffect, EntityPotionEffectEvent.Cause cause) { - return callEntityPotionEffectChangeEvent(entity, oldEffect, newEffect, cause, true); - } - - public static EntityPotionEffectEvent callEntityPotionEffectChangeEvent(LivingEntity entity, @Nullable EffectInstance oldEffect, @Nullable EffectInstance newEffect, EntityPotionEffectEvent.Cause cause, org.bukkit.event.entity.EntityPotionEffectEvent.Action action) { - return callEntityPotionEffectChangeEvent(entity, oldEffect, newEffect, cause, action, true); - } - - public static EntityPotionEffectEvent callEntityPotionEffectChangeEvent(LivingEntity entity, @Nullable EffectInstance oldEffect, @Nullable EffectInstance newEffect, EntityPotionEffectEvent.Cause cause, boolean willOverride) { - org.bukkit.event.entity.EntityPotionEffectEvent.Action action = org.bukkit.event.entity.EntityPotionEffectEvent.Action.CHANGED; - if (oldEffect == null) { - action = org.bukkit.event.entity.EntityPotionEffectEvent.Action.ADDED; - } else if (newEffect == null) { - action = org.bukkit.event.entity.EntityPotionEffectEvent.Action.REMOVED; - } - - return callEntityPotionEffectChangeEvent(entity, oldEffect, newEffect, cause, action, willOverride); - } - - public static EntityPotionEffectEvent callEntityPotionEffectChangeEvent(LivingEntity entity, @Nullable EffectInstance oldEffect, @Nullable EffectInstance newEffect, EntityPotionEffectEvent.Cause cause, org.bukkit.event.entity.EntityPotionEffectEvent.Action action, boolean willOverride) { - PotionEffect bukkitOldEffect = oldEffect == null ? null : ArclightPotionUtil.toBukkit(oldEffect); - PotionEffect bukkitNewEffect = newEffect == null ? null : ArclightPotionUtil.toBukkit(newEffect); - if (bukkitOldEffect == null && bukkitNewEffect == null) { - throw new IllegalStateException("Old and new potion effect are both null"); - } else { - EntityPotionEffectEvent event = new EntityPotionEffectEvent(((LivingEntityBridge) entity).bridge$getBukkitEntity(), bukkitOldEffect, bukkitNewEffect, cause, action, willOverride); - callEvent(event); - return event; - } - } - - public static EntityRegainHealthEvent callEntityRegainHealthEvent(Entity entity, float amount, EntityRegainHealthEvent.RegainReason regainReason) { - EntityRegainHealthEvent event = new EntityRegainHealthEvent(entity, amount, regainReason); - callEvent(event); - return event; - } - - public static EntityResurrectEvent callEntityResurrectEvent(org.bukkit.entity.LivingEntity livingEntity) { - EntityResurrectEvent event = new EntityResurrectEvent(livingEntity); - callEvent(event); - return event; - } - - public static void callEntityDeathEvent(LivingEntity entity, List drops) { - CraftLivingEntity craftLivingEntity = ((LivingEntityBridge) entity).bridge$getBukkitEntity(); - EntityDeathEvent event = new EntityDeathEvent(craftLivingEntity, drops, ((LivingEntityBridge) entity).bridge$getExpReward()); - callEvent(event); - ((LivingEntityBridge) entity).bridge$setExpToDrop(event.getDroppedExp()); - } - - public static EntityDeathEvent callEntityDeathEvent(org.bukkit.entity.LivingEntity entity, List drops, int droppedExp) { - EntityDeathEvent event = new EntityDeathEvent(entity, drops, droppedExp); - callEvent(event); - return event; - } - - public static EntityDropItemEvent callEntityDropItemEvent(org.bukkit.entity.Entity entity, org.bukkit.entity.Item drop) { - EntityDropItemEvent bukkitEvent = new EntityDropItemEvent(entity, drop); - callEvent(bukkitEvent); - return bukkitEvent; - } - - -} diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mod/util/ArclightWorldRegistry.java b/arclight-coremod/src/main/java/io/izzel/arclight/mod/util/ArclightWorldRegistry.java deleted file mode 100644 index 9a5c3a79..00000000 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mod/util/ArclightWorldRegistry.java +++ /dev/null @@ -1,11 +0,0 @@ -package io.izzel.arclight.mod.util; - -import net.minecraft.util.ResourceLocation; - -import java.util.Map; - -public class ArclightWorldRegistry { - - private static Map worldName; - -} diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mod/util/InterruptibleInputStream.java b/arclight-coremod/src/main/java/io/izzel/arclight/mod/util/InterruptibleInputStream.java deleted file mode 100644 index d6e5c412..00000000 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mod/util/InterruptibleInputStream.java +++ /dev/null @@ -1,101 +0,0 @@ -package io.izzel.arclight.mod.util; - -import java.io.IOException; -import java.io.InputStream; - -/** - * https://stackoverflow.com/a/49539574 - * - * @author piegames - */ -public class InterruptibleInputStream extends InputStream { - - public static Thread thread; - - protected final InputStream in; - - public InterruptibleInputStream(InputStream in) { - this.in = in; - } - - /** - * This will read one byte, blocking if needed. If the thread is interrupted while reading, it will stop and throw - * an {@link IOException}. - */ - @Override - public int read() throws IOException { - while (!Thread.interrupted()) - if (in.available() > 0) - return in.read(); - else - Thread.yield(); - throw new IOException("Thread interrupted while reading"); - } - - /** - * This will read multiple bytes into a buffer. While reading the first byte it will block and wait in an - * interruptable way until one is available. For the remaining bytes, it will stop reading when none are available - * anymore. If the thread is interrupted, it will return -1. - */ - @Override - public int read(byte b[], int off, int len) throws IOException { - if (b == null) { - throw new NullPointerException(); - } else if (off < 0 || len < 0 || len > b.length - off) { - throw new IndexOutOfBoundsException(); - } else if (len == 0) { - return 0; - } - int c = -1; - while (!Thread.interrupted()) - if (in.available() > 0) { - c = in.read(); - break; - } else - Thread.yield(); - if (c == -1) { - return -1; - } - b[off] = (byte) c; - - int i = 1; - try { - for (; i < len; i++) { - c = -1; - if (in.available() > 0) - c = in.read(); - if (c == -1) { - break; - } - b[off + i] = (byte) c; - } - } catch (IOException ee) { - } - return i; - } - - @Override - public int available() throws IOException { - return in.available(); - } - - @Override - public void close() throws IOException { - in.close(); - } - - @Override - public synchronized void mark(int readlimit) { - in.mark(readlimit); - } - - @Override - public synchronized void reset() throws IOException { - in.reset(); - } - - @Override - public boolean markSupported() { - return in.markSupported(); - } -} diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mod/util/potion/ArclightPotionUtil.java b/arclight-coremod/src/main/java/io/izzel/arclight/mod/util/potion/ArclightPotionUtil.java deleted file mode 100644 index b4d35c11..00000000 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mod/util/potion/ArclightPotionUtil.java +++ /dev/null @@ -1,155 +0,0 @@ -package io.izzel.arclight.mod.util.potion; - -import com.google.common.base.Preconditions; -import com.google.common.collect.BiMap; -import com.google.common.collect.ImmutableBiMap; -import net.minecraft.potion.Effect; -import net.minecraft.potion.EffectInstance; -import org.bukkit.Color; -import org.bukkit.potion.PotionData; -import org.bukkit.potion.PotionEffect; -import org.bukkit.potion.PotionEffectType; -import org.bukkit.potion.PotionType; - -import java.util.HashMap; -import java.util.Map; - -// todo 在 Registry 事件注册各种 PotionEffectType，删掉这个类 -public abstract class ArclightPotionUtil { - private static final BiMap regular; - private static final BiMap upgradeable; - private static final BiMap extendable; - private static final Map effectTypeMap; - private static final Map forgeEffectTypeMap = new HashMap<>(); - - static { - regular = ImmutableBiMap.builder().put(PotionType.UNCRAFTABLE, "empty").put(PotionType.WATER, "water").put(PotionType.MUNDANE, "mundane").put(PotionType.THICK, "thick").put(PotionType.AWKWARD, "awkward").put(PotionType.NIGHT_VISION, "night_vision").put(PotionType.INVISIBILITY, "invisibility").put(PotionType.JUMP, "leaping").put(PotionType.FIRE_RESISTANCE, "fire_resistance").put(PotionType.SPEED, "swiftness").put(PotionType.SLOWNESS, "slowness").put(PotionType.WATER_BREATHING, "water_breathing").put(PotionType.INSTANT_HEAL, "healing").put(PotionType.INSTANT_DAMAGE, "harming").put(PotionType.POISON, "poison").put(PotionType.REGEN, "regeneration").put(PotionType.STRENGTH, "strength").put(PotionType.WEAKNESS, "weakness").put(PotionType.LUCK, "luck").put(PotionType.TURTLE_MASTER, "turtle_master").put(PotionType.SLOW_FALLING, "slow_falling").build(); - upgradeable = ImmutableBiMap.builder().put(PotionType.JUMP, "strong_leaping").put(PotionType.SPEED, "strong_swiftness").put(PotionType.INSTANT_HEAL, "strong_healing").put(PotionType.INSTANT_DAMAGE, "strong_harming").put(PotionType.POISON, "strong_poison").put(PotionType.REGEN, "strong_regeneration").put(PotionType.STRENGTH, "strong_strength").put(PotionType.SLOWNESS, "strong_slowness").put(PotionType.TURTLE_MASTER, "strong_turtle_master").build(); - extendable = ImmutableBiMap.builder().put(PotionType.NIGHT_VISION, "long_night_vision").put(PotionType.INVISIBILITY, "long_invisibility").put(PotionType.JUMP, "long_leaping").put(PotionType.FIRE_RESISTANCE, "long_fire_resistance").put(PotionType.SPEED, "long_swiftness").put(PotionType.SLOWNESS, "long_slowness").put(PotionType.WATER_BREATHING, "long_water_breathing").put(PotionType.POISON, "long_poison").put(PotionType.REGEN, "long_regeneration").put(PotionType.STRENGTH, "long_strength").put(PotionType.WEAKNESS, "long_weakness").put(PotionType.TURTLE_MASTER, "long_turtle_master").put(PotionType.SLOW_FALLING, "long_slow_falling").build(); - effectTypeMap = ImmutableBiMap.builder() - .put("effect.minecraft.speed", PotionEffectType.SPEED) - .put("effect.minecraft.slow", PotionEffectType.SLOW) - .put("effect.minecraft.fast_digging", PotionEffectType.FAST_DIGGING) - .put("effect.minecraft.slow_digging", PotionEffectType.SLOW_DIGGING) - .put("effect.minecraft.increase_damage", PotionEffectType.INCREASE_DAMAGE) - .put("effect.minecraft.heal", PotionEffectType.HEAL) - .put("effect.minecraft.harm", PotionEffectType.HARM) - .put("effect.minecraft.jump", PotionEffectType.JUMP) - .put("effect.minecraft.confusion", PotionEffectType.CONFUSION) - .put("effect.minecraft.regeneration", PotionEffectType.REGENERATION) - .put("effect.minecraft.damage_resistance", PotionEffectType.DAMAGE_RESISTANCE) - .put("effect.minecraft.fire_resistance", PotionEffectType.FIRE_RESISTANCE) - .put("effect.minecraft.water_breathing", PotionEffectType.WATER_BREATHING) - .put("effect.minecraft.invisibility", PotionEffectType.INVISIBILITY) - .put("effect.minecraft.blindness", PotionEffectType.BLINDNESS) - .put("effect.minecraft.night_vision", PotionEffectType.NIGHT_VISION) - .put("effect.minecraft.hunger", PotionEffectType.HUNGER) - .put("effect.minecraft.weakness", PotionEffectType.WEAKNESS) - .put("effect.minecraft.poison", PotionEffectType.POISON) - .put("effect.minecraft.wither", PotionEffectType.WITHER) - .put("effect.minecraft.health_boost", PotionEffectType.HEALTH_BOOST) - .put("effect.minecraft.absorption", PotionEffectType.ABSORPTION) - .put("effect.minecraft.saturation", PotionEffectType.SATURATION) - .put("effect.minecraft.glowing", PotionEffectType.GLOWING) - .put("effect.minecraft.levitation", PotionEffectType.LEVITATION) - .put("effect.minecraft.luck", PotionEffectType.LUCK) - .put("effect.minecraft.unluck", PotionEffectType.UNLUCK) - .put("effect.minecraft.slow_falling", PotionEffectType.SLOW_FALLING) - .put("effect.minecraft.conduit_power", PotionEffectType.CONDUIT_POWER) - .put("effect.minecraft.dolphins_grace", PotionEffectType.DOLPHINS_GRACE) - .put("effect.minecraft.bad_omen", PotionEffectType.BAD_OMEN) - .put("effect.minecraft.hero_of_the_village", PotionEffectType.HERO_OF_THE_VILLAGE) - .build(); - } - - private ArclightPotionUtil() { - } - - public static String fromBukkit(PotionData data) { - String type; - if (data.isUpgraded()) { - type = (String) upgradeable.get(data.getType()); - } else if (data.isExtended()) { - type = (String) extendable.get(data.getType()); - } else { - type = (String) regular.get(data.getType()); - } - - Preconditions.checkNotNull(type, "Unknown potion type from data " + data); - return "minecraft:" + type; - } - - public static PotionData toBukkit(String type) { - if (type == null) { - return new PotionData(PotionType.UNCRAFTABLE, false, false); - } else { - if (type.startsWith("minecraft:")) { - type = type.substring(10); - } - - PotionType potionType = null; - potionType = (PotionType) extendable.inverse().get(type); - if (potionType != null) { - return new PotionData(potionType, true, false); - } else { - potionType = (PotionType) upgradeable.inverse().get(type); - if (potionType != null) { - return new PotionData(potionType, false, true); - } else { - potionType = (PotionType) regular.inverse().get(type); - return potionType != null ? new PotionData(potionType, false, false) : new PotionData(PotionType.UNCRAFTABLE, false, false); - } - } - } - } - - public static EffectInstance fromBukkit(PotionEffect effect) { - Effect type = Effect.get(effect.getType().getId()); - return new EffectInstance(type, effect.getDuration(), effect.getAmplifier(), effect.isAmbient(), effect.hasParticles()); - } - - public static PotionEffectType toBukkitPotionEffectType(String effectName) { - return effectTypeMap.getOrDefault(effectName, null); - } - - public static PotionEffectType forgeToBukkit(EffectInstance effect) { - try { - int id = Effect.getId(effect.getPotion()); - String name = effect.getEffectName(); - int colorInt = effect.getPotion().getLiquidColor(); - Color color = Color.fromRGB(colorInt); - boolean isInstant = effect.getPotion().isInstant(); - return PotionEffectTypeBuilder.build(id, 1.0, name, isInstant, color); - } catch (Exception e) { - throw new IllegalStateException("can not convert forge potion effect to bukkit:" + effect.getEffectName()); - } - } - - //TODO 监听事件，提高性能，不再需要lazy - public static PotionEffectType forgeToBukkitLazy(EffectInstance effect) { - final String effectName = effect.getEffectName(); - PotionEffectType type = forgeEffectTypeMap.getOrDefault(effectName, null); - if (type == null) { - type = forgeToBukkit(effect); - forgeEffectTypeMap.put(effectName, type); - } - return type; - } - - public static PotionEffect toBukkit(EffectInstance effect) { - PotionEffectType type = toBukkitPotionEffectType(effect.getEffectName()); - if (type == null) { - type = forgeToBukkitLazy(effect); - } - int amp = effect.getAmplifier(); - int duration = effect.getDuration(); - boolean ambient = effect.isAmbient(); - boolean particles = effect.doesShowParticles(); - return new PotionEffect(type, duration, amp, ambient, particles); - } - - public static boolean equals(Effect mobEffect, PotionEffectType type) { - PotionEffectType typeV = PotionEffectType.getById(Effect.getId(mobEffect)); - return typeV.equals(type); - } -} diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mod/util/potion/PotionEffectTypeBuilder.java b/arclight-coremod/src/main/java/io/izzel/arclight/mod/util/potion/PotionEffectTypeBuilder.java deleted file mode 100644 index dd404aae..00000000 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mod/util/potion/PotionEffectTypeBuilder.java +++ /dev/null @@ -1,43 +0,0 @@ -package io.izzel.arclight.mod.util.potion; - -import org.bukkit.Color; -import org.bukkit.potion.PotionEffectType; - -public class PotionEffectTypeBuilder extends PotionEffectType { - private final double durationModifier; - private final String name; - private final boolean isInstant; - private final Color color; - - protected PotionEffectTypeBuilder(int id, double durationModifier, String name, boolean isInstant, Color color) { - super(id); - this.durationModifier = durationModifier; - this.name = name; - this.isInstant = isInstant; - this.color = color; - } - - @Override - public double getDurationModifier() { - return durationModifier; - } - - @Override - public String getName() { - return name; - } - - @Override - public boolean isInstant() { - return isInstant; - } - - @Override - public Color getColor() { - return color; - } - - public static PotionEffectTypeBuilder build(int id, double durationModifier, String name, boolean isInstant, Color color) { - return new PotionEffectTypeBuilder(id, durationModifier, name, isInstant, color); - } -} diff --git a/arclight-coremod/src/main/resources/META-INF/coremods.json b/arclight-coremod/src/main/resources/META-INF/coremods.json deleted file mode 100644 index 7a73a41b..00000000 --- a/arclight-coremod/src/main/resources/META-INF/coremods.json +++ /dev/null @@ -1,2 +0,0 @@ -{ -} \ No newline at end of file diff --git a/arclight-coremod/src/main/resources/META-INF/services/net.minecraftforge.forgespi.locating.IModLocator b/arclight-coremod/src/main/resources/META-INF/services/net.minecraftforge.forgespi.locating.IModLocator deleted file mode 100644 index 99949ed6..00000000 --- a/arclight-coremod/src/main/resources/META-INF/services/net.minecraftforge.forgespi.locating.IModLocator +++ /dev/null @@ -1 +0,0 @@ -io.izzel.arclight.mod.ArclightLocator \ No newline at end of file diff --git a/arclight-coremod/src/main/resources/arclightRedirects.js b/arclight-coremod/src/main/resources/arclightRedirects.js deleted file mode 100644 index 905528b5..00000000 --- a/arclight-coremod/src/main/resources/arclightRedirects.js +++ /dev/null @@ -1,32 +0,0 @@ -// todo 这玩意儿先不用，但是说不定以后有用呢 - -function redirectStaticFieldToMethod(classNode, source, target, type) { - var Opcodes = Java.type("org.objectweb.asm.Opcodes"); - var FieldInsnNode = Java.type("org.objectweb.asm.tree.FieldInsnNode"); - var MethodInsnNode = Java.type("org.objectweb.asm.tree.MethodInsnNode"); - var idx = source.lastIndexOf('.'); - var owner = source.substring(0, idx); - var name = source.substring(idx + 1); - var desc = "L" + type.replace('.', '/') + ";"; - var fieldInsn = new FieldInsnNode(Opcodes.GETSTATIC, owner, name, desc); - var index = target.lastIndexOf('.'); - var targetClass = target.substring(0, index).replace('.', '/'); - var targetMethod = target.substring(index + 1); - var methodInsn = new MethodInsnNode(Opcodes.INVOKESTATIC, targetClass, targetMethod, "()" + fieldInsn.desc); - classNode.methods.forEach(function (methodNode) { - var iter = methodNode.instructions.iterator(); - while (iter.hasNext()) { - var insnNode = iter.next(); - if (insnNode.opcode == fieldInsn.opcode && insnNode.name == fieldInsn.name - && insnNode.desc == fieldInsn.desc && insnNode.owner == fieldInsn.owner) { - iter.remove(); - iter.add(methodInsn); - print("replaced"); - } - } - }); -} - -function initializeCoreMod() { - return {} -} \ No newline at end of file diff --git a/arclight-forge-1.14/arclight-coremod.iml b/arclight-forge-1.14/arclight-coremod.iml new file mode 100644 index 00000000..e0cfa548 --- /dev/null +++ b/arclight-forge-1.14/arclight-coremod.iml @@ -0,0 +1,862 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/arclight-coremod/build.gradle b/arclight-forge-1.14/build.gradle similarity index 90% rename from arclight-coremod/build.gradle rename to arclight-forge-1.14/build.gradle index beb450c6..18b94e59 100644 --- a/arclight-coremod/build.gradle +++ b/arclight-forge-1.14/build.gradle @@ -9,7 +9,7 @@ buildscript { dependencies { classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '3.+', changing: true classpath 'org.spongepowered:mixingradle:0.7-SNAPSHOT' - classpath 'com.github.IzzelAliz:arclight-gradle-plugin:1.2' + classpath 'com.github.IzzelAliz:arclight-gradle-plugin:1.3' } } @@ -41,7 +41,7 @@ configurations { minecraft { mappings channel: 'stable', version: "58-$minecraftVersion" - accessTransformer = project.file('src/main/resources/META-INF/accesstransformer.cfg') + accessTransformer = project(':arclight-common').file('src/main/resources/META-INF/accesstransformer.cfg') } repositories { @@ -68,7 +68,7 @@ def embedLibs = ['org.spongepowered:mixin:0.8', 'org.ow2.asm:asm-util:6.2', dependencies { minecraft "net.minecraftforge:forge:$minecraftVersion-$forgeVersion" compile group: 'org.jetbrains', name: 'annotations', version: '19.0.0' - embed project(':arclight-common') + compile project(':arclight-common') embed project(':forge-installer') for (def lib : embedLibs) { arclight lib @@ -93,7 +93,7 @@ processResources { } jar { - manifest.attributes 'MixinConnector': 'io.izzel.arclight.mod.ArclightConnector' + manifest.attributes 'MixinConnector': 'io.izzel.arclight.common.mod.ArclightConnector' manifest.attributes 'Main-Class': 'io.izzel.arclight.server.Main' manifest.attributes 'Implementation-Title': 'Arclight' manifest.attributes 'Implementation-Version': "arclight-${project.version}-${getGitHash()}" @@ -105,6 +105,7 @@ jar { exclude "META-INF/*.RSA" exclude "LICENSE.txt" } + from(project(':arclight-common').tasks.jar.outputs.files.collect { it.isDirectory() ? it : zipTree(it) }) } remapSpigotJar { @@ -112,7 +113,7 @@ remapSpigotJar { } mixin { - add sourceSets.main, 'mixins.arclight.refmap.json' + //add sourceSets.main, 'mixins.arclight.refmap.json' } compileJava { diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/server/Main.java b/arclight-forge-1.14/src/main/java/io/izzel/arclight/server/Main.java similarity index 89% rename from arclight-coremod/src/main/java/io/izzel/arclight/server/Main.java rename to arclight-forge-1.14/src/main/java/io/izzel/arclight/server/Main.java index 89c73370..1227657c 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/server/Main.java +++ b/arclight-forge-1.14/src/main/java/io/izzel/arclight/server/Main.java @@ -2,8 +2,8 @@ package io.izzel.arclight.server; import io.izzel.arclight.api.Unsafe; import io.izzel.arclight.forgeinstaller.ForgeInstaller; -import io.izzel.arclight.mod.util.remapper.ArclightRemapper; -import io.izzel.arclight.util.EnumHelper; +import io.izzel.arclight.common.mod.util.remapper.ArclightRemapper; +import io.izzel.arclight.api.EnumHelper; import net.minecraftforge.server.ServerMain; import org.apache.logging.log4j.LogManager; @@ -26,7 +26,7 @@ public class Main { } try { System.setProperty("java.util.logging.manager", "org.apache.logging.log4j.jul.LogManager"); - System.setProperty("log4j.jul.LoggerAdapter", "io.izzel.arclight.mod.util.ArclightLoggerAdapter"); + System.setProperty("log4j.jul.LoggerAdapter", "io.izzel.arclight.common.mod.util.ArclightLoggerAdapter"); LogManager.getLogger("Arclight").info("Loading mappings ..."); Objects.requireNonNull(ArclightRemapper.INSTANCE); ServerMain.main(args); diff --git a/arclight-coremod/src/main/resources/META-INF/mods.toml b/arclight-forge-1.14/src/main/resources/META-INF/mods.toml similarity index 100% rename from arclight-coremod/src/main/resources/META-INF/mods.toml rename to arclight-forge-1.14/src/main/resources/META-INF/mods.toml diff --git a/arclight-coremod/src/main/resources/pack.mcmeta b/arclight-forge-1.14/src/main/resources/pack.mcmeta similarity index 100% rename from arclight-coremod/src/main/resources/pack.mcmeta rename to arclight-forge-1.14/src/main/resources/pack.mcmeta diff --git a/build.gradle b/build.gradle index 4d361a59..af986954 100644 --- a/build.gradle +++ b/build.gradle @@ -1,4 +1,35 @@ +import java.nio.file.* +import java.nio.file.attribute.BasicFileAttributes + allprojects { group 'io.izzel.arclight' version '1.0.0-SNAPSHOT' + + task cleanBuild { + doFirst { + def f = project.file("build/libs") + if (Files.exists(f.toPath())) { + Files.walkFileTree(f.toPath(), new SimpleFileVisitor() { + @Override + FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException { + Files.delete(file) + return FileVisitResult.CONTINUE + } + + @Override + FileVisitResult postVisitDirectory(Path dir, IOException exc) throws IOException { + Files.delete(dir) + return FileVisitResult.CONTINUE + } + }) + } + } + } } + +task collect(type: Copy) { + destinationDir = file('build/libs') + subprojects.each { p -> + from p.file('build/libs') + } +} \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index f2f81a7b..032d5d02 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,5 +1,5 @@ rootProject.name = 'arclight' -include 'arclight-coremod' +include 'arclight-forge-1.14' include 'arclight-testplugin' include 'arclight-common' include 'forge-installer'