fuck off

changelog

@@ -1,3 +1,17 @@
+## Added
+* Bauxite processing
+  * Bauxite is now processed by mixing it with lye, and then fractioning it into sodium aluminate and red mud
+  * Red mud can now be turned into cement
+  * Sodium aluminate can either be processed directly into aluminium in a rotary furnace, or turned into alumina with fluorite to be used in an electrolyzer
+  * Standard aluminium ore is now "aluminium-bearing ore" which drops cryolite, which can either be smelted into aluminium like normal or combination smelted into aluminium and lye
+* Particle accelerator
+  * Should be about finished now
+  * Recipes should now be doable
+  * Added recipes to all the components
+  * Changed the dipole mechanic from a momentum penalty to a power draw penalty for smaller accelerator rings
+  * Added explicit compressor recipes for perfluoromethyl in order to change the standard compression speed of 100 ticks to 50
+  * All the parts have tooltips, you'll figure it out
+
 ## Changed
 * Blast doors will now pulverize any block that gets in their way during closing
 * The nuclear and RTG furnaces will be retired, their recipes have been removed but they remain operational for now

gradle.properties

@@ -1,6 +1,6 @@
 mod_version=1.0.27
 # Empty build number makes a release type
-mod_build_number=5224
+mod_build_number=5229
 
 credits=HbMinecraft,\
   \ rodolphito (explosion algorithms),\
@@ -38,7 +38,7 @@ credits=HbMinecraft,\
   \ VT-6/24 (models, textures),\
   \ Nos (models),\
   \ Minecreep (models),\
-  \ 70k (textures, glyphid AI, strand caster, electrolyzer changes),\
+  \ 70k (textures, glyphid AI, strand caster, electrolyzer changes, cryolite),\
   \ haru315 (spiral point algorithm),\
   \ Sten89 (models),\
   \ Pixelguru26 (textures),\

src/main/java/com/hbm/inventory/fluid/Fluids.java

