more FEL, small fixes

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

@@ -92,7 +92,7 @@ public class WasteEarth extends Block {
 	@Override
 	public void updateTick(World world, int x, int y, int z, Random rand) {
 
-		if((this == ModBlocks.waste_earth || this == ModBlocks.waste_mycelium) && world.getBlock(x, y + 1, z) == Blocks.air && rand.nextInt(10) == 0) {
+		if((this == ModBlocks.waste_earth || this == ModBlocks.waste_mycelium) && world.getBlock(x, y + 1, z) == Blocks.air && rand.nextInt(1000) == 0) {
 			Block b0;
 			int count = 0;
 			for(int i = -5; i < 5; i++) {

src/main/java/com/hbm/blocks/machine/MachineFEL.java

@@ -1,9 +1,13 @@
 package com.hbm.blocks.machine;
 
 import com.hbm.blocks.BlockDummyable;
+import com.hbm.blocks.ModBlocks;
+import com.hbm.main.MainRegistry;
 import com.hbm.tileentity.machine.TileEntityFEL;
 
+import cpw.mods.fml.common.network.internal.FMLNetworkHandler;
 import net.minecraft.block.material.Material;
+import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 
@@ -31,4 +35,22 @@ public class MachineFEL extends BlockDummyable {
 		return 2;
 	}
 	
+	@Override
+	public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) {
+		if(world.isRemote)
+		{
+			return true;
+		} else if(!player.isSneaking())
+		{
+			int[] pos = this.findCore(world, x, y, z);
+			
+			if(pos == null)
+				return false;
+			
+			FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_fel, world, pos[0], pos[1], pos[2]);
+			return true;
+		} else {
+			return false;
+		}
+	}
 }

src/main/java/com/hbm/blocks/machine/MachineSILEX.java

@@ -53,5 +53,4 @@ public class MachineSILEX extends BlockDummyable {
 			return false;
 		}
 	}
-
 }

src/main/java/com/hbm/crafting/MineralRecipes.java

@@ -314,7 +314,7 @@ public class MineralRecipes {
 		GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.ingot_schrabidium_fuel, 1), new Object[] { "nuggetSchrabidium", "nuggetSchrabidium", "nuggetSchrabidium", "nuggetNeptunium", "nuggetNeptunium", "nuggetNeptunium", ModItems.nugget_beryllium, ModItems.nugget_beryllium, ModItems.nugget_beryllium }));
 		GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.ingot_hes, 1), new Object[] { "nuggetSchrabidium", "nuggetSchrabidium", "nuggetSchrabidium", "nuggetSchrabidium", "nuggetSchrabidium", "nuggetNeptunium", "nuggetNeptunium", ModItems.nugget_beryllium, ModItems.nugget_beryllium }));
 		GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.ingot_les, 1), new Object[] { "nuggetSchrabidium", "nuggetNeptunium", "nuggetNeptunium", "nuggetNeptunium", "nuggetNeptunium", ModItems.nugget_beryllium, ModItems.nugget_beryllium, ModItems.nugget_beryllium, ModItems.nugget_beryllium }));
-		GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.ingot_pu_mix, 1), new Object[] { "nuggetPlutonium239", "nuggetPlutonium239", "nuggetPlutonium239", "nuggetPlutonium239", "nuggetPlutonium239", "nuggetPluonium240", "nuggetPluonium240", "nuggetPluonium240", "nuggetPluonium240" }));
+		GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.ingot_pu_mix, 1), new Object[] { "nuggetPlutonium239", "nuggetPlutonium239", "nuggetPlutonium239", "nuggetPlutonium239", "nuggetPlutonium239", "nuggetPlutonium239", "nuggetPluonium240", "nuggetPluonium240", "nuggetPluonium240" }));
-		GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.ingot_pu_mix, 1), new Object[] { "tinyPu239", "tinyPu239", "tinyPu239", "tinyPu239", "tinyPu239", "tinyPu240", "tinyPu240", "tinyPu240", "tinyPu240" }));
+		GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.ingot_pu_mix, 1), new Object[] { "tinyPu239", "tinyPu239", "tinyPu239", "tinyPu239", "tinyPu239", "tinyPu239", "tinyPu240", "tinyPu240", "tinyPu240" }));
 	}
 }

src/main/java/com/hbm/handler/GUIHandler.java

@@ -777,6 +777,13 @@ public class GUIHandler implements IGuiHandler {
 			}
 			return null;
 		}
+
+		case ModBlocks.guiID_fel: {
+			if(entity instanceof TileEntityFEL) {
+				return new ContainerFEL(player.inventory, (TileEntityFEL) entity);
+			}
+			return null;
+		}
 		}
 		// NON-TE CONTAINERS
 

