diff --git a/src/main/java/net/mcreator/target/TargetMod.java b/src/main/java/net/mcreator/target/TargetMod.java index bf529795c..a3b1311f4 100644 --- a/src/main/java/net/mcreator/target/TargetMod.java +++ b/src/main/java/net/mcreator/target/TargetMod.java @@ -106,5 +106,9 @@ public class TargetMod { event.enqueueWork(() -> BrewingRecipeRegistry.addRecipe(Ingredient.of(PotionUtils.setPotion(new ItemStack(Items.POTION), Potions.WATER)), Ingredient.of(Items.LIGHTNING_ROD), PotionUtils.setPotion(new ItemStack(Items.POTION), TargetModPotion.SHOCK.get()))); + event.enqueueWork(() -> BrewingRecipeRegistry.addRecipe(Ingredient.of(PotionUtils.setPotion(new ItemStack(Items.POTION), TargetModPotion.SHOCK.get())), + Ingredient.of(Items.REDSTONE), PotionUtils.setPotion(new ItemStack(Items.POTION), TargetModPotion.LONG_SHOCK.get()))); + event.enqueueWork(() -> BrewingRecipeRegistry.addRecipe(Ingredient.of(PotionUtils.setPotion(new ItemStack(Items.POTION), TargetModPotion.SHOCK.get())), + Ingredient.of(Items.GLOWSTONE_DUST), PotionUtils.setPotion(new ItemStack(Items.POTION), TargetModPotion.STRONG_SHOCK.get()))); } } diff --git a/src/main/java/net/mcreator/target/init/TargetModPotion.java b/src/main/java/net/mcreator/target/init/TargetModPotion.java index 4950f5162..46620de21 100644 --- a/src/main/java/net/mcreator/target/init/TargetModPotion.java +++ b/src/main/java/net/mcreator/target/init/TargetModPotion.java @@ -13,4 +13,8 @@ public class TargetModPotion { public static final RegistryObject SHOCK= POTIONS.register("target_shock", () -> new Potion(new MobEffectInstance(TargetModMobEffects.SHOCK.get(), 100, 0))); + public static final RegistryObject STRONG_SHOCK = POTIONS.register("target_strong_shock", + () -> new Potion(new MobEffectInstance(TargetModMobEffects.SHOCK.get(), 100, 1))); + public static final RegistryObject LONG_SHOCK = POTIONS.register("target_long_shock", + () -> new Potion(new MobEffectInstance(TargetModMobEffects.SHOCK.get(), 400, 0))); } diff --git a/src/main/java/net/mcreator/target/init/TargetModSounds.java b/src/main/java/net/mcreator/target/init/TargetModSounds.java index d58f43aa0..2f7362b5f 100644 --- a/src/main/java/net/mcreator/target/init/TargetModSounds.java +++ b/src/main/java/net/mcreator/target/init/TargetModSounds.java @@ -15,6 +15,7 @@ public class TargetModSounds { public static final RegistryObject TASER_FIRE_3P = REGISTRY.register("taser_fire_3p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "taser_fire_3p"))); public static final RegistryObject TASER_RELOAD = REGISTRY.register("taser_reload", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "taser_reload"))); public static final RegistryObject SHOCK = REGISTRY.register("shock", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "shock"))); + public static final RegistryObject ELECTRIC = REGISTRY.register("electric", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "electric"))); public static final RegistryObject TRACHELIUM_FIRE_1P = REGISTRY.register("trachelium_fire_1p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "trachelium_fire_1p"))); public static final RegistryObject TRACHELIUM_FIRE_3P = REGISTRY.register("trachelium_fire_3p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "trachelium_fire_3p"))); public static final RegistryObject TRACHELIUM_FAR = REGISTRY.register("trachelium_far", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "trachelium_far"))); diff --git a/src/main/resources/assets/target/lang/en_us.json b/src/main/resources/assets/target/lang/en_us.json index f7e4cceb2..7f49b62b2 100644 --- a/src/main/resources/assets/target/lang/en_us.json +++ b/src/main/resources/assets/target/lang/en_us.json @@ -196,6 +196,12 @@ "item.minecraft.potion.effect.target_shock": "Potion of Shock", "item.minecraft.splash_potion.effect.target_shock": "Splash Potion of Shock", "item.minecraft.lingering_potion.effect.target_shock": "Lingering Potion of Shock", + "item.minecraft.potion.effect.target_strong_shock": "Potion of Shock", + "item.minecraft.splash_potion.effect.target_strong_shock": "Splash Potion of Shock", + "item.minecraft.lingering_potion.effect.target_strong_shock": "Lingering Potion of Shock", + "item.minecraft.potion.effect.target_long_shock": "Potion of Shock", + "item.minecraft.splash_potion.effect.target_long_shock": "Splash Potion of Shock", + "item.minecraft.lingering_potion.effect.target_long_shock": "Lingering Potion of Shock", "des.target.sensitivity": "Current Sensitivity of This Gun: %1$s", diff --git a/src/main/resources/assets/target/lang/zh_cn.json b/src/main/resources/assets/target/lang/zh_cn.json index 5448f7e43..c5fa19999 100644 --- a/src/main/resources/assets/target/lang/zh_cn.json +++ b/src/main/resources/assets/target/lang/zh_cn.json @@ -196,6 +196,12 @@ "item.minecraft.potion.effect.target_shock": "电击药水", "item.minecraft.splash_potion.effect.target_shock": "喷溅型电击药水", "item.minecraft.lingering_potion.effect.target_shock": "滞留型电击药水", + "item.minecraft.potion.effect.target_strong_shock": "电击药水", + "item.minecraft.splash_potion.effect.target_strong_shock": "喷溅型电击药水", + "item.minecraft.lingering_potion.effect.target_strong_shock": "滞留型电击药水", + "item.minecraft.potion.effect.target_long_shock": "电击药水", + "item.minecraft.splash_potion.effect.target_long_shock": "喷溅型电击药水", + "item.minecraft.lingering_potion.effect.target_long_shock": "滞留型电击药水", "des.target.sensitivity": "当前枪械的灵敏度为:%1$s", diff --git a/src/main/resources/assets/target/sounds.json b/src/main/resources/assets/target/sounds.json index 8115983e7..f4b870dff 100644 --- a/src/main/resources/assets/target/sounds.json +++ b/src/main/resources/assets/target/sounds.json @@ -1223,6 +1223,14 @@ } ] }, + "electric": { + "sounds": [ + { + "name": "target:electric", + "stream": false + } + ] + }, "triggerclick": { "sounds": [ { diff --git a/src/main/resources/assets/target/sounds/electric.ogg b/src/main/resources/assets/target/sounds/electric.ogg new file mode 100644 index 000000000..53a2befef Binary files /dev/null and b/src/main/resources/assets/target/sounds/electric.ogg differ diff --git a/src/main/resources/assets/target/sounds/shock.ogg b/src/main/resources/assets/target/sounds/shock.ogg index 9ea95a63c..4f31a9b07 100644 Binary files a/src/main/resources/assets/target/sounds/shock.ogg and b/src/main/resources/assets/target/sounds/shock.ogg differ