Skip to content

Explicitly separate rigidly definite player interaction actions#7

Merged
BenCheung0422 merged 17 commits intorelictusfrom
plus-pr-552
Jan 20, 2025
Merged

Explicitly separate rigidly definite player interaction actions#7
BenCheung0422 merged 17 commits intorelictusfrom
plus-pr-552

Conversation

@BenCheung0422
Copy link
Copy Markdown
Member

@BenCheung0422 BenCheung0422 commented Dec 9, 2024

# Conflicts:
#	src/client/java/minicraft/entity/furniture/Bed.java
#	src/client/java/minicraft/entity/furniture/Chest.java
#	src/client/java/minicraft/entity/furniture/DeathChest.java
#	src/client/java/minicraft/entity/furniture/DungeonChest.java
#	src/client/java/minicraft/entity/furniture/Furniture.java
#	src/client/java/minicraft/entity/furniture/Tnt.java
#	src/client/java/minicraft/entity/mob/Player.java
#	src/client/java/minicraft/item/FishingRodItem.java
#	src/client/java/minicraft/item/FurnitureItem.java
#	src/client/java/minicraft/item/Item.java
#	src/client/java/minicraft/item/ToolItem.java
#	src/client/java/minicraft/level/tile/HardRockTile.java
#	src/client/java/minicraft/level/tile/OreTile.java
#	src/client/java/minicraft/level/tile/PathTile.java
#	src/client/java/minicraft/level/tile/TorchTile.java
#	src/client/java/minicraft/level/tile/TreeTile.java
#	src/client/java/minicraft/level/tile/farming/FarmTile.java
#	src/client/java/minicraft/screen/ContainerDisplay.java
#	src/client/java/minicraft/screen/CraftingDisplay.java
#	src/client/java/minicraft/screen/PauseDisplay.java
#	src/client/java/minicraft/screen/PlayerInvDisplay.java
#	src/client/java/minicraft/screen/TutorialDisplayHandler.java
# Conflicts:
#	src/client/java/minicraft/entity/furniture/Bed.java
#	src/client/java/minicraft/entity/furniture/Crafter.java
#	src/client/java/minicraft/entity/mob/Sheep.java
#	src/client/java/minicraft/level/tile/FlowerTile.java
# Conflicts:
#	src/client/java/minicraft/entity/Arrow.java
#	src/client/java/minicraft/entity/FireSpark.java
#	src/client/java/minicraft/entity/Spark.java
#	src/client/java/minicraft/entity/furniture/Crafter.java
#	src/client/java/minicraft/entity/mob/AirWizard.java
#	src/client/java/minicraft/entity/mob/EnemyMob.java
#	src/client/java/minicraft/entity/mob/Mob.java
#	src/client/java/minicraft/entity/mob/ObsidianKnight.java
#	src/client/java/minicraft/entity/mob/PassiveMob.java
#	src/client/java/minicraft/entity/mob/Player.java
#	src/client/java/minicraft/entity/particle/Particle.java
#	src/client/java/minicraft/item/ToolItem.java
#	src/client/java/minicraft/level/tile/CactusTile.java
#	src/client/java/minicraft/level/tile/ConnectTile.java
#	src/client/java/minicraft/level/tile/ExplodedTile.java
#	src/client/java/minicraft/level/tile/HoleTile.java
#	src/client/java/minicraft/level/tile/LavaTile.java
#	src/client/java/minicraft/level/tile/SaplingTile.java
#	src/client/java/minicraft/level/tile/SignTile.java
#	src/client/java/minicraft/level/tile/TreeTile.java
#	src/client/java/minicraft/level/tile/WaterTile.java
@BenCheung0422 BenCheung0422 merged commit 4100f74 into relictus Jan 20, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Improving the activation of player interactions on world

1 participant