1.20.6 fixes

AntiCope · May 8, 2024 · 8b51588 · 8b51588
1 parent 0f6227b
commit 8b51588
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/main/java/anticope/rejects/gui/screens/StatsScreen.java b/src/main/java/anticope/rejects/gui/screens/StatsScreen.java
@@ -48,7 +48,7 @@ private void updateData() {
             WSection effectList = add(theme.section("Status Effects", effectListExpanded)).expandX().widget();
             effectList.action = () -> effectListExpanded = effectList.isExpanded();
             liv.getActiveStatusEffects().forEach((effect, instance) -> {
-                String status = lang.get(effect.getIdAsString());
+                String status = lang.get(effect.value().getTranslationKey());
                 float tps = TickRate.INSTANCE.getTickRate();
                 if (instance.getAmplifier() != 0) {
                     status += (String.format(" %d (%s)", instance.getAmplifier()+1, StatusEffectUtil.getDurationText(instance, 1, tps)));
@@ -64,7 +64,7 @@ private void updateData() {
             WSection attribList = add(theme.section("Attributes", attribListExpanded)).expandX().widget();
             attribList.action = () -> attribListExpanded = attribList.isExpanded();
             liv.getAttributes().getTracked().forEach((attrib) -> attribList.add(theme.label(String.format("%s: %.2f",
-                lang.get(attrib.getAttribute().getIdAsString()),
+                lang.get(attrib.getAttribute().value().getTranslationKey()),
                 attrib.getValue()
             ))).expandX());
         }

diff --git a/src/main/java/anticope/rejects/modules/AutoFarm.java b/src/main/java/anticope/rejects/modules/AutoFarm.java
@@ -261,7 +261,7 @@ private boolean isMature(BlockState state, Block block) {
         } else if (block instanceof StemBlock) {
             return state.get(StemBlock.AGE) == StemBlock.MAX_AGE;
         } else if (block instanceof SweetBerryBushBlock sweetBerryBushBlock) {
-            return state.get(sweetBerryBushBlock.AGE) >= 3;
+            return state.get(sweetBerryBushBlock.AGE) >= 2;
         } else if (block instanceof NetherWartBlock netherWartBlock) {
             return state.get(netherWartBlock.AGE) >= 3;
         }
@@ -283,7 +283,8 @@ private boolean harvestFilter(Block block) {
                 block == Blocks.PUMPKIN ||
                 block == Blocks.MELON ||
                 block == Blocks.NETHER_WART ||
-                block == Blocks.SWEET_BERRY_BUSH;
+                block == Blocks.SWEET_BERRY_BUSH ||
+                block == Blocks.COCOA;
     }
 
     private boolean plantFilter(Item item) {