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

Emerald Kinesis Pipe

Browse source
This commit is contained in:
asiekierka 2014-09-04 13:07:37 +02:00
parent fd672003fa
commit 3f81bb3262
8 changed files with 61 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
buildcraft_resources/assets/buildcraft/lang/en_US.lang
View file

@ -207,6 +207,7 @@ item.PipePowerQuartz.name=Quartz Kinesis Pipe
item.PipePowerIron.name=Iron Kinesis Pipe
item.PipePowerGold.name=Golden Kinesis Pipe
item.PipePowerDiamond.name=Diamond Kinesis Pipe
item.PipePowerEmerald.name=Emerald Kinesis Pipe
item.PipeItemsStripes.name=Stripes Transport Pipe
item.PipeStructureCobblestone.name=Cobblestone Structure Pipe
item.PipeItemsVoid.name=Void Transport Pipe
@ -298,6 +299,7 @@ tip.PipeItemsVoid=Destroys items
tip.PipeItemsWood=Extraction pipe
tip.PipeItemsEmzuli=Gate controlled extraction pipe
tip.PipePowerWood=Power Input Pipe
tip.PipePowerEmerald=Power Input Pipe
tip.PipePowerIron=Selectable Limiter Pipe
tip.PipeStructureCobblestone=Support pipe

BIN
buildcraft_resources/assets/buildcraft/textures/blocks/pipePowerEmerald_standard.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 205 B

18
common/buildcraft/BuildCraftTransport.java
View file

