mirror of
https://github.com/GTNewHorizons/Botania.git
synced 2026-11-18 19:29:31 +00:00
Start API cleanup
This commit is contained in:
1 parent
76fa4cba29
commit
8d54c9a8cb
28 files changed
+81
-129
No files matched your search
@@ -13,9 +13,9 @@ package vazkii.botania.api.recipe;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
/**
|
||||
* An Item or Block that implements this interface can have a special particle color in the Petal Apothecary.
|
||||
* An Item that implements this interface can have a special particle color when in the Petal Apothecary.
|
||||
*/
|
||||
public interface ICustomApothecaryColor {
|
||||
public int getParticleColor(ItemStack stack);
|
||||
int getParticleColor(ItemStack stack);
|
||||
|
||||
}
|
||||
@@ -9,12 +9,10 @@
|
||||
package vazkii.botania.api.state;
|
||||
|
||||
import com.google.common.base.Predicates;
|
||||
import net.minecraft.block.BlockState;
|
||||
import net.minecraft.item.DyeColor;
|
||||
import net.minecraft.state.BooleanProperty;
|
||||
import net.minecraft.state.EnumProperty;
|
||||
import net.minecraft.util.Direction;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraftforge.client.model.data.ModelProperty;
|
||||
import vazkii.botania.api.item.IFloatingFlower;
|
||||
import vazkii.botania.api.state.enums.AlfPortalState;
|
||||
@@ -25,34 +23,16 @@ import vazkii.botania.api.state.enums.CratePattern;
|
||||
*/
|
||||
public final class BotaniaStateProps {
|
||||
|
||||
/** Unlisted properties **/
|
||||
|
||||
// The property for floating flower island type
|
||||
public static final ModelProperty<IFloatingFlower> FLOATING_DATA = new ModelProperty<>();
|
||||
|
||||
// The property for platform held blockstate
|
||||
public static final ModelProperty<BlockState> HELD_STATE = new ModelProperty<>();
|
||||
|
||||
// The property for platform world pos
|
||||
public static final ModelProperty<BlockPos> HELD_POS = new ModelProperty<>();
|
||||
|
||||
/** Common properties to all blocks to use **/
|
||||
|
||||
// The 16 Minecraft colors
|
||||
public static final EnumProperty<DyeColor> COLOR = EnumProperty.create("color", DyeColor.class);
|
||||
|
||||
// The four cardinal directions
|
||||
public static final EnumProperty<Direction> CARDINALS = EnumProperty.create("facing", Direction.class, Direction.Plane.HORIZONTAL);
|
||||
|
||||
// All 6 directions
|
||||
public static final EnumProperty<Direction> FACING = EnumProperty.create("facing", Direction.class);
|
||||
|
||||
// Redstone power - boolean
|
||||
// Also for any other simple boolean "on/off" state
|
||||
public static final BooleanProperty POWERED = BooleanProperty.create("powered");
|
||||
|
||||
/** Properties for individual blocks **/
|
||||
|
||||
// BlockAlfPortal
|
||||
public static final EnumProperty<AlfPortalState> ALFPORTAL_STATE = EnumProperty.create("state", AlfPortalState.class);
|
||||
|
||||
|
||||
@@ -21,9 +21,9 @@ import net.minecraftforge.client.MinecraftForgeClient;
|
||||
import net.minecraftforge.client.model.BakedModelWrapper;
|
||||
import net.minecraftforge.client.model.data.EmptyModelData;
|
||||
import net.minecraftforge.client.model.data.IModelData;
|
||||
import vazkii.botania.api.state.BotaniaStateProps;
|
||||
import vazkii.botania.common.block.BlockPlatform;
|
||||
import vazkii.botania.common.block.ModBlocks;
|
||||
import vazkii.botania.common.block.tile.TilePlatform;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
import java.util.List;
|
||||
@@ -48,8 +48,8 @@ public class PlatformModel extends BakedModelWrapper<IBakedModel> {
|
||||
layer = RenderType.getSolid(); // workaround for when this isn't set (digging, etc.)
|
||||
}
|
||||
|
||||
BlockState heldState = data.getData(BotaniaStateProps.HELD_STATE);
|
||||
BlockPos heldPos = data.getData(BotaniaStateProps.HELD_POS);
|
||||
BlockState heldState = data.getData(TilePlatform.HELD_STATE);
|
||||
BlockPos heldPos = data.getData(TilePlatform.HELD_POS);
|
||||
|
||||
if (heldPos == null) {
|
||||
return ImmutableList.of();
|
||||
|
||||
@@ -11,23 +11,19 @@
|
||||
package vazkii.botania.client.render.tile;
|
||||
|
||||
import com.mojang.blaze3d.matrix.MatrixStack;
|
||||
import com.mojang.blaze3d.platform.GLX;
|
||||
import com.mojang.blaze3d.platform.GlStateManager;
|
||||
import com.mojang.blaze3d.vertex.IVertexBuilder;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.IRenderTypeBuffer;
|
||||
import net.minecraft.client.renderer.RenderType;
|
||||
import net.minecraft.client.renderer.Vector3f;
|
||||
import net.minecraft.client.renderer.model.ItemCameraTransforms;
|
||||
import net.minecraft.client.renderer.texture.AtlasTexture;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntityRenderer;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.state.properties.BlockStateProperties;
|
||||
import net.minecraft.util.Direction;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import org.lwjgl.opengl.GL11;
|
||||
import vazkii.botania.api.item.IAvatarWieldable;
|
||||
import vazkii.botania.api.state.BotaniaStateProps;
|
||||
import vazkii.botania.client.core.handler.ClientTickHandler;
|
||||
import vazkii.botania.client.lib.LibResources;
|
||||
import vazkii.botania.client.model.ModelAvatar;
|
||||
@@ -57,7 +53,7 @@ public class RenderTileAvatar extends TileEntityRenderer<TileAvatar> {
|
||||
return;
|
||||
|
||||
ms.push();
|
||||
Direction facing = avatar != null && avatar.getWorld() != null ? avatar.getBlockState().get(BotaniaStateProps.CARDINALS) : Direction.SOUTH;
|
||||
Direction facing = avatar != null && avatar.getWorld() != null ? avatar.getBlockState().get(BlockStateProperties.HORIZONTAL_FACING) : Direction.SOUTH;
|
||||
|
||||
ms.translate(0.5F, 1.6F, 0.5F);
|
||||
ms.scale(1F, -1F, -1F);
|
||||
|
||||
@@ -11,19 +11,15 @@
|
||||
package vazkii.botania.client.render.tile;
|
||||
|
||||
import com.mojang.blaze3d.matrix.MatrixStack;
|
||||
import com.mojang.blaze3d.platform.GlStateManager;
|
||||
import com.mojang.blaze3d.systems.RenderSystem;
|
||||
import com.mojang.blaze3d.vertex.IVertexBuilder;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.IRenderTypeBuffer;
|
||||
import net.minecraft.client.renderer.Vector3f;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntityRenderer;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher;
|
||||
import net.minecraft.state.properties.BlockStateProperties;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import vazkii.botania.api.state.BotaniaStateProps;
|
||||
import vazkii.botania.client.lib.LibResources;
|
||||
import vazkii.botania.client.model.ModelBellows;
|
||||
import vazkii.botania.common.block.ModBlocks;
|
||||
import vazkii.botania.common.block.tile.mana.TileBellows;
|
||||
|
||||
import javax.annotation.Nullable;
|
||||
@@ -43,7 +39,7 @@ public class RenderTileBellows extends TileEntityRenderer<TileBellows> {
|
||||
ms.scale(1F, -1F, -1F);
|
||||
float angle = 0;
|
||||
if(bellows != null) {
|
||||
switch(bellows.getBlockState().get(BotaniaStateProps.CARDINALS)) {
|
||||
switch(bellows.getBlockState().get(BlockStateProperties.HORIZONTAL_FACING)) {
|
||||
case SOUTH: break;
|
||||
case NORTH: angle = 180F; break;
|
||||
case EAST: angle = 270F; break;
|
||||
|
||||
@@ -12,18 +12,15 @@ package vazkii.botania.client.render.tile;
|
||||
|
||||
import com.google.common.collect.ImmutableMap;
|
||||
import com.mojang.blaze3d.matrix.MatrixStack;
|
||||
import com.mojang.blaze3d.platform.GlStateManager;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.IRenderTypeBuffer;
|
||||
import net.minecraft.client.renderer.Vector3f;
|
||||
import net.minecraft.client.renderer.model.ItemCameraTransforms;
|
||||
import net.minecraft.client.renderer.texture.AtlasTexture;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntityRenderer;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.state.properties.BlockStateProperties;
|
||||
import net.minecraft.util.Direction;
|
||||
import vazkii.botania.api.state.BotaniaStateProps;
|
||||
import vazkii.botania.common.block.ModBlocks;
|
||||
import vazkii.botania.common.block.tile.TileIncensePlate;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
@@ -44,7 +41,7 @@ public class RenderTileIncensePlate extends TileEntityRenderer<TileIncensePlate>
|
||||
if(stack.isEmpty())
|
||||
return;
|
||||
|
||||
Direction facing = plate.getBlockState().get(BotaniaStateProps.CARDINALS);
|
||||
Direction facing = plate.getBlockState().get(BlockStateProperties.HORIZONTAL_FACING);
|
||||
|
||||
ms.push();
|
||||
ms.translate(0.5F, 1.5F, 0.5F);
|
||||
|
||||
@@ -1,17 +1,15 @@
|
||||
package vazkii.botania.client.render.tile;
|
||||
|
||||
import com.mojang.blaze3d.matrix.MatrixStack;
|
||||
import com.mojang.blaze3d.platform.GlStateManager;
|
||||
import com.mojang.blaze3d.vertex.IVertexBuilder;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.IRenderTypeBuffer;
|
||||
import net.minecraft.client.renderer.RenderType;
|
||||
import net.minecraft.client.renderer.Vector3f;
|
||||
import net.minecraft.client.renderer.model.IBakedModel;
|
||||
import net.minecraft.client.renderer.texture.AtlasTexture;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntityRenderer;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher;
|
||||
import vazkii.botania.api.state.BotaniaStateProps;
|
||||
import net.minecraft.state.properties.BlockStateProperties;
|
||||
import vazkii.botania.common.block.tile.mana.TilePump;
|
||||
|
||||
public class RenderTilePump extends TileEntityRenderer<TilePump> {
|
||||
@@ -26,7 +24,7 @@ public class RenderTilePump extends TileEntityRenderer<TilePump> {
|
||||
ms.push();
|
||||
ms.translate(0.5, 0, 0.5);
|
||||
float angle = 0;
|
||||
switch (pump.getBlockState().get(BotaniaStateProps.CARDINALS)) {
|
||||
switch (pump.getBlockState().get(BlockStateProperties.HORIZONTAL_FACING)) {
|
||||
default:
|
||||
case NORTH: break;
|
||||
case SOUTH:
|
||||
|
||||
@@ -11,32 +11,23 @@
|
||||
package vazkii.botania.client.render.tile;
|
||||
|
||||
import com.mojang.blaze3d.matrix.MatrixStack;
|
||||
import com.mojang.blaze3d.platform.GLX;
|
||||
import com.mojang.blaze3d.platform.GlStateManager;
|
||||
import com.mojang.blaze3d.systems.RenderSystem;
|
||||
import com.mojang.blaze3d.vertex.IVertexBuilder;
|
||||
import com.mojang.datafixers.util.Pair;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.Blocks;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.Atlases;
|
||||
import net.minecraft.client.renderer.BufferBuilder;
|
||||
import net.minecraft.client.renderer.IRenderTypeBuffer;
|
||||
import net.minecraft.client.renderer.RenderType;
|
||||
import net.minecraft.client.renderer.RenderTypeLookup;
|
||||
import net.minecraft.client.renderer.Tessellator;
|
||||
import net.minecraft.client.renderer.Vector3f;
|
||||
import net.minecraft.client.renderer.model.IBakedModel;
|
||||
import net.minecraft.client.renderer.model.ItemCameraTransforms;
|
||||
import net.minecraft.client.renderer.model.ModelRenderer;
|
||||
import net.minecraft.client.renderer.texture.AtlasTexture;
|
||||
import net.minecraft.client.renderer.texture.OverlayTexture;
|
||||
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntityRenderer;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher;
|
||||
import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
|
||||
import net.minecraft.item.BlockItem;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.state.properties.BlockStateProperties;
|
||||
import net.minecraft.util.Direction;
|
||||
import net.minecraft.util.Direction.Axis;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
@@ -45,10 +36,8 @@ import net.minecraft.util.math.RayTraceResult;
|
||||
import net.minecraft.util.text.StringTextComponent;
|
||||
import net.minecraftforge.common.MinecraftForge;
|
||||
import vazkii.botania.api.item.TinyPotatoRenderEvent;
|
||||
import vazkii.botania.api.state.BotaniaStateProps;
|
||||
import vazkii.botania.client.core.handler.ContributorFancinessHandler;
|
||||
import vazkii.botania.client.core.handler.MiscellaneousIcons;
|
||||
import vazkii.botania.client.core.helper.IconHelper;
|
||||
import vazkii.botania.client.core.helper.RenderHelper;
|
||||
import vazkii.botania.client.core.helper.ShaderHelper;
|
||||
import vazkii.botania.client.core.helper.ShaderWrappedRenderLayer;
|
||||
@@ -129,7 +118,7 @@ public class RenderTileTinyPotato extends TileEntityRenderer<TileTinyPotato> {
|
||||
ms.translate(0.5F, 1.5F, 0.5F);
|
||||
ms.scale(1F, -1F, -1F);
|
||||
|
||||
Direction potatoFacing = potato.getBlockState().get(BotaniaStateProps.CARDINALS);
|
||||
Direction potatoFacing = potato.getBlockState().get(BlockStateProperties.HORIZONTAL_FACING);
|
||||
float rotY = 0;
|
||||
switch(potatoFacing) {
|
||||
default:
|
||||
|
||||
@@ -17,6 +17,7 @@ import net.minecraft.entity.player.PlayerEntity;
|
||||
import net.minecraft.item.BlockItemUseContext;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.state.StateContainer;
|
||||
import net.minecraft.state.properties.BlockStateProperties;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.ActionResultType;
|
||||
import net.minecraft.util.Direction;
|
||||
@@ -31,7 +32,6 @@ import net.minecraft.world.IBlockReader;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.items.ItemHandlerHelper;
|
||||
import vazkii.botania.api.item.IAvatarWieldable;
|
||||
import vazkii.botania.api.state.BotaniaStateProps;
|
||||
import vazkii.botania.common.block.tile.TileAvatar;
|
||||
import vazkii.botania.common.block.tile.TileSimpleInventory;
|
||||
import vazkii.botania.common.core.helper.InventoryHelper;
|
||||
@@ -46,20 +46,20 @@ public class BlockAvatar extends BlockMod {
|
||||
|
||||
protected BlockAvatar(Properties builder) {
|
||||
super(builder);
|
||||
setDefaultState(stateContainer.getBaseState().with(BotaniaStateProps.CARDINALS, Direction.NORTH));
|
||||
setDefaultState(stateContainer.getBaseState().with(BlockStateProperties.HORIZONTAL_FACING, Direction.NORTH));
|
||||
}
|
||||
|
||||
@Nonnull
|
||||
@Override
|
||||
public VoxelShape getShape(BlockState state, IBlockReader world, BlockPos pos, ISelectionContext ctx) {
|
||||
if(state.get(BotaniaStateProps.CARDINALS).getAxis() == Direction.Axis.X)
|
||||
if(state.get(BlockStateProperties.HORIZONTAL_FACING).getAxis() == Direction.Axis.X)
|
||||
return X_AABB;
|
||||
else return Z_AABB;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void fillStateContainer(StateContainer.Builder<Block, BlockState> builder) {
|
||||
builder.add(BotaniaStateProps.CARDINALS);
|
||||
builder.add(BlockStateProperties.HORIZONTAL_FACING);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -91,7 +91,7 @@ public class BlockAvatar extends BlockMod {
|
||||
@Nullable
|
||||
@Override
|
||||
public BlockState getStateForPlacement(BlockItemUseContext context) {
|
||||
return getDefaultState().with(BotaniaStateProps.CARDINALS, context.getPlacementHorizontalFacing().getOpposite());
|
||||
return getDefaultState().with(BlockStateProperties.HORIZONTAL_FACING, context.getPlacementHorizontalFacing().getOpposite());
|
||||
}
|
||||
|
||||
@Nonnull
|
||||
@@ -114,12 +114,12 @@ public class BlockAvatar extends BlockMod {
|
||||
@Nonnull
|
||||
@Override
|
||||
public BlockState mirror(@Nonnull BlockState state, Mirror mirror) {
|
||||
return state.with(BotaniaStateProps.CARDINALS, mirror.mirror(state.get(BotaniaStateProps.CARDINALS)));
|
||||
return state.with(BlockStateProperties.HORIZONTAL_FACING, mirror.mirror(state.get(BlockStateProperties.HORIZONTAL_FACING)));
|
||||
}
|
||||
|
||||
@Nonnull
|
||||
@Override
|
||||
public BlockState rotate(@Nonnull BlockState state, Rotation rot) {
|
||||
return state.with(BotaniaStateProps.CARDINALS, rot.rotate(state.get(BotaniaStateProps.CARDINALS)));
|
||||
return state.with(BlockStateProperties.HORIZONTAL_FACING, rot.rotate(state.get(BlockStateProperties.HORIZONTAL_FACING)));
|
||||
}
|
||||
}
|
||||
@@ -17,6 +17,7 @@ import net.minecraft.item.BlockItemUseContext;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.item.Items;
|
||||
import net.minecraft.state.StateContainer;
|
||||
import net.minecraft.state.properties.BlockStateProperties;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.ActionResultType;
|
||||
import net.minecraft.util.Direction;
|
||||
@@ -29,7 +30,6 @@ import net.minecraft.world.IBlockReader;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.items.ItemHandlerHelper;
|
||||
import vazkii.botania.api.internal.VanillaPacketDispatcher;
|
||||
import vazkii.botania.api.state.BotaniaStateProps;
|
||||
import vazkii.botania.common.block.tile.TileIncensePlate;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
@@ -41,12 +41,12 @@ public class BlockIncensePlate extends BlockMod {
|
||||
|
||||
protected BlockIncensePlate(Properties builder) {
|
||||
super(builder);
|
||||
setDefaultState(stateContainer.getBaseState().with(BotaniaStateProps.CARDINALS, Direction.SOUTH));
|
||||
setDefaultState(stateContainer.getBaseState().with(BlockStateProperties.HORIZONTAL_FACING, Direction.SOUTH));
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void fillStateContainer(StateContainer.Builder<Block, BlockState> builder) {
|
||||
builder.add(BotaniaStateProps.CARDINALS);
|
||||
builder.add(BlockStateProperties.HORIZONTAL_FACING);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -84,7 +84,7 @@ public class BlockIncensePlate extends BlockMod {
|
||||
|
||||
@Override
|
||||
public BlockState getStateForPlacement(BlockItemUseContext context) {
|
||||
return getDefaultState().with(BotaniaStateProps.CARDINALS, context.getPlacementHorizontalFacing().getOpposite());
|
||||
return getDefaultState().with(BlockStateProperties.HORIZONTAL_FACING, context.getPlacementHorizontalFacing().getOpposite());
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -100,7 +100,7 @@ public class BlockIncensePlate extends BlockMod {
|
||||
@Nonnull
|
||||
@Override
|
||||
public VoxelShape getShape(BlockState state, IBlockReader world, BlockPos pos, ISelectionContext ctx) {
|
||||
if(state.get(BotaniaStateProps.CARDINALS).getAxis() == Direction.Axis.X) {
|
||||
if(state.get(BlockStateProperties.HORIZONTAL_FACING).getAxis() == Direction.Axis.X) {
|
||||
return X_SHAPE;
|
||||
} else {
|
||||
return Z_SHAPE;
|
||||
|
||||
@@ -19,6 +19,7 @@ import net.minecraft.item.BlockItemUseContext;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.particles.ParticleTypes;
|
||||
import net.minecraft.state.StateContainer;
|
||||
import net.minecraft.state.properties.BlockStateProperties;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.ActionResultType;
|
||||
import net.minecraft.util.Direction;
|
||||
@@ -31,7 +32,6 @@ import net.minecraft.util.math.shapes.VoxelShape;
|
||||
import net.minecraft.world.IBlockReader;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraft.world.server.ServerWorld;
|
||||
import vazkii.botania.api.state.BotaniaStateProps;
|
||||
import vazkii.botania.common.block.BlockMod;
|
||||
import vazkii.botania.common.block.tile.TileSimpleInventory;
|
||||
import vazkii.botania.common.block.tile.TileTinyPotato;
|
||||
@@ -46,12 +46,12 @@ public class BlockTinyPotato extends BlockMod {
|
||||
public BlockTinyPotato(Properties builder) {
|
||||
super(builder);
|
||||
setDefaultState(stateContainer.getBaseState()
|
||||
.with(BotaniaStateProps.CARDINALS, Direction.SOUTH));
|
||||
.with(BlockStateProperties.HORIZONTAL_FACING, Direction.SOUTH));
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void fillStateContainer(StateContainer.Builder<Block, BlockState> builder) {
|
||||
builder.add(BotaniaStateProps.CARDINALS);
|
||||
builder.add(BlockStateProperties.HORIZONTAL_FACING);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -84,7 +84,7 @@ public class BlockTinyPotato extends BlockMod {
|
||||
|
||||
@Override
|
||||
public BlockState getStateForPlacement(BlockItemUseContext ctx) {
|
||||
return getDefaultState().with(BotaniaStateProps.CARDINALS, ctx.getPlacementHorizontalFacing().getOpposite());
|
||||
return getDefaultState().with(BlockStateProperties.HORIZONTAL_FACING, ctx.getPlacementHorizontalFacing().getOpposite());
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -16,6 +16,7 @@ import net.minecraft.block.BlockState;
|
||||
import net.minecraft.entity.player.PlayerEntity;
|
||||
import net.minecraft.item.BlockItemUseContext;
|
||||
import net.minecraft.state.StateContainer;
|
||||
import net.minecraft.state.properties.BlockStateProperties;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.ActionResultType;
|
||||
import net.minecraft.util.Direction;
|
||||
@@ -26,7 +27,6 @@ import net.minecraft.util.math.shapes.ISelectionContext;
|
||||
import net.minecraft.util.math.shapes.VoxelShape;
|
||||
import net.minecraft.world.IBlockReader;
|
||||
import net.minecraft.world.World;
|
||||
import vazkii.botania.api.state.BotaniaStateProps;
|
||||
import vazkii.botania.common.block.BlockMod;
|
||||
import vazkii.botania.common.block.tile.mana.TileBellows;
|
||||
import vazkii.botania.common.entity.EntityDoppleganger;
|
||||
@@ -39,12 +39,12 @@ public class BlockBellows extends BlockMod {
|
||||
|
||||
public BlockBellows(Properties builder) {
|
||||
super(builder);
|
||||
setDefaultState(stateContainer.getBaseState().with(BotaniaStateProps.CARDINALS, Direction.SOUTH));
|
||||
setDefaultState(stateContainer.getBaseState().with(BlockStateProperties.HORIZONTAL_FACING, Direction.SOUTH));
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void fillStateContainer(StateContainer.Builder<Block, BlockState> builder) {
|
||||
builder.add(BotaniaStateProps.CARDINALS);
|
||||
builder.add(BlockStateProperties.HORIZONTAL_FACING);
|
||||
}
|
||||
|
||||
@Nonnull
|
||||
@@ -55,7 +55,7 @@ public class BlockBellows extends BlockMod {
|
||||
|
||||
@Override
|
||||
public BlockState getStateForPlacement(BlockItemUseContext context) {
|
||||
return getDefaultState().with(BotaniaStateProps.CARDINALS, context.getPlacementHorizontalFacing());
|
||||
return getDefaultState().with(BlockStateProperties.HORIZONTAL_FACING, context.getPlacementHorizontalFacing());
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -14,6 +14,7 @@ import net.minecraft.block.Block;
|
||||
import net.minecraft.block.BlockState;
|
||||
import net.minecraft.item.BlockItemUseContext;
|
||||
import net.minecraft.state.StateContainer;
|
||||
import net.minecraft.state.properties.BlockStateProperties;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.Direction;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
@@ -21,7 +22,6 @@ import net.minecraft.util.math.shapes.ISelectionContext;
|
||||
import net.minecraft.util.math.shapes.VoxelShape;
|
||||
import net.minecraft.world.IBlockReader;
|
||||
import net.minecraft.world.World;
|
||||
import vazkii.botania.api.state.BotaniaStateProps;
|
||||
import vazkii.botania.common.block.BlockMod;
|
||||
import vazkii.botania.common.block.tile.mana.TilePump;
|
||||
|
||||
@@ -35,24 +35,24 @@ public class BlockPump extends BlockMod {
|
||||
|
||||
public BlockPump(Properties builder) {
|
||||
super(builder);
|
||||
setDefaultState(getStateContainer().getBaseState().with(BotaniaStateProps.CARDINALS, Direction.SOUTH));
|
||||
setDefaultState(getStateContainer().getBaseState().with(BlockStateProperties.HORIZONTAL_FACING, Direction.SOUTH));
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void fillStateContainer(StateContainer.Builder<Block, BlockState> builder) {
|
||||
builder.add(BotaniaStateProps.CARDINALS);
|
||||
builder.add(BlockStateProperties.HORIZONTAL_FACING);
|
||||
}
|
||||
|
||||
@Nullable
|
||||
@Override
|
||||
public BlockState getStateForPlacement(BlockItemUseContext context) {
|
||||
return getDefaultState().with(BotaniaStateProps.CARDINALS, context.getPlacementHorizontalFacing().getOpposite());
|
||||
return getDefaultState().with(BlockStateProperties.HORIZONTAL_FACING, context.getPlacementHorizontalFacing().getOpposite());
|
||||
}
|
||||
|
||||
@Nonnull
|
||||
@Override
|
||||
public VoxelShape getShape(BlockState state, IBlockReader world, BlockPos pos, ISelectionContext ctx) {
|
||||
if(state.get(BotaniaStateProps.CARDINALS).getAxis() == Direction.Axis.X) {
|
||||
if(state.get(BlockStateProperties.HORIZONTAL_FACING).getAxis() == Direction.Axis.X) {
|
||||
return X_SHAPE;
|
||||
} else {
|
||||
return Z_SHAPE;
|
||||
|
||||
@@ -14,7 +14,7 @@ import net.minecraft.block.Block;
|
||||
import net.minecraft.block.BlockState;
|
||||
import net.minecraft.item.BlockItemUseContext;
|
||||
import net.minecraft.state.StateContainer;
|
||||
import vazkii.botania.api.state.BotaniaStateProps;
|
||||
import net.minecraft.state.properties.BlockStateProperties;
|
||||
import vazkii.botania.common.block.BlockMod;
|
||||
|
||||
public abstract class BlockRedString extends BlockMod {
|
||||
@@ -25,12 +25,12 @@ public abstract class BlockRedString extends BlockMod {
|
||||
|
||||
@Override
|
||||
protected void fillStateContainer(StateContainer.Builder<Block, BlockState> builder) {
|
||||
builder.add(BotaniaStateProps.FACING);
|
||||
builder.add(BlockStateProperties.FACING);
|
||||
}
|
||||
|
||||
@Override
|
||||
public BlockState getStateForPlacement(BlockItemUseContext context) {
|
||||
return getDefaultState().with(BotaniaStateProps.FACING, context.getNearestLookingDirection().getOpposite());
|
||||
return getDefaultState().with(BlockStateProperties.FACING, context.getNearestLookingDirection().getOpposite());
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -12,11 +12,11 @@ package vazkii.botania.common.block.string;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.BlockState;
|
||||
import net.minecraft.state.properties.BlockStateProperties;
|
||||
import net.minecraft.util.Direction;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.world.IBlockReader;
|
||||
import net.minecraft.world.World;
|
||||
import vazkii.botania.api.state.BotaniaStateProps;
|
||||
import vazkii.botania.common.block.tile.string.TileRedString;
|
||||
import vazkii.botania.common.block.tile.string.TileRedStringComparator;
|
||||
|
||||
@@ -26,7 +26,7 @@ public class BlockRedStringComparator extends BlockRedString {
|
||||
|
||||
public BlockRedStringComparator(Block.Properties builder) {
|
||||
super(builder);
|
||||
setDefaultState(stateContainer.getBaseState().with(BotaniaStateProps.FACING, Direction.DOWN));
|
||||
setDefaultState(stateContainer.getBaseState().with(BlockStateProperties.FACING, Direction.DOWN));
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -12,9 +12,9 @@ package vazkii.botania.common.block.string;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.BlockState;
|
||||
import net.minecraft.state.properties.BlockStateProperties;
|
||||
import net.minecraft.util.Direction;
|
||||
import net.minecraft.world.IBlockReader;
|
||||
import vazkii.botania.api.state.BotaniaStateProps;
|
||||
import vazkii.botania.common.block.tile.string.TileRedString;
|
||||
import vazkii.botania.common.block.tile.string.TileRedStringContainer;
|
||||
|
||||
@@ -24,7 +24,7 @@ public class BlockRedStringContainer extends BlockRedString {
|
||||
|
||||
public BlockRedStringContainer(Block.Properties builder) {
|
||||
super(builder);
|
||||
setDefaultState(stateContainer.getBaseState().with(BotaniaStateProps.FACING, Direction.DOWN));
|
||||
setDefaultState(stateContainer.getBaseState().with(BlockStateProperties.FACING, Direction.DOWN));
|
||||
}
|
||||
|
||||
@Nonnull
|
||||
|
||||
@@ -13,6 +13,7 @@ package vazkii.botania.common.block.string;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.BlockState;
|
||||
import net.minecraft.state.StateContainer;
|
||||
import net.minecraft.state.properties.BlockStateProperties;
|
||||
import net.minecraft.util.Direction;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.world.IBlockReader;
|
||||
@@ -27,7 +28,7 @@ public class BlockRedStringDispenser extends BlockRedString {
|
||||
|
||||
public BlockRedStringDispenser(Block.Properties builder) {
|
||||
super(builder);
|
||||
setDefaultState(stateContainer.getBaseState().with(BotaniaStateProps.FACING, Direction.DOWN).with(BotaniaStateProps.POWERED, false));
|
||||
setDefaultState(stateContainer.getBaseState().with(BlockStateProperties.FACING, Direction.DOWN).with(BotaniaStateProps.POWERED, false));
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -13,12 +13,12 @@ package vazkii.botania.common.block.string;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.BlockState;
|
||||
import net.minecraft.block.IGrowable;
|
||||
import net.minecraft.state.properties.BlockStateProperties;
|
||||
import net.minecraft.util.Direction;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.world.IBlockReader;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraft.world.server.ServerWorld;
|
||||
import vazkii.botania.api.state.BotaniaStateProps;
|
||||
import vazkii.botania.common.block.tile.string.TileRedString;
|
||||
import vazkii.botania.common.block.tile.string.TileRedStringFertilizer;
|
||||
|
||||
@@ -29,7 +29,7 @@ public class BlockRedStringFertilizer extends BlockRedString implements IGrowabl
|
||||
|
||||
public BlockRedStringFertilizer(Block.Properties builder) {
|
||||
super(builder);
|
||||
setDefaultState(stateContainer.getBaseState().with(BotaniaStateProps.FACING, Direction.DOWN));
|
||||
setDefaultState(stateContainer.getBaseState().with(BlockStateProperties.FACING, Direction.DOWN));
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -13,11 +13,11 @@ package vazkii.botania.common.block.string;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.BlockState;
|
||||
import net.minecraft.state.StateContainer;
|
||||
import net.minecraft.state.properties.BlockStateProperties;
|
||||
import net.minecraft.util.Direction;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.world.IBlockReader;
|
||||
import net.minecraft.world.IWorldReader;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraft.world.server.ServerWorld;
|
||||
import net.minecraftforge.event.entity.player.PlayerInteractEvent;
|
||||
import net.minecraftforge.eventbus.api.SubscribeEvent;
|
||||
@@ -35,7 +35,7 @@ public class BlockRedStringInterceptor extends BlockRedString {
|
||||
|
||||
public BlockRedStringInterceptor(Block.Properties builder) {
|
||||
super(builder);
|
||||
setDefaultState(stateContainer.getBaseState().with(BotaniaStateProps.FACING, Direction.DOWN).with(BotaniaStateProps.POWERED, false));
|
||||
setDefaultState(stateContainer.getBaseState().with(BlockStateProperties.FACING, Direction.DOWN).with(BotaniaStateProps.POWERED, false));
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -12,9 +12,9 @@ package vazkii.botania.common.block.string;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.BlockState;
|
||||
import net.minecraft.state.properties.BlockStateProperties;
|
||||
import net.minecraft.util.Direction;
|
||||
import net.minecraft.world.IBlockReader;
|
||||
import vazkii.botania.api.state.BotaniaStateProps;
|
||||
import vazkii.botania.common.block.tile.string.TileRedString;
|
||||
import vazkii.botania.common.block.tile.string.TileRedStringRelay;
|
||||
|
||||
@@ -24,7 +24,7 @@ public class BlockRedStringRelay extends BlockRedString {
|
||||
|
||||
public BlockRedStringRelay(Block.Properties builder) {
|
||||
super(builder);
|
||||
setDefaultState(stateContainer.getBaseState().with(BotaniaStateProps.FACING, Direction.DOWN));
|
||||
setDefaultState(stateContainer.getBaseState().with(BlockStateProperties.FACING, Direction.DOWN));
|
||||
}
|
||||
|
||||
@Nonnull
|
||||
|
||||
@@ -20,7 +20,6 @@ import net.minecraft.entity.player.PlayerEntity;
|
||||
import net.minecraft.entity.player.ServerPlayerEntity;
|
||||
import net.minecraft.fluid.Fluid;
|
||||
import net.minecraft.fluid.Fluids;
|
||||
import net.minecraft.item.BlockItem;
|
||||
import net.minecraft.item.FishBucketItem;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.item.Items;
|
||||
@@ -57,6 +56,7 @@ import vazkii.botania.common.lib.LibBlockNames;
|
||||
import vazkii.botania.common.lib.LibMisc;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
import javax.annotation.Nullable;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.regex.Pattern;
|
||||
@@ -180,14 +180,12 @@ public class TileAltar extends TileSimpleInventory implements IPetalApothecary,
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
@Nullable
|
||||
private ICustomApothecaryColor getFlowerComponent(ItemStack stack) {
|
||||
ICustomApothecaryColor c = null;
|
||||
if(stack.getItem() instanceof ICustomApothecaryColor)
|
||||
c = (ICustomApothecaryColor) stack.getItem();
|
||||
else if(stack.getItem() instanceof BlockItem && ((BlockItem) stack.getItem()).getBlock() instanceof ICustomApothecaryColor)
|
||||
c = (ICustomApothecaryColor) ((BlockItem) stack.getItem()).getBlock();
|
||||
|
||||
return c;
|
||||
}
|
||||
|
||||
|
||||
@@ -12,6 +12,7 @@ package vazkii.botania.common.block.tile;
|
||||
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.CompoundNBT;
|
||||
import net.minecraft.state.properties.BlockStateProperties;
|
||||
import net.minecraft.tileentity.ITickableTileEntity;
|
||||
import net.minecraft.tileentity.TileEntityType;
|
||||
import net.minecraft.util.Direction;
|
||||
@@ -19,7 +20,6 @@ import net.minecraftforge.items.IItemHandler;
|
||||
import net.minecraftforge.registries.ObjectHolder;
|
||||
import vazkii.botania.api.item.IAvatarTile;
|
||||
import vazkii.botania.api.item.IAvatarWieldable;
|
||||
import vazkii.botania.api.state.BotaniaStateProps;
|
||||
import vazkii.botania.common.lib.LibBlockNames;
|
||||
import vazkii.botania.common.lib.LibMisc;
|
||||
|
||||
@@ -123,7 +123,7 @@ public class TileAvatar extends TileSimpleInventory implements IAvatarTile, ITic
|
||||
|
||||
@Override
|
||||
public Direction getAvatarFacing() {
|
||||
return world.getBlockState(getPos()).get(BotaniaStateProps.CARDINALS);
|
||||
return world.getBlockState(getPos()).get(BlockStateProperties.HORIZONTAL_FACING);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -23,14 +23,17 @@ 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.client.model.data.ModelProperty;
|
||||
import net.minecraftforge.registries.ObjectHolder;
|
||||
import vazkii.botania.api.state.BotaniaStateProps;
|
||||
import vazkii.botania.common.lib.LibBlockNames;
|
||||
import vazkii.botania.common.lib.LibMisc;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
|
||||
public class TilePlatform extends TileMod {
|
||||
public static final ModelProperty<BlockState> HELD_STATE = new ModelProperty<>();
|
||||
public static final ModelProperty<BlockPos> HELD_POS = new ModelProperty<>();
|
||||
|
||||
@ObjectHolder(LibMisc.MOD_ID + ":" + LibBlockNames.PLATFORM)
|
||||
public static TileEntityType<TilePlatform> TYPE;
|
||||
private static final String TAG_CAMO = "camo";
|
||||
@@ -102,8 +105,8 @@ public class TilePlatform extends TileMod {
|
||||
@Override
|
||||
public IModelData getModelData() {
|
||||
return new ModelDataMap.Builder()
|
||||
.withInitial(BotaniaStateProps.HELD_POS, getPos())
|
||||
.withInitial(BotaniaStateProps.HELD_STATE, camoState)
|
||||
.withInitial(HELD_POS, getPos())
|
||||
.withInitial(HELD_STATE, camoState)
|
||||
.build();
|
||||
}
|
||||
}
|
||||
@@ -16,6 +16,7 @@ import net.minecraft.item.crafting.AbstractCookingRecipe;
|
||||
import net.minecraft.item.crafting.IRecipeType;
|
||||
import net.minecraft.nbt.CompoundNBT;
|
||||
import net.minecraft.particles.ParticleTypes;
|
||||
import net.minecraft.state.properties.BlockStateProperties;
|
||||
import net.minecraft.tileentity.AbstractFurnaceTileEntity;
|
||||
import net.minecraft.tileentity.FurnaceTileEntity;
|
||||
import net.minecraft.tileentity.ITickableTileEntity;
|
||||
@@ -25,7 +26,6 @@ import net.minecraft.util.Direction;
|
||||
import net.minecraft.util.SoundCategory;
|
||||
import net.minecraftforge.registries.ObjectHolder;
|
||||
import vazkii.botania.api.internal.VanillaPacketDispatcher;
|
||||
import vazkii.botania.api.state.BotaniaStateProps;
|
||||
import vazkii.botania.common.Botania;
|
||||
import vazkii.botania.common.block.tile.TileMod;
|
||||
import vazkii.botania.common.core.handler.ExoflameFurnaceHandler;
|
||||
@@ -127,7 +127,7 @@ public class TileBellows extends TileMod implements ITickableTileEntity {
|
||||
}
|
||||
|
||||
public TileEntity getLinkedTile() {
|
||||
Direction side = world.getBlockState(getPos()).get(BotaniaStateProps.CARDINALS);
|
||||
Direction side = world.getBlockState(getPos()).get(BlockStateProperties.HORIZONTAL_FACING);
|
||||
return world.getTileEntity(getPos().offset(side));
|
||||
}
|
||||
|
||||
|
||||
@@ -13,13 +13,13 @@ package vazkii.botania.common.block.tile.string;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.BlockState;
|
||||
import net.minecraft.block.Blocks;
|
||||
import net.minecraft.state.properties.BlockStateProperties;
|
||||
import net.minecraft.tileentity.ITickableTileEntity;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.tileentity.TileEntityType;
|
||||
import net.minecraft.util.Direction;
|
||||
import net.minecraft.util.math.AxisAlignedBB;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import vazkii.botania.api.state.BotaniaStateProps;
|
||||
import vazkii.botania.api.wand.ITileBound;
|
||||
import vazkii.botania.common.block.tile.TileMod;
|
||||
|
||||
@@ -85,7 +85,7 @@ public abstract class TileRedString extends TileMod implements ITileBound, ITick
|
||||
}
|
||||
|
||||
public Direction getOrientation() {
|
||||
return getBlockState().get(BotaniaStateProps.FACING);
|
||||
return getBlockState().get(BlockStateProperties.FACING);
|
||||
}
|
||||
|
||||
public TileEntity getTileAtBinding() {
|
||||
|
||||
@@ -20,6 +20,7 @@ import net.minecraft.network.IPacket;
|
||||
import net.minecraft.network.datasync.DataParameter;
|
||||
import net.minecraft.network.datasync.DataSerializers;
|
||||
import net.minecraft.network.datasync.EntityDataManager;
|
||||
import net.minecraft.state.properties.BlockStateProperties;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.DamageSource;
|
||||
import net.minecraft.util.Direction;
|
||||
@@ -31,7 +32,6 @@ import net.minecraftforge.fml.network.NetworkHooks;
|
||||
import net.minecraftforge.registries.ObjectHolder;
|
||||
import vazkii.botania.api.internal.VanillaPacketDispatcher;
|
||||
import vazkii.botania.api.mana.IManaPool;
|
||||
import vazkii.botania.api.state.BotaniaStateProps;
|
||||
import vazkii.botania.client.fx.WispParticleData;
|
||||
import vazkii.botania.common.block.ModBlocks;
|
||||
import vazkii.botania.common.block.tile.mana.TilePool;
|
||||
@@ -40,7 +40,6 @@ import vazkii.botania.common.item.ModItems;
|
||||
import vazkii.botania.common.lib.LibMisc;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
import java.awt.*;
|
||||
|
||||
public class EntityPoolMinecart extends AbstractMinecartEntity {
|
||||
@ObjectHolder(LibMisc.MOD_ID + ":pool_minecart")
|
||||
@@ -151,7 +150,7 @@ public class EntityPoolMinecart extends AbstractMinecartEntity {
|
||||
|
||||
if(tile instanceof IManaPool) {
|
||||
IManaPool pool = (IManaPool) tile;
|
||||
Direction pumpDir = world.getBlockState(posP).get(BotaniaStateProps.CARDINALS);
|
||||
Direction pumpDir = world.getBlockState(posP).get(BlockStateProperties.HORIZONTAL_FACING);
|
||||
boolean did = false;
|
||||
boolean can = false;
|
||||
|
||||
|
||||
@@ -13,6 +13,7 @@ package vazkii.botania.common.item.rod;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.entity.player.PlayerEntity;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.state.properties.BlockStateProperties;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.ActionResult;
|
||||
import net.minecraft.util.Hand;
|
||||
@@ -28,7 +29,6 @@ import vazkii.botania.api.item.IAvatarWieldable;
|
||||
import vazkii.botania.api.item.IManaProficiencyArmor;
|
||||
import vazkii.botania.api.mana.IManaUsingItem;
|
||||
import vazkii.botania.api.mana.ManaItemHandler;
|
||||
import vazkii.botania.api.state.BotaniaStateProps;
|
||||
import vazkii.botania.client.lib.LibResources;
|
||||
import vazkii.botania.common.block.ModBlocks;
|
||||
import vazkii.botania.common.block.tile.TileBifrost;
|
||||
@@ -150,7 +150,7 @@ public class ItemRainbowRod extends Item implements IManaUsingItem, IAvatarWield
|
||||
int l = 20;
|
||||
|
||||
AxisAlignedBB axis = null;
|
||||
switch(world.getBlockState(tePos).get(BotaniaStateProps.CARDINALS)) {
|
||||
switch(world.getBlockState(tePos).get(BlockStateProperties.HORIZONTAL_FACING)) {
|
||||
case NORTH :
|
||||
axis = new AxisAlignedBB(tePos.add(-w, -h, -l), tePos.add(w + 1, h, 0));
|
||||
break;
|
||||
|
||||
@@ -3,7 +3,6 @@ package vazkii.botania.data;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.FenceBlock;
|
||||
import net.minecraft.block.FenceGateBlock;
|
||||
import net.minecraft.block.FlowerBlock;
|
||||
import net.minecraft.block.PaneBlock;
|
||||
import net.minecraft.block.RotatedPillarBlock;
|
||||
import net.minecraft.block.SlabBlock;
|
||||
@@ -11,6 +10,7 @@ import net.minecraft.block.StairsBlock;
|
||||
import net.minecraft.block.TallFlowerBlock;
|
||||
import net.minecraft.block.WallBlock;
|
||||
import net.minecraft.data.DataGenerator;
|
||||
import net.minecraft.state.properties.BlockStateProperties;
|
||||
import net.minecraft.state.properties.DoubleBlockHalf;
|
||||
import net.minecraft.state.properties.SlabType;
|
||||
import net.minecraft.util.Direction;
|
||||
@@ -22,12 +22,7 @@ import net.minecraftforge.client.model.generators.ExistingFileHelper;
|
||||
import net.minecraftforge.client.model.generators.ModelFile;
|
||||
import vazkii.botania.api.state.BotaniaStateProps;
|
||||
import vazkii.botania.common.block.BlockAltGrass;
|
||||
import vazkii.botania.common.block.BlockAltar;
|
||||
import vazkii.botania.common.block.BlockModDoubleFlower;
|
||||
import vazkii.botania.common.block.BlockSpecialFlower;
|
||||
import vazkii.botania.common.block.ModBlocks;
|
||||
import vazkii.botania.common.block.decor.BlockFloatingFlower;
|
||||
import vazkii.botania.common.block.decor.BlockModMushroom;
|
||||
import vazkii.botania.common.block.decor.BlockPetalBlock;
|
||||
import vazkii.botania.common.block.string.BlockRedString;
|
||||
import vazkii.botania.common.lib.LibBlockNames;
|
||||
@@ -143,11 +138,11 @@ public class BlockstateProvider extends BlockStateProvider {
|
||||
private void redStringBlock(Block b) {
|
||||
ModelFile file = models().getExistingFile(prefix("block/" + b.getRegistryName().getPath()));
|
||||
getVariantBuilder(b)
|
||||
.partialState().with(BotaniaStateProps.FACING, Direction.NORTH).setModels(new ConfiguredModel(file))
|
||||
.partialState().with(BotaniaStateProps.FACING, Direction.SOUTH).setModels(new ConfiguredModel(file, 0, 180, false))
|
||||
.partialState().with(BotaniaStateProps.FACING, Direction.WEST).setModels(new ConfiguredModel(file, 0, 270, false))
|
||||
.partialState().with(BotaniaStateProps.FACING, Direction.EAST).setModels(new ConfiguredModel(file, 0, 90, false))
|
||||
.partialState().with(BotaniaStateProps.FACING, Direction.DOWN).setModels(new ConfiguredModel(file, 90, 0, false))
|
||||
.partialState().with(BotaniaStateProps.FACING, Direction.UP).setModels(new ConfiguredModel(file, 270, 0, false));
|
||||
.partialState().with(BlockStateProperties.FACING, Direction.NORTH).setModels(new ConfiguredModel(file))
|
||||
.partialState().with(BlockStateProperties.FACING, Direction.SOUTH).setModels(new ConfiguredModel(file, 0, 180, false))
|
||||
.partialState().with(BlockStateProperties.FACING, Direction.WEST).setModels(new ConfiguredModel(file, 0, 270, false))
|
||||
.partialState().with(BlockStateProperties.FACING, Direction.EAST).setModels(new ConfiguredModel(file, 0, 90, false))
|
||||
.partialState().with(BlockStateProperties.FACING, Direction.DOWN).setModels(new ConfiguredModel(file, 90, 0, false))
|
||||
.partialState().with(BlockStateProperties.FACING, Direction.UP).setModels(new ConfiguredModel(file, 270, 0, false));
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user