things and stuff

Author: JaisDK

gradle.properties

@@ -29,7 +29,7 @@ mod_name=Productive Lib
 # The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default.
 mod_license=All Rights Reserved
 # The mod version. See https://semver.org/
-mod_version=1.21.0-0.1.17
+mod_version=1.21.0-0.1.24
 # The group ID for the mod. It is only important when publishing as an artifact to a Maven repository.
 # This should match the base package used for the mod sources.
 # See https://maven.apache.org/guides/mini/guide-naming-conventions.html

src/main/java/cy/jdkdigital/productivelib/common/block/entity/IUpgradeableBlockEntity.java

@@ -24,7 +24,7 @@ default int getUpgradeCount(Item item) {
         if (handler != null) {
             for (int slot = 0; slot < handler.getSlots(); ++slot) {
                 ItemStack stack = handler.getStackInSlot(slot);
-                if (stack.getItem().equals(item)) {
+                if (stack.is(item)) {
                     numberOfUpgrades.getAndIncrement();
                 }
             }
@@ -37,7 +37,7 @@ default List<ItemStack> getInstalledUpgrades(@Nullable Item upgradeItem) {
         IItemHandler handler = getUpgradeHandler();
         if (handler != null) {
             for (int slot = 0; slot < handler.getSlots(); ++slot) {
-                if (upgradeItem == null || handler.getStackInSlot(slot).getItem().equals(upgradeItem)) {
+                if (upgradeItem == null || handler.getStackInSlot(slot).is(upgradeItem)) {
                     upgrades.add(handler.getStackInSlot(slot));
                 }
             }

src/main/java/cy/jdkdigital/productivelib/common/block/entity/InventoryHandlerHelper.java

@@ -8,6 +8,7 @@
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
+import cy.jdkdigital.productivelib.ProductiveLib;
 import cy.jdkdigital.productivelib.common.item.AbstractUpgradeItem;
 import cy.jdkdigital.productivelib.event.CollectValidUpgradesEvent;
 import net.minecraft.core.HolderLookup;
@@ -210,7 +211,7 @@ public boolean canFitStacks(List<ItemStack> stacks) {
             List<Integer> usedSlots = new ArrayList<>();
             for (ItemStack stack : stacks) {
                 int slot = getAvailableOutputSlot(this, stack, usedSlots);
-                if (slot == 0) {
+                if (slot < 0) {
                     return false;
                 }
             }

src/main/java/cy/jdkdigital/productivelib/common/item/AbstractUpgradeItem.java

@@ -30,7 +30,9 @@ public InteractionResult useOn(UseOnContext context) {
                     if (handler instanceof InventoryHandlerHelper.UpgradeHandler upgradeHandler && upgradeHandler.isValidUpgrade(context.getItemInHand())) {
                         for (int slot = 0; slot < handler.getSlots(); ++slot) {
                             if (handler.getStackInSlot(slot).equals(ItemStack.EMPTY)) {
-                                handler.insertItem(slot, new ItemStack(context.getItemInHand().getItem()), false);
+                                var upgradeStack = context.getItemInHand().copy();
+                                upgradeStack.setCount(1);
+                                handler.insertItem(slot, upgradeStack, false);
                                 hasInsertedUpgrade.set(true);
                                 break;
                             }

src/main/java/cy/jdkdigital/productivelib/event/ClientModEventHandler.java

@@ -26,6 +26,7 @@ public class LibItems
     public static final DeferredHolder<Item, ? extends Item> UPGRADE_ANTI_TELEPORT = createItem("upgrade_anti_teleport", () -> new UpgradeItem((new Item.Properties())));
     public static final DeferredHolder<Item, ? extends Item> UPGRADE_BLOCK = createItem("upgrade_block", () -> new UpgradeItem((new Item.Properties())));
     public static final DeferredHolder<Item, ? extends Item> UPGRADE_STABILITY = createItem("upgrade_stability", () -> new UpgradeItem((new Item.Properties())));
+    public static final DeferredHolder<Item, ? extends Item> UPGRADE_POLLEN_SIEVE = createItem("upgrade_pollen_sieve", () -> new UpgradeItem((new Item.Properties())));
 
     public static <I extends Item> DeferredHolder<Item, I> createItem(String name, Supplier<? extends I> supplier) {
         return ProductiveLib.ITEMS.register(name, supplier);

src/main/java/cy/jdkdigital/productivelib/registry/LibItems.java

@@ -91,4 +91,13 @@ public static int blend(int a, int b, float f) {
 
         return A << 24 | R << 16 | G << 8 | B;
     }
+
+    public static int darkenColor(int color, float ratio){
+        int a = (color >> 24) & 0xFF;
+        int r = (int) (((color >> 16) & 0xFF) * ratio);
+        int g = (int) (((color >> 8) & 0xFF) * ratio);
+        int b = (int) ((color & 0xFF) * ratio);
+
+        return (a << 24) | (r << 16) | (g << 8) | b;
+    }
 }

src/main/java/cy/jdkdigital/productivelib/util/ColorUtil.java

@@ -14,6 +14,21 @@ public class LangUtil
         put("Peach", "Peaches");
         put("Copoazu", "Copoazu");
         put("Cempedak", "Cempedak");
+        put("Potatos", "Potatoes");
+        put("Kadsura", "Kadsura");
+        put("Blackberry", "Blackberries");
+        put("Blueberry", "Blueberries");
+        put("Boysenberry", "Boysenberries");
+        put("Cloudberry", "Cloudberries");
+        put("Cranberry", "Cranberries");
+        put("Golden Raspberry", "Golden Raspberries");
+        put("Gooseberry", "Gooseberries");
+        put("Huckleberry", "Huckleberries");
+        put("Lingoberry", "Lingoberries");
+        put("Miracle Berry", "Miracle Berries");
+        put("Raspberry", "Raspberries");
+        put("Thimbleberry", "Thimbleberries");
+        put("Thimbleberry", "Thimbleberries");
     }};
 
     public static String capName(String name) {

src/main/java/cy/jdkdigital/productivelib/util/LangUtil.java

@@ -62,9 +62,10 @@ public static MultiBlockData detectStructure(Level level, BlockPos controllerPos
             while (height < maxHeight && !level.getBlockState(bottomCornerRelativePosition.move(Direction.DOWN)).is(bottomBlocks)) {
                 height++;
             }
+            height++;
 
             if (!level.getBlockState(bottomCornerRelativePosition).is(bottomBlocks)) {
-                throw new InvalidStructureException("Invalid bottom starting block", topCorners.getFirst().relative(controllerFacing.getOpposite()).relative(controllerFacing.getCounterClockWise()).mutable());
+                throw new InvalidStructureException("Invalid or missing bottom starting block. Valid blocks are " + bottomBlocks, topCorners.getFirst().relative(controllerFacing.getOpposite()).relative(controllerFacing.getCounterClockWise()).mutable());
             }
 
             // validate bottom
@@ -76,7 +77,7 @@ public static MultiBlockData detectStructure(Level level, BlockPos controllerPos
                 return uniformBottom ? !level.getBlockState(pos).is(firstBottomBlock.get().getBlock()) : !level.getBlockState(pos).is(bottomBlocks);
             }).toList();
             if (!notBottomBlocks.isEmpty()) {
-                throw new InvalidStructureException("Invalid bottom block", notBottomBlocks.getFirst());
+                throw new InvalidStructureException("Invalid or missing bottom block." + (uniformBottom ? "All bottom blocks must be of the same type." : ""), notBottomBlocks.getFirst());
             }
         } else {
             // check how far the wall under the controller continues
@@ -95,18 +96,21 @@ public static MultiBlockData detectStructure(Level level, BlockPos controllerPos
 
         // validate each ring between top and bottom
         for (int i = 1; i <= height; i++) {
-            // skip validating lowest ring if corners can be empty
-            if (optionalCorners && i == height) continue;
+            // skip validating lowest ring if corners can be empty and there's no wall block in the start position
+            if (optionalCorners && i == height && !level.getBlockState(top.below(i)).is(wallBlocks)) continue;
             findStructureSliceCorners(level, controllerPos, controllerFacing.getClockWise(), top.below(i), wallBlocks, optionalCorners, maxCirc, peripherals);
         }
 
-        int volume = (int) BlockPos.betweenClosedStream(topCorners.getFirst().relative(controllerFacing.getOpposite()).relative(controllerFacing.getCounterClockWise()), topCorners.getSecond().relative(controllerFacing).relative(controllerFacing.getClockWise()).below(height)).count();
+        int volume = (int) BlockPos.betweenClosedStream(topCorners.getFirst().relative(controllerFacing.getOpposite()).relative(controllerFacing.getCounterClockWise()), topCorners.getSecond().relative(controllerFacing).relative(controllerFacing.getClockWise()).below(height - 1)).count();
         if (volume > maxVolume) {
             throw new InvalidStructureException("Internal structure area is too big " + volume + "/" + maxVolume, controllerPos);
         }
 
         if (hollow) {
-            List<BlockPos> notAirBlocks = BlockPos.betweenClosedStream(topCorners.getFirst().relative(controllerFacing.getOpposite()).relative(controllerFacing.getCounterClockWise()), topCorners.getSecond().relative(controllerFacing).relative(controllerFacing.getClockWise()).below(height)).filter(pos -> !level.getBlockState(pos).isAir()).toList();
+            List<BlockPos> notAirBlocks = BlockPos.betweenClosedStream(
+                    topCorners.getFirst().relative(controllerFacing.getOpposite()).relative(controllerFacing.getCounterClockWise()),
+                    topCorners.getSecond().relative(controllerFacing).relative(controllerFacing.getClockWise()).below(height - 1)
+            ).filter(pos -> !level.getBlockState(pos).isAir()).toList();
             if (!notAirBlocks.isEmpty()) {
                 throw new InvalidStructureException("Internal structure area is not clear", notAirBlocks.getFirst());
             }

src/main/java/cy/jdkdigital/productivelib/util/MultiBlockDetector.java

@@ -18,7 +18,7 @@ license="${mod_license}"
     file="META-INF/accesstransformer.cfg"
 
 [[mixins]]
-    config="productivelib.mixin.json"
+    config="${mod_id}.mixin.json"
 
 [[mods]]
     modId="${mod_id}"