Merge branch '1.20.4' into feature/jade

TheMCBrothers · Feb 26, 2024 · 7592682 · 7592682
2 parents 7779920 + 5167942
commit 7592682
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/changelog.md b/changelog.md
@@ -1,3 +1,6 @@
+## 1.0.1
+- Fixed bug [#17 - Energy Slots not working](https://github.com/TheMCBrothers/Useful-Machinery/issues/17)
+
 ## 1.0.0
 - Migration to NeoForge 
 - Updated to 1.20.4

diff --git a/gradle.properties b/gradle.properties
@@ -8,7 +8,7 @@ org.gradle.debug=false
 mod_id=usefulmachinery
 mod_name=Useful Machinery
 mod_license=MIT License
-mod_version=1.0.0
+mod_version=1.0.1
 mod_group_id=net.themcbrothers
 mod_authors=TheMCBrothers
 mod_description=It adds simple machines for processing stuff

diff --git a/src/main/java/net/themcbrothers/usefulmachinery/block/entity/AbstractMachineBlockEntity.java b/src/main/java/net/themcbrothers/usefulmachinery/block/entity/AbstractMachineBlockEntity.java
@@ -221,7 +221,7 @@ protected void receiveEnergyFromSlot(int slotIndex) {
 
  if (energy != null && energy.canExtract()) {
  int maxExtract = this.energyStorage.receiveEnergy(Integer.MAX_VALUE, true);
- int accepted = energy.receiveEnergy(maxExtract, false);
+ int accepted = energy.extractEnergy(maxExtract, false);
 
  this.energyStorage.growEnergy(accepted);
  }