prepare experimental nextgen version
This commit is contained in:
parent
707e048eb8
commit
cc4a0eb7db
5 changed files with 43 additions and 28 deletions
|
@ -29,7 +29,7 @@ if (System.getenv().BUILD_NUMBER)
|
||||||
else
|
else
|
||||||
logger.lifecycle "SETTING BUILDNUMBER TO 0"
|
logger.lifecycle "SETTING BUILDNUMBER TO 0"
|
||||||
|
|
||||||
version = "5.0.2"
|
version = "6.0.0"
|
||||||
group= "com.mod-buildcraft"
|
group= "com.mod-buildcraft"
|
||||||
archivesBaseName = "buildcraft" // the name that all artifacts will use as a base. artifacts names follow this pattern: [baseName]-[appendix]-[version]-[classifier].[extension]
|
archivesBaseName = "buildcraft" // the name that all artifacts will use as a base. artifacts names follow this pattern: [baseName]-[appendix]-[version]-[classifier].[extension]
|
||||||
|
|
||||||
|
|
|
@ -271,9 +271,11 @@ 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) {
|
||||||
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");
|
||||||
|
}
|
||||||
|
|
||||||
GameRegistry.registerTileEntity(TileMarker.class, "Marker");
|
GameRegistry.registerTileEntity(TileMarker.class, "Marker");
|
||||||
GameRegistry.registerTileEntity(TileFiller.class, "Filler");
|
GameRegistry.registerTileEntity(TileFiller.class, "Filler");
|
||||||
|
|
|
@ -101,6 +101,8 @@ import cpw.mods.fml.relauncher.SideOnly;
|
||||||
|
|
||||||
@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 enum RenderMode {
|
public static enum RenderMode {
|
||||||
Full, NoDynamic
|
Full, NoDynamic
|
||||||
};
|
};
|
||||||
|
@ -263,6 +265,7 @@ public class BuildCraftCore extends BuildCraftMod {
|
||||||
CoreProxy.proxy.registerItem(redstoneCrystal);
|
CoreProxy.proxy.registerItem(redstoneCrystal);
|
||||||
OreDictionary.registerOre("redstoneCrystal", new ItemStack(redstoneCrystal));
|
OreDictionary.registerOre("redstoneCrystal", new ItemStack(redstoneCrystal));
|
||||||
|
|
||||||
|
if (!BuildCraftCore.NEXTGEN_PREALPHA) {
|
||||||
robotBaseItem = new ItemRobot(EntityRobot.class).setUnlocalizedName("robotBase");
|
robotBaseItem = new ItemRobot(EntityRobot.class).setUnlocalizedName("robotBase");
|
||||||
CoreProxy.proxy.registerItem(robotBaseItem);
|
CoreProxy.proxy.registerItem(robotBaseItem);
|
||||||
|
|
||||||
|
@ -271,6 +274,7 @@ public class BuildCraftCore extends BuildCraftMod {
|
||||||
|
|
||||||
robotBuilderItem = new ItemRobot(EntityRobotBuilder.class).setUnlocalizedName("robotBuilder");
|
robotBuilderItem = new ItemRobot(EntityRobotBuilder.class).setUnlocalizedName("robotBuilder");
|
||||||
CoreProxy.proxy.registerItem(robotBuilderItem);
|
CoreProxy.proxy.registerItem(robotBuilderItem);
|
||||||
|
}
|
||||||
|
|
||||||
MinecraftForge.EVENT_BUS.register(this);
|
MinecraftForge.EVENT_BUS.register(this);
|
||||||
} finally {
|
} finally {
|
||||||
|
|
|
@ -40,11 +40,11 @@ import buildcraft.energy.BlockBuildcraftFluid;
|
||||||
import buildcraft.energy.BlockEnergyEmitter;
|
import buildcraft.energy.BlockEnergyEmitter;
|
||||||
import buildcraft.energy.BlockEnergyReceiver;
|
import buildcraft.energy.BlockEnergyReceiver;
|
||||||
import buildcraft.energy.BlockEngine;
|
import buildcraft.energy.BlockEngine;
|
||||||
import buildcraft.energy.SchematicEngine;
|
|
||||||
import buildcraft.energy.EnergyProxy;
|
import buildcraft.energy.EnergyProxy;
|
||||||
import buildcraft.energy.GuiHandler;
|
import buildcraft.energy.GuiHandler;
|
||||||
import buildcraft.energy.ItemBucketBuildcraft;
|
import buildcraft.energy.ItemBucketBuildcraft;
|
||||||
import buildcraft.energy.ItemEngine;
|
import buildcraft.energy.ItemEngine;
|
||||||
|
import buildcraft.energy.SchematicEngine;
|
||||||
import buildcraft.energy.TileEnergyEmitter;
|
import buildcraft.energy.TileEnergyEmitter;
|
||||||
import buildcraft.energy.TileEnergyReceiver;
|
import buildcraft.energy.TileEnergyReceiver;
|
||||||
import buildcraft.energy.TileEngine.EnergyStage;
|
import buildcraft.energy.TileEngine.EnergyStage;
|
||||||
|
@ -206,6 +206,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 (blockRedPlasma != null) {
|
if (blockRedPlasma != null) {
|
||||||
bucketRedPlasma = new ItemBucketBuildcraft(blockRedPlasma, CreativeTabBuildCraft.TIER_4);
|
bucketRedPlasma = new ItemBucketBuildcraft(blockRedPlasma, CreativeTabBuildCraft.TIER_4);
|
||||||
bucketRedPlasma.setUnlocalizedName("bucketRedPlasma").setContainerItem(Items.bucket);
|
bucketRedPlasma.setUnlocalizedName("bucketRedPlasma").setContainerItem(Items.bucket);
|
||||||
|
@ -213,6 +214,7 @@ public class BuildCraftEnergy extends BuildCraftMod {
|
||||||
CoreProxy.proxy.registerItem(bucketRedPlasma);
|
CoreProxy.proxy.registerItem(bucketRedPlasma);
|
||||||
FluidContainerRegistry.registerFluidContainer(FluidRegistry.getFluidStack("redplasma", FluidContainerRegistry.BUCKET_VOLUME), new ItemStack(bucketRedPlasma), new ItemStack(Items.bucket));
|
FluidContainerRegistry.registerFluidContainer(FluidRegistry.getFluidStack("redplasma", FluidContainerRegistry.BUCKET_VOLUME), new ItemStack(bucketRedPlasma), new ItemStack(Items.bucket));
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// TODO: Are these still really necessary? If not, remove the
|
// TODO: Are these still really necessary? If not, remove the
|
||||||
// BucketHandler class as well.
|
// BucketHandler class as well.
|
||||||
|
@ -233,6 +235,7 @@ public class BuildCraftEnergy extends BuildCraftMod {
|
||||||
|
|
||||||
// Receiver / emitter
|
// Receiver / emitter
|
||||||
|
|
||||||
|
if (!BuildCraftCore.NEXTGEN_PREALPHA) {
|
||||||
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");
|
||||||
|
@ -240,6 +243,7 @@ public class BuildCraftEnergy extends BuildCraftMod {
|
||||||
receiverBlock = new BlockEnergyReceiver ();
|
receiverBlock = new BlockEnergyReceiver ();
|
||||||
CoreProxy.proxy.registerBlock(receiverBlock.setBlockName("energyReceiverBlock"));
|
CoreProxy.proxy.registerBlock(receiverBlock.setBlockName("energyReceiverBlock"));
|
||||||
CoreProxy.proxy.registerTileEntity(TileEnergyReceiver.class, "net.minecraft.src.builders.TileEnergyReceiver");
|
CoreProxy.proxy.registerTileEntity(TileEnergyReceiver.class, "net.minecraft.src.builders.TileEnergyReceiver");
|
||||||
|
}
|
||||||
|
|
||||||
MinecraftForge.EVENT_BUS.register(this);
|
MinecraftForge.EVENT_BUS.register(this);
|
||||||
}
|
}
|
||||||
|
|
|
@ -52,10 +52,10 @@ import buildcraft.transport.PipeIconProvider;
|
||||||
import buildcraft.transport.PipeTriggerProvider;
|
import buildcraft.transport.PipeTriggerProvider;
|
||||||
import buildcraft.transport.TransportProxy;
|
import buildcraft.transport.TransportProxy;
|
||||||
import buildcraft.transport.WireIconProvider;
|
import buildcraft.transport.WireIconProvider;
|
||||||
import buildcraft.transport.blueprints.SchematicPipe;
|
|
||||||
import buildcraft.transport.blueprints.BptItemPipeFilters;
|
import buildcraft.transport.blueprints.BptItemPipeFilters;
|
||||||
import buildcraft.transport.blueprints.BptPipeIron;
|
import buildcraft.transport.blueprints.BptPipeIron;
|
||||||
import buildcraft.transport.blueprints.BptPipeWooden;
|
import buildcraft.transport.blueprints.BptPipeWooden;
|
||||||
|
import buildcraft.transport.blueprints.SchematicPipe;
|
||||||
import buildcraft.transport.gates.GateExpansionPulsar;
|
import buildcraft.transport.gates.GateExpansionPulsar;
|
||||||
import buildcraft.transport.gates.GateExpansionRedstoneFader;
|
import buildcraft.transport.gates.GateExpansionRedstoneFader;
|
||||||
import buildcraft.transport.gates.GateExpansionTimer;
|
import buildcraft.transport.gates.GateExpansionTimer;
|
||||||
|
@ -350,7 +350,10 @@ public class BuildCraftTransport extends BuildCraftMod {
|
||||||
pipePowerIron = buildPipe(DefaultProps.PIPE_POWER_IRON_ID, PipePowerIron.class, "Iron Kinesis Pipe", CreativeTabBuildCraft.TIER_2, Items.redstone, pipeItemsIron);
|
pipePowerIron = buildPipe(DefaultProps.PIPE_POWER_IRON_ID, PipePowerIron.class, "Iron Kinesis Pipe", CreativeTabBuildCraft.TIER_2, Items.redstone, pipeItemsIron);
|
||||||
pipePowerGold = buildPipe(DefaultProps.PIPE_POWER_GOLD_ID, PipePowerGold.class, "Golden Kinesis Pipe", CreativeTabBuildCraft.TIER_2, Items.redstone, pipeItemsGold);
|
pipePowerGold = buildPipe(DefaultProps.PIPE_POWER_GOLD_ID, PipePowerGold.class, "Golden Kinesis Pipe", CreativeTabBuildCraft.TIER_2, Items.redstone, pipeItemsGold);
|
||||||
pipePowerDiamond = buildPipe(DefaultProps.PIPE_POWER_DIAMOND_ID, PipePowerDiamond.class, "Diamond Kinesis Pipe", CreativeTabBuildCraft.TIER_2, Items.redstone, pipeItemsDiamond);
|
pipePowerDiamond = buildPipe(DefaultProps.PIPE_POWER_DIAMOND_ID, PipePowerDiamond.class, "Diamond Kinesis Pipe", CreativeTabBuildCraft.TIER_2, Items.redstone, pipeItemsDiamond);
|
||||||
|
|
||||||
|
if (!BuildCraftCore.NEXTGEN_PREALPHA) {
|
||||||
pipePowerHeat = buildPipe(DefaultProps.PIPE_POWER_HEAT_ID, PipePowerHeat.class, "Heat Kinesis Pipe", CreativeTabBuildCraft.TIER_3, Blocks.furnace, pipeItemsDiamond);
|
pipePowerHeat = buildPipe(DefaultProps.PIPE_POWER_HEAT_ID, PipePowerHeat.class, "Heat Kinesis Pipe", CreativeTabBuildCraft.TIER_3, Blocks.furnace, pipeItemsDiamond);
|
||||||
|
}
|
||||||
|
|
||||||
pipeStructureCobblestone = buildPipe(DefaultProps.PIPE_STRUCTURE_COBBLESTONE_ID, PipeStructureCobblestone.class, "Cobblestone Structure Pipe", CreativeTabBuildCraft.TIER_1, Blocks.gravel, pipeItemsCobblestone);
|
pipeStructureCobblestone = buildPipe(DefaultProps.PIPE_STRUCTURE_COBBLESTONE_ID, PipeStructureCobblestone.class, "Cobblestone Structure Pipe", CreativeTabBuildCraft.TIER_1, Blocks.gravel, pipeItemsCobblestone);
|
||||||
|
|
||||||
|
@ -375,9 +378,11 @@ 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);
|
||||||
|
}
|
||||||
|
|
||||||
filteredBufferBlock = new BlockFilteredBuffer();
|
filteredBufferBlock = new BlockFilteredBuffer();
|
||||||
CoreProxy.proxy.registerBlock(filteredBufferBlock.setBlockName("filteredBufferBlock"));
|
CoreProxy.proxy.registerBlock(filteredBufferBlock.setBlockName("filteredBufferBlock"));
|
||||||
|
|
Loading…
Reference in a new issue