Fixed more classes...

src/main/java/de/ellpeck/actuallyadditions/data/BlockRecipeGenerator.java

@@ -76,7 +76,7 @@ public class BlockRecipeGenerator extends RecipeProvider {
                 .save(consumer);
 
         //Vertical Digger
-        Recipe.shaped(ActuallyBlocks.Vertical_DIGGER.get())
+        Recipe.shaped(ActuallyBlocks.VERTICAL_DIGGER.get())
                 .pattern("IRI", "RCR", "IDI")
                 .define('R', Tags.Items.STORAGE_BLOCKS_REDSTONE)
                 .define('I', ActuallyBlocks.IRON_CASING.get())

src/main/java/de/ellpeck/actuallyadditions/mod/blocks/ActuallyBlocks.java

@@ -91,7 +91,7 @@ public final class ActuallyBlocks {
     public static final AABlockReg<BlockBioReactor, AABlockItem, TileEntityBioReactor> BIOREACTOR = new AABlockReg<>("bio_reactor", BlockBioReactor::new,
         (b) -> new AABlockItem(b, defaultBlockItemProperties), TileEntityBioReactor::new);
 
-    public static final AABlockReg<BlockVerticalDigger, AABlockItem, TileEntityVerticalDigger> Vertical_DIGGER = new AABlockReg<>("vertical_digger", BlockVerticalDigger::new,
+    public static final AABlockReg<BlockVerticalDigger, AABlockItem, TileEntityVerticalDigger> VERTICAL_DIGGER = new AABlockReg<>("vertical_digger", BlockVerticalDigger::new,
         (b) -> new AABlockItem(b, defaultBlockItemProperties), TileEntityVerticalDigger::new);
 
     public static final AABlockReg<BlockAtomicReconstructor, AABlockItem, TileEntityAtomicReconstructor> ATOMIC_RECONSTRUCTOR = new AABlockReg<>("atomic_reconstructor", BlockAtomicReconstructor::new,

src/main/java/de/ellpeck/actuallyadditions/mod/booklet/InitBooklet.java

@@ -215,7 +215,7 @@ public final class InitBooklet {
         new BookletChapter("fireworkBox", ActuallyAdditionsAPI.entryFunctionalRF, new ItemStack(ActuallyBlocks.FIREWORK_BOX.get()), new PageTextOnly(1).addTextReplacement("<rf>", TileEntityFireworkBox.USE_PER_SHOT), new PageCrafting(2, BlockCrafting.recipeFireworkBox)).setSpecial();
         new BookletChapter("batteryBox", ActuallyAdditionsAPI.entryFunctionalRF, new ItemStack(ActuallyBlocks.BATTERY_BOX.get()), new PageTextOnly(1), new PageCrafting(2, BlockCrafting.recipeBatteryBox).setNoText()).setSpecial();
         new BookletChapter("farmer", ActuallyAdditionsAPI.entryFunctionalRF, new ItemStack(ActuallyBlocks.FARMER.get()), new PageTextOnly(1), new PagePicture(2, "page_farmer_crops", 95).addItemsToPage(new ItemStack(Items.WHEAT_SEEDS)).addItemsToPage(new ItemStack(ActuallyItems.CANOLA_SEED.get())), new PagePicture(3, "page_farmer_cactus", 105).addItemsToPage(new ItemStack(Blocks.CACTUS)), new PagePicture(4, "page_farmer_wart", 95).addItemsToPage(new ItemStack(Items.NETHER_WART)), new PagePicture(5, "page_farmer_reeds", 105).addItemsToPage(new ItemStack(Items.REEDS)), new PagePicture(6, "page_farmer_melons", 105).addItemsToPage(new ItemStack(Items.MELON), new ItemStack(Blocks.PUMPKIN), new ItemStack(Blocks.MELON_BLOCK)), new PagePicture(7, "page_farmer_enderlilly", 105), new PagePicture(8, "page_farmer_redorchid", 105), new PageCrafting(4, BlockCrafting.recipeFarmer).setWildcard().setNoText()).setImportant();
-        new BookletChapter("miner", ActuallyAdditionsAPI.entryFunctionalRF, new ItemStack(ActuallyBlocks.Vertical_DIGGER.get()), new PageTextOnly(1).addTextReplacement("<rf>", TileEntityVerticalDigger.ENERGY_USE_PER_BLOCK).addTextReplacement("<range>", TileEntityVerticalDigger.DEFAULT_RANGE), new PageCrafting(2, BlockCrafting.recipeMiner)).setSpecial();
+        new BookletChapter("miner", ActuallyAdditionsAPI.entryFunctionalRF, new ItemStack(ActuallyBlocks.VERTICAL_DIGGER.get()), new PageTextOnly(1).addTextReplacement("<rf>", TileEntityVerticalDigger.ENERGY_USE_PER_BLOCK).addTextReplacement("<range>", TileEntityVerticalDigger.DEFAULT_RANGE), new PageCrafting(2, BlockCrafting.recipeMiner)).setSpecial();
         new BookletChapterCoffee("coffeeMachine", ActuallyAdditionsAPI.entryFunctionalRF, new ItemStack(ActuallyBlocks.COFFEE_MACHINE.get()), new PageTextOnly(1).addItemsToPage(new ItemStack(ActuallyItems.COFFEE_BEANS.get())).addTextReplacement("<rf>", TileEntityCoffeeMachine.ENERGY_USED).addTextReplacement("<coffee>", TileEntityCoffeeMachine.CACHE_USE).addTextReplacement("<water>", TileEntityCoffeeMachine.WATER_USE), new PageTextOnly(2).addItemsToPage(new ItemStack(ActuallyItems.COFFEE.get())), new PagePicture(3, "page_coffee_machine", 115), new PageCrafting(4, BlockCrafting.recipeCoffeeMachine).setWildcard().setNoText(), new PageCrafting(5, ItemCrafting.recipeCup).setNoText()).setImportant();
 
         List<IBookletPage> list = new ArrayList<>();

src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLeafGenerator.java

@@ -10,6 +10,7 @@
 
 package de.ellpeck.actuallyadditions.mod.tile;
 
+import de.ellpeck.actuallyadditions.mod.blocks.ActuallyBlocks;
 import de.ellpeck.actuallyadditions.mod.config.values.ConfigIntValues;
 import de.ellpeck.actuallyadditions.mod.util.AssetUtil;
 import net.minecraft.block.Block;
@@ -36,7 +37,7 @@ public class TileEntityLeafGenerator extends TileEntityBase implements ISharingE
     private int oldEnergy;
 
     public TileEntityLeafGenerator() {
-        super(ActuallyTiles.LEAFGENERATOR_TILE.get());
+        super(ActuallyBlocks.LEAF_GENERATOR.getTileEntityType());
     }
 
     @Override

src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLongRangeBreaker.java

@@ -10,6 +10,7 @@
 
 package de.ellpeck.actuallyadditions.mod.tile;
 
+import de.ellpeck.actuallyadditions.mod.blocks.ActuallyBlocks;
 import de.ellpeck.actuallyadditions.mod.inventory.ContainerDirectionalBreaker;
 import de.ellpeck.actuallyadditions.mod.util.ItemStackHandlerAA.IAcceptor;
 import de.ellpeck.actuallyadditions.mod.util.StackUtil;
@@ -44,7 +45,7 @@ public class TileEntityLongRangeBreaker extends TileEntityInventoryBase implemen
     private int currentTime;
 
     public TileEntityLongRangeBreaker() {
-        super(ActuallyTiles.DIRECTIONALBREAKER_TILE.get(), 9);
+        super(ActuallyBlocks.LONG_RANGE_BREAKER.getTileEntityType(), 9);
     }
 
     @Override
@@ -68,7 +69,7 @@ public class TileEntityLongRangeBreaker extends TileEntityInventoryBase implemen
     @Override
     public void updateEntity() {
         super.updateEntity();
-        if (!this.world.isRemote) {
+        if (!this.level.isClientSide) {
             if (!this.isRedstonePowered && !this.isPulseMode) {
                 if (this.currentTime > 0) {
                     this.currentTime--;
@@ -88,24 +89,24 @@ public class TileEntityLongRangeBreaker extends TileEntityInventoryBase implemen
 
     private void doWork() {
         if (this.storage.getEnergyStored() >= ENERGY_USE * RANGE) {
-            BlockState state = this.world.getBlockState(this.pos);
+            BlockState state = this.level.getBlockState(this.worldPosition);
             Direction sideToManipulate = WorldUtil.getDirectionByPistonRotation(state);
 
             for (int i = 0; i < RANGE; i++) {
-                BlockPos coordsBlock = this.pos.offset(sideToManipulate, i + 1);
+                BlockPos coordsBlock = this.worldPosition.relative(sideToManipulate, i + 1);
-                BlockState breakState = this.world.getBlockState(coordsBlock);
+                BlockState breakState = this.level.getBlockState(coordsBlock);
                 Block blockToBreak = breakState.getBlock();
-                if (blockToBreak != null && !this.world.isAirBlock(coordsBlock) && this.world.getBlockState(coordsBlock).getBlockHardness(this.world, coordsBlock) > -1.0F) {
+                if (blockToBreak != null && !this.level.isEmptyBlock(coordsBlock) && this.level.getBlockState(coordsBlock).getDestroySpeed(this.level, coordsBlock) > -1.0F) {
-                    List<ItemStack> drops = Block.getDrops(breakState, (ServerWorld) this.world, coordsBlock, this.world.getTileEntity(coordsBlock));
+                    List<ItemStack> drops = Block.getDrops(breakState, (ServerWorld) this.level, coordsBlock, this.level.getBlockEntity(coordsBlock));
-                    float chance = WorldUtil.fireFakeHarvestEventsForDropChance(this, drops, this.world, coordsBlock);
+                    float chance = WorldUtil.fireFakeHarvestEventsForDropChance(this, drops, this.level, coordsBlock);
 
-                    if (chance > 0 && this.world.rand.nextFloat() <= chance) {
+                    if (chance > 0 && this.level.random.nextFloat() <= chance) {
                         if (StackUtil.canAddAll(this.inv, drops, false)) {
-                            this.world.playEvent(2001, coordsBlock, Block.getStateId(this.world.getBlockState(coordsBlock)));
+                            this.level.levelEvent(2001, coordsBlock, Block.getId(this.level.getBlockState(coordsBlock)));
-                            this.world.setBlockState(coordsBlock, Blocks.AIR.getDefaultState());
+                            this.level.setBlockAndUpdate(coordsBlock, Blocks.AIR.defaultBlockState());
                             StackUtil.addAll(this.inv, drops, false);
                             this.storage.extractEnergyInternal(ENERGY_USE, false);
-                            this.markDirty();
+                            this.setChanged();
                         }
                     }
                 }

src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityVerticalDigger.java

@@ -10,6 +10,7 @@
 
 package de.ellpeck.actuallyadditions.mod.tile;
 
+import de.ellpeck.actuallyadditions.mod.blocks.ActuallyBlocks;
 import de.ellpeck.actuallyadditions.mod.config.values.ConfigStringListValues;
 import de.ellpeck.actuallyadditions.mod.inventory.ContainerMiner;
 import de.ellpeck.actuallyadditions.mod.items.ItemDrill;
@@ -58,7 +59,7 @@ public class TileEntityVerticalDigger extends TileEntityInventoryBase implements
     private int oldCheckZ;
 
     public TileEntityVerticalDigger() {
-        super(ActuallyTiles.MINER_TILE.get(), 9);
+        super(ActuallyBlocks.VERTICAL_DIGGER.getTileEntityType(), 9);
     }
 
     @Override
@@ -90,13 +91,13 @@ public class TileEntityVerticalDigger extends TileEntityInventoryBase implements
     @Override
     public void updateEntity() {
         super.updateEntity();
-        if (!this.world.isRemote) {
+        if (!this.level.isClientSide) {
 
             if (!this.isRedstonePowered && this.ticksElapsed % 5 == 0) {
                 if (this.checkY != 0) {
-                    int range = TileEntityPhantomFace.upgradeRange(DEFAULT_RANGE, this.world, this.pos);
+                    int range = TileEntityPhantomface.upgradeRange(DEFAULT_RANGE, this.level, this.worldPosition);
                     if (this.checkY < 0) {
-                        this.checkY = this.pos.getY() - 1;
+                        this.checkY = this.worldPosition.getY() - 1;
                         this.checkX = -range;
                         this.checkZ = -range;
                     }
@@ -131,23 +132,23 @@ public class TileEntityVerticalDigger extends TileEntityInventoryBase implements
             ? 3
             : 1);
         if (this.storage.getEnergyStored() >= actualUse) {
-            BlockPos pos = new BlockPos(this.pos.getX() + this.checkX, this.checkY, this.pos.getZ() + this.checkZ);
+            BlockPos pos = new BlockPos(this.worldPosition.getX() + this.checkX, this.checkY, this.worldPosition.getZ() + this.checkZ);
 
-            BlockState state = this.world.getBlockState(pos);
+            BlockState state = this.level.getBlockState(pos);
             Block block = state.getBlock();
-            ItemStack stack = block.getPickBlock(state, new BlockRayTraceResult(new Vector3d(0, 0, 0), Direction.DOWN, pos, false), this.world, pos, FakePlayerFactory.getMinecraft((ServerWorld) this.world));
+            ItemStack stack = block.getPickBlock(state, new BlockRayTraceResult(new Vector3d(0, 0, 0), Direction.DOWN, pos, false), this.level, pos, FakePlayerFactory.getMinecraft((ServerWorld) this.level));
-            if (!block.isAir(this.world.getBlockState(pos), this.world, pos)) {
+            if (!block.isAir(this.level.getBlockState(pos), this.level, pos)) {
-                if (block.getHarvestLevel(this.world.getBlockState(pos)) <= ItemDrill.HARVEST_LEVEL && state.getBlockHardness(this.world, pos) >= 0F && !(block instanceof IFluidBlock) && this.isMinable(block, stack)) {
+                if (block.getHarvestLevel(this.level.getBlockState(pos)) <= ItemDrill.HARVEST_LEVEL && state.getDestroySpeed(this.level, pos) >= 0F && !(block instanceof IFluidBlock) && this.isMinable(block, stack)) {
-                    List<ItemStack> drops = Block.getDrops(state, (ServerWorld) this.world, pos, this.world.getTileEntity(pos));
+                    List<ItemStack> drops = Block.getDrops(state, (ServerWorld) this.level, pos, this.level.getBlockEntity(pos));
-                    float chance = WorldUtil.fireFakeHarvestEventsForDropChance(this, drops, this.world, pos);
+                    float chance = WorldUtil.fireFakeHarvestEventsForDropChance(this, drops, this.level, pos);
 
-                    if (chance > 0 && this.world.rand.nextFloat() <= chance) {
+                    if (chance > 0 && this.level.random.nextFloat() <= chance) {
                         if (StackUtil.canAddAll(this.inv, drops, false)) {
-                            this.world.playEvent(2001, pos, Block.getStateId(this.world.getBlockState(pos)));
+                            this.level.levelEvent(2001, pos, Block.getId(this.level.getBlockState(pos)));
-                            this.world.setBlockState(pos, Blocks.AIR.getDefaultState());
+                            this.level.setBlockAndUpdate(pos, Blocks.AIR.defaultBlockState());
 
                             StackUtil.addAll(this.inv, drops, false);
-                            this.markDirty();
+                            this.setChanged();
 
                             this.storage.extractEnergyInternal(actualUse, false);
                             this.shootParticles(pos.getX(), pos.getY(), pos.getZ());
@@ -196,7 +197,7 @@ public class TileEntityVerticalDigger extends TileEntityInventoryBase implements
     }
 
     private void shootParticles(int endX, int endY, int endZ) {
-        AssetUtil.spawnLaserWithTimeServer(this.world, this.getPos().getX(), this.getPos().getY(), this.getPos().getZ(), endX, endY, endZ, new float[]{65F / 255F, 150F / 255F, 2F / 255F}, 10, 120, 0.1F, 0.8F);
+        AssetUtil.spawnLaserWithTimeServer(this.level, this.worldPosition.getX(), this.worldPosition.getY(), this.worldPosition.getZ(), endX, endY, endZ, new float[]{65F / 255F, 150F / 255F, 2F / 255F}, 10, 120, 0.1F, 0.8F);
     }
 
     private boolean isBlacklisted(Block block) {

src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityXPSolidifier.java

@@ -11,6 +11,7 @@
 package de.ellpeck.actuallyadditions.mod.tile;
 
 import de.ellpeck.actuallyadditions.mod.ActuallyAdditions;
+import de.ellpeck.actuallyadditions.mod.blocks.ActuallyBlocks;
 import de.ellpeck.actuallyadditions.mod.inventory.ContainerXPSolidifier;
 import de.ellpeck.actuallyadditions.mod.items.ActuallyItems;
 import de.ellpeck.actuallyadditions.mod.items.ItemSolidifiedExperience;
@@ -50,7 +51,7 @@ public class TileEntityXPSolidifier extends TileEntityInventoryBase implements I
     private int singlePointAmount;
 
     public TileEntityXPSolidifier() {
-        super(ActuallyTiles.XPSOLIDIFIER_TILE.get(), 2);
+        super(ActuallyBlocks.XP_SOLIDIFIER.getTileEntityType(), 2);
     }
 
     /*