Bug Fixes Galore

build.gradle

@@ -10,8 +10,8 @@ apply plugin: 'net.minecraftforge.gradle.forge'
 //Only edit below this line, the above code adds and enables the necessary things for Forge to be setup.
 
 
-version = "1.6.5.2"
-version = "1.6.5a-Gv2"
+version = "1.6.8.1"
+version = "1.6.8a-G"
 group = "com.hbm" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 archivesBaseName = "hbm"
 

src/main/java/com/hbm/blocks/gas/BlockGasBase.java

@@ -115,11 +115,14 @@ public ForgeDirection getSecondDirection(World world, int x, int y, int z) {
 	}
 
 	public boolean tryMove(World world, int x, int y, int z, ForgeDirection dir) {
+		BlockPos newPos = new BlockPos(x + dir.offsetX, y + dir.offsetY, z + dir.offsetZ);
 
-		if(world.getBlockState(new BlockPos(x + dir.offsetX, y + dir.offsetY, z + dir.offsetZ)).getBlock() == Blocks.AIR) {
+		if (!world.isBlockLoaded(newPos)) {
+			return false;
+		} else if (world.getBlockState(newPos).getBlock() == Blocks.AIR) {
 			world.setBlockToAir(new BlockPos(x, y, z));
-			world.setBlockState(new BlockPos(x + dir.offsetX, y + dir.offsetY, z + dir.offsetZ), this.getDefaultState());
-			world.scheduleUpdate(new BlockPos(x + dir.offsetX, y + dir.offsetY, z + dir.offsetZ), this, getDelay(world));
+			world.setBlockState(newPos, this.getDefaultState());
+			world.scheduleUpdate(newPos, this, this.getDelay(world));
 			return true;
 		}
 

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

@@ -9,6 +9,7 @@
 
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
+import net.minecraft.block.state.BlockFaceShape;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
@@ -82,7 +83,7 @@ public boolean isLadder(IBlockState state, IBlockAccess world, BlockPos pos, Ent
 	@Override
 	public void addCollisionBoxToList(IBlockState state, World worldIn, BlockPos pos, AxisAlignedBB entityBox, List<AxisAlignedBB> collidingBoxes, Entity entityIn, boolean isActualState){
 		AxisAlignedBB box = state.getCollisionBoundingBox(worldIn, pos);
-		if(box.minY == 0 && box.maxY == 0)
+		if(box!= null && (box.minY == 0 && box.maxY == 0))
 			return;
 		super.addCollisionBoxToList(state, worldIn, pos, entityBox, collidingBoxes, entityIn, isActualState);
 	}
@@ -101,6 +102,14 @@ public void neighborChanged(IBlockState state, World world, BlockPos pos, Block
 		}
 		super.neighborChanged(state, world, pos, blockIn, fromPos);
 	}
+
+	public boolean isPassable(IBlockAccess worldIn, BlockPos pos) {
+		return true;
+	}
+
+	public BlockFaceShape getBlockFaceShape(IBlockAccess worldIn, IBlockState state, BlockPos pos, EnumFacing face) {
+		return BlockFaceShape.UNDEFINED;
+	}
 
 	@Override
 	public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess source, BlockPos pos){

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

@@ -6,6 +6,7 @@
 import com.hbm.interfaces.IDummy;
 import com.hbm.main.MainRegistry;
 import com.hbm.tileentity.machine.TileEntityDummy;
+import com.hbm.tileentity.machine.TileEntityDummyPort;
 import com.hbm.tileentity.machine.TileEntityMachineRadGen;
 
 import net.minecraft.block.BlockContainer;
@@ -38,7 +39,7 @@ public DummyBlockRadGen(Material m, String s) {
 
 	@Override
 	public TileEntity createNewTileEntity(World worldIn, int meta) {
-		return new TileEntityDummy();
+		return new TileEntityDummyPort();
 	}
 
 	@Override

src/main/java/com/hbm/entity/effect/EntityBlackHole.java

@@ -44,6 +44,10 @@ public EntityBlackHole(World w, float size){
 		this.getDataManager().set(SIZE, size);
 	}
 
+	public boolean isImmuneToExplosions() {
+		return true;
+	}
+
 	@Override
 	public void onUpdate() {
 		super.onUpdate();

src/main/java/com/hbm/entity/grenade/EntityGrenadeElectric.java

@@ -33,8 +33,8 @@ public void explode() {
         {
             this.setDead();
             this.world.createExplosion(this, this.posX, this.posY, this.posZ, 2.0F, true);
+            this.world.addWeatherEffect(new EntityLightningBolt(this.world, this.posX, this.posY, this.posZ, false));
         }
-            this.world.spawnEntity(new EntityLightningBolt(this.world, this.posX, this.posY, this.posZ, false));
     }
 
 	@Override

src/main/java/com/hbm/entity/mob/EntityNuclearCreeper.java

@@ -385,7 +385,7 @@ public void onStruckByLightning(EntityLightningBolt p_70077_1_){
 	protected boolean processInteract(EntityPlayer player, EnumHand hand){
 		ItemStack itemstack = player.inventory.getCurrentItem();
 
-		if(itemstack.getItem() == Items.FLINT_AND_STEEL) {
+		if(itemstack!= null && itemstack.getItem() == Items.FLINT_AND_STEEL) {
 			this.world.playSound(null, this.posX + 0.5D, this.posY + 0.5D, this.posZ + 0.5D, SoundEvents.ITEM_FLINTANDSTEEL_USE, this.getSoundCategory(), 1.0F, this.rand.nextFloat() * 0.4F + 0.8F);
 			player.swingArm(hand);
 

src/main/java/com/hbm/explosion/ExplosionNukeGeneric.java

@@ -691,7 +691,7 @@ public static void loadSoliniumFromFile(){
 					if(blocks.length != 2)
 						continue;
 					String[] modidBlock1 = blocks[0].split(":");
-					String[] modidBlock2 = blocks[0].split(":");
+					String[] modidBlock2 = blocks[1].split(":");
 					Block b1 = Block.REGISTRY.getObject(new ResourceLocation(modidBlock1[0], modidBlock1[1]));
 					Block b2 = Block.REGISTRY.getObject(new ResourceLocation(modidBlock2[0], modidBlock2[1]));
 					if(b1 == null || b2 == null){

src/main/java/com/hbm/forgefluid/FFPipeNetworkMk2.java

@@ -63,6 +63,7 @@ public int fill(FluidStack resource, boolean doFill) {
 		int remaining = resource.amount;
 		//Drillgon200: Extra hacky compensation
 		int intRoundingCompensation = resource.amount-part*handlers.size();
+		rand.setSeed(((TileEntity)this.fillables.values().iterator().next()).getWorld().getWorldTime());
 		int randomFillIndex = rand.nextInt(handlers.size());
 		for(int i = 0; i < handlers.size(); i++){
 			IFluidHandler consumer = handlers.get(i);

src/main/java/com/hbm/forgefluid/FFUtils.java

@@ -25,6 +25,7 @@
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
+import net.minecraft.nbt.NBTTagString;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.text.TextFormatting;
@@ -768,6 +769,34 @@ public static boolean containsFluid(ItemStack stack, Fluid fluid){
 		return false;
 	}
 
+	public static NBTTagList serializeFluidArray(Fluid[] fluids) {
+		NBTTagList list = new NBTTagList();
+
+		for(int i = 0; i < fluids.length; ++i) {
+			if (fluids[i] != null) {
+				list.appendTag(new NBTTagString(FluidRegistry.getFluidName(fluids[i])));
+			} else {
+				list.appendTag(new NBTTagString("ntmNullFluid"));
+			}
+		}
+
+		return list;
+	}
+
+	public static void deserializeFluidArray(NBTTagList fluidList, Fluid[] fluids) {
+		for(int i = 0; i < fluidList.tagCount(); ++i) {
+			String fluidName = fluidList.getStringTagAt(i);
+			if (i < fluids.length) {
+				if (fluidName != null && !fluidName.equals("ntmNullFluid")) {
+					fluids[i] = FluidRegistry.getFluid(fluidName);
+				} else {
+					fluids[i] = null;
+				}
+			}
+		}
+
+	}
+
 	public static NBTTagList serializeTankArray(FluidTank[] tanks){
 		NBTTagList list = new NBTTagList();
 		for(int i = 0; i < tanks.length; i++) {

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

@@ -134,7 +134,6 @@ public static void damageSuit(EntityPlayer player, int slot, int amount) {
 		player.inventory.armorInventory.get(slot).setItemDamage(j += amount);
 
 		if(player.inventory.armorInventory.get(slot).getItemDamage() >= player.inventory.armorInventory.get(slot).getMaxDamage()) {
-			System.out.println(player.inventory.armorInventory.get(slot).getMaxDamage());
 			player.inventory.armorInventory.set(slot, ItemStack.EMPTY);
 		}
 	}

src/main/java/com/hbm/handler/jei/HbmJeiRegistryPlugin.java

@@ -48,7 +48,7 @@ public <T extends IRecipeWrapper, V> List<T> getRecipeWrappers(IRecipeCategory<T
 					}).map(recipe -> new AssemblerRecipeWrapper(recipe.getKey().toStack(), recipe.getValue(), AssemblerRecipes.time.get(recipe.getKey()))).collect(Collectors.toList());
 					return list;
 				} else if(focus.getMode() == Mode.OUTPUT) {
-					return (List<T>) AssemblerRecipes.recipes.entrySet().stream().filter(recipe -> Library.areItemStacksEqualIgnoreCount(recipe.getKey().toStack(), stack)).map(recipe -> new AssemblerRecipeWrapper(recipe.getKey().toStack(), recipe.getValue(), AssemblerRecipes.time.get(recipe.getKey()))).collect(Collectors.toList());
+					return (List<T>) AssemblerRecipes.recipes.entrySet().stream().filter(recipe -> Library.areItemStacksCompatible(recipe.getKey().toStack(), stack, false)).map(recipe -> new AssemblerRecipeWrapper(recipe.getKey().toStack(), recipe.getValue(), AssemblerRecipes.time.get(recipe.getKey()))).collect(Collectors.toList());
 				}
 			}
 		}

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

@@ -366,6 +366,7 @@ private static void registerDefaults() {
 		makeRecipe(new ComparableStack(ModItems.missile_drill, 1), new AStack[] { new ComparableStack(ModItems.warhead_buster_large, 1), new ComparableStack(ModItems.fuel_tank_large, 1), new ComparableStack(ModItems.thruster_large, 1), new OreDictStack("plateTitanium", 14), new OreDictStack("plateSteel", 20), new OreDictStack("plateAluminum", 12), new ComparableStack(ModItems.circuit_targeting_tier3, 1), }, 350);
 		makeRecipe(new ComparableStack(ModItems.missile_nuclear, 1), new AStack[] { new ComparableStack(ModItems.warhead_nuclear, 1), new ComparableStack(ModItems.fuel_tank_large, 1), new ComparableStack(ModItems.thruster_large, 1), new OreDictStack("plateTitanium", 20), new OreDictStack("plateSteel", 24), new OreDictStack("plateAluminum", 16), new ComparableStack(ModItems.circuit_targeting_tier4, 1), }, 500);
 		makeRecipe(new ComparableStack(ModItems.missile_nuclear_cluster, 1), new AStack[] { new ComparableStack(ModItems.warhead_mirv, 1), new ComparableStack(ModItems.fuel_tank_large, 1), new ComparableStack(ModItems.thruster_large, 1), new OreDictStack("plateTitanium", 20), new OreDictStack("plateSteel", 24), new OreDictStack("plateAluminum", 16), new ComparableStack(ModItems.circuit_targeting_tier5, 1), }, 600);
+		makeRecipe(new ComparableStack(ModItems.missile_volcano, 1), new AStack[]{new ComparableStack(ModItems.warhead_volcano, 1), new ComparableStack(ModItems.fuel_tank_large, 1), new ComparableStack(ModItems.thruster_large, 1), new OreDictStack("plateTitanium", 20), new OreDictStack("plateSteel", 24), new OreDictStack("plateAluminum", 16), new ComparableStack(ModItems.circuit_targeting_tier5, 1)}, 600);
 		makeRecipe(new ComparableStack(ModItems.missile_endo, 1), new AStack[] { new ComparableStack(ModItems.warhead_thermo_endo, 1), new ComparableStack(ModItems.fuel_tank_large, 1), new ComparableStack(ModItems.thruster_large, 1), new OreDictStack("plateTitanium", 14), new OreDictStack("plateSteel", 20), new OreDictStack("plateAluminum", 12), new ComparableStack(ModItems.circuit_targeting_tier4, 1), }, 350);
 		makeRecipe(new ComparableStack(ModItems.missile_exo, 1), new AStack[] { new ComparableStack(ModItems.warhead_thermo_exo, 1), new ComparableStack(ModItems.fuel_tank_large, 1), new ComparableStack(ModItems.thruster_large, 1), new OreDictStack("plateTitanium", 14), new OreDictStack("plateSteel", 20), new OreDictStack("plateAluminum", 12), new ComparableStack(ModItems.circuit_targeting_tier4, 1), }, 350);
 		makeRecipe(new ComparableStack(ModItems.gun_defabricator, 1), new AStack[] { new OreDictStack("ingotSteel", 2), new ComparableStack(ModItems.ingot_polymer, 8), new OreDictStack("plateIron", 5), new ComparableStack(ModItems.mechanism_special, 3), new ComparableStack(Items.DIAMOND, 1), new ComparableStack(ModItems.plate_dalekanium, 3), }, 200);
@@ -796,6 +797,7 @@ private static void registerDefaults() {
 		makeRecipe(new ComparableStack(ModBlocks.transition_seal, 1), new AStack[]{new ComparableStack(ModBlocks.cmb_brick_reinforced, 16), new OreDictStack("plateSteel", 64), new OreDictStack("plateAdvancedAlloy", 40), new ComparableStack(ModItems.plate_polymer, 36), new OreDictStack("blockSteel", 24), new ComparableStack(ModItems.motor_desh, 16), new ComparableStack(ModItems.bolt_dura_steel, 12), new OreDictStack("dyeYellow", 4)}, 5000);
 
 		makeRecipe(new ComparableStack(ModBlocks.control0, 1), new AStack[]{new ComparableStack(ModItems.circuit_targeting_tier5), new OreDictStack("blockSteel", 1), new ComparableStack(ModItems.wire_copper, 24), new ComparableStack(ModBlocks.pole_top)}, 100);
+		makeRecipe(new ComparableStack(ModBlocks.railgun_plasma, 1), new AStack[]{new OreDictStack("plateSteel", 24), new ComparableStack(ModItems.hull_big_steel, 2), new ComparableStack(ModItems.hull_small_steel, 6), new ComparableStack(ModItems.pipes_steel, 2), new ComparableStack(ModBlocks.machine_lithium_battery, 4), new ComparableStack(ModItems.coil_copper, 16), new ComparableStack(ModItems.coil_copper_torus, 8), new ComparableStack(ModItems.plate_desh, 4), new ComparableStack(ModItems.circuit_targeting_tier4, 4), new ComparableStack(ModItems.circuit_targeting_tier3, 2), new OreDictStack("ingotPolymer", 4)}, 500);
 
 		/// HIDDEN ///
 		hidden.add(new ComparableStack(ModBlocks.machine_radgen, 1));

src/main/java/com/hbm/inventory/CrystallizerRecipes.java

@@ -37,7 +37,7 @@ public static void register() {
 		recipes.put("orePlutonium", new ItemStack(ModItems.crystal_plutonium));
 		recipes.put("oreTitanium", new ItemStack(ModItems.crystal_titanium));
 		recipes.put("oreSulfur", new ItemStack(ModItems.crystal_sulfur));
-		recipes.put("oreNiter", new ItemStack(ModItems.crystal_niter));
+		recipes.put("ore", new ItemStack(ModItems.crystal_niter));
 		recipes.put("oreSaltpeter", new ItemStack(ModItems.crystal_niter));
 		recipes.put("oreCopper", new ItemStack(ModItems.crystal_copper));
 		recipes.put("oreTungsten", new ItemStack(ModItems.crystal_tungsten));

src/main/java/com/hbm/items/gear/RedstoneSword.java

@@ -83,7 +83,6 @@ public EnumActionResult onItemUse(EntityPlayer player, World worldIn, BlockPos p
         	return EnumActionResult.PASS;
         } else {
         	if(worldIn.isAirBlock(editpos) && worldIn.isBlockFullCube(pos)){
-        		System.out.println(player.getHeldItem(hand).getItemDamage());
         		 worldIn.playSound(x + 0.5D, y + 0.5D, z + 0.5D, SoundEvents.BLOCK_STONE_BREAK, SoundCategory.BLOCKS, 1.0F, itemRand.nextFloat() * 0.4F + 0.8F, false);
                  worldIn.setBlockState(editpos, Blocks.REDSTONE_WIRE.getDefaultState(), 1);
                  player.getHeldItem(hand).damageItem(14, player);

src/main/java/com/hbm/items/special/ItemStarterKit.java

@@ -302,6 +302,7 @@ public ActionResult<ItemStack> onItemRightClick(World world, EntityPlayer player
 			player.inventory.addItemStackToInventory(new ItemStack(ModItems.missile_drill, 1));
 			player.inventory.addItemStackToInventory(new ItemStack(ModItems.missile_nuclear, 1));
 			player.inventory.addItemStackToInventory(new ItemStack(ModItems.missile_nuclear_cluster, 1));
+			player.inventory.addItemStackToInventory(new ItemStack(ModItems.missile_volcano, 1));
 			player.inventory.addItemStackToInventory(new ItemStack(ModItems.missile_endo, 1));
 			player.inventory.addItemStackToInventory(new ItemStack(ModItems.missile_exo, 1));
 			player.inventory.addItemStackToInventory(new ItemStack(ModItems.missile_doomsday, 1));

src/main/java/com/hbm/items/tool/ItemLock.java

@@ -28,23 +28,21 @@ public EnumActionResult onItemUse(EntityPlayer player, World world, BlockPos pos
 		ItemStack stack = player.getHeldItem(hand);
 		if(getPins(stack) != 0) {
 			TileEntity te = world.getTileEntity(pos);
-			
+
 			if(te != null && te instanceof TileEntityLockableBase) {
-				TileEntityLockableBase tile = (TileEntityLockableBase)te;
-
-				if(tile.isLocked())
-					return EnumActionResult.FAIL;
-
-				tile.setPins(getPins(stack));
-				tile.lock();
-				tile.setMod(lockMod);
+				TileEntityLockableBase tile = (TileEntityLockableBase) te;
 
-	        	world.playSound(null, player.posX, player.posY, player.posZ, HBMSoundHandler.lockHang, SoundCategory.PLAYERS, 1.0F, 1.0F);
-				stack.shrink(1);
-
-				return EnumActionResult.SUCCESS;
+				if (!tile.isLocked() && tile.canLock(player, hand, facing)) {
+					tile.setPins(getPins(stack));
+					tile.lock();
+					tile.setMod(this.lockMod);
+					world.playSound((EntityPlayer) null, player.posX, player.posY, player.posZ, HBMSoundHandler.lockHang, SoundCategory.PLAYERS, 1.0F, 1.0F);
+					stack.shrink(1);
+					return EnumActionResult.SUCCESS;
+				}
+
+				return EnumActionResult.FAIL;
 			}
-
 			if(te != null && te instanceof TileEntityDummy) {
 
 				TileEntityDummy dummy = (TileEntityDummy)te;

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

@@ -3,7 +3,7 @@
 public class RefStrings {
 	public static final String MODID = "hbm";
 	public static final String NAME = "Hbm's Nuclear Tech Mod";
-	public static final String VERSION = "hbm-1.6.5Av2-1.12.2";
+	public static final String VERSION = "hbm-1.6.8Av1-1.12.2";
 	//HBM's Beta Naming Convention:
 	//V T (X)
 	//V -> next release version

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

@@ -54,6 +54,7 @@
 public class CraftingManager {
 
 	public static RegistryEvent.Register<IRecipe> hack;
+	public static boolean registeringFluids = false;
 
 	public static void init(){
 		if(!GeneralConfig.recipes) {
@@ -1062,7 +1063,7 @@ public static void reg2(){
 		addShapedRecipe(new ItemStack(ModItems.syringe_metal_psycho, 1), new Object[] { " N ", "NSN", " N ", 'N', Items.GLOWSTONE_DUST, 'S', ModItems.syringe_metal_empty });
 		addShapedRecipe(new ItemStack(ModItems.pill_iodine, 8), new Object[] { "IF", 'I', ModItems.powder_iodine, 'F', ModItems.fluorite });
 		addShapedRecipe(new ItemStack(ModItems.plan_c, 1), new Object[] { "PFP", 'P', ModItems.powder_poison, 'F', ModItems.fluorite });
-		addShapelessOreRecipe(new ItemStack(ModItems.radx, 1), new Object[] { "dustCoal", "dustFluorite", "dustFluorite" });
+		addShapelessOreRecipe(new ItemStack(ModItems.radx, 1), new Object[] { "dustCoal", "dustCoal", "dustFluorite" });
 		addShapedRecipe(new ItemStack(ModItems.med_bag, 1), new Object[] { "LLL", "SIS", "LLL", 'L', Items.LEATHER, 'S', ModItems.syringe_metal_stimpak, 'I', ModItems.syringe_antidote });
 		addShapedRecipe(new ItemStack(ModItems.med_bag, 1), new Object[] { "LLL", "SIS", "LLL", 'L', Items.LEATHER, 'S', ModItems.syringe_metal_stimpak, 'I', ModItems.pill_iodine });
 		addShapedRecipe(new ItemStack(ModItems.med_bag, 1), new Object[] { "LL", "SI", "LL", 'L', Items.LEATHER, 'S', ModItems.syringe_metal_super, 'I', ModItems.radaway });
@@ -1086,7 +1087,7 @@ public static void reg2(){
 		addShapedOreRecipe(new ItemStack(ModBlocks.rail_booster, 6), new Object[] { "S S", "CIC", "SRS", 'S', "ingotSteel", 'I', "plateIron", 'R', "ingotMingrade", 'C', ModItems.coil_copper });
 
 		addShapedRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.bomb_multi), 1), new Object[] { "AAD", "CHF", "AAD", 'A', ModItems.wire_aluminium, 'C', ModItems.circuit_aluminium, 'H', ModItems.hull_small_aluminium, 'F', ModItems.fins_quad_titanium, 'D', new ItemStack(Items.DYE, 1, 15) });
-		addShapelessOreRecipe(new ItemStack(ModItems.powder_ice, 4), new Object[] { Items.SNOWBALL, "dustNiter", "dustRedstone" });
+		addShapelessOreRecipe(new ItemStack(ModItems.powder_ice, 4), new Object[] { Items.SNOWBALL, "dustSaltpeter", "dustRedstone" });
 		addShapelessOreRecipe(new ItemStack(ModItems.powder_poison, 4), new Object[] { Items.SPIDER_EYE, "dustRedstone", "gemQuartz" });
 		addShapelessOreRecipe(new ItemStack(ModItems.pellet_gas, 2), new Object[] { Items.WATER_BUCKET, "dustGlowstone", "plateSteel" });