sa

GTNewHorizons · Sep 8, 2023 · 7144eeb · 7144eeb
1 parent 39a1981
commit 7144eeb
Show file tree

Hide file tree

Showing 40 changed files with 144 additions and 170 deletions.
diff --git a/src/main/java/mcp/mobius/betterbarrels/BBWailaProvider.java b/src/main/java/mcp/mobius/betterbarrels/BBWailaProvider.java
@@ -2,19 +2,19 @@
 
 import java.util.List;
 
-import mcp.mobius.betterbarrels.common.blocks.TileEntityBarrel;
-import mcp.mobius.waila.api.IWailaConfigHandler;
-import mcp.mobius.waila.api.IWailaDataAccessor;
-import mcp.mobius.waila.api.IWailaDataProvider;
-import mcp.mobius.waila.api.IWailaRegistrar;
-
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.StatCollector;
 import net.minecraft.world.World;
 
+import mcp.mobius.betterbarrels.common.blocks.TileEntityBarrel;
+import mcp.mobius.waila.api.IWailaConfigHandler;
+import mcp.mobius.waila.api.IWailaDataAccessor;
+import mcp.mobius.waila.api.IWailaDataProvider;
+import mcp.mobius.waila.api.IWailaRegistrar;
+
 public class BBWailaProvider implements IWailaDataProvider {
 
     @Override

diff --git a/src/main/java/mcp/mobius/betterbarrels/BetterBarrels.java b/src/main/java/mcp/mobius/betterbarrels/BetterBarrels.java
@@ -3,21 +3,6 @@
 import java.util.Arrays;
 import java.util.HashSet;
 
-import mcp.mobius.betterbarrels.bspace.BSpaceStorageHandler;
-import mcp.mobius.betterbarrels.common.BaseProxy;
-import mcp.mobius.betterbarrels.common.StructuralLevel;
-import mcp.mobius.betterbarrels.common.blocks.BlockBarrel;
-import mcp.mobius.betterbarrels.common.blocks.TileEntityBarrel;
-import mcp.mobius.betterbarrels.common.items.ItemBarrelHammer;
-import mcp.mobius.betterbarrels.common.items.ItemTuningFork;
-import mcp.mobius.betterbarrels.common.items.dolly.ItemBarrelMover;
-import mcp.mobius.betterbarrels.common.items.dolly.ItemDiamondMover;
-import mcp.mobius.betterbarrels.common.items.dolly.ItemFoldedBarrelMover;
-import mcp.mobius.betterbarrels.common.items.upgrades.ItemUpgradeCore;
-import mcp.mobius.betterbarrels.common.items.upgrades.ItemUpgradeSide;
-import mcp.mobius.betterbarrels.common.items.upgrades.ItemUpgradeStructural;
-import mcp.mobius.betterbarrels.network.BarrelPacketHandler;
-
 import net.minecraft.block.Block;
 import net.minecraft.item.Item;
 import net.minecraft.tileentity.TileEntity;
@@ -36,6 +21,20 @@
 import cpw.mods.fml.common.event.FMLPreInitializationEvent;
 import cpw.mods.fml.common.event.FMLServerStoppingEvent;
 import cpw.mods.fml.common.registry.GameRegistry;
+import mcp.mobius.betterbarrels.bspace.BSpaceStorageHandler;
+import mcp.mobius.betterbarrels.common.BaseProxy;
+import mcp.mobius.betterbarrels.common.StructuralLevel;
+import mcp.mobius.betterbarrels.common.blocks.BlockBarrel;
+import mcp.mobius.betterbarrels.common.blocks.TileEntityBarrel;
+import mcp.mobius.betterbarrels.common.items.ItemBarrelHammer;
+import mcp.mobius.betterbarrels.common.items.ItemTuningFork;
+import mcp.mobius.betterbarrels.common.items.dolly.ItemBarrelMover;
+import mcp.mobius.betterbarrels.common.items.dolly.ItemDiamondMover;
+import mcp.mobius.betterbarrels.common.items.dolly.ItemFoldedBarrelMover;
+import mcp.mobius.betterbarrels.common.items.upgrades.ItemUpgradeCore;
+import mcp.mobius.betterbarrels.common.items.upgrades.ItemUpgradeSide;
+import mcp.mobius.betterbarrels.common.items.upgrades.ItemUpgradeStructural;
+import mcp.mobius.betterbarrels.network.BarrelPacketHandler;
 
 @Mod(
         modid = BetterBarrels.modid,

diff --git a/src/main/java/mcp/mobius/betterbarrels/RecipeHandler.java b/src/main/java/mcp/mobius/betterbarrels/RecipeHandler.java
@@ -1,8 +1,5 @@
 package mcp.mobius.betterbarrels;
 
-import mcp.mobius.betterbarrels.common.StructuralLevel;
-import mcp.mobius.betterbarrels.common.items.upgrades.UpgradeCore;
-
 import net.minecraft.block.Block;
 import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
@@ -12,6 +9,8 @@
 import net.minecraftforge.oredict.ShapelessOreRecipe;
 
 import cpw.mods.fml.common.registry.GameRegistry;
+import mcp.mobius.betterbarrels.common.StructuralLevel;
+import mcp.mobius.betterbarrels.common.items.upgrades.UpgradeCore;
 
 public class RecipeHandler {
 

diff --git a/src/main/java/mcp/mobius/betterbarrels/ServerTickHandler.java b/src/main/java/mcp/mobius/betterbarrels/ServerTickHandler.java
@@ -3,10 +3,10 @@
 import java.util.Arrays;
 import java.util.WeakHashMap;
 
-import mcp.mobius.betterbarrels.bspace.BSpaceStorageHandler;
-import mcp.mobius.betterbarrels.common.blocks.TileEntityBarrel;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import cpw.mods.fml.common.gameevent.TickEvent;
+import mcp.mobius.betterbarrels.bspace.BSpaceStorageHandler;
+import mcp.mobius.betterbarrels.common.blocks.TileEntityBarrel;
 
 public enum ServerTickHandler {
 

diff --git a/src/main/java/mcp/mobius/betterbarrels/bspace/BBEventHandler.java b/src/main/java/mcp/mobius/betterbarrels/bspace/BBEventHandler.java
@@ -1,10 +1,5 @@
 package mcp.mobius.betterbarrels.bspace;
 
-import mcp.mobius.betterbarrels.common.items.dolly.ItemBarrelMover;
-import mcp.mobius.betterbarrels.common.items.upgrades.ItemUpgradeCore;
-import mcp.mobius.betterbarrels.common.items.upgrades.ItemUpgradeStructural;
-import mcp.mobius.betterbarrels.common.items.upgrades.UpgradeCore;
-
 import net.minecraft.block.Block;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
@@ -14,6 +9,10 @@
 import net.minecraftforge.event.world.WorldEvent;
 
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
+import mcp.mobius.betterbarrels.common.items.dolly.ItemBarrelMover;
+import mcp.mobius.betterbarrels.common.items.upgrades.ItemUpgradeCore;
+import mcp.mobius.betterbarrels.common.items.upgrades.ItemUpgradeStructural;
+import mcp.mobius.betterbarrels.common.items.upgrades.UpgradeCore;
 
 public class BBEventHandler {
 

diff --git a/src/main/java/mcp/mobius/betterbarrels/bspace/BSpaceStorageHandler.java b/src/main/java/mcp/mobius/betterbarrels/bspace/BSpaceStorageHandler.java
@@ -11,13 +11,6 @@
 import java.util.Set;
 import java.util.zip.ZipException;
 
-import mcp.mobius.betterbarrels.BetterBarrels;
-import mcp.mobius.betterbarrels.ServerTickHandler;
-import mcp.mobius.betterbarrels.common.blocks.IBarrelStorage;
-import mcp.mobius.betterbarrels.common.blocks.StorageLocal;
-import mcp.mobius.betterbarrels.common.blocks.TileEntityBarrel;
-import mcp.mobius.betterbarrels.common.blocks.logic.Coordinates;
-
 import net.minecraft.nbt.CompressedStreamTools;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
@@ -29,6 +22,12 @@
 
 import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.relauncher.Side;
+import mcp.mobius.betterbarrels.BetterBarrels;
+import mcp.mobius.betterbarrels.ServerTickHandler;
+import mcp.mobius.betterbarrels.common.blocks.IBarrelStorage;
+import mcp.mobius.betterbarrels.common.blocks.StorageLocal;
+import mcp.mobius.betterbarrels.common.blocks.TileEntityBarrel;
+import mcp.mobius.betterbarrels.common.blocks.logic.Coordinates;
 
 public class BSpaceStorageHandler {
 

diff --git a/src/main/java/mcp/mobius/betterbarrels/client/ClientProxy.java b/src/main/java/mcp/mobius/betterbarrels/client/ClientProxy.java
@@ -5,15 +5,6 @@
 import java.nio.charset.Charset;
 import java.util.Map;
 
-import mcp.mobius.betterbarrels.BetterBarrels;
-import mcp.mobius.betterbarrels.Utils;
-import mcp.mobius.betterbarrels.bspace.BBEventHandler;
-import mcp.mobius.betterbarrels.client.render.BlockBarrelRenderer;
-import mcp.mobius.betterbarrels.client.render.TileEntityBarrelRenderer;
-import mcp.mobius.betterbarrels.common.BaseProxy;
-import mcp.mobius.betterbarrels.common.StructuralLevel;
-import mcp.mobius.betterbarrels.common.blocks.TileEntityBarrel;
-
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.resources.IReloadableResourceManager;
 import net.minecraft.client.resources.IResourceManager;
@@ -25,6 +16,14 @@
 import cpw.mods.fml.client.registry.ClientRegistry;
 import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
 import cpw.mods.fml.client.registry.RenderingRegistry;
+import mcp.mobius.betterbarrels.BetterBarrels;
+import mcp.mobius.betterbarrels.Utils;
+import mcp.mobius.betterbarrels.bspace.BBEventHandler;
+import mcp.mobius.betterbarrels.client.render.BlockBarrelRenderer;
+import mcp.mobius.betterbarrels.client.render.TileEntityBarrelRenderer;
+import mcp.mobius.betterbarrels.common.BaseProxy;
+import mcp.mobius.betterbarrels.common.StructuralLevel;
+import mcp.mobius.betterbarrels.common.blocks.TileEntityBarrel;
 
 public class ClientProxy extends BaseProxy {
 

diff --git a/src/main/java/mcp/mobius/betterbarrels/client/StructuralLevelClientData.java b/src/main/java/mcp/mobius/betterbarrels/client/StructuralLevelClientData.java
@@ -6,10 +6,6 @@
 
 import javax.imageio.ImageIO;
 
-import mcp.mobius.betterbarrels.BetterBarrels;
-import mcp.mobius.betterbarrels.Utils;
-import mcp.mobius.betterbarrels.common.StructuralLevel;
-
 import net.minecraft.block.Block;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.texture.IIconRegister;
@@ -27,6 +23,9 @@
 import org.lwjgl.opengl.GL11;
 
 import cpw.mods.fml.common.registry.LanguageRegistry;
+import mcp.mobius.betterbarrels.BetterBarrels;
+import mcp.mobius.betterbarrels.Utils;
+import mcp.mobius.betterbarrels.common.StructuralLevel;
 
 public class StructuralLevelClientData {
 

diff --git a/src/main/java/mcp/mobius/betterbarrels/client/render/BlockBarrelRenderer.java b/src/main/java/mcp/mobius/betterbarrels/client/render/BlockBarrelRenderer.java
@@ -1,9 +1,5 @@
 package mcp.mobius.betterbarrels.client.render;
 
-import mcp.mobius.betterbarrels.BetterBarrels;
-import mcp.mobius.betterbarrels.common.StructuralLevel;
-import mcp.mobius.betterbarrels.common.blocks.TileEntityBarrel;
-
 import net.minecraft.block.Block;
 import net.minecraft.client.renderer.RenderBlocks;
 import net.minecraft.client.renderer.Tessellator;
@@ -13,6 +9,9 @@
 import org.lwjgl.opengl.GL11;
 
 import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
+import mcp.mobius.betterbarrels.BetterBarrels;
+import mcp.mobius.betterbarrels.common.StructuralLevel;
+import mcp.mobius.betterbarrels.common.blocks.TileEntityBarrel;
 
 public class BlockBarrelRenderer implements ISimpleBlockRenderingHandler {
 

diff --git a/src/main/java/mcp/mobius/betterbarrels/client/render/TileEntityBarrelRenderer.java b/src/main/java/mcp/mobius/betterbarrels/client/render/TileEntityBarrelRenderer.java
@@ -1,5 +1,11 @@
 package mcp.mobius.betterbarrels.client.render;
 
+import net.minecraft.item.ItemStack;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraftforge.common.util.ForgeDirection;
+
+import org.lwjgl.opengl.GL11;
+
 import mcp.mobius.betterbarrels.BetterBarrels;
 import mcp.mobius.betterbarrels.common.StructuralLevel;
 import mcp.mobius.betterbarrels.common.blocks.TileEntityBarrel;
@@ -8,12 +14,6 @@
 import mcp.mobius.betterbarrels.common.items.upgrades.UpgradeCore;
 import mcp.mobius.betterbarrels.common.items.upgrades.UpgradeSide;
 
-import net.minecraft.item.ItemStack;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraftforge.common.util.ForgeDirection;
-
-import org.lwjgl.opengl.GL11;
-
 public class TileEntityBarrelRenderer extends TileEntityBaseRenderer {
 
     public static TileEntityBarrelRenderer _instance = null;

diff --git a/src/main/java/mcp/mobius/betterbarrels/client/render/TileEntityBaseRenderer.java b/src/main/java/mcp/mobius/betterbarrels/client/render/TileEntityBaseRenderer.java
@@ -1,7 +1,5 @@
 package mcp.mobius.betterbarrels.client.render;
 
-import mcp.mobius.betterbarrels.common.blocks.logic.Coordinates;
-
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.FontRenderer;
 import net.minecraft.client.renderer.OpenGlHelper;
@@ -20,6 +18,8 @@
 
 import org.lwjgl.opengl.GL11;
 
+import mcp.mobius.betterbarrels.common.blocks.logic.Coordinates;
+
 public abstract class TileEntityBaseRenderer extends TileEntitySpecialRenderer {
 
     protected float scale = 1f / 256f;

diff --git a/src/main/java/mcp/mobius/betterbarrels/common/BaseProxy.java b/src/main/java/mcp/mobius/betterbarrels/common/BaseProxy.java
@@ -1,11 +1,11 @@
 package mcp.mobius.betterbarrels.common;
 
-import mcp.mobius.betterbarrels.bspace.BBEventHandler;
-
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraftforge.common.MinecraftForge;
 
+import mcp.mobius.betterbarrels.bspace.BBEventHandler;
+
 public class BaseProxy {
 
     public void registerEventHandler() {

diff --git a/src/main/java/mcp/mobius/betterbarrels/common/JabbaCreativeTab.java b/src/main/java/mcp/mobius/betterbarrels/common/JabbaCreativeTab.java
@@ -1,11 +1,11 @@
 package mcp.mobius.betterbarrels.common;
 
-import mcp.mobius.betterbarrels.BetterBarrels;
-
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 
+import mcp.mobius.betterbarrels.BetterBarrels;
+
 public class JabbaCreativeTab extends CreativeTabs {
 
     public static JabbaCreativeTab tab = new JabbaCreativeTab();

diff --git a/src/main/java/mcp/mobius/betterbarrels/common/StructuralLevel.java b/src/main/java/mcp/mobius/betterbarrels/common/StructuralLevel.java
@@ -1,12 +1,11 @@
 package mcp.mobius.betterbarrels.common;
 
-import mcp.mobius.betterbarrels.BetterBarrels;
-import mcp.mobius.betterbarrels.Utils;
-
 import net.minecraft.util.MathHelper;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import mcp.mobius.betterbarrels.BetterBarrels;
+import mcp.mobius.betterbarrels.Utils;
 
 public class StructuralLevel {
 

diff --git a/src/main/java/mcp/mobius/betterbarrels/common/blocks/BarrelCoreUpgrades.java b/src/main/java/mcp/mobius/betterbarrels/common/blocks/BarrelCoreUpgrades.java
@@ -3,6 +3,14 @@
 import java.util.ArrayList;
 import java.util.Iterator;
 
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.MathHelper;
+import net.minecraftforge.common.util.ForgeDirection;
+
 import mcp.mobius.betterbarrels.BetterBarrels;
 import mcp.mobius.betterbarrels.Utils;
 import mcp.mobius.betterbarrels.bspace.BSpaceStorageHandler;
@@ -15,14 +23,6 @@
 import mcp.mobius.betterbarrels.network.Message0x05CoreUpdate;
 import mcp.mobius.betterbarrels.network.Message0x06FullStorage;
 
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.player.EntityPlayerMP;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.util.MathHelper;
-import net.minecraftforge.common.util.ForgeDirection;
-
 public class BarrelCoreUpgrades {
 
     private TileEntityBarrel barrel;

diff --git a/src/main/java/mcp/mobius/betterbarrels/common/blocks/BlockBarrel.java b/src/main/java/mcp/mobius/betterbarrels/common/blocks/BlockBarrel.java
@@ -2,14 +2,6 @@
 
 import java.util.Random;
 
-import mcp.mobius.betterbarrels.BetterBarrels;
-import mcp.mobius.betterbarrels.Utils;
-import mcp.mobius.betterbarrels.bspace.BSpaceStorageHandler;
-import mcp.mobius.betterbarrels.common.JabbaCreativeTab;
-import mcp.mobius.betterbarrels.common.StructuralLevel;
-import mcp.mobius.betterbarrels.common.items.upgrades.UpgradeCore;
-import mcp.mobius.betterbarrels.common.items.upgrades.UpgradeSide;
-
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.MapColor;
@@ -33,6 +25,13 @@
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import mcp.mobius.betterbarrels.BetterBarrels;
+import mcp.mobius.betterbarrels.Utils;
+import mcp.mobius.betterbarrels.bspace.BSpaceStorageHandler;
+import mcp.mobius.betterbarrels.common.JabbaCreativeTab;
+import mcp.mobius.betterbarrels.common.StructuralLevel;
+import mcp.mobius.betterbarrels.common.items.upgrades.UpgradeCore;
+import mcp.mobius.betterbarrels.common.items.upgrades.UpgradeSide;
 
 public class BlockBarrel extends BlockContainer {
 

diff --git a/src/main/java/mcp/mobius/betterbarrels/common/blocks/IBarrelStorage.java b/src/main/java/mcp/mobius/betterbarrels/common/blocks/IBarrelStorage.java
@@ -4,8 +4,8 @@
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 
-import powercrystals.minefactoryreloaded.api.IDeepStorageUnit;
 import cpw.mods.fml.common.Optional;
+import powercrystals.minefactoryreloaded.api.IDeepStorageUnit;
 
 @Optional.Interface(iface = "powercrystals.minefactoryreloaded.api.IDeepStorageUnit", modid = "MineFactoryReloaded")
 public interface IBarrelStorage extends ISidedInventory, IDeepStorageUnit {

diff --git a/src/main/java/mcp/mobius/betterbarrels/common/blocks/StorageLocal.java b/src/main/java/mcp/mobius/betterbarrels/common/blocks/StorageLocal.java
@@ -4,18 +4,18 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import mcp.mobius.betterbarrels.BetterBarrels;
-import mcp.mobius.betterbarrels.common.blocks.logic.Coordinates;
-import mcp.mobius.betterbarrels.common.blocks.logic.ItemImmut;
-import mcp.mobius.betterbarrels.common.blocks.logic.OreDictPair;
-
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.init.Blocks;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraftforge.oredict.OreDictionary;
 
+import mcp.mobius.betterbarrels.BetterBarrels;
+import mcp.mobius.betterbarrels.common.blocks.logic.Coordinates;
+import mcp.mobius.betterbarrels.common.blocks.logic.ItemImmut;
+import mcp.mobius.betterbarrels.common.blocks.logic.OreDictPair;
+
 public class StorageLocal implements IBarrelStorage {
 
     private ItemStack inputStack = null; // Slot 0