tilera/electrodynamics
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Wiki Activity

Little bit of work

Browse source
This commit is contained in:
DarkGuardsman 2014-01-10 03:00:46 -05:00
parent d7c536211e
commit dfabc9e1d8
149 changed files with 507 additions and 2218 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/main/java/resonantinduction/api/events/MachineMiningEvent.java
View file

@ -67,7 +67,7 @@ public class MachineMiningEvent extends MachineEvent
List<ItemStack> items = block.getBlockDropped(world, target.intX(), target.intY(), target.intZ(), target.getBlockMetadata(world), 1);
if (items != null)
{
MiningDrop event = new MiningDrop(world,spot, target, items);
MiningDrop event = new MiningDrop(world, spot, target, items);
MinecraftForge.EVENT_BUS.post(event);
items = event.items;
return items;
@ -75,4 +75,9 @@ public class MachineMiningEvent extends MachineEvent
}
return null;
}
public static List<ItemStack> getItemsMined(TileEntity entity, Vector3 target)
{
return getItemsMined(entity.worldObj, new Vector3(entity), target);
}
}

2
src/main/java/resonantinduction/archaic/Archaic.java
View file

@ -1,7 +1,5 @@
package resonantinduction.archaic;
import java.util.logging.Logger;
import resonantinduction.core.Reference;
import resonantinduction.core.ResonantInduction;
import resonantinduction.core.Settings;

2
src/main/java/resonantinduction/old/blocks/BlockColorGlass.java → src/main/java/resonantinduction/archaic/blocks/BlockColorGlass.java
View file

@ -1,4 +1,4 @@
package resonantinduction.old.blocks;
package resonantinduction.archaic.blocks;
import java.util.Random;

2
src/main/java/resonantinduction/old/blocks/BlockColorGlowGlass.java → src/main/java/resonantinduction/archaic/blocks/BlockColorGlowGlass.java
View file

