diff --git a/build.gradle b/build.gradle index 36d18483..23537121 100755 --- a/build.gradle +++ b/build.gradle @@ -29,7 +29,7 @@ if (System.getenv().BUILD_NUMBER) else logger.lifecycle "SETTING BUILDNUMBER TO 0" -version = "5.0.2" +version = "6.0.0" 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] diff --git a/common/buildcraft/BuildCraftBuilders.java b/common/buildcraft/BuildCraftBuilders.java index 494be8ae..7d8b9c72 100644 --- a/common/buildcraft/BuildCraftBuilders.java +++ b/common/buildcraft/BuildCraftBuilders.java @@ -271,9 +271,11 @@ public class BuildCraftBuilders extends BuildCraftMod { libraryBlock = new BlockBlueprintLibrary(); CoreProxy.proxy.registerBlock(libraryBlock.setBlockName("libraryBlock")); - urbanistBlock = new BlockUrbanist (); - CoreProxy.proxy.registerBlock(urbanistBlock.setBlockName("urbanistBlock")); - CoreProxy.proxy.registerTileEntity(TileUrbanist.class, "net.minecraft.src.builders.TileUrbanist"); + if (!BuildCraftCore.NEXTGEN_PREALPHA) { + urbanistBlock = new BlockUrbanist (); + CoreProxy.proxy.registerBlock(urbanistBlock.setBlockName("urbanistBlock")); + CoreProxy.proxy.registerTileEntity(TileUrbanist.class, "net.minecraft.src.builders.TileUrbanist"); + } GameRegistry.registerTileEntity(TileMarker.class, "Marker"); GameRegistry.registerTileEntity(TileFiller.class, "Filler"); diff --git a/common/buildcraft/BuildCraftCore.java b/common/buildcraft/BuildCraftCore.java index 682a50ce..60d2807f 100644 --- a/common/buildcraft/BuildCraftCore.java +++ b/common/buildcraft/BuildCraftCore.java @@ -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,)") public class BuildCraftCore extends BuildCraftMod { + public static final boolean NEXTGEN_PREALPHA = true; + public static enum RenderMode { Full, NoDynamic }; @@ -263,14 +265,16 @@ public class BuildCraftCore extends BuildCraftMod { CoreProxy.proxy.registerItem(redstoneCrystal); OreDictionary.registerOre("redstoneCrystal", new ItemStack(redstoneCrystal)); - robotBaseItem = new ItemRobot(EntityRobot.class).setUnlocalizedName("robotBase"); - CoreProxy.proxy.registerItem(robotBaseItem); + if (!BuildCraftCore.NEXTGEN_PREALPHA) { + robotBaseItem = new ItemRobot(EntityRobot.class).setUnlocalizedName("robotBase"); + CoreProxy.proxy.registerItem(robotBaseItem); - robotPickerItem = new ItemRobot(EntityRobotPicker.class).setUnlocalizedName("robotPicker"); - CoreProxy.proxy.registerItem(robotPickerItem); + robotPickerItem = new ItemRobot(EntityRobotPicker.class).setUnlocalizedName("robotPicker"); + CoreProxy.proxy.registerItem(robotPickerItem); - robotBuilderItem = new ItemRobot(EntityRobotBuilder.class).setUnlocalizedName("robotBuilder"); - CoreProxy.proxy.registerItem(robotBuilderItem); + robotBuilderItem = new ItemRobot(EntityRobotBuilder.class).setUnlocalizedName("robotBuilder"); + CoreProxy.proxy.registerItem(robotBuilderItem); + } MinecraftForge.EVENT_BUS.register(this); } finally { diff --git a/common/buildcraft/BuildCraftEnergy.java b/common/buildcraft/BuildCraftEnergy.java index 991b767e..5afd2d49 100644 --- a/common/buildcraft/BuildCraftEnergy.java +++ b/common/buildcraft/BuildCraftEnergy.java @@ -40,11 +40,11 @@ import buildcraft.energy.BlockBuildcraftFluid; import buildcraft.energy.BlockEnergyEmitter; import buildcraft.energy.BlockEnergyReceiver; import buildcraft.energy.BlockEngine; -import buildcraft.energy.SchematicEngine; import buildcraft.energy.EnergyProxy; import buildcraft.energy.GuiHandler; import buildcraft.energy.ItemBucketBuildcraft; import buildcraft.energy.ItemEngine; +import buildcraft.energy.SchematicEngine; import buildcraft.energy.TileEnergyEmitter; import buildcraft.energy.TileEnergyReceiver; import buildcraft.energy.TileEngine.EnergyStage; @@ -206,12 +206,14 @@ public class BuildCraftEnergy extends BuildCraftMod { FluidContainerRegistry.registerFluidContainer(FluidRegistry.getFluidStack("fuel", FluidContainerRegistry.BUCKET_VOLUME), new ItemStack(bucketFuel), new ItemStack(Items.bucket)); } - if (blockRedPlasma != null) { - bucketRedPlasma = new ItemBucketBuildcraft(blockRedPlasma, CreativeTabBuildCraft.TIER_4); - bucketRedPlasma.setUnlocalizedName("bucketRedPlasma").setContainerItem(Items.bucket); - LanguageRegistry.addName(bucketRedPlasma, "Red Plasma Bucket"); - CoreProxy.proxy.registerItem(bucketRedPlasma); - FluidContainerRegistry.registerFluidContainer(FluidRegistry.getFluidStack("redplasma", FluidContainerRegistry.BUCKET_VOLUME), new ItemStack(bucketRedPlasma), new ItemStack(Items.bucket)); + if (!BuildCraftCore.NEXTGEN_PREALPHA) { + if (blockRedPlasma != null) { + bucketRedPlasma = new ItemBucketBuildcraft(blockRedPlasma, CreativeTabBuildCraft.TIER_4); + bucketRedPlasma.setUnlocalizedName("bucketRedPlasma").setContainerItem(Items.bucket); + LanguageRegistry.addName(bucketRedPlasma, "Red Plasma Bucket"); + CoreProxy.proxy.registerItem(bucketRedPlasma); + 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 @@ -233,13 +235,15 @@ public class BuildCraftEnergy extends BuildCraftMod { // Receiver / emitter - emitterBlock = new BlockEnergyEmitter (); - CoreProxy.proxy.registerBlock(emitterBlock.setBlockName("energyEmitterBlock")); - CoreProxy.proxy.registerTileEntity(TileEnergyEmitter.class, "net.minecraft.src.builders.TileEnergyEmitter"); + if (!BuildCraftCore.NEXTGEN_PREALPHA) { + emitterBlock = new BlockEnergyEmitter (); + CoreProxy.proxy.registerBlock(emitterBlock.setBlockName("energyEmitterBlock")); + CoreProxy.proxy.registerTileEntity(TileEnergyEmitter.class, "net.minecraft.src.builders.TileEnergyEmitter"); - receiverBlock = new BlockEnergyReceiver (); - CoreProxy.proxy.registerBlock(receiverBlock.setBlockName("energyReceiverBlock")); - CoreProxy.proxy.registerTileEntity(TileEnergyReceiver.class, "net.minecraft.src.builders.TileEnergyReceiver"); + receiverBlock = new BlockEnergyReceiver (); + CoreProxy.proxy.registerBlock(receiverBlock.setBlockName("energyReceiverBlock")); + CoreProxy.proxy.registerTileEntity(TileEnergyReceiver.class, "net.minecraft.src.builders.TileEnergyReceiver"); + } MinecraftForge.EVENT_BUS.register(this); } diff --git a/common/buildcraft/BuildCraftTransport.java b/common/buildcraft/BuildCraftTransport.java index e6edeb85..400212fd 100644 --- a/common/buildcraft/BuildCraftTransport.java +++ b/common/buildcraft/BuildCraftTransport.java @@ -52,10 +52,10 @@ import buildcraft.transport.PipeIconProvider; import buildcraft.transport.PipeTriggerProvider; import buildcraft.transport.TransportProxy; import buildcraft.transport.WireIconProvider; -import buildcraft.transport.blueprints.SchematicPipe; import buildcraft.transport.blueprints.BptItemPipeFilters; import buildcraft.transport.blueprints.BptPipeIron; import buildcraft.transport.blueprints.BptPipeWooden; +import buildcraft.transport.blueprints.SchematicPipe; import buildcraft.transport.gates.GateExpansionPulsar; import buildcraft.transport.gates.GateExpansionRedstoneFader; 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); 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); - pipePowerHeat = buildPipe(DefaultProps.PIPE_POWER_HEAT_ID, PipePowerHeat.class, "Heat Kinesis Pipe", CreativeTabBuildCraft.TIER_3, Blocks.furnace, pipeItemsDiamond); + + if (!BuildCraftCore.NEXTGEN_PREALPHA) { + 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); @@ -375,9 +378,11 @@ public class BuildCraftTransport extends BuildCraftMod { plugItem.setUnlocalizedName("pipePlug"); CoreProxy.proxy.registerItem(plugItem); - robotStationItem = new ItemRobotStation(); - robotStationItem.setUnlocalizedName("robotStation"); - CoreProxy.proxy.registerItem(robotStationItem); + if (!BuildCraftCore.NEXTGEN_PREALPHA) { + robotStationItem = new ItemRobotStation(); + robotStationItem.setUnlocalizedName("robotStation"); + CoreProxy.proxy.registerItem(robotStationItem); + } filteredBufferBlock = new BlockFilteredBuffer(); CoreProxy.proxy.registerBlock(filteredBufferBlock.setBlockName("filteredBufferBlock"));