diff --git a/build.gradle b/build.gradle index e8b51a9..c473801 100644 --- a/build.gradle +++ b/build.gradle @@ -15,6 +15,7 @@ repositories { name "cloth config, rei" url "https://maven.shedaniel.me" } + maven { name "terraform wood api, trinkets" url "https://maven.terraformersmc.com" diff --git a/gradle.properties b/gradle.properties index 5c59562..b6d3ad7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,17 +3,17 @@ org.gradle.jvmargs=-Xmx2G org.gradle.parallel=true # Fabric Properties -minecraft_version=1.20.1 -yarn_mappings=1.20.1+build.9 -loader_version=0.14.21 +minecraft_version=1.19.2 +yarn_mappings=1.19.2+build.28 +loader_version=0.15.6 # Mod Properties - mod_version = 0.14.11+1.20.1 + mod_version = 0.14.12+1.19.2 maven_group = dev.sterner archives_base_name = cultural-delights-fabric # Dependencies -fabric_version=0.85.0+1.20.1 -delight_version=4640640 -rei_version=4644023 -terraform_wood_api_version=7.0.1 \ No newline at end of file +fabric_version=0.77.0+1.19.2 +delight_version=4634237 +rei_version=9.1.682 +terraform_wood_api_version=4.2.0 \ No newline at end of file diff --git a/src/main/java/dev/sterner/culturaldelights/common/registry/CDObjects.java b/src/main/java/dev/sterner/culturaldelights/common/registry/CDObjects.java index db2d092..76e7907 100644 --- a/src/main/java/dev/sterner/culturaldelights/common/registry/CDObjects.java +++ b/src/main/java/dev/sterner/culturaldelights/common/registry/CDObjects.java @@ -11,10 +11,7 @@ import net.fabricmc.fabric.api.registry.CompostingChanceRegistry; import net.fabricmc.fabric.api.registry.FlammableBlockRegistry; import net.fabricmc.fabric.api.registry.FuelRegistry; -import net.minecraft.block.Block; -import net.minecraft.block.Blocks; -import net.minecraft.block.PillarBlock; -import net.minecraft.block.SaplingBlock; +import net.minecraft.block.*; import net.minecraft.item.AliasedBlockItem; import net.minecraft.item.BlockItem; import net.minecraft.item.Item; @@ -88,7 +85,7 @@ public class CDObjects { public static final Block AVOCADO_LOG = register("avocado_log", new PillarBlock(FabricBlockSettings.copy(Blocks.JUNGLE_LOG)), settings(), true); public static final Block AVOCADO_WOOD = register("avocado_wood", new PillarBlock(FabricBlockSettings.copy(Blocks.JUNGLE_WOOD)), settings(), true); - public static final Block AVOCADO_LEAVES = register("avocado_leaves", new PillarBlock(FabricBlockSettings.copy(Blocks.JUNGLE_LEAVES)), settings(), true); + public static final Block AVOCADO_LEAVES = register("avocado_leaves", new LeavesBlock(FabricBlockSettings.copy(Blocks.JUNGLE_LEAVES)), settings(), true); public static final Block AVOCADO_SAPLING = register("avocado_sapling", new SaplingBlock(new AvocadoSaplingGenerator(), FabricBlockSettings.copy(Blocks.OAK_SAPLING)), settings(), true); diff --git a/src/main/resources/data/culturaldelights/loot_tables/blocks/avocado_leaves.json b/src/main/resources/data/culturaldelights/loot_tables/blocks/avocado_leaves.json index c043fef..0a5bf65 100644 --- a/src/main/resources/data/culturaldelights/loot_tables/blocks/avocado_leaves.json +++ b/src/main/resources/data/culturaldelights/loot_tables/blocks/avocado_leaves.json @@ -2,7 +2,6 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { @@ -12,7 +11,7 @@ "type": "minecraft:item", "conditions": [ { - "condition": "minecraft:alternative", + "condition": "minecraft:any_of", "terms": [ { "condition": "minecraft:match_tool", @@ -47,50 +46,81 @@ "condition": "minecraft:survives_explosion" }, { - "condition": "minecraft:table_bonus", - "enchantment": "minecraft:fortune", "chances": [ 0.05, 0.0625, 0.083333336, 0.1 - ] + ], + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune" } ], "name": "culturaldelights:avocado_sapling" } ] } - ] + ], + "rolls": 1.0 }, { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": [ + "minecraft:shears" + ] + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + ] + } + } + ], "entries": [ { "type": "minecraft:item", "conditions": [ { - "condition": "minecraft:table_bonus", - "enchantment": "minecraft:fortune", "chances": [ 0.02, 0.022222223, 0.025, 0.033333335, 0.1 - ] + ], + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune" } ], "functions": [ { - "function": "minecraft:set_count", + "add": false, "count": { "type": "minecraft:uniform", - "min": 1.0, - "max": 2.0 + "max": 2.0, + "min": 1.0 }, - "add": false + "function": "minecraft:set_count" }, { "function": "minecraft:explosion_decay" @@ -99,11 +129,15 @@ "name": "minecraft:stick" } ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, "conditions": [ { "condition": "minecraft:inverted", "term": { - "condition": "minecraft:alternative", + "condition": "minecraft:any_of", "terms": [ { "condition": "minecraft:match_tool", @@ -129,11 +163,7 @@ ] } } - ] - }, - { - "rolls": 1.0, - "bonus_rolls": 0.0, + ], "entries": [ { "type": "minecraft:item", @@ -142,51 +172,22 @@ "condition": "minecraft:survives_explosion" }, { - "condition": "minecraft:table_bonus", - "enchantment": "minecraft:fortune", "chances": [ 0.005, 0.0055555557, 0.00625, 0.008333334, 0.025 - ] + ], + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune" } ], "name": "culturaldelights:avocado" } ], - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:alternative", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "culturaldelights:blocks/avocado_leaves" } \ No newline at end of file