carpet from candy recipe; candy from carpet recipe; bigeye

Author: kismama

src/render/Textures.cs

@@ -39,6 +39,7 @@ public class Textures {
     public readonly BTexture2D zombie;
     public readonly BTexture2D eye;
     public readonly BTexture2D mummy;
+    public readonly BTexture2D bigeye;
 
     // texture pack management
     private readonly List<TexturePack> availablePacks = [];
@@ -90,6 +91,7 @@ public Textures(Silk.NET.OpenGL.Legacy.GL GL) {
         zombie = get("textures/entity/zombie.png");
         eye = get("textures/entity/eye.png");
         mummy = get("textures/entity/mummy.png");
+        bigeye = get("textures/entity/bigeye.png");
 
         reloadAll();
     }

src/render/model/BigEyeModel.cs

@@ -0,0 +1,22 @@
+using BlockGame.main;
+using BlockGame.world;
+using BlockGame.world.entity;
+
+namespace BlockGame.render.model;
+
+public class BigEyeModel : EntityModel {
+    public const int xs = 64;
+    public const int ys = 64;
+
+    public readonly Cube eye = new Cube().pos(0, 0, 0).off(-8, -8, -8).ext(16, 16, 16).tex(0, 0).gen(xs, ys);
+    public readonly Cube tail = new Cube().pos(0, 0, -16).off(-8, -8, -8).ext(16, 16, 16).tex(0, 32).dsided().gen(xs, ys);
+
+
+    public override void render(MatrixStack mat, Entity e, float apos, float aspeed, float scale, double interp) {
+        Game.graphics.tex(0, Game.textures.bigeye);
+
+        var ide = EntityRenderers.ide;
+        eye.xfrender(ide, mat, scale);
+        tail.xfrender(ide, mat, scale);
+    }
+}

src/render/model/DodoModel.cs

@@ -51,10 +51,8 @@ public override void render(MatrixStack mat, Entity e, float apos, float aspeed,
         float lr = MathF.Sin(apos * 10) * 20f * cs * Meth.phiF;
         rightLeg.rotation = new Vector3(0, 0, lr);
         leftLeg.rotation = new Vector3(0, 0, -lr);
-        //rightfoot.position = new Vector3(0, 0, cs);
-        //leftfoot.position = new Vector3(0, 0, -cs);
-
-
+        //rightfoot.position = new Vector3(0, 0, lr);
+        //leftfoot.position = new Vector3(0, 0, -lr);
 
         // render dodo
         var ide = EntityRenderers.ide;

src/render/model/EntityRenderer.cs

@@ -55,5 +55,6 @@ public static void reloadAll() {
         register(Entities.GRENADE, new GrenadeEntityRenderer());
         register(Entities.MUMMY, new MobRenderer<Mummy>(new MummyModel()));
         register(Entities.DODO, new MobRenderer<Dodo>(new DodoModel()));
+        register(Entities.BIGEYE, new MobRenderer<BigEye>(new BigEyeModel()));
     }
 }

src/util/ItemSlot.cs

@@ -199,13 +199,16 @@ public override ItemStack take(int count) {
 
         // use cached recipe from updateResult() to prevent double lookup
         var recipe = craftingGrid.lastMatchedRecipe;
+        Console.WriteLine($"[CraftingResultSlot.take] recipe={recipe?.GetType().Name}, result={result.getItem().name}");
         if (recipe != null && recipe.matches(craftingGrid)) {
+            Console.WriteLine($"[CraftingResultSlot.take] Recipe matches, calling consumeIngredients");
             // recipe still valid - consume ingredients
             recipe.consumeIngredients(craftingGrid);
             craftingGrid.updateResult(); // recalculate to see if we can craft again
             craftingGrid.notifyChanged();
         }
         else {
+            Console.WriteLine($"[CraftingResultSlot.take] Recipe NULL or doesn't match, clearing grid");
             // recipe no longer matches (grid changed or desync) - clear grid and don't give items
             craftingGrid.clearAll();
             craftingGrid.notifyChanged();

src/world/entity/BigEye.cs

@@ -11,7 +11,7 @@ public class BigEye : Hostile {
     protected override bool usePathfinding => false; // handles own flight movement
 
     private const double FLIGHT_SPEED = 1;
-    private const double HOVER_HEIGHT = 18.0; // preferred height above ground
+    private const double HOVER_HEIGHT = 8.0; // preferred height above ground
 
     private Vector3D? flyTarget;
     private int retargetCooldown;

src/world/entity/Entities.cs

@@ -24,7 +24,6 @@ public static class SpawnTypeExt {
  * Added this so we can officially claim to be a factory game. :D
  */
 public class Entities {
-
     public static int PLAYER;
     public static int ITEM_ENTITY;
     public static int FALLING_BLOCK;
@@ -38,6 +37,7 @@ public class Entities {
     public static int EYE;
     public static int MUMMY;
     public static int DODO;
+    public static int BIGEYE;
 
     /** spawn metadata for each entity type */
     public static XUList<SpawnType> spawnType => Registry.ENTITIES.spawnType;
@@ -60,6 +60,7 @@ public static void preLoad() {
         EYE = register("eye", w => new DemonEye(w));
         MUMMY = register("mummy", w => new Mummy(w));
         DODO = register("dodo", w => new Dodo(w));
+        BIGEYE = register("BigEye", w => new BigEye(w));
 
         if (!Net.mode.isDed()) {
             EntityRenderers.reloadAll();
@@ -72,6 +73,7 @@ public static void preLoad() {
         spawnType[EYE] = SpawnType.HOSTILE;
         spawnType[MUMMY] = SpawnType.CAVE;
         spawnType[DODO] = SpawnType.PASSIVE;
+        spawnType[BIGEYE] = SpawnType.HOSTILE;
     }
 
     /**

src/world/item/Recipe.cs

@@ -128,9 +128,10 @@ public static void preLoad() {
         Registry.RECIPES.register("candyblock", new CandyBlockRecipe());
         Registry.RECIPES.register("candydying", new CandyDyeRecipe());
 
-        // carpet mixing (any 2 carpets -> 1 of average colour)
-        Registry.RECIPES.register("carpet", new CarpetRecipe());
-        Registry.RECIPES.register("carpetdying", new CarpetDyeRecipe());
+        // carpet recipes (order matters - check 16 carpets before 2 carpets!)
+        Registry.RECIPES.register("candycarpet", new CandyCarpetRecipe());  // 1 candy ↔ 16 carpets
+        Registry.RECIPES.register("carpet", new CarpetRecipe());  // 2 carpets -> 1 mixed
+        Registry.RECIPES.register("carpetdying", new CarpetDyeRecipe());  // carpet + dye
 
         //dyes crafted from flowers
         yellow_dye = register(new ItemStack(Item.DYE, 6, 6));

src/world/item/inventory/CraftingGridInventory.cs

@@ -122,6 +122,7 @@ public void updateResult() {
         if (fullMatch != null) {
             matchStatus = CraftingMatchStatus.FULL_MATCH;
             result = fullMatch.getResult(this);
+            Console.WriteLine($"[CraftingGridInventory.updateResult] Matched recipe: {fullMatch.GetType().Name}, result: {result.getItem()?.name ?? "EMPTY"}");
             lastMatchedRecipe = fullMatch;  // for use in CraftingResultSlot.take()
             return;
         }