fix broken hard recipes and migrate hiadv machine to new style

This commit is contained in:
YuRaNnNzZZ 2015-08-14 20:09:13 +03:00
parent c840e5a60a
commit 7c57c4b2e3
5 changed files with 86 additions and 80 deletions

View file

@ -85,8 +85,8 @@ import cr0s.warpdrive.block.movement.TileEntityTransporter;
import cr0s.warpdrive.block.passive.BlockAir;
import cr0s.warpdrive.block.passive.BlockDecorative;
import cr0s.warpdrive.block.passive.BlockGas;
import cr0s.warpdrive.block.passive.BlockHiAdvMachine;
import cr0s.warpdrive.block.passive.BlockIridium;
import cr0s.warpdrive.block.BlockHiAdvMachine;
import cr0s.warpdrive.block.passive.BlockTransportBeacon;
import cr0s.warpdrive.block.passive.ItemBlockDecorative;
import cr0s.warpdrive.block.weapon.BlockLaserCamera;
@ -147,7 +147,7 @@ public class WarpDrive implements LoadingCallback {
public static Block blockAir;
public static Block blockGas;
public static Block blockIridium;
public static Block hiAdvMachineBlock;
public static Block blockHiAdvMachine;
public static Block blockTransportBeacon;
public static Block blockChunkLoader;
public static BlockDecorative blockDecorative;
@ -315,9 +315,9 @@ public class WarpDrive implements LoadingCallback {
// HIGHLY ADVANCED MACHINE BLOCK
if (WarpDriveConfig.isIndustrialCraft2loaded) {
hiAdvMachineBlock = new BlockHiAdvMachine();
blockHiAdvMachine = new BlockHiAdvMachine();
GameRegistry.registerBlock(hiAdvMachineBlock, "blockHAMachine");
GameRegistry.registerBlock(blockHiAdvMachine, "blockHAMachine");
}
// SHIP SCANNER
@ -740,90 +740,90 @@ public class WarpDrive implements LoadingCallback {
ItemStack mfsu = WarpDriveConfig.getModItem("IC2", "blockElectric", 2).copy();
ItemStack energiumDust = WarpDriveConfig.getModItem("IC2", "itemDust2", 2).copy();
ItemStack crystalmemory = WarpDriveConfig.getModItem("IC2", "itemcrystalmemory", -1).copy();
ItemStack itemHAMachine = new ItemStack(hiAdvMachineBlock).copy();
ItemStack itemHAMachine = new ItemStack(blockHiAdvMachine).copy();
GameRegistry.addRecipe(new ItemStack(warpCore),"uau", "tmt", "uau",
GameRegistry.addRecipe(new ItemStack(blockShipCore),"uau", "tmt", "uau",
'a', advancedAlloy,
't', WarpDriveConfig.getModItem("IC2", "blockMachine2", 0), // Teleporter
'm', itemHAMachine,
'u', mfsu);
if (Loader.isModLoaded("OpenComputers")) {
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(protocolBlock), false, new Object[] { "aha", "cmc", "apa", // With OC Adapter
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(blockShipController), false, new Object[] { "aha", "cmc", "apa", // With OC Adapter
'a', advancedAlloy,
'm', itemHAMachine,
'c', "circuitAdvanced",
'h', crystalmemory,
'p', WarpDriveConfig.getModItem("OpenComputers", "adapter", -1)}));
} else if (Loader.isModLoaded("ComputerCraft")) {
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(protocolBlock), false, new Object[] { "aha", "cmc", "apa", // With CC Modem
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(blockShipController), false, new Object[] { "aha", "cmc", "apa", // With CC Modem
'a', advancedAlloy,
'm', itemHAMachine,
'c', "circuitAdvanced",
'h', crystalmemory,
'p', WarpDriveConfig.getModItem("ComputerCraft", "CC-Cable", 1)}));
} else {
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(protocolBlock), false, new Object[] { "aha", "cmc", "aca",
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(blockShipController), false, new Object[] { "aha", "cmc", "aca",
'a', advancedAlloy,
'm', itemHAMachine,
'c', "circuitAdvanced",
'h', crystalmemory}));
}
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(radarBlock), false, new Object[] { "afa", "cmc", "aca",
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(blockRadar), false, new Object[] { "afa", "cmc", "aca",
'a', advancedAlloy,
'm', itemHAMachine,
'c', "circuitAdvanced",
'f', WarpDriveConfig.getModItem("IC2", "itemFreq", -1)}));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(isolationBlock), false, new Object[] { "sls", "lml", "sls",
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(blockWarpIsolation), false, new Object[] { "sls", "lml", "sls",
's', "plateDenseSteel",
'l', "plateDenseLead",
'm', itemHAMachine}));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(airgenBlock), false, new Object[] { "lel", "vmv", "lcl",
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(blockAirGenerator), false, new Object[] { "lel", "vmv", "lcl",
'l', Blocks.leaves,
'm', WarpDriveConfig.getModItem("IC2", "blockMachine", 0),
'c', "circuitBasic",
'e', WarpDriveConfig.getModItem("IC2", "blockMachine", 5), // Compressor
'v', WarpDriveConfig.getModItem("IC2", "reactorVent", -1)}));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(laserBlock), false, new Object[] { "aca", "cmc", "ala",
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(blockLaser), false, new Object[] { "aca", "cmc", "ala",
'm', advancedMachine,
'a', advancedAlloy,
'c', "circuitAdvanced",
'l', WarpDriveConfig.getModItem("IC2", "itemToolMiningLaser", -1)}));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(miningLaserBlock), false, new Object[] { "pcp", "pap", "plp",
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(blockMiningLaser), false, new Object[] { "pcp", "pap", "plp",
'c', "circuitAdvanced",
'p', advancedAlloy,
'a', WarpDriveConfig.getModItem("IC2", "blockMachine2", 11), // Advanced Miner
'l', laserBlock}));
'l', blockLaser}));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(boosterBlock), false, new Object[] { "efe", "aca", "ama",
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(blockLaserMedium), false, new Object[] { "efe", "aca", "ama",
'c', "circuitAdvanced",
'a', advancedAlloy,
'f', fiberGlassCable,
'e', energiumDust,
'm', mfe}));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(liftBlock), false, new Object[] { "aca", "ama", "aea",
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(blockLift), false, new Object[] { "aca", "ama", "aea",
'c', "circuitAdvanced",
'a', advancedAlloy,
'm', WarpDriveConfig.getModItem("IC2", "blockMachine", 9), // Magnetizer
'e', energiumDust}));
GameRegistry.addRecipe(new ItemStack(iridiumBlock), "iii", "iii", "iii",
GameRegistry.addRecipe(new ItemStack(blockIridium), "iii", "iii", "iii",
'i', iridiumAlloy);
GameRegistry.addShapelessRecipe(new ItemStack(iridiumAlloy.getItem(), 9), new ItemStack(iridiumBlock));
GameRegistry.addShapelessRecipe(new ItemStack(iridiumAlloy.getItem(), 9), new ItemStack(blockIridium));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(laserCamBlock), false, new Object[] { "ala", "sss", "aca",
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(blockLaserCamera), false, new Object[] { "ala", "sss", "aca",
'a', advancedAlloy,
's', "circuitAdvanced",
'l', laserBlock,
'c', cameraBlock}));
'l', blockLaser,
'c', blockCamera}));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(cameraBlock), false, new Object[] { "aed", "cma", "aga",
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(blockCamera), false, new Object[] { "aed", "cma", "aga",
'a', advancedAlloy,
'e', WarpDriveConfig.getModItem("IC2", "itemRecipePart", 1), // Electric Motor
'd', "gemDiamond",
@ -832,26 +832,26 @@ public class WarpDrive implements LoadingCallback {
'g', WarpDriveConfig.getModItem("IC2", "itemCable", 2)}));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(monitorBlock), false, new Object[] { "ala", "aca", "aga",
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(blockMonitor), false, new Object[] { "ala", "aca", "aga",
'a', advancedAlloy,
'l', Blocks.redstone_lamp,
'c', "circuitAdvanced",
'g', "paneGlassColorless" }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(scannerBlock), false, new Object[] { "ici", "isi", "mcm",
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(blockShipScanner), false, new Object[] { "ici", "isi", "mcm",
'm', mfsu,
'i', iridiumAlloy,
'c', "circuitAdvanced",
's', WarpDriveConfig.getModItem("IC2", "blockMachine2", 7) })); // Scanner
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(laserTreeFarmBlock), false, new Object[] { "awa", "cmc", "asa",
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(blockLaserTreeFarm), false, new Object[] { "awa", "cmc", "asa",
'a', advancedAlloy,
'c', "circuitAdvanced",
'w', "logWood",
'm', miningLaserBlock,
'm', blockMiningLaser,
's', WarpDriveConfig.getModItem("IC2", "itemToolChainsaw", -1) }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(transporterBlock), false, new Object[] { "aea", "ctc", "ama",
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(blockTransporter), false, new Object[] { "aea", "ctc", "ama",
'a', advancedAlloy,
'e', Items.ender_pearl,
'c', "circuitAdvanced",
@ -859,28 +859,28 @@ public class WarpDrive implements LoadingCallback {
't', WarpDriveConfig.getModItem("IC2", "blockMachine2", 0) })); // Teleporter
//if (WarpDriveConfig.isIndustrialCraft2loaded) { // It is already loaded, if this set of recipes initialized.
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(reactorLaserFocusItem), false, new Object[] { "a a", " d ", "a a",
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(itemIC2reactorLaserFocus), false, new Object[] { "a a", " d ", "a a",
'a', advancedAlloy,
'd', "gemDiamond" }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(reactorMonitorBlock), false, new Object[] { "pdp", "dmd", "pdp",
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(blockIC2reactorLaserMonitor), false, new Object[] { "pdp", "dmd", "pdp",
'p', advancedAlloy,
'd', "gemDiamond",
'm', mfe }));
//}
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(cloakBlock), false, new Object[] { "ici", "cmc", "igi",
'i', iridiumBlock,
'c', cloakCoilBlock,
'm', hiAdvMachineBlock,
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(blockCloakingCore), false, new Object[] { "ici", "cmc", "igi",
'i', blockIridium,
'c', blockCloakingCoil,
'm', blockHiAdvMachine,
'g', "circuitAdvanced" }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(cloakCoilBlock), false, new Object[] { "iai", "ccc", "iai",
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(blockCloakingCoil), false, new Object[] { "iai", "ccc", "iai",
'i', iridiumAlloy,
'c', WarpDriveConfig.getModItem("IC2", "itemRecipePart", 0), // Coil
'a', advancedAlloy }));
GameRegistry.addRecipe(new ItemStack(hiAdvMachineBlock), "iii", "imi", "iii",
GameRegistry.addRecipe(new ItemStack(blockHiAdvMachine), "iii", "imi", "iii",
'i', iridiumAlloy,
'm', advancedMachine);
}

View file

@ -1,4 +1,4 @@
package cr0s.warpdrive.block;
package cr0s.warpdrive.block.passive;
import java.util.Random;
@ -15,14 +15,14 @@ public class BlockHiAdvMachine extends Block
super(Material.rock);
setHardness(3.0F);
setStepSound(Block.soundTypeMetal);
setCreativeTab(WarpDrive.warpdriveTab);
setBlockName("warpdrive.blocks.HiAdvMachineBlock");
setCreativeTab(WarpDrive.creativeTabWarpDrive);
setBlockName("warpdrive.passive.HiAdvMachineBlock");
}
@Override
public void registerBlockIcons(IIconRegister par1IconRegister)
{
this.blockIcon = par1IconRegister.registerIcon("warpdrive:hiAdvMachineSide");
this.blockIcon = par1IconRegister.registerIcon("warpdrive:passive/hiAdvMachineSide");
}
@Override

