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

Removed thermometer

Browse source
This commit is contained in:
Calclavia 2014-12-26 02:18:18 -08:00
parent c9a41dd735
commit 7077a3e1f6
3 changed files with 0 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -62,7 +62,6 @@ object AtomicContent extends ContentHolder
var blockCentrifuge: Block = new TileCentrifuge var blockCentrifuge: Block = new TileCentrifuge
var blockNuclearBoiler: Block = new TileNuclearBoiler var blockNuclearBoiler: Block = new TileNuclearBoiler
var blockControlRod: Block = new TileControlRod var blockControlRod: Block = new TileControlRod
var blockThermometer: Block = new TileThermometer
var blockFusionCore: Block = new TilePlasmaHeater var blockFusionCore: Block = new TilePlasmaHeater
var blockPlasma: Block = new TilePlasma var blockPlasma: Block = new TilePlasma
var blockElectromagnet: Block = new TileElectromagnet var blockElectromagnet: Block = new TileElectromagnet
@ -128,7 +127,6 @@ object AtomicContent extends ContentHolder
super.preInit() super.preInit()
//Annotation Packet Users //Annotation Packet Users
PacketAnnotationManager.INSTANCE.register(classOf[TileThermometer])
PacketAnnotationManager.INSTANCE.register(classOf[TileReactorCell]) PacketAnnotationManager.INSTANCE.register(classOf[TileReactorCell])
PacketAnnotationManager.INSTANCE.register(classOf[TileChemicalExtractor]) PacketAnnotationManager.INSTANCE.register(classOf[TileChemicalExtractor])
PacketAnnotationManager.INSTANCE.register(classOf[TileNuclearBoiler]) PacketAnnotationManager.INSTANCE.register(classOf[TileNuclearBoiler])
@ -248,7 +246,6 @@ object AtomicContent extends ContentHolder
recipes += shaped(blockReactorCell, "SCS", "MEM", "SCS", 'E', "cellEmpty", 'C', UniversalRecipe.CIRCUIT_T2.get, 'S', UniversalRecipe.PRIMARY_PLATE.get, 'M', UniversalRecipe.MOTOR.get) recipes += shaped(blockReactorCell, "SCS", "MEM", "SCS", 'E', "cellEmpty", 'C', UniversalRecipe.CIRCUIT_T2.get, 'S', UniversalRecipe.PRIMARY_PLATE.get, 'M', UniversalRecipe.MOTOR.get)
recipes += shaped(blockFusionCore, "CPC", "PFP", "CPC", 'P', UniversalRecipe.PRIMARY_PLATE.get, 'F', AtomicContent.blockReactorCell, 'C', UniversalRecipe.CIRCUIT_T3.get) recipes += shaped(blockFusionCore, "CPC", "PFP", "CPC", 'P', UniversalRecipe.PRIMARY_PLATE.get, 'F', AtomicContent.blockReactorCell, 'C', UniversalRecipe.CIRCUIT_T3.get)
recipes += shaped(new ItemStack(itemCell, 16), " T ", "TGT", " T ", 'T', "ingotTin", 'G', Blocks.glass) recipes += shaped(new ItemStack(itemCell, 16), " T ", "TGT", " T ", 'T', "ingotTin", 'G', Blocks.glass)
recipes += shaped(blockThermometer, "SSS", "GCG", "GSG", 'S', UniversalRecipe.PRIMARY_METAL.get, 'G', Blocks.glass, 'C', UniversalRecipe.CIRCUIT_T1.get)
recipes += shaped(blockControlRod, "I", "I", "I", 'I', Items.iron_ingot) recipes += shaped(blockControlRod, "I", "I", "I", 'I', Items.iron_ingot)
recipes += shaped(itemFissileFuel, "CUC", "CUC", "CUC", 'U', "ingotUranium", 'C', "cellEmpty") recipes += shaped(itemFissileFuel, "CUC", "CUC", "CUC", 'U', "ingotUranium", 'C', "cellEmpty")
recipes += shaped(itemBreedingRod, "CUC", "CUC", "CUC", 'U', "breederUranium", 'C', "cellEmpty") recipes += shaped(itemBreedingRod, "CUC", "CUC", "CUC", 'U', "breederUranium", 'C', "cellEmpty")

1
src/main/scala/resonantinduction/atomic/schematic/SchematicBreedingReactor.scala
View file

@ -42,7 +42,6 @@ class SchematicBreedingReactor extends Schematic
if (!((x == -r || x == r) && (z == -r || z == r))) if (!((x == -r || x == r) && (z == -r || z == r)))
{ {
returnMap.put(new Vector3(x, 0, z), new Pair[Block, Integer](AtomicContent.blockReactorCell, 0)) returnMap.put(new Vector3(x, 0, z), new Pair[Block, Integer](AtomicContent.blockReactorCell, 0))
returnMap.put(new Vector3(x, -1, z), new Pair[Block, Integer](AtomicContent.blockThermometer, 0))
returnMap.put(new Vector3(x, -3, z), new Pair[Block, Integer](AtomicContent.blockSiren, 0)) returnMap.put(new Vector3(x, -3, z), new Pair[Block, Integer](AtomicContent.blockSiren, 0))
returnMap.put(new Vector3(x, -2, z), new Pair[Block, Integer](Blocks.redstone_wire, 0)) returnMap.put(new Vector3(x, -2, z), new Pair[Block, Integer](Blocks.redstone_wire, 0))
} }

1
src/main/scala/resonantinduction/atomic/schematic/SchematicFissionReactor.scala
View file

@ -42,7 +42,6 @@ class SchematicFissionReactor extends Schematic
} }
} }
returnMap.put(new Vector3(0, -1, 0), new Pair[Block, Integer](AtomicContent.blockThermometer, 0))
returnMap.put(new Vector3(0, -3, 0), new Pair[Block, Integer](AtomicContent.blockSiren, 0)) returnMap.put(new Vector3(0, -3, 0), new Pair[Block, Integer](AtomicContent.blockSiren, 0))
returnMap.put(new Vector3(0, -2, 0), new Pair[Block, Integer](Blocks.redstone_wire, 0)) returnMap.put(new Vector3(0, -2, 0), new Pair[Block, Integer](Blocks.redstone_wire, 0))
returnMap.put(new Vector3, new Pair[Block, Integer](AtomicContent.blockReactorCell, 0)) returnMap.put(new Vector3, new Pair[Block, Integer](AtomicContent.blockReactorCell, 0))