Added Sword on a Stick (...yep)

Tweaked Omen proc sound effect Added sound effect to Watcher proc
Sweenus · Aug 16, 2022 · d4002c2 · d4002c2
1 parent 9ecb948
commit d4002c2
Show file tree

Hide file tree

Showing 11 changed files with 692 additions and 2 deletions.
diff --git a/src/main/java/net/sweenus/simplyswords/effect/OmenEffect.java b/src/main/java/net/sweenus/simplyswords/effect/OmenEffect.java
@@ -32,7 +32,7 @@ public void applyUpdateEffect(LivingEntity pLivingEntity, int pAmplifier) {
                 pLivingEntity.kill();
                 if (pPlayer.getAbsorptionAmount() < 6f) {
                     pPlayer.setAbsorptionAmount(pPlayer.getAbsorptionAmount() + absAmount);
-                    world.playSound(null, position, SoundEvents.BLOCK_ANVIL_LAND, SoundCategory.BLOCKS, 1f, 1f);
+                    world.playSound(null, position, SoundEvents.BLOCK_ANVIL_LAND, SoundCategory.BLOCKS, 0.6f, 1f);
                 }
             }
 

diff --git a/src/main/java/net/sweenus/simplyswords/effect/WatcherEffect.java b/src/main/java/net/sweenus/simplyswords/effect/WatcherEffect.java
@@ -37,7 +37,7 @@ public void applyUpdateEffect(LivingEntity pLivingEntity, int pAmplifier) {
                 if (e != null && pPlayer != null){
                     e.damage(DamageSource.FREEZE, rAmount);
                     pPlayer.setHealth(pPlayer.getHealth() + rAmount);
-                    world.playSound(null, position, SoundEvents.BLOCK_ENDER_CHEST_OPEN, SoundCategory.BLOCKS, 1f, 1f);
+                    world.playSound(null, position, SoundEvents.BLOCK_ENDER_CHEST_OPEN, SoundCategory.BLOCKS, 0.2f, 1f);
                 }
             }
 

diff --git a/src/main/java/net/sweenus/simplyswords/item/ModItems.java b/src/main/java/net/sweenus/simplyswords/item/ModItems.java
@@ -122,6 +122,10 @@ public class ModItems {
             new StormSwordItem(ToolMaterials.NETHERITE, 3, -1.7f,
                     new FabricItemSettings().group(ModItemGroup.SIMPLYSWORDS).rarity(Rarity.EPIC)));
 
+    public static final Item SWORD_ON_A_STICK = registerItem( "sword_on_a_stick",
+            new SwordItem(ToolMaterials.WOOD, 5, -1.9f,
+                    new FabricItemSettings().group(ModItemGroup.SIMPLYSWORDS).rarity(Rarity.EPIC)));
+
     public static final Item TOXIC_LONGSWORD = registerItem( "toxic_longsword",
             new PoisonSwordItem(ToolMaterials.NETHERITE, 3, -2.4f,
                     new FabricItemSettings().group(ModItemGroup.SIMPLYSWORDS).rarity(Rarity.EPIC)));

diff --git a/src/main/java/net/sweenus/simplyswords/util/ModLootTableModifiers.java b/src/main/java/net/sweenus/simplyswords/util/ModLootTableModifiers.java
@@ -81,6 +81,8 @@ public static void modifyLootTables() {
                         .conditionally(RandomChanceLootCondition.builder(SimplySwordsConfig.getFloatValue("unique_loot_table_weight"))) // 1 = 100% of the time
                         .with(ItemEntry.builder(ModItems.WATCHER_CLAYMORE))
                         .with(ItemEntry.builder(ModItems.TOXIC_LONGSWORD))
+                        .with(ItemEntry.builder(ModItems.SWORD_ON_A_STICK))
+                        .with(ItemEntry.builder(ModItems.STORMS_EDGE))
                         .with(ItemEntry.builder(ModItems.BRIMSTONE_CLAYMORE));
                 tableBuilder.pool(upool);
 

diff --git a/src/main/resources/assets/simplyswords/lang/en_us.json b/src/main/resources/assets/simplyswords/lang/en_us.json
@@ -28,6 +28,7 @@
   "item.simplyswords.diamond_twinblade": "Diamond Twinblade",
   "item.simplyswords.netherite_twinblade": "Netherite Twinblade",
   "item.simplyswords.storms_edge": "Storm's Edge",
+  "item.simplyswords.sword_on_a_stick": "Sword on a Stick",
 
 
   "itemGroup.simplyswords.simplyswords": "Simply Swords",