From 85548ec3cbbaadc939b92fa947bc2a23eba3aeae Mon Sep 17 00:00:00 2001 From: simon Date: Mon, 1 Jan 2018 15:21:39 -0500 Subject: [PATCH] CHanged default energy value for biomass to 4000 + code styling --- .../main/java/net/simon987/cubotplugin/CubotInventory.java | 5 ++--- Server/src/main/resources/config.properties | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Plugin Cubot/src/main/java/net/simon987/cubotplugin/CubotInventory.java b/Plugin Cubot/src/main/java/net/simon987/cubotplugin/CubotInventory.java index 0f7d4b5..786bd0e 100644 --- a/Plugin Cubot/src/main/java/net/simon987/cubotplugin/CubotInventory.java +++ b/Plugin Cubot/src/main/java/net/simon987/cubotplugin/CubotInventory.java @@ -34,7 +34,6 @@ public class CubotInventory extends CpuHardware { int a = getCpu().getRegisterSet().getRegister("A").getValue(); if (a == INV_POLL) { - getCpu().getRegisterSet().getRegister("B").setValue(cubot.getHeldItem()); } else if (a == INV_CLEAR) { @@ -42,8 +41,8 @@ public class CubotInventory extends CpuHardware { int energy = GameServer.INSTANCE.getConfig().getInt("biomassEnergyValue"); cubot.storeEnergy(energy); cubot.setHeldItem(0); - } - else if (cubot.spendEnergy(100)) { + + } else if (cubot.spendEnergy(100)) { cubot.setHeldItem(0); } } diff --git a/Server/src/main/resources/config.properties b/Server/src/main/resources/config.properties index d6656b0..c26b4d3 100644 --- a/Server/src/main/resources/config.properties +++ b/Server/src/main/resources/config.properties @@ -45,7 +45,7 @@ minBiomassRespawnCount=2 maxBiomassCount=10 maxBiomassRespawnCount=6 # Energy generated by consuming biomass -biomassEnergyValue=1000 +biomassEnergyValue=4000 # Maximum energy of the battery hardware in kJ battery_max_energy=60000 # Time for biomass respawn in ticks