Skip to content

Commit

Permalink
fix #24
Browse files Browse the repository at this point in the history
  • Loading branch information
mrsterner committed Jul 2, 2024
1 parent 21966ed commit 6c56611
Show file tree
Hide file tree
Showing 65 changed files with 131 additions and 97 deletions.
6 changes: 3 additions & 3 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ yarn_mappings=1.20.1+build.9
loader_version=0.15.9

# Mod Properties
mod_version = 1.0.0+1.20.1
maven_group = dev.sterner
archives_base_name = cultural-delights-fabric
mod_version = 1.0.1+1.20.1
maven_group = dev.sterner
archives_base_name = cultural-delights-fabric

# Dependencies
fabric_version=0.85.0+1.20.1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import com.mojang.serialization.Codec;
import dev.sterner.culturaldelights.common.registry.CDObjects;
import dev.sterner.culturaldelights.common.registry.CDConfiguredFeatures;
import dev.sterner.culturaldelights.common.registry.CDTags;
import dev.sterner.culturaldelights.common.registry.CDWorldGenerators;
import dev.sterner.culturaldelights.common.utils.Constants;
import dev.sterner.culturaldelights.common.world.AvocadoBundleTreeDecorator;
Expand Down Expand Up @@ -85,6 +86,8 @@ public void onInitialize() {
.icon(() -> new ItemStack(CDObjects.AVOCADO))
.title(Component.translatable(MOD_ID + ".group.main"))
.build());

CDTags.init();
}

