Remove IBlockEE, rename some mroe classes to use Base instead of EE a…

…s a suffix (when its a base class)

src/main/java/com/pahimar/ee3/block/BlockAlchemicalFuel.java

@@ -1,6 +1,6 @@
 package com.pahimar.ee3.block;
 
-import com.pahimar.ee3.block.base.BlockEnumBase;
+import com.pahimar.ee3.block.base.BlockEnum;
 import com.pahimar.ee3.block.base.IEnumMeta;
 import net.minecraft.block.properties.PropertyEnum;
 import net.minecraft.block.state.BlockStateContainer;
@@ -13,7 +13,7 @@
 
 import java.util.List;
 
-public class BlockAlchemicalFuel extends BlockEnumBase {
+public class BlockAlchemicalFuel extends BlockEnum {
 
     public static final PropertyEnum<FuelVariant> VARIANT = PropertyEnum.create("variant", FuelVariant.class);
 

src/main/java/com/pahimar/ee3/block/BlockCalciner.java

@@ -1,6 +1,6 @@
 package com.pahimar.ee3.block;
 
-import com.pahimar.ee3.block.base.BlockContainerBase;
+import com.pahimar.ee3.block.base.BlockTileEntity;
 import com.pahimar.ee3.tileentity.TileEntityCalciner;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.tileentity.TileEntity;
@@ -12,7 +12,7 @@
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
-public class BlockCalciner extends BlockContainerBase {
+public class BlockCalciner extends BlockTileEntity {
 
     private static final AxisAlignedBB AABB_CALCINER = new AxisAlignedBB(0.1D, 0.0D, 0.1D, 0.9D, 1.0D, 0.9D);
 

src/main/java/com/pahimar/ee3/block/BlockGlassBell.java

@@ -1,6 +1,6 @@
 package com.pahimar.ee3.block;
 
-import com.pahimar.ee3.block.base.BlockContainerBase;
+import com.pahimar.ee3.block.base.BlockTileEntity;
 import com.pahimar.ee3.tileentity.TileEntityGlassBell;
 import net.minecraft.block.properties.PropertyDirection;
 import net.minecraft.block.state.BlockStateContainer;
@@ -16,7 +16,7 @@
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
-public class BlockGlassBell extends BlockContainerBase {
+public class BlockGlassBell extends BlockTileEntity {
 
     private static final AxisAlignedBB AABB_FACING_UP = new AxisAlignedBB(0.125D, 0.0D, 0.125D, 0.875D, 0.66D, 0.875D);
     private static final AxisAlignedBB AABB_FACING_DOWN = new AxisAlignedBB(0.125D, 0.33D, 0.125D, 0.875D, 1.0D, 0.875D);

src/main/java/com/pahimar/ee3/block/base/BlockBase.java

@@ -11,7 +11,7 @@
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
-public abstract class BlockBase extends Block implements IBlockEE {
+public abstract class BlockBase extends Block {
 
     private final String BASE_NAME;
 

src/main/java/com/pahimar/ee3/block/base/BlockEnumBase.java → src/main/java/com/pahimar/ee3/block/base/BlockEnum.java

@@ -10,15 +10,15 @@
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
-public abstract class BlockEnumBase extends BlockBase {
+public abstract class BlockEnum extends BlockBase {
 
     private final IEnumMeta[] VARIANTS;
 
-    public BlockEnumBase(String name, IEnumMeta[] variants) {
+    public BlockEnum(String name, IEnumMeta[] variants) {
         this(name, Material.ROCK, variants);
     }
 
-    public BlockEnumBase(String name, Material material, IEnumMeta[] variants) {
+    public BlockEnum(String name, Material material, IEnumMeta[] variants) {
         super(name, material);
         if (variants.length > 0) {
             VARIANTS = variants;

src/main/java/com/pahimar/ee3/block/base/BlockTileEntity.java

@@ -0,0 +1,15 @@
+package com.pahimar.ee3.block.base;
+
+import net.minecraft.block.ITileEntityProvider;
+import net.minecraft.block.material.Material;
+
+public abstract class BlockTileEntity extends BlockBase implements ITileEntityProvider {
+
+    public BlockTileEntity(String name) {
+        this(name, Material.ROCK);
+    }
+
+    public BlockTileEntity(String name, Material material) {
+        super(name, material);
+    }
+}

src/main/java/com/pahimar/ee3/init/ModBlocks.java

@@ -4,8 +4,7 @@
 import com.pahimar.ee3.block.BlockAlchemicalFuel;
 import com.pahimar.ee3.block.BlockCalciner;
 import com.pahimar.ee3.block.BlockGlassBell;
-import com.pahimar.ee3.block.base.IBlockEE;
-import net.minecraft.block.Block;
+import com.pahimar.ee3.block.base.BlockBase;
 import net.minecraftforge.fml.common.registry.GameRegistry;
 
 import java.util.ArrayList;
@@ -15,21 +14,19 @@
 @GameRegistry.ObjectHolder(EquivalentExchange3.MOD_ID)
 public class ModBlocks {
 
-    private static final List<Block> BLOCKS = new ArrayList<>();
+    private static final List<BlockBase> BLOCKS = new ArrayList<>();
 
-    public static final Block CALCINER = new BlockCalciner();
-    public static final Block ALCHEMICAL_FUEL = new BlockAlchemicalFuel();
-    public static final Block GLASS_BELL = new BlockGlassBell();
+    public static final BlockBase CALCINER = new BlockCalciner();
+    public static final BlockBase ALCHEMICAL_FUEL = new BlockAlchemicalFuel();
+    public static final BlockBase GLASS_BELL = new BlockGlassBell();
 
     private ModBlocks() {}
 
-    public static Collection<Block> getBlocks() {
+    public static Collection<BlockBase> getBlocks() {
         return BLOCKS;
     }
 
-    public static void register(Block block) {
-        if (block instanceof IBlockEE) {
-            BLOCKS.add(block);
-        }
+    public static void register(BlockBase block) {
+        BLOCKS.add(block);
     }
 }

src/main/java/com/pahimar/ee3/init/ModItems.java

@@ -2,7 +2,7 @@
 
 import com.pahimar.ee3.EquivalentExchange3;
 import com.pahimar.ee3.item.*;
-import com.pahimar.ee3.item.base.ItemEE;
+import com.pahimar.ee3.item.base.ItemBase;
 import net.minecraftforge.fml.common.registry.GameRegistry;
 
 import java.util.ArrayList;
@@ -12,21 +12,21 @@
 @GameRegistry.ObjectHolder(EquivalentExchange3.MOD_ID)
 public class ModItems {
 
-    private static final List<ItemEE> ITEMS = new ArrayList<>();
+    private static final List<ItemBase> ITEMS = new ArrayList<>();
 
-    public static final ItemEE CHALK = new ItemChalk();
-    public static final ItemEE ALCHEMICAL_FUEL = new ItemAlchemicalFuel();
-    public static final ItemEE ALCHENOMICON = new ItemAlchenomicon();
-    public static final ItemEE ALCHEMICAL_DUST = new ItemAlchemicalDust();
-    public static final ItemEE ALCHEMICAL_BAG = new ItemAlchemicalBag();
+    public static final ItemBase CHALK = new ItemChalk();
+    public static final ItemBase ALCHEMICAL_FUEL = new ItemAlchemicalFuel();
+    public static final ItemBase ALCHENOMICON = new ItemAlchenomicon();
+    public static final ItemBase ALCHEMICAL_DUST = new ItemAlchemicalDust();
+    public static final ItemBase ALCHEMICAL_BAG = new ItemAlchemicalBag();
 
     private ModItems() {}
 
-    public static Collection<ItemEE> getItems() {
+    public static Collection<ItemBase> getItems() {
         return ITEMS;
     }
 
-    public static void register(ItemEE item) {
+    public static void register(ItemBase item) {
         ITEMS.add(item);
     }
 }

src/main/java/com/pahimar/ee3/item/ItemAlchemicalBag.java

@@ -1,6 +1,6 @@
 package com.pahimar.ee3.item;
 
-import com.pahimar.ee3.item.base.ItemEE;
+import com.pahimar.ee3.item.base.ItemBase;
 import com.pahimar.ee3.reference.Messages;
 import com.pahimar.ee3.reference.Names;
 import com.pahimar.ee3.util.IOwnable;
@@ -19,7 +19,7 @@
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
-public class ItemAlchemicalBag extends ItemEE implements IOwnable, IItemColor {
+public class ItemAlchemicalBag extends ItemBase implements IOwnable, IItemColor {
 
     private static final String[] VARIANTS = {"alchemical_bag_closed", "alchemical_bag_open"};
 

src/main/java/com/pahimar/ee3/item/ItemAlchemicalDust.java

@@ -1,13 +1,13 @@
 package com.pahimar.ee3.item;
 
-import com.pahimar.ee3.item.base.ItemEE;
+import com.pahimar.ee3.item.base.ItemBase;
 import com.pahimar.ee3.reference.Colors;
 import net.minecraft.client.renderer.color.IItemColor;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
-public class ItemAlchemicalDust extends ItemEE implements IItemColor {
+public class ItemAlchemicalDust extends ItemBase implements IItemColor {
 
     public ItemAlchemicalDust() {
         super("alchemical_dust", "ash", "minium_dust");

src/main/java/com/pahimar/ee3/item/ItemAlchemicalFuel.java

@@ -1,8 +1,8 @@
 package com.pahimar.ee3.item;
 
-import com.pahimar.ee3.item.base.ItemEE;
+import com.pahimar.ee3.item.base.ItemBase;
 
-public class ItemAlchemicalFuel extends ItemEE {
+public class ItemAlchemicalFuel extends ItemBase {
 
     public ItemAlchemicalFuel() {
         super("alchemical_fuel", "alchemical_coal", "mobius_fuel", "aeternalis_fuel");

src/main/java/com/pahimar/ee3/item/ItemAlchenomicon.java

@@ -1,7 +1,7 @@
 package com.pahimar.ee3.item;
 
 import com.pahimar.ee3.EquivalentExchange3;
-import com.pahimar.ee3.item.base.ItemEE;
+import com.pahimar.ee3.item.base.ItemBase;
 import com.pahimar.ee3.reference.GUIs;
 import com.pahimar.ee3.reference.Messages;
 import com.pahimar.ee3.util.ItemStackUtils;
@@ -13,7 +13,7 @@
 import net.minecraft.util.text.TextComponentTranslation;
 import net.minecraft.world.World;
 
-public class ItemAlchenomicon extends ItemEE {
+public class ItemAlchenomicon extends ItemBase {
 
     public ItemAlchenomicon() {
         super("alchenomicon");

src/main/java/com/pahimar/ee3/item/ItemChalk.java

@@ -1,8 +1,8 @@
 package com.pahimar.ee3.item;
 
-import com.pahimar.ee3.item.base.ItemEE;
+import com.pahimar.ee3.item.base.ItemBase;
 
-public class ItemChalk extends ItemEE {
+public class ItemChalk extends ItemBase {
 
     public ItemChalk() {
         super("chalk");

src/main/java/com/pahimar/ee3/item/base/IItemVariantHolder.java

@@ -2,7 +2,7 @@
 
 import net.minecraft.client.renderer.ItemMeshDefinition;
 
-public interface IItemVariantHolder<T extends ItemEE> {
+public interface IItemVariantHolder<T extends ItemBase> {
 
     T getItem();
 

src/main/java/com/pahimar/ee3/item/base/ItemEE.java → src/main/java/com/pahimar/ee3/item/base/ItemBase.java

@@ -16,12 +16,12 @@
 import java.util.ArrayList;
 import java.util.List;
 
-public class ItemEE extends Item implements IItemVariantHolder<ItemEE> {
+public class ItemBase extends Item implements IItemVariantHolder<ItemBase> {
 
     private final String BASE_NAME;
     private final String[] VARIANTS;
 
-    public ItemEE(String name, String ... variants) {
+    public ItemBase(String name, String ... variants) {
 
         super();
         setRegistryName(name);
@@ -96,7 +96,7 @@ public void initModelsAndVariants() {
     }
 
     @Override
-    public ItemEE getItem() {
+    public ItemBase getItem() {
         return this;
     }
 

src/main/java/com/pahimar/ee3/item/base/ItemBlockEnumEE.java → src/main/java/com/pahimar/ee3/item/base/ItemBlockEnum.java

@@ -1,14 +1,14 @@
 package com.pahimar.ee3.item.base;
 
-import com.pahimar.ee3.block.base.BlockEnumBase;
+import com.pahimar.ee3.block.base.BlockEnum;
 import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
 
-public class ItemBlockEnumEE extends ItemBlock {
+public class ItemBlockEnum extends ItemBlock {
 
-    protected final BlockEnumBase block;
+    protected final BlockEnum block;
 
-    public ItemBlockEnumEE(BlockEnumBase block) {
+    public ItemBlockEnum(BlockEnum block) {
         super(block);
         this.block = block;
         this.setMaxDamage(0);

src/main/java/com/pahimar/ee3/proxy/ClientProxy.java

@@ -1,14 +1,14 @@
 package com.pahimar.ee3.proxy;
 
 import com.pahimar.ee3.EquivalentExchange3;
-import com.pahimar.ee3.block.base.IBlockEE;
+import com.pahimar.ee3.block.base.BlockBase;
 import com.pahimar.ee3.client.handler.ItemTooltipEventHandler;
 import com.pahimar.ee3.client.handler.KeyInputEventHandler;
 import com.pahimar.ee3.client.settings.Keybindings;
 import com.pahimar.ee3.client.util.ClientParticleHelper;
 import com.pahimar.ee3.init.ModBlocks;
 import com.pahimar.ee3.init.ModItems;
-import com.pahimar.ee3.item.base.ItemEE;
+import com.pahimar.ee3.item.base.ItemBase;
 import com.pahimar.ee3.settings.ChalkSettings;
 import net.minecraft.client.renderer.color.IItemColor;
 import net.minecraft.util.EnumParticleTypes;
@@ -35,10 +35,8 @@ public void onPreInit(FMLPreInitializationEvent event) {
         super.onPreInit(event);
 
         // Initialize models and textures
-        ModItems.getItems().forEach(ItemEE::initModelsAndVariants);
-        ModBlocks.getBlocks().stream()
-                .filter(block -> block instanceof IBlockEE)
-                .forEach(block -> ((IBlockEE) block).initModelsAndVariants());
+        ModItems.getItems().forEach(ItemBase::initModelsAndVariants);
+        ModBlocks.getBlocks().forEach(BlockBase::initModelsAndVariants);
         OBJLoader.INSTANCE.addDomain(EquivalentExchange3.MOD_ID);
 
         // Register keybindings