diff --git a/src/main/java/net/mcreator/superbwarfare/event/ClientEventHandler.java b/src/main/java/net/mcreator/superbwarfare/event/ClientEventHandler.java index d8930712c..90dc225ed 100644 --- a/src/main/java/net/mcreator/superbwarfare/event/ClientEventHandler.java +++ b/src/main/java/net/mcreator/superbwarfare/event/ClientEventHandler.java @@ -361,7 +361,8 @@ public class ClientEventHandler { } if (stack.is(ModItems.DEVOTION.get())) { - customRpm = Math.min(customRpm + 20, 500); + int perkLevel = PerkHelper.getItemPerkLevel(ModPerks.TURBO_CHARGER.get(), stack); + customRpm = Math.min(customRpm + 15 + ((perkLevel > 0 ? 5 : 0) + 3 * perkLevel), 500); } if (stack.getItem() == ModItems.SENTINEL.get()) { diff --git a/src/main/java/net/mcreator/superbwarfare/init/ModPerks.java b/src/main/java/net/mcreator/superbwarfare/init/ModPerks.java index 5e06faae9..0606610e4 100644 --- a/src/main/java/net/mcreator/superbwarfare/init/ModPerks.java +++ b/src/main/java/net/mcreator/superbwarfare/init/ModPerks.java @@ -55,7 +55,7 @@ public class ModPerks { public static final RegistryObject SUBSISTENCE = FUNC_PERKS.register("subsistence", () -> new Perk("subsistence", Perk.Type.FUNCTIONAL)); public static final RegistryObject FIELD_DOCTOR = FUNC_PERKS.register("field_doctor", () -> new Perk("field_doctor", Perk.Type.FUNCTIONAL)); public static final RegistryObject SUPER_RECHARGE = FUNC_PERKS.register("super_recharge", () -> new Perk("super_recharge", Perk.Type.FUNCTIONAL)); -// public static final RegistryObject DIMENSION_MAGAZINE = FUNC_PERKS.register("dimension_magazine", () -> new Perk("dimension_magazine", Perk.Type.FUNCTIONAL)); + public static final RegistryObject TURBO_CHARGER = FUNC_PERKS.register("turbo_charger", () -> new Perk("turbo_charger", Perk.Type.FUNCTIONAL)); /** * Damage Perks diff --git a/src/main/java/net/mcreator/superbwarfare/item/gun/machinegun/DevotionItem.java b/src/main/java/net/mcreator/superbwarfare/item/gun/machinegun/DevotionItem.java index c78763240..2458d802f 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/gun/machinegun/DevotionItem.java +++ b/src/main/java/net/mcreator/superbwarfare/item/gun/machinegun/DevotionItem.java @@ -1,6 +1,7 @@ package net.mcreator.superbwarfare.item.gun.machinegun; import net.mcreator.superbwarfare.ModUtils; +import net.mcreator.superbwarfare.client.PoseTool; import net.mcreator.superbwarfare.client.renderer.item.DevotionItemRenderer; import net.mcreator.superbwarfare.event.ClientEventHandler; import net.mcreator.superbwarfare.init.ModItems; @@ -12,7 +13,6 @@ import net.mcreator.superbwarfare.item.gun.GunItem; import net.mcreator.superbwarfare.perk.Perk; import net.mcreator.superbwarfare.perk.PerkHelper; import net.mcreator.superbwarfare.tools.GunsTool; -import net.mcreator.superbwarfare.client.PoseTool; import net.minecraft.client.Minecraft; import net.minecraft.client.model.HumanoidModel; import net.minecraft.client.player.LocalPlayer; @@ -132,6 +132,6 @@ public class DevotionItem extends GunItem implements GeoItem, AnimatedItem { @Override public boolean canApplyPerk(Perk perk) { - return PerkHelper.MACHINE_GUN_PERKS.test(perk) || PerkHelper.MAGAZINE_PERKS.test(perk) || perk == ModPerks.DESPERADO.get(); + return PerkHelper.MACHINE_GUN_PERKS.test(perk) || PerkHelper.MAGAZINE_PERKS.test(perk) || perk == ModPerks.DESPERADO.get() || perk == ModPerks.TURBO_CHARGER.get(); } } \ No newline at end of file diff --git a/src/main/resources/assets/superbwarfare/lang/en_us.json b/src/main/resources/assets/superbwarfare/lang/en_us.json index 00678cf3f..d64b6e04e 100644 --- a/src/main/resources/assets/superbwarfare/lang/en_us.json +++ b/src/main/resources/assets/superbwarfare/lang/en_us.json @@ -262,6 +262,8 @@ "des.superbwarfare.super_recharge": "Increases the recharge speed of Taser Gun", "item.superbwarfare.dimension_magazine": "Dimension Magazine", "des.superbwarfare.dimension_magazine": "Increases the magazine capacity", + "item.superbwarfare.turbo_charger": "Turbocharger", + "des.superbwarfare.turbo_charger": "Reduces autofire spin-up time for compatible weapons.", "item.superbwarfare.kill_clip": "Kill Clip", "des.superbwarfare.kill_clip": "Increases the damage of weapon after dealing a final blow", diff --git a/src/main/resources/assets/superbwarfare/lang/zh_cn.json b/src/main/resources/assets/superbwarfare/lang/zh_cn.json index 2375abf02..97bc9429d 100644 --- a/src/main/resources/assets/superbwarfare/lang/zh_cn.json +++ b/src/main/resources/assets/superbwarfare/lang/zh_cn.json @@ -260,8 +260,8 @@ "des.superbwarfare.field_doctor": "腰射时发射的子弹可以治疗队友", "item.superbwarfare.super_recharge": "超级快充", "des.superbwarfare.super_recharge": "增加泰瑟枪充能的速度", - "item.superbwarfare.dimension_magazine": "次元弹匣", - "des.superbwarfare.dimension_magazine": "增加弹匣容量", + "item.superbwarfare.turbo_charger": "涡轮增压器", + "des.superbwarfare.turbo_charger": "装配后减少武器自动射击所需的缓冲时间", "item.superbwarfare.kill_clip": "杀戮弹匣", "des.superbwarfare.kill_clip": "完成击杀后填装可提升武器伤害", diff --git a/src/main/resources/assets/superbwarfare/models/item/turbo_charger.json b/src/main/resources/assets/superbwarfare/models/item/turbo_charger.json new file mode 100644 index 000000000..388e492af --- /dev/null +++ b/src/main/resources/assets/superbwarfare/models/item/turbo_charger.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "superbwarfare:item/perk/turbo_charger" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/superbwarfare/textures/item/perk/turbo_charger.png b/src/main/resources/assets/superbwarfare/textures/item/perk/turbo_charger.png new file mode 100644 index 000000000..3bb8150c7 Binary files /dev/null and b/src/main/resources/assets/superbwarfare/textures/item/perk/turbo_charger.png differ diff --git a/src/main/resources/data/superbwarfare/recipes/perk/turbo_charger_perk_crafting.json b/src/main/resources/data/superbwarfare/recipes/perk/turbo_charger_perk_crafting.json new file mode 100644 index 000000000..6d3d61e13 --- /dev/null +++ b/src/main/resources/data/superbwarfare/recipes/perk/turbo_charger_perk_crafting.json @@ -0,0 +1,24 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "pattern": [ + "bcb", + "cac", + "bcb" + ], + "key": { + "a": { + "item": "superbwarfare:empty_perk" + }, + "b": { + "tag":"forge:ingots/steel" + }, + "c": { + "item": "minecraft:piston" + } + }, + "result": { + "item": "superbwarfare:turbo_charger", + "count": 1 + } +} \ No newline at end of file