Refactor packages; fix mapping crashes; fix UI textures

.gitignore

@@ -32,3 +32,4 @@ Thumbs.db
 .DS_Store
 local.properties
 .directory
+**.png~

build.gradle

@@ -6,7 +6,7 @@ sourceCompatibility = 1.8
 targetCompatibility = 1.8
 
 archivesBaseName = "vivatech"
-version = "1.0.0-alpha.13+1.14.4"
+version = "1.0.0-alpha.14+1.14.4"
 
 repositories {
     jcenter()

src/main/java/vivatech/api/block/AbstractMachineBlock.java

@@ -16,7 +16,7 @@
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Direction;
 import net.minecraft.world.World;
-import vivatech.api.entity.AbstractMachineEntity;
+import vivatech.api.block.entity.AbstractMachineBlockEntity;
 
 public abstract class AbstractMachineBlock extends Block implements BlockEntityProvider, AttributeProvider {
     public static final DirectionProperty FACING = Properties.HORIZONTAL_FACING;
@@ -55,8 +55,8 @@ public void onBlockRemoved(BlockState stateFrom, World world, BlockPos pos, Bloc
     @Override
     public void addAllAttributes(World world, BlockPos pos, BlockState state, AttributeList<?> to) {
         BlockEntity be = world.getBlockEntity(pos);
-        if (be instanceof AbstractMachineEntity) {
-            to.offer(((AbstractMachineEntity) be).getEnergy());
+        if (be instanceof AbstractMachineBlockEntity) {
+            to.offer(((AbstractMachineBlockEntity) be).getEnergy());
         }
     }
 }

src/main/java/vivatech/api/entity/AbstractMachineEntity.java → src/main/java/vivatech/api/block/entity/AbstractMachineBlockEntity.java

@@ -1,4 +1,4 @@
-package vivatech.api.entity;
+package vivatech.api.block.entity;
 
 import io.github.cottonmc.cotton.gui.PropertyDelegateHolder;
 import io.github.cottonmc.energy.api.EnergyAttribute;
@@ -17,18 +17,18 @@
 import vivatech.common.Vivatech;
 import vivatech.api.block.AbstractMachineBlock;
 
-public abstract class AbstractMachineEntity extends BlockEntity implements Tickable, SidedInventory, PropertyDelegateHolder,
+public abstract class AbstractMachineBlockEntity extends BlockEntity implements Tickable, SidedInventory, PropertyDelegateHolder,
         BlockEntityClientSerializable, EnergyAttributeProvider {
     protected DefaultedList<ItemStack> inventory = DefaultedList.ofSize(getInvSize(), ItemStack.EMPTY);
     protected SimpleEnergyAttribute energy = new SimpleEnergyAttribute(getMaxEnergy(), Vivatech.INFINITE_VOLTAGE) {
         @Override
-        public boolean canInsertEnergy() { return AbstractMachineEntity.this.canInsertEnergy(); }
+        public boolean canInsertEnergy() { return AbstractMachineBlockEntity.this.canInsertEnergy(); }
 
         @Override
-        public boolean canExtractEnergy() { return AbstractMachineEntity.this.canExtractEnergy(); }
+        public boolean canExtractEnergy() { return AbstractMachineBlockEntity.this.canExtractEnergy(); }
     };
 
-    public AbstractMachineEntity(BlockEntityType<?> type) {
+    public AbstractMachineBlockEntity(BlockEntityType<?> type) {
         super(type);
     }
 

src/main/java/vivatech/api/block/entity/AbstractTieredMachineBlockEntity.java

@@ -0,0 +1,22 @@
+package vivatech.api.block.entity;
+
+import net.minecraft.block.Block;
+import net.minecraft.block.entity.BlockEntityType;
+import vivatech.api.block.ITieredBlock;
+import vivatech.api.util.BlockTier;
+
+public abstract class AbstractTieredMachineBlockEntity extends AbstractMachineBlockEntity implements ITieredBlockEntity {
+	public AbstractTieredMachineBlockEntity(BlockEntityType<?> type) {
+		super(type);
+	}
+
+	@Override
+	public BlockTier getTier() {
+		Block block = world.getBlockState(pos).getBlock();
+		if (block instanceof ITieredBlock) {
+			return ((ITieredBlock) block).getTier();
+		} else {
+			return BlockTier.MINIMAL;
+		}
+	}
+}

src/main/java/vivatech/api/block/entity/IConduitBlockEntity.java

@@ -0,0 +1,9 @@
+package vivatech.api.block.entity;
+
+public interface IConduitBlockEntity extends ITieredBlockEntity {
+    int BASE_TRANSFER_RATE = 50;
+
+    default int getTransferRate() {
+        return (int) (BASE_TRANSFER_RATE * getTier().getEnergyMultiplier());
+    }
+}

src/main/java/vivatech/api/block/entity/ITieredBlockEntity.java

@@ -0,0 +1,7 @@
+package vivatech.api.block.entity;
+
+import vivatech.api.util.BlockTier;
+
+public interface ITieredBlockEntity {
+    BlockTier getTier();
+}

src/main/java/vivatech/common/block/CoalGeneratorBlock.java

@@ -12,7 +12,7 @@
 import net.minecraft.world.World;
 import vivatech.common.Vivatech;
 import vivatech.api.block.AbstractMachineBlock;
-import vivatech.common.entity.CoalGeneratorEntity;
+import vivatech.common.block.entity.CoalGeneratorBlockEntity;
 
 public class CoalGeneratorBlock extends AbstractMachineBlock {
     public static final Identifier ID = new Identifier(Vivatech.MODID, "coal_generator");
@@ -34,6 +34,6 @@ public boolean activate(BlockState state, World world, BlockPos pos, PlayerEntit
     // BlockEntityProvider
     @Override
     public BlockEntity createBlockEntity(BlockView blockView) {
-        return new CoalGeneratorEntity();
+        return new CoalGeneratorBlockEntity();
     }
 }

src/main/java/vivatech/common/block/CrusherBlock.java

@@ -12,7 +12,7 @@
 import net.minecraft.world.World;
 import vivatech.common.Vivatech;
 import vivatech.api.block.AbstractTieredMachineBlock;
-import vivatech.common.entity.CrusherEntity;
+import vivatech.common.block.entity.CrusherBlockEntity;
 import vivatech.api.util.BlockTier;
 import vivatech.util.TierHelper;
 
@@ -38,7 +38,7 @@ public boolean activate(BlockState state, World world, BlockPos pos, PlayerEntit
     // BlockEntityProvider
     @Override
     public BlockEntity createBlockEntity(BlockView blockView) {
-        return new CrusherEntity();
+        return new CrusherBlockEntity();
     }
 
     // ITieredBlock

src/main/java/vivatech/common/block/ElectricFurnaceBlock.java

@@ -12,7 +12,7 @@
 import net.minecraft.world.World;
 import vivatech.common.Vivatech;
 import vivatech.api.block.AbstractTieredMachineBlock;
-import vivatech.common.entity.ElectricFurnaceEntity;
+import vivatech.common.block.entity.ElectricFurnaceBlockEntity;
 import vivatech.api.util.BlockTier;
 import vivatech.util.TierHelper;
 
@@ -38,7 +38,7 @@ public boolean activate(BlockState state, World world, BlockPos pos, PlayerEntit
     // BlockEntityProvider
     @Override
     public BlockEntity createBlockEntity(BlockView blockView) {
-        return new ElectricFurnaceEntity();
+        return new ElectricFurnaceBlockEntity();
     }
 
 	@Override

src/main/java/vivatech/common/block/EnergyBankBlock.java

@@ -12,7 +12,7 @@
 import net.minecraft.world.World;
 import vivatech.common.Vivatech;
 import vivatech.api.block.AbstractMachineBlock;
-import vivatech.common.entity.EnergyBankEntity;
+import vivatech.common.block.entity.EnergyBankBlockEntity;
 
 public class EnergyBankBlock extends AbstractMachineBlock {
     public static final Identifier ID = new Identifier(Vivatech.MODID, "energy_bank");
@@ -34,6 +34,6 @@ public boolean activate(BlockState state, World world, BlockPos pos, PlayerEntit
     // BlockEntityProvider
     @Override
     public BlockEntity createBlockEntity(BlockView blockView) {
-        return new EnergyBankEntity();
+        return new EnergyBankBlockEntity();
     }
 }

src/main/java/vivatech/common/block/EnergyConduitBlock.java

@@ -30,7 +30,7 @@
 import vivatech.api.block.ITieredBlock;
 import vivatech.api.util.BlockTier;
 import vivatech.common.Vivatech;
-import vivatech.common.entity.EnergyConduitEntity;
+import vivatech.common.block.entity.EnergyConduitBlockEntity;
 import vivatech.util.TierHelper;
 
 import javax.annotation.Nullable;
@@ -204,7 +204,7 @@ public boolean canConnect(Direction direction) {
     @Nullable
     @Override
     public BlockEntity createBlockEntity(BlockView var1) {
-        return new EnergyConduitEntity();
+        return new EnergyConduitBlockEntity();
     }
 
     // ITieredBlock

src/main/java/vivatech/common/block/PressBlock.java

@@ -12,7 +12,7 @@
 import net.minecraft.world.World;
 import vivatech.common.Vivatech;
 import vivatech.api.block.AbstractTieredMachineBlock;
-import vivatech.common.entity.PressEntity;
+import vivatech.common.block.entity.PressBlockEntity;
 import vivatech.api.util.BlockTier;
 import vivatech.util.TierHelper;
 
@@ -43,6 +43,6 @@ public boolean activate(BlockState state, World world, BlockPos pos, PlayerEntit
     // BlockEntityProvider
     @Override
     public BlockEntity createBlockEntity(BlockView blockView) {
-        return new PressEntity();
+        return new PressBlockEntity();
     }
 }

src/main/java/vivatech/common/entity/CoalGeneratorEntity.java → src/main/java/vivatech/common/block/entity/CoalGeneratorBlockEntity.java

@@ -1,4 +1,4 @@
-package vivatech.common.entity;
+package vivatech.common.block.entity;
 
 import alexiil.mc.lib.attributes.Simulation;
 import net.minecraft.block.entity.AbstractFurnaceBlockEntity;
@@ -8,13 +8,13 @@
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.util.math.Direction;
 import vivatech.common.Vivatech;
-import vivatech.api.entity.AbstractMachineEntity;
+import vivatech.api.block.entity.AbstractMachineBlockEntity;
 import vivatech.common.init.VivatechEntities;
 import vivatech.util.EnergyHelper;
 
 import javax.annotation.Nullable;
 
-public class CoalGeneratorEntity extends AbstractMachineEntity {
+public class CoalGeneratorBlockEntity extends AbstractMachineBlockEntity {
     private static final int GENERATE_PER_TICK = 1;
     private static final int TICK_PER_GENERATE = 5;
     private int burnTime = 0;
@@ -63,7 +63,7 @@ public int size() {
     };
 
 
-    public CoalGeneratorEntity() {
+    public CoalGeneratorBlockEntity() {
         super(VivatechEntities.COAL_GENERATOR);
     }
 

src/main/java/vivatech/common/entity/CrusherEntity.java → src/main/java/vivatech/common/block/entity/CrusherBlockEntity.java

@@ -1,4 +1,4 @@
-package vivatech.common.entity;
+package vivatech.common.block.entity;
 
 import javax.annotation.Nullable;
 
@@ -8,13 +8,13 @@
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.util.math.Direction;
 import vivatech.common.Vivatech;
-import vivatech.api.entity.AbstractTieredMachineEntity;
+import vivatech.api.block.entity.AbstractTieredMachineBlockEntity;
 import vivatech.common.init.VivatechEntities;
 import vivatech.common.init.VivatechRecipes;
 import vivatech.common.recipe.CrushingRecipe;
 import vivatech.api.util.BlockTier;
 
-public class CrusherEntity extends AbstractTieredMachineEntity {
+public class CrusherBlockEntity extends AbstractTieredMachineBlockEntity {
 
     public static final int CONSUME_PER_TICK = 1;
     public static final int TICK_PER_CONSUME = 5;
@@ -63,7 +63,7 @@ public int size() {
         }
     };
 
-    public CrusherEntity() {
+    public CrusherBlockEntity() {
         super(VivatechEntities.CRUSHER);
     }
 

src/main/java/vivatech/common/entity/ElectricFurnaceEntity.java → src/main/java/vivatech/common/block/entity/ElectricFurnaceBlockEntity.java

@@ -1,4 +1,4 @@
-package vivatech.common.entity;
+package vivatech.common.block.entity;
 
 import javax.annotation.Nullable;
 
@@ -11,11 +11,11 @@
 import net.minecraft.recipe.SmeltingRecipe;
 import net.minecraft.util.math.Direction;
 import vivatech.common.Vivatech;
-import vivatech.api.entity.AbstractTieredMachineEntity;
+import vivatech.api.block.entity.AbstractTieredMachineBlockEntity;
 import vivatech.common.init.VivatechEntities;
 import vivatech.api.util.BlockTier;
 
-public class ElectricFurnaceEntity extends AbstractTieredMachineEntity {
+public class ElectricFurnaceBlockEntity extends AbstractTieredMachineBlockEntity {
     private static final int TICK_PER_CONSUME = 5;
     private static final int CONSUME_PER_TICK = 2;
     private int cookTime = 0;
@@ -63,7 +63,7 @@ public int size() {
         }
     };
 
-    public ElectricFurnaceEntity() {
+    public ElectricFurnaceBlockEntity() {
     	super(VivatechEntities.ELECTRIC_FURNACE);
     }
 

src/main/java/vivatech/common/entity/EnergyBankEntity.java → src/main/java/vivatech/common/block/entity/EnergyBankBlockEntity.java

@@ -1,17 +1,17 @@
-package vivatech.common.entity;
+package vivatech.common.block.entity;
 
 import io.github.cottonmc.energy.api.EnergyAttribute;
 import io.github.cottonmc.energy.api.EnergyAttributeProviderItem;
 import net.minecraft.container.PropertyDelegate;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.math.Direction;
-import vivatech.api.entity.AbstractMachineEntity;
+import vivatech.api.block.entity.AbstractMachineBlockEntity;
 import vivatech.common.init.VivatechEntities;
 import vivatech.util.EnergyHelper;
 
 import javax.annotation.Nullable;
 
-public class EnergyBankEntity extends AbstractMachineEntity {
+public class EnergyBankBlockEntity extends AbstractMachineBlockEntity {
 
     private static final int TRANSFER_PER_TICK = 4;
     private final PropertyDelegate propertyDelegate = new PropertyDelegate() {
@@ -47,7 +47,7 @@ public int size() {
         }
     };
 
-    public EnergyBankEntity() {
+    public EnergyBankBlockEntity() {
         super(VivatechEntities.ENERGY_BANK);
     }