Skip to content

Commit

Permalink
Add coffee stained wool and carpets
Browse files Browse the repository at this point in the history
  • Loading branch information
Chikorita-Lover committed Dec 2, 2024
1 parent ef10a4b commit 1b5d786
Show file tree
Hide file tree
Showing 35 changed files with 307 additions and 49 deletions.
10 changes: 5 additions & 5 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,16 @@ org.gradle.parallel=true

# Fabric Properties
# check these on https://fabricmc.net/develop
minecraft_version=1.21
yarn_mappings=1.21+build.9
loader_version=0.15.11
minecraft_version=1.21.1
yarn_mappings=1.21.1+build.3
loader_version=0.16.9

# Mod Properties
mod_version=2.0.0
mod_version=2.0.0+1.21.1
maven_group=net.chikorita_lover.caffeinated
archives_base_name=caffeinated

# Dependencies
fabric_version=0.100.6+1.21
fabric_version=0.110.0+1.21.1
farmersdelight_version=4640640
fabric_asm_version=v2.3
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
// 1.21 2024-09-17T22:54:59.3347647 Caffeinated/Block Loot Tables
// 1.21.1 2024-12-01T20:24:16.0014858 Caffeinated/Block Loot Tables
548d115eeb79b74d3fbe03951bdc179110ed6f8a data\caffeinated\loot_table\blocks\ground_coffee_cauldron.json
8b8e67a4f2fbd3f51a69d1359cceb2704429f4c3 data\caffeinated\loot_table\blocks\coffee_berry_crate.json
d481f7802dfc0e83cd271518b47e73b256a24d2f data\caffeinated\loot_table\blocks\flowering_coffee_shrub.json
548d115eeb79b74d3fbe03951bdc179110ed6f8a data\caffeinated\loot_table\blocks\coffee_cauldron.json
157b591fb3b4bf159fafab0ecdc6a5d8104ff026 data\caffeinated\loot_table\blocks\coffee_stained_carpet.json
aa60a948a9a5ca8497e8ea986f058420cf5522a7 data\caffeinated\loot_table\blocks\coffee_stained_wool.json
2181144c1ab146492f9cae41e26a4ad585b0c46b data\caffeinated\loot_table\blocks\ground_coffee_block.json
55664479b7d3ad31e070226a65db432f03d97236 data\caffeinated\loot_table\blocks\potted_coffee_shrub.json
3bec24cd54986eea9c228540df648ca7b01c86fc data\caffeinated\loot_table\blocks\coffee_bean_block.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.21 2024-09-17T22:54:59.3347647 Caffeinated/Advancements
// 1.21.1 2024-12-01T20:24:16.0004753 Caffeinated/Advancements
bcaa279e3e0ad8280ebfe57370201ce6290340a1 data\caffeinated\advancement\husbandry\brew_coffee.json
3a0446170026d8aa5bbef46b956c9373eb0a91c8 data\caffeinated\advancement\husbandry\bake_tiramisu.json
fd764b415f61cad9c185cf3c952535113b90044f data\caffeinated\advancement\husbandry\brew_all_coffee.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,17 @@
// 1.21 2024-09-17T22:54:59.3357799 Caffeinated/Recipes
// 1.21.1 2024-12-01T20:24:16.0024858 Caffeinated/Recipes
c773cd5c995b67602b5f054f551a8f5d6f33d139 data\caffeinated\advancement\recipes\misc\coffee_beans.json
c9b5cb066d0fab702915da1774fdd48fcbc57229 data\caffeinated\advancement\recipes\misc\coffee_beans_from_smoking.json
6061a7a2ef7b2febcca08d801ffce55d131fda2b data\caffeinated\recipe\tiramisu_from_slices.json
9e061efc3626a119413e61ca86a53990ab4f8a8a data\caffeinated\advancement\recipes\misc\ground_coffee_from_coffee_beans.json
b8e94b6ab3e5b643e335a6036992426d7e3ed11c data\caffeinated\advancement\recipes\building_blocks\coffee_bean_block.json
861e142a5a287eba94cf46a7d37342304f9ad285 data\caffeinated\recipe\ground_coffee_block.json
f0185fd7adf812d29e6e5a362c792d604a300a06 data\caffeinated\recipe\coffee_beans_from_smoking.json
c0c226ce1854c1aa133ac5392a6a40d18419bc37 data\caffeinated\advancement\recipes\building_blocks\coffee_stained_carpet_from_white_carpet.json
dc7a575ad5eb72be9b3ec137cbb83358fc420f10 data\caffeinated\recipe\coffee_stained_carpet.json
51cbbbc43481615db699ce0878398bb475466f96 data\caffeinated\advancement\recipes\building_blocks\ground_coffee_block.json
31f69cf23ef6a168c6d98a8fef731d470bcbb187 data\caffeinated\recipe\coffee_berries.json
081e951942029c81b7edec2c02074e4b47d00d3d data\caffeinated\recipe\ground_coffee_from_coffee_beans.json
19760d1f68d759f157db95e3e85d1aaacaa8ab64 data\caffeinated\recipe\coffee_stained_wool.json
07496d1ed8ed6ef8fda02b6606436108c59fbf43 data\caffeinated\advancement\recipes\food\cafe_miel_coffee_bottle.json
5dc445d11ac1091b47d0393e020f2644f701cd29 data\caffeinated\recipe\coffee_berry_crate.json
ba81552d4ee1d9d568b84f786de61e415fdb157e data\caffeinated\recipe\latte_coffee_bottle.json
Expand All @@ -19,11 +22,14 @@ b3d10b49b978d96c244fb776e1292f0b3f9c272b data\caffeinated\recipe\brown_dye_from_
400dd2329e8ff95d83dae40af8db1c9fc5296ce4 data\caffeinated\recipe\coffee_bean_block.json
a3089cb10cc080957830e10d1b276e6fb8e2845c data\caffeinated\advancement\recipes\food\tiramisu_from_slices.json
42e097d611b5534f387afce66da821f0349faf9f data\caffeinated\recipe\coffee_bottle.json
6079d9b72396de3a7ea6b8a181a581d701cd02d3 data\caffeinated\advancement\recipes\decorations\coffee_stained_carpet.json
5be6907919970b6cffc809b428d4e467a1db9d8a data\caffeinated\recipe\coffee_stained_carpet_from_white_carpet.json
72418a991f973fb5cf728affdcbfde7d5818b251 data\caffeinated\advancement\recipes\food\coffee_bottle.json
1410b08380530f562102b9d54fde26a7163b2256 data\caffeinated\advancement\recipes\food\latte_coffee_bottle.json
145d4111298037135c323e1347f67b3871daaa3e data\caffeinated\recipe\java_banner_pattern.json
3fbc068c16e4d63163f1d495c7a7c8cbefdf9ad0 data\caffeinated\recipe\coffee_beans_from_campfire_cooking.json
cf353bc3103b1834f861ecb7a2da0ae56550bb65 data\caffeinated\recipe\cafe_miel_coffee_bottle.json
1c90d5214cc2f466be11d17a52cde3d40f7d15d5 data\caffeinated\advancement\recipes\building_blocks\coffee_stained_wool.json
514280f7d04586c23693c1dae8cf30241a810a24 data\caffeinated\advancement\recipes\building_blocks\coffee_berry_crate.json
e1d9fbf68af558ba9d59fc35535075266be4d5fe data\caffeinated\recipe\tiramisu.json
d4cb036e5e2675e9ddf086c9a38c979f07b2648e data\caffeinated\advancement\recipes\food\tiramisu.json
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
// 1.21 2024-09-17T22:54:59.3329635 Caffeinated/Model Definitions
// 1.21.1 2024-12-01T20:24:15.9969777 Caffeinated/Model Definitions
da4528a3cfafc1ab21e5814b64029c10ec357178 assets\caffeinated\blockstates\ground_coffee_block.json
26f35f3a03b0d53578efd2c555721b08353d75f0 assets\caffeinated\blockstates\coffee_cauldron.json
b1a481861132973fe035c9b9ce7613e15938034c assets\caffeinated\models\block\coffee_berry_crate.json
e8f1792493d7219e1da4ac39e45bf903a349e3f5 assets\caffeinated\models\block\ground_coffee_cauldron_full.json
cd360bb185f465f81672c32ac31312f77270e5f4 assets\caffeinated\models\block\coffee_cauldron_level2.json
5f0ad0fc380a095ead21e3a00bdbbdcd648548e3 assets\caffeinated\models\item\latte_coffee_bottle.json
57311e73aae426dff5d3b58c69ec071360f952d3 assets\caffeinated\models\block\ground_coffee_cauldron_level1.json
7eea00b3f89da1c214d0719b54a196746bdaef55 assets\caffeinated\models\block\coffee_stained_carpet.json
13297d4a51cb3b1369630338ba5f7b439b4af3fc assets\caffeinated\models\block\cauldron_campfire_filled.json
cd254ba40cfd07d6c01d66a963e5ec83ed478aef assets\caffeinated\blockstates\coffee_berry_crate.json
ace2f8060adedf59471fa9728ad427b7c2abb51e assets\caffeinated\blockstates\soul_cauldron_campfire.json
cd254ba40cfd07d6c01d66a963e5ec83ed478aef assets\caffeinated\blockstates\coffee_berry_crate.json
cdbc1b9ed3c8b04b24b80402af15eb777423817d assets\caffeinated\models\block\ground_coffee_cauldron_level2.json
1297909cbb77803c3f1a796d29fa088c9aeae546 assets\caffeinated\blockstates\coffee_shrub.json
34202786f9a57de99cd6cc7be5013c91a1b9690a assets\caffeinated\models\item\tiramisu_slice.json
Expand All @@ -18,21 +19,26 @@ cdbc1b9ed3c8b04b24b80402af15eb777423817d assets\caffeinated\models\block\ground_
63ec6c618a3a23eab4cab9c52d7d3250de9b516e assets\caffeinated\models\item\civet_spawn_egg.json
fe9155058173a06c1325878e72a8f42b0acfb9d7 assets\caffeinated\models\block\coffee_shrub_stage1.json
2078aae9dd460adbf0bf14e46615e32012f351e8 assets\caffeinated\blockstates\ground_coffee_cauldron.json
2054aec4b6a37f589b32f18f2faf6366bb4a4056 assets\caffeinated\blockstates\coffee_stained_carpet.json
865a21f6601205d70079dbcc9d2bc9d375fbbc73 assets\caffeinated\models\block\coffee_bean_block.json
16db00fbb67b98528c1a99e61640adc411cc4cff assets\caffeinated\models\item\tiramisu.json
8ba76990b97aa664bf34e5e2b94761ebdc7a8c04 assets\caffeinated\models\block\coffee_cauldron_level1.json
3ef771d34d7bc76165d6a5f7053ea5ff27bc44dd assets\caffeinated\blockstates\coffee_bean_block.json
e097a5af6a5c1aab9668db9de97ac4825fd0c743 assets\caffeinated\models\item\cafe_miel_coffee_bottle.json
40fc080bf5e7fe5c74e12b3c3b2454805bb0ea3c assets\caffeinated\models\item\coffee_stained_carpet.json
821f41182077e0ce6bc7918aee907e45a9dd7d73 assets\caffeinated\models\block\soul_cauldron_campfire.json
2ee0688f44b78a48941720e3223b7bf3a9133161 assets\caffeinated\blockstates\potted_coffee_shrub.json
358965a77d8a9ace29f9981a460163089349eda2 assets\caffeinated\models\item\coffee_berry_crate.json
196754b26a9f9cac1bf6b81563cef5344f998868 assets\caffeinated\blockstates\tiramisu.json
04afd00b15d93557d58f63a6ba3b712667c225a7 assets\caffeinated\models\block\coffee_stained_wool.json
ee814f36f99a123b06cf2e7bcb08415b97595925 assets\caffeinated\models\block\potted_coffee_shrub.json
50804beb94c1a58c883df514333ff7d2c2807a42 assets\caffeinated\models\item\coffee_bean_block.json
6bc7bd9e663e1a1e43a79ef46957b15c4682a3a6 assets\caffeinated\models\block\coffee_shrub_stage0.json
0dab1d0bc7608970cc968c8f8569497fae0b2295 assets\caffeinated\models\item\ground_coffee.json
ffcb5afccb3a6b30399f263654799949096594da assets\caffeinated\blockstates\cauldron_campfire.json
58f78eb6198fba07304fece9e3c7bb6247a13229 assets\caffeinated\models\item\coffee_bottle.json
c6d2e6012ee1a88b1c31a8c23652c236df0f1b7a assets\caffeinated\models\item\coffee_stained_wool.json
60bef8f5239edf70b1bb8d309b7b27c58dc11cad assets\caffeinated\blockstates\coffee_stained_wool.json
6568f0e38ffcef7753bd7c0ae1bfdd66fafc6795 assets\caffeinated\models\block\cauldron_campfire.json
e4c8f2b75d3ecafc48e0a48ec6940b6dac0eb258 assets\caffeinated\models\item\coffee_beans.json
66ab3c0788a1452c84c9c06f8ffe0bf7828a9620 assets\caffeinated\models\item\java_banner_pattern.json
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "caffeinated:block/coffee_stained_carpet"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "caffeinated:block/coffee_stained_wool"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:block/carpet",
"textures": {
"wool": "caffeinated:block/coffee_stained_wool"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "caffeinated:block/coffee_stained_wool"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "caffeinated:block/coffee_stained_carpet"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "caffeinated:block/coffee_stained_wool"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_coffee_bottle": {
"conditions": {
"items": [
{
"items": "caffeinated:coffee_bottle"
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "caffeinated:coffee_stained_carpet_from_white_carpet"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_the_recipe",
"has_coffee_bottle"
]
],
"rewards": {
"recipes": [
"caffeinated:coffee_stained_carpet_from_white_carpet"
]
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_coffee_bottle": {
"conditions": {
"items": [
{
"items": "caffeinated:coffee_bottle"
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "caffeinated:coffee_stained_wool"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_the_recipe",
"has_coffee_bottle"
]
],
"rewards": {
"recipes": [
"caffeinated:coffee_stained_wool"
]
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_coffee_stained_wool": {
"conditions": {
"items": [
{
"items": "caffeinated:coffee_stained_wool"
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "caffeinated:coffee_stained_carpet"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_the_recipe",
"has_coffee_stained_wool"
]
],
"rewards": {
"recipes": [
"caffeinated:coffee_stained_carpet"
]
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"type": "minecraft:block",
"pools": [
{
"bonus_rolls": 0.0,
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
],
"entries": [
{
"type": "minecraft:item",
"name": "caffeinated:coffee_stained_carpet"
}
],
"rolls": 1.0
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"type": "minecraft:block",
"pools": [
{
"bonus_rolls": 0.0,
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
],
"entries": [
{
"type": "minecraft:item",
"name": "caffeinated:coffee_stained_wool"
}
],
"rolls": 1.0
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"type": "minecraft:crafting_shaped",
"category": "misc",
"group": "carpet",
"key": {
"#": {
"item": "caffeinated:coffee_stained_wool"
}
},
"pattern": [
"##"
],
"result": {
"count": 3,
"id": "caffeinated:coffee_stained_carpet"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"type": "minecraft:crafting_shapeless",
"category": "building",
"ingredients": [
{
"item": "caffeinated:coffee_bottle"
},
{
"item": "minecraft:white_carpet"
}
],
"result": {
"count": 1,
"id": "caffeinated:coffee_stained_carpet"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"type": "minecraft:crafting_shapeless",
"category": "building",
"ingredients": [
{
"item": "caffeinated:coffee_bottle"
},
{
"item": "minecraft:white_wool"
}
],
"result": {
"count": 1,
"id": "caffeinated:coffee_stained_wool"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import net.fabricmc.fabric.api.biome.v1.BiomeModifications;
import net.fabricmc.fabric.api.biome.v1.BiomeSelectors;
import net.fabricmc.fabric.api.loot.v3.LootTableEvents;
import net.minecraft.block.entity.BlockEntityType;
import net.minecraft.entity.SpawnGroup;
import net.minecraft.entity.SpawnLocationTypes;
import net.minecraft.entity.SpawnRestriction;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,10 @@
import net.chikorita_lover.caffeinated.registry.CaffeinatedItems;
import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput;
import net.fabricmc.fabric.api.datagen.v1.provider.FabricBlockLootTableProvider;
import net.minecraft.block.BedBlock;
import net.minecraft.block.Block;
import net.minecraft.block.Blocks;
import net.minecraft.block.enums.BedPart;
import net.minecraft.block.enums.DoubleBlockHalf;
import net.minecraft.enchantment.Enchantment;
import net.minecraft.enchantment.Enchantments;
Expand Down Expand Up @@ -34,6 +36,8 @@ public void generate() {
this.addPottedPlantDrops(CaffeinatedBlocks.POTTED_COFFEE_SHRUB);
this.addDrop(CaffeinatedBlocks.COFFEE_BEAN_BLOCK);
this.addDrop(CaffeinatedBlocks.GROUND_COFFEE_BLOCK);
this.addDrop(CaffeinatedBlocks.COFFEE_STAINED_WOOL);
this.addDrop(CaffeinatedBlocks.COFFEE_STAINED_CARPET);
this.addDrop(CaffeinatedBlocks.GROUND_COFFEE_CAULDRON, Blocks.CAULDRON);
this.addDrop(CaffeinatedBlocks.COFFEE_CAULDRON, Blocks.CAULDRON);
this.addDrop(CaffeinatedBlocks.COFFEE_BERRY_CRATE);
Expand Down
Loading

0 comments on commit 1b5d786

Please sign in to comment.