View file

@ -23,7 +23,7 @@ tile.warpdrive.passive.Air.name=Air Block
tile.warpdrive.passive.Energized.name=Energized Block
tile.warpdrive.passive.Gas.name=Gas Block
tile.warpdrive.passive.IridiumBlock.name=Iridium Block
tile.warpdrive.blocks.HiAdvMachineBlock.name=Highly Advanced Machine Block
tile.warpdrive.passive.HiAdvMachineBlock.name=Highly Advanced Machine Block
tile.warpdrive.passive.Network.name=Network Block
tile.warpdrive.passive.Plain.name=Plain Block
tile.warpdrive.passive.TransportBeacon.name=Transport Beacon

View file

@ -1,52 +1,58 @@
item.warpdrive.crafting.Malformed.name=Bad Item
item.warpdrive.crafting.EmptyCore.name=Пустое ядро
item.warpdrive.crafting.EmptyCore.name=Основа для ядра
item.warpdrive.crafting.TeleCore.name=Ядро телепортации
item.warpdrive.crafting.WarpCore.name=Ядро перемещения
item.warpdrive.crafting.LaserCore.name=Ядро лазера
item.warpdrive.crafting.LaserCore.name=Лазерное ядро
item.warpdrive.crafting.ReactorCore.name=Ядро реактора
item.warpdrive.crafting.InterfaceComputer.name=Компьютерный интерфейс
item.warpdrive.crafting.InterfaceComputer.name=Сигнальный интерфейс
item.warpdrive.crafting.InterfacePower.name=Интерфейс питания
item.warpdrive.crafting.PowerCore.name=Энергетическое ядро
item.warpdrive.crafting.AirCanisterEmpty.name=Пустой баллон воздуха
item.warpdrive.crafting.AirCanisterEmpty.name=Пустой воздушный баллон
item.warpdrive.upgrade.Power.name=Power Upgrade
item.warpdrive.upgrade.Speed.name=Speed Upgrade
item.warpdrive.upgrade.Range.name=Range Upgrade
item.warpdrive.upgrade.Energy.name=Energy Upgrade
item.warpdrive.items.ReactorLaserFocus.name=Reactor Laser Focus
item.warpdrive.items.AirCanisterFull.name=Баллон воздуха
item.warpdrive.energy.IC2reactorLaserFocus.name=IC2 Reactor Laser Focus
item.warpdrive.armor.AirCanisterFull.name=Баллон воздуха
item.warpdrive.armor.Helmet.name=Космический шлем
tile.warpdrive.blocks.Air.name=Блок воздуха
tile.warpdrive.blocks.Gas.name=Блок газа
tile.warpdrive.blocks.WarpIsolation.name=Warp-field Isolation Block
tile.warpdrive.blocks.IridiumBlock.name=Блок иридия
tile.warpdrive.blocks.HiAdvMachineBlock.name=Высокотехнологичный корпус механизма
tile.warpdrive.blocks.TransportBeacon.name=Transport Beacon
item.warpdrive.upgrade.Power.name=Улучшение питания
item.warpdrive.upgrade.Speed.name=Улучшение скорости
item.warpdrive.upgrade.Range.name=Улучшение радиуса
item.warpdrive.upgrade.Energy.name=Улучшение энергии
tile.warpdrive.decorative.Plain.name=Plain Block
tile.warpdrive.decorative.Energized.name=Energized Block
tile.warpdrive.decorative.Network.name=Network Block
tile.warpdrive.power.Reactor.name=Enantiomorphic Reactor
tile.warpdrive.power.Laser.name=Aurbis Reactor Stabilisation Laser
tile.warpdrive.power.Store.name=Anuic Energy Store
tile.warpdrive.machines.WarpCore.name=Варп-ядро
tile.warpdrive.machines.WarpProtocol.name=Варп-контроллер
tile.warpdrive.machines.WarpRadar.name=Варп-радар
tile.warpdrive.machines.Laser.name=Лазер
tile.warpdrive.machines.LaserCamera.name=Лазер-камера
tile.warpdrive.machines.LaserTreeFarm.name=Лазерная ферма дерева
tile.warpdrive.machines.CloakingCoil.name=Cloaking Coil
tile.warpdrive.machines.Camera.name=Камера видеонаблюдения
tile.warpdrive.machines.CloakingDeviceCore.name=Cloaking Device Core
tile.warpdrive.machines.ParticleBooster.name=Лазерный ускоритель частиц
tile.warpdrive.machines.Monitor.name=Монитор видеонаблюдения
tile.warpdrive.machines.MiningLaser.name=Лазерная буровая установка
tile.warpdrive.machines.LaserLift.name=Лазерный лифт
tile.warpdrive.machines.Transporter.name=Transporter
tile.warpdrive.machines.Scanner.name=Сканер корабля
tile.warpdrive.passive.Air.name=Воздух
tile.warpdrive.passive.Energized.name=Energized Block
tile.warpdrive.passive.Gas.name=Газ
tile.warpdrive.passive.IridiumBlock.name=Блок иридия
tile.warpdrive.passive.HiAdvMachineBlock.name=Высокотехнологичный корпус механизма
tile.warpdrive.passive.Network.name=Сетевой блок
tile.warpdrive.passive.Plain.name=Пустой блок
tile.warpdrive.passive.TransportBeacon.name=Transport Beacon
tile.warpdrive.machines.AirGenerator.name=Генератор воздуха
tile.warpdrive.machines.ChunkLoader.name=Chunk Loader
tile.warpdrive.machines.LaserReactorMonitor.name=Laser Reactor Monitor
tile.warpdrive.machines.Laser.name=Лазер
tile.warpdrive.machines.LaserMedium.name=Лазерный ускоритель частиц
tile.warpdrive.building.ShipScanner.name=Сканер корабля
tile.warpdrive.collection.LaserTreeFarm.name=Лазерная ферма деревьев
tile.warpdrive.collection.MiningLaser.name=Лазерная буровая установка
tile.warpdrive.detection.Camera.name=Камера видеонаблюдения
tile.warpdrive.detection.CloakingCoil.name=Катушка маскировщика
tile.warpdrive.detection.CloakingCore.name=Маскировщик
tile.warpdrive.detection.Monitor.name=Монитор видеонаблюдения
tile.warpdrive.detection.Radar.name=Варп-радар
tile.warpdrive.detection.WarpIsolation.name=Блок изоляции варп-поля
tile.warpdrive.energy.EnanReactorCore.name=Enantiomorphic Reactor
tile.warpdrive.energy.EnanReactorLaser.name=Aurbis Reactor Stabilisation Laser
tile.warpdrive.energy.EnergyBank.name=Anuic Energy Bank
tile.warpdrive.energy.IC2ReactorLaserMonitor.name=IC2 Reactor Laser Monitor
tile.warpdrive.movement.Lift.name=Лазерный лифт
tile.warpdrive.movement.ShipController.name=Контроллер корабля
tile.warpdrive.movement.ShipCore.name=Ядро корабля
tile.warpdrive.movement.Transporter.name=Transporter
tile.warpdrive.weapon.LaserCamera.name=Боевая камера видеонаблюдения