Dev

gradle.properties

@@ -12,7 +12,7 @@ neo_version=26.1.2.44-beta
 mod_id=cakesticklib
 mod_name=CakeStickLib
 mod_license=Ora Et Labora License
-mod_version=1.10.3
+mod_version=1.11
 mod_group_id=com.devdyna.cakestick
 mod_authors=DevDyna
 mod_description=A standalone port of Synergy API to unify most of the code

src/generated/resources/assets/cakesticklib/lang/en_us.json

@@ -40,6 +40,17 @@
   "cakesticklib.item.crafting_ingredient": "§7Crafting Ingredient",
   "cakesticklib.item.disabled": "§7Item-Form unobtainable",
   "cakesticklib.item.placeable": "§7Can be placed",
+  "cakesticklib.jei.alias.block.break": "Block Breaker",
+  "cakesticklib.jei.alias.drill": "Drill",
+  "cakesticklib.jei.alias.entity.killer": "Entity killer",
+  "cakesticklib.jei.alias.entity.mover": "Entity Mover",
+  "cakesticklib.jei.alias.fakeplayer": "FakePlayer",
+  "cakesticklib.jei.alias.hopper": "Hopper",
+  "cakesticklib.jei.alias.item.collector": "Item Collector",
+  "cakesticklib.jei.alias.miner": "Miner",
+  "cakesticklib.jei.alias.redstone.sensible": "Redstone Sensible",
+  "cakesticklib.jei.alias.tree.cutter": "Tree cutter",
+  "cakesticklib.jei.alias.tree.feller": "Tree feller",
   "cakesticklib.jei.copper_oxidation": "Copper Oxidation Info",
   "cakesticklib.jei.patina_drop": "§7Drop %s§7 items every scrape",
   "cakesticklib.jei.strippable": "Block Strippable Info",

src/main/java/com/devdyna/cakesticklib/api/ItemLogisticUtils.java

@@ -0,0 +1,57 @@
+package com.devdyna.cakesticklib.api;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.entity.item.ItemEntity;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.level.Level;
+
+public class ItemLogisticUtils {
+
+    public static ArrayList<ItemStack> unifyDrops(List<ItemStack>... itemLists) {
+        ArrayList<ItemStack> newItems = new ArrayList<>();
+
+        for (List<ItemStack> items : itemLists) {
+            for (ItemStack incoming : items) {
+
+                boolean found = false;
+
+                for (int i = 0; i < newItems.size(); i++) {
+                    ItemStack existing = newItems.get(i);
+
+                    if (existing.getItem() == incoming.getItem() && existing.getCount() < existing.getMaxStackSize()) {
+
+                        int newCount = Math.min(existing.getMaxStackSize(), existing.getCount() + incoming.getCount());
+
+                        newItems.set(i, new ItemStack(existing.getItem(), newCount));
+                        found = true;
+                        break;
+                    }
+                }
+
+                if (!found) {
+                    newItems.add(new ItemStack(incoming.getItem(), incoming.getCount()));
+                }
+            }
+        }
+
+        return newItems;
+    }
+
+    public static void createLazyItemEntity(ItemStack stack, Level l, BlockPos pos, int lifespan, boolean noMotion) {
+        var item = new ItemEntity(l,
+                pos.getX() + 0.5f,
+                pos.getY() + 0.5f,
+                pos.getZ() + 0.5f,
+                stack);
+
+        item.lifespan = lifespan;
+        if (noMotion)
+            item.setDeltaMovement(0, 0, 0);
+
+        l.addFreshEntity(item);
+    }
+
+}

src/main/java/com/devdyna/cakesticklib/api/RandomUtil.java

@@ -3,11 +3,26 @@
 import net.minecraft.world.level.Level;
 
 public class RandomUtil {
+
+    /**
+     * @param chance must be inside {@code [ 0 <-> 100 ]}
+     */
     public static boolean chance(Level level, int chance) {
         return level.getRandom().nextInt(100) < chance;
     }
 
+    /**
+     * @param chance must be inside {@code [ 0.0f <-> 1.0f ]}
+     */
+    public static boolean chance(Level level, double chance) {
+        return level.getRandom().nextDouble() < chance;
+    }
+
     public static boolean rnd50(Level level) {
         return level.getRandom().nextBoolean();
     }
+
+    public static double between(Level l, double min, double max) {
+        return min + l.getRandom().nextDouble() * (max - min);
+    }
 }

src/main/java/com/devdyna/cakesticklib/api/aspect/logic/EnvironmentModifier.java

@@ -0,0 +1,11 @@
+package com.devdyna.cakesticklib.api.aspect.logic;
+
+public interface EnvironmentModifier {
+    abstract float getSpeedModifier();
+
+    abstract boolean isRequired();
+
+    default String failDescKey() {
+        return "";//TODO IMP : when defaul fall on errored jade
+    }
+}

src/main/java/com/devdyna/cakesticklib/api/aspect/logic/FluidClearableTank.java

