Package changes

Gaming32 · Apr 19, 2024 · fedd61d · fedd61d
1 parent b9c3789
commit fedd61d
Show file tree

Hide file tree

Showing 15 changed files with 22 additions and 20 deletions.
diff --git a/common/src/main/java/io/github/gaming32/bingo/Bingo.java b/common/src/main/java/io/github/gaming32/bingo/Bingo.java
@@ -15,8 +15,6 @@
 import io.github.gaming32.bingo.data.subs.BingoSubType;
 import io.github.gaming32.bingo.game.BingoGame;
 import io.github.gaming32.bingo.mixin.common.ExplosionAccessor;
-import io.github.gaming32.bingo.multiloader.BingoPlatform;
-import io.github.gaming32.bingo.multiloader.Event;
 import io.github.gaming32.bingo.network.BingoNetworking;
 import io.github.gaming32.bingo.network.messages.c2s.KeyPressedPacket;
 import io.github.gaming32.bingo.network.messages.s2c.InitBoardPacket;
@@ -25,6 +23,8 @@
 import io.github.gaming32.bingo.network.messages.s2c.SyncTeamPacket;
 import io.github.gaming32.bingo.network.messages.s2c.UpdateProgressPacket;
 import io.github.gaming32.bingo.network.messages.s2c.UpdateStatePacket;
+import io.github.gaming32.bingo.platform.BingoPlatform;
+import io.github.gaming32.bingo.platform.event.Event;
 import io.github.gaming32.bingo.triggers.BingoTriggers;
 import io.github.gaming32.bingo.util.BingoUtil;
 import net.minecraft.locale.Language;

diff --git a/common/src/main/java/io/github/gaming32/bingo/client/BingoClient.java b/common/src/main/java/io/github/gaming32/bingo/client/BingoClient.java
@@ -16,8 +16,8 @@
 import io.github.gaming32.bingo.game.BingoBoard;
 import io.github.gaming32.bingo.game.BingoGameMode;
 import io.github.gaming32.bingo.game.GoalProgress;
-import io.github.gaming32.bingo.multiloader.ClientEvents;
 import io.github.gaming32.bingo.network.ClientGoal;
+import io.github.gaming32.bingo.platform.event.ClientEvents;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.minecraft.ChatFormatting;

diff --git a/common/src/main/java/io/github/gaming32/bingo/network/BingoNetworking.java b/common/src/main/java/io/github/gaming32/bingo/network/BingoNetworking.java
@@ -1,6 +1,6 @@
 package io.github.gaming32.bingo.network;
 
-import io.github.gaming32.bingo.multiloader.BingoPlatform;
+import io.github.gaming32.bingo.platform.BingoPlatform;
 import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.network.protocol.PacketFlow;
 import net.minecraft.network.protocol.common.custom.CustomPacketPayload;

diff --git a/...ng32/bingo/multiloader/BingoPlatform.java → ...aming32/bingo/platform/BingoPlatform.java b/...ng32/bingo/multiloader/BingoPlatform.java → ...aming32/bingo/platform/BingoPlatform.java
@@ -1,4 +1,4 @@
-package io.github.gaming32.bingo.multiloader;
+package io.github.gaming32.bingo.platform;
 
 import io.github.gaming32.bingo.network.BingoNetworking;
 

diff --git a/...ing32/bingo/multiloader/ClientEvents.java → ...32/bingo/platform/event/ClientEvents.java b/...ing32/bingo/multiloader/ClientEvents.java → ...32/bingo/platform/event/ClientEvents.java
@@ -1,4 +1,4 @@
-package io.github.gaming32.bingo.multiloader;
+package io.github.gaming32.bingo.platform.event;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiGraphics;

diff --git a/...hub/gaming32/bingo/multiloader/Event.java → .../gaming32/bingo/platform/event/Event.java b/...hub/gaming32/bingo/multiloader/Event.java → .../gaming32/bingo/platform/event/Event.java
@@ -1,4 +1,4 @@
-package io.github.gaming32.bingo.multiloader;
+package io.github.gaming32.bingo.platform.event;
 
 import com.mojang.brigadier.CommandDispatcher;
 import net.minecraft.commands.CommandBuildContext;

diff --git a/fabric/src/main/java/io/github/gaming32/bingo/fabric/BingoFabric.java b/fabric/src/main/java/io/github/gaming32/bingo/fabric/BingoFabric.java
@@ -1,8 +1,8 @@
 package io.github.gaming32.bingo.fabric;
 
 import io.github.gaming32.bingo.Bingo;
-import io.github.gaming32.bingo.multiloader.BingoPlatform;
 import io.github.gaming32.bingo.network.BingoNetworking;
+import io.github.gaming32.bingo.platform.BingoPlatform;
 import net.fabricmc.api.ModInitializer;
 import net.fabricmc.fabric.api.networking.v1.PacketByteBufs;
 import net.fabricmc.fabric.api.networking.v1.ServerLoginConnectionEvents;

diff --git a/fabric/src/main/java/io/github/gaming32/bingo/fabric/FabricPlatform.java b/fabric/src/main/java/io/github/gaming32/bingo/fabric/FabricPlatform.java
@@ -1,9 +1,11 @@
 package io.github.gaming32.bingo.fabric;
 