@ -1,4 +1,4 @@
package resonantinduction.old.blocks;
package resonantinduction.archaic.blocks;
public class BlockColorGlowGlass extends BlockColorGlass
{

2
src/main/java/resonantinduction/old/blocks/BlockColorSand.java → src/main/java/resonantinduction/archaic/blocks/BlockColorSand.java
View file

@ -1,4 +1,4 @@
package resonantinduction.old.blocks;
package resonantinduction.archaic.blocks;
import java.util.Random;

2
src/main/java/resonantinduction/old/blocks/BlockColored.java → src/main/java/resonantinduction/archaic/blocks/BlockColored.java
View file

@ -1,4 +1,4 @@
package resonantinduction.old.blocks;
package resonantinduction.archaic.blocks;
import java.util.List;

10
src/main/java/resonantinduction/old/transport/BlockTurntable.java → src/main/java/resonantinduction/archaic/blocks/BlockTurntable.java
View file

@ -1,9 +1,7 @@
package resonantinduction.old.transport;
package resonantinduction.archaic.blocks;
import java.util.Random;
import resonantinduction.old.lib.interfaces.IRotatable;
import resonantinduction.old.lib.interfaces.IRotatableBlock;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IconRegister;
@ -15,11 +13,15 @@ import net.minecraft.util.Icon;
import net.minecraft.util.MathHelper;
import net.minecraft.world.World;
import net.minecraftforge.common.ForgeDirection;
import resonantinduction.core.prefab.block.BlockMachine;
import resonantinduction.old.lib.interfaces.IRotatable;
import resonantinduction.old.lib.interfaces.IRotatableBlock;
import resonantinduction.old.transport.ResonantInductionTransport;
import universalelectricity.api.vector.Vector3;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public class BlockTurntable extends BlockAssembly
public class BlockTurntable extends BlockMachine
{
private Icon top;

4
src/main/java/resonantinduction/old/blocks/ItemBlockColored.java → src/main/java/resonantinduction/archaic/blocks/ItemBlockColored.java
View file

@ -1,9 +1,9 @@
package resonantinduction.old.blocks;
package resonantinduction.archaic.blocks;
import resonantinduction.old.lib.helpers.ColorCode;
import net.minecraft.block.Block;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;
import resonantinduction.old.lib.helpers.ColorCode;
public class ItemBlockColored extends ItemBlock
{

31
src/main/java/resonantinduction/core/debug/BlockDebug.java
View file

@ -3,8 +3,8 @@ package resonantinduction.core.debug;
import java.util.List;
import java.util.Set;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
@ -13,21 +13,22 @@ import net.minecraft.util.Icon;
import net.minecraft.world.World;
import net.minecraftforge.common.Configuration;
import resonantinduction.core.ResonantInductionTabs;
import resonantinduction.core.prefab.block.BlockMachine;
import resonantinduction.old.lib.IExtraInfo.IExtraBlockInfo;
import resonantinduction.old.transport.ResonantInductionTransport;
import calclavia.lib.prefab.block.BlockMachine;
import com.builtbroken.common.Pair;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public class BlockDebug extends BlockMachine
public class BlockDebug extends BlockMachine implements IExtraBlockInfo
{
public static float DebugWattOut, DebugWattDemand;
public BlockDebug()
{
super(ResonantInductionTransport.CONFIGURATION, "DebugBlock", Material.clay);
super("DebugBlock");
this.setCreativeTab(ResonantInductionTabs.CORE);
}
@ -117,7 +118,6 @@ public class BlockDebug extends BlockMachine
@Override
public void loadExtraConfigs(Configuration config)
{
super.loadExtraConfigs(config);
for (DebugBlocks block : DebugBlocks.values())
{
block.enabled = config.get("Blocks", "Enable" + block.name + "Block", true).getBoolean(true);
@ -184,4 +184,25 @@ public class BlockDebug extends BlockMachine
}
@Override
public boolean hasExtraConfigs()
{
// TODO Auto-generated method stub
return false;
}
@Override
public void loadOreNames()
{
// TODO Auto-generated method stub
}
@Override
public void getClientTileEntityRenderers(List<Pair<Class<? extends TileEntity>, TileEntitySpecialRenderer>> list)
{
// TODO Auto-generated method stub
}
}

2
src/main/java/resonantinduction/core/debug/TileEntityInfLoad.java
View file

@ -1,7 +1,7 @@
package resonantinduction.core.debug;
import resonantinduction.old.lib.prefab.TileEntityEnergyMachine;
import net.minecraftforge.common.ForgeDirection;
import resonantinduction.core.prefab.tile.TileEntityEnergyMachine;
public class TileEntityInfLoad extends TileEntityEnergyMachine
{

2
src/main/java/resonantinduction/core/debug/TileEntityInfSupply.java
View file

@ -2,8 +2,8 @@ package resonantinduction.core.debug;
import java.util.EnumSet;
import resonantinduction.old.lib.prefab.TileEntityEnergyMachine;
import net.minecraftforge.common.ForgeDirection;
import resonantinduction.core.prefab.tile.TileEntityEnergyMachine;
public class TileEntityInfSupply extends TileEntityEnergyMachine
{

32
src/main/java/resonantinduction/core/prefab/block/BlockBase.java
View file

@ -3,6 +3,7 @@
*/
package resonantinduction.core.prefab.block;
import net.minecraft.block.material.Material;
import net.minecraftforge.common.Configuration;
import resonantinduction.core.Reference;
import resonantinduction.core.ResonantInductionTabs;
@ -10,18 +11,25 @@ import resonantinduction.core.Settings;
import universalelectricity.api.UniversalElectricity;
import calclavia.lib.prefab.block.BlockAdvanced;
/**
* @author Calclavia
*
*/
/** @author Calclavia */
public class BlockBase extends BlockAdvanced
{
public BlockBase(String name, int id)
{
super(Settings.CONFIGURATION.get(Configuration.CATEGORY_BLOCK, name, id).getInt(id), UniversalElectricity.machine);
this.setCreativeTab(ResonantInductionTabs.CORE);
this.setUnlocalizedName(Reference.PREFIX + name);
this.setTextureName(Reference.PREFIX + name);
this.setHardness(1f);
}
public BlockBase(String name)
{
this(name, UniversalElectricity.machine);
}
public BlockBase(String name, Material material)
{
this(Settings.getNextBlockID(), name, material);
}
public BlockBase(int id, String name, Material material)
{
super(Settings.CONFIGURATION.get(Configuration.CATEGORY_BLOCK, name, id).getInt(id), material);
this.setCreativeTab(ResonantInductionTabs.CORE);
this.setUnlocalizedName(Reference.PREFIX + name);
this.setTextureName(Reference.PREFIX + name);
this.setHardness(1f);
}
}

4
src/main/java/resonantinduction/core/prefab/block/BlockImprintable.java
View file

@ -8,11 +8,9 @@ import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.MathHelper;
import net.minecraft.world.World;
import resonantinduction.core.Settings;
import resonantinduction.core.prefab.tile.TileEntityFilterable;
import resonantinduction.old.api.IFilterable;
import resonantinduction.old.transport.imprinter.ItemImprinter;
import calclavia.lib.prefab.block.BlockMachine;
/** Extend this block class if a filter is allowed to be placed inside of this block.
*
@ -22,7 +20,7 @@ public abstract class BlockImprintable extends BlockMachine
public BlockImprintable(String blockName, Material material)
{
super(Settings.getNextBlockID(),Settings.CONFIGURATION, blockName, material);
super(blockName, material);
}
/** Allows filters to be placed inside of this block. */

37
src/main/java/resonantinduction/core/prefab/block/BlockMachine.java Normal file
View file

@ -0,0 +1,37 @@
package resonantinduction.core.prefab.block;
import net.minecraft.block.material.Material;
import net.minecraftforge.common.Configuration;
import resonantinduction.core.Reference;
import resonantinduction.core.ResonantInductionTabs;
import resonantinduction.core.Settings;
import universalelectricity.api.UniversalElectricity;
import calclavia.lib.prefab.block.BlockTile;
/**
* Basic prefab for machine
* @author DarkGuardsman
*
*/
public class BlockMachine extends BlockTile
{
public BlockMachine(String name)
{
this(name, UniversalElectricity.machine);
}
public BlockMachine(String name, Material material)
{
this(Settings.getNextBlockID(), name, material);
}
public BlockMachine(int id, String name, Material material)
{
super(Settings.CONFIGURATION.get(Configuration.CATEGORY_BLOCK, name, id).getInt(id), material);
this.setCreativeTab(ResonantInductionTabs.CORE);
this.setUnlocalizedName(Reference.PREFIX + name);
this.setTextureName(Reference.PREFIX + name);
this.setHardness(1f);
}
}

4
src/main/java/resonantinduction/old/lib/prefab/TileEntityEnergyMachine.java → src/main/java/resonantinduction/core/prefab/tile/TileEntityEnergyMachine.java
View file

@ -1,8 +1,7 @@
package resonantinduction.old.lib.prefab;
package resonantinduction.core.prefab.tile;
import java.util.EnumSet;
import resonantinduction.old.lib.interfaces.IPowerLess;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTBase;
@ -12,6 +11,7 @@ import net.minecraft.nbt.NBTTagLong;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.oredict.OreDictionary;
import resonantinduction.old.lib.interfaces.IPowerLess;
import universalelectricity.api.CompatibilityModule;
import universalelectricity.api.electricity.IVoltageInput;
import universalelectricity.api.electricity.IVoltageOutput;

4
src/main/java/resonantinduction/old/lib/prefab/TileEntityInv.java → src/main/java/resonantinduction/core/prefab/tile/TileEntityInv.java
View file

@ -1,4 +1,4 @@
package resonantinduction.old.lib.prefab;
package resonantinduction.core.prefab.tile;
import java.util.ArrayList;
import java.util.List;
@ -10,10 +10,10 @@ import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList;
import net.minecraftforge.common.ForgeDirection;
import resonantinduction.core.tilenetwork.prefab.NetworkTileEntities;
import resonantinduction.old.lib.interfaces.IExternalInv;
import resonantinduction.old.lib.interfaces.IInvBox;
import resonantinduction.old.lib.prefab.invgui.InvChest;
import resonatninduction.tilenetwork.prefab.NetworkTileEntities;
import universalelectricity.api.vector.Vector3;
import calclavia.lib.access.AccessGroup;
import calclavia.lib.access.AccessUser;

2
src/main/java/resonantinduction/old/lib/prefab/TileEntityMachine.java → src/main/java/resonantinduction/core/prefab/tile/TileEntityMachine.java
View file

@ -1,4 +1,4 @@
package resonantinduction.old.lib.prefab;
package resonantinduction.core.prefab.tile;
import java.io.IOException;

3
src/main/java/resonantinduction/old/mechanics/generator/TileGenerator.java → src/main/java/resonantinduction/core/prefab/tile/TileGenerator.java
View file

@ -1,6 +1,5 @@
package resonantinduction.old.mechanics.generator;
package resonantinduction.core.prefab.tile;
import resonantinduction.old.lib.prefab.TileEntityEnergyMachine;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.ForgeDirection;
import universalelectricity.api.CompatibilityModule;

2
src/main/java/resonantinduction/old/blocks/BlockGasOre.java → src/main/java/resonantinduction/core/resource/BlockGasOre.java
View file

@ -1,4 +1,4 @@
package resonantinduction.old.blocks;
package resonantinduction.core.resource;
import java.awt.Color;
import java.util.List;

2
src/main/java/resonantinduction/old/blocks/BlockOre.java → src/main/java/resonantinduction/core/resource/BlockOre.java
View file

@ -1,4 +1,4 @@
package resonantinduction.old.blocks;
package resonantinduction.core.resource;
import java.util.List;
import java.util.Set;

2
src/main/java/resonantinduction/old/blocks/GasOreGenerator.java → src/main/java/resonantinduction/core/resource/GasOreGenerator.java
View file

@ -1,4 +1,4 @@
package resonantinduction.old.blocks;
package resonantinduction.core.resource;
import java.util.Random;

2
src/main/java/resonantinduction/core/resource/ItemBlockOre.java
View file

@ -3,7 +3,7 @@ package resonantinduction.core.resource;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;
import resonantinduction.core.Reference;
import resonantinduction.old.blocks.BlockOre.OreData;
import resonantinduction.core.resource.BlockOre.OreData;
public class ItemBlockOre extends ItemBlock
{

6
src/main/java/resonantinduction/core/resource/ItemDust.java
View file

@ -7,15 +7,9 @@ import java.util.Set;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraftforge.client.event.TextureStitchEvent;
import net.minecraftforge.event.ForgeSubscribe;
import net.minecraftforge.oredict.OreDictionary;
import net.minecraftforge.oredict.OreDictionary.OreRegisterEvent;
import resonantinduction.api.recipe.OreDetectionBlackList;
import resonantinduction.core.Reference;
import resonantinduction.core.ResonantInduction;
import resonantinduction.core.prefab.item.ItemBase;
import resonantinduction.core.resource.ResourceGenerator;
import calclavia.lib.utility.LanguageUtility;
import calclavia.lib.utility.NBTUtility;
import cpw.mods.fml.relauncher.Side;

3
src/main/java/resonantinduction/core/resource/ResourceGenerator.java
View file

@ -1,7 +1,5 @@
package resonantinduction.core.resource;
import java.awt.Color;
import java.lang.reflect.Method;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Set;
@ -22,7 +20,6 @@ import resonantinduction.core.ResonantInduction;
import codechicken.lib.colour.Colour;
import codechicken.lib.colour.ColourRGBA;
import codechicken.lib.render.TextureUtils;
import cpw.mods.fml.relauncher.ReflectionHelper;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;

2
src/main/java/resonatninduction/tilenetwork/INetworkContainer.java → src/main/java/resonantinduction/core/tilenetwork/INetworkContainer.java
View file

@ -1,4 +1,4 @@
package resonatninduction.tilenetwork;
package resonantinduction.core.tilenetwork;
/**
* Used on tiles that can contain more than one tile network. Currently WIP so don't use unless you

2
src/main/java/resonatninduction/tilenetwork/INetworkEnergyPart.java → src/main/java/resonantinduction/core/tilenetwork/INetworkEnergyPart.java
View file

@ -1,4 +1,4 @@
package resonatninduction.tilenetwork;
package resonantinduction.core.tilenetwork;
import universalelectricity.api.energy.IEnergyContainer;

2
src/main/java/resonatninduction/tilenetwork/INetworkPart.java → src/main/java/resonantinduction/core/tilenetwork/INetworkPart.java
View file

@ -1,4 +1,4 @@
package resonatninduction.tilenetwork;
package resonantinduction.core.tilenetwork;
import java.util.List;

2
src/main/java/resonatninduction/tilenetwork/ITileConnector.java → src/main/java/resonantinduction/core/tilenetwork/ITileConnector.java
View file

@ -1,4 +1,4 @@
package resonatninduction.tilenetwork;
package resonantinduction.core.tilenetwork;
import net.minecraftforge.common.ForgeDirection;

2
src/main/java/resonatninduction/tilenetwork/ITileNetwork.java → src/main/java/resonantinduction/core/tilenetwork/ITileNetwork.java
View file

@ -1,4 +1,4 @@
package resonatninduction.tilenetwork;
package resonantinduction.core.tilenetwork;
import java.util.Set;

4
src/main/java/resonatninduction/tilenetwork/prefab/NetworkPathFinder.java → src/main/java/resonantinduction/core/tilenetwork/prefab/NetworkPathFinder.java
View file

@ -1,11 +1,11 @@
package resonatninduction.tilenetwork.prefab;
package resonantinduction.core.tilenetwork.prefab;
import java.util.HashSet;
import java.util.Set;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import resonatninduction.tilenetwork.INetworkPart;
import resonantinduction.core.tilenetwork.INetworkPart;
import universalelectricity.api.vector.Vector3;
import calclavia.lib.path.IPathCallBack;
import calclavia.lib.path.Pathfinder;

4
src/main/java/resonatninduction/tilenetwork/prefab/NetworkResourceSupply.java → src/main/java/resonantinduction/core/tilenetwork/prefab/NetworkResourceSupply.java
View file

@ -1,11 +1,11 @@
package resonatninduction.tilenetwork.prefab;
package resonantinduction.core.tilenetwork.prefab;
import java.util.HashMap;
import java.util.List;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.ForgeDirection;
import resonatninduction.tilenetwork.INetworkPart;
import resonantinduction.core.tilenetwork.INetworkPart;
/**
* Network that supplies resources to tiles that demand a set resource

6
src/main/java/resonatninduction/tilenetwork/prefab/NetworkSharedPower.java → src/main/java/resonantinduction/core/tilenetwork/prefab/NetworkSharedPower.java
View file

@ -1,9 +1,9 @@
package resonatninduction.tilenetwork.prefab;
package resonantinduction.core.tilenetwork.prefab;
import net.minecraft.tileentity.TileEntity;
import resonantinduction.core.tilenetwork.INetworkEnergyPart;
import resonantinduction.core.tilenetwork.INetworkPart;
import resonantinduction.old.lib.interfaces.IPowerLess;
import resonatninduction.tilenetwork.INetworkEnergyPart;
import resonatninduction.tilenetwork.INetworkPart;
/**
* Used for tile networks that only need to share power or act like a group battery that doesn't

6
src/main/java/resonatninduction/tilenetwork/prefab/NetworkTileEntities.java → src/main/java/resonantinduction/core/tilenetwork/prefab/NetworkTileEntities.java
View file

@ -1,4 +1,4 @@
package resonatninduction.tilenetwork.prefab;
package resonantinduction.core.tilenetwork.prefab;
import java.util.HashSet;
import java.util.Iterator;
@ -7,8 +7,8 @@ import java.util.Set;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.ForgeDirection;
import resonatninduction.tilenetwork.INetworkPart;
import resonatninduction.tilenetwork.ITileNetwork;
import resonantinduction.core.tilenetwork.INetworkPart;
import resonantinduction.core.tilenetwork.ITileNetwork;
import universalelectricity.api.vector.Vector3;
import universalelectricity.api.vector.VectorHelper;
import calclavia.lib.path.Pathfinder;

4
src/main/java/resonatninduction/tilenetwork/prefab/NetworkUpdateHandler.java → src/main/java/resonantinduction/core/tilenetwork/prefab/NetworkUpdateHandler.java
View file

@ -1,4 +1,4 @@
package resonatninduction.tilenetwork.prefab;
package resonantinduction.core.tilenetwork.prefab;
import java.util.EnumSet;
import java.util.HashMap;
@ -6,7 +6,7 @@ import java.util.HashSet;
import java.util.Iterator;
import java.util.Set;
import resonatninduction.tilenetwork.ITileNetwork;
import resonantinduction.core.tilenetwork.ITileNetwork;
import cpw.mods.fml.common.ITickHandler;
import cpw.mods.fml.common.TickType;

6
src/main/java/resonantinduction/electrical/CommonProxy.java
View file

@ -3,13 +3,13 @@ package resonantinduction.electrical;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import codechicken.lib.colour.ColourRGBA;
import codechicken.multipart.TMultiPart;
import codechicken.multipart.TileMultipart;
import resonantinduction.core.prefab.ProxyBase;
import resonantinduction.electrical.multimeter.ContainerMultimeter;
import resonantinduction.electrical.multimeter.PartMultimeter;
import universalelectricity.api.vector.Vector3;
import codechicken.lib.colour.ColourRGBA;
import codechicken.multipart.TMultiPart;
import codechicken.multipart.TileMultipart;
public class CommonProxy extends ProxyBase
{

33
src/main/java/resonantinduction/old/mechanics/armbot/BlockArmbot.java → src/main/java/resonantinduction/electrical/armbot/BlockArmbot.java
View file

@ -1,4 +1,4 @@
package resonantinduction.old.mechanics.armbot;
package resonantinduction.electrical.armbot;
import java.util.List;
import java.util.Random;
@ -10,23 +10,23 @@ import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.world.World;
import resonantinduction.core.Settings;
import net.minecraftforge.common.Configuration;
import resonantinduction.core.prefab.block.BlockMachine;
import resonantinduction.old.client.render.BlockRenderingHandler;
import resonantinduction.old.client.render.RenderArmbot;
import universalelectricity.api.UniversalElectricity;
import resonantinduction.old.lib.IExtraInfo.IExtraBlockInfo;
import calclavia.lib.multiblock.link.IMultiBlock;
import calclavia.lib.prefab.block.BlockMachine;
import com.builtbroken.common.Pair;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public class BlockArmbot extends BlockMachine
public class BlockArmbot extends BlockMachine implements IExtraBlockInfo
{
public BlockArmbot()
{
super(Settings.CONFIGURATION,"armbot", UniversalElectricity.machine);
super("armbot");
}
@Override
@ -116,4 +116,25 @@ public class BlockArmbot extends BlockMachine
{
return false;
}
@Override
public boolean hasExtraConfigs()
{
// TODO Auto-generated method stub
return false;
}
@Override
public void loadExtraConfigs(Configuration config)
{
// TODO Auto-generated method stub
}
@Override
public void loadOreNames()
{
// TODO Auto-generated method stub
}
}

2
src/main/java/resonantinduction/old/mechanics/armbot/Program.java → src/main/java/resonantinduction/electrical/armbot/Program.java
View file

@ -1,4 +1,4 @@
package resonantinduction.old.mechanics.armbot;
package resonantinduction.electrical.armbot;
import java.util.ArrayList;
import java.util.HashMap;

2
src/main/java/resonantinduction/old/mechanics/armbot/TaskBase.java → src/main/java/resonantinduction/electrical/armbot/TaskBase.java
View file

@ -1,4 +1,4 @@
package resonantinduction.old.mechanics.armbot;
package resonantinduction.electrical.armbot;
import java.util.ArrayList;
import java.util.List;

2
src/main/java/resonantinduction/old/mechanics/armbot/TaskBaseArmbot.java → src/main/java/resonantinduction/electrical/armbot/TaskBaseArmbot.java
View file

@ -1,4 +1,4 @@
package resonantinduction.old.mechanics.armbot;
package resonantinduction.electrical.armbot;
import resonantinduction.old.api.IArmbot;
import resonantinduction.old.api.coding.IProgrammableMachine;

2
src/main/java/resonantinduction/old/mechanics/armbot/TaskBaseLogic.java → src/main/java/resonantinduction/electrical/armbot/TaskBaseLogic.java
View file

@ -1,4 +1,4 @@
package resonantinduction.old.mechanics.armbot;
package resonantinduction.electrical.armbot;
import resonantinduction.old.api.coding.ILogicTask;

2
src/main/java/resonantinduction/old/mechanics/armbot/TaskBaseProcess.java → src/main/java/resonantinduction/electrical/armbot/TaskBaseProcess.java
View file

@ -1,4 +1,4 @@
package resonantinduction.old.mechanics.armbot;
package resonantinduction.electrical.armbot;
import net.minecraft.item.ItemStack;
import resonantinduction.old.api.coding.IProcessTask;

12
src/main/java/resonantinduction/old/mechanics/armbot/TileEntityArmbot.java → src/main/java/resonantinduction/electrical/armbot/TileEntityArmbot.java
View file

@ -1,4 +1,4 @@
package resonantinduction.old.mechanics.armbot;
package resonantinduction.electrical.armbot;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityList;
@ -10,15 +10,15 @@ import net.minecraft.network.packet.Packet;
import net.minecraft.world.World;
import net.minecraftforge.common.ForgeDirection;
import resonantinduction.core.ResonantInduction;
import resonantinduction.electrical.armbot.command.TaskDrop;
import resonantinduction.electrical.armbot.command.TaskGOTO;
import resonantinduction.electrical.armbot.command.TaskGrabItem;
import resonantinduction.electrical.armbot.command.TaskReturn;
import resonantinduction.electrical.armbot.command.TaskRotateTo;
import resonantinduction.old.api.IArmbot;
import resonantinduction.old.api.coding.IProgram;
import resonantinduction.old.api.coding.ProgramHelper;
import resonantinduction.old.core.recipe.RecipeLoader;
import resonantinduction.old.mechanics.armbot.command.TaskDrop;
import resonantinduction.old.mechanics.armbot.command.TaskGOTO;
import resonantinduction.old.mechanics.armbot.command.TaskGrabItem;
import resonantinduction.old.mechanics.armbot.command.TaskReturn;
import resonantinduction.old.mechanics.armbot.command.TaskRotateTo;
import resonantinduction.old.transport.ResonantInductionTransport;
import resonantinduction.old.transport.TileEntityAssembly;
import resonantinduction.old.transport.encoder.ItemDisk;

6
src/main/java/resonantinduction/old/mechanics/armbot/command/TaskBreak.java → src/main/java/resonantinduction/electrical/armbot/command/TaskBreak.java
View file

@ -1,4 +1,4 @@
package resonantinduction.old.mechanics.armbot.command;
package resonantinduction.electrical.armbot.command;
import java.util.ArrayList;
@ -7,10 +7,10 @@ import net.minecraft.entity.item.EntityItem;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.world.World;
import resonantinduction.electrical.armbot.TaskBaseArmbot;
import resonantinduction.electrical.armbot.TaskBaseProcess;
import resonantinduction.old.api.IArmbot;
import resonantinduction.old.api.coding.ITask;
import resonantinduction.old.mechanics.armbot.TaskBaseArmbot;
import resonantinduction.old.mechanics.armbot.TaskBaseProcess;
import universalelectricity.api.vector.Vector3;
import calclavia.lib.utility.HelperMethods;

6
src/main/java/resonantinduction/old/mechanics/armbot/command/TaskDrop.java → src/main/java/resonantinduction/electrical/armbot/command/TaskDrop.java
View file

@ -1,8 +1,8 @@
package resonantinduction.old.mechanics.armbot.command;
package resonantinduction.electrical.armbot.command;
import resonantinduction.electrical.armbot.TaskBaseArmbot;
import resonantinduction.electrical.armbot.TaskBaseProcess;
import resonantinduction.old.api.IArmbot;
import resonantinduction.old.mechanics.armbot.TaskBaseArmbot;
import resonantinduction.old.mechanics.armbot.TaskBaseProcess;
import universalelectricity.api.vector.Vector2;
public class TaskDrop extends TaskBaseArmbot

4
src/main/java/resonantinduction/old/mechanics/armbot/command/TaskEnd.java → src/main/java/resonantinduction/electrical/armbot/command/TaskEnd.java
View file

@ -1,6 +1,6 @@
package resonantinduction.old.mechanics.armbot.command;
package resonantinduction.electrical.armbot.command;
import resonantinduction.old.mechanics.armbot.TaskBase;
import resonantinduction.electrical.armbot.TaskBase;
/** @author DarkGuardsman */
public class TaskEnd extends TaskBase

6
src/main/java/resonantinduction/old/mechanics/armbot/command/TaskFire.java → src/main/java/resonantinduction/electrical/armbot/command/TaskFire.java
View file

@ -1,4 +1,4 @@
package resonantinduction.old.mechanics.armbot.command;
package resonantinduction.electrical.armbot.command;
import java.util.Random;
@ -9,10 +9,10 @@ import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.world.World;
import resonantinduction.electrical.armbot.TaskBaseArmbot;
import resonantinduction.electrical.armbot.TaskBaseProcess;
import resonantinduction.old.api.IArmbot;
import resonantinduction.old.api.coding.args.ArgumentFloatData;
import resonantinduction.old.mechanics.armbot.TaskBaseArmbot;
import resonantinduction.old.mechanics.armbot.TaskBaseProcess;
import universalelectricity.api.vector.Vector3;
import com.builtbroken.common.Pair;

4
src/main/java/resonantinduction/old/mechanics/armbot/command/TaskGOTO.java → src/main/java/resonantinduction/electrical/armbot/command/TaskGOTO.java
View file

@ -1,12 +1,12 @@
package resonantinduction.old.mechanics.armbot.command;
package resonantinduction.electrical.armbot.command;
import java.util.ArrayList;
import java.util.List;
import net.minecraft.nbt.NBTTagCompound;
import resonantinduction.electrical.armbot.TaskBase;
import resonantinduction.old.api.coding.IRedirectTask;
import resonantinduction.old.api.coding.ITask;
import resonantinduction.old.mechanics.armbot.TaskBase;
import universalelectricity.api.vector.Vector2;
/** @author DarkGuardsman */

6
src/main/java/resonantinduction/old/mechanics/armbot/command/TaskGive.java → src/main/java/resonantinduction/electrical/armbot/command/TaskGive.java
View file

@ -1,4 +1,4 @@
package resonantinduction.old.mechanics.armbot.command;
package resonantinduction.electrical.armbot.command;
import java.util.ArrayList;
import java.util.List;
@ -8,11 +8,11 @@ import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.ForgeDirection;
import resonantinduction.electrical.armbot.TaskBaseArmbot;
import resonantinduction.electrical.armbot.TaskBaseProcess;
import resonantinduction.old.api.IArmbot;
import resonantinduction.old.api.coding.IProgrammableMachine;
import resonantinduction.old.api.coding.args.ArgumentIntData;
import resonantinduction.old.mechanics.armbot.TaskBaseArmbot;
import resonantinduction.old.mechanics.armbot.TaskBaseProcess;
import universalelectricity.api.vector.Vector2;
import universalelectricity.api.vector.Vector3;
import calclavia.lib.utility.InvInteractionHelper;

4
src/main/java/resonantinduction/old/mechanics/armbot/command/TaskGrabEntity.java → src/main/java/resonantinduction/electrical/armbot/command/TaskGrabEntity.java
View file

@ -1,4 +1,4 @@
package resonantinduction.old.mechanics.armbot.command;
package resonantinduction.electrical.armbot.command;
import java.util.List;
@ -8,10 +8,10 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.projectile.EntityArrow;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.AxisAlignedBB;
import resonantinduction.electrical.armbot.TaskBaseProcess;
import resonantinduction.old.api.EntityDictionary;
import resonantinduction.old.api.IArmbot;
import resonantinduction.old.api.coding.args.ArgumentData;
import resonantinduction.old.mechanics.armbot.TaskBaseProcess;
public class TaskGrabEntity extends TaskGrabPrefab
{

4
src/main/java/resonantinduction/old/mechanics/armbot/command/TaskGrabItem.java → src/main/java/resonantinduction/electrical/armbot/command/TaskGrabItem.java
View file

@ -1,4 +1,4 @@
package resonantinduction.old.mechanics.armbot.command;
package resonantinduction.electrical.armbot.command;
import java.util.List;
@ -6,9 +6,9 @@ import net.minecraft.block.Block;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.item.ItemStack;
import net.minecraft.util.AxisAlignedBB;
import resonantinduction.electrical.armbot.TaskBaseProcess;
import resonantinduction.old.api.IArmbot;
import resonantinduction.old.api.coding.args.ArgumentIntData;
import resonantinduction.old.mechanics.armbot.TaskBaseProcess;
import com.builtbroken.common.science.units.UnitHelper;

4
src/main/java/resonantinduction/old/mechanics/armbot/command/TaskGrabPrefab.java → src/main/java/resonantinduction/electrical/armbot/command/TaskGrabPrefab.java
View file

@ -1,10 +1,10 @@
package resonantinduction.old.mechanics.armbot.command;
package resonantinduction.electrical.armbot.command;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.ForgeDirection;
import resonantinduction.electrical.armbot.TaskBaseArmbot;
import resonantinduction.old.api.IArmbot;
import resonantinduction.old.api.IBelt;
import resonantinduction.old.mechanics.armbot.TaskBaseArmbot;
import universalelectricity.api.vector.Vector2;
import universalelectricity.api.vector.Vector3;

2
src/main/java/resonantinduction/old/mechanics/armbot/command/TaskHarvest.java → src/main/java/resonantinduction/electrical/armbot/command/TaskHarvest.java
View file

@ -1,4 +1,4 @@
package resonantinduction.old.mechanics.armbot.command;
package resonantinduction.electrical.armbot.command;
/**
* Used by arms to break a specific block in a position.

4
src/main/java/resonantinduction/old/mechanics/armbot/command/TaskIF.java → src/main/java/resonantinduction/electrical/armbot/command/TaskIF.java
View file

@ -1,12 +1,12 @@
package resonantinduction.old.mechanics.armbot.command;
package resonantinduction.electrical.armbot.command;
import java.util.ArrayList;
import java.util.List;
import resonantinduction.electrical.armbot.TaskBaseLogic;
import resonantinduction.old.api.coding.IProgrammableMachine;
import resonantinduction.old.api.coding.ITask;
import resonantinduction.old.api.coding.args.ArgumentData;
import resonantinduction.old.mechanics.armbot.TaskBaseLogic;
import universalelectricity.api.vector.Vector2;
/** @author DarkGuardsman */

4
src/main/java/resonantinduction/old/mechanics/armbot/command/TaskIdle.java → src/main/java/resonantinduction/electrical/armbot/command/TaskIdle.java
View file

@ -1,11 +1,11 @@
package resonantinduction.old.mechanics.armbot.command;
package resonantinduction.electrical.armbot.command;
import java.util.List;
import net.minecraft.nbt.NBTTagCompound;
import resonantinduction.electrical.armbot.TaskBaseProcess;
import resonantinduction.old.api.coding.IProgrammableMachine;
import resonantinduction.old.api.coding.args.ArgumentData;
import resonantinduction.old.mechanics.armbot.TaskBaseProcess;
import com.builtbroken.common.science.units.UnitHelper;

6
src/main/java/resonantinduction/old/mechanics/armbot/command/TaskPlace.java → src/main/java/resonantinduction/electrical/armbot/command/TaskPlace.java
View file

@ -1,4 +1,4 @@
package resonantinduction.old.mechanics.armbot.command;
package resonantinduction.electrical.armbot.command;
import net.minecraft.block.Block;
import net.minecraft.entity.item.EntityItem;
@ -6,9 +6,9 @@ import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;
import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.common.IPlantable;
import resonantinduction.electrical.armbot.TaskBaseArmbot;
import resonantinduction.electrical.armbot.TaskBaseProcess;
import resonantinduction.old.api.IArmbot;
import resonantinduction.old.mechanics.armbot.TaskBaseArmbot;
import resonantinduction.old.mechanics.armbot.TaskBaseProcess;
import universalelectricity.api.vector.Vector3;
/**

4
src/main/java/resonantinduction/old/mechanics/armbot/command/TaskReturn.java → src/main/java/resonantinduction/electrical/armbot/command/TaskReturn.java
View file

@ -1,6 +1,6 @@
package resonantinduction.old.mechanics.armbot.command;
package resonantinduction.electrical.armbot.command;
import resonantinduction.old.mechanics.armbot.TaskBaseProcess;
import resonantinduction.electrical.armbot.TaskBaseProcess;
public class TaskReturn extends TaskRotateTo
{

6
src/main/java/resonantinduction/old/mechanics/armbot/command/TaskRotateBy.java → src/main/java/resonantinduction/electrical/armbot/command/TaskRotateBy.java
View file

@ -1,12 +1,12 @@
package resonantinduction.old.mechanics.armbot.command;
package resonantinduction.electrical.armbot.command;
import java.util.List;
import net.minecraft.nbt.NBTTagCompound;
import resonantinduction.electrical.armbot.TaskBaseArmbot;
import resonantinduction.electrical.armbot.TaskBaseProcess;
import resonantinduction.old.api.IArmbot;
import resonantinduction.old.api.coding.args.ArgumentIntData;
import resonantinduction.old.mechanics.armbot.TaskBaseArmbot;
import resonantinduction.old.mechanics.armbot.TaskBaseProcess;
import universalelectricity.api.vector.Vector2;
import com.builtbroken.common.science.units.UnitHelper;

6
src/main/java/resonantinduction/old/mechanics/armbot/command/TaskRotateTo.java → src/main/java/resonantinduction/electrical/armbot/command/TaskRotateTo.java
View file

@ -1,12 +1,12 @@
package resonantinduction.old.mechanics.armbot.command;
package resonantinduction.electrical.armbot.command;
import java.util.List;
import net.minecraft.nbt.NBTTagCompound;
import resonantinduction.electrical.armbot.TaskBaseArmbot;
import resonantinduction.electrical.armbot.TaskBaseProcess;
import resonantinduction.old.api.IArmbot;
import resonantinduction.old.api.coding.args.ArgumentIntData;
import resonantinduction.old.mechanics.armbot.TaskBaseArmbot;
import resonantinduction.old.mechanics.armbot.TaskBaseProcess;
import universalelectricity.api.vector.Vector2;
import com.builtbroken.common.science.units.UnitHelper;

4
src/main/java/resonantinduction/old/mechanics/armbot/command/TaskStart.java → src/main/java/resonantinduction/electrical/armbot/command/TaskStart.java
View file

@ -1,6 +1,6 @@
package resonantinduction.old.mechanics.armbot.command;
package resonantinduction.electrical.armbot.command;
import resonantinduction.old.mechanics.armbot.TaskBase;
import resonantinduction.electrical.armbot.TaskBase;
/**
* Fake task as the player can not create, edit, or do anything with this task. Its only used to

6
src/main/java/resonantinduction/old/mechanics/armbot/command/TaskTake.java → src/main/java/resonantinduction/electrical/armbot/command/TaskTake.java
View file

@ -1,4 +1,4 @@
package resonantinduction.old.mechanics.armbot.command;
package resonantinduction.electrical.armbot.command;
import java.util.ArrayList;
import java.util.List;
@ -8,10 +8,10 @@ import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.ForgeDirection;
import resonantinduction.electrical.armbot.TaskBaseArmbot;
import resonantinduction.electrical.armbot.TaskBaseProcess;
import resonantinduction.old.api.IArmbot;
import resonantinduction.old.api.coding.args.ArgumentIntData;
import resonantinduction.old.mechanics.armbot.TaskBaseArmbot;
import resonantinduction.old.mechanics.armbot.TaskBaseProcess;
import universalelectricity.api.vector.Vector2;
import universalelectricity.api.vector.Vector3;
import calclavia.lib.utility.InvInteractionHelper;

6
src/main/java/resonantinduction/old/mechanics/armbot/command/TaskUse.java → src/main/java/resonantinduction/electrical/armbot/command/TaskUse.java
View file

@ -1,16 +1,16 @@
package resonantinduction.old.mechanics.armbot.command;
package resonantinduction.electrical.armbot.command;
import java.util.List;
import net.minecraft.block.Block;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import resonantinduction.electrical.armbot.TaskBaseArmbot;
import resonantinduction.electrical.armbot.TaskBaseProcess;
import resonantinduction.old.api.IArmbot;
import resonantinduction.old.api.IArmbotUseable;
import resonantinduction.old.api.coding.IProcessTask;
import resonantinduction.old.api.coding.args.ArgumentIntData;
import resonantinduction.old.mechanics.armbot.TaskBaseArmbot;
import resonantinduction.old.mechanics.armbot.TaskBaseProcess;
import com.builtbroken.common.science.units.UnitHelper;

25
src/main/java/resonantinduction/old/mechanics/generator/solar/BlockSolarPanel.java → src/main/java/resonantinduction/electrical/generator/solar/BlockSolarPanel.java
View file

@ -1,4 +1,4 @@
package resonantinduction.old.mechanics.generator.solar;
package resonantinduction.electrical.generator.solar;
import java.util.List;
import java.util.Set;
@ -9,19 +9,17 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import net.minecraftforge.common.Configuration;
import net.minecraftforge.oredict.OreDictionary;
import resonantinduction.core.ResonantInductionTabs;
import resonantinduction.core.prefab.block.BlockMachine;
import resonantinduction.old.client.render.BlockRenderingHandler;
import resonantinduction.old.client.render.RenderBlockSolarPanel;
import resonantinduction.old.transport.ResonantInductionTransport;
import universalelectricity.api.UniversalElectricity;
import calclavia.lib.prefab.block.BlockMachine;
import resonantinduction.old.lib.IExtraInfo.IExtraBlockInfo;
import com.builtbroken.common.Pair;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public class BlockSolarPanel extends BlockMachine
public class BlockSolarPanel extends BlockMachine implements IExtraBlockInfo
{
public static int tickRate = 10;
public static long wattDay = 120;
@ -30,9 +28,8 @@ public class BlockSolarPanel extends BlockMachine
public BlockSolarPanel()
{
super(ResonantInductionTransport.CONFIGURATION, "BlockSolarPanel", UniversalElectricity.machine);
super("BlockSolarPanel");
this.setBlockBounds(0, 0, 0, 1f, .6f, 1f);
this.setCreativeTab(ResonantInductionTabs.tabIndustrial());
}
@Override
@ -69,16 +66,13 @@ public class BlockSolarPanel extends BlockMachine
@SideOnly(Side.CLIENT)
public void getClientTileEntityRenderers(List<Pair<Class<? extends TileEntity>, TileEntitySpecialRenderer>> list)
{
if (!this.zeroRendering)
{
list.add(new Pair<Class<? extends TileEntity>, TileEntitySpecialRenderer>(TileEntitySolarPanel.class, new RenderBlockSolarPanel()));
}
}
@Override
public void loadExtraConfigs(Configuration config)
{
super.loadExtraConfigs(config);
tickRate = config.get("settings", "PanelUpdateRate", tickRate).getInt();
wattDay = config.get("settings", "WattDayLight", 120).getInt();
wattNight = config.get("settings", "WattMoonLight", 1).getInt();
@ -90,4 +84,11 @@ public class BlockSolarPanel extends BlockMachine
{
OreDictionary.registerOre("SolarPanel", new ItemStack(this, 1, 0));
}
@Override
public boolean hasExtraConfigs()
{
// TODO Auto-generated method stub
return false;
}
}

4
src/main/java/resonantinduction/old/mechanics/generator/solar/TileEntitySolarBox.java → src/main/java/resonantinduction/electrical/generator/solar/TileEntitySolarBox.java
View file

@ -1,6 +1,6 @@
package resonantinduction.old.mechanics.generator.solar;
package resonantinduction.electrical.generator.solar;
import resonantinduction.old.mechanics.generator.TileGenerator;
import resonantinduction.core.prefab.tile.TileGenerator;
/** TileEntity that acts as the connection node for the solar panel */
public class TileEntitySolarBox extends TileGenerator

4
src/main/java/resonantinduction/old/mechanics/generator/solar/TileEntitySolarPanel.java → src/main/java/resonantinduction/electrical/generator/solar/TileEntitySolarPanel.java
View file

@ -1,9 +1,9 @@
package resonantinduction.old.mechanics.generator.solar;
package resonantinduction.electrical.generator.solar;
import java.util.EnumSet;
import net.minecraftforge.common.ForgeDirection;
import resonantinduction.old.mechanics.generator.TileGenerator;
import resonantinduction.core.prefab.tile.TileGenerator;
public class TileEntitySolarPanel extends TileGenerator
{

4
src/main/java/resonantinduction/electrical/multimeter/ItemReadoutTools.java
View file

@ -16,10 +16,10 @@ import net.minecraftforge.fluids.FluidTankInfo;
import net.minecraftforge.fluids.IFluidHandler;
import resonantinduction.core.Reference;
import resonantinduction.core.Settings;
import resonantinduction.core.prefab.tile.TileEntityEnergyMachine;
import resonantinduction.core.prefab.tile.TileGenerator;
import resonantinduction.old.lib.interfaces.IReadOut;
import resonantinduction.old.lib.interfaces.IReadOut.EnumTools;
import resonantinduction.old.lib.prefab.TileEntityEnergyMachine;
import resonantinduction.old.mechanics.generator.TileGenerator;
import universalelectricity.api.electricity.IVoltageInput;
import universalelectricity.api.electricity.IVoltageOutput;
import universalelectricity.api.energy.IConductor;

3
src/main/java/resonantinduction/electrical/wire/framed/RenderPartWire.java
View file

@ -11,10 +11,9 @@ import net.minecraftforge.common.ForgeDirection;
import org.lwjgl.BufferUtils;
import org.lwjgl.opengl.GL11;
import calclavia.lib.render.EnumColor;
import resonantinduction.core.Reference;
import resonantinduction.core.ResonantInduction;
import resonantinduction.core.render.InvertX;
import calclavia.lib.render.EnumColor;
import codechicken.lib.colour.Colour;
import codechicken.lib.colour.ColourRGBA;
import codechicken.lib.lighting.LightModel;

2
src/main/java/resonantinduction/mechanical/Mechanical.java
View file

@ -1,7 +1,5 @@
package resonantinduction.mechanical;
import java.util.logging.Logger;
import resonantinduction.core.Reference;
import resonantinduction.core.ResonantInduction;
import resonantinduction.core.Settings;

34
src/main/java/resonantinduction/old/transport/belt/BlockConveyorBelt.java → src/main/java/resonantinduction/mechanical/belt/BlockConveyorBelt.java
View file

@ -1,4 +1,4 @@
package resonantinduction.old.transport.belt;
package resonantinduction.mechanical.belt;
import java.util.List;
import java.util.Set;
@ -15,13 +15,13 @@ import net.minecraft.util.AxisAlignedBB;
import net.minecraft.util.MathHelper;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import net.minecraftforge.common.Configuration;
import net.minecraftforge.common.ForgeDirection;
import resonantinduction.core.Settings;
import resonantinduction.core.prefab.block.BlockMachine;
import resonantinduction.mechanical.belt.TileEntityConveyorBelt.SlantType;
import resonantinduction.old.client.render.BlockRenderingHandler;
import resonantinduction.old.client.render.RenderConveyorBelt;
import resonantinduction.old.transport.belt.TileEntityConveyorBelt.SlantType;
import universalelectricity.api.UniversalElectricity;
import calclavia.lib.prefab.block.BlockMachine;
import resonantinduction.old.lib.IExtraInfo.IExtraBlockInfo;
import com.builtbroken.common.Pair;
@ -31,11 +31,11 @@ import cpw.mods.fml.relauncher.SideOnly;
/** The block for the actual conveyor belt!
*
* @author Calclavia, DarkGuardsman */
public class BlockConveyorBelt extends BlockMachine
public class BlockConveyorBelt extends BlockMachine implements IExtraBlockInfo
{
public BlockConveyorBelt()
{
super(Settings.CONFIGURATION, "conveyorBelt", UniversalElectricity.machine);
super("conveyorBelt");
this.setBlockBounds(0, 0, 0, 1, 0.3f, 1);
}
@ -375,4 +375,24 @@ public class BlockConveyorBelt extends BlockMachine
{
return 0;
}
@Override
public boolean hasExtraConfigs()
{
return false;
}
@Override
public void loadExtraConfigs(Configuration config)
{
// TODO Auto-generated method stub
}
@Override
public void loadOreNames()
{
// TODO Auto-generated method stub
}
}

2
src/main/java/resonantinduction/old/transport/belt/TileEntityConveyorBelt.java → src/main/java/resonantinduction/mechanical/belt/TileEntityConveyorBelt.java
View file

@ -1,4 +1,4 @@
package resonantinduction.old.transport.belt;
package resonantinduction.mechanical.belt;
import java.util.ArrayList;
import java.util.Iterator;

2
src/main/java/resonantinduction/old/mechanics/machine/grinder/BlockGrinderWheel.java → src/main/java/resonantinduction/mechanical/grinder/BlockGrinderWheel.java
View file

@ -1,4 +1,4 @@
package resonantinduction.old.mechanics.machine.grinder;
package resonantinduction.mechanical.grinder;
import net.minecraft.block.ITileEntityProvider;
import net.minecraft.entity.Entity;

2
src/main/java/resonantinduction/old/mechanics/machine/grinder/TileGrinderWheel.java → src/main/java/resonantinduction/mechanical/grinder/TileGrinderWheel.java
View file

@ -1,4 +1,4 @@
package resonantinduction.old.mechanics.machine.grinder;
package resonantinduction.mechanical.grinder;
import java.util.HashMap;

4
src/main/java/resonantinduction/old/mechanics/machine/grinder/TilePurifier.java → src/main/java/resonantinduction/mechanical/grinder/TilePurifier.java
View file

@ -1,4 +1,4 @@
package resonantinduction.old.mechanics.machine.grinder;
package resonantinduction.mechanical.grinder;
import java.util.HashMap;
import java.util.List;
@ -8,7 +8,7 @@ import net.minecraft.entity.item.EntityItem;
import net.minecraft.item.ItemStack;
import net.minecraft.util.AxisAlignedBB;
import resonantinduction.core.Reference;
import resonantinduction.old.mechanics.item.ItemDust;
import resonantinduction.core.resource.ItemDust;
import universalelectricity.api.energy.EnergyStorageHandler;
import universalelectricity.api.vector.Vector3;
import calclavia.lib.prefab.tile.TileElectrical;

2
src/main/java/resonantinduction/old/api/IProcessable.java
View file

@ -1,7 +1,7 @@
package resonantinduction.old.api;
import resonantinduction.old.lib.recipes.ProcessorType;
import net.minecraft.item.ItemStack;
import resonantinduction.old.lib.recipes.ProcessorType;
/**
* Simple interface that allows an item to control how its salvaged, processed, or refined by a

2
src/main/java/resonantinduction/old/api/fluid/IDrain.java
View file

@ -2,9 +2,9 @@ package resonantinduction.old.api.fluid;
import java.util.Set;
import resonantinduction.old.lib.interfaces.IRotatable;
import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.fluids.IFluidHandler;
import resonantinduction.old.lib.interfaces.IRotatable;
import universalelectricity.api.vector.Vector3;
/**

2
src/main/java/resonantinduction/old/api/fluid/INetworkFluidPart.java
View file

@ -4,7 +4,7 @@ import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.FluidTankInfo;
import net.minecraftforge.fluids.IFluidHandler;
import resonatninduction.tilenetwork.INetworkPart;
import resonantinduction.core.tilenetwork.INetworkPart;
/**
* Interface used by part that are members of a fluid tile network. Parts in the network will act as

3
src/main/java/resonantinduction/old/client/gui/GuiEncoderBase.java
View file

@ -2,7 +2,8 @@ package resonantinduction.old.client.gui;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.inventory.Container;
import resonantinduction.old.lib.prefab.TileEntityMachine;
import resonantinduction.core.prefab.tile.TileEntityMachine;
import resonantinduction.mechanical.MechCommonProxy;
import resonantinduction.old.lib.prefab.invgui.ContainerFake;
import resonantinduction.old.lib.prefab.invgui.GuiMachineContainer;
import resonantinduction.old.transport.ResonantInductionTransport;

6
src/main/java/resonantinduction/old/client/gui/GuiTaskList.java
View file

@ -6,13 +6,13 @@ import net.minecraft.tileentity.TileEntity;
import org.lwjgl.opengl.GL11;
import resonantinduction.electrical.armbot.command.TaskEnd;
import resonantinduction.electrical.armbot.command.TaskIdle;
import resonantinduction.electrical.armbot.command.TaskStart;
import resonantinduction.old.api.coding.IProgram;
import resonantinduction.old.api.coding.IRedirectTask;
import resonantinduction.old.api.coding.ITask;
import resonantinduction.old.lib.interfaces.IScroll;
import resonantinduction.old.mechanics.armbot.command.TaskEnd;
import resonantinduction.old.mechanics.armbot.command.TaskIdle;
import resonantinduction.old.mechanics.armbot.command.TaskStart;
import resonantinduction.old.transport.encoder.TileEntityEncoder;
import cpw.mods.fml.client.FMLClientHandler;
import cpw.mods.fml.common.FMLCommonHandler;

8
src/main/java/resonantinduction/old/client/render/BlockRenderHelper.java
View file

@ -74,14 +74,6 @@ public class BlockRenderHelper implements ISimpleBlockRenderingHandler
GL11.glScalef(1.0F, -1F, -1F);
RenderFrackingPipe.model.renderAll();
}
else if (RecipeLoader.laserSentry != null && block.blockID == RecipeLoader.laserSentry.blockID)
{
FMLClientHandler.instance().getClient().renderEngine.bindTexture(RenderMiningLaser.TEXTURE);
GL11.glTranslatef(0, 1.7F, 0);
GL11.glScalef(1.0F, -1F, -1F);
GL11.glRotatef(180, 0, 1, 0);
RenderMiningLaser.model.renderAll();
}
GL11.glPopMatrix();
}

2
src/main/java/resonantinduction/old/client/render/RenderArmbot.java
View file

@ -15,8 +15,8 @@ import net.minecraft.util.ResourceLocation;
import org.lwjgl.opengl.GL11;
import resonantinduction.core.Reference;
import resonantinduction.electrical.armbot.TileEntityArmbot;
import resonantinduction.old.client.model.ModelArmbot;
import resonantinduction.old.mechanics.armbot.TileEntityArmbot;
import universalelectricity.api.vector.Vector3;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;

4
src/main/java/resonantinduction/old/client/render/RenderConveyorBelt.java
View file

@ -7,10 +7,10 @@ import net.minecraft.util.ResourceLocation;
import org.lwjgl.opengl.GL11;
import resonantinduction.core.Reference;
import resonantinduction.mechanical.belt.TileEntityConveyorBelt;
import resonantinduction.mechanical.belt.TileEntityConveyorBelt.SlantType;
import resonantinduction.old.client.model.ModelAngledBelt;
import resonantinduction.old.client.model.ModelConveyorBelt;
import resonantinduction.old.transport.belt.TileEntityConveyorBelt;
import resonantinduction.old.transport.belt.TileEntityConveyorBelt.SlantType;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;

36
src/main/java/resonantinduction/old/client/render/RenderMiningLaser.java
View file

@ -1,36 +0,0 @@
package resonantinduction.old.client.render;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.ResourceLocation;
import org.lwjgl.opengl.GL11;
import resonantinduction.core.Reference;
import resonantinduction.old.client.model.ModelLaserTile;
import resonantinduction.old.mechanics.machine.mining.TileMiningLaser;
/** @author Darkguardsman */
public class RenderMiningLaser extends TileEntitySpecialRenderer
{
public static final ModelLaserTile model = new ModelLaserTile();
public static final ResourceLocation TEXTURE = new ResourceLocation(Reference.DOMAIN, Reference.MODEL_DIRECTORY + "LaserTile.png");
@Override
public void renderTileEntityAt(TileEntity tileEntity, double d, double d1, double d2, float f)
{
bindTexture(TEXTURE);
GL11.glPushMatrix();
GL11.glTranslatef((float) d + 0.5F, (float) d1 + 1.5F, (float) d2 + 0.5F);
GL11.glScalef(1.0F, -1F, -1F);
if (tileEntity instanceof TileMiningLaser)
{
float yaw = ((TileMiningLaser) tileEntity).getYaw() - 90;
GL11.glRotatef(yaw, 0, 1, 0);
}
model.renderAll();
GL11.glPopMatrix(); // end
}
}

2
src/main/java/resonantinduction/old/client/render/RenderSteamGen.java
View file

@ -8,10 +8,10 @@ import net.minecraft.util.ResourceLocation;
import org.lwjgl.opengl.GL11;
import resonantinduction.core.Reference;
import resonantinduction.core.prefab.tile.TileEntityMachine;
import resonantinduction.old.client.model.ModelMachine;
import resonantinduction.old.client.model.ModelSteamGen;
import resonantinduction.old.client.model.ModelSteamTurbine;
import resonantinduction.old.lib.prefab.TileEntityMachine;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;

2
src/main/java/resonantinduction/old/lib/ClientRegistryProxy.java
View file

@ -3,11 +3,11 @@ package resonantinduction.old.lib;
import java.util.ArrayList;
import java.util.List;
import resonantinduction.old.lib.IExtraInfo.IExtraBlockInfo;
import net.minecraft.block.Block;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
import net.minecraft.item.ItemBlock;
import net.minecraft.tileentity.TileEntity;
import resonantinduction.old.lib.IExtraInfo.IExtraBlockInfo;
import com.builtbroken.common.Pair;

5
src/main/java/resonantinduction/old/lib/CoreRegistry.java
View file

@ -6,8 +6,6 @@ import java.util.HashSet;
import java.util.Map.Entry;
import java.util.Set;
import resonantinduction.old.lib.IExtraInfo.IExtraBlockInfo;
import resonantinduction.old.lib.IExtraInfo.IExtraItemInfo;
import net.minecraft.block.Block;
import net.minecraft.item.Item;
import net.minecraft.item.ItemBlock;
@ -15,12 +13,13 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.Configuration;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidRegistry;
import resonantinduction.old.lib.IExtraInfo.IExtraBlockInfo;
import resonantinduction.old.lib.IExtraInfo.IExtraItemInfo;
import com.builtbroken.common.Pair;
import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.Loader;
import cpw.mods.fml.common.SidedProxy;
import cpw.mods.fml.common.registry.GameRegistry;
/**

2
src/main/java/resonantinduction/old/lib/prefab/invgui/GuiMachineContainer.java
View file

@ -13,7 +13,7 @@ import org.lwjgl.opengl.GL11;
import org.lwjgl.opengl.GL12;
import resonantinduction.core.Reference;
import resonantinduction.old.lib.prefab.TileEntityMachine;
import resonantinduction.core.prefab.tile.TileEntityMachine;
import resonantinduction.old.lib.prefab.invgui.GuiButtonImage.ButtonIcon;
import cpw.mods.fml.client.FMLClientHandler;
import cpw.mods.fml.relauncher.Side;

4
src/main/java/resonantinduction/old/lib/prefab/invgui/InvChest.java
View file

@ -1,7 +1,5 @@
package resonantinduction.old.lib.prefab.invgui;
import resonantinduction.old.lib.interfaces.IExternalInv;
import resonantinduction.old.lib.interfaces.IInvBox;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
@ -9,6 +7,8 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.ForgeDirection;
import resonantinduction.old.lib.interfaces.IExternalInv;
import resonantinduction.old.lib.interfaces.IInvBox;
public class InvChest implements IInvBox
{

2
src/main/java/resonantinduction/old/lib/terminal/CommandRegistry.java
View file

@ -3,9 +3,9 @@ package resonantinduction.old.lib.terminal;
import java.util.ArrayList;
import java.util.List;
import net.minecraft.entity.player.EntityPlayer;
import resonantinduction.old.lib.interfaces.ITerminal;
import resonantinduction.old.lib.interfaces.ITerminalCommand;
import net.minecraft.entity.player.EntityPlayer;
import calclavia.lib.access.GroupRegistry;
public class CommandRegistry

2
src/main/java/resonantinduction/old/lib/terminal/CommandUser.java
View file

@ -3,9 +3,9 @@ package resonantinduction.old.lib.terminal;
import java.util.HashSet;
import java.util.Set;
import net.minecraft.entity.player.EntityPlayer;
import resonantinduction.old.lib.interfaces.ITerminal;
import resonantinduction.old.lib.interfaces.ITerminalCommand;
import net.minecraft.entity.player.EntityPlayer;
import calclavia.lib.access.ISpecialAccess;
public class CommandUser implements ITerminalCommand

6
src/main/java/resonantinduction/old/lib/terminal/TileEntityTerminal.java
View file

@ -3,13 +3,13 @@ package resonantinduction.old.lib.terminal;
import java.util.ArrayList;
import java.util.List;
import resonantinduction.old.lib.interfaces.IScroll;
import resonantinduction.old.lib.interfaces.ITerminal;
import resonantinduction.old.lib.prefab.TileEntityEnergyMachine;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.network.packet.Packet;
import net.minecraft.util.AxisAlignedBB;
import resonantinduction.core.prefab.tile.TileEntityEnergyMachine;
import resonantinduction.old.lib.interfaces.IScroll;
import resonantinduction.old.lib.interfaces.ITerminal;
import calclavia.lib.network.PacketHandler;
import com.google.common.io.ByteArrayDataInput;

12
src/main/java/resonantinduction/old/mechanics/ResonantInductionMechanics.java
View file

@ -5,12 +5,10 @@ import java.util.HashMap;
import java.util.Map;
import net.minecraft.block.Block;
import net.minecraft.item.Item;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.tileentity.TileEntityFurnace;
import net.minecraft.util.Icon;
import net.minecraftforge.client.event.TextureStitchEvent;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.ForgeSubscribe;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidRegistry;
@ -25,14 +23,12 @@ import resonantinduction.core.resource.BlockFluidMixture;
import resonantinduction.core.resource.ResourceGenerator;
import resonantinduction.core.resource.TileFluidMixture;
import resonantinduction.electrical.MultipartElectrical;
import resonantinduction.mechanical.grinder.BlockGrinderWheel;
import resonantinduction.mechanical.grinder.TileGrinderWheel;
import resonantinduction.mechanical.grinder.TilePurifier;
import resonantinduction.old.mechanics.furnace.BlockAdvancedFurnace;
import resonantinduction.old.mechanics.furnace.TileAdvancedFurnace;
import resonantinduction.old.mechanics.item.ItemDust;
import resonantinduction.old.mechanics.machine.grinder.BlockGrinderWheel;
import resonantinduction.old.mechanics.machine.grinder.TileGrinderWheel;
import resonantinduction.old.mechanics.machine.grinder.TilePurifier;
import resonantinduction.old.mechanics.purifier.BlockPurifier;
import calclavia.lib.network.PacketHandler;
import calclavia.lib.network.PacketTile;
import calclavia.lib.utility.LanguageUtility;
import codechicken.lib.colour.ColourRGBA;
@ -42,11 +38,9 @@ import cpw.mods.fml.common.Mod.EventHandler;
import cpw.mods.fml.common.Mod.Instance;
import cpw.mods.fml.common.ModMetadata;
import cpw.mods.fml.common.ObfuscationReflectionHelper;
import cpw.mods.fml.common.SidedProxy;
import cpw.mods.fml.common.event.FMLInitializationEvent;
import cpw.mods.fml.common.event.FMLPostInitializationEvent;
import cpw.mods.fml.common.event.FMLPreInitializationEvent;
import cpw.mods.fml.common.network.NetworkMod;
import cpw.mods.fml.common.network.NetworkRegistry;
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.relauncher.Side;

9
src/main/java/resonantinduction/old/mechanics/furnace/TileAdvancedFurnace.java
View file

@ -10,6 +10,7 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.tileentity.TileEntityFurnace;
import net.minecraftforge.common.ForgeDirection;
import resonantinduction.core.ResonantInduction;
import resonantinduction.core.Settings;
import universalelectricity.api.CompatibilityModule;
import universalelectricity.api.UniversalClass;
import universalelectricity.api.energy.EnergyStorageHandler;
@ -32,7 +33,7 @@ public class TileAdvancedFurnace extends TileEntityFurnace implements IEnergyInt
{
private static final float WATTAGE = 5;
private EnergyStorageHandler energy = new EnergyStorageHandler(ResonantInduction.FURNACE_WATTAGE * 5);
private EnergyStorageHandler energy = new EnergyStorageHandler(Settings.FURNACE_WATTAGE * 5);
@Override
public void updateEntity()
@ -53,7 +54,7 @@ public class TileAdvancedFurnace extends TileEntityFurnace implements IEnergyInt
if (this.furnaceBurnTime > 0)
{
this.energy.receiveEnergy(ResonantInduction.FURNACE_WATTAGE / 20, true);
this.energy.receiveEnergy(Settings.FURNACE_WATTAGE / 20, true);
this.furnaceBurnTime--;
}
@ -70,7 +71,7 @@ public class TileAdvancedFurnace extends TileEntityFurnace implements IEnergyInt
*/
if (this.canSmelt())
{
if (this.energy.checkExtract(ResonantInduction.FURNACE_WATTAGE / 20))
if (this.energy.checkExtract(Settings.FURNACE_WATTAGE / 20))
{
this.furnaceCookTime++;
@ -80,7 +81,7 @@ public class TileAdvancedFurnace extends TileEntityFurnace implements IEnergyInt
this.smeltItem();
}
this.energy.extractEnergy(ResonantInduction.FURNACE_WATTAGE / 20, true);
this.energy.extractEnergy(Settings.FURNACE_WATTAGE / 20, true);
}
}
else

197
src/main/java/resonantinduction/old/mechanics/generator/steam/BlockSmallSteamGen.java
View file

@ -1,197 +0,0 @@
package resonantinduction.old.mechanics.generator.steam;
import java.util.List;
import java.util.Random;
import java.util.Set;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.world.World;
import net.minecraftforge.common.Configuration;
import resonantinduction.core.ResonantInductionTabs;
import resonantinduction.old.client.render.BlockRenderingHandler;
import resonantinduction.old.client.render.RenderSteamGen;
import resonantinduction.old.transport.ResonantInductionTransport;
import universalelectricity.api.UniversalElectricity;
import calclavia.lib.prefab.block.BlockMachine;
import com.builtbroken.common.Pair;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
/**
* Starter power setup using steam generated by burning items or fuels. This setup takes two blocks.
* A) the generator B) the collector The generator creates the steam and burns the fuel. The
* collector uses the steam to generate a small amount of constant power. This setup is not very
* powerful but is easy to create and doesn't take much to keep running
*
* @author DarkGuardsman
*/
public class BlockSmallSteamGen extends BlockMachine
{
public BlockSmallSteamGen()
{
super(ResonantInductionTransport.CONFIGURATION, "StarterSteamGen", UniversalElectricity.machine);
this.setStepSound(soundMetalFootstep);
this.setCreativeTab(ResonantInductionTabs.tabIndustrial());
}
@Override
public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase entityLiving, ItemStack itemStack)
{
super.onBlockPlacedBy(world, x, y, z, entityLiving, itemStack);
int metadata = world.getBlockMetadata(x, y, z);
int angle = net.minecraft.util.MathHelper.floor_double((entityLiving.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3;
world.setBlockMetadataWithNotify(x, y, z, ((metadata / 4) * 4) + angle, 3);
}
@Override
public void randomDisplayTick(World par1World, int x, int y, int z, Random rand)
{
TileEntity tile = par1World.getBlockTileEntity(x, y, z);
if (tile instanceof TileEntitySteamGen)
{
TileEntitySteamGen tileEntity = (TileEntitySteamGen) tile;
if (tileEntity.isFunctioning())
{
int face = par1World.getBlockMetadata(x, y, z) % 4;
float xx = x + 0.5F;
float yy = y + 0.0F + rand.nextFloat() * 6.0F / 16.0F;
float zz = z + 0.5F;
float posTooner = 0.52F;
float randPosChange = rand.nextFloat() * 0.6F - 0.3F;
if (face == 3)
{
par1World.spawnParticle("smoke", xx - posTooner, yy, zz + randPosChange, 0.0D, 0.0D, 0.0D);
par1World.spawnParticle("flame", xx - posTooner, yy, zz + randPosChange, 0.0D, 0.0D, 0.0D);
}
else if (face == 2)
{
par1World.spawnParticle("smoke", xx + posTooner, yy, zz + randPosChange, 0.0D, 0.0D, 0.0D);
par1World.spawnParticle("flame", xx + posTooner, yy, zz + randPosChange, 0.0D, 0.0D, 0.0D);
}
else if (face == 1)
{
par1World.spawnParticle("smoke", xx + randPosChange, yy, zz - posTooner, 0.0D, 0.0D, 0.0D);
par1World.spawnParticle("flame", xx + randPosChange, yy, zz - posTooner, 0.0D, 0.0D, 0.0D);
}
else if (face == 0)
{
par1World.spawnParticle("smoke", xx + randPosChange, yy, zz + posTooner, 0.0D, 0.0D, 0.0D);
par1World.spawnParticle("flame", xx + randPosChange, yy, zz + posTooner, 0.0D, 0.0D, 0.0D);
}
}
}
}
@Override
public boolean onUseWrench(World world, int x, int y, int z, EntityPlayer entityPlayer, int side, float hitX, float hitY, float hitZ)
{
if (world.getBlockMetadata(x, y, z) % 4 < 3)
{
world.setBlockMetadataWithNotify(x, y, z, world.getBlockMetadata(x, y, z) + 1, 3);
return true;
}
else
{
world.setBlockMetadataWithNotify(x, y, z, world.getBlockMetadata(x, y, z) - 3, 3);
return true;
}
}
@Override
public void getTileEntities(int blockID, Set<Pair<String, Class<? extends TileEntity>>> list)
{
list.add(new Pair<String, Class<? extends TileEntity>>("DCTileSteamFan", TileEntitySteamFan.class));
list.add(new Pair<String, Class<? extends TileEntity>>("DCTileSteamPiston", TileEntitySteamPiston.class));
list.add(new Pair<String, Class<? extends TileEntity>>("DCTileSteamGen", TileEntitySteamGen.class));
}
@Override
@SideOnly(Side.CLIENT)
public void getClientTileEntityRenderers(List<Pair<Class<? extends TileEntity>, TileEntitySpecialRenderer>> list)
{
list.add(new Pair(TileEntitySteamPiston.class, new RenderSteamGen()));
list.add(new Pair(TileEntitySteamFan.class, new RenderSteamGen()));
list.add(new Pair(TileEntitySteamGen.class, new RenderSteamGen()));
}
@Override
public void loadExtraConfigs(Configuration config)
{
super.loadExtraConfigs(config);
}
/** Called when the block is right clicked by the player */
@Override
public boolean onMachineActivated(World par1World, int x, int y, int z, EntityPlayer par5EntityPlayer, int side, float hitX, float hitY, float hitZ)
{
return true;
}
@Override
public boolean isOpaqueCube()
{
return false;
}
@Override
public boolean renderAsNormalBlock()
{
return false;
}
@Override
public int getRenderType()
{
return BlockRenderingHandler.BLOCK_RENDER_ID;
}
@Override
public TileEntity createTileEntity(World world, int metadata)
{
switch (metadata / 4)
{
case 0:
return new TileEntitySteamFan();
case 1:
return new TileEntitySteamPiston();
case 2:
return new TileEntitySteamGen();
case 3:
return new TileEntitySteamGen();
}
return super.createTileEntity(world, metadata);
}
@Override
public void getSubBlocks(int par1, CreativeTabs par2CreativeTabs, List par3List)
{
par3List.add(new ItemStack(par1, 1, 0));
par3List.add(new ItemStack(par1, 1, 8));
par3List.add(new ItemStack(par1, 1, 12));
}
@Override
public int damageDropped(int metadata)
{
return metadata / 4;
}
@Override
public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z)
{
return new ItemStack(this, 1, (world.getBlockMetadata(x, y, z) / 4) * 4);
}
}

10
src/main/java/resonantinduction/old/mechanics/generator/steam/TileEntitySteamFan.java
View file

@ -1,10 +0,0 @@
package resonantinduction.old.mechanics.generator.steam;
public class TileEntitySteamFan extends TileEntitySteamPiston
{
@Override
protected void updateAnimation()
{
}
}

130
src/main/java/resonantinduction/old/mechanics/generator/steam/TileEntitySteamGen.java
View file

@ -1,130 +0,0 @@
package resonantinduction.old.mechanics.generator.steam;
import resonantinduction.old.lib.prefab.TileEntityMachine;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidContainerRegistry;
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.FluidTank;
import net.minecraftforge.fluids.FluidTankInfo;
import net.minecraftforge.fluids.IFluidHandler;
/**
* Simple steam gen designed to burn items to create steam to power a steam device directly above
* it. Doesn't actually make steam fluid but rather simple functions. The machines above it will
* need to call to this machines and do a check for steam. If this machines is creating steam then
* the machine above it should function
*
* @author DarkGuardsman
*/
public class TileEntitySteamGen extends TileEntityMachine implements IFluidHandler
{
/**
* The number of ticks that a fresh copy of the currently-burning item would keep the furnace
* burning for
*/
public int itemCookTime = 0;
protected final int HEAT_TIME = 100;
protected int heatTicks = 0;
protected boolean steamMachineConnected = false, isHeated = false, creatingSteam = false;
protected FluidTank tank = new FluidTank(2 * FluidContainerRegistry.BUCKET_VOLUME);
@Override
public void updateEntity()
{
super.updateEntity();
this.creatingSteam = false;
if (itemCookTime < 10)
{
this.consumeFuel();
if (itemCookTime <= 0)
{
if (heatTicks > 0)
heatTicks--;
}
}
else if (this.heatTicks < HEAT_TIME)
{
heatTicks++;
}
if (this.isFunctioning())
{
if (this.tank != null && this.tank.getFluid() != null && this.tank.getFluidAmount() > 1 && this.tank.getFluid().isFluidEqual(new FluidStack(FluidRegistry.WATER, 1000)))
{
this.tank.drain(1, true);
this.creatingSteam = true;
}
else
{
// TODO start heating up machine and blow it up if left without water for too long
this.tank.fill(new FluidStack(FluidRegistry.WATER, 1000), true);
}
}
}
/** Called when the generator is running low on energy and needs to burn more fuel to keep going */
public void consumeFuel()
{
// TODO consume an item to keep us running
itemCookTime += 20;
}
/** Is the machines running and making steam */
public boolean isCreatingSteam()
{
return creatingSteam;
}
@Override
public boolean canFunction()
{
TileEntity ent = this.worldObj.getBlockTileEntity(xCoord, yCoord + 1, zCoord);
return super.canFunction() && ent instanceof TileEntitySteamPiston && this.itemCookTime > 0 && this.isHeated;
}
@Override
public int fill(ForgeDirection from, FluidStack resource, boolean doFill)
{
if (resource != null && resource.getFluid().equals(FluidRegistry.WATER))
{
this.tank.fill(resource, doFill);
}
return 0;
}
@Override
public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain)
{
return null;
}
@Override
public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain)
{
return null;
}
@Override
public boolean canFill(ForgeDirection from, Fluid fluid)
{
return fluid != null && fluid.equals(FluidRegistry.WATER);
}
@Override
public boolean canDrain(ForgeDirection from, Fluid fluid)
{
return false;
}
@Override
public FluidTankInfo[] getTankInfo(ForgeDirection from)
{
return new FluidTankInfo[] { this.tank.getInfo() };
}
}

70
src/main/java/resonantinduction/old/mechanics/generator/steam/TileEntitySteamPiston.java
View file

@ -1,70 +0,0 @@
package resonantinduction.old.mechanics.generator.steam;
import java.util.EnumSet;
import resonantinduction.old.lib.prefab.TileEntityEnergyMachine;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.ForgeDirection;
public class TileEntitySteamPiston extends TileEntityEnergyMachine
{
protected float wattPerSteam = 32.0f;
protected float maxWattOutput = 500f;
protected float maxSteamInput = 50f;
protected float wattsOut = 0;
protected int heatUpTime = 100;
protected int heatTicks = 0;
public TileEntitySteamPiston()
{
super(0, 0);
}
@Override
public void updateEntity()
{
super.updateEntity();
if (this.isFunctioning())
{
if (heatTicks < heatUpTime)
{
heatTicks++;
}
this.wattsOut = this.maxWattOutput * (heatTicks / heatUpTime);
}
else
{
if (heatTicks > 0)
{
heatTicks--;
}
}
}
@Override
public boolean canFunction()
{
TileEntity ent = this.worldObj.getBlockTileEntity(xCoord, yCoord - 1, zCoord);
return super.canFunction() && ent instanceof TileEntitySteamGen && ((TileEntitySteamGen) ent).isCreatingSteam();
}
protected void updateAnimation()
{
}
@Override
public EnumSet<ForgeDirection> getInputDirections()
{
return EnumSet.noneOf(ForgeDirection.class);
}
@Override
public EnumSet<ForgeDirection> getOutputDirections()
{
return EnumSet.allOf(ForgeDirection.class);
}
}

40
src/main/java/resonantinduction/old/mechanics/machine/mining/BlockApertureExcavator.java
View file

@ -1,22 +1,24 @@
package resonantinduction.old.mechanics.machine.mining;
import java.util.List;
import java.util.Set;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import resonantinduction.core.Settings;
import universalelectricity.api.UniversalElectricity;
import calclavia.lib.prefab.block.BlockMachine;
import net.minecraftforge.common.Configuration;
import resonantinduction.core.prefab.block.BlockMachine;
import resonantinduction.old.lib.IExtraInfo.IExtraBlockInfo;
import com.builtbroken.common.Pair;
/** @author Archadia */
public class BlockApertureExcavator extends BlockMachine
public class BlockApertureExcavator extends BlockMachine implements IExtraBlockInfo
{
public BlockApertureExcavator()
{
super(Settings.CONFIGURATION, "Machine_ApertureExcavator", UniversalElectricity.machine);
super("Machine_ApertureExcavator");
}
@Override
@ -30,4 +32,32 @@ public class BlockApertureExcavator extends BlockMachine
{
list.add(new Pair<String, Class<? extends TileEntity>>("TileApertureExcavator", TileApertureExcavator.class));
}
@Override
public boolean hasExtraConfigs()
{
// TODO Auto-generated method stub
return false;
}
@Override
public void loadExtraConfigs(Configuration config)
{
// TODO Auto-generated method stub
}
@Override
public void loadOreNames()
{
// TODO Auto-generated method stub
}
@Override
public void getClientTileEntityRenderers(List<Pair<Class<? extends TileEntity>, TileEntitySpecialRenderer>> list)
{
// TODO Auto-generated method stub
}
}

40
src/main/java/resonantinduction/old/mechanics/machine/mining/BlockFracker.java
View file

@ -1,23 +1,25 @@
package resonantinduction.old.mechanics.machine.mining;
import java.util.List;
import java.util.Set;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import resonantinduction.core.Settings;
import universalelectricity.api.UniversalElectricity;
import calclavia.lib.prefab.block.BlockMachine;
import net.minecraftforge.common.Configuration;
import resonantinduction.core.prefab.block.BlockMachine;
import resonantinduction.old.lib.IExtraInfo.IExtraBlockInfo;
import com.builtbroken.common.Pair;
/** @author Archadia */
public class BlockFracker extends BlockMachine
public class BlockFracker extends BlockMachine implements IExtraBlockInfo
{
public BlockFracker()
{
super(Settings.CONFIGURATION, "Machine_Fracker", UniversalElectricity.machine);
super("Machine_Fracker");
}
@Override
@ -41,4 +43,32 @@ public class BlockFracker extends BlockMachine
{
list.add(new Pair<String, Class<? extends TileEntity>>("TileFracker", TileFracker.class));
}
@Override
public boolean hasExtraConfigs()
{
// TODO Auto-generated method stub
return false;
}
@Override
public void loadExtraConfigs(Configuration config)
{
// TODO Auto-generated method stub
}
@Override
public void loadOreNames()
{
// TODO Auto-generated method stub
}
@Override
public void getClientTileEntityRenderers(List<Pair<Class<? extends TileEntity>, TileEntitySpecialRenderer>> list)
{
// TODO Auto-generated method stub
}
}

39
src/main/java/resonantinduction/old/mechanics/machine/mining/BlockFrackingPipe.java
View file

@ -1,24 +1,25 @@
package resonantinduction.old.mechanics.machine.mining;
import java.util.List;
import java.util.Set;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import resonantinduction.core.Settings;
import net.minecraftforge.common.Configuration;
import resonantinduction.core.prefab.block.BlockMachine;
import resonantinduction.old.client.render.BlockRenderHelper;
import calclavia.lib.prefab.block.BlockMachine;
import resonantinduction.old.lib.IExtraInfo.IExtraBlockInfo;
import com.builtbroken.common.Pair;
/** @author Archadia */
public class BlockFrackingPipe extends BlockMachine
public class BlockFrackingPipe extends BlockMachine implements IExtraBlockInfo
{
public BlockFrackingPipe()
{
super(Settings.CONFIGURATION, "Fracking_Pipe", Material.wood);
super("Fracking_Pipe");
}
@Override
@ -50,4 +51,32 @@ public class BlockFrackingPipe extends BlockMachine
{
return new TileFrackingPipe();
}
@Override
public boolean hasExtraConfigs()
{
// TODO Auto-generated method stub
return false;
}
@Override
public void loadExtraConfigs(Configuration config)
{
// TODO Auto-generated method stub
}
@Override
public void loadOreNames()
{
// TODO Auto-generated method stub
}
@Override
public void getTileEntities(int blockID, Set<Pair<String, Class<? extends TileEntity>>> list)
{
// TODO Auto-generated method stub
}
}

62
src/main/java/resonantinduction/old/mechanics/machine/mining/BlockLaserDrill.java
View file

@ -1,62 +0,0 @@
package resonantinduction.old.mechanics.machine.mining;
import java.util.Set;
import net.minecraft.block.material.Material;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import resonantinduction.core.Settings;
import calclavia.lib.prefab.block.BlockMachine;
import com.builtbroken.common.Pair;
/** @author Archadia */
public class BlockLaserDrill extends BlockMachine
{
public BlockLaserDrill()
{
super(Settings.CONFIGURATION, "Machine_LaserDrill", Material.iron);
}
@Override
public TileEntity createTileEntity(World world, int metadata)
{
return new TileLaserDrill();
}
@Override
public void getTileEntities(int blockID, Set<Pair<String, Class<? extends TileEntity>>> list)
{
list.add(new Pair<String, Class<? extends TileEntity>>("TileLaserDrill", TileLaserDrill.class));
}
@Override
public boolean onUseWrench(World world, int x, int y, int z, EntityPlayer entityPlayer, int side, float hitX, float hitY, float hitZ)
{
if (!world.isRemote)
{
TileEntity ent = world.getBlockTileEntity(x, y, z);
if (ent instanceof TileMiningLaser)
{
((TileMiningLaser) ent).rotateYaw(-10);
}
}
return false;
}
@Override
public boolean onSneakUseWrench(World world, int x, int y, int z, EntityPlayer entityPlayer, int side, float hitX, float hitY, float hitZ)
{
if (!world.isRemote)
{
TileEntity ent = world.getBlockTileEntity(x, y, z);
if (ent instanceof TileMiningLaser)
{
((TileMiningLaser) ent).rotateYaw(10);
}
}
return false;
}
}

86
src/main/java/resonantinduction/old/mechanics/machine/mining/BlockMiningLaser.java
View file

@ -1,86 +0,0 @@
package resonantinduction.old.mechanics.machine.mining;
import java.util.Set;
import net.minecraft.block.material.Material;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import resonantinduction.core.Settings;
import resonantinduction.old.client.render.BlockRenderHelper;
import calclavia.lib.prefab.block.BlockMachine;
import com.builtbroken.common.Pair;
/**
* Mining laser Prototype mainly used for crafting but can be used in the same way as Excavator.
* Creates four lasers from the side it is pointing in to mine away blocks
*
* @author DarkGuardsman
*/
public class BlockMiningLaser extends BlockMachine
{
public BlockMiningLaser()
{
super(Settings.CONFIGURATION, "LaserMiner", Material.iron);
}
@Override
public TileEntity createTileEntity(World world, int metadata)
{
return new TileMiningLaser();
}
@Override
public void getTileEntities(int blockID, Set<Pair<String, Class<? extends TileEntity>>> list)
{
list.add(new Pair<String, Class<? extends TileEntity>>("TileMiningLaser", TileMiningLaser.class));
}
@Override
public boolean onUseWrench(World world, int x, int y, int z, EntityPlayer entityPlayer, int side, float hitX, float hitY, float hitZ)
{
if (!world.isRemote)
{
TileEntity ent = world.getBlockTileEntity(x, y, z);
if (ent instanceof TileMiningLaser)
{
((TileMiningLaser) ent).rotateYaw(-10);
}
}
return false;
}
@Override
public boolean onSneakUseWrench(World world, int x, int y, int z, EntityPlayer entityPlayer, int side, float hitX, float hitY, float hitZ)
{
if (!world.isRemote)
{
TileEntity ent = world.getBlockTileEntity(x, y, z);
if (ent instanceof TileMiningLaser)
{
((TileMiningLaser) ent).rotateYaw(10);
}
}
return false;
}
@Override
public int getRenderType()
{
return BlockRenderHelper.instance.getRenderId();
}
@Override
public boolean isOpaqueCube()
{
return false;
}
@Override
public boolean renderAsNormalBlock()
{
return false;
}
}

Some files were not shown because too many files have changed in this diff Show more