Anvilcraft/buildcraft
3
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Oops that wasn't supposed to make it in

Browse source
This commit is contained in:
CovertJaguar 2013-08-07 02:01:46 -07:00
parent 9472dea734
commit d6b8fd6f15
4 changed files with 6 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
common/buildcraft/BuildCraftSilicon.java
View file

@ -22,7 +22,6 @@ import buildcraft.silicon.SiliconProxy;
import buildcraft.silicon.TileAdvancedCraftingTable;
import buildcraft.silicon.TileAssemblyTable;
import buildcraft.silicon.TileLaser;
import buildcraft.silicon.TileLaserStandard;
import buildcraft.silicon.network.PacketHandlerSilicon;
import cpw.mods.fml.common.Mod;
import cpw.mods.fml.common.Mod.EventHandler;
@ -75,7 +74,7 @@ public class BuildCraftSilicon {
@EventHandler
public void init(FMLInitializationEvent evt) {
NetworkRegistry.instance().registerGuiHandler(instance, new GuiHandler());
CoreProxy.proxy.registerTileEntity(TileLaserStandard.class, "net.minecraft.src.buildcraft.factory.TileLaser");
CoreProxy.proxy.registerTileEntity(TileLaser.class, "net.minecraft.src.buildcraft.factory.TileLaser");
CoreProxy.proxy.registerTileEntity(TileAssemblyTable.class, "net.minecraft.src.buildcraft.factory.TileAssemblyTable");
CoreProxy.proxy.registerTileEntity(TileAdvancedCraftingTable.class, "net.minecraft.src.buildcraft.factory.TileAssemblyAdvancedWorkbench");

2
common/buildcraft/silicon/BlockLaser.java
View file

@ -52,7 +52,7 @@ public class BlockLaser extends BlockContainer {
@Override
public TileEntity createTileEntity(World world, int meta) {
return new TileLaserStandard();
return new TileLaser();
}
@Override

6
common/buildcraft/silicon/TileLaser.java
View file

@ -27,7 +27,7 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.ForgeDirection;
public abstract class TileLaser extends TileBuildCraft implements IPowerReceptor, IActionReceptor, IMachine {
public class TileLaser extends TileBuildCraft implements IPowerReceptor, IActionReceptor, IMachine {
private EntityEnergyLaser laser = null;
private final SafeTimeTracker laserTickTracker = new SafeTimeTracker();
@ -102,7 +102,9 @@ public abstract class TileLaser extends TileBuildCraft implements IPowerReceptor
sendNetworkUpdate();
}
protected abstract float getMaxPowerSent();
protected float getMaxPowerSent(){
return 4;
}
protected void onPowerSent(float power) {
}

21
common/buildcraft/silicon/TileLaserStandard.java
View file

@ -1,21 +0,0 @@
/*
* Copyright (c) SpaceToad, 2011-2012
* http://www.mod-buildcraft.com
*
* BuildCraft is distributed under the terms of the Minecraft Mod Public
* License 1.0, or MMPL. Please check the contents of the license located in
* http://www.mod-buildcraft.com/MMPL-1.0.txt
*/
package buildcraft.silicon;
/**
*
* @author CovertJaguar <http://www.railcraft.info/>
*/
public class TileLaserStandard extends TileLaser {
@Override
protected float getMaxPowerSent() {
return 8;
}
}