diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index 4bcd769..e671e92 100644 --- a/src/generated/resources/.cache/cache +++ b/src/generated/resources/.cache/cache @@ -151,6 +151,11 @@ cef57333ec781c3687f8623afe75fa9c66dcdb38 data/reignitedutilities/advancements/re 028c41bb63187ab7532d47eeb4deb6816d82f513 data/reignitedutilities/advancements/recipes/reignitedutilities/6_compressed_netherrack.json 308a165154f38594b1a608f3f2e3c06a204f2a34 data/reignitedutilities/advancements/recipes/reignitedutilities/7_compressed_cobblestone.json ab209559ad76b9a5fde663dc5c5234afbdc7ff58 data/reignitedutilities/advancements/recipes/reignitedutilities/8_compressed_cobblestone.json +1a7516d07d316c22e86750ec8aecd209fd203796 data/reignitedutilities/advancements/recipes/reignitedutilities/diamond_spike.json +fde4a034056f61d39e536f9e11b331dde861ae69 data/reignitedutilities/advancements/recipes/reignitedutilities/gold_spike.json +079007bf3aea47fc0beeaefbfc3df5a8b297448b data/reignitedutilities/advancements/recipes/reignitedutilities/iron_spike.json +917273cedc9612c887423d467dfba43855c5e35d data/reignitedutilities/advancements/recipes/reignitedutilities/stone_spike.json +6e0d653d62e8cea54859f05680dddde25542c968 data/reignitedutilities/advancements/recipes/reignitedutilities/wood_spike.json a6036bbc4b210b872d9dfde59dcf3c2b661f6726 data/reignitedutilities/loot_tables/blocks/1_compressed_cobblestone.json ebe4ba33c5be48488dea2dfaed69ab187de2bfc3 data/reignitedutilities/loot_tables/blocks/1_compressed_dirt.json fe972e6eb6107f47c0e0e493e40349242f60a0c9 data/reignitedutilities/loot_tables/blocks/1_compressed_gravel.json @@ -217,3 +222,8 @@ f62c7523762566d4f9f8000955ce09136c9ca7e1 data/reignitedutilities/recipes/5_compr abfde1a633b6f27264e1fd9fcea7c82ea0406dbb data/reignitedutilities/recipes/6_compressed_netherrack.json 5fe34b95dc9ed1c082a7228b811e0ce7c7e25fee data/reignitedutilities/recipes/7_compressed_cobblestone.json cb419b04c98dbdbd8326c440832557468571f7d4 data/reignitedutilities/recipes/8_compressed_cobblestone.json +7c89f9a4e77531c009aa783c01b4ea69f47e54bc data/reignitedutilities/recipes/diamond_spike.json +079c127e61ec943ae52d4f39b3da9a33ceab94a0 data/reignitedutilities/recipes/gold_spike.json +711a4d1e13afb5ffe64ad5262efe2d9b819d2c2f data/reignitedutilities/recipes/iron_spike.json +a5cfcfb49eccb179a3d8f94c629f727418dd8068 data/reignitedutilities/recipes/stone_spike.json +31efc349fd150f9cb26e84e01336a5aa37a95c09 data/reignitedutilities/recipes/wood_spike.json diff --git a/src/generated/resources/assets/reignitedutilities/blockstates/manual_mill.json b/src/generated/resources/assets/reignitedutilities/blockstates/manual_mill.json deleted file mode 100644 index e06afad..0000000 --- a/src/generated/resources/assets/reignitedutilities/blockstates/manual_mill.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "reignitedutilities:block/manual_mill" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/data/reignitedutilities/advancements/recipes/reignitedutilities/diamond_spike.json b/src/generated/resources/data/reignitedutilities/advancements/recipes/reignitedutilities/diamond_spike.json new file mode 100644 index 0000000..c49b551 --- /dev/null +++ b/src/generated/resources/data/reignitedutilities/advancements/recipes/reignitedutilities/diamond_spike.json @@ -0,0 +1,26 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "reignitedutilities:diamond_spike" + ] + }, + "criteria": { + "tick": { + "trigger": "minecraft:tick", + "conditions": {} + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "reignitedutilities:diamond_spike" + } + } + }, + "requirements": [ + [ + "tick", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/reignitedutilities/advancements/recipes/reignitedutilities/gold_spike.json b/src/generated/resources/data/reignitedutilities/advancements/recipes/reignitedutilities/gold_spike.json new file mode 100644 index 0000000..ec95cbf --- /dev/null +++ b/src/generated/resources/data/reignitedutilities/advancements/recipes/reignitedutilities/gold_spike.json @@ -0,0 +1,26 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "reignitedutilities:gold_spike" + ] + }, + "criteria": { + "tick": { + "trigger": "minecraft:tick", + "conditions": {} + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "reignitedutilities:gold_spike" + } + } + }, + "requirements": [ + [ + "tick", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/reignitedutilities/advancements/recipes/reignitedutilities/iron_spike.json b/src/generated/resources/data/reignitedutilities/advancements/recipes/reignitedutilities/iron_spike.json new file mode 100644 index 0000000..a9dd2a4 --- /dev/null +++ b/src/generated/resources/data/reignitedutilities/advancements/recipes/reignitedutilities/iron_spike.json @@ -0,0 +1,26 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "reignitedutilities:iron_spike" + ] + }, + "criteria": { + "tick": { + "trigger": "minecraft:tick", + "conditions": {} + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "reignitedutilities:iron_spike" + } + } + }, + "requirements": [ + [ + "tick", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/reignitedutilities/advancements/recipes/reignitedutilities/stone_spike.json b/src/generated/resources/data/reignitedutilities/advancements/recipes/reignitedutilities/stone_spike.json new file mode 100644 index 0000000..5c7990e --- /dev/null +++ b/src/generated/resources/data/reignitedutilities/advancements/recipes/reignitedutilities/stone_spike.json @@ -0,0 +1,26 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "reignitedutilities:stone_spike" + ] + }, + "criteria": { + "tick": { + "trigger": "minecraft:tick", + "conditions": {} + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "reignitedutilities:stone_spike" + } + } + }, + "requirements": [ + [ + "tick", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/reignitedutilities/advancements/recipes/reignitedutilities/wood_spike.json b/src/generated/resources/data/reignitedutilities/advancements/recipes/reignitedutilities/wood_spike.json new file mode 100644 index 0000000..a3b8730 --- /dev/null +++ b/src/generated/resources/data/reignitedutilities/advancements/recipes/reignitedutilities/wood_spike.json @@ -0,0 +1,26 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "reignitedutilities:wood_spike" + ] + }, + "criteria": { + "tick": { + "trigger": "minecraft:tick", + "conditions": {} + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "reignitedutilities:wood_spike" + } + } + }, + "requirements": [ + [ + "tick", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/reignitedutilities/recipes/diamond_spike.json b/src/generated/resources/data/reignitedutilities/recipes/diamond_spike.json new file mode 100644 index 0000000..347f9b7 --- /dev/null +++ b/src/generated/resources/data/reignitedutilities/recipes/diamond_spike.json @@ -0,0 +1,23 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + " S ", + "SIS", + "IBI" + ], + "key": { + "S": { + "item": "minecraft:diamond_sword" + }, + "I": { + "item": "minecraft:diamond" + }, + "B": { + "item": "minecraft:diamond_block" + } + }, + "result": { + "item": "reignitedutilities:diamond_spike", + "count": 4 + } +} \ No newline at end of file diff --git a/src/generated/resources/data/reignitedutilities/recipes/gold_spike.json b/src/generated/resources/data/reignitedutilities/recipes/gold_spike.json new file mode 100644 index 0000000..9cbda43 --- /dev/null +++ b/src/generated/resources/data/reignitedutilities/recipes/gold_spike.json @@ -0,0 +1,23 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + " S ", + "SIS", + "IBI" + ], + "key": { + "S": { + "item": "minecraft:golden_sword" + }, + "I": { + "item": "minecraft:gold_ingot" + }, + "B": { + "item": "minecraft:gold_block" + } + }, + "result": { + "item": "reignitedutilities:gold_spike", + "count": 4 + } +} \ No newline at end of file diff --git a/src/generated/resources/data/reignitedutilities/recipes/iron_spike.json b/src/generated/resources/data/reignitedutilities/recipes/iron_spike.json new file mode 100644 index 0000000..41507b1 --- /dev/null +++ b/src/generated/resources/data/reignitedutilities/recipes/iron_spike.json @@ -0,0 +1,23 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + " S ", + "SIS", + "IBI" + ], + "key": { + "S": { + "item": "minecraft:iron_sword" + }, + "I": { + "item": "minecraft:iron_ingot" + }, + "B": { + "item": "minecraft:iron_block" + } + }, + "result": { + "item": "reignitedutilities:iron_spike", + "count": 4 + } +} \ No newline at end of file diff --git a/src/generated/resources/data/reignitedutilities/recipes/stone_spike.json b/src/generated/resources/data/reignitedutilities/recipes/stone_spike.json new file mode 100644 index 0000000..c30c736 --- /dev/null +++ b/src/generated/resources/data/reignitedutilities/recipes/stone_spike.json @@ -0,0 +1,23 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + " S ", + "SIS", + "IBI" + ], + "key": { + "S": { + "item": "minecraft:stone_sword" + }, + "I": { + "tag": "forge:cobblestone" + }, + "B": { + "item": "reignitedutilities:1_compressed_cobblestone" + } + }, + "result": { + "item": "reignitedutilities:stone_spike", + "count": 4 + } +} \ No newline at end of file diff --git a/src/generated/resources/data/reignitedutilities/recipes/wood_spike.json b/src/generated/resources/data/reignitedutilities/recipes/wood_spike.json new file mode 100644 index 0000000..423b9be --- /dev/null +++ b/src/generated/resources/data/reignitedutilities/recipes/wood_spike.json @@ -0,0 +1,23 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + " S ", + "SIS", + "IBI" + ], + "key": { + "S": { + "item": "minecraft:wooden_sword" + }, + "I": { + "tag": "minecraft:planks" + }, + "B": { + "tag": "minecraft:logs" + } + }, + "result": { + "item": "reignitedutilities:wood_spike", + "count": 4 + } +} \ No newline at end of file diff --git a/src/main/java/site/hellishmods/reignitedutilities/init/Providers.java b/src/main/java/site/hellishmods/reignitedutilities/init/Providers.java index b6d4e31..13559e3 100644 --- a/src/main/java/site/hellishmods/reignitedutilities/init/Providers.java +++ b/src/main/java/site/hellishmods/reignitedutilities/init/Providers.java @@ -9,9 +9,10 @@ import site.hellishmods.reignitedutilities.providers.blocks.AllSideBlockModelProvider; import site.hellishmods.reignitedutilities.providers.blocks.BlockLootTableProvider; import site.hellishmods.reignitedutilities.providers.blocks.PanelModelProvider; -import site.hellishmods.reignitedutilities.providers.blocks.SpikeModelProvider; import site.hellishmods.reignitedutilities.providers.blocks.compressed.CompressedBlockModelProvider; import site.hellishmods.reignitedutilities.providers.blocks.compressed.CompressedBlockRecipeProvider; +import site.hellishmods.reignitedutilities.providers.blocks.spikes.SpikeModelProvider; +import site.hellishmods.reignitedutilities.providers.blocks.spikes.SpikeRecipeProvider; import site.hellishmods.reignitedutilities.providers.items.ReignitedItemModelProvider; @Mod.EventBusSubscriber(bus = Mod.EventBusSubscriber.Bus.MOD, modid = reignitedutilities.MOD_ID) @@ -27,6 +28,7 @@ public static void onDataGather(GatherDataEvent e) { gen.addProvider(new AllSideBlockModelProvider(gen, exFileHelper)); gen.addProvider(new PanelModelProvider(gen, exFileHelper)); gen.addProvider(new SpikeModelProvider(gen, exFileHelper)); + gen.addProvider(new SpikeRecipeProvider(gen)); gen.addProvider(new CompressedBlockModelProvider(gen, exFileHelper)); gen.addProvider(new CompressedBlockRecipeProvider(gen)); } diff --git a/src/main/java/site/hellishmods/reignitedutilities/providers/blocks/SpikeModelProvider.java b/src/main/java/site/hellishmods/reignitedutilities/providers/blocks/spikes/SpikeModelProvider.java similarity index 95% rename from src/main/java/site/hellishmods/reignitedutilities/providers/blocks/SpikeModelProvider.java rename to src/main/java/site/hellishmods/reignitedutilities/providers/blocks/spikes/SpikeModelProvider.java index e4c0f6e..f46949c 100644 --- a/src/main/java/site/hellishmods/reignitedutilities/providers/blocks/SpikeModelProvider.java +++ b/src/main/java/site/hellishmods/reignitedutilities/providers/blocks/spikes/SpikeModelProvider.java @@ -1,4 +1,4 @@ -package site.hellishmods.reignitedutilities.providers.blocks; +package site.hellishmods.reignitedutilities.providers.blocks.spikes; import net.minecraft.block.Block; import net.minecraft.data.DataGenerator; diff --git a/src/main/java/site/hellishmods/reignitedutilities/providers/blocks/spikes/SpikeRecipeProvider.java b/src/main/java/site/hellishmods/reignitedutilities/providers/blocks/spikes/SpikeRecipeProvider.java new file mode 100644 index 0000000..7035697 --- /dev/null +++ b/src/main/java/site/hellishmods/reignitedutilities/providers/blocks/spikes/SpikeRecipeProvider.java @@ -0,0 +1,49 @@ +package site.hellishmods.reignitedutilities.providers.blocks.spikes; + +import java.util.function.Consumer; + +import net.minecraft.advancements.criterion.EntityPredicate; +import net.minecraft.advancements.criterion.TickTrigger; +import net.minecraft.data.DataGenerator; +import net.minecraft.data.IFinishedRecipe; +import net.minecraft.data.RecipeProvider; +import net.minecraft.data.ShapedRecipeBuilder; +import net.minecraft.item.Items; +import net.minecraft.tags.ItemTags; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.common.Tags; +import net.minecraftforge.registries.ForgeRegistries; +import site.hellishmods.reignitedutilities.reignitedutilities; +import site.hellishmods.reignitedutilities.init.Blocks; + +public class SpikeRecipeProvider extends RecipeProvider { + public SpikeRecipeProvider(DataGenerator gen) { + super(gen); + } + + @Override + protected void buildShapelessRecipes(Consumer consumer) { + Blocks.SPIKES.forEach(s -> { + String spikeMat = s.get().getRegistryName().getPath().split("_")[0]; + if(spikeMat.equals("creative")) return; + + ShapedRecipeBuilder builder = ShapedRecipeBuilder.shaped(s.get(), 4) + .pattern(" S ") + .pattern("SIS") + .pattern("IBI") + .define('S', ForgeRegistries.ITEMS.getValue(new ResourceLocation("minecraft", (spikeMat.equals("wood") || spikeMat.equals("gold") ? spikeMat+"en" : spikeMat)+"_sword"))); + + switch (spikeMat) { + case "wood": builder.define('I', ItemTags.createOptional(new ResourceLocation("minecraft", "planks"))); builder.define('B', ItemTags.createOptional(new ResourceLocation("minecraft", "logs"))); break; + case "stone": builder.define('I', Tags.Items.COBBLESTONE); builder.define('B', ForgeRegistries.ITEMS.getValue(new ResourceLocation(reignitedutilities.MOD_ID, "1_compressed_cobblestone"))); break; + case "diamond": builder.define('I', Items.DIAMOND); builder.define('B', Items.DIAMOND_BLOCK); break; + + default: builder.define('I', ForgeRegistries.ITEMS.getValue(new ResourceLocation("minecraft", spikeMat+"_ingot"))); builder.define('B', ForgeRegistries.ITEMS.getValue(new ResourceLocation("minecraft", spikeMat+"_block"))); break; + } + + builder + .unlockedBy("tick", new TickTrigger().createInstance(null, EntityPredicate.AndPredicate.ANY, null)) + .save(consumer); + }); + } +} diff --git a/src/main/java/site/hellishmods/reignitedutilities/providers/items/ReignitedItemModelProvider.java b/src/main/java/site/hellishmods/reignitedutilities/providers/items/ReignitedItemModelProvider.java index 5ee056f..fd9b76e 100644 --- a/src/main/java/site/hellishmods/reignitedutilities/providers/items/ReignitedItemModelProvider.java +++ b/src/main/java/site/hellishmods/reignitedutilities/providers/items/ReignitedItemModelProvider.java @@ -24,7 +24,6 @@ protected void registerModels() { "sun_crystal", "biome_marker" ); - ForgeRegistries.ITEMS.getValues().stream().filter(item -> item.getRegistryName().getNamespace().equals(reignitedutilities.MOD_ID)).forEach(i -> { String name = i.getRegistryName().getPath(); diff --git a/src/main/resources/data/reignitedutilities/recipes/biome_marker.json b/src/main/resources/data/reignitedutilities/recipes/biome_marker.json new file mode 100644 index 0000000..11a76a7 --- /dev/null +++ b/src/main/resources/data/reignitedutilities/recipes/biome_marker.json @@ -0,0 +1,23 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "DID", + "ISI", + "DID" + ], + "key": { + "D": { + "tag": "reignitedutilities:biome_marker_ingerdients" + }, + "I": { + "item": "minecraft:iron_ingot" + }, + "S": { + "tag": "minecraft:saplings" + } + }, + "result": { + "item": "reignitedutilities:biome_marker", + "count": 1 + } +} diff --git a/src/main/resources/data/reignitedutilities/recipes/slightly_larger_chest.json b/src/main/resources/data/reignitedutilities/recipes/slightly_larger_chest.json new file mode 100644 index 0000000..1be6970 --- /dev/null +++ b/src/main/resources/data/reignitedutilities/recipes/slightly_larger_chest.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "SSS", + "SCS", + "SSS" + ], + "key": { + "S": { + "item": "minecraft:stick" + }, + "C": { + "tag": "forge:chests" + } + }, + "result": { + "item": "reignitedutilities:slightly_larger_chest", + "count": 1 + } +} diff --git a/src/main/resources/data/reignitedutilities/tags/items/biome_marker_ingredients.json b/src/main/resources/data/reignitedutilities/tags/items/biome_marker_ingredients.json new file mode 100644 index 0000000..74671d7 --- /dev/null +++ b/src/main/resources/data/reignitedutilities/tags/items/biome_marker_ingredients.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "minecraft:purple_dye", + "minecraft:magenta_dye" + ] +} \ No newline at end of file