From 28ff9ce3bbed22e4e11c358a8044f29f850dfa0b Mon Sep 17 00:00:00 2001 From: DrParadox7 Date: Sat, 9 Dec 2023 19:16:49 +0100 Subject: [PATCH] Update Gradle + SA --- gradle/wrapper/gradle-wrapper.properties | 2 +- .../java/squeek/spiceoflife/ModConfig.java | 6 +++--- .../java/squeek/spiceoflife/ModContent.java | 2 +- .../squeek/spiceoflife/ModSpiceOfLife.java | 20 +++++++++---------- .../compat/PacketDispatcherNetty.java | 2 +- .../spiceoflife/foodtracker/FoodModifier.java | 9 ++++----- .../spiceoflife/foodtracker/FoodTracker.java | 14 ++++++------- .../foodtracker/foodgroups/FoodGroup.java | 6 +++--- .../foodgroups/FoodGroupConfig.java | 6 +++--- .../spiceoflife/gui/GuiScreenFoodJournal.java | 4 ++-- .../spiceoflife/gui/TooltipHandler.java | 6 +++--- .../gui/widget/WidgetButtonSortDirection.java | 2 +- .../gui/widget/WidgetFoodEaten.java | 4 ++-- .../squeek/spiceoflife/helpers/GuiHelper.java | 4 ++-- .../interfaces/IPacketProcessor.java | 2 +- .../inventory/FoodContainerInventory.java | 2 +- .../spiceoflife/items/ItemFoodContainer.java | 10 +++++----- .../spiceoflife/items/ItemFoodJournal.java | 4 ++-- .../spiceoflife/network/PacketBase.java | 4 ++-- .../spiceoflife/network/PacketConfigSync.java | 2 +- .../network/PacketFoodEatenAllTime.java | 2 +- .../spiceoflife/network/PacketFoodGroup.java | 2 +- .../network/PacketFoodHistory.java | 2 +- .../spiceoflife/network/PacketHandler.java | 4 ++-- .../network/PacketToggleFoodContainer.java | 2 +- 25 files changed, 61 insertions(+), 62 deletions(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index f398c33..3499ded 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/main/java/squeek/spiceoflife/ModConfig.java b/src/main/java/squeek/spiceoflife/ModConfig.java index e947ea6..d6b0b39 100644 --- a/src/main/java/squeek/spiceoflife/ModConfig.java +++ b/src/main/java/squeek/spiceoflife/ModConfig.java @@ -8,6 +8,9 @@ import net.minecraftforge.common.config.Configuration; import net.minecraftforge.common.config.Property; +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import squeek.spiceoflife.compat.IByteIO; import squeek.spiceoflife.compat.PacketDispatcher; import squeek.spiceoflife.foodtracker.FoodHistory; @@ -18,9 +21,6 @@ import squeek.spiceoflife.interfaces.IPacketProcessor; import squeek.spiceoflife.network.PacketBase; import squeek.spiceoflife.network.PacketConfigSync; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class ModConfig implements IPackable, IPacketProcessor { diff --git a/src/main/java/squeek/spiceoflife/ModContent.java b/src/main/java/squeek/spiceoflife/ModContent.java index 4deee6a..15d916e 100644 --- a/src/main/java/squeek/spiceoflife/ModContent.java +++ b/src/main/java/squeek/spiceoflife/ModContent.java @@ -4,9 +4,9 @@ import net.minecraft.init.Items; import net.minecraft.item.ItemStack; +import cpw.mods.fml.common.registry.GameRegistry; import squeek.spiceoflife.items.ItemFoodContainer; import squeek.spiceoflife.items.ItemFoodJournal; -import cpw.mods.fml.common.registry.GameRegistry; public class ModContent { diff --git a/src/main/java/squeek/spiceoflife/ModSpiceOfLife.java b/src/main/java/squeek/spiceoflife/ModSpiceOfLife.java index 2a000b6..c1ac11f 100644 --- a/src/main/java/squeek/spiceoflife/ModSpiceOfLife.java +++ b/src/main/java/squeek/spiceoflife/ModSpiceOfLife.java @@ -7,16 +7,6 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import squeek.spiceoflife.foodtracker.FoodLists; -import squeek.spiceoflife.foodtracker.FoodModifier; -import squeek.spiceoflife.foodtracker.FoodTracker; -import squeek.spiceoflife.foodtracker.commands.CommandFoodList; -import squeek.spiceoflife.foodtracker.commands.CommandResetHistory; -import squeek.spiceoflife.foodtracker.foodgroups.FoodGroupConfig; -import squeek.spiceoflife.foodtracker.foodgroups.FoodGroupRegistry; -import squeek.spiceoflife.gui.TooltipHandler; -import squeek.spiceoflife.helpers.GuiHelper; -import squeek.spiceoflife.network.PacketHandler; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.Mod; @@ -27,6 +17,16 @@ import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.event.FMLServerStartingEvent; import cpw.mods.fml.relauncher.Side; +import squeek.spiceoflife.foodtracker.FoodLists; +import squeek.spiceoflife.foodtracker.FoodModifier; +import squeek.spiceoflife.foodtracker.FoodTracker; +import squeek.spiceoflife.foodtracker.commands.CommandFoodList; +import squeek.spiceoflife.foodtracker.commands.CommandResetHistory; +import squeek.spiceoflife.foodtracker.foodgroups.FoodGroupConfig; +import squeek.spiceoflife.foodtracker.foodgroups.FoodGroupRegistry; +import squeek.spiceoflife.gui.TooltipHandler; +import squeek.spiceoflife.helpers.GuiHelper; +import squeek.spiceoflife.network.PacketHandler; @Mod(modid = ModInfo.MODID, version = ModInfo.VERSION, dependencies = "required-after:AppleCore") public class ModSpiceOfLife { diff --git a/src/main/java/squeek/spiceoflife/compat/PacketDispatcherNetty.java b/src/main/java/squeek/spiceoflife/compat/PacketDispatcherNetty.java index 769dd31..666839d 100644 --- a/src/main/java/squeek/spiceoflife/compat/PacketDispatcherNetty.java +++ b/src/main/java/squeek/spiceoflife/compat/PacketDispatcherNetty.java @@ -2,10 +2,10 @@ import net.minecraft.entity.player.EntityPlayerMP; +import cpw.mods.fml.common.network.NetworkRegistry; import squeek.spiceoflife.compat.PacketDispatcher.PacketTarget; import squeek.spiceoflife.network.PacketBase; import squeek.spiceoflife.network.PacketHandler; -import cpw.mods.fml.common.network.NetworkRegistry; public class PacketDispatcherNetty implements IPacketDispatcher { diff --git a/src/main/java/squeek/spiceoflife/foodtracker/FoodModifier.java b/src/main/java/squeek/spiceoflife/foodtracker/FoodModifier.java index ca6442f..9741cf3 100644 --- a/src/main/java/squeek/spiceoflife/foodtracker/FoodModifier.java +++ b/src/main/java/squeek/spiceoflife/foodtracker/FoodModifier.java @@ -6,6 +6,10 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.event.entity.player.PlayerUseItemEvent; +import com.udojava.evalex.Expression; + +import cpw.mods.fml.common.eventhandler.EventPriority; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; import squeek.applecore.api.AppleCoreAPI; import squeek.applecore.api.food.FoodEvent; import squeek.applecore.api.food.FoodValues; @@ -15,11 +19,6 @@ import squeek.spiceoflife.helpers.FoodHelper; import squeek.spiceoflife.items.ItemFoodContainer; -import com.udojava.evalex.Expression; - -import cpw.mods.fml.common.eventhandler.EventPriority; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; - public class FoodModifier { public static final FoodModifier GLOBAL = new FoodModifier(); diff --git a/src/main/java/squeek/spiceoflife/foodtracker/FoodTracker.java b/src/main/java/squeek/spiceoflife/foodtracker/FoodTracker.java index 5e6d974..d660bea 100644 --- a/src/main/java/squeek/spiceoflife/foodtracker/FoodTracker.java +++ b/src/main/java/squeek/spiceoflife/foodtracker/FoodTracker.java @@ -6,13 +6,6 @@ import net.minecraftforge.event.entity.EntityEvent.EntityConstructing; import net.minecraftforge.event.entity.living.LivingDeathEvent; -import squeek.applecore.api.food.FoodEvent; -import squeek.spiceoflife.ModConfig; -import squeek.spiceoflife.compat.PacketDispatcher; -import squeek.spiceoflife.foodtracker.foodgroups.FoodGroupRegistry; -import squeek.spiceoflife.items.ItemFoodJournal; -import squeek.spiceoflife.network.PacketFoodEatenAllTime; -import squeek.spiceoflife.network.PacketFoodHistory; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.PlayerEvent.PlayerChangedDimensionEvent; @@ -20,6 +13,13 @@ import cpw.mods.fml.common.gameevent.PlayerEvent.PlayerRespawnEvent; import cpw.mods.fml.common.network.FMLNetworkEvent.ClientConnectedToServerEvent; import cpw.mods.fml.relauncher.Side; +import squeek.applecore.api.food.FoodEvent; +import squeek.spiceoflife.ModConfig; +import squeek.spiceoflife.compat.PacketDispatcher; +import squeek.spiceoflife.foodtracker.foodgroups.FoodGroupRegistry; +import squeek.spiceoflife.items.ItemFoodJournal; +import squeek.spiceoflife.network.PacketFoodEatenAllTime; +import squeek.spiceoflife.network.PacketFoodHistory; public class FoodTracker { diff --git a/src/main/java/squeek/spiceoflife/foodtracker/foodgroups/FoodGroup.java b/src/main/java/squeek/spiceoflife/foodtracker/foodgroups/FoodGroup.java index 633310d..2b2ee1f 100644 --- a/src/main/java/squeek/spiceoflife/foodtracker/foodgroups/FoodGroup.java +++ b/src/main/java/squeek/spiceoflife/foodtracker/foodgroups/FoodGroup.java @@ -12,14 +12,14 @@ import net.minecraft.util.StatCollector; import net.minecraftforge.oredict.OreDictionary; +import com.google.gson.annotations.SerializedName; + +import cpw.mods.fml.common.registry.GameRegistry; import squeek.spiceoflife.compat.IByteIO; import squeek.spiceoflife.foodtracker.FoodModifier; import squeek.spiceoflife.helpers.OreDictionaryHelper; import squeek.spiceoflife.interfaces.IPackable; -import com.google.gson.annotations.SerializedName; -import cpw.mods.fml.common.registry.GameRegistry; - public class FoodGroup implements IPackable { static final transient EnumChatFormatting DEFAULT_FORMATTING = EnumChatFormatting.GRAY; diff --git a/src/main/java/squeek/spiceoflife/foodtracker/foodgroups/FoodGroupConfig.java b/src/main/java/squeek/spiceoflife/foodtracker/foodgroups/FoodGroupConfig.java index 11d1505..ade5d61 100644 --- a/src/main/java/squeek/spiceoflife/foodtracker/foodgroups/FoodGroupConfig.java +++ b/src/main/java/squeek/spiceoflife/foodtracker/foodgroups/FoodGroupConfig.java @@ -11,14 +11,14 @@ import org.apache.commons.io.FilenameUtils; +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; + import squeek.spiceoflife.ModInfo; import squeek.spiceoflife.ModSpiceOfLife; import squeek.spiceoflife.helpers.FileHelper; import squeek.spiceoflife.helpers.MiscHelper; -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; - public class FoodGroupConfig { private static final Gson gson = new GsonBuilder().enableComplexMapKeySerialization().setPrettyPrinting().create(); diff --git a/src/main/java/squeek/spiceoflife/gui/GuiScreenFoodJournal.java b/src/main/java/squeek/spiceoflife/gui/GuiScreenFoodJournal.java index 6e23325..3cd41e6 100644 --- a/src/main/java/squeek/spiceoflife/gui/GuiScreenFoodJournal.java +++ b/src/main/java/squeek/spiceoflife/gui/GuiScreenFoodJournal.java @@ -17,13 +17,13 @@ import org.lwjgl.opengl.GL11; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import squeek.spiceoflife.foodtracker.FoodEaten; import squeek.spiceoflife.foodtracker.FoodHistory; import squeek.spiceoflife.foodtracker.ProgressInfo; import squeek.spiceoflife.gui.widget.WidgetButtonNextPage; import squeek.spiceoflife.gui.widget.WidgetFoodEaten; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class GuiScreenFoodJournal extends GuiScreen { diff --git a/src/main/java/squeek/spiceoflife/gui/TooltipHandler.java b/src/main/java/squeek/spiceoflife/gui/TooltipHandler.java index 9b18d3b..ee48442 100644 --- a/src/main/java/squeek/spiceoflife/gui/TooltipHandler.java +++ b/src/main/java/squeek/spiceoflife/gui/TooltipHandler.java @@ -13,6 +13,9 @@ import net.minecraft.util.StatCollector; import net.minecraftforge.event.entity.player.ItemTooltipEvent; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import squeek.applecore.api.food.FoodValues; import squeek.spiceoflife.ModConfig; import squeek.spiceoflife.foodtracker.FoodHistory; @@ -23,9 +26,6 @@ import squeek.spiceoflife.helpers.FoodHelper; import squeek.spiceoflife.helpers.KeyHelper; import squeek.spiceoflife.helpers.StringHelper; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class TooltipHandler { diff --git a/src/main/java/squeek/spiceoflife/gui/widget/WidgetButtonSortDirection.java b/src/main/java/squeek/spiceoflife/gui/widget/WidgetButtonSortDirection.java index e5d9f10..90a680f 100644 --- a/src/main/java/squeek/spiceoflife/gui/widget/WidgetButtonSortDirection.java +++ b/src/main/java/squeek/spiceoflife/gui/widget/WidgetButtonSortDirection.java @@ -8,9 +8,9 @@ import org.lwjgl.opengl.GL11; -import squeek.spiceoflife.ModInfo; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import squeek.spiceoflife.ModInfo; @SideOnly(Side.CLIENT) public class WidgetButtonSortDirection extends GuiButton { diff --git a/src/main/java/squeek/spiceoflife/gui/widget/WidgetFoodEaten.java b/src/main/java/squeek/spiceoflife/gui/widget/WidgetFoodEaten.java index 198d5f5..1572c90 100644 --- a/src/main/java/squeek/spiceoflife/gui/widget/WidgetFoodEaten.java +++ b/src/main/java/squeek/spiceoflife/gui/widget/WidgetFoodEaten.java @@ -5,11 +5,11 @@ import org.lwjgl.opengl.GL11; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import squeek.applecore.api.food.FoodValues; import squeek.spiceoflife.foodtracker.FoodEaten; import squeek.spiceoflife.helpers.ColorHelper; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class WidgetFoodEaten extends Gui { diff --git a/src/main/java/squeek/spiceoflife/helpers/GuiHelper.java b/src/main/java/squeek/spiceoflife/helpers/GuiHelper.java index d07aa7a..6c1b921 100644 --- a/src/main/java/squeek/spiceoflife/helpers/GuiHelper.java +++ b/src/main/java/squeek/spiceoflife/helpers/GuiHelper.java @@ -6,13 +6,13 @@ import net.minecraft.util.IIcon; import net.minecraft.world.World; +import cpw.mods.fml.common.network.IGuiHandler; +import cpw.mods.fml.common.network.NetworkRegistry; import squeek.spiceoflife.ModSpiceOfLife; import squeek.spiceoflife.gui.GuiFoodContainer; import squeek.spiceoflife.inventory.ContainerFoodContainer; import squeek.spiceoflife.inventory.FoodContainerInventory; import squeek.spiceoflife.items.ItemFoodContainer; -import cpw.mods.fml.common.network.IGuiHandler; -import cpw.mods.fml.common.network.NetworkRegistry; public class GuiHelper implements IGuiHandler { diff --git a/src/main/java/squeek/spiceoflife/interfaces/IPacketProcessor.java b/src/main/java/squeek/spiceoflife/interfaces/IPacketProcessor.java index 2e44af2..4742c18 100644 --- a/src/main/java/squeek/spiceoflife/interfaces/IPacketProcessor.java +++ b/src/main/java/squeek/spiceoflife/interfaces/IPacketProcessor.java @@ -2,8 +2,8 @@ import net.minecraft.entity.player.EntityPlayer; -import squeek.spiceoflife.network.PacketBase; import cpw.mods.fml.relauncher.Side; +import squeek.spiceoflife.network.PacketBase; public interface IPacketProcessor { diff --git a/src/main/java/squeek/spiceoflife/inventory/FoodContainerInventory.java b/src/main/java/squeek/spiceoflife/inventory/FoodContainerInventory.java index a7c82df..c775ef5 100644 --- a/src/main/java/squeek/spiceoflife/inventory/FoodContainerInventory.java +++ b/src/main/java/squeek/spiceoflife/inventory/FoodContainerInventory.java @@ -3,11 +3,11 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import squeek.spiceoflife.items.ItemFoodContainer; import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import squeek.spiceoflife.items.ItemFoodContainer; public class FoodContainerInventory extends NBTInventory { diff --git a/src/main/java/squeek/spiceoflife/items/ItemFoodContainer.java b/src/main/java/squeek/spiceoflife/items/ItemFoodContainer.java index 3a85fa2..335cd93 100644 --- a/src/main/java/squeek/spiceoflife/items/ItemFoodContainer.java +++ b/src/main/java/squeek/spiceoflife/items/ItemFoodContainer.java @@ -22,6 +22,11 @@ import net.minecraftforge.event.ForgeEventFactory; import net.minecraftforge.event.entity.item.ItemTossEvent; +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.common.eventhandler.EventPriority; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import squeek.applecore.api.food.FoodEvent; import squeek.applecore.api.food.FoodValues; import squeek.applecore.api.food.IEdible; @@ -40,11 +45,6 @@ import squeek.spiceoflife.network.NetworkHelper; import squeek.spiceoflife.network.PacketHandler; import squeek.spiceoflife.network.PacketToggleFoodContainer; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.eventhandler.EventPriority; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class ItemFoodContainer extends Item implements INBTInventoryHaver, IEdible { diff --git a/src/main/java/squeek/spiceoflife/items/ItemFoodJournal.java b/src/main/java/squeek/spiceoflife/items/ItemFoodJournal.java index b82cbf4..3c23650 100644 --- a/src/main/java/squeek/spiceoflife/items/ItemFoodJournal.java +++ b/src/main/java/squeek/spiceoflife/items/ItemFoodJournal.java @@ -10,12 +10,12 @@ import net.minecraft.item.ItemStack; import net.minecraft.world.World; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import squeek.spiceoflife.ModConfig; import squeek.spiceoflife.ModContent; import squeek.spiceoflife.ModInfo; import squeek.spiceoflife.gui.GuiScreenFoodJournal; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class ItemFoodJournal extends Item { diff --git a/src/main/java/squeek/spiceoflife/network/PacketBase.java b/src/main/java/squeek/spiceoflife/network/PacketBase.java index 4106d85..a613f98 100644 --- a/src/main/java/squeek/spiceoflife/network/PacketBase.java +++ b/src/main/java/squeek/spiceoflife/network/PacketBase.java @@ -2,11 +2,11 @@ import net.minecraft.network.Packet; +import cpw.mods.fml.common.network.simpleimpl.IMessage; +import io.netty.buffer.ByteBuf; import squeek.spiceoflife.compat.ByteIO; import squeek.spiceoflife.interfaces.IPackable; import squeek.spiceoflife.interfaces.IPacketProcessor; -import cpw.mods.fml.common.network.simpleimpl.IMessage; -import io.netty.buffer.ByteBuf; public abstract class PacketBase implements IMessage, IPackable, IPacketProcessor { diff --git a/src/main/java/squeek/spiceoflife/network/PacketConfigSync.java b/src/main/java/squeek/spiceoflife/network/PacketConfigSync.java index 99a9c7b..91a5ec2 100644 --- a/src/main/java/squeek/spiceoflife/network/PacketConfigSync.java +++ b/src/main/java/squeek/spiceoflife/network/PacketConfigSync.java @@ -2,9 +2,9 @@ import net.minecraft.entity.player.EntityPlayer; +import cpw.mods.fml.relauncher.Side; import squeek.spiceoflife.ModConfig; import squeek.spiceoflife.compat.IByteIO; -import cpw.mods.fml.relauncher.Side; public class PacketConfigSync extends PacketBase { diff --git a/src/main/java/squeek/spiceoflife/network/PacketFoodEatenAllTime.java b/src/main/java/squeek/spiceoflife/network/PacketFoodEatenAllTime.java index 47ee6fc..f0574fa 100644 --- a/src/main/java/squeek/spiceoflife/network/PacketFoodEatenAllTime.java +++ b/src/main/java/squeek/spiceoflife/network/PacketFoodEatenAllTime.java @@ -2,9 +2,9 @@ import net.minecraft.entity.player.EntityPlayer; +import cpw.mods.fml.relauncher.Side; import squeek.spiceoflife.compat.IByteIO; import squeek.spiceoflife.foodtracker.FoodHistory; -import cpw.mods.fml.relauncher.Side; public class PacketFoodEatenAllTime extends PacketBase { diff --git a/src/main/java/squeek/spiceoflife/network/PacketFoodGroup.java b/src/main/java/squeek/spiceoflife/network/PacketFoodGroup.java index a6f7bd0..50d2023 100644 --- a/src/main/java/squeek/spiceoflife/network/PacketFoodGroup.java +++ b/src/main/java/squeek/spiceoflife/network/PacketFoodGroup.java @@ -2,10 +2,10 @@ import net.minecraft.entity.player.EntityPlayer; +import cpw.mods.fml.relauncher.Side; import squeek.spiceoflife.compat.IByteIO; import squeek.spiceoflife.foodtracker.foodgroups.FoodGroup; import squeek.spiceoflife.foodtracker.foodgroups.FoodGroupRegistry; -import cpw.mods.fml.relauncher.Side; public class PacketFoodGroup extends PacketBase { diff --git a/src/main/java/squeek/spiceoflife/network/PacketFoodHistory.java b/src/main/java/squeek/spiceoflife/network/PacketFoodHistory.java index 9c4e509..6874b9c 100644 --- a/src/main/java/squeek/spiceoflife/network/PacketFoodHistory.java +++ b/src/main/java/squeek/spiceoflife/network/PacketFoodHistory.java @@ -2,10 +2,10 @@ import net.minecraft.entity.player.EntityPlayer; +import cpw.mods.fml.relauncher.Side; import squeek.spiceoflife.compat.IByteIO; import squeek.spiceoflife.foodtracker.FoodEaten; import squeek.spiceoflife.foodtracker.FoodHistory; -import cpw.mods.fml.relauncher.Side; public class PacketFoodHistory extends PacketBase { diff --git a/src/main/java/squeek/spiceoflife/network/PacketHandler.java b/src/main/java/squeek/spiceoflife/network/PacketHandler.java index 17bfaea..fc2c441 100644 --- a/src/main/java/squeek/spiceoflife/network/PacketHandler.java +++ b/src/main/java/squeek/spiceoflife/network/PacketHandler.java @@ -1,10 +1,10 @@ package squeek.spiceoflife.network; -import squeek.spiceoflife.ModInfo; -import squeek.spiceoflife.network.simpleimpl.BetterSimpleNetworkWrapper; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import cpw.mods.fml.relauncher.Side; +import squeek.spiceoflife.ModInfo; +import squeek.spiceoflife.network.simpleimpl.BetterSimpleNetworkWrapper; public class PacketHandler implements IMessageHandler { diff --git a/src/main/java/squeek/spiceoflife/network/PacketToggleFoodContainer.java b/src/main/java/squeek/spiceoflife/network/PacketToggleFoodContainer.java index d498074..2aa1fa6 100644 --- a/src/main/java/squeek/spiceoflife/network/PacketToggleFoodContainer.java +++ b/src/main/java/squeek/spiceoflife/network/PacketToggleFoodContainer.java @@ -3,10 +3,10 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import cpw.mods.fml.relauncher.Side; import squeek.spiceoflife.compat.IByteIO; import squeek.spiceoflife.helpers.FoodHelper; import squeek.spiceoflife.items.ItemFoodContainer; -import cpw.mods.fml.relauncher.Side; public class PacketToggleFoodContainer extends PacketBase {