From 6271ff32b412e68917b592f3a5d9e80c758e4ac4 Mon Sep 17 00:00:00 2001 From: HbmMods Date: Sun, 24 May 2020 22:27:30 +0200 Subject: [PATCH] updated schrab textures, added starmetal armor textures, recipes --- assets/hbm/lang/de_DE.lang | 8 + assets/hbm/lang/en_US.lang | 8 + assets/hbm/sounds.json | 3 +- assets/hbm/sounds/music/recordGlass.ogg | Bin 0 -> 608334 bytes assets/hbm/sounds/weapon/stop1.ogg | Bin 0 -> 5193 bytes assets/hbm/sounds/weapon/stop2.ogg | Bin 0 -> 4606 bytes assets/hbm/textures/items/cobalt_pickaxe.png | Bin 0 -> 317 bytes assets/hbm/textures/items/fragment_cobalt.png | Bin 449 -> 470 bytes assets/hbm/textures/items/powder_cobalt.png | Bin 378 -> 361 bytes .../hbm/textures/items/powder_cobalt_tiny.png | Bin 188 -> 198 bytes assets/hbm/textures/items/schrabidium_axe.png | Bin 299 -> 245 bytes assets/hbm/textures/items/schrabidium_hoe.png | Bin 264 -> 182 bytes .../textures/items/schrabidium_pickaxe.png | Bin 306 -> 248 bytes .../hbm/textures/items/schrabidium_shovel.png | Bin 276 -> 191 bytes .../hbm/textures/items/schrabidium_sword.png | Bin 341 -> 299 bytes assets/hbm/textures/items/starmetal_boots.png | Bin 0 -> 243 bytes .../hbm/textures/items/starmetal_helmet.png | Bin 0 -> 263 bytes assets/hbm/textures/items/starmetal_legs.png | Bin 0 -> 270 bytes assets/hbm/textures/items/starmetal_plate.png | Bin 0 -> 321 bytes com/hbm/handler/WeaponAbility.java | 107 +++++++++++++ com/hbm/inventory/MachineRecipes.java | 6 + com/hbm/items/ModItems.java | 145 +++++++++++------- com/hbm/items/tool/ItemToolAbility.java | 68 +++++++- com/hbm/items/tool/WeaponSpecial.java | 3 + com/hbm/lib/RefStrings.java | 2 +- com/hbm/main/CraftingManager.java | 28 ++-- com/hbm/main/MainRegistry.java | 12 +- 27 files changed, 319 insertions(+), 71 deletions(-) create mode 100644 assets/hbm/sounds/music/recordGlass.ogg create mode 100644 assets/hbm/sounds/weapon/stop1.ogg create mode 100644 assets/hbm/sounds/weapon/stop2.ogg create mode 100644 assets/hbm/textures/items/cobalt_pickaxe.png create mode 100644 assets/hbm/textures/items/starmetal_boots.png create mode 100644 assets/hbm/textures/items/starmetal_helmet.png create mode 100644 assets/hbm/textures/items/starmetal_legs.png create mode 100644 assets/hbm/textures/items/starmetal_plate.png create mode 100644 com/hbm/handler/WeaponAbility.java diff --git a/assets/hbm/lang/de_DE.lang b/assets/hbm/lang/de_DE.lang index 494cc4106..08d39073a 100644 --- a/assets/hbm/lang/de_DE.lang +++ b/assets/hbm/lang/de_DE.lang @@ -73,6 +73,9 @@ tool.ability.hammer=AoE tool.ability.smelter=Auto-Ofen tool.ability.shredder=Auto-Brecher tool.ability.cnetrifuge=Auto-Zentrifuge +weapon.ability.radiation=Radioaktive Schneide +weapon.ability.vampire=Vampir +weapon.ability.stun=Betäubend hbmfluid.none=Nichts hbmfluid.water=Wasser @@ -2118,6 +2121,11 @@ item.desh_pickaxe.name=Arbeitslegierungsspitzhacke item.desh_axe.name=Arbeitslegierungsaxt item.desh_shovel.name=Arbeitslegierungsschaufel item.desh_hoe.name=Arbeitslegierungsfeldhacke +item.cobalt_sword.name=Kobaltschwert +item.cobalt_pickaxe.name=Kobaltspitzhacke +item.cobalt_axe.name=Kobaltaxt +item.cobalt_shovel.name=Kobaltschaufel +item.cobalt_hoe.name=Kobaltfeldhacke tile.red_cable.name=Rotes Kupferkabel diff --git a/assets/hbm/lang/en_US.lang b/assets/hbm/lang/en_US.lang index ebd3a6ecc..c4e02f670 100644 --- a/assets/hbm/lang/en_US.lang +++ b/assets/hbm/lang/en_US.lang @@ -73,6 +73,9 @@ tool.ability.hammer=AoE tool.ability.smelter=Auto-Smelter tool.ability.shredder=Auto-Shredder tool.ability.centrifuge=Auto-Centrifuge +weapon.ability.radiation=Radioactive Blade +weapon.ability.vampire=Vampire +weapon.ability.stun=Stunning hbmfluid.none=None hbmfluid.water=Water @@ -2118,6 +2121,11 @@ item.desh_pickaxe.name=Worker's Alloy Pickaxe item.desh_axe.name=Worker's Alloy Axe item.desh_shovel.name=Worker's Alloy Shovel item.desh_hoe.name=Worker's Alloy Hoe +item.cobalt_sword.name=Cobalt Sword +item.cobalt_pickaxe.name=Cobalt Pickaxe +item.cobalt_axe.name=Cobalt Axe +item.cobalt_shovel.name=Cobalt Shovel +item.cobalt_hoe.name=Cobalt Hoe tile.red_cable.name=Red Copper Cable diff --git a/assets/hbm/sounds.json b/assets/hbm/sounds.json index 8a3d931fe..f23f29ce0 100644 --- a/assets/hbm/sounds.json +++ b/assets/hbm/sounds.json @@ -55,7 +55,7 @@ "music.recordLambdaCore": {"category": "record", "sounds": [{"name": "music/recordLambdaCore", "stream": true}]}, "music.recordSectorSweep": {"category": "record", "sounds": [{"name": "music/recordSectorSweep", "stream": true}]}, "music.recordVortalCombat": {"category": "record", "sounds": [{"name": "music/recordVortalCombat", "stream": true}]}, - "music.transmission": {"category": "record", "sounds": [{"name": "music/transmission", "stream": true}]}, + "music.transmission": {"category": "record", "sounds": [{"name": "music/recordGlass", "stream": true}]}, "weapon.tauShoot": {"category": "player", "sounds": [{"name": "weapon/tauShoot", "stream": false}]}, "weapon.tauChargeLoop2": {"category": "player", "sounds": [{"name": "weapon/tauChargeLoop2", "stream": true}]}, @@ -122,6 +122,7 @@ "weapon.tesla": {"category": "block", "sounds": ["weapon/tesla1", "weapon/tesla2", "weapon/tesla3", "weapon/tesla4"]}, "weapon.teslaShoot": {"category": "player", "sounds": [{"name": "weapon/teslaShoot", "stream": false}]}, "weapon.flamerReload": {"category": "player", "sounds": [{"name": "weapon/flamerReload", "stream": false}]}, + "weapon.stop": {"category": "player", "sounds": ["weapon/stop1", "weapon/stop2"]}, "weapon.reloadTurret": {"category": "player", "sounds": [{"name": "weapon/reloadTurret", "stream": false}]}, "weapon.switchmode1": {"category": "player", "sounds": [{"name": "weapon/switchmode1", "stream": false}]}, diff --git a/assets/hbm/sounds/music/recordGlass.ogg b/assets/hbm/sounds/music/recordGlass.ogg new file mode 100644 index 0000000000000000000000000000000000000000..f37147ccb7dde9cd3fb36ef7293ca0119d1cfc96 GIT binary patch literal 608334 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