diff --git a/src/main/java/vazkii/quark/addons/oddities/module/BackpackModule.java b/src/main/java/vazkii/quark/addons/oddities/module/BackpackModule.java index ca79ca35d4..d18fadd2a2 100644 --- a/src/main/java/vazkii/quark/addons/oddities/module/BackpackModule.java +++ b/src/main/java/vazkii/quark/addons/oddities/module/BackpackModule.java @@ -47,7 +47,7 @@ import vazkii.zeta.event.ZCommonSetup; import vazkii.zeta.event.ZRegister; import vazkii.zeta.event.bus.LoadEvent; -import vazkii.zeta.event.client.ZClientSetup; +import vazkii.zeta.client.event.ZClientSetup; @LoadModule(category = "oddities", hasSubscriptions = true) public class BackpackModule extends ZetaModule { diff --git a/src/main/java/vazkii/quark/addons/oddities/module/CrateModule.java b/src/main/java/vazkii/quark/addons/oddities/module/CrateModule.java index 34627ebb0a..1d2f85292f 100644 --- a/src/main/java/vazkii/quark/addons/oddities/module/CrateModule.java +++ b/src/main/java/vazkii/quark/addons/oddities/module/CrateModule.java @@ -19,7 +19,7 @@ import vazkii.quark.base.module.hint.Hint; import vazkii.zeta.event.ZRegister; import vazkii.zeta.event.bus.LoadEvent; -import vazkii.zeta.event.client.ZClientSetup; +import vazkii.zeta.client.event.ZClientSetup; @LoadModule(category = "oddities") public class CrateModule extends ZetaModule { diff --git a/src/main/java/vazkii/quark/addons/oddities/module/MagnetsModule.java b/src/main/java/vazkii/quark/addons/oddities/module/MagnetsModule.java index a509058640..21cd94d5da 100644 --- a/src/main/java/vazkii/quark/addons/oddities/module/MagnetsModule.java +++ b/src/main/java/vazkii/quark/addons/oddities/module/MagnetsModule.java @@ -25,7 +25,7 @@ import vazkii.quark.base.module.hint.Hint; import vazkii.zeta.event.ZRegister; import vazkii.zeta.event.bus.LoadEvent; -import vazkii.zeta.event.client.ZClientSetup; +import vazkii.zeta.client.event.ZClientSetup; @LoadModule(category = "oddities", hasSubscriptions = true) public class MagnetsModule extends ZetaModule { diff --git a/src/main/java/vazkii/quark/addons/oddities/module/MatrixEnchantingModule.java b/src/main/java/vazkii/quark/addons/oddities/module/MatrixEnchantingModule.java index 27cc62376e..9f45c029bf 100644 --- a/src/main/java/vazkii/quark/addons/oddities/module/MatrixEnchantingModule.java +++ b/src/main/java/vazkii/quark/addons/oddities/module/MatrixEnchantingModule.java @@ -31,7 +31,7 @@ import vazkii.zeta.event.ZRegister; import vazkii.zeta.event.bus.LoadEvent; import vazkii.zeta.event.bus.PlayEvent; -import vazkii.zeta.event.client.ZClientSetup; +import vazkii.zeta.client.event.ZClientSetup; import vazkii.zeta.util.ItemNBTHelper; import vazkii.quark.addons.oddities.block.MatrixEnchantingTableBlock; import vazkii.quark.addons.oddities.block.be.MatrixEnchantingTableBlockEntity; diff --git a/src/main/java/vazkii/quark/addons/oddities/module/PipesModule.java b/src/main/java/vazkii/quark/addons/oddities/module/PipesModule.java index ba87a2a30b..1c081b5222 100644 --- a/src/main/java/vazkii/quark/addons/oddities/module/PipesModule.java +++ b/src/main/java/vazkii/quark/addons/oddities/module/PipesModule.java @@ -23,8 +23,8 @@ import vazkii.zeta.event.ZConfigChanged; import vazkii.zeta.event.ZRegister; import vazkii.zeta.event.bus.LoadEvent; -import vazkii.zeta.event.client.ZAddModels; -import vazkii.zeta.event.client.ZClientSetup; +import vazkii.zeta.client.event.ZAddModels; +import vazkii.zeta.client.event.ZClientSetup; @LoadModule(category = "oddities") public class PipesModule extends ZetaModule { diff --git a/src/main/java/vazkii/quark/addons/oddities/module/TinyPotatoModule.java b/src/main/java/vazkii/quark/addons/oddities/module/TinyPotatoModule.java index 471f1d5384..e91cafa03e 100644 --- a/src/main/java/vazkii/quark/addons/oddities/module/TinyPotatoModule.java +++ b/src/main/java/vazkii/quark/addons/oddities/module/TinyPotatoModule.java @@ -29,9 +29,9 @@ import vazkii.quark.base.module.hint.Hint; import vazkii.zeta.event.ZRegister; import vazkii.zeta.event.bus.LoadEvent; -import vazkii.zeta.event.client.ZAddModels; -import vazkii.zeta.event.client.ZClientSetup; -import vazkii.zeta.event.client.ZModelBakingCompleted; +import vazkii.zeta.client.event.ZAddModels; +import vazkii.zeta.client.event.ZClientSetup; +import vazkii.zeta.client.event.ZModelBakingCompleted; @LoadModule(category = "oddities", antiOverlap = "botania", hasSubscriptions = true, subscribeOn = Dist.CLIENT) public class TinyPotatoModule extends ZetaModule { diff --git a/src/main/java/vazkii/quark/addons/oddities/module/TotemOfHoldingModule.java b/src/main/java/vazkii/quark/addons/oddities/module/TotemOfHoldingModule.java index 2e099ea3b0..ab72593fe2 100644 --- a/src/main/java/vazkii/quark/addons/oddities/module/TotemOfHoldingModule.java +++ b/src/main/java/vazkii/quark/addons/oddities/module/TotemOfHoldingModule.java @@ -29,8 +29,8 @@ import vazkii.quark.base.module.config.Config; import vazkii.zeta.event.ZRegister; import vazkii.zeta.event.bus.LoadEvent; -import vazkii.zeta.event.client.ZAddModels; -import vazkii.zeta.event.client.ZClientSetup; +import vazkii.zeta.client.event.ZAddModels; +import vazkii.zeta.client.event.ZClientSetup; /** * @author WireSegal diff --git a/src/main/java/vazkii/quark/base/client/handler/InventoryButtonHandler.java b/src/main/java/vazkii/quark/base/client/handler/InventoryButtonHandler.java index b4cffa4c37..4b3d72e823 100644 --- a/src/main/java/vazkii/quark/base/client/handler/InventoryButtonHandler.java +++ b/src/main/java/vazkii/quark/base/client/handler/InventoryButtonHandler.java @@ -35,7 +35,7 @@ import vazkii.quark.base.handler.GeneralConfig; import vazkii.quark.base.handler.InventoryTransferHandler; import vazkii.zeta.module.ZetaModule; -import vazkii.zeta.event.client.ZKeyMapping; +import vazkii.zeta.client.event.ZKeyMapping; public final class InventoryButtonHandler { diff --git a/src/main/java/vazkii/quark/base/client/handler/ModKeybindHandler.java b/src/main/java/vazkii/quark/base/client/handler/ModKeybindHandler.java index 5f9d6e08c2..88ece59d06 100644 --- a/src/main/java/vazkii/quark/base/client/handler/ModKeybindHandler.java +++ b/src/main/java/vazkii/quark/base/client/handler/ModKeybindHandler.java @@ -8,12 +8,11 @@ import net.minecraft.client.KeyMapping; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -import net.minecraftforge.client.event.RegisterKeyMappingsEvent; import net.minecraftforge.client.settings.KeyModifier; import vazkii.quark.base.client.util.PredicatedKeyBinding; import vazkii.quark.base.client.util.SortedKeyBinding; import vazkii.quark.base.client.util.SortedPredicatedKeyBinding; -import vazkii.zeta.event.client.ZKeyMapping; +import vazkii.zeta.client.event.ZKeyMapping; @OnlyIn(Dist.CLIENT) public class ModKeybindHandler { diff --git a/src/main/java/vazkii/quark/base/handler/DyeHandler.java b/src/main/java/vazkii/quark/base/handler/DyeHandler.java index 3c97977222..0abe277139 100644 --- a/src/main/java/vazkii/quark/base/handler/DyeHandler.java +++ b/src/main/java/vazkii/quark/base/handler/DyeHandler.java @@ -22,7 +22,7 @@ import vazkii.quark.base.recipe.DyeRecipe; import vazkii.zeta.event.ZRegister; import vazkii.zeta.event.bus.LoadEvent; -import vazkii.zeta.event.client.ZAddItemColorHandlers; +import vazkii.zeta.client.event.ZAddItemColorHandlers; import javax.annotation.Nonnull; import java.util.HashMap; diff --git a/src/main/java/vazkii/quark/base/handler/RenderLayerHandler.java b/src/main/java/vazkii/quark/base/handler/RenderLayerHandler.java index bad1ae45df..ff29663df1 100644 --- a/src/main/java/vazkii/quark/base/handler/RenderLayerHandler.java +++ b/src/main/java/vazkii/quark/base/handler/RenderLayerHandler.java @@ -7,7 +7,7 @@ import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.fml.DistExecutor; import vazkii.zeta.event.bus.LoadEvent; -import vazkii.zeta.event.client.ZClientSetup; +import vazkii.zeta.client.event.ZClientSetup; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/vazkii/quark/base/handler/WoodSetHandler.java b/src/main/java/vazkii/quark/base/handler/WoodSetHandler.java index fc6657bfbb..868a0955f7 100644 --- a/src/main/java/vazkii/quark/base/handler/WoodSetHandler.java +++ b/src/main/java/vazkii/quark/base/handler/WoodSetHandler.java @@ -34,7 +34,7 @@ import vazkii.zeta.event.ZCommonSetup; import vazkii.zeta.event.ZRegister; import vazkii.zeta.event.bus.LoadEvent; -import vazkii.zeta.event.client.ZClientSetup; +import vazkii.zeta.client.event.ZClientSetup; import java.util.*; import java.util.stream.Stream; diff --git a/src/main/java/vazkii/quark/base/proxy/ClientProxy.java b/src/main/java/vazkii/quark/base/proxy/ClientProxy.java index 2aeebf1218..05ce8c4884 100644 --- a/src/main/java/vazkii/quark/base/proxy/ClientProxy.java +++ b/src/main/java/vazkii/quark/base/proxy/ClientProxy.java @@ -33,8 +33,8 @@ import vazkii.quark.base.network.QuarkNetwork; import vazkii.quark.base.network.message.structural.C2SUpdateFlag; import vazkii.quark.mixin.client.accessor.AccessorMultiPlayerGameMode; -import vazkii.zeta.event.client.ZClientModulesReady; -import vazkii.zeta.event.client.ZConfigChangedClient; +import vazkii.zeta.client.event.ZClientModulesReady; +import vazkii.zeta.client.event.ZConfigChangedClient; import java.io.File; import java.io.FileOutputStream; diff --git a/src/main/java/vazkii/quark/content/automation/module/GravisandModule.java b/src/main/java/vazkii/quark/content/automation/module/GravisandModule.java index ac441cbd24..b143971270 100755 --- a/src/main/java/vazkii/quark/content/automation/module/GravisandModule.java +++ b/src/main/java/vazkii/quark/content/automation/module/GravisandModule.java @@ -16,7 +16,7 @@ import vazkii.quark.content.automation.entity.Gravisand; import vazkii.zeta.event.ZRegister; import vazkii.zeta.event.bus.LoadEvent; -import vazkii.zeta.event.client.ZClientSetup; +import vazkii.zeta.client.event.ZClientSetup; @LoadModule(category = "automation") public class GravisandModule extends ZetaModule { diff --git a/src/main/java/vazkii/quark/content/building/client/render/be/VariantChestRenderer.java b/src/main/java/vazkii/quark/content/building/client/render/be/VariantChestRenderer.java index 8ef992aa9a..86f9d10f4c 100644 --- a/src/main/java/vazkii/quark/content/building/client/render/be/VariantChestRenderer.java +++ b/src/main/java/vazkii/quark/content/building/client/render/be/VariantChestRenderer.java @@ -9,7 +9,7 @@ import vazkii.quark.base.Quark; import vazkii.quark.base.client.render.GenericChestBERenderer; import vazkii.quark.content.building.module.VariantChestsModule.IChestTextureProvider; -import vazkii.zeta.event.client.ZPreTextureStitch; +import vazkii.zeta.client.event.ZPreTextureStitch; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/vazkii/quark/content/building/module/GlassItemFrameModule.java b/src/main/java/vazkii/quark/content/building/module/GlassItemFrameModule.java index bd808650ef..fb801bca94 100644 --- a/src/main/java/vazkii/quark/content/building/module/GlassItemFrameModule.java +++ b/src/main/java/vazkii/quark/content/building/module/GlassItemFrameModule.java @@ -18,8 +18,8 @@ import vazkii.quark.content.building.item.QuarkItemFrameItem; import vazkii.zeta.event.ZRegister; import vazkii.zeta.event.bus.LoadEvent; -import vazkii.zeta.event.client.ZAddModels; -import vazkii.zeta.event.client.ZClientSetup; +import vazkii.zeta.client.event.ZAddModels; +import vazkii.zeta.client.event.ZClientSetup; /** * @author WireSegal diff --git a/src/main/java/vazkii/quark/content/building/module/MorePottedPlantsModule.java b/src/main/java/vazkii/quark/content/building/module/MorePottedPlantsModule.java index 25893b9aa6..f7e6242053 100644 --- a/src/main/java/vazkii/quark/content/building/module/MorePottedPlantsModule.java +++ b/src/main/java/vazkii/quark/content/building/module/MorePottedPlantsModule.java @@ -19,7 +19,7 @@ import vazkii.quark.base.module.hint.Hint; import vazkii.zeta.event.ZRegister; import vazkii.zeta.event.bus.LoadEvent; -import vazkii.zeta.event.client.ZClientSetup; +import vazkii.zeta.client.event.ZClientSetup; @LoadModule(category = "building") public class MorePottedPlantsModule extends ZetaModule { diff --git a/src/main/java/vazkii/quark/content/building/module/ShearVinesModule.java b/src/main/java/vazkii/quark/content/building/module/ShearVinesModule.java index da16164d93..664cd046ca 100644 --- a/src/main/java/vazkii/quark/content/building/module/ShearVinesModule.java +++ b/src/main/java/vazkii/quark/content/building/module/ShearVinesModule.java @@ -27,8 +27,8 @@ import vazkii.zeta.event.ZRightClickBlock; import vazkii.zeta.event.bus.LoadEvent; import vazkii.zeta.event.bus.PlayEvent; -import vazkii.zeta.event.client.ZAddBlockColorHandlers; -import vazkii.zeta.event.client.ZAddItemColorHandlers; +import vazkii.zeta.client.event.ZAddBlockColorHandlers; +import vazkii.zeta.client.event.ZAddItemColorHandlers; import vazkii.zeta.module.ZetaLoadModule; @ZetaLoadModule(category = "building") diff --git a/src/main/java/vazkii/quark/content/building/module/StoolsModule.java b/src/main/java/vazkii/quark/content/building/module/StoolsModule.java index a2aa84763f..3850fdf2e6 100644 --- a/src/main/java/vazkii/quark/content/building/module/StoolsModule.java +++ b/src/main/java/vazkii/quark/content/building/module/StoolsModule.java @@ -24,7 +24,7 @@ import vazkii.zeta.event.ZCommonSetup; import vazkii.zeta.event.ZRegister; import vazkii.zeta.event.bus.LoadEvent; -import vazkii.zeta.event.client.ZClientSetup; +import vazkii.zeta.client.event.ZClientSetup; @LoadModule(category = "building", hasSubscriptions = true) public class StoolsModule extends ZetaModule { diff --git a/src/main/java/vazkii/quark/content/building/module/VariantChestsModule.java b/src/main/java/vazkii/quark/content/building/module/VariantChestsModule.java index 551f8c1b91..9bea3890f6 100644 --- a/src/main/java/vazkii/quark/content/building/module/VariantChestsModule.java +++ b/src/main/java/vazkii/quark/content/building/module/VariantChestsModule.java @@ -52,8 +52,8 @@ import vazkii.zeta.event.ZLoadComplete; import vazkii.zeta.event.ZRegister; import vazkii.zeta.event.bus.LoadEvent; -import vazkii.zeta.event.client.ZClientSetup; -import vazkii.zeta.event.client.ZPreTextureStitch; +import vazkii.zeta.client.event.ZClientSetup; +import vazkii.zeta.client.event.ZPreTextureStitch; import javax.annotation.Nullable; import java.util.*; diff --git a/src/main/java/vazkii/quark/content/client/module/AutoWalkKeybindModule.java b/src/main/java/vazkii/quark/content/client/module/AutoWalkKeybindModule.java index f907253f5c..73a2ff4af0 100644 --- a/src/main/java/vazkii/quark/content/client/module/AutoWalkKeybindModule.java +++ b/src/main/java/vazkii/quark/content/client/module/AutoWalkKeybindModule.java @@ -22,7 +22,7 @@ import vazkii.zeta.module.ZetaModule; import vazkii.quark.base.module.config.Config; import vazkii.zeta.event.bus.LoadEvent; -import vazkii.zeta.event.client.ZKeyMapping; +import vazkii.zeta.client.event.ZKeyMapping; @LoadModule(category = "client", hasSubscriptions = true, subscribeOn = Dist.CLIENT) public class AutoWalkKeybindModule extends ZetaModule { diff --git a/src/main/java/vazkii/quark/content/client/module/BackButtonKeybindModule.java b/src/main/java/vazkii/quark/content/client/module/BackButtonKeybindModule.java index ce793821fa..190a456fcd 100644 --- a/src/main/java/vazkii/quark/content/client/module/BackButtonKeybindModule.java +++ b/src/main/java/vazkii/quark/content/client/module/BackButtonKeybindModule.java @@ -22,7 +22,7 @@ import vazkii.quark.base.module.LoadModule; import vazkii.zeta.module.ZetaModule; import vazkii.zeta.event.bus.LoadEvent; -import vazkii.zeta.event.client.ZKeyMapping; +import vazkii.zeta.client.event.ZKeyMapping; @LoadModule(category = "client", hasSubscriptions = true, subscribeOn = Dist.CLIENT) public class BackButtonKeybindModule extends ZetaModule { diff --git a/src/main/java/vazkii/quark/content/client/module/BucketsShowInhabitantsModule.java b/src/main/java/vazkii/quark/content/client/module/BucketsShowInhabitantsModule.java index eafdc4d4ad..c3aa62c091 100644 --- a/src/main/java/vazkii/quark/content/client/module/BucketsShowInhabitantsModule.java +++ b/src/main/java/vazkii/quark/content/client/module/BucketsShowInhabitantsModule.java @@ -19,8 +19,8 @@ import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.registries.ForgeRegistries; import vazkii.zeta.event.bus.LoadEvent; -import vazkii.zeta.event.client.ZAddItemColorHandlers; -import vazkii.zeta.event.client.ZClientSetup; +import vazkii.zeta.client.event.ZAddItemColorHandlers; +import vazkii.zeta.client.event.ZClientSetup; import vazkii.zeta.util.ItemNBTHelper; import vazkii.quark.base.Quark; import vazkii.quark.base.module.LoadModule; diff --git a/src/main/java/vazkii/quark/content/client/module/CameraModule.java b/src/main/java/vazkii/quark/content/client/module/CameraModule.java index a06b743acf..13987148f1 100644 --- a/src/main/java/vazkii/quark/content/client/module/CameraModule.java +++ b/src/main/java/vazkii/quark/content/client/module/CameraModule.java @@ -32,7 +32,7 @@ import vazkii.quark.base.module.config.Config; import vazkii.quark.content.experimental.module.OverlayShaderModule; import vazkii.zeta.event.bus.LoadEvent; -import vazkii.zeta.event.client.ZKeyMapping; +import vazkii.zeta.client.event.ZKeyMapping; import java.sql.Date; import java.text.SimpleDateFormat; diff --git a/src/main/java/vazkii/quark/content/client/module/ChestSearchingModule.java b/src/main/java/vazkii/quark/content/client/module/ChestSearchingModule.java index 2f51321ad6..4a930e4acc 100644 --- a/src/main/java/vazkii/quark/content/client/module/ChestSearchingModule.java +++ b/src/main/java/vazkii/quark/content/client/module/ChestSearchingModule.java @@ -39,7 +39,7 @@ import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.wrapper.EmptyHandler; import vazkii.zeta.event.bus.LoadEvent; -import vazkii.zeta.event.client.ZClientSetup; +import vazkii.zeta.client.event.ZClientSetup; import vazkii.zeta.util.ItemNBTHelper; import vazkii.quark.api.IQuarkButtonAllowed; import vazkii.quark.base.client.handler.InventoryButtonHandler; diff --git a/src/main/java/vazkii/quark/content/client/module/GreenerGrassModule.java b/src/main/java/vazkii/quark/content/client/module/GreenerGrassModule.java index f7334a142c..3f434fe318 100644 --- a/src/main/java/vazkii/quark/content/client/module/GreenerGrassModule.java +++ b/src/main/java/vazkii/quark/content/client/module/GreenerGrassModule.java @@ -23,7 +23,7 @@ import vazkii.quark.mixin.client.accessor.AccessorBlockColors; import vazkii.zeta.event.ZConfigChanged; import vazkii.zeta.event.bus.LoadEvent; -import vazkii.zeta.event.client.ZFirstClientTick; +import vazkii.zeta.client.event.ZFirstClientTick; @LoadModule(category = "client") public class GreenerGrassModule extends ZetaModule { diff --git a/src/main/java/vazkii/quark/content/client/module/ImprovedTooltipsModule.java b/src/main/java/vazkii/quark/content/client/module/ImprovedTooltipsModule.java index deaf9e77c5..3350e7f7e2 100644 --- a/src/main/java/vazkii/quark/content/client/module/ImprovedTooltipsModule.java +++ b/src/main/java/vazkii/quark/content/client/module/ImprovedTooltipsModule.java @@ -11,8 +11,8 @@ import net.minecraftforge.eventbus.api.SubscribeEvent; import vazkii.zeta.event.ZConfigChanged; import vazkii.zeta.event.bus.LoadEvent; -import vazkii.zeta.event.client.ZRegisterReloadListeners; -import vazkii.zeta.event.client.ZTooltipComponents; +import vazkii.zeta.client.event.ZRegisterReloadListeners; +import vazkii.zeta.client.event.ZTooltipComponents; import vazkii.zeta.util.ItemNBTHelper; import vazkii.quark.base.module.LoadModule; import vazkii.zeta.module.ZetaModule; diff --git a/src/main/java/vazkii/quark/content/client/module/UsesForCursesModule.java b/src/main/java/vazkii/quark/content/client/module/UsesForCursesModule.java index 3bc3b2d5b0..d0cf3ee061 100644 --- a/src/main/java/vazkii/quark/content/client/module/UsesForCursesModule.java +++ b/src/main/java/vazkii/quark/content/client/module/UsesForCursesModule.java @@ -21,7 +21,7 @@ import vazkii.quark.content.tweaks.client.layer.ArmorStandFakePlayerLayer; import vazkii.zeta.event.ZConfigChanged; import vazkii.zeta.event.bus.LoadEvent; -import vazkii.zeta.event.client.ZAddModelLayers; +import vazkii.zeta.client.event.ZAddModelLayers; @LoadModule(category = "client") public class UsesForCursesModule extends ZetaModule { diff --git a/src/main/java/vazkii/quark/content/client/module/VariantAnimalTexturesModule.java b/src/main/java/vazkii/quark/content/client/module/VariantAnimalTexturesModule.java index fb3fdfa72a..f4f28e815d 100644 --- a/src/main/java/vazkii/quark/content/client/module/VariantAnimalTexturesModule.java +++ b/src/main/java/vazkii/quark/content/client/module/VariantAnimalTexturesModule.java @@ -22,7 +22,7 @@ import vazkii.quark.base.module.config.Config; import vazkii.zeta.event.ZConfigChanged; import vazkii.zeta.event.bus.LoadEvent; -import vazkii.zeta.event.client.ZClientSetup; +import vazkii.zeta.client.event.ZClientSetup; import javax.annotation.Nullable; import java.util.*; diff --git a/src/main/java/vazkii/quark/content/experimental/module/AdjustableChatModule.java b/src/main/java/vazkii/quark/content/experimental/module/AdjustableChatModule.java index 7821f2bec0..cd0d60bd20 100644 --- a/src/main/java/vazkii/quark/content/experimental/module/AdjustableChatModule.java +++ b/src/main/java/vazkii/quark/content/experimental/module/AdjustableChatModule.java @@ -2,7 +2,7 @@ import vazkii.quark.base.module.config.Config; import vazkii.zeta.event.bus.PlayEvent; -import vazkii.zeta.event.client.ZRenderChat; +import vazkii.zeta.client.event.ZRenderChat; import vazkii.zeta.module.ModuleSide; import vazkii.zeta.module.ZetaLoadModule; import vazkii.zeta.module.ZetaModule; diff --git a/src/main/java/vazkii/quark/content/experimental/module/EnchantmentPredicatesModule.java b/src/main/java/vazkii/quark/content/experimental/module/EnchantmentPredicatesModule.java index 48ceb6a3c9..84cc3cda44 100644 --- a/src/main/java/vazkii/quark/content/experimental/module/EnchantmentPredicatesModule.java +++ b/src/main/java/vazkii/quark/content/experimental/module/EnchantmentPredicatesModule.java @@ -16,7 +16,7 @@ import vazkii.zeta.module.ZetaModule; import vazkii.quark.base.module.config.Config; import vazkii.zeta.event.bus.LoadEvent; -import vazkii.zeta.event.client.ZClientSetup; +import vazkii.zeta.client.event.ZClientSetup; import java.util.List; diff --git a/src/main/java/vazkii/quark/content/experimental/module/NarratorReadoutModule.java b/src/main/java/vazkii/quark/content/experimental/module/NarratorReadoutModule.java index 803b3f340c..26e5d6261c 100644 --- a/src/main/java/vazkii/quark/content/experimental/module/NarratorReadoutModule.java +++ b/src/main/java/vazkii/quark/content/experimental/module/NarratorReadoutModule.java @@ -32,7 +32,7 @@ import vazkii.quark.base.module.LoadModule; import vazkii.zeta.module.ZetaModule; import vazkii.zeta.event.bus.LoadEvent; -import vazkii.zeta.event.client.ZKeyMapping; +import vazkii.zeta.client.event.ZKeyMapping; @LoadModule(category = "experimental", enabledByDefault = false, hasSubscriptions = true, subscribeOn = Dist.CLIENT) public class NarratorReadoutModule extends ZetaModule { diff --git a/src/main/java/vazkii/quark/content/experimental/module/VariantSelectorModule.java b/src/main/java/vazkii/quark/content/experimental/module/VariantSelectorModule.java index efcc5eda3e..9363282a76 100644 --- a/src/main/java/vazkii/quark/content/experimental/module/VariantSelectorModule.java +++ b/src/main/java/vazkii/quark/content/experimental/module/VariantSelectorModule.java @@ -60,8 +60,8 @@ import vazkii.zeta.event.ZConfigChanged; import vazkii.zeta.event.ZRegister; import vazkii.zeta.event.bus.LoadEvent; -import vazkii.zeta.event.client.ZKeyMapping; -import vazkii.zeta.event.client.ZTooltipComponents; +import vazkii.zeta.client.event.ZKeyMapping; +import vazkii.zeta.client.event.ZTooltipComponents; @LoadModule(category = "experimental", hasSubscriptions = true, enabledByDefault = false, description = "Allows placing variant blocks automatically via a selector menu triggered from a keybind") diff --git a/src/main/java/vazkii/quark/content/management/module/EasyTransferingModule.java b/src/main/java/vazkii/quark/content/management/module/EasyTransferingModule.java index d701efec14..d45b77cb0c 100644 --- a/src/main/java/vazkii/quark/content/management/module/EasyTransferingModule.java +++ b/src/main/java/vazkii/quark/content/management/module/EasyTransferingModule.java @@ -13,7 +13,7 @@ import vazkii.quark.base.network.message.InventoryTransferMessage; import vazkii.quark.content.management.client.screen.widgets.MiniInventoryButton; import vazkii.zeta.event.bus.LoadEvent; -import vazkii.zeta.event.client.ZKeyMapping; +import vazkii.zeta.client.event.ZKeyMapping; @LoadModule(category = "management") public class EasyTransferingModule extends ZetaModule { diff --git a/src/main/java/vazkii/quark/content/management/module/ExpandedItemInteractionsModule.java b/src/main/java/vazkii/quark/content/management/module/ExpandedItemInteractionsModule.java index 9eaac72da5..09d327e1c8 100644 --- a/src/main/java/vazkii/quark/content/management/module/ExpandedItemInteractionsModule.java +++ b/src/main/java/vazkii/quark/content/management/module/ExpandedItemInteractionsModule.java @@ -46,7 +46,7 @@ import vazkii.zeta.event.ZConfigChanged; import vazkii.zeta.event.ZRegister; import vazkii.zeta.event.bus.LoadEvent; -import vazkii.zeta.event.client.ZClientSetup; +import vazkii.zeta.client.event.ZClientSetup; import vazkii.zeta.util.ItemNBTHelper; import vazkii.quark.base.Quark; import vazkii.quark.base.handler.GeneralConfig; diff --git a/src/main/java/vazkii/quark/content/management/module/HotbarChangerModule.java b/src/main/java/vazkii/quark/content/management/module/HotbarChangerModule.java index 39e154e647..00a27bd064 100644 --- a/src/main/java/vazkii/quark/content/management/module/HotbarChangerModule.java +++ b/src/main/java/vazkii/quark/content/management/module/HotbarChangerModule.java @@ -30,7 +30,7 @@ import vazkii.quark.base.network.QuarkNetwork; import vazkii.quark.base.network.message.ChangeHotbarMessage; import vazkii.zeta.event.bus.LoadEvent; -import vazkii.zeta.event.client.ZKeyMapping; +import vazkii.zeta.client.event.ZKeyMapping; @LoadModule(category = "management", hasSubscriptions = true, subscribeOn = Dist.CLIENT) public class HotbarChangerModule extends ZetaModule { diff --git a/src/main/java/vazkii/quark/content/management/module/InventorySortingModule.java b/src/main/java/vazkii/quark/content/management/module/InventorySortingModule.java index 2719963008..82c1b346b3 100644 --- a/src/main/java/vazkii/quark/content/management/module/InventorySortingModule.java +++ b/src/main/java/vazkii/quark/content/management/module/InventorySortingModule.java @@ -19,7 +19,7 @@ import vazkii.quark.base.network.message.SortInventoryMessage; import vazkii.quark.content.management.client.screen.widgets.MiniInventoryButton; import vazkii.zeta.event.bus.LoadEvent; -import vazkii.zeta.event.client.ZKeyMapping; +import vazkii.zeta.client.event.ZKeyMapping; @LoadModule(category = "management") public class InventorySortingModule extends ZetaModule { diff --git a/src/main/java/vazkii/quark/content/mobs/module/CrabsModule.java b/src/main/java/vazkii/quark/content/mobs/module/CrabsModule.java index 6f581d92c7..ceaa6bb1ec 100644 --- a/src/main/java/vazkii/quark/content/mobs/module/CrabsModule.java +++ b/src/main/java/vazkii/quark/content/mobs/module/CrabsModule.java @@ -44,7 +44,7 @@ import vazkii.zeta.event.ZCommonSetup; import vazkii.zeta.event.ZRegister; import vazkii.zeta.event.bus.LoadEvent; -import vazkii.zeta.event.client.ZClientSetup; +import vazkii.zeta.client.event.ZClientSetup; /** * @author WireSegal diff --git a/src/main/java/vazkii/quark/content/mobs/module/ForgottenModule.java b/src/main/java/vazkii/quark/content/mobs/module/ForgottenModule.java index 1a09767e72..4f724fae19 100644 --- a/src/main/java/vazkii/quark/content/mobs/module/ForgottenModule.java +++ b/src/main/java/vazkii/quark/content/mobs/module/ForgottenModule.java @@ -32,7 +32,7 @@ import vazkii.quark.content.mobs.item.ForgottenHatItem; import vazkii.zeta.event.ZRegister; import vazkii.zeta.event.bus.LoadEvent; -import vazkii.zeta.event.client.ZClientSetup; +import vazkii.zeta.client.event.ZClientSetup; @LoadModule(category = "mobs", hasSubscriptions = true) public class ForgottenModule extends ZetaModule { diff --git a/src/main/java/vazkii/quark/content/mobs/module/FoxhoundModule.java b/src/main/java/vazkii/quark/content/mobs/module/FoxhoundModule.java index 63ac49462b..e9b476c4bb 100644 --- a/src/main/java/vazkii/quark/content/mobs/module/FoxhoundModule.java +++ b/src/main/java/vazkii/quark/content/mobs/module/FoxhoundModule.java @@ -39,7 +39,7 @@ import vazkii.zeta.event.ZCommonSetup; import vazkii.zeta.event.ZRegister; import vazkii.zeta.event.bus.LoadEvent; -import vazkii.zeta.event.client.ZClientSetup; +import vazkii.zeta.client.event.ZClientSetup; /** * @author WireSegal diff --git a/src/main/java/vazkii/quark/content/mobs/module/ShibaModule.java b/src/main/java/vazkii/quark/content/mobs/module/ShibaModule.java index 181be4c4e1..9ab569a640 100644 --- a/src/main/java/vazkii/quark/content/mobs/module/ShibaModule.java +++ b/src/main/java/vazkii/quark/content/mobs/module/ShibaModule.java @@ -28,7 +28,7 @@ import vazkii.quark.content.mobs.entity.Shiba; import vazkii.zeta.event.ZRegister; import vazkii.zeta.event.bus.LoadEvent; -import vazkii.zeta.event.client.ZClientSetup; +import vazkii.zeta.client.event.ZClientSetup; @LoadModule(category = "mobs") public class ShibaModule extends ZetaModule { diff --git a/src/main/java/vazkii/quark/content/mobs/module/StonelingsModule.java b/src/main/java/vazkii/quark/content/mobs/module/StonelingsModule.java index 561e355b0d..b7b512c34d 100755 --- a/src/main/java/vazkii/quark/content/mobs/module/StonelingsModule.java +++ b/src/main/java/vazkii/quark/content/mobs/module/StonelingsModule.java @@ -28,7 +28,7 @@ import vazkii.zeta.event.ZCommonSetup; import vazkii.zeta.event.ZRegister; import vazkii.zeta.event.bus.LoadEvent; -import vazkii.zeta.event.client.ZClientSetup; +import vazkii.zeta.client.event.ZClientSetup; @LoadModule(category = "mobs", hasSubscriptions = true) public class StonelingsModule extends ZetaModule { diff --git a/src/main/java/vazkii/quark/content/mobs/module/ToretoiseModule.java b/src/main/java/vazkii/quark/content/mobs/module/ToretoiseModule.java index 0322dec63c..3543c1d709 100644 --- a/src/main/java/vazkii/quark/content/mobs/module/ToretoiseModule.java +++ b/src/main/java/vazkii/quark/content/mobs/module/ToretoiseModule.java @@ -27,7 +27,7 @@ import vazkii.quark.content.mobs.entity.Toretoise; import vazkii.zeta.event.ZRegister; import vazkii.zeta.event.bus.LoadEvent; -import vazkii.zeta.event.client.ZClientSetup; +import vazkii.zeta.client.event.ZClientSetup; @LoadModule(category = "mobs", hasSubscriptions = true) public class ToretoiseModule extends ZetaModule { diff --git a/src/main/java/vazkii/quark/content/mobs/module/WraithModule.java b/src/main/java/vazkii/quark/content/mobs/module/WraithModule.java index b0e1fa74ce..3d4f85acea 100644 --- a/src/main/java/vazkii/quark/content/mobs/module/WraithModule.java +++ b/src/main/java/vazkii/quark/content/mobs/module/WraithModule.java @@ -40,7 +40,7 @@ import vazkii.zeta.event.ZConfigChanged; import vazkii.zeta.event.ZRegister; import vazkii.zeta.event.bus.LoadEvent; -import vazkii.zeta.event.client.ZClientSetup; +import vazkii.zeta.client.event.ZClientSetup; @LoadModule(category = "mobs") public class WraithModule extends ZetaModule { diff --git a/src/main/java/vazkii/quark/content/tools/module/AbacusModule.java b/src/main/java/vazkii/quark/content/tools/module/AbacusModule.java index c58518772f..4135dafa59 100644 --- a/src/main/java/vazkii/quark/content/tools/module/AbacusModule.java +++ b/src/main/java/vazkii/quark/content/tools/module/AbacusModule.java @@ -30,9 +30,9 @@ import vazkii.zeta.event.ZRegister; import vazkii.zeta.event.bus.LoadEvent; import vazkii.zeta.event.bus.PlayEvent; -import vazkii.zeta.event.client.ZClientSetup; -import vazkii.zeta.event.client.ZHighlightBlock; -import vazkii.zeta.event.client.ZRenderCrosshair; +import vazkii.zeta.client.event.ZClientSetup; +import vazkii.zeta.client.event.ZHighlightBlock; +import vazkii.zeta.client.event.ZRenderCrosshair; import vazkii.zeta.module.ZetaLoadModule; import vazkii.zeta.module.ZetaModule; diff --git a/src/main/java/vazkii/quark/content/tools/module/BottledCloudModule.java b/src/main/java/vazkii/quark/content/tools/module/BottledCloudModule.java index 35239489ab..c3d6dfc3ed 100644 --- a/src/main/java/vazkii/quark/content/tools/module/BottledCloudModule.java +++ b/src/main/java/vazkii/quark/content/tools/module/BottledCloudModule.java @@ -22,7 +22,7 @@ import vazkii.quark.content.tools.item.BottledCloudItem; import vazkii.zeta.event.ZRegister; import vazkii.zeta.event.bus.LoadEvent; -import vazkii.zeta.event.client.ZClientSetup; +import vazkii.zeta.client.event.ZClientSetup; @LoadModule(category = "tools", hasSubscriptions = true) public class BottledCloudModule extends ZetaModule { diff --git a/src/main/java/vazkii/quark/content/tools/module/EndermoshMusicDiscModule.java b/src/main/java/vazkii/quark/content/tools/module/EndermoshMusicDiscModule.java index 3c83dcdd99..217d30db33 100644 --- a/src/main/java/vazkii/quark/content/tools/module/EndermoshMusicDiscModule.java +++ b/src/main/java/vazkii/quark/content/tools/module/EndermoshMusicDiscModule.java @@ -15,7 +15,7 @@ import vazkii.zeta.event.ZRegister; import vazkii.zeta.event.bus.LoadEvent; import vazkii.zeta.event.bus.PlayEvent; -import vazkii.zeta.event.client.ZEndClientTickEvent; +import vazkii.zeta.client.event.ZEndClientTickEvent; import vazkii.zeta.module.ZetaLoadModule; import vazkii.zeta.module.ZetaModule; diff --git a/src/main/java/vazkii/quark/content/tools/module/ParrotEggsModule.java b/src/main/java/vazkii/quark/content/tools/module/ParrotEggsModule.java index 3ed6f0ec6a..05bbcf1d43 100644 --- a/src/main/java/vazkii/quark/content/tools/module/ParrotEggsModule.java +++ b/src/main/java/vazkii/quark/content/tools/module/ParrotEggsModule.java @@ -51,7 +51,7 @@ import vazkii.zeta.event.ZConfigChanged; import vazkii.zeta.event.ZRegister; import vazkii.zeta.event.bus.LoadEvent; -import vazkii.zeta.event.client.ZClientSetup; +import vazkii.zeta.client.event.ZClientSetup; @LoadModule(category = "tools", hasSubscriptions = true) public class ParrotEggsModule extends ZetaModule { diff --git a/src/main/java/vazkii/quark/content/tools/module/PathfinderMapsModule.java b/src/main/java/vazkii/quark/content/tools/module/PathfinderMapsModule.java index 3496462dd6..403308a350 100644 --- a/src/main/java/vazkii/quark/content/tools/module/PathfinderMapsModule.java +++ b/src/main/java/vazkii/quark/content/tools/module/PathfinderMapsModule.java @@ -44,7 +44,7 @@ import vazkii.zeta.event.ZConfigChanged; import vazkii.zeta.event.ZRegister; import vazkii.zeta.event.bus.LoadEvent; -import vazkii.zeta.event.client.ZClientSetup; +import vazkii.zeta.client.event.ZClientSetup; import vazkii.zeta.util.ItemNBTHelper; import vazkii.quark.base.Quark; import vazkii.quark.base.handler.advancement.QuarkAdvancementHandler; diff --git a/src/main/java/vazkii/quark/content/tools/module/PickarangModule.java b/src/main/java/vazkii/quark/content/tools/module/PickarangModule.java index aefe3b0e66..f28d6e3f12 100755 --- a/src/main/java/vazkii/quark/content/tools/module/PickarangModule.java +++ b/src/main/java/vazkii/quark/content/tools/module/PickarangModule.java @@ -34,7 +34,7 @@ import vazkii.zeta.event.ZConfigChanged; import vazkii.zeta.event.ZRegister; import vazkii.zeta.event.bus.LoadEvent; -import vazkii.zeta.event.client.ZClientSetup; +import vazkii.zeta.client.event.ZClientSetup; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/vazkii/quark/content/tools/module/SeedPouchModule.java b/src/main/java/vazkii/quark/content/tools/module/SeedPouchModule.java index 639f17f878..012aa91dc1 100644 --- a/src/main/java/vazkii/quark/content/tools/module/SeedPouchModule.java +++ b/src/main/java/vazkii/quark/content/tools/module/SeedPouchModule.java @@ -28,8 +28,8 @@ import vazkii.zeta.event.ZCommonSetup; import vazkii.zeta.event.ZRegister; import vazkii.zeta.event.bus.LoadEvent; -import vazkii.zeta.event.client.ZClientSetup; -import vazkii.zeta.event.client.ZTooltipComponents; +import vazkii.zeta.client.event.ZClientSetup; +import vazkii.zeta.client.event.ZTooltipComponents; @LoadModule(category = "tools", hasSubscriptions = true) public class SeedPouchModule extends ZetaModule { diff --git a/src/main/java/vazkii/quark/content/tools/module/SkullPikesModule.java b/src/main/java/vazkii/quark/content/tools/module/SkullPikesModule.java index aac9527a8d..ae961bd537 100644 --- a/src/main/java/vazkii/quark/content/tools/module/SkullPikesModule.java +++ b/src/main/java/vazkii/quark/content/tools/module/SkullPikesModule.java @@ -30,7 +30,7 @@ import vazkii.zeta.event.ZCommonSetup; import vazkii.zeta.event.ZRegister; import vazkii.zeta.event.bus.LoadEvent; -import vazkii.zeta.event.client.ZClientSetup; +import vazkii.zeta.client.event.ZClientSetup; @LoadModule(category = "tools", hasSubscriptions = true) public class SkullPikesModule extends ZetaModule { diff --git a/src/main/java/vazkii/quark/content/tools/module/SlimeInABucketModule.java b/src/main/java/vazkii/quark/content/tools/module/SlimeInABucketModule.java index 4c56820d7d..2e1b18ef43 100644 --- a/src/main/java/vazkii/quark/content/tools/module/SlimeInABucketModule.java +++ b/src/main/java/vazkii/quark/content/tools/module/SlimeInABucketModule.java @@ -18,7 +18,7 @@ import net.minecraftforge.eventbus.api.SubscribeEvent; import vazkii.zeta.event.ZRegister; import vazkii.zeta.event.bus.LoadEvent; -import vazkii.zeta.event.client.ZClientSetup; +import vazkii.zeta.client.event.ZClientSetup; import vazkii.zeta.util.ItemNBTHelper; import vazkii.quark.base.module.LoadModule; import vazkii.zeta.module.ZetaModule; diff --git a/src/main/java/vazkii/quark/content/tools/module/TorchArrowModule.java b/src/main/java/vazkii/quark/content/tools/module/TorchArrowModule.java index 038b564af5..e01bc26c76 100644 --- a/src/main/java/vazkii/quark/content/tools/module/TorchArrowModule.java +++ b/src/main/java/vazkii/quark/content/tools/module/TorchArrowModule.java @@ -18,7 +18,7 @@ import vazkii.quark.content.tools.entity.TorchArrow; import vazkii.zeta.event.ZRegister; import vazkii.zeta.event.bus.LoadEvent; -import vazkii.zeta.event.client.ZClientSetup; +import vazkii.zeta.client.event.ZClientSetup; @LoadModule(category = "tools") public class TorchArrowModule extends ZetaModule { diff --git a/src/main/java/vazkii/quark/content/tweaks/module/CompassesWorkEverywhereModule.java b/src/main/java/vazkii/quark/content/tweaks/module/CompassesWorkEverywhereModule.java index b1d8611d1a..aa9b440cd3 100644 --- a/src/main/java/vazkii/quark/content/tweaks/module/CompassesWorkEverywhereModule.java +++ b/src/main/java/vazkii/quark/content/tweaks/module/CompassesWorkEverywhereModule.java @@ -22,7 +22,7 @@ import vazkii.zeta.event.ZGatherHints; import vazkii.zeta.event.bus.LoadEvent; import vazkii.zeta.event.bus.PlayEvent; -import vazkii.zeta.event.client.ZClientSetup; +import vazkii.zeta.client.event.ZClientSetup; @LoadModule(category = "tweaks", hasSubscriptions = true) public class CompassesWorkEverywhereModule extends ZetaModule { diff --git a/src/main/java/vazkii/quark/content/tweaks/module/DyeableItemFramesModule.java b/src/main/java/vazkii/quark/content/tweaks/module/DyeableItemFramesModule.java index a0238d246b..a55f8744c0 100644 --- a/src/main/java/vazkii/quark/content/tweaks/module/DyeableItemFramesModule.java +++ b/src/main/java/vazkii/quark/content/tweaks/module/DyeableItemFramesModule.java @@ -36,8 +36,8 @@ import vazkii.quark.content.tweaks.entity.DyedItemFrame; import vazkii.zeta.event.ZRegister; import vazkii.zeta.event.bus.LoadEvent; -import vazkii.zeta.event.client.ZAddModels; -import vazkii.zeta.event.client.ZClientSetup; +import vazkii.zeta.client.event.ZAddModels; +import vazkii.zeta.client.event.ZClientSetup; @LoadModule(category = "tweaks", hasSubscriptions = true) public class DyeableItemFramesModule extends ZetaModule { diff --git a/src/main/java/vazkii/quark/content/tweaks/module/EmotesModule.java b/src/main/java/vazkii/quark/content/tweaks/module/EmotesModule.java index 2b60447eff..9cadec558a 100644 --- a/src/main/java/vazkii/quark/content/tweaks/module/EmotesModule.java +++ b/src/main/java/vazkii/quark/content/tweaks/module/EmotesModule.java @@ -56,10 +56,10 @@ import vazkii.quark.content.tweaks.client.screen.widgets.EmoteButton; import vazkii.quark.content.tweaks.client.screen.widgets.TranslucentButton; import vazkii.zeta.event.bus.LoadEvent; -import vazkii.zeta.event.client.ZClientModulesReady; -import vazkii.zeta.event.client.ZClientSetup; -import vazkii.zeta.event.client.ZConfigChangedClient; -import vazkii.zeta.event.client.ZKeyMapping; +import vazkii.zeta.client.event.ZClientModulesReady; +import vazkii.zeta.client.event.ZClientSetup; +import vazkii.zeta.client.event.ZConfigChangedClient; +import vazkii.zeta.client.event.ZKeyMapping; @LoadModule(category = "tweaks", hasSubscriptions = true, subscribeOn = Dist.CLIENT) public class EmotesModule extends ZetaModule { diff --git a/src/main/java/vazkii/quark/content/tweaks/module/LockRotationModule.java b/src/main/java/vazkii/quark/content/tweaks/module/LockRotationModule.java index d3c113c850..16fbb69bc7 100644 --- a/src/main/java/vazkii/quark/content/tweaks/module/LockRotationModule.java +++ b/src/main/java/vazkii/quark/content/tweaks/module/LockRotationModule.java @@ -53,7 +53,7 @@ import vazkii.zeta.event.ZCommonSetup; import vazkii.zeta.event.ZConfigChanged; import vazkii.zeta.event.bus.LoadEvent; -import vazkii.zeta.event.client.ZKeyMapping; +import vazkii.zeta.client.event.ZKeyMapping; import java.lang.reflect.Field; import java.util.HashMap; diff --git a/src/main/java/vazkii/quark/integration/lootr/ILootrIntegration.java b/src/main/java/vazkii/quark/integration/lootr/ILootrIntegration.java index f68802ea92..ef9e804e95 100644 --- a/src/main/java/vazkii/quark/integration/lootr/ILootrIntegration.java +++ b/src/main/java/vazkii/quark/integration/lootr/ILootrIntegration.java @@ -6,9 +6,8 @@ import net.minecraft.world.level.block.entity.ChestBlockEntity; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -import net.minecraftforge.client.event.TextureStitchEvent; import net.minecraftforge.fml.ModList; -import vazkii.zeta.event.client.ZPreTextureStitch; +import vazkii.zeta.client.event.ZPreTextureStitch; import javax.annotation.Nullable; diff --git a/src/main/java/vazkii/quark/integration/lootr/LootrIntegration.java b/src/main/java/vazkii/quark/integration/lootr/LootrIntegration.java index 8385ff1433..598ebcf389 100644 --- a/src/main/java/vazkii/quark/integration/lootr/LootrIntegration.java +++ b/src/main/java/vazkii/quark/integration/lootr/LootrIntegration.java @@ -11,7 +11,7 @@ import vazkii.quark.base.Quark; import vazkii.quark.content.building.module.VariantChestsModule; import vazkii.quark.integration.lootr.client.LootrVariantChestRenderer; -import vazkii.zeta.event.client.ZPreTextureStitch; +import vazkii.zeta.client.event.ZPreTextureStitch; import javax.annotation.Nullable; import java.util.HashMap; diff --git a/src/main/java/vazkii/quark/integration/lootr/client/LootrVariantChestRenderer.java b/src/main/java/vazkii/quark/integration/lootr/client/LootrVariantChestRenderer.java index 8adfcf91f0..b8b15b3743 100644 --- a/src/main/java/vazkii/quark/integration/lootr/client/LootrVariantChestRenderer.java +++ b/src/main/java/vazkii/quark/integration/lootr/client/LootrVariantChestRenderer.java @@ -6,14 +6,13 @@ import net.minecraft.world.entity.player.Player; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.state.properties.ChestType; -import net.minecraftforge.client.event.TextureStitchEvent; import noobanidus.mods.lootr.config.ConfigManager; import noobanidus.mods.lootr.util.Getter; import vazkii.quark.base.Quark; import vazkii.quark.base.client.render.GenericChestBERenderer; import vazkii.quark.content.building.module.VariantChestsModule; import vazkii.quark.integration.lootr.LootrVariantChestBlockEntity; -import vazkii.zeta.event.client.ZPreTextureStitch; +import vazkii.zeta.client.event.ZPreTextureStitch; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/vazkii/zeta/event/client/ZAddBlockColorHandlers.java b/src/main/java/vazkii/zeta/client/event/ZAddBlockColorHandlers.java similarity index 90% rename from src/main/java/vazkii/zeta/event/client/ZAddBlockColorHandlers.java rename to src/main/java/vazkii/zeta/client/event/ZAddBlockColorHandlers.java index fa27efdbc3..66326d1620 100644 --- a/src/main/java/vazkii/zeta/event/client/ZAddBlockColorHandlers.java +++ b/src/main/java/vazkii/zeta/client/event/ZAddBlockColorHandlers.java @@ -1,4 +1,4 @@ -package vazkii.zeta.event.client; +package vazkii.zeta.client.event; import net.minecraft.client.color.block.BlockColor; import net.minecraft.client.color.block.BlockColors; diff --git a/src/main/java/vazkii/zeta/event/client/ZAddItemColorHandlers.java b/src/main/java/vazkii/zeta/client/event/ZAddItemColorHandlers.java similarity index 90% rename from src/main/java/vazkii/zeta/event/client/ZAddItemColorHandlers.java rename to src/main/java/vazkii/zeta/client/event/ZAddItemColorHandlers.java index 24e9b8b65e..2d301b6775 100644 --- a/src/main/java/vazkii/zeta/event/client/ZAddItemColorHandlers.java +++ b/src/main/java/vazkii/zeta/client/event/ZAddItemColorHandlers.java @@ -1,4 +1,4 @@ -package vazkii.zeta.event.client; +package vazkii.zeta.client.event; import net.minecraft.client.color.item.ItemColor; import net.minecraft.client.color.item.ItemColors; diff --git a/src/main/java/vazkii/zeta/event/client/ZAddModelLayers.java b/src/main/java/vazkii/zeta/client/event/ZAddModelLayers.java similarity index 94% rename from src/main/java/vazkii/zeta/event/client/ZAddModelLayers.java rename to src/main/java/vazkii/zeta/client/event/ZAddModelLayers.java index 2ff8da2c79..2d2efeacb7 100644 --- a/src/main/java/vazkii/zeta/event/client/ZAddModelLayers.java +++ b/src/main/java/vazkii/zeta/client/event/ZAddModelLayers.java @@ -1,4 +1,4 @@ -package vazkii.zeta.event.client; +package vazkii.zeta.client.event; import net.minecraft.client.model.EntityModel; import net.minecraft.client.model.geom.EntityModelSet; diff --git a/src/main/java/vazkii/zeta/event/client/ZAddModels.java b/src/main/java/vazkii/zeta/client/event/ZAddModels.java similarity index 84% rename from src/main/java/vazkii/zeta/event/client/ZAddModels.java rename to src/main/java/vazkii/zeta/client/event/ZAddModels.java index d4d3516849..a584bd9e5b 100644 --- a/src/main/java/vazkii/zeta/event/client/ZAddModels.java +++ b/src/main/java/vazkii/zeta/client/event/ZAddModels.java @@ -1,4 +1,4 @@ -package vazkii.zeta.event.client; +package vazkii.zeta.client.event; import net.minecraft.resources.ResourceLocation; import vazkii.zeta.event.bus.IZetaLoadEvent; diff --git a/src/main/java/vazkii/zeta/event/client/ZClientModulesReady.java b/src/main/java/vazkii/zeta/client/event/ZClientModulesReady.java similarity index 76% rename from src/main/java/vazkii/zeta/event/client/ZClientModulesReady.java rename to src/main/java/vazkii/zeta/client/event/ZClientModulesReady.java index 12aa399b9a..4f0c44ddcb 100644 --- a/src/main/java/vazkii/zeta/event/client/ZClientModulesReady.java +++ b/src/main/java/vazkii/zeta/client/event/ZClientModulesReady.java @@ -1,4 +1,4 @@ -package vazkii.zeta.event.client; +package vazkii.zeta.client.event; import vazkii.zeta.event.bus.IZetaLoadEvent; diff --git a/src/main/java/vazkii/zeta/event/client/ZClientSetup.java b/src/main/java/vazkii/zeta/client/event/ZClientSetup.java similarity index 80% rename from src/main/java/vazkii/zeta/event/client/ZClientSetup.java rename to src/main/java/vazkii/zeta/client/event/ZClientSetup.java index 6d884739d8..d354ad0023 100644 --- a/src/main/java/vazkii/zeta/event/client/ZClientSetup.java +++ b/src/main/java/vazkii/zeta/client/event/ZClientSetup.java @@ -1,4 +1,4 @@ -package vazkii.zeta.event.client; +package vazkii.zeta.client.event; import vazkii.zeta.event.bus.IZetaLoadEvent; diff --git a/src/main/java/vazkii/zeta/event/client/ZConfigChangedClient.java b/src/main/java/vazkii/zeta/client/event/ZConfigChangedClient.java similarity index 76% rename from src/main/java/vazkii/zeta/event/client/ZConfigChangedClient.java rename to src/main/java/vazkii/zeta/client/event/ZConfigChangedClient.java index 95ef8a2c7a..8984631c4b 100644 --- a/src/main/java/vazkii/zeta/event/client/ZConfigChangedClient.java +++ b/src/main/java/vazkii/zeta/client/event/ZConfigChangedClient.java @@ -1,4 +1,4 @@ -package vazkii.zeta.event.client; +package vazkii.zeta.client.event; import vazkii.zeta.event.bus.IZetaLoadEvent; diff --git a/src/main/java/vazkii/zeta/event/client/ZEndClientTickEvent.java b/src/main/java/vazkii/zeta/client/event/ZEndClientTickEvent.java similarity index 84% rename from src/main/java/vazkii/zeta/event/client/ZEndClientTickEvent.java rename to src/main/java/vazkii/zeta/client/event/ZEndClientTickEvent.java index 4c38188399..a037148b3e 100644 --- a/src/main/java/vazkii/zeta/event/client/ZEndClientTickEvent.java +++ b/src/main/java/vazkii/zeta/client/event/ZEndClientTickEvent.java @@ -1,4 +1,4 @@ -package vazkii.zeta.event.client; +package vazkii.zeta.client.event; import vazkii.zeta.event.bus.FiredAs; import vazkii.zeta.event.bus.IZetaPlayEvent; diff --git a/src/main/java/vazkii/zeta/event/client/ZFirstClientTick.java b/src/main/java/vazkii/zeta/client/event/ZFirstClientTick.java similarity index 75% rename from src/main/java/vazkii/zeta/event/client/ZFirstClientTick.java rename to src/main/java/vazkii/zeta/client/event/ZFirstClientTick.java index 75fdaa8747..1f80fa4add 100644 --- a/src/main/java/vazkii/zeta/event/client/ZFirstClientTick.java +++ b/src/main/java/vazkii/zeta/client/event/ZFirstClientTick.java @@ -1,4 +1,4 @@ -package vazkii.zeta.event.client; +package vazkii.zeta.client.event; import vazkii.zeta.event.bus.IZetaLoadEvent; diff --git a/src/main/java/vazkii/zeta/event/client/ZHighlightBlock.java b/src/main/java/vazkii/zeta/client/event/ZHighlightBlock.java similarity index 91% rename from src/main/java/vazkii/zeta/event/client/ZHighlightBlock.java rename to src/main/java/vazkii/zeta/client/event/ZHighlightBlock.java index c9d7670ea2..925ad63e7a 100644 --- a/src/main/java/vazkii/zeta/event/client/ZHighlightBlock.java +++ b/src/main/java/vazkii/zeta/client/event/ZHighlightBlock.java @@ -1,4 +1,4 @@ -package vazkii.zeta.event.client; +package vazkii.zeta.client.event; import com.mojang.blaze3d.vertex.PoseStack; import net.minecraft.client.Camera; diff --git a/src/main/java/vazkii/zeta/event/client/ZKeyMapping.java b/src/main/java/vazkii/zeta/client/event/ZKeyMapping.java similarity index 83% rename from src/main/java/vazkii/zeta/event/client/ZKeyMapping.java rename to src/main/java/vazkii/zeta/client/event/ZKeyMapping.java index 448098f34b..d970fb3acc 100644 --- a/src/main/java/vazkii/zeta/event/client/ZKeyMapping.java +++ b/src/main/java/vazkii/zeta/client/event/ZKeyMapping.java @@ -1,4 +1,4 @@ -package vazkii.zeta.event.client; +package vazkii.zeta.client.event; import net.minecraft.client.KeyMapping; import vazkii.zeta.event.bus.IZetaLoadEvent; diff --git a/src/main/java/vazkii/zeta/event/client/ZModelBakingCompleted.java b/src/main/java/vazkii/zeta/client/event/ZModelBakingCompleted.java similarity index 89% rename from src/main/java/vazkii/zeta/event/client/ZModelBakingCompleted.java rename to src/main/java/vazkii/zeta/client/event/ZModelBakingCompleted.java index 779bf80872..86e5965f19 100644 --- a/src/main/java/vazkii/zeta/event/client/ZModelBakingCompleted.java +++ b/src/main/java/vazkii/zeta/client/event/ZModelBakingCompleted.java @@ -1,4 +1,4 @@ -package vazkii.zeta.event.client; +package vazkii.zeta.client.event; import java.util.Map; diff --git a/src/main/java/vazkii/zeta/event/client/ZPreTextureStitch.java b/src/main/java/vazkii/zeta/client/event/ZPreTextureStitch.java similarity index 89% rename from src/main/java/vazkii/zeta/event/client/ZPreTextureStitch.java rename to src/main/java/vazkii/zeta/client/event/ZPreTextureStitch.java index 057da50612..966ded7808 100644 --- a/src/main/java/vazkii/zeta/event/client/ZPreTextureStitch.java +++ b/src/main/java/vazkii/zeta/client/event/ZPreTextureStitch.java @@ -1,4 +1,4 @@ -package vazkii.zeta.event.client; +package vazkii.zeta.client.event; import net.minecraft.client.renderer.texture.TextureAtlas; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/vazkii/zeta/event/client/ZRegisterReloadListeners.java b/src/main/java/vazkii/zeta/client/event/ZRegisterReloadListeners.java similarity index 92% rename from src/main/java/vazkii/zeta/event/client/ZRegisterReloadListeners.java rename to src/main/java/vazkii/zeta/client/event/ZRegisterReloadListeners.java index 508508fcbc..8d2dbe19c3 100644 --- a/src/main/java/vazkii/zeta/event/client/ZRegisterReloadListeners.java +++ b/src/main/java/vazkii/zeta/client/event/ZRegisterReloadListeners.java @@ -1,4 +1,4 @@ -package vazkii.zeta.event.client; +package vazkii.zeta.client.event; import java.util.function.Consumer; diff --git a/src/main/java/vazkii/zeta/event/client/ZRenderChat.java b/src/main/java/vazkii/zeta/client/event/ZRenderChat.java similarity index 90% rename from src/main/java/vazkii/zeta/event/client/ZRenderChat.java rename to src/main/java/vazkii/zeta/client/event/ZRenderChat.java index e1c4a9b40f..28eaefa124 100644 --- a/src/main/java/vazkii/zeta/event/client/ZRenderChat.java +++ b/src/main/java/vazkii/zeta/client/event/ZRenderChat.java @@ -1,4 +1,4 @@ -package vazkii.zeta.event.client; +package vazkii.zeta.client.event; import com.mojang.blaze3d.vertex.PoseStack; import vazkii.zeta.event.bus.Cancellable; diff --git a/src/main/java/vazkii/zeta/event/client/ZRenderCrosshair.java b/src/main/java/vazkii/zeta/client/event/ZRenderCrosshair.java similarity index 87% rename from src/main/java/vazkii/zeta/event/client/ZRenderCrosshair.java rename to src/main/java/vazkii/zeta/client/event/ZRenderCrosshair.java index 14fbd0c436..94de089694 100644 --- a/src/main/java/vazkii/zeta/event/client/ZRenderCrosshair.java +++ b/src/main/java/vazkii/zeta/client/event/ZRenderCrosshair.java @@ -1,4 +1,4 @@ -package vazkii.zeta.event.client; +package vazkii.zeta.client.event; import com.mojang.blaze3d.platform.Window; import com.mojang.blaze3d.vertex.PoseStack; diff --git a/src/main/java/vazkii/zeta/event/client/ZTooltipComponents.java b/src/main/java/vazkii/zeta/client/event/ZTooltipComponents.java similarity index 94% rename from src/main/java/vazkii/zeta/event/client/ZTooltipComponents.java rename to src/main/java/vazkii/zeta/client/event/ZTooltipComponents.java index b3c14c3216..463e941ba3 100644 --- a/src/main/java/vazkii/zeta/event/client/ZTooltipComponents.java +++ b/src/main/java/vazkii/zeta/client/event/ZTooltipComponents.java @@ -1,4 +1,4 @@ -package vazkii.zeta.event.client; +package vazkii.zeta.client.event; import java.util.function.Function; diff --git a/src/main/java/vazkii/zetaimplforge/client/ForgeZetaClient.java b/src/main/java/vazkii/zetaimplforge/client/ForgeZetaClient.java index d2bc3ecb09..42af9c4bd8 100644 --- a/src/main/java/vazkii/zetaimplforge/client/ForgeZetaClient.java +++ b/src/main/java/vazkii/zetaimplforge/client/ForgeZetaClient.java @@ -17,9 +17,9 @@ import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; import vazkii.zeta.Zeta; import vazkii.zeta.client.ZetaClient; -import vazkii.zeta.event.client.ZEndClientTickEvent; -import vazkii.zeta.event.client.ZFirstClientTick; -import vazkii.zeta.event.client.ZRegisterReloadListeners; +import vazkii.zeta.client.event.ZEndClientTickEvent; +import vazkii.zeta.client.event.ZFirstClientTick; +import vazkii.zeta.client.event.ZRegisterReloadListeners; import vazkii.zetaimplforge.event.client.ForgeZAddBlockColorHandlers; import vazkii.zetaimplforge.event.client.ForgeZAddItemColorHandlers; import vazkii.zetaimplforge.event.client.ForgeZAddModelLayers; diff --git a/src/main/java/vazkii/zetaimplforge/event/client/ForgeZAddBlockColorHandlers.java b/src/main/java/vazkii/zetaimplforge/event/client/ForgeZAddBlockColorHandlers.java index f306de1fb3..9420eb098b 100644 --- a/src/main/java/vazkii/zetaimplforge/event/client/ForgeZAddBlockColorHandlers.java +++ b/src/main/java/vazkii/zetaimplforge/event/client/ForgeZAddBlockColorHandlers.java @@ -5,7 +5,7 @@ import net.minecraft.world.level.block.Block; import net.minecraftforge.client.event.RegisterColorHandlersEvent; import vazkii.zeta.event.bus.FiredAs; -import vazkii.zeta.event.client.ZAddBlockColorHandlers; +import vazkii.zeta.client.event.ZAddBlockColorHandlers; @FiredAs(ZAddBlockColorHandlers.class) public record ForgeZAddBlockColorHandlers(RegisterColorHandlersEvent.Block e) implements ZAddBlockColorHandlers { diff --git a/src/main/java/vazkii/zetaimplforge/event/client/ForgeZAddItemColorHandlers.java b/src/main/java/vazkii/zetaimplforge/event/client/ForgeZAddItemColorHandlers.java index 53c99bca06..5b97d45fc1 100644 --- a/src/main/java/vazkii/zetaimplforge/event/client/ForgeZAddItemColorHandlers.java +++ b/src/main/java/vazkii/zetaimplforge/event/client/ForgeZAddItemColorHandlers.java @@ -5,7 +5,7 @@ import net.minecraft.world.level.ItemLike; import net.minecraftforge.client.event.RegisterColorHandlersEvent; import vazkii.zeta.event.bus.FiredAs; -import vazkii.zeta.event.client.ZAddItemColorHandlers; +import vazkii.zeta.client.event.ZAddItemColorHandlers; @FiredAs(ZAddItemColorHandlers.class) public record ForgeZAddItemColorHandlers(RegisterColorHandlersEvent.Item e) implements ZAddItemColorHandlers { diff --git a/src/main/java/vazkii/zetaimplforge/event/client/ForgeZAddModelLayers.java b/src/main/java/vazkii/zetaimplforge/event/client/ForgeZAddModelLayers.java index fdf1cc5252..1c17914a7c 100644 --- a/src/main/java/vazkii/zetaimplforge/event/client/ForgeZAddModelLayers.java +++ b/src/main/java/vazkii/zetaimplforge/event/client/ForgeZAddModelLayers.java @@ -7,7 +7,7 @@ import net.minecraft.world.entity.LivingEntity; import net.minecraftforge.client.event.EntityRenderersEvent; import vazkii.zeta.event.bus.FiredAs; -import vazkii.zeta.event.client.ZAddModelLayers; +import vazkii.zeta.client.event.ZAddModelLayers; @FiredAs(ZAddModelLayers.class) public record ForgeZAddModelLayers(EntityRenderersEvent.AddLayers e) implements ZAddModelLayers { diff --git a/src/main/java/vazkii/zetaimplforge/event/client/ForgeZAddModels.java b/src/main/java/vazkii/zetaimplforge/event/client/ForgeZAddModels.java index f1145a317a..62b9552f19 100644 --- a/src/main/java/vazkii/zetaimplforge/event/client/ForgeZAddModels.java +++ b/src/main/java/vazkii/zetaimplforge/event/client/ForgeZAddModels.java @@ -3,7 +3,7 @@ import net.minecraft.resources.ResourceLocation; import net.minecraftforge.client.event.ModelEvent; import vazkii.zeta.event.bus.FiredAs; -import vazkii.zeta.event.client.ZAddModels; +import vazkii.zeta.client.event.ZAddModels; @FiredAs(ZAddModels.class) public record ForgeZAddModels(ModelEvent.RegisterAdditional e) implements ZAddModels { diff --git a/src/main/java/vazkii/zetaimplforge/event/client/ForgeZClientSetup.java b/src/main/java/vazkii/zetaimplforge/event/client/ForgeZClientSetup.java index a67094f1d4..0e30442e1e 100644 --- a/src/main/java/vazkii/zetaimplforge/event/client/ForgeZClientSetup.java +++ b/src/main/java/vazkii/zetaimplforge/event/client/ForgeZClientSetup.java @@ -2,7 +2,7 @@ import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent; import vazkii.zeta.event.bus.FiredAs; -import vazkii.zeta.event.client.ZClientSetup; +import vazkii.zeta.client.event.ZClientSetup; @FiredAs(ZClientSetup.class) public record ForgeZClientSetup(FMLClientSetupEvent e) implements ZClientSetup { diff --git a/src/main/java/vazkii/zetaimplforge/event/client/ForgeZHighlightBlock.java b/src/main/java/vazkii/zetaimplforge/event/client/ForgeZHighlightBlock.java index 280acc0c25..b300cfca9d 100644 --- a/src/main/java/vazkii/zetaimplforge/event/client/ForgeZHighlightBlock.java +++ b/src/main/java/vazkii/zetaimplforge/event/client/ForgeZHighlightBlock.java @@ -5,7 +5,7 @@ import net.minecraft.client.renderer.MultiBufferSource; import net.minecraftforge.client.event.RenderHighlightEvent; import vazkii.zeta.event.bus.FiredAs; -import vazkii.zeta.event.client.ZHighlightBlock; +import vazkii.zeta.client.event.ZHighlightBlock; @FiredAs(ZHighlightBlock.class) public record ForgeZHighlightBlock(RenderHighlightEvent.Block e) implements ZHighlightBlock { diff --git a/src/main/java/vazkii/zetaimplforge/event/client/ForgeZKeyMapping.java b/src/main/java/vazkii/zetaimplforge/event/client/ForgeZKeyMapping.java index d282cb0431..2028b0aa30 100644 --- a/src/main/java/vazkii/zetaimplforge/event/client/ForgeZKeyMapping.java +++ b/src/main/java/vazkii/zetaimplforge/event/client/ForgeZKeyMapping.java @@ -3,7 +3,7 @@ import net.minecraft.client.KeyMapping; import net.minecraftforge.client.event.RegisterKeyMappingsEvent; import vazkii.zeta.event.bus.FiredAs; -import vazkii.zeta.event.client.ZKeyMapping; +import vazkii.zeta.client.event.ZKeyMapping; @FiredAs(ZKeyMapping.class) public record ForgeZKeyMapping(RegisterKeyMappingsEvent e) implements ZKeyMapping { diff --git a/src/main/java/vazkii/zetaimplforge/event/client/ForgeZModelBakingCompleted.java b/src/main/java/vazkii/zetaimplforge/event/client/ForgeZModelBakingCompleted.java index cb4f3f7364..626df3c280 100644 --- a/src/main/java/vazkii/zetaimplforge/event/client/ForgeZModelBakingCompleted.java +++ b/src/main/java/vazkii/zetaimplforge/event/client/ForgeZModelBakingCompleted.java @@ -6,7 +6,7 @@ import net.minecraft.resources.ResourceLocation; import net.minecraftforge.client.event.ModelEvent; import vazkii.zeta.event.bus.FiredAs; -import vazkii.zeta.event.client.ZModelBakingCompleted; +import vazkii.zeta.client.event.ZModelBakingCompleted; @FiredAs(ZModelBakingCompleted.class) public record ForgeZModelBakingCompleted(ModelEvent.BakingCompleted e) implements ZModelBakingCompleted { diff --git a/src/main/java/vazkii/zetaimplforge/event/client/ForgeZPreTextureStitch.java b/src/main/java/vazkii/zetaimplforge/event/client/ForgeZPreTextureStitch.java index c4e92d2722..fb4f4069f6 100644 --- a/src/main/java/vazkii/zetaimplforge/event/client/ForgeZPreTextureStitch.java +++ b/src/main/java/vazkii/zetaimplforge/event/client/ForgeZPreTextureStitch.java @@ -4,7 +4,7 @@ import net.minecraft.resources.ResourceLocation; import net.minecraftforge.client.event.TextureStitchEvent; import vazkii.zeta.event.bus.FiredAs; -import vazkii.zeta.event.client.ZPreTextureStitch; +import vazkii.zeta.client.event.ZPreTextureStitch; @FiredAs(ZPreTextureStitch.class) public record ForgeZPreTextureStitch(TextureStitchEvent.Pre e) implements ZPreTextureStitch { diff --git a/src/main/java/vazkii/zetaimplforge/event/client/ForgeZRenderChat.java b/src/main/java/vazkii/zetaimplforge/event/client/ForgeZRenderChat.java index 96e6608374..c11de8a38b 100644 --- a/src/main/java/vazkii/zetaimplforge/event/client/ForgeZRenderChat.java +++ b/src/main/java/vazkii/zetaimplforge/event/client/ForgeZRenderChat.java @@ -3,7 +3,7 @@ import com.mojang.blaze3d.vertex.PoseStack; import net.minecraftforge.client.event.RenderGuiOverlayEvent; import vazkii.zeta.event.bus.FiredAs; -import vazkii.zeta.event.client.ZRenderChat; +import vazkii.zeta.client.event.ZRenderChat; @FiredAs(ZRenderChat.class) public abstract class ForgeZRenderChat implements ZRenderChat { diff --git a/src/main/java/vazkii/zetaimplforge/event/client/ForgeZRenderCrosshair.java b/src/main/java/vazkii/zetaimplforge/event/client/ForgeZRenderCrosshair.java index 7197771e3c..edfa1aa60c 100644 --- a/src/main/java/vazkii/zetaimplforge/event/client/ForgeZRenderCrosshair.java +++ b/src/main/java/vazkii/zetaimplforge/event/client/ForgeZRenderCrosshair.java @@ -4,7 +4,7 @@ import com.mojang.blaze3d.vertex.PoseStack; import net.minecraftforge.client.event.RenderGuiOverlayEvent; import vazkii.zeta.event.bus.FiredAs; -import vazkii.zeta.event.client.ZRenderCrosshair; +import vazkii.zeta.client.event.ZRenderCrosshair; @FiredAs(ZRenderCrosshair.class) public record ForgeZRenderCrosshair(RenderGuiOverlayEvent e) implements ZRenderCrosshair { diff --git a/src/main/java/vazkii/zetaimplforge/event/client/ForgeZTooltipComponents.java b/src/main/java/vazkii/zetaimplforge/event/client/ForgeZTooltipComponents.java index 9879f2d75c..07b089c1d7 100644 --- a/src/main/java/vazkii/zetaimplforge/event/client/ForgeZTooltipComponents.java +++ b/src/main/java/vazkii/zetaimplforge/event/client/ForgeZTooltipComponents.java @@ -6,7 +6,7 @@ import net.minecraft.world.inventory.tooltip.TooltipComponent; import net.minecraftforge.client.event.RegisterClientTooltipComponentFactoriesEvent; import vazkii.zeta.event.bus.FiredAs; -import vazkii.zeta.event.client.ZTooltipComponents; +import vazkii.zeta.client.event.ZTooltipComponents; @FiredAs(ZTooltipComponents.class) public record ForgeZTooltipComponents(RegisterClientTooltipComponentFactoriesEvent e) implements ZTooltipComponents {