src/main/java/com/hbm/inventory/container/ContainerFEL.java

@@ -0,0 +1,64 @@
+package com.hbm.inventory.container;
+
+import com.hbm.tileentity.machine.TileEntityFEL;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.inventory.Container;
+import net.minecraft.inventory.Slot;
+import net.minecraft.item.ItemStack;
+
+public class ContainerFEL extends Container {
+
+	private TileEntityFEL microwave;
+
+	public ContainerFEL(InventoryPlayer invPlayer, TileEntityFEL tedf) {
+
+		microwave = tedf;
+
+		this.addSlotToContainer(new Slot(tedf, 0, 26, 53));
+
+		for(int i = 0; i < 3; i++) {
+			for(int j = 0; j < 9; j++) {
+				this.addSlotToContainer(new Slot(invPlayer, j + i * 9 + 9, 8 + j * 18, 84 + i * 18));
+			}
+		}
+
+		for(int i = 0; i < 9; i++) {
+			this.addSlotToContainer(new Slot(invPlayer, i, 8 + i * 18, 142));
+		}
+	}
+
+	@Override
+	public ItemStack transferStackInSlot(EntityPlayer p_82846_1_, int par2) {
+		ItemStack var3 = null;
+		Slot var4 = (Slot) this.inventorySlots.get(par2);
+
+		if(var4 != null && var4.getHasStack()) {
+			ItemStack var5 = var4.getStack();
+			var3 = var5.copy();
+
+			if(par2 == 0) {
+				if(!this.mergeItemStack(var5, 1, this.inventorySlots.size(), true)) {
+					return null;
+				}
+			} else {
+				if(!this.mergeItemStack(var5, 0, 1, true))
+					return null;
+			}
+
+			if(var5.stackSize == 0) {
+				var4.putStack((ItemStack) null);
+			} else {
+				var4.onSlotChanged();
+			}
+		}
+
+		return var3;
+	}
+
+	@Override
+	public boolean canInteractWith(EntityPlayer player) {
+		return microwave.isUseableByPlayer(player);
+	}
+}

src/main/java/com/hbm/inventory/container/ContainerPlasmaHeater.java

