Ironclad Compressor

assets/bundles/bundle.properties

@@ -135,11 +135,8 @@ block.uaw-gelatinizer.details = When mixed with sand, cryofluid can be gelatiniz
 block.uaw-cryofluid-blender.name = Cryofluid Blender
 block.uaw-cryofluid-blender.description = Rapidly mixes water with fine titanium powder to produce cryofluid.
 
-block.uaw-plastanium-fabricator.name = Plastanium Fabricator
-block.uaw-plastanium-fabricator.description = Rapidly produces plastanium from oil and titanium.
-
-block.uaw-steam-press.name = Steam Press
-block.uaw-steam-press.description = Rapidly compresses coal into graphite.
+block.uaw-ironclad-compress.name = Ironclad Compressor
+block.uaw-ironclad-compress.description = [EHE]
 
 block.uaw-petroleum-crucible.name = Petroleum Crucible
 block.uaw-petroleum-crucible.description = Produces silicon and metaglass at a very high rate using oil as fuel.

src/UAW/content/UAWItems.java

@@ -2,6 +2,7 @@
 
 import UAW.audiovisual.UAWPal;
 import arc.graphics.Color;
+import mindustry.graphics.Pal;
 import mindustry.type.Item;
 
 public class UAWItems {
@@ -14,7 +15,7 @@ public class UAWItems {
 	sulphur, anthracite;
 
 	public static void load() {
-		cryogel = new Item("item-cryogel", Color.valueOf("87ceeb")) {{
+		cryogel = new Item("item-cryogel", UAWPal.cryoMiddle) {{
 			flammability = -10f;
 			explosiveness = 0f;
 		}};
@@ -39,16 +40,26 @@ public class Munitions {
 		emptyBulletCasing, emptyMineCanister,
 
 		// Bullets
-		standardBullet, incendiaryBullet, cryoBullet, armourPiercingBullet, spreadShotBullet, explosiveBullet, phaseBullet, arcBullet,
+		standardBullet, incendiaryBullet, cryoBullet, armourPiercingBullet, spreadShotBullet, explosiveBullet, arcBullet,
 
 		// Mine Canister
 		standardMineCanister, incendiaryMineCanister, cryoMineCanister, antiAirMineCanister, sporeMineCanister, empMineCanister, nukeMineCanister;
 
 		public static void load() {
+			emptyBulletCasing = new Item("item-bullet-empty", Color.valueOf("989aa4"));
 			emptyMineCanister = new Item("item-mine-empty", Color.valueOf("989aa4"));
+
+			standardBullet = new Item("item-bullet-basic", Color.valueOf("eab678"));
+			incendiaryBullet = new Item("item-bullet-incendiary", Color.valueOf("e48c57"));
+			cryoMineCanister = new Item("item-bullet-cryo", UAWPal.cryoMiddle);
+			armourPiercingBullet = new Item("item-bullet-ap", Color.valueOf("ebeef5"));
+			spreadShotBullet = new Item("item-bullet-spreadshot", Color.valueOf("646469"));
+			explosiveBullet = new Item("item-bullet-explosive", Color.valueOf("e46b58"));
+			arcBullet = new Item("item-bullet-arc", Pal.lancerLaser);
+
 			standardMineCanister = new Item("item-mine-basic", Color.valueOf("eab678"));
 			incendiaryMineCanister = new Item("item-mine-incendiary", Color.valueOf("e48c57"));
-			cryoMineCanister = new Item("item-mine-cryo", Color.valueOf("87ceeb"));
+			cryoMineCanister = new Item("item-mine-cryo", UAWPal.cryoMiddle);
 			antiAirMineCanister = new Item("item-mine-aa", Color.valueOf("cbd97f"));
 			sporeMineCanister = new Item("item-mine-spore", Color.valueOf("7457ce"));
 			empMineCanister = new Item("item-mine-emp", Color.valueOf("6974c4"));

src/UAW/content/UAWSerpuloTechTree.java

@@ -52,7 +52,7 @@ public static void load() {
 
 				node(steamDrill, () -> {
 					node(advancedSteamDrill);
-					node(steamPress, Seq.with(new Research(multiPress)), () -> {
+					node(ironcladCompressor, Seq.with(new Research(multiPress)), () -> {
 					});
 					node(steamThumper, () -> {
 						node(alloyCrucible, () -> {

src/UAW/content/blocks/UAWBlocksDefence.java

@@ -1462,43 +1462,43 @@ Items.surgeAlloy, new BuckshotBulletType(18, 6f, 60f) {{
 			);
 		}};
 
-		minesAssembler = new MultiCrafter("blast-furnace") {{
-			requirements(Category.crafting, with(
-				Items.lead, 45,
-				Items.graphite, 30,
-				Items.thorium, 20
-			));
-			size = 3;
-
-			hasItems = true;
-			hasLiquids = true;
-			menu = simple;
-			resolvedRecipes = Seq.with(
-				new Recipe() {{
-					input = new IOEntry(
-						Seq.with(with(Items.silicon, 4)),
-						Seq.with()
-					);
-					output = new IOEntry(
-						Seq.with(with(Items.metaglass, 4)),
-						Seq.with()
-					);
-					craftTime = 2 * tick;
-				}},
-				new Recipe() {{
-					input = new IOEntry(
-						Seq.with(with(Items.metaglass, 4)),
-						Seq.with(),
-						85f / tick
-					);
-					output = new IOEntry(
-						Seq.with(with(Items.surgeAlloy, 4)),
-						Seq.with()
-					);
-					craftTime = 4 * tick;
-				}}
-			);
-		}};
+//		minesAssembler = new MultiCrafter("blast-furnace") {{
+//			requirements(Category.crafting, with(
+//				Items.lead, 45,
+//				Items.graphite, 30,
+//				Items.thorium, 20
+//			));
+//			size = 3;
+//
+//			hasItems = true;
+//			hasLiquids = true;
+//			menu = simple;
+//			resolvedRecipes = Seq.with(
+//				new Recipe() {{
+//					input = new IOEntry(
+//						Seq.with(with(Items.silicon, 4)),
+//						Seq.with()
+//					);
+//					output = new IOEntry(
+//						Seq.with(with(Items.metaglass, 4)),
+//						Seq.with()
+//					);
+//					craftTime = 2 * tick;
+//				}},
+//				new Recipe() {{
+//					input = new IOEntry(
+//						Seq.with(with(Items.metaglass, 4)),
+//						Seq.with(),
+//						85f / tick
+//					);
+//					output = new IOEntry(
+//						Seq.with(with(Items.surgeAlloy, 4)),
+//						Seq.with()
+//					);
+//					craftTime = 4 * tick;
+//				}}
+//			);
+//		}};
 		//endregion Serpulo
 	}
 }