Merge branch 'bugfix/fix-inventory-snapshot-test' into develop

Author: SMILEY4

src/main/java/stevebot/data/player/PlayerSnapshot.java

@@ -1,6 +1,5 @@
 package stevebot.data.player;
 
-import net.minecraft.client.entity.EntityPlayerSP;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemTool;
 import stevebot.data.blocks.BlockLibrary;
@@ -16,8 +15,8 @@
 import stevebot.data.modification.BlockPlaceModification;
 import stevebot.data.modification.HealthChangeModification;
 import stevebot.data.modification.Modification;
+import stevebot.minecraft.MinecraftAdapter;
 import stevebot.pathfinding.actions.ActionCosts;
-import stevebot.player.PlayerUtils;
 
 public class PlayerSnapshot {
 
@@ -62,8 +61,7 @@ public PlayerSnapshot(PlayerSnapshot snapshot) {
 	public void applyModification(Modification modification) {
 
 		if (modification instanceof BlockPlaceModification) {
-			final EntityPlayerSP player = PlayerUtils.getPlayer();
-			if (player.isCreative()) {
+			if (MinecraftAdapter.get().isPlayerCreativeMode()) {
 				return;
 			}
 

src/main/java/stevebot/minecraft/MinecraftAdapter.java

@@ -59,6 +59,12 @@ public static MinecraftAdapter get() {
 	 */
 	public abstract InventoryPlayer getPlayerInventory();
 
+
+	/**
+	 * @return true, if the player is in creative mode
+	 */
+	public abstract boolean isPlayerCreativeMode();
+
 	/**
 	 * @param pos the position of the block
 	 * @return the block at the given position

src/main/java/stevebot/minecraft/MinecraftAdapterImpl.java

@@ -51,6 +51,14 @@ public InventoryPlayer getPlayerInventory() {
 
 
 
+	@Override
+	public boolean isPlayerCreativeMode() {
+		return getPlayer().isCreative();
+	}
+
+
+
+
 	@Override
 	public Block getBlock(BlockPos pos) {
 		return getWorld().getBlockState(pos).getBlock();

src/main/java/stevebot/minecraft/UnsupportedMinecraftAdapter.java

@@ -39,6 +39,14 @@ public InventoryPlayer getPlayerInventory() {
 
 
 
+	@Override
+	public boolean isPlayerCreativeMode() {
+		throw new UnsupportedOperationException();
+	}
+
+
+
+
 	@Override
 	public Block getBlock(BlockPos pos) {
 		throw new UnsupportedOperationException();

src/test/java/stevebot/InventorySnapshotTest.java

@@ -9,6 +9,8 @@
 import stevebot.data.items.wrapper.ItemWrapper;
 import stevebot.data.modification.Modification;
 import stevebot.data.player.PlayerSnapshot;
+import stevebot.minecraft.MinecraftAdapter;
+import stevebot.minecraft.UnsupportedMinecraftAdapter;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -44,6 +46,13 @@ public class InventorySnapshotTest {
 	@Test
 	void testApplyModificationPlace() {
 
+		MinecraftAdapter.initialize(new UnsupportedMinecraftAdapter() {
+			@Override
+			public boolean isPlayerCreativeMode() {
+				return false;
+			}
+		});
+
 		final PlayerSnapshot snapshot = new PlayerSnapshot();
 		snapshot.setHotbarItemStack(3, ITEM_DIRT, 2);
 		snapshot.setHotbarItemStack(6, ITEM_DIA_PICKAXE, 1);
@@ -67,6 +76,35 @@ void testApplyModificationPlace() {
 
 
 
+	@Test
+	void testApplyModificationPlaceCreative() {
+
+		MinecraftAdapter.initialize(new UnsupportedMinecraftAdapter() {
+			@Override
+			public boolean isPlayerCreativeMode() {
+				return true;
+			}
+		});
+
+		final PlayerSnapshot snapshot = new PlayerSnapshot();
+		snapshot.setHotbarItemStack(3, ITEM_DIRT, 2);
+		snapshot.setHotbarItemStack(6, ITEM_DIA_PICKAXE, 1);
+		snapshot.setHotbarItemStack(7, ITEM_STONE, 10);
+
+		snapshot.applyModification(Modification.placeBlock(new BaseBlockPos(), BLOCK_STONE));
+		snapshot.applyModification(Modification.placeBlock(new BaseBlockPos(), BLOCK_DIRT));
+
+		assertThat(snapshot.getStackSize(3)).isEqualTo(2);
+		assertThat(snapshot.getItem(3).getId()).isEqualTo(ITEM_DIRT.getId());
+
+		assertThat(snapshot.getStackSize(7)).isEqualTo(10);
+		assertThat(snapshot.getItem(7).getId()).isEqualTo(ITEM_STONE.getId());
+
+	}
+
+
+
+
 	@Test
 	void testFindThrowawayBlock() {