Skip to content

Fix bugs #187

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
Circulate233 wants to merge 2 commits into
base: 1.12.2
Choose a base branch
from
Open

Fix bugs #187

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4d23982
Fix bugs
Circulate233 Feb 11, 2025
66fe868
Fix bugs , once again
Circulate233 Apr 15, 2025
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
50 changes: 40 additions & 10 deletions src/main/java/com/glodblock/github/inventory/GuiType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,11 +64,9 @@
import com.glodblock.github.interfaces.FCPriorityHost;
import com.google.common.collect.ImmutableList;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.EnumHand;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import net.minecraftforge.fml.common.Loader;
Expand Down Expand Up @@ -489,16 +487,32 @@ public ItemOrPartGuiFactory(Class<T> invClass) {
@Nullable
@Override
protected T getInventory(TileEntity tile, EntityPlayer player, EnumFacing face, BlockPos pos) {
ItemStack hold = player.getHeldItem(EnumHand.values()[face.ordinal() % 2]);
if (pos.getZ() == Integer.MIN_VALUE && !hold.isEmpty()) {
Object holder = getItemGuiObject(hold, player, player.world, pos.getX(), pos.getY(), pos.getZ());
if (pos.getZ() == Integer.MIN_VALUE) {
ItemStack terminal = ItemStack.EMPTY;
if (pos.getY() == 0) { // main inventory
terminal = player.inventory.getStackInSlot(pos.getX());
} else if (pos.getY() == 1 && Loader.isModLoaded("baubles")) { // baubles inventory
terminal = getStackInBaubleSlot(player, pos.getX());
}
if (terminal == null || terminal.isEmpty()) {
return null;
}
Object holder = getItemGuiObject(terminal, player, player.world, pos.getX(), pos.getY(), pos.getZ());
if (invClass.isInstance(holder)) {
return invClass.cast(holder);
}
}
return super.getInventory(tile, player, face, pos);
}

@Optional.Method(modid = "baubles")
private static ItemStack getStackInBaubleSlot(EntityPlayer player, int slot) {
if (slot >= 0 && slot < BaublesApi.getBaublesHandler(player).getSlots()) {
return BaublesApi.getBaublesHandler(player).getStackInSlot(slot);
}
return null;
}

}

public static abstract class AllGuiFactory<T> extends PartOrTileGuiFactory<T> {
Expand All @@ -510,16 +524,32 @@ public AllGuiFactory(Class<T> invClass) {
@Nullable
@Override
protected T getInventory(TileEntity tile, EntityPlayer player, EnumFacing face, BlockPos pos) {
ItemStack hold = player.getHeldItem(EnumHand.values()[face.ordinal() % 2]);
if (pos.getZ() == Integer.MIN_VALUE && !hold.isEmpty()) {
Object holder = getItemGuiObject(hold, player, player.world, pos.getX(), pos.getY(), pos.getZ());
if (invClass.isInstance(holder)) {
return invClass.cast(holder);
if (pos.getZ() == Integer.MIN_VALUE) {
ItemStack terminal = ItemStack.EMPTY;
if (pos.getY() == 0) {
terminal = player.inventory.getStackInSlot(pos.getX());
} else if (pos.getY() == 1 && Loader.isModLoaded("baubles")) {
terminal = getStackInBaubleSlot(player, pos.getX());
}

if (terminal == null || terminal.isEmpty()) {
return null;
}

Object holder = GuiType.getItemGuiObject(terminal, player, player.world, pos.getX(), pos.getY(), pos.getZ());
if (this.invClass.isInstance(holder)) {
return this.invClass.cast(holder);
}
}

return super.getInventory(tile, player, face, pos);
}

@Optional.Method(modid = "baubles")
private static ItemStack getStackInBaubleSlot(EntityPlayer player, int slot) {
return slot >= 0 && slot < BaublesApi.getBaublesHandler(player).getSlots() ? BaublesApi.getBaublesHandler(player).getStackInSlot(slot) : null;
}

}

public static Object getItemGuiObject(ItemStack it, EntityPlayer player, World w, int x, int y, int z) {
Expand Down
7 changes: 3 additions & 4 deletions src/main/java/com/glodblock/github/network/CPacketLoadPattern.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.glodblock.github.network;

import appeng.helpers.ItemStackHelper;
import com.glodblock.github.interfaces.PatternConsumer;
import com.glodblock.github.util.Util;
import io.netty.buffer.ByteBuf;
Expand Down Expand Up @@ -63,10 +64,8 @@ private void writeItemArray(NBTTagCompound nbt, ItemStack[] itemList, String key
if (itemList != null) {
int cnt = 0;
for (ItemStack item : itemList) {
NBTTagCompound itemTag = new NBTTagCompound();
if (item != null) {
item.writeToNBT(itemTag);
dict.setTag(cnt + "#", itemTag);
dict.setTag(cnt + "#", ItemStackHelper.stackToNBT(item));
cnt ++;
}
}
Expand All @@ -83,7 +82,7 @@ private ItemStack[] readItemArray(NBTTagCompound nbt, String key) {
} else {
ItemStack[] itemList = new ItemStack[len];
for (int i = 0; i < len; i ++) {
itemList[i] = new ItemStack(dict.getCompoundTag(i + "#"));
itemList[i] = ItemStackHelper.stackFromNBT(dict.getCompoundTag(i + "#"));
}
return itemList;
}
Expand Down