From 23f19c17a43fc360991d3ada6aec7616a1ccf868 Mon Sep 17 00:00:00 2001 From: DarkGuardsman Date: Fri, 25 Oct 2013 03:15:51 -0400 Subject: [PATCH] Auto-Sync --- .../common/science/units/UnitHelper.java | 12 ++++++------ src/dark/api/energy/ExtraBlockData.java | 6 +++--- src/dark/api/energy/IHeatObject.java | 8 ++++---- src/dark/core/common/RecipeLoader.java | 8 ++++---- src/dark/core/common/items/EnumMaterial.java | 7 +++---- src/dark/core/common/items/ItemCommonTool.java | 5 ++--- src/dark/core/common/items/ItemParts.java | 2 +- src/dark/core/common/items/ItemWrench.java | 3 --- .../core/common/machines/TileEntityHeatCouple.java | 3 ++- src/dark/core/prefab/helpers/EntityDictionary.java | 3 +-- src/dark/core/prefab/helpers/NBTFileHelper.java | 14 +++++++------- src/dark/core/prefab/invgui/GuiBase.java | 1 - src/dark/core/prefab/machine/BlockMachine.java | 2 +- src/dark/modhelppage/common/ModHelpPage.java | 4 ++-- src/dark/modhelppage/common/XMLHelpFileReader.java | 1 - 15 files changed, 36 insertions(+), 43 deletions(-) diff --git a/src/com/builtbroken/common/science/units/UnitHelper.java b/src/com/builtbroken/common/science/units/UnitHelper.java index 454d8b3fa..943719646 100644 --- a/src/com/builtbroken/common/science/units/UnitHelper.java +++ b/src/com/builtbroken/common/science/units/UnitHelper.java @@ -98,7 +98,7 @@ public class UnitHelper } /** Tries to parse a value that may be anything. - * + * * @param var - String, Integer, Float, Double * @param suggestValue - Used by string parsing in case it fails and you want to return a * default value */ @@ -124,7 +124,7 @@ public class UnitHelper } /** Tries to parse a value that may be anything. - * + * * @param var - String, Integer, Float, Double */ public static int tryToParseInt(Object var) { @@ -132,7 +132,7 @@ public class UnitHelper } /** Tries to parse a value that may be anything. - * + * * @param var - String, Integer, Float, Double * @param suggestValue - Used by string parsing in case it fails and you want to return a * default value */ @@ -158,7 +158,7 @@ public class UnitHelper } /** Tries to parse a value that may be anything. - * + * * @param var - String, Integer, Float, Double */ public static Double tryToParseDouble(Object var) { @@ -166,7 +166,7 @@ public class UnitHelper } /** Tries to parse a value that may be anything. - * + * * @param var - String, Integer, Float, Double * @param suggestValue - Used by string parsing in case it fails and you want to return a * default value */ @@ -192,7 +192,7 @@ public class UnitHelper } /** Tries to parse a value that may be anything. - * + * * @param var - String, Integer, Float, Double * @return Zero if it fails to parse the value */ public static Float tryToParseFloat(Object var) diff --git a/src/dark/api/energy/ExtraBlockData.java b/src/dark/api/energy/ExtraBlockData.java index 815dc86af..753880d62 100644 --- a/src/dark/api/energy/ExtraBlockData.java +++ b/src/dark/api/energy/ExtraBlockData.java @@ -7,9 +7,9 @@ import universalelectricity.core.vector.Vector3; import com.builtbroken.common.Pair; -/** Information about blocks not provided by minecraft such as density, mass, volume, heating values, chemical properties, etc - * etc - * +/** Information about blocks not provided by minecraft such as density, mass, volume, heating values, + * chemical properties, etc etc + * * @author DarkGuardsman */ public class ExtraBlockData { diff --git a/src/dark/api/energy/IHeatObject.java b/src/dark/api/energy/IHeatObject.java index ea4bcad86..4a7d2e7fc 100644 --- a/src/dark/api/energy/IHeatObject.java +++ b/src/dark/api/energy/IHeatObject.java @@ -1,22 +1,22 @@ package dark.api.energy; -import dark.api.parts.ITileConnector; import net.minecraftforge.common.ForgeDirection; +import dark.api.parts.ITileConnector; /** Used by TileEntities or Entities to show heat stored and cooling rate of the object - * + * * @author DarkGuardsman */ public interface IHeatObject extends ITileConnector { /** Amount of heat stored in the body of the object. Think of it as a battery for heat but * remember that heat is lost very fast - * + * * @return amount of heat in generic units */ public float getHeat(ForgeDirection side); /** Sets the heat level of the object or increase it - * + * * @param amount - amount to set or increase by * @param incrase - true if should increase the current heat level */ public void setHeat(double amount, boolean incrase); diff --git a/src/dark/core/common/RecipeLoader.java b/src/dark/core/common/RecipeLoader.java index 87acb028d..93e28035b 100644 --- a/src/dark/core/common/RecipeLoader.java +++ b/src/dark/core/common/RecipeLoader.java @@ -12,7 +12,7 @@ import com.builtbroken.common.Triple; import cpw.mods.fml.common.registry.GameRegistry; /** Recipe system to make it easier to load recipes for a mod - * + * * @author DarkGuardsman */ public abstract class RecipeLoader { @@ -97,7 +97,7 @@ public abstract class RecipeLoader } /** An easier to read recipe system for the basic minecraft recipes - * + * * @author DarkGaurdsman */ public static class RecipeGrid { @@ -123,7 +123,7 @@ public abstract class RecipeLoader /** 3x3 Crafting grid. Each Triple is a row. Input for the triples should be any of { Item, * Block, ItemStack, String} - * + * * @param one - top row * @param two - middle row * @param three - bottom row */ @@ -137,7 +137,7 @@ public abstract class RecipeLoader /** 2x2 Crafting grid. Each Pair is a row. Input for the pairs should be any of { Item, * Block, ItemStack, String} - * + * * @param one - top row * @param two - middle row */ public RecipeGrid(Object stack, Pair one, Pair two) diff --git a/src/dark/core/common/items/EnumMaterial.java b/src/dark/core/common/items/EnumMaterial.java index 1ce19d10b..6bf5f09f2 100644 --- a/src/dark/core/common/items/EnumMaterial.java +++ b/src/dark/core/common/items/EnumMaterial.java @@ -10,11 +10,10 @@ import net.minecraft.util.Icon; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import dark.core.common.CoreRecipeLoader; -import dark.core.common.DarkMain; /** Class for storing materials, there icon names, sub items to be made from them or there sub ores - * - * + * + * * @author DarkGuardsman */ public enum EnumMaterial { @@ -74,7 +73,7 @@ public enum EnumMaterial /** Creates a new item stack using material and part given. Uses a preset length of 50 for parts * enum so to prevent any unwanted changes in loading of itemStacks metadata. - * + * * @param mat - material * @param part - part * @return new ItemStack created from the two enums as long as everything goes right */ diff --git a/src/dark/core/common/items/ItemCommonTool.java b/src/dark/core/common/items/ItemCommonTool.java index 3eef5b133..c09d35515 100644 --- a/src/dark/core/common/items/ItemCommonTool.java +++ b/src/dark/core/common/items/ItemCommonTool.java @@ -3,8 +3,6 @@ package dark.core.common.items; import java.awt.Color; import java.util.List; -import universalelectricity.core.electricity.ElectricityDisplay; - import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; @@ -26,6 +24,7 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.Event.Result; import net.minecraftforge.event.entity.player.UseHoeEvent; import net.minecraftforge.oredict.OreDictionary; +import universalelectricity.core.electricity.ElectricityDisplay; import com.google.common.collect.Multimap; @@ -37,7 +36,7 @@ import dark.core.prefab.ModPrefab; /** Flexible tool class that uses NBT to store damage and effect rather than metadata. Metadata * instead is used to store sub items allowing several different tools to exist within the same item - * + * * @author DarkGuardsman */ public class ItemCommonTool extends Item implements IExtraItemInfo { diff --git a/src/dark/core/common/items/ItemParts.java b/src/dark/core/common/items/ItemParts.java index b7383e641..2cce89a79 100644 --- a/src/dark/core/common/items/ItemParts.java +++ b/src/dark/core/common/items/ItemParts.java @@ -14,7 +14,7 @@ import dark.core.prefab.items.ItemBasic; /** A meta data item containing parts of various crafting recipes. These parts do not do anything but * allow new crafting recipes to be created. - * + * * @author DarkGuardsman */ public class ItemParts extends ItemBasic { diff --git a/src/dark/core/common/items/ItemWrench.java b/src/dark/core/common/items/ItemWrench.java index a2f18dfce..a6cf0bcc8 100644 --- a/src/dark/core/common/items/ItemWrench.java +++ b/src/dark/core/common/items/ItemWrench.java @@ -4,13 +4,10 @@ import net.minecraft.block.Block; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.common.Configuration; import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.oredict.OreDictionary; -import universalelectricity.prefab.block.IRotatableBlock; -import universalelectricity.prefab.tile.IRotatable; import buildcraft.api.tools.IToolWrench; import dark.core.common.DarkMain; import dark.core.prefab.IExtraInfo.IExtraItemInfo; diff --git a/src/dark/core/common/machines/TileEntityHeatCouple.java b/src/dark/core/common/machines/TileEntityHeatCouple.java index a155f5c81..3d89a5f4d 100644 --- a/src/dark/core/common/machines/TileEntityHeatCouple.java +++ b/src/dark/core/common/machines/TileEntityHeatCouple.java @@ -10,7 +10,7 @@ import dark.api.parts.ITileConnector.Connection; import dark.core.prefab.machine.TileEntityEnergyMachine; /** Machine that turns heat into usable electrical energy - * + * * @author DarkGuardsman */ public class TileEntityHeatCouple extends TileEntityEnergyMachine { @@ -71,6 +71,7 @@ public class TileEntityHeatCouple extends TileEntityEnergyMachine return this.outputWatts; } + @Override public EnumSet getOutputDirections() { return EnumSet.allOf(ForgeDirection.class); diff --git a/src/dark/core/prefab/helpers/EntityDictionary.java b/src/dark/core/prefab/helpers/EntityDictionary.java index d1e841ee2..519bfd3c7 100644 --- a/src/dark/core/prefab/helpers/EntityDictionary.java +++ b/src/dark/core/prefab/helpers/EntityDictionary.java @@ -23,11 +23,10 @@ import net.minecraft.entity.passive.EntityCow; import net.minecraft.entity.passive.EntityPig; import net.minecraft.entity.passive.EntitySheep; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.nbt.NBTBase; /** Dictionary to track entities by several names to be used for anything. Current use is armbot task * so the user has an easy way to ID creatures. - * + * * @author DarkGuardsman */ public class EntityDictionary { diff --git a/src/dark/core/prefab/helpers/NBTFileHelper.java b/src/dark/core/prefab/helpers/NBTFileHelper.java index 42979affc..e409380c6 100644 --- a/src/dark/core/prefab/helpers/NBTFileHelper.java +++ b/src/dark/core/prefab/helpers/NBTFileHelper.java @@ -28,7 +28,7 @@ import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.FMLLog; /** Helper class used to work with minecraft's NBT file system. - * + * * @author DarkGuardsman */ public class NBTFileHelper { @@ -42,7 +42,7 @@ public class NBTFileHelper } /** Saves an NBT file - * + * * @param file - exact File * @param data - nbt data * @return */ @@ -76,7 +76,7 @@ public class NBTFileHelper } /** Uses the default world directory to save the data to file by the given name - * + * * @param filename - file name * @param data - nbt data * @return true if everything goes well */ @@ -86,7 +86,7 @@ public class NBTFileHelper } /** Reads NBT data from the world folder. - * + * * @return The NBT data */ public static NBTTagCompound loadNBTFile(File saveDirectory, String filename) { @@ -114,7 +114,7 @@ public class NBTFileHelper } /** Loads an NBT file from the current world file - * + * * @param filename - name of the file * @return NBTTagCompound that was stored in the file */ public static NBTTagCompound loadNBTFile(String filename) @@ -150,7 +150,7 @@ public class NBTFileHelper /** Used to save an object without knowing what the object is exactly. Supports most * NBTTagCompound save methods including some special cases. Which includes boolean being saves * as a string so it can be loaded as a boolean from an object save. - * + * * @param tag - NBTTagCompound to save the tag too * @param key - name to save the object as * @param value - the actual object @@ -230,7 +230,7 @@ public class NBTFileHelper } /** Reads an unknown object with a known name from NBT - * + * * @param tag - tag to read the value from * @param key - name of the value * @param suggestionValue - value to return in case nothing is found diff --git a/src/dark/core/prefab/invgui/GuiBase.java b/src/dark/core/prefab/invgui/GuiBase.java index 191af8de9..ae4b87ecb 100644 --- a/src/dark/core/prefab/invgui/GuiBase.java +++ b/src/dark/core/prefab/invgui/GuiBase.java @@ -8,7 +8,6 @@ import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; import universalelectricity.core.vector.Vector2; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/dark/core/prefab/machine/BlockMachine.java b/src/dark/core/prefab/machine/BlockMachine.java index 8a8321023..b2f53fa2e 100644 --- a/src/dark/core/prefab/machine/BlockMachine.java +++ b/src/dark/core/prefab/machine/BlockMachine.java @@ -28,7 +28,7 @@ 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 use build data * per block. - * + * * @author Darkguardsman */ public abstract class BlockMachine extends BlockTile implements IExtraBlockInfo { diff --git a/src/dark/modhelppage/common/ModHelpPage.java b/src/dark/modhelppage/common/ModHelpPage.java index ee80c8be5..4358b3efe 100644 --- a/src/dark/modhelppage/common/ModHelpPage.java +++ b/src/dark/modhelppage/common/ModHelpPage.java @@ -14,7 +14,7 @@ public class ModHelpPage private static boolean init = false; /** Call this to setup mod page helper for the mod - * + * * @param modID - mod's id used to track it, and register all xmls too * @param configFolder - location of the mods config folder for storing player crated xmls */ public static void init(String modID, String configFolder) @@ -33,7 +33,7 @@ public class ModHelpPage } /** Call this to load an xmlFile from within the mod package - * + * * @param modID - mod's id used to track it, and register all xmls too * @param xmlFile - path to the file */ public static void load(String modID, String xmlFile) diff --git a/src/dark/modhelppage/common/XMLHelpFileReader.java b/src/dark/modhelppage/common/XMLHelpFileReader.java index a191c5aa2..fb13d6482 100644 --- a/src/dark/modhelppage/common/XMLHelpFileReader.java +++ b/src/dark/modhelppage/common/XMLHelpFileReader.java @@ -62,6 +62,5 @@ public class XMLHelpFileReader { String name; - } }