Fixed oversight where a default implementation class was used instead of an interface.

Author: MartinSVK12

all/gradle.properties

@@ -1 +1 @@
-mod_version=1.3.9
+mod_version=1.3.10

energy/gradle.properties

@@ -1,6 +1,6 @@
 org.gradle.jvmargs=-Xmx2G
 
 # Mod
-mod_version=1.0.7
+mod_version=1.0.8
 mod_group=sunsetsatellite
 mod_name=catalyst-energy

energy/src/main/java/sunsetsatellite/catalyst/energy/impl/TileEntityEnergyConductor.java

@@ -7,6 +7,7 @@
 import sunsetsatellite.catalyst.core.util.Connection;
 import sunsetsatellite.catalyst.core.util.Direction;
 import sunsetsatellite.catalyst.energy.api.IEnergy;
+import sunsetsatellite.catalyst.energy.api.IEnergyItem;
 import sunsetsatellite.catalyst.energy.api.IEnergySink;
 import sunsetsatellite.catalyst.energy.api.IEnergySource;
 
@@ -58,13 +59,13 @@ public int provide(Direction dir, int amount, boolean test) {
 
     @Override
     public int provide(ItemStack stack, int amount, boolean test){
-        if(stack.getItem() instanceof ItemEnergyContainer){
+        if(stack.getItem() instanceof IEnergyItem){
             int provided = Math.min(this.energy, Math.min(this.maxProvide, amount));
-            int received = ((ItemEnergyContainer) stack.getItem()).receive(stack,amount,true);
+            int received = ((IEnergyItem) stack.getItem()).receive(stack,amount,true);
             int actual = Math.min(provided,received);
             if(!test){
                 energy -= actual;
-                ((ItemEnergyContainer) stack.getItem()).receive(stack,actual,false);
+                ((IEnergyItem) stack.getItem()).receive(stack,actual,false);
             }
             return actual;
         }
@@ -73,13 +74,13 @@ public int provide(ItemStack stack, int amount, boolean test){
 
     @Override
     public int receive(ItemStack stack, int amount, boolean test){
-        if(stack.getItem() instanceof ItemEnergyContainer){
+        if(stack.getItem() instanceof IEnergyItem){
             int received = Math.min(this.capacity - this.energy, Math.min(this.maxReceive, amount));
-            int provided = ((ItemEnergyContainer) stack.getItem()).provide(stack,amount,true);
+            int provided = ((IEnergyItem) stack.getItem()).provide(stack,amount,true);
             int actual = Math.min(provided,received);
             if(!test){
                 energy += actual;
-                ((ItemEnergyContainer) stack.getItem()).provide(stack,actual,false);
+                ((IEnergyItem) stack.getItem()).provide(stack,actual,false);
             }
             return actual;
         }

energy/src/main/java/sunsetsatellite/catalyst/energy/impl/TileEntityEnergyContainer.java

@@ -8,6 +8,7 @@
 import net.minecraft.core.player.inventory.IInventory;
 import sunsetsatellite.catalyst.core.util.Connection;
 import sunsetsatellite.catalyst.core.util.Direction;
+import sunsetsatellite.catalyst.energy.api.IEnergyItem;
 
 public class TileEntityEnergyContainer extends TileEntityEnergyConductor
     implements IInventory {
@@ -25,15 +26,13 @@ public TileEntityEnergyContainer(){
     @Override
     public void tick() {
         super.tick();
-        if(getStackInSlot(1) != null && getStackInSlot(1).getItem() instanceof ItemEnergyContainer){
+        if(getStackInSlot(1) != null && getStackInSlot(1).getItem() instanceof IEnergyItem){
             ItemStack stack = getStackInSlot(1);
-            ItemEnergyContainer item = (ItemEnergyContainer) getStackInSlot(1).getItem();
-            provide(stack,getMaxProvide(),false);
+			provide(stack,getMaxProvide(),false);
         }
-        if(getStackInSlot(0) != null && getStackInSlot(0).getItem() instanceof ItemEnergyContainer) {
+        if(getStackInSlot(0) != null && getStackInSlot(0).getItem() instanceof IEnergyItem) {
             ItemStack stack = getStackInSlot(0);
-            ItemEnergyContainer item = (ItemEnergyContainer) getStackInSlot(0).getItem();
-            receive(stack,getMaxReceive(),false);
+			receive(stack,getMaxReceive(),false);
         }
     }
 

energy/src/main/java/sunsetsatellite/catalyst/energy/impl/TileEntityEnergySink.java

@@ -5,6 +5,7 @@
 import net.minecraft.core.item.ItemStack;
 import sunsetsatellite.catalyst.core.util.Connection;
 import sunsetsatellite.catalyst.core.util.Direction;
+import sunsetsatellite.catalyst.energy.api.IEnergyItem;
 import sunsetsatellite.catalyst.energy.api.IEnergySink;
 
 public class TileEntityEnergySink extends TileEntityEnergy implements IEnergySink {
@@ -25,13 +26,13 @@ public int receive(Direction dir, int amount, boolean test) {
 
     @Override
     public int receive(ItemStack stack, int amount, boolean test){
-        if(stack.getItem() instanceof ItemEnergyContainer){
+        if(stack.getItem() instanceof IEnergyItem){
             int received = Math.min(this.capacity - this.energy, Math.min(this.maxReceive, amount));
-            int provided = ((ItemEnergyContainer) stack.getItem()).provide(stack,amount,true);
+            int provided = ((IEnergyItem) stack.getItem()).provide(stack,amount,true);
             int actual = Math.min(provided,received);
             if(!test){
                 energy += actual;
-                ((ItemEnergyContainer) stack.getItem()).provide(stack,actual,false);
+                ((IEnergyItem) stack.getItem()).provide(stack,actual,false);
             }
             return actual;
         }

energy/src/main/java/sunsetsatellite/catalyst/energy/impl/TileEntityEnergySource.java

@@ -5,6 +5,7 @@
 import net.minecraft.core.item.ItemStack;
 import sunsetsatellite.catalyst.core.util.Connection;
 import sunsetsatellite.catalyst.core.util.Direction;
+import sunsetsatellite.catalyst.energy.api.IEnergyItem;
 import sunsetsatellite.catalyst.energy.api.IEnergySource;
 
 public class TileEntityEnergySource extends TileEntityEnergy implements IEnergySource {
@@ -24,13 +25,13 @@ public int provide(Direction dir, int amount, boolean test) {
 
     @Override
     public int provide(ItemStack stack, int amount, boolean test){
-        if(stack.getItem() instanceof ItemEnergyContainer){
+        if(stack.getItem() instanceof IEnergyItem){
             int provided = Math.min(this.energy, Math.min(this.maxProvide, amount));
-            int received = ((ItemEnergyContainer) stack.getItem()).receive(stack,amount,true);
+            int received = ((IEnergyItem) stack.getItem()).receive(stack,amount,true);
             int actual = Math.min(provided,received);
             if(!test){
                 energy -= actual;
-                ((ItemEnergyContainer) stack.getItem()).receive(stack,actual,false);
+                ((IEnergyItem) stack.getItem()).receive(stack,actual,false);
             }
             return actual;
         }