@@ -12,7 +12,7 @@ import net.minecraft.item.ItemStack;
 
 public class ContainerPlasmaHeater extends Container {
 
-private TileEntityMachinePlasmaHeater microwave;
+	private TileEntityMachinePlasmaHeater microwave;
 
 	public ContainerPlasmaHeater(InventoryPlayer invPlayer, TileEntityMachinePlasmaHeater tedf) {
 
@@ -24,53 +24,44 @@ private TileEntityMachinePlasmaHeater microwave;
 		this.addSlotToContainer(new Slot(tedf, 3, 152, 17));
 		this.addSlotToContainer(new SlotMachineOutput(tedf, 4, 152, 53));
 
-		for(int i = 0; i < 3; i++)
+		for(int i = 0; i < 3; i++) {
-		{
+			for(int j = 0; j < 9; j++) {
-			for(int j = 0; j < 9; j++)
-			{
 				this.addSlotToContainer(new Slot(invPlayer, j + i * 9 + 9, 8 + j * 18, 84 + i * 18));
 			}
 		}
 
-		for(int i = 0; i < 9; i++)
+		for(int i = 0; i < 9; i++) {
-		{
 			this.addSlotToContainer(new Slot(invPlayer, i, 8 + i * 18, 142));
 		}
 	}
 
 	@Override
-    public ItemStack transferStackInSlot(EntityPlayer p_82846_1_, int par2)
+	public ItemStack transferStackInSlot(EntityPlayer p_82846_1_, int par2) {
-    {
 		ItemStack var3 = null;
 		Slot var4 = (Slot) this.inventorySlots.get(par2);
 
-		if (var4 != null && var4.getHasStack())
+		if(var4 != null && var4.getHasStack()) {
-		{
 			ItemStack var5 = var4.getStack();
 			var3 = var5.copy();
 
-            if (par2 <= 4) {
+			if(par2 <= 4) {
-				if (!this.mergeItemStack(var5, 5, this.inventorySlots.size(), true))
+				if(!this.mergeItemStack(var5, 5, this.inventorySlots.size(), true)) {
-				{
 					return null;
 				}
 			} else {
-				if (!this.mergeItemStack(var5, 0, 1, true))
+				if(!this.mergeItemStack(var5, 0, 1, true))
 					return null;
 			}
 
-			if (var5.stackSize == 0)
+			if(var5.stackSize == 0) {
-			{
 				var4.putStack((ItemStack) null);
-			}
+			} else {
-			else
-			{
 				var4.onSlotChanged();
 			}
 		}
 
 		return var3;
-    }
+	}
 
 	@Override
 	public boolean canInteractWith(EntityPlayer player) {

src/main/java/com/hbm/items/ModItems.java

@@ -3871,7 +3871,7 @@ public class ModItems {
 		linker = new ItemTeleLink().setUnlocalizedName("linker").setMaxStackSize(1).setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":linker");
 		reactor_sensor = new ItemReactorSensor().setUnlocalizedName("reactor_sensor").setMaxStackSize(1).setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":reactor_sensor");
 		oil_detector = new ItemOilDetector().setUnlocalizedName("oil_detector").setMaxStackSize(1).setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":oil_detector");
-		turret_control = new ItemTurretControl().setUnlocalizedName("turret_control").setFull3D().setMaxStackSize(1).setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":turret_control");
+		turret_control = new ItemTurretControl().setUnlocalizedName("turret_control").setFull3D().setMaxStackSize(1).setCreativeTab(null).setTextureName(RefStrings.MODID + ":turret_control");
 		turret_chip = new ItemTurretChip().setUnlocalizedName("turret_chip").setMaxStackSize(1).setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":turret_chip");
 		turret_biometry = new ItemTurretBiometry().setUnlocalizedName("turret_biometry").setFull3D().setMaxStackSize(1).setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":rei_scanner");
 		geiger_counter = new ItemGeigerCounter().setUnlocalizedName("geiger_counter").setMaxStackSize(1).setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":geiger_counter");

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

@@ -671,7 +671,7 @@ public class HbmWorldGen implements IWorldGenerator {
 		DungeonToolbox.generateOre(world, rand, i, j, WorldConfig.netherCoalSpawn, 32, 16, 96, ModBlocks.ore_nether_coal, Blocks.netherrack);
 		
 		if(GeneralConfig.enablePlutoniumOre)
-			DungeonToolbox.generateOre(world, rand, i, j, WorldConfig.netherPlutoniumSpawn, 4, 0, 127, ModBlocks.ore_nether_uranium, Blocks.netherrack);
+			DungeonToolbox.generateOre(world, rand, i, j, WorldConfig.netherPlutoniumSpawn, 4, 0, 127, ModBlocks.ore_nether_plutonium, Blocks.netherrack);
 
 		for(int k = 0; k < 30; k++){
 			int x = i + rand.nextInt(16);

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

@@ -496,7 +496,7 @@ public class CraftingManager {
 		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.fluid_duct, 8), new Object[] { "SAS", "   ", "SAS", 'S', "plateSteel", 'A', "plateAluminum" }));
 		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.machine_assembler, 1), new Object[] { "WWW", "MCM", "ISI", 'W', "paneGlass", 'M', ModItems.motor, 'C', ModItems.circuit_aluminium, 'I', "blockCopper", 'S', "blockSteel" }));
 		GameRegistry.addRecipe(new ItemStack(ModItems.template_folder, 1), new Object[] { "LPL", "BPB", "LPL", 'P', Items.paper, 'L', new ItemStack(Items.dye, 1, 4), 'B', new ItemStack(Items.dye, 1, 15) });
-		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.turret_control, 1), new Object[] { "R12", "PPI", "  I", 'R', Items.redstone, '1', ModItems.circuit_aluminium, '2', ModItems.circuit_red_copper, 'P', "plateSteel", 'I', "ingotSteel" }));
+		//GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.turret_control, 1), new Object[] { "R12", "PPI", "  I", 'R', Items.redstone, '1', ModItems.circuit_aluminium, '2', ModItems.circuit_red_copper, 'P', "plateSteel", 'I', "ingotSteel" }));
 		GameRegistry.addRecipe(new ItemStack(ModItems.pellet_antimatter, 1), new Object[] { "###", "###", "###", '#', ModItems.cell_antimatter });
 		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.fluid_tank_empty, 8), new Object[] { "121", "1 1", "121", '1', "plateAluminum", '2', "plateIron" }));
 		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.fluid_barrel_empty, 2), new Object[] { "121", "1 1", "121", '1', "plateSteel", '2', "plateAluminum" }));

src/main/java/com/hbm/main/ModEventHandler.java

@@ -129,7 +129,7 @@ public class ModEventHandler
 		
 		EntityPlayer player = event.player;
 		
