From 28bf298aec98e771ad01d5eceec0ba83ec4b6223 Mon Sep 17 00:00:00 2001 From: HbmMods Date: Sun, 12 Aug 2018 18:56:11 +0200 Subject: [PATCH] fixed radiation durations being too long, added deco recipes, langs --- assets/hbm/lang/de_DE.lang | 8 ++++++++ assets/hbm/lang/en_US.lang | 8 ++++++++ assets/hbm/textures/items/clip_rpg_alt.png | Bin 0 -> 308 bytes com/hbm/items/ModItems.java | 2 +- com/hbm/lib/Library.java | 4 ++-- com/hbm/lib/RefStrings.java | 2 +- com/hbm/main/CraftingManager.java | 8 ++++++++ 7 files changed, 28 insertions(+), 4 deletions(-) create mode 100644 assets/hbm/textures/items/clip_rpg_alt.png diff --git a/assets/hbm/lang/de_DE.lang b/assets/hbm/lang/de_DE.lang index 76642547e..8e7c45311 100644 --- a/assets/hbm/lang/de_DE.lang +++ b/assets/hbm/lang/de_DE.lang @@ -626,6 +626,14 @@ tile.ore_oil.name=Ölvorkommen tile.ore_oil_empty.name=Leeres Ölvorkommen tile.ore_oil_sand.name=Teersand +tile.deco_titanium.name=Titan-Dekoblock +tile.deco_red_copper.name=Roter Kupfer-Dekoblock +tile.deco_tungsten.name=Wolfram-Dekoblock +tile.deco_aluminium.name=Aluminium-Dekoblock +tile.deco_steel.name=Stahl-Dekoblock +tile.deco_lead.name=Blei-Dekoblock +tile.deco_beryllium.name=Beryllium-Dekoblock + tile.reinforced_brick.name=Verstärkter Stein tile.reinforced_glass.name=Verstärktes Glas tile.reinforced_sand.name=Verstärkter Sandstein diff --git a/assets/hbm/lang/en_US.lang b/assets/hbm/lang/en_US.lang index 12888a786..8c6c1d00f 100644 --- a/assets/hbm/lang/en_US.lang +++ b/assets/hbm/lang/en_US.lang @@ -626,6 +626,14 @@ tile.ore_oil.name=Oil Deposit tile.ore_oil_empty.name=Empty Oil Deposit tile.ore_oil_sand.name=Tar Sand +tile.deco_titanium.name=Titanium Deco Block +tile.deco_red_copper.name=Red Copper Deco Block +tile.deco_tungsten.name=Tungsten Deco Block +tile.deco_aluminium.name=Aluminium Deco Block +tile.deco_steel.name=Steel Deco Block +tile.deco_lead.name=Lead Deco Block +tile.deco_beryllium.name=Beryllium Deco Block + tile.reinforced_brick.name=Reinforced Stone tile.reinforced_glass.name=Reinforced Glass tile.reinforced_sand.name=Reinforced Sandstone diff --git a/assets/hbm/textures/items/clip_rpg_alt.png b/assets/hbm/textures/items/clip_rpg_alt.png new file mode 100644 index 0000000000000000000000000000000000000000..6fe42d25e8f52f2b33212e27fd3b84de258b293d GIT binary patch literal 308 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#VfpJ_kniz9!3V2NePvE*?OlePW&ive4}mO@s33t znX{ZUS=UVwb*kazyu)za;MkM7TUdDRG7Et2&_>NpU)asRzr9IS7;I~-g%4sX!m zsIV{GH>+ZX-fAyR?-_<{YfDR6%(qUc=B_>ez5W{aT))Ko^5w;wf!=2DboFyt=akR{ E0I;if`2YX_ literal 0 HcmV?d00001 diff --git a/com/hbm/items/ModItems.java b/com/hbm/items/ModItems.java index 932209e8c..a823fefcf 100644 --- a/com/hbm/items/ModItems.java +++ b/com/hbm/items/ModItems.java @@ -2160,7 +2160,7 @@ public class ModItems { clip_revolver_nightmare = new ItemClip().setUnlocalizedName("clip_revolver_nightmare").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":clip_revolver_nightmare"); clip_revolver_nightmare2 = new ItemClip().setUnlocalizedName("clip_revolver_nightmare2").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":clip_revolver_nightmare2"); clip_revolver_pip = new ItemClip().setUnlocalizedName("clip_revolver_pip").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":clip_revolver_pip"); - clip_rpg = new ItemClip().setUnlocalizedName("clip_rpg").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":clip_rpg"); + clip_rpg = new ItemClip().setUnlocalizedName("clip_rpg").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":clip_rpg_alt"); clip_stinger = new ItemClip().setUnlocalizedName("clip_stinger").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":clip_stinger"); clip_fatman = new ItemClip().setUnlocalizedName("clip_fatman").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":clip_fatman"); clip_mirv = new ItemClip().setUnlocalizedName("clip_mirv").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":clip_mirv"); diff --git a/com/hbm/lib/Library.java b/com/hbm/lib/Library.java index e1aa24ef7..e040e0df0 100644 --- a/com/hbm/lib/Library.java +++ b/com/hbm/lib/Library.java @@ -235,12 +235,12 @@ public class Library { return; if(checkForGasMask(player)) { - entity.addPotionEffect(new PotionEffect(HbmPotion.radiation.id, maskDura * 60, maskLevel)); + entity.addPotionEffect(new PotionEffect(HbmPotion.radiation.id, maskDura * 20, maskLevel)); return; } } - entity.addPotionEffect(new PotionEffect(HbmPotion.radiation.id, radDura * 60, radLevel)); + entity.addPotionEffect(new PotionEffect(HbmPotion.radiation.id, radDura * 20, radLevel)); } public static boolean checkForHazmat(EntityPlayer player) { diff --git a/com/hbm/lib/RefStrings.java b/com/hbm/lib/RefStrings.java index c03a41d24..74770bb9a 100644 --- a/com/hbm/lib/RefStrings.java +++ b/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 (2855)"; + public static final String VERSION = "1.0.27 BETA (2863)"; //HBM's Beta Naming Convention: //V T (X-Y-Z) //V -> next release version diff --git a/com/hbm/main/CraftingManager.java b/com/hbm/main/CraftingManager.java index 87b35513a..61b622353 100644 --- a/com/hbm/main/CraftingManager.java +++ b/com/hbm/main/CraftingManager.java @@ -397,6 +397,14 @@ public class CraftingManager { //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.part_carbon), new Object[] { "P", "D", "P", 'P', "plateSteel", 'D', "dustCoal" })); //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.part_copper), new Object[] { "P", "D", "P", 'P', "plateSteel", 'D', "dustCopper" })); //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.part_plutonium), new Object[] { "P", "D", "P", 'P', "plateSteel", 'D', "dustPlutonium" })); + + GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModBlocks.deco_aluminium), new Object[] { "ingotAluminum", ModBlocks.steel_scaffold })); + GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModBlocks.deco_beryllium), new Object[] { "ingotBeryllium", ModBlocks.steel_scaffold })); + GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModBlocks.deco_lead), new Object[] { "ingotLead", ModBlocks.steel_scaffold })); + GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModBlocks.deco_red_copper), new Object[] { "ingotRedstoneAlloy", ModBlocks.steel_scaffold })); + GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModBlocks.deco_steel), new Object[] { "ingotSteel", ModBlocks.steel_scaffold })); + GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModBlocks.deco_titanium), new Object[] { "ingotTitanium", ModBlocks.steel_scaffold })); + GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModBlocks.deco_tungsten), new Object[] { "ingotTungsten", ModBlocks.steel_scaffold })); GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_euphemium, 1), new Object[] { ModItems.rod_quad_euphemium }); GameRegistry.addRecipe(new ItemStack(ModItems.ingot_euphemium, 1), new Object[] { "###", "###", "###", '#', ModItems.nugget_euphemium });