@@ -0,0 +1,39 @@
+package com.devdyna.cakesticklib.api.aspect.logic;
+
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.InteractionResult;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.phys.BlockHitResult;
+import net.neoforged.neoforge.capabilities.Capabilities;
+import net.neoforged.neoforge.transfer.transaction.Transaction;
+
+public interface FluidClearableTank {
+
+    default InteractionResult useItemToClear(BlockState blockState, Level level,
+            BlockPos blockPos, Player player, BlockHitResult blockHitResult) {
+
+        // if (!player.isCrouching())
+        // return InteractionResult.FAIL;
+
+        if (level.isClientSide())
+            return InteractionResult.SUCCESS;
+
+        var cap = level.getCapability(Capabilities.Fluid.BLOCK, blockPos,
+                blockHitResult.getDirection());
+
+        if (cap == null)
+            return InteractionResult.FAIL;
+
+        if (cap.getAmountAsInt(0) == 0)
+            return InteractionResult.FAIL;
+
+        try (var tx = Transaction.openRoot()) {
+            cap.extract(0, cap.getResource(0), cap.getAmountAsInt(0), tx);
+            tx.commit();
+        }
+        return InteractionResult.SUCCESS;
+
+    }
+}

src/main/java/com/devdyna/cakesticklib/api/aspect/logic/NoGuiStorage.java

@@ -2,6 +2,8 @@
 
 import java.util.ArrayList;
 
+import com.devdyna.cakesticklib.api.utils.x;
+
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
 import net.minecraft.world.InteractionHand;
@@ -10,6 +12,9 @@
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.Level;
+import net.neoforged.neoforge.transfer.item.ItemResource;
+import net.neoforged.neoforge.transfer.item.ItemStacksResourceHandler;
+import net.neoforged.neoforge.transfer.transaction.Transaction;
 
 public interface NoGuiStorage {
 
@@ -114,4 +119,36 @@ default void spawnItemEntity(Level l, BlockPos p, ItemStack s) {
                 p.getZ() + 0.5,
                 s.copy()));
     }
+
+    ItemStacksResourceHandler getItemStorage();
+
+    default ItemStack simpleInsertItem(ItemStack stack) {
+
+        var inserted = 0;
+
+        try (Transaction tx = Transaction.openRoot()) {
+            inserted = getItemStorage().insert(0, ItemResource.of(stack), stack.getCount(), tx);
+            tx.commit();
+        }
+
+        return x.item(stack.getItem(), stack.getCount() - inserted);
+    }
+
+    default ItemStack simpleExtractItem() {
+
+        var resource = getItemStorage().getResource(0);
+
+        if (resource.isEmpty())
+            return ItemStack.EMPTY;
+
+        try (Transaction tx = Transaction.openRoot()) {
+
+            var extracted = getItemStorage()
+                    .extract(0, resource, getItemStorage().getAmountAsInt(0), tx);
+            tx.commit();
+
+            return resource.toStack(extracted);
+        }
+    }
+
 }

src/main/java/com/devdyna/cakesticklib/api/aspect/logic/SimpleTickerDelay.java

@@ -0,0 +1,8 @@
+package com.devdyna.cakesticklib.api.aspect.logic;
+
+import com.devdyna.cakesticklib.api.primitive.Ticker;
+
+public interface SimpleTickerDelay {
+    abstract Ticker getTicker();
+
+}

src/main/java/com/devdyna/cakesticklib/api/aspect/logic/TimeredRecipe.java

@@ -0,0 +1,6 @@
+package com.devdyna.cakesticklib.api.aspect.logic;
+
+public interface TimeredRecipe extends SimpleTickerDelay {
+    abstract float getTickerSpeed();
+
+}

src/main/java/com/devdyna/cakesticklib/api/compat/jei/JEIAliasesHelper.java

@@ -0,0 +1,40 @@
+package com.devdyna.cakesticklib.api.compat.jei;
+
+import static com.devdyna.cakesticklib.CakeStickLib.MODULE_ID;
+
+import java.util.Arrays;
+import java.util.List;
+
+import com.devdyna.cakesticklib.api.utils.x;
+
+import mezz.jei.api.registration.IIngredientAliasRegistration;
+import net.minecraft.world.level.ItemLike;
+import net.neoforged.neoforge.registries.DeferredHolder;
+
+public class JEIAliasesHelper {
+
+    public static class Aliases {
+        public static final String BLOCK_BREAKER = MODULE_ID + ".jei.alias.block.break";
+        public static final String DRILL = MODULE_ID + ".jei.alias.drill";
+        public static final String MINER = MODULE_ID + ".jei.alias.miner";
+        public static final String TREE_CUTTER = MODULE_ID + ".jei.alias.tree.cutter";
+        public static final String TREE_FELLER = MODULE_ID + ".jei.alias.tree.feller";
+        public static final String ENTITY_KILLER = MODULE_ID + ".jei.alias.entity.killer";
+        public static final String FAKEPLAYER = MODULE_ID + ".jei.alias.fakeplayer";
+        public static final String HOPPER = MODULE_ID + ".jei.alias.hopper";
+        public static final String ITEM_COLLECTOR = MODULE_ID + ".jei.alias.item.collector";
+        public static final String ENTITY_MOVER = MODULE_ID + ".jei.alias.entity.mover";
+        public static final String REDSTONE_SENSIBLE = MODULE_ID + ".jei.alias.redstone.sensible";
+
+    }
+
+    public static void addAlias(IIngredientAliasRegistration r,
+            List<DeferredHolder<? extends ItemLike, ? extends ItemLike>> i,
+            String... alias) {
+
+        i.stream()
+                .map(DeferredHolder::get).map(x::item)
+                .forEach(e -> Arrays.asList(alias).forEach(a -> r.addAlias(e, a)));
+
+    }
+}

