diff options
| author | Jason Mitchell <mitchej@gmail.com> | 2023-05-01 07:02:55 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-01 16:02:55 +0200 |
| commit | e2d8bffd9673b6f22ba7ade2c2bacda58bb99373 (patch) | |
| tree | 73b7f49efe643874a6e390f58a3693c30de5943b /src/main/java/kubatech | |
| parent | 2d6e7e82c117d9c4687632017b3470dafd0dccef (diff) | |
| download | GT5-Unofficial-e2d8bffd9673b6f22ba7ade2c2bacda58bb99373.tar.gz GT5-Unofficial-e2d8bffd9673b6f22ba7ade2c2bacda58bb99373.tar.bz2 GT5-Unofficial-e2d8bffd9673b6f22ba7ade2c2bacda58bb99373.zip | |
ForgeDirection (#74)
* ForgeDirection
* spotlessApply
* update dep
* update
---------
Co-authored-by: GitHub GTNH Actions <unknown>
Co-authored-by: Martin Robertz <dream-master@gmx.net>
Diffstat (limited to 'src/main/java/kubatech')
48 files changed, 199 insertions, 220 deletions
diff --git a/src/main/java/kubatech/ClientProxy.java b/src/main/java/kubatech/ClientProxy.java index 92ef759fcc..3b5b68ec4e 100644 --- a/src/main/java/kubatech/ClientProxy.java +++ b/src/main/java/kubatech/ClientProxy.java @@ -20,10 +20,10 @@ package kubatech; +import cpw.mods.fml.common.event.*; import kubatech.api.utils.ModUtils; import kubatech.loaders.MobRecipeLoader; import kubatech.nei.IMCForNEI; -import cpw.mods.fml.common.event.*; @SuppressWarnings("unused") public class ClientProxy extends CommonProxy { diff --git a/src/main/java/kubatech/CommonProxy.java b/src/main/java/kubatech/CommonProxy.java index 71c575ecc4..a2ce560669 100644 --- a/src/main/java/kubatech/CommonProxy.java +++ b/src/main/java/kubatech/CommonProxy.java @@ -23,6 +23,10 @@ package kubatech; import static kubatech.loaders.BlockLoader.registerBlocks; import static kubatech.loaders.ItemLoader.registerItems; +import net.minecraftforge.common.MinecraftForge; + +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.common.event.*; import kubatech.api.LoaderReference; import kubatech.commands.*; import kubatech.config.Config; @@ -31,11 +35,6 @@ import kubatech.loaders.RecipeLoader; import kubatech.loaders.TCLoader; import kubatech.savedata.PlayerDataManager; -import net.minecraftforge.common.MinecraftForge; - -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.event.*; - public class CommonProxy { public void preInit(FMLPreInitializationEvent event) { diff --git a/src/main/java/kubatech/FMLEventHandler.java b/src/main/java/kubatech/FMLEventHandler.java index 0c6f3d20ea..27ff42615c 100644 --- a/src/main/java/kubatech/FMLEventHandler.java +++ b/src/main/java/kubatech/FMLEventHandler.java @@ -20,14 +20,13 @@ package kubatech; -import kubatech.api.helpers.UUIDFinder; -import kubatech.api.network.LoadConfigPacket; -import kubatech.savedata.PlayerDataManager; - import net.minecraft.entity.player.EntityPlayerMP; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.PlayerEvent; +import kubatech.api.helpers.UUIDFinder; +import kubatech.api.network.LoadConfigPacket; +import kubatech.savedata.PlayerDataManager; public class FMLEventHandler { diff --git a/src/main/java/kubatech/api/Variables.java b/src/main/java/kubatech/api/Variables.java index 4ab730a150..22db1344db 100644 --- a/src/main/java/kubatech/api/Variables.java +++ b/src/main/java/kubatech/api/Variables.java @@ -23,10 +23,10 @@ package kubatech.api; import java.text.DecimalFormat; import java.text.NumberFormat; -import kubatech.api.utils.StringUtils; - import net.minecraft.util.EnumChatFormatting; +import kubatech.api.utils.StringUtils; + public class Variables { public static final String Author = "Author: " diff --git a/src/main/java/kubatech/api/helpers/EnderIOHelper.java b/src/main/java/kubatech/api/helpers/EnderIOHelper.java index 683d193d34..63da31e76e 100644 --- a/src/main/java/kubatech/api/helpers/EnderIOHelper.java +++ b/src/main/java/kubatech/api/helpers/EnderIOHelper.java @@ -20,13 +20,12 @@ package kubatech.api.helpers; -import kubatech.api.LoaderReference; - import net.minecraft.entity.Entity; import net.minecraft.entity.EntityList; import net.minecraft.entity.boss.IBossDisplayData; import crazypants.enderio.EnderIO; +import kubatech.api.LoaderReference; public class EnderIOHelper { diff --git a/src/main/java/kubatech/api/helpers/GTHelper.java b/src/main/java/kubatech/api/helpers/GTHelper.java index 8521045404..201f8b45b7 100644 --- a/src/main/java/kubatech/api/helpers/GTHelper.java +++ b/src/main/java/kubatech/api/helpers/GTHelper.java @@ -23,9 +23,9 @@ package kubatech.api.helpers; import static gregtech.api.metatileentity.implementations.GT_MetaTileEntity_MultiBlockBase.isValidMetaTileEntity; import static kubatech.api.Variables.ln4; -import kubatech.api.implementations.KubaTechGTMultiBlockBase; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Energy; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_MultiBlockBase; +import kubatech.api.implementations.KubaTechGTMultiBlockBase; public class GTHelper { diff --git a/src/main/java/kubatech/api/helpers/ProgressBarWrapper.java b/src/main/java/kubatech/api/helpers/ProgressBarWrapper.java index d49d1cd16c..24758565e3 100644 --- a/src/main/java/kubatech/api/helpers/ProgressBarWrapper.java +++ b/src/main/java/kubatech/api/helpers/ProgressBarWrapper.java @@ -24,11 +24,11 @@ import static kubatech.api.utils.ModUtils.isClientSided; import java.io.IOException; -import kubatech.Tags; -import kubatech.api.LoaderReference; import alexiil.mods.load.ProgressDisplayer; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.ProgressManager; +import kubatech.Tags; +import kubatech.api.LoaderReference; @SuppressWarnings("deprecation") public class ProgressBarWrapper { diff --git a/src/main/java/kubatech/api/mobhandler/MobDrop.java b/src/main/java/kubatech/api/mobhandler/MobDrop.java index f8dafc01a1..9b8b9cd51c 100644 --- a/src/main/java/kubatech/api/mobhandler/MobDrop.java +++ b/src/main/java/kubatech/api/mobhandler/MobDrop.java @@ -22,13 +22,12 @@ package kubatech.api.mobhandler; import java.util.HashMap; -import kubatech.api.ConstructableItemStack; -import kubatech.api.utils.GSONUtils; - import net.minecraft.item.ItemStack; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; +import kubatech.api.ConstructableItemStack; +import kubatech.api.utils.GSONUtils; public class MobDrop { diff --git a/src/main/java/kubatech/api/network/CustomTileEntityPacket.java b/src/main/java/kubatech/api/network/CustomTileEntityPacket.java index bc4587389f..cd65d08d57 100644 --- a/src/main/java/kubatech/api/network/CustomTileEntityPacket.java +++ b/src/main/java/kubatech/api/network/CustomTileEntityPacket.java @@ -22,10 +22,6 @@ package kubatech.api.network; import java.nio.charset.StandardCharsets; -import kubatech.api.tileentity.CustomTileEntityPacketHandler; -import kubatech.api.utils.ModUtils; -import kubatech.kubatech; - import net.minecraft.client.Minecraft; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; @@ -38,6 +34,9 @@ import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; +import kubatech.api.tileentity.CustomTileEntityPacketHandler; +import kubatech.api.utils.ModUtils; +import kubatech.kubatech; public class CustomTileEntityPacket implements IMessage { diff --git a/src/main/java/kubatech/api/network/LoadConfigPacket.java b/src/main/java/kubatech/api/network/LoadConfigPacket.java index 9af665d46b..be3d0b803c 100644 --- a/src/main/java/kubatech/api/network/LoadConfigPacket.java +++ b/src/main/java/kubatech/api/network/LoadConfigPacket.java @@ -24,14 +24,14 @@ import java.nio.charset.StandardCharsets; import java.util.HashMap; import java.util.HashSet; -import kubatech.config.Config; -import kubatech.config.OverridesConfig; -import kubatech.kubatech; -import kubatech.loaders.MobRecipeLoader; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import io.netty.buffer.ByteBuf; +import kubatech.config.Config; +import kubatech.config.OverridesConfig; +import kubatech.kubatech; +import kubatech.loaders.MobRecipeLoader; public class LoadConfigPacket implements IMessage { diff --git a/src/main/java/kubatech/api/tea/TeaNetwork.java b/src/main/java/kubatech/api/tea/TeaNetwork.java index 286dde6b33..68c8275bfd 100644 --- a/src/main/java/kubatech/api/tea/TeaNetwork.java +++ b/src/main/java/kubatech/api/tea/TeaNetwork.java @@ -4,12 +4,12 @@ import java.math.BigInteger; import java.util.HashSet; import java.util.UUID; +import net.minecraft.nbt.NBTTagCompound; + import kubatech.savedata.PlayerData; import kubatech.savedata.PlayerDataManager; import kubatech.tileentity.TeaStorageTile; -import net.minecraft.nbt.NBTTagCompound; - public class TeaNetwork { // TODO: Optimize later :P diff --git a/src/main/java/kubatech/api/utils/ModUtils.java b/src/main/java/kubatech/api/utils/ModUtils.java index e618c2557a..a6cceecdeb 100644 --- a/src/main/java/kubatech/api/utils/ModUtils.java +++ b/src/main/java/kubatech/api/utils/ModUtils.java @@ -26,12 +26,11 @@ import java.util.*; import javax.xml.bind.DatatypeConverter; -import kubatech.kubatech; - import net.minecraft.launchwrapper.Launch; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.ModContainer; +import kubatech.kubatech; public class ModUtils { diff --git a/src/main/java/kubatech/client/effect/EntityRenderer.java b/src/main/java/kubatech/client/effect/EntityRenderer.java index 2f9e5c9825..1db113c563 100644 --- a/src/main/java/kubatech/client/effect/EntityRenderer.java +++ b/src/main/java/kubatech/client/effect/EntityRenderer.java @@ -22,10 +22,6 @@ package kubatech.client.effect; import static net.minecraft.client.renderer.entity.RenderManager.*; -import kubatech.Tags; -import kubatech.api.utils.MobUtils; -import kubatech.config.Config; - import net.minecraft.client.Minecraft; import net.minecraft.client.particle.EntityFX; import net.minecraft.client.renderer.OpenGlHelper; @@ -44,6 +40,9 @@ import org.lwjgl.util.glu.GLU; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import kubatech.Tags; +import kubatech.api.utils.MobUtils; +import kubatech.config.Config; @SideOnly(Side.CLIENT) public class EntityRenderer extends EntityFX { diff --git a/src/main/java/kubatech/client/effect/MegaApiaryBeesRenderer.java b/src/main/java/kubatech/client/effect/MegaApiaryBeesRenderer.java index 9d3a883e98..40079f3fed 100644 --- a/src/main/java/kubatech/client/effect/MegaApiaryBeesRenderer.java +++ b/src/main/java/kubatech/client/effect/MegaApiaryBeesRenderer.java @@ -22,8 +22,6 @@ package kubatech.client.effect; import static net.minecraft.client.renderer.entity.RenderManager.*; -import kubatech.api.enums.ItemList; - import net.minecraft.client.Minecraft; import net.minecraft.client.particle.EntityFX; import net.minecraft.client.renderer.OpenGlHelper; @@ -36,6 +34,8 @@ import net.minecraft.world.World; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; +import kubatech.api.enums.ItemList; + public class MegaApiaryBeesRenderer extends EntityFX { public MegaApiaryBeesRenderer(World world, double x, double y, double z, int age) { diff --git a/src/main/java/kubatech/commands/CommandConfig.java b/src/main/java/kubatech/commands/CommandConfig.java index 8f94f9334f..6b61a4ca30 100644 --- a/src/main/java/kubatech/commands/CommandConfig.java +++ b/src/main/java/kubatech/commands/CommandConfig.java @@ -22,11 +22,6 @@ package kubatech.commands; import static kubatech.commands.CommandConfig.Translations.*; -import kubatech.api.network.LoadConfigPacket; -import kubatech.config.Config; -import kubatech.kubatech; -import kubatech.loaders.MobRecipeLoader; - import net.minecraft.command.CommandBase; import net.minecraft.command.ICommandSender; import net.minecraft.entity.player.EntityPlayerMP; @@ -34,6 +29,11 @@ import net.minecraft.server.MinecraftServer; import net.minecraft.util.ChatComponentText; import net.minecraft.util.StatCollector; +import kubatech.api.network.LoadConfigPacket; +import kubatech.config.Config; +import kubatech.kubatech; +import kubatech.loaders.MobRecipeLoader; + public class CommandConfig extends CommandBase { enum Translations { diff --git a/src/main/java/kubatech/commands/CommandTea.java b/src/main/java/kubatech/commands/CommandTea.java index ac949571f2..48e1b110b5 100644 --- a/src/main/java/kubatech/commands/CommandTea.java +++ b/src/main/java/kubatech/commands/CommandTea.java @@ -25,14 +25,14 @@ import static kubatech.commands.CommandTea.Translations.*; import java.math.BigInteger; import java.util.UUID; -import kubatech.api.helpers.UUIDFinder; -import kubatech.api.tea.TeaNetwork; - import net.minecraft.command.CommandBase; import net.minecraft.command.ICommandSender; import net.minecraft.util.ChatComponentText; import net.minecraft.util.StatCollector; +import kubatech.api.helpers.UUIDFinder; +import kubatech.api.tea.TeaNetwork; + public class CommandTea extends CommandBase { enum Translations { diff --git a/src/main/java/kubatech/config/Config.java b/src/main/java/kubatech/config/Config.java index 4c361f6573..6508063faf 100644 --- a/src/main/java/kubatech/config/Config.java +++ b/src/main/java/kubatech/config/Config.java @@ -22,10 +22,10 @@ package kubatech.config; import java.io.File; -import kubatech.Tags; - import net.minecraftforge.common.config.Configuration; +import kubatech.Tags; + public class Config { private enum Category { diff --git a/src/main/java/kubatech/config/OverridesConfig.java b/src/main/java/kubatech/config/OverridesConfig.java index 2959b7bbed..e80e63a16f 100644 --- a/src/main/java/kubatech/config/OverridesConfig.java +++ b/src/main/java/kubatech/config/OverridesConfig.java @@ -29,13 +29,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import kubatech.Tags; -import kubatech.api.ConstructableItemStack; -import kubatech.api.LoaderReference; -import kubatech.api.helpers.ReflectionHelper; -import kubatech.api.mobhandler.MobDrop; -import kubatech.api.utils.GSONUtils; - import net.minecraft.entity.EntityList; import net.minecraft.entity.EntityLiving; import net.minecraft.init.Items; @@ -55,6 +48,12 @@ import com.google.gson.reflect.TypeToken; import cpw.mods.fml.common.registry.GameRegistry; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; +import kubatech.Tags; +import kubatech.api.ConstructableItemStack; +import kubatech.api.LoaderReference; +import kubatech.api.helpers.ReflectionHelper; +import kubatech.api.mobhandler.MobDrop; +import kubatech.api.utils.GSONUtils; public class OverridesConfig { diff --git a/src/main/java/kubatech/kubatech.java b/src/main/java/kubatech/kubatech.java index 1814abffe1..929165d075 100644 --- a/src/main/java/kubatech/kubatech.java +++ b/src/main/java/kubatech/kubatech.java @@ -24,10 +24,6 @@ import static kubatech.api.enums.ItemList.LegendaryRedTea; import java.util.List; -import kubatech.api.enums.ItemList; -import kubatech.api.network.CustomTileEntityPacket; -import kubatech.api.network.LoadConfigPacket; - import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -40,6 +36,9 @@ import cpw.mods.fml.common.SidedProxy; import cpw.mods.fml.common.event.*; import cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper; import cpw.mods.fml.relauncher.Side; +import kubatech.api.enums.ItemList; +import kubatech.api.network.CustomTileEntityPacket; +import kubatech.api.network.LoadConfigPacket; @SuppressWarnings("unused") @Mod( diff --git a/src/main/java/kubatech/loaders/BlockLoader.java b/src/main/java/kubatech/loaders/BlockLoader.java index 099401eb15..e6f8d5b8ed 100644 --- a/src/main/java/kubatech/loaders/BlockLoader.java +++ b/src/main/java/kubatech/loaders/BlockLoader.java @@ -20,6 +20,10 @@ package kubatech.loaders; +import net.minecraft.block.material.Material; +import net.minecraft.item.ItemBlock; + +import cpw.mods.fml.common.registry.GameRegistry; import kubatech.api.enums.ItemList; import kubatech.loaders.block.KubaBlock; import kubatech.loaders.block.KubaItemBlock; @@ -28,11 +32,6 @@ import kubatech.loaders.block.blocks.TeaStorage; import kubatech.tileentity.TeaAcceptorTile; import kubatech.tileentity.TeaStorageTile; -import net.minecraft.block.material.Material; -import net.minecraft.item.ItemBlock; - -import cpw.mods.fml.common.registry.GameRegistry; - public class BlockLoader { public static final KubaBlock kubaBlock = new KubaBlock(Material.anvil); diff --git a/src/main/java/kubatech/loaders/ItemLoader.java b/src/main/java/kubatech/loaders/ItemLoader.java index 110b1d0ede..03af96a406 100644 --- a/src/main/java/kubatech/loaders/ItemLoader.java +++ b/src/main/java/kubatech/loaders/ItemLoader.java @@ -22,10 +22,10 @@ package kubatech.loaders; import static kubatech.api.enums.ItemList.*; +import cpw.mods.fml.common.registry.GameRegistry; import kubatech.loaders.item.ItemProxy; import kubatech.loaders.item.KubaItems; import kubatech.loaders.item.items.*; -import cpw.mods.fml.common.registry.GameRegistry; public class ItemLoader { diff --git a/src/main/java/kubatech/loaders/MTLoader.java b/src/main/java/kubatech/loaders/MTLoader.java index 306197267e..133a876f02 100644 --- a/src/main/java/kubatech/loaders/MTLoader.java +++ b/src/main/java/kubatech/loaders/MTLoader.java @@ -20,12 +20,12 @@ package kubatech.loaders; -import kubatech.Tags; -import minetweaker.MineTweakerImplementationAPI; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import kubatech.Tags; +import minetweaker.MineTweakerImplementationAPI; + public class MTLoader { private static final Logger LOG = LogManager.getLogger(Tags.MODID + "[MT Loader]"); diff --git a/src/main/java/kubatech/loaders/MobRecipeLoader.java b/src/main/java/kubatech/loaders/MobRecipeLoader.java index cfac6bc925..2c0bbf464f 100644 --- a/src/main/java/kubatech/loaders/MobRecipeLoader.java +++ b/src/main/java/kubatech/loaders/MobRecipeLoader.java @@ -34,24 +34,6 @@ import java.nio.charset.StandardCharsets; import java.util.*; import java.util.stream.Collectors; -import kubatech.Tags; -import kubatech.api.LoaderReference; -import kubatech.api.helpers.EnderIOHelper; -import kubatech.api.helpers.InfernalHelper; -import kubatech.api.helpers.ProgressBarWrapper; -import kubatech.api.mobhandler.MobDrop; -import kubatech.api.network.LoadConfigPacket; -import kubatech.api.utils.GSONUtils; -import kubatech.api.utils.ModUtils; -import kubatech.config.Config; -import kubatech.config.OverridesConfig; -import kubatech.nei.Mob_Handler; -import kubatech.tileentity.gregtech.multiblock.GT_MetaTileEntity_ExtremeExterminationChamber; -import minetweaker.MineTweakerAPI; -import minetweaker.api.entity.IEntityDefinition; -import minetweaker.api.item.IItemStack; -import minetweaker.mc1710.item.MCItemStack; - import net.minecraft.block.Block; import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnchantmentHelper; @@ -74,19 +56,35 @@ import net.minecraft.world.World; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import |
