Refactor, split out bootstrap and mod

Added missing AT

ForgeInstaller no longer been translated

arclight-common/build.gradle

@@ -23,11 +23,15 @@ arclight {
     forgeVersion = project.ext.forgeVersion
     bukkitVersion = 'v1_17_R1'
     wipeVersion = true
-    reobfVersion = false
+    reobfVersion = true
     accessTransformer = project.file('bukkit.at')
     // packageName = 'spigot'
 }
 
+configurations {
+    embed
+}
+
 java.toolchain.languageVersion = JavaLanguageVersion.of(16)
 
 minecraft {
@@ -64,6 +68,32 @@ dependencies {
     implementation "io.izzel:tools:$toolsVersion"
     implementation "io.izzel.arclight:arclight-api:$apiVersion"
     implementation project(':i18n-config')
+    embed 'net.md-5:bungeecord-chat:1.16-R0.4@jar'
+    embed "org.spigotmc:spigot-api:$minecraftVersion-R0.1-SNAPSHOT@jar"
+}
+
+jar {
+    manifest.attributes 'MixinConnector': 'io.izzel.arclight.common.mod.ArclightConnector'
+    manifest.attributes 'Implementation-Title': 'Arclight'
+    manifest.attributes 'Implementation-Version': "arclight-$minecraftVersion-${project.version}-$gitHash"
+    manifest.attributes 'Implementation-Vendor': 'Arclight Team'
+    manifest.attributes 'Implementation-Timestamp': new Date().format("yyyy-MM-dd HH:mm:ss")
+    from(configurations.embed.collect { it.isDirectory() ? it : zipTree(it) }) {
+        exclude "META-INF/MANIFEST.MF"
+        exclude "META-INF/*.SF"
+        exclude "META-INF/*.DSA"
+        exclude "META-INF/*.RSA"
+        exclude "LICENSE.txt"
+        exclude "META-INF/services/**"
+        exclude "org/apache/commons/lang/enum/**"
+    }
+    duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+}
+
+processResources {
+    filesMatching("**/mods.toml") {
+        expand 'version': "$minecraftVersion-${project.version}-$gitHash"
+    }
 }
 
 remapSpigotJar {
@@ -71,12 +101,6 @@ remapSpigotJar {
     includes.add('net/minecraft/tileentity/LecternTileEntity$LecternInventory')
 }
 
-generateArclightMeta {
-    doFirst {
-        throw new StopExecutionException()
-    }
-}
-
 mixin {
     add sourceSets.main, 'mixins.arclight.refmap.json'
 }

arclight-common/src/main/java/io/izzel/arclight/common/bridge/command/CommandNodeBridge.java

@@ -1,6 +0,0 @@
-package io.izzel.arclight.common.bridge.command;
-
-public interface CommandNodeBridge {
-
-    void bridge$removeCommand(String name);
-}

arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/advancement/AdvancementBridge.java

@@ -1,4 +1,4 @@
-package io.izzel.arclight.common.bridge.advancement;
+package io.izzel.arclight.common.bridge.core.advancement;
 
 import org.bukkit.advancement.Advancement;
 

arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/block/BlockBridge.java

@@ -1,4 +1,4 @@
-package io.izzel.arclight.common.bridge.block;
+package io.izzel.arclight.common.bridge.core.block;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.server.level.ServerLevel;

arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/block/FireBlockBridge.java

@@ -1,4 +1,4 @@
-package io.izzel.arclight.common.bridge.block;
+package io.izzel.arclight.common.bridge.core.block;
 
 import net.minecraft.world.level.block.Block;
 

arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/block/NoteBlockBridge.java

@@ -1,4 +1,4 @@
-package io.izzel.arclight.common.bridge.block;
+package io.izzel.arclight.common.bridge.core.block;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.Level;

arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/block/PortalInfoBridge.java

@@ -1,4 +1,4 @@
-package io.izzel.arclight.common.bridge.block;
+package io.izzel.arclight.common.bridge.core.block;
 
 import net.minecraft.server.level.ServerLevel;
 import org.bukkit.craftbukkit.v.event.CraftPortalEvent;

arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/block/PortalSizeBridge.java

@@ -1,4 +1,4 @@
-package io.izzel.arclight.common.bridge.block;
+package io.izzel.arclight.common.bridge.core.block;
 
 public interface PortalSizeBridge {
 

arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/command/CommandSourceBridge.java

@@ -1,4 +1,4 @@
-package io.izzel.arclight.common.bridge.command;
+package io.izzel.arclight.common.bridge.core.command;
 
 import com.mojang.brigadier.tree.CommandNode;
 import org.bukkit.command.CommandSender;

arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/command/ICommandSourceBridge.java

@@ -1,4 +1,4 @@
-package io.izzel.arclight.common.bridge.command;
+package io.izzel.arclight.common.bridge.core.command;
 
 import net.minecraft.commands.CommandSourceStack;
 import org.bukkit.command.CommandSender;

arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/command/arguments/EntityArgumentBridge.java

@@ -1,4 +1,4 @@
-package io.izzel.arclight.common.bridge.command.arguments;
+package io.izzel.arclight.common.bridge.core.command.arguments;
 
 import com.mojang.brigadier.StringReader;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;

arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/command/arguments/EntitySelectorParserBridge.java

@@ -1,4 +1,4 @@
-package io.izzel.arclight.common.bridge.command.arguments;
+package io.izzel.arclight.common.bridge.core.command.arguments;
 
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import net.minecraft.commands.arguments.selector.EntitySelector;

arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/entity/AgeableEntityBridge.java

@@ -1,4 +1,4 @@
-package io.izzel.arclight.common.bridge.entity;
+package io.izzel.arclight.common.bridge.core.entity;
 
 public interface AgeableEntityBridge extends LivingEntityBridge {
 

arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/entity/AreaEffectCloudEntityBridge.java

@@ -1,4 +1,4 @@
-package io.izzel.arclight.common.bridge.entity;
+package io.izzel.arclight.common.bridge.core.entity;
 
 public interface AreaEffectCloudEntityBridge {
 

arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/entity/EntityBridge.java

@@ -1,6 +1,6 @@
-package io.izzel.arclight.common.bridge.entity;
+package io.izzel.arclight.common.bridge.core.entity;
 
-import io.izzel.arclight.common.bridge.command.ICommandSourceBridge;
+import io.izzel.arclight.common.bridge.core.command.ICommandSourceBridge;
 import org.bukkit.craftbukkit.v.entity.CraftEntity;
 import org.bukkit.projectiles.ProjectileSource;
 

arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/entity/EntityTypeBridge.java

@@ -1,4 +1,4 @@
-package io.izzel.arclight.common.bridge.entity;
+package io.izzel.arclight.common.bridge.core.entity;
 
 import org.bukkit.event.entity.CreatureSpawnEvent;
 

arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/entity/InternalEntityBridge.java

@@ -1,4 +1,4 @@
-package io.izzel.arclight.common.bridge.entity;
+package io.izzel.arclight.common.bridge.core.entity;
 
 import net.minecraft.core.BlockPos;
 import org.bukkit.craftbukkit.v.entity.CraftEntity;

arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/entity/LivingEntityBridge.java

@@ -1,4 +1,4 @@
-package io.izzel.arclight.common.bridge.entity;
+package io.izzel.arclight.common.bridge.core.entity;
 
 import org.bukkit.craftbukkit.v.entity.CraftLivingEntity;
 import org.bukkit.event.entity.EntityPotionEffectEvent;

arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/entity/MobEntityBridge.java

@@ -1,4 +1,4 @@
-package io.izzel.arclight.common.bridge.entity;
+package io.izzel.arclight.common.bridge.core.entity;
 
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.entity.LivingEntity;

arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/entity/ai/attributes/RangedAttributeBridge.java

@@ -1,4 +1,4 @@
-package io.izzel.arclight.common.bridge.entity.ai.attributes;
+package io.izzel.arclight.common.bridge.core.entity.ai.attributes;
 
 public interface RangedAttributeBridge {
 

arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/entity/merchant/IMerchantBridge.java

@@ -1,4 +1,4 @@
-package io.izzel.arclight.common.bridge.entity.merchant;
+package io.izzel.arclight.common.bridge.core.entity.merchant;
 
 import org.bukkit.craftbukkit.v.inventory.CraftMerchant;
 

arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/entity/monster/CreeperEntityBridge.java

@@ -0,0 +1,8 @@
+package io.izzel.arclight.common.bridge.core.entity.monster;
+
+import io.izzel.arclight.common.bridge.core.entity.MobEntityBridge;
+
+public interface CreeperEntityBridge extends MobEntityBridge {
+
+    void bridge$setPowered(boolean power);
+}

arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/entity/monster/EndermanEntityBridge.java

@@ -1,4 +1,4 @@
-package io.izzel.arclight.common.bridge.entity.monster;
+package io.izzel.arclight.common.bridge.core.entity.monster;
 
 import net.minecraft.world.entity.LivingEntity;
 

arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/entity/monster/piglin/PiglinBridge.java

@@ -1,4 +1,4 @@
-package io.izzel.arclight.common.bridge.entity.monster.piglin;
+package io.izzel.arclight.common.bridge.core.entity.monster.piglin;
 
 import net.minecraft.world.item.Item;
 

arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/entity/passive/AnimalEntityBridge.java

@@ -1,6 +1,6 @@
-package io.izzel.arclight.common.bridge.entity.passive;
+package io.izzel.arclight.common.bridge.core.entity.passive;
 
-import io.izzel.arclight.common.bridge.entity.MobEntityBridge;
+import io.izzel.arclight.common.bridge.core.entity.MobEntityBridge;
 import net.minecraft.world.item.ItemStack;
 
 public interface AnimalEntityBridge extends MobEntityBridge {

arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/entity/passive/FoxEntityBridge.java

@@ -1,4 +1,4 @@
-package io.izzel.arclight.common.bridge.entity.passive;
+package io.izzel.arclight.common.bridge.core.entity.passive;
 
 import java.util.UUID;
 

arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/entity/passive/TurtleEntityBridge.java

@@ -1,4 +1,4 @@
-package io.izzel.arclight.common.bridge.entity.passive;
+package io.izzel.arclight.common.bridge.core.entity.passive;
 
 public interface TurtleEntityBridge extends AnimalEntityBridge {
 

arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/entity/player/PlayerEntityBridge.java

@@ -1,7 +1,7 @@
-package io.izzel.arclight.common.bridge.entity.player;
+package io.izzel.arclight.common.bridge.core.entity.player;
 
 import com.mojang.datafixers.util.Either;
-import io.izzel.arclight.common.bridge.entity.LivingEntityBridge;
+import io.izzel.arclight.common.bridge.core.entity.LivingEntityBridge;
 import net.minecraft.core.BlockPos;
 import net.minecraft.util.Unit;
 import net.minecraft.world.entity.player.Player;

arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/entity/player/PlayerInventoryBridge.java

@@ -1,4 +1,4 @@
-package io.izzel.arclight.common.bridge.entity.player;
+package io.izzel.arclight.common.bridge.core.entity.player;
 
 import net.minecraft.world.item.ItemStack;
 

arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/entity/player/ServerPlayerEntityBridge.java

@@ -1,4 +1,4 @@
-package io.izzel.arclight.common.bridge.entity.player;
+package io.izzel.arclight.common.bridge.core.entity.player;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.network.chat.Component;

arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/entity/projectile/ArrowEntityBridge.java

@@ -1,6 +1,6 @@
-package io.izzel.arclight.common.bridge.entity.projectile;
+package io.izzel.arclight.common.bridge.core.entity.projectile;
 
-import io.izzel.arclight.common.bridge.entity.EntityBridge;
+import io.izzel.arclight.common.bridge.core.entity.EntityBridge;
 
 public interface ArrowEntityBridge extends EntityBridge {
 

arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/entity/projectile/DamagingProjectileEntityBridge.java

@@ -0,0 +1,8 @@
+package io.izzel.arclight.common.bridge.core.entity.projectile;
+
+import io.izzel.arclight.common.bridge.core.entity.EntityBridge;
+
+public interface DamagingProjectileEntityBridge extends EntityBridge {
+
+    void bridge$setBukkitYield(float yield);
+}

arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/entity/projectile/TridentEntityBridge.java

@@ -1,4 +1,4 @@
-package io.izzel.arclight.common.bridge.entity.projectile;
+package io.izzel.arclight.common.bridge.core.entity.projectile;
 
 import net.minecraft.world.item.ItemStack;
 

arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/inventory/CraftingInventoryBridge.java

@@ -1,4 +1,4 @@
-package io.izzel.arclight.common.bridge.inventory;
+package io.izzel.arclight.common.bridge.core.inventory;
 
 import net.minecraft.world.Container;
 import net.minecraft.world.entity.player.Player;

arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/inventory/IInventoryBridge.java

@@ -1,4 +1,4 @@
-package io.izzel.arclight.common.bridge.inventory;
+package io.izzel.arclight.common.bridge.core.inventory;
 
 import io.izzel.arclight.common.mod.ArclightMod;
 import io.izzel.arclight.common.mod.util.WrappedContents;

arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/inventory/container/ContainerBridge.java

@@ -1,4 +1,4 @@
-package io.izzel.arclight.common.bridge.inventory.container;
+package io.izzel.arclight.common.bridge.core.inventory.container;
 
 import net.minecraft.network.chat.Component;
 import net.minecraft.world.inventory.AbstractContainerMenu;

arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/inventory/container/LecternContainerBridge.java

@@ -1,4 +1,4 @@
-package io.izzel.arclight.common.bridge.inventory.container;
+package io.izzel.arclight.common.bridge.core.inventory.container;
 
 import net.minecraft.world.entity.player.Inventory;
 

arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/inventory/container/PosContainerBridge.java

@@ -1,6 +1,6 @@
-package io.izzel.arclight.common.bridge.inventory.container;
+package io.izzel.arclight.common.bridge.core.inventory.container;
 
-import io.izzel.arclight.common.bridge.util.IWorldPosCallableBridge;
+import io.izzel.arclight.common.bridge.core.util.IWorldPosCallableBridge;
 import net.minecraft.world.inventory.ContainerLevelAccess;
 import org.bukkit.Location;
 

arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/inventory/container/SlotBridge.java

@@ -1,4 +1,4 @@
-package io.izzel.arclight.common.bridge.inventory.container;
+package io.izzel.arclight.common.bridge.core.inventory.container;
 
 public interface SlotBridge {
 

arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/item/ItemStackBridge.java

@@ -1,4 +1,4 @@
-package io.izzel.arclight.common.bridge.item;
+package io.izzel.arclight.common.bridge.core.item;
 
 import net.minecraft.nbt.CompoundTag;
 

arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/item/MerchantOfferBridge.java

@@ -1,4 +1,4 @@
-package io.izzel.arclight.common.bridge.item;
+package io.izzel.arclight.common.bridge.core.item;
 
 import org.bukkit.craftbukkit.v.inventory.CraftMerchantRecipe;
 

arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/item/crafting/IRecipeBridge.java

@@ -1,4 +1,4 @@
-package io.izzel.arclight.common.bridge.item.crafting;
+package io.izzel.arclight.common.bridge.core.item.crafting;
 
 import org.bukkit.inventory.Recipe;
 

arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/item/crafting/IngredientBridge.java

@@ -1,4 +1,4 @@
-package io.izzel.arclight.common.bridge.item.crafting;
+package io.izzel.arclight.common.bridge.core.item.crafting;
 
 public interface IngredientBridge {
 

arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/item/crafting/RecipeManagerBridge.java

@@ -1,4 +1,4 @@
-package io.izzel.arclight.common.bridge.item.crafting;
+package io.izzel.arclight.common.bridge.core.item.crafting;
 
 import net.minecraft.world.item.crafting.Recipe;
 

arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/network/NetworkManagerBridge.java

@@ -1,4 +1,4 @@
-package io.izzel.arclight.common.bridge.network;
+package io.izzel.arclight.common.bridge.core.network;
 
 import com.mojang.authlib.properties.Property;
 

arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/network/datasync/EntityDataManagerBridge.java

@@ -1,4 +1,4 @@
-package io.izzel.arclight.common.bridge.network.datasync;
+package io.izzel.arclight.common.bridge.core.network.datasync;
 
 import net.minecraft.network.syncher.EntityDataAccessor;
 

arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/network/login/ServerLoginNetHandlerBridge.java

@@ -1,4 +1,4 @@
-package io.izzel.arclight.common.bridge.network.login;
+package io.izzel.arclight.common.bridge.core.network.login;
 
 public interface ServerLoginNetHandlerBridge {
 

arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/network/play/ServerPlayNetHandlerBridge.java

@@ -1,4 +1,4 @@
-package io.izzel.arclight.common.bridge.network.play;
+package io.izzel.arclight.common.bridge.core.network.play;
 
 import org.bukkit.Location;
 import org.bukkit.event.player.PlayerTeleportEvent;

arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/network/play/TimestampedPacket.java

@@ -1,4 +1,4 @@
-package io.izzel.arclight.common.bridge.network.play;
+package io.izzel.arclight.common.bridge.core.network.play;
 
 public interface TimestampedPacket {
 

arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/network/rcon/RConConsoleSourceBridge.java

@@ -1,4 +1,4 @@
-package io.izzel.arclight.common.bridge.network.rcon;
+package io.izzel.arclight.common.bridge.core.network.rcon;
 
 public interface RConConsoleSourceBridge {
 

arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/server/CustomServerBossInfoBridge.java

@@ -1,4 +1,4 @@
-package io.izzel.arclight.common.bridge.server;
+package io.izzel.arclight.common.bridge.core.server;
 
 import org.bukkit.boss.KeyedBossBar;
 

arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/server/MinecraftServerBridge.java

@@ -1,4 +1,4 @@
-package io.izzel.arclight.common.bridge.server;
+package io.izzel.arclight.common.bridge.core.server;
 
 import net.minecraft.commands.Commands;
 import org.bukkit.command.ConsoleCommandSender;

arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/server/management/BanEntryBridge.java

@@ -1,4 +1,4 @@
-package io.izzel.arclight.common.bridge.server.management;
+package io.izzel.arclight.common.bridge.core.server.management;
 
 import java.util.Date;
 

arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/server/management/PlayerInteractionManagerBridge.java

@@ -1,4 +1,4 @@
-package io.izzel.arclight.common.bridge.server.management;
+package io.izzel.arclight.common.bridge.core.server.management;
 
 public interface PlayerInteractionManagerBridge {
 

arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/server/management/PlayerListBridge.java

@@ -1,4 +1,4 @@
-package io.izzel.arclight.common.bridge.server.management;
+package io.izzel.arclight.common.bridge.core.server.management;
 
 import com.mojang.authlib.GameProfile;
 import org.bukkit.craftbukkit.v.CraftServer;

arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/server/management/UserListBridge.java

@@ -1,4 +1,4 @@
-package io.izzel.arclight.common.bridge.server.management;
+package io.izzel.arclight.common.bridge.core.server.management;
 
 import java.util.Collection;
 

arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/tags/NetworkTagCollectionBridge.java

@@ -1,4 +1,4 @@
-package io.izzel.arclight.common.bridge.tags;
+package io.izzel.arclight.common.bridge.core.tags;
 
 public interface NetworkTagCollectionBridge {
 

arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/tileentity/AbstractFurnaceTileEntityBridge.java

@@ -1,4 +1,4 @@
-package io.izzel.arclight.common.bridge.tileentity;
+package io.izzel.arclight.common.bridge.core.tileentity;
 
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.item.ItemStack;

arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/tileentity/BeaconTileEntityBridge.java

@@ -1,4 +1,4 @@
-package io.izzel.arclight.common.bridge.tileentity;
+package io.izzel.arclight.common.bridge.core.tileentity;
 
 import org.bukkit.potion.PotionEffect;
 

arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/tileentity/SignTileEntityBridge.java

@@ -1,4 +1,4 @@
-package io.izzel.arclight.common.bridge.tileentity;
+package io.izzel.arclight.common.bridge.core.tileentity;
 
 public interface SignTileEntityBridge {
 

arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/tileentity/TileEntityBridge.java

@@ -1,4 +1,4 @@
-package io.izzel.arclight.common.bridge.tileentity;
+package io.izzel.arclight.common.bridge.core.tileentity;
 
 import org.bukkit.inventory.InventoryHolder;
 

arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/util/DamageSourceBridge.java

@@ -1,4 +1,4 @@
-package io.izzel.arclight.common.bridge.util;
+package io.izzel.arclight.common.bridge.core.util;
 
 import net.minecraft.world.damagesource.DamageSource;
 

arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/util/FoodStatsBridge.java

@@ -1,4 +1,4 @@
-package io.izzel.arclight.common.bridge.util;
+package io.izzel.arclight.common.bridge.core.util;
 
 import net.minecraft.world.entity.player.Player;
 

arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/util/IWorldPosCallableBridge.java

@@ -1,6 +1,6 @@
-package io.izzel.arclight.common.bridge.util;
+package io.izzel.arclight.common.bridge.core.util;
 
-import io.izzel.arclight.common.bridge.world.WorldBridge;
+import io.izzel.arclight.common.bridge.core.world.WorldBridge;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.inventory.ContainerLevelAccess;
 import net.minecraft.world.level.Level;

arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/util/IndirectEntityDamageSourceBridge.java

@@ -1,4 +1,4 @@
-package io.izzel.arclight.common.bridge.util;
+package io.izzel.arclight.common.bridge.core.util;
 
 import net.minecraft.world.entity.Entity;
 

arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/util/text/ITextComponentBridge.java

@@ -1,4 +1,4 @@
-package io.izzel.arclight.common.bridge.util.text;
+package io.izzel.arclight.common.bridge.core.util.text;
 
 import java.util.Iterator;
 import java.util.stream.Stream;

arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/world/ExplosionBridge.java

@@ -1,4 +1,4 @@
-package io.izzel.arclight.common.bridge.world;
+package io.izzel.arclight.common.bridge.core.world;
 
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.level.Explosion;

arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/world/IBlockReaderBridge.java

@@ -1,4 +1,4 @@
-package io.izzel.arclight.common.bridge.world;
+package io.izzel.arclight.common.bridge.core.world;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.ClipContext;

arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/world/IWorldBridge.java

@@ -1,4 +1,4 @@
-package io.izzel.arclight.common.bridge.world;
+package io.izzel.arclight.common.bridge.core.world;
 
 import net.minecraft.server.level.ServerLevel;
 

arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/world/IWorldWriterBridge.java

@@ -1,4 +1,4 @@
-package io.izzel.arclight.common.bridge.world;
+package io.izzel.arclight.common.bridge.core.world;
 
 import net.minecraft.world.entity.Entity;
 import org.bukkit.event.entity.CreatureSpawnEvent;

arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/world/TeleporterBridge.java

@@ -1,4 +1,4 @@
-package io.izzel.arclight.common.bridge.world;
+package io.izzel.arclight.common.bridge.core.world;
 
 import java.util.Optional;
 import net.minecraft.BlockUtil;

arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/world/TrackedEntityBridge.java

@@ -1,4 +1,4 @@
-package io.izzel.arclight.common.bridge.world;
+package io.izzel.arclight.common.bridge.core.world;
 
 import java.util.Set;
 import net.minecraft.server.level.ServerPlayer;

arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/world/WorldBridge.java

@@ -1,4 +1,4 @@
-package io.izzel.arclight.common.bridge.world;
+package io.izzel.arclight.common.bridge.core.world;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.resources.ResourceKey;

arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/world/border/WorldBorderBridge.java

@@ -1,4 +1,4 @@
-package io.izzel.arclight.common.bridge.world.border;
+package io.izzel.arclight.common.bridge.core.world.border;
 
 import net.minecraft.world.level.Level;
 

arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/world/chunk/ChunkBridge.java

@@ -1,4 +1,4 @@
-package io.izzel.arclight.common.bridge.world.chunk;
+package io.izzel.arclight.common.bridge.core.world.chunk;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.block.state.BlockState;

arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/world/chunk/storage/RegionFileCacheBridge.java

@@ -1,4 +1,4 @@
-package io.izzel.arclight.common.bridge.world.chunk.storage;
+package io.izzel.arclight.common.bridge.core.world.chunk.storage;
 
 import java.io.IOException;
 import net.minecraft.world.level.ChunkPos;

arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/world/raid/RaidBridge.java

@@ -1,4 +1,4 @@
-package io.izzel.arclight.common.bridge.world.raid;
+package io.izzel.arclight.common.bridge.core.world.raid;
 
 import java.util.Collection;
 import net.minecraft.world.entity.raid.Raider;

arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/world/server/ChunkHolderBridge.java

@@ -1,4 +1,4 @@
-package io.izzel.arclight.common.bridge.world.server;
+package io.izzel.arclight.common.bridge.core.world.server;
 
 import net.minecraft.world.level.chunk.LevelChunk;
 

arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/world/server/ChunkMapBridge.java

@@ -1,4 +1,4 @@
-package io.izzel.arclight.common.bridge.world.server;
+package io.izzel.arclight.common.bridge.core.world.server;
 
 import io.izzel.arclight.common.mod.util.ArclightCallbackExecutor;
 import net.minecraft.server.level.ChunkHolder;

arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/world/server/ServerChunkProviderBridge.java

@@ -1,4 +1,4 @@
-package io.izzel.arclight.common.bridge.world.server;
+package io.izzel.arclight.common.bridge.core.world.server;
 
 import java.io.IOException;
 import net.minecraft.server.level.ThreadedLevelLightEngine;

arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/world/server/ServerWorldBridge.java

@@ -1,8 +1,8 @@
-package io.izzel.arclight.common.bridge.world.server;
+package io.izzel.arclight.common.bridge.core.world.server;
 
 import org.bukkit.event.entity.CreatureSpawnEvent;
 import org.bukkit.event.weather.LightningStrikeEvent;
-import io.izzel.arclight.common.bridge.world.WorldBridge;
+import io.izzel.arclight.common.bridge.core.world.WorldBridge;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.particles.ParticleOptions;
 import net.minecraft.world.entity.Entity;

arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/world/server/TicketManagerBridge.java

@@ -1,4 +1,4 @@
-package io.izzel.arclight.common.bridge.world.server;
+package io.izzel.arclight.common.bridge.core.world.server;
 
 import net.minecraft.server.level.Ticket;
 import net.minecraft.server.level.TicketType;

arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/world/server/TicketTypeBridge.java

@@ -1,4 +1,4 @@
-package io.izzel.arclight.common.bridge.world.server;
+package io.izzel.arclight.common.bridge.core.world.server;
 
 public interface TicketTypeBridge {
 

arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/world/spawner/WorldEntitySpawnerBridge.java

@@ -1,4 +1,4 @@
-package io.izzel.arclight.common.bridge.world.spawner;
+package io.izzel.arclight.common.bridge.core.world.spawner;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.entity.EntityType;

arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/world/storage/DerivedWorldInfoBridge.java

@@ -1,4 +1,4 @@
-package io.izzel.arclight.common.bridge.world.storage;
+package io.izzel.arclight.common.bridge.core.world.storage;
 
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.world.level.dimension.DimensionType;

arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/world/storage/MapDataBridge.java

@@ -1,4 +1,4 @@
-package io.izzel.arclight.common.bridge.world.storage;
+package io.izzel.arclight.common.bridge.core.world.storage;
 
 import net.minecraft.world.level.saveddata.maps.MapItemSavedData;
 import org.bukkit.craftbukkit.v.map.CraftMapView;

arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/world/storage/PlayerDataBridge.java

@@ -1,4 +1,4 @@
-package io.izzel.arclight.common.bridge.world.storage;
+package io.izzel.arclight.common.bridge.core.world.storage;
 
 import java.io.File;
 import net.minecraft.nbt.CompoundTag;

arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/world/storage/SaveFormatBridge.java

@@ -1,4 +1,4 @@
-package io.izzel.arclight.common.bridge.world.storage;
+package io.izzel.arclight.common.bridge.core.world.storage;
 
 import java.io.IOException;
 import net.minecraft.resources.ResourceKey;

arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/world/storage/WorldInfoBridge.java

@@ -1,4 +1,4 @@
-package io.izzel.arclight.common.bridge.world.storage;
+package io.izzel.arclight.common.bridge.core.world.storage;
 
 import com.mojang.serialization.Lifecycle;
 import net.minecraft.server.level.ServerLevel;

arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/world/storage/loot/LootTableBridge.java

@@ -1,4 +1,4 @@
-package io.izzel.arclight.common.bridge.world.storage.loot;
+package io.izzel.arclight.common.bridge.core.world.storage.loot;
 
 import net.minecraft.world.Container;
 import net.minecraft.world.level.storage.loot.LootContext;

arclight-common/src/main/java/io/izzel/arclight/common/bridge/entity/monster/CreeperEntityBridge.java

@@ -1,8 +0,0 @@
-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);
-}

arclight-common/src/main/java/io/izzel/arclight/common/bridge/entity/projectile/DamagingProjectileEntityBridge.java

@@ -1,8 +0,0 @@
-package io.izzel.arclight.common.bridge.entity.projectile;
-
-import io.izzel.arclight.common.bridge.entity.EntityBridge;
-
-public interface DamagingProjectileEntityBridge extends EntityBridge {
-
-    void bridge$setBukkitYield(float yield);
-}

arclight-common/src/main/java/io/izzel/arclight/common/bridge/optimization/EntityBridge_ActivationRange.java

@@ -1,4 +1,4 @@
-package io.izzel.arclight.impl.bridge;
+package io.izzel.arclight.common.bridge.optimization;
 
 public interface EntityBridge_ActivationRange {
 

arclight-common/src/main/java/io/izzel/arclight/common/mixin/bukkit/CraftEventFactoryMixin.java

@@ -1,7 +1,7 @@
 package io.izzel.arclight.common.mixin.bukkit;
 
 import com.google.common.base.Function;
-import io.izzel.arclight.common.bridge.entity.EntityBridge;
+import io.izzel.arclight.common.bridge.core.entity.EntityBridge;
 import io.izzel.arclight.common.mod.ArclightMod;
 import io.izzel.arclight.common.mod.util.ArclightCaptures;
 import org.bukkit.Bukkit;

arclight-common/src/main/java/io/izzel/arclight/common/mixin/bukkit/CraftItemStackMixin.java

@@ -2,7 +2,7 @@ package io.izzel.arclight.common.mixin.bukkit;
 
 import io.izzel.arclight.common.bridge.bukkit.CraftItemStackBridge;
 import io.izzel.arclight.common.bridge.bukkit.ItemMetaBridge;
-import io.izzel.arclight.common.bridge.item.ItemStackBridge;
+import io.izzel.arclight.common.bridge.core.item.ItemStackBridge;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.world.item.ItemStack;
 import org.bukkit.Material;

arclight-common/src/main/java/io/izzel/arclight/common/mixin/bukkit/CraftServerMixin.java

@@ -3,7 +3,7 @@ package io.izzel.arclight.common.mixin.bukkit;
 import com.mojang.brigadier.ParseResults;
 import com.mojang.brigadier.StringReader;
 import io.izzel.arclight.common.bridge.bukkit.CraftServerBridge;
-import io.izzel.arclight.common.bridge.world.WorldBridge;
+import io.izzel.arclight.common.bridge.core.world.WorldBridge;
 import io.izzel.arclight.common.mod.server.ArclightServer;
 import jline.console.ConsoleReader;
 import net.minecraft.commands.CommandSourceStack;

arclight-common/src/main/java/io/izzel/arclight/common/mixin/bukkit/CraftWorldMixin.java

@@ -1,7 +1,7 @@
 package io.izzel.arclight.common.mixin.bukkit;
 
 import io.izzel.arclight.common.bridge.bukkit.EntityTypeBridge;
-import io.izzel.arclight.common.bridge.world.server.ServerWorldBridge;
+import io.izzel.arclight.common.bridge.core.world.server.ServerWorldBridge;
 import org.bukkit.Location;
 import org.bukkit.craftbukkit.v.CraftWorld;
 import org.bukkit.entity.Entity;

arclight-common/src/main/java/io/izzel/arclight/common/mixin/bukkit/MaterialMixin.java

@@ -1,7 +1,7 @@
 package io.izzel.arclight.common.mixin.bukkit;
 
 import com.google.common.collect.ImmutableMap;
-import io.izzel.arclight.common.bridge.block.FireBlockBridge;
+import io.izzel.arclight.common.bridge.core.block.FireBlockBridge;
 import io.izzel.arclight.common.bridge.bukkit.MaterialBridge;
 import io.izzel.arclight.common.mod.ArclightMod;
 import io.izzel.arclight.common.mod.server.block.ArclightTileInventory;

arclight-common/src/main/java/io/izzel/arclight/common/mixin/bukkit/PluginClassLoaderMixin.java

@@ -1,7 +1,6 @@
 package io.izzel.arclight.common.mixin.bukkit;
 
 import com.google.common.io.ByteStreams;
-import io.izzel.arclight.common.asm.SwitchTableFixer;
 import io.izzel.arclight.common.bridge.bukkit.JavaPluginLoaderBridge;
 import io.izzel.arclight.common.mod.util.remapper.ArclightRemapper;
 import io.izzel.arclight.common.mod.util.remapper.ClassLoaderRemapper;
@@ -75,7 +74,7 @@ public class PluginClassLoaderMixin extends URLClassLoader implements RemappingC
                     byteSource = () -> {
                         try (InputStream is = connection.getInputStream()) {
                             byte[] classBytes = ByteStreams.toByteArray(is);
-                            classBytes = SwitchTableFixer.INSTANCE.processClass(classBytes);
+                            classBytes = ArclightRemapper.SWITCH_TABLE_FIXER.apply(classBytes);
                             classBytes = Bukkit.getUnsafe().processClass(description, path, classBytes);
                             return classBytes;
                         }

arclight-common/src/main/java/io/izzel/arclight/common/mixin/bukkit/RecipeIteratorMixin.java

@@ -1,6 +1,6 @@
 package io.izzel.arclight.common.mixin.bukkit;
 
-import io.izzel.arclight.common.bridge.item.crafting.IRecipeBridge;
+import io.izzel.arclight.common.bridge.core.item.crafting.IRecipeBridge;
 import org.bukkit.craftbukkit.v.inventory.RecipeIterator;
 import org.bukkit.inventory.Recipe;
 import org.spongepowered.asm.mixin.Final;