-		if(player.getDisplayName().equals("Dr_Nostalgia") && !player.worldObj.isRemote) {
+		if(player.getUniqueID().toString().equals(Library.Dr_Nostalgia) && !player.worldObj.isRemote) {
 			
 			if(!player.inventory.hasItem(ModItems.hat))
 				player.inventory.addItemStackToInventory(new ItemStack(ModItems.hat));

src/main/java/com/hbm/tileentity/machine/TileEntityFEL.java

@@ -1,11 +1,26 @@
 package com.hbm.tileentity.machine;
 
+import com.hbm.tileentity.TileEntityMachineBase;
+
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.AxisAlignedBB;
 
-public class TileEntityFEL extends TileEntity {
+public class TileEntityFEL extends TileEntityMachineBase {
+	
+	public TileEntityFEL() {
+		super(1);
+	}
+
+	@Override
+	public String getName() {
+		return "container.machineFEL";
+	}
+
+	@Override
+	public void updateEntity() {
+		
+	}
 
 	@Override
 	public AxisAlignedBB getRenderBoundingBox() {

src/main/java/com/hbm/tileentity/turret/TileEntityTurretBaseNT.java

@@ -7,6 +7,7 @@ import java.util.List;
 import com.hbm.blocks.BlockDummyable;
 import com.hbm.entity.logic.EntityBomber;
 import com.hbm.entity.missile.EntityMissileBaseAdvanced;
+import com.hbm.entity.missile.EntityMissileCustom;
 import com.hbm.entity.projectile.EntityBulletBase;
 import com.hbm.handler.BulletConfigSyncingUtil;
 import com.hbm.handler.BulletConfiguration;
@@ -22,7 +23,6 @@ import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.INpc;
 import net.minecraft.entity.item.EntityMinecart;
-import net.minecraft.entity.monster.EntityCreeper;
 import net.minecraft.entity.monster.IMob;
 import net.minecraft.entity.passive.IAnimals;
 import net.minecraft.entity.player.EntityPlayer;
@@ -175,6 +175,7 @@ public abstract class TileEntityTurretBaseNT extends TileEntityMachineBase imple
 			
 			if(this.target != null && !target.isEntityAlive()) {
 				this.target = null;
+				this.tPos = null;
 				this.stattrak++;
 			}
 			
@@ -185,7 +186,9 @@ public abstract class TileEntityTurretBaseNT extends TileEntityMachineBase imple
 				
 				if(searchTimer <= 0) {
 					searchTimer = this.getDecetorInterval();
-					this.seekNewTarget();
+					
+					if(this.target == null)
+						this.seekNewTarget();
 				}
 			} else {
 				searchTimer = 0;
@@ -545,6 +548,8 @@ public abstract class TileEntityTurretBaseNT extends TileEntityMachineBase imple
 
 			if(e instanceof EntityMissileBaseAdvanced)
 				return true;
+			if(e instanceof EntityMissileCustom)
+				return true;
 			if(e instanceof EntityMinecart)
 				return true;
 			if(e instanceof EntityBomber)

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

@@ -552,8 +552,8 @@ item.ammo_rocket_shrapnel.name=84mm Rakete (Schrapnell)
 item.ammo_rocket_sleek.name=84mm Rakete (IF-R&D)
 item.ammo_rocket_toxic.name=84mm Rakete (Chemisch)
 item.ammo_shell.name=240mm Geschoss
-item.ammo_shell_apfsds_du.name=240mm APFSTS-DU
+item.ammo_shell_apfsds_du.name=240mm APFSDS-DU
-item.ammo_shell_apfsds_t.name=240mm APFSTS-T
+item.ammo_shell_apfsds_t.name=240mm APFSDS-T
 item.ammo_shell_explosive.name=240mm HE-Geschoss
 item.ammo_shell_w9.name=240mm W9 Atomares Geschoss
 item.ams_catalyst_aluminium.name=Aluminium-Reaktionskatalysator

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

@@ -554,8 +554,8 @@ item.ammo_rocket_shrapnel.name=84mm Rocket (Shrapnel)
 item.ammo_rocket_sleek.name=84mm Rocket (IF-R&D)
 item.ammo_rocket_toxic.name=84mm Rocket (Chemical)
 item.ammo_shell.name=240mm Shell
-item.ammo_shell_apfsds_du.name=240mm APFSTS-DU
+item.ammo_shell_apfsds_du.name=240mm APFSDS-DU
-item.ammo_shell_apfsds_t.name=240mm APFSTS-T
+item.ammo_shell_apfsds_t.name=240mm APFSDS-T
 item.ammo_shell_explosive.name=240mm HE Shell
 item.ammo_shell_w9.name=240mm W9 Nuclear Shell
 item.ams_catalyst_aluminium.name=Aluminium Reaction Catalyst