tilera/electrodynamics
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Wiki Activity

Mod now loads again. Saves may have missing blocks

Browse source
This commit is contained in:
Robert S 2014-10-04 21:40:30 -04:00
parent d0a19eed44
commit d7d3b4f271
2 changed files with 28 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
src/main/scala/resonantinduction/atomic/AtomicContent.scala
View file

@ -44,7 +44,7 @@ import resonantinduction.atomic.machine.quantum.TileQuantumAssembler
import resonantinduction.atomic.machine.reactor.{TileControlRod, TileReactorCell}
import resonantinduction.atomic.machine.thermometer.TileThermometer
import resonantinduction.atomic.schematic.{SchematicAccelerator, SchematicBreedingReactor, SchematicFissionReactor, SchematicFusionReactor}
import resonantinduction.core.{Reference, ResonantTab, Settings}
import resonantinduction.core.{ResonantInduction, Reference, ResonantTab, Settings}
import universalelectricity.core.transform.vector.VectorWorld
import scala.collection.JavaConversions._
@ -105,14 +105,15 @@ object AtomicContent extends ContentHolder
override def preInit()
{
super.preInit()
MinecraftForge.EVENT_BUS.register(this)
MinecraftForge.EVENT_BUS.register(AtomicContent.itemAntimatter)
MinecraftForge.EVENT_BUS.register(FulminationHandler.INSTANCE)
Settings.config.load
// Blocks
blockRadioactive = new BlockRadioactive(Material.rock).setBlockName(Reference.prefix + "radioactive").setBlockTextureName(Reference.prefix + "radioactive").setCreativeTab(CreativeTabs.tabBlock)
blockRadioactive = manager.newBlock("radioactive", new BlockRadioactive(Material.rock)).setBlockTextureName(Reference.prefix + "radioactive").setCreativeTab(CreativeTabs.tabBlock)
blockCentrifuge = manager.newBlock(classOf[TileCentrifuge])
blockNuclearBoiler = manager.newBlock(classOf[TileNuclearBoiler])
blockControlRod = manager.newBlock(classOf[TileControlRod])
@ -127,29 +128,30 @@ object AtomicContent extends ContentHolder
blockFulmination = manager.newBlock(classOf[TileFulmination])
blockQuantumAssembler = manager.newBlock(classOf[TileQuantumAssembler])
blockReactorCell = manager.newBlock(classOf[TileReactorCell])
blockUraniumOre = new BlockUraniumOre
blockToxicWaste = new BlockToxicWaste().setCreativeTab(null)
blockUraniumOre = manager.newBlock(classOf[BlockUraniumOre])
blockToxicWaste = manager.newBlock(classOf[BlockToxicWaste]).setCreativeTab(null)
//Cells
itemCell = new ItemCell("cellEmpty")
itemCell = manager.newItem("cellEmpty", new ItemCell("cellEmpty"))
itemFissileFuel = manager.newItem(classOf[ItemFissileFuel])
itemBreedingRod = manager.newItem(classOf[ItemBreederFuel])
itemDarkMatter = new ItemCell("darkMatter")
itemDarkMatter = manager.newItem("darkMatter", new ItemCell("darkMatter"))
itemAntimatter = manager.newItem(classOf[ItemAntimatter])
itemDeuteriumCell = new ItemCell("cellDeuterium")
itemTritiumCell = new ItemCell("cellTritium")
itemWaterCell = new ItemCell("cellWater")
itemYellowCake = new ItemRadioactive().setUnlocalizedName("yellowcake").setTextureName(Reference.prefix + "yellowcake").setCreativeTab(ResonantTab)
MinecraftForge.EVENT_BUS.register(AtomicContent.itemAntimatter)
itemDeuteriumCell = manager.newItem("cellDeuterium", new ItemCell("cellDeuterium"))
itemTritiumCell = manager.newItem("cellTritium", new ItemCell("cellTritium"))
itemWaterCell = manager.newItem("cellWater", new ItemCell("cellWater"))
itemYellowCake = manager.newItem("yellowcake", new ItemRadioactive()).setTextureName(Reference.prefix + "yellowcake").setCreativeTab(ResonantTab)
itemUranium = manager.newItem(classOf[ItemUranium]).setCreativeTab(ResonantTab)
//Buckets
itemBucketToxic = new ItemBucket(AtomicContent.blockPlasma).setCreativeTab(ResonantTab.tab).setUnlocalizedName(Reference.prefix + "bucketToxicWaste").setContainerItem(Items.bucket).setTextureName(Reference.prefix + "bucketToxicWaste")
itemBucketToxic = manager.newItem("bucketToxicWaste", new ItemBucket(AtomicContent.blockPlasma)).setCreativeTab(ResonantTab.tab).setContainerItem(Items.bucket).setTextureName(Reference.prefix + "bucketToxicWaste")
//Hazmat suit
itemHazmatTop = new ItemHazmat("hazmatMask", 0).setCreativeTab(ResonantTab)
itemHazmatBody = new ItemHazmat("hazmatBody", 1).setCreativeTab(ResonantTab)
itemHazmatLeggings = new ItemHazmat("hazmatLeggings", 2).setCreativeTab(ResonantTab)
itemHazmatBoots = new ItemHazmat("hazmatBoots", 3).setCreativeTab(ResonantTab)
itemHazmatTop = manager.newItem("hazmatMask", new ItemHazmat("hazmatMask", 0))
itemHazmatBody = manager.newItem("hazmatBody", new ItemHazmat("hazmatBody", 1))
itemHazmatLeggings = manager.newItem("hazmatLeggings", new ItemHazmat("hazmatLeggings", 2))
itemHazmatBoots = manager.newItem("hazmatBoots", new ItemHazmat("hazmatBoots", 3))
FluidRegistry.registerFluid(AtomicContent.FLUID_URANIUM_HEXAFLOURIDE)
FluidRegistry.registerFluid(AtomicContent.FLUID_STEAM)
@ -158,8 +160,6 @@ object AtomicContent extends ContentHolder
FluidRegistry.registerFluid(AtomicContent.getFluidToxicWaste)
FluidRegistry.registerFluid(AtomicContent.FLUID_PLASMA)
super.preInit()
TileCreativeBuilder.register(new SchematicAccelerator)
TileCreativeBuilder.register(new SchematicBreedingReactor)
TileCreativeBuilder.register(new SchematicFissionReactor)
@ -241,7 +241,7 @@ object AtomicContent extends ContentHolder
GameRegistry.addRecipe(new ShapelessOreRecipe(AtomicContent.itemCell, "cellEmpty"))
}
EntityRegistry.registerGlobalEntityID(classOf[EntityParticle], "ASParticle", EntityRegistry.findGlobalUniqueEntityId)
EntityRegistry.registerModEntity(classOf[EntityParticle], "ASParticle", ENTITY_ID_PREFIX, this, 80, 3, true)
EntityRegistry.registerModEntity(classOf[EntityParticle], "ASParticle", ENTITY_ID_PREFIX, ResonantInduction, 80, 3, true)
Settings.config.load
for (oreName <- OreDictionary.getOreNames)
{
@ -258,8 +258,8 @@ object AtomicContent extends ContentHolder
}
Settings.config.save
recipes += shaped(new ItemStack(itemAntimatter, 1, 1), itemAntimatter, itemAntimatter, itemAntimatter, itemAntimatter, itemAntimatter, AtomicContent.itemAntimatter, itemAntimatter, itemAntimatter)
recipes += shaped(new ItemStack(itemAntimatter, 8, 0), new ItemStack(AtomicContent.itemAntimatter, 1, 1))
recipes += shapeless(new ItemStack(itemAntimatter, 1, 1), itemAntimatter, itemAntimatter, itemAntimatter, itemAntimatter, itemAntimatter, AtomicContent.itemAntimatter, itemAntimatter, itemAntimatter)
recipes += shapeless(new ItemStack(itemAntimatter, 8, 0), new ItemStack(AtomicContent.itemAntimatter, 1, 1))
recipes += shaped(new ItemStack(blockSteamFunnel, 2), " B ", "B B", "B B", 'B', UniversalRecipe.SECONDARY_METAL.get)

