Skip to content

Commit

Permalink
Move client packets into a different package (large commit)
Browse files Browse the repository at this point in the history
  • Loading branch information
quat1024 committed Oct 25, 2023
1 parent 9fef6af commit 510478a
Show file tree
Hide file tree
Showing 91 changed files with 111 additions and 114 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/vazkii/quark/base/handler/DyeHandler.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/vazkii/quark/base/proxy/ClientProxy.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.*;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.*;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Loading

0 comments on commit 510478a

Please sign in to comment.