@@ -391,14 +391,14 @@ public class Fluids {
 		VITRIOL =				new FluidType("VITRIOL",			0x6E5222, 2, 0, 1, EnumSymbol.NONE).addTraits(LIQUID, VISCOUS);
 		SLOP =					new FluidType("SLOP",				0x929D45, 0, 0, 0, EnumSymbol.NONE).addTraits(LIQUID, VISCOUS);
 		LEAD =					new FluidType("LEAD",				0x666672, 4, 0, 0, EnumSymbol.NONE).setTemp(350).addTraits(LIQUID, VISCOUS);
-		LEAD_HOT =				new FluidType("LEAD_HOT",		0x776563, 4, 0, 0, EnumSymbol.NONE).setTemp(1500).addTraits(LIQUID, VISCOUS);
+		LEAD_HOT =				new FluidType("LEAD_HOT",			0x776563, 4, 0, 0, EnumSymbol.NONE).setTemp(1500).addTraits(LIQUID, VISCOUS);
 		PERFLUOROMETHYL =		new FluidType("PERFLUOROMETHYL",	0xBDC8DC, 1, 0, 1, EnumSymbol.NONE).setTemp(15).addTraits(LIQUID);
 		PERFLUOROMETHYL_COLD =	new FluidType("PERFLUOROMETHYL_COLD",0x99DADE, 1, 0, 1, EnumSymbol.NONE).setTemp(-150).addTraits(LIQUID);
 		PERFLUOROMETHYL_HOT =	new FluidType("PERFLUOROMETHYL_HOT",0xB899DE, 1, 0, 1, EnumSymbol.NONE).setTemp(250).addTraits(LIQUID);
-		LYE =					new FluidType("LYE",			0xFFECCC, 3, 0, 1, EnumSymbol.ACID).addTraits(new FT_Corrosive(40), LIQUID);
-		SODIUM_ALUMINATE =		new FluidType("SODIUM_ALUMINATE",			0xFFD191, 3, 0, 1, EnumSymbol.ACID).addTraits(new FT_Corrosive(30), LIQUID);
-		BAUXITE_SOLUTION =		new FluidType("BAUXITE_SOLUTION",			0xE2560F, 3, 0, 3, EnumSymbol.ACID).addTraits(new FT_Corrosive(40), LIQUID, VISCOUS);
-		ALUMINA =				new FluidType(150,"ALUMINA",			0xDDFFFF, 0, 0, 0, EnumSymbol.NONE).addTraits(LIQUID);
+		LYE =					new FluidType("LYE",				0xFFECCC, 3, 0, 1, EnumSymbol.ACID).addTraits(new FT_Corrosive(40), LIQUID);
+		SODIUM_ALUMINATE =		new FluidType("SODIUM_ALUMINATE",	0xFFD191, 3, 0, 1, EnumSymbol.ACID).addTraits(new FT_Corrosive(30), LIQUID);
+		BAUXITE_SOLUTION =		new FluidType("BAUXITE_SOLUTION",	0xE2560F, 3, 0, 3, EnumSymbol.ACID).addTraits(new FT_Corrosive(40), LIQUID, VISCOUS);
+		ALUMINA =				new FluidType(150,"ALUMINA",		0xDDFFFF, 0, 0, 0, EnumSymbol.NONE).addTraits(LIQUID);
 
 		// ^ ^ ^ ^ ^ ^ ^ ^
 		//ADD NEW FLUIDS HERE

src/main/java/com/hbm/inventory/gui/GUIPADetector.java

@@ -38,7 +38,7 @@ public class GUIPADetector extends GuiInfoContainer {
 	protected void drawGuiContainerForegroundLayer( int i, int j) {
 		
 		String name = this.source.hasCustomInventoryName() ? this.source.getInventoryName() : I18n.format(this.source.getInventoryName());
-		this.fontRendererObj.drawString(name, this.xSize / 2 - this.fontRendererObj.getStringWidth(name) / 2 - 9, 6, 4210752);
+		this.fontRendererObj.drawString(name, this.xSize / 2 - this.fontRendererObj.getStringWidth(name) / 2 - 9, 4, 4210752);
 		this.fontRendererObj.drawString(I18n.format("container.inventory"), 8, this.ySize - 96 + 2, 4210752);
 
 		this.fontRendererObj.drawString(EnumChatFormatting.AQUA + "/123K", 136, 22, 4210752);

src/main/java/com/hbm/inventory/gui/GUIPASource.java

@@ -66,7 +66,7 @@ public class GUIPASource extends GuiInfoContainer {
 	protected void drawGuiContainerForegroundLayer( int i, int j) {
 		
 		String name = this.source.hasCustomInventoryName() ? this.source.getInventoryName() : I18n.format(this.source.getInventoryName());
-		this.fontRendererObj.drawString(name, this.xSize / 2 - this.fontRendererObj.getStringWidth(name) / 2 - 9, 6, 4210752);
+		this.fontRendererObj.drawString(name, this.xSize / 2 - this.fontRendererObj.getStringWidth(name) / 2 - 9, 4, 4210752);
 		this.fontRendererObj.drawString(I18n.format("container.inventory"), 8, this.ySize - 96 + 2, 4210752);
 
 		this.fontRendererObj.drawString(EnumChatFormatting.AQUA + "/123K", 136, 22, 4210752);

src/main/java/com/hbm/inventory/recipes/AssemblerRecipes.java

@@ -108,7 +108,7 @@ public class AssemblerRecipes extends SerializableRecipe {
 		makeRecipe(new ComparableStack(ModItems.tritium_deuterium_cake, 1), new AStack[] {new ComparableStack(ModItems.cell_deuterium, 6), new ComparableStack(ModItems.cell_tritium, 2), new OreDictStack(LI.ingot(), 4), },150);
 		makeRecipe(new ComparableStack(ModItems.pellet_cluster, 1), new AStack[] {new OreDictStack(STEEL.plate(), 4), new ComparableStack(Blocks.tnt, 1), }, 50);
 		makeRecipe(new ComparableStack(ModItems.pellet_buckshot, 1), new AStack[] {new OreDictStack(PB.nugget(), 6), }, 50);
-		makeRecipe(new ComparableStack(ModItems.magnetron, 1), new AStack[] {new OreDictStack(CU.plate(), 3), new OreDictStack(W.wireFine(), 4), },100);
+		makeRecipe(new ComparableStack(ModItems.magnetron, 1), new AStack[] {new OreDictStack(CU.plate(), 3), new OreDictStack(W.wireFine(), 4), }, 40);
 		makeRecipe(new ComparableStack(ModItems.redcoil_capacitor, 1), new AStack[] {new OreDictStack(GOLD.plate(), 3), new ComparableStack(ModItems.fuse, 1), new OreDictStack(ALLOY.wireFine(), 4), new ComparableStack(ModItems.coil_advanced_alloy, 6), new ComparableStack(Blocks.redstone_block, 2), },200);
 		makeRecipe(new ComparableStack(ModItems.part_lithium, 8), new AStack[] {new OreDictStack(ANY_RUBBER.ingot(), 1), new OreDictStack(LI.dust(), 1), },50);
 		makeRecipe(new ComparableStack(ModItems.part_beryllium, 8), new AStack[] {new OreDictStack(ANY_RUBBER.ingot(), 1), new OreDictStack(BE.dust(), 1), },50);

src/main/java/com/hbm/inventory/recipes/ChemplantRecipes.java

@@ -9,7 +9,6 @@ import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.stream.JsonWriter;
-import com.hbm.blocks.BlockEnums;
 import com.hbm.blocks.ModBlocks;
 import com.hbm.config.GeneralConfig;
 import com.hbm.inventory.FluidStack;
@@ -19,7 +18,6 @@ import com.hbm.inventory.RecipesCommon.ComparableStack;
 import com.hbm.inventory.RecipesCommon.OreDictStack;
 import com.hbm.inventory.fluid.Fluids;
 import com.hbm.inventory.recipes.loader.SerializableRecipe;
-import com.hbm.items.ItemEnums;
 import com.hbm.items.ModItems;
 import com.hbm.main.MainRegistry;
 

src/main/java/com/hbm/inventory/recipes/CombinationRecipes.java

@@ -9,8 +9,6 @@ import static com.hbm.inventory.OreDictManager.*;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.stream.JsonWriter;
-import com.hbm.blocks.BlockEnums.EnumStoneType;
-import com.hbm.blocks.ModBlocks;
 import com.hbm.inventory.FluidStack;
 import com.hbm.inventory.OreDictManager.DictFrame;
 import com.hbm.inventory.RecipesCommon.AStack;

src/main/java/com/hbm/inventory/recipes/CompressorRecipes.java

@@ -27,7 +27,8 @@ public class CompressorRecipes extends SerializableRecipe {
 
 		recipes.put(new Pair(Fluids.BLOOD, 3), new CompressorRecipe(1_000, new FluidStack(Fluids.HEAVYOIL, 250, 0), 200));
 
-		recipes.put(new Pair(Fluids.PERFLUOROMETHYL, 1), new CompressorRecipe(1_000, new FluidStack(Fluids.PERFLUOROMETHYL_COLD, 1_000, 0), 100));
+		recipes.put(new Pair(Fluids.PERFLUOROMETHYL, 0), new CompressorRecipe(1_000, new FluidStack(Fluids.PERFLUOROMETHYL, 1_000, 1), 50));
+		recipes.put(new Pair(Fluids.PERFLUOROMETHYL, 1), new CompressorRecipe(1_000, new FluidStack(Fluids.PERFLUOROMETHYL_COLD, 1_000, 0), 50));
 	}
 
 	public static HashMap getRecipes() {

src/main/java/com/hbm/inventory/recipes/ElectrolyserFluidRecipes.java

@@ -13,7 +13,6 @@ import com.hbm.inventory.FluidStack;
 import com.hbm.inventory.fluid.FluidType;
 import com.hbm.inventory.fluid.Fluids;
 import com.hbm.inventory.recipes.loader.SerializableRecipe;
-import com.hbm.items.ItemEnums;
 import com.hbm.items.ModItems;
 import com.hbm.items.machine.ItemFluidIcon;
 

src/main/java/com/hbm/inventory/recipes/ParticleAcceleratorRecipes.java

@@ -182,7 +182,7 @@ public class ParticleAcceleratorRecipes extends SerializableRecipe {
 		
 		writer.name("outputs").beginArray();
 		this.writeItemStack(rec.output1, writer);
-		this.writeItemStack(rec.output2, writer);
+		if(rec.output2 != null) this.writeItemStack(rec.output2, writer);
 		writer.endArray();
 	}
 }

src/main/java/com/hbm/lib/RefStrings.java

@@ -3,7 +3,7 @@ package com.hbm.lib;
 public class RefStrings {
 	public static final String MODID = "hbm";
 	public static final String NAME = "Hbm's Nuclear Tech Mod";
-	public static final String VERSION = "1.0.27 BETA (5224)";
+	public static final String VERSION = "1.0.27 BETA (5229)";
 	//HBM's Beta Naming Convention:
 	//V T (X)
 	//V -> next release version

src/main/java/com/hbm/tileentity/machine/albion/TileEntityPASource.java

@@ -241,7 +241,7 @@ public class TileEntityPASource extends TileEntityCooledBase implements IGUIProv
 		public int momentum;
 		public int defocus;
 		public int distanceTraveled;
-		public static final int maxDefocus = 100;
+		public static final int maxDefocus = 1000;
 		public boolean invalid = false;
 		
 		public ItemStack input1;

src/main/resources/assets/hbm/lang/de_DE.lang

@@ -405,6 +405,10 @@ container.nukeSolinium=Die Blauspülung
 container.nukeTsar=Tsar Bombe
 container.oilWell=Ölbohrturm
 container.orbus=Schwerer Magnetischer Lagerbehälter
+container.paDetector=Detektor
+container.paDipole=Dipol
+container.paQuadrupole=Quad.
+container.paSource=Teilchenquelle
 container.plasmaHeater=Plasmaerhitzer
 container.press=Befeuerte Presse
 container.puf6_tank=PuF6 Tank
@@ -872,6 +876,7 @@ hbmmat.cobalt=Kobalt
 hbmmat.cobalt60=Kobalt-60
 hbmmat.coltan=Coltan
 hbmmat.copper=Kupfer
+hbmmat.cryolite=Kryolith
 hbmmat.desh=Desh
 hbmmat.diamond=Diamant
 hbmmat.dineutronium=Dineutronium
@@ -1723,7 +1728,8 @@ item.chopper_head.name=Jagdschrauber Cockpit
 item.chopper_tail.name=Jagdschrauber Heck
 item.chopper_torso.name=Jagdschrauber Rumpf
 item.chopper_wing.name=Jagdschrauber Seitentragfläche
-item.chunk_ore.malachite.name=Malachit-Brocken
+item.chunk_ore.cryolite.name=Kryolithbrocken
+item.chunk_ore.malachite.name=Malachitbrocken
 item.chunk_ore.rare.name=Seltenerdenerz-Brocken
 item.cigarette.name=FFI-Markenzigarette
 item.cinnebar.name=Zinnober
@@ -4650,7 +4656,7 @@ tile.oil_duct_solid.name=Verstärktes Ölrohr
 tile.oil_pipe.name=Rohölrohr
 tile.oil_spill.name=Ölteppich
 tile.ore_alexandrite.name=Alexandriterz
-tile.ore_aluminium.name=Aluminiumerz
+tile.ore_aluminium.name=Aluminiumhaltiges Erz
 tile.ore_asbestos.name=Asbesterz
 tile.ore_australium.name=Australisches Erz
 tile.ore_basalt_asbestos.name=Asbestreicher Basalt

src/main/resources/assets/hbm/lang/en_US.lang

@@ -808,6 +808,10 @@ container.nukeSolinium=The Blue Rinse
 container.nukeTsar=Tsar Bomba
 container.oilWell=Oil Derrick
 container.orbus=Heavy Antimatter Storage
+container.paDetector=Detector
+container.paDipole=Dipole
+container.paQuadrupole=Quad.
+container.paSource=Particle Source
 container.plasmaHeater=Plasma Heater
 container.press=Burner Press
 container.puf6_tank=PuF6 Tank
@@ -5778,7 +5782,7 @@ tile.oil_duct_solid.name=Coated Oil Pipe
 tile.oil_pipe.name=Crude Oil Extraction Pipe
 tile.oil_spill.name=Oil Spill
 tile.ore_alexandrite.name=Alexandrite Ore
-tile.ore_aluminium.name=Aluminium Ore
+tile.ore_aluminium.name=Aluminium-Bearing Ore
 tile.ore_asbestos.name=Asbestos Ore
 tile.ore_australium.name=Australian Ore
 tile.ore_basalt_asbestos.name=Asbestos-Rich Basalt
@@ -5873,7 +5877,7 @@ tile.pa_dipole.desc=Requires cooling!$Redirects particles based on momentum.$Has
 tile.pa_quadrupole.name=Quadrupole Magnets
 tile.pa_quadrupole.desc=Requires cooling!$Reduces particle defocus by 100 points.$Requires large coils to work.
 tile.pa_rfc.name=RF Cavity
-tile.pa_rfc.desc=Requires cooling!$Accelerates particles by 100 points,$and adds 100 points of defocus.
+tile.pa_rfc.desc=Requires cooling!$Accelerates particles by 100 points,$and adds 100 points of defocus.$The particle will crash when reaching points of 1000 defocus.
 tile.pa_source.name=Particle Source
 tile.pa_source.desc=Requires cooling!$Uses two items to create a particle.
 tile.part_emitter.name=Deco Particle Emitter