Fix crafty crate rendering, pattern now derived from blockstate instead of TE

This commit is contained in:
Vincent Lee committed 2019-04-01 17:40:25 -05:00
1 parent cb90228d10
commit bb4bae1761
4 files changed
+25 -46

No files matched your search

@@ -37,19 +37,6 @@ public class BlockCraftyCrate extends BlockOpenCrate implements IWandHUD {
builder.add(BotaniaStateProps.CRATE_PATTERN);
}
/* todo 1.13
@Nonnull
@Override
public IBlockState getActualState(@Nonnull IBlockState state, IBlockReader world, BlockPos pos) {
TileEntity te = world instanceof ChunkCache ? ((ChunkCache)world).getTileEntity(pos, Chunk.EnumCreateEntityType.CHECK) : world.getTileEntity(pos);
if(te instanceof TileCraftCrate) {
TileCraftCrate tile = (TileCraftCrate) te;
state = state.with(BotaniaStateProps.CRATE_PATTERN, tile.pattern);
}
return state;
}*/
@Nonnull
@Override
public TileEntity createTileEntity(@Nonnull IBlockState state, @Nonnull IBlockReader world) {
@@ -83,8 +70,8 @@ public class BlockCraftyCrate extends BlockOpenCrate implements IWandHUD {
int yp = yc + i * 18;
boolean enabled = true;
if(craft.pattern != CratePattern.NONE)
enabled = craft.pattern.openSlots.get(index);
if(craft.getPattern() != CratePattern.NONE)
enabled = craft.getPattern().openSlots.get(index);
Gui.drawRect(xp, yp, xp + 16, yp + 16, enabled ? 0x22FFFFFF : 0x22FF0000);
@@ -50,12 +50,11 @@ public class BlockOpenCrate extends BlockMod implements ILexiconable, IWandable
@Override
public void onReplaced(@Nonnull IBlockState state, @Nonnull World world, @Nonnull BlockPos pos, @Nonnull IBlockState newState, boolean isMoving) {
if (!world.isRemote) {
if(newState.getBlock() != state.getBlock()) {
TileSimpleInventory inv = (TileSimpleInventory) world.getTileEntity(pos);
InventoryHelper.dropInventory(inv, world, state, pos);
super.onReplaced(state, world, pos, newState, isMoving);
}
super.onReplaced(state, world, pos, newState, isMoving);
}
@Override
@@ -10,6 +10,7 @@
*/
package vazkii.botania.common.block.tile;
import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.Container;
import net.minecraft.inventory.InventoryCrafting;
@@ -23,7 +24,9 @@ import net.minecraft.world.World;
import net.minecraftforge.common.crafting.VanillaRecipeTypes;
import net.minecraftforge.registries.ObjectHolder;
import vazkii.botania.api.internal.VanillaPacketDispatcher;
import vazkii.botania.api.state.BotaniaStateProps;
import vazkii.botania.api.state.enums.CratePattern;
import vazkii.botania.common.block.ModBlocks;
import vazkii.botania.common.item.ModItems;
import vazkii.botania.common.lib.LibBlockNames;
import vazkii.botania.common.lib.LibMisc;
@@ -36,7 +39,6 @@ public class TileCraftCrate extends TileOpenCrate {
public static TileEntityType<TileCraftCrate> TYPE;
private static final String TAG_PATTERN = "pattern";
public CratePattern pattern = CratePattern.NONE;
private int signal = 0;
public TileCraftCrate() {
@@ -66,8 +68,15 @@ public class TileCraftCrate extends TileOpenCrate {
};
}
public CratePattern getPattern() {
IBlockState state = getBlockState();
if(state.getBlock() != ModBlocks.craftCrate)
return CratePattern.NONE;
return state.get(BotaniaStateProps.CRATE_PATTERN);
}
private boolean isLocked(int slot) {
return !pattern.openSlots.get(slot);
return !getPattern().openSlots.get(slot);
}
@Override
@@ -142,18 +151,6 @@ public class TileCraftCrate extends TileOpenCrate {
markDirty();
}
@Override
public void writePacketNBT(NBTTagCompound par1nbtTagCompound) {
super.writePacketNBT(par1nbtTagCompound);
par1nbtTagCompound.putInt(TAG_PATTERN, pattern.ordinal());
}
@Override
public void readPacketNBT(NBTTagCompound par1nbtTagCompound) {
super.readPacketNBT(par1nbtTagCompound);
pattern = CratePattern.values()[par1nbtTagCompound.getInt(TAG_PATTERN)];
}
@Override
public boolean onWanded(World world, EntityPlayer player, ItemStack stack) {
if(!world.isRemote && canEject()) {
@@ -174,12 +171,4 @@ public class TileCraftCrate extends TileOpenCrate {
return signal;
}
@Override
public void onDataPacket(NetworkManager manager, SPacketUpdateTileEntity packet) {
CratePattern lastPattern = pattern;
super.onDataPacket(manager, packet);
if(pattern != lastPattern)
world.markBlockRangeForRenderUpdate(pos, pos);
}
}
@@ -10,12 +10,15 @@
*/
package vazkii.botania.common.item;
import net.minecraft.block.state.IBlockState;
import net.minecraft.item.ItemUseContext;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumActionResult;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import vazkii.botania.api.state.BotaniaStateProps;
import vazkii.botania.api.state.enums.CratePattern;
import vazkii.botania.common.block.ModBlocks;
import vazkii.botania.common.block.tile.TileCraftCrate;
import vazkii.botania.common.lib.LibItemNames;
@@ -35,14 +38,15 @@ public class ItemCraftPattern extends ItemMod {
public EnumActionResult onItemUse(ItemUseContext ctx) {
World world = ctx.getWorld();
BlockPos pos = ctx.getPos();
IBlockState state = world.getBlockState(pos);
TileEntity tile = world.getTileEntity(pos);
if(tile instanceof TileCraftCrate) {
TileCraftCrate crate = (TileCraftCrate) tile;
crate.pattern = this.pattern;
world.notifyBlockUpdate(pos, world.getBlockState(pos), world.getBlockState(pos), 8);
return EnumActionResult.SUCCESS;
if(state.getBlock() == ModBlocks.craftCrate) {
if(pattern != state.get(BotaniaStateProps.CRATE_PATTERN)) {
world.setBlockState(pos, state.with(BotaniaStateProps.CRATE_PATTERN, this.pattern));
return EnumActionResult.SUCCESS;
}
}
return EnumActionResult.PASS;
}
}