xircon/Hbm-s-Nuclear-Tech-GIT
1
0
Fork 0
mirror of https://github.com/HbmMods/Hbm-s-Nuclear-Tech-GIT.git synced 2026-01-25 10:32:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1179 from 70000hp/uac-pistol-uv-fix

Browse Source 
UAC Pistol UV fix, and recipe
This commit is contained in:
HbmMods 2023-09-03 18:30:12 +02:00 committed by GitHub
commit 015e3f36d6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7340 additions and 7806 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/hbm/crafting/WeaponRecipes.java
View File

@ -89,6 +89,7 @@ public class WeaponRecipes {
CraftingManager.addRecipeAuto(new ItemStack(ModItems.gun_revolver_silver, 1), new Object[] { "SSP", " TI", 'S', AL.plate(), 'P', ModItems.mechanism_revolver_2, 'T', ModItems.wire_tungsten, 'I', KEY_PLANKS });
CraftingManager.addRecipeAuto(new ItemStack(ModItems.gun_revolver_red, 1), new Object[] { "R ", " B", 'R', ModItems.key_red, 'B', ModItems.gun_revolver_blackjack });
CraftingManager.addRecipeAuto(new ItemStack(ModItems.gun_deagle, 1), new Object[] { "PPM", " BI", 'P', STEEL.plate(), 'B', ModItems.bolt_tungsten, 'I', ANY_PLASTIC.ingot(), 'M', ModItems.mechanism_rifle_1 });
CraftingManager.addRecipeAuto(new ItemStack(ModItems.gun_uac_pistol, 1), new Object[] { "IIM", " BI", 'B', ModItems.bolt_dura_steel, 'I', ANY_PLASTIC.ingot(), 'M', ModItems.mechanism_rifle_1 });
CraftingManager.addRecipeAuto(new ItemStack(ModItems.gun_revolver_cursed, 1), new Object[] { "TTM", "SRI", 'S', STEEL.plate(), 'I', STEEL.ingot(), 'R', ModItems.wire_red_copper, 'T', TI.plate(), 'M', ModItems.mechanism_revolver_2 });
CraftingManager.addRecipeAuto(new ItemStack(ModItems.gun_revolver_nightmare, 1), new Object[] { "SEM", " RW", 'S', STEEL.plate(), 'W', KEY_PLANKS, 'R', ModItems.wire_aluminium, 'E', ModItems.powder_power, 'M', ModItems.mechanism_revolver_2 });
CraftingManager.addRecipeAuto(new ItemStack(ModItems.gun_revolver_nightmare2, 1), new Object[] { "SSM", "RRW", 'S', OreDictManager.getReflector(), 'W', W.ingot(), 'R', ModItems.wire_gold, 'M', ModItems.mechanism_special });

4
src/main/java/com/hbm/lib/HbmChestContents.java
View File

@ -266,11 +266,13 @@ public class HbmChestContents {
public static WeightedRandomChestContent[] vault1 = new WeightedRandomChestContent[] {
new WeightedRandomChestContent(Items.gold_ingot, 0, 3, 14, 1),
new WeightedRandomChestContent(ModItems.gun_uac_pistol, 0, 1, 1, 2),
new WeightedRandomChestContent(ModItems.pin, 0, 8, 8, 1),
new WeightedRandomChestContent(ModItems.gun_calamity, 0, 1, 1, 1),
new WeightedRandomChestContent(ModItems.bottle_quantum, 0, 1, 3, 1),
new WeightedRandomChestContent(ModItems.ingot_advanced_alloy, 0, 4, 12, 1),
new WeightedRandomChestContent(ModItems.ammo_50bmg, 0, 24, 48, 1),
new WeightedRandomChestContent(ModItems.ammo_45, 0, 48, 64, 2),
new WeightedRandomChestContent(ModItems.circuit_red_copper, 0, 6, 12, 1),
new WeightedRandomChestContent(ModItems.gas_mask_m65, 0, 1, 1, 1),
new WeightedRandomChestContent(ModItems.grenade_if_he, 0, 1, 1, 1),
@ -386,6 +388,8 @@ public class HbmChestContents {
public static WeightedRandomChestContent[] lockersVault = new WeightedRandomChestContent[] {
new WeightedRandomChestContent(ModItems.robes_helmet, 0, 1, 1, 1),
new WeightedRandomChestContent(ModItems.robes_plate, 0, 1, 1, 1),
new WeightedRandomChestContent(ModItems.ammo_45, 0, 48, 64, 2),
new WeightedRandomChestContent(ModItems.gun_uac_pistol, 0, 1, 1, 1),
new WeightedRandomChestContent(ModItems.robes_legs, 0, 1, 1, 1),
new WeightedRandomChestContent(ModItems.robes_boots, 0, 1, 1, 1),
new WeightedRandomChestContent(ModItems.jackt, 0, 1, 1, 1),

15141
src/main/resources/assets/hbm/models/weapons/UAC pistol.obj
View File

File diff suppressed because it is too large Load Diff