-
Notifications
You must be signed in to change notification settings - Fork 5
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
19 changed files
with
358 additions
and
10 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
7 changes: 0 additions & 7 deletions
7
src/generated/resources/assets/reignitedutilities/blockstates/manual_mill.json
This file was deleted.
Oops, something went wrong.
26 changes: 26 additions & 0 deletions
26
...ources/data/reignitedutilities/advancements/recipes/reignitedutilities/diamond_spike.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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" | ||
| ] | ||
| ] | ||
| } |
26 changes: 26 additions & 0 deletions
26
...resources/data/reignitedutilities/advancements/recipes/reignitedutilities/gold_spike.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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" | ||
| ] | ||
| ] | ||
| } |
26 changes: 26 additions & 0 deletions
26
...resources/data/reignitedutilities/advancements/recipes/reignitedutilities/iron_spike.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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" | ||
| ] | ||
| ] | ||
| } |
26 changes: 26 additions & 0 deletions
26
...esources/data/reignitedutilities/advancements/recipes/reignitedutilities/stone_spike.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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" | ||
| ] | ||
| ] | ||
| } |
26 changes: 26 additions & 0 deletions
26
...resources/data/reignitedutilities/advancements/recipes/reignitedutilities/wood_spike.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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" | ||
| ] | ||
| ] | ||
| } |
23 changes: 23 additions & 0 deletions
23
src/generated/resources/data/reignitedutilities/recipes/diamond_spike.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 | ||
| } | ||
| } |
23 changes: 23 additions & 0 deletions
23
src/generated/resources/data/reignitedutilities/recipes/gold_spike.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 | ||
| } | ||
| } |
23 changes: 23 additions & 0 deletions
23
src/generated/resources/data/reignitedutilities/recipes/iron_spike.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 | ||
| } | ||
| } |
23 changes: 23 additions & 0 deletions
23
src/generated/resources/data/reignitedutilities/recipes/stone_spike.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 | ||
| } | ||
| } |
23 changes: 23 additions & 0 deletions
23
src/generated/resources/data/reignitedutilities/recipes/wood_spike.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
.../providers/blocks/SpikeModelProvider.java → ...ers/blocks/spikes/SpikeModelProvider.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
49 changes: 49 additions & 0 deletions
49
...java/site/hellishmods/reignitedutilities/providers/blocks/spikes/SpikeRecipeProvider.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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<IFinishedRecipe> 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); | ||
| }); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.