diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/ModBlocks.java b/src/main/java/de/ellpeck/naturesaura/blocks/ModBlocks.java index 532ce774..b801fa76 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/ModBlocks.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/ModBlocks.java @@ -29,6 +29,7 @@ public final class ModBlocks { public static final Block POTION_GENERATOR = new BlockPotionGenerator(); public static final Block AURA_DETECTOR = new BlockAuraDetector(); public static final Block CONVERSION_CATALYST = new BlockImpl("conversion_catalyst", Material.ROCK).setSoundType(SoundType.STONE).setHardness(2.5F); + public static final Block CRUSHING_CATALYST = new BlockImpl("crushing_catalyst",Material.ROCK).setSoundType(SoundType.STONE).setHardness(2.5F); public static final Block FLOWER_GENERATOR = new BlockFlowerGenerator(); public static final Block PLACER = new BlockPlacer(); public static final Block HOPPER_UPGRADE = new BlockHopperUpgrade(); diff --git a/src/main/java/de/ellpeck/naturesaura/recipes/ModRecipes.java b/src/main/java/de/ellpeck/naturesaura/recipes/ModRecipes.java index b10d52d3..6e42cc26 100644 --- a/src/main/java/de/ellpeck/naturesaura/recipes/ModRecipes.java +++ b/src/main/java/de/ellpeck/naturesaura/recipes/ModRecipes.java @@ -76,12 +76,18 @@ public final class ModRecipes { new NBTIngredient(ItemAuraBottle.setType(new ItemStack(ModItems.AURA_BOTTLE), NaturesAuraAPI.TYPE_NETHER))).register(); new TreeRitualRecipe(new ResourceLocation(NaturesAura.MOD_ID, "conversion_catalyst"), Ingredient.fromStacks(new ItemStack(Blocks.SAPLING, 1, 3)), new ItemStack(ModBlocks.CONVERSION_CATALYST), 600, - Ingredient.fromStacks(new ItemStack(Blocks.STONEBRICK, 1, 1)), + Helper.blockIng(ModBlocks.GOLD_BRICK), Helper.blockIng(ModBlocks.INFUSED_STONE), Ingredient.fromItem(Items.BREWING_STAND), Ingredient.fromItem(ModItems.SKY_INGOT), Ingredient.fromItem(ModItems.GOLD_LEAF), Helper.blockIng(Blocks.GLOWSTONE)).register(); + new TreeRitualRecipe(new ResourceLocation(NaturesAura.MOD_ID, "crushing_catalyst"), + Helper.blockIng(Blocks.SAPLING), new ItemStack(ModBlocks.CRUSHING_CATALYST), 600, + Helper.blockIng(ModBlocks.GOLD_BRICK), + Helper.blockIng(ModBlocks.INFUSED_STONE), + Helper.blockIng(Blocks.PISTON), + Ingredient.fromItem(Items.FLINT)).register(); new TreeRitualRecipe(new ResourceLocation(NaturesAura.MOD_ID, "plant_powder"), Ingredient.fromStacks(new ItemStack(Blocks.SAPLING)), ItemEffectPowder.setEffect(new ItemStack(ModItems.EFFECT_POWDER, 24), PlantBoostEffect.NAME), 400, @@ -132,6 +138,23 @@ public final class ModRecipes { Ingredient.fromItem(Items.QUARTZ), new ItemStack(Items.PRISMARINE_SHARD), conversion, 850, 200).register(); + Ingredient crushing = Helper.blockIng(ModBlocks.CRUSHING_CATALYST); + new AltarRecipe(new ResourceLocation(NaturesAura.MOD_ID, "bone"), + Ingredient.fromItem(Items.BONE), new ItemStack(Items.DYE, 6, 15), + crushing, 50, 40).register(); + new AltarRecipe(new ResourceLocation(NaturesAura.MOD_ID, "sugar"), + Ingredient.fromItem(Items.REEDS), new ItemStack(Items.SUGAR, 3), + crushing, 50, 40).register(); + new AltarRecipe(new ResourceLocation(NaturesAura.MOD_ID, "blaze"), + Ingredient.fromItem(Items.BLAZE_ROD), new ItemStack(Items.BLAZE_POWDER, 4), + crushing, 80, 60).register(); + new AltarRecipe(new ResourceLocation(NaturesAura.MOD_ID, "glowstone"), + Helper.blockIng(Blocks.GLOWSTONE), new ItemStack(Items.GLOWSTONE_DUST, 4), + crushing, 50, 40).register(); + new AltarRecipe(new ResourceLocation(NaturesAura.MOD_ID, "sand"), + Helper.blockIng(Blocks.COBBLESTONE), new ItemStack(Blocks.SAND), + crushing, 50, 40).register(); + new OfferingRecipe(new ResourceLocation(NaturesAura.MOD_ID, "sky_ingot"), new AmountIngredient(new ItemStack(ModItems.INFUSED_IRON, 3)), Ingredient.fromItem(ModItems.CALLING_SPIRIT), diff --git a/src/main/resources/assets/naturesaura/blockstates/crushing_catalyst.json b/src/main/resources/assets/naturesaura/blockstates/crushing_catalyst.json new file mode 100644 index 00000000..d991d9ad --- /dev/null +++ b/src/main/resources/assets/naturesaura/blockstates/crushing_catalyst.json @@ -0,0 +1,14 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "textures": { + "all": "naturesaura:blocks/crushing_catalyst" + }, + "transform": "forge:default-block" + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/lang/en_US.lang b/src/main/resources/assets/naturesaura/lang/en_US.lang index c5c9efff..4fb6a28b 100644 --- a/src/main/resources/assets/naturesaura/lang/en_US.lang +++ b/src/main/resources/assets/naturesaura/lang/en_US.lang @@ -15,6 +15,7 @@ tile.naturesaura.furnace_heater.name=Extraneous Firestarter tile.naturesaura.potion_generator.name=Lingering Absorber tile.naturesaura.aura_detector.name=Aura Detector tile.naturesaura.conversion_catalyst.name=Transmutation Catalyst +tile.naturesaura.crushing_catalyst.name=Crumbling Catalyst tile.naturesaura.infused_stairs.name=Infused Rock Stairs tile.naturesaura.infused_slab.name=Infused Rock Slab tile.naturesaura.infused_slab_double.name=Infused Rock Double Slab diff --git a/src/main/resources/assets/naturesaura/patchouli_books/book/en_us/entries/using/conversion_catalyst.json b/src/main/resources/assets/naturesaura/patchouli_books/book/en_us/entries/using/conversion_catalyst.json index c6cd2b3e..43edfd76 100644 --- a/src/main/resources/assets/naturesaura/patchouli_books/book/en_us/entries/using/conversion_catalyst.json +++ b/src/main/resources/assets/naturesaura/patchouli_books/book/en_us/entries/using/conversion_catalyst.json @@ -6,7 +6,7 @@ "pages": [ { "type": "text", - "text": "The $(l:collecting/altar)Natural Altar$() can be useful for infusing certain items with the power of $(aura), however, it can also assist in transmuting items from one type into another.$(br)This can be achieved by creating the $(item)Transmutation Catalyst$() and placing it on top of any of the four lower $(item)Mossy Stone Brick$() blocks around the altar, and then placing the ingredient on the altar as usual." + "text": "The $(l:collecting/altar)Natural Altar$() can be useful for infusing certain items with the power of $(aura), however, it can also assist in transmuting items from one type into another.$(br)This can be achieved by creating the $(item)Transmutation Catalyst$() and placing it on top of any of the four lower $(item)Golden Stone Brick$() blocks around the altar, and then placing the ingredient on the altar as usual." }, { "type": "naturesaura:tree_ritual", diff --git a/src/main/resources/assets/naturesaura/patchouli_books/book/en_us/entries/using/crushing_catalyst.json b/src/main/resources/assets/naturesaura/patchouli_books/book/en_us/entries/using/crushing_catalyst.json new file mode 100644 index 00000000..5f00ecae --- /dev/null +++ b/src/main/resources/assets/naturesaura/patchouli_books/book/en_us/entries/using/crushing_catalyst.json @@ -0,0 +1,42 @@ +{ + "name": "Crumbling Catalyst", + "icon": "naturesaura:crushing_catalyst", + "category": "using", + "advancement": "naturesaura:infused_materials", + "pages": [ + { + "type": "text", + "text": "The $(l:collecting/altar)Natural Altar$() can be useful for infusing certain items with the power of $(aura), but it can also be used to $(thing)crush$() certain items into different shapes.$(br)This can be achieved by creating the $(item)Crumbling Catalyst$() and placing it on top of any of the four lower $(item)Golden Stone Brick$() blocks around the altar, and then placing the ingredient on the altar as usual." + }, + { + "type": "naturesaura:tree_ritual", + "text": "Creating the $(item)Crumbling Catalyst$() using the $(l:practices/tree_ritual)Ritual of the Forest$().", + "recipe": "naturesaura:crushing_catalyst" + }, + { + "type": "naturesaura:altar", + "text": "Creating $(item)Bone Meal$() by crushing $(item)Bones$()", + "recipe": "naturesaura:bone" + }, + { + "type": "naturesaura:altar", + "text": "Harvesting $(item)Sugar$() by removing it from the cane", + "recipe": "naturesaura:sugar" + }, + { + "type": "naturesaura:altar", + "text": "Making $(item)Blaze Powder$() out of the Nether's materials", + "recipe": "naturesaura:blaze" + }, + { + "type": "naturesaura:altar", + "text": "Creating $(item)Glowstone Dust$() by destroying $(item)Glowstone$()", + "recipe": "naturesaura:glowstone" + }, + { + "type": "naturesaura:altar", + "text": "Making $(item)Sand$() from pulverizing $(item)Cobblestone$()", + "recipe": "naturesaura:sand" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/textures/blocks/conversion_catalyst.png b/src/main/resources/assets/naturesaura/textures/blocks/conversion_catalyst.png index ee259fad..cb846a46 100644 Binary files a/src/main/resources/assets/naturesaura/textures/blocks/conversion_catalyst.png and b/src/main/resources/assets/naturesaura/textures/blocks/conversion_catalyst.png differ diff --git a/src/main/resources/assets/naturesaura/textures/blocks/crushing_catalyst.png b/src/main/resources/assets/naturesaura/textures/blocks/crushing_catalyst.png new file mode 100644 index 00000000..076451b6 Binary files /dev/null and b/src/main/resources/assets/naturesaura/textures/blocks/crushing_catalyst.png differ