From c2693b9b210066d28d4ca9395076b9436b22baa8 Mon Sep 17 00:00:00 2001
From: Michael Hillcox <michaelhillcox@gmail.com>
Date: Sat, 28 Nov 2020 12:36:16 +0000
Subject: [PATCH] removed: BlackLotus (per spec)

---
 .../common/blocks/ActuallyBlocks.java                  |  2 --
 .../common/blocks/plant/BlackLotusBlock.java           | 10 ----------
 .../actuallyadditions/data/GeneratorBlockStates.java   |  1 -
 .../actuallyadditions/data/GeneratorLanguage.java      |  1 -
 4 files changed, 14 deletions(-)
 delete mode 100644 src/main/java/de/ellpeck/actuallyadditions/common/blocks/plant/BlackLotusBlock.java

diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/ActuallyBlocks.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/ActuallyBlocks.java
index 6c9ae4fe9..1ad9f7008 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/ActuallyBlocks.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/ActuallyBlocks.java
@@ -6,7 +6,6 @@ import de.ellpeck.actuallyadditions.common.blocks.building.CrystalClusterBlock;
 import de.ellpeck.actuallyadditions.common.blocks.building.WallBlock;
 import de.ellpeck.actuallyadditions.common.blocks.functional.*;
 import de.ellpeck.actuallyadditions.common.blocks.misc.TinyTorchBlock;
-import de.ellpeck.actuallyadditions.common.blocks.plant.BlackLotusBlock;
 import de.ellpeck.actuallyadditions.common.blocks.plant.PlantBlock;
 import de.ellpeck.actuallyadditions.common.blocks.types.Crystals;
 import de.ellpeck.actuallyadditions.common.blocks.types.LaserRelays;
@@ -29,7 +28,6 @@ public class ActuallyBlocks {
     public static final DeferredRegister<Block> BLOCKS = DeferredRegister.create(ForgeRegistries.BLOCKS, ActuallyAdditions.MOD_ID);
 
     // Plant!
-    public static final RegistryObject<Block> BLACK_LOTUS = BLOCKS.register("black_lotus_block", BlackLotusBlock::new);
     public static final RegistryObject<Block> RICE = BLOCKS.register("rice_block", () -> new PlantBlock(1, 2));
     public static final RegistryObject<Block> CANOLA = BLOCKS.register("canola_block", () -> new PlantBlock(2, 3));
     public static final RegistryObject<Block> FLAX = BLOCKS.register("flax_block", () -> new PlantBlock(2, 4));
diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/plant/BlackLotusBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/plant/BlackLotusBlock.java
deleted file mode 100644
index c26b1b24b..000000000
--- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/plant/BlackLotusBlock.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package de.ellpeck.actuallyadditions.common.blocks.plant;
-
-import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlock;
-import net.minecraft.block.material.Material;
-
-public class BlackLotusBlock extends ActuallyBlock {
-    public BlackLotusBlock() {
-        super(Properties.create(Material.ROCK));
-    }
-}
diff --git a/src/main/java/de/ellpeck/actuallyadditions/data/GeneratorBlockStates.java b/src/main/java/de/ellpeck/actuallyadditions/data/GeneratorBlockStates.java
index 5be1fc867..29384d44b 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/data/GeneratorBlockStates.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/data/GeneratorBlockStates.java
@@ -54,7 +54,6 @@ public class GeneratorBlockStates extends BlockStateProvider {
         buildCubeAll(ActuallyBlocks.CRYSTAL_EMPOWERED_VOID);
         buildCubeAll(ActuallyBlocks.CRYSTAL_EMPOWERED_EMERADIC);
         buildCubeAll(ActuallyBlocks.CRYSTAL_EMPOWERED_ENORI);
-        buildCubeAll(ActuallyBlocks.BLACK_LOTUS);
         buildCubeAll(ActuallyBlocks.ENERGY_LASER_RELAY);
         buildCubeAll(ActuallyBlocks.ENERGY_LASER_RELAY_ADVANCED);
         buildCubeAll(ActuallyBlocks.ENERGY_LASER_RELAY_EXTREME);
diff --git a/src/main/java/de/ellpeck/actuallyadditions/data/GeneratorLanguage.java b/src/main/java/de/ellpeck/actuallyadditions/data/GeneratorLanguage.java
index e54d8ba2f..ea8727582 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/data/GeneratorLanguage.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/data/GeneratorLanguage.java
@@ -13,7 +13,6 @@ public class GeneratorLanguage extends LanguageProvider {
     @Override
     protected void addTranslations() {
         // Blocks (kill me)
-        addBlock(ActuallyBlocks.BLACK_LOTUS, "Black lotus");
         addBlock(ActuallyBlocks.RICE, "Rice");
         addBlock(ActuallyBlocks.CANOLA, "Canola");
         addBlock(ActuallyBlocks.FLAX, "Flax");