Anvilcraft/WarpDrive
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Removed accelerator until modpack is ready

Browse source
This commit is contained in:
LemADEC 2017-03-25 10:35:39 +01:00
parent b3b9175722
commit 8ccce42471
4 changed files with 192 additions and 179 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

91
src/main/java/cr0s/warpdrive/WarpDrive.java
View file

@ -11,7 +11,6 @@ import cr0s.warpdrive.block.TileEntityChunkLoader;
import cr0s.warpdrive.block.TileEntityLaser;
import cr0s.warpdrive.block.TileEntityLaserMedium;
import cr0s.warpdrive.block.atomic.BlockAcceleratorControlPoint;
import cr0s.warpdrive.block.atomic.BlockAcceleratorController;
import cr0s.warpdrive.block.atomic.BlockChiller;
import cr0s.warpdrive.block.atomic.BlockElectromagnetGlass;
import cr0s.warpdrive.block.atomic.BlockElectromagnetPlain;
@ -20,7 +19,6 @@ import cr0s.warpdrive.block.atomic.BlockParticlesInjector;
import cr0s.warpdrive.block.atomic.BlockVoidShellGlass;
import cr0s.warpdrive.block.atomic.BlockVoidShellPlain;
import cr0s.warpdrive.block.atomic.TileEntityAcceleratorControlPoint;
import cr0s.warpdrive.block.atomic.TileEntityAcceleratorController;
import cr0s.warpdrive.block.atomic.TileEntityParticlesInjector;
import cr0s.warpdrive.block.building.BlockShipScanner;
import cr0s.warpdrive.block.building.TileEntityShipScanner;
@ -491,48 +489,51 @@ public class WarpDrive implements LoadingCallback {
GameRegistry.registerBlock(blockSecurityStation, ItemBlockAbstractBase.class, "blockSecurityStation");
GameRegistry.registerTileEntity(TileEntitySecurityStation.class, MODID + ":blockSecurityStation");
*/
/*
// ACCELERATOR CONTROLLER
blockAcceleratorController = new BlockAcceleratorController();
GameRegistry.registerBlock(blockAcceleratorController, ItemBlockAbstractBase.class, "blockAcceleratorController");
GameRegistry.registerTileEntity(TileEntityAcceleratorController.class, MODID + ":blockAcceleratorController");
/**/
// ACCELERATOR CONTROL POINT
blockAcceleratorControlPoint = new BlockAcceleratorControlPoint();
GameRegistry.registerBlock(blockAcceleratorControlPoint, ItemBlockAbstractBase.class, "blockAcceleratorControlPoint");
GameRegistry.registerTileEntity(TileEntityAcceleratorControlPoint.class, MODID + ":blockAcceleratorControlPoint");
// PARTICLES COLLIDER
blockParticlesCollider = new BlockParticlesCollider();
GameRegistry.registerBlock(blockParticlesCollider, ItemBlockAbstractBase.class, "blockParticlesCollider");
// PARTICLES INJECTOR
blockParticlesInjector = new BlockParticlesInjector();
GameRegistry.registerBlock(blockParticlesInjector, ItemBlockAbstractBase.class, "blockParticlesInjector");
GameRegistry.registerTileEntity(TileEntityParticlesInjector.class, MODID + ":blockParticlesInjector");
// VOID SHELL PLAIN/GLASS
blockVoidShellPlain = new BlockVoidShellPlain();
GameRegistry.registerBlock(blockVoidShellPlain, ItemBlockAbstractBase.class, "blockVoidShellPlain");
blockVoidShellGlass = new BlockVoidShellGlass();
GameRegistry.registerBlock(blockVoidShellGlass, ItemBlockAbstractBase.class, "blockVoidShellGlass");
blockElectromagnetPlain = new Block[3];
blockElectromagnetGlass = new Block[3];
blockChillers = new Block[3];
for(byte tier = 1; tier <= 3; tier++) {
int index = tier - 1;
// ELECTROMAGNETS PLAIN
blockElectromagnetPlain[index] = new BlockElectromagnetPlain(tier);
GameRegistry.registerBlock(blockElectromagnetPlain[index], ItemBlockAbstractBase.class, "blockElectromagnetPlain" + tier);
if (WarpDriveConfig.ACCELERATOR_ENABLE) {
/*
// ACCELERATOR CONTROLLER
blockAcceleratorController = new BlockAcceleratorController();
GameRegistry.registerBlock(blockAcceleratorController, ItemBlockAbstractBase.class, "blockAcceleratorController");
GameRegistry.registerTileEntity(TileEntityAcceleratorController.class, MODID + ":blockAcceleratorController");
/**/
// ACCELERATOR CONTROL POINT
blockAcceleratorControlPoint = new BlockAcceleratorControlPoint();
GameRegistry.registerBlock(blockAcceleratorControlPoint, ItemBlockAbstractBase.class, "blockAcceleratorControlPoint");
GameRegistry.registerTileEntity(TileEntityAcceleratorControlPoint.class, MODID + ":blockAcceleratorControlPoint");
// ELECTROMAGNETS GLASS
blockElectromagnetGlass[index] = new BlockElectromagnetGlass(tier);
GameRegistry.registerBlock(blockElectromagnetGlass[index], ItemBlockAbstractBase.class, "blockElectromagnetGlass" + tier);
// PARTICLES COLLIDER
blockParticlesCollider = new BlockParticlesCollider();
GameRegistry.registerBlock(blockParticlesCollider, ItemBlockAbstractBase.class, "blockParticlesCollider");
// CHILLER
blockChillers[index] = new BlockChiller(tier);
GameRegistry.registerBlock(blockChillers[index], ItemBlockAbstractBase.class, "blockChiller" + tier);
// PARTICLES INJECTOR
blockParticlesInjector = new BlockParticlesInjector();
GameRegistry.registerBlock(blockParticlesInjector, ItemBlockAbstractBase.class, "blockParticlesInjector");
GameRegistry.registerTileEntity(TileEntityParticlesInjector.class, MODID + ":blockParticlesInjector");
// VOID SHELL PLAIN/GLASS
blockVoidShellPlain = new BlockVoidShellPlain();
GameRegistry.registerBlock(blockVoidShellPlain, ItemBlockAbstractBase.class, "blockVoidShellPlain");
blockVoidShellGlass = new BlockVoidShellGlass();
GameRegistry.registerBlock(blockVoidShellGlass, ItemBlockAbstractBase.class, "blockVoidShellGlass");
blockElectromagnetPlain = new Block[3];
blockElectromagnetGlass = new Block[3];
blockChillers = new Block[3];
for (byte tier = 1; tier <= 3; tier++) {
int index = tier - 1;
// ELECTROMAGNETS PLAIN
blockElectromagnetPlain[index] = new BlockElectromagnetPlain(tier);
GameRegistry.registerBlock(blockElectromagnetPlain[index], ItemBlockAbstractBase.class, "blockElectromagnetPlain" + tier);
// ELECTROMAGNETS GLASS
blockElectromagnetGlass[index] = new BlockElectromagnetGlass(tier);
GameRegistry.registerBlock(blockElectromagnetGlass[index], ItemBlockAbstractBase.class, "blockElectromagnetGlass" + tier);
// CHILLER
blockChillers[index] = new BlockChiller(tier);
GameRegistry.registerBlock(blockChillers[index], ItemBlockAbstractBase.class, "blockChiller" + tier);
}
}
// DECORATIVE
@ -608,9 +609,11 @@ public class WarpDrive implements LoadingCallback {
itemForceFieldUpgrade = new ItemForceFieldUpgrade();
GameRegistry.registerItem(itemForceFieldUpgrade, "itemForceFieldUpgrade");
// ELECTROMAGNETIC CELL
itemElectromagneticCell = new ItemElectromagneticCell();
GameRegistry.registerItem(itemElectromagneticCell, "itemElectromagneticCell");
if (WarpDriveConfig.ACCELERATOR_ENABLE) {
// ELECTROMAGNETIC CELL
itemElectromagneticCell = new ItemElectromagneticCell();
GameRegistry.registerItem(itemElectromagneticCell, "itemElectromagneticCell");
}
// DAMAGE SOURCES
damageAsphyxia = new DamageAsphyxia();

271
src/main/java/cr0s/warpdrive/config/Recipes.java
View file

@ -1477,12 +1477,14 @@ public class Recipes {
'S', new ItemStack(WarpDrive.blockSiren, 1, BlockSiren.METADATA_TYPE_RAID + BlockSiren.METADATA_RANGE_ADVANCED)));
// Accelerator related ore dictionary
OreDictionary.registerOre("blockVoidShell", new ItemStack(WarpDrive.blockVoidShellPlain, 1));
OreDictionary.registerOre("blockVoidShell", new ItemStack(WarpDrive.blockVoidShellGlass, 1));
for(int tier = 1; tier <= 3; tier++) {
int index = tier - 1;
OreDictionary.registerOre("blockElectromagnet" + tier, new ItemStack(WarpDrive.blockElectromagnetPlain[index], 1));
OreDictionary.registerOre("blockElectromagnet" + tier, new ItemStack(WarpDrive.blockElectromagnetGlass[index], 1));
if (WarpDriveConfig.ACCELERATOR_ENABLE) {
OreDictionary.registerOre("blockVoidShell", new ItemStack(WarpDrive.blockVoidShellPlain, 1));
OreDictionary.registerOre("blockVoidShell", new ItemStack(WarpDrive.blockVoidShellGlass, 1));
for (int tier = 1; tier <= 3; tier++) {
int index = tier - 1;
OreDictionary.registerOre("blockElectromagnet" + tier, new ItemStack(WarpDrive.blockElectromagnetPlain[index], 1));
OreDictionary.registerOre("blockElectromagnet" + tier, new ItemStack(WarpDrive.blockElectromagnetGlass[index], 1));
}
}
// iron or steel
@ -1491,133 +1493,138 @@ public class Recipes {
ingotIronOrSteel = "ingotSteel";
}
// Void shells is hull + power interface + steel or iron
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(WarpDrive.blockVoidShellPlain, 6), "psh", "s s", "hsp",
'h', "blockHull1_plain",
'p', ItemComponent.getItemStack(EnumComponentType.POWER_INTERFACE),
's', ingotIronOrSteel));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(WarpDrive.blockVoidShellGlass, 6), "psh", "s s", "hsp",
'h', "blockHull1_glass",
'p', ItemComponent.getItemStack(EnumComponentType.POWER_INTERFACE),
's', ingotIronOrSteel));
// Electromagnetic cell
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(WarpDrive.itemElectromagneticCell, 2), "iri", "i i", "ici",
'i', ironBars,
'c', ItemComponent.getItemStack(EnumComponentType.CAPACITIVE_CRYSTAL),
'r', Items.redstone));
// Accelerator control point
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(WarpDrive.blockAcceleratorControlPoint), "hd ", "vc ", "he ",
'h', Blocks.hopper,
'd', ItemComponent.getItemStack(EnumComponentType.DIAMOND_CRYSTAL),
'e', ItemComponent.getItemStack(EnumComponentType.EMERALD_CRYSTAL),
'c', ItemComponent.getItemStack(EnumComponentType.COMPUTER_INTERFACE),
'v', "blockVoidShell"));
// Particles injector
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(WarpDrive.blockParticlesInjector), "mm ", "vvp", "mmc",
'p', Blocks.piston,
'm', "blockElectromagnet1",
'c', WarpDrive.blockAcceleratorControlPoint,
'v', "blockVoidShell"));
// Accelerator controller
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(WarpDrive.blockAcceleratorController), "MmM", "mcm", "MmM",
'M', ItemComponent.getItemStack(EnumComponentType.MEMORY_CRYSTAL),
'm', "blockElectromagnet1",
'c', WarpDrive.blockAcceleratorControlPoint));
// Particles collider
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(WarpDrive.blockParticlesCollider), "hoh", "odo", "hoh",
'h', "blockHull1_plain",
'o', Blocks.obsidian,
'd', Items.diamond));
// Chillers
Object snowOrIce = Blocks.snow;
if (OreDictionary.doesOreNameExist("dustCryotheum") && !OreDictionary.getOres("dustCryotheum").isEmpty()) {
snowOrIce = Blocks.ice;
if (WarpDriveConfig.ACCELERATOR_ENABLE) {
// Void shells is hull + power interface + steel or iron
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(WarpDrive.blockVoidShellPlain, 6), "psh", "s s", "hsp",
'h', "blockHull1_plain",
'p', ItemComponent.getItemStack(EnumComponentType.POWER_INTERFACE),
's', ingotIronOrSteel));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(WarpDrive.blockVoidShellGlass, 6), "psh", "s s", "hsp",
'h', "blockHull1_glass",
'p', ItemComponent.getItemStack(EnumComponentType.POWER_INTERFACE),
's', ingotIronOrSteel));
// Electromagnetic cell
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(WarpDrive.itemElectromagneticCell, 2), "iri", "i i", "ici",
'i', ironBars,
'c', ItemComponent.getItemStack(EnumComponentType.CAPACITIVE_CRYSTAL),
'r', Items.redstone));
// Accelerator control point
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(WarpDrive.blockAcceleratorControlPoint), "hd ", "vc ", "he ",
'h', Blocks.hopper,
'd', ItemComponent.getItemStack(EnumComponentType.DIAMOND_CRYSTAL),
'e', ItemComponent.getItemStack(EnumComponentType.EMERALD_CRYSTAL),
'c', ItemComponent.getItemStack(EnumComponentType.COMPUTER_INTERFACE),
'v', "blockVoidShell"));
// Particles injector
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(WarpDrive.blockParticlesInjector), "mm ", "vvp", "mmc",
'p', Blocks.piston,
'm', "blockElectromagnet1",
'c', WarpDrive.blockAcceleratorControlPoint,
'v', "blockVoidShell"));
// Accelerator controller
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(WarpDrive.blockAcceleratorController), "MmM", "mcm", "MmM",
'M', ItemComponent.getItemStack(EnumComponentType.MEMORY_CRYSTAL),
'm', "blockElectromagnet1",
'c', WarpDrive.blockAcceleratorControlPoint));
// Particles collider
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(WarpDrive.blockParticlesCollider), "hoh", "odo", "hoh",
'h', "blockHull1_plain",
'o', Blocks.obsidian,
'd', Items.diamond));
// Chillers
Object snowOrIce = Blocks.snow;
if (OreDictionary.doesOreNameExist("dustCryotheum") && !OreDictionary.getOres("dustCryotheum").isEmpty()) {
snowOrIce = Blocks.ice;
}
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(WarpDrive.blockChillers[0]), "wgw", "sms", "bMb",
'w', snowOrIce,
'g', Items.ghast_tear,
's', ingotIronOrSteel,
'm', itemStackMotorLV,
'b', ironBars,
'M', "blockElectromagnet1"));
Object nitrogen = Blocks.ice;
if (OreDictionary.doesOreNameExist("dustCryotheum") && !OreDictionary.getOres("dustCryotheum").isEmpty()) {
nitrogen = Blocks.packed_ice;
}
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(WarpDrive.blockChillers[1]), "ngn", "dmd", "bMb",
'n', nitrogen,
'g', Items.ghast_tear,
'd', Items.diamond,
'm', itemStackMotorMV,
'b', ironBars,
'M', "blockElectromagnet2"));
Object helium = Blocks.packed_ice;
if (OreDictionary.doesOreNameExist("dustCryotheum") && !OreDictionary.getOres("dustCryotheum").isEmpty()) {
helium = "dustCryotheum";
}
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(WarpDrive.blockChillers[2]), "hgh", "eme", "bMb",
'h', helium,
'g', Items.ghast_tear,
'e', Items.emerald,
'm', itemStackMotorHV,
'b', ironBars,
'M', "blockElectromagnet3"));
// Lower tier coil is iron, copper or coil
Object ironIngotOrCopperIngotOrCoil = new ItemStack(Items.iron_ingot);
if (WarpDriveConfig.isGregTech5Loaded) {
ironIngotOrCopperIngotOrCoil = itemStackGoldIngotOrCoil; // @TODO revise GT recipes
} else if (WarpDriveConfig.isIndustrialCraft2Loaded) {
ironIngotOrCopperIngotOrCoil = WarpDriveConfig.getModItemStack("IC2", "itemRecipePart", 0); // Coil
} else if (WarpDriveConfig.isThermalExpansionLoaded) {
ironIngotOrCopperIngotOrCoil = WarpDriveConfig.getModItemStack("ThermalExpansion", "material", 1); // Redstone reception coil
} else if (WarpDriveConfig.isImmersiveEngineeringLoaded) {
ironIngotOrCopperIngotOrCoil = WarpDriveConfig.getModItemStack("ImmersiveEngineering", "coil", 2); // HV wire coil
} else if (WarpDriveConfig.isEnderIOLoaded) {
ironIngotOrCopperIngotOrCoil = WarpDriveConfig.getModItemStack("EnderIO", "itemPowerConduit", 1); // Enhanced energy conduit
} else if (OreDictionary.doesOreNameExist("ingotCopper") && !OreDictionary.getOres("ingotCopper").isEmpty()) {
ironIngotOrCopperIngotOrCoil = "ingotCopper";
}
// Normal electromagnets
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(WarpDrive.blockElectromagnetPlain[0], 4), "ctc", "cmc", "cCc",
'c', ironIngotOrCopperIngotOrCoil,
't', ItemComponent.getItemStack(EnumComponentType.GLASS_TANK),
'm', itemStackMotorLV,
'C', ItemComponent.getItemStack(EnumComponentType.CAPACITIVE_CRYSTAL)));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(WarpDrive.blockElectromagnetGlass[0], 4), "mgm", "g g", "mgm",
'g', Blocks.glass,
'm', WarpDrive.blockElectromagnetPlain[0]));
// Advanced electromagnets
GameRegistry.addRecipe(new RecipeParticleShapedOre(new ItemStack(WarpDrive.blockElectromagnetPlain[1], 6), "mpm", "pip", "mpm",
'i', ItemElectromagneticCell.getItemStackNoCache(ParticleRegistry.ION, 200),
'p', ItemComponent.getItemStack(EnumComponentType.POWER_INTERFACE),
'm', WarpDrive.blockElectromagnetPlain[0]));
GameRegistry.addRecipe(new RecipeParticleShapedOre(new ItemStack(WarpDrive.blockElectromagnetGlass[1], 6), "mpm", "pip", "mpm",
'i', ItemElectromagneticCell.getItemStackNoCache(ParticleRegistry.ION, 200),
'p', ItemComponent.getItemStack(EnumComponentType.POWER_INTERFACE),
'm', WarpDrive.blockElectromagnetGlass[0]));
// Superior electromagnets
GameRegistry.addRecipe(new RecipeParticleShapedOre(new ItemStack(WarpDrive.blockElectromagnetPlain[2], 6), "mtm", "sps", "mMm",
't', ItemComponent.getItemStack(EnumComponentType.GLASS_TANK),
's', ItemComponent.getItemStack(EnumComponentType.SUPERCONDUCTOR),
'p', ItemElectromagneticCell.getItemStackNoCache(ParticleRegistry.PROTON, 24),
'M', itemStackMotorHV,
'm', WarpDrive.blockElectromagnetPlain[1]));
GameRegistry.addRecipe(new RecipeParticleShapedOre(new ItemStack(WarpDrive.blockElectromagnetGlass[2], 6), "mtm", "sps", "mMm",
't', ItemComponent.getItemStack(EnumComponentType.GLASS_TANK),
's', ItemComponent.getItemStack(EnumComponentType.SUPERCONDUCTOR),
'p', ItemElectromagneticCell.getItemStackNoCache(ParticleRegistry.PROTON, 24),
'M', itemStackMotorHV,
'm', WarpDrive.blockElectromagnetGlass[1]));
}
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(WarpDrive.blockChillers[0]), "wgw", "sms", "bMb",
'w', snowOrIce,
'g', Items.ghast_tear,
's', ingotIronOrSteel,
'm', itemStackMotorLV,
'b', ironBars,
'M', "blockElectromagnet1"));
Object nitrogen = Blocks.ice;
if (OreDictionary.doesOreNameExist("dustCryotheum") && !OreDictionary.getOres("dustCryotheum").isEmpty()) {
nitrogen = Blocks.packed_ice;
}
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(WarpDrive.blockChillers[1]), "ngn", "dmd", "bMb",
'n', nitrogen,
'g', Items.ghast_tear,
'd', Items.diamond,
'm', itemStackMotorMV,
'b', ironBars,
'M', "blockElectromagnet2"));
Object helium = Blocks.packed_ice;
if (OreDictionary.doesOreNameExist("dustCryotheum") && !OreDictionary.getOres("dustCryotheum").isEmpty()) {
helium = "dustCryotheum";
}
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(WarpDrive.blockChillers[2]), "hgh", "eme", "bMb",
'h', helium,
'g', Items.ghast_tear,
'e', Items.emerald,
'm', itemStackMotorHV,
'b', ironBars,
'M', "blockElectromagnet3"));
// Lower tier coil is iron, copper or coil
Object ironIngotOrCopperIngotOrCoil = new ItemStack(Items.iron_ingot);
if (WarpDriveConfig.isGregTech5Loaded) {
ironIngotOrCopperIngotOrCoil = itemStackGoldIngotOrCoil; // @TODO revise GT recipes
} else if (WarpDriveConfig.isIndustrialCraft2Loaded) {
ironIngotOrCopperIngotOrCoil = WarpDriveConfig.getModItemStack("IC2", "itemRecipePart", 0); // Coil
} else if (WarpDriveConfig.isThermalExpansionLoaded) {
ironIngotOrCopperIngotOrCoil = WarpDriveConfig.getModItemStack("ThermalExpansion", "material", 1); // Redstone reception coil
} else if (WarpDriveConfig.isImmersiveEngineeringLoaded) {
ironIngotOrCopperIngotOrCoil = WarpDriveConfig.getModItemStack("ImmersiveEngineering", "coil", 2); // HV wire coil
} else if (WarpDriveConfig.isEnderIOLoaded) {
ironIngotOrCopperIngotOrCoil = WarpDriveConfig.getModItemStack("EnderIO", "itemPowerConduit", 1); // Enhanced energy conduit
} else if (OreDictionary.doesOreNameExist("ingotCopper") && !OreDictionary.getOres("ingotCopper").isEmpty()) {
ironIngotOrCopperIngotOrCoil = "ingotCopper";
}
// Normal electromagnets
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(WarpDrive.blockElectromagnetPlain[0], 4), "ctc", "cmc", "cCc",
'c', ironIngotOrCopperIngotOrCoil,
't', ItemComponent.getItemStack(EnumComponentType.GLASS_TANK),
'm', itemStackMotorLV,
'C', ItemComponent.getItemStack(EnumComponentType.CAPACITIVE_CRYSTAL)));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(WarpDrive.blockElectromagnetGlass[0], 4), "mgm", "g g", "mgm",
'g', Blocks.glass,
'm', WarpDrive.blockElectromagnetPlain[0]));
// Advanced electromagnets
GameRegistry.addRecipe(new RecipeParticleShapedOre(new ItemStack(WarpDrive.blockElectromagnetPlain[1], 6), "mpm", "pip", "mpm",
'i', ItemElectromagneticCell.getItemStackNoCache(ParticleRegistry.ION, 200),
'p', ItemComponent.getItemStack(EnumComponentType.POWER_INTERFACE),
'm', WarpDrive.blockElectromagnetPlain[0]));
GameRegistry.addRecipe(new RecipeParticleShapedOre(new ItemStack(WarpDrive.blockElectromagnetGlass[1], 6), "mpm", "pip", "mpm",
'i', ItemElectromagneticCell.getItemStackNoCache(ParticleRegistry.ION, 200),
'p', ItemComponent.getItemStack(EnumComponentType.POWER_INTERFACE),
'm', WarpDrive.blockElectromagnetGlass[0]));
// Superior electromagnets
GameRegistry.addRecipe(new RecipeParticleShapedOre(new ItemStack(WarpDrive.blockElectromagnetPlain[2], 6), "mtm", "sps", "mMm",
't', ItemComponent.getItemStack(EnumComponentType.GLASS_TANK),
's', ItemComponent.getItemStack(EnumComponentType.SUPERCONDUCTOR),
'p', ItemElectromagneticCell.getItemStackNoCache(ParticleRegistry.PROTON, 24),
'M', itemStackMotorHV,
'm', WarpDrive.blockElectromagnetPlain[1]));
GameRegistry.addRecipe(new RecipeParticleShapedOre(new ItemStack(WarpDrive.blockElectromagnetGlass[2], 6), "mtm", "sps", "mMm",
't', ItemComponent.getItemStack(EnumComponentType.GLASS_TANK),
's', ItemComponent.getItemStack(EnumComponentType.SUPERCONDUCTOR),
'p', ItemElectromagneticCell.getItemStackNoCache(ParticleRegistry.PROTON, 24),
'M', itemStackMotorHV,
'm', WarpDrive.blockElectromagnetGlass[1]));
}
private static void initDynamicHull() {

1
src/main/java/cr0s/warpdrive/config/WarpDriveConfig.java
View file

@ -328,6 +328,7 @@ public class WarpDriveConfig {
public static HashMap<String, IBlockTransformer> blockTransformers = null;
// Particles accelerator
public static boolean ACCELERATOR_ENABLE = false;
public static int ACCELERATOR_MAX_PARTICLE_BUNCHES = 20;
public static Block getModBlock(final String mod, final String id) {

8
src/main/java/cr0s/warpdrive/item/ItemElectromagneticCell.java
View file

@ -1,6 +1,5 @@
package cr0s.warpdrive.item;
import cr0s.warpdrive.Commons;
import cr0s.warpdrive.WarpDrive;
import cr0s.warpdrive.api.IParticleContainerItem;
@ -24,10 +23,11 @@ import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public class ItemElectromagneticCell extends Item implements IParticleContainerItem {
private static final String AMOUNT_TO_CONSUME_TAG = "amountToConsume";
@SideOnly(Side.CLIENT)
private IIcon[] icons = new IIcon[31];
private IIcon[] icons;
public ItemElectromagneticCell() {
super();
@ -41,6 +41,7 @@ public class ItemElectromagneticCell extends Item implements IParticleContainerI
@Override
@SideOnly(Side.CLIENT)
public void registerIcons(IIconRegister iconRegister) {
icons = new IIcon[31];
icons[ 0] = iconRegister.registerIcon("warpdrive:atomic/electromagnetic_cell-empty");
icons[ 1] = iconRegister.registerIcon("warpdrive:atomic/electromagnetic_cell-blue-20");
icons[ 2] = iconRegister.registerIcon("warpdrive:atomic/electromagnetic_cell-blue-40");
@ -95,11 +96,12 @@ public class ItemElectromagneticCell extends Item implements IParticleContainerI
@Override
public void getSubItems(Item item, CreativeTabs creativeTab, List list) {
list.add(getItemStackNoCache(null, 0));
list.add(getItemStackNoCache(ParticleRegistry.ION, 1000));
list.add(getItemStackNoCache(ParticleRegistry.PROTON, 1000));
list.add(getItemStackNoCache(ParticleRegistry.ANTIMATTER, 1000));
list.add(getItemStackNoCache(ParticleRegistry.STRANGE_MATTER, 1000));
// list.add(getItemStackNoCache(ParticleRegistry.TACHYONS, 100));
// list.add(getItemStackNoCache(ParticleRegistry.TACHYONS, 1000));
}
@Override