From 7077a3e1f6d8cd6f74df045b6f559b80fba55624 Mon Sep 17 00:00:00 2001 From: Calclavia Date: Fri, 26 Dec 2014 02:18:18 -0800 Subject: [PATCH] Removed thermometer --- src/main/scala/resonantinduction/atomic/AtomicContent.scala | 3 --- .../atomic/schematic/SchematicBreedingReactor.scala | 1 - .../atomic/schematic/SchematicFissionReactor.scala | 1 - 3 files changed, 5 deletions(-) diff --git a/src/main/scala/resonantinduction/atomic/AtomicContent.scala b/src/main/scala/resonantinduction/atomic/AtomicContent.scala index 286173293..f5018e322 100644 --- a/src/main/scala/resonantinduction/atomic/AtomicContent.scala +++ b/src/main/scala/resonantinduction/atomic/AtomicContent.scala @@ -62,7 +62,6 @@ object AtomicContent extends ContentHolder var blockCentrifuge: Block = new TileCentrifuge var blockNuclearBoiler: Block = new TileNuclearBoiler var blockControlRod: Block = new TileControlRod - var blockThermometer: Block = new TileThermometer var blockFusionCore: Block = new TilePlasmaHeater var blockPlasma: Block = new TilePlasma var blockElectromagnet: Block = new TileElectromagnet @@ -128,7 +127,6 @@ object AtomicContent extends ContentHolder super.preInit() //Annotation Packet Users - PacketAnnotationManager.INSTANCE.register(classOf[TileThermometer]) PacketAnnotationManager.INSTANCE.register(classOf[TileReactorCell]) PacketAnnotationManager.INSTANCE.register(classOf[TileChemicalExtractor]) 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(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(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(itemFissileFuel, "CUC", "CUC", "CUC", 'U', "ingotUranium", 'C', "cellEmpty") recipes += shaped(itemBreedingRod, "CUC", "CUC", "CUC", 'U', "breederUranium", 'C', "cellEmpty") diff --git a/src/main/scala/resonantinduction/atomic/schematic/SchematicBreedingReactor.scala b/src/main/scala/resonantinduction/atomic/schematic/SchematicBreedingReactor.scala index 7497dfe68..6617ba984 100644 --- a/src/main/scala/resonantinduction/atomic/schematic/SchematicBreedingReactor.scala +++ b/src/main/scala/resonantinduction/atomic/schematic/SchematicBreedingReactor.scala @@ -42,7 +42,6 @@ class SchematicBreedingReactor extends Schematic 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, -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, -2, z), new Pair[Block, Integer](Blocks.redstone_wire, 0)) } diff --git a/src/main/scala/resonantinduction/atomic/schematic/SchematicFissionReactor.scala b/src/main/scala/resonantinduction/atomic/schematic/SchematicFissionReactor.scala index eb08e99b4..2f4a141b5 100644 --- a/src/main/scala/resonantinduction/atomic/schematic/SchematicFissionReactor.scala +++ b/src/main/scala/resonantinduction/atomic/schematic/SchematicFissionReactor.scala @@ -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, -2, 0), new Pair[Block, Integer](Blocks.redstone_wire, 0)) returnMap.put(new Vector3, new Pair[Block, Integer](AtomicContent.blockReactorCell, 0))