Crash Fix and Sushi Changes

Crash Fix and Sushi Changes

build.gradle

@@ -178,19 +178,18 @@ dependencies {
     // Specify the version of Minecraft to use. If this is any group other than 'net.minecraft', it is assumed
     // that the dep is a ForgeGradle 'patcher' dependency, and its patches will be applied.
     // The userdev artifact is a special name and will get all sorts of transformations applied to it.
-    minecraft 'net.minecraftforge:forge:1.18.2-40.1.0'
+    minecraft 'net.minecraftforge:forge:1.18.2-40.1.80'
 
     // compile against the JEI API but do not include it at runtime
     compileOnly fg.deobf("mezz.jei:jei-1.18.2:9.7.0.193:api")
     // at runtime, use the full JEI jar
     runtimeOnly fg.deobf("mezz.jei:jei-1.18.2:9.7.0.193")
 
     //implementation fg.deobf("curse.maven:abnormals-core:3457851")
-    implementation fg.deobf("curse.maven:farmersdelight-398521:3765351")
+    implementation fg.deobf("curse.maven:farmersdelight-398521:3999153")
     runtimeOnly fg.deobf("curse.maven:brewinandchewin-637808:3854764")
     runtimeOnly fg.deobf("curse.maven:appleskin-248787:3686482")
 
-
     // Real mod deobf dependency examples - these get remapped to your current mappings
     // compileOnly fg.deobf("mezz.jei:jei-${mc_version}:${jei_version}:api") // Adds JEI API as a compile dependency
     // runtimeOnly fg.deobf("mezz.jei:jei-${mc_version}:${jei_version}") // Adds the full JEI mod as a runtime dependency
@@ -210,17 +209,17 @@ jar {
         attributes([
                 "Specification-Title"     : "culturaldelights",
                 "Specification-Vendor"    : "ncpbails",
-                "Specification-Version"   : "0.13", // We are version 1 of ourselves
+                "Specification-Version"   : "0.14", // We are version 1 of ourselves
                 "Implementation-Title"    : project.name,
                 "Implementation-Version"  : project.jar.archiveVersion,
-                "Implementation-Vendor"   : "ncpbails",
+                "Implementation-Vendor"   : "culturaldelightssareus",
                 "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ")
         ])
     }
 }
 
-// Example configuration to allow publishing using themaven-publish plugin
-// This is the preferred method to reobfuscate your jar f ile
+// Example configuration to allow publishing using the maven-publish plugin
+// This is the preferred method to reobfuscate your jar file
 jar.finalizedBy('reobfJar')
 // However if you are in a multi-project build, dev time needs unobfed jar files, so you can delay the obfuscation until publishing by doing
 // publish.dependsOn('reobfJar')

src/main/java/com/ncpbails/culturaldelights/block/ModBlocks.java

