Update to 1.21

Jaxydog · Jun 13, 2024 · d96e0c4 · d96e0c4
1 parent 77ddc82
commit d96e0c4
Show file tree

Hide file tree

Showing 47 changed files with 10 additions and 10 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -3,15 +3,15 @@ org.gradle.jvmargs = -Xmx1G
 org.gradle.parallel = true
 
 # Fabric Properties
-minecraft_version = 1.20.6
-yarn_mappings = 1.20.6+build.3
+minecraft_version = 1.21
+yarn_mappings = 1.21+build.1
 loader_version = 0.15.11
 
 # Mod Properties
-mod_version = 1.6.0
+mod_version = 1.7.0
 maven_group = dev.jaxydog
 archives_base_name = cheese
 
 # Dependencies
-fabric_version = 0.100.0+1.20.6
-lodestone_version = 1.3.0
+fabric_version = 0.100.0+1.21
+lodestone_version = 1.4.0
diff --git a/src/main/java/dev/jaxydog/content/item/CustomAliasedBlockItem.java b/src/main/java/dev/jaxydog/content/item/CustomAliasedBlockItem.java
@@ -5,10 +5,10 @@
 import dev.jaxydog.utility.LootModifier;
 import net.fabricmc.fabric.api.itemgroup.v1.ItemGroupEvents;
 import net.minecraft.block.Block;
-import net.minecraft.client.item.TooltipType;
 import net.minecraft.client.resource.language.I18n;
 import net.minecraft.item.AliasedBlockItem;
 import net.minecraft.item.ItemStack;
+import net.minecraft.item.tooltip.TooltipType;
 import net.minecraft.registry.Registries;
 import net.minecraft.registry.Registry;
 import net.minecraft.text.Text;

diff --git a/src/main/java/dev/jaxydog/content/item/CustomBlockItem.java b/src/main/java/dev/jaxydog/content/item/CustomBlockItem.java
@@ -5,10 +5,10 @@
 import dev.jaxydog.utility.LootModifier;
 import net.fabricmc.fabric.api.itemgroup.v1.ItemGroupEvents;
 import net.minecraft.block.Block;
-import net.minecraft.client.item.TooltipType;
 import net.minecraft.client.resource.language.I18n;
 import net.minecraft.item.BlockItem;
 import net.minecraft.item.ItemStack;
+import net.minecraft.item.tooltip.TooltipType;
 import net.minecraft.registry.Registries;
 import net.minecraft.registry.Registry;
 import net.minecraft.text.Text;

diff --git a/src/main/java/dev/jaxydog/content/item/CustomItem.java b/src/main/java/dev/jaxydog/content/item/CustomItem.java
@@ -4,10 +4,10 @@
 import dev.jaxydog.lodestone.api.CommonLoaded;
 import dev.jaxydog.utility.LootModifier;
 import net.fabricmc.fabric.api.itemgroup.v1.ItemGroupEvents;
-import net.minecraft.client.item.TooltipType;
 import net.minecraft.client.resource.language.I18n;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
+import net.minecraft.item.tooltip.TooltipType;
 import net.minecraft.registry.Registries;
 import net.minecraft.registry.Registry;
 import net.minecraft.text.Text;

