From 975b7ff7229a9996bce82114b7e139293c7fd2ff Mon Sep 17 00:00:00 2001 From: Bob Date: Sun, 13 Apr 2025 15:59:50 +0200 Subject: [PATCH] mh --- gradle.properties | 2 +- src/main/java/com/hbm/config/ClientConfig.java | 2 ++ src/main/java/com/hbm/lib/RefStrings.java | 2 +- src/main/java/com/hbm/main/NEIConfig.java | 10 +++++----- .../com/hbm/util/DamageResistanceHandler.java | 2 +- src/main/resources/assets/hbm/lang/de_DE.lang | 13 ++++--------- src/main/resources/assets/hbm/lang/en_US.lang | 17 ++++++----------- 7 files changed, 20 insertions(+), 28 deletions(-) diff --git a/gradle.properties b/gradle.properties index 777d9673c..ca78c1bd1 100644 --- a/gradle.properties +++ b/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),\ diff --git a/src/main/java/com/hbm/config/ClientConfig.java b/src/main/java/com/hbm/config/ClientConfig.java index e5905a135..534701703 100644 --- a/src/main/java/com/hbm/config/ClientConfig.java +++ b/src/main/java/com/hbm/config/ClientConfig.java @@ -30,6 +30,7 @@ public class ClientConfig extends RunningConfig { public static ConfigWrapper NUKE_HUD_FLASH = new ConfigWrapper(true); public static ConfigWrapper NUKE_HUD_SHAKE = new ConfigWrapper(true); public static ConfigWrapper RENDER_REEDS = new ConfigWrapper(!Compat.isModLoaded(Compat.MOD_ANG)); + public static ConfigWrapper 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. */ diff --git a/src/main/java/com/hbm/lib/RefStrings.java b/src/main/java/com/hbm/lib/RefStrings.java index cb0cbb305..599922a8e 100644 --- a/src/main/java/com/hbm/lib/RefStrings.java +++ b/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 diff --git a/src/main/java/com/hbm/main/NEIConfig.java b/src/main/java/com/hbm/main/NEIConfig.java index 171a589ed..3e8c4df68 100644 --- a/src/main/java/com/hbm/main/NEIConfig.java +++ b/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) { - API.hideItem(new ItemStack(item)); + if(ClientConfig.NEI_HIDE_SECRETS.get()) { + 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)); diff --git a/src/main/java/com/hbm/util/DamageResistanceHandler.java b/src/main/java/com/hbm/util/DamageResistanceHandler.java index 1c7a81dc6..ff7f99b19 100644 --- a/src/main/java/com/hbm/util/DamageResistanceHandler.java +++ b/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)); diff --git a/src/main/resources/assets/hbm/lang/de_DE.lang b/src/main/resources/assets/hbm/lang/de_DE.lang index 7fc015c70..61a1aa941 100644 --- a/src/main/resources/assets/hbm/lang/de_DE.lang +++ b/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.tank_waste_1.name=Schlammcontainer -item.tank_waste_2.name=Schlammcontainer -item.tank_waste_3.name=Schlammcontainer -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.taurun_boots.name=Taurun-Stiefel +item.taurun_helmet.name=Taurun-Helm +item.taurun_legs.name=Taurun-Hose +item.taurun_plate.name=Taurun-Jacke item.telepad.name=Teleplatte item.tem_flakes.name=Tem Flakes item.template_folder.name=Produktionsvorlagen-Zeichenmappe diff --git a/src/main/resources/assets/hbm/lang/en_US.lang b/src/main/resources/assets/hbm/lang/en_US.lang index f7feca632..29de3b5c5 100644 --- a/src/main/resources/assets/hbm/lang/en_US.lang +++ b/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.tank_waste_1.name=Mud Container -item.tank_waste_2.name=Mud Container -item.tank_waste_3.name=Mud Container -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.taurun_boots.name=Taurun Boots +item.taurun_helmet.name=Taurun Helmet +item.taurun_legs.name=Taurun Leggigns +item.taurun_plate.name=Taurun Chestplate 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