mind the GUI

changelog

@@ -1,8 +1,13 @@
-## Changed
-* Sped up the electrolyzer, fluid electrolysis now takes 3 seconds instead of 5 and crystal processing now only takes 20 seconds instead of 50
-* Increased electrolyzer pouring speed to 3 nuggets per tick instead of 1
-* Deco blocks now only drop ingots 25% of the time
-  * The incredibly common structures now only yield a few dozen free ingots instead of several stacks. How horrible!
+## Added
+* More custom machine parts
+  * Custom machines now have a neutron acceptor which allows them to use flux from the breeding reactor in recipes
+  * There is now a heat acceptor which can accept heat from things like fireboxes or electric heaters
+  * Also added a config option to create pollution
 
-## Fixed
-* Fixed radar screens not working at all and potentially freezing the game
+## Changed
+* Deco bocks now drop all of the time, but they drop themselves instead of ingots
+  * To get the ingots, deco blocks now have to be deconstructed in the anvil, yielding an ingot 25% of the time
+  * If I see one more person complaining about the chances I'm reducing it down to 10%
+* Catalytic reformers now have a tooltip informing about the need for a catalytic converter
+* Several guns now have reload animations including most .357 revolvers and Samuel
+* Updated stealth missile texture

gradle.properties

@@ -17,4 +17,5 @@ credits=HbMinecraft, rodolphito (explosion algorithms), grangerave (explosion al
   \ JamesH2 (blood mechanics, nitric acid, particle emitter), sdddddf80 (recipe configs, chinese localization,\
   \ custom machine holograms, I18n improvements), SuperCraftAlex (tooltips) LePeep (coilgun model, BDCL QC),\
   \ 70k (textures, glyphid AI, strand caster), Maksymisio (polish localization) Ice-Arrow (research reactor tweaks),\
-  \ 245tt (anvil GUI improvements), MellowArpeggiation (turbine sounds, sound fixes)
+  \ 245tt (anvil GUI improvements), MellowArpeggiation (new animation system, turbine sounds, sound fixes),\
+  \ FOlkvangrField (custom machine parts)

src/main/java/com/hbm/blocks/generic/BlockDecoCT.java

@@ -1,9 +1,5 @@
 package com.hbm.blocks.generic;
 
-import java.util.Random;
-
-import com.hbm.blocks.ModBlocks;
-import com.hbm.items.ModItems;
 import com.hbm.render.block.ct.CT;
 import com.hbm.render.block.ct.CTStitchReceiver;
 import com.hbm.render.block.ct.IBlockCT;
@@ -12,7 +8,6 @@ import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.item.Item;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.IBlockAccess;
 
@@ -40,16 +35,4 @@ public class BlockDecoCT extends BlockOre implements IBlockCT{
 	public IIcon[] getFragments(IBlockAccess world, int x, int y, int z) {
 		return rec.fragCache;
 	}
-	
-	@Override
-	public Item getItemDropped(int i, Random rand, int j) {
-		if(rand.nextInt(4) != 0) return null;
-		if(this == ModBlocks.deco_aluminium) return ModItems.ingot_aluminium;
-		if(this == ModBlocks.deco_beryllium) return ModItems.ingot_beryllium;
-		if(this == ModBlocks.deco_lead) return ModItems.ingot_lead;
-		if(this == ModBlocks.deco_red_copper) return ModItems.ingot_red_copper;
-		if(this == ModBlocks.deco_steel) return ModItems.ingot_steel;
-		if(this == ModBlocks.deco_tungsten) return ModItems.ingot_tungsten;
-		return null;
-	}
 }

src/main/java/com/hbm/blocks/generic/BlockOre.java

@@ -154,12 +154,6 @@ public class BlockOre extends Block {
 		if(this == ModBlocks.ore_rare || this == ModBlocks.ore_gneiss_rare) {
 			return ModItems.chunk_ore;
 		}
-		if(this == ModBlocks.deco_titanium) {
-			return rand.nextInt(4) == 0 ? ModItems.ingot_titanium : null;
-		}
-		if(this == ModBlocks.deco_asbestos) {
-			return rand.nextInt(4) == 0 ? ModItems.ingot_asbestos : null;
-		}
 		if(this == ModBlocks.ore_asbestos || this == ModBlocks.ore_gneiss_asbestos) {
 			return ModItems.ingot_asbestos;
 		}

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

@@ -1,14 +1,19 @@
 package com.hbm.inventory.gui;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import org.lwjgl.opengl.GL11;
 
 import com.hbm.inventory.container.ContainerMachineCatalyticReformer;
+import com.hbm.items.ModItems;
 import com.hbm.lib.RefStrings;
 import com.hbm.tileentity.machine.oil.TileEntityMachineCatalyticReformer;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.resources.I18n;
 import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.item.ItemStack;
 import net.minecraft.util.ResourceLocation;
 
 public class GUIMachineCatalyticReformer extends GuiInfoContainer {
@@ -33,6 +38,14 @@ public class GUIMachineCatalyticReformer extends GuiInfoContainer {
 		refinery.tanks[2].renderTankInfo(this, mouseX, mouseY, guiLeft + 125, guiTop + 70 - 52, 16, 52);
 		refinery.tanks[3].renderTankInfo(this, mouseX, mouseY, guiLeft + 143, guiTop + 70 - 52, 16, 52);
 		this.drawElectricityInfo(this, mouseX, mouseY, guiLeft + 17, guiTop + 70 - 52, 16, 52, refinery.power, refinery.maxPower);
+
+		if(this.mc.thePlayer.inventory.getItemStack() == null && this.isMouseOverSlot(this.inventorySlots.getSlot(10), mouseX, mouseY) && !this.inventorySlots.getSlot(10).getHasStack()) {
+			List<Object[]> lines = new ArrayList();
+			ItemStack converter = new ItemStack(ModItems.catalytic_converter);
+			lines.add(new Object[] {converter});
+			lines.add(new Object[] {converter.getDisplayName()});
+			this.drawStackText(lines, mouseX, mouseY, this.fontRendererObj);
+		}
 	}
 	
 	@Override

src/main/java/com/hbm/inventory/recipes/anvil/AnvilRecipes.java

@@ -718,6 +718,15 @@ public class AnvilRecipes {
 				}
 		).setTier(2));
 
+		constructionRecipes.add(new AnvilConstructionRecipe(new ComparableStack(ModBlocks.deco_titanium), new AnvilOutput[] {new AnvilOutput(new ItemStack(ModItems.ingot_titanium, 1), 0.25F)}).setTier(1));
+		constructionRecipes.add(new AnvilConstructionRecipe(new ComparableStack(ModBlocks.deco_red_copper), new AnvilOutput[] {new AnvilOutput(new ItemStack(ModItems.ingot_red_copper, 1), 0.25F)}).setTier(1));
+		constructionRecipes.add(new AnvilConstructionRecipe(new ComparableStack(ModBlocks.deco_tungsten), new AnvilOutput[] {new AnvilOutput(new ItemStack(ModItems.ingot_tungsten, 1), 0.25F)}).setTier(1));
+		constructionRecipes.add(new AnvilConstructionRecipe(new ComparableStack(ModBlocks.deco_aluminium), new AnvilOutput[] {new AnvilOutput(new ItemStack(ModItems.ingot_aluminium, 1), 0.25F)}).setTier(1));
+		constructionRecipes.add(new AnvilConstructionRecipe(new ComparableStack(ModBlocks.deco_steel), new AnvilOutput[] {new AnvilOutput(new ItemStack(ModItems.ingot_steel, 1), 0.25F)}).setTier(1));
+		constructionRecipes.add(new AnvilConstructionRecipe(new ComparableStack(ModBlocks.deco_lead), new AnvilOutput[] {new AnvilOutput(new ItemStack(ModItems.ingot_lead, 1), 0.25F)}).setTier(1));
+		constructionRecipes.add(new AnvilConstructionRecipe(new ComparableStack(ModBlocks.deco_beryllium), new AnvilOutput[] {new AnvilOutput(new ItemStack(ModItems.ingot_beryllium, 1), 0.25F)}).setTier(1));
+		constructionRecipes.add(new AnvilConstructionRecipe(new ComparableStack(ModBlocks.deco_asbestos), new AnvilOutput[] {new AnvilOutput(new ItemStack(ModItems.ingot_asbestos, 1), 0.25F)}).setTier(1));
+
 		constructionRecipes.add(new AnvilConstructionRecipe(
 				new ComparableStack(ModBlocks.heater_firebox),
 				new AnvilOutput[] {

src/main/java/com/hbm/main/CraftingManager.java

@@ -1183,8 +1183,8 @@ public class CraftingManager {
 		addRecipeAuto(new ItemStack(ModBlocks.cm_circuit, 1, 2), " I ", "IMI", " I ", 'I', STEEL.ingot(), 'M', ModItems.circuit_red_copper);
 		addRecipeAuto(new ItemStack(ModBlocks.cm_circuit, 1, 3), " I ", "IMI", " I ", 'I', STEEL.ingot(), 'M', ModItems.circuit_gold);
 		addRecipeAuto(new ItemStack(ModBlocks.cm_circuit, 1, 4), " I ", "IMI", " I ", 'I', STEEL.ingot(), 'M', ModItems.circuit_schrabidium);
-		addRecipeAuto(new ItemStack(ModBlocks.cm_flux, 1, 0), "NZN", "ZCZ", "NZN", 'Z', ZR.plateCast(), 'N', ModItems.neutron_reflector, 'C', ModItems.reactor_core);
-		addRecipeAuto(new ItemStack(ModBlocks.cm_heat, 1, 0), "PCP", "PSP", "PCP", 'P', ANY_PLASTIC.ingot(), 'C', ModItems.board_copper, 'S', ModItems.pipes_steel);
+		addRecipeAuto(new ItemStack(ModBlocks.cm_flux, 1, 0), "NNN", "ZCZ", "NNN", 'Z', ZR.plateCast(), 'N', ModItems.neutron_reflector, 'C', ModItems.reactor_core);
+		addRecipeAuto(new ItemStack(ModBlocks.cm_heat, 1, 0), "PCP", "PCP", "PCP", 'P', ModItems.plate_polymer, 'C', CU.ingot());
 	}
 	
 	public static void crumple() {