diff --git a/...heese/advancements/recipe/beef_gravy.json → ...cheese/advancement/recipe/beef_gravy.json b/...heese/advancements/recipe/beef_gravy.json → ...cheese/advancement/recipe/beef_gravy.json
diff --git a/...ta/cheese/advancements/recipe/cheese.json → ...ata/cheese/advancement/recipe/cheese.json b/...ta/cheese/advancements/recipe/cheese.json → ...ata/cheese/advancement/recipe/cheese.json
diff --git a/...ancements/recipe/cheese_and_crackers.json → ...vancement/recipe/cheese_and_crackers.json b/...ancements/recipe/cheese_and_crackers.json → ...vancement/recipe/cheese_and_crackers.json
diff --git a/...ese/advancements/recipe/cheese_cloth.json → ...eese/advancement/recipe/cheese_cloth.json b/...ese/advancements/recipe/cheese_cloth.json → ...eese/advancement/recipe/cheese_cloth.json
diff --git a/...ese/advancements/recipe/cheese_curds.json → ...eese/advancement/recipe/cheese_curds.json b/...ese/advancements/recipe/cheese_curds.json → ...eese/advancement/recipe/cheese_curds.json
diff --git a/...ese/advancements/recipe/cheese_fries.json → ...eese/advancement/recipe/cheese_fries.json b/...ese/advancements/recipe/cheese_fries.json → ...eese/advancement/recipe/cheese_fries.json
diff --git a/...ese/advancements/recipe/cheese_steak.json → ...eese/advancement/recipe/cheese_steak.json b/...ese/advancements/recipe/cheese_steak.json → ...eese/advancement/recipe/cheese_steak.json
diff --git a/...ancements/recipe/cheesy_baked_potato.json → ...vancement/recipe/cheesy_baked_potato.json b/...ancements/recipe/cheesy_baked_potato.json → ...vancement/recipe/cheesy_baked_potato.json
diff --git a/...vancements/recipe/cheesy_dino_nugget.json → ...dvancement/recipe/cheesy_dino_nugget.json b/...vancements/recipe/cheesy_dino_nugget.json → ...dvancement/recipe/cheesy_dino_nugget.json
diff --git a/.../cheese/advancements/recipe/crackers.json → ...a/cheese/advancement/recipe/crackers.json b/.../cheese/advancements/recipe/crackers.json → ...a/cheese/advancement/recipe/crackers.json
diff --git a/...eese/advancements/recipe/dino_nugget.json → ...heese/advancement/recipe/dino_nugget.json b/...eese/advancements/recipe/dino_nugget.json → ...heese/advancement/recipe/dino_nugget.json
diff --git a/...ata/cheese/advancements/recipe/fries.json → ...data/cheese/advancement/recipe/fries.json b/...ata/cheese/advancements/recipe/fries.json → ...data/cheese/advancement/recipe/fries.json
diff --git a/...e/advancements/recipe/grilled_cheese.json → ...se/advancement/recipe/grilled_cheese.json b/...e/advancements/recipe/grilled_cheese.json → ...se/advancement/recipe/grilled_cheese.json
diff --git a/.../cheese/advancements/recipe/macaroni.json → ...a/cheese/advancement/recipe/macaroni.json b/.../cheese/advancements/recipe/macaroni.json → ...a/cheese/advancement/recipe/macaroni.json
diff --git a/...ancements/recipe/macaroni_and_cheese.json → ...vancement/recipe/macaroni_and_cheese.json b/...ancements/recipe/macaroni_and_cheese.json → ...vancement/recipe/macaroni_and_cheese.json
diff --git a/...a/cheese/advancements/recipe/poutine.json → ...ta/cheese/advancement/recipe/poutine.json b/...a/cheese/advancements/recipe/poutine.json → ...ta/cheese/advancement/recipe/poutine.json
diff --git a/...eese/loot_tables/blocks/cheese_block.json → ...heese/loot_table/blocks/cheese_block.json b/...eese/loot_tables/blocks/cheese_block.json → ...heese/loot_table/blocks/cheese_block.json
diff --git a/...a/cheese/loot_tables/blocks/tomatoes.json → ...ta/cheese/loot_table/blocks/tomatoes.json b/...a/cheese/loot_tables/blocks/tomatoes.json → ...ta/cheese/loot_table/blocks/tomatoes.json
diff --git a/...urces/data/cheese/recipes/beef_gravy.json → ...ources/data/cheese/recipe/beef_gravy.json b/...urces/data/cheese/recipes/beef_gravy.json → ...ources/data/cheese/recipe/beef_gravy.json
diff --git a/...resources/data/cheese/recipes/cheese.json → .../resources/data/cheese/recipe/cheese.json b/...resources/data/cheese/recipes/cheese.json → .../resources/data/cheese/recipe/cheese.json
diff --git a/...a/cheese/recipes/cheese_and_crackers.json → ...ta/cheese/recipe/cheese_and_crackers.json b/...a/cheese/recipes/cheese_and_crackers.json → ...ta/cheese/recipe/cheese_and_crackers.json
diff --git a/...ces/data/cheese/recipes/cheese_block.json → ...rces/data/cheese/recipe/cheese_block.json b/...ces/data/cheese/recipes/cheese_block.json → ...rces/data/cheese/recipe/cheese_block.json
diff --git a/...ces/data/cheese/recipes/cheese_cloth.json → ...rces/data/cheese/recipe/cheese_cloth.json b/...ces/data/cheese/recipes/cheese_cloth.json → ...rces/data/cheese/recipe/cheese_cloth.json
diff --git a/...ces/data/cheese/recipes/cheese_curds.json → ...rces/data/cheese/recipe/cheese_curds.json b/...ces/data/cheese/recipes/cheese_curds.json → ...rces/data/cheese/recipe/cheese_curds.json
diff --git a/...ces/data/cheese/recipes/cheese_fries.json → ...rces/data/cheese/recipe/cheese_fries.json b/...ces/data/cheese/recipes/cheese_fries.json → ...rces/data/cheese/recipe/cheese_fries.json
diff --git a/...ata/cheese/recipes/cheese_from_block.json → ...data/cheese/recipe/cheese_from_block.json b/...ata/cheese/recipes/cheese_from_block.json → ...data/cheese/recipe/cheese_from_block.json
diff --git a/...ces/data/cheese/recipes/cheese_pizza.json → ...rces/data/cheese/recipe/cheese_pizza.json b/...ces/data/cheese/recipes/cheese_pizza.json → ...rces/data/cheese/recipe/cheese_pizza.json
diff --git a/...ces/data/cheese/recipes/cheese_steak.json → ...rces/data/cheese/recipe/cheese_steak.json b/...ces/data/cheese/recipes/cheese_steak.json → ...rces/data/cheese/recipe/cheese_steak.json
diff --git a/...a/cheese/recipes/cheesy_baked_potato.json → ...ta/cheese/recipe/cheesy_baked_potato.json b/...a/cheese/recipes/cheesy_baked_potato.json → ...ta/cheese/recipe/cheesy_baked_potato.json
diff --git a/...ta/cheese/recipes/cheesy_dino_nugget.json → ...ata/cheese/recipe/cheesy_dino_nugget.json b/...ta/cheese/recipes/cheesy_dino_nugget.json → ...ata/cheese/recipe/cheesy_dino_nugget.json
diff --git a/...sources/data/cheese/recipes/crackers.json → ...esources/data/cheese/recipe/crackers.json b/...sources/data/cheese/recipes/crackers.json → ...esources/data/cheese/recipe/crackers.json
diff --git a/...rces/data/cheese/recipes/dino_nugget.json → ...urces/data/cheese/recipe/dino_nugget.json b/...rces/data/cheese/recipes/dino_nugget.json → ...urces/data/cheese/recipe/dino_nugget.json
diff --git a/.../resources/data/cheese/recipes/dough.json → ...n/resources/data/cheese/recipe/dough.json b/.../resources/data/cheese/recipes/dough.json → ...n/resources/data/cheese/recipe/dough.json
diff --git a/.../resources/data/cheese/recipes/fries.json → ...n/resources/data/cheese/recipe/fries.json b/.../resources/data/cheese/recipes/fries.json → ...n/resources/data/cheese/recipe/fries.json
diff --git a/...s/data/cheese/recipes/grilled_cheese.json → ...es/data/cheese/recipe/grilled_cheese.json b/...s/data/cheese/recipes/grilled_cheese.json → ...es/data/cheese/recipe/grilled_cheese.json
diff --git a/...sources/data/cheese/recipes/macaroni.json → ...esources/data/cheese/recipe/macaroni.json b/...sources/data/cheese/recipes/macaroni.json → ...esources/data/cheese/recipe/macaroni.json
diff --git a/...a/cheese/recipes/macaroni_and_cheese.json → ...ta/cheese/recipe/macaroni_and_cheese.json b/...a/cheese/recipes/macaroni_and_cheese.json → ...ta/cheese/recipe/macaroni_and_cheese.json
diff --git a/...esources/data/cheese/recipes/poutine.json → ...resources/data/cheese/recipe/poutine.json b/...esources/data/cheese/recipes/poutine.json → ...resources/data/cheese/recipe/poutine.json
diff --git a/...ces/data/cheese/recipes/tomato_sauce.json → ...rces/data/cheese/recipe/tomato_sauce.json b/...ces/data/cheese/recipes/tomato_sauce.json → ...rces/data/cheese/recipe/tomato_sauce.json
diff --git a/...urces/data/cheese/tags/blocks/cheese.json → ...ources/data/cheese/tags/block/cheese.json b/...urces/data/cheese/tags/blocks/cheese.json → ...ources/data/cheese/tags/block/cheese.json
diff --git a/...ources/data/cheese/tags/items/cheese.json → ...sources/data/cheese/tags/item/cheese.json b/...ources/data/cheese/tags/items/cheese.json → ...sources/data/cheese/tags/item/cheese.json
diff --git a/.../resources/data/minecraft/items/meat.json → ...ources/data/minecraft/tags/item/meat.json b/.../resources/data/minecraft/items/meat.json → ...ources/data/minecraft/tags/item/meat.json
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
@@ -19,9 +19,9 @@
     "mixins": [ "cheese.mixins.json" ],
     "depends": {
         "fabricloader": ">=0.15.11",
-        "minecraft": "~1.20.6",
+        "minecraft": "~1.21",
         "java": ">=21",
         "fabric-api": "*",
-        "lodestone": ">=1.3.0"
+        "lodestone": ">=1.4.0"
     }
 }