rework placement logic to match spawn eggs

Author: TropheusJ

common/src/main/java/one/devos/nautical/losing_my_marbles/content/marble/MarbleEntity.java

@@ -41,7 +41,6 @@
 import net.minecraft.world.level.storage.ValueOutput;
 import net.minecraft.world.phys.Vec3;
 import one.devos.nautical.losing_my_marbles.content.LosingMyMarblesDataComponents;
-import one.devos.nautical.losing_my_marbles.content.LosingMyMarblesEntities;
 import one.devos.nautical.losing_my_marbles.content.LosingMyMarblesItemTags;
 import one.devos.nautical.losing_my_marbles.content.marble.data.MarbleInstance;
 import one.devos.nautical.losing_my_marbles.content.marble.data.shape.MarbleShape;
@@ -83,11 +82,6 @@ public MarbleEntity(EntityType<?> type, Level level, MarbleInstance marble) {
 		this.refreshDimensions();
 	}
 
-	public MarbleEntity(Level level, MarbleInstance marble, @Nullable LivingEntity owner) {
-		this(LosingMyMarblesEntities.MARBLE, level, marble);
-		this.owner = owner == null ? null : new EntityReference<>(owner);
-	}
-
 	public MarbleInstance marble() {
 		return Objects.requireNonNull(this.marble, "marble() called too early");
 	}
@@ -104,6 +98,10 @@ public void setMarble(MarbleInstance marble) {
 		}
 	}
 
+	public void setOwner(@Nullable LivingEntity entity) {
+		this.owner = entity == null ? null : new EntityReference<>(entity);
+	}
+
 	public double distanceTraveled() {
 		return this.distanceTraveled;
 	}

common/src/main/java/one/devos/nautical/losing_my_marbles/content/marble/MarbleItem.java

@@ -1,5 +1,6 @@
 package one.devos.nautical.losing_my_marbles.content.marble;
 
+import java.util.Objects;
 import java.util.Optional;
 import java.util.function.Consumer;
 
@@ -9,26 +10,27 @@
 import net.minecraft.core.dispenser.DefaultDispenseItemBehavior;
 import net.minecraft.core.dispenser.DispenseItemBehavior;
 import net.minecraft.network.chat.Component;
+import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.InteractionResult;
 import net.minecraft.world.entity.EntitySpawnReason;
 import net.minecraft.world.entity.EntityType;
+import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.TooltipFlag;
 import net.minecraft.world.item.component.TooltipDisplay;
 import net.minecraft.world.item.context.UseOnContext;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.DispenserBlock;
+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.Vec3;
 import one.devos.nautical.losing_my_marbles.content.LosingMyMarblesDataComponents;
 import one.devos.nautical.losing_my_marbles.content.LosingMyMarblesEntities;
 import one.devos.nautical.losing_my_marbles.content.LosingMyMarblesItems;
 import one.devos.nautical.losing_my_marbles.content.marble.data.MarbleInstance;
 
+// placement and dispense logic based on spawn eggs
 public final class MarbleItem extends Item {
-	// based on spawn eggs
 	public static final DispenseItemBehavior DISPENSE_BEHAVIOR = new DefaultDispenseItemBehavior() {
 		@Override
 		public ItemStack execute(BlockSource source, ItemStack stack) {
@@ -68,26 +70,39 @@ public InteractionResult useOn(UseOnContext context) {
 			return InteractionResult.FAIL;
 		}
 
-		BlockPos pos = context.getClickedPos().relative(context.getClickedFace());
 		Level level = context.getLevel();
 
-		if (!level.noCollision(new AABB(pos)))
-			return InteractionResult.FAIL;
-
 		Optional<MarbleInstance> instance = marble.get(level.registryAccess());
 		if (instance.isEmpty()) {
 			return InteractionResult.FAIL;
 		}
 
-		if (level.isClientSide()) {
+		if (!(level instanceof ServerLevel serverLevel)) {
 			return InteractionResult.SUCCESS;
 		}
 
-		MarbleEntity entity = new MarbleEntity(level, instance.get(), context.getPlayer());
-		entity.setPos(Vec3.atCenterOf(pos));
-		level.addFreshEntity(entity);
+		Direction face = context.getClickedFace();
+		BlockPos pos = context.getClickedPos();
+		BlockState state = level.getBlockState(pos);
+		Player player = context.getPlayer();
+
+		BlockPos actualPos = state.getCollisionShape(level, pos).isEmpty() ? pos : pos.relative(face);
+		boolean offset = !Objects.equals(pos, actualPos) && face == Direction.UP;
+
+		Consumer<MarbleEntity> config = EntityType.appendDefaultStackConfig(entity -> {
+			entity.setMarble(instance.get());
+			entity.setOwner(player);
+		}, level, stack, player);
+
+		MarbleEntity spawned = LosingMyMarblesEntities.MARBLE.spawn(
+				serverLevel, config, actualPos, EntitySpawnReason.SPAWN_ITEM_USE, true, offset
+		);
+
+		if (spawned != null) {
+			stack.shrink(1);
+			level.gameEvent(player, GameEvent.ENTITY_PLACE, pos);
+		}
 
-		stack.shrink(1);
 		return InteractionResult.SUCCESS_SERVER;
 	}