14
src/main/scala/resonantinduction/electrical/ElectricalContent.scala
View file

@ -123,8 +123,8 @@ object ElectricalContent extends ContentHolder
override def postInit
{
super.postInit
recipes += shaped(ElectricalContent.blockTesla, "WEW", " C ", "DID", 'W', "wire", 'E', Items.ender_eye, 'C', UniversalRecipe.BATTERY.get, 'D', Items.diamond, 'I', UniversalRecipe.PRIMARY_PLATE.get)
recipes += shaped(ElectricalContent.itemMultimeter, "WWW", "ICI", 'W', "wire", 'C', UniversalRecipe.BATTERY.get, 'I', UniversalRecipe.PRIMARY_METAL.get)
recipes += shaped(blockTesla, "WEW", " C ", "DID", 'W', "wire", 'E', Items.ender_eye, 'C', UniversalRecipe.BATTERY.get, 'D', Items.diamond, 'I', UniversalRecipe.PRIMARY_PLATE.get)
recipes += shaped(itemMultimeter, "WWW", "ICI", 'W', "wire", 'C', UniversalRecipe.BATTERY.get, 'I', UniversalRecipe.PRIMARY_METAL.get)
recipes += shaped(tierOneBattery, "III", "IRI", "III", 'R', Blocks.redstone_block, 'I', UniversalRecipe.PRIMARY_METAL.get)
recipes += shaped(tierTwoBattery, "RRR", "RIR", "RRR", 'R', tierOneBattery, 'I', UniversalRecipe.PRIMARY_PLATE.get)
recipes += shaped(tierThreeBattery, "RRR", "RIR", "RRR", 'R', tierTwoBattery, 'I', Blocks.diamond_block)
@ -136,16 +136,16 @@ object ElectricalContent extends ContentHolder
recipes += shaped(getWire(WireMaterial.SUPERCONDUCTOR, 3), "MMM", 'M', "ingotSuperconductor")
recipes += shaped(getWire(WireMaterial.SUPERCONDUCTOR, 3), "MMM", "MEM", "MMM", 'M', Items.gold_ingot, 'E', Items.ender_eye)
//recipes += shaped(ElectricalContent.itemCharger, "WWW", "ICI", 'W', "wire", 'I', UniversalRecipe.PRIMARY_METAL.get, 'C', UniversalRecipe.CIRCUIT_T1.get)
recipes += shaped(ElectricalContent.itemTransformer, "WWW", "WWW", "III", 'W', "wire", 'I', UniversalRecipe.PRIMARY_METAL.get)
recipes += shaped(itemTransformer, "WWW", "WWW", "III", 'W', "wire", 'I', UniversalRecipe.PRIMARY_METAL.get)
//recipes += shaped(new ItemStack(ElectricalContent.itemQuantumGlyph, 1, 0), " CT", "LBL", "TCT", 'B', Blocks.diamond_block, 'L', ElectricalContent.itemLevitator, 'C', ElectricalContent.itemCharger, 'T', ElectricalContent.blockTesla)
//recipes += shaped(new ItemStack(ElectricalContent.itemQuantumGlyph, 1, 1), "TCT", "LBL", " CT", 'B', Blocks.diamond_block, 'L', ElectricalContent.itemLevitator, 'C', ElectricalContent.itemCharger, 'T', ElectricalContent.blockTesla)
//recipes += shaped(new ItemStack(ElectricalContent.itemQuantumGlyph, 1, 2), "TC ", "LBL", "TCT", 'B', Blocks.diamond_block, 'L', ElectricalContent.itemLevitator, 'C', ElectricalContent.itemCharger, 'T', ElectricalContent.blockTesla)
//recipes += shaped(new ItemStack(ElectricalContent.itemQuantumGlyph, 1, 3), "TCT", "LBL", "TC ", 'B', Blocks.diamond_block, 'L', ElectricalContent.itemLevitator, 'C', ElectricalContent.itemCharger, 'T', ElectricalContent.blockTesla)
recipes += shaped(ElectricalContent.blockSolarPanel, "CCC", "WWW", "III", 'W', "wire", 'C', Items.coal, 'I', UniversalRecipe.PRIMARY_METAL.get)
recipes += shaped(ElectricalContent.blockMotor, "SRS", "SMS", "SWS", 'W', "wire", 'R', Items.redstone, 'M', Blocks.iron_block, 'S', UniversalRecipe.PRIMARY_METAL.get)
recipes += shaped(ElectricalContent.blockThermopile, "ORO", "OWO", "OOO", 'W', "wire", 'O', Blocks.obsidian, 'R', Items.redstone)
recipes += shaped(blockSolarPanel, "CCC", "WWW", "III", 'W', "wire", 'C', Items.coal, 'I', UniversalRecipe.PRIMARY_METAL.get)
recipes += shaped(blockMotor, "SRS", "SMS", "SWS", 'W', "wire", 'R', Items.redstone, 'M', Blocks.iron_block, 'S', UniversalRecipe.PRIMARY_METAL.get)
recipes += shaped(blockThermopile, "ORO", "OWO", "OOO", 'W', "wire", 'O', Blocks.obsidian, 'R', Items.redstone)
recipes += shaped(blockLaserEmitter, "IGI", "IDI", "III", 'G, Blocks.glass, 'I', Items.iron_ingot, 'D', Items.diamond)
recipes += shaped(blockLaserEmitter, "IGI", "IDI", "III", 'G', Blocks.glass, 'I', Items.iron_ingot, 'D', Items.diamond)
recipes += shaped(blockLaserReceiver, "IGI", "IRI", "III", 'G', Blocks.glass, 'I', Items.iron_ingot, 'R', Blocks.redstone_block)
recipes += shaped(blockMirror, "GGG", "III", "GGG", 'G', Blocks.glass, 'I', Items.iron_ingot)
recipes += shaped(blockFocusCrystal, "GGG", "GDG", "GGG", 'G', Blocks.glass, 'D', Items.diamond)