File change from src/minecraft/dark to src/dark

Long over due
This commit is contained in:
Robert 2013-11-09 11:25:43 -05:00
parent c7d217a062
commit e3228669a1
119 changed files with 491 additions and 2 deletions

View file

@ -1,9 +1,11 @@
package dark.assembly.common.machine;
import net.minecraft.block.material.Material;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import net.minecraftforge.common.Configuration;
import dark.assembly.common.AssemblyLine;
import dark.core.common.DMCreativeTab;
import dark.core.prefab.machine.BlockMachine;
@ -17,6 +19,12 @@ public class BlockAssembly extends BlockMachine
super(buildBuildData.setCreativeTab(DMCreativeTab.tabAutomation).setConfigProvider(AssemblyLine.CONFIGURATION));
}
public BlockAssembly(String blockName, Material material)
{
super(AssemblyLine.CONFIGURATION, blockName, material);
this.setCreativeTab(DMCreativeTab.tabAutomation);
}
@Override
public boolean onMachineActivated(World world, int x, int y, int z, EntityPlayer entityPlayer, int side, float hitX, float hitY, float hitZ)
{

View file

@ -12,7 +12,7 @@ import universalelectricity.core.block.IElectricalStorage;
import universalelectricity.core.vector.Vector3;
import dark.api.parts.INetworkEnergyPart;
import dark.api.parts.INetworkPart;
import dark.core.prefab.tilenetwork.NetworkHandler;
import dark.core.prefab.tilenetwork.NetworkUpdateHandler;
import dark.core.prefab.tilenetwork.NetworkSharedPower;
public class NetworkAssembly extends NetworkSharedPower
@ -41,7 +41,7 @@ public class NetworkAssembly extends NetworkSharedPower
public float minDemand = 0;
static
{
NetworkHandler.registerNetworkClass("AssemblyNet", NetworkAssembly.class);
NetworkUpdateHandler.registerNetworkClass("AssemblyNet", NetworkAssembly.class);
}
public NetworkAssembly(INetworkPart... parts)

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