public static class EmeraldToItemOffer implements VillagerTrades.ItemListing {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,18 @@
import net.minecraft.world.item.Item;

public class CDTags {
public static final TagKey<Item> CORN = TagKey.create(Registries.ITEM, new ResourceLocation("c", "corn"));
public static final TagKey<Item> CORN = cItemTag("foods/vegetables/corn");
public static final TagKey<Item> CUCUMBER = cItemTag("foods/vegetables/cucumber");
public static final TagKey<Item> TORTILLAS = cItemTag("foods/tortillas");

public static final TagKey<Item> FOODS_RAW_FISHES_PUFFERFISH = cItemTag("foods/raw_fishes/pufferfish");
public static final TagKey<Item> FOODS_GLOW_SQUID = cItemTag("foods/glow_squid");
public static final TagKey<Item> FOODS_SQUID = cItemTag("foods/squid");

private static TagKey<Item> cItemTag(String path) {
return TagKey.create(Registries.ITEM, new ResourceLocation("c", path));
}

public static void init() {
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"replace": false,
"values": [
"#c:fruits/avocado"
]
{
"replace": false,
"values": [
"#c:foods/raw_calamari"
]
}
6 changes: 6 additions & 0 deletions src/main/resources/data/c/tags/items/foods/fruits.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"#c:foods/fruits/avocado"
]
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"replace": false,
"values": [
"#c:grain/corn"
"#c:foods/grain/corn"
]
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"replace": false,
"values": [
"#c:raw_calamari"
"minecraft:pufferfish"
]
}
8 changes: 8 additions & 0 deletions src/main/resources/data/c/tags/items/foods/vegetables.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"replace": false,
"values": [
"#c:foods/vegetables/cucumber",
"#c:foods/vegetables/eggplant",
"#c:foods/vegetables/white_eggplant"
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"culturaldelights:corn_cob"
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"farmersdelight:tomato"
]
}
8 changes: 0 additions & 8 deletions src/main/resources/data/c/tags/items/vegetables.json

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
],
"key": {
"#": {
"item": "culturaldelights:avocado"
"tag": "c:foods/fruits/avocado"
}
},
"result": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
"type": "minecraft:crafting_shapeless",
"ingredients": [
{
"tag": "culturaldelights:avocados"
"tag": "c:foods/fruits/avocado"
},
{
"tag": "culturaldelights:avocados"
"tag": "c:foods/fruits/avocado"
},
{
"item": "minecraft:bread"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
"type": "minecraft:crafting_shapeless",
"ingredients": [
{
"tag": "c:tortillas"
"tag": "c:foods/tortillas"
},
{
"tag": "c:cooked_beef"
"tag": "c:foods/cooked_meats/cooked_beef"
},
{
"tag": "culturaldelights:avocados"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
"item": "farmersdelight:cooked_rice"
},
{
"tag": "c:calamari"
"tag": "c:foods/calamari"
},
{
"tag": "c:calamari"
"tag": "c:foods/calamari"
}
],
"result": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"item": "farmersdelight:cooked_rice"
},
"?": {
"tag": "c:cooked_chicken"
"tag": "c:foods/cooked_meats/cooked_chicken"
},
"!": {
"item": "minecraft:beetroot"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
"type": "minecraft:crafting_shapeless",
"ingredients": [
{
"tag": "c:tortillas"
"tag": "c:foods/tortillas"
},
{
"tag": "c:cooked_chicken"
"tag": "c:foods/cooked_meats/cooked_chicken"
},
{
"tag": "c:crops/onion"
"tag": "c:foods/vegetables/onion"
},
{
"item": "farmersdelight:tomato_sauce"
Expand All @@ -17,7 +17,7 @@
"tag": "culturaldelights:cucumbers"
},
{
"tag": "c:crops/corn"
"tag": "c:foods/vegetables/corn"
}
],
"result": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
"type": "farmersdelight:cooking",
"ingredients": [
{
"tag": "c:crops/corn"
"tag": "c:foods/vegetables/corns"
},
{
"tag": "c:crops/corn"
"tag": "c:foods/vegetables/corns"
},
{
"tag": "c:crops/corn"
"tag": "c:foods/vegetables/corns"
}
],
"result": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
"type": "farmersdelight:cooking",
"ingredients": [
{
"tag": "c:crops/corn"
"tag": "c:foods/vegetables/corn"
},
{
"tag": "c:crops/corn"
"tag": "c:foods/vegetables/corn"
},
{
"tag": "c:milk"
"tag": "c:milks"
}
],
"result": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
"type": "farmersdelight:cooking",
"ingredients": [
{
"tag": "culturaldelights:regular_eggplants"
"tag": "c:foods/vegetables/eggplant"
},
{
"item": "farmersdelight:raw_pasta"
"tag": "c:foods/pastas"
},
{
"item": "farmersdelight:tomato_sauce"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
"type": "farmersdelight:cooking",
"ingredients": [
{
"item": "minecraft:wheat"
"tag": "c:grains/wheat"
},
{
"item": "minecraft:wheat"
"tag": "c:grains/wheat"
},
{
"item": "minecraft:egg"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@
"item": "farmersdelight:cooked_rice"
},
{
"tag": "c:crops/onion"
"tag": "c:foods/vegetables/onion"
},
{
"tag": "c:cooked_chicken"
"tag": "c:foods/cooked_meats/cooked_chicken"
},
{
"tag": "c:milk"
"tag": "c:milks"
}
],
"result": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
"type": "farmersdelight:cooking",
"ingredients": [
{
"item": "minecraft:wheat"
"tag": "c:grains/wheat"
},
{
"item": "minecraft:wheat"
"tag": "c:grains/wheat"
},
{
"item": "minecraft:wheat"
"tag": "c:grains/wheat"
}
],
"result": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
],
"key": {
"#": {
"tag": "c:crops/corn"
"tag": "c:foods/vegetables/corn"
}
},
"result": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
"item": "minecraft:water_bucket"
},
{
"tag": "c:crops/corn"
"tag": "c:foods/vegetables/corn"
},
{
"tag": "c:crops/corn"
"tag": "c:foods/vegetables/corn"
},
{
"tag": "c:crops/corn"
"tag": "c:foods/vegetables/corn"
}
],
"result": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
],
"key": {
"#": {
"item": "culturaldelights:cucumber"
"tag": "c:foods/vegetables/cucumber"
}
},
"result": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"type": "farmersdelight:cutting",
"ingredients": [
{
"tag": "c:crops/corn"
"tag": "c:foods/vegetables/corn"
}
],
"tool": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"type": "farmersdelight:cutting",
"ingredients": [
{
"tag": "c:fruits/avocado"
"tag": "c:foods/fruits/avocado"
}
],
"tool": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"type": "farmersdelight:cutting",
"ingredients": [
{
"tag": "c:vegetables/cucumber"
"tag": "c:foods/vegetables/cucumber"
}
],
"tool": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"type": "farmersdelight:cutting",
"ingredients": [
{
"tag": "c:vegetables/eggplant"
"tag": "c:foods/vegetables/eggplant"
}
],
"tool": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"type": "farmersdelight:cutting",
"ingredients": [
{
"item": "culturaldelights:squid"
"tag": "c:foods/squid"
}
],
"tool": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"type": "farmersdelight:cutting",
"ingredients": [
{
"item": "culturaldelights:glow_squid"
"tag": "c:foods/glow_squid"
}
],
"tool": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"type": "farmersdelight:cutting",
"ingredients": [
{
"tag": "c:tortillas"
"tag": "c:foods/tortillas"
}
],
"tool": {
Expand Down
Loading

0 comments on commit 6c56611

Please sign in to comment.