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.1
+mod_version=1.10.3
 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

@@ -42,6 +42,7 @@
   "cakesticklib.item.placeable": "§7Can be placed",
   "cakesticklib.jei.copper_oxidation": "Copper Oxidation Info",
   "cakesticklib.jei.patina_drop": "§7Drop %s§7 items every scrape",
+  "cakesticklib.jei.strippable": "Block Strippable Info",
   "cakesticklib.provider.every_tick": "Generate %s %s every tick",
   "cakesticklib.provider.generic": "Generate %s %s every %d ticks",
   "cakesticklib.redstone_acid.tip": "§7Oxidize copper blocks",

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

@@ -11,15 +11,15 @@
 
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.Level;
-import net.neoforged.neoforge.transfer.item.ItemStackResourceHandler;
+import net.neoforged.neoforge.transfer.item.ItemStacksResourceHandler;
 
 public interface UpgradeInstallable {
 
     boolean tryAddUpgrade(ItemStack item);
 
     Level getLevel();
 
-    ItemStackResourceHandler getUpgradeItemStorage();
+    ItemStacksResourceHandler getUpgradeItemStorage();
 
     List<Integer> getUpgradeSlots();
 

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

@@ -0,0 +1,63 @@
+package com.devdyna.cakesticklib.api.compat.jei;
+
+import java.util.function.Function;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.GuiGraphicsExtractor;
+import net.minecraft.client.gui.screens.inventory.InventoryScreen;
+import net.minecraft.util.Mth;
+import net.minecraft.world.entity.EntitySpawnReason;
+import net.minecraft.world.entity.EntityType;
+import net.minecraft.world.entity.LivingEntity;
+
+public class EntityJei {
+
+    public static <ENTITY extends LivingEntity> void renderEntity(EntityType<ENTITY> type,
+            GuiGraphicsExtractor g, int x, int y, int xo, int yo, double mouseX,
+            double mouseY) {
+        renderEntity(type, g, x, y, xo, yo, e -> e, mouseX, mouseY);
+    }
+
+    public static <ENTITY extends LivingEntity> void renderEntity(EntityType<ENTITY> type,
+            GuiGraphicsExtractor g, int x, int y, int xo, int yo, Function<ENTITY, ENTITY> c, double mouseX,
+            double mouseY) {
+
+        var level = Minecraft.getInstance().level;
+
+        if (level == null)
+            return;
+
+        var entity = type.create(level, EntitySpawnReason.EVENT);
+
+        if (entity == null)
+            return;
+
+        entity = c.apply(entity);
+
+        xo = Math.max(xo, 1);
+        yo = Math.max(yo, 1);
+
+        var pose = g.pose();
+        var left = pose.m20();
+        var top = pose.m21();
+
+        var x1 = (int) left + x;
+        var y1 = (int) top + y;
+        var x2 = (int) left + xo + x;
+        var y2 = (int) top + yo + y;
+
+        var entH = entity.getBbHeight();
+        var entW = entity.getBbWidth();
+
+        var scale = Mth.clamp(
+                Math.min((y2 - y1) / entH, (x2 - x1) / Mth.sqrt(entW * entW + entH * entH)), 6.0F, 18.0F);
+
+        InventoryScreen.extractEntityInInventoryFollowsMouse(
+                g,
+                x1, y1, x2, y2,
+                (int) scale,
+                ((y2 - y1) - entH * scale) / 2 / scale,
+                (int) (mouseX + left), (int) (mouseY + top),
+                entity);
+    }
+}

src/main/java/com/devdyna/cakesticklib/api/gui/BaseScreen.java

@@ -2,6 +2,8 @@
 
 import javax.annotation.Nullable;
 
+import com.devdyna.cakesticklib.api.utils.x;
+
 import net.minecraft.client.gui.GuiGraphicsExtractor;
 import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
 import net.minecraft.client.renderer.RenderPipelines;
@@ -21,6 +23,8 @@ public BaseScreen(T menu, Inventory playerInventory, Component title) {
         return null;
     }
 
+    public static final Identifier furnace_arrow = x.mcLoc("container/furnace/burn_progress");
+
     protected boolean whenAnimateArrow() {
         return false;
     }
@@ -29,7 +33,6 @@ protected int getScaledArrowProgress() {
         return 0;
     }
 
-
     @Override
     public void extractBackground(GuiGraphicsExtractor graphics, int mouseX, int mouseY, float a) {
         super.extractBackground(graphics, mouseX, mouseY, a);
@@ -40,9 +43,12 @@ public void extractBackground(GuiGraphicsExtractor graphics, int mouseX, int mou
 
     protected void renderArrow(GuiGraphicsExtractor guiGraphics) {
         if (arrow() != null && whenAnimateArrow())
-            guiGraphics.blit(arrow(), getLeftPos() + 73, getTopPos() + 35, 0, 0, getScaledArrowProgress(), 16, 24, 16);
+            guiGraphics.blitSprite(RenderPipelines.GUI_TEXTURED,
+                    arrow(),
+                    24, 16,
+                    0, 0,
+                    getLeftPos() + 73, getTopPos() + 35,
+                    getScaledArrowProgress(), 16);
     }
 
-
-
 }

src/main/java/com/devdyna/cakesticklib/api/utils/LootTableHelper.java

@@ -0,0 +1,45 @@
+package com.devdyna.cakesticklib.api.utils;
+
+import java.util.List;
+
+import net.minecraft.core.registries.Registries;
+import net.minecraft.resources.Identifier;
+import net.minecraft.resources.ResourceKey;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.level.storage.loot.LootParams;
+import net.minecraft.world.level.storage.loot.LootTable;
+import net.minecraft.world.level.storage.loot.parameters.LootContextParamSets;
+
+public class LootTableHelper {
+
+    public static LootTable getLootTable(Level level, Identifier rl) {
+        return level.getServer().reloadableRegistries()
+                .getLootTable(ResourceKey
+                        .create(Registries.LOOT_TABLE, rl));
+    }
+
+    public static List<ItemStack> getItemStackFromLootTable(ServerLevel level, Identifier rl) {
+        return getLootTable(level, rl).getRandomItems(new LootParams.Builder(level).create(LootContextParamSets.EMPTY));
+    }
+
+    public static List<ItemStack> getItemStackFromLootTable(ServerLevel level, Identifier rl, LootParams p) {
+        return getLootTable(level, rl).getRandomItems(p);
+    }
+
+    public static LootTable getLootTable(Level level, ResourceKey<LootTable> rk) {
+        return level.getServer().reloadableRegistries()
+                .getLootTable(rk);
+    }
+
+    public static List<ItemStack> getItemStackFromLootTable(ServerLevel level, ResourceKey<LootTable> rk) {
+        return getLootTable(level, rk).getRandomItems(new LootParams.Builder(level).create(LootContextParamSets.EMPTY));
+    }
+
+    public static List<ItemStack> getItemStackFromLootTable(ServerLevel level, ResourceKey<LootTable> rk,
+            LootParams p) {
+        return getLootTable(level, rk).getRandomItems(p);
+    }
+
+}

src/main/java/com/devdyna/cakesticklib/api/utils/x.java

@@ -499,19 +499,22 @@ public static Item[] toItems(Block... blocks) {
     }
 
     public static List<Optional<Reference<Block>>> getBlocks(DataMapType<Block, ?> datamap) {
-        return BuiltInRegistries.BLOCK.getDataMap(datamap).entrySet()
-                .stream()
-                .map(Map.Entry::getKey)
-                .map(ResourceKey::identifier)
-                .map(BuiltInRegistries.BLOCK::get).toList();
+        return getFrom(BuiltInRegistries.BLOCK, datamap);
     }
 
     public static List<Optional<Reference<Item>>> getItems(DataMapType<Item, ?> datamap) {
-        return BuiltInRegistries.ITEM.getDataMap(datamap).entrySet()
+        return getFrom(BuiltInRegistries.ITEM, datamap);
+    }
+
+    public static <T> List<Optional<Reference<T>>> getFrom(
+            DefaultedRegistry<T> registry,
+            DataMapType<T, ?> datamap) {
+        return registry.getDataMap(datamap).entrySet()
                 .stream()
                 .map(Map.Entry::getKey)
                 .map(ResourceKey::identifier)
-                .map(BuiltInRegistries.ITEM::get).toList();
+                .map(registry::get)
+                .toList();
     }
 
 }

src/main/java/com/devdyna/cakesticklib/setup/compat/jei/PluginJEI.java

@@ -7,6 +7,7 @@
 import com.devdyna.cakesticklib.api.utils.x;
 import com.devdyna.cakesticklib.setup.Client;
 import com.devdyna.cakesticklib.setup.compat.jei.categories.CopperOxidationCategory;
+import com.devdyna.cakesticklib.setup.compat.jei.categories.StrippableCategory;
 import com.devdyna.cakesticklib.setup.registry.*;
 
 import mezz.jei.api.IModPlugin;
@@ -43,7 +44,8 @@ public void registerCategories(IRecipeCategoryRegistration r) {
 
         r.addRecipeCategories(
 
-                new CopperOxidationCategory(helper)
+                new CopperOxidationCategory(helper),
+                new StrippableCategory(helper)
 
         );
 
@@ -55,6 +57,8 @@ public void registerRecipes(IRecipeRegistration r) {
         r.addRecipes(CopperOxidationCategory.TYPE,
                 getRecipes(LibRecipeTypes.COPPER_OXIDATION.getType()));
 
+        r.addRecipes(StrippableCategory.TYPE, StrippableCategory.getRecipes());
+
     }
 
     private <C extends RecipeInput, T extends Recipe<C>> List<RecipeHolder<T>> getRecipes(RecipeType<T> type) {

src/main/java/com/devdyna/cakesticklib/setup/compat/jei/categories/CopperOxidationCategory.java

@@ -74,7 +74,7 @@ public Size setXY() {
 
     @Override
     public Identifier setBackGround() {
-        return x.rl(MODULE_ID, "textures/gui/jei/oxidation.png");
+        return x.rl(MODULE_ID, "textures/gui/jei/catalyst.png");
     }
 
     @Override