From 9d8e711d354ba8ecd88c408f2d97586a88a48d86 Mon Sep 17 00:00:00 2001 From: Michael Date: Wed, 9 Sep 2020 16:18:09 +0100 Subject: [PATCH] Made Baseblock abstract, removed rarity and blockItem handlers for now This might come back but I don't know how we're going to handle block item handling yet --- .../blocks/BlockAtomicReconstructor.java | 8 ++----- .../common/blocks/BlockColoredLamp.java | 4 ++-- .../common/blocks/BlockCrystal.java | 4 ++-- .../common/blocks/BlockFurnaceDouble.java | 4 ++-- .../common/blocks/BlockInputter.java | 4 ++-- .../common/blocks/BlockMisc.java | 4 ++-- .../common/blocks/BlockSlabs.java | 4 ++-- .../common/blocks/BlockWildPlant.java | 4 ++-- .../common/blocks/base/ActuallyBlockBase.java | 21 +++++++++++++++++++ .../common/blocks/base/BlockBase.java | 17 --------------- .../common/blocks/base/BlockBushBase.java | 9 +------- .../blocks/base/BlockContainerBase.java | 2 +- .../common/blocks/base/BlockItemBase.java | 13 ------------ .../common/blocks/base/BlockPlant.java | 13 ++---------- .../common/blocks/base/IBaseBlock.java | 17 --------------- .../common/items/base/ItemSwordAA.java | 1 - .../common/util/ItemUtil.java | 1 - 17 files changed, 41 insertions(+), 89 deletions(-) create mode 100644 src/main/java/de/ellpeck/actuallyadditions/common/blocks/base/ActuallyBlockBase.java delete mode 100644 src/main/java/de/ellpeck/actuallyadditions/common/blocks/base/BlockBase.java delete mode 100644 src/main/java/de/ellpeck/actuallyadditions/common/blocks/base/BlockItemBase.java delete mode 100644 src/main/java/de/ellpeck/actuallyadditions/common/blocks/base/IBaseBlock.java diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockAtomicReconstructor.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockAtomicReconstructor.java index 964c408bc..85cb92041 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockAtomicReconstructor.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockAtomicReconstructor.java @@ -3,7 +3,6 @@ package de.ellpeck.actuallyadditions.common.blocks; import de.ellpeck.actuallyadditions.api.lens.ILensItem; import de.ellpeck.actuallyadditions.common.ActuallyAdditions; import de.ellpeck.actuallyadditions.common.blocks.base.BlockContainerBase; -import de.ellpeck.actuallyadditions.common.blocks.base.BlockItemBase; import de.ellpeck.actuallyadditions.common.config.values.ConfigIntValues; import de.ellpeck.actuallyadditions.common.tile.TileEntityAtomicReconstructor; import de.ellpeck.actuallyadditions.common.util.AssetUtil; @@ -17,10 +16,7 @@ import net.minecraft.client.MainWindow; import net.minecraft.client.Minecraft; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.item.Items; -import net.minecraft.item.Rarity; +import net.minecraft.item.*; import net.minecraft.state.StateContainer; import net.minecraft.state.properties.BlockStateProperties; import net.minecraft.tileentity.TileEntity; @@ -151,7 +147,7 @@ public class BlockAtomicReconstructor extends BlockContainerBase implements IHud return MathHelper.clamp(i / 20000, 0, 15); } - public class BlockItem extends BlockItemBase { + public class BlockItem extends net.minecraft.item.BlockItem { private long lastSysTime; private int toPick1; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockColoredLamp.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockColoredLamp.java index 512fc62e8..83be7836a 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockColoredLamp.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockColoredLamp.java @@ -3,7 +3,6 @@ package de.ellpeck.actuallyadditions.common.blocks; import java.util.Random; import de.ellpeck.actuallyadditions.common.ActuallyAdditions; -import de.ellpeck.actuallyadditions.common.blocks.base.BlockItemBase; import de.ellpeck.actuallyadditions.common.blocks.metalists.TheColoredLampColors; import de.ellpeck.actuallyadditions.common.util.StackUtil; import de.ellpeck.actuallyadditions.common.util.StringUtil; @@ -15,6 +14,7 @@ import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.BlockItem; import net.minecraft.item.EnumRarity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -132,7 +132,7 @@ public class BlockColoredLamp extends Block { return new BlockStateContainer(this, TYPE); } - public static class TheItemBlock extends BlockItemBase { + public static class TheItemBlock extends BlockItem { public TheItemBlock(Block block) { super(block); diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockCrystal.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockCrystal.java index 14471d2b6..705e3f947 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockCrystal.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockCrystal.java @@ -1,7 +1,6 @@ package de.ellpeck.actuallyadditions.common.blocks; import de.ellpeck.actuallyadditions.common.ActuallyAdditions; -import de.ellpeck.actuallyadditions.common.blocks.base.BlockItemBase; import de.ellpeck.actuallyadditions.common.items.metalists.TheCrystals; import de.ellpeck.actuallyadditions.common.util.StringUtil; import net.minecraft.block.Block; @@ -11,6 +10,7 @@ import net.minecraft.block.properties.PropertyEnum; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.BlockItem; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; @@ -75,7 +75,7 @@ public class BlockCrystal extends Block { return new BlockStateContainer(this, TYPE); } - public static class TheItemBlock extends BlockItemBase { + public static class TheItemBlock extends BlockItem { public TheItemBlock(Block block) { super(block); diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockFurnaceDouble.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockFurnaceDouble.java index ace7ffa23..5d9cfa5de 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockFurnaceDouble.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockFurnaceDouble.java @@ -2,7 +2,6 @@ package de.ellpeck.actuallyadditions.common.blocks; import de.ellpeck.actuallyadditions.common.ActuallyAdditions; import de.ellpeck.actuallyadditions.common.blocks.base.BlockContainerBase; -import de.ellpeck.actuallyadditions.common.blocks.base.BlockItemBase; import de.ellpeck.actuallyadditions.common.inventory.GuiHandler; import de.ellpeck.actuallyadditions.common.tile.TileEntityFurnaceDouble; import de.ellpeck.actuallyadditions.common.util.StringUtil; @@ -16,6 +15,7 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.BlockItem; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -120,7 +120,7 @@ public class BlockFurnaceDouble extends BlockContainerBase { return new TheItemBlock(this); } - public static class TheItemBlock extends BlockItemBase { + public static class TheItemBlock extends BlockItem { public TheItemBlock(Block block) { super(block); diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockInputter.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockInputter.java index da74f26fe..3793c0e4c 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockInputter.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockInputter.java @@ -2,7 +2,6 @@ package de.ellpeck.actuallyadditions.common.blocks; import de.ellpeck.actuallyadditions.common.ActuallyAdditions; import de.ellpeck.actuallyadditions.common.blocks.base.BlockContainerBase; -import de.ellpeck.actuallyadditions.common.blocks.base.BlockItemBase; import de.ellpeck.actuallyadditions.common.inventory.GuiHandler; import de.ellpeck.actuallyadditions.common.tile.TileEntityInputter; import de.ellpeck.actuallyadditions.common.tile.TileEntityInputterAdvanced; @@ -13,6 +12,7 @@ import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.BlockItem; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -67,7 +67,7 @@ public class BlockInputter extends BlockContainerBase { return EnumRarity.EPIC; } - public static class TheItemBlock extends BlockItemBase { + public static class TheItemBlock extends BlockItem { private final Random rand = new Random(); private long lastSysTime; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockMisc.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockMisc.java index bf5475ddf..1cbe8b797 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockMisc.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockMisc.java @@ -1,7 +1,6 @@ package de.ellpeck.actuallyadditions.common.blocks; import de.ellpeck.actuallyadditions.common.ActuallyAdditions; -import de.ellpeck.actuallyadditions.common.blocks.base.BlockItemBase; import de.ellpeck.actuallyadditions.common.blocks.metalists.TheMiscBlocks; import de.ellpeck.actuallyadditions.common.util.StringUtil; import net.minecraft.block.Block; @@ -11,6 +10,7 @@ import net.minecraft.block.properties.PropertyEnum; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.BlockItem; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; @@ -72,7 +72,7 @@ public class BlockMisc extends Block { return new BlockStateContainer(this, TYPE); } - public static class TheItemBlock extends BlockItemBase { + public static class TheItemBlock extends BlockItem { public TheItemBlock(Block block) { super(block); diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockSlabs.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockSlabs.java index e84550701..4bdbf31cf 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockSlabs.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockSlabs.java @@ -1,6 +1,5 @@ package de.ellpeck.actuallyadditions.common.blocks; -import de.ellpeck.actuallyadditions.common.blocks.base.BlockItemBase; import de.ellpeck.actuallyadditions.common.util.StackUtil; import net.minecraft.block.Block; import net.minecraft.block.BlockSlab; @@ -10,6 +9,7 @@ import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.BlockItem; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumActionResult; @@ -91,7 +91,7 @@ public class BlockSlabs extends Block { return new BlockStateContainer(this, BlockSlab.HALF); } - public static class TheItemBlock extends BlockItemBase { + public static class TheItemBlock extends BlockItem { public TheItemBlock(Block block) { super(block); diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockWildPlant.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockWildPlant.java index 4504e3618..718df7656 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockWildPlant.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockWildPlant.java @@ -3,7 +3,6 @@ package de.ellpeck.actuallyadditions.common.blocks; import de.ellpeck.actuallyadditions.common.ActuallyAdditions; import de.ellpeck.actuallyadditions.common.blocks.base.BlockBushBase; import de.ellpeck.actuallyadditions.common.blocks.base.BlockPlant; -import de.ellpeck.actuallyadditions.common.blocks.base.BlockItemBase; import de.ellpeck.actuallyadditions.common.blocks.metalists.TheWildPlants; import de.ellpeck.actuallyadditions.common.util.StringUtil; import net.minecraft.block.Block; @@ -14,6 +13,7 @@ import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.BlockItem; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; @@ -101,7 +101,7 @@ public class BlockWildPlant extends BlockBushBase { return stack.getItemDamage() >= ALL_WILD_PLANTS.length ? EnumRarity.COMMON : ALL_WILD_PLANTS[stack.getItemDamage()].getRarity(); } - public static class TheItemBlock extends BlockItemBase { + public static class TheItemBlock extends BlockItem { public TheItemBlock(Block block) { super(block); diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/base/ActuallyBlockBase.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/base/ActuallyBlockBase.java new file mode 100644 index 000000000..dec4530e4 --- /dev/null +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/base/ActuallyBlockBase.java @@ -0,0 +1,21 @@ +package de.ellpeck.actuallyadditions.common.blocks.base; + +import net.minecraft.block.Block; +import net.minecraft.block.SoundType; +import net.minecraft.block.material.Material; +import net.minecraftforge.common.ToolType; + +public abstract class ActuallyBlockBase extends Block { + private static final Properties STONE_PROPS = Block.Properties.create(Material.ROCK) + .harvestTool(ToolType.PICKAXE) + .sound(SoundType.STONE); + + private static final Properties STONE_PROPS_WITH_TICK = STONE_PROPS.tickRandomly(); + private static final Properties STONE_PROPS_WITH_HARDNESS = STONE_PROPS.hardnessAndResistance(1.5f, 10.0f); + + public ActuallyBlockBase(Properties properties) { + super(properties); + } + + +} diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/base/BlockBase.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/base/BlockBase.java deleted file mode 100644 index bfe0223bc..000000000 --- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/base/BlockBase.java +++ /dev/null @@ -1,17 +0,0 @@ -package de.ellpeck.actuallyadditions.common.blocks.base; - -import net.minecraft.block.Block; -import net.minecraft.item.Item; - -public class BlockBase extends Block implements IBaseBlock{ - - public BlockBase(Properties properties) { - super(properties); - } - - @Override - public BlockItemBase getItemBlock() { - return new BlockItemBase(this, new Item.Properties()); - } - -} diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/base/BlockBushBase.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/base/BlockBushBase.java index 77d8be551..77a34c658 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/base/BlockBushBase.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/base/BlockBushBase.java @@ -2,17 +2,10 @@ package de.ellpeck.actuallyadditions.common.blocks.base; import net.minecraft.block.BushBlock; import net.minecraft.block.SoundType; -import net.minecraft.item.Item; -public class BlockBushBase extends BushBlock implements IBaseBlock { +public class BlockBushBase extends BushBlock { public BlockBushBase(Properties properties) { super(properties.sound(SoundType.PLANT)); } - - @Override - public BlockItemBase getItemBlock(){ - return new BlockItemBase(this, new Item.Properties()); - } - } diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/base/BlockContainerBase.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/base/BlockContainerBase.java index ec314f2a3..363727aa3 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/base/BlockContainerBase.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/base/BlockContainerBase.java @@ -29,7 +29,7 @@ import net.minecraftforge.fluids.capability.templates.FluidTank; import javax.annotation.Nullable; import java.util.Random; -public abstract class BlockContainerBase extends BlockBase { +public abstract class BlockContainerBase extends ActuallyBlockBase { public BlockContainerBase(Properties properties) { super(properties); diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/base/BlockItemBase.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/base/BlockItemBase.java deleted file mode 100644 index c127f0119..000000000 --- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/base/BlockItemBase.java +++ /dev/null @@ -1,13 +0,0 @@ -package de.ellpeck.actuallyadditions.common.blocks.base; - -import net.minecraft.block.Block; -import net.minecraft.item.BlockItem; -import net.minecraft.item.Item; - -public class BlockItemBase extends BlockItem { - - public BlockItemBase(T block , Item.Properties properties) { - super(block, properties.rarity(block.getRarity())); - } - -} \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/base/BlockPlant.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/base/BlockPlant.java index faddaf064..f1a888a5d 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/base/BlockPlant.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/base/BlockPlant.java @@ -30,7 +30,7 @@ import net.minecraftforge.items.ItemHandlerHelper; import java.util.List; -public class BlockPlant extends CropsBlock implements IBaseBlock { +public class BlockPlant extends CropsBlock { private final int minDropAmount; private final int addDropAmount; @@ -52,16 +52,7 @@ public class BlockPlant extends CropsBlock implements IBaseBlock { this.returnItem = returnItem; this.returnMeta = returnMeta; } - - @Override - public BlockItemBase getItemBlock(){ - return new BlockItemBase(this, new Item.Properties()); - } - - public boolean shouldAddCreative() { - return false; - } - + @Override public PlantType getPlantType(IBlockReader world, BlockPos pos) { return PlantType.Crop; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/base/IBaseBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/base/IBaseBlock.java deleted file mode 100644 index 6e2ff583d..000000000 --- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/base/IBaseBlock.java +++ /dev/null @@ -1,17 +0,0 @@ -package de.ellpeck.actuallyadditions.common.blocks.base; - -import net.minecraft.item.Rarity; - -public interface IBaseBlock { - - BlockItemBase getItemBlock(); - - default boolean shouldAddCreative() { - return true; - } - - default Rarity getRarity() { - return Rarity.COMMON; - } - -} diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/items/base/ItemSwordAA.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/base/ItemSwordAA.java index b78d2560a..cfc61683f 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/items/base/ItemSwordAA.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/base/ItemSwordAA.java @@ -2,7 +2,6 @@ package de.ellpeck.actuallyadditions.common.items.base; import de.ellpeck.actuallyadditions.api.misc.IDisableableItem; import de.ellpeck.actuallyadditions.common.ActuallyAdditions; -import de.ellpeck.actuallyadditions.common.blocks.base.BlockItemBase; import de.ellpeck.actuallyadditions.common.config.ConfigurationHandler; import de.ellpeck.actuallyadditions.common.util.ItemUtil; import de.ellpeck.actuallyadditions.common.util.StringUtil; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/util/ItemUtil.java b/src/main/java/de/ellpeck/actuallyadditions/common/util/ItemUtil.java index 5b88a7520..082bc6424 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/util/ItemUtil.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/util/ItemUtil.java @@ -5,7 +5,6 @@ import java.util.List; import de.ellpeck.actuallyadditions.common.ActuallyAdditions; import de.ellpeck.actuallyadditions.common.RegistryHandler; -import de.ellpeck.actuallyadditions.common.blocks.base.BlockItemBase; import de.ellpeck.actuallyadditions.common.creative.CreativeTab; import de.ellpeck.actuallyadditions.common.util.compat.IMCHandler; import net.minecraft.block.Block;