diff --git a/gradle.properties b/gradle.properties index c72c8379..b546e887 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ mod_version=1.0.x minecraft_version=1.18.2 -forge_version=40.0.12 \ No newline at end of file +forge_version=40.0.32 diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index 150cf3f4..d4eabff8 100644 --- a/src/generated/resources/.cache/cache +++ b/src/generated/resources/.cache/cache @@ -1,15 +1,14 @@ a28b0f687e669d4994b7667c92dde8394e3e6208 assets/testmod/blockstates/magic_item_model.json 539ba580bd22c7822c059998a2479aefa78dde61 assets/testmod/blockstates/testblock.json 209c1eedcb8fbc05ed7146cb3ed3077cb0e2172f assets/testmod/blockstates/testfluid.json -2f94ce46a72dac1daede637b8a326f91df4154df assets/testmod/lang/en_ud.json -0258d5485d993b470c77c71e332c2fde7b8b9e6e assets/testmod/lang/en_us.json +3d9c3a812d0c49240f229cd37cf5c1ff92a39498 assets/testmod/lang/en_ud.json +f4dd307f9dbcdc7b3cd20ea397dd9fce90977e69 assets/testmod/lang/en_us.json e252697eaaed16b403c6ccbd1d16e5a55d180753 assets/testmod/models/block/subfolder/magic_item_model.json f6d6714e77dedf174f7cdf2148c61979b8ff950a assets/testmod/models/block/testblock.json af64d14ab81f8d19774a45ad1ca41cb69c280e6e assets/testmod/models/block/testfluid.json 63fe0b9d5aa5d58f07aa7bd9c0c76604a234c678 assets/testmod/models/item/magic_item_model.json 1ecfe3e1394a79cacfefe33c36cfb714af953374 assets/testmod/models/item/testblock.json 98167609bf3898587f7565736a6fc24a7966cacd assets/testmod/models/item/testentity_spawn_egg.json -f5978560e17788b6f4fb40382e25257de00befcc assets/testmod/models/item/testfluid_bucket.json 44a7f013ea9ed633a6eef7670db72fd6138b7d35 assets/testmod/models/item/testitem.json a6cdf498951379d190dc11c82b13398f792e5fb3 data/minecraft/tags/blocks/bamboo_plantable_on.json a6cdf498951379d190dc11c82b13398f792e5fb3 data/minecraft/tags/blocks/dragon_immune.json @@ -17,14 +16,14 @@ a6cdf498951379d190dc11c82b13398f792e5fb3 data/minecraft/tags/blocks/wither_immun b27f8565b143ba660c58d74121b2358a5a53c5c7 data/minecraft/tags/entity_types/raiders.json c9e95e928aae7b806f272f029519f7da88217864 data/minecraft/tags/fluids/water.json f388aaa8e3ca0f0ae20c8df06d1f2a2295cf1f51 data/minecraft/tags/items/beds.json -ad5992997669d0b5287b648bfd0b4a03214287da data/testmod/advancements/recipes/building_blocks/diamond_block_from_testblock_campfire.json -d7f76c9f6597c2767c2edb24c2a72bcfefe2703f data/testmod/advancements/recipes/building_blocks/diamond_block_from_testblock_smelting.json -6a3ff6f8d7983ab8b25dcdd345da2cdce98fe24c data/testmod/advancements/recipes/building_blocks/diamond_block_from_testblock_smoking.json -1f9d4ea3ff63546bf258a2a3b7d826913b2e3060 data/testmod/advancements/recipes/testmod/testblock.json -68ab742ba2e458e900b03f8c51c7f5b95d660d52 data/testmod/advancements/root.json -5bcd3d963c178a6bf8d45da58e4ddc19ca1f3db0 data/testmod/loot_tables/blocks/magic_item_model.json -584afe0097ffcd23949a055522e22a8194506ff9 data/testmod/loot_tables/blocks/testblock.json -2e2bc9fedc2380a91b82f1161c30db25016623da data/testmod/loot_tables/entities/testentity.json +d89129efe43bedab8879e946581f6d461c29e77b data/testmod/advancements/recipes/building_blocks/diamond_block_from_testblock_campfire.json +faea8b95ef3da2c766a9565b4e0fd100d0947abe data/testmod/advancements/recipes/building_blocks/diamond_block_from_testblock_smelting.json +b402b67080821cf05df04c87ceacc603aa704985 data/testmod/advancements/recipes/building_blocks/diamond_block_from_testblock_smoking.json +387ad0982ba73f0339fd65222b89ac806b9b44f3 data/testmod/advancements/recipes/testmod/testblock.json +bce8c5ebc3089f297396f4fc71ad2f52d9fa8be1 data/testmod/advancements/root.json +fdce99e848f33a57df1e333e4398cbacb3a2dfa7 data/testmod/loot_tables/blocks/magic_item_model.json +f460f7ed502ab0928c210fc93c2b41e05c4cc200 data/testmod/loot_tables/blocks/testblock.json +0c9ede425546f487c74e0b943ebbc62d058409ff data/testmod/loot_tables/entities/testentity.json f0266b86d509baafb030ddb9915394ea06d372cd data/testmod/loot_tables/entities/testitem.json 3fce860c2686d77a1d3085cc4184ee4d0431e0b1 data/testmod/recipes/diamond_block_from_testblock_campfire.json a5715702ab3c5d70e72667c431c89d822c50d1b4 data/testmod/recipes/diamond_block_from_testblock_smelting.json diff --git a/src/generated/resources/assets/testmod/lang/en_ud.json b/src/generated/resources/assets/testmod/lang/en_ud.json index ab99c63e..be2efb24 100644 --- a/src/generated/resources/assets/testmod/lang/en_ud.json +++ b/src/generated/resources/assets/testmod/lang/en_ud.json @@ -8,7 +8,6 @@ "entity.testmod.testentity": "\u028E\u0287\u0131\u0287u\u01DD\u0287s\u01DD\u27D8", "entity.testmod.testitem": "\u026F\u01DD\u0287\u0131\u0287s\u01DD\u27D8", "item.testmod.testentity_spawn_egg": "bb\u018E u\u028D\u0250dS \u028E\u0287\u0131\u0287u\u01DD\u0287s\u01DD\u27D8", - "item.testmod.testfluid_bucket": "\u0287\u01DD\u029E\u0254n\u15FA p\u0131n\u05DF\u025F\u0287s\u01DD\u27D8", "item.testmod.testitem": "\u026F\u01DD\u0287\u0131\u0287s\u01DD\u27D8", "item.testmod.testitem.testextra": "\u00A1\u0254\u0131b\u0250W", "itemGroup.testmod": "poW \u0287s\u01DD\u27D8", diff --git a/src/generated/resources/assets/testmod/lang/en_us.json b/src/generated/resources/assets/testmod/lang/en_us.json index 802dc63c..bbd7330b 100644 --- a/src/generated/resources/assets/testmod/lang/en_us.json +++ b/src/generated/resources/assets/testmod/lang/en_us.json @@ -8,7 +8,6 @@ "entity.testmod.testentity": "Testentity", "entity.testmod.testitem": "Testitem", "item.testmod.testentity_spawn_egg": "Testentity Spawn Egg", - "item.testmod.testfluid_bucket": "Testfluid Bucket", "item.testmod.testitem": "Testitem", "item.testmod.testitem.testextra": "Magic!", "itemGroup.testmod": "Test Mod", diff --git a/src/generated/resources/assets/testmod/models/item/testfluid_bucket.json b/src/generated/resources/assets/testmod/models/item/testfluid_bucket.json deleted file mode 100644 index e22a8c4e..00000000 --- a/src/generated/resources/assets/testmod/models/item/testfluid_bucket.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "minecraft:item/water_bucket" -} \ No newline at end of file diff --git a/src/generated/resources/data/testmod/advancements/recipes/building_blocks/diamond_block_from_testblock_campfire.json b/src/generated/resources/data/testmod/advancements/recipes/building_blocks/diamond_block_from_testblock_campfire.json index 21fb9ab1..e0d9e148 100644 --- a/src/generated/resources/data/testmod/advancements/recipes/building_blocks/diamond_block_from_testblock_campfire.json +++ b/src/generated/resources/data/testmod/advancements/recipes/building_blocks/diamond_block_from_testblock_campfire.json @@ -11,7 +11,9 @@ "conditions": { "items": [ { - "item": "testmod:testblock" + "items": [ + "testmod:testblock" + ] } ] } diff --git a/src/generated/resources/data/testmod/advancements/recipes/building_blocks/diamond_block_from_testblock_smelting.json b/src/generated/resources/data/testmod/advancements/recipes/building_blocks/diamond_block_from_testblock_smelting.json index d18647d0..723a9ff4 100644 --- a/src/generated/resources/data/testmod/advancements/recipes/building_blocks/diamond_block_from_testblock_smelting.json +++ b/src/generated/resources/data/testmod/advancements/recipes/building_blocks/diamond_block_from_testblock_smelting.json @@ -11,7 +11,9 @@ "conditions": { "items": [ { - "item": "testmod:testblock" + "items": [ + "testmod:testblock" + ] } ] } diff --git a/src/generated/resources/data/testmod/advancements/recipes/building_blocks/diamond_block_from_testblock_smoking.json b/src/generated/resources/data/testmod/advancements/recipes/building_blocks/diamond_block_from_testblock_smoking.json index 1478b0fb..a9338962 100644 --- a/src/generated/resources/data/testmod/advancements/recipes/building_blocks/diamond_block_from_testblock_smoking.json +++ b/src/generated/resources/data/testmod/advancements/recipes/building_blocks/diamond_block_from_testblock_smoking.json @@ -11,7 +11,9 @@ "conditions": { "items": [ { - "item": "testmod:testblock" + "items": [ + "testmod:testblock" + ] } ] } diff --git a/src/generated/resources/data/testmod/advancements/recipes/testmod/testblock.json b/src/generated/resources/data/testmod/advancements/recipes/testmod/testblock.json index 7f104172..ae8d12f6 100644 --- a/src/generated/resources/data/testmod/advancements/recipes/testmod/testblock.json +++ b/src/generated/resources/data/testmod/advancements/recipes/testmod/testblock.json @@ -11,7 +11,9 @@ "conditions": { "items": [ { - "item": "minecraft:egg" + "items": [ + "minecraft:egg" + ] } ] } diff --git a/src/generated/resources/data/testmod/advancements/root.json b/src/generated/resources/data/testmod/advancements/root.json index 07ae463e..6dd7686b 100644 --- a/src/generated/resources/data/testmod/advancements/root.json +++ b/src/generated/resources/data/testmod/advancements/root.json @@ -21,7 +21,9 @@ "conditions": { "items": [ { - "item": "minecraft:egg" + "items": [ + "minecraft:egg" + ] } ] } diff --git a/src/generated/resources/data/testmod/loot_tables/blocks/magic_item_model.json b/src/generated/resources/data/testmod/loot_tables/blocks/magic_item_model.json index b710ed02..e23e1a65 100644 --- a/src/generated/resources/data/testmod/loot_tables/blocks/magic_item_model.json +++ b/src/generated/resources/data/testmod/loot_tables/blocks/magic_item_model.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/src/generated/resources/data/testmod/loot_tables/blocks/testblock.json b/src/generated/resources/data/testmod/loot_tables/blocks/testblock.json index 8e5f0834..137ee8c0 100644 --- a/src/generated/resources/data/testmod/loot_tables/blocks/testblock.json +++ b/src/generated/resources/data/testmod/loot_tables/blocks/testblock.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/src/generated/resources/data/testmod/loot_tables/entities/testentity.json b/src/generated/resources/data/testmod/loot_tables/entities/testentity.json index 52308a30..4ce88106 100644 --- a/src/generated/resources/data/testmod/loot_tables/entities/testentity.json +++ b/src/generated/resources/data/testmod/loot_tables/entities/testentity.json @@ -2,7 +2,8 @@ "type": "minecraft:entity", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -10,14 +11,16 @@ { "function": "minecraft:set_count", "count": { + "type": "minecraft:uniform", "min": 1.0, - "max": 3.0, - "type": "minecraft:uniform" - } + "max": 3.0 + }, + "add": false }, { "function": "minecraft:looting_enchant", "count": { + "type": "minecraft:uniform", "min": 0.0, "max": 2.0 } diff --git a/src/main/java/com/tterrag/registrate/AbstractRegistrate.java b/src/main/java/com/tterrag/registrate/AbstractRegistrate.java index 061697da..94316dfe 100644 --- a/src/main/java/com/tterrag/registrate/AbstractRegistrate.java +++ b/src/main/java/com/tterrag/registrate/AbstractRegistrate.java @@ -94,6 +94,7 @@ import net.minecraftforge.registries.ForgeRegistries; import net.minecraftforge.registries.IForgeRegistry; import net.minecraftforge.registries.IForgeRegistryEntry; +import net.minecraftforge.registries.NewRegistryEvent; import net.minecraftforge.registries.RegistryBuilder; import net.minecraftforge.registries.RegistryManager; import net.minecraftforge.registries.RegistryObject; @@ -792,11 +793,11 @@ protected , T extends R> RegistryEntry accep @Beta @SuppressWarnings("unchecked") public > Supplier> makeRegistry(String name, Class superType, Supplier> builder) { - OneTimeEventReceiver.addModListener(RegistryEvent.NewRegistry.class, $ -> builder.get() - .setName(new ResourceLocation(getModid(), name)) - .setType((Class) superType) - .create()); - return Suppliers.memoize(() -> RegistryManager.ACTIVE.getRegistry(superType)); + final ResourceLocation registryId = new ResourceLocation(getModid(), name); + OneTimeEventReceiver.addModListener(NewRegistryEvent.class, e -> e.create(builder.get() + .setName(registryId) + .setType((Class) superType))); + return Suppliers.memoize(() -> RegistryManager.ACTIVE.getRegistry(registryId)); } /* === Builder helpers === */ diff --git a/src/main/java/com/tterrag/registrate/builders/AbstractBuilder.java b/src/main/java/com/tterrag/registrate/builders/AbstractBuilder.java index fcc83b42..4eb03ab6 100644 --- a/src/main/java/com/tterrag/registrate/builders/AbstractBuilder.java +++ b/src/main/java/com/tterrag/registrate/builders/AbstractBuilder.java @@ -17,9 +17,7 @@ import lombok.AccessLevel; import lombok.Getter; import lombok.RequiredArgsConstructor; -import net.minecraft.tags.Tag; import net.minecraft.tags.TagKey; -import net.minecraft.world.item.Item; import net.minecraftforge.common.util.NonNullFunction; import net.minecraftforge.registries.IForgeRegistryEntry; import net.minecraftforge.registries.RegistryObject; diff --git a/src/main/java/com/tterrag/registrate/builders/BlockBuilder.java b/src/main/java/com/tterrag/registrate/builders/BlockBuilder.java index 5c3a7589..b28aadad 100644 --- a/src/main/java/com/tterrag/registrate/builders/BlockBuilder.java +++ b/src/main/java/com/tterrag/registrate/builders/BlockBuilder.java @@ -34,7 +34,6 @@ import net.minecraft.client.color.block.BlockColor; import net.minecraft.client.renderer.ItemBlockRenderTypes; import net.minecraft.client.renderer.RenderType; -import net.minecraft.tags.Tag; import net.minecraft.tags.TagKey; import net.minecraft.world.item.BlockItem; import net.minecraft.world.item.DyeColor; diff --git a/src/main/java/com/tterrag/registrate/builders/EntityBuilder.java b/src/main/java/com/tterrag/registrate/builders/EntityBuilder.java index 1cf0bc47..375d1ce9 100644 --- a/src/main/java/com/tterrag/registrate/builders/EntityBuilder.java +++ b/src/main/java/com/tterrag/registrate/builders/EntityBuilder.java @@ -22,7 +22,6 @@ import net.minecraft.client.renderer.entity.EntityRenderer; import net.minecraft.client.renderer.entity.EntityRendererProvider; import net.minecraft.resources.ResourceLocation; -import net.minecraft.tags.Tag; import net.minecraft.tags.TagKey; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.EntityType; diff --git a/src/main/java/com/tterrag/registrate/builders/FluidBuilder.java b/src/main/java/com/tterrag/registrate/builders/FluidBuilder.java index 730e35b3..769587f6 100644 --- a/src/main/java/com/tterrag/registrate/builders/FluidBuilder.java +++ b/src/main/java/com/tterrag/registrate/builders/FluidBuilder.java @@ -25,7 +25,6 @@ import net.minecraft.Util; import net.minecraft.resources.ResourceLocation; import net.minecraft.tags.FluidTags; -import net.minecraft.tags.Tag; import net.minecraft.tags.TagKey; import net.minecraft.world.item.BucketItem; import net.minecraft.world.item.Item; diff --git a/src/main/java/com/tterrag/registrate/builders/ItemBuilder.java b/src/main/java/com/tterrag/registrate/builders/ItemBuilder.java index 3714535e..774c7f02 100644 --- a/src/main/java/com/tterrag/registrate/builders/ItemBuilder.java +++ b/src/main/java/com/tterrag/registrate/builders/ItemBuilder.java @@ -223,7 +223,7 @@ public ItemBuilder recipe(NonNullBiConsumer, Regis } /** - * Assign {@link TagKey}{@code s} to this item. Multiple calls will add additional tags. + * Assign {@link TagKey}{@code s} to this item. Multiple calls will add additional tags. * * @param tags * The tag to assign diff --git a/src/main/java/com/tterrag/registrate/providers/RegistrateRecipeProvider.java b/src/main/java/com/tterrag/registrate/providers/RegistrateRecipeProvider.java index b618b871..ea0145fe 100644 --- a/src/main/java/com/tterrag/registrate/providers/RegistrateRecipeProvider.java +++ b/src/main/java/com/tterrag/registrate/providers/RegistrateRecipeProvider.java @@ -1,6 +1,7 @@ package com.tterrag.registrate.providers; import java.nio.file.Path; +import java.util.List; import java.util.function.Consumer; import java.util.function.Supplier; @@ -16,18 +17,21 @@ import net.minecraft.advancements.critereon.EnterBlockTrigger; import net.minecraft.advancements.critereon.InventoryChangeTrigger; import net.minecraft.advancements.critereon.ItemPredicate; +import net.minecraft.advancements.critereon.MinMaxBounds; +import net.minecraft.data.BlockFamily; import net.minecraft.data.DataGenerator; import net.minecraft.data.HashCache; import net.minecraft.data.recipes.FinishedRecipe; +import net.minecraft.data.recipes.RecipeBuilder; import net.minecraft.data.recipes.RecipeProvider; import net.minecraft.data.recipes.ShapedRecipeBuilder; import net.minecraft.data.recipes.ShapelessRecipeBuilder; import net.minecraft.data.recipes.SimpleCookingRecipeBuilder; import net.minecraft.data.recipes.SingleItemRecipeBuilder; import net.minecraft.resources.ResourceLocation; -import net.minecraft.tags.Tag; import net.minecraft.tags.TagKey; import net.minecraft.world.item.Item; +import net.minecraft.world.item.crafting.Ingredient; import net.minecraft.world.item.crafting.RecipeSerializer; import net.minecraft.world.item.crafting.SimpleCookingSerializer; import net.minecraft.world.level.ItemLike; @@ -299,13 +303,109 @@ public > void trapDoor(DataIngredien @Override public void saveAdvancement(HashCache p_126014_, JsonObject p_126015_, Path p_126016_) { super.saveAdvancement(p_126014_, p_126015_, p_126016_); } + public static void oreSmelting(Consumer p_176592_, List p_176593_, ItemLike p_176594_, float p_176595_, int p_176596_, String p_176597_) { RecipeProvider.oreSmelting(p_176592_, p_176593_, p_176594_, p_176595_, p_176596_, p_176597_); } + + public static void oreBlasting(Consumer p_176626_, List p_176627_, ItemLike p_176628_, float p_176629_, int p_176630_, String p_176631_) { RecipeProvider.oreBlasting(p_176626_, p_176627_, p_176628_, p_176629_, p_176630_, p_176631_); } + + public static void oreCooking(Consumer p_176534_, SimpleCookingSerializer p_176535_, List p_176536_, ItemLike p_176537_, float p_176538_, int p_176539_, String p_176540_, String p_176541_) { RecipeProvider.oreCooking(p_176534_, p_176535_, p_176536_, p_176537_, p_176538_, p_176539_, p_176540_, p_176541_); } + + public static void netheriteSmithing(Consumer p_125995_, Item p_125996_, Item p_125997_) { RecipeProvider.netheriteSmithing(p_125995_, p_125996_, p_125997_); } + + public static void planksFromLog(Consumer p_206409_, ItemLike p_206410_, TagKey p_206411_) { RecipeProvider.planksFromLog(p_206409_, p_206410_, p_206411_); } + + public static void planksFromLogs(Consumer p_206413_, ItemLike p_206414_, TagKey p_206415_) { RecipeProvider.planksFromLogs(p_206413_, p_206414_, p_206415_); } + + public static void woodFromLogs(Consumer p_126003_, ItemLike p_126004_, ItemLike p_126005_) { RecipeProvider.woodFromLogs(p_126003_, p_126004_, p_126005_); } + + public static void woodenBoat(Consumer p_126022_, ItemLike p_126023_, ItemLike p_126024_) { RecipeProvider.woodenBoat(p_126022_, p_126023_, p_126024_); } + + public static RecipeBuilder buttonBuilder(ItemLike p_176659_, Ingredient p_176660_) { return RecipeProvider.buttonBuilder(p_176659_, p_176660_); } + + public static RecipeBuilder doorBuilder(ItemLike p_176671_, Ingredient p_176672_) { return RecipeProvider.doorBuilder(p_176671_, p_176672_); } + + public static RecipeBuilder fenceBuilder(ItemLike p_176679_, Ingredient p_176680_) { return RecipeProvider.fenceBuilder(p_176679_, p_176680_); } + + public static RecipeBuilder fenceGateBuilder(ItemLike p_176685_, Ingredient p_176686_) { return RecipeProvider.fenceGateBuilder(p_176685_, p_176686_); } + + public static void pressurePlate(Consumer p_176691_, ItemLike p_176692_, ItemLike p_176693_) { RecipeProvider.pressurePlate(p_176691_, p_176692_, p_176693_); } + + public static RecipeBuilder pressurePlateBuilder(ItemLike p_176695_, Ingredient p_176696_) { return RecipeProvider.pressurePlateBuilder(p_176695_, p_176696_); } + + public static void slab(Consumer p_176701_, ItemLike p_176702_, ItemLike p_176703_) { RecipeProvider.slab(p_176701_, p_176702_, p_176703_); } + + public static RecipeBuilder slabBuilder(ItemLike p_176705_, Ingredient p_176706_) { return RecipeProvider.slabBuilder(p_176705_, p_176706_); } + + public static RecipeBuilder stairBuilder(ItemLike p_176711_, Ingredient p_176712_) { return RecipeProvider.stairBuilder(p_176711_, p_176712_); } + + public static RecipeBuilder trapdoorBuilder(ItemLike p_176721_, Ingredient p_176722_) { return RecipeProvider.trapdoorBuilder(p_176721_, p_176722_); } + + public static RecipeBuilder signBuilder(ItemLike p_176727_, Ingredient p_176728_) { return RecipeProvider.signBuilder(p_176727_, p_176728_); } + + public static void coloredWoolFromWhiteWoolAndDye(Consumer p_126062_, ItemLike p_126063_, ItemLike p_126064_) { RecipeProvider.coloredWoolFromWhiteWoolAndDye(p_126062_, p_126063_, p_126064_); } + + public static void carpet(Consumer p_176717_, ItemLike p_176718_, ItemLike p_176719_) { RecipeProvider.carpet(p_176717_, p_176718_, p_176719_); } + + public static void coloredCarpetFromWhiteCarpetAndDye(Consumer p_126070_, ItemLike p_126071_, ItemLike p_126072_) { RecipeProvider.coloredCarpetFromWhiteCarpetAndDye(p_126070_, p_126071_, p_126072_); } + + public static void bedFromPlanksAndWool(Consumer p_126074_, ItemLike p_126075_, ItemLike p_126076_) { RecipeProvider.bedFromPlanksAndWool(p_126074_, p_126075_, p_126076_); } + + public static void bedFromWhiteBedAndDye(Consumer p_126078_, ItemLike p_126079_, ItemLike p_126080_) { RecipeProvider.bedFromWhiteBedAndDye(p_126078_, p_126079_, p_126080_); } + + public static void banner(Consumer p_126082_, ItemLike p_126083_, ItemLike p_126084_) { RecipeProvider.banner(p_126082_, p_126083_, p_126084_); } + + public static void stainedGlassFromGlassAndDye(Consumer p_126086_, ItemLike p_126087_, ItemLike p_126088_) { RecipeProvider.stainedGlassFromGlassAndDye(p_126086_, p_126087_, p_126088_); } + + public static void stainedGlassPaneFromStainedGlass(Consumer p_126090_, ItemLike p_126091_, ItemLike p_126092_) { RecipeProvider.stainedGlassPaneFromStainedGlass(p_126090_, p_126091_, p_126092_); } + + public static void stainedGlassPaneFromGlassPaneAndDye(Consumer p_126094_, ItemLike p_126095_, ItemLike p_126096_) { RecipeProvider.stainedGlassPaneFromGlassPaneAndDye(p_126094_, p_126095_, p_126096_); } + + public static void coloredTerracottaFromTerracottaAndDye(Consumer p_126098_, ItemLike p_126099_, ItemLike p_126100_) { RecipeProvider.coloredTerracottaFromTerracottaAndDye(p_126098_, p_126099_, p_126100_); } + + public static void concretePowder(Consumer p_126102_, ItemLike p_126103_, ItemLike p_126104_) { RecipeProvider.concretePowder(p_126102_, p_126103_, p_126104_); } + + public static void stonecutterResultFromBase(Consumer p_176736_, ItemLike p_176737_, ItemLike p_176738_) { RecipeProvider.stonecutterResultFromBase(p_176736_, p_176737_, p_176738_); } + + public static void stonecutterResultFromBase(Consumer p_176547_, ItemLike p_176548_, ItemLike p_176549_, int p_176550_) { RecipeProvider.stonecutterResultFromBase(p_176547_, p_176548_, p_176549_, p_176550_); } + + public static void smeltingResultFromBase(Consumer p_176740_, ItemLike p_176741_, ItemLike p_176742_) { RecipeProvider.smeltingResultFromBase(p_176740_, p_176741_, p_176742_); } + + public static void nineBlockStorageRecipes(Consumer p_176744_, ItemLike p_176745_, ItemLike p_176746_) { RecipeProvider.nineBlockStorageRecipes(p_176744_, p_176745_, p_176746_); } + + public static void nineBlockStorageRecipesWithCustomPacking(Consumer p_176563_, ItemLike p_176564_, ItemLike p_176565_, String p_176566_, String p_176567_) { RecipeProvider.nineBlockStorageRecipesWithCustomPacking(p_176563_, p_176564_, p_176565_, p_176566_, p_176567_); } + + public static void nineBlockStorageRecipesRecipesWithCustomUnpacking(Consumer p_176617_, ItemLike p_176618_, ItemLike p_176619_, String p_176620_, String p_176621_) { RecipeProvider.nineBlockStorageRecipesRecipesWithCustomUnpacking(p_176617_, p_176618_, p_176619_, p_176620_, p_176621_); } + + public static void cookRecipes(Consumer p_126007_, String p_126008_, SimpleCookingSerializer p_126009_, int p_126010_) { RecipeProvider.cookRecipes(p_126007_, p_126008_, p_126009_, p_126010_); } + + public static void simpleCookingRecipe(Consumer p_176584_, String p_176585_, SimpleCookingSerializer p_176586_, int p_176587_, ItemLike p_176588_, ItemLike p_176589_, float p_176590_) { RecipeProvider.simpleCookingRecipe(p_176584_, p_176585_, p_176586_, p_176587_, p_176588_, p_176589_, p_176590_); } + + public static void waxRecipes(Consumer p_176611_) { RecipeProvider.waxRecipes(p_176611_); } + + public static void generateRecipes(Consumer p_176581_, BlockFamily p_176582_) { RecipeProvider.generateRecipes(p_176581_, p_176582_); } + + public static Block getBaseBlock(BlockFamily p_176524_, BlockFamily.Variant p_176525_) { return RecipeProvider.getBaseBlock(p_176524_, p_176525_); } + public static EnterBlockTrigger.TriggerInstance insideOf(Block p_125980_) { return RecipeProvider.insideOf(p_125980_); } + public static InventoryChangeTrigger.TriggerInstance has(MinMaxBounds.Ints p_176521_, ItemLike p_176522_) { return RecipeProvider.has(p_176521_, p_176522_); } + public static InventoryChangeTrigger.TriggerInstance has(ItemLike p_125978_) { return RecipeProvider.has(p_125978_); } - public static InventoryChangeTrigger.TriggerInstance has(TagKey p_125976_) { return RecipeProvider.inventoryTrigger(ItemPredicate.Builder.item().of(p_125976_).build()); } + public static InventoryChangeTrigger.TriggerInstance has(TagKey p_206407_) { return RecipeProvider.has(p_206407_); } public static InventoryChangeTrigger.TriggerInstance inventoryTrigger(ItemPredicate... p_126012_) { return RecipeProvider.inventoryTrigger(p_126012_); } + public static String getHasName(ItemLike p_176603_) { return RecipeProvider.getHasName(p_176603_); } + + public static String getItemName(ItemLike p_176633_) { return RecipeProvider.getItemName(p_176633_); } + + public static String getSimpleRecipeName(ItemLike p_176645_) { return RecipeProvider.getSimpleRecipeName(p_176645_); } + + public static String getConversionRecipeName(ItemLike p_176518_, ItemLike p_176519_) { return RecipeProvider.getConversionRecipeName(p_176518_, p_176519_); } + + public static String getSmeltingRecipeName(ItemLike p_176657_) { return RecipeProvider.getSmeltingRecipeName(p_176657_); } + + public static String getBlastingRecipeName(ItemLike p_176669_) { return RecipeProvider.getBlastingRecipeName(p_176669_); } + // GENERATED END } diff --git a/src/main/java/com/tterrag/registrate/util/DataIngredient.java b/src/main/java/com/tterrag/registrate/util/DataIngredient.java index ae614445..8de793da 100644 --- a/src/main/java/com/tterrag/registrate/util/DataIngredient.java +++ b/src/main/java/com/tterrag/registrate/util/DataIngredient.java @@ -27,7 +27,7 @@ * A helper for data generation when using ingredients as input(s) to recipes.
* It remembers the name of the primary ingredient for use in creating recipe names/criteria. *

- * Create an instance of this class with the various factory methods such as {@link #items(ItemLike, ItemLike...)} and {@link #tag(TagKey)}. + * Create an instance of this class with the various factory methods such as {@link #items(ItemLike, ItemLike...)} and {@link #tag(TagKey)}. *

* This class should not be used for any purpose other than data generation, it will throw an exception if it is serialized to a packet buffer. */ @@ -38,10 +38,12 @@ private interface Excludes { IIngredientSerializer getSerializer(); void toNetwork(FriendlyByteBuf buffer); - + + boolean checkInvalidation(); + + void markValid(); + boolean isVanilla(); - - public boolean checkInvalidation(); } @Delegate(excludes = Excludes.class) diff --git a/src/test/java/com/tterrag/registrate/test/meta/UpdateRecipeProvider.java b/src/test/java/com/tterrag/registrate/test/meta/UpdateRecipeProvider.java index eb446ed6..450591d5 100644 --- a/src/test/java/com/tterrag/registrate/test/meta/UpdateRecipeProvider.java +++ b/src/test/java/com/tterrag/registrate/test/meta/UpdateRecipeProvider.java @@ -7,7 +7,7 @@ public class UpdateRecipeProvider { public static void main(String[] args) throws IOException { new MethodGenerator() - .exclude("registerRecipes") + .exclude("buildCraftingRecipes") .generate(Paths.get("src", "main", "java", "com", "tterrag", "registrate", "providers", "RegistrateRecipeProvider.java")); } } diff --git a/src/test/java/com/tterrag/registrate/test/mod/TestMod.java b/src/test/java/com/tterrag/registrate/test/mod/TestMod.java index 9266ff08..30dfb485 100644 --- a/src/test/java/com/tterrag/registrate/test/mod/TestMod.java +++ b/src/test/java/com/tterrag/registrate/test/mod/TestMod.java @@ -284,10 +284,10 @@ private static class TestCustomRegistryEntry extends ForgeRegistryEntry a.luminosity(15)) .properties(p -> p.canMultiply()) -// .noBucket() - .bucket() - .model((ctx, prov) -> prov.withExistingParent(ctx.getName(), prov.mcLoc("item/water_bucket"))) - .build() + .noBucket() +// .bucket() +// .model((ctx, prov) -> prov.withExistingParent(ctx.getName(), prov.mcLoc("item/water_bucket"))) +// .build() // .removeTag(FluidTags.WATER) .register();