From 3bf19aff8b807302fb6e0da75ff951fc93e43c0a Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Wed, 26 Feb 2020 12:03:36 +0100 Subject: [PATCH] integrate tainted gold and the crimson altar with everything --- .../blockstates/tainted_gold_block.json | 7 +++++ .../models/block/tainted_gold_block.json | 6 ++++ .../naturesaura/models/item/tainted_gold.json | 6 ++++ .../models/item/tainted_gold_block.json | 3 ++ .../blocks/tainted_gold_block.json | 19 ++++++++++++ .../ellpeck/naturesaura/blocks/ModBlocks.java | 1 + .../naturesaura/blocks/multi/Multiblocks.java | 3 +- .../ellpeck/naturesaura/items/ModItems.java | 1 + .../naturesaura/recipes/ModRecipes.java | 12 +++++++- .../ellpeck/naturesaura/reg/ModRegistry.java | 7 +++-- .../assets/naturesaura/lang/en_us.json | 4 +++ .../textures/block/tainted_gold_block.png | Bin 0 -> 546 bytes .../textures/item/tainted_gold.png | Bin 0 -> 584 bytes .../advancements/tainted_gold.json | 26 ++++++++++++++++ .../entries/items/shockwave_creator.json | 2 +- .../en_us/entries/practices/offering.json | 7 ++++- .../en_us/entries/using/crimson_altar.json | 29 ++++++++++++++++++ .../naturesaura/recipes/calling_spirit.json | 5 ++- .../recipes/dimension_rail_nether.json | 2 +- .../recipes/generator_limit_remover.json | 2 +- .../recipes/shockwave_creator.json | 2 +- .../naturesaura/recipes/tainted_gold.json | 15 +++++++++ .../recipes/tainted_gold_block.json | 16 ++++++++++ 23 files changed, 164 insertions(+), 11 deletions(-) create mode 100644 src/generated/resources/assets/naturesaura/blockstates/tainted_gold_block.json create mode 100644 src/generated/resources/assets/naturesaura/models/block/tainted_gold_block.json create mode 100644 src/generated/resources/assets/naturesaura/models/item/tainted_gold.json create mode 100644 src/generated/resources/assets/naturesaura/models/item/tainted_gold_block.json create mode 100644 src/generated/resources/data/naturesaura/loot_tables/blocks/tainted_gold_block.json create mode 100644 src/main/resources/assets/naturesaura/textures/block/tainted_gold_block.png create mode 100644 src/main/resources/assets/naturesaura/textures/item/tainted_gold.png create mode 100644 src/main/resources/data/naturesaura/advancements/tainted_gold.json create mode 100644 src/main/resources/data/naturesaura/patchouli_books/book/en_us/entries/using/crimson_altar.json create mode 100644 src/main/resources/data/naturesaura/recipes/tainted_gold.json create mode 100644 src/main/resources/data/naturesaura/recipes/tainted_gold_block.json diff --git a/src/generated/resources/assets/naturesaura/blockstates/tainted_gold_block.json b/src/generated/resources/assets/naturesaura/blockstates/tainted_gold_block.json new file mode 100644 index 00000000..e5c5c57a --- /dev/null +++ b/src/generated/resources/assets/naturesaura/blockstates/tainted_gold_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "naturesaura:block/tainted_gold_block" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/block/tainted_gold_block.json b/src/generated/resources/assets/naturesaura/models/block/tainted_gold_block.json new file mode 100644 index 00000000..eab199b4 --- /dev/null +++ b/src/generated/resources/assets/naturesaura/models/block/tainted_gold_block.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "naturesaura:block/tainted_gold_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/item/tainted_gold.json b/src/generated/resources/assets/naturesaura/models/item/tainted_gold.json new file mode 100644 index 00000000..506b18d3 --- /dev/null +++ b/src/generated/resources/assets/naturesaura/models/item/tainted_gold.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "naturesaura:item/tainted_gold" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/item/tainted_gold_block.json b/src/generated/resources/assets/naturesaura/models/item/tainted_gold_block.json new file mode 100644 index 00000000..5301c4e1 --- /dev/null +++ b/src/generated/resources/assets/naturesaura/models/item/tainted_gold_block.json @@ -0,0 +1,3 @@ +{ + "parent": "naturesaura:block/tainted_gold_block" +} \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/tainted_gold_block.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/tainted_gold_block.json new file mode 100644 index 00000000..48e992f0 --- /dev/null +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/tainted_gold_block.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "naturesaura:tainted_gold_block" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/ModBlocks.java b/src/main/java/de/ellpeck/naturesaura/blocks/ModBlocks.java index b8ca6db5..f872a04e 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/ModBlocks.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/ModBlocks.java @@ -65,6 +65,7 @@ public final class ModBlocks { public static Block ITEM_DISTRIBUTOR; public static Block AURA_BLOOM; public static Block AURA_CACTUS; + public static Block TAINTED_GOLD_BLOCK; public static Block.Properties prop(Material material, MaterialColor color) { return Block.Properties.create(material, color); diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/multi/Multiblocks.java b/src/main/java/de/ellpeck/naturesaura/blocks/multi/Multiblocks.java index a4ba5562..ed46e153 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/multi/Multiblocks.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/multi/Multiblocks.java @@ -5,6 +5,7 @@ import de.ellpeck.naturesaura.NaturesAura; import de.ellpeck.naturesaura.api.NaturesAuraAPI; import de.ellpeck.naturesaura.api.multiblock.IMultiblock; import de.ellpeck.naturesaura.api.multiblock.Matcher; +import de.ellpeck.naturesaura.blocks.BlockNatureAltar; import de.ellpeck.naturesaura.blocks.ModBlocks; import net.minecraft.block.Blocks; import net.minecraft.block.LogBlock; @@ -36,7 +37,7 @@ public final class Multiblocks { 'B', Blocks.NETHER_BRICKS, 'W', Blocks.NETHER_WART_BLOCK, 'M', ModBlocks.GOLD_NETHER_BRICK, - '0', ModBlocks.NATURE_ALTAR, + '0', ModBlocks.NATURE_ALTAR.getDefaultState().with(BlockNatureAltar.NETHER, true), ' ', Matcher.wildcard()); public static final IMultiblock TREE_RITUAL = NaturesAuraAPI.instance().createMultiblock( new ResourceLocation(NaturesAura.MOD_ID, "tree_ritual"), diff --git a/src/main/java/de/ellpeck/naturesaura/items/ModItems.java b/src/main/java/de/ellpeck/naturesaura/items/ModItems.java index a049fa9b..722a8ec7 100644 --- a/src/main/java/de/ellpeck/naturesaura/items/ModItems.java +++ b/src/main/java/de/ellpeck/naturesaura/items/ModItems.java @@ -46,4 +46,5 @@ public final class ModItems { public static Item CAVE_FINDER; public static Item CRIMSON_MEAL; public static Item DEATH_RING; + public static Item TAINTED_GOLD; } diff --git a/src/main/java/de/ellpeck/naturesaura/recipes/ModRecipes.java b/src/main/java/de/ellpeck/naturesaura/recipes/ModRecipes.java index b585e893..913e4f72 100644 --- a/src/main/java/de/ellpeck/naturesaura/recipes/ModRecipes.java +++ b/src/main/java/de/ellpeck/naturesaura/recipes/ModRecipes.java @@ -73,7 +73,7 @@ public final class ModRecipes { ing(Blocks.OAK_SAPLING), new ItemStack(ModBlocks.FURNACE_HEATER), 600, ing(ModBlocks.INFUSED_STONE), ing(ModBlocks.INFUSED_STONE), - ing(ModItems.INFUSED_IRON), + ing(ModItems.TAINTED_GOLD), ing(ModItems.INFUSED_IRON), ing(Items.FIRE_CHARGE), ing(Items.FLINT), @@ -161,6 +161,12 @@ public final class ModRecipes { new AltarRecipe(res("infused_iron_block"), ing(Blocks.IRON_BLOCK), new ItemStack(ModBlocks.INFUSED_IRON_BLOCK), NaturesAuraAPI.TYPE_OVERWORLD, Ingredient.EMPTY, 135000, 700).register(); + new AltarRecipe(res("tainted_gold"), + ing(Items.GOLD_INGOT), new ItemStack(ModItems.TAINTED_GOLD), + NaturesAuraAPI.TYPE_NETHER, Ingredient.EMPTY, 15000, 80).register(); + new AltarRecipe(res("tainted_gold_block"), + ing(Blocks.GOLD_BLOCK), new ItemStack(ModBlocks.TAINTED_GOLD_BLOCK), + NaturesAuraAPI.TYPE_NETHER, Ingredient.EMPTY, 135000, 700).register(); new AltarRecipe(res("infused_stone"), ing(Blocks.STONE), new ItemStack(ModBlocks.INFUSED_STONE), NaturesAuraAPI.TYPE_OVERWORLD, Ingredient.EMPTY, 7500, 40).register(); @@ -185,6 +191,10 @@ public final class ModRecipes { amountIng(new ItemStack(ModItems.INFUSED_IRON, 3)), ing(ModItems.CALLING_SPIRIT), new ItemStack(ModItems.SKY_INGOT)).register(); + new OfferingRecipe(res("sky_ingot_from_gold"), + ing(ModItems.TAINTED_GOLD), + ing(ModItems.CALLING_SPIRIT), + new ItemStack(ModItems.SKY_INGOT)).register(); new OfferingRecipe(res("clock_hand"), ing(Items.NETHER_STAR), ing(ModItems.CALLING_SPIRIT), diff --git a/src/main/java/de/ellpeck/naturesaura/reg/ModRegistry.java b/src/main/java/de/ellpeck/naturesaura/reg/ModRegistry.java index f392100b..c4508a5b 100644 --- a/src/main/java/de/ellpeck/naturesaura/reg/ModRegistry.java +++ b/src/main/java/de/ellpeck/naturesaura/reg/ModRegistry.java @@ -129,8 +129,8 @@ public final class ModRegistry { temp = new BlockAuraBloom("aura_bloom", TileEntityAuraBloom::new), createFlowerPot(temp), temp = new BlockAuraBloom("aura_cactus", TileEntityAuraCactus::new), - createFlowerPot(temp) - ); + createFlowerPot(temp), + new BlockImpl("tainted_gold_block", ModBlocks.prop(Material.IRON).sound(SoundType.METAL).hardnessAndResistance(3F))); if (ModConfig.instance.rfConverter.get()) event.getRegistry().register(new BlockRFConverter()); @@ -193,7 +193,8 @@ public final class ModRegistry { new ItemEnderAccess(), new ItemCaveFinder(), new ItemCrimsonMeal(), - new ItemDeathRing() + new ItemDeathRing(), + new ItemImpl("tainted_gold") ); Helper.populateObjectHolders(ModItems.class, event.getRegistry()); } diff --git a/src/main/resources/assets/naturesaura/lang/en_us.json b/src/main/resources/assets/naturesaura/lang/en_us.json index 0a10915d..bf2e35dc 100644 --- a/src/main/resources/assets/naturesaura/lang/en_us.json +++ b/src/main/resources/assets/naturesaura/lang/en_us.json @@ -61,6 +61,7 @@ "block.naturesaura.item_distributor": "Item Distributor", "block.naturesaura.aura_bloom": "Aura Bloom", "block.naturesaura.aura_cactus": "Aura Cactus", + "block.naturesaura.tainted_gold_block": "Tainted Gold Block", "item.naturesaura.eye": "Environmental Eye", "item.naturesaura.eye_improved": "Environmental Ocular", "item.naturesaura.gold_fiber": "Brilliant Fiber", @@ -110,6 +111,7 @@ "item.naturesaura.aura_trove": "Aura Trove", "item.naturesaura.crimson_meal": "Crimson Meal", "item.naturesaura.death_ring": "Ring of Last Chance", + "item.naturesaura.tainted_gold": "Tainted Gold", "container.naturesaura:tree_ritual.name": "Ritual of the Forest", "container.naturesaura:altar.name": "Natural Altar Infusion", "container.naturesaura:offering.name": "Offering to the Gods", @@ -142,6 +144,8 @@ "advancement.naturesaura.altar.desc": "Create a Natural Altar using the Ritual of the Forest", "advancement.naturesaura.infused_materials": "Iron Factory", "advancement.naturesaura.infused_materials.desc": "Use the Natural Altar to create Infused Iron", + "advancement.naturesaura.tainted_gold": "Gold Factory", + "advancement.naturesaura.tainted_gold.desc": "Use the Crimson Altar to create Tainted Gold", "advancement.naturesaura.furnace_heater": "Cozy Warmth", "advancement.naturesaura.furnace_heater.desc": "Create an Extraneous Firestarter to heat your furnace", "advancement.naturesaura.placer": "Plop Plop Placement", diff --git a/src/main/resources/assets/naturesaura/textures/block/tainted_gold_block.png b/src/main/resources/assets/naturesaura/textures/block/tainted_gold_block.png new file mode 100644 index 0000000000000000000000000000000000000000..773c64ff84978d93df87fc66fa9c187f6892bb5b GIT binary patch literal 546 zcmV+-0^R+IP)Kn2_&<1%ui3YEeGD0CO+7!|}~t-!CpG()ohTd0i!0N(I9#vMw<+|B+u ze73pnqJ}Udev+|5MQ9fS9QagV6-^<9J)0nUh5H;9fE{Eyp3k9@58QynrieRo2NFxn7&0y9Vt_!M~e_p1x&9%+vC0;WWP;K@xvgk7V z6r&9RPg4sNNJ0JmI+O}0&tSm&66btT1yP91WKk9NeTap%$qMWB89K!fzTbMpS&)Do zu9F8Tk7ttj-lihTu%z&si?~pSRmE}G3}-~w17=~aU92{`g$lkuVZHBg@4^m9oB{$> zrX@;`f!7tf53ikvRt3rwKy^@>Dq)P;FpEfBpXNFtfMSRtkkjN8i@^H>WQd_HrXV&? zsAul?9O^)-C;wVzyJUM literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/naturesaura/textures/item/tainted_gold.png b/src/main/resources/assets/naturesaura/textures/item/tainted_gold.png new file mode 100644 index 0000000000000000000000000000000000000000..f2d7320061a313275af7c77a32c83538d231169d GIT binary patch literal 584 zcmV-O0=NB%P)Px%0!c(cR5*>zlDlh^Q53{~_ug;s$3`WDkU$`oK@kxVK^wIS@kJ^Nu}}~M!GFQR zLb0_F?JVq4*=d6Kh&DEo%0~(%60tFXWV6}*zWX@GV$EvAUQagzGiL?{{)@BL{uMjt z`rPz^VLiEbmpbQYG#Y)rFvcJv+YD3{fYbX1wXSQNbKIC3A*DnJ%liCtZMGhnKhsQ3 z45+mhYc02@$1%o`a|T<`>UR0QAv}1q%G_ex06l}V`-e2=j4_6rXU51mlhqJoq%2FS zoDmV$H+wjx#NAgb%zoT3W^!Uc2b+%Tr*!ff40CJtE7wkpkVL4fgteYf1s=X_(dl$(Hk({MK28XMC?L|SQp6Z(cWcfa z9OC}#RjwQxvXm42f6FUb^7 zKD3Og>V?C@w5vo}mUQZfs?v>$6XDUj4%SwL5P0^fGCAj8LjrjGe%*+Oo