Merge branch '1.21' of https://github.com/TeamMoegMC/Caupona into 1.21

src/datagen/java/com/teammoeg/caupona/datagen/CPItemModelProvider.java

@@ -51,6 +51,8 @@ protected void registerModels() {
 		}
 		for(String s:CPItems.bread_bowls)
 			texture(s+"_loaf", "bread_bowls/"+s);
+		for(String s:CPItems.dishes)
+			texture(s+"_loaf", "bread_bowls/"+s);
 		for (String s : CPItems.base_material)
 			texture(s);
 		for (FoodMaterialInfo s : CPItems.food_material)

src/datagen/java/com/teammoeg/caupona/datagen/CPStatesProvider.java

@@ -219,9 +219,9 @@ protected void registerStatesAndModels() {
 		blockItemModel("wolf_statue", "_1");
 		blockItemModel("fumarole_boulder");
 		blockItemModel("fumarole_vent");
-		simpleBlockItem("litharge_fumarole_boulder");
-		simpleBlockItem("litharge_fumarole_vent");
-		simpleBlockItem("litharge_bloom");
+		blockItemModel("litharge_fumarole_boulder");
+		blockItemModel("litharge_fumarole_vent");
+		blockItemModel("litharge_bloom");
 		blockItemModel("pumice");
 		blockItemModel("pumice_bloom");
 		blockItemModel("lead_block");

src/generated/resources/assets/caupona/models/item/crumb.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "caupona:item/crumb"
+  }
+}

src/generated/resources/assets/caupona/models/item/huevos_pericos_loaf.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "caupona:item/bread_bowls/huevos_pericos"
+  }
+}

src/generated/resources/assets/caupona/models/item/sauteed_beef_loaf.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "caupona:item/bread_bowls/sauteed_beef"
+  }
+}

src/generated/resources/assets/caupona/models/item/sauteed_greens_loaf.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "caupona:item/bread_bowls/sauteed_greens"
+  }
+}

src/generated/resources/assets/caupona/models/item/sauteed_hodgepodge_loaf.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "caupona:item/bread_bowls/sauteed_hodgepodge"
+  }
+}

src/generated/resources/assets/caupona/models/item/sauteed_meat_loaf.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "caupona:item/bread_bowls/sauteed_meat"
+  }
+}

src/generated/resources/assets/caupona/models/item/sauteed_mushrooms_loaf.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "caupona:item/bread_bowls/sauteed_mushrooms"
+  }
+}

src/generated/resources/assets/caupona/models/item/sauteed_roots_loaf.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "caupona:item/bread_bowls/sauteed_roots"
+  }
+}

src/generated/resources/assets/caupona/models/item/sauteed_seafood_loaf.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "caupona:item/bread_bowls/sauteed_seafood"
+  }
+}

src/generated/resources/assets/caupona/models/item/sauteed_vegetables_loaf.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "caupona:item/bread_bowls/sauteed_vegetables"
+  }
+}

src/generated/resources/assets/caupona/models/item/seared_fillet_loaf.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "caupona:item/bread_bowls/seared_fillet"
+  }
+}

src/generated/resources/assets/caupona/models/item/seared_poultry_loaf.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "caupona:item/bread_bowls/seared_poultry"
+  }
+}

src/generated/resources/data/caupona/recipe/spice/asafoetida_spice_jar.json

@@ -4,8 +4,8 @@
     "duration": 200,
     "id": "minecraft:resistance",
     "neoforge:cures": [
-      "protected_by_totem",
-      "milk"
+      "milk",
+      "protected_by_totem"
     ],
     "show_icon": true
   },

src/generated/resources/data/caupona/recipe/spice/chives_spice_jar.json

@@ -4,8 +4,8 @@
     "duration": 200,
     "id": "minecraft:slow_falling",
     "neoforge:cures": [
-      "protected_by_totem",
-      "milk"
+      "milk",
+      "protected_by_totem"
     ],
     "show_icon": true
   },

src/generated/resources/data/caupona/recipe/spice/garum_spice_jar.json

@@ -4,8 +4,8 @@
     "duration": 200,
     "id": "minecraft:jump_boost",
     "neoforge:cures": [
-      "protected_by_totem",
-      "milk"
+      "milk",
+      "protected_by_totem"
     ],
     "show_icon": true
   },

src/generated/resources/data/caupona/recipe/spice/sapa_spice_jar.json

@@ -4,8 +4,8 @@
     "duration": 200,
     "id": "caupona:hyperactive",
     "neoforge:cures": [
-      "protected_by_totem",
-      "milk"
+      "milk",
+      "protected_by_totem"
     ],
     "show_icon": true
   },

src/generated/resources/data/caupona/recipe/spice/sugar_spice_jar.json

@@ -4,8 +4,8 @@
     "duration": 200,
     "id": "minecraft:speed",
     "neoforge:cures": [
-      "protected_by_totem",
-      "milk"
+      "milk",
+      "protected_by_totem"
     ],
     "show_icon": true
   },

src/generated/resources/data/caupona/recipe/spice/vinegar_spice_jar.json

@@ -4,8 +4,8 @@
     "duration": 200,
     "id": "minecraft:night_vision",
     "neoforge:cures": [
-      "protected_by_totem",
-      "milk"
+      "milk",
+      "protected_by_totem"
     ],
     "show_icon": true
   },

src/main/java/com/teammoeg/caupona/CPItems.java

@@ -85,7 +85,7 @@ public class CPItems {
 			new FoodMaterialInfo("plump_snail",3,0.3f,0.7f).food(c->c.effect(()->new MobEffectInstance(MobEffects.HUNGER, 600, 0), 0.3F))};
 	public static final String[] base_material = new String[] { "lateres", "clay_portable_brazier", "vivid_charcoal", "silphium",
 																"asafoetida", "leaden_walnut", "litharge_cake", "lead_ingot", "lead_nugget",
-																"asses","brick_tesserae","basalt_tesserae","pumice_tesserae", "fresh_wolfberry_leaves"};
+																"asses","brick_tesserae","basalt_tesserae","pumice_tesserae", "fresh_wolfberry_leaves" ,"crumb"};
 
 	public static final List<Item> stews = new ArrayList<>();
 	public static final List<Item> dish = new ArrayList<>();

src/main/java/com/teammoeg/caupona/components/IFoodInfo.java

@@ -39,7 +39,7 @@ default FoodProperties getFood() {
 		return getFood(0,0).usingConvertsTo(Items.BOWL).build();
 	}
 	Fluid getBase();
-	public List<PossibleEffect> getEffects();
+	List<PossibleEffect> getEffects();
 	default float getDensity() {
 		return getStacks().stream().map(FloatemStack::getCount).reduce(0f, Float::sum);
 	}

src/main/java/com/teammoeg/caupona/components/SauteedFoodInfo.java

@@ -199,4 +199,5 @@ public Builder getFood(int extraHealing, int extraSaturation) {
 		return b;
 	}
 
+
 }

src/main/java/com/teammoeg/caupona/generated/CPStewTexture.java

@@ -1,24 +1,3 @@
-/*
- * Copyright (c) 2024 TeamMoeg
- *
- * This file is part of Caupona.
- *
- * Caupona is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 3.
- *
- * Caupona is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * Specially, we allow this software to be used alongside with closed source software Minecraft(R) and Forge or other modloader.
- * Any mods or plugins can also use apis provided by forge or com.teammoeg.caupona.api without using GPL or open source.
- *
- * You should have received a copy of the GNU General Public License
- * along with Caupona. If not, see <https://www.gnu.org/licenses/>.
- */
-
 /** Copyright (c) 2022 TeamMoeg
 * 
 *