Combine camo and platform classes, they didn't ever need to be separate

This commit is contained in:
Vincent Lee committed 2019-09-27 10:43:54 -05:00
1 parent 172119701c
commit a3b7f1c4b0
7 files changed
+99 -192

No files matched your search

@@ -1,39 +1,30 @@
package vazkii.botania.client.core.handler;
import net.minecraft.block.Block;
import net.minecraft.block.BlockState;
import net.minecraft.block.BlockState;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.color.BlockColors;
import net.minecraft.client.renderer.color.IBlockColor;
import net.minecraft.client.renderer.color.IItemColor;
import net.minecraft.client.renderer.color.ItemColors;
import net.minecraft.block.Blocks;
import net.minecraft.item.DyeColor;
import net.minecraft.item.DyeColor;
import net.minecraft.item.Item;
import net.minecraft.item.BlockItem;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.Hand;
import net.minecraft.util.Hand;
import net.minecraft.util.Util;
import net.minecraft.world.FoliageColors;
import net.minecraft.world.biome.BiomeColors;
import net.minecraftforge.registries.IRegistryDelegate;
import vazkii.botania.api.BotaniaAPI;
import vazkii.botania.api.brew.Brew;
import vazkii.botania.api.brew.IBrewItem;
import vazkii.botania.api.mana.BurstProperties;
import vazkii.botania.api.state.BotaniaStateProps;
import vazkii.botania.common.Botania;
import vazkii.botania.common.block.BlockCamo;
import vazkii.botania.common.block.BlockPlatform;
import vazkii.botania.common.block.ModBlocks;
import vazkii.botania.common.block.decor.BlockPetalBlock;
import vazkii.botania.common.block.mana.BlockPool;
import vazkii.botania.common.block.tile.TileCamo;
import vazkii.botania.common.block.tile.TilePlatform;
import vazkii.botania.common.block.tile.mana.TilePool;
import vazkii.botania.common.entity.EntityManaBurst;
import vazkii.botania.common.item.Item16Colors;
import vazkii.botania.common.item.ItemManaGun;
import vazkii.botania.common.item.ItemManaMirror;
@@ -44,11 +35,8 @@ import vazkii.botania.common.item.equipment.bauble.ItemBloodPendant;
import vazkii.botania.common.item.equipment.tool.terrasteel.ItemTerraPick;
import vazkii.botania.common.item.lens.ItemLens;
import vazkii.botania.common.item.material.ItemPetal;
import vazkii.botania.common.lib.LibMisc;
import java.awt.Color;
import java.lang.reflect.Field;
import java.util.Map;
public final class ColorHandler {
@@ -100,11 +88,11 @@ public final class ColorHandler {
(state, world, pos, tintIndex) -> {
if (world != null && pos != null) {
TileEntity tile = world.getTileEntity(pos);
if(tile instanceof TileCamo) {
TileCamo camo = (TileCamo) tile;
if(tile instanceof TilePlatform) {
TilePlatform camo = (TilePlatform) tile;
BlockState camoState = camo.camoState;
if(camoState != null)
return camoState.getBlock() instanceof BlockCamo
return camoState.getBlock() instanceof BlockPlatform
? 0xFFFFFF
: Minecraft.getInstance().getBlockColors().getColor(camoState, world, pos, tintIndex);
}
@@ -10,33 +10,22 @@ package vazkii.botania.client.model;
import com.google.common.collect.ImmutableList;
import net.minecraft.block.BlockState;
import net.minecraft.block.BlockState;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.model.BakedQuad;
import net.minecraft.client.renderer.model.IBakedModel;
import net.minecraft.client.renderer.model.ItemCameraTransforms;
import net.minecraft.client.renderer.model.ItemOverrideList;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.fluid.IFluidState;
import net.minecraft.block.Blocks;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.BlockRenderLayer;
import net.minecraft.util.Direction;
import net.minecraft.util.Direction;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IBlockReader;
import net.minecraft.world.WorldType;
import net.minecraft.world.biome.Biome;
import net.minecraftforge.client.MinecraftForgeClient;
import net.minecraftforge.client.model.ModelDataManager;
import net.minecraftforge.client.model.data.EmptyModelData;
import net.minecraftforge.client.model.data.IDynamicBakedModel;
import net.minecraftforge.client.model.data.IModelData;
import vazkii.botania.api.state.BotaniaStateProps;
import vazkii.botania.common.block.BlockCamo;
import vazkii.botania.common.block.BlockPlatform;
import vazkii.botania.common.block.ModBlocks;
import vazkii.botania.common.block.tile.TileCamo;
import javax.annotation.Nonnull;
import java.util.List;
@@ -1,71 +0,0 @@
/**
* This class was created by <Vazkii>. It's distributed as
* part of the Botania Mod. Get the Source Code in github:
* https://github.com/Vazkii/Botania
*
* Botania is Open Source and distributed under the
* Botania License: http://botaniamod.net/license.php
*
* File Created @ [Jun 7, 2014, 2:20:51 PM (GMT)]
*/
package vazkii.botania.common.block;
import net.minecraft.block.Block;
import net.minecraft.block.BlockState;
import net.minecraft.block.Blocks;
import net.minecraft.block.material.Material;
import net.minecraft.block.BlockState;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.item.BlockItemUseContext;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.block.BlockRenderType;
import net.minecraft.util.Direction;
import net.minecraft.util.Hand;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.BlockRayTraceResult;
import net.minecraft.world.World;
import vazkii.botania.common.block.tile.TileCamo;
public abstract class BlockCamo extends BlockMod {
protected BlockCamo(Properties builder) {
super(builder);
}
public static boolean isValidBlock(BlockState state, World world, BlockPos pos) {
return state.isOpaqueCube(world, pos) || state.getRenderType() == BlockRenderType.MODEL;
}
@Override
public boolean onBlockActivated(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult hit) {
TileEntity tile = world.getTileEntity(pos);
if(world.isRemote)
return true;
ItemStack currentStack = player.getHeldItem(hand);
if(!currentStack.isEmpty()
&& Block.getBlockFromItem(currentStack.getItem()) != Blocks.AIR
&& tile instanceof TileCamo) {
TileCamo camo = (TileCamo) tile;
BlockItemUseContext ctx = new BlockItemUseContext(world, player, hand, currentStack, hit);
BlockState changeState = Block.getBlockFromItem(currentStack.getItem()).getStateForPlacement(ctx);
if(isValidBlock(changeState, world, pos) && !(changeState.getBlock() instanceof BlockCamo) && changeState.getMaterial() != Material.AIR) {
camo.camoState = changeState;
world.notifyBlockUpdate(pos, state, state, 8);
return true;
}
}
return false;
}
@Override
public boolean hasTileEntity(BlockState state) {
return true;
}
}
@@ -10,51 +10,36 @@
*/
package vazkii.botania.common.block;
import net.minecraft.block.Block;
import net.minecraft.block.BlockRenderType;
import net.minecraft.block.BlockState;
import net.minecraft.block.SoundType;
import net.minecraft.block.Blocks;
import net.minecraft.block.material.Material;
import net.minecraft.block.BlockState;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.item.BlockItemUseContext;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.BlockRenderLayer;
import net.minecraft.util.Direction;
import net.minecraft.util.Direction;
import net.minecraft.util.NonNullList;
import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.util.Hand;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.BlockRayTraceResult;
import net.minecraft.util.math.shapes.ISelectionContext;
import net.minecraft.util.math.shapes.VoxelShape;
import net.minecraft.util.math.shapes.VoxelShapes;
import net.minecraft.world.Explosion;
import net.minecraft.world.IBlockReader;
import net.minecraft.world.IBlockReader;
import net.minecraft.world.IWorldReader;
import net.minecraft.world.World;
import net.minecraft.world.chunk.Chunk;
import net.minecraftforge.client.model.ModelLoader;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import vazkii.botania.api.lexicon.ILexiconable;
import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.api.mana.IManaCollisionGhost;
import vazkii.botania.api.state.BotaniaStateProps;
import vazkii.botania.api.state.enums.PlatformVariant;
import vazkii.botania.api.wand.IWandable;
import vazkii.botania.client.core.handler.ModelHandler;
import vazkii.botania.common.block.tile.TileCamo;
import vazkii.botania.common.block.tile.TilePlatform;
import vazkii.botania.common.lexicon.LexiconData;
import vazkii.botania.common.lib.LibBlockNames;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import java.util.List;
import java.util.Locale;
public class BlockPlatform extends BlockCamo implements ILexiconable, IWandable, IManaCollisionGhost {
public class BlockPlatform extends BlockMod implements ILexiconable, IWandable, IManaCollisionGhost {
public enum Variant {
ABSTRUSE,
@@ -94,6 +79,11 @@ public class BlockPlatform extends BlockCamo implements ILexiconable, IWandable,
return variant != Variant.INFRANGIBLE;
}
@Override
public boolean hasTileEntity(BlockState state) {
return true;
}
@Nonnull
@Override
public TileEntity createTileEntity(@Nonnull BlockState state, @Nonnull IBlockReader world) {
@@ -115,4 +105,36 @@ public class BlockPlatform extends BlockCamo implements ILexiconable, IWandable,
public boolean isGhost(BlockState state, World world, BlockPos pos) {
return true;
}
public static boolean isValidBlock(BlockState state, World world, BlockPos pos) {
return state.isOpaqueCube(world, pos) || state.getRenderType() == BlockRenderType.MODEL;
}
@Override
public boolean onBlockActivated(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult hit) {
TileEntity tile = world.getTileEntity(pos);
if(world.isRemote)
return true;
ItemStack currentStack = player.getHeldItem(hand);
if(!currentStack.isEmpty()
&& Block.getBlockFromItem(currentStack.getItem()) != Blocks.AIR
&& tile instanceof TilePlatform) {
TilePlatform camo = (TilePlatform) tile;
BlockItemUseContext ctx = new BlockItemUseContext(world, player, hand, currentStack, hit);
BlockState changeState = Block.getBlockFromItem(currentStack.getItem()).getStateForPlacement(ctx);
if(isValidBlock(changeState, world, pos) && !(changeState.getBlock() instanceof BlockPlatform) && changeState.getMaterial() != Material.AIR) {
camo.camoState = changeState;
world.notifyBlockUpdate(pos, state, state, 3);
return true;
}
}
return false;
}
}
@@ -1,66 +0,0 @@
/**
* This class was created by <Vazkii>. It's distributed as
* part of the Botania Mod. Get the Source Code in github:
* https://github.com/Vazkii/Botania
*
* Botania is Open Source and distributed under the
* Botania License: http://botaniamod.net/license.php
*
* File Created @ [Jun 7, 2014, 2:21:28 PM (GMT)]
*/
package vazkii.botania.common.block.tile;
import net.minecraft.block.BlockState;
import net.minecraft.block.BlockState;
import net.minecraft.nbt.CompoundNBT;
import net.minecraft.nbt.NBTUtil;
import net.minecraft.network.NetworkManager;
import net.minecraft.network.play.server.SUpdateTileEntityPacket;
import net.minecraft.tileentity.TileEntityType;
import net.minecraftforge.client.model.data.IModelData;
import net.minecraftforge.client.model.data.ModelDataMap;
import vazkii.botania.api.state.BotaniaStateProps;
import javax.annotation.Nonnull;
public class TileCamo extends TileMod {
private static final String TAG_CAMO = "camo";
public BlockState camoState;
public TileCamo(TileEntityType<?> type) {
super(type);
}
@Override
public void writePacketNBT(CompoundNBT cmp) {
if(camoState != null) {
cmp.put(TAG_CAMO, NBTUtil.writeBlockState(camoState));
}
}
@Override
public void readPacketNBT(CompoundNBT cmp) {
camoState = NBTUtil.readBlockState(cmp.getCompound(TAG_CAMO));
if(camoState.isAir()) {
camoState = null;
}
}
@Override
public void onDataPacket(NetworkManager manager, SUpdateTileEntityPacket packet) {
super.onDataPacket(manager, packet);
requestModelDataUpdate();
// todo 1.14 world.markForRerender(pos);
}
@Nonnull
@Override
public IModelData getModelData() {
return new ModelDataMap.Builder()
.withInitial(BotaniaStateProps.HELD_POS, getPos())
.withInitial(BotaniaStateProps.HELD_STATE, camoState)
.build();
}
}
@@ -10,18 +10,32 @@
*/
package vazkii.botania.common.block.tile;
import net.minecraft.block.BlockState;
import net.minecraft.client.world.ClientWorld;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.nbt.CompoundNBT;
import net.minecraft.nbt.NBTUtil;
import net.minecraft.network.NetworkManager;
import net.minecraft.network.play.server.SUpdateTileEntityPacket;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.tileentity.TileEntityType;
import net.minecraft.util.Direction;
import net.minecraft.util.math.BlockPos;
import net.minecraftforge.client.model.data.IModelData;
import net.minecraftforge.client.model.data.ModelDataMap;
import net.minecraftforge.registries.ObjectHolder;
import vazkii.botania.api.state.BotaniaStateProps;
import vazkii.botania.common.lib.LibBlockNames;
import vazkii.botania.common.lib.LibMisc;
public class TilePlatform extends TileCamo {
import javax.annotation.Nonnull;
public class TilePlatform extends TileMod {
@ObjectHolder(LibMisc.MOD_ID + ":" + LibBlockNames.PLATFORM)
public static TileEntityType<TilePlatform> TYPE;
private static final String TAG_CAMO = "camo";
public BlockState camoState;
public TilePlatform() {
super(TYPE);
@@ -57,7 +71,39 @@ public class TilePlatform extends TileCamo {
private void swap(TilePlatform tile, boolean empty) {
tile.camoState = empty ? null : camoState;
world.notifyBlockUpdate(tile.getPos(), world.getBlockState(tile.getPos()), world.getBlockState(tile.getPos()), 8);
world.notifyBlockUpdate(tile.getPos(), world.getBlockState(tile.getPos()), world.getBlockState(tile.getPos()), 3);
}
@Override
public void writePacketNBT(CompoundNBT cmp) {
if(camoState != null) {
cmp.put(TAG_CAMO, NBTUtil.writeBlockState(camoState));
}
}
@Override
public void readPacketNBT(CompoundNBT cmp) {
camoState = NBTUtil.readBlockState(cmp.getCompound(TAG_CAMO));
if(camoState.isAir()) {
camoState = null;
}
}
@Override
public void onDataPacket(NetworkManager manager, SUpdateTileEntityPacket packet) {
super.onDataPacket(manager, packet);
requestModelDataUpdate();
if (world instanceof ClientWorld) {
world.notifyBlockUpdate(getPos(), getBlockState(), getBlockState(), 0);
}
}
@Nonnull
@Override
public IModelData getModelData() {
return new ModelDataMap.Builder()
.withInitial(BotaniaStateProps.HELD_POS, getPos())
.withInitial(BotaniaStateProps.HELD_STATE, camoState)
.build();
}
}
@@ -25,7 +25,6 @@ import net.minecraft.util.ActionResultType;
import net.minecraft.util.Direction;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.BlockRayTraceResult;
import net.minecraft.util.math.EntityRayTraceResult;
import net.minecraft.util.math.RayTraceResult;
import net.minecraft.util.text.ITextComponent;
import net.minecraft.util.text.TextFormatting;
@@ -44,7 +43,7 @@ import vazkii.botania.api.item.IWireframeCoordinateListProvider;
import vazkii.botania.api.mana.IManaUsingItem;
import vazkii.botania.api.mana.ManaItemHandler;
import vazkii.botania.client.core.handler.ItemsRemainingRenderHandler;
import vazkii.botania.common.block.BlockCamo;
import vazkii.botania.common.block.BlockPlatform;
import vazkii.botania.common.core.helper.ItemNBTHelper;
import vazkii.botania.common.item.ItemMod;
@@ -82,7 +81,7 @@ public class ItemExchangeRod extends ItemMod implements IManaUsingItem, IWirefra
if(player != null && player.isSneaking()) {
TileEntity tile = world.getTileEntity(pos);
if(tile == null) {
if(BlockCamo.isValidBlock(wstate, world, pos)) {
if(BlockPlatform.isValidBlock(wstate, world, pos)) {
setBlock(stack, wstate);
displayRemainderCounter(player, stack);