@@ -36,15 +36,15 @@ public class ModBlocks {
             () -> new Block(BlockBehaviour.Properties.copy(Blocks.PUMPKIN).noOcclusion()), FarmersDelight.CREATIVE_TAB, false, 0);
 
      public static final RegistryObject<Block> WILD_CUCUMBERS = registerBlock("wild_cucumbers",
-            () -> new WildCropBlock(MobEffects.FIRE_RESISTANCE, 6, BlockBehaviour.Properties.copy(Blocks.TALL_GRASS), false),
+            () -> new WildCropBlock(MobEffects.FIRE_RESISTANCE, 6, BlockBehaviour.Properties.copy(Blocks.TALL_GRASS)),
              FarmersDelight.CREATIVE_TAB, false, 0);
 
     public static final RegistryObject<Block> WILD_CORN = registerBlock("wild_corn",
-            () -> new WildCropBlock(MobEffects.HUNGER, 6, BlockBehaviour.Properties.copy(Blocks.TALL_GRASS), false),
+            () -> new WildCropBlock(MobEffects.HUNGER, 6, BlockBehaviour.Properties.copy(Blocks.TALL_GRASS)),
             FarmersDelight.CREATIVE_TAB, false, 0);
 
     public static final RegistryObject<Block> WILD_EGGPLANTS = registerBlock("wild_eggplants",
-            () -> new WildCropBlock(MobEffects.DAMAGE_BOOST, 6, BlockBehaviour.Properties.copy(Blocks.TALL_GRASS), false),
+            () -> new WildCropBlock(MobEffects.DAMAGE_BOOST, 6, BlockBehaviour.Properties.copy(Blocks.TALL_GRASS)),
             FarmersDelight.CREATIVE_TAB, false, 0);
 
     public static final RegistryObject<Block> AVOCADO_LOG = registerBlock("avocado_log",

src/main/java/com/ncpbails/culturaldelights/item/ModFoods.java

@@ -33,15 +33,15 @@ public class ModFoods {
     public static final FoodProperties SMOKED_CUT_EGGPLANT = (new FoodProperties.Builder()).nutrition(4).saturationMod(0.4F).fast().build();
 
     //SUSHI
-    public static final FoodProperties VEGETABLE_ROLL = (new FoodProperties.Builder()).nutrition(3).saturationMod(0.4F).fast().build();
+    public static final FoodProperties VEGETABLE_ROLL = (new FoodProperties.Builder()).nutrition(7).saturationMod(0.4F).build();
+    public static final FoodProperties VEGETABLE_ROLL_SLICE = (new FoodProperties.Builder()).nutrition(3).saturationMod(0.2F).fast().build();
     public static final FoodProperties EGG_ROLL = (new FoodProperties.Builder()).nutrition(3).saturationMod(0.5F).fast().build();
-    public static final FoodProperties CHICKEN_ROLL = (new FoodProperties.Builder()).nutrition(10).saturationMod(1F).fast().build();
-    public static final FoodProperties COD_ROLL = (new FoodProperties.Builder()).nutrition(3).saturationMod(0.5F).fast().build();
-    public static final FoodProperties PUFFERFISH_ROLL = (new FoodProperties.Builder()).nutrition(3).saturationMod(0.5F)
+    public static final FoodProperties CHICKEN_ROLL = (new FoodProperties.Builder()).nutrition(8).saturationMod(0.8F).build();
+    public static final FoodProperties CHICKEN_ROLL_SLICE = (new FoodProperties.Builder()).nutrition(4).saturationMod(0.4F).fast().build();
+    public static final FoodProperties PUFFERFISH_ROLL = (new FoodProperties.Builder()).nutrition(7).saturationMod(0.6F)
             .effect(() -> new MobEffectInstance(MobEffects.CONFUSION, 200, 0), 1.0F)
             .effect(() -> new MobEffectInstance(MobEffects.HUNGER, 200, 1), 1.0F).fast().build();
-    public static final FoodProperties SALMON_ROLL = (new FoodProperties.Builder()).nutrition(3).saturationMod(0.6F).fast().build();
-    public static final FoodProperties TROPICAL_ROLL = (new FoodProperties.Builder()).nutrition(1).saturationMod(0.15F).fast().build();
+    public static final FoodProperties TROPICAL_ROLL = (new FoodProperties.Builder()).nutrition(7).saturationMod(0.6F).fast().build();
     public static final FoodProperties RICE_BALL = (new FoodProperties.Builder()).nutrition(3).saturationMod(0.5F).fast().build();
     public static final FoodProperties CALAMARI_ROLL = (new FoodProperties.Builder()).nutrition(4).saturationMod(0.5F).fast().build();
 

src/main/java/com/ncpbails/culturaldelights/item/ModItems.java

@@ -8,6 +8,7 @@
 import net.minecraftforge.registries.ForgeRegistries;
 import net.minecraftforge.registries.RegistryObject;
 import vectorwing.farmersdelight.FarmersDelight;
+import vectorwing.farmersdelight.common.item.KelpRollItem;
 
 public class ModItems {
 
@@ -142,21 +143,21 @@ public class ModItems {
     public static final RegistryObject<Item> VEGETABLE_ROLL = ITEMS.register("vegetable_roll",
             () -> new Item(new Item.Properties().tab(FarmersDelight.CREATIVE_TAB).food(ModFoods.VEGETABLE_ROLL)));
 
+    public static final RegistryObject<Item> VEGETABLE_ROLL_SLICE = ITEMS.register("vegetable_roll_slice",
+            () -> new Item(new Item.Properties().tab(FarmersDelight.CREATIVE_TAB).food(ModFoods.VEGETABLE_ROLL_SLICE)));
+
     public static final RegistryObject<Item> EGG_ROLL = ITEMS.register("egg_roll",
             () -> new Item(new Item.Properties().tab(FarmersDelight.CREATIVE_TAB).food(ModFoods.EGG_ROLL)));
 
     public static final RegistryObject<Item> CHICKEN_ROLL = ITEMS.register("chicken_roll",
-            () -> new Item(new Item.Properties().tab(FarmersDelight.CREATIVE_TAB).food(ModFoods.CHICKEN_ROLL)));
+            () -> new KelpRollItem(new Item.Properties().tab(FarmersDelight.CREATIVE_TAB).food(ModFoods.CHICKEN_ROLL)));
 
-    public static final RegistryObject<Item> COD_ROLL = ITEMS.register("cod_roll",
-            () -> new Item(new Item.Properties().tab(FarmersDelight.CREATIVE_TAB).food(ModFoods.COD_ROLL)));
+    public static final RegistryObject<Item> CHICKEN_ROLL_SLICE = ITEMS.register("chicken_roll_slice",
+            () -> new KelpRollItem(new Item.Properties().tab(FarmersDelight.CREATIVE_TAB).food(ModFoods.CHICKEN_ROLL_SLICE)));
 
     public static final RegistryObject<Item> PUFFERFISH_ROLL = ITEMS.register("pufferfish_roll",
             () -> new Item(new Item.Properties().tab(FarmersDelight.CREATIVE_TAB).food(ModFoods.PUFFERFISH_ROLL)));
 
-    public static final RegistryObject<Item> SALMON_ROLL = ITEMS.register("salmon_roll",
-            () -> new Item(new Item.Properties().tab(FarmersDelight.CREATIVE_TAB).food(ModFoods.SALMON_ROLL)));
-
     public static final RegistryObject<Item> TROPICAL_ROLL = ITEMS.register("tropical_roll",
             () -> new Item(new Item.Properties().tab(FarmersDelight.CREATIVE_TAB).food(ModFoods.TROPICAL_ROLL)));
 

src/main/resources/assets/culturaldelights/lang/en_us.json

@@ -45,9 +45,9 @@
 
   "item.culturaldelights.chicken_roll": "Chicken Roll",
   "item.culturaldelights.vegetable_roll": "Vegetable Roll",
-  "item.culturaldelights.cod_roll": "Cod Roll",
+  "item.culturaldelights.chicken_roll_slice": "Chicken Roll Slice",
+  "item.culturaldelights.vegetable_roll_slice": "Vegetable Roll Slice",
   "item.culturaldelights.pufferfish_roll": "Pufferfish Roll",
-  "item.culturaldelights.salmon_roll": "Salmon Roll",
   "item.culturaldelights.tropical_roll": "Tropical Roll",
   "item.culturaldelights.rice_ball": "Rice Ball",
   "item.culturaldelights.egg_roll": "Egg Roll",

src/main/resources/assets/culturaldelights/models/item/chicken_roll_slice.json

@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "culturaldelights:item/chicken_roll_slice"
+  }
+}

src/main/resources/assets/culturaldelights/models/item/vegetable_roll_slice.json

@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "culturaldelights:item/vegetable_roll_slice"
+  }
+}

