diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockAtomicReconstructor.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockAtomicReconstructor.java index 1c97be5a0..877a28139 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockAtomicReconstructor.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockAtomicReconstructor.java @@ -135,7 +135,7 @@ protected ItemBlockBase getItemBlock(){ @Override public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.EPIC; + return EnumRarity.COMMON; } @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockBioReactor.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockBioReactor.java index c21031491..771c657cf 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockBioReactor.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockBioReactor.java @@ -54,7 +54,7 @@ public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, En @Override public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.EPIC; + return EnumRarity.COMMON; } @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockBreaker.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockBreaker.java index 7a8ee49a3..be70fcef0 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockBreaker.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockBreaker.java @@ -68,7 +68,7 @@ public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, En @Override public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.UNCOMMON; + return EnumRarity.COMMON; } @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCanolaPress.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCanolaPress.java index 910555c46..dedd3664d 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCanolaPress.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCanolaPress.java @@ -67,7 +67,7 @@ public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, En @Override public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.RARE; + return EnumRarity.COMMON; } @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCoalGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCoalGenerator.java index 7cffafe6f..da5f0c40c 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCoalGenerator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCoalGenerator.java @@ -110,7 +110,7 @@ public void onBlockPlacedBy(World world, BlockPos pos, IBlockState state, Entity @Override public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.RARE; + return EnumRarity.COMMON; } @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCoffeeMachine.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCoffeeMachine.java index 281e67f21..50a07d1ac 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCoffeeMachine.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCoffeeMachine.java @@ -88,7 +88,7 @@ public void breakBlock(World world, BlockPos pos, IBlockState state){ @Override public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.EPIC; + return EnumRarity.COMMON; } @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockColoredLamp.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockColoredLamp.java index 58b047733..ecf548daf 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockColoredLamp.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockColoredLamp.java @@ -130,7 +130,7 @@ protected void registerRendering(){ @Override public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.RARE; + return EnumRarity.COMMON; } @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCompost.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCompost.java index 4bcb9f1a1..4fedd8bf7 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCompost.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCompost.java @@ -153,7 +153,7 @@ public void breakBlock(World world, BlockPos pos, IBlockState state){ @Override public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.UNCOMMON; + return EnumRarity.COMMON; } @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockDirectionalBreaker.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockDirectionalBreaker.java index 9f37f45b5..8ac6e8f40 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockDirectionalBreaker.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockDirectionalBreaker.java @@ -65,7 +65,7 @@ public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, En @Override public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.EPIC; + return EnumRarity.COMMON; } @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockDisplayStand.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockDisplayStand.java index 9ad6c05d3..6b1414ae5 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockDisplayStand.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockDisplayStand.java @@ -102,6 +102,6 @@ public void breakBlock(World worldIn, BlockPos pos, IBlockState state){ @Override public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.RARE; + return EnumRarity.COMMON; } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockDropper.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockDropper.java index 517c1134a..47f930c55 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockDropper.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockDropper.java @@ -64,7 +64,7 @@ public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, En @Override public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.RARE; + return EnumRarity.COMMON; } @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockEmpowerer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockEmpowerer.java index 55ff2cc66..a0a4d8dc8 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockEmpowerer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockEmpowerer.java @@ -102,6 +102,6 @@ public void breakBlock(World worldIn, BlockPos pos, IBlockState state){ @Override public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.RARE; + return EnumRarity.COMMON; } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockEnergizer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockEnergizer.java index 8be3a2da6..7ff76f272 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockEnergizer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockEnergizer.java @@ -68,7 +68,7 @@ public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, En @Override public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.EPIC; + return EnumRarity.COMMON; } @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFarmer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFarmer.java index 11542d741..000bb4c53 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFarmer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFarmer.java @@ -61,7 +61,7 @@ public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, En @Override public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.RARE; + return EnumRarity.COMMON; } @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFeeder.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFeeder.java index b1e5c1765..379d55ab3 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFeeder.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFeeder.java @@ -56,7 +56,7 @@ public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, En @Override public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.UNCOMMON; + return EnumRarity.COMMON; } @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFermentingBarrel.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFermentingBarrel.java index b44cb6bde..93861019d 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFermentingBarrel.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFermentingBarrel.java @@ -73,6 +73,6 @@ public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, En @Override public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.RARE; + return EnumRarity.COMMON; } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFireworkBox.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFireworkBox.java index 240fac039..4d848d732 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFireworkBox.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFireworkBox.java @@ -48,7 +48,7 @@ public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, En @Override public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.RARE; + return EnumRarity.COMMON; } @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFishingNet.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFishingNet.java index 25640345d..1d12448cf 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFishingNet.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFishingNet.java @@ -58,6 +58,6 @@ public boolean isOpaqueCube(IBlockState state){ @Override public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.RARE; + return EnumRarity.COMMON; } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFluidCollector.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFluidCollector.java index c6152b475..4f04977c3 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFluidCollector.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFluidCollector.java @@ -71,7 +71,7 @@ public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, En @Override public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.RARE; + return EnumRarity.COMMON; } @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFurnaceDouble.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFurnaceDouble.java index 54631bb4e..dc9aeb183 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFurnaceDouble.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFurnaceDouble.java @@ -114,7 +114,7 @@ public int getLightValue(IBlockState state, IBlockAccess world, BlockPos pos){ @Override public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.UNCOMMON; + return EnumRarity.COMMON; } @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFurnaceSolar.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFurnaceSolar.java index 587a52f97..27cb12d38 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFurnaceSolar.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFurnaceSolar.java @@ -58,6 +58,6 @@ public boolean isOpaqueCube(IBlockState state){ @Override public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.UNCOMMON; + return EnumRarity.COMMON; } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockGiantChest.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockGiantChest.java index 769ae8759..6b1a517dd 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockGiantChest.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockGiantChest.java @@ -92,7 +92,7 @@ public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, En @Override public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.EPIC; + return EnumRarity.COMMON; } @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockGreenhouseGlass.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockGreenhouseGlass.java index 4070549d4..93fadb06b 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockGreenhouseGlass.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockGreenhouseGlass.java @@ -65,7 +65,7 @@ public BlockRenderLayer getBlockLayer(){ @Override public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.EPIC; + return EnumRarity.COMMON; } @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockGrinder.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockGrinder.java index 126fa437d..9cd836b68 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockGrinder.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockGrinder.java @@ -89,7 +89,7 @@ public int getLightValue(IBlockState state, IBlockAccess world, BlockPos pos){ @Override public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.EPIC; + return EnumRarity.COMMON; } @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockHeatCollector.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockHeatCollector.java index 348478f9e..b87577c69 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockHeatCollector.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockHeatCollector.java @@ -37,6 +37,6 @@ public TileEntity createNewTileEntity(World world, int par2){ @Override public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.UNCOMMON; + return EnumRarity.COMMON; } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockInputter.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockInputter.java index cd30abe71..1a15e676f 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockInputter.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockInputter.java @@ -88,7 +88,7 @@ protected ItemBlockBase getItemBlock(){ @Override public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.EPIC; + return EnumRarity.COMMON; } public static class TheItemBlock extends ItemBlockBase{ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockItemRepairer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockItemRepairer.java index 0aefdaf7d..b6125ef21 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockItemRepairer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockItemRepairer.java @@ -64,7 +64,7 @@ public int getLightValue(IBlockState state, IBlockAccess world, BlockPos pos){ @Override public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.EPIC; + return EnumRarity.COMMON; } @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockItemViewer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockItemViewer.java index 883a2b3dd..440cbfe4d 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockItemViewer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockItemViewer.java @@ -36,6 +36,6 @@ public TileEntity createNewTileEntity(World worldIn, int meta){ @Override public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.RARE; + return EnumRarity.COMMON; } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLampPowerer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLampPowerer.java index 5b5631d5e..9ac31b8e9 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLampPowerer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLampPowerer.java @@ -100,7 +100,7 @@ private void updateSurrounding(World world, BlockPos pos, boolean powered, List< @Override public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.RARE; + return EnumRarity.COMMON; } @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLaserRelay.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLaserRelay.java index 3a32a8b83..c12c4b686 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLaserRelay.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLaserRelay.java @@ -128,7 +128,7 @@ public IBlockState onBlockPlaced(World world, BlockPos pos, EnumFacing side, flo @Override public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.EPIC; + return EnumRarity.COMMON; } @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLavaFactoryController.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLavaFactoryController.java index 982982e92..1c30c37fa 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLavaFactoryController.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLavaFactoryController.java @@ -45,7 +45,7 @@ public TileEntity createNewTileEntity(World world, int par2){ @Override public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.RARE; + return EnumRarity.COMMON; } @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLeafGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLeafGenerator.java index ffe2ac44d..0f9e5b89e 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLeafGenerator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLeafGenerator.java @@ -39,7 +39,7 @@ public TileEntity createNewTileEntity(World world, int par2){ @Override public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.EPIC; + return EnumRarity.COMMON; } @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockMiner.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockMiner.java index dba732efe..e878aeb5c 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockMiner.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockMiner.java @@ -61,7 +61,7 @@ public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, En @Override public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.RARE; + return EnumRarity.COMMON; } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockOilGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockOilGenerator.java index 60517feda..aed6b7a2c 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockOilGenerator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockOilGenerator.java @@ -112,7 +112,7 @@ public void onBlockPlacedBy(World world, BlockPos pos, IBlockState state, Entity @Override public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.RARE; + return EnumRarity.COMMON; } @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockPhantom.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockPhantom.java index ede88b7a0..d9bc554bd 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockPhantom.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockPhantom.java @@ -121,7 +121,7 @@ public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, En @Override public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.EPIC; + return EnumRarity.COMMON; } @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockPhantomBooster.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockPhantomBooster.java index e78749fae..e2cda8be2 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockPhantomBooster.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockPhantomBooster.java @@ -52,7 +52,7 @@ public boolean isOpaqueCube(IBlockState state){ @Override public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.EPIC; + return EnumRarity.COMMON; } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockPlayerInterface.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockPlayerInterface.java index 3fe01d866..8e1003a73 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockPlayerInterface.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockPlayerInterface.java @@ -47,7 +47,7 @@ public TileEntity createNewTileEntity(World world, int par2){ @Override public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.EPIC; + return EnumRarity.COMMON; } @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockRangedCollector.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockRangedCollector.java index c50767c99..0e28d0574 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockRangedCollector.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockRangedCollector.java @@ -60,7 +60,7 @@ public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, En @Override public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.EPIC; + return EnumRarity.COMMON; } @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockShockSuppressor.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockShockSuppressor.java index 518cc57e6..effd47fb7 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockShockSuppressor.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockShockSuppressor.java @@ -96,7 +96,7 @@ public void onExplosion(ExplosionEvent.Detonate event){ @Override public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.EPIC; + return EnumRarity.COMMON; } @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockSmileyCloud.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockSmileyCloud.java index e3bcd06a6..8fbece15f 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockSmileyCloud.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockSmileyCloud.java @@ -98,7 +98,7 @@ public void breakBlock(World world, BlockPos pos, IBlockState state){ @Override public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.RARE; + return EnumRarity.COMMON; } @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockTreasureChest.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockTreasureChest.java index 0981c2eaf..9e475dd70 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockTreasureChest.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockTreasureChest.java @@ -120,7 +120,7 @@ private void dropItems(World world, BlockPos pos){ @Override public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.UNCOMMON; + return EnumRarity.COMMON; } @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockXPSolidifier.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockXPSolidifier.java index 380b24071..3324882b7 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockXPSolidifier.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockXPSolidifier.java @@ -62,7 +62,7 @@ public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, En @Override public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.EPIC; + return EnumRarity.COMMON; } @Override 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 066d960ec..64c71ff8f 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 @@ -61,6 +61,6 @@ public boolean displaceIfPossible(World world, BlockPos pos){ @Override public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.EPIC; + return EnumRarity.COMMON; } } 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 b3e7aa2ab..d49261d0a 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 @@ -76,7 +76,7 @@ protected void registerRendering(){ @Override public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.RARE; + return EnumRarity.COMMON; } @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/metalists/TheMiscBlocks.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/metalists/TheMiscBlocks.java index ecfad5592..46603b452 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/metalists/TheMiscBlocks.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/metalists/TheMiscBlocks.java @@ -14,16 +14,16 @@ public enum TheMiscBlocks{ - QUARTZ_PILLAR("BlackQuartzPillar", EnumRarity.RARE), - QUARTZ_CHISELED("BlackQuartzChiseled", EnumRarity.RARE), - QUARTZ("BlackQuartz", EnumRarity.RARE), - ORE_QUARTZ("OreBlackQuartz", EnumRarity.EPIC), + QUARTZ_PILLAR("BlackQuartzPillar", EnumRarity.COMMON), + QUARTZ_CHISELED("BlackQuartzChiseled", EnumRarity.COMMON), + QUARTZ("BlackQuartz", EnumRarity.COMMON), + ORE_QUARTZ("OreBlackQuartz", EnumRarity.COMMON), WOOD_CASING("WoodCasing", EnumRarity.COMMON), CHARCOAL_BLOCK("Charcoal", EnumRarity.COMMON), - ENDERPEARL_BLOCK("Enderpearl", EnumRarity.RARE), - LAVA_FACTORY_CASE("LavaFactoryCase", EnumRarity.UNCOMMON), - ENDER_CASING("EnderCasing", EnumRarity.EPIC), - IRON_CASING("IronCasing", EnumRarity.RARE); + ENDERPEARL_BLOCK("Enderpearl", EnumRarity.COMMON), + LAVA_FACTORY_CASE("LavaFactoryCase", EnumRarity.COMMON), + ENDER_CASING("EnderCasing", EnumRarity.COMMON), + IRON_CASING("IronCasing", EnumRarity.COMMON); public final String name; public final EnumRarity rarity; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/metalists/TheWildPlants.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/metalists/TheWildPlants.java index 28eaf04a7..179d1a17a 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/metalists/TheWildPlants.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/metalists/TheWildPlants.java @@ -16,10 +16,10 @@ public enum TheWildPlants{ - CANOLA("Canola", EnumRarity.RARE, InitBlocks.blockCanola), - FLAX("Flax", EnumRarity.RARE, InitBlocks.blockFlax), - RICE("Rice", EnumRarity.RARE, InitBlocks.blockRice), - COFFEE("Coffee", EnumRarity.RARE, InitBlocks.blockCoffee); + CANOLA("Canola", EnumRarity.COMMON, InitBlocks.blockCanola), + FLAX("Flax", EnumRarity.COMMON, InitBlocks.blockFlax), + RICE("Rice", EnumRarity.COMMON, InitBlocks.blockRice), + COFFEE("Coffee", EnumRarity.COMMON, InitBlocks.blockCoffee); public final String name; public final EnumRarity rarity; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/fluids/InitFluids.java b/src/main/java/de/ellpeck/actuallyadditions/mod/fluids/InitFluids.java index dd09fcbba..67c46e3e6 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/fluids/InitFluids.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/fluids/InitFluids.java @@ -32,10 +32,10 @@ public final class InitFluids{ public static Block blockEmpoweredOil; public static void init(){ - fluidCanolaOil = registerFluid("canolaoil", "blockCanolaOil", EnumRarity.UNCOMMON); - fluidOil = registerFluid("oil", "blockOil", EnumRarity.UNCOMMON); - fluidCrystalOil = registerFluid("crystaloil", "blockCrystalOil", EnumRarity.RARE); - fluidEmpoweredOil = registerFluid("empoweredoil", "blockEmpoweredOil", EnumRarity.EPIC); + fluidCanolaOil = registerFluid("canolaoil", "blockCanolaOil", EnumRarity.COMMON); + fluidOil = registerFluid("oil", "blockOil", EnumRarity.COMMON); + fluidCrystalOil = registerFluid("crystaloil", "blockCrystalOil", EnumRarity.COMMON); + fluidEmpoweredOil = registerFluid("empoweredoil", "blockEmpoweredOil", EnumRarity.COMMON); blockCanolaOil = registerFluidBlock(fluidCanolaOil, Material.WATER, "blockCanolaOil"); blockOil = registerFluidBlock(fluidOil, Material.WATER, "blockOil"); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/InitItems.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/InitItems.java index 8ff4e8687..e37c71d63 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/InitItems.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/InitItems.java @@ -276,29 +276,29 @@ public static void init(){ CompatUtil.registerMFRSeed(itemFlaxSeed, InitBlocks.blockFlax); itemCoffeeSeed = new ItemSeed("itemCoffeeSeed", "seedCoffeeBeans", InitBlocks.blockCoffee, itemCoffeeBean, 0); CompatUtil.registerMFRSeed(itemCoffeeSeed, InitBlocks.blockCoffee); - itemPickaxeEmerald = new ItemPickaxeAA(InitToolMaterials.toolMaterialEmerald, new ItemStack(Items.EMERALD), "itemPickaxeEmerald", EnumRarity.EPIC); - itemAxeEmerald = new ItemAxeAA(InitToolMaterials.toolMaterialEmerald, new ItemStack(Items.EMERALD), "itemAxeEmerald", EnumRarity.EPIC); - itemShovelEmerald = new ItemShovelAA(InitToolMaterials.toolMaterialEmerald, new ItemStack(Items.EMERALD), "itemShovelEmerald", EnumRarity.EPIC); - itemSwordEmerald = new ItemSwordAA(InitToolMaterials.toolMaterialEmerald, new ItemStack(Items.EMERALD), "itemSwordEmerald", EnumRarity.EPIC); - itemHoeEmerald = new ItemHoeAA(InitToolMaterials.toolMaterialEmerald, new ItemStack(Items.EMERALD), "itemHoeEmerald", EnumRarity.EPIC); - itemPickaxeObsidian = new ItemPickaxeAA(InitToolMaterials.toolMaterialObsidian, new ItemStack(Blocks.OBSIDIAN), "itemPickaxeObsidian", EnumRarity.UNCOMMON); - itemAxeObsidian = new ItemAxeAA(InitToolMaterials.toolMaterialObsidian, new ItemStack(Blocks.OBSIDIAN), "itemAxeObsidian", EnumRarity.UNCOMMON); - itemShovelObsidian = new ItemShovelAA(InitToolMaterials.toolMaterialObsidian, new ItemStack(Blocks.OBSIDIAN), "itemShovelObsidian", EnumRarity.UNCOMMON); - itemSwordObsidian = new ItemSwordAA(InitToolMaterials.toolMaterialObsidian, new ItemStack(Blocks.OBSIDIAN), "itemSwordObsidian", EnumRarity.UNCOMMON); - itemHoeObsidian = new ItemHoeAA(InitToolMaterials.toolMaterialObsidian, new ItemStack(Blocks.OBSIDIAN), "itemHoeObsidian", EnumRarity.UNCOMMON); - itemPickaxeQuartz = new ItemPickaxeAA(InitToolMaterials.toolMaterialQuartz, new ItemStack(InitItems.itemMisc, 1, TheMiscItems.QUARTZ.ordinal()), "itemPickaxeQuartz", EnumRarity.RARE); - itemAxeQuartz = new ItemAxeAA(InitToolMaterials.toolMaterialQuartz, new ItemStack(InitItems.itemMisc, 1, TheMiscItems.QUARTZ.ordinal()), "itemAxeQuartz", EnumRarity.RARE); - itemShovelQuartz = new ItemShovelAA(InitToolMaterials.toolMaterialQuartz, new ItemStack(InitItems.itemMisc, 1, TheMiscItems.QUARTZ.ordinal()), "itemShovelQuartz", EnumRarity.RARE); - itemSwordQuartz = new ItemSwordAA(InitToolMaterials.toolMaterialQuartz, new ItemStack(InitItems.itemMisc, 1, TheMiscItems.QUARTZ.ordinal()), "itemSwordQuartz", EnumRarity.RARE); - itemHoeQuartz = new ItemHoeAA(InitToolMaterials.toolMaterialQuartz, new ItemStack(InitItems.itemMisc, 1, TheMiscItems.QUARTZ.ordinal()), "itemHoeQuartz", EnumRarity.RARE); - woodenPaxel = new ItemAllToolAA(Item.ToolMaterial.WOOD, "plankWood", "woodenPaxel", EnumRarity.UNCOMMON, 5192733); - stonePaxel = new ItemAllToolAA(Item.ToolMaterial.STONE, new ItemStack(Blocks.COBBLESTONE), "stonePaxel", EnumRarity.UNCOMMON, 7040621); - ironPaxel = new ItemAllToolAA(Item.ToolMaterial.IRON, new ItemStack(Items.IRON_INGOT), "ironPaxel", EnumRarity.RARE, 10920613); - goldPaxel = new ItemAllToolAA(Item.ToolMaterial.GOLD, new ItemStack(Items.GOLD_INGOT), "goldPaxel", EnumRarity.RARE, 16770048); - diamondPaxel = new ItemAllToolAA(Item.ToolMaterial.DIAMOND, new ItemStack(Items.DIAMOND), "diamondPaxel", EnumRarity.EPIC, 3250376); - emeraldPaxel = new ItemAllToolAA(InitToolMaterials.toolMaterialEmerald, new ItemStack(Items.EMERALD), "emeraldPaxel", EnumRarity.EPIC, 7723338); - obsidianPaxel = new ItemAllToolAA(InitToolMaterials.toolMaterialObsidian, new ItemStack(Blocks.OBSIDIAN), "obsidianPaxel", EnumRarity.EPIC, 4166); - quartzPaxel = new ItemAllToolAA(InitToolMaterials.toolMaterialQuartz, new ItemStack(InitItems.itemMisc, 1, TheMiscItems.QUARTZ.ordinal()), "quartzPaxel", EnumRarity.RARE, 1710103); + itemPickaxeEmerald = new ItemPickaxeAA(InitToolMaterials.toolMaterialEmerald, new ItemStack(Items.EMERALD), "itemPickaxeEmerald", EnumRarity.COMMON); + itemAxeEmerald = new ItemAxeAA(InitToolMaterials.toolMaterialEmerald, new ItemStack(Items.EMERALD), "itemAxeEmerald", EnumRarity.COMMON); + itemShovelEmerald = new ItemShovelAA(InitToolMaterials.toolMaterialEmerald, new ItemStack(Items.EMERALD), "itemShovelEmerald", EnumRarity.COMMON); + itemSwordEmerald = new ItemSwordAA(InitToolMaterials.toolMaterialEmerald, new ItemStack(Items.EMERALD), "itemSwordEmerald", EnumRarity.COMMON); + itemHoeEmerald = new ItemHoeAA(InitToolMaterials.toolMaterialEmerald, new ItemStack(Items.EMERALD), "itemHoeEmerald", EnumRarity.COMMON); + itemPickaxeObsidian = new ItemPickaxeAA(InitToolMaterials.toolMaterialObsidian, new ItemStack(Blocks.OBSIDIAN), "itemPickaxeObsidian", EnumRarity.COMMON); + itemAxeObsidian = new ItemAxeAA(InitToolMaterials.toolMaterialObsidian, new ItemStack(Blocks.OBSIDIAN), "itemAxeObsidian", EnumRarity.COMMON); + itemShovelObsidian = new ItemShovelAA(InitToolMaterials.toolMaterialObsidian, new ItemStack(Blocks.OBSIDIAN), "itemShovelObsidian", EnumRarity.COMMON); + itemSwordObsidian = new ItemSwordAA(InitToolMaterials.toolMaterialObsidian, new ItemStack(Blocks.OBSIDIAN), "itemSwordObsidian", EnumRarity.COMMON); + itemHoeObsidian = new ItemHoeAA(InitToolMaterials.toolMaterialObsidian, new ItemStack(Blocks.OBSIDIAN), "itemHoeObsidian", EnumRarity.COMMON); + itemPickaxeQuartz = new ItemPickaxeAA(InitToolMaterials.toolMaterialQuartz, new ItemStack(InitItems.itemMisc, 1, TheMiscItems.QUARTZ.ordinal()), "itemPickaxeQuartz", EnumRarity.COMMON); + itemAxeQuartz = new ItemAxeAA(InitToolMaterials.toolMaterialQuartz, new ItemStack(InitItems.itemMisc, 1, TheMiscItems.QUARTZ.ordinal()), "itemAxeQuartz", EnumRarity.COMMON); + itemShovelQuartz = new ItemShovelAA(InitToolMaterials.toolMaterialQuartz, new ItemStack(InitItems.itemMisc, 1, TheMiscItems.QUARTZ.ordinal()), "itemShovelQuartz", EnumRarity.COMMON); + itemSwordQuartz = new ItemSwordAA(InitToolMaterials.toolMaterialQuartz, new ItemStack(InitItems.itemMisc, 1, TheMiscItems.QUARTZ.ordinal()), "itemSwordQuartz", EnumRarity.COMMON); + itemHoeQuartz = new ItemHoeAA(InitToolMaterials.toolMaterialQuartz, new ItemStack(InitItems.itemMisc, 1, TheMiscItems.QUARTZ.ordinal()), "itemHoeQuartz", EnumRarity.COMMON); + woodenPaxel = new ItemAllToolAA(Item.ToolMaterial.WOOD, "plankWood", "woodenPaxel", EnumRarity.COMMON, 5192733); + stonePaxel = new ItemAllToolAA(Item.ToolMaterial.STONE, new ItemStack(Blocks.COBBLESTONE), "stonePaxel", EnumRarity.COMMON, 7040621); + ironPaxel = new ItemAllToolAA(Item.ToolMaterial.IRON, new ItemStack(Items.IRON_INGOT), "ironPaxel", EnumRarity.COMMON, 10920613); + goldPaxel = new ItemAllToolAA(Item.ToolMaterial.GOLD, new ItemStack(Items.GOLD_INGOT), "goldPaxel", EnumRarity.COMMON, 16770048); + diamondPaxel = new ItemAllToolAA(Item.ToolMaterial.DIAMOND, new ItemStack(Items.DIAMOND), "diamondPaxel", EnumRarity.COMMON, 3250376); + emeraldPaxel = new ItemAllToolAA(InitToolMaterials.toolMaterialEmerald, new ItemStack(Items.EMERALD), "emeraldPaxel", EnumRarity.COMMON, 7723338); + obsidianPaxel = new ItemAllToolAA(InitToolMaterials.toolMaterialObsidian, new ItemStack(Blocks.OBSIDIAN), "obsidianPaxel", EnumRarity.COMMON, 4166); + quartzPaxel = new ItemAllToolAA(InitToolMaterials.toolMaterialQuartz, new ItemStack(InitItems.itemMisc, 1, TheMiscItems.QUARTZ.ordinal()), "quartzPaxel", EnumRarity.COMMON, 1710103); itemPickaxeCrystalRed = new ItemPickaxeAA(InitToolMaterials.toolMaterialCrystalRed, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.REDSTONE.ordinal()), "itemPickaxeCrystalRed", Util.CRYSTAL_RED_RARITY); itemAxeCrystalRed = new ItemAxeAA(InitToolMaterials.toolMaterialCrystalRed, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.REDSTONE.ordinal()), "itemAxeCrystalRed", Util.CRYSTAL_RED_RARITY); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemBag.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemBag.java index fa00214bc..f2bc12b45 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemBag.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemBag.java @@ -66,7 +66,7 @@ public void addInformation(ItemStack stack, EntityPlayer playerIn, List } } - // don't count the filter 4 slots + // don't count the filter 4 slots slotsTotal = slotsTotal-4; tooltip.add(TextFormatting.ITALIC.toString()+slotsFilled+"/"+slotsTotal+" filled slots"); @@ -197,6 +197,6 @@ public ActionResult onItemRightClick(ItemStack stack, World world, En @Override public EnumRarity getRarity(ItemStack stack){ - return this.isVoid ? EnumRarity.RARE : EnumRarity.UNCOMMON; + return this.isVoid ? EnumRarity.COMMON : EnumRarity.COMMON; } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemBattery.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemBattery.java index 508c9f0a6..e169abbbd 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemBattery.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemBattery.java @@ -40,7 +40,7 @@ public ItemBattery(String name, int capacity, int transfer){ @Override public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.RARE; + return EnumRarity.COMMON; } @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemBooklet.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemBooklet.java index 1c8123bfe..c12a0d7cb 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemBooklet.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemBooklet.java @@ -96,7 +96,7 @@ public void addInformation(ItemStack stack, EntityPlayer player, List list, bool @Override public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.EPIC; + return EnumRarity.COMMON; } @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemChestToCrateUpgrade.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemChestToCrateUpgrade.java index f41e70d4f..56afb592c 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemChestToCrateUpgrade.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemChestToCrateUpgrade.java @@ -85,6 +85,6 @@ public EnumActionResult onItemUse(ItemStack heldStack, EntityPlayer player, Worl @Override public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.RARE; + return EnumRarity.COMMON; } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCoffee.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCoffee.java index 5cb1db173..94e235fd2 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCoffee.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCoffee.java @@ -127,7 +127,7 @@ public void addInformation(ItemStack stack, EntityPlayer player, List list, bool @Override public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.RARE; + return EnumRarity.COMMON; } public static class MilkIngredient extends CoffeeIngredient{ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCoffeeBean.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCoffeeBean.java index 3da5de4d6..9dcce422b 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCoffeeBean.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCoffeeBean.java @@ -24,6 +24,6 @@ public ItemCoffeeBean(String name){ @Override public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.RARE; + return EnumRarity.COMMON; } } \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCrafterOnAStick.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCrafterOnAStick.java index c83422dd3..28a2b0a67 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCrafterOnAStick.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCrafterOnAStick.java @@ -40,6 +40,6 @@ public ActionResult onItemRightClick(ItemStack stack, World world, En @Override public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.EPIC; + return EnumRarity.COMMON; } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemDrill.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemDrill.java index 93bcbfb3e..87b15692d 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemDrill.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemDrill.java @@ -221,7 +221,7 @@ else if(ActuallyAdditions.teslaLoaded && slotStack.hasCapability(TeslaUtil.tesla @Override public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.EPIC; + return EnumRarity.COMMON; } @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFertilizer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFertilizer.java index f95a4ff15..8a01a2b1a 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFertilizer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFertilizer.java @@ -46,6 +46,6 @@ public EnumActionResult onItemUse(ItemStack stack, EntityPlayer player, World wo @Override public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.RARE; + return EnumRarity.COMMON; } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFillingWand.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFillingWand.java index c6489255d..a73e47a80 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFillingWand.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFillingWand.java @@ -253,6 +253,6 @@ public int getMaxItemUseDuration(ItemStack stack){ @Override public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.EPIC; + return EnumRarity.COMMON; } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFilter.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFilter.java index 03fd5a779..21b5c9e4d 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFilter.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFilter.java @@ -34,7 +34,7 @@ public ItemFilter(String name){ @Override public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.UNCOMMON; + return EnumRarity.COMMON; } @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemGeneric.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemGeneric.java index 86238564e..357bf9df4 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemGeneric.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemGeneric.java @@ -24,6 +24,6 @@ public ItemGeneric(String name){ @Override public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.UNCOMMON; + return EnumRarity.COMMON; } } \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemGrowthRing.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemGrowthRing.java index a4d8515df..b51ede68d 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemGrowthRing.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemGrowthRing.java @@ -98,6 +98,6 @@ public void onUpdate(ItemStack stack, World world, Entity entity, int par4, bool @Override public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.EPIC; + return EnumRarity.COMMON; } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemHairyBall.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemHairyBall.java index 9911fc849..b0f506662 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemHairyBall.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemHairyBall.java @@ -77,6 +77,6 @@ public ItemStack getRandomReturnItem(Random rand){ @Override public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.EPIC; + return EnumRarity.COMMON; } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemKnife.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemKnife.java index 528e2ef14..784b18efd 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemKnife.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemKnife.java @@ -37,7 +37,7 @@ public boolean getShareTag(){ @Override public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.EPIC; + return EnumRarity.COMMON; } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemLaserWrench.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemLaserWrench.java index a7a9c7848..0b72da7cc 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemLaserWrench.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemLaserWrench.java @@ -93,6 +93,6 @@ public void addInformation(ItemStack stack, EntityPlayer player, List list, bool @Override public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.EPIC; + return EnumRarity.COMMON; } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemLeafBlower.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemLeafBlower.java index 648191d5e..b7f68dd74 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemLeafBlower.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemLeafBlower.java @@ -67,7 +67,7 @@ public int getMaxItemUseDuration(ItemStack stack){ @Override public EnumRarity getRarity(ItemStack stack){ - return this.isAdvanced ? EnumRarity.EPIC : EnumRarity.RARE; + return this.isAdvanced ? EnumRarity.COMMON : EnumRarity.COMMON; } @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemMagnetRing.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemMagnetRing.java index 3cb84fb9a..3d3464f06 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemMagnetRing.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemMagnetRing.java @@ -63,6 +63,6 @@ public void onUpdate(ItemStack stack, World world, Entity entity, int par4, bool @Override public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.EPIC; + return EnumRarity.COMMON; } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemPhantomConnector.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemPhantomConnector.java index 7af581e86..3b46a581f 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemPhantomConnector.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemPhantomConnector.java @@ -146,6 +146,6 @@ public void addInformation(ItemStack stack, EntityPlayer player, List list, bool @Override public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.EPIC; + return EnumRarity.COMMON; } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemResonantRice.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemResonantRice.java index 3f7dc9c78..4ff0f2178 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemResonantRice.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemResonantRice.java @@ -39,6 +39,6 @@ public ActionResult onItemRightClick(ItemStack stack, World world, En @Override public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.EPIC; + return EnumRarity.COMMON; } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemSolidifiedExperience.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemSolidifiedExperience.java index 7f4bdc3dc..4c7d18ba8 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemSolidifiedExperience.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemSolidifiedExperience.java @@ -79,6 +79,6 @@ public ActionResult onItemRightClick(ItemStack stack, World world, En @Override public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.UNCOMMON; + return EnumRarity.COMMON; } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemTeleStaff.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemTeleStaff.java index c83e9877e..c666e8a0c 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemTeleStaff.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemTeleStaff.java @@ -62,6 +62,6 @@ public ActionResult onItemRightClick(ItemStack stack, World world, En @Override public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.EPIC; + return EnumRarity.COMMON; } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemWaterRemovalRing.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemWaterRemovalRing.java index d4e866160..0dec67b65 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemWaterRemovalRing.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemWaterRemovalRing.java @@ -77,6 +77,6 @@ else if((block == Blocks.LAVA || block == Blocks.FLOWING_LAVA) && this.getEnergy @Override public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.EPIC; + return EnumRarity.COMMON; } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemWingsOfTheBats.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemWingsOfTheBats.java index 13b1d410f..4b6bb1941 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemWingsOfTheBats.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemWingsOfTheBats.java @@ -154,6 +154,6 @@ public void livingUpdateEvent(LivingEvent.LivingUpdateEvent event){ @Override public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.EPIC; + return EnumRarity.COMMON; } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemArmorAA.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemArmorAA.java index 9cc783e69..d4671681d 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemArmorAA.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemArmorAA.java @@ -24,7 +24,7 @@ public class ItemArmorAA extends ItemArmor{ private final EnumRarity rarity; public ItemArmorAA(String name, ArmorMaterial material, int type, ItemStack repairItem){ - this(name, material, type, repairItem, EnumRarity.RARE); + this(name, material, type, repairItem, EnumRarity.COMMON); } public ItemArmorAA(String name, ArmorMaterial material, int type, ItemStack repairItem, EnumRarity rarity){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemFoodSeed.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemFoodSeed.java index 60b528830..5f67a2025 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemFoodSeed.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemFoodSeed.java @@ -69,7 +69,7 @@ protected void registerRendering(){ @Override public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.RARE; + return EnumRarity.COMMON; } @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemSeed.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemSeed.java index d67a9a8e1..ef93964a0 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemSeed.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemSeed.java @@ -62,7 +62,7 @@ protected void registerRendering(){ @Override public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.RARE; + return EnumRarity.COMMON; } @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/ItemLens.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/ItemLens.java index efa22488c..af611b518 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/ItemLens.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/ItemLens.java @@ -29,7 +29,7 @@ public ItemLens(String name, Lens type){ @Override public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.UNCOMMON; + return EnumRarity.COMMON; } @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/metalists/TheDusts.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/metalists/TheDusts.java index 1ffc2e117..03ff55f43 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/metalists/TheDusts.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/metalists/TheDusts.java @@ -16,13 +16,13 @@ public enum TheDusts{ IRON("Iron", 7826534, EnumRarity.COMMON), - GOLD("Gold", 14335744, EnumRarity.UNCOMMON), - DIAMOND("Diamond", 292003, EnumRarity.RARE), - EMERALD("Emerald", 4319527, EnumRarity.EPIC), - LAPIS("Lapis", 1849791, EnumRarity.UNCOMMON), - QUARTZ("Quartz", StringUtil.DECIMAL_COLOR_WHITE, EnumRarity.UNCOMMON), - COAL("Coal", 0, EnumRarity.UNCOMMON), - QUARTZ_BLACK("QuartzBlack", 18, EnumRarity.RARE); + GOLD("Gold", 14335744, EnumRarity.COMMON), + DIAMOND("Diamond", 292003, EnumRarity.COMMON), + EMERALD("Emerald", 4319527, EnumRarity.COMMON), + LAPIS("Lapis", 1849791, EnumRarity.COMMON), + QUARTZ("Quartz", StringUtil.DECIMAL_COLOR_WHITE, EnumRarity.COMMON), + COAL("Coal", 0, EnumRarity.COMMON), + QUARTZ_BLACK("QuartzBlack", 18, EnumRarity.COMMON); public final String name; public final int color; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/metalists/TheFoods.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/metalists/TheFoods.java index 7ba7d729f..92f712047 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/metalists/TheFoods.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/metalists/TheFoods.java @@ -21,23 +21,23 @@ public enum TheFoods{ CHEESE("Cheese", 1, 0.05F, false, 3, EnumRarity.COMMON), PUMPKIN_STEW("PumpkinStew", 6, 0.3F, true, 30, EnumRarity.COMMON), CARROT_JUICE("CarrotJuice", 4, 0.2F, true, 20, EnumRarity.COMMON), - FISH_N_CHIPS("FishNChips", 14, 0.65F, false, 40, EnumRarity.UNCOMMON), + FISH_N_CHIPS("FishNChips", 14, 0.65F, false, 40, EnumRarity.COMMON), FRENCH_FRIES("FrenchFries", 10, 0.6F, false, 32, EnumRarity.COMMON), FRENCH_FRY("FrenchFry", 2, 0.025F, false, 3, EnumRarity.COMMON), SPAGHETTI("Spaghetti", 7, 0.4F, false, 38, EnumRarity.COMMON), NOODLE("Noodle", 1, 0.01F, false, 3, EnumRarity.COMMON), - CHOCOLATE_CAKE("ChocolateCake", 16, 0.8F, false, 45, EnumRarity.UNCOMMON), + CHOCOLATE_CAKE("ChocolateCake", 16, 0.8F, false, 45, EnumRarity.COMMON), CHOCOLATE("Chocolate", 3, 0.3F, false, 15, EnumRarity.COMMON), TOAST("Toast", 3, 0.08F, false, 25, EnumRarity.COMMON), - SUBMARINE_SANDWICH("SubmarineSandwich", 9, 0.4F, false, 40, EnumRarity.UNCOMMON), - BIG_COOKIE("BigCookie", 4, 0.25F, false, 20, EnumRarity.UNCOMMON), + SUBMARINE_SANDWICH("SubmarineSandwich", 9, 0.4F, false, 40, EnumRarity.COMMON), + BIG_COOKIE("BigCookie", 4, 0.25F, false, 20, EnumRarity.COMMON), HAMBURGER("Hamburger", 13, 0.65F, false, 40, EnumRarity.COMMON), - PIZZA("Pizza", 16, 0.8F, false, 45, EnumRarity.UNCOMMON), + PIZZA("Pizza", 16, 0.8F, false, 45, EnumRarity.COMMON), BAGUETTE("Baguette", 6, 0.5F, false, 25, EnumRarity.COMMON), - RICE("Rice", 2, 0.05F, false, 10, EnumRarity.UNCOMMON), - RICE_BREAD("RiceBread", 6, 0.5F, false, 25, EnumRarity.UNCOMMON), - DOUGHNUT("Doughnut", 2, 0.1F, false, 10, EnumRarity.EPIC), - CHOCOLATE_TOAST("ChocolateToast", 5, 0.2F, false, 40, EnumRarity.RARE), + RICE("Rice", 2, 0.05F, false, 10, EnumRarity.COMMON), + RICE_BREAD("RiceBread", 6, 0.5F, false, 25, EnumRarity.COMMON), + DOUGHNUT("Doughnut", 2, 0.1F, false, 10, EnumRarity.COMMON), + CHOCOLATE_TOAST("ChocolateToast", 5, 0.2F, false, 40, EnumRarity.COMMON), BACON("Bacon", 4, 0.1F, false, 30, EnumRarity.COMMON); public final String name; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/metalists/TheJams.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/metalists/TheJams.java index 4e44b5cb5..5393f255b 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/metalists/TheJams.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/metalists/TheJams.java @@ -14,13 +14,13 @@ public enum TheJams{ - CU_BA_RA("CuBaRa", 6, 0.1F, EnumRarity.RARE, 5, 12, 12595273), - GRA_KI_BA("GraKiBa", 6, 0.1F, EnumRarity.RARE, 16, 13, 5492820), - PL_AP_LE("PlApLe", 6, 0.1F, EnumRarity.RARE, 15, 3, 13226009), - CH_AP_CI("ChApCi", 6, 0.1F, EnumRarity.RARE, 10, 1, 13189222), - HO_ME_KI("HoMeKi", 6, 0.1F, EnumRarity.RARE, 10, 14, 2031360), - PI_CO("PiCo", 6, 0.1F, EnumRarity.RARE, 9, 1, 16056203), - HO_ME_CO("HoMeCo", 6, 0.1F, EnumRarity.RARE, 10, 13, 10462208); + CU_BA_RA("CuBaRa", 6, 0.1F, EnumRarity.COMMON, 5, 12, 12595273), + GRA_KI_BA("GraKiBa", 6, 0.1F, EnumRarity.COMMON, 16, 13, 5492820), + PL_AP_LE("PlApLe", 6, 0.1F, EnumRarity.COMMON, 15, 3, 13226009), + CH_AP_CI("ChApCi", 6, 0.1F, EnumRarity.COMMON, 10, 1, 13189222), + HO_ME_KI("HoMeKi", 6, 0.1F, EnumRarity.COMMON, 10, 14, 2031360), + PI_CO("PiCo", 6, 0.1F, EnumRarity.COMMON, 9, 1, 16056203), + HO_ME_CO("HoMeCo", 6, 0.1F, EnumRarity.COMMON, 10, 13, 10462208); public final String name; public final int healAmount; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/metalists/TheMiscItems.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/metalists/TheMiscItems.java index 4289e6442..03c36a419 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/metalists/TheMiscItems.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/metalists/TheMiscItems.java @@ -16,30 +16,30 @@ public enum TheMiscItems{ PAPER_CONE("PaperCone", EnumRarity.COMMON), - MASHED_FOOD("MashedFood", EnumRarity.UNCOMMON), + MASHED_FOOD("MashedFood", EnumRarity.COMMON), KNIFE_BLADE("KnifeBlade", EnumRarity.COMMON), KNIFE_HANDLE("KnifeHandle", EnumRarity.COMMON), DOUGH("Dough", EnumRarity.COMMON), - QUARTZ("BlackQuartz", EnumRarity.EPIC), - RING("Ring", EnumRarity.UNCOMMON), + QUARTZ("BlackQuartz", EnumRarity.COMMON), + RING("Ring", EnumRarity.COMMON), COIL("Coil", EnumRarity.COMMON), - COIL_ADVANCED("CoilAdvanced", EnumRarity.UNCOMMON), - RICE_DOUGH("RiceDough", EnumRarity.UNCOMMON), + COIL_ADVANCED("CoilAdvanced", EnumRarity.COMMON), + RICE_DOUGH("RiceDough", EnumRarity.COMMON), TINY_COAL("TinyCoal", EnumRarity.COMMON), TINY_CHAR("TinyCharcoal", EnumRarity.COMMON), - RICE_SLIME("RiceSlime", EnumRarity.UNCOMMON), - CANOLA("Canola", EnumRarity.UNCOMMON), - CUP("Cup", EnumRarity.UNCOMMON), - BAT_WING("BatWing", EnumRarity.RARE), - DRILL_CORE("DrillCore", EnumRarity.UNCOMMON), - BLACK_DYE("BlackDye", EnumRarity.EPIC), - LENS("Lens", EnumRarity.UNCOMMON), - ENDER_STAR("EnderStar", EnumRarity.EPIC), - SPAWNER_SHARD("SpawnerShard", EnumRarity.EPIC), - BIOMASS("Biomass", EnumRarity.UNCOMMON), - BIOCOAL("Biocoal", EnumRarity.RARE), - CRYSTALLIZED_CANOLA_SEED("CrystallizedCanolaSeed", EnumRarity.UNCOMMON), - EMPOWERED_CANOLA_SEED("EmpoweredCanolaSeed", EnumRarity.RARE), + RICE_SLIME("RiceSlime", EnumRarity.COMMON), + CANOLA("Canola", EnumRarity.COMMON), + CUP("Cup", EnumRarity.COMMON), + BAT_WING("BatWing", EnumRarity.COMMON), + DRILL_CORE("DrillCore", EnumRarity.COMMON), + BLACK_DYE("BlackDye", EnumRarity.COMMON), + LENS("Lens", EnumRarity.COMMON), + ENDER_STAR("EnderStar", EnumRarity.COMMON), + SPAWNER_SHARD("SpawnerShard", EnumRarity.COMMON), + BIOMASS("Biomass", EnumRarity.COMMON), + BIOCOAL("Biocoal", EnumRarity.COMMON), + CRYSTALLIZED_CANOLA_SEED("CrystallizedCanolaSeed", EnumRarity.COMMON), + EMPOWERED_CANOLA_SEED("EmpoweredCanolaSeed", EnumRarity.COMMON), YOUTUBE_ICON("YoutubeIcon", Util.FALLBACK_RARITY); public final String name; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/metalists/ThePotionRings.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/metalists/ThePotionRings.java index 863df3032..cbb6a540f 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/metalists/ThePotionRings.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/metalists/ThePotionRings.java @@ -19,22 +19,22 @@ public enum ThePotionRings{ - SPEED(MobEffects.SPEED.getName(), 8171462, MobEffects.SPEED, 0, 1, 10, false, EnumRarity.UNCOMMON, new ItemStack(Items.SUGAR)), + SPEED(MobEffects.SPEED.getName(), 8171462, MobEffects.SPEED, 0, 1, 10, false, EnumRarity.COMMON, new ItemStack(Items.SUGAR)), //Slowness - HASTE(MobEffects.HASTE.getName(), 14270531, MobEffects.HASTE, 0, 1, 10, false, EnumRarity.EPIC, new ItemStack(Items.REPEATER)), + HASTE(MobEffects.HASTE.getName(), 14270531, MobEffects.HASTE, 0, 1, 10, false, EnumRarity.COMMON, new ItemStack(Items.REPEATER)), //Mining Fatigue - STRENGTH(MobEffects.STRENGTH.getName(), 9643043, MobEffects.STRENGTH, 0, 1, 10, false, EnumRarity.RARE, new ItemStack(Items.BLAZE_POWDER)), + STRENGTH(MobEffects.STRENGTH.getName(), 9643043, MobEffects.STRENGTH, 0, 1, 10, false, EnumRarity.COMMON, new ItemStack(Items.BLAZE_POWDER)), //Health (Not Happening) //Damage - JUMP_BOOST(MobEffects.JUMP_BOOST.getName(), 7889559, MobEffects.JUMP_BOOST, 0, 1, 10, false, EnumRarity.RARE, new ItemStack(Blocks.PISTON)), + JUMP_BOOST(MobEffects.JUMP_BOOST.getName(), 7889559, MobEffects.JUMP_BOOST, 0, 1, 10, false, EnumRarity.COMMON, new ItemStack(Blocks.PISTON)), //Nausea - REGEN(MobEffects.REGENERATION.getName(), 13458603, MobEffects.REGENERATION, 0, 1, 50, true, EnumRarity.RARE, new ItemStack(Items.GHAST_TEAR)), - RESISTANCE(MobEffects.RESISTANCE.getName(), 10044730, MobEffects.RESISTANCE, 0, 1, 10, false, EnumRarity.EPIC, new ItemStack(Items.SLIME_BALL)), - FIRE_RESISTANCE(MobEffects.FIRE_RESISTANCE.getName(), 14981690, MobEffects.FIRE_RESISTANCE, 0, 0, 10, false, EnumRarity.UNCOMMON, new ItemStack(Items.MAGMA_CREAM)), - WATER_BREATHING(MobEffects.WATER_BREATHING.getName(), 3035801, MobEffects.WATER_BREATHING, 0, 0, 10, false, EnumRarity.RARE, new ItemStack(Items.FISH, 1, 3)), - INVISIBILITY(MobEffects.INVISIBILITY.getName(), 8356754, MobEffects.INVISIBILITY, 0, 0, 10, false, EnumRarity.EPIC, new ItemStack(Items.FERMENTED_SPIDER_EYE)), + REGEN(MobEffects.REGENERATION.getName(), 13458603, MobEffects.REGENERATION, 0, 1, 50, true, EnumRarity.COMMON, new ItemStack(Items.GHAST_TEAR)), + RESISTANCE(MobEffects.RESISTANCE.getName(), 10044730, MobEffects.RESISTANCE, 0, 1, 10, false, EnumRarity.COMMON, new ItemStack(Items.SLIME_BALL)), + FIRE_RESISTANCE(MobEffects.FIRE_RESISTANCE.getName(), 14981690, MobEffects.FIRE_RESISTANCE, 0, 0, 10, false, EnumRarity.COMMON, new ItemStack(Items.MAGMA_CREAM)), + WATER_BREATHING(MobEffects.WATER_BREATHING.getName(), 3035801, MobEffects.WATER_BREATHING, 0, 0, 10, false, EnumRarity.COMMON, new ItemStack(Items.FISH, 1, 3)), + INVISIBILITY(MobEffects.INVISIBILITY.getName(), 8356754, MobEffects.INVISIBILITY, 0, 0, 10, false, EnumRarity.COMMON, new ItemStack(Items.FERMENTED_SPIDER_EYE)), //Blindness - NIGHT_VISION(MobEffects.NIGHT_VISION.getName(), 2039713, MobEffects.NIGHT_VISION, 0, 0, 300, false, EnumRarity.RARE, new ItemStack(Items.GOLDEN_CARROT)); + NIGHT_VISION(MobEffects.NIGHT_VISION.getName(), 2039713, MobEffects.NIGHT_VISION, 0, 0, 300, false, EnumRarity.COMMON, new ItemStack(Items.GOLDEN_CARROT)); //Hunger //Weakness //Poison diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/recipe/TreasureChestHandler.java b/src/main/java/de/ellpeck/actuallyadditions/mod/recipe/TreasureChestHandler.java index cbe92b10e..1b3ced1f5 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/recipe/TreasureChestHandler.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/recipe/TreasureChestHandler.java @@ -19,14 +19,14 @@ public final class TreasureChestHandler{ public static void init(){ - ActuallyAdditionsAPI.addTreasureChestLoot(new ItemStack(Items.DIAMOND), 10, 1, 2); - ActuallyAdditionsAPI.addTreasureChestLoot(new ItemStack(Items.IRON_INGOT), 60, 1, 5); - ActuallyAdditionsAPI.addTreasureChestLoot(new ItemStack(Items.GOLD_NUGGET), 100, 1, 8); - ActuallyAdditionsAPI.addTreasureChestLoot(new ItemStack(Items.GOLD_INGOT), 70, 1, 3); - ActuallyAdditionsAPI.addTreasureChestLoot(new ItemStack(Items.ENDER_PEARL), 20, 1, 2); - ActuallyAdditionsAPI.addTreasureChestLoot(new ItemStack(Items.EMERALD), 20, 1, 1); - ActuallyAdditionsAPI.addTreasureChestLoot(new ItemStack(Items.EXPERIENCE_BOTTLE), 10, 3, 6); - ActuallyAdditionsAPI.addTreasureChestLoot(new ItemStack(InitItems.itemSolidifiedExperience), 30, 3, 6); + ActuallyAdditionsAPI.addTreasureChestLoot(new ItemStack(Items.DIAMOND), 20, 2, 4); + ActuallyAdditionsAPI.addTreasureChestLoot(new ItemStack(Items.IRON_INGOT), 60, 2, 9); + ActuallyAdditionsAPI.addTreasureChestLoot(new ItemStack(Items.GOLD_NUGGET), 100, 4, 9); + ActuallyAdditionsAPI.addTreasureChestLoot(new ItemStack(Items.GOLD_INGOT), 70, 2, 6); + ActuallyAdditionsAPI.addTreasureChestLoot(new ItemStack(Items.ENDER_PEARL), 30, 2, 4); + ActuallyAdditionsAPI.addTreasureChestLoot(new ItemStack(Items.EMERALD), 30, 2, 2); + ActuallyAdditionsAPI.addTreasureChestLoot(new ItemStack(Items.EXPERIENCE_BOTTLE), 10, 7, 9); + ActuallyAdditionsAPI.addTreasureChestLoot(new ItemStack(InitItems.itemSolidifiedExperience), 30, 3, 9); ActuallyAdditionsAPI.addTreasureChestLoot(new ItemStack(Items.RECORD_11), 10, 1, 1); ActuallyAdditionsAPI.addTreasureChestLoot(new ItemStack(Items.RECORD_13), 10, 1, 1); ActuallyAdditionsAPI.addTreasureChestLoot(new ItemStack(Items.RECORD_BLOCKS), 10, 1, 1);