more fixes

changelog

@@ -19,6 +19,9 @@
 * Removed legacy circuits
 * Removed a bunch of random unused items
 * Centrifuges are now configurable via `hbmMachines.json`
+* Updated refinery GUI
+* Crayons now require paper to craft, fixing an issue where some recipes conflict with the dye mixing ones
+* Halved energy consumption for night vision goggles
 
 ## Fixed
 * Fixed crash caused by decontaminating items with the radiolysis machine
@@ -32,4 +35,6 @@
 * Fixed primary bedrock ore fraction roasting yielding one extra pile of crumbs
 * Fixed filing cabinets being unreasonably laggy due to the old packet code
 * Fixed the secure access door taking way longer to craft than any other door
-* Fixed issues with the spotlight crafting recipes
+* Fixed issues with the spotlight crafting recipes
+* Fixed various issues with opencomputers integration
+* Fixed incorrect armor mod descriptions being shown for cards

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

@@ -101,7 +101,7 @@ public class PowderRecipes {
 		CraftingManager.addShapelessAuto(DictFrame.fromOne(ModItems.chemical_dye, EnumChemDye.PINK, 2),			new Object[] { DictFrame.fromOne(ModItems.chemical_dye, EnumChemDye.RED),		DictFrame.fromOne(ModItems.chemical_dye, EnumChemDye.WHITE) });
 		CraftingManager.addShapelessAuto(DictFrame.fromOne(ModItems.chemical_dye, EnumChemDye.GREEN, 2),		new Object[] { DictFrame.fromOne(ModItems.chemical_dye, EnumChemDye.BLUE),		DictFrame.fromOne(ModItems.chemical_dye, EnumChemDye.YELLOW) });
 		
-		for(int i = 0; i < 15; i++) CraftingManager.addShapelessAuto(new ItemStack(ModItems.crayon, 4, i), new Object[] { new ItemStack(ModItems.chemical_dye, 1, i), ANY_TAR.any() });
+		for(int i = 0; i < 15; i++) CraftingManager.addShapelessAuto(new ItemStack(ModItems.crayon, 4, i), new Object[] { new ItemStack(ModItems.chemical_dye, 1, i), ANY_TAR.any(), Items.paper });
 
 	}
 }

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

