Fix balloons not firing game events for placing or removal (#8105) and make it so that balloons can be spawned via dispensers

Author: pupnewfster

src/additions/java/mekanism/additions/common/MekanismAdditions.java

@@ -3,6 +3,8 @@
 import mekanism.additions.client.AdditionsClient;
 import mekanism.additions.common.block.BlockObsidianTNT;
 import mekanism.additions.common.config.MekanismAdditionsConfig;
+import mekanism.additions.common.entity.EntityBalloon;
+import mekanism.additions.common.item.ItemBalloon;
 import mekanism.additions.common.registries.AdditionsBiomeModifierSerializers;
 import mekanism.additions.common.registries.AdditionsBlocks;
 import mekanism.additions.common.registries.AdditionsCreativeTabs;
@@ -16,13 +18,17 @@
 import mekanism.common.base.IModModule;
 import mekanism.common.config.MekanismModConfig;
 import mekanism.common.lib.Version;
+import mekanism.common.registration.impl.ItemRegistryObject;
 import net.minecraft.core.BlockPos;
+import net.minecraft.core.Position;
 import net.minecraft.core.dispenser.BlockSource;
 import net.minecraft.core.dispenser.DefaultDispenseItemBehavior;
 import net.minecraft.resources.ResourceLocation;
+import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.block.DispenserBlock;
 import net.minecraft.world.level.gameevent.GameEvent;
+import net.minecraft.world.phys.Vec3;
 import net.neoforged.bus.api.IEventBus;
 import net.neoforged.fml.ModContainer;
 import net.neoforged.fml.common.Mod;
@@ -113,6 +119,26 @@ protected ItemStack execute(@NotNull BlockSource source, @NotNull ItemStack stac
                     return super.execute(source, stack);
                 }
             });
+            DefaultDispenseItemBehavior balloonBehavior = new DefaultDispenseItemBehavior() {
+                @NotNull
+                @Override
+                protected ItemStack execute(@NotNull BlockSource source, @NotNull ItemStack stack) {
+                    ServerLevel level = source.level();
+                    Position position = DispenserBlock.getDispensePosition(source, 1, new Vec3(-0.5, -3.5, -0.5));
+                    EntityBalloon balloon = EntityBalloon.create(level, position.x(), position.y(), position.z(), ((ItemBalloon) stack.getItem()).getColor());
+                    if (balloon == null) {
+                        //Otherwise, if something went very wrong, eject it as a normal item
+                        return super.execute(source, stack);
+                    }
+                    stack.shrink(1);
+                    level.addFreshEntity(balloon);
+                    level.gameEvent(null, GameEvent.ENTITY_PLACE, new Vec3(position.x(), position.y(), position.z()));
+                    return stack;
+                }
+            };
+            for (ItemRegistryObject<ItemBalloon> balloon : AdditionsItems.BALLOONS.values()) {
+                DispenserBlock.registerBehavior(balloon, balloonBehavior);
+            }
         });
         Mekanism.logger.info("Loaded 'Mekanism: Additions' module.");
     }

src/additions/java/mekanism/additions/common/entity/EntityBalloon.java

@@ -31,6 +31,7 @@
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.gameevent.GameEvent;
 import net.minecraft.world.phys.AABB;
 import net.minecraft.world.phys.HitResult;
 import net.minecraft.world.phys.Vec3;
@@ -247,6 +248,7 @@ private void pop() {
                       center.z() + 0.6 * random.nextFloat() - 0.3, 1, 0, 0, 0, 0);
             }
         }
+        level().gameEvent(GameEvent.ENTITY_DAMAGE, position(), GameEvent.Context.of(this));
         discard();
     }
 

src/additions/java/mekanism/additions/common/item/ItemBalloon.java

@@ -23,6 +23,7 @@
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.DispenserBlock;
+import net.minecraft.world.level.gameevent.GameEvent;
 import net.minecraft.world.phys.AABB;
 import net.minecraft.world.phys.Vec3;
 import org.jetbrains.annotations.NotNull;
@@ -53,6 +54,7 @@ public InteractionResultHolder<ItemStack> use(Level world, @NotNull Player playe
                 return InteractionResultHolder.fail(stack);
             }
             world.addFreshEntity(balloon);
+            world.gameEvent(player, GameEvent.ENTITY_PLACE, pos);
         }
         if (!player.isCreative()) {
             stack.shrink(1);
@@ -102,6 +104,7 @@ public InteractionResult useOn(UseOnContext context) {
                     }
                     world.addFreshEntity(balloon);
                     stack.shrink(1);
+                    world.gameEvent(player, GameEvent.ENTITY_PLACE, pos);
                 }
                 return InteractionResult.SUCCESS;
             }
@@ -114,10 +117,11 @@ public InteractionResult useOn(UseOnContext context) {
     @Override
     public InteractionResult interactLivingEntity(@NotNull ItemStack stack, Player player, @NotNull LivingEntity entity, @NotNull InteractionHand hand) {
         if (player.isShiftKeyDown()) {
-            if (!player.level().isClientSide) {
+            Level level = player.level();
+            if (!level.isClientSide) {
                 AABB bound = new AABB(entity.getX() - 0.2, entity.getY() - 0.5, entity.getZ() - 0.2,
                       entity.getX() + 0.2, entity.getY() + entity.getBbHeight() + 4, entity.getZ() + 0.2);
-                List<EntityBalloon> balloonsNear = player.level().getEntitiesOfClass(EntityBalloon.class, bound);
+                List<EntityBalloon> balloonsNear = level.getEntitiesOfClass(EntityBalloon.class, bound);
                 for (EntityBalloon balloon : balloonsNear) {
                     if (balloon.latchedEntity == entity) {
                         return InteractionResult.SUCCESS;
@@ -127,8 +131,9 @@ public InteractionResult interactLivingEntity(@NotNull ItemStack stack, Player p
                 if (balloon == null) {
                     return InteractionResult.FAIL;
                 }
-                player.level().addFreshEntity(balloon);
+                level.addFreshEntity(balloon);
                 stack.shrink(1);
+                level.gameEvent(player, GameEvent.ENTITY_PLACE, balloon.position());
             }
             return InteractionResult.SUCCESS;
         }