src/main/resources/data/culturaldelights/recipes/calamari_roll.json

@@ -7,9 +7,6 @@
     {
       "item": "farmersdelight:cooked_rice"
     },
-    {
-      "tag": "culturaldelights:cucumbers"
-    },
     {
       "item": "culturaldelights:raw_calamari"
     },

src/main/resources/data/culturaldelights/recipes/chicken_roll.json

@@ -1,24 +1,25 @@
 {
-  "type": "minecraft:crafting_shapeless",
-  "ingredients": [
-    {
+  "type": "minecraft:crafting_shaped",
+  "pattern": [
+    " ! ",
+    "@?@",
+    "###"
+  ],
+  "key": {
+    "#": {
       "item": "minecraft:dried_kelp"
     },
-    {
+    "@": {
       "item": "farmersdelight:cooked_rice"
     },
-    {
-      "tag": "culturaldelights:avocados"
+    "?": {
+      "tag": "forge:cooked_chicken"
     },
-    {
+    "!": {
       "item": "minecraft:beetroot"
-    },
-    {
-      "tag": "forge:cooked_chicken"
     }
-  ],
+  },
   "result": {
-    "item": "culturaldelights:chicken_roll",
-    "count": 1
+    "item": "culturaldelights:chicken_roll"
   }
 }

src/main/resources/data/culturaldelights/recipes/chicken_taco.json

@@ -24,4 +24,4 @@
     "item": "culturaldelights:chicken_taco",
     "count": 1
   }
-}
+}

src/main/resources/data/culturaldelights/recipes/cutting/chicken_roll_slice.json

@@ -0,0 +1,17 @@
+{
+  "type": "farmersdelight:cutting",
+  "ingredients": [
+    {
+      "item": "culturaldelights:chicken_roll"
+    }
+  ],
+  "tool": {
+    "tag": "forge:tools/knives"
+  },
+  "result": [
+    {
+      "item": "culturaldelights:chicken_roll_slice",
+      "count": 3
+    }
+  ]
+}

src/main/resources/data/culturaldelights/recipes/cutting/vegetable_roll_slice.json

@@ -0,0 +1,17 @@
+{
+  "type": "farmersdelight:cutting",
+  "ingredients": [
+    {
+      "item": "culturaldelights:chicken_roll"
+    }
+  ],
+  "tool": {
+    "tag": "forge:tools/knives"
+  },
+  "result": [
+    {
+      "item": "culturaldelights:vegetable_roll_slice",
+      "count": 3
+    }
+  ]
+}

src/main/resources/data/culturaldelights/recipes/pufferfish_roll.json

@@ -1,24 +1,18 @@
 {
   "type": "minecraft:crafting_shapeless",
   "ingredients": [
-    {
-      "item": "minecraft:dried_kelp"
-    },
     {
       "item": "farmersdelight:cooked_rice"
     },
     {
       "item": "minecraft:pufferfish"
     },
-    {
-      "item": "minecraft:pufferfish"
-    },
     {
       "item": "minecraft:pufferfish"
     }
   ],
   "result": {
     "item": "culturaldelights:pufferfish_roll",
-    "count": 4
+    "count": 2
   }
 }

src/main/resources/data/culturaldelights/recipes/tropical_roll.json

@@ -10,15 +10,12 @@
     {
       "item": "minecraft:tropical_fish"
     },
-    {
-      "item": "minecraft:tropical_fish"
-    },
     {
       "item": "minecraft:tropical_fish"
     }
   ],
   "result": {
     "item": "culturaldelights:tropical_roll",
-    "count": 6
+    "count": 2
   }
 }