Rose gold bomb fixes

Author: cassiancc

CHANGELOG-LATEST.md

@@ -5,11 +5,14 @@
 - Setting in music and sounds menu to control jukebox fade distance.
 - Config option to disable Ecologics penguins dropping feathers.
 - Config option to modify Savage & Ravage creeper spore cloud durations.
+- Disabled some curative items.
 
 ### Fixed
 - Swap Arrows can no longer force Withers into boats.
 - Vertical leashes now render properly.
 - Leads now connect to the front of boats.
 - Boat leash connections persist on world reload.
 - A spectator with Bracewalk no longer can break blocks. (Additional Enchantments)
-- Aloe Vera blocks can now be harvested with modded shears. (Atmospheric)
+- Aloe Vera blocks can now be harvested with modded shears. (Atmospheric)
+- Rose Gold bombs now dispense correctly.
+- Crash with Pehkui.

src/main/java/cc/cassian/raspberry/items/RoseGoldBombItem.java

@@ -2,19 +2,44 @@
 
 import cc.cassian.raspberry.entity.Ashball;
 import cc.cassian.raspberry.entity.RoseGoldBombEntity;
+import cc.cassian.raspberry.entity.SwapArrowEntity;
 import cc.cassian.raspberry.registry.RaspberrySoundEvents;
+import net.mehvahdjukaar.supplementaries.common.entities.BombEntity;
+import net.mehvahdjukaar.supplementaries.common.items.BombItem;
+import net.minecraft.core.BlockSource;
+import net.minecraft.core.Direction;
+import net.minecraft.core.Position;
+import net.minecraft.core.dispenser.AbstractProjectileDispenseBehavior;
 import net.minecraft.sounds.SoundSource;
 import net.minecraft.stats.Stats;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.InteractionResultHolder;
 import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.entity.projectile.AbstractArrow;
+import net.minecraft.world.entity.projectile.Projectile;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.Level;
+import net.minecraft.world.level.block.DispenserBlock;
 
 public class RoseGoldBombItem extends Item {
     public RoseGoldBombItem(Properties properties) {
         super(properties);
+        DispenserBlock.registerBehavior(this, new AbstractProjectileDispenseBehavior() {
+
+            @Override
+            protected Projectile getProjectile(Level level, Position position, ItemStack stack) {
+                return new RoseGoldBombEntity(level, position.x(), position.y(), position.z());
+            }
+
+            protected float getUncertainty() {
+                return 11.0F;
+            }
+
+            protected float getPower() {
+                return 1.3F;
+            }
+        });
     }
 
     @Override
@@ -25,7 +50,7 @@ public InteractionResultHolder<ItemStack> use(Level level, Player player, Intera
                 player.getX(),
                 player.getY(),
                 player.getZ(),
-                RaspberrySoundEvents.ASHBALL_THROW.get(),
+                RaspberrySoundEvents.ROSE_GOLD_BOMB_THROW.get(),
                 SoundSource.NEUTRAL,
                 0.5F,
                 0.4F / (level.getRandom().nextFloat() * 0.4F + 0.8F)

src/main/java/cc/cassian/raspberry/registry/RaspberrySoundEvents.java

@@ -14,6 +14,7 @@ public class RaspberrySoundEvents {
     public static final DeferredRegister<SoundEvent> SOUNDS = DeferredRegister.create(ForgeRegistries.SOUND_EVENTS, MOD_ID);
 
     public static final RegistryObject<SoundEvent> ASHBALL_THROW = register("entity.ashball.throw");
+    public static final RegistryObject<SoundEvent> ROSE_GOLD_BOMB_THROW = register("entity.rose_gold_bomb.throw");
     public static final RegistryObject<SoundEvent> CRUNCHY_FRUIT_SOUNDS = register("entity.crunchy_fruit.eat");
     public static final RegistryObject<SoundEvent> SOFT_FRUIT_SOUNDS = register("entity.soft_fruit.eat");
     public static final RegistryObject<SoundEvent> DRIED_KELP_SOUNDS = register("entity.dried_kelp.eat");

src/main/resources/assets/raspberry/lang/en_us.json

@@ -51,6 +51,7 @@
 
 
   "raspberry.subtitles.entity.ashball.throw": "Ashball flies",
+  "raspberry.subtitles.entity.rose_gold_bomb.throw": "Bomb flies",
   "raspberry.subtitles.player.attack.silver_hit": "Mirror connects",
 
   "subtitles.item.armor.equip_copper": "Copper armor clonks",

src/main/resources/assets/raspberry/sounds.json

@@ -5,6 +5,12 @@
   ],
   "subtitle": "raspberry.subtitles.entity.ashball.throw"
   },
+  "entity.rose_gold_bomb.throw": {
+    "sounds": [
+      "random/bow"
+    ],
+    "subtitle": "raspberry.subtitles.entity.rose_gold_bomb.throw"
+  },
   "entity.dried_kelp.eat": {
     "sounds": [
       "raspberry:eat_dried_kelp1",