From 1c9c7af416f85068e1099b0b00946df8a3d9d0b7 Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Mon, 27 Jun 2016 20:24:45 +0200 Subject: [PATCH] Made this system less stupid --- .../mod/blocks/base/BlockBase.java | 3 +- .../mod/blocks/base/BlockBushBase.java | 3 +- .../mod/blocks/base/BlockContainerBase.java | 3 +- .../mod/blocks/base/BlockFluidFlowing.java | 3 +- .../mod/blocks/base/BlockPlant.java | 3 +- .../mod/blocks/base/BlockStair.java | 3 +- .../mod/blocks/base/ItemBlockBase.java | 29 +++++++------------ 7 files changed, 23 insertions(+), 24 deletions(-) diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockBase.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockBase.java index 450cb05db..36a4dbf66 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockBase.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockBase.java @@ -20,7 +20,7 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; -public class BlockBase extends Block{ +public class BlockBase extends Block implements ItemBlockBase.ICustomRarity{ private final String name; @@ -53,6 +53,7 @@ public class BlockBase extends Block{ ActuallyAdditions.proxy.addRenderRegister(new ItemStack(this), this.getRegistryName(), "inventory"); } + @Override public EnumRarity getRarity(ItemStack stack){ return EnumRarity.COMMON; } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockBushBase.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockBushBase.java index fbdc95ce8..5cbbb7cac 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockBushBase.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockBushBase.java @@ -20,7 +20,7 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; -public class BlockBushBase extends BlockBush{ +public class BlockBushBase extends BlockBush implements ItemBlockBase.ICustomRarity{ private final String name; @@ -53,6 +53,7 @@ public class BlockBushBase extends BlockBush{ ActuallyAdditions.proxy.addRenderRegister(new ItemStack(this), this.getRegistryName(), "inventory"); } + @Override public EnumRarity getRarity(ItemStack stack){ return EnumRarity.COMMON; } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockContainerBase.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockContainerBase.java index 641941389..c6fc11f5a 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockContainerBase.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockContainerBase.java @@ -41,7 +41,7 @@ import net.minecraftforge.fluids.FluidUtil; import java.util.ArrayList; import java.util.Random; -public abstract class BlockContainerBase extends BlockContainer{ +public abstract class BlockContainerBase extends BlockContainer implements ItemBlockBase.ICustomRarity{ private final String name; @@ -74,6 +74,7 @@ public abstract class BlockContainerBase extends BlockContainer{ ActuallyAdditions.proxy.addRenderRegister(new ItemStack(this), this.getRegistryName(), "inventory"); } + @Override public EnumRarity getRarity(ItemStack stack){ return EnumRarity.COMMON; } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockFluidFlowing.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockFluidFlowing.java index 88c09b438..5e1b4cf57 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockFluidFlowing.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockFluidFlowing.java @@ -22,7 +22,7 @@ import net.minecraft.world.World; import net.minecraftforge.fluids.BlockFluidClassic; import net.minecraftforge.fluids.Fluid; -public class BlockFluidFlowing extends BlockFluidClassic{ +public class BlockFluidFlowing extends BlockFluidClassic implements ItemBlockBase.ICustomRarity{ private final String name; @@ -60,6 +60,7 @@ public class BlockFluidFlowing extends BlockFluidClassic{ return !PosUtil.getMaterial(pos, world).isLiquid() && super.displaceIfPossible(world, pos); } + @Override public EnumRarity getRarity(ItemStack stack){ return EnumRarity.EPIC; } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockPlant.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockPlant.java index e212c1bb3..e3597c096 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockPlant.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockPlant.java @@ -29,7 +29,7 @@ import net.minecraftforge.common.EnumPlantType; import java.util.List; import java.util.Random; -public class BlockPlant extends BlockCrops{ +public class BlockPlant extends BlockCrops implements ItemBlockBase.ICustomRarity{ private final String name; private final int minDropAmount; @@ -73,6 +73,7 @@ public class BlockPlant extends BlockCrops{ ActuallyAdditions.proxy.addRenderRegister(new ItemStack(this), this.getRegistryName(), "inventory"); } + @Override public EnumRarity getRarity(ItemStack stack){ return EnumRarity.RARE; } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockStair.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockStair.java index d2c60f4e0..c8189a04d 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockStair.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockStair.java @@ -18,7 +18,7 @@ import net.minecraft.block.BlockStairs; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; -public class BlockStair extends BlockStairs{ +public class BlockStair extends BlockStairs implements ItemBlockBase.ICustomRarity{ private final String name; @@ -56,6 +56,7 @@ public class BlockStair extends BlockStairs{ ActuallyAdditions.proxy.addRenderRegister(new ItemStack(this), this.getRegistryName(), "inventory"); } + @Override public EnumRarity getRarity(ItemStack stack){ return EnumRarity.COMMON; } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/ItemBlockBase.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/ItemBlockBase.java index 3316ae28f..c4e3eea7f 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/ItemBlockBase.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/ItemBlockBase.java @@ -24,6 +24,7 @@ public class ItemBlockBase extends ItemBlock{ this.setMaxDamage(0); } + @Override public String getUnlocalizedName(ItemStack stack){ return this.getUnlocalizedName(); @@ -34,28 +35,20 @@ public class ItemBlockBase extends ItemBlock{ return damage; } + @Override public EnumRarity getRarity(ItemStack stack){ - if(this.block instanceof BlockBase){ - return ((BlockBase)this.block).getRarity(stack); - } - else if(this.block instanceof BlockContainerBase){ - return ((BlockContainerBase)this.block).getRarity(stack); - } - else if(this.block instanceof BlockFluidFlowing){ - return ((BlockFluidFlowing)this.block).getRarity(stack); - } - else if(this.block instanceof BlockPlant){ - return ((BlockPlant)this.block).getRarity(stack); - } - else if(this.block instanceof BlockStair){ - return ((BlockStair)this.block).getRarity(stack); - } - else if(this.block instanceof BlockBushBase){ - return ((BlockBushBase)this.block).getRarity(stack); + if(this.block instanceof ICustomRarity){ + return ((ICustomRarity)this.block).getRarity(stack); } else{ return Util.FALLBACK_RARITY; } } -} + + public interface ICustomRarity{ + + EnumRarity getRarity(ItemStack stack); + + } +} \ No newline at end of file