Removal of lots of fixmes.

Removed InvTweaks sort order (mod indicates it wont update, suggested replacement cpw sorting mod only sorts by count and reg-id).
Reactivated dissassemble special recipe.
Removed leftovers from cable bus non-tesr tile.
Added JEI facade recipes back in.
Removed superflous datagen for quartz tools.
This commit is contained in:
Sebastian Hartte
2020-06-22 02:31:45 +02:00
parent 8350ae5f45
commit c4b5100283
38 changed files with 309 additions and 587 deletions
@@ -36,41 +36,6 @@ public class BlockChargedQuartzOre extends BlockQuartzOre {
super(props);
}
// FIXME: Loot tables
// @Override
// public Item getItemDropped( final BlockState state, final Random rand, final int fortune )
// {
// return AEApi.instance()
// .definitions()
// .materials()
// .certusQuartzCrystalCharged()
// .maybeItem()
// .orElseThrow( () -> new MissingDefinitionException( "Tried to access charged certus quartz crystal, even though they are disabled" ) );
// }
//
// @Override
// public int damageDropped( final BlockState state )
// {
// return AEApi.instance()
// .definitions()
// .materials()
// .certusQuartzCrystalCharged()
// .maybeStack( 1 )
// .orElseThrow( () -> new MissingDefinitionException( "Tried to access charged certus quartz crystal, even though they are disabled" ) )
// .getItemDamage();
// }
//
// @Override
// public ItemStack getPickBlock( BlockState state, RayTraceResult target, World world, BlockPos pos, PlayerEntity player )
// {
// return AEApi.instance()
// .definitions()
// .blocks()
// .quartzOreCharged()
// .maybeStack( 1 )
// .orElseThrow( () -> new MissingDefinitionException( "Tried to access charged certus quartz ore, even though they are disabled" ) );
// }
@Override
@OnlyIn(Dist.CLIENT)
public void animateTick(final BlockState state, final World w, final BlockPos pos, final Random r) {
@@ -29,62 +29,10 @@ public class BlockQuartzOre extends AEBaseBlock {
super(props);
}
// FIXME: Loot Tables
// @Override
// public int quantityDropped( BlockState state, int fortune, Random rand )
// {
// if( fortune > 0 && Item.getItemFromBlock( this ) != this.getItemDropped( null, rand, fortune ) )
// {
// int j = rand.nextInt( fortune + 2 ) - 1;
//
// if( j < 0 )
// {
// j = 0;
// }
//
// return this.quantityDropped( rand ) * ( j + 1 );
// }
// else
// {
// return this.quantityDropped( rand );
// }
// }
// @Override
// public int quantityDropped( final Random rand )
// {
// return 1 + rand.nextInt( 2 );
// }
//
@Override
public int getExpDrop(BlockState state, net.minecraft.world.IWorldReader reader, BlockPos pos, int fortune,
int silktouch) {
return silktouch == 0 ? MathHelper.nextInt(RANDOM, 2, 5) : 0;
}
// FIXME: loot tables
// @Override
// public Item getItemDropped( final BlockState state, final Random rand, final int fortune )
// {
// return AEApi.instance()
// .definitions()
// .materials()
// .certusQuartzCrystal()
// .maybeItem()
// .orElseThrow( () -> new MissingDefinitionException( "Tried to access certus quartz crystal, even though they are disabled" ) );
// }
// FIXME: loot tables
// @Override
// public int damageDropped( final BlockState state )
// {
// return AEApi.instance()
// .definitions()
// .materials()
// .certusQuartzCrystal()
// .maybeStack( 1 )
// .orElseThrow( () -> new MissingDefinitionException( "Tried to access certus quartz crystal, even though they are disabled" ) )
// .getItemDamage();
// }
}