Skip to content

追加：オフハンドとして認識するスロットを変更できる機能 #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
CrafterKina wants to merge 3 commits into
base: master
Choose a base branch
from
Open

追加：オフハンドとして認識するスロットを変更できる機能 #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9e1ca08
変更：オフハンドのスロットをメインインベントリに統合
CrafterKina Jul 24, 2018
deb1585
追加：オフハンドとして認識するスロットを変更できる機能
CrafterKina Jul 24, 2018
0bdd6bc
変更：装備変更をアイテムの位置変更ではなく手ごとの参照位置変更によって実現
CrafterKina Jul 24, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/main/java/littleservantmod/client/gui/inventory/GuiServantInventory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,8 +115,8 @@ protected void renderCurrentSlot() {
int i = this.guiLeft;
int j = this.guiTop;

int i1 = 6 + 18 * (this.servant.inventory.currentItem % 9);
int ij = 74 + 18 * (this.servant.inventory.currentItem / 9);
int i1 = 6 + 18 * (this.servant.inventory.currentIndex[0] % 9);
int ij = 74 + 18 * (this.servant.inventory.currentIndex[0] / 9);

this.drawTexturedModalRect(i + i1, j + ij, 176, 0, 20, 20);

Expand Down
62 changes: 36 additions & 26 deletions src/main/java/littleservantmod/entity/EntityLittleServantFakePlayer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,8 @@ public abstract class EntityLittleServantFakePlayer extends EntityLittleServantB
public InventoryServant inventory;
private IItemHandler inventoryHandler;

protected static final DataParameter<Integer> CURRENT_ITEN = EntityDataManager.createKey(EntityLittleServantBase.class, DataSerializers.VARINT);
protected static final DataParameter<Integer> MAIN_HAND_ITEM = EntityDataManager.createKey(EntityLittleServantBase.class, DataSerializers.VARINT);
protected static final DataParameter<Integer> OFF_HAND_ITEM = EntityDataManager.createKey(EntityLittleServantBase.class, DataSerializers.VARINT);

public static final net.minecraft.entity.ai.attributes.IAttribute REACH_DISTANCE = new net.minecraft.entity.ai.attributes.RangedAttribute(null, "generic.reachDistance", 5.0D, 0.0D, 1024.0D).setShouldWatch(true);

Expand All @@ -77,7 +78,8 @@ protected void entityInit() {
if (!world.isRemote) this.player = FakePlayerFactory.getMinecraft((WorldServer) world);
this.inventory = new InventoryServant((EntityLittleServant) this, player);
this.inventoryHandler = new InvWrapper(this.inventory);
this.dataManager.register(CURRENT_ITEN, 0);
this.dataManager.register(MAIN_HAND_ITEM, this.inventory.currentIndex[0]);
this.dataManager.register(OFF_HAND_ITEM, this.inventory.currentIndex[1]);

}

Expand Down Expand Up @@ -122,12 +124,10 @@ public Iterable<ItemStack> getArmorInventoryList() {
* */
@Override
public ItemStack getItemStackFromSlot(EntityEquipmentSlot slotIn) {
if (slotIn == EntityEquipmentSlot.MAINHAND) {
return this.inventory.getCurrentItem();
} else if (slotIn == EntityEquipmentSlot.OFFHAND) {
return this.inventory.offHandInventory.get(0);
} else {
return slotIn.getSlotType() == EntityEquipmentSlot.Type.ARMOR ? this.inventory.armorInventory.get(slotIn.getIndex()) : ItemStack.EMPTY;
switch (slotIn.getSlotType()) {
case HAND: return this.inventory.getItemInHand(slotIn.getIndex() == 0 ? EnumHand.MAIN_HAND : EnumHand.OFF_HAND);
case ARMOR: return this.inventory.armorInventory.get(slotIn.getIndex());
default: return ItemStack.EMPTY;
}
}

Expand All @@ -136,15 +136,14 @@ public ItemStack getItemStackFromSlot(EntityEquipmentSlot slotIn) {
*/
@Override
public void setItemStackToSlot(EntityEquipmentSlot slotIn, ItemStack stack) {
if (slotIn == EntityEquipmentSlot.MAINHAND) {
this.playEquipSound(stack);
this.inventory.mainInventory.set(this.inventory.currentItem, stack);
} else if (slotIn == EntityEquipmentSlot.OFFHAND) {
this.playEquipSound(stack);
this.inventory.offHandInventory.set(0, stack);
} else if (slotIn.getSlotType() == EntityEquipmentSlot.Type.ARMOR) {
this.playEquipSound(stack);
this.inventory.armorInventory.set(slotIn.getIndex(), stack);
switch (slotIn.getSlotType()){
case HAND:
this.playEquipSound(stack);
this.inventory.mainInventory.set(this.inventory.currentIndex[slotIn.getIndex()], stack);
break;
case ARMOR:
this.playEquipSound(stack);
this.inventory.armorInventory.set(slotIn.getIndex(), stack);
}
}

Expand Down Expand Up @@ -443,22 +442,32 @@ public CooldownTracker getCooldownTracker() {
return this.cooldownTracker;
}

public int getCurrentItem() {
return this.dataManager.get(CURRENT_ITEN);
public int[] getItemsInHand(){
return new int[]{getItemInHand(EnumHand.MAIN_HAND),getItemInHand(EnumHand.OFF_HAND)};
}

public int getItemInHand(EnumHand hand) {
return this.dataManager.get(hand == EnumHand.MAIN_HAND ? MAIN_HAND_ITEM : OFF_HAND_ITEM);
}

public void setCurrentItem(int currentItem) {
this.inventory.currentItem = currentItem;
this.dataManager.set(CURRENT_ITEN, currentItem);
public void setItemInHand(int index, EnumHand hand) {
this.inventory.currentIndex[hand.ordinal()] = index;
this.dataManager.set(hand == EnumHand.MAIN_HAND ? MAIN_HAND_ITEM : OFF_HAND_ITEM, index);
}

@Override
public void notifyDataManagerChange(DataParameter<?> key) {
super.notifyDataManagerChange(key);

if (CURRENT_ITEN.equals(key) && this.world.isRemote) {
if (MAIN_HAND_ITEM.equals(key) && this.world.isRemote) {

this.inventory.currentIndex[EnumHand.MAIN_HAND.ordinal()] = getItemInHand(EnumHand.MAIN_HAND);

}

if (OFF_HAND_ITEM.equals(key) && this.world.isRemote) {

this.inventory.currentItem = getCurrentItem();
this.inventory.currentIndex[EnumHand.OFF_HAND.ordinal()] = getItemInHand(EnumHand.OFF_HAND);

}

Expand All @@ -469,7 +478,7 @@ public void readEntityFromNBT(NBTTagCompound compound) {
super.readEntityFromNBT(compound);
NBTTagList nbttaglist = compound.getTagList("Inventory", 10);
this.inventory.readFromNBT(nbttaglist);
this.inventory.currentItem = compound.getInteger("SelectedItemSlot");
this.inventory.currentIndex = compound.getIntArray("InHandIndexes");

}

Expand All @@ -478,7 +487,8 @@ public void writeEntityToNBT(NBTTagCompound compound) {
super.writeEntityToNBT(compound);
compound.setTag("Inventory", this.inventory.writeToNBT(new NBTTagList()));
// compound.setInteger("SelectedItemSlot", this.inventory.currentItem);
compound.setInteger("SelectedItemSlot", this.getCurrentItem());
// compound.setInteger("SelectedItemSlot", this.getCurrentItem());
compound.setIntArray("InHandIndexes", this.getItemsInHand());

}

Expand Down
Loading