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

Reactivated robots, for #1732.

Browse source
This commit is contained in:
SpaceToad 2014-05-07 19:48:39 +02:00
parent 2bbe4b132b
commit 83b526592d
4 changed files with 19 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/buildcraft/BuildCraftBuilders.java
View file

@ -428,7 +428,7 @@ public class BuildCraftBuilders extends BuildCraftMod {
libraryBlock = new BlockBlueprintLibrary(); libraryBlock = new BlockBlueprintLibrary();
CoreProxy.proxy.registerBlock(libraryBlock.setBlockName("libraryBlock")); CoreProxy.proxy.registerBlock(libraryBlock.setBlockName("libraryBlock"));
if (!BuildCraftCore.NEXTGEN_PREALPHA) { if (!BuildCraftCore.NONRELEASED_BLOCKS) {
urbanistBlock = new BlockUrbanist (); urbanistBlock = new BlockUrbanist ();
CoreProxy.proxy.registerBlock(urbanistBlock.setBlockName("urbanistBlock")); CoreProxy.proxy.registerBlock(urbanistBlock.setBlockName("urbanistBlock"));
CoreProxy.proxy.registerTileEntity(TileUrbanist.class, "net.minecraft.src.builders.TileUrbanist"); CoreProxy.proxy.registerTileEntity(TileUrbanist.class, "net.minecraft.src.builders.TileUrbanist");

24
common/buildcraft/BuildCraftCore.java
View file

@ -102,7 +102,7 @@ import buildcraft.core.utils.CraftingHandler;
@Mod(name = "BuildCraft", version = Version.VERSION, useMetadata = false, modid = "BuildCraft|Core", acceptedMinecraftVersions = "[1.7.2,1.8)", dependencies = "required-after:Forge@[10.12.0.1024,)") @Mod(name = "BuildCraft", version = Version.VERSION, useMetadata = false, modid = "BuildCraft|Core", acceptedMinecraftVersions = "[1.7.2,1.8)", dependencies = "required-after:Forge@[10.12.0.1024,)")
public class BuildCraftCore extends BuildCraftMod { public class BuildCraftCore extends BuildCraftMod {
public static final boolean NEXTGEN_PREALPHA = true; public static final boolean NONRELEASED_BLOCKS = true;
public static enum RenderMode { public static enum RenderMode {
Full, NoDynamic Full, NoDynamic
@ -283,21 +283,21 @@ public class BuildCraftCore extends BuildCraftMod {
CoreProxy.proxy.registerItem(diamondGearItem); CoreProxy.proxy.registerItem(diamondGearItem);
OreDictionary.registerOre("gearDiamond", new ItemStack(diamondGearItem)); OreDictionary.registerOre("gearDiamond", new ItemStack(diamondGearItem));
if (!BuildCraftCore.NEXTGEN_PREALPHA) { if (!BuildCraftCore.NONRELEASED_BLOCKS) {
redstoneCrystal = (new ItemBuildCraft()).setUnlocalizedName("redstoneCrystal"); redstoneCrystal = (new ItemBuildCraft()).setUnlocalizedName("redstoneCrystal");
CoreProxy.proxy.registerItem(redstoneCrystal); CoreProxy.proxy.registerItem(redstoneCrystal);
OreDictionary.registerOre("redstoneCrystal", new ItemStack(redstoneCrystal)); OreDictionary.registerOre("redstoneCrystal", new ItemStack(redstoneCrystal));
robotBaseItem = new ItemRobot(EntityRobot.class).setUnlocalizedName("robotBase");
CoreProxy.proxy.registerItem(robotBaseItem);
robotPickerItem = new ItemRobot(EntityRobotPicker.class).setUnlocalizedName("robotPicker");
CoreProxy.proxy.registerItem(robotPickerItem);
robotBuilderItem = new ItemRobot(EntityRobotBuilder.class).setUnlocalizedName("robotBuilder");
CoreProxy.proxy.registerItem(robotBuilderItem);
} }
robotBaseItem = new ItemRobot(EntityRobot.class).setUnlocalizedName("robotBase");
CoreProxy.proxy.registerItem(robotBaseItem);
robotPickerItem = new ItemRobot(EntityRobotPicker.class).setUnlocalizedName("robotPicker");
CoreProxy.proxy.registerItem(robotPickerItem);
robotBuilderItem = new ItemRobot(EntityRobotBuilder.class).setUnlocalizedName("robotBuilder");
CoreProxy.proxy.registerItem(robotBuilderItem);
MinecraftForge.EVENT_BUS.register(this); MinecraftForge.EVENT_BUS.register(this);
MinecraftForge.EVENT_BUS.register(new BlockHighlightHandler()); MinecraftForge.EVENT_BUS.register(new BlockHighlightHandler());
} finally { } finally {
@ -401,7 +401,7 @@ public class BuildCraftCore extends BuildCraftMod {
// it happens to be very expensive at run time, so we need some way // it happens to be very expensive at run time, so we need some way
// to operate it only when releval (e.g. in the cycle following a // to operate it only when releval (e.g. in the cycle following a
// click request). // click request).
if (NEXTGEN_PREALPHA) { if (NONRELEASED_BLOCKS) {
return; return;
} }

4
common/buildcraft/BuildCraftEnergy.java
View file

@ -242,7 +242,7 @@ public class BuildCraftEnergy extends BuildCraftMod {
FluidContainerRegistry.registerFluidContainer(FluidRegistry.getFluidStack("fuel", FluidContainerRegistry.BUCKET_VOLUME), new ItemStack(bucketFuel), new ItemStack(Items.bucket)); FluidContainerRegistry.registerFluidContainer(FluidRegistry.getFluidStack("fuel", FluidContainerRegistry.BUCKET_VOLUME), new ItemStack(bucketFuel), new ItemStack(Items.bucket));
} }
if (!BuildCraftCore.NEXTGEN_PREALPHA) { if (!BuildCraftCore.NONRELEASED_BLOCKS) {
if (blockRedPlasma != null) { if (blockRedPlasma != null) {
bucketRedPlasma = new ItemBucketBuildcraft(blockRedPlasma); bucketRedPlasma = new ItemBucketBuildcraft(blockRedPlasma);
bucketRedPlasma.setUnlocalizedName("bucketRedPlasma").setContainerItem(Items.bucket); bucketRedPlasma.setUnlocalizedName("bucketRedPlasma").setContainerItem(Items.bucket);
@ -269,7 +269,7 @@ public class BuildCraftEnergy extends BuildCraftMod {
// Receiver / emitter // Receiver / emitter
if (!BuildCraftCore.NEXTGEN_PREALPHA) { if (!BuildCraftCore.NONRELEASED_BLOCKS) {
emitterBlock = new BlockEnergyEmitter(); emitterBlock = new BlockEnergyEmitter();
CoreProxy.proxy.registerBlock(emitterBlock.setBlockName("energyEmitterBlock")); CoreProxy.proxy.registerBlock(emitterBlock.setBlockName("energyEmitterBlock"));
CoreProxy.proxy.registerTileEntity(TileEnergyEmitter.class, "net.minecraft.src.builders.TileEnergyEmitter"); CoreProxy.proxy.registerTileEntity(TileEnergyEmitter.class, "net.minecraft.src.builders.TileEnergyEmitter");

11
common/buildcraft/BuildCraftTransport.java
View file

@ -356,7 +356,7 @@ public class BuildCraftTransport extends BuildCraftMod {
pipePowerGold = buildPipe(PipePowerGold.class, "Golden Kinesis Pipe", CreativeTabBuildCraft.PIPES, Items.redstone, pipeItemsGold); pipePowerGold = buildPipe(PipePowerGold.class, "Golden Kinesis Pipe", CreativeTabBuildCraft.PIPES, Items.redstone, pipeItemsGold);
pipePowerDiamond = buildPipe(PipePowerDiamond.class, "Diamond Kinesis Pipe", CreativeTabBuildCraft.PIPES, Items.redstone, pipeItemsDiamond); pipePowerDiamond = buildPipe(PipePowerDiamond.class, "Diamond Kinesis Pipe", CreativeTabBuildCraft.PIPES, Items.redstone, pipeItemsDiamond);
if (!BuildCraftCore.NEXTGEN_PREALPHA) { if (!BuildCraftCore.NONRELEASED_BLOCKS) {
pipePowerHeat = buildPipe(PipePowerHeat.class, "Heat Kinesis Pipe", CreativeTabBuildCraft.PIPES, Blocks.furnace, pipeItemsDiamond); pipePowerHeat = buildPipe(PipePowerHeat.class, "Heat Kinesis Pipe", CreativeTabBuildCraft.PIPES, Blocks.furnace, pipeItemsDiamond);
} }
@ -378,12 +378,9 @@ public class BuildCraftTransport extends BuildCraftMod {
plugItem.setUnlocalizedName("pipePlug"); plugItem.setUnlocalizedName("pipePlug");
CoreProxy.proxy.registerItem(plugItem); CoreProxy.proxy.registerItem(plugItem);
if (!BuildCraftCore.NEXTGEN_PREALPHA) { robotStationItem = new ItemRobotStation();
robotStationItem = new ItemRobotStation(); robotStationItem.setUnlocalizedName("robotStation");
robotStationItem.setUnlocalizedName("robotStation"); CoreProxy.proxy.registerItem(robotStationItem);
CoreProxy.proxy.registerItem(robotStationItem);
}
for (PipeContents kind : PipeContents.values()) { for (PipeContents kind : PipeContents.values()) {
triggerPipe[kind.ordinal()] = new TriggerPipeContents(kind); triggerPipe[kind.ordinal()] = new TriggerPipeContents(kind);