-import io.github.gaming32.bingo.multiloader.BingoPlatform;
-import io.github.gaming32.bingo.multiloader.ClientEvents;
-import io.github.gaming32.bingo.multiloader.Event;
+import io.github.gaming32.bingo.fabric.event.FabricClientEvents;
+import io.github.gaming32.bingo.fabric.event.FabricEvents;
 import io.github.gaming32.bingo.network.BingoNetworking;
+import io.github.gaming32.bingo.platform.BingoPlatform;
+import io.github.gaming32.bingo.platform.event.ClientEvents;
+import io.github.gaming32.bingo.platform.event.Event;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
 import net.fabricmc.fabric.api.client.rendering.v1.HudRenderCallback;

diff --git a/...ng32/bingo/fabric/FabricClientEvents.java → ...ingo/fabric/event/FabricClientEvents.java b/...ng32/bingo/fabric/FabricClientEvents.java → ...ingo/fabric/event/FabricClientEvents.java
@@ -1,4 +1,4 @@
-package io.github.gaming32.bingo.fabric;
+package io.github.gaming32.bingo.fabric.event;
 
 import net.fabricmc.fabric.api.event.Event;
 import net.fabricmc.fabric.api.event.EventFactory;

diff --git a/...b/gaming32/bingo/fabric/FabricEvents.java → ...ng32/bingo/fabric/event/FabricEvents.java b/...b/gaming32/bingo/fabric/FabricEvents.java → ...ng32/bingo/fabric/event/FabricEvents.java
@@ -1,4 +1,4 @@
-package io.github.gaming32.bingo.fabric;
+package io.github.gaming32.bingo.fabric.event;
 
 import net.fabricmc.fabric.api.event.Event;
 import net.fabricmc.fabric.api.event.EventFactory;

diff --git a/fabric/src/main/java/io/github/gaming32/bingo/mixin/fabric/MixinLevel.java b/fabric/src/main/java/io/github/gaming32/bingo/mixin/fabric/MixinLevel.java
@@ -1,7 +1,7 @@
 package io.github.gaming32.bingo.mixin.fabric;
 
 import com.llamalad7.mixinextras.sugar.Local;
-import io.github.gaming32.bingo.fabric.FabricEvents;
+import io.github.gaming32.bingo.fabric.event.FabricEvents;
 import net.minecraft.core.particles.ParticleOptions;
 import net.minecraft.sounds.SoundEvent;
 import net.minecraft.world.damagesource.DamageSource;

diff --git a/fabric/src/main/java/io/github/gaming32/bingo/mixin/fabric/MixinPlayerList.java b/fabric/src/main/java/io/github/gaming32/bingo/mixin/fabric/MixinPlayerList.java
@@ -1,6 +1,6 @@
 package io.github.gaming32.bingo.mixin.fabric;
 
-import io.github.gaming32.bingo.fabric.FabricEvents;
+import io.github.gaming32.bingo.fabric.event.FabricEvents;
 import net.minecraft.network.Connection;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.server.network.CommonListenerCookie;

diff --git a/fabric/src/main/java/io/github/gaming32/bingo/mixin/fabric/client/MixinMinecraft.java b/fabric/src/main/java/io/github/gaming32/bingo/mixin/fabric/client/MixinMinecraft.java
@@ -1,6 +1,6 @@
 package io.github.gaming32.bingo.mixin.fabric.client;
 
-import io.github.gaming32.bingo.fabric.FabricClientEvents;
+import io.github.gaming32.bingo.fabric.event.FabricClientEvents;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.client.player.LocalPlayer;

diff --git a/neoforge/src/main/java/io/github/gaming32/bingo/neoforge/BingoNeoForge.java b/neoforge/src/main/java/io/github/gaming32/bingo/neoforge/BingoNeoForge.java
@@ -1,7 +1,7 @@
 package io.github.gaming32.bingo.neoforge;
 
 import io.github.gaming32.bingo.Bingo;
-import io.github.gaming32.bingo.multiloader.BingoPlatform;
+import io.github.gaming32.bingo.platform.BingoPlatform;
 import net.neoforged.bus.api.IEventBus;
 import net.neoforged.fml.common.Mod;
 

diff --git a/neoforge/src/main/java/io/github/gaming32/bingo/neoforge/NeoForgePlatform.java b/neoforge/src/main/java/io/github/gaming32/bingo/neoforge/NeoForgePlatform.java
@@ -1,9 +1,9 @@
 package io.github.gaming32.bingo.neoforge;
 
-import io.github.gaming32.bingo.multiloader.BingoPlatform;
-import io.github.gaming32.bingo.multiloader.ClientEvents;
-import io.github.gaming32.bingo.multiloader.Event;
 import io.github.gaming32.bingo.network.BingoNetworking;
+import io.github.gaming32.bingo.platform.BingoPlatform;
+import io.github.gaming32.bingo.platform.event.ClientEvents;
+import io.github.gaming32.bingo.platform.event.Event;
 import net.minecraft.client.Minecraft;
 import net.minecraft.server.level.ServerPlayer;
 import net.neoforged.bus.api.IEventBus;