TotalFreedomMC/OpenInv
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/OpenInv.git synced 2024-12-22 16:05:03 +00:00
Code Issues Projects Releases Wiki Activity

Cursor/crafting progress

Browse source
This commit is contained in:
Jikoo 2019-10-02 07:09:42 -04:00
parent ff76f2b95a
commit 1dd28ac0eb
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
internal/v1_14_R1/src/main/java/com/lishid/openinv/internal/v1_14_R1/SpecialPlayerInventory.java
View file

@ -34,6 +34,7 @@ import net.minecraft.server.v1_14_R1.EntityPlayer;
import net.minecraft.server.v1_14_R1.EnumItemSlot; import net.minecraft.server.v1_14_R1.EnumItemSlot;
import net.minecraft.server.v1_14_R1.IBlockData; import net.minecraft.server.v1_14_R1.IBlockData;
import net.minecraft.server.v1_14_R1.IChatBaseComponent; import net.minecraft.server.v1_14_R1.IChatBaseComponent;
import net.minecraft.server.v1_14_R1.IInventory;
import net.minecraft.server.v1_14_R1.Item; import net.minecraft.server.v1_14_R1.Item;
import net.minecraft.server.v1_14_R1.ItemArmor; import net.minecraft.server.v1_14_R1.ItemArmor;
import net.minecraft.server.v1_14_R1.ItemStack; import net.minecraft.server.v1_14_R1.ItemStack;
@ -60,6 +61,7 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
private EntityHuman player; private EntityHuman player;
private List<ItemStack> items, armor, extraSlots, crafting; private List<ItemStack> items, armor, extraSlots, crafting;
@SuppressWarnings("MismatchedQueryAndUpdateOfCollection") // Backing field is mutable. @SuppressWarnings("MismatchedQueryAndUpdateOfCollection") // Backing field is mutable.
// TODO: cursor requires an additional slot listener
private final List<ItemStack> cursor = new SingleFieldList<>(this::getCarried, this::setCarried); private final List<ItemStack> cursor = new SingleFieldList<>(this::getCarried, this::setCarried);
private List<List<ItemStack>> f; private List<List<ItemStack>> f;
@ -71,10 +73,14 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
this.items = this.player.inventory.items; this.items = this.player.inventory.items;
this.armor = this.player.inventory.armor; this.armor = this.player.inventory.armor;
this.extraSlots = this.player.inventory.extraSlots; this.extraSlots = this.player.inventory.extraSlots;
this.crafting = ((CraftInventoryCrafting) this.player.defaultContainer.getBukkitView().getTopInventory()).getInventory().getContents(); this.crafting = this.getCrafting().getContents();
this.f = ImmutableList.of(this.items, this.armor, this.extraSlots, this.crafting, this.cursor); this.f = ImmutableList.of(this.items, this.armor, this.extraSlots, this.crafting, this.cursor);
} }
private IInventory getCrafting() {
return ((CraftInventoryCrafting) this.player.defaultContainer.getBukkitView().getTopInventory()).getInventory();
}
@Override @Override
public void setPlayerOnline(@NotNull final Player player) { public void setPlayerOnline(@NotNull final Player player) {
if (!this.playerOnline) { if (!this.playerOnline) {
@ -89,7 +95,7 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
this.items = this.player.inventory.items; this.items = this.player.inventory.items;
this.armor = this.player.inventory.armor; this.armor = this.player.inventory.armor;
this.extraSlots = this.player.inventory.extraSlots; this.extraSlots = this.player.inventory.extraSlots;
this.crafting = ((CraftInventoryCrafting) this.player.defaultContainer.getBukkitView().getTopInventory()).getInventory().getContents(); this.crafting = this.getCrafting().getContents();
this.f = ImmutableList.of(this.items, this.armor, this.extraSlots, this.crafting, this.cursor); this.f = ImmutableList.of(this.items, this.armor, this.extraSlots, this.crafting, this.cursor);
this.playerOnline = true; this.playerOnline = true;
} }
@ -267,11 +273,13 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
@Override @Override
public void onOpen(CraftHumanEntity who) { public void onOpen(CraftHumanEntity who) {
this.transaction.add(who); this.transaction.add(who);
this.getCrafting().getViewers().add(who);
} }
@Override @Override
public void onClose(CraftHumanEntity who) { public void onClose(CraftHumanEntity who) {
this.transaction.remove(who); this.transaction.remove(who);
this.getCrafting().getViewers().remove(who);
} }
@Override @Override