diff --git a/src/dark/api/ColorCode.java b/src/dark/api/ColorCode.java index 4b6c8e4a..5b14b14e 100644 --- a/src/dark/api/ColorCode.java +++ b/src/dark/api/ColorCode.java @@ -38,7 +38,7 @@ public enum ColorCode } /** gets a ColorCode from any of the following - * + * * @param obj - Integer,String,LiquidData,ColorCode * @return Color NONE if it can't find it */ public static ColorCode get(Object obj) diff --git a/src/dark/core/client/ClientProxy.java b/src/dark/core/client/ClientProxy.java index 296a966e..d90dde3a 100644 --- a/src/dark/core/client/ClientProxy.java +++ b/src/dark/core/client/ClientProxy.java @@ -25,7 +25,7 @@ public class ClientProxy extends CommonProxy { /** Renders a laser beam from one power to another by a set color for a set time - * + * * @param world - world this laser is to be rendered in * @param position - start vector3 * @param target - end vector3 diff --git a/src/dark/core/client/GuiCoalGenerator.java b/src/dark/core/client/GuiCoalGenerator.java index 668c93c9..39bb95d0 100644 --- a/src/dark/core/client/GuiCoalGenerator.java +++ b/src/dark/core/client/GuiCoalGenerator.java @@ -18,7 +18,7 @@ import dark.core.common.machines.TileEntityCoalGenerator; @SideOnly(Side.CLIENT) public class GuiCoalGenerator extends GuiContainer { - private static final ResourceLocation coalGeneratorTexture = new ResourceLocation(DarkMain.getInstance().DOMAIN,DarkMain.GUI_DIRECTORY+ "coal_generator.png"); + private static final ResourceLocation coalGeneratorTexture = new ResourceLocation(DarkMain.getInstance().DOMAIN, DarkMain.GUI_DIRECTORY + "coal_generator.png"); private TileEntityCoalGenerator tileEntity; diff --git a/src/dark/core/client/GuiElectricFurnace.java b/src/dark/core/client/GuiElectricFurnace.java index f62cce0a..de9f7dc2 100644 --- a/src/dark/core/client/GuiElectricFurnace.java +++ b/src/dark/core/client/GuiElectricFurnace.java @@ -18,7 +18,7 @@ import dark.core.common.machines.TileEntityElectricFurnace; @SideOnly(Side.CLIENT) public class GuiElectricFurnace extends GuiContainer { - private static final ResourceLocation electricFurnaceTexture = new ResourceLocation(DarkMain.getInstance().DOMAIN,DarkMain.GUI_DIRECTORY+ "electric_furnace.png"); + private static final ResourceLocation electricFurnaceTexture = new ResourceLocation(DarkMain.getInstance().DOMAIN, DarkMain.GUI_DIRECTORY + "electric_furnace.png"); private TileEntityElectricFurnace tileEntity; diff --git a/src/dark/core/common/CommonProxy.java b/src/dark/core/common/CommonProxy.java index ed3038b9..c364a2de 100644 --- a/src/dark/core/common/CommonProxy.java +++ b/src/dark/core/common/CommonProxy.java @@ -38,7 +38,7 @@ public class CommonProxy implements IGuiHandler } /** Renders a laser beam from one power to another by a set color for a set time - * + * * @param world - world this laser is to be rendered in * @param position - start vector3 * @param target - end vector3 diff --git a/src/dark/core/common/DarkMain.java b/src/dark/core/common/DarkMain.java index 407c8654..2e6e0583 100644 --- a/src/dark/core/common/DarkMain.java +++ b/src/dark/core/common/DarkMain.java @@ -5,8 +5,6 @@ import java.io.File; import java.util.Arrays; import net.minecraft.block.Block; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.common.Configuration; import net.minecraftforge.common.MinecraftForge; @@ -258,6 +256,4 @@ public class DarkMain extends ModPrefab return "dark"; } - - } diff --git a/src/dark/core/common/blocks/BlockBasalt.java b/src/dark/core/common/blocks/BlockBasalt.java index 426d2957..d9e26fe5 100644 --- a/src/dark/core/common/blocks/BlockBasalt.java +++ b/src/dark/core/common/blocks/BlockBasalt.java @@ -10,6 +10,7 @@ import net.minecraft.util.Icon; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import dark.core.common.DarkMain; +import dark.core.prefab.ModPrefab; public class BlockBasalt extends Block { @@ -35,7 +36,7 @@ public class BlockBasalt extends Block public BlockBasalt() { - super(DarkMain.CONFIGURATION.getBlock("basalt", DarkMain.getNextID()).getInt(), Material.rock); + super(DarkMain.CONFIGURATION.getBlock("basalt", ModPrefab.getNextID()).getInt(), Material.rock); this.setCreativeTab(CreativeTabs.tabDecorations); this.setHardness(2f); this.setResistance(2f); diff --git a/src/dark/core/common/blocks/BlockColorGlass.java b/src/dark/core/common/blocks/BlockColorGlass.java index 31d0b861..cc39a188 100644 --- a/src/dark/core/common/blocks/BlockColorGlass.java +++ b/src/dark/core/common/blocks/BlockColorGlass.java @@ -8,13 +8,14 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import dark.core.common.DarkMain; import dark.core.prefab.BlockColored; +import dark.core.prefab.ModPrefab; public class BlockColorGlass extends BlockColored { public BlockColorGlass(String name) { - super(name, DarkMain.CONFIGURATION.getBlock(name, DarkMain.getNextID()).getInt(), Material.glass); + super(name, DarkMain.CONFIGURATION.getBlock(name, ModPrefab.getNextID()).getInt(), Material.glass); this.setCreativeTab(CreativeTabs.tabDecorations); this.setHardness(.5f); this.setResistance(.5f); diff --git a/src/dark/core/common/blocks/BlockColorSand.java b/src/dark/core/common/blocks/BlockColorSand.java index 93bebf2b..fc103251 100644 --- a/src/dark/core/common/blocks/BlockColorSand.java +++ b/src/dark/core/common/blocks/BlockColorSand.java @@ -8,13 +8,14 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.world.World; import dark.core.common.DarkMain; import dark.core.prefab.BlockColored; +import dark.core.prefab.ModPrefab; //TODO fix instant falling sand public class BlockColorSand extends BlockColored { public BlockColorSand() { - super("colorSand", DarkMain.CONFIGURATION.getBlock("colorSand", DarkMain.getNextID()).getInt(), Material.sand); + super("colorSand", DarkMain.CONFIGURATION.getBlock("colorSand", ModPrefab.getNextID()).getInt(), Material.sand); this.setCreativeTab(CreativeTabs.tabDecorations); this.setHardness(1f); this.setResistance(.5f); diff --git a/src/dark/core/common/blocks/BlockOre.java b/src/dark/core/common/blocks/BlockOre.java index b044d894..a33d2536 100644 --- a/src/dark/core/common/blocks/BlockOre.java +++ b/src/dark/core/common/blocks/BlockOre.java @@ -14,10 +14,10 @@ import net.minecraftforge.common.Configuration; import net.minecraftforge.oredict.OreDictionary; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import dark.core.common.CoreRecipeLoader; import dark.core.common.DarkMain; import dark.core.common.items.EnumMeterials; import dark.core.prefab.IExtraObjectInfo; +import dark.core.prefab.ModPrefab; import dark.core.prefab.helpers.Pair; public class BlockOre extends Block implements IExtraObjectInfo @@ -26,7 +26,7 @@ public class BlockOre extends Block implements IExtraObjectInfo public BlockOre() { - super(DarkMain.CONFIGURATION.getBlock("Ore", DarkMain.getNextID()).getInt(), Material.rock); + super(DarkMain.CONFIGURATION.getBlock("Ore", ModPrefab.getNextID()).getInt(), Material.rock); this.setCreativeTab(CreativeTabs.tabBlock); this.setUnlocalizedName(DarkMain.getInstance().PREFIX + "Ore"); } diff --git a/src/dark/core/common/machines/TileEntityElectricFurnace.java b/src/dark/core/common/machines/TileEntityElectricFurnace.java index 663425c2..7e3320c7 100644 --- a/src/dark/core/common/machines/TileEntityElectricFurnace.java +++ b/src/dark/core/common/machines/TileEntityElectricFurnace.java @@ -1,22 +1,14 @@ package dark.core.common.machines; import java.io.DataInputStream; -import java.util.HashSet; -import java.util.Set; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.FurnaceRecipes; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; -import net.minecraft.network.INetworkManager; import net.minecraft.network.packet.Packet; -import net.minecraft.network.packet.Packet250CustomPayload; import net.minecraftforge.common.ForgeDirection; import universalelectricity.core.item.IItemElectric; - -import com.google.common.io.ByteArrayDataInput; - import cpw.mods.fml.common.network.PacketDispatcher; import cpw.mods.fml.common.network.Player; import cpw.mods.fml.common.registry.LanguageRegistry; diff --git a/src/dark/core/common/transmit/BlockWire.java b/src/dark/core/common/transmit/BlockWire.java index e2cfdd6c..40466f19 100644 --- a/src/dark/core/common/transmit/BlockWire.java +++ b/src/dark/core/common/transmit/BlockWire.java @@ -6,7 +6,6 @@ import java.util.Set; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; -import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; diff --git a/src/dark/core/prefab/ModPrefab.java b/src/dark/core/prefab/ModPrefab.java index af670462..658e518a 100644 --- a/src/dark/core/prefab/ModPrefab.java +++ b/src/dark/core/prefab/ModPrefab.java @@ -84,7 +84,7 @@ public abstract class ModPrefab /** Grabs a list of all the mods block Data used to register the block, tileEntities, and extra * configs - * + * * @return */ public abstract void registerObjects(); diff --git a/src/dark/core/prefab/machine/BlockMachine.java b/src/dark/core/prefab/machine/BlockMachine.java index aef1dbec..97d0ad72 100644 --- a/src/dark/core/prefab/machine/BlockMachine.java +++ b/src/dark/core/prefab/machine/BlockMachine.java @@ -1,39 +1,35 @@ package dark.core.prefab.machine; import net.minecraft.block.ITileEntityProvider; -import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; -import net.minecraft.creativetab.CreativeTabs; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Icon; import net.minecraft.world.World; -import net.minecraftforge.common.Configuration; import universalelectricity.prefab.block.BlockTile; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import dark.api.parts.INetworkPart; import dark.core.common.DarkMain; +import dark.core.prefab.ModPrefab; import dark.core.registration.ModObjectRegistry.BlockBuildData; /** Basic TileEntity Container class designed to be used by generic machines. It is suggested that * each mod using this create there own basic block extending this to reduce need to input config * file each time - * + * * @author Darkguardsman */ public abstract class BlockMachine extends BlockTile implements ITileEntityProvider { public BlockMachine(BlockBuildData data) { - super(data.config.getBlock(data.blockName, DarkMain.getNextID()).getInt(), data.blockMaterial); + super(data.config.getBlock(data.blockName, ModPrefab.getNextID()).getInt(), data.blockMaterial); this.setUnlocalizedName(data.blockName); - if(data.creativeTab != null) + if (data.creativeTab != null) { this.setCreativeTab(data.creativeTab); } } - - @Override @SideOnly(Side.CLIENT) public void registerIcons(IconRegister iconReg) diff --git a/src/dark/core/prefab/machine/BlockMulti.java b/src/dark/core/prefab/machine/BlockMulti.java index 2b4287e9..0382d735 100644 --- a/src/dark/core/prefab/machine/BlockMulti.java +++ b/src/dark/core/prefab/machine/BlockMulti.java @@ -5,7 +5,6 @@ import java.util.Set; import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; -import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -19,6 +18,7 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import dark.core.common.DarkMain; import dark.core.prefab.IExtraObjectInfo; +import dark.core.prefab.ModPrefab; import dark.core.prefab.helpers.Pair; public class BlockMulti extends BlockContainer implements IExtraObjectInfo @@ -28,7 +28,7 @@ public class BlockMulti extends BlockContainer implements IExtraObjectInfo public BlockMulti() { - super(DarkMain.CONFIGURATION.getBlock("MultiBlock", DarkMain.getNextID()).getInt(), UniversalElectricity.machine); + super(DarkMain.CONFIGURATION.getBlock("MultiBlock", ModPrefab.getNextID()).getInt(), UniversalElectricity.machine); this.setHardness(0.8F); this.setUnlocalizedName("multiBlock"); this.setChannel(DarkMain.CHANNEL); diff --git a/src/dark/core/prefab/machine/TileEntityEnergyMachine.java b/src/dark/core/prefab/machine/TileEntityEnergyMachine.java index 27f4a3af..568cb4e4 100644 --- a/src/dark/core/prefab/machine/TileEntityEnergyMachine.java +++ b/src/dark/core/prefab/machine/TileEntityEnergyMachine.java @@ -37,9 +37,9 @@ import dark.api.energy.IPowerLess; import dark.core.common.ExternalModHandler; /** Basic energy tile that can consume power - * + * * Based off both UE universal electrical tile, and electrical tile prefabs - * + * * @author DarkGuardsman */ public class TileEntityEnergyMachine extends TileEntityMachine implements IElectrical, IElectricalStorage, IEnergySink, IEnergySource, IPowerReceptor, IPowerLess { @@ -413,7 +413,7 @@ public class TileEntityEnergyMachine extends TileEntityMachine implements IElect } /** Produces UE power towards a specific direction. - * + * * @param outputDirection - The output direction. */ public void produceUE(ForgeDirection outputDirection) { @@ -442,7 +442,7 @@ public class TileEntityEnergyMachine extends TileEntityMachine implements IElect } /** The electrical input direction. - * + * * @return The direction that electricity is entered into the tile. Return null for no input. By * default you can accept power from all sides. */ public EnumSet getInputDirections() @@ -451,7 +451,7 @@ public class TileEntityEnergyMachine extends TileEntityMachine implements IElect } /** The electrical output direction. - * + * * @return The direction that electricity is output from the tile. Return null for no output. By * default it will return an empty EnumSet. */ public EnumSet getOutputDirections() diff --git a/src/dark/core/registration/BlockFluid.java b/src/dark/core/registration/BlockFluid.java index d9b58909..342d5e88 100644 --- a/src/dark/core/registration/BlockFluid.java +++ b/src/dark/core/registration/BlockFluid.java @@ -9,6 +9,7 @@ import net.minecraftforge.fluids.Fluid; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import dark.core.common.DarkMain; +import dark.core.prefab.ModPrefab; public class BlockFluid extends BlockFluidFinite { @@ -19,7 +20,7 @@ public class BlockFluid extends BlockFluidFinite public BlockFluid(String prefix, Fluid fluid, Configuration config) { - super(config.getBlock("BlockFluid" + fluid.getName(), DarkMain.getNextID()).getInt(), fluid, Material.water); + super(config.getBlock("BlockFluid" + fluid.getName(), ModPrefab.getNextID()).getInt(), fluid, Material.water); this.fluid = fluid; if (prefix != null && prefix.contains(":")) { diff --git a/src/dark/core/registration/ModObjectRegistry.java b/src/dark/core/registration/ModObjectRegistry.java index 6bab4261..b63144b3 100644 --- a/src/dark/core/registration/ModObjectRegistry.java +++ b/src/dark/core/registration/ModObjectRegistry.java @@ -21,11 +21,12 @@ import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.registry.GameRegistry; import dark.core.common.DarkMain; import dark.core.prefab.IExtraObjectInfo; +import dark.core.prefab.ModPrefab; import dark.core.prefab.helpers.Pair; import dark.core.prefab.machine.BlockMachine; /** Handler to make registering all parts of a mod's objects that are loaded into the game by forge - * + * * @author DarkGuardsman */ public class ModObjectRegistry { @@ -91,7 +92,7 @@ public class ModObjectRegistry { constructor.setAccessible(true); - Object obj = (Block) constructor.newInstance(buildData.config.getBlock(buildData.blockName, DarkMain.getNextID()), buildData.blockMaterial); + Object obj = constructor.newInstance(buildData.config.getBlock(buildData.blockName, ModPrefab.getNextID()), buildData.blockMaterial); if (obj instanceof Block) { block = (Block) obj; @@ -303,7 +304,7 @@ public class ModObjectRegistry } /** Adds a tileEntity to be registered when this block is registered - * + * * @param name - mod name for the tileEntity, should be unique * @param class1 - new instance of the TileEntity to register */ public BlockBuildData addTileEntity(String name, Class class1)