mh

gradle.properties

@@ -1,6 +1,6 @@
 mod_version=1.0.27
 # Empty build number makes a release type
-mod_build_number=5298
+mod_build_number=5299
 
 credits=HbMinecraft,\
   \ rodolphito (explosion algorithms),\

src/main/java/com/hbm/config/ClientConfig.java

@@ -30,6 +30,7 @@ public class ClientConfig extends RunningConfig {
 	public static ConfigWrapper<Boolean> NUKE_HUD_FLASH =					new ConfigWrapper(true);
 	public static ConfigWrapper<Boolean> NUKE_HUD_SHAKE =					new ConfigWrapper(true);
 	public static ConfigWrapper<Boolean> RENDER_REEDS =						new ConfigWrapper(!Compat.isModLoaded(Compat.MOD_ANG));
+	public static ConfigWrapper<Boolean> NEI_HIDE_SECRETS =					new ConfigWrapper(true);
 
 	private static void initDefaults() {
 		configMap.put("GEIGER_OFFSET_HORIZONTAL", GEIGER_OFFSET_HORIZONTAL);
@@ -49,6 +50,7 @@ public class ClientConfig extends RunningConfig {
 		configMap.put("NUKE_HUD_FLASH", NUKE_HUD_FLASH);
 		configMap.put("NUKE_HUD_SHAKE", NUKE_HUD_SHAKE);
 		configMap.put("RENDER_REEDS", RENDER_REEDS);
+		configMap.put("NEI_HIDE_SECRETS", NEI_HIDE_SECRETS);
 	}
 
 	/** Initializes defaults, then reads the config file if it exists, then writes the config file. */

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 (5298)";
+	public static final String VERSION = "1.0.27 BETA (5299)";
 	//HBM's Beta Naming Convention:
 	//V T (X)
 	//V -> next release version

src/main/java/com/hbm/main/NEIConfig.java

@@ -7,6 +7,7 @@ import codechicken.nei.api.ItemInfo.Layout;
 import codechicken.nei.recipe.*;
 import com.hbm.blocks.ModBlocks;
 import com.hbm.blocks.generic.BlockPlushie.TileEntityPlushie;
+import com.hbm.config.ClientConfig;
 import com.hbm.config.CustomMachineConfigJSON;
 import com.hbm.handler.nei.CustomMachineHandler;
 import com.hbm.items.ItemEnums.EnumSecretType;
@@ -36,17 +37,16 @@ public class NEIConfig implements IConfigureNEI {
 			registerHandlerBypass(new CustomMachineHandler(conf));
 		}
 
-		for(Item item : ItemGunBaseNT.secrets) {
+		if(ClientConfig.NEI_HIDE_SECRETS.get()) {
-			API.hideItem(new ItemStack(item));
+			for(Item item : ItemGunBaseNT.secrets) API.hideItem(new ItemStack(item));
+			for(int i = 0; i < EnumAmmoSecret.values().length; i++) API.hideItem(new ItemStack(ModItems.ammo_secret, 1, i));
+			for(int i = 0; i < EnumSecretType.values().length; i++) API.hideItem(new ItemStack(ModItems.item_secret, 1, i));
 		}
 
-		for(int i = 0; i < EnumAmmoSecret.values().length; i++) API.hideItem(new ItemStack(ModItems.ammo_secret, 1, i));
-
 		//Some things are even beyond my control...or are they?
 		API.hideItem(ItemBattery.getEmptyBattery(ModItems.memory));
 		API.hideItem(ItemBattery.getFullBattery(ModItems.memory));
 
-		for(int i = 0; i < EnumSecretType.values().length; i++) API.hideItem(new ItemStack(ModItems.item_secret, 1, i));
 		API.hideItem(new ItemStack(ModBlocks.machine_electric_furnace_on));
 		API.hideItem(new ItemStack(ModBlocks.machine_difurnace_on));
 		API.hideItem(new ItemStack(ModBlocks.machine_rtg_furnace_on));

src/main/java/com/hbm/util/DamageResistanceHandler.java

@@ -220,7 +220,7 @@ public class DamageResistanceHandler {
 				.setOther(100F, 1F));
 		registerSet(ModItems.taurun_helmet, ModItems.taurun_plate, ModItems.taurun_legs, ModItems.taurun_boots, new ResistanceStats()
 				.addCategory(CATEGORY_PROJECTILE, 2F, 0.15F)
-				.addCategory(CATEGORY_FIRE, 1F, 0.25F)
+				.addCategory(CATEGORY_FIRE, 0F, 0.25F)
 				.addCategory(CATEGORY_EXPLOSION, 0F, 0.25F)
 				.addExact(DamageSource.fall.damageType, 4F, 0.5F)
 				.setOther(2F, 0.1F));

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

@@ -3384,15 +3384,10 @@ item.t45_kit.name=T45-Powerrüstungskit
 item.t45_legs.name=T45-Powerrüstungsbeinschutz
 item.t45_plate.name=T45-Powerrüstungsbrustpanzer
 item.tank_steel.name=Stahltank
-item.tank_waste_0.name=Schlammcontainer
+item.taurun_boots.name=Taurun-Stiefel
-item.tank_waste_1.name=Schlammcontainer
+item.taurun_helmet.name=Taurun-Helm
-item.tank_waste_2.name=Schlammcontainer
+item.taurun_legs.name=Taurun-Hose
-item.tank_waste_3.name=Schlammcontainer
+item.taurun_plate.name=Taurun-Jacke
-item.tank_waste_4.name=Schlammcontainer
-item.tank_waste_5.name=Schlammcontainer
-item.tank_waste_6.name=Schlammcontainer
-item.tank_waste_7.name=Schlammcontainer
-item.tank_waste_8.name=Schlammcontainer
 item.telepad.name=Teleplatte
 item.tem_flakes.name=Tem Flakes
 item.template_folder.name=Produktionsvorlagen-Zeichenmappe

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

@@ -3147,8 +3147,6 @@ item.key_red.desc.P11=§4e§r
 item.key_red_cracked.name=Cracked Key
 item.key_red_cracked.desc=???
 item.key_red.key_red_cracked.P11=§4???§r
-item.toolbox.name=Toolbox
-item.toolbox_legacy.name=Toolbox (LEGACY)
 item.laser_crystal_bismuth.desc=Bismuth-Samarium-Uranium-Thorium crystal matrix
 item.laser_crystal_bismuth.name=BiSmUTh Laser Crystal
 item.laser_crystal_cmb.desc=Antischrabidium Suspended in a CMB-Schrabidate Alloy Lattice
@@ -4403,15 +4401,10 @@ item.t45_kit.name=T45 Power Armor Kit
 item.t45_legs.name=T45 Power Armor Leggings
 item.t45_plate.name=T45 Power Armor Chestplate
 item.tank_steel.name=Steel Tank
-item.tank_waste_0.name=Mud Container
+item.taurun_boots.name=Taurun Boots
-item.tank_waste_1.name=Mud Container
+item.taurun_helmet.name=Taurun Helmet
-item.tank_waste_2.name=Mud Container
+item.taurun_legs.name=Taurun Leggigns
-item.tank_waste_3.name=Mud Container
+item.taurun_plate.name=Taurun Chestplate
-item.tank_waste_4.name=Mud Container
-item.tank_waste_5.name=Mud Container
-item.tank_waste_6.name=Mud Container
-item.tank_waste_7.name=Mud Container
-item.tank_waste_8.name=Mud Container
 item.telepad.name=Telepad
 item.tem_flakes.name=Tem Flakes
 item.template_folder.name=Machine Template Folder
@@ -4442,6 +4435,8 @@ item.titanium_pickaxe.name=Titanium Pickaxe
 item.titanium_plate.name=Titanium Chestplate
 item.titanium_shovel.name=Titanium Shovel
 item.titanium_sword.name=Titanium Sword
+item.toolbox.name=Toolbox
+item.toolbox_legacy.name=Toolbox (LEGACY)
 item.toothpicks.name=Toothpicks
 item.train.cargo_tram.name=Electric Flat Bed Tram
 item.trenchmaster_boots.name=Trenchmaster's Boots