aboutsummaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/at/hannibal2/skyhanni/config/features/garden/composter/ComposterConfig.java2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterOverlay.kt8
2 files changed, 5 insertions, 5 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/garden/composter/ComposterConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/garden/composter/ComposterConfig.java
index a2be38643..2d3da1ce5 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/garden/composter/ComposterConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/garden/composter/ComposterConfig.java
@@ -55,7 +55,7 @@ public class ComposterConfig {
@Expose
@ConfigOption(name = "Retrieve From", desc = "Change where to retrieve the materials from in the composter overlay: The Bazaar or Sacks.")
@ConfigEditorDropdown()
- public RetrieveFromEntry retrieveFrom = RetrieveFromEntry.BAZAAR;
+ public RetrieveFromEntry retrieveFrom = RetrieveFromEntry.SACKS;
public enum RetrieveFromEntry implements HasLegacyId {
BAZAAR("Bazaar", 0),
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterOverlay.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterOverlay.kt
index c9ff17c5b..bdbc94ee7 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterOverlay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterOverlay.kt
@@ -469,8 +469,8 @@ object ComposterOverlay {
}
private fun retrieveMaterials(internalName: NEUInternalName, itemName: String, itemsNeeded: Int) {
- if (itemsNeeded == 0 || internalName.equals("BIOFUEL")) return
- if (config.retrieveFrom == ComposterConfig.RetrieveFromEntry.BAZAAR && !LorenzUtils.noTradeMode) {
+ if (itemsNeeded == 0) return
+ if (config.retrieveFrom == ComposterConfig.RetrieveFromEntry.BAZAAR && !LorenzUtils.noTradeMode && !internalName.equals("BIOFUEL")) {
BazaarApi.searchForBazaarItem(itemName, itemsNeeded)
return
}
@@ -485,9 +485,9 @@ object ComposterOverlay {
val sackStatus = sackItem.getStatus()
if (sackStatus == SackStatus.MISSING || sackStatus == SackStatus.OUTDATED) {
- if (sackStatus == SackStatus.OUTDATED) LorenzUtils.sendCommandToServer("gfs ${internalName.asString()} ${itemsNeeded - having}")
+ LorenzUtils.sendCommandToServer("gfs ${internalName.asString()} ${itemsNeeded - having}")
// TODO Add sack type repo data
- val sackType = if (internalName.equals("VOLTA") || internalName.equals("OIL_BARREL")) "Mining"
+ val sackType = if (internalName.equals("VOLTA") || internalName.equals("OIL_BARREL") || internalName.equals("BIOFUEL")) "Mining §eor §9Dwarven"
else "Enchanted Agronomy"
LorenzUtils.clickableChat(
"Sacks could not be loaded. Click here and open your §9$sackType Sack §eto update the data!",