mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-17 11:05:40 +00:00
World and TileEntity patch work.
TerrtainGen events are removed, 1.13's world gen re-write invalidates them all.
This commit is contained in:
1 parent
b7b5dd5bea
commit
f13465012b
111 files changed
+2790
-5201
No files matched your search
@@ -1,237 +0,0 @@
|
||||
/*
|
||||
* Minecraft Forge
|
||||
* Copyright (c) 2016-2018.
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU Lesser General Public
|
||||
* License as published by the Free Software Foundation version 2.1
|
||||
* of the License.
|
||||
*
|
||||
* This library is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
* Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public
|
||||
* License along with this library; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*/
|
||||
|
||||
package net.minecraftforge.items;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.state.IBlockState;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.tileentity.TileEntityChest;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.util.EnumFacing;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import java.lang.ref.WeakReference;
|
||||
|
||||
import com.google.common.base.Objects;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
import javax.annotation.Nullable;
|
||||
|
||||
public class VanillaDoubleChestItemHandler extends WeakReference<TileEntityChest> implements IItemHandlerModifiable
|
||||
{
|
||||
// Dummy cache value to signify that we have checked and definitely found no adjacent chests
|
||||
public static final VanillaDoubleChestItemHandler NO_ADJACENT_CHESTS_INSTANCE = new VanillaDoubleChestItemHandler(null, null, false);
|
||||
private final boolean mainChestIsUpper;
|
||||
private final TileEntityChest mainChest;
|
||||
private final int hashCode;
|
||||
|
||||
public VanillaDoubleChestItemHandler(@Nullable TileEntityChest mainChest, @Nullable TileEntityChest other, boolean mainChestIsUpper)
|
||||
{
|
||||
super(other);
|
||||
this.mainChest = mainChest;
|
||||
this.mainChestIsUpper = mainChestIsUpper;
|
||||
hashCode = Objects.hashCode(mainChestIsUpper ? mainChest : other) * 31 + Objects.hashCode(!mainChestIsUpper ? mainChest : other);
|
||||
}
|
||||
|
||||
@Nullable
|
||||
public static VanillaDoubleChestItemHandler get(TileEntityChest chest)
|
||||
{
|
||||
World world = chest.getWorld();
|
||||
BlockPos pos = chest.getPos();
|
||||
if (world == null || pos == null || !world.isBlockLoaded(pos))
|
||||
return null; // Still loading
|
||||
|
||||
IBlockState state = chest.getBlockState();
|
||||
|
||||
EnumFacing[] horizontals = EnumFacing.BY_HORIZONTAL_INDEX;
|
||||
for (int i = horizontals.length - 1; i >= 0; i--) // Use reverse order so we can return early
|
||||
{
|
||||
EnumFacing enumfacing = horizontals[i];
|
||||
BlockPos blockpos = pos.offset(enumfacing);
|
||||
Block block = world.getBlockState(blockpos).getBlock();
|
||||
|
||||
if (block == state.getBlock())
|
||||
{
|
||||
TileEntity otherTE = world.getTileEntity(blockpos);
|
||||
|
||||
if (otherTE instanceof TileEntityChest)
|
||||
{
|
||||
TileEntityChest otherChest = (TileEntityChest) otherTE;
|
||||
return new VanillaDoubleChestItemHandler(chest, otherChest,
|
||||
enumfacing != net.minecraft.util.EnumFacing.WEST && enumfacing != net.minecraft.util.EnumFacing.NORTH);
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
return NO_ADJACENT_CHESTS_INSTANCE; //All alone
|
||||
}
|
||||
|
||||
@Nullable
|
||||
public TileEntityChest getChest(boolean accessingUpper)
|
||||
{
|
||||
if (accessingUpper == mainChestIsUpper)
|
||||
return mainChest;
|
||||
else
|
||||
{
|
||||
return getOtherChest();
|
||||
}
|
||||
}
|
||||
|
||||
@Nullable
|
||||
private TileEntityChest getOtherChest()
|
||||
{
|
||||
TileEntityChest tileEntityChest = get();
|
||||
return tileEntityChest != null && !tileEntityChest.isRemoved() ? tileEntityChest : null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getSlots()
|
||||
{
|
||||
return 27 * 2;
|
||||
}
|
||||
|
||||
@Override
|
||||
@Nonnull
|
||||
public ItemStack getStackInSlot(int slot)
|
||||
{
|
||||
boolean accessingUpperChest = slot < 27;
|
||||
int targetSlot = accessingUpperChest ? slot : slot - 27;
|
||||
TileEntityChest chest = getChest(accessingUpperChest);
|
||||
return chest != null ? chest.getStackInSlot(targetSlot) : ItemStack.EMPTY;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setStackInSlot(int slot, @Nonnull ItemStack stack)
|
||||
{
|
||||
boolean accessingUpperChest = slot < 27;
|
||||
int targetSlot = accessingUpperChest ? slot : slot - 27;
|
||||
TileEntityChest chest = getChest(accessingUpperChest);
|
||||
if (chest != null)
|
||||
{
|
||||
IItemHandler singleHandler = null; // TODO TileEntityChest patches chest.getSingleChestHandler();
|
||||
if (singleHandler instanceof IItemHandlerModifiable)
|
||||
{
|
||||
((IItemHandlerModifiable) singleHandler).setStackInSlot(targetSlot, stack);
|
||||
}
|
||||
}
|
||||
|
||||
chest = getChest(!accessingUpperChest);
|
||||
if (chest != null)
|
||||
chest.markDirty();
|
||||
}
|
||||
|
||||
@Override
|
||||
@Nonnull
|
||||
public ItemStack insertItem(int slot, @Nonnull ItemStack stack, boolean simulate)
|
||||
{
|
||||
boolean accessingUpperChest = slot < 27;
|
||||
int targetSlot = accessingUpperChest ? slot : slot - 27;
|
||||
TileEntityChest chest = getChest(accessingUpperChest);
|
||||
if (chest == null)
|
||||
return stack;
|
||||
|
||||
int starting = stack.getCount();
|
||||
ItemStack ret = ItemStack.EMPTY; // TODO TileEntityChest patches chest.getSingleChestHandler().insertItem(targetSlot, stack, simulate);
|
||||
if (ret.getCount() != starting && !simulate)
|
||||
{
|
||||
chest = getChest(!accessingUpperChest);
|
||||
if (chest != null)
|
||||
chest.markDirty();
|
||||
}
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
@Override
|
||||
@Nonnull
|
||||
public ItemStack extractItem(int slot, int amount, boolean simulate)
|
||||
{
|
||||
boolean accessingUpperChest = slot < 27;
|
||||
int targetSlot = accessingUpperChest ? slot : slot - 27;
|
||||
TileEntityChest chest = getChest(accessingUpperChest);
|
||||
if (chest == null)
|
||||
return ItemStack.EMPTY;
|
||||
|
||||
ItemStack ret = ItemStack.EMPTY; // TODO TileEntityChest patches chest.getSingleChestHandler().extractItem(targetSlot, amount, simulate);
|
||||
if (!ret.isEmpty() && !simulate)
|
||||
{
|
||||
chest = getChest(!accessingUpperChest);
|
||||
if (chest != null)
|
||||
chest.markDirty();
|
||||
}
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getSlotLimit(int slot)
|
||||
{
|
||||
boolean accessingUpperChest = slot < 27;
|
||||
return getChest(accessingUpperChest).getInventoryStackLimit();
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isItemValid(int slot, @Nonnull ItemStack stack)
|
||||
{
|
||||
boolean accessingUpperChest = slot < 27;
|
||||
int targetSlot = accessingUpperChest ? slot : slot - 27;
|
||||
TileEntityChest chest = getChest(accessingUpperChest);
|
||||
if (chest != null)
|
||||
{
|
||||
return false; // TODO TileEntityChest patches chest.getSingleChestHandler().isItemValid(targetSlot, stack);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean equals(Object o)
|
||||
{
|
||||
if (this == o)
|
||||
return true;
|
||||
if (o == null || getClass() != o.getClass())
|
||||
return false;
|
||||
|
||||
VanillaDoubleChestItemHandler that = (VanillaDoubleChestItemHandler) o;
|
||||
|
||||
if (hashCode != that.hashCode)
|
||||
return false;
|
||||
|
||||
final TileEntityChest otherChest = getOtherChest();
|
||||
if (mainChestIsUpper == that.mainChestIsUpper)
|
||||
return Objects.equal(mainChest, that.mainChest) && Objects.equal(otherChest, that.getOtherChest());
|
||||
else
|
||||
return Objects.equal(mainChest, that.getOtherChest()) && Objects.equal(otherChest, that.mainChest);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int hashCode()
|
||||
{
|
||||
return hashCode;
|
||||
}
|
||||
|
||||
public boolean needsRefresh()
|
||||
{
|
||||
if (this == NO_ADJACENT_CHESTS_INSTANCE)
|
||||
return false;
|
||||
TileEntityChest tileEntityChest = get();
|
||||
return tileEntityChest == null || tileEntityChest.isRemoved();
|
||||
}
|
||||
}
|
||||
@@ -43,7 +43,7 @@ public class SidedInvWrapper implements IItemHandlerModifiable
|
||||
return ret;
|
||||
}
|
||||
|
||||
protected SidedInvWrapper(ISidedInventory inv, EnumFacing side)
|
||||
public SidedInvWrapper(ISidedInventory inv, EnumFacing side)
|
||||
{
|
||||
this.inv = inv;
|
||||
this.side = side;
|
||||
|
||||
Reference in new issue
Block a user