diff --git a/src/main/java/ru/dbotthepony/mc/otm/OverdriveThatMatters.java b/src/main/java/ru/dbotthepony/mc/otm/OverdriveThatMatters.java index ed3e94a68..b60c6393f 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/OverdriveThatMatters.java +++ b/src/main/java/ru/dbotthepony/mc/otm/OverdriveThatMatters.java @@ -16,10 +16,8 @@ import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent; import net.minecraftforge.fml.event.lifecycle.InterModEnqueueEvent; import net.minecraftforge.fml.event.lifecycle.InterModProcessEvent; import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; -import net.minecraftforge.fmlserverevents.FMLServerAboutToStartEvent; -import net.minecraftforge.fmlserverevents.FMLServerStartedEvent; -import net.minecraftforge.fmlserverevents.FMLServerStartingEvent; -import net.minecraftforge.fmlserverevents.FMLServerStoppingEvent; +import net.minecraftforge.event.server.ServerAboutToStartEvent; +import net.minecraftforge.event.server.ServerStoppingEvent; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import ru.dbotthepony.mc.otm.block.entity.BlockEntityBlackHole; @@ -27,7 +25,6 @@ import ru.dbotthepony.mc.otm.capability.android.AndroidCapability; import ru.dbotthepony.mc.otm.capability.android.AndroidCapabilityPlayer; import ru.dbotthepony.mc.otm.capability.MatteryCapability; import ru.dbotthepony.mc.otm.capability.drive.DrivePool; -import ru.dbotthepony.mc.otm.capability.drive.AbstractMatteryDrive; import ru.dbotthepony.mc.otm.client.AndroidGui; import ru.dbotthepony.mc.otm.client.EventHandler; import ru.dbotthepony.mc.otm.item.ItemPortableCondensationDrive; @@ -37,11 +34,8 @@ import ru.dbotthepony.mc.otm.network.MatteryNetworking; import ru.dbotthepony.mc.otm.storage.ItemStackWrapper; import ru.dbotthepony.mc.otm.storage.StorageObjectRegistry; -import javax.annotation.Nonnull; import javax.annotation.ParametersAreNonnullByDefault; import java.util.ArrayList; -import java.util.HashSet; -import java.util.Set; import java.util.WeakHashMap; import java.util.function.Consumer; import java.util.function.Supplier; @@ -66,12 +60,12 @@ public class OverdriveThatMatters { private static final WeakHashMap>> tick_once = new WeakHashMap<>(); @SubscribeEvent(priority = EventPriority.HIGHEST) - public void onServerStarting(FMLServerAboutToStartEvent event) { + public void onServerStarting(ServerAboutToStartEvent event) { tick_until.clear(); } @SubscribeEvent(priority = EventPriority.HIGHEST) - public void onServerStopping(FMLServerStoppingEvent event) { + public void onServerStopping(ServerStoppingEvent event) { tick_until.clear(); } diff --git a/src/main/java/ru/dbotthepony/mc/otm/capability/android/AndroidCapability.java b/src/main/java/ru/dbotthepony/mc/otm/capability/android/AndroidCapability.java index 802afd00e..b84063074 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/capability/android/AndroidCapability.java +++ b/src/main/java/ru/dbotthepony/mc/otm/capability/android/AndroidCapability.java @@ -22,7 +22,7 @@ import net.minecraftforge.event.entity.living.LivingHurtEvent; import net.minecraftforge.eventbus.api.EventPriority; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent; -import net.minecraftforge.fmllegacy.network.PacketDistributor; +import net.minecraftforge.network.PacketDistributor; import ru.dbotthepony.mc.otm.Registry; import ru.dbotthepony.mc.otm.android.AndroidFeature; import ru.dbotthepony.mc.otm.android.AndroidFeatureType; diff --git a/src/main/java/ru/dbotthepony/mc/otm/capability/drive/DrivePool.java b/src/main/java/ru/dbotthepony/mc/otm/capability/drive/DrivePool.java index 30e4d6eda..14af0abed 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/capability/drive/DrivePool.java +++ b/src/main/java/ru/dbotthepony/mc/otm/capability/drive/DrivePool.java @@ -10,9 +10,8 @@ import net.minecraftforge.event.TickEvent; import net.minecraftforge.event.world.WorldEvent; import net.minecraftforge.eventbus.api.EventPriority; import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fmlserverevents.FMLServerStartedEvent; -import net.minecraftforge.fmlserverevents.FMLServerStartingEvent; -import net.minecraftforge.fmlserverevents.FMLServerStoppingEvent; +import net.minecraftforge.event.server.ServerStartingEvent; +import net.minecraftforge.event.server.ServerStoppingEvent; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -21,7 +20,6 @@ import javax.annotation.ParametersAreNonnullByDefault; import java.io.File; import java.util.ArrayList; import java.util.HashMap; -import java.util.List; import java.util.UUID; import java.util.concurrent.locks.LockSupport; import java.util.function.Function; @@ -151,7 +149,7 @@ public class DrivePool { } @SubscribeEvent(priority = EventPriority.HIGHEST) - public static void serverStartEvent(FMLServerStartingEvent event) { + public static void serverStartEvent(ServerStartingEvent event) { if (thread != null && thread.isAlive()) { LOGGER.error("FMLServerStartedEvent fired twice."); LOGGER.error("Attempting to start another DrivePool I/O thread when already running one!"); @@ -170,7 +168,7 @@ public class DrivePool { } @SubscribeEvent(priority = EventPriority.HIGHEST) - public static void serverStopEvent(FMLServerStoppingEvent event) { + public static void serverStopEvent(ServerStoppingEvent event) { if (thread != null && thread.isAlive()) { stopping = true; LockSupport.unpark(thread); diff --git a/src/main/java/ru/dbotthepony/mc/otm/client/screen/panels/AbstractSlotPanel.java b/src/main/java/ru/dbotthepony/mc/otm/client/screen/panels/AbstractSlotPanel.java index 38f6e8167..a93fdd741 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/client/screen/panels/AbstractSlotPanel.java +++ b/src/main/java/ru/dbotthepony/mc/otm/client/screen/panels/AbstractSlotPanel.java @@ -7,6 +7,7 @@ import net.minecraft.client.gui.Font; import net.minecraft.client.renderer.GameRenderer; import net.minecraft.network.chat.Component; import net.minecraft.world.item.ItemStack; +import net.minecraftforge.client.gui.GuiUtils; import ru.dbotthepony.mc.otm.client.screen.MatteryScreen; import ru.dbotthepony.mc.otm.client.render.RGBAColor; import ru.dbotthepony.mc.otm.client.render.RenderHelper; @@ -105,9 +106,9 @@ public abstract class AbstractSlotPanel extends EditablePanel { if (!itemstack.isEmpty()) { Font font = net.minecraftforge.client.RenderProperties.get(itemstack).getFont(itemstack); - net.minecraftforge.fmlclient.gui.GuiUtils.preItemToolTip(itemstack); + GuiUtils.preItemToolTip(itemstack); screen.renderComponentToolTip(stack, getItemStackTooltip(itemstack), (int) mouse_x, (int) mouse_y, (font == null ? screen.getFont() : font)); - net.minecraftforge.fmlclient.gui.GuiUtils.postItemToolTip(); + GuiUtils.postItemToolTip(); return true; } diff --git a/src/main/java/ru/dbotthepony/mc/otm/matter/MatterRegistry.java b/src/main/java/ru/dbotthepony/mc/otm/matter/MatterRegistry.java index 21cb46158..07d087a06 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/matter/MatterRegistry.java +++ b/src/main/java/ru/dbotthepony/mc/otm/matter/MatterRegistry.java @@ -13,9 +13,9 @@ import net.minecraft.world.item.crafting.Recipe; import net.minecraft.world.item.crafting.RecipeType; import net.minecraftforge.event.entity.player.ItemTooltipEvent; import net.minecraftforge.event.entity.player.PlayerEvent; +import net.minecraftforge.event.server.ServerStartedEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fmllegacy.network.PacketDistributor; -import net.minecraftforge.fmlserverevents.FMLServerStartedEvent; +import net.minecraftforge.network.PacketDistributor; import ru.dbotthepony.mc.otm.OverdriveThatMatters; import ru.dbotthepony.mc.otm.capability.MatteryCapability; import ru.dbotthepony.mc.otm.capability.drive.IMatteryDrive; @@ -513,7 +513,7 @@ public class MatterRegistry { } @SubscribeEvent - public static void onServerStarted(FMLServerStartedEvent event) { + public static void onServerStarted(ServerStartedEvent event) { should_network = event.getServer() instanceof DedicatedServer; ITEMS.clear(); diff --git a/src/main/java/ru/dbotthepony/mc/otm/menu/DriveViewerMenu.java b/src/main/java/ru/dbotthepony/mc/otm/menu/DriveViewerMenu.java index 410549fc7..e72e2a33b 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/menu/DriveViewerMenu.java +++ b/src/main/java/ru/dbotthepony/mc/otm/menu/DriveViewerMenu.java @@ -6,7 +6,7 @@ import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; import net.minecraftforge.energy.CapabilityEnergy; -import net.minecraftforge.fmllegacy.network.NetworkEvent; +import net.minecraftforge.network.NetworkEvent; import ru.dbotthepony.mc.otm.Registry; import ru.dbotthepony.mc.otm.block.entity.BlockEntityDriveViewer; import ru.dbotthepony.mc.otm.capability.MatteryCapability; diff --git a/src/main/java/ru/dbotthepony/mc/otm/menu/MatterPanelMenu.java b/src/main/java/ru/dbotthepony/mc/otm/menu/MatterPanelMenu.java index 47034d1a5..df3b5ff0d 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/menu/MatterPanelMenu.java +++ b/src/main/java/ru/dbotthepony/mc/otm/menu/MatterPanelMenu.java @@ -3,7 +3,7 @@ package ru.dbotthepony.mc.otm.menu; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.entity.player.Player; -import net.minecraftforge.fmllegacy.network.PacketDistributor; +import net.minecraftforge.network.PacketDistributor; import ru.dbotthepony.mc.otm.OverdriveThatMatters; import ru.dbotthepony.mc.otm.Registry; import ru.dbotthepony.mc.otm.block.entity.BlockEntityMatterPanel; diff --git a/src/main/java/ru/dbotthepony/mc/otm/menu/data/ClearPacket.java b/src/main/java/ru/dbotthepony/mc/otm/menu/data/ClearPacket.java index d7297dc06..7e4d20a21 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/menu/data/ClearPacket.java +++ b/src/main/java/ru/dbotthepony/mc/otm/menu/data/ClearPacket.java @@ -2,8 +2,7 @@ package ru.dbotthepony.mc.otm.menu.data; import net.minecraft.client.Minecraft; import net.minecraft.network.FriendlyByteBuf; -import net.minecraftforge.fmllegacy.network.NetworkEvent; -import ru.dbotthepony.mc.otm.menu.DriveViewerMenu; +import net.minecraftforge.network.NetworkEvent; import java.util.function.Supplier; diff --git a/src/main/java/ru/dbotthepony/mc/otm/menu/data/InteractPacket.java b/src/main/java/ru/dbotthepony/mc/otm/menu/data/InteractPacket.java index 5fdfc8e7c..3a0a3b092 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/menu/data/InteractPacket.java +++ b/src/main/java/ru/dbotthepony/mc/otm/menu/data/InteractPacket.java @@ -3,11 +3,7 @@ package ru.dbotthepony.mc.otm.menu.data; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.world.inventory.ClickAction; import net.minecraft.world.inventory.ClickType; -import net.minecraftforge.fmllegacy.network.NetworkEvent; -import ru.dbotthepony.mc.otm.block.entity.BlockEntityDriveViewer; -import ru.dbotthepony.mc.otm.menu.DriveViewerMenu; -import ru.dbotthepony.mc.otm.network.MatteryNetworking; -import ru.dbotthepony.mc.otm.network.SetCarriedPacket; +import net.minecraftforge.network.NetworkEvent; import java.util.function.Supplier; diff --git a/src/main/java/ru/dbotthepony/mc/otm/menu/data/NetworkedItemView.java b/src/main/java/ru/dbotthepony/mc/otm/menu/data/NetworkedItemView.java index fd2e32f69..928d5162e 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/menu/data/NetworkedItemView.java +++ b/src/main/java/ru/dbotthepony/mc/otm/menu/data/NetworkedItemView.java @@ -7,7 +7,7 @@ import net.minecraft.world.entity.player.Player; import net.minecraft.world.inventory.ClickAction; import net.minecraft.world.inventory.ClickType; import net.minecraft.world.item.ItemStack; -import net.minecraftforge.fmllegacy.network.PacketDistributor; +import net.minecraftforge.network.PacketDistributor; import ru.dbotthepony.mc.otm.menu.MatteryMenu; import ru.dbotthepony.mc.otm.network.MatteryNetworking; import ru.dbotthepony.mc.otm.network.SetCarriedPacket; diff --git a/src/main/java/ru/dbotthepony/mc/otm/menu/data/StackAddPacket.java b/src/main/java/ru/dbotthepony/mc/otm/menu/data/StackAddPacket.java index 22fe9402e..3e928710b 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/menu/data/StackAddPacket.java +++ b/src/main/java/ru/dbotthepony/mc/otm/menu/data/StackAddPacket.java @@ -4,8 +4,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; -import net.minecraftforge.fmllegacy.network.NetworkEvent; -import ru.dbotthepony.mc.otm.menu.DriveViewerMenu; +import net.minecraftforge.network.NetworkEvent; import java.util.function.Supplier; diff --git a/src/main/java/ru/dbotthepony/mc/otm/menu/data/StackChangePacket.java b/src/main/java/ru/dbotthepony/mc/otm/menu/data/StackChangePacket.java index 49c61337a..2eefd7369 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/menu/data/StackChangePacket.java +++ b/src/main/java/ru/dbotthepony/mc/otm/menu/data/StackChangePacket.java @@ -2,8 +2,7 @@ package ru.dbotthepony.mc.otm.menu.data; import net.minecraft.client.Minecraft; import net.minecraft.network.FriendlyByteBuf; -import net.minecraftforge.fmllegacy.network.NetworkEvent; -import ru.dbotthepony.mc.otm.menu.DriveViewerMenu; +import net.minecraftforge.network.NetworkEvent; import java.util.function.Supplier; diff --git a/src/main/java/ru/dbotthepony/mc/otm/menu/data/StackRemovePacket.java b/src/main/java/ru/dbotthepony/mc/otm/menu/data/StackRemovePacket.java index 1f169d6d6..eba404e2e 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/menu/data/StackRemovePacket.java +++ b/src/main/java/ru/dbotthepony/mc/otm/menu/data/StackRemovePacket.java @@ -2,8 +2,7 @@ package ru.dbotthepony.mc.otm.menu.data; import net.minecraft.client.Minecraft; import net.minecraft.network.FriendlyByteBuf; -import net.minecraftforge.fmllegacy.network.NetworkEvent; -import ru.dbotthepony.mc.otm.menu.DriveViewerMenu; +import net.minecraftforge.network.NetworkEvent; import java.util.function.Supplier; diff --git a/src/main/java/ru/dbotthepony/mc/otm/network/CancelMatterTaskPacket.java b/src/main/java/ru/dbotthepony/mc/otm/network/CancelMatterTaskPacket.java index 1858b4511..633cdee20 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/network/CancelMatterTaskPacket.java +++ b/src/main/java/ru/dbotthepony/mc/otm/network/CancelMatterTaskPacket.java @@ -1,7 +1,7 @@ package ru.dbotthepony.mc.otm.network; import net.minecraft.network.FriendlyByteBuf; -import net.minecraftforge.fmllegacy.network.NetworkEvent; +import net.minecraftforge.network.NetworkEvent; import ru.dbotthepony.mc.otm.capability.matter.MatterTask; import ru.dbotthepony.mc.otm.menu.MatterPanelMenu; diff --git a/src/main/java/ru/dbotthepony/mc/otm/network/MatterBottlerSwitchPacket.java b/src/main/java/ru/dbotthepony/mc/otm/network/MatterBottlerSwitchPacket.java index 247e9618a..b923d3edc 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/network/MatterBottlerSwitchPacket.java +++ b/src/main/java/ru/dbotthepony/mc/otm/network/MatterBottlerSwitchPacket.java @@ -2,10 +2,7 @@ package ru.dbotthepony.mc.otm.network; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.server.level.ServerPlayer; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.fml.DistExecutor; -import net.minecraftforge.fmllegacy.network.NetworkEvent; -import ru.dbotthepony.mc.otm.matter.MatterRegistry; +import net.minecraftforge.network.NetworkEvent; import ru.dbotthepony.mc.otm.menu.MatterBottlerMenu; import java.util.function.Supplier; diff --git a/src/main/java/ru/dbotthepony/mc/otm/network/MatterRegistryPacket.java b/src/main/java/ru/dbotthepony/mc/otm/network/MatterRegistryPacket.java index bd9990646..c8e2235b9 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/network/MatterRegistryPacket.java +++ b/src/main/java/ru/dbotthepony/mc/otm/network/MatterRegistryPacket.java @@ -4,14 +4,12 @@ import net.minecraft.network.FriendlyByteBuf; import net.minecraft.world.item.Item; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.fml.DistExecutor; -import net.minecraftforge.fmllegacy.network.NetworkEvent; +import net.minecraftforge.network.NetworkEvent; import net.minecraftforge.registries.ForgeRegistry; import net.minecraftforge.registries.RegistryManager; -import ru.dbotthepony.mc.otm.OverdriveThatMatters; import ru.dbotthepony.mc.otm.matter.MatterRegistry; import java.math.BigDecimal; -import java.util.Collection; import java.util.HashMap; import java.util.Map; import java.util.function.Supplier; diff --git a/src/main/java/ru/dbotthepony/mc/otm/network/MatterTaskPacket.java b/src/main/java/ru/dbotthepony/mc/otm/network/MatterTaskPacket.java index 62259f612..cbb23fef3 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/network/MatterTaskPacket.java +++ b/src/main/java/ru/dbotthepony/mc/otm/network/MatterTaskPacket.java @@ -4,7 +4,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.network.FriendlyByteBuf; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.fml.DistExecutor; -import net.minecraftforge.fmllegacy.network.NetworkEvent; +import net.minecraftforge.network.NetworkEvent; import ru.dbotthepony.mc.otm.OverdriveThatMatters; import ru.dbotthepony.mc.otm.capability.matter.MatterTask; import ru.dbotthepony.mc.otm.menu.MatterPanelMenu; diff --git a/src/main/java/ru/dbotthepony/mc/otm/network/MatteryNetworking.java b/src/main/java/ru/dbotthepony/mc/otm/network/MatteryNetworking.java index d614ef10a..0649f2be2 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/network/MatteryNetworking.java +++ b/src/main/java/ru/dbotthepony/mc/otm/network/MatteryNetworking.java @@ -2,10 +2,10 @@ package ru.dbotthepony.mc.otm.network; import net.minecraft.resources.ResourceLocation; import net.minecraft.server.level.ServerPlayer; -import net.minecraftforge.fmllegacy.network.NetworkDirection; -import net.minecraftforge.fmllegacy.network.NetworkRegistry; -import net.minecraftforge.fmllegacy.network.PacketDistributor; -import net.minecraftforge.fmllegacy.network.simple.SimpleChannel; +import net.minecraftforge.network.NetworkDirection; +import net.minecraftforge.network.NetworkRegistry; +import net.minecraftforge.network.PacketDistributor; +import net.minecraftforge.network.simple.SimpleChannel; import ru.dbotthepony.mc.otm.OverdriveThatMatters; import ru.dbotthepony.mc.otm.menu.DriveViewerMenu; import ru.dbotthepony.mc.otm.menu.data.*; diff --git a/src/main/java/ru/dbotthepony/mc/otm/network/PatternGridPacket.java b/src/main/java/ru/dbotthepony/mc/otm/network/PatternGridPacket.java index e9170a940..77e945a84 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/network/PatternGridPacket.java +++ b/src/main/java/ru/dbotthepony/mc/otm/network/PatternGridPacket.java @@ -4,7 +4,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.network.FriendlyByteBuf; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.fml.DistExecutor; -import net.minecraftforge.fmllegacy.network.NetworkEvent; +import net.minecraftforge.network.NetworkEvent; import ru.dbotthepony.mc.otm.OverdriveThatMatters; import ru.dbotthepony.mc.otm.capability.matter.PatternState; import ru.dbotthepony.mc.otm.menu.MatterPanelMenu; diff --git a/src/main/java/ru/dbotthepony/mc/otm/network/PatternReplicationRequestPacket.java b/src/main/java/ru/dbotthepony/mc/otm/network/PatternReplicationRequestPacket.java index 1a3db4e89..c69179d1b 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/network/PatternReplicationRequestPacket.java +++ b/src/main/java/ru/dbotthepony/mc/otm/network/PatternReplicationRequestPacket.java @@ -1,7 +1,7 @@ package ru.dbotthepony.mc.otm.network; import net.minecraft.network.FriendlyByteBuf; -import net.minecraftforge.fmllegacy.network.NetworkEvent; +import net.minecraftforge.network.NetworkEvent; import ru.dbotthepony.mc.otm.capability.matter.PatternState; import ru.dbotthepony.mc.otm.menu.MatterPanelMenu; diff --git a/src/main/java/ru/dbotthepony/mc/otm/network/SetCarriedPacket.java b/src/main/java/ru/dbotthepony/mc/otm/network/SetCarriedPacket.java index 16d9aa769..f657c064f 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/network/SetCarriedPacket.java +++ b/src/main/java/ru/dbotthepony/mc/otm/network/SetCarriedPacket.java @@ -2,13 +2,8 @@ package ru.dbotthepony.mc.otm.network; import net.minecraft.client.Minecraft; import net.minecraft.network.FriendlyByteBuf; -import net.minecraft.world.inventory.AbstractContainerMenu; import net.minecraft.world.item.ItemStack; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.fml.DistExecutor; -import net.minecraftforge.fmllegacy.network.NetworkEvent; -import ru.dbotthepony.mc.otm.capability.MatteryCapability; -import ru.dbotthepony.mc.otm.network.android.AndroidBatteryPacket; +import net.minecraftforge.network.NetworkEvent; import java.util.function.Supplier; diff --git a/src/main/java/ru/dbotthepony/mc/otm/network/android/AndroidBatteryPacket.java b/src/main/java/ru/dbotthepony/mc/otm/network/android/AndroidBatteryPacket.java index 0b0e7436b..3febcc368 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/network/android/AndroidBatteryPacket.java +++ b/src/main/java/ru/dbotthepony/mc/otm/network/android/AndroidBatteryPacket.java @@ -5,11 +5,9 @@ import net.minecraft.network.FriendlyByteBuf; import net.minecraft.world.item.ItemStack; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.fml.DistExecutor; -import net.minecraftforge.fmllegacy.network.NetworkEvent; +import net.minecraftforge.network.NetworkEvent; import ru.dbotthepony.mc.otm.capability.MatteryCapability; -import ru.dbotthepony.mc.otm.network.NetworkHelper; -import java.math.BigDecimal; import java.util.function.Supplier; public record AndroidBatteryPacket(ItemStack battery) { diff --git a/src/main/java/ru/dbotthepony/mc/otm/network/android/AndroidEnergyPacket.java b/src/main/java/ru/dbotthepony/mc/otm/network/android/AndroidEnergyPacket.java index f31ae050d..85123b55f 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/network/android/AndroidEnergyPacket.java +++ b/src/main/java/ru/dbotthepony/mc/otm/network/android/AndroidEnergyPacket.java @@ -4,8 +4,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.network.FriendlyByteBuf; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.fml.DistExecutor; -import net.minecraftforge.fmllegacy.network.NetworkEvent; -import ru.dbotthepony.mc.otm.OverdriveThatMatters; +import net.minecraftforge.network.NetworkEvent; import ru.dbotthepony.mc.otm.capability.MatteryCapability; import ru.dbotthepony.mc.otm.network.NetworkHelper; diff --git a/src/main/java/ru/dbotthepony/mc/otm/network/android/AndroidFeaturePacket.java b/src/main/java/ru/dbotthepony/mc/otm/network/android/AndroidFeaturePacket.java index 1581b78ab..35a0940b0 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/network/android/AndroidFeaturePacket.java +++ b/src/main/java/ru/dbotthepony/mc/otm/network/android/AndroidFeaturePacket.java @@ -4,7 +4,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.network.FriendlyByteBuf; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.fml.DistExecutor; -import net.minecraftforge.fmllegacy.network.NetworkEvent; +import net.minecraftforge.network.NetworkEvent; import ru.dbotthepony.mc.otm.Registry; import ru.dbotthepony.mc.otm.capability.MatteryCapability; import ru.dbotthepony.mc.otm.capability.android.AndroidCapabilityPlayer; diff --git a/src/main/java/ru/dbotthepony/mc/otm/network/android/AndroidResearchPacket.java b/src/main/java/ru/dbotthepony/mc/otm/network/android/AndroidResearchPacket.java index 068359d9c..e97e51ea0 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/network/android/AndroidResearchPacket.java +++ b/src/main/java/ru/dbotthepony/mc/otm/network/android/AndroidResearchPacket.java @@ -5,7 +5,7 @@ import net.minecraft.nbt.CompoundTag; import net.minecraft.network.FriendlyByteBuf; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.fml.DistExecutor; -import net.minecraftforge.fmllegacy.network.NetworkEvent; +import net.minecraftforge.network.NetworkEvent; import ru.dbotthepony.mc.otm.Registry; import ru.dbotthepony.mc.otm.android.AndroidResearch; import ru.dbotthepony.mc.otm.android.AndroidResearchType; diff --git a/src/main/java/ru/dbotthepony/mc/otm/network/android/AndroidResearchRequestPacket.java b/src/main/java/ru/dbotthepony/mc/otm/network/android/AndroidResearchRequestPacket.java index 040b3b0a5..a8d84eb7e 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/network/android/AndroidResearchRequestPacket.java +++ b/src/main/java/ru/dbotthepony/mc/otm/network/android/AndroidResearchRequestPacket.java @@ -2,7 +2,7 @@ package ru.dbotthepony.mc.otm.network.android; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.server.level.ServerPlayer; -import net.minecraftforge.fmllegacy.network.NetworkEvent; +import net.minecraftforge.network.NetworkEvent; import ru.dbotthepony.mc.otm.Registry; import ru.dbotthepony.mc.otm.android.AndroidResearch; import ru.dbotthepony.mc.otm.android.AndroidResearchType; diff --git a/src/main/java/ru/dbotthepony/mc/otm/network/android/AndroidStatusPacket.java b/src/main/java/ru/dbotthepony/mc/otm/network/android/AndroidStatusPacket.java index 519d3ed90..ce714ddd5 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/network/android/AndroidStatusPacket.java +++ b/src/main/java/ru/dbotthepony/mc/otm/network/android/AndroidStatusPacket.java @@ -4,7 +4,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.network.FriendlyByteBuf; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.fml.DistExecutor; -import net.minecraftforge.fmllegacy.network.NetworkEvent; +import net.minecraftforge.network.NetworkEvent; import ru.dbotthepony.mc.otm.capability.MatteryCapability; import ru.dbotthepony.mc.otm.capability.android.AndroidCapabilityPlayer;