@ -17,7 +17,6 @@ import net.minecraft.item.Item;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
import cpw.mods.fml.common.Mod;
import cpw.mods.fml.common.event.FMLInitializationEvent;
import cpw.mods.fml.common.event.FMLInterModComms;
@ -26,12 +25,10 @@ import cpw.mods.fml.common.event.FMLPostInitializationEvent;
import cpw.mods.fml.common.event.FMLPreInitializationEvent;
import cpw.mods.fml.common.network.NetworkRegistry;
import cpw.mods.fml.common.registry.GameRegistry;
import net.minecraftforge.common.config.Configuration;
import net.minecraftforge.common.config.Property;
import net.minecraftforge.common.util.ForgeDirection;
import net.minecraftforge.oredict.RecipeSorter;
import buildcraft.api.blueprints.SchematicRegistry;
import buildcraft.api.core.EnumColor;
import buildcraft.api.core.IIconProvider;
@ -101,6 +98,7 @@ import buildcraft.transport.pipes.PipeItemsVoid;
import buildcraft.transport.pipes.PipeItemsWood;
import buildcraft.transport.pipes.PipePowerCobblestone;
import buildcraft.transport.pipes.PipePowerDiamond;
import buildcraft.transport.pipes.PipePowerEmerald;
import buildcraft.transport.pipes.PipePowerGold;
import buildcraft.transport.pipes.PipePowerIron;
import buildcraft.transport.pipes.PipePowerIron.PowerMode;
@ -176,7 +174,8 @@ public class BuildCraftTransport extends BuildCraftMod {
public static Item pipePowerIron;
public static Item pipePowerGold;
public static Item pipePowerDiamond;
public static Item pipePowerEmerald;
public static int groupItemsTrigger;
public static String[] facadeBlacklist;
@ -231,6 +230,7 @@ public class BuildCraftTransport extends BuildCraftMod {
public static TechnoSimpleItem technoPipePowerIron = new TechnoSimpleItem();
public static TechnoSimpleItem technoPipePowerGold = new TechnoSimpleItem();
public static TechnoSimpleItem technoPipePowerDiamond = new TechnoSimpleItem();
public static TechnoSimpleItem technoPipePowerEmerald = new TechnoSimpleItem();
public static TechnoStatement technoTriggerPipe = new TechnoStatement();
public static TechnoStatement technoTriggerPipeWireActive = new TechnoStatement();
@ -410,7 +410,8 @@ public class BuildCraftTransport extends BuildCraftMod {
pipePowerIron = buildPipe(PipePowerIron.class, "Iron Kinesis Pipe", CreativeTabBuildCraft.PIPES, Items.redstone, pipeItemsIron);
pipePowerGold = buildPipe(PipePowerGold.class, "Golden Kinesis Pipe", CreativeTabBuildCraft.PIPES, Items.redstone, pipeItemsGold);
pipePowerDiamond = buildPipe(PipePowerDiamond.class, "Diamond Kinesis Pipe", CreativeTabBuildCraft.PIPES, Items.redstone, pipeItemsDiamond);
pipePowerEmerald = buildPipe(PipePowerEmerald.class, "Emerald Kinesis Pipe", CreativeTabBuildCraft.PIPES, Items.redstone, pipeItemsEmerald);
pipeStructureCobblestone = buildPipe(PipeStructureCobblestone.class, "Cobblestone Structure Pipe", CreativeTabBuildCraft.PIPES, Blocks.gravel, pipeItemsCobblestone);
pipeWire = new ItemPipeWire();
@ -717,6 +718,13 @@ public class BuildCraftTransport extends BuildCraftMod {
technoPipeItemsDiamond,
technoPipePowerWood);
technoPipePowerEmerald.initialize(
Tier.GoldenGear,
pipePowerEmerald,
new ItemStack(BuildCraftCore.goldGearItem, 5),
technoPipeItemsEmerald,
technoPipePowerWood);
// Statements
technoTriggerPipe.initialize(

1
common/buildcraft/transport/PipeIconProvider.java
View file

@ -104,6 +104,7 @@ public class PipeIconProvider implements IIconProvider {
PipePowerStone("pipePowerStone"),
PipePowerCobblestone("pipePowerCobblestone"),
PipePowerWood_Standard("pipePowerWood_standard"),
PipePowerEmerald_Standard("pipePowerEmerald_standard"),
//
PipePowerIronM2("pipePowerIronM2"),
PipePowerIronM4("pipePowerIronM4"),

4
common/buildcraft/transport/PipeTransportPower.java
View file

@ -29,6 +29,7 @@ import buildcraft.core.DefaultProps;
import buildcraft.transport.network.PacketPowerUpdate;
import buildcraft.transport.pipes.PipePowerCobblestone;
import buildcraft.transport.pipes.PipePowerDiamond;
import buildcraft.transport.pipes.PipePowerEmerald;
import buildcraft.transport.pipes.PipePowerGold;
import buildcraft.transport.pipes.PipePowerIron;
import buildcraft.transport.pipes.PipePowerQuartz;
@ -293,7 +294,7 @@ public class PipeTransportPower extends PipeTransport {
}
// Sum the amount of energy requested on each side
int[] transferQuery = new int[6];
for (int i = 0; i < 6; ++i) {
@ -543,6 +544,7 @@ public class PipeTransportPower extends PipeTransport {
powerCapacities.put(PipePowerQuartz.class, 640);
powerCapacities.put(PipePowerIron.class, 1280);
powerCapacities.put(PipePowerGold.class, 2560);
powerCapacities.put(PipePowerEmerald.class, 2560);
powerCapacities.put(PipePowerDiamond.class, 10240);
}
}

1
common/buildcraft/transport/TransportProxyClient.java
View file

@ -71,6 +71,7 @@ public class TransportProxyClient extends TransportProxy {
MinecraftForgeClient.registerItemRenderer(BuildCraftTransport.pipePowerIron, pipeItemRenderer);
MinecraftForgeClient.registerItemRenderer(BuildCraftTransport.pipePowerGold, pipeItemRenderer);
MinecraftForgeClient.registerItemRenderer(BuildCraftTransport.pipePowerDiamond, pipeItemRenderer);
MinecraftForgeClient.registerItemRenderer(BuildCraftTransport.pipePowerEmerald, pipeItemRenderer);
MinecraftForgeClient.registerItemRenderer(BuildCraftTransport.pipeStructureCobblestone, pipeItemRenderer);
MinecraftForgeClient.registerItemRenderer(BuildCraftTransport.pipeItemsVoid, pipeItemRenderer);

39
common/buildcraft/transport/pipes/PipePowerEmerald.java Normal file
View file

@ -0,0 +1,39 @@
package buildcraft.transport.pipes;
import buildcraft.BuildCraftTransport;
import buildcraft.api.core.IIconProvider;
import buildcraft.core.RFBattery;
import buildcraft.transport.PipeIconProvider;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.item.Item;
import net.minecraftforge.common.util.ForgeDirection;
public class PipePowerEmerald extends PipePowerWood {
protected int standardIconIndex = PipeIconProvider.TYPE.PipePowerEmerald_Standard.ordinal();
protected int solidIconIndex = PipeIconProvider.TYPE.PipeAllEmerald_Solid.ordinal();
public PipePowerEmerald(Item item) {
super(item);
battery = new RFBattery(2560 * 50, 2560, 0);
transport.initFromPipe(this.getClass());
}
@Override
@SideOnly(Side.CLIENT)
public IIconProvider getIconProvider() {
return BuildCraftTransport.instance.pipeIconProvider;
}
@Override
public int getIconIndex(ForgeDirection direction) {
if (direction != ForgeDirection.UNKNOWN && powerSources[direction.ordinal()]) {
return solidIconIndex;
} else {
return standardIconIndex;
}
}
}

4
common/buildcraft/transport/pipes/PipePowerWood.java
View file

@ -36,16 +36,16 @@ public class PipePowerWood extends Pipe<PipeTransportPower> implements IPowerRec
protected int standardIconIndex = PipeIconProvider.TYPE.PipePowerWood_Standard.ordinal();
protected int solidIconIndex = PipeIconProvider.TYPE.PipeAllWood_Solid.ordinal();
protected RFBattery battery;
private boolean full;
private int requestedEnergy, sources;
private RFBattery battery;
private PowerHandler powerHandler;
public PipePowerWood(Item item) {
super(new PipeTransportPower(), item);
battery = new RFBattery(15000, PipeTransportPower.powerCapacities.get(this.getClass()), 0);
battery = new RFBattery(320 * 50, 320, 0);
powerHandler = new PowerHandler(this, Type.PIPE);
powerHandler.configure(0, 500, 1, 1500);