Auto-Sync
This commit is contained in:
parent
dcf0627d51
commit
7ab3936e72
35 changed files with 80 additions and 86 deletions
|
@ -4,7 +4,7 @@ import java.util.ArrayList;
|
|||
import java.util.List;
|
||||
|
||||
/** Generic class for link objects of the same class type to each other.
|
||||
*
|
||||
*
|
||||
* @author Robert Seifert */
|
||||
public class Group<J>
|
||||
{
|
||||
|
|
|
@ -3,7 +3,7 @@ package com.builtbroken.common;
|
|||
/** Class to track a user. Mainly used to create groups of users, and is mostly a prefab since it
|
||||
* only stores a string name. People who use this class should extend it to make better use out of
|
||||
* the class.
|
||||
*
|
||||
*
|
||||
* @author Robert Seifert */
|
||||
public class User
|
||||
{
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
package com.builtbroken.common;
|
||||
|
||||
/** Simple class uses to plot a vector on a line
|
||||
*
|
||||
*
|
||||
* @author Robert seifert */
|
||||
public class Vector
|
||||
{
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
package com.builtbroken.common;
|
||||
|
||||
/** Simple class to plot a vector on a plane
|
||||
*
|
||||
*
|
||||
* @author Robert Seifert */
|
||||
public class Vector2 extends Vector
|
||||
{
|
||||
|
@ -26,6 +26,6 @@ public class Vector2 extends Vector
|
|||
@Override
|
||||
public String toString()
|
||||
{
|
||||
return super.toString() +"["+y+"y]";
|
||||
return super.toString() + "[" + y + "y]";
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
package com.builtbroken.common;
|
||||
|
||||
/** Simple class to plot a vector in a 3D space
|
||||
*
|
||||
*
|
||||
* @author Robert Seifert */
|
||||
public class Vector3 extends Vector2
|
||||
{
|
||||
|
@ -26,6 +26,6 @@ public class Vector3 extends Vector2
|
|||
@Override
|
||||
public String toString()
|
||||
{
|
||||
return super.toString() +"["+z+"z]";
|
||||
return super.toString() + "[" + z + "z]";
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
package com.builtbroken.common;
|
||||
|
||||
/** class used to plot a point in a 3D space over time. Also used for ploting a vector in a 4D space
|
||||
*
|
||||
*
|
||||
* @author Robert seifert */
|
||||
public class Vector4 extends Vector3
|
||||
{
|
||||
|
@ -21,6 +21,6 @@ public class Vector4 extends Vector3
|
|||
@Override
|
||||
public String toString()
|
||||
{
|
||||
return super.toString() +"["+time+"t]";
|
||||
return super.toString() + "[" + time + "t]";
|
||||
}
|
||||
}
|
||||
|
|
|
@ -5,8 +5,6 @@ import java.io.File;
|
|||
public class Skeleton
|
||||
{
|
||||
|
||||
|
||||
|
||||
public void read(File file)
|
||||
{
|
||||
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -3,14 +3,13 @@ package dark.api;
|
|||
import java.util.List;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
|
||||
import dark.api.access.ISpecialAccess;
|
||||
import dark.core.interfaces.IScroll;
|
||||
|
||||
/** Basic methods to make it easier to construct or interact with a terminal based tile. Recommend to
|
||||
* be used by tiles that want to mimic computer command line like interfaces. As well to restrict
|
||||
* access to the tile in the same way a computer would
|
||||
*
|
||||
*
|
||||
* @author DarkGuardsmsan */
|
||||
public interface ITerminal extends ISpecialAccess, IScroll
|
||||
{
|
||||
|
|
|
@ -10,7 +10,7 @@ import com.builtbroken.common.Group;
|
|||
|
||||
/** Used by a terminal to track what users are part of each group. As well used to setup access
|
||||
* points to the terminal.
|
||||
*
|
||||
*
|
||||
* @author DarkGuardsman */
|
||||
public class AccessGroup extends Group<AccessUser>
|
||||
{
|
||||
|
|
|
@ -10,7 +10,7 @@ import net.minecraft.nbt.NBTTagList;
|
|||
import com.builtbroken.common.User;
|
||||
|
||||
/** Used to define a users access to a terminal based object.
|
||||
*
|
||||
*
|
||||
* @author DarkGuardsman */
|
||||
public class AccessUser extends User
|
||||
{
|
||||
|
|
|
@ -4,7 +4,7 @@ import java.util.List;
|
|||
|
||||
/** Used by any object that needs to restrict access to it by a set of users or groups. Make sure to
|
||||
* always use the default groups(user,admin,owner) so that things work smoothly.
|
||||
*
|
||||
*
|
||||
* @author DarkGuardsman */
|
||||
public interface ISpecialAccess
|
||||
{
|
||||
|
|
|
@ -6,12 +6,12 @@ import net.minecraft.entity.player.EntityPlayer;
|
|||
import dark.api.ITerminal;
|
||||
|
||||
/** Prefab for creating commands that most terminal entities can use
|
||||
*
|
||||
*
|
||||
* @author DarkGuardsman */
|
||||
public interface ITerminalCommand
|
||||
{
|
||||
/** The command has been called by a player in a terminal.
|
||||
*
|
||||
*
|
||||
* @return false if the call was not supported rather than failed. Used too allow several
|
||||
* commands with the same name to exist but each has its own sub calls */
|
||||
public boolean called(EntityPlayer player, ITerminal terminal, String[] args);
|
||||
|
|
|
@ -16,8 +16,6 @@ import dark.core.common.items.EnumOrePart;
|
|||
import dark.core.common.items.ItemOreDirv;
|
||||
import dark.core.common.items.ItemParts;
|
||||
import dark.core.common.items.ItemParts.Parts;
|
||||
import dark.core.common.items.ItemCommonTool;
|
||||
import dark.core.common.items.ItemWrench;
|
||||
|
||||
public class CoreRecipeLoader extends RecipeLoader
|
||||
{
|
||||
|
@ -58,7 +56,6 @@ public class CoreRecipeLoader extends RecipeLoader
|
|||
valvePart = new ItemStack(itemParts, 1, Parts.Tank.ordinal());
|
||||
unfinishedTank = new ItemStack(itemParts, 1, Parts.Tank.ordinal());
|
||||
|
||||
|
||||
// seal
|
||||
new RecipeGrid(this.setStackSize(leatherSeal, 16), 2, 2).setRowOne(Item.leather, Item.leather).setRowTwo(Item.leather, Item.leather).RegisterRecipe();
|
||||
// slime steal
|
||||
|
|
|
@ -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
|
||||
{
|
||||
|
@ -85,7 +85,7 @@ public abstract class RecipeLoader
|
|||
}
|
||||
|
||||
/** An easier to read recipe system for the basic minecraft recipes
|
||||
*
|
||||
*
|
||||
* @author DarkGaurdsman */
|
||||
public static class RecipeGrid
|
||||
{
|
||||
|
@ -111,7 +111,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 */
|
||||
|
@ -125,7 +125,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)
|
||||
|
|
|
@ -13,8 +13,8 @@ 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 +74,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 */
|
||||
|
@ -156,7 +156,7 @@ public enum EnumMaterial
|
|||
public ItemStack getTool(EnumTool tool)
|
||||
{
|
||||
ItemStack stack = null;
|
||||
if (DarkMain.recipeLoader.itemDiggingTool instanceof ItemCommonTool)
|
||||
if (CoreRecipeLoader.itemDiggingTool instanceof ItemCommonTool)
|
||||
{
|
||||
stack = new ItemStack(CoreRecipeLoader.itemDiggingTool.itemID, 1, (this.ordinal() * toolCountPerMaterial) + tool.ordinal());
|
||||
}
|
||||
|
|
|
@ -6,7 +6,7 @@ import java.util.List;
|
|||
import net.minecraft.block.material.Material;
|
||||
|
||||
/** Enum to store tools that can be created from the material sheet.
|
||||
*
|
||||
*
|
||||
* @author DarkGuardsman */
|
||||
public enum EnumTool
|
||||
{
|
||||
|
|
|
@ -7,15 +7,16 @@ import universalelectricity.core.item.ItemElectric;
|
|||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import dark.core.common.DarkMain;
|
||||
import dark.core.prefab.ModPrefab;
|
||||
|
||||
/** Simple battery to store energy
|
||||
*
|
||||
*
|
||||
* @author DarkGuardsman */
|
||||
public class ItemBattery extends ItemElectric
|
||||
{
|
||||
public ItemBattery()
|
||||
{
|
||||
super(DarkMain.CONFIGURATION.getItem("Battery", DarkMain.getNextItemId()).getInt());
|
||||
super(DarkMain.CONFIGURATION.getItem("Battery", ModPrefab.getNextItemId()).getInt());
|
||||
this.setUnlocalizedName(DarkMain.getInstance().PREFIX + "Battery");
|
||||
this.setCreativeTab(CreativeTabs.tabRedstone);
|
||||
}
|
||||
|
|
|
@ -4,12 +4,12 @@ import java.util.List;
|
|||
|
||||
import net.minecraft.client.renderer.texture.IconRegister;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
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;
|
||||
import dark.core.prefab.items.ItemBasic;
|
||||
|
||||
public class ItemColoredDust extends ItemBasic
|
||||
|
@ -19,7 +19,7 @@ public class ItemColoredDust extends ItemBasic
|
|||
|
||||
public ItemColoredDust()
|
||||
{
|
||||
super(DarkMain.getNextItemId(), "GlowRefinedSand", DarkMain.CONFIGURATION);
|
||||
super(ModPrefab.getNextItemId(), "GlowRefinedSand", DarkMain.CONFIGURATION);
|
||||
this.setMaxDamage(0);
|
||||
this.setHasSubtypes(true);
|
||||
this.setCreativeTab(CreativeTabs.tabMaterials);
|
||||
|
|
|
@ -24,18 +24,17 @@ import net.minecraftforge.event.Event.Result;
|
|||
import net.minecraftforge.event.entity.player.UseHoeEvent;
|
||||
import net.minecraftforge.oredict.OreDictionary;
|
||||
|
||||
import buildcraft.api.tools.IToolWrench;
|
||||
|
||||
import com.google.common.collect.Multimap;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import dark.core.common.DarkMain;
|
||||
import dark.core.prefab.IExtraInfo.IExtraItemInfo;
|
||||
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
|
||||
{
|
||||
|
@ -47,7 +46,7 @@ public class ItemCommonTool extends Item implements IExtraItemInfo
|
|||
|
||||
public ItemCommonTool()
|
||||
{
|
||||
super(DarkMain.CONFIGURATION.getItem("Items", "CommonTools", DarkMain.getNextItemId()).getInt());
|
||||
super(DarkMain.CONFIGURATION.getItem("Items", "CommonTools", ModPrefab.getNextItemId()).getInt());
|
||||
this.maxStackSize = 1;
|
||||
this.setCreativeTab(CreativeTabs.tabTools);
|
||||
}
|
||||
|
@ -89,7 +88,7 @@ public class ItemCommonTool extends Item implements IExtraItemInfo
|
|||
if (par7 != 0 && air && (blockID == Block.grass.blockID || blockID == Block.dirt.blockID))
|
||||
{
|
||||
Block block = Block.tilledField;
|
||||
world.playSoundEffect((double) ((float) x + 0.5F), (double) ((float) y + 0.5F), (double) ((float) z + 0.5F), block.stepSound.getStepSound(), (block.stepSound.getVolume() + 1.0F) / 2.0F, block.stepSound.getPitch() * 0.8F);
|
||||
world.playSoundEffect((x + 0.5F), (y + 0.5F), (z + 0.5F), block.stepSound.getStepSound(), (block.stepSound.getVolume() + 1.0F) / 2.0F, block.stepSound.getPitch() * 0.8F);
|
||||
|
||||
if (world.isRemote)
|
||||
{
|
||||
|
@ -190,7 +189,7 @@ public class ItemCommonTool extends Item implements IExtraItemInfo
|
|||
@Override
|
||||
public boolean onBlockDestroyed(ItemStack itemStack, World par2World, int par3, int par4, int par5, int par6, EntityLivingBase par7EntityLivingBase)
|
||||
{
|
||||
if ((double) Block.blocksList[par3].getBlockHardness(par2World, par4, par5, par6) != 0.0D)
|
||||
if (Block.blocksList[par3].getBlockHardness(par2World, par4, par5, par6) != 0.0D)
|
||||
{
|
||||
this.damage(itemStack, 1, par7EntityLivingBase);
|
||||
}
|
||||
|
|
|
@ -12,16 +12,17 @@ import cpw.mods.fml.relauncher.Side;
|
|||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import dark.core.common.DarkMain;
|
||||
import dark.core.prefab.IExtraInfo.IExtraItemInfo;
|
||||
import dark.core.prefab.ModPrefab;
|
||||
import dark.core.prefab.items.ItemBasic;
|
||||
|
||||
/** A series of items that are derived from a basic material
|
||||
*
|
||||
*
|
||||
* @author DarkGuardsman */
|
||||
public class ItemOreDirv extends ItemBasic implements IExtraItemInfo
|
||||
{
|
||||
public ItemOreDirv()
|
||||
{
|
||||
super(DarkMain.getNextItemId(), "Metal_Parts", DarkMain.CONFIGURATION);
|
||||
super(ModPrefab.getNextItemId(), "Metal_Parts", DarkMain.CONFIGURATION);
|
||||
this.setHasSubtypes(true);
|
||||
this.setCreativeTab(CreativeTabs.tabMaterials);
|
||||
}
|
||||
|
|
|
@ -6,20 +6,20 @@ import net.minecraft.client.renderer.texture.IconRegister;
|
|||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.Icon;
|
||||
import net.minecraftforge.common.Configuration;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import dark.core.common.DarkMain;
|
||||
import dark.core.prefab.ModPrefab;
|
||||
import dark.core.prefab.items.ItemBasic;
|
||||
|
||||
/** A metadata item containing parts of various machines in Liquid Mechanics Mod.
|
||||
*
|
||||
*
|
||||
* @author DarkGuardsman */
|
||||
public class ItemParts extends ItemBasic
|
||||
{
|
||||
public ItemParts()
|
||||
{
|
||||
super(DarkMain.getNextItemId(), "DMParts", DarkMain.CONFIGURATION);
|
||||
super(ModPrefab.getNextItemId(), "DMParts", DarkMain.CONFIGURATION);
|
||||
this.setHasSubtypes(true);
|
||||
this.setMaxDamage(0);
|
||||
this.setMaxStackSize(64);
|
||||
|
|
|
@ -10,7 +10,6 @@ import net.minecraft.tileentity.TileEntity;
|
|||
import net.minecraft.util.ChatMessageComponent;
|
||||
import net.minecraft.util.Icon;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.common.Configuration;
|
||||
import net.minecraftforge.common.ForgeDirection;
|
||||
import net.minecraftforge.fluids.FluidStack;
|
||||
import net.minecraftforge.fluids.FluidTankInfo;
|
||||
|
@ -25,6 +24,7 @@ import cpw.mods.fml.relauncher.SideOnly;
|
|||
import dark.api.IToolReadOut;
|
||||
import dark.api.IToolReadOut.EnumTools;
|
||||
import dark.core.common.DarkMain;
|
||||
import dark.core.prefab.ModPrefab;
|
||||
import dark.core.prefab.helpers.FluidHelper;
|
||||
import dark.core.prefab.items.ItemBasic;
|
||||
|
||||
|
@ -34,7 +34,7 @@ public class ItemReadoutTools extends ItemBasic
|
|||
|
||||
public ItemReadoutTools()
|
||||
{
|
||||
super(DarkMain.getNextItemId(), "DMTools", DarkMain.CONFIGURATION);
|
||||
super(ModPrefab.getNextItemId(), "DMTools", DarkMain.CONFIGURATION);
|
||||
this.setHasSubtypes(true);
|
||||
this.setCreativeTab(CreativeTabs.tabTools);
|
||||
this.setMaxStackSize(1);
|
||||
|
|
|
@ -11,6 +11,7 @@ import net.minecraftforge.oredict.OreDictionary;
|
|||
import buildcraft.api.tools.IToolWrench;
|
||||
import dark.core.common.DarkMain;
|
||||
import dark.core.prefab.IExtraInfo.IExtraItemInfo;
|
||||
import dark.core.prefab.ModPrefab;
|
||||
import dark.core.prefab.items.ItemBasic;
|
||||
|
||||
public class ItemWrench extends ItemBasic implements IToolWrench, IExtraItemInfo
|
||||
|
@ -19,7 +20,7 @@ public class ItemWrench extends ItemBasic implements IToolWrench, IExtraItemInfo
|
|||
|
||||
public ItemWrench()
|
||||
{
|
||||
super(DarkMain.getNextItemId(), "wrench", DarkMain.CONFIGURATION);
|
||||
super(ModPrefab.getNextItemId(), "wrench", DarkMain.CONFIGURATION);
|
||||
this.setMaxStackSize(1);
|
||||
this.setCreativeTab(CreativeTabs.tabTools);
|
||||
this.setTextureName(DarkMain.getInstance().PREFIX + "wrench");
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
package dark.core.common.machines;
|
||||
|
||||
import universalelectricity.core.UniversalElectricity;
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraftforge.common.Configuration;
|
||||
import universalelectricity.core.UniversalElectricity;
|
||||
import dark.core.common.DMCreativeTab;
|
||||
import dark.core.common.DarkMain;
|
||||
import dark.core.prefab.machine.BlockMachine;
|
||||
|
|
|
@ -15,7 +15,7 @@ import cpw.mods.fml.relauncher.SideOnly;
|
|||
|
||||
/** Used to handle info about the block that would normally be handled by the mod main class. Use the
|
||||
* BlockRegistry in order for these methods to be called on load of the mod.
|
||||
*
|
||||
*
|
||||
* @author DarkGuardsman */
|
||||
public interface IExtraInfo
|
||||
{
|
||||
|
|
|
@ -8,7 +8,6 @@ import org.modstats.Modstats;
|
|||
|
||||
import universalelectricity.compatibility.Compatibility;
|
||||
import universalelectricity.core.UniversalElectricity;
|
||||
|
||||
import cpw.mods.fml.common.FMLCommonHandler;
|
||||
import cpw.mods.fml.common.Mod.EventHandler;
|
||||
import cpw.mods.fml.common.event.FMLInitializationEvent;
|
||||
|
|
|
@ -25,7 +25,7 @@ import net.minecraft.entity.player.EntityPlayer;
|
|||
|
||||
/** 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
|
||||
{
|
||||
|
@ -148,6 +148,7 @@ public class EntityDictionary
|
|||
{
|
||||
grabMap.put(clazz, false);
|
||||
}
|
||||
|
||||
public static void setCanBeGrabbed(Class<? extends Entity> clazz)
|
||||
{
|
||||
grabMap.put(clazz, true);
|
||||
|
|
|
@ -3,13 +3,12 @@ package dark.core.prefab.helpers;
|
|||
import java.util.Random;
|
||||
|
||||
import net.minecraftforge.common.ForgeDirection;
|
||||
|
||||
import universalelectricity.core.vector.Vector3;
|
||||
|
||||
public class MathHelper extends net.minecraft.util.MathHelper
|
||||
{
|
||||
/** Generates an array of random numbers
|
||||
*
|
||||
*
|
||||
* @param random - random instance to be used
|
||||
* @param maxNumber - max size of the int to use
|
||||
* @param arraySize - length of the array
|
||||
|
@ -20,7 +19,7 @@ public class MathHelper extends net.minecraft.util.MathHelper
|
|||
}
|
||||
|
||||
/** Generates an array of random numbers
|
||||
*
|
||||
*
|
||||
* @param random - random instance to be used
|
||||
* @param minNumber - smallest random Integer to use. Warning can lead to longer than normal
|
||||
* delay in returns
|
||||
|
@ -56,7 +55,7 @@ public class MathHelper extends net.minecraft.util.MathHelper
|
|||
}
|
||||
|
||||
/** Turns radius and sphere cords into a vector3
|
||||
*
|
||||
*
|
||||
* @param radius - sphere radius
|
||||
* @param inclination -
|
||||
* @param azimuth
|
||||
|
|
|
@ -4,8 +4,6 @@ import java.io.File;
|
|||
import java.io.FileInputStream;
|
||||
import java.io.FileOutputStream;
|
||||
|
||||
import com.builtbroken.common.science.units.UnitHelper;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.nbt.CompressedStreamTools;
|
||||
import net.minecraft.nbt.NBTBase;
|
||||
|
@ -22,12 +20,15 @@ import net.minecraft.nbt.NBTTagString;
|
|||
import net.minecraft.server.MinecraftServer;
|
||||
import universalelectricity.core.vector.Vector2;
|
||||
import universalelectricity.core.vector.Vector3;
|
||||
|
||||
import com.builtbroken.common.science.units.UnitHelper;
|
||||
|
||||
import cpw.mods.fml.client.FMLClientHandler;
|
||||
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
|
||||
{
|
||||
|
@ -41,7 +42,7 @@ public class NBTFileHelper
|
|||
}
|
||||
|
||||
/** Saves an NBT file
|
||||
*
|
||||
*
|
||||
* @param file - exact File
|
||||
* @param data - nbt data
|
||||
* @return */
|
||||
|
@ -75,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 */
|
||||
|
@ -85,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)
|
||||
{
|
||||
|
@ -113,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)
|
||||
|
@ -149,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
|
||||
|
@ -229,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
|
||||
|
|
|
@ -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
|
||||
{
|
||||
|
|
|
@ -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
|
||||
{
|
||||
|
@ -417,7 +417,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)
|
||||
{
|
||||
|
@ -446,7 +446,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<ForgeDirection> getInputDirections()
|
||||
|
@ -455,7 +455,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<ForgeDirection> getOutputDirections()
|
||||
|
|
|
@ -19,7 +19,7 @@ import dark.core.interfaces.IInvBox;
|
|||
import dark.core.prefab.invgui.InvChest;
|
||||
|
||||
/** Prefab for simple object who only need basic inv support and nothing more
|
||||
*
|
||||
*
|
||||
* @author Darkguardsman */
|
||||
public class TileEntityInv extends TileEntityAdvanced implements IExternalInv, ISidedInventory, ISpecialAccess
|
||||
{
|
||||
|
|
|
@ -105,7 +105,7 @@ public class TerminalCommandRegistry
|
|||
}
|
||||
|
||||
/** When a player uses a command in any CMD machine it pass threw here first
|
||||
*
|
||||
*
|
||||
* @param terminal - The terminal, can be cast to TileEntity. */
|
||||
public static boolean onCommand(EntityPlayer player, ITerminal terminal, String cmd)
|
||||
{
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
package dark.core.registration;
|
||||
|
||||
import java.io.File;
|
||||
import java.lang.reflect.Constructor;
|
||||
import java.util.HashMap;
|
||||
import java.util.HashSet;
|
||||
import java.util.Map.Entry;
|
||||
|
@ -26,11 +25,10 @@ import dark.core.common.DarkMain;
|
|||
import dark.core.prefab.IExtraInfo;
|
||||
import dark.core.prefab.IExtraInfo.IExtraBlockInfo;
|
||||
import dark.core.prefab.IExtraInfo.IExtraItemInfo;
|
||||
import dark.core.prefab.ModPrefab;
|
||||
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
|
||||
{
|
||||
|
@ -125,7 +123,7 @@ public class ModObjectRegistry
|
|||
}
|
||||
|
||||
/** Method to get block via name
|
||||
*
|
||||
*
|
||||
* @param blockName
|
||||
* @return Block requested */
|
||||
public static Block getBlock(String blockName)
|
||||
|
@ -142,7 +140,7 @@ public class ModObjectRegistry
|
|||
}
|
||||
|
||||
/** Method to get block via id
|
||||
*
|
||||
*
|
||||
* @param blockID
|
||||
* @return Block requested */
|
||||
public static Block getBlock(int blockID)
|
||||
|
@ -186,7 +184,7 @@ public class ModObjectRegistry
|
|||
|
||||
/** Creates a new item using reflection as well runs it threw some check to activate any
|
||||
* interface methods
|
||||
*
|
||||
*
|
||||
* @param name - name to register the item with
|
||||
* @param modid - mods that the item comes from
|
||||
* @param clazz - item class
|
||||
|
@ -280,7 +278,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<? extends TileEntity> class1)
|
||||
|
|
Loading…
Reference in a new issue