src/main/java/com/devdyna/cakesticklib/api/factories/plants/CropEntityInteraction.java

@@ -13,22 +13,22 @@
 
 public interface CropEntityInteraction {
 
-   static List<EntityType<?>> EntityTypeSafe = List.of(EntityType.FOX, EntityType.BEE);
+   static List<EntityType<?>> entityTypeSafe = List.of(EntityType.FOX, EntityType.BEE);
 
    /**
     * By default it dont stuck entity inside
     * <br>
     * <br>
     * To make that you NEED to concat canStuckEntityWhen()
     */
-   boolean HurtWhenInside();
+   boolean hurtWhenInside();
 
-   boolean HurtWhenStep();
+   boolean hurtWhenStep();
 
-   boolean StuckWhenInside();
+   boolean stuckWhenInside();
 
    default boolean stuckCondition(Entity entity) {
-      return entity instanceof LivingEntity && !EntityTypeSafe.contains(entity.getType());
+      return entity instanceof LivingEntity && !entityTypeSafe.contains(entity.getType());
    }
 
    default boolean hurtCondition(Entity entity, Level level) {
@@ -46,14 +46,14 @@ default Vec3 speedFactor() {
    static double hurt = 0.003000000026077032;
 
    default void getEntityInside(BlockState state, ServerLevel level, BlockPos pos, Entity entity) {
-      if (StuckWhenInside())
+      if (stuckWhenInside())
          entity.makeStuckInBlock(state, speedFactor());
-      if (HurtWhenInside())
+      if (hurtWhenInside())
       entity.hurtServer(level, level.damageSources().sweetBerryBush(), 1.0f);
    }
 
    default void getStepEntityOn(ServerLevel level, BlockPos pos, BlockState state, Entity entity) {
-      if (HurtWhenStep())
+      if (hurtWhenStep())
          entity.hurtServer(level, level.damageSources().sweetBerryBush(), 1.0f);
    }
 

src/main/java/com/devdyna/cakesticklib/api/factories/plants/Harvestable.java

@@ -2,9 +2,11 @@
 
 import java.util.List;
 
+import com.devdyna.cakesticklib.api.RandomUtil;
 import com.devdyna.cakesticklib.setup.Config;
 
 import net.minecraft.core.BlockPos;
+import net.minecraft.core.Direction;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.Level;
@@ -13,25 +15,44 @@
 
 public interface Harvestable {
 
-    List<ItemStack> getItemResult(Level level, BlockState state, BlockPos pos, Player player, ItemStack tool);
+    static boolean getConfig() {
+        return Config.HARVESTABLE_ACTION.get();
+    }
+
+    boolean canHarvest(Harvestable.Context ctx);
+
+    List<ItemStack> getItemsResult(Harvestable.Context ctx);
+
+    /**
+     * Called after successfully collect all items , only to remove mature plants
+     */
+    void replant(Harvestable.Context ctx);
+
+    default void simpleAgeResetReplant(Harvestable.Context ctx) {
+        ctx.level().setBlockAndUpdate(ctx.pos(), ctx.state().setValue(getAgeProperty(), 0));
+    }
 
-    int maxAge();
+    default void simpleAgeRedutionReplant(Harvestable.Context ctx) {
+        ctx.level().setBlockAndUpdate(ctx.pos(),
+                ctx.state().setValue(getAgeProperty(),
+                        (int) RandomUtil.between(ctx.level(), 0, getMaxAge() - 2)));
+    }
 
-    boolean canBeHarvested(BlockState state);
+    IntegerProperty getAgeProperty();
 
-    IntegerProperty getPublicAgeProperty();
+    int getMaxAge();
 
-    default boolean harvestCrop(Level level, BlockState state, BlockPos pos, Player player, ItemStack tool) {
-        if (!level.isClientSide() && canBeHarvested(state) && Config.HARVESTABLE_ACTION.get()) {
+    public record Context(Level level, BlockPos pos, Player player) {
+        public static Context of(Level l, BlockPos p, Player e) {
+            return new Context(l, p, e);
+        }
 
-            getItemResult(level, state, pos, player, tool)
-                    .forEach(item -> player.addItem(item));
+        public BlockState state() {
+            return level.getBlockState(pos);
+        }
 
-            level.setBlockAndUpdate(pos,
-                    state.setValue(getPublicAgeProperty(), level.getRandom().nextInt(maxAge() - 2)));
-            return true;
+        public BlockState state(Direction d) {
+            return level.getBlockState(pos.relative(d));
         }
-        return false;
     }
-
 }