@@ -75,11 +75,6 @@ public class ModItems {
 	public static Item redstone_sword;
 	public static Item big_sword;
 
-	public static Item test_helmet;
-	public static Item test_chestplate;
-	public static Item test_leggings;
-	public static Item test_boots;
-
 	public static Item ingot_th232;
 	public static Item ingot_uranium;
 	public static Item ingot_u233;
@@ -2215,18 +2210,10 @@ public class ModItems {
 
 	public static Item rod_of_discord;
 
-	public static Item cape_test;
 	public static Item cape_radiation;
 	public static Item cape_gasmask;
 	public static Item cape_schrabidium;
 	public static Item cape_hidden;
-	/*public static Item cape_hbm;
-	public static Item cape_dafnik;
-	public static Item cape_lpkukin;
-	public static Item cape_vertice;
-	public static Item cape_codered_;
-	public static Item cape_ayy;
-	public static Item cape_nostalgia;*/
 
 	public static Item nuke_starter_kit;
 	public static Item nuke_advanced_kit;
@@ -2456,11 +2443,6 @@ public class ModItems {
 	{			
 		redstone_sword = new RedstoneSword(ToolMaterial.STONE).setUnlocalizedName("redstone_sword").setCreativeTab(CreativeTabs.tabCombat).setTextureName(RefStrings.MODID + ":redstone_sword");
 		big_sword = new BigSword(ToolMaterial.EMERALD).setUnlocalizedName("big_sword").setCreativeTab(CreativeTabs.tabCombat).setTextureName(RefStrings.MODID + ":big_sword");
-
-		test_helmet = new ArmorTest(MainRegistry.enumArmorMaterialEmerald, 0).setUnlocalizedName("test_helmet").setCreativeTab(null).setTextureName(RefStrings.MODID + ":test_helmet");
-		test_chestplate = new ArmorTest(MainRegistry.enumArmorMaterialEmerald, 1).setUnlocalizedName("test_chestplate").setCreativeTab(null).setTextureName(RefStrings.MODID + ":test_chestplate");
-		test_leggings = new ArmorTest(MainRegistry.enumArmorMaterialEmerald, 2).setUnlocalizedName("test_leggings").setCreativeTab(null).setTextureName(RefStrings.MODID + ":test_leggings");
-		test_boots = new ArmorTest(MainRegistry.enumArmorMaterialEmerald, 3).setUnlocalizedName("test_boots").setCreativeTab(null).setTextureName(RefStrings.MODID + ":test_boots");
 		
 		test_nuke_igniter = new Item().setUnlocalizedName("test_nuke_igniter").setMaxStackSize(1).setCreativeTab(null).setTextureName(RefStrings.MODID + ":test_nuke_igniter");
 		test_nuke_propellant = new Item().setUnlocalizedName("test_nuke_propellant").setMaxStackSize(1).setCreativeTab(null).setTextureName(RefStrings.MODID + ":test_nuke_propellant");
@@ -5330,7 +5312,6 @@ public class ModItems {
 		wings_murk = new WingsMurk(MainRegistry.aMatCobalt).setUnlocalizedName("wings_murk").setCreativeTab(CreativeTabs.tabCombat).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":wings_murk");
 		wings_limp = new WingsMurk(MainRegistry.aMatCobalt).setUnlocalizedName("wings_limp").setCreativeTab(CreativeTabs.tabCombat).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":wings_limp");
 
-		cape_test = new ArmorModel(MainRegistry.enumArmorMaterialEmerald, 1).setUnlocalizedName("cape_test").setCreativeTab(null).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":cape_test");
 		cape_radiation = new ArmorModel(ArmorMaterial.CHAIN, 1).setUnlocalizedName("cape_radiation").setCreativeTab(MainRegistry.consumableTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":cape_radiation");
 		cape_gasmask = new ArmorModel(ArmorMaterial.CHAIN, 1).setUnlocalizedName("cape_gasmask").setCreativeTab(MainRegistry.consumableTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":cape_gasmask");
 		cape_schrabidium = new ArmorModel(MainRegistry.aMatSchrab, 1).setUnlocalizedName("cape_schrabidium").setCreativeTab(MainRegistry.consumableTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":cape_schrabidium");
@@ -5522,13 +5503,6 @@ public class ModItems {
 		GameRegistry.registerItem(redstone_sword, redstone_sword.getUnlocalizedName());
 		GameRegistry.registerItem(big_sword, big_sword.getUnlocalizedName());
 		
-		//Test Armor
-		GameRegistry.registerItem(test_helmet, test_helmet.getUnlocalizedName());
-		GameRegistry.registerItem(test_chestplate, test_chestplate.getUnlocalizedName());
-		GameRegistry.registerItem(test_leggings, test_leggings.getUnlocalizedName());
-		GameRegistry.registerItem(test_boots, test_boots.getUnlocalizedName());
-		GameRegistry.registerItem(cape_test, cape_test.getUnlocalizedName());
-		
 		//Test Nuke
 		GameRegistry.registerItem(test_nuke_igniter, test_nuke_igniter.getUnlocalizedName());
 		GameRegistry.registerItem(test_nuke_propellant, test_nuke_propellant.getUnlocalizedName());

src/main/java/com/hbm/items/armor/ArmorModel.java

@@ -70,7 +70,7 @@ public class ArmorModel extends ItemArmor {
 				return this.modelHat;
 			}
 		}
-		if(this == ModItems.cape_test || this == ModItems.cape_radiation || this == ModItems.cape_gasmask || this == ModItems.cape_schrabidium || this == ModItems.cape_hidden) {
+		if(this == ModItems.cape_radiation || this == ModItems.cape_gasmask || this == ModItems.cape_schrabidium || this == ModItems.cape_hidden) {
 			if(armorSlot == 1) {
 				if(this.modelCloak == null) {
 					this.modelCloak = new ModelCloak();
@@ -86,9 +86,6 @@ public class ArmorModel extends ItemArmor {
 		if(stack.getItem() == ModItems.goggles) {
 			return "hbm:textures/models/Goggles.png";
 		}
-		if(stack.getItem() == ModItems.cape_test) {
-			return "hbm:textures/models/TestCape.png";
-		}
 		if(stack.getItem() == ModItems.cape_radiation) {
 			return "hbm:textures/models/capes/CapeRadiation.png";
 		}

src/main/java/com/hbm/items/armor/ArmorTest.java

@@ -1,28 +0,0 @@
-package com.hbm.items.armor;
-
-import com.hbm.items.ModItems;
-import com.hbm.lib.RefStrings;
-
-import net.minecraft.entity.Entity;
-import net.minecraft.item.ItemArmor;
-import net.minecraft.item.ItemStack;
-
-public class ArmorTest extends ItemArmor {
-	
-	public ArmorTest(ArmorMaterial armorMaterial, int armorType) {
-		super(armorMaterial, 0, armorType);
-	}
-	
-	@Override
-	public String getArmorTexture(ItemStack stack, Entity entity, int slot, String layer) {
-		if(stack.getItem().equals(ModItems.test_helmet) || stack.getItem().equals(ModItems.test_chestplate) || stack.getItem().equals(ModItems.test_boots)) {
-			return (RefStrings.MODID + ":textures/armor/test_1.png");
-		}
-		if(stack.getItem().equals(ModItems.test_leggings)) {
-			return (RefStrings.MODID + ":textures/armor/test_2.png");
-		}
-		
-		else return null;
-	}
-
-}

src/main/java/com/hbm/items/armor/ItemModCard.java

@@ -6,7 +6,6 @@ import com.hbm.extprop.HbmPlayerProps;
 import com.hbm.handler.ArmorModHandler;
 import com.hbm.items.ModItems;
 
-import net.minecraft.client.resources.I18n;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumChatFormatting;
@@ -35,7 +34,7 @@ public class ItemModCard extends ItemArmorMod {
 
 	@Override
 	public void addDesc(List list, ItemStack stack, ItemStack armor) {
-		list.add(EnumChatFormatting.YELLOW + I18n.format("item.night_vision.description.in_armor", stack.getDisplayName()));
+		list.add(EnumChatFormatting.RED + stack.getDisplayName());
 	}
 	
 	@Override

src/main/java/com/hbm/items/armor/ItemModNightVision.java

@@ -33,7 +33,7 @@ public class ItemModNightVision extends ItemArmorMod {
 		if(!entity.worldObj.isRemote && entity instanceof EntityPlayer && armor.getItem() instanceof ArmorFSBPowered && ArmorFSBPowered.hasFSBArmor((EntityPlayer) entity)) {
 			entity.addPotionEffect(new PotionEffect(Potion.nightVision.id, 15 * 20, 0));
 
-			if(entity.getRNG().nextInt(50) == 0) {
+			if(entity.getRNG().nextInt(100) == 0) {
 				armor.damageItem(1, entity);
 			}
 		}

src/main/java/com/hbm/main/MainRegistry.java

@@ -137,7 +137,6 @@ public class MainRegistry {
 	public static ToolMaterial enumToolMaterialMultitool = EnumHelper.addToolMaterial("MULTITOOL", 3, 5000, 25F, 5.5F, 25);
 
 	// Armor Materials
-	public static ArmorMaterial enumArmorMaterialEmerald = EnumHelper.addArmorMaterial("HBM_TEST", 2500, new int[] { 3, 8, 6, 3 }, 30);
 	public static ArmorMaterial aMatSchrab = EnumHelper.addArmorMaterial("HBM_SCHRABIDIUM", 100, new int[] { 3, 8, 6, 3 }, 50);
 	public static ArmorMaterial aMatEuph = EnumHelper.addArmorMaterial("HBM_EUPHEMIUM", 15000000, new int[] { 3, 8, 6, 3 }, 100);
 	public static ArmorMaterial aMatHaz = EnumHelper.addArmorMaterial("HBM_HAZMAT", 60, new int[] { 2, 5, 4, 1 }, 5);
@@ -1398,6 +1397,11 @@ public class MainRegistry {
 		ignoreMappings.add("hbm:tile.crystal_trixite");
 		ignoreMappings.add("hbm:tile.hazmat");
 		ignoreMappings.add("hbm:item.pellet_coal");
+		ignoreMappings.add("hbm:item.test_helmet");
+		ignoreMappings.add("hbm:item.test_chestplate");
+		ignoreMappings.add("hbm:item.test_leggings");
+		ignoreMappings.add("hbm:item.test_boots");
+		ignoreMappings.add("hbm:item.cape_test");
 		
 		/// REMAP ///
 		remapItems.put("hbm:item.gadget_explosive8", ModItems.early_explosive_lenses);