AutoSync
This commit is contained in:
parent
b4b8f857d1
commit
eb8dba750e
14 changed files with 30 additions and 30 deletions
|
@ -23,7 +23,6 @@ public enum ColorCode
|
||||||
WHITE("White", Color.white),
|
WHITE("White", Color.white),
|
||||||
UNKOWN("", Color.BLACK);
|
UNKOWN("", Color.BLACK);
|
||||||
|
|
||||||
|
|
||||||
public String name;
|
public String name;
|
||||||
public Color color;
|
public Color color;
|
||||||
|
|
||||||
|
@ -39,7 +38,7 @@ public enum ColorCode
|
||||||
}
|
}
|
||||||
|
|
||||||
/** gets a ColorCode from any of the following
|
/** gets a ColorCode from any of the following
|
||||||
*
|
*
|
||||||
* @param obj - Integer,String,LiquidData,ColorCode
|
* @param obj - Integer,String,LiquidData,ColorCode
|
||||||
* @return Color NONE if it can't find it */
|
* @return Color NONE if it can't find it */
|
||||||
public static ColorCode get(Object obj)
|
public static ColorCode get(Object obj)
|
||||||
|
|
|
@ -12,7 +12,7 @@ import dark.core.prefab.helpers.AutoCraftingManager;
|
||||||
import dark.core.prefab.helpers.Pair;
|
import dark.core.prefab.helpers.Pair;
|
||||||
|
|
||||||
/** Recipes for ore processor machines
|
/** Recipes for ore processor machines
|
||||||
*
|
*
|
||||||
* @author DarkGuardsman */
|
* @author DarkGuardsman */
|
||||||
public class ProcessorRecipes
|
public class ProcessorRecipes
|
||||||
{
|
{
|
||||||
|
@ -60,7 +60,7 @@ public class ProcessorRecipes
|
||||||
|
|
||||||
/** Creates a simple one itemStack in one ItemStack out. Itemstack output can actual have a stack
|
/** Creates a simple one itemStack in one ItemStack out. Itemstack output can actual have a stack
|
||||||
* size larger than one
|
* size larger than one
|
||||||
*
|
*
|
||||||
* @param type - processor type
|
* @param type - processor type
|
||||||
* @param in - input item, stacksize is ignored
|
* @param in - input item, stacksize is ignored
|
||||||
* @param out - ouput item */
|
* @param out - ouput item */
|
||||||
|
@ -82,7 +82,7 @@ public class ProcessorRecipes
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Creates a recipe that has a chance of failing
|
/** Creates a recipe that has a chance of failing
|
||||||
*
|
*
|
||||||
* @param type - processor type
|
* @param type - processor type
|
||||||
* @param in - input item stack, stack size is ignored
|
* @param in - input item stack, stack size is ignored
|
||||||
* @param out - output item stack, stack size is used
|
* @param out - output item stack, stack size is used
|
||||||
|
@ -158,6 +158,7 @@ public class ProcessorRecipes
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Marks an itemstack as unsalvagable by processors */
|
/** Marks an itemstack as unsalvagable by processors */
|
||||||
public static void markUnsalvagable(ProcessorType type, ItemStack stack)
|
public static void markUnsalvagable(ProcessorType type, ItemStack stack)
|
||||||
{
|
{
|
||||||
|
@ -187,7 +188,7 @@ public class ProcessorRecipes
|
||||||
|
|
||||||
/** Gets the lit of items that are created from the input item stack. General this will be an
|
/** Gets the lit of items that are created from the input item stack. General this will be an
|
||||||
* array of one item. However, in salavaging cases it can be up to 8 items.
|
* array of one item. However, in salavaging cases it can be up to 8 items.
|
||||||
*
|
*
|
||||||
* @param type - Processor type
|
* @param type - Processor type
|
||||||
* @param stack - item stack input ignores stacksize
|
* @param stack - item stack input ignores stacksize
|
||||||
* @return array of itemStacks */
|
* @return array of itemStacks */
|
||||||
|
|
|
@ -13,11 +13,10 @@ import cpw.mods.fml.common.FMLCommonHandler;
|
||||||
import cpw.mods.fml.relauncher.Side;
|
import cpw.mods.fml.relauncher.Side;
|
||||||
import cpw.mods.fml.relauncher.SideOnly;
|
import cpw.mods.fml.relauncher.SideOnly;
|
||||||
import dark.core.client.renders.BlockRenderingHandler;
|
import dark.core.client.renders.BlockRenderingHandler;
|
||||||
import dark.core.client.renders.RenderBlockWire;
|
|
||||||
import dark.core.client.renders.RenderBlockSolarPanel;
|
import dark.core.client.renders.RenderBlockSolarPanel;
|
||||||
|
import dark.core.client.renders.RenderBlockWire;
|
||||||
import dark.core.common.CommonProxy;
|
import dark.core.common.CommonProxy;
|
||||||
import dark.core.common.CoreRecipeLoader;
|
import dark.core.common.CoreRecipeLoader;
|
||||||
import dark.core.common.DarkMain;
|
|
||||||
import dark.core.common.machines.TileEntityBatteryBox;
|
import dark.core.common.machines.TileEntityBatteryBox;
|
||||||
import dark.core.common.machines.TileEntityCoalGenerator;
|
import dark.core.common.machines.TileEntityCoalGenerator;
|
||||||
import dark.core.common.machines.TileEntityElectricFurnace;
|
import dark.core.common.machines.TileEntityElectricFurnace;
|
||||||
|
@ -30,7 +29,7 @@ public class ClientProxy extends CommonProxy
|
||||||
{
|
{
|
||||||
|
|
||||||
/** Renders a laser beam from one power to another by a set color for a set time
|
/** 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 world - world this laser is to be rendered in
|
||||||
* @param position - start vector3
|
* @param position - start vector3
|
||||||
* @param target - end vector3
|
* @param target - end vector3
|
||||||
|
|
|
@ -8,7 +8,6 @@ package dark.core.client.models;
|
||||||
|
|
||||||
import net.minecraft.client.model.ModelBase;
|
import net.minecraft.client.model.ModelBase;
|
||||||
import net.minecraft.client.model.ModelRenderer;
|
import net.minecraft.client.model.ModelRenderer;
|
||||||
import net.minecraft.entity.Entity;
|
|
||||||
|
|
||||||
public class ModelElecFurnace extends ModelBase
|
public class ModelElecFurnace extends ModelBase
|
||||||
{
|
{
|
||||||
|
|
|
@ -44,7 +44,7 @@ public class CoreRecipeLoader extends RecipeLoader
|
||||||
{
|
{
|
||||||
super.loadRecipes();
|
super.loadRecipes();
|
||||||
new RecipeGrid(new ItemStack(itemTool, 1, 0), 3, 2).setRowOne("ironTube", "valvePart", "ironTube").setRowTwo(null, "ironTube", null).RegisterRecipe();
|
new RecipeGrid(new ItemStack(itemTool, 1, 0), 3, 2).setRowOne("ironTube", "valvePart", "ironTube").setRowTwo(null, "ironTube", null).RegisterRecipe();
|
||||||
new RecipeGrid(new ItemStack(blockSolar, 1, 0), 3, 3).setRowOne(Block.glass, Block.glass, Block.glass).setRowTwo(this.steel, this.circuit, this.steel).setRowThree(this.steel, "copperWire", this.steel).RegisterRecipe();
|
new RecipeGrid(new ItemStack(blockSolar, 1, 0), 3, 3).setRowOne(Block.glass, Block.glass, Block.glass).setRowTwo(RecipeLoader.steel, RecipeLoader.circuit, RecipeLoader.steel).setRowThree(RecipeLoader.steel, "copperWire", RecipeLoader.steel).RegisterRecipe();
|
||||||
this.loadParts();
|
this.loadParts();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -187,9 +187,9 @@ public class DarkMain extends ModPrefab
|
||||||
|
|
||||||
if (FMLCommonHandler.instance().getEffectiveSide() == Side.CLIENT)
|
if (FMLCommonHandler.instance().getEffectiveSide() == Side.CLIENT)
|
||||||
{
|
{
|
||||||
this.zeroAnimation = CONFIGURATION.get("Graphics", "DisableAllAnimation", false, "Disables active animations by any non-active models").getBoolean(false);
|
DarkMain.zeroAnimation = CONFIGURATION.get("Graphics", "DisableAllAnimation", false, "Disables active animations by any non-active models").getBoolean(false);
|
||||||
this.zeroRendering = CONFIGURATION.get("Graphics", "DisableAllRendering", false, "Replaces all model renderers with single block forms").getBoolean(false);
|
DarkMain.zeroRendering = CONFIGURATION.get("Graphics", "DisableAllRendering", false, "Replaces all model renderers with single block forms").getBoolean(false);
|
||||||
this.zeroGraphics = CONFIGURATION.get("Graphics", "DisableAllGraphics", false, "Disables extra effects that models and renders have. Such as particles, and text").getBoolean(false);
|
DarkMain.zeroGraphics = CONFIGURATION.get("Graphics", "DisableAllGraphics", false, "Disables extra effects that models and renders have. Such as particles, and text").getBoolean(false);
|
||||||
}
|
}
|
||||||
/* BLOCKS */
|
/* BLOCKS */
|
||||||
Block m = ModObjectRegistry.createNewBlock("DMBlockMulti", DarkMain.MOD_ID, BlockMulti.class, false);
|
Block m = ModObjectRegistry.createNewBlock("DMBlockMulti", DarkMain.MOD_ID, BlockMulti.class, false);
|
||||||
|
|
|
@ -97,7 +97,7 @@ public abstract class RecipeLoader
|
||||||
|
|
||||||
/** 3x3 Crafting grid. Each Triple is a row. Input for the triples should be any of { Item,
|
/** 3x3 Crafting grid. Each Triple is a row. Input for the triples should be any of { Item,
|
||||||
* Block, ItemStack, String}
|
* Block, ItemStack, String}
|
||||||
*
|
*
|
||||||
* @param one - top row
|
* @param one - top row
|
||||||
* @param two - middle row
|
* @param two - middle row
|
||||||
* @param three - bottom row */
|
* @param three - bottom row */
|
||||||
|
@ -111,7 +111,7 @@ public abstract class RecipeLoader
|
||||||
|
|
||||||
/** 2x2 Crafting grid. Each Pair is a row. Input for the pairs should be any of { Item,
|
/** 2x2 Crafting grid. Each Pair is a row. Input for the pairs should be any of { Item,
|
||||||
* Block, ItemStack, String}
|
* Block, ItemStack, String}
|
||||||
*
|
*
|
||||||
* @param one - top row
|
* @param one - top row
|
||||||
* @param two - middle row */
|
* @param two - middle row */
|
||||||
public RecipeGrid(Object stack, Pair one, Pair two)
|
public RecipeGrid(Object stack, Pair one, Pair two)
|
||||||
|
|
|
@ -11,8 +11,8 @@ import cpw.mods.fml.relauncher.SideOnly;
|
||||||
import dark.core.common.CoreRecipeLoader;
|
import dark.core.common.CoreRecipeLoader;
|
||||||
|
|
||||||
/** Class for storing materials, there icon names, sub items to be made from them or there sub ores
|
/** Class for storing materials, there icon names, sub items to be made from them or there sub ores
|
||||||
*
|
*
|
||||||
*
|
*
|
||||||
* @author DarkGuardsman */
|
* @author DarkGuardsman */
|
||||||
public enum EnumMaterial
|
public enum EnumMaterial
|
||||||
{
|
{
|
||||||
|
@ -56,7 +56,7 @@ public enum EnumMaterial
|
||||||
|
|
||||||
/** Creates a new item stack using material and part given. Uses a preset length of 50 for parts
|
/** 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.
|
* enum so to prevent any unwanted changes in loading of itemStacks metadata.
|
||||||
*
|
*
|
||||||
* @param mat - material
|
* @param mat - material
|
||||||
* @param part - part
|
* @param part - part
|
||||||
* @return new ItemStack created from the two enums as long as everything goes right */
|
* @return new ItemStack created from the two enums as long as everything goes right */
|
||||||
|
|
|
@ -13,7 +13,7 @@ import dark.core.common.DarkMain;
|
||||||
import dark.core.prefab.items.ItemBasic;
|
import dark.core.prefab.items.ItemBasic;
|
||||||
|
|
||||||
/** A series of items that are derived from a basic material
|
/** A series of items that are derived from a basic material
|
||||||
*
|
*
|
||||||
* @author DarkGuardsman */
|
* @author DarkGuardsman */
|
||||||
public class ItemOreDirv extends ItemBasic
|
public class ItemOreDirv extends ItemBasic
|
||||||
{
|
{
|
||||||
|
@ -67,7 +67,7 @@ public class ItemOreDirv extends ItemBasic
|
||||||
{
|
{
|
||||||
for (EnumOrePart part : EnumOrePart.values())
|
for (EnumOrePart part : EnumOrePart.values())
|
||||||
{
|
{
|
||||||
ItemStack stack = mat.getStack(mat, part, 1);
|
ItemStack stack = EnumMaterial.getStack(mat, part, 1);
|
||||||
if (stack != null && mat.shouldCreateItem(part) && mat.itemIcons[part.ordinal()] != null)
|
if (stack != null && mat.shouldCreateItem(part) && mat.itemIcons[part.ordinal()] != null)
|
||||||
{
|
{
|
||||||
par3List.add(stack);
|
par3List.add(stack);
|
||||||
|
|
|
@ -28,6 +28,7 @@ public class BlockSolarPanel extends BlockMachine
|
||||||
this.setCreativeTab(DMCreativeTab.tabIndustrial);
|
this.setCreativeTab(DMCreativeTab.tabIndustrial);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
public TileEntity createNewTileEntity(World world)
|
public TileEntity createNewTileEntity(World world)
|
||||||
{
|
{
|
||||||
return new TileEntitySolarPanel();
|
return new TileEntitySolarPanel();
|
||||||
|
|
|
@ -39,7 +39,7 @@ public class TileEntitySolarPanel extends TileEntityEnergyMachine
|
||||||
this.wattOutput = BlockSolarPanel.wattNight;
|
this.wattOutput = BlockSolarPanel.wattNight;
|
||||||
if (this.worldObj.isThundering() || this.worldObj.isRaining())
|
if (this.worldObj.isThundering() || this.worldObj.isRaining())
|
||||||
{
|
{
|
||||||
this. wattOutput = 0;
|
this.wattOutput = 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -55,6 +55,7 @@ public class TileEntitySolarPanel extends TileEntityEnergyMachine
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
public EnumSet<ForgeDirection> getOutputDirections()
|
public EnumSet<ForgeDirection> getOutputDirections()
|
||||||
{
|
{
|
||||||
return EnumSet.allOf(ForgeDirection.class);
|
return EnumSet.allOf(ForgeDirection.class);
|
||||||
|
|
|
@ -22,7 +22,7 @@ import dark.core.registration.ModObjectRegistry.BlockBuildData;
|
||||||
/** Basic TileEntity Container class designed to be used by generic machines. It is suggested that
|
/** 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
|
* each mod using this create there own basic block extending this to reduce need to input config
|
||||||
* file each time
|
* file each time
|
||||||
*
|
*
|
||||||
* @author Darkguardsman */
|
* @author Darkguardsman */
|
||||||
public abstract class BlockMachine extends BlockTile implements ITileEntityProvider, IExtraBlockInfo
|
public abstract class BlockMachine extends BlockTile implements ITileEntityProvider, IExtraBlockInfo
|
||||||
{
|
{
|
||||||
|
|
|
@ -37,9 +37,9 @@ import dark.api.energy.IPowerLess;
|
||||||
import dark.core.common.ExternalModHandler;
|
import dark.core.common.ExternalModHandler;
|
||||||
|
|
||||||
/** Basic energy tile that can consume power
|
/** Basic energy tile that can consume power
|
||||||
*
|
*
|
||||||
* Based off both UE universal electrical tile, and electrical tile prefabs
|
* Based off both UE universal electrical tile, and electrical tile prefabs
|
||||||
*
|
*
|
||||||
* @author DarkGuardsman */
|
* @author DarkGuardsman */
|
||||||
public class TileEntityEnergyMachine extends TileEntityMachine implements IElectrical, IElectricalStorage, IEnergySink, IEnergySource, IPowerReceptor, IPowerLess
|
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.
|
/** Produces UE power towards a specific direction.
|
||||||
*
|
*
|
||||||
* @param outputDirection - The output direction. */
|
* @param outputDirection - The output direction. */
|
||||||
public void produceUE(ForgeDirection outputDirection)
|
public void produceUE(ForgeDirection outputDirection)
|
||||||
{
|
{
|
||||||
|
@ -446,7 +446,7 @@ public class TileEntityEnergyMachine extends TileEntityMachine implements IElect
|
||||||
}
|
}
|
||||||
|
|
||||||
/** The electrical input direction.
|
/** The electrical input direction.
|
||||||
*
|
*
|
||||||
* @return The direction that electricity is entered into the tile. Return null for no input. By
|
* @return The direction that electricity is entered into the tile. Return null for no input. By
|
||||||
* default you can accept power from all sides. */
|
* default you can accept power from all sides. */
|
||||||
public EnumSet<ForgeDirection> getInputDirections()
|
public EnumSet<ForgeDirection> getInputDirections()
|
||||||
|
@ -455,7 +455,7 @@ public class TileEntityEnergyMachine extends TileEntityMachine implements IElect
|
||||||
}
|
}
|
||||||
|
|
||||||
/** The electrical output direction.
|
/** The electrical output direction.
|
||||||
*
|
*
|
||||||
* @return The direction that electricity is output from the tile. Return null for no output. By
|
* @return The direction that electricity is output from the tile. Return null for no output. By
|
||||||
* default it will return an empty EnumSet. */
|
* default it will return an empty EnumSet. */
|
||||||
public EnumSet<ForgeDirection> getOutputDirections()
|
public EnumSet<ForgeDirection> getOutputDirections()
|
||||||
|
|
|
@ -27,7 +27,7 @@ import dark.core.prefab.helpers.Pair;
|
||||||
import dark.core.prefab.machine.BlockMachine;
|
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
|
/** Handler to make registering all parts of a mod's objects that are loaded into the game by forge
|
||||||
*
|
*
|
||||||
* @author DarkGuardsman */
|
* @author DarkGuardsman */
|
||||||
public class ModObjectRegistry
|
public class ModObjectRegistry
|
||||||
{
|
{
|
||||||
|
@ -307,7 +307,7 @@ public class ModObjectRegistry
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Adds a tileEntity to be registered when this block is registered
|
/** Adds a tileEntity to be registered when this block is registered
|
||||||
*
|
*
|
||||||
* @param name - mod name for the tileEntity, should be unique
|
* @param name - mod name for the tileEntity, should be unique
|
||||||
* @param class1 - new instance of the TileEntity to register */
|
* @param class1 - new instance of the TileEntity to register */
|
||||||
public BlockBuildData addTileEntity(String name, Class<? extends TileEntity> class1)
|
public BlockBuildData addTileEntity(String name, Class<? extends TileEntity> class1)
|
||||||
|
|
Loading…
Reference in a new issue