diff --git a/.gitignore b/.gitignore index 12f864471..a6b5af566 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,5 @@ run # Files from Forge MDK forge*changelog.txt +/run-data/logs/ +/src/generated/resources/.cache/ diff --git a/build.gradle.kts b/build.gradle.kts index f7bc95b1d..0864d8a55 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -164,7 +164,7 @@ dependencies { implementation(fg.deobf("curse.maven:farmers_delight-398521:4638874")) implementation(fg.deobf("curse.maven:create-328085:4626108")) - implementation(fg.deobf("curse.maven:jeed-532286:4599236")) + //implementation(fg.deobf("curse.maven:jeed-532286:4599236")) runtimeOnly(fg.deobf("curse.maven:world-stripper-250603:4578579")) runtimeOnly(fg.deobf("curse.maven:spark-361579:4587309")) } diff --git a/gradle.properties b/gradle.properties index 6c667295a..d0687615c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,7 +8,7 @@ modJavaVersion=17 minecraftVersion=1.20.1 minecraftVersionRange=[1.20.1,1.21] # Forge Versions -forgeVersion=47.1.0 +forgeVersion=47.2.1 forgeVersionRange=[47,) loaderVersionRange=[47,) @@ -35,6 +35,6 @@ modAuthors=Sammy Semicolon # The description of the mod. This is a simple multiline text string that is used for display purposes in the mod list. modDescription=A dark magic mod focused on soul and spirit magic. # Mod Dependency Versions -lodestoneVersion=1.4.20 +lodestoneVersion=1.4.22 jeiVersion=15.2.0.22 -curiosVersion=5.2.0-beta.3+1.20.1 \ No newline at end of file +curiosVersion=5.4.0+1.20.1 \ No newline at end of file diff --git a/lib/lodestone-1.20.1-1.4.18.jar b/lib/lodestone-1.20.1-1.4.18.jar deleted file mode 100644 index e89924c42..000000000 Binary files a/lib/lodestone-1.20.1-1.4.18.jar and /dev/null differ diff --git a/lib/lodestone-1.20.1-1.4.19.jar b/lib/lodestone-1.20.1-1.4.19.jar deleted file mode 100644 index 380b50b94..000000000 Binary files a/lib/lodestone-1.20.1-1.4.19.jar and /dev/null differ diff --git a/lib/lodestone-1.20.1-1.4.20.jar b/lib/lodestone-1.20.1-1.4.22.jar similarity index 86% rename from lib/lodestone-1.20.1-1.4.20.jar rename to lib/lodestone-1.20.1-1.4.22.jar index 7fbdab976..27c15939a 100644 Binary files a/lib/lodestone-1.20.1-1.4.20.jar and b/lib/lodestone-1.20.1-1.4.22.jar differ diff --git a/run-data/config/fml.toml b/run-data/config/fml.toml new file mode 100644 index 000000000..f843a0bd1 --- /dev/null +++ b/run-data/config/fml.toml @@ -0,0 +1,25 @@ +#Early window height +earlyWindowHeight = 480 +#Early window framebuffer scale +earlyWindowFBScale = 1 +#Enable forge global version checking +versionCheck = true +#Early window provider +earlyWindowProvider = "fmlearlywindow" +#Early window width +earlyWindowWidth = 854 +#Early window starts maximized +earlyWindowMaximized = false +#Default config path for servers +defaultConfigPath = "defaultconfigs" +#Disables Optimized DFU client-side - already disabled on servers +disableOptimizedDFU = true +#Skip specific GL versions, may help with buggy graphics card drivers +earlyWindowSkipGLVersions = [] +#Should we control the window. Disabling this disables new GL features and can be bad for mods that rely on them. +earlyWindowControl = true +#Max threads for early initialization parallelism, -1 is based on processor count +maxThreads = -1 +#Squir? +earlyWindowSquir = false + diff --git a/run-data/config/jei/jei-client.ini b/run-data/config/jei/jei-client.ini new file mode 100644 index 000000000..2146509c9 --- /dev/null +++ b/run-data/config/jei/jei-client.ini @@ -0,0 +1,141 @@ +[advanced] + # Description: Display search bar in the center + # Valid Values: [true, false] + # Default Value: false + CenterSearch = false + + # Description: Set low-memory mode (makes search very slow, but uses less RAM) + # Valid Values: [true, false] + # Default Value: false + LowMemorySlowSearchEnabled = false + + # Description: Enable cheating items into the hotbar by using the shift+number keys. + # Valid Values: [true, false] + # Default Value: false + CheatToHotbarUsingHotkeysEnabled = false + + # Description: Enable adding new bookmarks to the front of the bookmark list. + # Valid Values: [true, false] + # Default Value: true + AddBookmarksToFrontEnabled = true + + # Description: When looking up recipes with items that contain fluids, also look up recipes for the fluids. + # Valid Values: [true, false] + # Default Value: false + LookupFluidContents = false + + # Description: How items should be handed to you + # Valid Values: [INVENTORY, MOUSE_PICKUP] + # Default Value: MOUSE_PICKUP + GiveMode = MOUSE_PICKUP + + # Description: Max. recipe gui height + # Valid Values: Any integer greater than or equal to 175 + # Default Value: 350 + RecipeGuiHeight = 350 + + +[sorting] + # Description: Sorting order for the ingredient list + # Valid Values: A comma-separated list containing values of: + # [MOD_NAME, INGREDIENT_TYPE, ALPHABETICAL, CREATIVE_MENU, TAG, ARMOR, MAX_DURABILITY] + # Default Value: MOD_NAME, INGREDIENT_TYPE, CREATIVE_MENU + IngredientSortStages = MOD_NAME, INGREDIENT_TYPE, CREATIVE_MENU + + +[search] + # Description: Search mode for Mod Names (prefix: @) + # Valid Values: [ENABLED, REQUIRE_PREFIX, DISABLED] + # Default Value: REQUIRE_PREFIX + ModNameSearchMode = REQUIRE_PREFIX + + # Description: Search mode for Tooltips (prefix: #) + # Valid Values: [ENABLED, REQUIRE_PREFIX, DISABLED] + # Default Value: ENABLED + TooltipSearchMode = ENABLED + + # Description: Search mode for Tag Names (prefix: $) + # Valid Values: [ENABLED, REQUIRE_PREFIX, DISABLED] + # Default Value: REQUIRE_PREFIX + TagSearchMode = REQUIRE_PREFIX + + # Description: Search mode for Colors (prefix: ^) + # Valid Values: [ENABLED, REQUIRE_PREFIX, DISABLED] + # Default Value: DISABLED + ColorSearchMode = DISABLED + + # Description: Search mode for resources locations (prefix: &) + # Valid Values: [ENABLED, REQUIRE_PREFIX, DISABLED] + # Default Value: DISABLED + ResourceLocationSearchMode = DISABLED + + # Description: Search advanced tooltips (visible with F3+H) + # Valid Values: [true, false] + # Default Value: false + SearchAdvancedTooltips = false + + +[IngredientList] + # Description: Max number of rows shown + # Valid Values: An integer in the range [1, 100] (inclusive) + # Default Value: 16 + MaxRows = 16 + + # Description: Max number of columns shown + # Valid Values: An integer in the range [4, 100] (inclusive) + # Default Value: 9 + MaxColumns = 9 + + # Description: Horizontal alignment of the ingredient grid inside the available area + # Valid Values: [LEFT, CENTER, RIGHT] + # Default Value: RIGHT + HorizontalAlignment = RIGHT + + # Description: Vertical alignment of the ingredient grid inside the available area + # Valid Values: [TOP, CENTER, BOTTOM] + # Default Value: TOP + VerticalAlignment = TOP + + # Description: Visibility of the top page buttons. Use AUTO_HIDE to only show it when there are multiple pages. + # Valid Values: [ENABLED, AUTO_HIDE, DISABLED] + # Default Value: ENABLED + ButtonNavigationVisibility = ENABLED + + # Description: Set to true to draw a background texture behind the gui. + # Valid Values: [true, false] + # Default Value: false + DrawBackground = false + + +[BookmarkList] + # Description: Max number of rows shown + # Valid Values: An integer in the range [1, 100] (inclusive) + # Default Value: 16 + MaxRows = 16 + + # Description: Max number of columns shown + # Valid Values: An integer in the range [4, 100] (inclusive) + # Default Value: 9 + MaxColumns = 9 + + # Description: Horizontal alignment of the ingredient grid inside the available area + # Valid Values: [LEFT, CENTER, RIGHT] + # Default Value: LEFT + HorizontalAlignment = LEFT + + # Description: Vertical alignment of the ingredient grid inside the available area + # Valid Values: [TOP, CENTER, BOTTOM] + # Default Value: TOP + VerticalAlignment = TOP + + # Description: Visibility of the top page buttons. Use AUTO_HIDE to only show it when there are multiple pages. + # Valid Values: [ENABLED, AUTO_HIDE, DISABLED] + # Default Value: ENABLED + ButtonNavigationVisibility = ENABLED + + # Description: Set to true to draw a background texture behind the gui. + # Valid Values: [true, false] + # Default Value: false + DrawBackground = false + + diff --git a/run-data/config/jei/jei-colors.ini b/run-data/config/jei/jei-colors.ini new file mode 100644 index 000000000..1fc7da4ea --- /dev/null +++ b/run-data/config/jei/jei-colors.ini @@ -0,0 +1,8 @@ +[colors] + # Description: Color values to search for + # Valid Values: A comma-separated list containing values of: + # Any color name and an RGB hex color, separated by a ':' + # Default Value: White:EEEEEE, LightBlue:7492CC, Cyan:00EEEE, Blue:2222DD, LapisBlue:25418B, Teal:008080, Yellow:CACB58, GoldenYellow:EED700, Orange:D97634, Pink:D1899D, HotPink:FC0FC0, Magenta:B24BBB, Purple:813EB9, EvilPurple:2E1649, Lavender:B57EDC, Indigo:480082, Sand:DBD3A0, Tan:BB9B63, LightBrown:A0522D, Brown:634B33, DarkBrown:3A2D13, LimeGreen:43B239, SlimeGreen:83CB73, Green:008000, DarkGreen:224D22, GrassGreen:548049, Red:963430, BrickRed:B0604B, NetherBrick:2A1516, Redstone:CE3E36, Black:181515, CharcoalGray:464646, IronGray:646464, Gray:808080, Silver:C0C0C0 + SearchColors = White:EEEEEE, LightBlue:7492CC, Cyan:00EEEE, Blue:2222DD, LapisBlue:25418B, Teal:008080, Yellow:CACB58, GoldenYellow:EED700, Orange:D97634, Pink:D1899D, HotPink:FC0FC0, Magenta:B24BBB, Purple:813EB9, EvilPurple:2E1649, Lavender:B57EDC, Indigo:480082, Sand:DBD3A0, Tan:BB9B63, LightBrown:A0522D, Brown:634B33, DarkBrown:3A2D13, LimeGreen:43B239, SlimeGreen:83CB73, Green:008000, DarkGreen:224D22, GrassGreen:548049, Red:963430, BrickRed:B0604B, NetherBrick:2A1516, Redstone:CE3E36, Black:181515, CharcoalGray:464646, IronGray:646464, Gray:808080, Silver:C0C0C0 + + diff --git a/run-data/config/jei/jei-debug.ini b/run-data/config/jei/jei-debug.ini new file mode 100644 index 000000000..89c6b8f5f --- /dev/null +++ b/run-data/config/jei/jei-debug.ini @@ -0,0 +1,12 @@ +[debug] + # Description: Debug mode enabled + # Valid Values: [true, false] + # Default Value: false + DebugMode = false + + # Description: Debug inputs enabled + # Valid Values: [true, false] + # Default Value: false + DebugInputs = false + + diff --git a/run-data/config/jei/jei-mod-id-format.ini b/run-data/config/jei/jei-mod-id-format.ini new file mode 100644 index 000000000..05234a802 --- /dev/null +++ b/run-data/config/jei/jei-mod-id-format.ini @@ -0,0 +1,11 @@ +[modname] + # Description: Formatting for mod name tooltip + # Valid Values: A chat formatting string. + # Use these formatting colors: + # black dark_blue dark_green dark_aqua dark_red dark_purple gold gray dark_gray blue green aqua red light_purple yellow white + # With these formatting options: + # obfuscated bold strikethrough underline italic + # Default Value: blue italic + ModNameFormat = blue italic + + diff --git a/run-data/config/worldstripper/stripper.json b/run-data/config/worldstripper/stripper.json new file mode 100644 index 000000000..44669b5c1 --- /dev/null +++ b/run-data/config/worldstripper/stripper.json @@ -0,0 +1,50 @@ +{ + "entries": [ + "minecraft:dirt", + "minecraft:grass", + "minecraft:grass_path", + "minecraft:tall_grass", + "minecraft:grass_block", + "minecraft:stone", + "minecraft:diorite", + "minecraft:granite", + "minecraft:andesite", + "minecraft:gravel", + "minecraft:sand", + "minecraft:sandstone", + "minecraft:red_sand", + "minecraft:red_sandstone", + "minecraft:ice", + "minecraft:snow", + "minecraft:snow_block", + "minecraft:powder_snow", + "minecraft:oak_log", + "minecraft:dark_oak_log", + "minecraft:spruce_log", + "minecraft:birch_log", + "minecraft:jungle_log", + "minecraft:acacia_log", + "minecraft:oak_leaves", + "minecraft:dark_oak_leaves", + "minecraft:spruce_leaves", + "minecraft:birch_leaves", + "minecraft:jungle_leaves", + "minecraft:acacia_leaves", + "minecraft:water", + "minecraft:flowing_water", + "minecraft:lava", + "minecraft:flowing_lava", + "minecraft:netherrack", + "minecraft:end_stone", + "minecraft:podzol", + "minecraft:mycelium", + "minecraft:bamboo", + "minecraft:seagrass", + "minecraft:tall_seagrass", + "minecraft:kelp", + "minecraft:kelp_plant", + "minecraft:deepslate", + "minecraft:tuff", + "minecraft:glow_lichen" + ] +} \ No newline at end of file diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache deleted file mode 100644 index c322bb66e..000000000 --- a/src/generated/resources/.cache/cache +++ /dev/null @@ -1,2288 +0,0 @@ -e0585c70a1c6b05b18fe9aad2be9d2c2e1a30c43 assets/malum/blockstates/blazing_quartz_ore.json -e43eb167c0d79c7364a2a2b8bbe8823e3c7b9d04 assets/malum/blockstates/blighted_earth.json -d9dabc97845e0a01bc07acf4e1efea908a70f6f0 assets/malum/blockstates/blighted_soil.json -417915d8e8bcfb15356f8ae0add5f5137f1e0b7e assets/malum/blockstates/blighted_soulwood.json -e5bb31be1fa650ddd1c30b363f7a9d4670957fb0 assets/malum/blockstates/blighted_tumor.json -5e556e4817ba9845efe6f26d010f9d1c9ce912b4 assets/malum/blockstates/blighted_weed.json -a66c0e7d1fce3f95e23a5d3851ad2612448546f2 assets/malum/blockstates/block_of_alchemical_calx.json -891a3809d7f441cbcbac47346a8373b4e9080a0d assets/malum/blockstates/block_of_arcane_charcoal.json -de0213efcbe9216037d5b4b51a674e4d7db8a62d assets/malum/blockstates/block_of_astral_weave.json -4ba857bc7e2521ec9c09f7a1eaa919e6029205a5 assets/malum/blockstates/block_of_blazing_quartz.json -cb7b0828e31179a0e1de0dd31fcaeb2836d6a7ab assets/malum/blockstates/block_of_brilliance.json -ff2c5a04660e2a20aade87b58d246c250fcceab4 assets/malum/blockstates/block_of_cthonic_gold.json -944d68db61092796a1fc0466e40ce25b166c2b53 assets/malum/blockstates/block_of_cursed_grit.json -1e5ea334495e69af048589a58e31bcc746e5c7bc assets/malum/blockstates/block_of_grim_talc.json -225a6f0034c0e012eec5b18d2ed34f711a30e291 assets/malum/blockstates/block_of_hallowed_gold.json -918f9c2fc7d03743d5eac611203ebc902a457f34 assets/malum/blockstates/block_of_hex_ash.json -3eeed05cf0c739dad04cabc7bda3c7bd462d7142 assets/malum/blockstates/block_of_raw_soulstone.json -c04ece8fb1bdd574d1d5589ca80a9d47fd27315a assets/malum/blockstates/block_of_rotting_essence.json -8239165059fc6d78c5689df27b5639bcc3fa91d4 assets/malum/blockstates/block_of_soul_stained_steel.json -0418f9cbce3174fc9806f03830889243c18ee9ee assets/malum/blockstates/block_of_soulstone.json -8d913838da38dcb2550099614d6860c6b7df0ad3 assets/malum/blockstates/block_of_void_salts.json -73ed7fa1e65da4564227b29eb156e225e2baa670 assets/malum/blockstates/brilliant_deepslate.json -0f522995c17b024a238680cf56dc8c69ad9de12f assets/malum/blockstates/brilliant_obelisk.json -a6f7167feb809c95c327c63554b27c03163e588e assets/malum/blockstates/brilliant_obelisk_component.json -a7c6b6c3d59914e3d0d65143b9b630c2a997fbc2 assets/malum/blockstates/brilliant_stone.json -30728b7f873ca0d6e714886b2382aad3667940ae assets/malum/blockstates/chiseled_tainted_rock.json -6f5be99bf4ee3c6a27275f3a6c4f2e58823b582d assets/malum/blockstates/chiseled_twisted_rock.json -72ab3dc2ed0a4939b880c759a200e5d65c34e1f7 assets/malum/blockstates/cut_runewood_planks.json -7cdc47a348deffc8c2477f49fccd99a68dbfff7a assets/malum/blockstates/cut_soulwood_planks.json -36cdb64a88de8b2ec1a2d99fe8da49c8a6d53f04 assets/malum/blockstates/cut_tainted_rock.json -c3b66437fc63b3c6d04af6338d0f0d0cd8d482d6 assets/malum/blockstates/cut_twisted_rock.json -811c44c006cd595c38d5fe4e891780b60b9d74e3 assets/malum/blockstates/deepslate_quartz_ore.json -220015a69010e4d14d363fda56c040c4ae35300f assets/malum/blockstates/deepslate_soulstone_ore.json -309256d41c8d3872036ebfe96e79fb641109363b assets/malum/blockstates/ether.json -ca060dc171375332542985507f689d3e0099e3df assets/malum/blockstates/ether_torch.json -29562f35b3515226f237e57f9593619a5773e4aa assets/malum/blockstates/exposed_runewood_log.json -e947382904190df73b8919fb215788921bf0b1cf assets/malum/blockstates/exposed_soulwood_log.json -cfbfe360d97ffbeba99375734f90549568f796a2 assets/malum/blockstates/iridescent_ether.json -ca060dc171375332542985507f689d3e0099e3df assets/malum/blockstates/iridescent_ether_torch.json -cb6a17c4dca30d064eedc28529420373d25d1933 assets/malum/blockstates/iridescent_wall_ether_torch.json -38fee0f3873a1a74e72550bc3c01f58a5a0cb635 assets/malum/blockstates/mass_of_blighted_gunk.json -be8fac8e2accf76397573528fa4d0a6972f2c4fc assets/malum/blockstates/mote_of_aerial_arcana.json -e30c80dd1083c23de5442cb6c8c0e1ea45ccedba assets/malum/blockstates/mote_of_aqueous_arcana.json -76fe1082ee58c0e172e3fc9325066651f6857e6b assets/malum/blockstates/mote_of_earthen_arcana.json -e06f81897dc20f05858ae80ed5640c9279bb57f2 assets/malum/blockstates/mote_of_eldritch_arcana.json -4e95c63367ea4248a43ebd0e01c7415371707c4f assets/malum/blockstates/mote_of_infernal_arcana.json -903a3215ac3621abd02d8edec04a8ac1a47da5c9 assets/malum/blockstates/mote_of_raw_arcana.json -705bcc3187d055d7024ae9fc9e770753c9272db1 assets/malum/blockstates/mote_of_sacred_arcana.json -11dbeb54e9cb8dbd161f2bbea00943c927e1e04f assets/malum/blockstates/mote_of_wicked_arcana.json -34a0ba9fbc1d1a1dc94d2f62fc347569088c2791 assets/malum/blockstates/natural_quartz_cluster.json -e852112f92a235c242098bce385507753da07d7a assets/malum/blockstates/natural_quartz_ore.json -5788b572cdf889552b3be8909a940b74c8814a11 assets/malum/blockstates/polished_tainted_rock.json -635f31edaa37bdc6c7018cf2d4a9c0cf9d558c65 assets/malum/blockstates/polished_tainted_rock_slab.json -a3ffe9c9227c067375ac693fd4c6a630b2d28c0c assets/malum/blockstates/polished_tainted_rock_stairs.json -22d53c8a6bda27a37b1a818bfd6bad8915cf1dc6 assets/malum/blockstates/polished_twisted_rock.json -d83f0e03ba6059e098a0b5ecaa89d4e08f769917 assets/malum/blockstates/polished_twisted_rock_slab.json -6eaa825fd07b88d1e5af0ef547fc5c67cb6a7a3b assets/malum/blockstates/polished_twisted_rock_stairs.json -ac1c4e70fa52342559367704d9faf20dcb69f82f assets/malum/blockstates/primordial_soup.json -6a7c1b3a5ec95a0729c56755934db0affc1d970b assets/malum/blockstates/revealed_runewood_log.json -b68dbe989936111f2e8b6dd182431e770738cf00 assets/malum/blockstates/revealed_soulwood_log.json -257b21599bbe4156aacef0a97e8a81a8fc8b735f assets/malum/blockstates/runewood.json -f0d5cf89ea062e25af4c695d6a213e804ccb02b7 assets/malum/blockstates/runewood_beam.json -9f0ef2b0ff9bfff82973418222879cfc4a58ef38 assets/malum/blockstates/runewood_door.json -d133c1de910763c6251bec7bd51770f7bcbfa96f assets/malum/blockstates/runewood_item_pedestal.json -5add5fda4fbf3de23d9c5ace26cbe0c59b8051d9 assets/malum/blockstates/runewood_item_stand.json -7f0829ade0b0a2d272611ab62a21402fde2ae412 assets/malum/blockstates/runewood_leaves.json -2a0d02469cc6d881e39d101b44004249d454921a assets/malum/blockstates/runewood_log.json -7637a1b0bf83ab1d0fc8d0cc13103f51f1dbae8e assets/malum/blockstates/runewood_obelisk.json -2a6248bf2a63d7a634f662cd5d15b162311e5dd9 assets/malum/blockstates/runewood_obelisk_component.json -5aede286c714b2ef4d803c4bc6734659c7e0b5cd assets/malum/blockstates/runewood_panel.json -e85555f11a12e925624e9ec4b8cc1dd81b5e7a5a assets/malum/blockstates/runewood_panel_slab.json -2113f78fa206a3314c9446e3e955ec450c620350 assets/malum/blockstates/runewood_panel_stairs.json -43325492aff6771ceebedfeb2e053e57fd36c75c assets/malum/blockstates/runewood_planks.json -e08f0312643f18f02d7186441141b2a91b178ca8 assets/malum/blockstates/runewood_planks_button.json -2ab744119bd7cee522e5e84c4d504500ed12cdc6 assets/malum/blockstates/runewood_planks_fence.json -435398debe555956d2c0fc8abbe30726dcab66da assets/malum/blockstates/runewood_planks_fence_gate.json -c890c7ec193e4461b550dcaacd9b1c250ac1f330 assets/malum/blockstates/runewood_planks_pressure_plate.json -0729889d0f02549c1740ca89d347b18a6ae0a37f assets/malum/blockstates/runewood_planks_slab.json -cac95b720421f16916508930a0605100edd8ea02 assets/malum/blockstates/runewood_planks_stairs.json -f26e13bdfe47ad986c768fdcc5606f88fad91207 assets/malum/blockstates/runewood_sapling.json -406bb0e75ce3d42757b54335646b77f4d9c9d339 assets/malum/blockstates/runewood_sign.json -136fcbbc4823a1024897ee405193bbbff19c7b55 assets/malum/blockstates/runewood_tiles.json -8587170279b813d9900a33b72dea79f050c9915c assets/malum/blockstates/runewood_tiles_slab.json -6503ff3ebb3b8819b5ef68c4f5a5da7ef8333fd9 assets/malum/blockstates/runewood_tiles_stairs.json -0e2ea040a3ebd9b9b8e2a2014e7416b6dad11ad4 assets/malum/blockstates/runewood_totem_base.json -86441cb9fa4eb1b3387bd8e60033aaeb38d25666 assets/malum/blockstates/runewood_totem_pole.json -95c9fced47b86c1d191198d83a86c0f45e627972 assets/malum/blockstates/runewood_trapdoor.json -b4bf9f5c47e35165bf143c73dd2a69d9dd050e79 assets/malum/blockstates/runewood_wall_sign.json -70d2e49616f10cf9428c9747b8800755effcebf1 assets/malum/blockstates/runic_small_tainted_rock_bricks.json -dd2dc0a5944777c6bc14bb47937a5a8bedeb92b6 assets/malum/blockstates/runic_small_tainted_rock_bricks_slab.json -fb99c7252f7bbafa16d248b294f2e9b5b815c2a8 assets/malum/blockstates/runic_small_tainted_rock_bricks_stairs.json -13aa222153b905bfec5f09700994d176aa76e725 assets/malum/blockstates/runic_small_tainted_rock_bricks_wall.json -4e6a53c4dae8dab4205d78581bc02676b0c6c5b5 assets/malum/blockstates/runic_small_twisted_rock_bricks.json -b566e45b3c8ee589cdf292418ba9fa66a2939828 assets/malum/blockstates/runic_small_twisted_rock_bricks_slab.json -7d302ef470aa44fce0e6058c811b158113bd3a39 assets/malum/blockstates/runic_small_twisted_rock_bricks_stairs.json -2dd55eaeaad5c29f4eebbfc61b9116db62dec017 assets/malum/blockstates/runic_small_twisted_rock_bricks_wall.json -cf9f2c105b80f95e16ded7df934d6f92eb1445af assets/malum/blockstates/runic_tainted_rock_bricks.json -c16a12638aec9e174b6aa932cae034ddf3c5bf0d assets/malum/blockstates/runic_tainted_rock_bricks_slab.json -cfffa7ab055c2f1a6cc2350dd97d9d8289c2c7d4 assets/malum/blockstates/runic_tainted_rock_bricks_stairs.json -b7ba35d171d803d2c0ff0b2e68175886102a9dee assets/malum/blockstates/runic_tainted_rock_bricks_wall.json -2f969b5815276a682477ef2b56f574bdb65c600e assets/malum/blockstates/runic_tainted_rock_tiles.json -09ee6e2f5765940f6c615009bf15581b32c1c230 assets/malum/blockstates/runic_tainted_rock_tiles_slab.json -c2e7b93ed1cad1b024eca8006108e7b8eb7d58c2 assets/malum/blockstates/runic_tainted_rock_tiles_stairs.json -4e44fb352b83ef9e303f510cb17ac5ac8f98677d assets/malum/blockstates/runic_tainted_rock_tiles_wall.json -2c795346a222ad6e2d03fadd6146b4950ffdff39 assets/malum/blockstates/runic_twisted_rock_bricks.json -028f19ef314dc06ef070ba9f31275af198cad3b4 assets/malum/blockstates/runic_twisted_rock_bricks_slab.json -0201902dbae3e22ee700bafa7916527c16e5bced assets/malum/blockstates/runic_twisted_rock_bricks_stairs.json -de72c2cd1b51ff1da5b204d9fcc848489dfc0b5f assets/malum/blockstates/runic_twisted_rock_bricks_wall.json -acd1c39f3df73e1440a8e3dc994ded99dc67069d assets/malum/blockstates/runic_twisted_rock_tiles.json -4b93cff9dcbfacf2ba12eb5efc93c14f70f87e26 assets/malum/blockstates/runic_twisted_rock_tiles_slab.json -e09f7cbab56027bd1d53aa3af6ddd42a7d48c4ff assets/malum/blockstates/runic_twisted_rock_tiles_stairs.json -ece62ceefdcaf1f1378423c0915d4e6e16b2b5ff assets/malum/blockstates/runic_twisted_rock_tiles_wall.json -52f0d5402d22257c0901a9e4233378ce9da44e2e assets/malum/blockstates/small_tainted_rock_bricks.json -8b2db3b52ec01f9c18b2297f53e8b81d5edea5e1 assets/malum/blockstates/small_tainted_rock_bricks_slab.json -21c2cf590524dafbae9ed2f8fd23f1a57cabbed5 assets/malum/blockstates/small_tainted_rock_bricks_stairs.json -f9f6e70660afc190fe762ac2361798b0f4e9902e assets/malum/blockstates/small_tainted_rock_bricks_wall.json -0af135aa5ca3225f83cbbc21fb182013cfdec903 assets/malum/blockstates/small_twisted_rock_bricks.json -1ea107c4e6bfa65ec0b08d9cd09cc5d68e6a7ac1 assets/malum/blockstates/small_twisted_rock_bricks_slab.json -e5046f5be2d66ef823a1b12f9ff8b6244c0b5b62 assets/malum/blockstates/small_twisted_rock_bricks_stairs.json -f7fedd26582984f7651adab8d2c00afa81eb5806 assets/malum/blockstates/small_twisted_rock_bricks_wall.json -a1bb324df0d068c0dc729dbbee1bfb0b89cdb7fd assets/malum/blockstates/smooth_tainted_rock.json -577e71a2b8974b3ce450efdfbf4cd21195dcdde2 assets/malum/blockstates/smooth_tainted_rock_slab.json -7adafa7bda2d6b895f60ba28b3cba4f65a7b277c assets/malum/blockstates/smooth_tainted_rock_stairs.json -75aa577f471b6b32466c38b9d5221dc3ce71018d assets/malum/blockstates/smooth_twisted_rock.json -5b7d15360cdefae58e9ac84ffb812971d6c15884 assets/malum/blockstates/smooth_twisted_rock_slab.json -b455e94a95b4801bacbb99f3b3da16a08dfcbd12 assets/malum/blockstates/smooth_twisted_rock_stairs.json -d54a71d3f96d41e4f5a6d64dae29decd0ce47605 assets/malum/blockstates/solid_runewood_trapdoor.json -588788eb10bd0d7ca30d98a1b40a4d04fde8bf72 assets/malum/blockstates/solid_soulwood_trapdoor.json -46d9a3c9b75d0055c3199b5fa6c4341aed2b527e assets/malum/blockstates/soul_vial.json -00b1832514720eac8d6b8a4c73fec68dc684ecef assets/malum/blockstates/soulstone_ore.json -efe4d347971d43d12552fbbb4fac9b520d2cc3e4 assets/malum/blockstates/soulwood.json -9e7fc9b435c83b6ef44f2850a36b78fdd641eeb5 assets/malum/blockstates/soulwood_beam.json -3814693f25918a6459aa8b046222d7e4900217a4 assets/malum/blockstates/soulwood_door.json -c6da38ccd9837c58de133974be84ded7561f2c20 assets/malum/blockstates/soulwood_growth.json -a6c73d8ed036bae8beb174e31b2cb36eae741f28 assets/malum/blockstates/soulwood_item_pedestal.json -06cf45ba7a3f3a7393e0346cb1e9bc880b804bc8 assets/malum/blockstates/soulwood_item_stand.json -a96d173a69c7e31d2bf363eb22bbe5e77f6508c6 assets/malum/blockstates/soulwood_leaves.json -9e986bda834eb30660884eb815eb1af8bef6dc9f assets/malum/blockstates/soulwood_log.json -fcf0ae2d4f77ca96ad1299feb97854305f0570e4 assets/malum/blockstates/soulwood_panel.json -e58b47cb3fa7cb47d36dd0c635e2d639b27fc891 assets/malum/blockstates/soulwood_panel_slab.json -bb17aa2c03b85dca54b86064c05c12204836d427 assets/malum/blockstates/soulwood_panel_stairs.json -37c2fcd2633020e0d2f3eb8fbb5dec8849751310 assets/malum/blockstates/soulwood_planks.json -72d0b32b64eb42b73964a3f49b5d30496c17466f assets/malum/blockstates/soulwood_planks_button.json -0f753772c8f2921a301300eb48cb28f8911e4baf assets/malum/blockstates/soulwood_planks_fence.json -d6f4a676d96292492e289e0d6ddd78098b7e3e74 assets/malum/blockstates/soulwood_planks_fence_gate.json -e57aeaa58701ccf489b673eeb91074c29ea27389 assets/malum/blockstates/soulwood_planks_pressure_plate.json -4d3972a3d1834375fd6c3c6594ed4adf8c21adf2 assets/malum/blockstates/soulwood_planks_slab.json -ca2c2c5f65a5c5fbce1252fdf3b610b82615d206 assets/malum/blockstates/soulwood_planks_stairs.json -1f0003f740dc53ad87c37dbb5566417e24da85b8 assets/malum/blockstates/soulwood_sign.json -2ff8d80c259fc31ddddf1446a13d117d8dbd81ed assets/malum/blockstates/soulwood_tiles.json -c9b5d5e91231eefab38249465635a42e50596ed8 assets/malum/blockstates/soulwood_tiles_slab.json -beb5e7f037eedec23e47262cf00f7252cf3916ed assets/malum/blockstates/soulwood_tiles_stairs.json -2c4bac67385e914c943ab5057a0f8b635c96cfa8 assets/malum/blockstates/soulwood_totem_base.json -af90f9c638ae80f344c60b2f2348941fe2632bd8 assets/malum/blockstates/soulwood_totem_pole.json -a8aadf21c79d7fef2aaf33048e79298a97c3c431 assets/malum/blockstates/soulwood_trapdoor.json -dc6a4f5b1f863d4c8ce3cedcb43bf58a3027c76b assets/malum/blockstates/soulwood_wall_sign.json -d51d2292922e359215bffd0763942b5e7a1861ee assets/malum/blockstates/spirit_altar.json -450038dfde286f25206bb1f4aa4d477511cec730 assets/malum/blockstates/spirit_catalyzer.json -ab472042f38b347356772e47056df6f9e0f62f9c assets/malum/blockstates/spirit_catalyzer_component.json -1c432d252f71c0ab16c383ec5b1dc067de5e1b1c assets/malum/blockstates/spirit_crucible.json -9ca08fe9f868f98638c6862bfcb98a5cba003ff2 assets/malum/blockstates/spirit_crucible_component.json -be5a2259a7adfc42aacfec48731bfb149c4dffcd assets/malum/blockstates/spirit_jar.json -a5372dec593e3d3e6fa8026fc728fe27401cea5b assets/malum/blockstates/stripped_runewood.json -a3e4de7f0070c260243b5a5787468488bc9423d2 assets/malum/blockstates/stripped_runewood_log.json -c5cf70a781ed4a46d0c664da0b74de5b1bd1f9bf assets/malum/blockstates/stripped_soulwood.json -e25437b4250ac2b54569d33ce123f9898af655bc assets/malum/blockstates/stripped_soulwood_log.json -bc2e3d58b710edd496dd73dd5067e7cdc452c769 assets/malum/blockstates/tainted_ether_brazier.json -9638d9cd2a2c6bee852de2dcae68157890c3325e assets/malum/blockstates/tainted_iridescent_ether_brazier.json -0a8e5ae26da85f68ba3c6f1aab6e9d6894da5dfe assets/malum/blockstates/tainted_rock.json -23df0111c0afacee2efdfbb0d8f59dc1c5c35005 assets/malum/blockstates/tainted_rock_bricks.json -6d7f5e8afe5c8da8c92df9e16f61751333fd0644 assets/malum/blockstates/tainted_rock_bricks_slab.json -80d657a635cfd1411537f8fd5075763a585a9133 assets/malum/blockstates/tainted_rock_bricks_stairs.json -8b26ef55ae0aef5f66a8f28f1c63395447532639 assets/malum/blockstates/tainted_rock_bricks_wall.json -45448fc87895fa7e8fa232d1f22bead0da71a1e3 assets/malum/blockstates/tainted_rock_button.json -4e1c7df8c43471bc880cabbf529914ab5dc5f0c4 assets/malum/blockstates/tainted_rock_column.json -56ec651e6fceb608ead2a3810639627f642ef40a assets/malum/blockstates/tainted_rock_column_cap.json -644acaef25195e3394807d85ae96c8218cc98bc7 assets/malum/blockstates/tainted_rock_item_pedestal.json -88c93c49ad79b36ebcc8b04cb1673c237efecd0f assets/malum/blockstates/tainted_rock_item_stand.json -1d43452831c9bd2e74b945bf5812f0d93c0c5540 assets/malum/blockstates/tainted_rock_pressure_plate.json -28c7033d35c424142a976d6200fe3e7d5454e437 assets/malum/blockstates/tainted_rock_slab.json -e45b8f5c661e1a7811e90dce8d5370ba48c12c42 assets/malum/blockstates/tainted_rock_stairs.json -2066658aa4228729f37a407a5ff873f5e6568296 assets/malum/blockstates/tainted_rock_tiles.json -d434a355b027b19e50b06186220f54e3886eee8f assets/malum/blockstates/tainted_rock_tiles_slab.json -c7256c39001536e4841c1141ec6ea2f6f799606c assets/malum/blockstates/tainted_rock_tiles_stairs.json -0d1dc90945a6d2f0ff4f1d9884c132bc65dc5195 assets/malum/blockstates/tainted_rock_tiles_wall.json -310425fb1df6b82c536820bbaedf103edb2850e0 assets/malum/blockstates/tainted_rock_wall.json -71966be6548957832d7e22014dba980d995a2a94 assets/malum/blockstates/the_device.json -988a03362711d72a738c71aae6e7c6e5b76861e5 assets/malum/blockstates/the_vessel.json -8775a7c843baf7935738e614e65bf0136a66652d assets/malum/blockstates/twisted_ether_brazier.json -4de2c5c86514bc00d7cbc3165f07cb0973313b67 assets/malum/blockstates/twisted_iridescent_ether_brazier.json -61472d3ed53704d6e3773afc4ee4d0ce82b43afb assets/malum/blockstates/twisted_rock.json -1b970c2929fb07b2a7d02e51da0961d2756b941e assets/malum/blockstates/twisted_rock_bricks.json -9830fb59515a287132affb4a30ea582a4b89e095 assets/malum/blockstates/twisted_rock_bricks_slab.json -91c61245094babe205bd5c00bb169ac83f1ac3f8 assets/malum/blockstates/twisted_rock_bricks_stairs.json -b6f74998e22683490e2a502994bf3c43b594c66b assets/malum/blockstates/twisted_rock_bricks_wall.json -55997acd81d4200dc9b5cdaaa457be973fec3d47 assets/malum/blockstates/twisted_rock_button.json -8ea8c04a11fe8f6546bf44eaf31daa4fe085bb2b assets/malum/blockstates/twisted_rock_column.json -0be160ef8075869519bead91c5cb7f46794581eb assets/malum/blockstates/twisted_rock_column_cap.json -91cffdac0537d7bed2a21eb3868035e8754a774a assets/malum/blockstates/twisted_rock_item_pedestal.json -0c76cdb29849ccdb03c1de578e46bd6dfd960808 assets/malum/blockstates/twisted_rock_item_stand.json -6503ad319eb581684ec3bf843daf4d12596c51d5 assets/malum/blockstates/twisted_rock_pressure_plate.json -e96d35dd4ce6ceb6caf276563363c6e76bc66786 assets/malum/blockstates/twisted_rock_slab.json -c60a7bca77f3ae1efadf51cf8dd97acde9972de5 assets/malum/blockstates/twisted_rock_stairs.json -0a9677a9e09f8f80eb3aaf94ea28b663b76dce84 assets/malum/blockstates/twisted_rock_tiles.json -03a022627f40e8ec6a5e8ff8fc40c7158203e1a4 assets/malum/blockstates/twisted_rock_tiles_slab.json -a64dad393d0e59d105f2967bc0596947ad57273e assets/malum/blockstates/twisted_rock_tiles_stairs.json -bf3933c0048d5182a0d88e9c191602d40ee9d0c3 assets/malum/blockstates/twisted_rock_tiles_wall.json -3d4eebd0847c9b1bd30f171ce458e05e4cd8e0a9 assets/malum/blockstates/twisted_rock_wall.json -b6e45996de9b3378dabe5b774baec74b66064437 assets/malum/blockstates/twisted_tablet.json -9685b98a77994e75c221c72ee387caf552057fe1 assets/malum/blockstates/vertical_runewood_planks.json -876cdc4e4d234caa1b9db8ac171736a7df43fe52 assets/malum/blockstates/vertical_runewood_planks_slab.json -ed8f25d2013e294a7c6740ab292a4ef8a8c9900d assets/malum/blockstates/vertical_runewood_planks_stairs.json -eae07e90708b4ad79087ece2f880b20d2dd71862 assets/malum/blockstates/vertical_soulwood_planks.json -ea2124145fd87d36427a1e743f7865d328403f7b assets/malum/blockstates/vertical_soulwood_planks_slab.json -d9001ce582022fed3dcfa3c78a5f1497f622a419 assets/malum/blockstates/vertical_soulwood_planks_stairs.json -e575ddd51ffebce9b050d328c21942bbcb73ae32 assets/malum/blockstates/void_conduit.json -cb6a17c4dca30d064eedc28529420373d25d1933 assets/malum/blockstates/wall_ether_torch.json -52bf01d357cdc6553ced8804ed477c45098078a2 assets/malum/blockstates/weavers_workbench.json -55635004672302336ef4a04dbe0d38dff66c4cd9 assets/malum/blockstates/weeping_well_core.json -55188decc0c9a982e5ba40f8df2adea65a032e32 assets/malum/blockstates/weeping_well_corner.json -62e007ecef751f8b9b42eaa138f06d18cc008d05 assets/malum/blockstates/weeping_well_side.json -902a033ca070a4b64430c4e9c6c935d89cc927be assets/malum/lang/en_us.json -c2637401df2afc394d62b5c6bde312c604cdb21f assets/malum/models/block/blazing_quartz_ore.json -782e64739e04f0b87aa0aeafb55893cc348df504 assets/malum/models/block/blighted_earth.json -c0b5a7b1d337a7090eaf86d07fd8b47d35fbc1e1 assets/malum/models/block/blighted_soil.json -d9a4a0bb07c6da1c1118d8d1315ecf92de3d313b assets/malum/models/block/blighted_soil_1.json -d2cdc723df89f0c9fcc45273d2d372297556ec5d assets/malum/models/block/blighted_soulwood.json -1a13f27c534920b2ebbee38c0c2b97ffa34e20e1 assets/malum/models/block/blighted_tumor_0.json -c1365ce853373e43b45c942bc550b05a1c4e4e1d assets/malum/models/block/blighted_tumor_1.json -aab051ca132f199ba2640e7895fdba5f190c6a9c assets/malum/models/block/blighted_tumor_2.json -f452be6673e9d258cc44e8d8ede4b417421233c7 assets/malum/models/block/blighted_tumor_3.json -905050abc955180f941bc112e93b64b2c9e02f5f assets/malum/models/block/blighted_weed.json -ce57a2aab6388821cdbdd04790a85df60e76bdeb assets/malum/models/block/block_of_alchemical_calx.json -2c4e15d0101cc615297cc50b33a02ab3446852ad assets/malum/models/block/block_of_arcane_charcoal.json -8e0805abae92c0e4b58c6628a9efb1b5e3d754e7 assets/malum/models/block/block_of_astral_weave.json -61d7f55832e24c9670354dde8356f4e26d6e36f4 assets/malum/models/block/block_of_blazing_quartz.json -b37e181f4b9617d137dfc0e4fae4e08c4003ca65 assets/malum/models/block/block_of_brilliance.json -ea871a021da6bfeee5c04f9c39a0ddda8f0737b9 assets/malum/models/block/block_of_cthonic_gold.json -74aca487ebc731f989d08e41e0419b9554583385 assets/malum/models/block/block_of_cursed_grit.json -6c3e33a4b852c580bb26aafa6ee6677484d34251 assets/malum/models/block/block_of_grim_talc.json -debd9aee317dd4061d117933a2eea7d6ff47f968 assets/malum/models/block/block_of_hallowed_gold.json -dab92369f8142c419ab44201c3957ee3a4286e23 assets/malum/models/block/block_of_hex_ash.json -caa2ab21b19deca687b30407e241d71ca8d1700a assets/malum/models/block/block_of_raw_soulstone.json -8d5c5747a7275e75a4e7ac1cc1b4c1268c1637d1 assets/malum/models/block/block_of_rotting_essence.json -116281688f68619de04e79203aaa6e99eb6a7fcb assets/malum/models/block/block_of_soul_stained_steel.json -bb0aef7c33aacb19b7b17aaa1e3d07ea0b301aae assets/malum/models/block/block_of_soulstone.json -dbad5bfaf767e171723931c180aa7c152dd3d0a7 assets/malum/models/block/block_of_void_salts.json -0ab85e17091693b212422aadadd18528a10ae4e6 assets/malum/models/block/brilliant_deepslate.json -3a6b66a326a7351d630b2a5e592f3a8784f7bfca assets/malum/models/block/brilliant_stone.json -aa24498b02cbbff18b6ff8ffe869b3396a2d3cdb assets/malum/models/block/chiseled_tainted_rock.json -8def5c470336892049347083bf84c5838596e2ab assets/malum/models/block/chiseled_twisted_rock.json -16410b8dd5470aed3b1f1cc5910bf9baebfc5213 assets/malum/models/block/cut_runewood_planks.json -6523aa9d046e9d4b5d1cd3741cc33a6f37ce4ddd assets/malum/models/block/cut_soulwood_planks.json -26b033c0ae746015e5f1ac310c70e6c00192606e assets/malum/models/block/cut_tainted_rock.json -e2b3fb8fb9af421b784c8be56587aeb287271760 assets/malum/models/block/cut_twisted_rock.json -17efbe0504435b67147a88a15a002fa318acf47d assets/malum/models/block/deepslate_quartz_ore.json -95c63bd23a3d070e8b43a999f1caa4818dfeefee assets/malum/models/block/deepslate_soulstone_ore.json -2d5510fbe116efbb0485a013bbb573ef858200fc assets/malum/models/block/ether.json -2b752c30cb97185aa8032ea9db47d89fbc030af2 assets/malum/models/block/exposed_runewood_log.json -752884da4e7ca3cb37e08af2f28c8f4d90126042 assets/malum/models/block/exposed_runewood_log_horizontal.json -bb608f7b19c9b0fb9f777d73ee582d20e6a0c71e assets/malum/models/block/exposed_soulwood_log.json -b08c0e2b7ef242d82d69494f97e2f34ae4155bc7 assets/malum/models/block/exposed_soulwood_log_horizontal.json -2d5510fbe116efbb0485a013bbb573ef858200fc assets/malum/models/block/iridescent_ether.json -65bb7228b6c11bd15e99af460623034c1fcb58dd assets/malum/models/block/mass_of_blighted_gunk.json -2440daf7c0fa67175476b5c3a01a080e482234fa assets/malum/models/block/mote_of_aerial_arcana.json -2440daf7c0fa67175476b5c3a01a080e482234fa assets/malum/models/block/mote_of_aqueous_arcana.json -2440daf7c0fa67175476b5c3a01a080e482234fa assets/malum/models/block/mote_of_earthen_arcana.json -2440daf7c0fa67175476b5c3a01a080e482234fa assets/malum/models/block/mote_of_eldritch_arcana.json -2440daf7c0fa67175476b5c3a01a080e482234fa assets/malum/models/block/mote_of_infernal_arcana.json -2440daf7c0fa67175476b5c3a01a080e482234fa assets/malum/models/block/mote_of_raw_arcana.json -2440daf7c0fa67175476b5c3a01a080e482234fa assets/malum/models/block/mote_of_sacred_arcana.json -2440daf7c0fa67175476b5c3a01a080e482234fa assets/malum/models/block/mote_of_wicked_arcana.json -2ceb271284ea65d566e10e128060cfa5e3989d1b assets/malum/models/block/natural_quartz_cluster.json -857fe2105ccc9e47528362d23485fdc2b5a29684 assets/malum/models/block/natural_quartz_ore.json -45d1aef0e68c0eedfbc34f6daa1457dd6cddcb1a assets/malum/models/block/polished_tainted_rock.json -ace91e7dbdae4809dd9eb57dcafed4ca5b97db50 assets/malum/models/block/polished_tainted_rock_slab.json -c50900af8a8e8fd56bc2562207a04de84d4c7350 assets/malum/models/block/polished_tainted_rock_slab_top.json -7a07fa0357832f1d8e0938793deef2be949da30e assets/malum/models/block/polished_tainted_rock_stairs.json -da70de1f7aac29d9456c11592780d6251f590574 assets/malum/models/block/polished_tainted_rock_stairs_inner.json -5a04ca7dd85fd49ae3e06ac284b1ec0701d6a90a assets/malum/models/block/polished_tainted_rock_stairs_outer.json -a494be3093e42a7c6055b27e72fb2d8f648a5360 assets/malum/models/block/polished_twisted_rock.json -4c4e6e8a9e88e3b8fdb5444a42edf6ece698b17b assets/malum/models/block/polished_twisted_rock_slab.json -b30e7e3b0a79d976bb085a5d96fbbd5ec6287191 assets/malum/models/block/polished_twisted_rock_slab_top.json -4cf89c81bab6a2e6343bd5c6ff3c655d3f178eec assets/malum/models/block/polished_twisted_rock_stairs.json -8228f4bcf35fd4830f97d6ee34e6a1c1c9827891 assets/malum/models/block/polished_twisted_rock_stairs_inner.json -e3284a0ec5c149eccf60fff01cd96fc532d2d2fa assets/malum/models/block/polished_twisted_rock_stairs_outer.json -05cfd7ada450f5266a33a585af240ebdaa43f2f3 assets/malum/models/block/primordial_soup.json -f28992bc3fdbb342f460d62bd72497ee0bdfca01 assets/malum/models/block/revealed_runewood_log.json -146b688221c15061b03a32070f9f987ef3cd92b2 assets/malum/models/block/revealed_runewood_log_horizontal.json -5053f8ae35d74e55cad4240e8a681a4a51c2c84f assets/malum/models/block/revealed_soulwood_log.json -7989a60a5219b96294028989ba18f47ebcf40b60 assets/malum/models/block/revealed_soulwood_log_horizontal.json -0368037a731423e0469a0d64fdb1629181f37765 assets/malum/models/block/runewood.json -cdd7d0887d56a7ea6d37e3a00ad53d96abfbe3de assets/malum/models/block/runewood_beam.json -ed4fc3c56e5673b29354de1af47febb3e491c988 assets/malum/models/block/runewood_beam_horizontal.json -b286a351ab0f38d668ddf4b458bc51eb3f505d28 assets/malum/models/block/runewood_door_bottom.json -40a62caa7f27cd6252ff43e66050d25fe9bb9d4e assets/malum/models/block/runewood_door_bottom_hinge.json -46175a77fec6fe14b6f27102629b67b5e394c83a assets/malum/models/block/runewood_door_top.json -d534fbef16b27f8ca74349deafd29eb21cc37ec1 assets/malum/models/block/runewood_door_top_hinge.json -f0b8ece97585a16ffbdee8505f722da86762833c assets/malum/models/block/runewood_horizontal.json -919c75dcecf8a2c556b6cdd31243b3b4a5b9b9ec assets/malum/models/block/runewood_item_pedestal.json -6b0b2b78a630b5eb95b63c79e0db45a05d8ab028 assets/malum/models/block/runewood_item_stand.json -15015dcc3927bcffeb6a18744bd5f1c2fd113933 assets/malum/models/block/runewood_leaves.json -5b06d4cc5e900bcc487718af020a303da58730fb assets/malum/models/block/runewood_log.json -5e1da2213b0a2fdecfc90d11655c658f4b98a97a assets/malum/models/block/runewood_log_horizontal.json -2d25ddf72a8d248327e0f1cf1b2b21ef4ddda465 assets/malum/models/block/runewood_panel.json -b6ae4c477a25e7020779cedae82ff54ebae25bae assets/malum/models/block/runewood_panel_slab.json -5fcfca1efd2cd30908a2ca4cee617fa04e5b7771 assets/malum/models/block/runewood_panel_slab_top.json -db42c8a9588420294c55ec515ef6e0544e506080 assets/malum/models/block/runewood_panel_stairs.json -f567647de4d32c11fdb870ac3d8c5259dee0c8bf assets/malum/models/block/runewood_panel_stairs_inner.json -83a39905e0b4bdd1b1c0411d53540e2bb120e0fe assets/malum/models/block/runewood_panel_stairs_outer.json -ce3df79488e66f599dc3b54a72d71c5680e86b53 assets/malum/models/block/runewood_planks.json -c9d288f72e48c3d108d08a69a1ef025e863d366b assets/malum/models/block/runewood_planks_button.json -b60bd6957d6b9c07b856f833b106d11fae1bdb30 assets/malum/models/block/runewood_planks_button_inventory.json -bc5a189da4e19c17174f36db2cac79e67e3c03e3 assets/malum/models/block/runewood_planks_button_pressed.json -a5e6547f81c02abc6cb1213bcd0332787500408e assets/malum/models/block/runewood_planks_fence_gate.json -10ee726f9adb940ae1598d40ad6b5a8221199c44 assets/malum/models/block/runewood_planks_fence_gate_open.json -ac73f725b909cb75b44da43f687f638aa9a85505 assets/malum/models/block/runewood_planks_fence_gate_wall.json -0f3965f0c540ef14f3551edbd9e43b2b743c57f3 assets/malum/models/block/runewood_planks_fence_gate_wall_open.json -244a54612de9f483abcb811220c8112a359b9ede assets/malum/models/block/runewood_planks_fence_post.json -e8d61359394c9083fd4a1efd5a9e1cb675a95645 assets/malum/models/block/runewood_planks_fence_side.json -76fb681732e835398774bd5f8a0059141ae3a26c assets/malum/models/block/runewood_planks_pressure_plate.json -d34fc2c6946cdab2c6c6d205f8a0dc3af0b7fa39 assets/malum/models/block/runewood_planks_pressure_plate_down.json -6206cf46a66c601794513809353f590ec8ba3d92 assets/malum/models/block/runewood_planks_slab.json -0423c4dae5a012c48dd39d1f01bdc6e32ebb3697 assets/malum/models/block/runewood_planks_slab_top.json -31ac9e6642fab8d86fc114366802ffc922c98cbf assets/malum/models/block/runewood_planks_stairs.json -0f75024db8b3717430d21e5a7d06eb4acff07614 assets/malum/models/block/runewood_planks_stairs_inner.json -d1dfca0fb3a137ec9e545b702d044b4718890473 assets/malum/models/block/runewood_planks_stairs_outer.json -352e07848b8d1d0f4125d7eec656fc683925f9e3 assets/malum/models/block/runewood_sapling.json -88fb4073dfb4d4aea1a552e5030cbaa8c438c99f assets/malum/models/block/runewood_sign.json -44de4b56631c85ff6f1b2dd3b7840231e2b1279f assets/malum/models/block/runewood_tiles.json -5fdc1d417ef995288e878916588e1cdc9da3e94a assets/malum/models/block/runewood_tiles_slab.json -2321da9143e3cb4d60b317ddc11d403345a0c180 assets/malum/models/block/runewood_tiles_slab_top.json -4f0da95980b35a3ebd713bf2c72d2e48a0758310 assets/malum/models/block/runewood_tiles_stairs.json -55f64acdf10e2f910f1145c9c44c7250481c0621 assets/malum/models/block/runewood_tiles_stairs_inner.json -77d5ec011276d05fa460961b4d58923c3641d8b8 assets/malum/models/block/runewood_tiles_stairs_outer.json -fd38b919b80ebf6da3cf81803f32047ed00ee1b5 assets/malum/models/block/runewood_totem_base.json -739fa46643935b82fbf0c5f54b9044397526628e assets/malum/models/block/runewood_totem_pole_aerial.json -dbbc7308330764afb4fdf7bd72c551a3dd0a31b9 assets/malum/models/block/runewood_totem_pole_aqueous.json -6f6819f63ebc86c90db5d09ef7dfeaee159cabb4 assets/malum/models/block/runewood_totem_pole_arcane.json -4ffca7700d3dd0909c75525175d36d170e436cb9 assets/malum/models/block/runewood_totem_pole_earthen.json -e1e8e99c574df7bffd4055da3b37f5a5f91eb2de assets/malum/models/block/runewood_totem_pole_eldritch.json -fc465332f99988b1c0f8d7ae3e16bd00f1878793 assets/malum/models/block/runewood_totem_pole_infernal.json -f79f8c88715b0896b96ff8efa8407f6e0b2de83a assets/malum/models/block/runewood_totem_pole_sacred.json -d8b3c380985707320ca4043d9c3bd36cc0cf1dec assets/malum/models/block/runewood_totem_pole_wicked.json -33071423683100f8ffbe021e453305bb0c7a2276 assets/malum/models/block/runewood_trapdoor_bottom.json -0211a0c41d8ddf04d83e87b270a7b5314333ef6b assets/malum/models/block/runewood_trapdoor_open.json -3952c5acccde496260a8ceef145ff36a3e284ddb assets/malum/models/block/runewood_trapdoor_top.json -88fb4073dfb4d4aea1a552e5030cbaa8c438c99f assets/malum/models/block/runewood_wall_sign.json -ec9971937a17946b0217465ce03ab4c32f426f57 assets/malum/models/block/runic_small_tainted_rock_bricks.json -0d64434dc94ffcde3ac6e279d1ba97e8f87dabcd assets/malum/models/block/runic_small_tainted_rock_bricks_slab.json -380808eb49daefa092abeed16b5fe8b0c1bc8362 assets/malum/models/block/runic_small_tainted_rock_bricks_slab_top.json -9a37727b51b43278cea8605a3cf1b177bda46a09 assets/malum/models/block/runic_small_tainted_rock_bricks_stairs.json -b92f34d07c9001ef3fa989dbe36fc9a9591bc6ca assets/malum/models/block/runic_small_tainted_rock_bricks_stairs_inner.json -31134d745a7a00ea917e2fb00e6762265ba4cd28 assets/malum/models/block/runic_small_tainted_rock_bricks_stairs_outer.json -b8c82999f0413f6273d0154cbab4cd191c22a2e9 assets/malum/models/block/runic_small_tainted_rock_bricks_wall_post.json -f2710164565e125a147d69b2f66d7b4861e119a1 assets/malum/models/block/runic_small_tainted_rock_bricks_wall_side.json -caa0b523a21b095afcafdc2ca712e008c10076af assets/malum/models/block/runic_small_tainted_rock_bricks_wall_side_tall.json -fdde12222b53863e7e8f66f21debfbe427b1d409 assets/malum/models/block/runic_small_twisted_rock_bricks.json -2fdcad409a05962f10890c9744e1b91ee41d0dfb assets/malum/models/block/runic_small_twisted_rock_bricks_slab.json -6ceebfbee2b285db19d0150e4fcd79a648308006 assets/malum/models/block/runic_small_twisted_rock_bricks_slab_top.json -91e12230017e5bf4d1b92179a6016aebff902230 assets/malum/models/block/runic_small_twisted_rock_bricks_stairs.json -cafe61062e4a2a144e8e0dbce1339729be000517 assets/malum/models/block/runic_small_twisted_rock_bricks_stairs_inner.json -2af476650618da46c2143387290b3ad8aa81fdb0 assets/malum/models/block/runic_small_twisted_rock_bricks_stairs_outer.json -f2bd6ad8f5bc13eada9153e8a11f9137f0a1a8be assets/malum/models/block/runic_small_twisted_rock_bricks_wall_post.json -0f576f7f87f4c2e2f0c6bd373258ed6226be8142 assets/malum/models/block/runic_small_twisted_rock_bricks_wall_side.json -93b10efee1adfc8c3fdbc0cb39c94726d77372bb assets/malum/models/block/runic_small_twisted_rock_bricks_wall_side_tall.json -3afaeb9c8ad0517c713c88d88a306ad8223f7805 assets/malum/models/block/runic_tainted_rock_bricks.json -3c03e5d53143ea1737673f92fa564bc4f3394222 assets/malum/models/block/runic_tainted_rock_bricks_slab.json -2af5a39b8ca647ad01fde2d1fde2b71136950cd6 assets/malum/models/block/runic_tainted_rock_bricks_slab_top.json -236d5d377560c29d4e51bfed471f8cc156e21d03 assets/malum/models/block/runic_tainted_rock_bricks_stairs.json -b138b7b94d2de581e90677eacc08dd02136b767f assets/malum/models/block/runic_tainted_rock_bricks_stairs_inner.json -45b2a04bb41ddd1f96d8fdec3e867a41d9178257 assets/malum/models/block/runic_tainted_rock_bricks_stairs_outer.json -4b9f25b4437a5060ae1da70de1fd465b92cf699e assets/malum/models/block/runic_tainted_rock_bricks_wall_post.json -d410e88accc4fb0c9992e5936f92b341193f0075 assets/malum/models/block/runic_tainted_rock_bricks_wall_side.json -e696af5fc052c5f6c9021e59725258da6a2ca22b assets/malum/models/block/runic_tainted_rock_bricks_wall_side_tall.json -d070cc325ed56324a094e8da78b3eb228faedc6b assets/malum/models/block/runic_tainted_rock_tiles.json -e39a020f62f38dfaed03eaeab2e639cf699945d2 assets/malum/models/block/runic_tainted_rock_tiles_slab.json -64bc2be9e9652351d034e459d163e3c4d314d9a6 assets/malum/models/block/runic_tainted_rock_tiles_slab_top.json -68e5b9d45a93e6ac288cb561d41e2988c8c34574 assets/malum/models/block/runic_tainted_rock_tiles_stairs.json -baae8b7907e978135c00f026e9c3bdb5e0182408 assets/malum/models/block/runic_tainted_rock_tiles_stairs_inner.json -a914b094b256b1895da6f830bd6eae98d3008bfe assets/malum/models/block/runic_tainted_rock_tiles_stairs_outer.json -01f6d35e589a53164165dc6b95c1bba89f480080 assets/malum/models/block/runic_tainted_rock_tiles_wall_post.json -b3354d0364c44f99a0ede0b67cb8217d60388238 assets/malum/models/block/runic_tainted_rock_tiles_wall_side.json -a32742b12bfb9013953e8bf5b8702bb9089526b1 assets/malum/models/block/runic_tainted_rock_tiles_wall_side_tall.json -1e0b24fe876fae277b839c41536f378ef2b06308 assets/malum/models/block/runic_twisted_rock_bricks.json -68daa0b4cd81515412df3730bf7698b2919660bc assets/malum/models/block/runic_twisted_rock_bricks_slab.json -57021c32fdc26dfd25f262fc7c9c6e6a90a63d98 assets/malum/models/block/runic_twisted_rock_bricks_slab_top.json -2b1d5d08252e30ce630ae668cffaef3722b4fe5d assets/malum/models/block/runic_twisted_rock_bricks_stairs.json -35b3df8ea9145bfdbe18ddd5939c28f80391bfa7 assets/malum/models/block/runic_twisted_rock_bricks_stairs_inner.json -562f080a1cb2bfcd86920aacd0a27f9517e7bba9 assets/malum/models/block/runic_twisted_rock_bricks_stairs_outer.json -99bfa394375bd6451ac19d92b9a4ade24bd754ac assets/malum/models/block/runic_twisted_rock_bricks_wall_post.json -351363a6d64580bb8a4ec7612f68b3f6b4c820e3 assets/malum/models/block/runic_twisted_rock_bricks_wall_side.json -597313beaf71e975a60372ea3cd2edad95b744f0 assets/malum/models/block/runic_twisted_rock_bricks_wall_side_tall.json -05f57c16515f244218d8cc4bb20d210797c5e1c0 assets/malum/models/block/runic_twisted_rock_tiles.json -da8a1e5ca1aff0a8d23284916ebb051b5482c9d1 assets/malum/models/block/runic_twisted_rock_tiles_slab.json -b1e532caf5813897ed2952e11c193242cd08e335 assets/malum/models/block/runic_twisted_rock_tiles_slab_top.json -7dde0376401a1f32f486021873ad90ea6c31f0ee assets/malum/models/block/runic_twisted_rock_tiles_stairs.json -2b2d429f5f07aabe3d1a9184b3a482f4251716a6 assets/malum/models/block/runic_twisted_rock_tiles_stairs_inner.json -dbf9abd1354ca3a5dded95496a8ac58b6c4361b6 assets/malum/models/block/runic_twisted_rock_tiles_stairs_outer.json -bcbc05c5605b53d54bc3ebc694c958bc994403c8 assets/malum/models/block/runic_twisted_rock_tiles_wall_post.json -e7c6b9aead1bbcb7c47692341e956f8a96229f2a assets/malum/models/block/runic_twisted_rock_tiles_wall_side.json -de296e618bc3535abe81c634eb234bb4da8aa540 assets/malum/models/block/runic_twisted_rock_tiles_wall_side_tall.json -86863d74e74f93a95469be7d094bd9fae88b8fcf assets/malum/models/block/small_tainted_rock_bricks.json -7dddff78e3879f779ca58bd545fcf207f59ab98f assets/malum/models/block/small_tainted_rock_bricks_slab.json -83e2603f965e04afec46ca10d05c380c1dbfcfe5 assets/malum/models/block/small_tainted_rock_bricks_slab_top.json -dddf92580e5ea22a8e3a4b0fb2310cedc5af0ace assets/malum/models/block/small_tainted_rock_bricks_stairs.json -86400ec10877740af76f4704d90ba38faf682f1b assets/malum/models/block/small_tainted_rock_bricks_stairs_inner.json -bf362a7e9b668be82e3281ca5ed824f34214c496 assets/malum/models/block/small_tainted_rock_bricks_stairs_outer.json -7aa630111afe4172e6a8364243b2c833cdd4b9fa assets/malum/models/block/small_tainted_rock_bricks_wall_post.json -b19b424e7374368e2fb42386aa6855110b12e6b2 assets/malum/models/block/small_tainted_rock_bricks_wall_side.json -cdd4f4e7f109778c0eae983529d1664752dcfb62 assets/malum/models/block/small_tainted_rock_bricks_wall_side_tall.json -c90a1e487bdf574d80dd00255c8b0a612b2085ce assets/malum/models/block/small_twisted_rock_bricks.json -ca5b4ec5de85b81eef79fc1dfa7cc0d4c96220a1 assets/malum/models/block/small_twisted_rock_bricks_slab.json -6f976b1591bd662b8d71840a99dd82228f1ade0c assets/malum/models/block/small_twisted_rock_bricks_slab_top.json -ff2ddbe27f18384ed6ed09ce3b937802b6da29f1 assets/malum/models/block/small_twisted_rock_bricks_stairs.json -14d28225216bf890548aaf30b2e78167a98aded3 assets/malum/models/block/small_twisted_rock_bricks_stairs_inner.json -f60c08959d3bbb724cdcbf14c607702285aa6d6f assets/malum/models/block/small_twisted_rock_bricks_stairs_outer.json -e27fc546fe895e3e8e4d886f49575de1a1609759 assets/malum/models/block/small_twisted_rock_bricks_wall_post.json -b9167693ec0aabbaea32b6416c8d45107fcae12c assets/malum/models/block/small_twisted_rock_bricks_wall_side.json -13704d1315b1f9ccd418edb2e48bcb6a74341e1b assets/malum/models/block/small_twisted_rock_bricks_wall_side_tall.json -b8265a7119aca765520037e0ee78cddebaa45b5c assets/malum/models/block/smooth_tainted_rock.json -13128a032a319a56ce78fcda553777e62feb6098 assets/malum/models/block/smooth_tainted_rock_slab.json -dbf63937a201effbac5ba391d24eeb38c4986bcc assets/malum/models/block/smooth_tainted_rock_slab_top.json -dd1a6fe3de7a7128369c03b600826c00c9cb54f2 assets/malum/models/block/smooth_tainted_rock_stairs.json -ed8400422a76f0c6c9cd1829ffc916bc7b3ce905 assets/malum/models/block/smooth_tainted_rock_stairs_inner.json -1b55d04b4a96818ebd3c6232fda52efdcd03b8f1 assets/malum/models/block/smooth_tainted_rock_stairs_outer.json -ebc2253010b7017ea5e1e7db2d0a49fab7899838 assets/malum/models/block/smooth_twisted_rock.json -540bca40986558b6afecd36a5039c4344cc00836 assets/malum/models/block/smooth_twisted_rock_slab.json -cd465a82d7a650c0347c94506272f14838aad7df assets/malum/models/block/smooth_twisted_rock_slab_top.json -f17e7c30da006bef3c3af0fb7109299aa161755b assets/malum/models/block/smooth_twisted_rock_stairs.json -e6199f30bcebeb6424c43551ece4ac870504e81d assets/malum/models/block/smooth_twisted_rock_stairs_inner.json -cb497c38b12453b6ab2ec13084adbaaeaf8d0236 assets/malum/models/block/smooth_twisted_rock_stairs_outer.json -a1ed92b442d3ae3eecd31147cd46697fa68baa14 assets/malum/models/block/solid_runewood_trapdoor_bottom.json -44d077a528823904ca87671ad23d0709e864adeb assets/malum/models/block/solid_runewood_trapdoor_open.json -79534e1b52a3b7f696a74998dcba58f0909a7d3d assets/malum/models/block/solid_runewood_trapdoor_top.json -79da69481a67a23a84b3f4e276563a17178be0cd assets/malum/models/block/solid_soulwood_trapdoor_bottom.json -43ff27e7045190325d94e223054759261cd31f29 assets/malum/models/block/solid_soulwood_trapdoor_open.json -894736048770d87bd0d0984d1547ba5c1824ec0a assets/malum/models/block/solid_soulwood_trapdoor_top.json -52161bf9617c624f89050e773cf2e32e9ddde90f assets/malum/models/block/soulstone_ore.json -310c37e42fa4c88cc73c427d9d47eef117ae8805 assets/malum/models/block/soulwood.json -e65a875b104f29b6a638fcb4c6f5f5e26a6a61e0 assets/malum/models/block/soulwood_beam.json -d755e873ccb18748ef70957edadff3b441615cf3 assets/malum/models/block/soulwood_beam_horizontal.json -2f57a6efbc040ba8494eb96978e2c683dde0e9a7 assets/malum/models/block/soulwood_door_bottom.json -803d13820a6194a6cbc4a03563fa8c68e62d376d assets/malum/models/block/soulwood_door_bottom_hinge.json -382d65fc02aeb7a20ef9c6aa7ccc232ad5063c19 assets/malum/models/block/soulwood_door_top.json -fadf9372529a94ccf3ed43f3789999ec94fc2675 assets/malum/models/block/soulwood_door_top_hinge.json -ede663ae5079f97c74a49e7ef07bfdc8483e4b91 assets/malum/models/block/soulwood_growth.json -d5cd1a404af90220d29131a0b108e48618f45482 assets/malum/models/block/soulwood_horizontal.json -893fbafb2c60c31312d6d6b07e1fa9e6e2dd6983 assets/malum/models/block/soulwood_item_pedestal.json -f5dffe4c71bea797c2f918afc829890a5b957c4f assets/malum/models/block/soulwood_item_stand.json -55a39020130ff69caaf29af446c23d996803e931 assets/malum/models/block/soulwood_leaves.json -489f0977c8abd77c6c0721be9575f2c43920d452 assets/malum/models/block/soulwood_log.json -e9fe143c9528226eafd1ec927658bd2f2d0ca4bd assets/malum/models/block/soulwood_log_horizontal.json -ca874f0d290d6ad454ef761854306155de9d6e83 assets/malum/models/block/soulwood_panel.json -db7f3154924a22b73b180c2de0e746dd89b5f64e assets/malum/models/block/soulwood_panel_slab.json -917e0a4b7be63d6bb519f68132ce53d1fa97ac8e assets/malum/models/block/soulwood_panel_slab_top.json -b47147469c989c18ead94479cdcddc9a8774b135 assets/malum/models/block/soulwood_panel_stairs.json -4ad9aaef4454523ef535cb4c669563b29574624f assets/malum/models/block/soulwood_panel_stairs_inner.json -036f31ffca2f67a318a6abab25d01fbb2e095720 assets/malum/models/block/soulwood_panel_stairs_outer.json -67e477af29ee85fb436818442bbdf42a4d068571 assets/malum/models/block/soulwood_planks.json -c5b617c65f632a5621f16f5456d3bc47a48f5ad5 assets/malum/models/block/soulwood_planks_button.json -67e7da157b1e838796010854cd687164aabc1d31 assets/malum/models/block/soulwood_planks_button_inventory.json -90a94f980e8addb01c45cbb40e711c666bf9f188 assets/malum/models/block/soulwood_planks_button_pressed.json -dab9ec6c8349b1607e13e95271c045cedf93e132 assets/malum/models/block/soulwood_planks_fence_gate.json -f18cd2f91c8f3ae74ed01189d86d9bd14910ec3d assets/malum/models/block/soulwood_planks_fence_gate_open.json -a1684d344b85cca7423d1468b316635c28ea94ab assets/malum/models/block/soulwood_planks_fence_gate_wall.json -3db33dcdcaa71b7fd3faacb97531cc75963e7101 assets/malum/models/block/soulwood_planks_fence_gate_wall_open.json -64d65b7b9549f7fc619da3124760c6e83a398eb3 assets/malum/models/block/soulwood_planks_fence_post.json -5bb9123069a08e3d04f42b8f09c2e9ec020c2a2a assets/malum/models/block/soulwood_planks_fence_side.json -27aea3cadb6479f77d6a52618e5aaeb145accff5 assets/malum/models/block/soulwood_planks_pressure_plate.json -80a5eeaf053fbadcdfe95faa94ffcb233047c11e assets/malum/models/block/soulwood_planks_pressure_plate_down.json -d3c2493935e0eb52f63e1d853cf3c343912a4bf0 assets/malum/models/block/soulwood_planks_slab.json -3b18b88892339b8f00d33ba5627f5bd5e18efbc8 assets/malum/models/block/soulwood_planks_slab_top.json -b5ee1d7b6cd52609cc3ea2f074b983fd474e191b assets/malum/models/block/soulwood_planks_stairs.json -0664a1c84843b8388d09aa57d38798dc8a8e8216 assets/malum/models/block/soulwood_planks_stairs_inner.json -027d3320725539fbd4c42292c2694f40ed4c6737 assets/malum/models/block/soulwood_planks_stairs_outer.json -74748fd6058b216afcf0d08f18cc50cfd239a028 assets/malum/models/block/soulwood_sign.json -45458397caab9012718486e8c6ce9e6b4a4e1133 assets/malum/models/block/soulwood_tiles.json -53dc9c9c23791709421be6c67eb43743560f3391 assets/malum/models/block/soulwood_tiles_slab.json -a9e60a0c0bcc82ded0ab54b0a633b4eef14dc214 assets/malum/models/block/soulwood_tiles_slab_top.json -a13abcf8289a248cc8afb637d91db81e31df1fd6 assets/malum/models/block/soulwood_tiles_stairs.json -51a3f7160467ff95fea5048af8289302f2ccabb4 assets/malum/models/block/soulwood_tiles_stairs_inner.json -4808497029d3ae2b3ca2b0aa31558ea5102b794a assets/malum/models/block/soulwood_tiles_stairs_outer.json -5c0f37f1213e81ff9a1fecf7d187dfdc35d2d21d assets/malum/models/block/soulwood_totem_base.json -2cc38e11681f965fbbd76f6fa498733b7ea746f6 assets/malum/models/block/soulwood_totem_pole_aerial.json -a16236775a3a6d4621d528c733ed55f0337d6b3a assets/malum/models/block/soulwood_totem_pole_aqueous.json -d26f4faf1bf50a1f117712d507891989aafb180b assets/malum/models/block/soulwood_totem_pole_arcane.json -c7a190d89261ceabb0867db5593af03198a627e7 assets/malum/models/block/soulwood_totem_pole_earthen.json -f94c4656b08c8670dd4b125a4e7c587b56a33fcc assets/malum/models/block/soulwood_totem_pole_eldritch.json -6adcdc4d47bb7e0bc0623177412510ca3e597769 assets/malum/models/block/soulwood_totem_pole_infernal.json -34eb41fab89f698c7ba05d3432bda30014bf0aff assets/malum/models/block/soulwood_totem_pole_sacred.json -c03c98defc399e3e302040a08372907b5098aab6 assets/malum/models/block/soulwood_totem_pole_wicked.json -bc463a6535af5e8e274b87466662f495394fc205 assets/malum/models/block/soulwood_trapdoor_bottom.json -40c0151362e447ed0b438f1512afb0c0ba829187 assets/malum/models/block/soulwood_trapdoor_open.json -fe3fd70f07624ad08f3414fb75e53286a7b16cfd assets/malum/models/block/soulwood_trapdoor_top.json -74748fd6058b216afcf0d08f18cc50cfd239a028 assets/malum/models/block/soulwood_wall_sign.json -1d3c7092d66281ae01828ba5a845ddc71551bcd7 assets/malum/models/block/stripped_runewood.json -61b16643fb1ffe4382ecfa60734ce8d49f760384 assets/malum/models/block/stripped_runewood_horizontal.json -c373b7ef146618ac6ff017cb4a7ec608babc5fc9 assets/malum/models/block/stripped_runewood_log.json -d885029508f81bcc81c2b3b11d75db4c389c3cd5 assets/malum/models/block/stripped_runewood_log_horizontal.json -1bd9e9994277db85c4357761ca0d8b7b15a0a199 assets/malum/models/block/stripped_soulwood.json -d0656dfb50b79a6b5f391e664bff1f17b6262fbe assets/malum/models/block/stripped_soulwood_horizontal.json -85e27b4f37a9d52795ee4fc127d208005df4a1a8 assets/malum/models/block/stripped_soulwood_log.json -47ff624821502d7e80a920dbe5915a7a1e04aafe assets/malum/models/block/stripped_soulwood_log_horizontal.json -7f82f3b192caa576bb9f46831532be9676d2f659 assets/malum/models/block/tainted_ether_brazier.json -1bab6611104ae6c5a9765d3069041398ede6f08d assets/malum/models/block/tainted_ether_brazier_hanging.json -7f82f3b192caa576bb9f46831532be9676d2f659 assets/malum/models/block/tainted_iridescent_ether_brazier.json -1bab6611104ae6c5a9765d3069041398ede6f08d assets/malum/models/block/tainted_iridescent_ether_brazier_hanging.json -8fc3f895d883a3414737c3b8225ea8770bbe7e2e assets/malum/models/block/tainted_rock.json -1f47143c70fbb6ac3aa5dfeac2043876882a5415 assets/malum/models/block/tainted_rock_bricks.json -ff674b7c8c1d55ceaf7ba8fb3aef5d7840ca3652 assets/malum/models/block/tainted_rock_bricks_slab.json -e6a5dc989afa7f3f6b24c47f6f6727e7950ae0ce assets/malum/models/block/tainted_rock_bricks_slab_top.json -7caba0365827bd7ddfd40d15d20aa3dac00d7691 assets/malum/models/block/tainted_rock_bricks_stairs.json -ba5bd9a5087e14b82365df4256e6ce01c30660df assets/malum/models/block/tainted_rock_bricks_stairs_inner.json -0e268dbb10e3a3e15f46047ce2ec6359cc838484 assets/malum/models/block/tainted_rock_bricks_stairs_outer.json -36a4c741a4ab5f50d816c2f5e605acd45f612054 assets/malum/models/block/tainted_rock_bricks_wall_post.json -bd9a64671218c1604170faf3e65f61c211ae16c5 assets/malum/models/block/tainted_rock_bricks_wall_side.json -ff01fd903c0fd750bb6ae6528a145c95646944be assets/malum/models/block/tainted_rock_bricks_wall_side_tall.json -f04caca1698bd92054ce1462879835b6854e6a3f assets/malum/models/block/tainted_rock_button.json -ba252fb05e6ce8766a82924aceac45ecac4b096b assets/malum/models/block/tainted_rock_button_inventory.json -c2a7bc6a601f2a88e1d08b79efb1130c31be4a59 assets/malum/models/block/tainted_rock_button_pressed.json -446f230a48eec2c526f36e49b824fe7dad1146ef assets/malum/models/block/tainted_rock_column.json -f6a1afd381de4698210f0b7721716161de127454 assets/malum/models/block/tainted_rock_column_cap.json -aa5fc67fe11fe5bf5a272adf97b168cd72e47b03 assets/malum/models/block/tainted_rock_column_horizontal.json -2630b60e27ecba8ae9c7db89d420ca3f7c929ce3 assets/malum/models/block/tainted_rock_item_pedestal.json -f996de9afcca62f1770376dd8db22b4b4e089f15 assets/malum/models/block/tainted_rock_item_stand.json -020580046f161b4e4c52c4f59608dadd17e4940a assets/malum/models/block/tainted_rock_pressure_plate.json -31d530a4a4d118ab1be3565ce8b5fda92ddb0910 assets/malum/models/block/tainted_rock_pressure_plate_down.json -73b39bd8a78fd6c5e70bcf976d0303d272a7eb93 assets/malum/models/block/tainted_rock_slab.json -a3be8ae4b11bf8933002b2ee3237929d1fce32b0 assets/malum/models/block/tainted_rock_slab_top.json -fc6024e0d6fa0af14fc43ae45cf58e457990a5db assets/malum/models/block/tainted_rock_stairs.json -662a7c67deccdc4e80a813db88da955c91025603 assets/malum/models/block/tainted_rock_stairs_inner.json -01cd8d594fe4992b04538464fd7ff72d3eb54c01 assets/malum/models/block/tainted_rock_stairs_outer.json -3e11d7d8bf261d996652fe7093d38730d0f43bca assets/malum/models/block/tainted_rock_tiles.json -fc8c1b051a0bb51f646cf15c58255f1b6cdc1db3 assets/malum/models/block/tainted_rock_tiles_slab.json -80d564ab02835337636fc92656e7066cd927f26c assets/malum/models/block/tainted_rock_tiles_slab_top.json -9584e3895cdbbc46cf6366cb392cf1a4a630361e assets/malum/models/block/tainted_rock_tiles_stairs.json -63208ba97a97edcda4b7490923dd1e297c28cf55 assets/malum/models/block/tainted_rock_tiles_stairs_inner.json -b35cc1bf25f6a28bb423f87b975da1d0a9848d70 assets/malum/models/block/tainted_rock_tiles_stairs_outer.json -fcecbd29d30b81c0aee66255f7205aac4ae4be73 assets/malum/models/block/tainted_rock_tiles_wall_post.json -f79f7c9b6ec0fc9df54333f7cef0cb3d6a5785b2 assets/malum/models/block/tainted_rock_tiles_wall_side.json -2c60f06927deb4ed439737746af8f8fb9013e890 assets/malum/models/block/tainted_rock_tiles_wall_side_tall.json -7720d137e5e458e5e3d17702ee6155efdc026fd5 assets/malum/models/block/tainted_rock_wall_post.json -b2b3d5b573199bb0b347f1023651c0af47ae3505 assets/malum/models/block/tainted_rock_wall_side.json -e529a7decf2b37b93e228c5b1d7df8561bc07771 assets/malum/models/block/tainted_rock_wall_side_tall.json -2fba6ec6c664b64d9abf0a3603d18cb6db51a5d5 assets/malum/models/block/the_device.json -d0c7cca7db85805c4c4f0c470425e43ea2bdf49d assets/malum/models/block/the_vessel.json -ae7b2bb30a934fdb1248e0e4e734a201d636cb87 assets/malum/models/block/twisted_ether_brazier.json -231e1120085f0ecce6a0b0ce99a06f438217883d assets/malum/models/block/twisted_ether_brazier_hanging.json -ae7b2bb30a934fdb1248e0e4e734a201d636cb87 assets/malum/models/block/twisted_iridescent_ether_brazier.json -231e1120085f0ecce6a0b0ce99a06f438217883d assets/malum/models/block/twisted_iridescent_ether_brazier_hanging.json -b0888a1681352f4b774c0b32487b870388314a74 assets/malum/models/block/twisted_rock.json -0483f4fe57c064d9c02102b11913acc3ff505607 assets/malum/models/block/twisted_rock_bricks.json -0d9fa495015d14de5a55267026547d54d21e7e66 assets/malum/models/block/twisted_rock_bricks_slab.json -3c4dfd45bd8f0ef42483c5a49085929e68bd9aaf assets/malum/models/block/twisted_rock_bricks_slab_top.json -76f27c8fdb949fbf705a600f3ccc1f769991ee2e assets/malum/models/block/twisted_rock_bricks_stairs.json -82da8d2ae7994c0b7f6a1a2dcba0fdf6bec6ee94 assets/malum/models/block/twisted_rock_bricks_stairs_inner.json -e04a87c0eec62e11145252ae3bf0629880d6e0e6 assets/malum/models/block/twisted_rock_bricks_stairs_outer.json -e13e868b403f76828517e28a888fa1c3dd7ac90c assets/malum/models/block/twisted_rock_bricks_wall_post.json -5cdfab51a4cdddf424e36cab5428526da4ca1a2d assets/malum/models/block/twisted_rock_bricks_wall_side.json -05e288d94d97bb16eef848343868a4e2055078f1 assets/malum/models/block/twisted_rock_bricks_wall_side_tall.json -5169c47cc06503dc15747ec9fc3c2bd487cccabd assets/malum/models/block/twisted_rock_button.json -81d8b70bbd49b7c3c56d5b9ca442788fbd1e3494 assets/malum/models/block/twisted_rock_button_inventory.json -333a8b87e5c8fd1ed33e1584d3ad62bd57b78d46 assets/malum/models/block/twisted_rock_button_pressed.json -28391c829b15aca50988c96f3113006e53c4caa3 assets/malum/models/block/twisted_rock_column.json -ebc6fd8824a64214baf9d5280c74e6d5d96a3265 assets/malum/models/block/twisted_rock_column_cap.json -e44b4f3f43a679cf21a1d85b8dabfc7bf075ba4b assets/malum/models/block/twisted_rock_column_horizontal.json -4d7aa9e01a22986a4a51ee8f3aba409bc945ac3e assets/malum/models/block/twisted_rock_item_pedestal.json -9f69b59530c1373fafc28585f66e49329f02fa7f assets/malum/models/block/twisted_rock_item_stand.json -36cd87bfe88ea259a17c4ead76fc9fd258d9aba3 assets/malum/models/block/twisted_rock_pressure_plate.json -0a8c9d0b612ac3502be49cd2acffab87f2cee7b5 assets/malum/models/block/twisted_rock_pressure_plate_down.json -151bf2e941552984742159b1f19bef1fe753c053 assets/malum/models/block/twisted_rock_slab.json -8233a9986bce1807451c8570d2f61edaa6e99bd3 assets/malum/models/block/twisted_rock_slab_top.json -ea3b7166b53031c8f40c0d244ee220b4d5199455 assets/malum/models/block/twisted_rock_stairs.json -4d8a54aa513c14a54b8d45cc396f4a979a92956b assets/malum/models/block/twisted_rock_stairs_inner.json -f7204752fe374fe6b711327ccc1e80bfbe0ac672 assets/malum/models/block/twisted_rock_stairs_outer.json -05ac1843df4e8848207cc253db85f6026d0966aa assets/malum/models/block/twisted_rock_tiles.json -f67de2db5433d6eba5081f2665d7a91fde260336 assets/malum/models/block/twisted_rock_tiles_slab.json -794837359072895fc264ebf41be3d8aae876a376 assets/malum/models/block/twisted_rock_tiles_slab_top.json -abd1cbe4fdb7d9d3cc33ff2337b4ea5a72748389 assets/malum/models/block/twisted_rock_tiles_stairs.json -0105cc9c208aaa34ddad5409be6d615201b6c803 assets/malum/models/block/twisted_rock_tiles_stairs_inner.json -538defd48411fd2bf81f7032f9b1a3d26bcd4723 assets/malum/models/block/twisted_rock_tiles_stairs_outer.json -eac99fb766bc2ab147cc0c435b11999426211e3f assets/malum/models/block/twisted_rock_tiles_wall_post.json -43db184758c19e7c4604a4a08a891c3c693010e3 assets/malum/models/block/twisted_rock_tiles_wall_side.json -21486c239460acaa9bc2e2d22f99f8c60988899f assets/malum/models/block/twisted_rock_tiles_wall_side_tall.json -3c72563139dc50dc0d2cbe9516dbda947ed2ea08 assets/malum/models/block/twisted_rock_wall_post.json -275c574dd890ee829ae4a5cc6c2a1ce62f480737 assets/malum/models/block/twisted_rock_wall_side.json -3251e4b269b471eb97fee36dd7b38c84fe85f334 assets/malum/models/block/twisted_rock_wall_side_tall.json -acf9d052fd63c9a42968d2446852fb5c1ff9de69 assets/malum/models/block/vertical_runewood_planks.json -49a6addb37cdc1b37e6c39ad0fe3060deaa5414e assets/malum/models/block/vertical_runewood_planks_slab.json -116d5789e78fa1274990812f23746db33028fa4c assets/malum/models/block/vertical_runewood_planks_slab_top.json -3c225896c6f34be61efc7c3e6bc436b36ac8a652 assets/malum/models/block/vertical_runewood_planks_stairs.json -699f2c51f74f66ec3281c6d9ca6087ce2f334c04 assets/malum/models/block/vertical_runewood_planks_stairs_inner.json -6c7ea11b882003b32368bc194a2fa4fbab6afaa1 assets/malum/models/block/vertical_runewood_planks_stairs_outer.json -94d57ab9bff77b736b35a0dff3c68399fc6dcfcb assets/malum/models/block/vertical_soulwood_planks.json -a8d909e3ee1019a24ed96d9658e8bb7b79f29279 assets/malum/models/block/vertical_soulwood_planks_slab.json -883d6f48b63c2369f23db45e9175d12424601f88 assets/malum/models/block/vertical_soulwood_planks_slab_top.json -47f083562acd534bd79fb678a4836d0b64ce122d assets/malum/models/block/vertical_soulwood_planks_stairs.json -62be8c75625ac85f9aea30b1c47c5f6f54239a97 assets/malum/models/block/vertical_soulwood_planks_stairs_inner.json -70ecf75926cb4f4efb6a196d656cbafcc791367f assets/malum/models/block/vertical_soulwood_planks_stairs_outer.json -0353fe41a81145d3ab155ac1ad2174eaf6014ff4 assets/malum/models/item/ace_beanie.json -e5fcc099a48300367b934736aed2eabf03ddcf20 assets/malum/models/item/ace_hoodie.json -474ffaaa2eb306210486597943f913534aca22c5 assets/malum/models/item/ace_prideweave.json -0d5468c73e2350b7fb471e2c9ecd6c1ea698019e assets/malum/models/item/ace_shorts.json -22b515fbef1633dc018bd863450d7e913e8a83a5 assets/malum/models/item/ace_socks.json -651fd0e81ceafbe8e07fa0e52c16d7e1810ee390 assets/malum/models/item/aerial_spirit.json -7e8db849472d8b1a42ff14631eb617141bb915b4 assets/malum/models/item/aerial_tuned_optic.json -cf825b5a8714201494ddbd124ef82a2ba4486e62 assets/malum/models/item/agender_beanie.json -df457cbae948b0280d376ca35dcf6347bd818b5f assets/malum/models/item/agender_hoodie.json -5dca23836b89e01931a7714dc68fd0398e5e78cc assets/malum/models/item/agender_prideweave.json -2a31b99393ac0805cc0c80f676a5bd6ac0166e81 assets/malum/models/item/agender_shorts.json -6b37ffb064240508b611c567a71e13c59c506b38 assets/malum/models/item/agender_socks.json -02ad6d8851243be3af702c294a93364d81d03f8f assets/malum/models/item/alchemical_calx.json -3ff355c26a03b62737377a6daa4b3d9b57aaedd8 assets/malum/models/item/alchemical_impetus.json -7d3b3faf85b592c71804e1d64a43b580227a1529 assets/malum/models/item/aluminum_impetus.json -4b08ba0921156fcd709c065ddf0d4895d43781e8 assets/malum/models/item/aluminum_node.json -f55ad219d556ab07a9bca306fea5d37e1cf18393 assets/malum/models/item/ancient_cloth_boots.json -a8d685855571970e935ffd491cd0e5c0dfeef5f0 assets/malum/models/item/ancient_cloth_cloak.json -b2a2685514e8fbc896eb9677e63abe76e5c54beb assets/malum/models/item/ancient_cloth_leggings.json -2c59ded185a1343241f82b3f5f15a8a5de62c987 assets/malum/models/item/ancient_cloth_robe.json -9254741de5322cdf391d8b62460b92c3e5208c12 assets/malum/models/item/ancient_metal_boots.json -6109b77c929f9f2dac9938ec511b9b7311c37796 assets/malum/models/item/ancient_metal_chestplate.json -399bf3c12f423775e61f9407f230c7b0dd0d269c assets/malum/models/item/ancient_metal_helmet.json -92b91217d1739fcd623a9382bf22da8d9d7147b6 assets/malum/models/item/ancient_metal_leggings.json -8158d8694c2e5408314880e8ee11adf77c5419a2 assets/malum/models/item/ancient_weave.json -e30a0b3264fbc447a48eb560884c8237a2e202ed assets/malum/models/item/anomalous_snare.json -651fd0e81ceafbe8e07fa0e52c16d7e1810ee390 assets/malum/models/item/aqueous_spirit.json -7e8db849472d8b1a42ff14631eb617141bb915b4 assets/malum/models/item/aqueous_tuned_optic.json -3dcfadf0ce314ea0fe314263d6755bd6c070ea39 assets/malum/models/item/arcane_charcoal.json -3ba6bc77b2e346b4de89fde97183bd2e68dbe85e assets/malum/models/item/arcane_charcoal_fragment.json -651fd0e81ceafbe8e07fa0e52c16d7e1810ee390 assets/malum/models/item/arcane_spirit.json -f0955cd228fe33865738cec7930ef3244b002154 assets/malum/models/item/aro_beanie.json -98214843b719e4979a40e102159b9ac79918deb8 assets/malum/models/item/aro_hoodie.json -9a72f094a6e937c20b4fb5a4288e1145ad7c551e assets/malum/models/item/aro_prideweave.json -9f20f5f849d12834d3753ee6db918f1e3de6d21c assets/malum/models/item/aro_shorts.json -eaa15af0984591e391f50545f91f2959799b60a3 assets/malum/models/item/aro_socks.json -a02232b607af3d7cddf1302e97d470bdd7c0e5e9 assets/malum/models/item/aroace_beanie.json -a2a84494e6a9070dca43bf9056144389899cb0b9 assets/malum/models/item/aroace_hoodie.json -03c8be42184dd60f2e49984dbb5c1bace1ce0d32 assets/malum/models/item/aroace_prideweave.json -ef55f4d5934dbedf0e79702352061cfaa5574ed0 assets/malum/models/item/aroace_shorts.json -db65e1a908abadd1e41e021cd48e8a46afd5f602 assets/malum/models/item/aroace_socks.json -8409301717c9381b23c7bced06069843fef6f2bf assets/malum/models/item/astral_weave.json -25b288ff51a5993cca7623d22809da18f0ace2a7 assets/malum/models/item/belt_of_the_magebane.json -31c8dfd24f66dcc8eaba2b898dda5f1b711f5e4e assets/malum/models/item/belt_of_the_prospector.json -df4a776da0a2bd7b7df878d0c5cb832c7e711d93 assets/malum/models/item/belt_of_the_starved.json -f57a70a6dd25b4678d3ecfc625943db16048ce52 assets/malum/models/item/bi_beanie.json -b411e3468e852125a9071eafd62ca2f13b639610 assets/malum/models/item/bi_hoodie.json -12f520dd18d39d815f41daf133af043491562730 assets/malum/models/item/bi_prideweave.json -776f437f4a115c622c9b471eb0765eeff9bdf22f assets/malum/models/item/bi_shorts.json -7e1c9d77fa65e743306ab6e289fc90f4940cde20 assets/malum/models/item/bi_socks.json -d44bb0a32aa2a2a2de69e6e722d2d9976d97bcd4 assets/malum/models/item/blazing_quartz.json -017c9f1fded133ec6bcf277f87766291d1db031a assets/malum/models/item/blazing_quartz_fragment.json -a12d60f14eac0e88ade6e9edd85a235844f0d70a assets/malum/models/item/blazing_quartz_ore.json -5a0be0425a282910a2c0612dfc2e837bc9f11dc7 assets/malum/models/item/blighted_earth.json -0f8a988f89748d843db2e7675bc9a7f89ecb342c assets/malum/models/item/blighted_gunk.json -4f4712f898874c9adc04564d1423a08049a5d0ca assets/malum/models/item/blighted_soil.json -ae2d6a8d323a165c804d3a42cd7e5aa6bef60210 assets/malum/models/item/blighted_soulwood.json -aa1131b4666c49ee84aa24f3f4d6e14998d8bb8c assets/malum/models/item/blighted_tumor.json -0c2d25b5b82c64daf3a1852bbf0a8cdd1d55cd55 assets/malum/models/item/blighted_weed.json -56dc537c4964204b55d1d47b4ec89a418c2fbec0 assets/malum/models/item/block_of_alchemical_calx.json -954f468ff0719ba4b7c1b61922266c6d176baa88 assets/malum/models/item/block_of_arcane_charcoal.json -9cc7dbbdb26f16ab31bf5ac67b0e86c55676e354 assets/malum/models/item/block_of_astral_weave.json -ffa159ebc82505dd5869e28a449f17228d5ed5c5 assets/malum/models/item/block_of_blazing_quartz.json -18a24b4121f222e374dc9cd16666a23c441272cf assets/malum/models/item/block_of_brilliance.json -ecc269e56e935ba54def13046119a304a34fe06d assets/malum/models/item/block_of_cthonic_gold.json -54e6b2db05227138657e52478c60c08747f40c00 assets/malum/models/item/block_of_cursed_grit.json -87c42eedfc00ddbfed45b4a2966efed4979572aa assets/malum/models/item/block_of_grim_talc.json -4c44e344f134981f01cd6748875e6b3fca6d6309 assets/malum/models/item/block_of_hallowed_gold.json -dd1decd89c59d97e856dfdaf4969be9e81a32596 assets/malum/models/item/block_of_hex_ash.json -73b4ff6e6c95bf356c63cb0b2ca8b41ec030cb77 assets/malum/models/item/block_of_raw_soulstone.json -a855952f9b3ad1e149762fc7fcf66c1584d5be37 assets/malum/models/item/block_of_rotting_essence.json -8ab7562a34681e4af62931cc6b4fed4c9f43799d assets/malum/models/item/block_of_soul_stained_steel.json -4e2853c5e7329d8251d6b56ca0ff7616be6a733a assets/malum/models/item/block_of_soulstone.json -ebe63ef7e76e90511c574e67aa0032c370362e36 assets/malum/models/item/block_of_void_salts.json -d81a15d05c931cfbacf5df6e972023240548f526 assets/malum/models/item/brilliant_deepslate.json -baa2acd359fa47d44dc633770b8753cf172e631e assets/malum/models/item/brilliant_stone.json -770b8f68a970e1ba4f18d1c6cd8194709d3692fa assets/malum/models/item/charcoal_fragment.json -b8e7a5411c7acba80cf649a1d98d328165b9d5c6 assets/malum/models/item/chiseled_tainted_rock.json -26b43f39e41e2c7d14f7b7c454541882f8dcb502 assets/malum/models/item/chiseled_twisted_rock.json -dd31ff6873bedc4042aa66f0c90af4a27d60eed9 assets/malum/models/item/chunk_of_brilliance.json -771a03ccc85fc94f494cfb987053c2ef026d78ec assets/malum/models/item/cluster_of_brilliance.json -1f93de3b5cf027eadd3e952d8909903ee16c5d9b assets/malum/models/item/coal_fragment.json -9af0b6b3855f177f207ab43665599cd4401c9a49 assets/malum/models/item/commando_drip_boots.json -ae217a712180aaa0d9cf9e5224f8f77dc524f41e assets/malum/models/item/commando_drip_chestplate.json -afe33262fcddb746db12153401b0f7d8bf5584f6 assets/malum/models/item/commando_drip_leggings.json -81246865dc710b0ba5db7e005b484682ca43404b assets/malum/models/item/commando_drip_visor.json -2f5494e337d657eac6ad7fd2ff1da900e00fbb37 assets/malum/models/item/copper_impetus.json -a76cb14450b8a8cd61c4544aefb49d43c2658efd assets/malum/models/item/copper_node.json -3fde72895fb3a0da604a4979ba917683ec757443 assets/malum/models/item/copper_nugget.json -0b20b0b179f579d92cabfa9d7ef4822ac8aa46d4 assets/malum/models/item/cornered_weave.json -eb015dbc9a169f9c7b5b7d25cc9cb85f352f4e41 assets/malum/models/item/corrupted_resonance.json -ffc22bc5e42e9b6671e86c3afb922d4c33c6c8c9 assets/malum/models/item/cracked_alchemical_impetus.json -784cf6a8e3f76019a034a82f8e38e767e520f748 assets/malum/models/item/cracked_aluminum_impetus.json -cdf3e3db6760fd85608daa5ae2332b7699559563 assets/malum/models/item/cracked_copper_impetus.json -961f0c90ca2a8886823251d1018a8f412533818a assets/malum/models/item/cracked_gold_impetus.json -67c441f6a2bfd7c1046e9def8b04ad3eac09a222 assets/malum/models/item/cracked_iron_impetus.json -1defb243681efb5a25d3ba5afe48a2ccdb15b50b assets/malum/models/item/cracked_lead_impetus.json -d210dd0220870656bac95cbd365851e24c169cf7 assets/malum/models/item/cracked_nickel_impetus.json -3c94f2ab4ff8495dbbdebea85051c76acf6a8212 assets/malum/models/item/cracked_osmium_impetus.json -df37f5225df9befe5ca793442c83f16c8bf36104 assets/malum/models/item/cracked_silver_impetus.json -1ff0fe1faee2f50d8681645db99b8f291345c1d6 assets/malum/models/item/cracked_tin_impetus.json -7b6d2738c59f7832f730e6f5297dba5253b0d70e assets/malum/models/item/cracked_uranium_impetus.json -7ba46065e9827054f92c5cb8c2ea04485ee309a8 assets/malum/models/item/cracked_zinc_impetus.json -cc14b3ff96bec26168c3d7fa674cd0cb44ce7140 assets/malum/models/item/crushed_brilliance.json -e5410aa88d294a4366fd88705fba463785eab435 assets/malum/models/item/crushed_soulstone.json -48ffb89f8977d0ea9b3ace331b43ecb83883edde assets/malum/models/item/crystallized_nihility.json -46251c7bb1c980634d26f54dc62d79f89b669783 assets/malum/models/item/cthonic_gold.json -6d9b524060dfccbe2488aff9d2c7a0a0430bd254 assets/malum/models/item/cursed_grit.json -4f70b1243b893549113da1a9e158c61fa03f1f60 assets/malum/models/item/cut_runewood_planks.json -0f483cbafa2ef670dd64b194688ed0fc28286591 assets/malum/models/item/cut_soulwood_planks.json -c5d9e89db6476eafafb8561f9c92bc3c5116951f assets/malum/models/item/cut_tainted_rock.json -17d36b75a725cbae198e84bf2737f08d90ace5d5 assets/malum/models/item/cut_twisted_rock.json -c9e64cf1d814c5a0cb0f4acc89a480bb8ebda340 assets/malum/models/item/deepslate_quartz_ore.json -a2f8bcfc18a56db2a35fa7c6bbeb5b10cde2caac assets/malum/models/item/deepslate_soulstone_ore.json -56c78737addf0e18610a980cef51f48db494daa9 assets/malum/models/item/demiboy_beanie.json -daada1b7230ffb0529f4a788ba38f8e8387a95e5 assets/malum/models/item/demiboy_hoodie.json -99de4c0e341dd24c9f8431b0b62020e2cb9b6934 assets/malum/models/item/demiboy_prideweave.json -a65629d1bac93d684c3465d4d97559f60818ecf8 assets/malum/models/item/demiboy_shorts.json -ad5694d60561234218de6445c10bd4628f8600f7 assets/malum/models/item/demiboy_socks.json -033394ba7984dc37e0aad6e00cdfd692f4d6c08c assets/malum/models/item/demigirl_beanie.json -febb5165c03e71c0374e5a987c536f57f3f48b77 assets/malum/models/item/demigirl_hoodie.json -2d4a447e06a73e872dde6ddaec490febfadfc60d assets/malum/models/item/demigirl_prideweave.json -14d6aa7ef0dc896f8375bec17341bfd1e3cbcc78 assets/malum/models/item/demigirl_shorts.json -d11a048b4c398fab3db8863f9b2bde041d1aa292 assets/malum/models/item/demigirl_socks.json -227325d32af66084ffdbd3d49de7715e2b5ae84b assets/malum/models/item/dreaded_weave.json -651fd0e81ceafbe8e07fa0e52c16d7e1810ee390 assets/malum/models/item/earthen_spirit.json -7e8db849472d8b1a42ff14631eb617141bb915b4 assets/malum/models/item/earthen_tuned_optic.json -651fd0e81ceafbe8e07fa0e52c16d7e1810ee390 assets/malum/models/item/eldritch_spirit.json -e8c8fb0b0d7d846e69a66b75db967833378eabf0 assets/malum/models/item/enby_beanie.json -8fa0eefc9a9c0983fae3d11d8f1e1e5f4e92670b assets/malum/models/item/enby_hoodie.json -13b1a6fdf1ea4945791929c6d0362c5c1281aed7 assets/malum/models/item/enby_prideweave.json -0f224a6bd65863967d92a8db69e5242b08cbb9db assets/malum/models/item/enby_shorts.json -a1086738bdc5e73a567222a27caa16fc07ee1aa2 assets/malum/models/item/enby_socks.json -c8081ec18f29a1360ffc8eff817c74191c9affb4 assets/malum/models/item/encyclopedia_arcana.json -0b7857098c92ad23217efeb4400b6fceae856a36 assets/malum/models/item/esoteric_spool.json -f9ca28d19ad74f977843179eebc7699a062def3b assets/malum/models/item/ether.json -a25832222ffab36052563f1749ada9968f8c6cac assets/malum/models/item/ether_torch.json -5b2b59f07b87ae3d0021cb4c719bdbbb4b693171 assets/malum/models/item/etheric_nitrate.json -c747823083462f770b00092436a6c0efd913cc22 assets/malum/models/item/executioner_drip_boots.json -6e450761fc87aa2f5153ae1bc3d0bddbc5cce00e assets/malum/models/item/executioner_drip_chestplate.json -5305b26b90ea0a280649c09794ed4dd928425321 assets/malum/models/item/executioner_drip_leggings.json -81dc6dc7859fa373769cf3ac2f03c15d441b16eb assets/malum/models/item/executioner_drip_visor.json -5f7c497c6ebc3a265cb07e33b73b58e81aa72bd6 assets/malum/models/item/exposed_runewood_log.json -42d876dd8d91c3b7af2383b569b140a776c36a9b assets/malum/models/item/exposed_soulwood_log.json -9de986f99ce972c931762308eb91bcff280762f4 assets/malum/models/item/fused_consciousness.json -0203f98cc4d81338e31b6e019c8a9a28c746d89f assets/malum/models/item/gay_beanie.json -8e94c4a82e3b5c34a5208e868c6588c2315500ec assets/malum/models/item/gay_hoodie.json -ac2ba7ea5e6c7f032a9f6da8f5e9288112d00c3b assets/malum/models/item/gay_prideweave.json -d2a01b44e2220781a295ec98c65290687371a7ad assets/malum/models/item/gay_shorts.json -2aa3c818f80478be02d216469e2175c533c5ba82 assets/malum/models/item/gay_socks.json -bd4d4b1a0f4c10c8bf4e39a0b947460e82b6149c assets/malum/models/item/genderfluid_beanie.json -b9a51dfd43ccada795accabef36e73fa8f94c8f5 assets/malum/models/item/genderfluid_hoodie.json -44f4c8d19a553887dc8898a1c726ee18291a0054 assets/malum/models/item/genderfluid_prideweave.json -7ea54c0a364ade8a8b53d5a321ad48f3c3b17629 assets/malum/models/item/genderfluid_shorts.json -a29d1a4f1d057158a2837413add077a39b2c467b assets/malum/models/item/genderfluid_socks.json -fdcff24136240903fdba2d53a583a1255c7b3339 assets/malum/models/item/genderqueer_beanie.json -ec1e311c2431a9329ed2a2e861e32c2d928286bc assets/malum/models/item/genderqueer_hoodie.json -32d19d89f04639e93b988b1a08407ec42685be0f assets/malum/models/item/genderqueer_prideweave.json -9163c38b7b78cbd8f9dd0fb261f9fbb05f0fda43 assets/malum/models/item/genderqueer_shorts.json -1356575a112970e4efa56f58b4979f8c4f6bbcee assets/malum/models/item/genderqueer_socks.json -d44a07710726da52d5194d1593a3521fbdfa4ca3 assets/malum/models/item/gilded_belt.json -a77609784dfc431f1279aff527e0e765a54ef0a7 assets/malum/models/item/gilded_ring.json -c5f3b633a77eb7a5909916329c86b5384242defd assets/malum/models/item/gold_impetus.json -58c3a8bfed30991bd4f774fa2d4556de12f34b2e assets/malum/models/item/gold_node.json -04fbe164988c77a497c2b85c50bccbc4b8b1a76d assets/malum/models/item/grim_talc.json -6746005be1e8e0240e906fb391bb3c1a7a5fc26d assets/malum/models/item/hallowed_gold_ingot.json -25bfc9072fda3a8fbb6851392c7387fe392c8e1f assets/malum/models/item/hallowed_gold_nugget.json -7b0676f2b3fb9ab1e2cc21ed108ef474592c31a8 assets/malum/models/item/hex_ash.json -afdf9a99558d5373847e6f463e1760e84dfd0130 assets/malum/models/item/holy_caramel.json -53885fe2264472ad67340d1f6561439ee66809ed assets/malum/models/item/holy_sap.json -260496b916509ce8d9d8bf544b3f62e608d97332 assets/malum/models/item/holy_sapball.json -521630417a6a23c2d3d6b830fad42701f885fd1f assets/malum/models/item/holy_syrup.json -651fd0e81ceafbe8e07fa0e52c16d7e1810ee390 assets/malum/models/item/infernal_spirit.json -7e8db849472d8b1a42ff14631eb617141bb915b4 assets/malum/models/item/infernal_tuned_optic.json -eba6ae4434354f8e0acfe960e01c00bde86b5c73 assets/malum/models/item/intersex_beanie.json -ed7962cdc14f240911781f0fa74117e606ef7c77 assets/malum/models/item/intersex_hoodie.json -077eb81bf8df488bb4b32ab5232fb50880cd75ac assets/malum/models/item/intersex_prideweave.json -bca5d8d59ae1501b4eb9abcf6e9a2cefec6a766b assets/malum/models/item/intersex_shorts.json -8e127ef01b1a81a8283dfe2eb7307eca342310f0 assets/malum/models/item/intersex_socks.json -bc333164babcad2b1fd5a3a1a1726217bcd11126 assets/malum/models/item/iridescent_ether.json -863002489a2ace617f59ecc683ef478494769a64 assets/malum/models/item/iridescent_ether_torch.json -796795dd5bd51024bed4f4d8837dc58812711351 assets/malum/models/item/iron_impetus.json -d4f1f9e290de45238d8b51b854dad21eeea8bd73 assets/malum/models/item/iron_node.json -35c658b7a78693febfeb439c91a599c58cacb27b assets/malum/models/item/lead_impetus.json -16d2b3723af382f6dcac02f50f0415f7f28a0db7 assets/malum/models/item/lead_node.json -127962ed2a578135725a2ebf69b35ec7c552bc1b assets/malum/models/item/lesbian_beanie.json -ee70f834a2eadd45a43de90a843bbba8f470a02e assets/malum/models/item/lesbian_hoodie.json -6db1a3682308d00e06971037f5d8dd215282c4a4 assets/malum/models/item/lesbian_prideweave.json -6a07fe914223c022a2ba239914745733e216d8a3 assets/malum/models/item/lesbian_shorts.json -a56612bd33c6aad91b4ab8e790c583fece15d8c0 assets/malum/models/item/lesbian_socks.json -711d4dc2983e70e6c1d7a267705fef3401f374fd assets/malum/models/item/mass_of_blighted_gunk.json -3bc61d13b5f34a70a8d2fe50c76b217356db7e70 assets/malum/models/item/mechanical_weave_v1.json -b8e27e449543a23d3eca374ce2743b783ca89afb assets/malum/models/item/mechanical_weave_v2.json -7d40a98ed69a9e516c58f2c434652ed524e08781 assets/malum/models/item/natural_quartz.json -98224cf93bffa5b8cd1402e2d50c65647165eeef assets/malum/models/item/natural_quartz_ore.json -00fcfb42bf644c6fdbf5db55581b94a151a05545 assets/malum/models/item/necklace_of_blissful_harmony.json -c62e6536260b5e9971fd9f66fa261d1865169122 assets/malum/models/item/necklace_of_the_hidden_blade.json -19f5b9a6ab92fc328cffde102fde5664ed369aea assets/malum/models/item/necklace_of_the_mystic_mirror.json -1fd361d55d71d6e0eb0d7675f2cc86234099b526 assets/malum/models/item/necklace_of_the_narrow_edge.json -03bd64df92e2fe948c26ae18266a847623f193b5 assets/malum/models/item/necklace_of_the_watcher.json -0ce75baaf3721c88e6e4285543accabec7b5d903 assets/malum/models/item/necklace_of_tidal_affinity.json -a91b2cd9b62c544f476f101cfcbf3ccc1da6c827 assets/malum/models/item/nickel_impetus.json -0ed6a6048b7366e7948ab05c21b0090136240b26 assets/malum/models/item/nickel_node.json -88aafeb96797992464f90855fc56c2a29f281a1d assets/malum/models/item/null_slate.json -b28005f548ec1ef41d3b487a1ce84281287b8531 assets/malum/models/item/ornate_necklace.json -7ff1cdcc1d1a779509a8716266a1798009ed5faa assets/malum/models/item/ornate_ring.json -b55a6ada8f629d03faa9fc365d804097dcb2b23a assets/malum/models/item/osmium_impetus.json -8850aa5a2ec82abde5e1f6b209bf3a05e28d0369 assets/malum/models/item/osmium_node.json -4f773820b86f12f4b515b441981b3b9bdedb30b8 assets/malum/models/item/pan_beanie.json -f34e138f6a45854eaf4f576dd118fe4a763a42aa assets/malum/models/item/pan_hoodie.json -cc2945ccae7f40f31d7a91e5477605baded59f12 assets/malum/models/item/pan_prideweave.json -d2e834e2d4909d533caca04791004f107dd4ba42 assets/malum/models/item/pan_shorts.json -5a0a2372e76a6095bb0ca80f5e9be37c4502e542 assets/malum/models/item/pan_socks.json -d451a1bb6a76b1db9dd9053ae61eedb25155175f assets/malum/models/item/plural_beanie.json -fab61576d63c21c3ae70ba5b58c9bf89fede7da5 assets/malum/models/item/plural_hoodie.json -fceaae6b31986dc1db3564abceaaa5090b5efe03 assets/malum/models/item/plural_prideweave.json -ba5f07165971a239ac153031a41f170a42dffe68 assets/malum/models/item/plural_shorts.json -7099547355e547e25a28c96ef794598795932e34 assets/malum/models/item/plural_socks.json -d22754dc952d1d9435579c86feb1e06cff7463ba assets/malum/models/item/polished_tainted_rock.json -afa43e374218939b15c092490c7761df30411587 assets/malum/models/item/polished_tainted_rock_slab.json -bc4c02434bab5dde999396191b5ce97b0d9f5d38 assets/malum/models/item/polished_tainted_rock_stairs.json -796234f3008a7bd6d12a91f6448acdd3cc80bf14 assets/malum/models/item/polished_twisted_rock.json -120527aaeb2dc6001c10f79e7820d6feef75a350 assets/malum/models/item/polished_twisted_rock_slab.json -47399f349a23e29e34ead8cfbe2b45be0216cf35 assets/malum/models/item/polished_twisted_rock_stairs.json -69c6d3e986c46b2928f1f994ace6f17e0b85c643 assets/malum/models/item/poly_beanie.json -5dbeb292dcdf0ad16209ff8a936b9eca586d9de8 assets/malum/models/item/poly_hoodie.json -3505aee47a46be294392dbe12cf2b18fb7078e58 assets/malum/models/item/poly_prideweave.json -ab658c88b9c0cfc578060efe7280402540e7994d assets/malum/models/item/poly_shorts.json -4400315442fd79f1cbbe36b4d74e1c68d54c1037 assets/malum/models/item/poly_socks.json -5d6ac19076040411777d9ab5a3bc9b41bf72f890 assets/malum/models/item/poppet.json -5bbeb76cbdb1c8d82b25e57c4cea38fd51d26226 assets/malum/models/item/pride_beanie.json -e13da6831f3cc804657ea3d9ce633a03c98222b6 assets/malum/models/item/pride_hoodie.json -e051077e81fe4ee7b039fae566fe9fe7aa5eec19 assets/malum/models/item/pride_prideweave.json -c0e0445dbf795498f735c6053cfb4570f7c31906 assets/malum/models/item/pride_shorts.json -2c28cac5728560558c592ef0a28f572ded7e9aca assets/malum/models/item/pride_socks.json -14b9aff11fc5abf7784420c5568e3e349f324461 assets/malum/models/item/processed_soulstone.json -2f2fecfbf5bfa9082052eaa335cbc9243f545270 assets/malum/models/item/raw_soulstone.json -eb7b211a030ef70e110798cd220720f8e97f5557 assets/malum/models/item/revealed_runewood_log.json -3be1650db18bc78223da198b28a1dc3c1f13cfcc assets/malum/models/item/revealed_soulwood_log.json -a1be2c85c94965037db29b423105bf6bce46dfca assets/malum/models/item/ring_of_alchemical_mastery.json -0865fd5dfe63866e2814f914c2910d042dbb4473 assets/malum/models/item/ring_of_arcane_prowess.json -ca8fd5fe9afdf4d969aebb680811ee9a2e1bedf0 assets/malum/models/item/ring_of_curative_talent.json -c3940ae4e28ab382ce90195ff702f95f782cc815 assets/malum/models/item/ring_of_desperate_voracity.json -df216d5f5d5c244205ea72983253700478354719 assets/malum/models/item/ring_of_esoteric_spoils.json -d301f68443803ed8116c4afb84ed88de72ac49ed assets/malum/models/item/ring_of_growing_flesh.json -49d9c324a37907243d7919422dc5b5c9acc0488f assets/malum/models/item/ring_of_gruesome_satiation.json -39006a8db27350c24b03518f26ebbcf55e223ec1 assets/malum/models/item/ring_of_the_demolitionist.json -5f3e93dbf31babbad4012a9a84fc431f0e07abe1 assets/malum/models/item/ring_of_the_hoarder.json -d5d476b62ea7c5202ce0d8cf4e290d6b1c3cf082 assets/malum/models/item/rotting_essence.json -a60ab88f04bb9b72ad6bb600b7b9135a641ee87d assets/malum/models/item/runewood.json -a40798f9b5b7e5a13ac67fb6c1b991e6e3b2a8b8 assets/malum/models/item/runewood_beam.json -30ed7fe55c6f85aa220aaaf2e9245a2e55d05511 assets/malum/models/item/runewood_boat.json -d09862cede7ca9d5654c08806a29c43488c3e730 assets/malum/models/item/runewood_door.json -021fecdcf65b5e630d0de49163aafa65dc37d9a7 assets/malum/models/item/runewood_item_pedestal.json -affb6d03ea5c29d6ab5628f7b233ecbebdf44776 assets/malum/models/item/runewood_item_stand.json -d35c2263f327ea668bfc27d42f795745aec28f1e assets/malum/models/item/runewood_leaves.json -a664e632b8f0d83db2949d3bf029779cde554e41 assets/malum/models/item/runewood_log.json -76f5db87030f25e539fcaada875c22c5f71d4875 assets/malum/models/item/runewood_panel.json -38c2daa0d1e54e1e11a1cba60ecb83e6b83cefa9 assets/malum/models/item/runewood_panel_slab.json -315aaa437bbe74fbc5e7f33b16de3c4700877af4 assets/malum/models/item/runewood_panel_stairs.json -d805415df85202eaf803bfa732e23d0d42ecd9b7 assets/malum/models/item/runewood_planks.json -25c2b6ad16dc783a9452e57c71ae4f3a0043eaeb assets/malum/models/item/runewood_planks_button.json -8829e955b0f72cae5b429723d4ed7965d70aed5e assets/malum/models/item/runewood_planks_fence.json -23304e3a53328876aab207279cfa0c46b51a41a4 assets/malum/models/item/runewood_planks_fence_gate.json -232afe0762c9570908b7895ed311f10a075fd7a2 assets/malum/models/item/runewood_planks_pressure_plate.json -5e820014aa6f2c2c6439db02ed7e0f2c62fdfc98 assets/malum/models/item/runewood_planks_slab.json -b3498b2ceeb59fc2c13f80f0cf653f4b77475311 assets/malum/models/item/runewood_planks_stairs.json -e7c81240ca2cac22c61056fbdea519be91ee44b0 assets/malum/models/item/runewood_sapling.json -5d016c01a3d372b13f5ec29977b0acff8a8071f6 assets/malum/models/item/runewood_sign.json -818c03d2693b66a8f012deb78aa7c71c1ace801c assets/malum/models/item/runewood_tiles.json -991b5740a5a18348de69d2b2ff9e4de0a0c1bafd assets/malum/models/item/runewood_tiles_slab.json -92bf55fadb091b50aefd95c787d78c554655bf71 assets/malum/models/item/runewood_tiles_stairs.json -a492c97f4545cc57302446c57424eb8a31dd9b22 assets/malum/models/item/runewood_totem_base.json -45ac2c4f27b15066127c1a4284a4a365149e9cd5 assets/malum/models/item/runewood_trapdoor.json -7fbc0b6366a6d16c7a963cc7fb7a21aa31a5f8fb assets/malum/models/item/runic_small_tainted_rock_bricks.json -e6ac8e37f73db479cde5b5a0d0c40413c5bd8fdc assets/malum/models/item/runic_small_tainted_rock_bricks_slab.json -05c91adea7a0856287d123290ffddaa534910c69 assets/malum/models/item/runic_small_tainted_rock_bricks_stairs.json -8738cb18615779ca5c7527e1471ae84a79032418 assets/malum/models/item/runic_small_tainted_rock_bricks_wall.json -be1166700b97b7d2e6567f7efa1514dd86763b50 assets/malum/models/item/runic_small_twisted_rock_bricks.json -d204b03e1203d7a314e5deefc9244f6552412bd7 assets/malum/models/item/runic_small_twisted_rock_bricks_slab.json -6be01a58cc145c91e6715572fad4631d205faf51 assets/malum/models/item/runic_small_twisted_rock_bricks_stairs.json -a4dc02417ced424b76d685695fb8c23831efad65 assets/malum/models/item/runic_small_twisted_rock_bricks_wall.json -fb1f4095911e866f1e73d26d5229b7bf17e3c62a assets/malum/models/item/runic_tainted_rock_bricks.json -2216ca6589cf7250eff293c717fbcd94fa36a35c assets/malum/models/item/runic_tainted_rock_bricks_slab.json -810a25526cc1c5a067d60bc41c64348c1e71add1 assets/malum/models/item/runic_tainted_rock_bricks_stairs.json -21503462aeb1494322f0d520272bf51e8d808046 assets/malum/models/item/runic_tainted_rock_bricks_wall.json -a79d601b5f226b9256982a33a472316295d71fd8 assets/malum/models/item/runic_tainted_rock_tiles.json -7fd7c79820438f896d17c1481465236678859a6e assets/malum/models/item/runic_tainted_rock_tiles_slab.json -870d7bfbb44bd7a14dc4b9a0171f403063832e42 assets/malum/models/item/runic_tainted_rock_tiles_stairs.json -046e0ccf4a008c71594f5bfceac7c62c8e2b4836 assets/malum/models/item/runic_tainted_rock_tiles_wall.json -cb40582e3753dc976685af838e07177241e28051 assets/malum/models/item/runic_twisted_rock_bricks.json -12ccedf7739e17b6818681a95d41294ae33aa427 assets/malum/models/item/runic_twisted_rock_bricks_slab.json -746f84766375de966e64ab19326307341bc80147 assets/malum/models/item/runic_twisted_rock_bricks_stairs.json -28d6162084f0c1d29e5aa7fbf7d78848b290adfe assets/malum/models/item/runic_twisted_rock_bricks_wall.json -ff8ab7baf34a0885744d15537db0957e4dec5036 assets/malum/models/item/runic_twisted_rock_tiles.json -86a3a4e31bc799f9eb1e13dc18bbc0f745914c51 assets/malum/models/item/runic_twisted_rock_tiles_slab.json -1f142d3d811122a8cb64ce29d9a345c8fb37a181 assets/malum/models/item/runic_twisted_rock_tiles_stairs.json -9eff68127ef3112f0693a51ca1fff062c1fa7b66 assets/malum/models/item/runic_twisted_rock_tiles_wall.json -651fd0e81ceafbe8e07fa0e52c16d7e1810ee390 assets/malum/models/item/sacred_spirit.json -ecc074c440444164d97086bdde8c2ac4c9a086b5 assets/malum/models/item/silver_impetus.json -444a8647f4f72a159e0652ee4585d63e4b34dc28 assets/malum/models/item/silver_node.json -7fdaeebc2620854359ef0c410e749e4af9384c11 assets/malum/models/item/small_tainted_rock_bricks.json -e11b1d56ccd58579a76dc18ed9a42b0517781f3a assets/malum/models/item/small_tainted_rock_bricks_slab.json -79eb9f6d35660c016d7110a1463f299ac93ed046 assets/malum/models/item/small_tainted_rock_bricks_stairs.json -5831228c8bd0c7346ad24fd3018237432b049fa2 assets/malum/models/item/small_tainted_rock_bricks_wall.json -75a86e765b1001329dad8217a921288f3b5a8723 assets/malum/models/item/small_twisted_rock_bricks.json -f98c8b069f961a6814870e81016ed7d8a982ad98 assets/malum/models/item/small_twisted_rock_bricks_slab.json -9fb31fb507fbcabddd3c7346ad8d8f329d7bc332 assets/malum/models/item/small_twisted_rock_bricks_stairs.json -9e71c0164beb83edf18a8d7959842cbb44f0b223 assets/malum/models/item/small_twisted_rock_bricks_wall.json -e742eb63b33b12553c6ef0339b349045ac7a583f assets/malum/models/item/smooth_tainted_rock.json -11b790c978c510a16d852fc6267843728dd8ed66 assets/malum/models/item/smooth_tainted_rock_slab.json -637436e4d9a8de5c054db5f11c7bf0320b4c307c assets/malum/models/item/smooth_tainted_rock_stairs.json -91582bc130401333eeb584ca3c6d81b6c74fa274 assets/malum/models/item/smooth_twisted_rock.json -73227483bb11c59603bc3dc43459f6d003e3e302 assets/malum/models/item/smooth_twisted_rock_slab.json -32f3df23601e9522e1923cbf7467309ab2cbba64 assets/malum/models/item/smooth_twisted_rock_stairs.json -5eb66b0e8a0cc4b949445e353f1a91df9a07d081 assets/malum/models/item/solid_runewood_trapdoor.json -80d0dfda656043cc43d7dc3c08b8b8746da6b6f2 assets/malum/models/item/solid_soulwood_trapdoor.json -915967e3a929fc791c683a730e092bad01791ccf assets/malum/models/item/soul_hunter_boots.json -35515c8e312d6037a59540f3743dc114b715cbf0 assets/malum/models/item/soul_hunter_cloak.json -537d7092b015c1b1011646d59e83cef70bfc3768 assets/malum/models/item/soul_hunter_leggings.json -6c3ad962a9d3211b5bdb6eec25ed94b4d4006ab8 assets/malum/models/item/soul_hunter_robe.json -61d75414e48d4bbaa8fd0409336db7ff7964897e assets/malum/models/item/soul_stained_steel_axe.json -565e9ef6e5ecf9c4d5e7c917d728f54c11780ffe assets/malum/models/item/soul_stained_steel_boots.json -0d8470e4b4425c300f8869ceb5e4154a731dae6b assets/malum/models/item/soul_stained_steel_chestplate.json -139b033a8dd25d1ea3a7e7ece04ae6dbc69f3c3b assets/malum/models/item/soul_stained_steel_helmet.json -3c1c9508c70b02272b620cbebe7d8910ab8e5690 assets/malum/models/item/soul_stained_steel_hoe.json -9f0bb1ff7c1a0580890837f24f652214ccd6d7f4 assets/malum/models/item/soul_stained_steel_ingot.json -ec4f8d2ac2f10149e109f930aa1b306b12cd8e3d assets/malum/models/item/soul_stained_steel_knife.json -32ec0b52cbc63132043b739cd32dd9d9ed66f2e7 assets/malum/models/item/soul_stained_steel_leggings.json -6c06b17175142b0f6001e9d5cd559bdd59276a13 assets/malum/models/item/soul_stained_steel_nugget.json -439d49825a167b710278ce887656309140d12928 assets/malum/models/item/soul_stained_steel_pickaxe.json -88855988cc565919ae4c0606b27d2267786f563a assets/malum/models/item/soul_stained_steel_shovel.json -a86156fa6fe46e8626c22e5c28fb74aa88d29dbc assets/malum/models/item/soul_stained_steel_sword.json -4be35bf24d316154cbca4e5a99fcf0390bbe422b assets/malum/models/item/soul_vial.json -d101c6e0b92cbe54083380727e52a68721f454aa assets/malum/models/item/soulstone_ore.json -d6570cdbc9e041aed2ef843555499f255e814d23 assets/malum/models/item/soulwood.json -6ef47f1ec38472c0390fb7907172a2a78661b0e8 assets/malum/models/item/soulwood_beam.json -fd8684ec1d2848ab80bbc89101340e9d08fe0c0d assets/malum/models/item/soulwood_boat.json -e3a1714b346c2dd5887813ce97da2618a373001a assets/malum/models/item/soulwood_door.json -65637e23e12bdef98f2105585714b2dce69fc41c assets/malum/models/item/soulwood_growth.json -b172d6ebc23945b2bd674541d416121b9afc4ed3 assets/malum/models/item/soulwood_item_pedestal.json -e878b3df6d71eba2321d3e999d95ee51a6010356 assets/malum/models/item/soulwood_item_stand.json -1a608fbee377e0ad08a7a2dd723609ac4d1c4826 assets/malum/models/item/soulwood_leaves.json -042ae3da98056001a8e9aad63852b4261fe2a14b assets/malum/models/item/soulwood_log.json -81f0b99c358698d95e08a513c2200dcc3d936556 assets/malum/models/item/soulwood_panel.json -8dd2d825613c670bb57fa7a393e04f257e0ca7c4 assets/malum/models/item/soulwood_panel_slab.json -e723d65ef0020922021c6ca8c68d3b0b43ef0fe7 assets/malum/models/item/soulwood_panel_stairs.json -f545a7e45438a16830240ad88665de2992d49053 assets/malum/models/item/soulwood_planks.json -4fdd905ea0ae7b4b1a779c25f43c3544824e66ac assets/malum/models/item/soulwood_planks_button.json -9ac13a62ee7154badce59fd7eb8d6fa7975b5e69 assets/malum/models/item/soulwood_planks_fence.json -8d0abe68738a71da2ebcc30b20225af7229f1ba7 assets/malum/models/item/soulwood_planks_fence_gate.json -8dc249691c1f848b0edd91b183b4489e7822fb67 assets/malum/models/item/soulwood_planks_pressure_plate.json -efcf15921b12596a5dc04b040a713ee2315f66d6 assets/malum/models/item/soulwood_planks_slab.json -8989dba8bbc0f0e79d1faaae0df144df8c414207 assets/malum/models/item/soulwood_planks_stairs.json -003409e00d6b18c61eeefa0d0cf46e519d6cf63d assets/malum/models/item/soulwood_sign.json -b1c1e74c213493678d5e2b0f738b63d8787ce2b3 assets/malum/models/item/soulwood_stave.json -bd4ca4a8667d9f92734a8b5245a92fab26d02255 assets/malum/models/item/soulwood_tiles.json -30752f9a0810b69eba62eac35f3bccdff2db6796 assets/malum/models/item/soulwood_tiles_slab.json -ee63cd22ce2883cd479f8c9a49b79cc9b696c5a1 assets/malum/models/item/soulwood_tiles_stairs.json -80431e65c5dc9b92d058465fa1e1d757c3613139 assets/malum/models/item/soulwood_totem_base.json -16fef2267d9c5c8753ee46dfef8ba420fb252481 assets/malum/models/item/soulwood_trapdoor.json -3c6ef2844b8e18472df50fea9ca03c24fd60fe78 assets/malum/models/item/spectral_lens.json -d398d5d6e69e2982a817fbaf1b559390a086fe3d assets/malum/models/item/spectral_optic.json -6541382b4ee02585af32523ce0deee6d023c1d0e assets/malum/models/item/spirit_altar.json -90437b4ec6c45a9f1288ba538ca4f27e93be3e4a assets/malum/models/item/spirit_fabric.json -578b50f731090ec6a5cceeaf29a8fb3633e7bf72 assets/malum/models/item/spirit_jar.json -17cad448788d1d1e238f6d36157055595615556b assets/malum/models/item/spirit_pouch.json -f965da88c47727d0cdcebe817dde6568578be7e6 assets/malum/models/item/strange_nucleus.json -732118e1c394a9cb3bd06760957fecae9f65d43f assets/malum/models/item/stripped_runewood.json -586f2dbd25d7a654a421b8d7d79501b98071f99f assets/malum/models/item/stripped_runewood_log.json -d8bda8b19170149c94fab9b37e08e6f1b11b8483 assets/malum/models/item/stripped_soulwood.json -f5cffe7294018af163008b8114bafef2444ce295 assets/malum/models/item/stripped_soulwood_log.json -f85a3ce53e297b37e1db186ff00b2f17161040ac assets/malum/models/item/tainted_ether_brazier.json -40080e4a682a6b2c0248c63d15320ae2c8f60364 assets/malum/models/item/tainted_iridescent_ether_brazier.json -37ce2e1a92a671ad8d524de276eefa2540bad315 assets/malum/models/item/tainted_rock.json -4018d53333aaad18e74f8477ee10f693f481f039 assets/malum/models/item/tainted_rock_bricks.json -73ec7bb3c5621047237d8b07ef67d1a489f20b56 assets/malum/models/item/tainted_rock_bricks_slab.json -68f3dd2688a8489cdb8d2fdc2d74f88d1e1df54a assets/malum/models/item/tainted_rock_bricks_stairs.json -2b1a3959e37f8607076bce0f92302e5001706ceb assets/malum/models/item/tainted_rock_bricks_wall.json -4852790ebcc743cc0728cfef92960ec358019d85 assets/malum/models/item/tainted_rock_button.json -0a3ab8861d3821f914a8916b43421345dddeba09 assets/malum/models/item/tainted_rock_column.json -8098923d868a90fa8b3b4d6e8d02265ad68d19cf assets/malum/models/item/tainted_rock_column_cap.json -e30127dbfeaac3f86046212ecd42b7cdf081793f assets/malum/models/item/tainted_rock_item_pedestal.json -1827055fc5172ec0ed281b7982bb4875be9b5629 assets/malum/models/item/tainted_rock_item_stand.json -28e87ebe46ef77e0c392f16b037578e2371d49ef assets/malum/models/item/tainted_rock_pressure_plate.json -27823dde1f98ceea49d758999e0d70edd2df175c assets/malum/models/item/tainted_rock_slab.json -01f52315d057ea9facb47ee4eea4ca430f4c465f assets/malum/models/item/tainted_rock_stairs.json -9bd4b6abd04085bb1a7a734c6f5c32b366ff48b9 assets/malum/models/item/tainted_rock_tiles.json -c109456be103cc3310ebbf584d3a87c59a02b34b assets/malum/models/item/tainted_rock_tiles_slab.json -34a8e51145e5b54a8bf063331f36ffb2c57052e8 assets/malum/models/item/tainted_rock_tiles_stairs.json -cebf184b69d6d9071baded301494b4acff7fd24f assets/malum/models/item/tainted_rock_tiles_wall.json -f29105ee9327bbeb77b4ab43f5663f1b37c6568b assets/malum/models/item/tainted_rock_wall.json -992eb917203f6260e93227f4d479ac18d5a8f866 assets/malum/models/item/the_device.json -93592a7d808cc3a0f83426f2c2d2f7284fec97d2 assets/malum/models/item/the_vessel.json -ed61909d7ec3de75d8654b0a73dccddca56a7444 assets/malum/models/item/tin_impetus.json -082af7d73d5c9369e820306a729434eadb582d2f assets/malum/models/item/tin_node.json -74dd77cf189d80beef187102203c81e5fe7ce790 assets/malum/models/item/token_of_gratitude.json -600d9272437d98d2560f891ce234696ea25d1260 assets/malum/models/item/tophat.json -e940ce49f702b24f98020683b0465989d319668f assets/malum/models/item/trans_beanie.json -26430451d96a3f2bdab9713281bcf213dcd46a69 assets/malum/models/item/trans_hoodie.json -5a4c5f8951c9f21d800a5c19fe778e0a709bc977 assets/malum/models/item/trans_prideweave.json -bdf966ef12d498748f3a85c5ad503c3035b50f55 assets/malum/models/item/trans_shorts.json -2b686c8d774cf9ed171199da9e96fa01acf3135f assets/malum/models/item/trans_socks.json -48892ffafdcdf10d62cfcd6e9323bd4dd278b7f0 assets/malum/models/item/twisted_ether_brazier.json -0bab34d71ef7aa19308762c1377d7b94efb62d64 assets/malum/models/item/twisted_iridescent_ether_brazier.json -870e78d937d81dd1432edfdd22358c04fc4a7891 assets/malum/models/item/twisted_rock.json -659917d15bae26cfd05ff25a8248a5f2687cc18c assets/malum/models/item/twisted_rock_bricks.json -6b386e292c98d256bedcb7da8ca9ef1174649346 assets/malum/models/item/twisted_rock_bricks_slab.json -bf833ff20fb09227add0f18b176564311c582a53 assets/malum/models/item/twisted_rock_bricks_stairs.json -2d3fd440ecc346818eb8f4d0e8a18325f7cce786 assets/malum/models/item/twisted_rock_bricks_wall.json -8ce9273e09b1468164fc7e58a4d260eddf1a577e assets/malum/models/item/twisted_rock_button.json -3ff70f3e0df42b7f016363e44b8d1827489b6013 assets/malum/models/item/twisted_rock_column.json -cb488214682bcfe94da51fc33cc2dc5ca1ea8d1a assets/malum/models/item/twisted_rock_column_cap.json -e29d6f4b77edb1c727bf89abafe02d308044c8c3 assets/malum/models/item/twisted_rock_item_pedestal.json -50521a320705f1be22767936a7cfec8d9e1befff assets/malum/models/item/twisted_rock_item_stand.json -48ee8ec39a83477ac17d0b0cbf7c68415acf07a5 assets/malum/models/item/twisted_rock_pressure_plate.json -d54616c25760009ce8f27d041979c48085644543 assets/malum/models/item/twisted_rock_slab.json -b5ead579cd041be80caa94d4b95cc916cc1379e1 assets/malum/models/item/twisted_rock_stairs.json -ce72101d404f48ccee94473f0e8a5cb50ba0aa8f assets/malum/models/item/twisted_rock_tiles.json -8250a5b1d11f768fc30b9332bae5823a1bc37744 assets/malum/models/item/twisted_rock_tiles_slab.json -1324b53bcd5354fdd83c0a66b1aa510b80c11437 assets/malum/models/item/twisted_rock_tiles_stairs.json -cf80b888cdb7fefe91dafa4d3fff929c13f4fe11 assets/malum/models/item/twisted_rock_tiles_wall.json -bbe273df60502c3f5420085f18ecf47857750034 assets/malum/models/item/twisted_rock_wall.json -70ff1797c98d30837c505bba79d1bb4cd91b8267 assets/malum/models/item/twisted_tablet.json -9ba99e08eb93f3094a3df4d8f618c7e11fc60ae9 assets/malum/models/item/tyrving.json -cf0ea347bfcd02bafb70772c6ba49523b2ba06c3 assets/malum/models/item/ultrakill_v1_boots.json -bbaba1c45d785d2099800a2a7de0a1c39b76f047 assets/malum/models/item/ultrakill_v1_chestplate.json -acf03a48196c7efc88f9ff7cd328ac31b7fc5b90 assets/malum/models/item/ultrakill_v1_leggings.json -56640defdec2d5da9db1a7835390e55235a54f1b assets/malum/models/item/ultrakill_v1_visor.json -ca9ec45267a33845328d08d4e80920e81b6d370b assets/malum/models/item/ultrakill_v2_boots.json -e4edba340505e9599874f8562a603e5c39f1b132 assets/malum/models/item/ultrakill_v2_chestplate.json -0c0cb3ed432761f92714fd07904d660561b01394 assets/malum/models/item/ultrakill_v2_leggings.json -d7cebebead59f1a4b9ece98fecdf5ed3719ccec9 assets/malum/models/item/ultrakill_v2_visor.json -e35457ee4b2a52acc9d4c4486386d6b683915155 assets/malum/models/item/unholy_caramel.json -0c693127432619175babec88974fbb29eb92f4f5 assets/malum/models/item/unholy_sap.json -c4a0209e987d835e1354f4d6510336b75b1613c6 assets/malum/models/item/unholy_sapball.json -a0331e7011d1b7c9f497aaba6134b72506ac53e9 assets/malum/models/item/unholy_syrup.json -de71615b48b627dc0279c4be5590202ea37cbb96 assets/malum/models/item/uranium_impetus.json -6bc8af8f4ca274da170031bad08625df95f731bc assets/malum/models/item/uranium_node.json -a53f4f87e5e4aeb3127de734fa426084258edc3b assets/malum/models/item/vertical_runewood_planks.json -c339fc6cb1478bc3f5a90b12d392c644b13d5a65 assets/malum/models/item/vertical_runewood_planks_slab.json -85ce93cfd7602ac6e3adc028df0023a838088790 assets/malum/models/item/vertical_runewood_planks_stairs.json -385f9fd33741913942ad98688c1c412eac12f854 assets/malum/models/item/vertical_soulwood_planks.json -f2b3a9ea703ce14d00132d29349d11cb587944d9 assets/malum/models/item/vertical_soulwood_planks_slab.json -9d1956ed0dfd2665cf40f3edeb13c9ee8d68ae06 assets/malum/models/item/vertical_soulwood_planks_stairs.json -84107d93cf01a8e4ec3616eea5928840302594ac assets/malum/models/item/vivid_nitrate.json -65fcd9a1af6c19f73d2cb71c17f1919c9c735a48 assets/malum/models/item/void_salts.json -5a95e9ea93182c1cadc49772e96ae328c99f148a assets/malum/models/item/weavers_workbench.json -651fd0e81ceafbe8e07fa0e52c16d7e1810ee390 assets/malum/models/item/wicked_spirit.json -40816291246e228b7eaaa13cf8747a9a006034cd assets/malum/models/item/zinc_impetus.json -d77f0ad1da38969caa81ac9dda635e8489792040 assets/malum/models/item/zinc_node.json -698745fda607b0f8ff1419254c61c9e62ae2d8bf data/farmersdelight/tags/blocks/heat_sources.json -4123d0f89328086539271fedfdefd0832a1bbc13 data/farmersdelight/tags/blocks/tray_heat_sources.json -05a3bb3cca9ff66e09b8571f8a8e4f43e0c93fb6 data/farmersdelight/tags/items/tools/knives.json -5736c68f4e1bf1daacb3685108f42dd499ddffdb data/forge/tags/blocks/fence_gates/wooden.json -14e43dbddca55da7019d426b6e601c63ed63e01f data/forge/tags/blocks/ores.json -aed6719ede3daca4961b7820bdb282860122c5ed data/forge/tags/blocks/storage_blocks.json -cc6d034c0dc05acb049e9a1f9d9292b1fa1fc1b2 data/forge/tags/blocks/stripped_logs.json -47e85f1717b604e87d13b21055a8715ac035638e data/forge/tags/items/gems.json -25c0bab813d31da58924161f204b3fb38c042d6d data/forge/tags/items/gems/quartz.json -6d0d449bf8402643e3975424002baac100fba903 data/forge/tags/items/ingots.json -0eb9e279d8970574cfe375057253c0b87a5bf7fe data/forge/tags/items/nuggets.json -e8fab8d2e63dec1fbb96cca35aaa365190400b02 data/forge/tags/items/nuggets/copper.json -14e43dbddca55da7019d426b6e601c63ed63e01f data/forge/tags/items/ores.json -96ed2b8a733298462d5805fded9826a1f85463b1 data/forge/tags/items/ores/quartz.json -2956c7ab14fca69e8efefa4ef85e2bb49eb29956 data/forge/tags/items/slimeballs.json -aed6719ede3daca4961b7820bdb282860122c5ed data/forge/tags/items/storage_blocks.json -cc6d034c0dc05acb049e9a1f9d9292b1fa1fc1b2 data/forge/tags/items/stripped_logs.json -05a3bb3cca9ff66e09b8571f8a8e4f43e0c93fb6 data/forge/tags/items/tools/knives.json -12e91a0923b969a078b72ac01a8cf5722373a6cb data/malum/advancements/recipes/aluminum_from_node_blasting.json -12e91a0923b969a078b72ac01a8cf5722373a6cb data/malum/advancements/recipes/aluminum_from_node_smelting.json -c306d55fd625191ca486715f771b1b2295cad232 data/malum/advancements/recipes/brewing/magma_cream_from_sapballs.json -e48aa8c3746e286af828653dade98df1a5677046 data/malum/advancements/recipes/building_blocks/netherrack_from_blazing_quartz.json -192ad70c06113df2ac791b72d0b54a55e309e56c data/malum/advancements/recipes/decorations/blazing_torch.json -1f7b53a97c419ca4fe28fe68c7286c80deaeb4b8 data/malum/advancements/recipes/decorations/skeleton_skull_from_grim_talc.json -b4db14cafd7b93322276a570ccc208223f69823e data/malum/advancements/recipes/decorations/zombie_head_from_grim_talc.json -f0b50edcc24fa039e87a1cbf6c6e83697835d953 data/malum/advancements/recipes/impetus_creation_aluminum.json -6a3ec76df305e1b170ebb43bfbf99869fd292c44 data/malum/advancements/recipes/impetus_creation_lead.json -558e431edea3fb5821b8125bfd7fd612aab0a079 data/malum/advancements/recipes/impetus_creation_nickel.json -ff6b21afc0c09e3513dee53fe0e336c76bcb85b3 data/malum/advancements/recipes/impetus_creation_osmium.json -cf0d4a8bf470714ddb3d345a3e1cd4eb83ca79b7 data/malum/advancements/recipes/impetus_creation_silver.json -d19f3e2c0178389faa037e12860b4ab617846d53 data/malum/advancements/recipes/impetus_creation_tin.json -bee6b728b6ff3fbf974e8f0e8cbfbb7cc8fcdc4c data/malum/advancements/recipes/impetus_creation_uranium.json -f0ee1c77e646a1cfbc84f14f67e1038980e29b65 data/malum/advancements/recipes/impetus_creation_zinc.json -b307ce30cc2318b6fc774b08b0c98447ddef6922 data/malum/advancements/recipes/lead_from_node_blasting.json -b307ce30cc2318b6fc774b08b0c98447ddef6922 data/malum/advancements/recipes/lead_from_node_smelting.json -38477f4a2580d8469da9875fa17b867af3e94735 data/malum/advancements/recipes/malum_arcane_construct/chiseled_tainted_rock.json -6efa4800bba30c3e833fa004c77eb59e58c59940 data/malum/advancements/recipes/malum_arcane_construct/chiseled_tainted_rock_bricks_stonecutting.json -2526995e645663ee4f01ff43ca1157bedf9717cb data/malum/advancements/recipes/malum_arcane_construct/chiseled_tainted_rock_bricks_stonecutting_alt.json -4919290c00cec976d27d94b7498118ce5cc9fccd data/malum/advancements/recipes/malum_arcane_construct/chiseled_twisted_rock.json -86d778188a667bda8cddef7398eb194379a14eb1 data/malum/advancements/recipes/malum_arcane_construct/chiseled_twisted_rock_bricks_stonecutting.json -818c14e657cb7b145fd1237960d619e39820c12a data/malum/advancements/recipes/malum_arcane_construct/chiseled_twisted_rock_bricks_stonecutting_alt.json -b5b5c58fc67697deb2bd4768ef9ef40e74e497d2 data/malum/advancements/recipes/malum_arcane_construct/cracked_small_tainted_rock_bricks_slab_stonecutting.json -52e63b70bc7e5a716c8de1afef13b9919cfa1c2c data/malum/advancements/recipes/malum_arcane_construct/cracked_small_tainted_rock_bricks_smelting.json -3e6c99099c420213ae3c56b422064e7cf6cff86c data/malum/advancements/recipes/malum_arcane_construct/cracked_small_tainted_rock_bricks_stairs_stonecutting.json -79143ba8534feb99145772c8d465e781300fc9e9 data/malum/advancements/recipes/malum_arcane_construct/cracked_small_tainted_rock_bricks_stonecutting_alt.json -7dd0601817e66c434e6de7f8f3996e7ae2a298fb data/malum/advancements/recipes/malum_arcane_construct/cracked_small_tainted_rock_bricks_wall_stonecutting.json -57ba0919c1d18ddfc41da037c4691832a4ed7839 data/malum/advancements/recipes/malum_arcane_construct/cracked_small_twisted_rock_bricks_slab_stonecutting.json -421001505bf054caf93cbafc394aaa971f2161e9 data/malum/advancements/recipes/malum_arcane_construct/cracked_small_twisted_rock_bricks_smelting.json -d84abef68a33be8e7910fea403e6e3c663bcc3ff data/malum/advancements/recipes/malum_arcane_construct/cracked_small_twisted_rock_bricks_stairs_stonecutting.json -105b1815291b084c1ad06f0f936034a77415a692 data/malum/advancements/recipes/malum_arcane_construct/cracked_small_twisted_rock_bricks_stonecutting_alt.json -2161a2e0e68b2c29dabf62fdcf777f46dfc0c047 data/malum/advancements/recipes/malum_arcane_construct/cracked_small_twisted_rock_bricks_wall_stonecutting.json -37684592d516eec4a91a868724c7a5dafbae905d data/malum/advancements/recipes/malum_arcane_construct/cracked_tainted_rock_bricks_slab_stonecutting.json -1fb03889adfacc3d3a885970a6ec64eafdfbedaf data/malum/advancements/recipes/malum_arcane_construct/cracked_tainted_rock_bricks_stairs_stonecutting.json -9b3be5db6ec432a1503c2f71924c0304961845a1 data/malum/advancements/recipes/malum_arcane_construct/cracked_tainted_rock_tiles_slab_stonecutting.json -04599804f74c33c8a9df9009d2ee53ef689716c9 data/malum/advancements/recipes/malum_arcane_construct/cracked_tainted_rock_tiles_stairs_stonecutting.json -d2ec92df17a2139357cf9b166d06bec801c6fb4f data/malum/advancements/recipes/malum_arcane_construct/cracked_tainted_rock_tiles_stonecutting.json -4fc3bd35ebcd42755e00c463e983c6f78fe8766f data/malum/advancements/recipes/malum_arcane_construct/cracked_tainted_rock_tiles_wall_stonecutting.json -5b999b7906f4dac777f232865369adf7ceb4378e data/malum/advancements/recipes/malum_arcane_construct/cracked_twisted_rock_bricks_slab_stonecutting.json -a303b4e8bdb5eb790cdfeca3d5c99d0089ce1a65 data/malum/advancements/recipes/malum_arcane_construct/cracked_twisted_rock_bricks_stairs_stonecutting.json -e69b43b356fbb85a1e4f03d2acde15b3ad92df54 data/malum/advancements/recipes/malum_arcane_construct/cracked_twisted_rock_tiles_slab_stonecutting.json -efd15d3a636520b046c2b2db8d62a7b197000ff8 data/malum/advancements/recipes/malum_arcane_construct/cracked_twisted_rock_tiles_stairs_stonecutting.json -bfd73ee868f6bd393d878e13abd991b171ef8e75 data/malum/advancements/recipes/malum_arcane_construct/cracked_twisted_rock_tiles_stonecutting.json -34c3f1a075fa56f3b6d45395ed0f08b4b3b9a229 data/malum/advancements/recipes/malum_arcane_construct/cracked_twisted_rock_tiles_wall_stonecutting.json -87e1690f819dfee1df8374e09d87afe3401dd833 data/malum/advancements/recipes/malum_arcane_construct/cut_tainted_rock.json -fc12bd347716adcef1e9ce3d74237169ec3ec895 data/malum/advancements/recipes/malum_arcane_construct/cut_tainted_rock_stonecutting.json -f5375cdf252620c7d3ad39008f59139a0552e399 data/malum/advancements/recipes/malum_arcane_construct/cut_twisted_rock.json -3bd24d8df31478a37d6a7fcdf4ca32327fe553e7 data/malum/advancements/recipes/malum_arcane_construct/cut_twisted_rock_stonecutting.json -8f0d0a05e987321dda47685b09a8549738b60a7b data/malum/advancements/recipes/malum_arcane_construct/polished_tainted_rock.json -578c688133ade28b69de9241074d91fd350a2435 data/malum/advancements/recipes/malum_arcane_construct/polished_tainted_rock_slab.json -b0962463681d3acfc905130ea510717d56994558 data/malum/advancements/recipes/malum_arcane_construct/polished_tainted_rock_slab_stonecutting.json -bd6872330a6013f1eb49d427f6fbbf3472ed4efa data/malum/advancements/recipes/malum_arcane_construct/polished_tainted_rock_stairs.json -edb7ca4a7e335280793e141c78a8a2d3539597a1 data/malum/advancements/recipes/malum_arcane_construct/polished_tainted_rock_stairs_stonecutting.json -76abb3e97aac568f6658c7edef649b569c4b269a data/malum/advancements/recipes/malum_arcane_construct/polished_tainted_rock_stonecutting.json -edf0213b58a7f77c4138f8f59d455f13d58c1e7e data/malum/advancements/recipes/malum_arcane_construct/polished_twisted_rock.json -ccf71cbdbb2636f2ad7679e8ff00aede2a0c21a3 data/malum/advancements/recipes/malum_arcane_construct/polished_twisted_rock_slab.json -da668197f5ea13d196ff3a8508a39207c9b6c571 data/malum/advancements/recipes/malum_arcane_construct/polished_twisted_rock_slab_stonecutting.json -31010a8c995eab6c07e0dd762a21b207e54dff14 data/malum/advancements/recipes/malum_arcane_construct/polished_twisted_rock_stairs.json -0b47417254f0fc5dd23fb5669813c3ffeaac0751 data/malum/advancements/recipes/malum_arcane_construct/polished_twisted_rock_stairs_stonecutting.json -4dbe9235edddd9f293adb7d6681f2118d665f51b data/malum/advancements/recipes/malum_arcane_construct/polished_twisted_rock_stonecutting.json -a5d72c494451eefbbbdb0202bab85255ab428e1d data/malum/advancements/recipes/malum_arcane_construct/runic_small_tainted_rock_bricks_slab.json -0a29c1677e55124e11fcd212914d58da57c51717 data/malum/advancements/recipes/malum_arcane_construct/runic_small_tainted_rock_bricks_stairs.json -94d3333bd13ba40b6ec31f3b5a1b581cbd08e7d4 data/malum/advancements/recipes/malum_arcane_construct/runic_small_tainted_rock_bricks_wall.json -cbb2b73dd71814c52252f899eab6c122a33a22a1 data/malum/advancements/recipes/malum_arcane_construct/runic_small_twisted_rock_bricks_slab.json -3d41cde1b9d23b967cc6d1d607d17d05c8fb10d8 data/malum/advancements/recipes/malum_arcane_construct/runic_small_twisted_rock_bricks_stairs.json -222b8dfc4eae9521cedd9517dc4f82c181015563 data/malum/advancements/recipes/malum_arcane_construct/runic_small_twisted_rock_bricks_wall.json -3455233aca368d750ab4b1288eb530b530790566 data/malum/advancements/recipes/malum_arcane_construct/runic_tainted_rock_bricks.json -68fd584e2b2041756a8bddd5eef2dab18993f9f5 data/malum/advancements/recipes/malum_arcane_construct/runic_tainted_rock_bricks_slab.json -e8044678a9cba9528099b482a1d19f1559f6cdbb data/malum/advancements/recipes/malum_arcane_construct/runic_tainted_rock_bricks_stairs.json -5bcf96ce5cfb06b1339cd58fe38d02eb81c9de5f data/malum/advancements/recipes/malum_arcane_construct/runic_tainted_rock_bricks_wall.json -ae4e7a54be8ac50b53217f22eea9b547937d8616 data/malum/advancements/recipes/malum_arcane_construct/runic_tainted_rock_tiles.json -3c1af59d4d032936c63938bc6e68a0b8068c7bf2 data/malum/advancements/recipes/malum_arcane_construct/runic_tainted_rock_tiles_slab.json -10321bbdd18e09fdeebf19aeeed0f9f821111e82 data/malum/advancements/recipes/malum_arcane_construct/runic_tainted_rock_tiles_stairs.json -1e9c6cc7fc4897ac968c4b75f281c409ea04f417 data/malum/advancements/recipes/malum_arcane_construct/runic_tainted_rock_tiles_wall.json -757df8649ec4bd2062b75ea5915357b26c346265 data/malum/advancements/recipes/malum_arcane_construct/runic_twisted_rock_bricks.json -0040179a6d647af4254df977debb3526139ad241 data/malum/advancements/recipes/malum_arcane_construct/runic_twisted_rock_bricks_slab.json -9aa8508a8c144a28a031dffddd4b82ffb497ba34 data/malum/advancements/recipes/malum_arcane_construct/runic_twisted_rock_bricks_stairs.json -d920ac765d52c3708cf5b6da8145da22f03928c7 data/malum/advancements/recipes/malum_arcane_construct/runic_twisted_rock_bricks_wall.json -f7c13e6d571cc9090c4227593250d03430eb90c9 data/malum/advancements/recipes/malum_arcane_construct/runic_twisted_rock_tiles.json -05256c77e60f6508d792d8f3e4623a394e26cc2c data/malum/advancements/recipes/malum_arcane_construct/runic_twisted_rock_tiles_slab.json -dc4a41080f27091eadce5cbd3577c4d595e041e7 data/malum/advancements/recipes/malum_arcane_construct/runic_twisted_rock_tiles_stairs.json -15d20a3f6eaff304a5e8aa6c2536ffcee4c18c7a data/malum/advancements/recipes/malum_arcane_construct/runic_twisted_rock_tiles_wall.json -02ee6a8971b435dfdef1d0b55b96d30549fdeab2 data/malum/advancements/recipes/malum_arcane_construct/small_tainted_rock_bricks.json -c4d5a136c5b47afa48f3d8dde97acbb070c60d97 data/malum/advancements/recipes/malum_arcane_construct/small_tainted_rock_bricks_slab.json -f2656b2f8d28c056d5a6b1d69ecfeaa4cdc02881 data/malum/advancements/recipes/malum_arcane_construct/small_tainted_rock_bricks_slab_stonecutting.json -709467d47b9ef8ced34586bcde35a9941733e888 data/malum/advancements/recipes/malum_arcane_construct/small_tainted_rock_bricks_stairs.json -94b8f8fafc207b6b641c27fdb67833663c1c50c2 data/malum/advancements/recipes/malum_arcane_construct/small_tainted_rock_bricks_stairs_stonecutting.json -f7532492a22f2f7658766c9f0efdc059681d6ed6 data/malum/advancements/recipes/malum_arcane_construct/small_tainted_rock_bricks_stonecutting.json -8a4349e81616d74692b7913694e173de6be32f19 data/malum/advancements/recipes/malum_arcane_construct/small_tainted_rock_bricks_stonecutting_alt.json -1a49846ca4a1603549dccb0c111fb0fb878a2bd2 data/malum/advancements/recipes/malum_arcane_construct/small_tainted_rock_bricks_stonecutting_from_bricks.json -a84a2a7c93b81c252860b90e9a707e176d51d28f data/malum/advancements/recipes/malum_arcane_construct/small_tainted_rock_bricks_stonecutting_from_tiles.json -24bcf5ae11ff84f836bebe16b60dfa366b89b9c2 data/malum/advancements/recipes/malum_arcane_construct/small_tainted_rock_bricks_wall.json -b190ee240a78702e85a4bdd814ea0ce7e8914370 data/malum/advancements/recipes/malum_arcane_construct/small_tainted_rock_bricks_wall_stonecutting.json -769b17d91a37c04fb4231965526046b547fe6552 data/malum/advancements/recipes/malum_arcane_construct/small_twisted_rock_bricks.json -9d36d2486198700864736e274048a9d52eac6a2a data/malum/advancements/recipes/malum_arcane_construct/small_twisted_rock_bricks_slab.json -297eb1b19939b1bbbde0948b05405a9e5bfba619 data/malum/advancements/recipes/malum_arcane_construct/small_twisted_rock_bricks_slab_stonecutting.json -e2b271e53a6e6c0108370f5edd8841f25e2a7b83 data/malum/advancements/recipes/malum_arcane_construct/small_twisted_rock_bricks_stairs.json -3c5ce71fc79ee926735a6e6562452a1cc93e8253 data/malum/advancements/recipes/malum_arcane_construct/small_twisted_rock_bricks_stairs_stonecutting.json -ba8026c81c7c6a83fab1fba30cb79e3cce70a6ad data/malum/advancements/recipes/malum_arcane_construct/small_twisted_rock_bricks_stonecutting.json -10712caaeb7235c21176223f3e5c86cc0cc72809 data/malum/advancements/recipes/malum_arcane_construct/small_twisted_rock_bricks_stonecutting_alt.json -945ac1812fe8426ce3fc8cd78e1c1fdc5a3e7c5e data/malum/advancements/recipes/malum_arcane_construct/small_twisted_rock_bricks_stonecutting_from_bricks.json -c7a90100c6166701489ca9e69ed0a4af33f3d11c data/malum/advancements/recipes/malum_arcane_construct/small_twisted_rock_bricks_stonecutting_from_tiles.json -2f01432da9300e3c86dffb8aed20f78457ff11a5 data/malum/advancements/recipes/malum_arcane_construct/small_twisted_rock_bricks_wall.json -5b67a994520ccee02566c688d177f70730cffa1b data/malum/advancements/recipes/malum_arcane_construct/small_twisted_rock_bricks_wall_stonecutting.json -66500772b63880c4bc6320925fd6c873eb62abfa data/malum/advancements/recipes/malum_arcane_construct/smooth_tainted_rock.json -c2a7da03dcdd4f1a0c60e17ddcf114556cdef805 data/malum/advancements/recipes/malum_arcane_construct/smooth_tainted_rock_slab.json -10958dbc83f2e1ecabdcb3c584e1443cb8b31f6e data/malum/advancements/recipes/malum_arcane_construct/smooth_tainted_rock_slab_stonecutting.json -1e1c49fe62008cf301da050561c726f7f0f329cd data/malum/advancements/recipes/malum_arcane_construct/smooth_tainted_rock_stairs.json -3e805d76bad96a7e441d9736ea4c796f9307c675 data/malum/advancements/recipes/malum_arcane_construct/smooth_tainted_rock_stairs_stonecutting.json -f73cc77448c1b0df57232aaa1801b2c62c6df300 data/malum/advancements/recipes/malum_arcane_construct/smooth_tainted_rock_stonecutting.json -2d4885f677fa9b7e6cb3605d5d2984725f5331da data/malum/advancements/recipes/malum_arcane_construct/smooth_twisted_rock.json -e5a02806a26c61c36e06103d5dfe18b64b3e9cc6 data/malum/advancements/recipes/malum_arcane_construct/smooth_twisted_rock_slab.json -c2be615ba015fb14f5aade5ce4ecc4f4b8227708 data/malum/advancements/recipes/malum_arcane_construct/smooth_twisted_rock_slab_stonecutting.json -49b137354cade669c0173a0ca53fed61ba0446f2 data/malum/advancements/recipes/malum_arcane_construct/smooth_twisted_rock_stairs.json -caac9e6bcb5ed92542f061bb80a229906f98f138 data/malum/advancements/recipes/malum_arcane_construct/smooth_twisted_rock_stairs_stonecutting.json -fc204ea7b46874348c74b58964a8a646491863bb data/malum/advancements/recipes/malum_arcane_construct/smooth_twisted_rock_stonecutting.json -7a2e4a11e3625b6282ad47d86fbcdafac01745e5 data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_brick_wall_stonecutting.json -928f9bfa397b195f0d76cdb63d78db237883eb8d data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_bricks.json -629fdcd161d3c6b2bef122aca196427f68972552 data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_bricks_from_small_bricks.json -0732e517b111c9bd307a5e3b9ee94c9f226a35ec data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_bricks_slab.json -a8551967f035ea93a34e0231f23d4f9b683c5772 data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_bricks_slab_stonecutting.json -80102b3923607d7aaf97ee6e9c2dfc1eb57a3b13 data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_bricks_stairs.json -fc5cdd54c93018309c9993901e9e373da6110237 data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_bricks_stairs_stonecutting.json -67c5188427e9d262e4e907113138823394e053dc data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_bricks_stonecutting.json -64172698494739bc3b485ff142e55cc9e8edb51b data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_bricks_stonecutting_from_polished.json -ff53adab1df0d40961fc2e03cf0a8f4a8dbee70c data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_bricks_wall.json -c122ae43ffa69a94bb84ae93654a4a13156e60d8 data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_button.json -190c704819aefa03f280b7b1df1213c91db8a715 data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_column.json -087f8d78ea547fbaf08c68a3ac2849628dd2ca50 data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_column_cap.json -2533f20716a8dc123b235303e98e1fcf852ef8d3 data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_column_cap_stonecutting.json -281d6c51b5e36f787f9ae14ba3aef795598f9e55 data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_column_from_cap.json -ff3a9950a5f77f4564d797b9f1713968be98a23b data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_column_stonecutting.json -b7a55820e7bc370bbf2755fe58e9e72bcebf4091 data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_item_pedestal.json -dbf898fc85338f79994b1fd6b0672b929d4095eb data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_item_stand.json -2a34f7fd6369399d0136e133a74cbc6f7293a3ae data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_pressure_plate.json -e47a24549fe5bcc0e3d249d0df4bfe8ae0cde1ee data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_slab.json -d05778c62fe97b9ad1a0226e0dee8076f0a90af3 data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_slab_stonecutting.json -8dcace82c9e5b64efe9d6afcc2e2b7816d090959 data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_stairs.json -5595c51901e2a4d5d20b7d96876e250bf14e4567 data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_stairs_stonecutting.json -baf85ff24091042d4c46aa5709575e747acbbd0a data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_tiles.json -1e8347559b5a5d9099e2af6b07bbbbbb1196dc25 data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_tiles_slab.json -1a5dc9a0ead98c79564ec47aecc41a12ca0a0813 data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_tiles_slab_stonecutting.json -3cce43ad8ba836f0d18fd3f69458d8136349b147 data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_tiles_stairs.json -104e3de31076d36fcf2a56d32b609b21b9016576 data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_tiles_stairs_stonecutting.json -f6ab5b8d492b0fff6b579e5b1f676f10631a914e data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_tiles_stonecutting.json -f5050747ed7657e004a66258bca39f4385167e30 data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_tiles_stonecutting_from_bricks.json -c9f445e43c89a4de431ec20f50c15920f81fd77c data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_tiles_stonecutting_from_polished.json -b4f1df3b8ad42a131f9ed882c37f244814b26004 data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_tiles_wall.json -f4eb4ad40cb0396b976833a31673541698d38326 data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_tiles_wall_stonecutting.json -eaea2efe12d794414f68a514fc14536747df3193 data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_wall.json -d29d988f3e100376d221d30bc57a577ec248bc18 data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_wall_stonecutting.json -e758215aea25d67acb96ff46950844018c1b60eb data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_brick_wall_stonecutting.json -b59c7f8af2cbe073b95914bb1216e55a4706ef38 data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_bricks.json -926c7800f6530c71a846e6eb12cb0acdc2b2b453 data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_bricks_from_small_bricks.json -7f48a3e2c43f92c72d2a5093877154e53167ef52 data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_bricks_slab.json -6f018e8dac2e2bb6ce617a1d281997733a1eefd8 data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_bricks_slab_stonecutting.json -f8b7ff65b6c90a3bd92c2e6f2f5b962f91bb8790 data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_bricks_stairs.json -6a401fa4563f6f0e6b6b2b272c210aaae8d00c94 data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_bricks_stairs_stonecutting.json -84b059417f5065a584d788dfbff6a0d9d57cb9c0 data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_bricks_stonecutting.json -0b79e2598f5fbc4b1f37ae633d1caca997d3e05e data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_bricks_stonecutting_from_polished.json -803eaf9a2120b2a59620bf56b91c30c645835551 data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_bricks_wall.json -86ea0becec05ff8972a5661166bd5a131e302294 data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_button.json -151639d255ab902187378ac193954fcab55b55ea data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_column.json -cf2480630fce0ce048d9afb2575db1e860179644 data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_column_cap.json -520de773b31e9841c3e5b1526f5e4f81db100669 data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_column_cap_stonecutting.json -2e8b35ad57b2869f333f9f81cdbae0b3fb43b391 data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_column_from_cap.json -68e286ad6f45e4a66b022392f6d8617f171ee9b5 data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_column_stonecutting.json -7ec8b576b9df5edf33bcdb34f4a4f2ee9ab6d238 data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_item_pedestal.json -af26acc42c06b9cf225cd5734891244396ece815 data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_item_stand.json -85052c99dedb6b6b5008a66fcacc298ca48e8517 data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_pressure_plate.json -3598ca94c0f095571b461ad1d156fa108555542a data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_slab.json -598e1152c3f08894ab7afb5810579f59fff85296 data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_slab_stonecutting.json -d590da78340e09877f9d333cabaa7829338d1c6f data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_stairs.json -f4135b658f41b96cf50a27824c96e60914a3c362 data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_stairs_stonecutting.json -651dccff268e76e3363e5f5df70e25d60421738b data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_tiles.json -1d9e941ff59eff5a29f4fe6a52f1ac279de5fca6 data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_tiles_slab.json -f2389fafa33821aa2d897cd0f92e597c0fc87061 data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_tiles_slab_stonecutting.json -753d41c4963d0c25ed25c49dba8c1b7a201a8fb0 data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_tiles_stairs.json -7d296f04f67c0e312f5d701a89cc16b55cc7bb72 data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_tiles_stairs_stonecutting.json -040d23e01a1bcf9219fc50d2a165310c3dbf4a21 data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_tiles_stonecutting.json -1139775e81b824f7368bf9d212de2395b5baaf31 data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_tiles_stonecutting_from_bricks.json -3b1b2d1ec59889cf112b214931f3b4be4d465c00 data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_tiles_stonecutting_from_polished.json -e5ca929cde12c065464a214fb6042fe66d8b715b data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_tiles_wall.json -97e6117fa581b8cf6c732db84fe66976dd1ad7ff data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_tiles_wall_stonecutting.json -2fa545bdd097761e6ce4b97e4aea7890f4562c12 data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_wall.json -aa81558cf2fb532c4036b5ec284845de49669352 data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_wall_stonecutting.json -9313f3791176775c827dd27fd2599f8145dff648 data/malum/advancements/recipes/malum_basis_of_magic/alchemical_calx_from_block.json -f93dbc1df79c7413f25b97bd80186bc5e0b1ad54 data/malum/advancements/recipes/malum_basis_of_magic/arcane_charcoal_fragment.json -3fd68a6f51eb5efdc53d9f8484677695023f7f7d data/malum/advancements/recipes/malum_basis_of_magic/arcane_charcoal_from_block.json -5a8b849156464d498784565e13939843f4e3b995 data/malum/advancements/recipes/malum_basis_of_magic/arcane_charcoal_from_fragment.json -78d7b7fff60dc936424ff1e03300ff97a5048c50 data/malum/advancements/recipes/malum_basis_of_magic/arcane_charcoal_from_runewood.json -20fe177dd09ab10a9b37527b7171adf7b1b19def data/malum/advancements/recipes/malum_basis_of_magic/arcane_charcoal_from_soulwood.json -d21deac83bab32f8bc790a6ea15ffd33a8244242 data/malum/advancements/recipes/malum_basis_of_magic/astral_weave_from_block.json -923296c1b50ea5120c2db8381307345a0927e8d8 data/malum/advancements/recipes/malum_basis_of_magic/blazing_quartz_fragment.json -c7c8640a96b6a4148906cc1039796bfe5950eeec data/malum/advancements/recipes/malum_basis_of_magic/blazing_quartz_from_blasting.json -c61f25a880b9b0140971206c7f082ac80507f854 data/malum/advancements/recipes/malum_basis_of_magic/blazing_quartz_from_block.json -8f7776ff2df47ec310db4a75c81de5f159dba626 data/malum/advancements/recipes/malum_basis_of_magic/blazing_quartz_from_fragment.json -ef77776c9d132cf5e35fc5a53d7d65e3700afcbc data/malum/advancements/recipes/malum_basis_of_magic/blazing_quartz_from_smelting.json -71051f8a1fef71fe798c4690921337b19a93cc80 data/malum/advancements/recipes/malum_basis_of_magic/bligh.json -aa43fe5dd3fa040364de467960bd1e7b8102ca5f data/malum/advancements/recipes/malum_basis_of_magic/block_of_alchemical_calx.json -296f1f0fef5a0fddf47e8839a939f37ba25863e0 data/malum/advancements/recipes/malum_basis_of_magic/block_of_arcane_charcoal.json -88d13a4fac61e91c5ef76b4c424585a1c02623c1 data/malum/advancements/recipes/malum_basis_of_magic/block_of_astral_weave.json -ea33602957bc9b0980d2a2eddea701c510603903 data/malum/advancements/recipes/malum_basis_of_magic/block_of_blazing_quartz.json -d227aad82fc0dc2b6333c95e323334399d0413c8 data/malum/advancements/recipes/malum_basis_of_magic/block_of_brilliance.json -34c821c49da1797926830978cbf0e62dcb26f96c data/malum/advancements/recipes/malum_basis_of_magic/block_of_cursed_grit.json -dd921ceecd47a72fd5a5962d96eb24c1896dd826 data/malum/advancements/recipes/malum_basis_of_magic/block_of_grim_talc.json -dbffccf9e808b7c3945b1f95bd444583d713149d data/malum/advancements/recipes/malum_basis_of_magic/block_of_hallowed_gold.json -740f758ae6f1f1ff8b08f4e4032756363ea58460 data/malum/advancements/recipes/malum_basis_of_magic/block_of_hex_ash.json -c840119f35214c5de16e262e20e1df5344a2d8e5 data/malum/advancements/recipes/malum_basis_of_magic/block_of_rotting_essence.json -b4a7a05d5f62bbebb41d8c465a6e26c75d85e8ac data/malum/advancements/recipes/malum_basis_of_magic/block_of_soul_stained_steel.json -7e333daf2d6c057d14745c81f72c64da3486b131 data/malum/advancements/recipes/malum_basis_of_magic/block_of_soulstone.json -a282712199bdf307efb719823081cd363d12de35 data/malum/advancements/recipes/malum_basis_of_magic/brilliance_from_block.json -57ef70b3487e5568dbf16419c261e17cb7ba22d9 data/malum/advancements/recipes/malum_basis_of_magic/crude_scythe.json -1991f8a540ac2ba3695f4c04022fd250c2143d95 data/malum/advancements/recipes/malum_basis_of_magic/cthonic_gold_from_blasting.json -57fab76c26f10fb424adba309c4d4011c52b5488 data/malum/advancements/recipes/malum_basis_of_magic/cthonic_gold_from_smelting.json -ac7c88558d36ca1f4b981d4330f59821f56a3dbb data/malum/advancements/recipes/malum_basis_of_magic/cursed_grit_from_block.json -85bd1ee2d3023f6c47cc76c68ffefcc98e6603bc data/malum/advancements/recipes/malum_basis_of_magic/encyclopedia_arcana.json -0279eb342dfe983ee6480bb5dccc33997989b563 data/malum/advancements/recipes/malum_basis_of_magic/gilded_belt.json -62704d71cd4c672df40bb315a750bf455d1c5c60 data/malum/advancements/recipes/malum_basis_of_magic/gilded_ring.json -8918ab0f38b4e6450019553cc33e20643fa78200 data/malum/advancements/recipes/malum_basis_of_magic/grim_talc_from_block.json -4e8b1082706a0ab77abe5c7a71c21bb5f8c6ea7c data/malum/advancements/recipes/malum_basis_of_magic/hallowed_gold_from_block.json -f96f82cdb39b1b860d74012eebd61fdee1da1b37 data/malum/advancements/recipes/malum_basis_of_magic/hallowed_gold_from_nuggets.json -0445f0f9e8dee90b3d7206444d4aafed739bc4dd data/malum/advancements/recipes/malum_basis_of_magic/hallowed_gold_nugget.json -80932705253c5851fc1c9c1296d4ac4cd2d7498a data/malum/advancements/recipes/malum_basis_of_magic/hex_ash_from_block.json -ed30adb0988075e33c28a147a1f98061d30c8e35 data/malum/advancements/recipes/malum_basis_of_magic/natural_quartz_from_blasting.json -e1287116b8a7e57831ef66fb1b120ec0c340f8aa data/malum/advancements/recipes/malum_basis_of_magic/natural_quartz_from_deepslate_blasting.json -95ccb278d19d174d8c2bc554ab8eeacfae807771 data/malum/advancements/recipes/malum_basis_of_magic/natural_quartz_from_deepslate_smelting.json -100eb4b60b9de9125878011171b06615a6396b5f data/malum/advancements/recipes/malum_basis_of_magic/natural_quartz_from_smelting.json -49460703967b8abad7645bcf0544369274354f69 data/malum/advancements/recipes/malum_basis_of_magic/ornate_necklace.json -5c671252947042a941ae22823591761bd7d34d8f data/malum/advancements/recipes/malum_basis_of_magic/ornate_ring.json -dd757c02ca15aeceddbc37b8d6a66cb080d91efc data/malum/advancements/recipes/malum_basis_of_magic/raw_soulstone_block.json -b8fbee10eb380c7061f1530bfb4359017c739039 data/malum/advancements/recipes/malum_basis_of_magic/raw_soulstone_from_block.json -7b07798b4450b07aafedf3c5c0c40c8646b376ab data/malum/advancements/recipes/malum_basis_of_magic/rotting_essence_from_block.json -04e2445f8812d2a6114364296ae92b57e44750e1 data/malum/advancements/recipes/malum_basis_of_magic/soul_stained_steel_axe.json -87b4d0e1243b7fbff90836befcbd0ce8b9fa98ef data/malum/advancements/recipes/malum_basis_of_magic/soul_stained_steel_from_block.json -9e5e3ae83936b024503eb3117fd2b5ae26c3899f data/malum/advancements/recipes/malum_basis_of_magic/soul_stained_steel_from_nuggets.json -931f72fd4b704b7c3e2e02dbd707609ce641a0b3 data/malum/advancements/recipes/malum_basis_of_magic/soul_stained_steel_hoe.json -189361fbbef89a72dcbaa28d6c7a4cf335978564 data/malum/advancements/recipes/malum_basis_of_magic/soul_stained_steel_nugget.json -bca76e32b21b314c0dfc37c8e51114c182780957 data/malum/advancements/recipes/malum_basis_of_magic/soul_stained_steel_pickaxe.json -26b46c9aaf55aea981d812012016fb75d0ba930e data/malum/advancements/recipes/malum_basis_of_magic/soul_stained_steel_shovel.json -c8b15c9b93b10a9559d62899726739a11c86cffb data/malum/advancements/recipes/malum_basis_of_magic/soul_stained_steel_sword.json -d0ede04417256bcc87f6fe355eed5832b2557235 data/malum/advancements/recipes/malum_basis_of_magic/soulstone_from_blasting.json -a93864276b4ec3a9d03a8ed4e758b67c13309d1d data/malum/advancements/recipes/malum_basis_of_magic/soulstone_from_block.json -fe352f12c49722b35889eeeffd5a3b429f1a6249 data/malum/advancements/recipes/malum_basis_of_magic/soulstone_from_crushed_blasting.json -8dbf79a403f3fa2fb721ba054aee27d0d8dc4824 data/malum/advancements/recipes/malum_basis_of_magic/soulstone_from_crushed_smelting.json -132070f42c17e77c61ec2683fee01d9032d25f8b data/malum/advancements/recipes/malum_basis_of_magic/soulstone_from_deepslate_blasting.json -6033da9b07d9747d389ad76d189c0abeca29f2ad data/malum/advancements/recipes/malum_basis_of_magic/soulstone_from_deepslate_smelting.json -04fac4e8cadf945bca77ba925915bbd3890a2911 data/malum/advancements/recipes/malum_basis_of_magic/soulstone_from_raw_blasting.json -b07eb07a546e1158f09f8f3c569a00154fdaf1c4 data/malum/advancements/recipes/malum_basis_of_magic/soulstone_from_raw_smelting.json -dfce8bc59be3e25b6f5fcaf739249e9a84fc89e2 data/malum/advancements/recipes/malum_basis_of_magic/soulstone_from_smelting.json -d3c046e84b46234b81437319e928c81b56737faf data/malum/advancements/recipes/malum_basis_of_magic/spectral_lens.json -3d7c52727a174e51aa6876263d89d1a9401f0afb data/malum/advancements/recipes/malum_basis_of_magic/spectral_optic.json -3c4a3d498d982a9cb64515a5bc93918705c602de data/malum/advancements/recipes/malum_basis_of_magic/spirit_altar.json -d44afe33bb141ffd33bf2871565389072330ee6b data/malum/advancements/recipes/malum_basis_of_magic/spirit_jar.json -9ec366497564fd320ad3e1f4a821a6c1d4ac65a1 data/malum/advancements/recipes/malum_basis_of_magic/spirit_pouch.json -e50c75a03cdb2d77fd0eb510fe6e8e7e40da0aea data/malum/advancements/recipes/malum_cosmetics/ace_prideweave.json -1d13f9affa1f95d62ea28bc32da5ffbdea2ee4ca data/malum/advancements/recipes/malum_cosmetics/agender_prideweave.json -30dcd46c8eb5e655921c6bcc1f9d5957c6beccee data/malum/advancements/recipes/malum_cosmetics/ancient_weave.json -db65c4a41128478f10e03c8fddab6fa72faded98 data/malum/advancements/recipes/malum_cosmetics/aro_prideweave.json -3a3a19676428d5b5258785830fbe69d7fbeb18f8 data/malum/advancements/recipes/malum_cosmetics/aroace_prideweave.json -b152d66515088e0e538c2d37b29f0d4105b0004e data/malum/advancements/recipes/malum_cosmetics/bi_prideweave.json -b953e4ef7954bdced03cf4bb511af105818db0d1 data/malum/advancements/recipes/malum_cosmetics/cornered_weave.json -900a53af1fbee26cdc1a53fe7e50950feafaadd9 data/malum/advancements/recipes/malum_cosmetics/demiboy_prideweave.json -5f0cf6b222c01f0be9d281355b456bc6889a36a1 data/malum/advancements/recipes/malum_cosmetics/demigirl_prideweave.json -1d252e35c2002353c253bf4676ea014237114217 data/malum/advancements/recipes/malum_cosmetics/dreaded_weave.json -dd877323f1ffc544a1a08d082d624049de99924f data/malum/advancements/recipes/malum_cosmetics/enby_prideweave.json -44bab3e6a9db5d25de5b43e5ee84a2d297d2a946 data/malum/advancements/recipes/malum_cosmetics/gay_prideweave.json -feed1d83443af8e17fa69687646b0c9bb12bac15 data/malum/advancements/recipes/malum_cosmetics/genderfluid_prideweave.json -3d3c745f01e421efa123b2c4920fb3afb7a21ce6 data/malum/advancements/recipes/malum_cosmetics/genderqueer_prideweave.json -27f8643b878c264cb267953b0439a8e9fea14d06 data/malum/advancements/recipes/malum_cosmetics/intersex_prideweave.json -a396b690cf3911f94f7075d09b05a8d2c70219c2 data/malum/advancements/recipes/malum_cosmetics/lesbian_prideweave.json -8da6daf654ab3105d737c18c486da2c8e369c8ca data/malum/advancements/recipes/malum_cosmetics/mechanical_weave_v1.json -d1732a82c14abfe61318b83b42a7b546fe905e7e data/malum/advancements/recipes/malum_cosmetics/mechanical_weave_v2.json -dbb8222c0b33eab84b289b8a72d3887235957c47 data/malum/advancements/recipes/malum_cosmetics/pan_prideweave.json -d409e49f572cb27c8ab4e26edd0bd1c3a560204a data/malum/advancements/recipes/malum_cosmetics/plural_prideweave.json -b12161d6464c266d4c30faf4a0b399f40836b0df data/malum/advancements/recipes/malum_cosmetics/poly_prideweave.json -dfa9defac8399bf0fdbae9d48a46a34f57003373 data/malum/advancements/recipes/malum_cosmetics/pride_prideweave.json -376199ebe935ad3a47c61d5928791ec899f8e413 data/malum/advancements/recipes/malum_cosmetics/trans_prideweave.json -083160a9a3cc86e14dfc401e9d1f3f4a8ab25daf data/malum/advancements/recipes/malum_cosmetics/weavers_workbench.json -eb4afa54c5429ef9478c60a9b0f3196990555512 data/malum/advancements/recipes/malum_natural_wonders/blighted_gunk_from_mass.json -eb2c3ff0609736b2f7bc2328901e7301512e1c5d data/malum/advancements/recipes/malum_natural_wonders/cut_runewood_planks.json -5f5d78bfd4dbb1809f9eaa10f2390047099abaef data/malum/advancements/recipes/malum_natural_wonders/cut_soulwood_planks.json -0acf32f0e53b70a2b3fd7f9de561b9f6488787a2 data/malum/advancements/recipes/malum_natural_wonders/holy_sap_from_smelting.json -c58a8aeca7e956045da9dea3c2a0a2cb6a293370 data/malum/advancements/recipes/malum_natural_wonders/holy_sap_from_smoking.json -a1c086d459a0863f204e079739ff672f3f0f3a90 data/malum/advancements/recipes/malum_natural_wonders/holy_sapball.json -7cf50150fcf4945e84de43cab71b19a05d21eb9a data/malum/advancements/recipes/malum_natural_wonders/runewood.json -004216e56c6e13534e884168103b4b34899e94b7 data/malum/advancements/recipes/malum_natural_wonders/runewood_beam.json -2adeba39ed4267f9155e25306b17076e4af7b5bb data/malum/advancements/recipes/malum_natural_wonders/runewood_boat.json -1703acac7e390d22cf11a0f0674c056210bd2b66 data/malum/advancements/recipes/malum_natural_wonders/runewood_door.json -b766919ee5617ef5074c61251b158ad0cfaf8706 data/malum/advancements/recipes/malum_natural_wonders/runewood_item_pedestal.json -57ef29427f63af8641be4c97f5fac272ac841a3d data/malum/advancements/recipes/malum_natural_wonders/runewood_item_stand.json -cfda0700918a6f8f7f8e3b48906829490829bc01 data/malum/advancements/recipes/malum_natural_wonders/runewood_panel.json -631178e53bee6f736e7d01cffddd524eee511826 data/malum/advancements/recipes/malum_natural_wonders/runewood_panel_slab.json -1194a416e3fa479c089c36543cbb84c20161a4c7 data/malum/advancements/recipes/malum_natural_wonders/runewood_panel_stairs.json -56f1b6741277a3e4c418584a5406992a128443a0 data/malum/advancements/recipes/malum_natural_wonders/runewood_planks.json -1e7dd00a3da475eae2ffc2cb3dece5bdd244104e data/malum/advancements/recipes/malum_natural_wonders/runewood_planks_button.json -6cce3bd929ab30500bf62bbc6e5e2d52002ea548 data/malum/advancements/recipes/malum_natural_wonders/runewood_planks_fence.json -025babe33b1c5f58cb7a5df52ec6d8f359659056 data/malum/advancements/recipes/malum_natural_wonders/runewood_planks_fence_gate.json -e6c40acd262322618c35579935c53e1a104aa940 data/malum/advancements/recipes/malum_natural_wonders/runewood_planks_pressure_plate.json -a62801f12e6f69395d5e8b4e87c61d8ee2a17b79 data/malum/advancements/recipes/malum_natural_wonders/runewood_planks_slab.json -30c8a44cc4eb800351e01ce44b24c5541de0481d data/malum/advancements/recipes/malum_natural_wonders/runewood_planks_stairs.json -2347ebc71a3c326a6c67be18cab8a456d94ca696 data/malum/advancements/recipes/malum_natural_wonders/runewood_sign.json -1e542cea9ed7b1b3eb584c9e108c04d8b6c39885 data/malum/advancements/recipes/malum_natural_wonders/runewood_tiles.json -b9b7bea66c627b7399868d5a6153aad3b08c8e91 data/malum/advancements/recipes/malum_natural_wonders/runewood_tiles_slab.json -93100af7f21096cf49ea0766c8712403444ee624 data/malum/advancements/recipes/malum_natural_wonders/runewood_tiles_stairs.json -53cb02b8d819a90132160e63ef2b2ab71c483c31 data/malum/advancements/recipes/malum_natural_wonders/runewood_trapdoor.json -7e77638dbaecce5ee73b5622a1b860d2f9522eae data/malum/advancements/recipes/malum_natural_wonders/runewood_trapdoor_from_solid.json -1d60c7ca7297b2cb0700549a7cdd39c2960471f7 data/malum/advancements/recipes/malum_natural_wonders/solid_runewood_trapdoor.json -e3ebb907f25f7094f85835d4a63f50628eb2e96e data/malum/advancements/recipes/malum_natural_wonders/solid_soulwood_trapdoor.json -ea139e00dcd3c62c3a5a6c942df2420df635729d data/malum/advancements/recipes/malum_natural_wonders/soulwood.json -07a86f11c089eb579190e30cd40a71bc758fc01f data/malum/advancements/recipes/malum_natural_wonders/soulwood_beam.json -7c946882a649c93c0599a8dce2e874b6cc2f765b data/malum/advancements/recipes/malum_natural_wonders/soulwood_boat.json -3e8f17d6a119f10921b19cb3d97b386a74987ccd data/malum/advancements/recipes/malum_natural_wonders/soulwood_door.json -1a8257a568640b13cf752c47f72a66b819f348fb data/malum/advancements/recipes/malum_natural_wonders/soulwood_item_pedestal.json -2b8b3a19a6abcfa58178a47ea23b20f8b19c8185 data/malum/advancements/recipes/malum_natural_wonders/soulwood_item_stand.json -562a2da73a88d8036b8caeeb1af56cdfb187b3e6 data/malum/advancements/recipes/malum_natural_wonders/soulwood_panel.json -a73e5507faf6ad250683d5ef290cb66313044235 data/malum/advancements/recipes/malum_natural_wonders/soulwood_panel_slab.json -a877e594b1f7fbd91d93ec7ad3aea6cb3f41f685 data/malum/advancements/recipes/malum_natural_wonders/soulwood_panel_stairs.json -ed4a0906ec42f02592ceb054382cf826587cfe62 data/malum/advancements/recipes/malum_natural_wonders/soulwood_planks.json -0070697eb288cef7522fbb42779c5b3eb0202953 data/malum/advancements/recipes/malum_natural_wonders/soulwood_planks_button.json -a77edd19a88893e17910f72aecdd36ca78f2dac8 data/malum/advancements/recipes/malum_natural_wonders/soulwood_planks_fence.json -ab754c1d77bd75abcd81ad0d758dd622cdc8c11e data/malum/advancements/recipes/malum_natural_wonders/soulwood_planks_fence_gate.json -3c9a77ca462acde77c4fbfb0362ef9101167ee36 data/malum/advancements/recipes/malum_natural_wonders/soulwood_planks_pressure_plate.json -c1fd6f3318d6417304a5885ebb1410141554ee84 data/malum/advancements/recipes/malum_natural_wonders/soulwood_planks_slab.json -181127736b118e4af06c2c1e6dde9a6996353039 data/malum/advancements/recipes/malum_natural_wonders/soulwood_planks_stairs.json -6441a2d35f2438d0d96991afc12fbee9bd7c8753 data/malum/advancements/recipes/malum_natural_wonders/soulwood_sign.json -bc98a1c6b3990b6063c9bdc498440d1221d828ad data/malum/advancements/recipes/malum_natural_wonders/soulwood_tiles.json -e5c5b0069fc9cf4027bbcc21788b99ef73c29f48 data/malum/advancements/recipes/malum_natural_wonders/soulwood_tiles_slab.json -7f4f391844987be76ee4e25ea31a9ace7a2935f0 data/malum/advancements/recipes/malum_natural_wonders/soulwood_tiles_stairs.json -680e15362a53363943a00226d42fe628729e2ebb data/malum/advancements/recipes/malum_natural_wonders/soulwood_trapdoor.json -553f039a7572abd7e5adb2c15bd70ddb88e7fd4f data/malum/advancements/recipes/malum_natural_wonders/soulwood_trapdoor_from_solid.json -81ca9d7da28ed02923d8f538d712a1a222dc8c17 data/malum/advancements/recipes/malum_natural_wonders/stripped_runewood.json -88ae0b2adb0945f22febc8b5ad2ee80a693d2f22 data/malum/advancements/recipes/malum_natural_wonders/stripped_soulwood.json -c141cd90c9cca9d2f0f36488b28a5f0003d051d0 data/malum/advancements/recipes/malum_natural_wonders/unholy_sap_from_smelting.json -00ce4f2a72f0a3efc8fbed1730f86cff7b3431fd data/malum/advancements/recipes/malum_natural_wonders/unholy_sap_from_smoking.json -c7fb27393bef1e5fa89d4cc55f24c7d6581f4886 data/malum/advancements/recipes/malum_natural_wonders/unholy_sapball.json -b1055d9e4ef4658435608931d2e492cd8f8a2829 data/malum/advancements/recipes/malum_natural_wonders/vertical_runewood_planks.json -d26d68421a4f97ddc9e4134a0227efd439f7f0c3 data/malum/advancements/recipes/malum_natural_wonders/vertical_runewood_planks_slab.json -27f1b9a8db1d175c8f65158e68ffba00ce44d874 data/malum/advancements/recipes/malum_natural_wonders/vertical_runewood_planks_stairs.json -dbb75e39c83d41c08d95e35235cf252450ae5318 data/malum/advancements/recipes/malum_natural_wonders/vertical_soulwood_planks.json -1792414f58dd360a050b74df1201e9a4377d78fa data/malum/advancements/recipes/malum_natural_wonders/vertical_soulwood_planks_slab.json -5ffe036835716f9e4ad0a595ca9a28feb86fe684 data/malum/advancements/recipes/malum_natural_wonders/vertical_soulwood_planks_stairs.json -ed3d604bba241a9ca55da826f064e1f804045ea2 data/malum/advancements/recipes/misc/bonemeal_from_grim_talc.json -94cc4abe07bb29f71626dd51f3be2ffe7ae4d9bc data/malum/advancements/recipes/misc/brilliance_from_blasting.json -345dcbd22ec1bc5c2a3a126e394df1d0eddab19b data/malum/advancements/recipes/misc/brilliance_from_crushed_blasting.json -27d9d19d7c2af7db6587d278cb7f86b74158d1c2 data/malum/advancements/recipes/misc/brilliance_from_crushed_smelting.json -da3c53f2f861ce8c9275f762f1320b8d945b8a58 data/malum/advancements/recipes/misc/brilliance_from_deepslate_blasting.json -ab469057129a0e123f4697f473fb16740e847cb1 data/malum/advancements/recipes/misc/brilliance_from_deepslate_smelting.json -f861d781f42d8c4bfd8480a1150cdb72287c0bf5 data/malum/advancements/recipes/misc/brilliance_from_raw_blasting.json -76804dce477e485af639aa633b495a4f2c2014a9 data/malum/advancements/recipes/misc/brilliance_from_raw_smelting.json -a9403f5dc8c6196d03ffab1f452cd3cacc4e8381 data/malum/advancements/recipes/misc/brilliance_from_smelting.json -7f2c18a86bc5d36e573861464faf34fb48b50eee data/malum/advancements/recipes/misc/charcoal_fragment.json -d21b36181f4c6363e98e2c0e6f4ca430045c6084 data/malum/advancements/recipes/misc/charcoal_from_fragment.json -7d84bc31401aba9335bf1544346118bd1a2f85dc data/malum/advancements/recipes/misc/coal_fragment.json -5b1db948a86bfa89d5768301bedaf85fa5c5c57e data/malum/advancements/recipes/misc/coal_from_fragment.json -c9a3ca54a2d6312f04e85c8796c1ed7bd0a3848b data/malum/advancements/recipes/misc/copper_from_node_blasting.json -aa0f3d4fe61a3a8d39fdef03f033857520b6e752 data/malum/advancements/recipes/misc/copper_from_node_smelting.json -0a9cc047b2fa63a710f6c4f2152164fe20097431 data/malum/advancements/recipes/misc/copper_ingot_from_nugget.json -596943d5bd5543a288611be85cf0b1af8da1de05 data/malum/advancements/recipes/misc/copper_nugget_from_ingot.json -7ffbf33b0559f99a5d29afc8ed8cfb53e278ea92 data/malum/advancements/recipes/misc/experience_bottle_from_brilliance.json -bbb64b94477a930f1ea97f0795ce40b221591d9d data/malum/advancements/recipes/misc/gold_from_node_blasting.json -7443300a0178664fad0623453a49b75a89475fcc data/malum/advancements/recipes/misc/gold_from_node_smelting.json -ccbc925aaba00019ad52670e333d1aad31a38256 data/malum/advancements/recipes/misc/iron_from_node_blasting.json -dfc27679bcc7383e200819fbbabd56f255e0ef43 data/malum/advancements/recipes/misc/iron_from_node_smelting.json -6f8925039c15df8b1d3c2fefd4c8ecd049f63580 data/malum/advancements/recipes/nickel_from_node_blasting.json -6f8925039c15df8b1d3c2fefd4c8ecd049f63580 data/malum/advancements/recipes/nickel_from_node_smelting.json -68593e1455cc2ce8a9874ca079575557cf96d48a data/malum/advancements/recipes/node_focusing_aluminum.json -5ad72f3d946b8563c24e55cd8688620e24f9f2ca data/malum/advancements/recipes/node_focusing_lead.json -8a56271a5b089bcae756d82568269467dcea445a data/malum/advancements/recipes/node_focusing_nickel.json -d90df1d668552f62ae86c99ebdb75d1d79b48f37 data/malum/advancements/recipes/node_focusing_osmium.json -9d6966d78779f3a74e45f6f6acf9dd8172ad6bce data/malum/advancements/recipes/node_focusing_silver.json -2f883519698070e896a30f066c67504ab94cb60a data/malum/advancements/recipes/node_focusing_tin.json -a49106d71be33f0d496e03ca5829077d48484135 data/malum/advancements/recipes/node_focusing_uranium.json -fc3d62f79a01a5b52c6b1971db71dc5131076b75 data/malum/advancements/recipes/node_focusing_zinc.json -a09936920ea12a18b6c12a44d58992b731783579 data/malum/advancements/recipes/osmium_from_node_blasting.json -a09936920ea12a18b6c12a44d58992b731783579 data/malum/advancements/recipes/osmium_from_node_smelting.json -a5bcbfbdb1c291b93ff9c93b248927a6737c979f data/malum/advancements/recipes/redstone/sticky_piston_from_sapballs.json -ad710f07c3023235dae5606cdf14d920482abc82 data/malum/advancements/recipes/silver_from_node_blasting.json -ad710f07c3023235dae5606cdf14d920482abc82 data/malum/advancements/recipes/silver_from_node_smelting.json -d23c7574a1c85d50fddc6bd91bd9a7aae3ea4888 data/malum/advancements/recipes/the_device/the_device.json -33797da612ba27c05550374a7fce0c216b03ffd8 data/malum/advancements/recipes/tin_from_node_blasting.json -33797da612ba27c05550374a7fce0c216b03ffd8 data/malum/advancements/recipes/tin_from_node_smelting.json -07975a67833ac35a1b5546459965a152ee220c41 data/malum/advancements/recipes/tools/lead_from_sapballs.json -70a307c5cd76d4d18a4e875327135149ce72aaa5 data/malum/advancements/recipes/uranium_from_node_blasting.json -70a307c5cd76d4d18a4e875327135149ce72aaa5 data/malum/advancements/recipes/uranium_from_node_smelting.json -4b2a3a3874eb72ba143b55d1977d7dd3da2828b3 data/malum/advancements/recipes/zinc_from_node_blasting.json -4b2a3a3874eb72ba143b55d1977d7dd3da2828b3 data/malum/advancements/recipes/zinc_from_node_smelting.json -e55b89bf73835e139909d23bba48229953f3a51c data/malum/loot_tables/blocks/blazing_quartz_ore.json -fba23ab859411452d0396f5cc72998558a9918d3 data/malum/loot_tables/blocks/blighted_earth.json -a942c71b9eb821ecde6adfc82112646c2838fbbf data/malum/loot_tables/blocks/blighted_soil.json -9ac48b9175ed18f99364bda5d2fe0f533c59a412 data/malum/loot_tables/blocks/blighted_soulwood.json -56ab81d3b432d39fd2b0316c332730af41a02aa6 data/malum/loot_tables/blocks/blighted_tumor.json -aac19bcc218021786b410b0c9c7593b056b7a4d8 data/malum/loot_tables/blocks/blighted_weed.json -f7df70b07e71e027ed274435b660192d74ac76b7 data/malum/loot_tables/blocks/block_of_alchemical_calx.json -f6ee74bebc1674334ba3a2707f89348eb3651b4d data/malum/loot_tables/blocks/block_of_arcane_charcoal.json -1184a01129af9dab2885b49c0c24a2675e0cebc3 data/malum/loot_tables/blocks/block_of_astral_weave.json -4570e11cdd5518b632bb1d64756c969a6fa300a2 data/malum/loot_tables/blocks/block_of_blazing_quartz.json -4c97116457804c1066aa476f20dc2d394d73c28b data/malum/loot_tables/blocks/block_of_brilliance.json -342e897a195d9fed5d0b7ce74a01770ff8289da4 data/malum/loot_tables/blocks/block_of_cthonic_gold.json -d54868284574840314e1dd67d3b614cea5970d35 data/malum/loot_tables/blocks/block_of_cursed_grit.json -0ba703255a85c057edbe7e85416927e83b96d5b8 data/malum/loot_tables/blocks/block_of_grim_talc.json -0178cb28e7cddb456306acb6858b2f1c1ce1b0c3 data/malum/loot_tables/blocks/block_of_hallowed_gold.json -a363aa8a376798ccf6f0af091129b7a19f93109e data/malum/loot_tables/blocks/block_of_hex_ash.json -f095e0df0ed4c80c56b0a71e6c076c463fffc8b1 data/malum/loot_tables/blocks/block_of_raw_soulstone.json -467443f0fbfb89bceddae1010865d4ec0577e367 data/malum/loot_tables/blocks/block_of_rotting_essence.json -682a24f85705462df4c607a9fd48ae58b96448f7 data/malum/loot_tables/blocks/block_of_soul_stained_steel.json -5eff615584503cc3e1d0425af301825406debaf0 data/malum/loot_tables/blocks/block_of_soulstone.json -af6364ca475aed4db550a5f2aee438afb7f7b87e data/malum/loot_tables/blocks/block_of_void_salts.json -18cdd2c1c975ff1d5ef127d81079996c21342510 data/malum/loot_tables/blocks/brilliant_deepslate.json -062ba41aff0e0c6c7e16997c50fca62943520b65 data/malum/loot_tables/blocks/brilliant_obelisk.json -fec029d0e19ca5bf20098894f7572bcd6e6be667 data/malum/loot_tables/blocks/brilliant_stone.json -02a420b5ff94c191c4e1fd5de1d084b952a23c8d data/malum/loot_tables/blocks/chiseled_tainted_rock.json -26603d7bfac51d89ac63126d06ada42afb256f9d data/malum/loot_tables/blocks/chiseled_twisted_rock.json -6f75a28c7e45b3d9cea59f3f1594044eacffe019 data/malum/loot_tables/blocks/cut_runewood_planks.json -7329ec7a9b666c3b2435d1f06d5b14148f881e93 data/malum/loot_tables/blocks/cut_soulwood_planks.json -cfc24d01c96cbfeaadda5f8d1e4dc67c4561aa85 data/malum/loot_tables/blocks/cut_tainted_rock.json -3ded2962ed5bc9afd5bd566ac3bca59e3b87c656 data/malum/loot_tables/blocks/cut_twisted_rock.json -35f985adad3b96b824ad61dbffea48ea643aa7be data/malum/loot_tables/blocks/deepslate_quartz_ore.json -5c8ecec87c05f472c60050f3bef082d2d4bf5fb4 data/malum/loot_tables/blocks/deepslate_soulstone_ore.json -8c638a792fde2faaf15b0aedf80ecc6aebfb26eb data/malum/loot_tables/blocks/ether.json -f458efbeda30277525db2865e91e3d6d5ad3b3e7 data/malum/loot_tables/blocks/ether_torch.json -c7670145d1f3222017fabb26994ae00c868e5992 data/malum/loot_tables/blocks/exposed_runewood_log.json -2580e4d4e74619704f94e5fbf8144500eaef7ba3 data/malum/loot_tables/blocks/exposed_soulwood_log.json -0e2779a94c923cd249d07b94fe7e45f7da3d86ee data/malum/loot_tables/blocks/iridescent_ether.json -aef6ef17478afb028d18446b39f89203be4855b7 data/malum/loot_tables/blocks/iridescent_ether_torch.json -20c30059ff36eb4c8dbd4162bbd441d2a3d40839 data/malum/loot_tables/blocks/mass_of_blighted_gunk.json -5c1df8443043b3fe3b665dba348e2ff188bcbe31 data/malum/loot_tables/blocks/mote_of_aerial_arcana.json -5c1df8443043b3fe3b665dba348e2ff188bcbe31 data/malum/loot_tables/blocks/mote_of_aqueous_arcana.json -5c1df8443043b3fe3b665dba348e2ff188bcbe31 data/malum/loot_tables/blocks/mote_of_earthen_arcana.json -5c1df8443043b3fe3b665dba348e2ff188bcbe31 data/malum/loot_tables/blocks/mote_of_eldritch_arcana.json -5c1df8443043b3fe3b665dba348e2ff188bcbe31 data/malum/loot_tables/blocks/mote_of_infernal_arcana.json -5c1df8443043b3fe3b665dba348e2ff188bcbe31 data/malum/loot_tables/blocks/mote_of_raw_arcana.json -5c1df8443043b3fe3b665dba348e2ff188bcbe31 data/malum/loot_tables/blocks/mote_of_sacred_arcana.json -5c1df8443043b3fe3b665dba348e2ff188bcbe31 data/malum/loot_tables/blocks/mote_of_wicked_arcana.json -c149925332df06ea040e4eb7d380ba48e069b57c data/malum/loot_tables/blocks/natural_quartz_cluster.json -49d9f4f741a0da965dc92c00eabe0cad1d11577e data/malum/loot_tables/blocks/natural_quartz_ore.json -aeae36f6b4107e61860481ce78b0aedf9d56fb21 data/malum/loot_tables/blocks/polished_tainted_rock.json -07c57a6d3cd71fe4cf1e77765a15638ce41d3a03 data/malum/loot_tables/blocks/polished_tainted_rock_slab.json -67a52188d8db9c170a9f84168c4f297387e06af4 data/malum/loot_tables/blocks/polished_tainted_rock_stairs.json -e56e34384c6038ef81416d87c3cdc60b1aec8f14 data/malum/loot_tables/blocks/polished_twisted_rock.json -13cb6afe7d2fa9a375e5ce9345a67b17ce9b4a82 data/malum/loot_tables/blocks/polished_twisted_rock_slab.json -ec38efc39f00568002b0356e2689e80e0b290081 data/malum/loot_tables/blocks/polished_twisted_rock_stairs.json -c2bd913781672b85d8a6612581e0233636068e53 data/malum/loot_tables/blocks/primordial_soup.json -df35446837ad0a7598a9f6732e7711b02fae33df data/malum/loot_tables/blocks/revealed_runewood_log.json -2a300976c700eb99797a874ef6bdf2aca501dbeb data/malum/loot_tables/blocks/revealed_soulwood_log.json -78f5bc4283c64e7f61ead3165b89639ee8bf9c7c data/malum/loot_tables/blocks/runewood.json -d59ba113f4bcd38efb057ccca049e68a2481749f data/malum/loot_tables/blocks/runewood_beam.json -124d6ea8c7f6a4a0ec066d82bfdb35594b510f27 data/malum/loot_tables/blocks/runewood_door.json -8693abe5c85264b71f553bb22b870fbdfcc9156f data/malum/loot_tables/blocks/runewood_item_pedestal.json -57fe27377212f0158f4568bd2fa798432e4d71ce data/malum/loot_tables/blocks/runewood_item_stand.json -5dcafbf086eae7ccd6f7645a7b046519f2ed2292 data/malum/loot_tables/blocks/runewood_leaves.json -4a404fbf0da17e6696bd11119608c78bb26fbe93 data/malum/loot_tables/blocks/runewood_log.json -a168479f699c1b3020df7fe2b043b55ab52ea00f data/malum/loot_tables/blocks/runewood_obelisk.json -7e2eec523021ef0260429f244b407eeb877c2cc6 data/malum/loot_tables/blocks/runewood_panel.json -a13ce1ad81306ff6c4bbbc8c133c5cf4d2fb0f52 data/malum/loot_tables/blocks/runewood_panel_slab.json -2f6cd1adf9eb3d6ea1d4ca89aeff4da671ec7ab8 data/malum/loot_tables/blocks/runewood_panel_stairs.json -c5e92ff76f8130d48ea32e77d90318bbfbc06718 data/malum/loot_tables/blocks/runewood_planks.json -f607a0a70cc90354116f46f2e49931f5328ab18c data/malum/loot_tables/blocks/runewood_planks_button.json -1059f45a89e59411412ad17a44aa706310b45792 data/malum/loot_tables/blocks/runewood_planks_fence.json -8d5bd5aae1d1ed5aa162540c9741b260d4ba867b data/malum/loot_tables/blocks/runewood_planks_fence_gate.json -8d2dab841aa02307c63912bd7384b2d1598d0fa7 data/malum/loot_tables/blocks/runewood_planks_pressure_plate.json -f11cdb41a0304993ea5b499a962bfb93410f19c3 data/malum/loot_tables/blocks/runewood_planks_slab.json -41e36d3bba38cfa7368b9bfc17489740f38f055b data/malum/loot_tables/blocks/runewood_planks_stairs.json -9b305c0955d0bd7292c58b82b1482460083fae9a data/malum/loot_tables/blocks/runewood_sapling.json -9f2d0929b29d777da03472002b1280990b7226e3 data/malum/loot_tables/blocks/runewood_sign.json -ebcb8a6dbf6cd51db7b625244c70c3b09dcf384d data/malum/loot_tables/blocks/runewood_tiles.json -4c31a6e006ac2e0e3a7cfc42135408d5469857cd data/malum/loot_tables/blocks/runewood_tiles_slab.json -2928058519f3635b511f2b7b9f17e38221a39189 data/malum/loot_tables/blocks/runewood_tiles_stairs.json -ca875c9653f2a8eb63140c3f1fbf9e742d3d9a8a data/malum/loot_tables/blocks/runewood_totem_base.json -8b64c417f4db08e1313e81a99ae8fbbc920fa11b data/malum/loot_tables/blocks/runewood_trapdoor.json -9f2d0929b29d777da03472002b1280990b7226e3 data/malum/loot_tables/blocks/runewood_wall_sign.json -8056180030917348cbd77fc807c3307fdb25a1e8 data/malum/loot_tables/blocks/runic_small_tainted_rock_bricks.json -aea82f8b599e2340adc3185fe724f720e235eb2f data/malum/loot_tables/blocks/runic_small_tainted_rock_bricks_slab.json -a8164306ba534c2514c4697ff0374ac4d5d911d2 data/malum/loot_tables/blocks/runic_small_tainted_rock_bricks_stairs.json -c8537f62d5011e818059945f77e8f86244c506c4 data/malum/loot_tables/blocks/runic_small_tainted_rock_bricks_wall.json -81a14f0d88ab24a2b4076dd80f144e64416893da data/malum/loot_tables/blocks/runic_small_twisted_rock_bricks.json -ddd714244093c9bd837ed58ff38834fb491c9708 data/malum/loot_tables/blocks/runic_small_twisted_rock_bricks_slab.json -3882371b4fc3b529dc67e3764ceb2cf6ebae0877 data/malum/loot_tables/blocks/runic_small_twisted_rock_bricks_stairs.json -7316229e4c1661330f7a4e91302c9851820d348e data/malum/loot_tables/blocks/runic_small_twisted_rock_bricks_wall.json -b6ef415ffb263eabd5a292e415e04cf7c7937891 data/malum/loot_tables/blocks/runic_tainted_rock_bricks.json -74fa69d2375e989e7a1e219353cb94ce1edd6a8b data/malum/loot_tables/blocks/runic_tainted_rock_bricks_slab.json -97333779825ab201803a074427e168dd829174ac data/malum/loot_tables/blocks/runic_tainted_rock_bricks_stairs.json -bbb30aa87d8de48760e9be4832b61313704c5078 data/malum/loot_tables/blocks/runic_tainted_rock_bricks_wall.json -333f11b783648e0cf019b0493fd5cfeeefcb011a data/malum/loot_tables/blocks/runic_tainted_rock_tiles.json -05e8447b964be1ec7df58fd78e28c2eb6e239997 data/malum/loot_tables/blocks/runic_tainted_rock_tiles_slab.json -31fc54d8f17ca8c67cd87b74802412d4fe6ace10 data/malum/loot_tables/blocks/runic_tainted_rock_tiles_stairs.json -85fb9e97f180fef8eaf2a0ff1bbfbc5a16b85318 data/malum/loot_tables/blocks/runic_tainted_rock_tiles_wall.json -06101a6a97688410535132fe3a462279177fbe08 data/malum/loot_tables/blocks/runic_twisted_rock_bricks.json -c99a2982a9a33473572ed065d1a79c1afef19c7a data/malum/loot_tables/blocks/runic_twisted_rock_bricks_slab.json -b93237874876bcc17c2a15bb0e0228c033739e43 data/malum/loot_tables/blocks/runic_twisted_rock_bricks_stairs.json -c5b6e07a1090941d9397f56238a3741bfb452aee data/malum/loot_tables/blocks/runic_twisted_rock_bricks_wall.json -a035a4b68709a0b3c78c63b04693d6b7c31b2d84 data/malum/loot_tables/blocks/runic_twisted_rock_tiles.json -12b6fb0f009154a68386a932da61735d12cb551c data/malum/loot_tables/blocks/runic_twisted_rock_tiles_slab.json -6f612fe5cdd5524eb1027f89502e23e5810d55e5 data/malum/loot_tables/blocks/runic_twisted_rock_tiles_stairs.json -f4afa094dc7407182f424aff13f999e60a3dd27c data/malum/loot_tables/blocks/runic_twisted_rock_tiles_wall.json -c052b39682ca2c813ba7202ac3438f6e395da066 data/malum/loot_tables/blocks/small_tainted_rock_bricks.json -b6e9fae9d05f80d776cb0cde9a7be04a08fa8332 data/malum/loot_tables/blocks/small_tainted_rock_bricks_slab.json -7e43920bbf5a94bd43db26f52093f291f5687cc8 data/malum/loot_tables/blocks/small_tainted_rock_bricks_stairs.json -823b039bc473e4f364982f3224417dd302b09d1d data/malum/loot_tables/blocks/small_tainted_rock_bricks_wall.json -e2c7c148299892aa8e110bf791dd3dc8ebe79d0f data/malum/loot_tables/blocks/small_twisted_rock_bricks.json -a522c7d1b4a406830a466ce15dd0723b44489b73 data/malum/loot_tables/blocks/small_twisted_rock_bricks_slab.json -142f63f9c78b30e84a2f5a10a07637a4e61f39be data/malum/loot_tables/blocks/small_twisted_rock_bricks_stairs.json -0cb43eb400692e6fb96a7b3752160f7f092e6140 data/malum/loot_tables/blocks/small_twisted_rock_bricks_wall.json -eb95762afa9349bf31b2923690b8e861e608bee4 data/malum/loot_tables/blocks/smooth_tainted_rock.json -daac30d213bc41d174ff40acce7f7204140c8245 data/malum/loot_tables/blocks/smooth_tainted_rock_slab.json -e612132160c75984961fc7c252f33bae79a12d2f data/malum/loot_tables/blocks/smooth_tainted_rock_stairs.json -21687933e9277368d1802e26cb4e1f9a07286ffc data/malum/loot_tables/blocks/smooth_twisted_rock.json -4e58b5857d48a158f15c7e0fdce8ed3469f9d0e8 data/malum/loot_tables/blocks/smooth_twisted_rock_slab.json -0f4d86b78192dd24cbdce063fa64400292237450 data/malum/loot_tables/blocks/smooth_twisted_rock_stairs.json -fe76cb033efca04c8f4626647658e9f059a5a5a4 data/malum/loot_tables/blocks/solid_runewood_trapdoor.json -2c862505f619100171354b68c441db8b7dd6d115 data/malum/loot_tables/blocks/solid_soulwood_trapdoor.json -cdbb184d7d25f389f966ccd4edf912ba2d85252c data/malum/loot_tables/blocks/soul_vial.json -67bfb0389362638b13cfc37b945b4e0498733973 data/malum/loot_tables/blocks/soulstone_ore.json -e7d0fc32c1ac7ced3c6f9e673f7281fe7edebf4f data/malum/loot_tables/blocks/soulwood.json -dce8eaa9b9aa2f130e0dcb05fa074615d36c5f85 data/malum/loot_tables/blocks/soulwood_beam.json -e2892c40ed79c1ed2bd7e3f89fdf3d268c0a3167 data/malum/loot_tables/blocks/soulwood_door.json -6c0a00b194fe9c0dca5d942d6f61b846fd83d87e data/malum/loot_tables/blocks/soulwood_growth.json -292c7897b6377cb9799c12b7e7979703adc3b395 data/malum/loot_tables/blocks/soulwood_item_pedestal.json -2aef16c9bb3c34910ff5854886ee4d7e515c8272 data/malum/loot_tables/blocks/soulwood_item_stand.json -12904233b874e208f2437a15129baa6a669665b3 data/malum/loot_tables/blocks/soulwood_leaves.json -f49d4dbee2c7b8b5d3b6814e175f4865d0acb234 data/malum/loot_tables/blocks/soulwood_log.json -278683fe4f06f8bfbbdfd90ffa5c8a67f1f3ded5 data/malum/loot_tables/blocks/soulwood_panel.json -23130b975f530c42dc8d97558907b96015ae25df data/malum/loot_tables/blocks/soulwood_panel_slab.json -200de11a2af3c189f503ec9a8da271113c66730d data/malum/loot_tables/blocks/soulwood_panel_stairs.json -9b8c91646f13d701916c520d9023f6a411a29ad0 data/malum/loot_tables/blocks/soulwood_planks.json -7f844b523e7c36b4df70454891ad2471cc5560e5 data/malum/loot_tables/blocks/soulwood_planks_button.json -72a147f5047fbb87a48fc9b9c8e62193307c5f20 data/malum/loot_tables/blocks/soulwood_planks_fence.json -71357f25ebaa762f33951a605c4c6858df33f81e data/malum/loot_tables/blocks/soulwood_planks_fence_gate.json -880ca9aa24e2346cc0c2a61149095e9757014872 data/malum/loot_tables/blocks/soulwood_planks_pressure_plate.json -1b50f1d63cee5b3067bc852d1a7a0cf58b595667 data/malum/loot_tables/blocks/soulwood_planks_slab.json -bac15fbf09b6cca536565664db164052fd059f1b data/malum/loot_tables/blocks/soulwood_planks_stairs.json -453459dc06e1281705ecbf5b6e3616086b46b9ec data/malum/loot_tables/blocks/soulwood_sign.json -f8cb32944eda64153b2bece4282d88f9e0db8a3d data/malum/loot_tables/blocks/soulwood_tiles.json -5e59a39063f4947fd00618ed810306e9e09dbdd4 data/malum/loot_tables/blocks/soulwood_tiles_slab.json -19a7b59120ae2c61f33f58a00fed22e5322102a7 data/malum/loot_tables/blocks/soulwood_tiles_stairs.json -7364c19afd57d776f9fdaaf7503af8af4b432653 data/malum/loot_tables/blocks/soulwood_totem_base.json -1babbd808e8cb523ea12ce82df2a4cd0a0536074 data/malum/loot_tables/blocks/soulwood_trapdoor.json -453459dc06e1281705ecbf5b6e3616086b46b9ec data/malum/loot_tables/blocks/soulwood_wall_sign.json -00de05e2b136de95384245df2c64b1a2728cf41f data/malum/loot_tables/blocks/spirit_altar.json -e1ac4d1c7b3944b886a32b9008c8622410ea201f data/malum/loot_tables/blocks/spirit_catalyzer.json -b4f4c2ddec5a73eee78128962468c21c364752b7 data/malum/loot_tables/blocks/spirit_crucible.json -e41e6f27646a9e425b832d5a5ad2d4dc39ef734a data/malum/loot_tables/blocks/spirit_jar.json -a4a9de88e90ce68e13c01512c41093e9d81a297f data/malum/loot_tables/blocks/stripped_runewood.json -3bc381294671a8777899dc77ca581fe9baba3186 data/malum/loot_tables/blocks/stripped_runewood_log.json -5bbec0039bdff09cde02c4a58a0fa00663d083b8 data/malum/loot_tables/blocks/stripped_soulwood.json -df90e857a5ca6f27c28de89143b6a5eb0a08badd data/malum/loot_tables/blocks/stripped_soulwood_log.json -7c9e7993d80ff4a0d3f4cc664dca3459fac36769 data/malum/loot_tables/blocks/tainted_ether_brazier.json -b8b445e36f299fc70918961173e92cee702edb3f data/malum/loot_tables/blocks/tainted_iridescent_ether_brazier.json -b3ab1aee6b05af65dca24c01217502c74868c4b7 data/malum/loot_tables/blocks/tainted_rock.json -1d39e06ca52c65698149ab5dbec94a25f0e20396 data/malum/loot_tables/blocks/tainted_rock_bricks.json -d09aae326fc3cc406e2ce692c3de8ca9ad74081b data/malum/loot_tables/blocks/tainted_rock_bricks_slab.json -964ff78c8b19c2eb0a18f5902b50edb96ae1dc78 data/malum/loot_tables/blocks/tainted_rock_bricks_stairs.json -c9117361e1b34806ea02b75322ddbc6f31c1cddc data/malum/loot_tables/blocks/tainted_rock_bricks_wall.json -ef6a3f413468164bef03b737ca9cc3020e032ac6 data/malum/loot_tables/blocks/tainted_rock_button.json -60656931a3c54926efd4066e02dfa432c2eb4911 data/malum/loot_tables/blocks/tainted_rock_column.json -fc9f1aa71f31c337724775c5c7d6ee881876a5dc data/malum/loot_tables/blocks/tainted_rock_column_cap.json -7ce80d3b44ae76804afb6514334b8458a10df1af data/malum/loot_tables/blocks/tainted_rock_item_pedestal.json -cced63bb0e0d671c99df8505bf647529e6617953 data/malum/loot_tables/blocks/tainted_rock_item_stand.json -3b8fa9c14d5355fef20500b59ea32f5014dba62c data/malum/loot_tables/blocks/tainted_rock_pressure_plate.json -bb75da0de540d93e3e2042d986540598913b1afa data/malum/loot_tables/blocks/tainted_rock_slab.json -9d19529b894b95e6cfbf8d1690befe41e226afdd data/malum/loot_tables/blocks/tainted_rock_stairs.json -d14985b9c345917fb2722dad4460e25d716f8a10 data/malum/loot_tables/blocks/tainted_rock_tiles.json -4be9695b2f2c11141ed8bcf5d0cacd9370da8b98 data/malum/loot_tables/blocks/tainted_rock_tiles_slab.json -8b1d41cf5df4d42e23369faa9900bbb23a5d8d16 data/malum/loot_tables/blocks/tainted_rock_tiles_stairs.json -5553c07d1f78f1c68f4e196a45be98b66d513790 data/malum/loot_tables/blocks/tainted_rock_tiles_wall.json -b4e512cd88f757338d2d31e947348be852d074bc data/malum/loot_tables/blocks/tainted_rock_wall.json -d216a32732961ae8786027dc958b8f135a25f680 data/malum/loot_tables/blocks/the_device.json -7b7ec588686c99b00f485e74a6f385946947278e data/malum/loot_tables/blocks/the_vessel.json -bebebcf14e3f814de13c771a876543ab02c86c41 data/malum/loot_tables/blocks/twisted_ether_brazier.json -f3db11fec46ce0f6ac59bfd6f404cc54de12cb31 data/malum/loot_tables/blocks/twisted_iridescent_ether_brazier.json -89a4c33d734821b839eb84e52c46b9fd243ab924 data/malum/loot_tables/blocks/twisted_rock.json -1bc6aacf2f5c339bc47ee7fb859f6c81b0c9c5c4 data/malum/loot_tables/blocks/twisted_rock_bricks.json -126ac54bcc940a507a05d6bbd7db13cad98ab436 data/malum/loot_tables/blocks/twisted_rock_bricks_slab.json -043d3e5c00d2bb4012564bf1c5219b1b14623a7f data/malum/loot_tables/blocks/twisted_rock_bricks_stairs.json -5043e0fd7923a1bf3fffff96fddc47a9bae0968d data/malum/loot_tables/blocks/twisted_rock_bricks_wall.json -51875ee614b489a20c2fbcd521872e03ee4eaac3 data/malum/loot_tables/blocks/twisted_rock_button.json -5411749ee7727633894b686f3b97803896c0e253 data/malum/loot_tables/blocks/twisted_rock_column.json -faece4d6b6172ce12a18852b2c01e8c5ba5b9512 data/malum/loot_tables/blocks/twisted_rock_column_cap.json -b246d965dcea4d3feb868b8edf2939be067032b2 data/malum/loot_tables/blocks/twisted_rock_item_pedestal.json -19841d9deb3f3550267b50c11807f4a49210ef65 data/malum/loot_tables/blocks/twisted_rock_item_stand.json -d8e252e7adedde37bdd7baf30ae9acf9ed3638f3 data/malum/loot_tables/blocks/twisted_rock_pressure_plate.json -1d7ba81fb431a18029c309d8f74383d62fbec27f data/malum/loot_tables/blocks/twisted_rock_slab.json -771e91f1331089d70d545b57e373965fc783d305 data/malum/loot_tables/blocks/twisted_rock_stairs.json -3c4eac73795a471743867a6e4ac4da2b3695050f data/malum/loot_tables/blocks/twisted_rock_tiles.json -ef9a69f04a593d00e422621cbddc477a0c9a3507 data/malum/loot_tables/blocks/twisted_rock_tiles_slab.json -7bf3d1e83a8209d359f5c43c8f4a2dffe1c890f1 data/malum/loot_tables/blocks/twisted_rock_tiles_stairs.json -9c53b1236058b1ba0e3ebdaa9e8042f059de9c27 data/malum/loot_tables/blocks/twisted_rock_tiles_wall.json -abc891e92a86bb52297802945d3bc3cef1b8420c data/malum/loot_tables/blocks/twisted_rock_wall.json -adf18a455f139d8f374b4cc8da460c2443138a50 data/malum/loot_tables/blocks/twisted_tablet.json -07270f2d5c39a47fb4fcdc1a5ec85463b43f7d26 data/malum/loot_tables/blocks/vertical_runewood_planks.json -6b975ed5d6dae6c446d2e75801ca0e6f1a2137ae data/malum/loot_tables/blocks/vertical_runewood_planks_slab.json -4eb0b901c4344c539ffa0234d498a35e566fb1e2 data/malum/loot_tables/blocks/vertical_runewood_planks_stairs.json -740fa67d0834eb04f23c5110f73165372fafafe4 data/malum/loot_tables/blocks/vertical_soulwood_planks.json -b78232bb4bc763f7c9db54136bb0017f782321ff data/malum/loot_tables/blocks/vertical_soulwood_planks_slab.json -cf949c0994b2421d9e9f41f3ce19ee4f9da9c01c data/malum/loot_tables/blocks/vertical_soulwood_planks_stairs.json -5c1df8443043b3fe3b665dba348e2ff188bcbe31 data/malum/loot_tables/blocks/void_conduit.json -19669779ff7afa714f3fd96c55e22b13c5db0ba3 data/malum/loot_tables/blocks/weavers_workbench.json -5c1df8443043b3fe3b665dba348e2ff188bcbe31 data/malum/loot_tables/blocks/weeping_well_core.json -5c1df8443043b3fe3b665dba348e2ff188bcbe31 data/malum/loot_tables/blocks/weeping_well_corner.json -5c1df8443043b3fe3b665dba348e2ff188bcbe31 data/malum/loot_tables/blocks/weeping_well_side.json -7c6ba53a46ba55ab1c4c41ca814676e59b8c88d0 data/malum/recipes/ace_prideweave.json -d95efc58077a0dcbdbc6880c45db6e5dbdfae589 data/malum/recipes/agender_prideweave.json -1939371ec203f1876562138717b22ceae6d3e324 data/malum/recipes/alchemical_calx_from_block.json -e0ccda6a23af005ba0a616477735be7f851dded4 data/malum/recipes/aluminum_from_node_blasting.json -abd6e0c651a2aecde10f4091d715481a1fb09f57 data/malum/recipes/aluminum_from_node_smelting.json -fa8148af709504dba97135770dff91a27654522d data/malum/recipes/ancient_weave.json -d20a2388948e4b9adb7c33b17f94ae99ffdb2c9f data/malum/recipes/arcane_charcoal_fragment.json -8f92240f29b3331140df8742539313bf20535e01 data/malum/recipes/arcane_charcoal_from_block.json -d2790e80b1d3745aa2d3cb00225c7e1a6f0df581 data/malum/recipes/arcane_charcoal_from_fragment.json -dd03b6e611f9e7ec6015005e4405be153d342864 data/malum/recipes/arcane_charcoal_from_runewood.json -143481e020508adbeb2e9dfe23fab722cf92cd25 data/malum/recipes/arcane_charcoal_from_soulwood.json -c1d0662ee2a5fe79d5329f3e8ee7f71523aee555 data/malum/recipes/aro_prideweave.json -994e5c9985a2f0cc94cb4cdfd693ba576f21ab0d data/malum/recipes/aroace_prideweave.json -abef4c193184aab49f371dfec59ebf7741f416ae data/malum/recipes/astral_weave_from_block.json -418d1cb874182ceeb0607a2d45087e7e51d39a47 data/malum/recipes/bi_prideweave.json -dc1895159089cfe1816e5afab15581d72e3e325d data/malum/recipes/blazing_quartz_fragment.json -29619c9a1122905489f6aa859a2d42e41f0c8b43 data/malum/recipes/blazing_quartz_from_blasting.json -57f2f619f398b7ed56da4534361ed8e2daf1464c data/malum/recipes/blazing_quartz_from_block.json -0c524044e4fa35137d3d0259030a02ebc6a9280e data/malum/recipes/blazing_quartz_from_fragment.json -3f5a8dd075f2e0d3bb8abc855b0a5e2378348665 data/malum/recipes/blazing_quartz_from_smelting.json -cc32f0e38ea862fdb23401f7e6f0a65c291339a8 data/malum/recipes/blazing_torch.json -11cde515b5f23e0faebc3605e5cef88d131dacda data/malum/recipes/bligh.json -85b44b5ecdbc07a4c83eebd788501bb062db475c data/malum/recipes/blighted_gunk_from_mass.json -fd07eca9746815012c3f4a847a08ee7f962d7787 data/malum/recipes/block_of_alchemical_calx.json -cc424a6ecdb9bd8b38f197ef050363341eaabfdd data/malum/recipes/block_of_arcane_charcoal.json -e78fde0960fa660249c1683d0a12d8e6a12dde2d data/malum/recipes/block_of_astral_weave.json -7bd2973af895f76659237564525b420bd5d493e2 data/malum/recipes/block_of_blazing_quartz.json -a79bba852b1543f6036f680edddc2b7f2122c404 data/malum/recipes/block_of_brilliance.json -55b2d13e2ff75de38823fd4157ebc26f8c10df4c data/malum/recipes/block_of_cursed_grit.json -be64960854b7a97fbe42fbb93e88a6dd9791eb80 data/malum/recipes/block_of_grim_talc.json -046b7ee9dcab5642b9fb4cce192e8b5de626f1ba data/malum/recipes/block_of_hallowed_gold.json -4cc282c939857d06282f48c7292bc9d1f70e3297 data/malum/recipes/block_of_hex_ash.json -35a07963fd213cde0fd0cf4ee9778ef144457485 data/malum/recipes/block_of_rotting_essence.json -630402b38b890bd8d233912411d578777289fa9a data/malum/recipes/block_of_soul_stained_steel.json -056039ed70b86fe30ec9584bfadc56599fb43b7d data/malum/recipes/block_of_soulstone.json -151d802e4b812eaa347754f9a4d7e967f9c39228 data/malum/recipes/bonemeal_from_grim_talc.json -0ed77c673ae61a1c00369c5deb9cbc68789cd005 data/malum/recipes/brilliance_from_blasting.json -a81c7c4a1879f32623c781a693f871d8d582ec25 data/malum/recipes/brilliance_from_block.json -9fd4aebaeeea38d2726ef8e1522f8f262a51a73f data/malum/recipes/brilliance_from_crushed_blasting.json -e7a0f4c60aecf862f0eee61d5af8ff5f8b10f7ec data/malum/recipes/brilliance_from_crushed_smelting.json -bd72fac2fb0c6192d1cc90cf4f8c8e59de59f5d7 data/malum/recipes/brilliance_from_deepslate_blasting.json -783e3eb522ec36f857c5b337ba4770609ad195bd data/malum/recipes/brilliance_from_deepslate_smelting.json -c7930aff81c7f66d938c904bd5c517ced5d069a9 data/malum/recipes/brilliance_from_raw_blasting.json -37f8cc8a3ae32ef905b8be732f754e138b9baab5 data/malum/recipes/brilliance_from_raw_smelting.json -c34763708dda1d78827a57e5a08515bb70bfe297 data/malum/recipes/brilliance_from_smelting.json -f416b57988a023074ad8ae0118a9f2cb1b08ecb4 data/malum/recipes/charcoal_fragment.json -321fbec87c6355c3dd945df13f057c2b15d75348 data/malum/recipes/charcoal_from_fragment.json -b32013ab5af096db0bfb9efeddac175cff24b870 data/malum/recipes/chiseled_tainted_rock.json -7de0439399598b18b1599b14029f2e74e7f6f117 data/malum/recipes/chiseled_tainted_rock_bricks_stonecutting.json -4c16d8d852405e5b01c6dc61f6681ca33e5a7b6c data/malum/recipes/chiseled_tainted_rock_bricks_stonecutting_alt.json -781ea13e670260914a3bb3385fefe7c42ef1132e data/malum/recipes/chiseled_twisted_rock.json -bf7127d14f33d409861d32e36bb78ade2b7980f7 data/malum/recipes/chiseled_twisted_rock_bricks_stonecutting.json -f4780aa41293df930e094b710bbd2438e698cfba data/malum/recipes/chiseled_twisted_rock_bricks_stonecutting_alt.json -21b6f9af56429a27e8fdfbf97fd4f9f51e689885 data/malum/recipes/coal_fragment.json -601bc435a3ae84c2865db5011ffcb18007f801f6 data/malum/recipes/coal_from_fragment.json -06ac479acb6ebb9195da74fd65b91a3feeacfa40 data/malum/recipes/copper_from_node_blasting.json -f955615e72231201d06e71657e1d92cbc4ea0bce data/malum/recipes/copper_from_node_smelting.json -837300b32516c9bea6ef09ecb2e1ebbf38117855 data/malum/recipes/copper_ingot_from_nugget.json -3c82cef895152f2e7977688312865e0ddcf040cc data/malum/recipes/copper_nugget_from_ingot.json -e9a9e24d3ea2903ddcf487a713131db79948f701 data/malum/recipes/cornered_weave.json -9eb0f6e8aa85aef0cdc7873376473705b040c688 data/malum/recipes/cracked_small_tainted_rock_bricks_slab_stonecutting.json -19ae14a41be5b3dafddb1747f384d320a44c5678 data/malum/recipes/cracked_small_tainted_rock_bricks_smelting.json -430f5ee99df976ad4632975c410c61cdb522aea2 data/malum/recipes/cracked_small_tainted_rock_bricks_stairs_stonecutting.json -ef1c4bf1643cfdd185bdd663fbe0b56fc440c300 data/malum/recipes/cracked_small_tainted_rock_bricks_stonecutting_alt.json -9d0cdd52c79188918e65acda3187f33d9cf650c6 data/malum/recipes/cracked_small_tainted_rock_bricks_wall_stonecutting.json -cec579f1a3dc1cc003e63d3dde0e9eba2d3e7098 data/malum/recipes/cracked_small_twisted_rock_bricks_slab_stonecutting.json -a7187c377c6c84b99187901949195db4986869a2 data/malum/recipes/cracked_small_twisted_rock_bricks_smelting.json -eefa7aef008a1fdf517966834afb32a581d764d0 data/malum/recipes/cracked_small_twisted_rock_bricks_stairs_stonecutting.json -73c4d8a9802480f79c7edaa8fa4a256f8a6b6be4 data/malum/recipes/cracked_small_twisted_rock_bricks_stonecutting_alt.json -2a4519bc8d2d7891891370d3cc4282efca9eb3cf data/malum/recipes/cracked_small_twisted_rock_bricks_wall_stonecutting.json -0116824097cea677cf498a9be610fe7c921bafa8 data/malum/recipes/cracked_tainted_rock_bricks_slab_stonecutting.json -07249db967c0f93b89c1e0ec5eb20ed7c927b6c4 data/malum/recipes/cracked_tainted_rock_bricks_stairs_stonecutting.json -0564e074acc734c5997e9796a417a4ba588e8f5f data/malum/recipes/cracked_tainted_rock_tiles_slab_stonecutting.json -6c663f092aebbc28b9e397a683aab1029de8d3c0 data/malum/recipes/cracked_tainted_rock_tiles_stairs_stonecutting.json -d4adf3d512583603b21dedad20bd41c1a5aacf38 data/malum/recipes/cracked_tainted_rock_tiles_stonecutting.json -7a7cd27d3cef72f1b418eb3edf51268f42879cfa data/malum/recipes/cracked_tainted_rock_tiles_wall_stonecutting.json -d41a82a8feb5f1775b4f6e5161dbf77e2cac9a59 data/malum/recipes/cracked_twisted_rock_bricks_slab_stonecutting.json -a139f46155380917f98246203df3ebc2bed070a3 data/malum/recipes/cracked_twisted_rock_bricks_stairs_stonecutting.json -e91b0249cd896b7d0582935beff2905ded502fac data/malum/recipes/cracked_twisted_rock_tiles_slab_stonecutting.json -ab79019252394524256641435b08363a2cdac1f3 data/malum/recipes/cracked_twisted_rock_tiles_stairs_stonecutting.json -e0f2dcb07503946d05fb6213b50a6906c17f323a data/malum/recipes/cracked_twisted_rock_tiles_stonecutting.json -2004e68c12b209ee7bffb29e07868a4cad5898cb data/malum/recipes/cracked_twisted_rock_tiles_wall_stonecutting.json -43ef2766dab13e38f42678125437d08778eda91a data/malum/recipes/crude_scythe.json -c98899b5f598aa9f0417b194e4b529122e61902f data/malum/recipes/cthonic_gold_from_blasting.json -bf9dc9e95a58b554056acb96364ca654d52f81b1 data/malum/recipes/cthonic_gold_from_smelting.json -2c32c10f141f52f4a8dcf3f6e56083c6191d5e11 data/malum/recipes/cursed_grit_from_block.json -52fd7f820d8f0f83ec6d1fc9edc08c950205ba9f data/malum/recipes/cut_runewood_planks.json -887898c404e9175e563e5a5a971d6b715c4bba40 data/malum/recipes/cut_soulwood_planks.json -ea852dac9f98e3fe9283e987b955f0437f5896cc data/malum/recipes/cut_tainted_rock.json -4582e2a9d79452434547871792279a6427c891ac data/malum/recipes/cut_tainted_rock_stonecutting.json -bec5d6bf0b6e93c9004d63b35e35deeedd24e2c3 data/malum/recipes/cut_twisted_rock.json -ef98a9037a7307629e36526e3ccf84f3b205440c data/malum/recipes/cut_twisted_rock_stonecutting.json -5c83e7c2a47ebe629659337d19220477f1d4e393 data/malum/recipes/demiboy_prideweave.json -5d52159c919c63553a263971373d83aa592f1c54 data/malum/recipes/demigirl_prideweave.json -c027d9d957bb0f46008eb5f601eea5489106f0b3 data/malum/recipes/dreaded_weave.json -e373581a08f3d1e0e51c929dbda49bff96a662e5 data/malum/recipes/enby_prideweave.json -eda951231eabbfa965077eeaa1e6c0cee8d1559f data/malum/recipes/encyclopedia_arcana.json -b50487914ac1f6be72c4fc8867cbfbaeeedf107c data/malum/recipes/experience_bottle_from_brilliance.json -5b34a676fa1f0971a4c89a1f9fec7e716dfe4216 data/malum/recipes/gay_prideweave.json -20ea4ee71dfdb012db3a2276b77275006bdd6357 data/malum/recipes/genderfluid_prideweave.json -bd492ea54b762b8e1a0b1f36035142c8ffbecf53 data/malum/recipes/genderqueer_prideweave.json -e86f2f147ec2ea68db61f5a2eafb9bdc018c8917 data/malum/recipes/gilded_belt.json -e2d32fe33e54b93764631bb6c3c6b2e229b0c6ac data/malum/recipes/gilded_ring.json -de44b0303a4e5dd13e279caf83d3e2e564865641 data/malum/recipes/gold_from_node_blasting.json -a48fe1cfbcd1f988dcef40ed28fe4166f7a811ae data/malum/recipes/gold_from_node_smelting.json -692eb9427fbbc7e987eb32f0c1f861c1a48d0acd data/malum/recipes/grim_talc_from_block.json -9a5d60a7958935567d19eda2da62d101841575ed data/malum/recipes/hallowed_gold_from_block.json -19d234a9785e51f5aa6d0917541cc53eb40e0361 data/malum/recipes/hallowed_gold_from_nuggets.json -6bd27327b28384d2e0724ac729e528c2d408398a data/malum/recipes/hallowed_gold_nugget.json -2ba192df72b386ed43116099bb54584857cb6063 data/malum/recipes/hex_ash_from_block.json -fedc1ac991bb3b5004483735d26a5d731036fb0b data/malum/recipes/holy_sap_from_smelting.json -a0c60325b894f20efab5609acfe0a93c89c24247 data/malum/recipes/holy_sap_from_smoking.json -60502c82b2bdc7074dd9af47cd8ebae828b594f1 data/malum/recipes/holy_sapball.json -7f5f37ca0af9b91da52e2232b500830a7a5b2022 data/malum/recipes/impetus_creation_aluminum.json -11854b18ae369b7156f2062934a4e565355c72b8 data/malum/recipes/impetus_creation_lead.json -e7b802a100d6d9d767e63531fca310af62c687e4 data/malum/recipes/impetus_creation_nickel.json -470078f86c2cac16a73be6c5851e739072f69f7c data/malum/recipes/impetus_creation_osmium.json -2251469dd088f98e8884d82f8e4804d1b7af8006 data/malum/recipes/impetus_creation_silver.json -3d12f56d108de9256852c9142268889104cad65d data/malum/recipes/impetus_creation_tin.json -a74c4db04cb80f04927d4a8cbbd7abe7723909e7 data/malum/recipes/impetus_creation_uranium.json -43402a6d1678e3a921a83245eda6a915bd1acbc4 data/malum/recipes/impetus_creation_zinc.json -3e694ead388f41703a45e7dcb4e191c803d9d1ec data/malum/recipes/intersex_prideweave.json -d5ed4423f60a0ff6e959f682646fb2f8f2ae4c3f data/malum/recipes/iron_from_node_blasting.json -09606ecef52a91155845524f247a0edb42e0dbad data/malum/recipes/iron_from_node_smelting.json -6a3bbd418053c0f12b8eebe062f2dfa688b12014 data/malum/recipes/lead_from_node_blasting.json -6cb7b222b3b76ea4dbcd5c07d6db82a7742e10df data/malum/recipes/lead_from_node_smelting.json -6ce6f6e5ad7fbfa905baf7ec48877fad15ad20eb data/malum/recipes/lead_from_sapballs.json -77ecec3d2b15bd7e8e4a791481868e7c0cdf9414 data/malum/recipes/lesbian_prideweave.json -e8c71e249fac330cdb07f833d5775dd3d6476f16 data/malum/recipes/magma_cream_from_sapballs.json -d7b744086fe4db08e9eac6682bd1f8274eaa816c data/malum/recipes/mechanical_weave_v1.json -1e6514a7e4e638959d71594249864533700951cb data/malum/recipes/mechanical_weave_v2.json -768841c2b1b1fc1b1a1a98b0b6ad75b88cc7638e data/malum/recipes/natural_quartz_from_blasting.json -70ce17841c34a3ab1b4b91fbe9f9cb227477b269 data/malum/recipes/natural_quartz_from_deepslate_blasting.json -f91c73793c23c8ae69b73c21d5add06e1ebc579e data/malum/recipes/natural_quartz_from_deepslate_smelting.json -cc207473730badacababbd712223af6287c89e28 data/malum/recipes/natural_quartz_from_smelting.json -3d426d55af8e9a14cdfb13447ff34158704aa3d4 data/malum/recipes/netherrack_from_blazing_quartz.json -3f0f301efd4ae62b115b4cb77c24667c620f1b2d data/malum/recipes/nickel_from_node_blasting.json -5dcd74008fefadbd171ce1a6568e6e400fe50a62 data/malum/recipes/nickel_from_node_smelting.json -642f3392cc76d58180d19f282ec1c0f8f41bd8e5 data/malum/recipes/node_focusing_aluminum.json -55f54dd1448c71d95295867473bc455f9b82021e data/malum/recipes/node_focusing_copper.json -efda45013fa8925f5808a8c7fc03d9c6e027b11d data/malum/recipes/node_focusing_gold.json -abc3ed4dab19459428bdef6d22c8321c7717c9ce data/malum/recipes/node_focusing_iron.json -01500a2615f021c5775f922592a290d6c4099612 data/malum/recipes/node_focusing_lead.json -96e3add52296a71eafbe7f73766ab2e59241ead8 data/malum/recipes/node_focusing_nickel.json -3545957ac08be8e8258167bd2df71bae60c66e80 data/malum/recipes/node_focusing_osmium.json -2cad0a0d9a66f3b9185151e2b9064a50e25bfa88 data/malum/recipes/node_focusing_silver.json -af9479ee264d0d8e9067be8785e5f30218a4dbd4 data/malum/recipes/node_focusing_tin.json -03c97c0fc72545e3d6ba771896b20a2ec4e25db6 data/malum/recipes/node_focusing_uranium.json -5e2256b81787c78d438d5d2e93679b3b6b09164e data/malum/recipes/node_focusing_zinc.json -59062e3666886027e53fc265b9aa38890326d077 data/malum/recipes/ornate_necklace.json -76b222cc140cc571936bf5936e1e302e64b3dde7 data/malum/recipes/ornate_ring.json -e2795cbe8d83dabc11ab0c90c719dcb270f8831a data/malum/recipes/osmium_from_node_blasting.json -50793ce55f6ad54c61af5ee07287b6e8ce82781a data/malum/recipes/osmium_from_node_smelting.json -d414dbf6a4a70280bb903540c720eef86784b05f data/malum/recipes/pan_prideweave.json -11fe3d303ef0d1a3cbccf58f6bc81865f9d21483 data/malum/recipes/plural_prideweave.json -64a279c9e37387f1f7b9a1fb3d489acc1a8bd229 data/malum/recipes/polished_tainted_rock.json -e80b73d9448e72eb45ddcc42559a738b2ccf275d data/malum/recipes/polished_tainted_rock_slab.json -05082fbd88dca41adf33a64b9d3126c0ccb6b310 data/malum/recipes/polished_tainted_rock_slab_stonecutting.json -05a0b4a3c8f2f6bac2b57ec0172193b7ca455f33 data/malum/recipes/polished_tainted_rock_stairs.json -deb8d9459d21e08dbc897eb356a09fb2d8beaef3 data/malum/recipes/polished_tainted_rock_stairs_stonecutting.json -47b729012156cc22551d0436874b8a78e3be20b9 data/malum/recipes/polished_tainted_rock_stonecutting.json -6ecaf42e901400d8e9294f7f8c938a6ce7893bdb data/malum/recipes/polished_twisted_rock.json -959eeeb36f4ee3079e8cabb0bf346e9b07fc26fd data/malum/recipes/polished_twisted_rock_slab.json -6f078e1ed896462f6d8eb96d57fc146ab3aa062d data/malum/recipes/polished_twisted_rock_slab_stonecutting.json -b3f5c8c63d605bc7e943f7f2d2c62d898bb29479 data/malum/recipes/polished_twisted_rock_stairs.json -904149ebcfb38674b98e6da26f8d6540246b1cdc data/malum/recipes/polished_twisted_rock_stairs_stonecutting.json -5c0169e2727cca253c4b497a1e1073451075a044 data/malum/recipes/polished_twisted_rock_stonecutting.json -3f4abda1e89931cafa29d87ebbbe12ac1fc50689 data/malum/recipes/poly_prideweave.json -97feb87c99a33c78e9f465d953c6011c2cf201f2 data/malum/recipes/pride_prideweave.json -564ac6c1aaadff55876b34c3851407734cd3a323 data/malum/recipes/raw_soulstone_block.json -bc18af0cde50074b36bfa2c7f198af5b010ab3dd data/malum/recipes/raw_soulstone_from_block.json -240227e6d6180d8a02178eddd8c7a16b90f48ef2 data/malum/recipes/rotting_essence_from_block.json -7b0912804e6a37c04d0f48244457febd21d41cf3 data/malum/recipes/runewood.json -25b2036da4046c1ed02f65a79bb91647f7e28260 data/malum/recipes/runewood_beam.json -481f5055bec9c2f160a08fe271e60dbae859cdfb data/malum/recipes/runewood_boat.json -a5552fdf2bd3fa1b4c0ba6f64079ea74a5c18861 data/malum/recipes/runewood_door.json -e861d2f132119b9051200c85d4f29b9a2decb3d0 data/malum/recipes/runewood_item_pedestal.json -bde302dc0b9da85ccdd203aabcf332923d4c39cc data/malum/recipes/runewood_item_stand.json -ec74bdceb6e3ca81dc49a62bd35f1594ae3353c6 data/malum/recipes/runewood_panel.json -790c9c3f96cc3cf31d3e7510b5f73c2135f058f2 data/malum/recipes/runewood_panel_slab.json -a87ebe8d84bcbbb0b06a9dafc6e71fdb699d8a70 data/malum/recipes/runewood_panel_stairs.json -e1ecf8f80c54c918e1a6a02867f6025671bd2a9e data/malum/recipes/runewood_planks.json -f54e0e75779b98eec54069828f8d4c96f36cd2d0 data/malum/recipes/runewood_planks_button.json -673cdcd5dc4201834289c72fa4753e6ed51876c9 data/malum/recipes/runewood_planks_fence.json -ba955d968c2fcaf9e4093c1681f0d47eaf162b7c data/malum/recipes/runewood_planks_fence_gate.json -278ae899bbae5c29fc9ab622d379df0d6e4a00b7 data/malum/recipes/runewood_planks_pressure_plate.json -ae9cbcc0b616e7d1ac43c1a3a908b5746fa28f39 data/malum/recipes/runewood_planks_slab.json -4941babc91d490d06cc5e0f715279240024b31e9 data/malum/recipes/runewood_planks_stairs.json -9e39a99e8522115f191ad5f1738a94e1644e24b0 data/malum/recipes/runewood_sign.json -13d648609d3f8e612fc91eec30ebca6a656c2265 data/malum/recipes/runewood_tiles.json -3e0892a525275432d3775c168b325f408a702753 data/malum/recipes/runewood_tiles_slab.json -f0b3325d20be264bd44dbea095f2557f7f7346ed data/malum/recipes/runewood_tiles_stairs.json -33e18570e82e11346ccf25a58725430db869ff6a data/malum/recipes/runewood_trapdoor.json -f706b109ede9335bf0f51e2e233f3bab045cf8ed data/malum/recipes/runewood_trapdoor_from_solid.json -6d753a0c7e8fd53b5cac18a9429a99fb5c36ec24 data/malum/recipes/runic_small_tainted_rock_bricks_slab.json -aa32d749913b229dc3b7e7293fd212f9e74a71e9 data/malum/recipes/runic_small_tainted_rock_bricks_stairs.json -53e3ce116c46b06f400c860fd9f251dc744c8c76 data/malum/recipes/runic_small_tainted_rock_bricks_wall.json -af4dc56fc7922cfbe9947b5ca8b88b7873f06ee4 data/malum/recipes/runic_small_twisted_rock_bricks_slab.json -1042da1472161e18786bd68ad0df2fe251041fe1 data/malum/recipes/runic_small_twisted_rock_bricks_stairs.json -6b60a56708c94ce37f0c0921e07ad3afa5fda389 data/malum/recipes/runic_small_twisted_rock_bricks_wall.json -0793adcd99deb65f24d0415928abb281d40649ee data/malum/recipes/runic_tainted_rock_bricks.json -a6d708a16ee7373c547178538452b78a6c2c4880 data/malum/recipes/runic_tainted_rock_bricks_slab.json -7432a4da4df40d53107fc17b84edb0d93075b6fc data/malum/recipes/runic_tainted_rock_bricks_stairs.json -a47293b818d976939b0c7ff9e03a58e603808a40 data/malum/recipes/runic_tainted_rock_bricks_wall.json -48df1df582f3a5edf5f769ae4c5a411d5c908cfc data/malum/recipes/runic_tainted_rock_tiles.json -1d327a5558a7e27c4371f68ba17950ec0de7e9da data/malum/recipes/runic_tainted_rock_tiles_slab.json -9656fce4f04fde1d24d8a95a027b90a0aa4816b0 data/malum/recipes/runic_tainted_rock_tiles_stairs.json -4f8dbee18c56f66156553df4c475eef2f20bf7c1 data/malum/recipes/runic_tainted_rock_tiles_wall.json -28b9d496c7a16bd6146d17df40973e735a91c19f data/malum/recipes/runic_twisted_rock_bricks.json -c44c6a9198ee05b33099466b0cd9b5b266e916d1 data/malum/recipes/runic_twisted_rock_bricks_slab.json -2f5e11f912afb581837a95ecaff022d786120ebc data/malum/recipes/runic_twisted_rock_bricks_stairs.json -12e4857d00d1e2198d8990a68ef13c4657be6602 data/malum/recipes/runic_twisted_rock_bricks_wall.json -89bb4ce109d079dfa53f0dad6d1b9f0b09bca0fe data/malum/recipes/runic_twisted_rock_tiles.json -640dc6553b3f62d7ac047104bbb103d410187097 data/malum/recipes/runic_twisted_rock_tiles_slab.json -5f8713dc71a9cfe063eb488905c012377509b6bf data/malum/recipes/runic_twisted_rock_tiles_stairs.json -d0e38cacdb65e72e023b939f98774957ca4dad41 data/malum/recipes/runic_twisted_rock_tiles_wall.json -cd473b35e0e7121c539d585f27c8efd6b5e0483e data/malum/recipes/silver_from_node_blasting.json -9fc5d6e30af1d40c5edbfd1e50ed998e4f190e6c data/malum/recipes/silver_from_node_smelting.json -c1bf6a94fdd1dff45d72c9a5fcc01a948acf41c0 data/malum/recipes/skeleton_skull_from_grim_talc.json -ff8509b9078dae403c61dbfb599ddfe5785099ea data/malum/recipes/small_tainted_rock_bricks.json -cb048470b1fba379a3c02e4c7a5072c24e65ec83 data/malum/recipes/small_tainted_rock_bricks_slab.json -1f7524ac67f1812a64eb030b7cc34d9888329eb8 data/malum/recipes/small_tainted_rock_bricks_slab_stonecutting.json -cc09f31471df05164dea8f8c70aba89f615e9107 data/malum/recipes/small_tainted_rock_bricks_stairs.json -b1818680de79e65246ad49d1a31a139880558c97 data/malum/recipes/small_tainted_rock_bricks_stairs_stonecutting.json -75d1c54472ee0f4b6763dbc4b85c233334a06338 data/malum/recipes/small_tainted_rock_bricks_stonecutting.json -f98c7b94db3283142722733fb6f32dcbc970a392 data/malum/recipes/small_tainted_rock_bricks_stonecutting_alt.json -f98c7b94db3283142722733fb6f32dcbc970a392 data/malum/recipes/small_tainted_rock_bricks_stonecutting_from_bricks.json -b7084ae66aa3a4b6a081473c700c07d4d74dbcd8 data/malum/recipes/small_tainted_rock_bricks_stonecutting_from_tiles.json -cad7d2282cde7b7a91922f37ecd9cfc6206e68ec data/malum/recipes/small_tainted_rock_bricks_wall.json -a4e242059d656b9bf947cf439ad525af73d77cda data/malum/recipes/small_tainted_rock_bricks_wall_stonecutting.json -e33ae81a30eefaae72e942f47d441121d8608f25 data/malum/recipes/small_twisted_rock_bricks.json -5e36f2deb30cf4d1fb7c8978e34c5a2a357399cb data/malum/recipes/small_twisted_rock_bricks_slab.json -1e9cafbb985b20fb57a60f326b9a14f0522c9440 data/malum/recipes/small_twisted_rock_bricks_slab_stonecutting.json -1ea846aa89817f45627f14576877930df7afa6c6 data/malum/recipes/small_twisted_rock_bricks_stairs.json -60c5efcf9f96cebc23cce64516acbc802d674b62 data/malum/recipes/small_twisted_rock_bricks_stairs_stonecutting.json -e1d3e0a37d4c34511f4babd1d8bd8d31508dae1a data/malum/recipes/small_twisted_rock_bricks_stonecutting.json -61d1676dbd303fab33df97a95a0f9070549d3090 data/malum/recipes/small_twisted_rock_bricks_stonecutting_alt.json -61d1676dbd303fab33df97a95a0f9070549d3090 data/malum/recipes/small_twisted_rock_bricks_stonecutting_from_bricks.json -a456df3678336f38c7ef89309ed95fec9fd733ab data/malum/recipes/small_twisted_rock_bricks_stonecutting_from_tiles.json -adba5a78825880ec204c3705869edb31543e54ba data/malum/recipes/small_twisted_rock_bricks_wall.json -84101dbf85e60f0127bbe801852b163ac74877df data/malum/recipes/small_twisted_rock_bricks_wall_stonecutting.json -2df41d402e9314863127ede475ea31c4698312dc data/malum/recipes/smooth_tainted_rock.json -b0190f65dfcdea842ff6e74034a87adbb79e98e1 data/malum/recipes/smooth_tainted_rock_slab.json -227a96ab6d09b2a682661d311f0a15d41ae4af18 data/malum/recipes/smooth_tainted_rock_slab_stonecutting.json -38b9c16fefb850cc1dd829b82ce66a96cd0b61e7 data/malum/recipes/smooth_tainted_rock_stairs.json -5c97fc2c4ef35988051c32fc0d84ce40ed35cc7e data/malum/recipes/smooth_tainted_rock_stairs_stonecutting.json -5e46f284cbe41b81a5a7d1b8c8bb5af4e6a0c46c data/malum/recipes/smooth_tainted_rock_stonecutting.json -7752420ea646fe8f96bb20f28ad2971c2a23ddb6 data/malum/recipes/smooth_twisted_rock.json -405f109b9684ebf6ddf7d78796deb39f735d6d00 data/malum/recipes/smooth_twisted_rock_slab.json -ec09688454039194f880d65130aa269d6e073d96 data/malum/recipes/smooth_twisted_rock_slab_stonecutting.json -c910e004b2e725ceea34ea5fde7a2c5921dcc433 data/malum/recipes/smooth_twisted_rock_stairs.json -fbd3437397621af4398bf04774110e7994a14cbe data/malum/recipes/smooth_twisted_rock_stairs_stonecutting.json -a694d5743a5f6d0984c5dcdd127d0d6b72c8679a data/malum/recipes/smooth_twisted_rock_stonecutting.json -8f3ee84c1966ae574ce914b6f3c459d4b983cefd data/malum/recipes/solid_runewood_trapdoor.json -6aa52848f3e0002122414865d5c9f3c4aa7d2be7 data/malum/recipes/solid_soulwood_trapdoor.json -44e9a705b318698ea80eaafce4f4556c5abf7fcf data/malum/recipes/soul_stained_steel_axe.json -4305662fa6f7c6b7ba1d30e3f9abd622bcc42b00 data/malum/recipes/soul_stained_steel_from_block.json -b7502a6227c786099626290e9f71215bfdbbea93 data/malum/recipes/soul_stained_steel_from_nuggets.json -93a64d057a167f0445c9f1f7dea42b9547791d7a data/malum/recipes/soul_stained_steel_hoe.json -b9ca6e87ff9b3a74f6254b86f95ef24d0dfd66a8 data/malum/recipes/soul_stained_steel_nugget.json -51b8884130686d598c495780df91cdb4248e193b data/malum/recipes/soul_stained_steel_pickaxe.json -4341f2aa639d9d10f00463f11db53cf3a0e3259a data/malum/recipes/soul_stained_steel_shovel.json -495740d9df087183e0a5a798c33b7a5649758fa5 data/malum/recipes/soul_stained_steel_sword.json -707abf52a7413fbd3efbd61058912a85a48c1cf7 data/malum/recipes/soulstone_from_blasting.json -6f1870ff2b8a5f8eca1cc455ad3dbdeb550857cc data/malum/recipes/soulstone_from_block.json -536c716116f31622f55d7f2122a98e4fbf0c5931 data/malum/recipes/soulstone_from_crushed_blasting.json -891e58d62eacf8efb6710a303994d9aa87014039 data/malum/recipes/soulstone_from_crushed_smelting.json -54a45db2fc7c739ec2865ad83dde869657ce6c36 data/malum/recipes/soulstone_from_deepslate_blasting.json -ac53aeece225f2f755843342bef0a3f8dc5e054a data/malum/recipes/soulstone_from_deepslate_smelting.json -68c5da2aa0615303d528237e79d05786b40ccc64 data/malum/recipes/soulstone_from_raw_blasting.json -530ece6d7d5f875d83420036ec6be15509228ab9 data/malum/recipes/soulstone_from_raw_smelting.json -745f0c813a97ba6345cb757a4e54911b39c390fc data/malum/recipes/soulstone_from_smelting.json -55862674c681e9f3dc234f7bcf3691201427d011 data/malum/recipes/soulwood.json -ca3a238af1b258898999e0e483250d766d0338c9 data/malum/recipes/soulwood_beam.json -49c8e8f8e8ae2442460296d64a9f647288463412 data/malum/recipes/soulwood_boat.json -7bd50194aeda25ff556c659c864a5aaf8f574ef2 data/malum/recipes/soulwood_door.json -4bd37dfacbce662687a8399b2f70e5a986a736da data/malum/recipes/soulwood_item_pedestal.json -7ca3afd10036a08ec091d40975a955288eca28ff data/malum/recipes/soulwood_item_stand.json -3cc06a65ff537bd7a56d2bdb0ca68bc8a4548d15 data/malum/recipes/soulwood_panel.json -eab42d67419398b4619bb3a41320636cd58aebd8 data/malum/recipes/soulwood_panel_slab.json -66a318ba5b0ce292f0d44d6d4acf7d5de416d8d4 data/malum/recipes/soulwood_panel_stairs.json -e3a107c452a675ce0e631a79ec9a5ce7da6b5ed1 data/malum/recipes/soulwood_planks.json -9204dc564ecfb48ee5513e685556a311f9a712fc data/malum/recipes/soulwood_planks_button.json -6f655f5d15dcfec91fdd53ed937dd0086948931e data/malum/recipes/soulwood_planks_fence.json -9b97d140f2342af409f40383df2f5bbdf9f7362f data/malum/recipes/soulwood_planks_fence_gate.json -7d9c6e1e4433395293e6eab4ee10bd33743db544 data/malum/recipes/soulwood_planks_pressure_plate.json -458ccf3f3a2e52b217fb85e8f395183cff4e5cf1 data/malum/recipes/soulwood_planks_slab.json -8cd2beeac076b625f8e0f9b37590ed2ad7a328bf data/malum/recipes/soulwood_planks_stairs.json -f9e956999163bbbb6126c36015b3e5b1054ff0cd data/malum/recipes/soulwood_sign.json -f41dbe4d6f131a4cd82b9eb363ceb5dffbf908d4 data/malum/recipes/soulwood_tiles.json -71d8c6476cf22cfef3c1d01e8bdc101b3e80a908 data/malum/recipes/soulwood_tiles_slab.json -8e39a30c5906824721eeb3d29025a6d2b3c1acf0 data/malum/recipes/soulwood_tiles_stairs.json -e8a4f5a3092d46add5831dfecbbc1701dcb008f0 data/malum/recipes/soulwood_trapdoor.json -aef9eec8be9e3dc05f735c382192381b45b194ef data/malum/recipes/soulwood_trapdoor_from_solid.json -a22ac702c4ce16ee60b0ef9e233447577a670903 data/malum/recipes/spectral_lens.json -e1c88a3f03073853ba202b936f8a59b36fbe6a1b data/malum/recipes/spectral_optic.json -980abd6b4b256d6359f715f6664147a108287910 data/malum/recipes/spirit_altar.json -40772ec079fe23adfd4ffe574b0e0a8c6a6e021c data/malum/recipes/spirit_crucible/amethyst_shard.json -bb8bc137eca4708a128684519b6368f78d6f0443 data/malum/recipes/spirit_crucible/blazing_quartz.json -04166f4fc32eba6e2354f8ee6278fffda82ccedd data/malum/recipes/spirit_crucible/glowstone_dust.json -5ecbe9a007fb3be570830257f4c4d3600982a98c data/malum/recipes/spirit_crucible/gunpowder.json -20096d19cc08099538d6850e48bb5d6baaccf388 data/malum/recipes/spirit_crucible/prismarine_shard.json -22910946987e9d47636a40ed49c956b08c3dac94 data/malum/recipes/spirit_crucible/quartz.json -f34ec6332acc994ea8e879ed5d22120f2f3472a0 data/malum/recipes/spirit_crucible/redstone.json -d8aefc4c2010b01beaa6bd845ddd677525f25dbe data/malum/recipes/spirit_crucible/repair/alchemical_impetus_restoration.json -889a1bb20de68ef5b5500091fc3c9c5c0ce2807e data/malum/recipes/spirit_crucible/repair/copper.json -ce6a43acdb3e99a97720ac2df9b5d86fb23c41be data/malum/recipes/spirit_crucible/repair/diamond.json -b2c6b3d7c4af2f6e2cb69ee8f26b3d90463d44b9 data/malum/recipes/spirit_crucible/repair/flint.json -dbb813963849f32d6d1ae8585f7974739c812b0e data/malum/recipes/spirit_crucible/repair/gold.json -9c92815e4eed6584103c47379814f7daed8689f1 data/malum/recipes/spirit_crucible/repair/iron.json -c477de71c2c08e9d2bf80c1fc4e72ffd8d6626c2 data/malum/recipes/spirit_crucible/repair/metal_impetus_restoration.json -f4fb3507176787696d9e7f7dfd7ebd7a2ec418c0 data/malum/recipes/spirit_crucible/repair/netherite.json -291960a068964822e51dd7a0e4ce1cf5bb145cbf data/malum/recipes/spirit_crucible/repair/soul_hunter_armor.json -0997b305610c97adddff45fd4d9efbb917a25aa7 data/malum/recipes/spirit_crucible/repair/soul_stained_steel.json -a9c863d649a849f72e4902093465f1cba70a6073 data/malum/recipes/spirit_crucible/repair/special_soul_stained_steel.json -1ea90c539068551c67398777b787f396998ab18a data/malum/recipes/spirit_crucible/repair/stone.json -fcccc15601724124a3c36079117de9b0ff7db883 data/malum/recipes/spirit_crucible/repair/trident.json -feb96c95fae791d52f9b35267d87b8d11bd3f9e8 data/malum/recipes/spirit_crucible/repair/tyrving.json -a12b20b236de0c3814efb29f9938ae0156a50ab7 data/malum/recipes/spirit_crucible/repair/wooden.json -fc807927f28d57c616e079263cec49e285a99b7c data/malum/recipes/spirit_infusion/alchemical_calx.json -31f4508d0023855a43073141bebf5d8ec46053cb data/malum/recipes/spirit_infusion/alchemical_impetus.json -059b8b137da2a29e98a68205db5c8a15caae9d9b data/malum/recipes/spirit_infusion/arcane_charcoal.json -a3e7390cd5037f8b9c3d2902a62412293ac6fd37 data/malum/recipes/spirit_infusion/belt_of_the_magebane.json -a3076bcbd28d76399203fa55378095717c35c468 data/malum/recipes/spirit_infusion/belt_of_the_prospector.json -66a90294da5561305d50bd74b2665be5f8532648 data/malum/recipes/spirit_infusion/belt_of_the_starved.json -d99b792501e70fa0325c301dd62893b66575caec data/malum/recipes/spirit_infusion/brilliant_obelisk.json -d96ca71539ee548b85c9438f492a8b18ca6c6636 data/malum/recipes/spirit_infusion/copper_impetus.json -d3a587bed43f0f0251ccf796f0e271735127ce8d data/malum/recipes/spirit_infusion/corrupted_resonance.json -d895b3b4208d242bebfd545191aae366eced1805 data/malum/recipes/spirit_infusion/cursed_grit.json -c8a385605f8e66ca0bacdbaf10538c7d6f7f8242 data/malum/recipes/spirit_infusion/esoteric_spool.json -866783fdb6dfff7dc65b323a647196b29673d1b1 data/malum/recipes/spirit_infusion/ether.json -4940256cc6f4914834aebb15d82a2624964e8856 data/malum/recipes/spirit_infusion/etheric_nitrate.json -e74f48b43782e71dbad70327c4ef154dde59d84a data/malum/recipes/spirit_infusion/gold_impetus.json -6fbe94d7024ad4ee81f0e7fade28105a374b4796 data/malum/recipes/spirit_infusion/hallowed_gold_ingot.json -6ef483bccb66aedaea449d2efcb7453d23ca57f9 data/malum/recipes/spirit_infusion/hex_ash.json -c33d1d84d12bd83247afcd1d4b6989b0c44a0400 data/malum/recipes/spirit_infusion/iridescent_ether.json -ed51254f0e08eeeee97478a8bbf2adc4760e4930 data/malum/recipes/spirit_infusion/iron_impetus.json -202787237eca05dddb503b583a1318e601485d79 data/malum/recipes/spirit_infusion/necklace_of_blissful_harmony.json -7f89d3e450d691063008778ddcfcc92219ffa311 data/malum/recipes/spirit_infusion/necklace_of_the_mystic_mirror.json -2d511c617fe47c195c383351ff56bd334c40c712 data/malum/recipes/spirit_infusion/necklace_of_the_narrow_edge.json -caf36085f01011244578561b8b513ecfed5a92a6 data/malum/recipes/spirit_infusion/necklace_of_tidal_affinity.json -14c60fe6535a9d4b40252b52510044feceee5f77 data/malum/recipes/spirit_infusion/poppet.json -c4f740f4a9d95288a37596424a0f716eabfa8dfa data/malum/recipes/spirit_infusion/ring_of_alchemical_mastery.json -89d7c5382eb1001ec80cce572a246d77d3003eec data/malum/recipes/spirit_infusion/ring_of_arcane_prowess.json -35dfff4cfdf2880ab5af626097a7e5d823c09412 data/malum/recipes/spirit_infusion/ring_of_curative_talent.json -dd6656fada0c7c1bea7b63770cfff6f0bb6ff78e data/malum/recipes/spirit_infusion/ring_of_desperate_voracity.json -ac73d26f4e661e10b78a756d9b16605ea665c47a data/malum/recipes/spirit_infusion/ring_of_esoteric_spoils.json -5d8715f0339c0d6b4027bba9426bc3773d565583 data/malum/recipes/spirit_infusion/ring_of_the_demolitionist.json -4663b166fd26ad18a7df179b3ad7f29e0a6112db data/malum/recipes/spirit_infusion/ring_of_the_hoarder.json -0074fa1f7540700abafee63063fb0face1bdaa91 data/malum/recipes/spirit_infusion/runewood_obelisk.json -393801496f90a89ef4be0d035a66acede32e6eac data/malum/recipes/spirit_infusion/runewood_totem_base.json -48c9f82ab40fedd55b40f4fc99ff1ce42d9efd78 data/malum/recipes/spirit_infusion/soul_hunter_boots.json -6a119f9c6c3f304bdbc22aa468a98bc091f1f8fd data/malum/recipes/spirit_infusion/soul_hunter_cloak.json -3d5094593d2f18ec48af4f43c23bbea3e8c88932 data/malum/recipes/spirit_infusion/soul_hunter_leggings.json -56efdfdfeff0cd0fa380b099cadd2cb46eda8de6 data/malum/recipes/spirit_infusion/soul_hunter_robe.json -5eb7be2a6608b1801b88e9c0c424ba94ec994a5d data/malum/recipes/spirit_infusion/soul_stained_steel_boots.json -9628d6f8f7d742dceabf931faff274709af80c7f data/malum/recipes/spirit_infusion/soul_stained_steel_chestplate.json -4360c3e3395f4f55a3af784ee516999581d1da52 data/malum/recipes/spirit_infusion/soul_stained_steel_helmet.json -1ec4664245021aeef7ce446d72e73d3d2a22d575 data/malum/recipes/spirit_infusion/soul_stained_steel_ingot.json -24e0d4c4f79a88e7f2d78af05dcbb36347bb4005 data/malum/recipes/spirit_infusion/soul_stained_steel_leggings.json -883fcfed076815048f7a520633fc964bda66d38d data/malum/recipes/spirit_infusion/soul_stained_steel_scythe.json -c7bab88c0163744e63f2717e946159c603efd7fd data/malum/recipes/spirit_infusion/soulwood_totem_base.json -50b4793425e8e531ad533e9e869da8e9828bd2c4 data/malum/recipes/spirit_infusion/spirit_catalyzer.json -1a804be93573ac9f4db260b59e6dc436e78008ac data/malum/recipes/spirit_infusion/spirit_crucible.json -16d53119f620a89f91f2da70021ffa4a559147c7 data/malum/recipes/spirit_infusion/spirit_fabric.json -5b79ec9756a03faad2a3b4aab2f110f0e33b0bac data/malum/recipes/spirit_infusion/tainted_rock.json -b5107733c89ac274efd1ac3ec10d0cee95a31b7d data/malum/recipes/spirit_infusion/twisted_rock.json -ced041ff7a435361b8d90e10e0476f4c93d53c57 data/malum/recipes/spirit_infusion/twisted_tablet.json -890c4cf446fbb52ee6c9e122c01622104848ff04 data/malum/recipes/spirit_infusion/tyrving.json -1cbf45ff353eef46734e63fa04816edb988719aa data/malum/recipes/spirit_infusion/vivid_nitrate.json -8071d9ee27ef03856982379288076922eb08b939 data/malum/recipes/spirit_jar.json -cccd975c15c9f3a12f886a6e272adc1dc04305e4 data/malum/recipes/spirit_pouch.json -d57565353fa62a794358810a27bb215d8272e739 data/malum/recipes/spirit_transmutation/basalt.json -30652d684f28578f19c4cd4b75260a726ab47bf5 data/malum/recipes/spirit_transmutation/blighted_soil.json -3586b663a198f1006cafa9de0610d869ccb73975 data/malum/recipes/spirit_transmutation/calcite.json -a45fd24bdd45df366fe3d29463e4eb1965044449 data/malum/recipes/spirit_transmutation/calcite_to_stone.json -a7ac40a82b6086c4e1ad434e176689e92eb0fa90 data/malum/recipes/spirit_transmutation/clay.json -9c13c4be2fd8063c1708c62670ac23f5cdd30a0e data/malum/recipes/spirit_transmutation/cobbled_deepslate.json -2ab977516fcf0b3d78fc55b6ac282a130d74d86f data/malum/recipes/spirit_transmutation/cobblestone.json -a569c4205a096e8f6e981f638765e936332e6293 data/malum/recipes/spirit_transmutation/dripstone_block.json -5ffabbb13b337a0d44952677e71098a3e307c983 data/malum/recipes/spirit_transmutation/dripstone_block_to_stone.json -3ef67a578f5d2ee1c8294571a3c07dc9b483c0fe data/malum/recipes/spirit_transmutation/gravel.json -e22449a6717f88b1770fa25b90d86333f54eb2b9 data/malum/recipes/spirit_transmutation/ice.json -3c1c438d3404ae0749d4d63cb1986c906f599a0e data/malum/recipes/spirit_transmutation/ice_to_blighted_soil.json -5f04dbeb2e6caccc048a15f1a5870f6d341aca37 data/malum/recipes/spirit_transmutation/netherrack.json -67da295f92fcfc05a6b776a2dc7f776ffad2817b data/malum/recipes/spirit_transmutation/prismarine.json -c15a37af03805e2757cabbdeb6c4aeae7a0370db data/malum/recipes/spirit_transmutation/red_sand.json -79697a80874fbcf063455bd43429a99c3f26d8e7 data/malum/recipes/spirit_transmutation/red_sand_to_blighted_soil.json -e487147d77f1551720699b54d8e7738dc4edca0e data/malum/recipes/spirit_transmutation/sand.json -ee81926ed637db03add002a250a187a268676408 data/malum/recipes/spirit_transmutation/sea_lantern.json -cd08d36fe5c2545748c2e7aaf2fcaf9d1254be5c data/malum/recipes/spirit_transmutation/snow_block.json -422597612d20c5822494ba0aef2b2342bdfa45bd data/malum/recipes/spirit_transmutation/soul_sand.json -d2c36cdcebcdcfc4c001782c4b938450ca0a16af data/malum/recipes/spirit_transmutation/soulwood/beam.json -4f381287ab79c36b9902176a55482a7000e8b7a3 data/malum/recipes/spirit_transmutation/soulwood/cut_planks.json -ef1d6cb66d02f4121ced0562d33ae8d635296f1d data/malum/recipes/spirit_transmutation/soulwood/door.json -29ed2d7d2a3af3d2282f8925e9cbc3dab9aa4b1b data/malum/recipes/spirit_transmutation/soulwood/exposed_log.json -b6006d96e62e002b7e631be27cec0a755ab9a9a1 data/malum/recipes/spirit_transmutation/soulwood/growth.json -03e47d511a139fe1b59adc5bfc0147d7befc1d3c data/malum/recipes/spirit_transmutation/soulwood/item_pedestal.json -394b5d464dea2fd365df6bc3bb6eed755836ab61 data/malum/recipes/spirit_transmutation/soulwood/item_stand.json -b0c98de2b50918666511492b00cacb730ca58d04 data/malum/recipes/spirit_transmutation/soulwood/leaves.json -87723c396275aad9cbd3a82bf39479e9d4c35713 data/malum/recipes/spirit_transmutation/soulwood/log.json -41b54a200874b5367250732eb323dfeec0ca9d69 data/malum/recipes/spirit_transmutation/soulwood/panel.json -533350aa68f071ddc5fb1c948de0283a1d33e32c data/malum/recipes/spirit_transmutation/soulwood/panel_slab.json -bf01c2efe3be97a1a8597c010a7c1527dd2f32e3 data/malum/recipes/spirit_transmutation/soulwood/panel_stairs.json -37287f0c2577e876cc7db634d33c80695f0f5531 data/malum/recipes/spirit_transmutation/soulwood/planks.json -14d1486ce31defc427cb9c69ed8bba93491cf00a data/malum/recipes/spirit_transmutation/soulwood/planks_button.json -86a935845909fc56c43e024737f4f01ace4440a5 data/malum/recipes/spirit_transmutation/soulwood/planks_fence.json -2db9eb56e4cd409b62efb2abeb270b04bb108eb0 data/malum/recipes/spirit_transmutation/soulwood/planks_fence_gate.json -c66a7cab44d71bf01e58bd41ad67a5f13399232d data/malum/recipes/spirit_transmutation/soulwood/planks_pressure_plate.json -3174b8bb519cb75fe09cdba0127b8a9a46a755d0 data/malum/recipes/spirit_transmutation/soulwood/planks_slab.json -f5e62c9b04c139276e9546089dd24cc250ae0ce6 data/malum/recipes/spirit_transmutation/soulwood/planks_stairs.json -88a5acc1579759a945943b4578912aae3ebe52c9 data/malum/recipes/spirit_transmutation/soulwood/revealed_log.json -9e3c37fef58c5f07fda3e0094d9386f8b324e015 data/malum/recipes/spirit_transmutation/soulwood/sign.json -c3e0200ed23066916aea2265180806913fee96c5 data/malum/recipes/spirit_transmutation/soulwood/solid_trapdoor.json -cb11ea126b876af52cda1d6d1d8b1723aa311976 data/malum/recipes/spirit_transmutation/soulwood/soulwood.json -ee27e9489dbad05d0b5689f165dcf0fd70c6a71e data/malum/recipes/spirit_transmutation/soulwood/stripped.json -4eb4d8d60e35c2793418a31cfd799e6a0dac9503 data/malum/recipes/spirit_transmutation/soulwood/stripped_log.json -20b240b8e3d1ad10bb28c5695978d32cc5fe41bf data/malum/recipes/spirit_transmutation/soulwood/tiles.json -6608abde935174f80639caa3e6db52dbebbd05ae data/malum/recipes/spirit_transmutation/soulwood/tiles_slab.json -cf45bd33bd4a6e1c41e58de480613fdf8442c5a4 data/malum/recipes/spirit_transmutation/soulwood/tiles_stairs.json -bc94e90c6114b854421e9f59f6e6f810152ad465 data/malum/recipes/spirit_transmutation/soulwood/trapdoor.json -d394c7012bb9f154dc88e073fe3e2fb379751050 data/malum/recipes/spirit_transmutation/soulwood/vertical_planks.json -18f73d1a75d616f6e83e215210671a5d7f95bd15 data/malum/recipes/spirit_transmutation/soulwood/vertical_planks_slab.json -f871ed7c2b85d13888a846c503da57628134769f data/malum/recipes/spirit_transmutation/soulwood/vertical_planks_stairs.json -082772f26da48645667b090f32f45a56478a405b data/malum/recipes/spirit_transmutation/tuff.json -f2a205e1aaae4e4bf8ecc47ec5991f29c160f63c data/malum/recipes/spirit_transmutation/tuff_block_to_stone.json -a267117f683ed93708efe7f30f22634d4356cc86 data/malum/recipes/sticky_piston_from_sapballs.json -35e2790efbb61e2ec3b7d4ac56a3a26611fc0da9 data/malum/recipes/stripped_runewood.json -d356c97aebb6fb8f1b500f6e4974fafa0545fe23 data/malum/recipes/stripped_soulwood.json -9744bf16dc68272119febf4bb81a6b3cfd060824 data/malum/recipes/tainted_rock_brick_wall_stonecutting.json -65c45cb63c7f39f16d1f1ef6bf3f02b7dbee44a7 data/malum/recipes/tainted_rock_bricks.json -051d97f0076a2c97eff340df1f67fe143845c0aa data/malum/recipes/tainted_rock_bricks_from_small_bricks.json -f41068d8d4eb9ac6aa6e856c2b32f7c600641610 data/malum/recipes/tainted_rock_bricks_slab.json -549c88bfc7d971fc643ffe1f0ffac50256606f1e data/malum/recipes/tainted_rock_bricks_slab_stonecutting.json -d6ced7675959010c0cbe196a4ccbf4dd6df7661c data/malum/recipes/tainted_rock_bricks_stairs.json -65ffeba3932cbc2a749d540d15de536060159fd7 data/malum/recipes/tainted_rock_bricks_stairs_stonecutting.json -c29562e6ac0ad39aa3762d43648a59968ced818b data/malum/recipes/tainted_rock_bricks_stonecutting.json -d9424f305d1c363865f74ac9a6575f7218731725 data/malum/recipes/tainted_rock_bricks_stonecutting_from_polished.json -56d8dff48675354ed2d7c59c9b477e1ca07b3c45 data/malum/recipes/tainted_rock_bricks_wall.json -3d714941b15f7c47ac4760a725e36c62f80dfaf9 data/malum/recipes/tainted_rock_button.json -e33c718817e618342178daf7adf45ce11be589ee data/malum/recipes/tainted_rock_column.json -2732e57d8dfa416d55dd9d5ebb11ed1e5afc7368 data/malum/recipes/tainted_rock_column_cap.json -7e16077e7e3477810b9c030532629fd6b1ed23eb data/malum/recipes/tainted_rock_column_cap_stonecutting.json -0357a8f81c1e0ce54a4460306e9b0108cc3f707b data/malum/recipes/tainted_rock_column_from_cap.json -018009953de250b8a4b1dbb63086843e48835c9a data/malum/recipes/tainted_rock_column_stonecutting.json -438e0a97fb81b244e7a511f3d39c0af318320b8d data/malum/recipes/tainted_rock_item_pedestal.json -ed8be22d1d071fd607f34841f9e500b034057da8 data/malum/recipes/tainted_rock_item_stand.json -884f77c0b949d2a986c36bcb8b67ea61b1a39ad6 data/malum/recipes/tainted_rock_pressure_plate.json -e74200402dfbf2aff37fafc83b7aefbb1c3b8dad data/malum/recipes/tainted_rock_slab.json -d3c857e99b1c1cb0512a1c4dee75bc5c11b8de77 data/malum/recipes/tainted_rock_slab_stonecutting.json -7e52a023feb86fbfad6377c1126abf717920f77a data/malum/recipes/tainted_rock_stairs.json -3866e1dc0f1d1936b65b0ddda78c6d97787333d1 data/malum/recipes/tainted_rock_stairs_stonecutting.json -b0bdefb90d3677462fa35e6f574116e74f54d150 data/malum/recipes/tainted_rock_tiles.json -cde3e780b3542eb57c3a778473f15726812e7101 data/malum/recipes/tainted_rock_tiles_slab.json -7b2b663fa5cacea43cf13deb13755f6554d60dd7 data/malum/recipes/tainted_rock_tiles_slab_stonecutting.json -a03c49f862c20e4e0c9c93ae5e2281db8b82b9e4 data/malum/recipes/tainted_rock_tiles_stairs.json -f51253aa98bfcb76a0306e5736b0cf0e58e45243 data/malum/recipes/tainted_rock_tiles_stairs_stonecutting.json -07b20a8f5c1e40a693aa10758f1dcbebcd5c5efa data/malum/recipes/tainted_rock_tiles_stonecutting.json -53813007bb54535d7e6cf3a2bc267765fd8812ee data/malum/recipes/tainted_rock_tiles_stonecutting_from_bricks.json -03accf4dcca6a675d72e7e840c905ee9264300e7 data/malum/recipes/tainted_rock_tiles_stonecutting_from_polished.json -4b946a006b07f5e8ff76b5b45e688a676ed0f25a data/malum/recipes/tainted_rock_tiles_wall.json -5e99eb36f1c432bbfa2076a36d3ff810d81e4218 data/malum/recipes/tainted_rock_tiles_wall_stonecutting.json -aa8d14d4a5034abf32870791ad453f31aa04b1ca data/malum/recipes/tainted_rock_wall.json -b2eaba7a7ec45a771888900988c1620fce41c74e data/malum/recipes/tainted_rock_wall_stonecutting.json -65ff02bcd56abfc8ca194687301e9110fed37cad data/malum/recipes/the_device.json -d72c659f6986dafba203ed12b9fc5327c9848049 data/malum/recipes/tin_from_node_blasting.json -e8f38ab13c1f8100d87cc5a25014dbc6837d5d15 data/malum/recipes/tin_from_node_smelting.json -8070d85af379632fc19c0a3e732ab4fd77a1400c data/malum/recipes/trans_prideweave.json -7218db760b007eb9b6a8b2a23fe92befafabcccb data/malum/recipes/twisted_rock_brick_wall_stonecutting.json -691c528702a4091a0184c44a0907096870dfc2c3 data/malum/recipes/twisted_rock_bricks.json -47d7278616de58b2539020102905f0b17228c0e9 data/malum/recipes/twisted_rock_bricks_from_small_bricks.json -d6e50dc00744b431e06737acdbae86431466b8dd data/malum/recipes/twisted_rock_bricks_slab.json -a498e568f3fd6d3141c64812a9f0af98cabfe700 data/malum/recipes/twisted_rock_bricks_slab_stonecutting.json -8c1ae8b0b59659055d3cd89e66231486ca4fbc83 data/malum/recipes/twisted_rock_bricks_stairs.json -697de174cc8465d0a02a45c49ed6f81362f554fd data/malum/recipes/twisted_rock_bricks_stairs_stonecutting.json -a950f7259ea19cf165d9bdefc9fd8b7d408926c8 data/malum/recipes/twisted_rock_bricks_stonecutting.json -f6001e4c87a9f92f165e3b445ff013240fbc2429 data/malum/recipes/twisted_rock_bricks_stonecutting_from_polished.json -7dacc5fa53a2066d579ff31ef88fcb9096b2efa3 data/malum/recipes/twisted_rock_bricks_wall.json -8f71f6db67ae06b272b828e09a547fe0ef14de1b data/malum/recipes/twisted_rock_button.json -f4ee7b4bd49349caa853435d35439191e95b6433 data/malum/recipes/twisted_rock_column.json -57c05adeb63b9dff0353616d96202e0a36d484b3 data/malum/recipes/twisted_rock_column_cap.json -2fcda19ca06c049a0ef41092fc7d8d7f6cd17855 data/malum/recipes/twisted_rock_column_cap_stonecutting.json -b74f90263bf6211c30a695b2db1dff10a1376046 data/malum/recipes/twisted_rock_column_from_cap.json -f678be4ed2876bf148cd2ed84bca31751e637d06 data/malum/recipes/twisted_rock_column_stonecutting.json -fb542e054e7468c30527272d378643ee33205181 data/malum/recipes/twisted_rock_item_pedestal.json -f792532238f1148c134281375a5af7df3d5ac9e5 data/malum/recipes/twisted_rock_item_stand.json -f5841e15299e6b73aa8fe4a74ae888712ebed764 data/malum/recipes/twisted_rock_pressure_plate.json -efca0ae712403d8501701f08b6564c1176815e92 data/malum/recipes/twisted_rock_slab.json -ccb4e08b278562c424bebf0264d32d1262d747e1 data/malum/recipes/twisted_rock_slab_stonecutting.json -582d420b5e9793fa75e4c5b23e37638b0b07f6b2 data/malum/recipes/twisted_rock_stairs.json -7bc99717425b37590853f7b91df28269925d9a8c data/malum/recipes/twisted_rock_stairs_stonecutting.json -f0f4470ad05b967be0f072b2fdecdda39baff25e data/malum/recipes/twisted_rock_tiles.json -5125651b4502cff1014751ff2dafee7f41e5d0a3 data/malum/recipes/twisted_rock_tiles_slab.json -fcdcb5c257bd4262d69373def2a62350856571d9 data/malum/recipes/twisted_rock_tiles_slab_stonecutting.json -1c3ea8f79f2baa3097cadaaadb406db8038960c4 data/malum/recipes/twisted_rock_tiles_stairs.json -19ac832e6cd658afe6474404ee823b6e7fb7e15d data/malum/recipes/twisted_rock_tiles_stairs_stonecutting.json -e9d4153c7bdc772453b9e53f0afcde6c585ca79e data/malum/recipes/twisted_rock_tiles_stonecutting.json -ec0a98ef6aeeab7a8cc724c4df26e45915685700 data/malum/recipes/twisted_rock_tiles_stonecutting_from_bricks.json -58e72892db98d648df9e85773074fdf724f7ad0a data/malum/recipes/twisted_rock_tiles_stonecutting_from_polished.json -dfef3b4d3de12d555c6646ab0c53c703e7e65692 data/malum/recipes/twisted_rock_tiles_wall.json -e15851b1cf0c6a71415feead77f5887498959d67 data/malum/recipes/twisted_rock_tiles_wall_stonecutting.json -e057959d4bf6e9b51be7267ba473015c8647c2f2 data/malum/recipes/twisted_rock_wall.json -fbbac86353eae18f21792a469f933520b5986fa9 data/malum/recipes/twisted_rock_wall_stonecutting.json -6be9027479c025477b43691998338cefd8c92f4e data/malum/recipes/unholy_sap_from_smelting.json -5627b211db9e99d43f12f31fd2c4411fe9bb1fe9 data/malum/recipes/unholy_sap_from_smoking.json -3e4970f92c9d32db6d699857f35fb03de970babc data/malum/recipes/unholy_sapball.json -4db1951fd11dea783fc9c27f5111f2bdbc500d7b data/malum/recipes/uranium_from_node_blasting.json -86208cc50e0491929a78a011291df57527b1f4f1 data/malum/recipes/uranium_from_node_smelting.json -b7cbbfbf31cfcaf67a3c54dce52eab37562eb4d6 data/malum/recipes/vertical_runewood_planks.json -db470b95141d7b70c5251d28caea9054ff6fd687 data/malum/recipes/vertical_runewood_planks_slab.json -4d91d1491ba154c4d9c00e93daf984d503f664a0 data/malum/recipes/vertical_runewood_planks_stairs.json -f20706fed208e84778d8d7112e487053fe0685ee data/malum/recipes/vertical_soulwood_planks.json -7c0b5c59986c84bd0c6ec74cc29fa487c782bac6 data/malum/recipes/vertical_soulwood_planks_slab.json -aa95dbfa14350ca1c5868221663ac9a5481f35be data/malum/recipes/vertical_soulwood_planks_stairs.json -678486ec425a70266fd5914e99a3312dc03f55e5 data/malum/recipes/void_favor/anomalous_snare.json -74066cf2b9f8e345ebfaef68f00b93440942abca data/malum/recipes/void_favor/crystallized_nihility.json -f86db12c910149b44dfe00edd46d00268e3b369f data/malum/recipes/void_favor/null_slate.json -eaf9a25862b50bf447a8c0f778db58bd2dd834dd data/malum/recipes/void_favor/raw_soulstone.json -6e240a92c945d68d3b03c54e50307f5472a0ad47 data/malum/recipes/void_favor/strange_nucleus.json -49da947d625a708be60ea24e1f4e08981edd93b3 data/malum/recipes/void_favor/the_vessel.json -205a808a9cb6e1f6f00af516fd5e4821256e7570 data/malum/recipes/void_favor/void_salts.json -6be7bd80785f638a452b6075d0bb6fb8a1acba36 data/malum/recipes/weavers_workbench.json -c9a00a0dea1e204ea6d81e70ce5f3d8b0a90c499 data/malum/recipes/zinc_from_node_blasting.json -14730fbd0a601a657e165c1ae3d8f1684c23378e data/malum/recipes/zinc_from_node_smelting.json -68c85bfc69f4fa21c8a26406dd1c83c3224f5ba0 data/malum/recipes/zombie_head_from_grim_talc.json -69f101435729367fc32b7dee4471befc92747d97 data/malum/tags/blocks/blighted_blocks.json -9bb211fd558c3df77922a9248197ecc1666e1535 data/malum/tags/blocks/blighted_plants.json -74700d556ca80c7a1db5fd4efb09c3ddb26cad66 data/malum/tags/blocks/endless_flame.json -74700d556ca80c7a1db5fd4efb09c3ddb26cad66 data/malum/tags/blocks/greater_aerial_whitelist.json -1c70b76fa97e8ff7c41828d323a6209632a0774f data/malum/tags/blocks/rite_immune.json -5bacbc91f453d1eb454e3e979e34d07dc6c7c4da data/malum/tags/blocks/runewood_logs.json -cc05d84ab882a6d50eccd1c1249984b7a73a068c data/malum/tags/blocks/soulwood_logs.json -31528cfe500b144075e04c32eaadb551f5bf8cd9 data/malum/tags/blocks/tainted_rock.json -118cae981aa64137bd98abe5e7f3542f37fc72d8 data/malum/tags/blocks/twisted_rock.json -4be47ded58b1431cd4f809d9930ab3f775853aa2 data/malum/tags/items/gross_foods.json -61483a182cfda1ba4d98076b9b0971544f209b28 data/malum/tags/items/metal_nodes.json -e77d16ce6a09ea73b9803e4b088669ecfa5e1d4c data/malum/tags/items/prospectors_treasure.json -3afb0862d66b4628b9773712566384838c236c38 data/malum/tags/items/runewood_logs.json -2956c7ab14fca69e8efefa4ef85e2bb49eb29956 data/malum/tags/items/sapballs.json -c38cf15e4af935f1898a951527bf049f8745f546 data/malum/tags/items/scythe.json -c7e3995a0da422668d01646e6482e9dde83e9626 data/malum/tags/items/soul_hunter_weapon.json -22decac6a24ac386d2e3678d3670ba345516ae6a data/malum/tags/items/soulwood_logs.json -ef921fe634779bc5dde9d3dc3657e33c5c09f1a1 data/minecraft/advancements/recipes/malum_basis_of_magic/ether_torch_alternative.json -5f53d17d41cfede8f758ce9be7fb457958108f59 data/minecraft/advancements/recipes/malum_basis_of_magic/iridescent_ether_torch_alternative.json -7662ed0466af46475d7cd0d342539ab0f1df67a1 data/minecraft/advancements/recipes/malum_basis_of_magic/tainted_ether_brazier.json -30d0f751fc75692344c11b4a88f6bca53f8deed3 data/minecraft/advancements/recipes/malum_basis_of_magic/tainted_iridescent_ether_brazier.json -02f50f7b1be238ceb8e03bfd73373a81248d2b11 data/minecraft/advancements/recipes/malum_basis_of_magic/twisted_ether_brazier.json -6bbb5922e849f59358dd0f775ebe1a3574492538 data/minecraft/advancements/recipes/malum_basis_of_magic/twisted_iridescent_ether_brazier.json -63ee2c83c200d592a2920d761ecfa1a70134b91e data/minecraft/recipes/comparator.json -3bf9818c3c74233784d985df1695e3fddcb4187a data/minecraft/recipes/daylight_detector.json -d519b87ee2e4672504547177f2891b1f549d583b data/minecraft/recipes/diorite.json -0f19affb415d0deceaa370e5cd9be1b6776f5e19 data/minecraft/recipes/ether_torch_alternative.json -01cd4e733032c1e788e03c5363a448e8f7024110 data/minecraft/recipes/granite.json -3f511897be7a342e65a9a696f2cdf08be3b6b4c1 data/minecraft/recipes/iridescent_ether_torch_alternative.json -f033d822b48de30f3fb61fce071a924a6955133d data/minecraft/recipes/observer.json -380b915eeefcbc0756252a08ef7a9562709f2d66 data/minecraft/recipes/quartz_block.json -01f7ac72b77852de80370ba09abb769269ea32ba data/minecraft/recipes/tainted_ether_brazier.json -12d0395674f44d86acbc2b6792cc36d5e52fa808 data/minecraft/recipes/tainted_iridescent_ether_brazier.json -4b896e98b75da0cd6680d5f9c64e0e19dfe82e84 data/minecraft/recipes/twisted_ether_brazier.json -81fb70c072483e558546de5b47d9c3ce293e0b14 data/minecraft/recipes/twisted_iridescent_ether_brazier.json -1b67005cdea8575d667f91b954708af6a042d476 data/minecraft/tags/blocks/beacon_base_blocks.json -849330ef10b068236b0de99186b329a010ae36ca data/minecraft/tags/blocks/buttons.json -30f6bfd92fd612fa49790698ecba4d35a7c14613 data/minecraft/tags/blocks/doors.json -5736c68f4e1bf1daacb3685108f42dd499ddffdb data/minecraft/tags/blocks/fence_gates.json -5f9c009fff7f5805f446d202b04551126d9ea90e data/minecraft/tags/blocks/fences.json -ddbfda4cbb4b8f2e39f52cde67d5b0d9f05279d3 data/minecraft/tags/blocks/leaves.json -5222d214211542a5574aed8b0aba716c1910d9cf data/minecraft/tags/blocks/logs.json -1f783ff7d1f657a03e7ca5fd12e633ef9e987358 data/minecraft/tags/blocks/mineable/axe.json -dc7a85f0d4fb76bd7f24656936c912c2f6f23b80 data/minecraft/tags/blocks/mineable/hoe.json -b95498881b109bce6f737e9689f1c84d77cdebc5 data/minecraft/tags/blocks/mineable/pickaxe.json -e789a1028c4443a22a9b914c2b235d87a16a7290 data/minecraft/tags/blocks/mineable/shovel.json -115f6e20a06d1eb85cac0e9ae1600601d83bc69f data/minecraft/tags/blocks/planks.json -d168d8e3b43e6778d4b9db9c314c3aa3f08cbcc5 data/minecraft/tags/blocks/pressure_plates.json -2a73d99f25cfc497bc7fbac067a0e5b7ed4b7d76 data/minecraft/tags/blocks/saplings.json -601699006f77d49637c041c099924fb78c114a29 data/minecraft/tags/blocks/signs.json -6302ada1c46335412c9a167d70b1419e90474df9 data/minecraft/tags/blocks/slabs.json -ec5f08f4e67e964af51b9e5cefa209abec0f385f data/minecraft/tags/blocks/stairs.json -8a3ae0a23ef750c16b11aa2234e44d0388d051c2 data/minecraft/tags/blocks/standing_signs.json -229d78b7721355331aea34f79d2464d4f57d5545 data/minecraft/tags/blocks/trapdoors.json -926700baa82a9439335f47c24922bbed38f029ca data/minecraft/tags/blocks/wall_signs.json -e43129b07b44903cabc2d504fd5f476a903ce460 data/minecraft/tags/blocks/walls.json -bda2f9fd7e1c7cdd07a066b08462645c787d55fb data/minecraft/tags/blocks/wooden_buttons.json -30f6bfd92fd612fa49790698ecba4d35a7c14613 data/minecraft/tags/blocks/wooden_doors.json -5f9c009fff7f5805f446d202b04551126d9ea90e data/minecraft/tags/blocks/wooden_fences.json -847f0b6e72bf1f5fca0571774ec52bc9006179cc data/minecraft/tags/blocks/wooden_pressure_plates.json -80d37a23224f8c7bbf1f6e323ade798623347b35 data/minecraft/tags/blocks/wooden_slabs.json -0e96f68921b267defebbe41310898d93f033331e data/minecraft/tags/blocks/wooden_stairs.json -229d78b7721355331aea34f79d2464d4f57d5545 data/minecraft/tags/blocks/wooden_trapdoors.json -74700d556ca80c7a1db5fd4efb09c3ddb26cad66 data/minecraft/tags/items/anvil.json -74700d556ca80c7a1db5fd4efb09c3ddb26cad66 data/minecraft/tags/items/beds.json -849330ef10b068236b0de99186b329a010ae36ca data/minecraft/tags/items/buttons.json -74700d556ca80c7a1db5fd4efb09c3ddb26cad66 data/minecraft/tags/items/carpets.json -30f6bfd92fd612fa49790698ecba4d35a7c14613 data/minecraft/tags/items/doors.json -5f9c009fff7f5805f446d202b04551126d9ea90e data/minecraft/tags/items/fences.json -74700d556ca80c7a1db5fd4efb09c3ddb26cad66 data/minecraft/tags/items/flowers.json -74700d556ca80c7a1db5fd4efb09c3ddb26cad66 data/minecraft/tags/items/gold_ores.json -ddbfda4cbb4b8f2e39f52cde67d5b0d9f05279d3 data/minecraft/tags/items/leaves.json -5222d214211542a5574aed8b0aba716c1910d9cf data/minecraft/tags/items/logs.json -74700d556ca80c7a1db5fd4efb09c3ddb26cad66 data/minecraft/tags/items/logs_that_burn.json -115f6e20a06d1eb85cac0e9ae1600601d83bc69f data/minecraft/tags/items/planks.json -74700d556ca80c7a1db5fd4efb09c3ddb26cad66 data/minecraft/tags/items/sand.json -2a73d99f25cfc497bc7fbac067a0e5b7ed4b7d76 data/minecraft/tags/items/saplings.json -6302ada1c46335412c9a167d70b1419e90474df9 data/minecraft/tags/items/slabs.json -74700d556ca80c7a1db5fd4efb09c3ddb26cad66 data/minecraft/tags/items/small_flowers.json -74700d556ca80c7a1db5fd4efb09c3ddb26cad66 data/minecraft/tags/items/soul_fire_base_blocks.json -ec5f08f4e67e964af51b9e5cefa209abec0f385f data/minecraft/tags/items/stairs.json -74700d556ca80c7a1db5fd4efb09c3ddb26cad66 data/minecraft/tags/items/stone_bricks.json -74700d556ca80c7a1db5fd4efb09c3ddb26cad66 data/minecraft/tags/items/tall_flowers.json -229d78b7721355331aea34f79d2464d4f57d5545 data/minecraft/tags/items/trapdoors.json -e43129b07b44903cabc2d504fd5f476a903ce460 data/minecraft/tags/items/walls.json -bda2f9fd7e1c7cdd07a066b08462645c787d55fb data/minecraft/tags/items/wooden_buttons.json -30f6bfd92fd612fa49790698ecba4d35a7c14613 data/minecraft/tags/items/wooden_doors.json -5f9c009fff7f5805f446d202b04551126d9ea90e data/minecraft/tags/items/wooden_fences.json -847f0b6e72bf1f5fca0571774ec52bc9006179cc data/minecraft/tags/items/wooden_pressure_plates.json -80d37a23224f8c7bbf1f6e323ade798623347b35 data/minecraft/tags/items/wooden_slabs.json -0e96f68921b267defebbe41310898d93f033331e data/minecraft/tags/items/wooden_stairs.json -229d78b7721355331aea34f79d2464d4f57d5545 data/minecraft/tags/items/wooden_trapdoors.json -74700d556ca80c7a1db5fd4efb09c3ddb26cad66 data/minecraft/tags/items/wool.json diff --git a/src/generated/resources/assets/malum/blockstates/iridescent_wall_ether_torch.json b/src/generated/resources/assets/malum/blockstates/iridescent_wall_ether_torch.json index 5f3132860..13f8d6848 100644 --- a/src/generated/resources/assets/malum/blockstates/iridescent_wall_ether_torch.json +++ b/src/generated/resources/assets/malum/blockstates/iridescent_wall_ether_torch.json @@ -1,34 +1,34 @@ { "variants": { - "facing=north,waterlogged=false": { - "model": "malum:block/ether_torch_wall", - "y": 270 + "facing=east,waterlogged=false": { + "model": "malum:block/ether_torch_wall" }, - "facing=south,waterlogged=false": { - "model": "malum:block/ether_torch_wall", - "y": 90 + "facing=east,waterlogged=true": { + "model": "malum:block/ether_torch_wall" }, - "facing=west,waterlogged=false": { + "facing=north,waterlogged=false": { "model": "malum:block/ether_torch_wall", - "y": 180 - }, - "facing=east,waterlogged=false": { - "model": "malum:block/ether_torch_wall" + "y": 270 }, "facing=north,waterlogged=true": { "model": "malum:block/ether_torch_wall", "y": 270 }, + "facing=south,waterlogged=false": { + "model": "malum:block/ether_torch_wall", + "y": 90 + }, "facing=south,waterlogged=true": { "model": "malum:block/ether_torch_wall", "y": 90 }, - "facing=west,waterlogged=true": { + "facing=west,waterlogged=false": { "model": "malum:block/ether_torch_wall", "y": 180 }, - "facing=east,waterlogged=true": { - "model": "malum:block/ether_torch_wall" + "facing=west,waterlogged=true": { + "model": "malum:block/ether_torch_wall", + "y": 180 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/blockstates/natural_quartz_cluster.json b/src/generated/resources/assets/malum/blockstates/natural_quartz_cluster.json index ffeda6bdf..d8b85cd3a 100644 --- a/src/generated/resources/assets/malum/blockstates/natural_quartz_cluster.json +++ b/src/generated/resources/assets/malum/blockstates/natural_quartz_cluster.json @@ -4,53 +4,53 @@ "model": "malum:block/natural_quartz_cluster", "x": 180 }, - "facing=up,waterlogged=false": { - "model": "malum:block/natural_quartz_cluster" - }, - "facing=north,waterlogged=false": { - "model": "malum:block/natural_quartz_cluster", - "x": 90 - }, - "facing=south,waterlogged=false": { + "facing=down,waterlogged=true": { "model": "malum:block/natural_quartz_cluster", - "x": 90, - "y": 180 + "x": 180 }, - "facing=west,waterlogged=false": { + "facing=east,waterlogged=false": { "model": "malum:block/natural_quartz_cluster", "x": 90, - "y": 270 + "y": 90 }, - "facing=east,waterlogged=false": { + "facing=east,waterlogged=true": { "model": "malum:block/natural_quartz_cluster", "x": 90, "y": 90 }, - "facing=down,waterlogged=true": { + "facing=north,waterlogged=false": { "model": "malum:block/natural_quartz_cluster", - "x": 180 - }, - "facing=up,waterlogged=true": { - "model": "malum:block/natural_quartz_cluster" + "x": 90 }, "facing=north,waterlogged=true": { "model": "malum:block/natural_quartz_cluster", "x": 90 }, + "facing=south,waterlogged=false": { + "model": "malum:block/natural_quartz_cluster", + "x": 90, + "y": 180 + }, "facing=south,waterlogged=true": { "model": "malum:block/natural_quartz_cluster", "x": 90, "y": 180 }, - "facing=west,waterlogged=true": { + "facing=up,waterlogged=false": { + "model": "malum:block/natural_quartz_cluster" + }, + "facing=up,waterlogged=true": { + "model": "malum:block/natural_quartz_cluster" + }, + "facing=west,waterlogged=false": { "model": "malum:block/natural_quartz_cluster", "x": 90, "y": 270 }, - "facing=east,waterlogged=true": { + "facing=west,waterlogged=true": { "model": "malum:block/natural_quartz_cluster", "x": 90, - "y": 90 + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/blockstates/polished_tainted_rock_slab.json b/src/generated/resources/assets/malum/blockstates/polished_tainted_rock_slab.json index e9f0a0435..4138fae22 100644 --- a/src/generated/resources/assets/malum/blockstates/polished_tainted_rock_slab.json +++ b/src/generated/resources/assets/malum/blockstates/polished_tainted_rock_slab.json @@ -1,13 +1,13 @@ { "variants": { - "type=top": { - "model": "malum:block/polished_tainted_rock_slab_top" - }, "type=bottom": { "model": "malum:block/polished_tainted_rock_slab" }, "type=double": { "model": "malum:block/polished_tainted_rock" + }, + "type=top": { + "model": "malum:block/polished_tainted_rock_slab_top" } } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/blockstates/polished_tainted_rock_stairs.json b/src/generated/resources/assets/malum/blockstates/polished_tainted_rock_stairs.json index ca83c3e6e..d45436423 100644 --- a/src/generated/resources/assets/malum/blockstates/polished_tainted_rock_stairs.json +++ b/src/generated/resources/assets/malum/blockstates/polished_tainted_rock_stairs.json @@ -1,209 +1,209 @@ { "variants": { - "facing=north,half=top,shape=straight": { - "model": "malum:block/polished_tainted_rock_stairs", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=south,half=top,shape=straight": { - "model": "malum:block/polished_tainted_rock_stairs", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=west,half=top,shape=straight": { - "model": "malum:block/polished_tainted_rock_stairs", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=east,half=top,shape=straight": { - "model": "malum:block/polished_tainted_rock_stairs", - "x": 180, - "uvlock": true + "facing=east,half=bottom,shape=inner_left": { + "model": "malum:block/polished_tainted_rock_stairs_inner", + "uvlock": true, + "y": 270 }, - "facing=north,half=bottom,shape=straight": { - "model": "malum:block/polished_tainted_rock_stairs", - "y": 270, - "uvlock": true + "facing=east,half=bottom,shape=inner_right": { + "model": "malum:block/polished_tainted_rock_stairs_inner" }, - "facing=south,half=bottom,shape=straight": { - "model": "malum:block/polished_tainted_rock_stairs", - "y": 90, - "uvlock": true + "facing=east,half=bottom,shape=outer_left": { + "model": "malum:block/polished_tainted_rock_stairs_outer", + "uvlock": true, + "y": 270 }, - "facing=west,half=bottom,shape=straight": { - "model": "malum:block/polished_tainted_rock_stairs", - "y": 180, - "uvlock": true + "facing=east,half=bottom,shape=outer_right": { + "model": "malum:block/polished_tainted_rock_stairs_outer" }, "facing=east,half=bottom,shape=straight": { "model": "malum:block/polished_tainted_rock_stairs" }, - "facing=north,half=top,shape=inner_left": { + "facing=east,half=top,shape=inner_left": { "model": "malum:block/polished_tainted_rock_stairs_inner", - "x": 180, - "y": 270, - "uvlock": true + "uvlock": true, + "x": 180 }, - "facing=south,half=top,shape=inner_left": { + "facing=east,half=top,shape=inner_right": { "model": "malum:block/polished_tainted_rock_stairs_inner", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 90 }, - "facing=west,half=top,shape=inner_left": { - "model": "malum:block/polished_tainted_rock_stairs_inner", - "x": 180, - "y": 180, - "uvlock": true + "facing=east,half=top,shape=outer_left": { + "model": "malum:block/polished_tainted_rock_stairs_outer", + "uvlock": true, + "x": 180 }, - "facing=east,half=top,shape=inner_left": { - "model": "malum:block/polished_tainted_rock_stairs_inner", + "facing=east,half=top,shape=outer_right": { + "model": "malum:block/polished_tainted_rock_stairs_outer", + "uvlock": true, "x": 180, - "uvlock": true + "y": 90 + }, + "facing=east,half=top,shape=straight": { + "model": "malum:block/polished_tainted_rock_stairs", + "uvlock": true, + "x": 180 }, "facing=north,half=bottom,shape=inner_left": { "model": "malum:block/polished_tainted_rock_stairs_inner", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=south,half=bottom,shape=inner_left": { - "model": "malum:block/polished_tainted_rock_stairs_inner" - }, - "facing=west,half=bottom,shape=inner_left": { + "facing=north,half=bottom,shape=inner_right": { "model": "malum:block/polished_tainted_rock_stairs_inner", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 270 }, - "facing=east,half=bottom,shape=inner_left": { - "model": "malum:block/polished_tainted_rock_stairs_inner", - "y": 270, - "uvlock": true + "facing=north,half=bottom,shape=outer_left": { + "model": "malum:block/polished_tainted_rock_stairs_outer", + "uvlock": true, + "y": 180 }, - "facing=north,half=top,shape=inner_right": { - "model": "malum:block/polished_tainted_rock_stairs_inner", - "x": 180, - "uvlock": true + "facing=north,half=bottom,shape=outer_right": { + "model": "malum:block/polished_tainted_rock_stairs_outer", + "uvlock": true, + "y": 270 }, - "facing=south,half=top,shape=inner_right": { + "facing=north,half=bottom,shape=straight": { + "model": "malum:block/polished_tainted_rock_stairs", + "uvlock": true, + "y": 270 + }, + "facing=north,half=top,shape=inner_left": { "model": "malum:block/polished_tainted_rock_stairs_inner", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 270 }, - "facing=west,half=top,shape=inner_right": { + "facing=north,half=top,shape=inner_right": { "model": "malum:block/polished_tainted_rock_stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=outer_left": { + "model": "malum:block/polished_tainted_rock_stairs_outer", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 270 }, - "facing=east,half=top,shape=inner_right": { - "model": "malum:block/polished_tainted_rock_stairs_inner", + "facing=north,half=top,shape=outer_right": { + "model": "malum:block/polished_tainted_rock_stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=straight": { + "model": "malum:block/polished_tainted_rock_stairs", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 270 }, - "facing=north,half=bottom,shape=inner_right": { - "model": "malum:block/polished_tainted_rock_stairs_inner", - "y": 270, - "uvlock": true + "facing=south,half=bottom,shape=inner_left": { + "model": "malum:block/polished_tainted_rock_stairs_inner" }, "facing=south,half=bottom,shape=inner_right": { "model": "malum:block/polished_tainted_rock_stairs_inner", - "y": 90, - "uvlock": true - }, - "facing=west,half=bottom,shape=inner_right": { - "model": "malum:block/polished_tainted_rock_stairs_inner", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 90 }, - "facing=east,half=bottom,shape=inner_right": { - "model": "malum:block/polished_tainted_rock_stairs_inner" + "facing=south,half=bottom,shape=outer_left": { + "model": "malum:block/polished_tainted_rock_stairs_outer" }, - "facing=north,half=top,shape=outer_left": { + "facing=south,half=bottom,shape=outer_right": { "model": "malum:block/polished_tainted_rock_stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=straight": { + "model": "malum:block/polished_tainted_rock_stairs", + "uvlock": true, + "y": 90 + }, + "facing=south,half=top,shape=inner_left": { + "model": "malum:block/polished_tainted_rock_stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=inner_right": { + "model": "malum:block/polished_tainted_rock_stairs_inner", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 180 }, "facing=south,half=top,shape=outer_left": { "model": "malum:block/polished_tainted_rock_stairs_outer", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 90 }, - "facing=west,half=top,shape=outer_left": { + "facing=south,half=top,shape=outer_right": { "model": "malum:block/polished_tainted_rock_stairs_outer", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 180 }, - "facing=east,half=top,shape=outer_left": { - "model": "malum:block/polished_tainted_rock_stairs_outer", + "facing=south,half=top,shape=straight": { + "model": "malum:block/polished_tainted_rock_stairs", + "uvlock": true, "x": 180, - "uvlock": true + "y": 90 }, - "facing=north,half=bottom,shape=outer_left": { - "model": "malum:block/polished_tainted_rock_stairs_outer", - "y": 180, - "uvlock": true + "facing=west,half=bottom,shape=inner_left": { + "model": "malum:block/polished_tainted_rock_stairs_inner", + "uvlock": true, + "y": 90 }, - "facing=south,half=bottom,shape=outer_left": { - "model": "malum:block/polished_tainted_rock_stairs_outer" + "facing=west,half=bottom,shape=inner_right": { + "model": "malum:block/polished_tainted_rock_stairs_inner", + "uvlock": true, + "y": 180 }, "facing=west,half=bottom,shape=outer_left": { "model": "malum:block/polished_tainted_rock_stairs_outer", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 90 }, - "facing=east,half=bottom,shape=outer_left": { + "facing=west,half=bottom,shape=outer_right": { "model": "malum:block/polished_tainted_rock_stairs_outer", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=north,half=top,shape=outer_right": { - "model": "malum:block/polished_tainted_rock_stairs_outer", - "x": 180, - "uvlock": true + "facing=west,half=bottom,shape=straight": { + "model": "malum:block/polished_tainted_rock_stairs", + "uvlock": true, + "y": 180 }, - "facing=south,half=top,shape=outer_right": { - "model": "malum:block/polished_tainted_rock_stairs_outer", + "facing=west,half=top,shape=inner_left": { + "model": "malum:block/polished_tainted_rock_stairs_inner", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 180 }, - "facing=west,half=top,shape=outer_right": { - "model": "malum:block/polished_tainted_rock_stairs_outer", + "facing=west,half=top,shape=inner_right": { + "model": "malum:block/polished_tainted_rock_stairs_inner", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 270 }, - "facing=east,half=top,shape=outer_right": { + "facing=west,half=top,shape=outer_left": { "model": "malum:block/polished_tainted_rock_stairs_outer", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true - }, - "facing=north,half=bottom,shape=outer_right": { - "model": "malum:block/polished_tainted_rock_stairs_outer", - "y": 270, - "uvlock": true - }, - "facing=south,half=bottom,shape=outer_right": { - "model": "malum:block/polished_tainted_rock_stairs_outer", - "y": 90, - "uvlock": true + "y": 180 }, - "facing=west,half=bottom,shape=outer_right": { + "facing=west,half=top,shape=outer_right": { "model": "malum:block/polished_tainted_rock_stairs_outer", - "y": 180, - "uvlock": true + "uvlock": true, + "x": 180, + "y": 270 }, - "facing=east,half=bottom,shape=outer_right": { - "model": "malum:block/polished_tainted_rock_stairs_outer" + "facing=west,half=top,shape=straight": { + "model": "malum:block/polished_tainted_rock_stairs", + "uvlock": true, + "x": 180, + "y": 180 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/blockstates/polished_twisted_rock_slab.json b/src/generated/resources/assets/malum/blockstates/polished_twisted_rock_slab.json index bc3bff006..3c6ef22d7 100644 --- a/src/generated/resources/assets/malum/blockstates/polished_twisted_rock_slab.json +++ b/src/generated/resources/assets/malum/blockstates/polished_twisted_rock_slab.json @@ -1,13 +1,13 @@ { "variants": { - "type=top": { - "model": "malum:block/polished_twisted_rock_slab_top" - }, "type=bottom": { "model": "malum:block/polished_twisted_rock_slab" }, "type=double": { "model": "malum:block/polished_twisted_rock" + }, + "type=top": { + "model": "malum:block/polished_twisted_rock_slab_top" } } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/blockstates/polished_twisted_rock_stairs.json b/src/generated/resources/assets/malum/blockstates/polished_twisted_rock_stairs.json index 935e54912..d8f1fcbdf 100644 --- a/src/generated/resources/assets/malum/blockstates/polished_twisted_rock_stairs.json +++ b/src/generated/resources/assets/malum/blockstates/polished_twisted_rock_stairs.json @@ -1,209 +1,209 @@ { "variants": { - "facing=north,half=top,shape=straight": { - "model": "malum:block/polished_twisted_rock_stairs", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=south,half=top,shape=straight": { - "model": "malum:block/polished_twisted_rock_stairs", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=west,half=top,shape=straight": { - "model": "malum:block/polished_twisted_rock_stairs", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=east,half=top,shape=straight": { - "model": "malum:block/polished_twisted_rock_stairs", - "x": 180, - "uvlock": true + "facing=east,half=bottom,shape=inner_left": { + "model": "malum:block/polished_twisted_rock_stairs_inner", + "uvlock": true, + "y": 270 }, - "facing=north,half=bottom,shape=straight": { - "model": "malum:block/polished_twisted_rock_stairs", - "y": 270, - "uvlock": true + "facing=east,half=bottom,shape=inner_right": { + "model": "malum:block/polished_twisted_rock_stairs_inner" }, - "facing=south,half=bottom,shape=straight": { - "model": "malum:block/polished_twisted_rock_stairs", - "y": 90, - "uvlock": true + "facing=east,half=bottom,shape=outer_left": { + "model": "malum:block/polished_twisted_rock_stairs_outer", + "uvlock": true, + "y": 270 }, - "facing=west,half=bottom,shape=straight": { - "model": "malum:block/polished_twisted_rock_stairs", - "y": 180, - "uvlock": true + "facing=east,half=bottom,shape=outer_right": { + "model": "malum:block/polished_twisted_rock_stairs_outer" }, "facing=east,half=bottom,shape=straight": { "model": "malum:block/polished_twisted_rock_stairs" }, - "facing=north,half=top,shape=inner_left": { + "facing=east,half=top,shape=inner_left": { "model": "malum:block/polished_twisted_rock_stairs_inner", - "x": 180, - "y": 270, - "uvlock": true + "uvlock": true, + "x": 180 }, - "facing=south,half=top,shape=inner_left": { + "facing=east,half=top,shape=inner_right": { "model": "malum:block/polished_twisted_rock_stairs_inner", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 90 }, - "facing=west,half=top,shape=inner_left": { - "model": "malum:block/polished_twisted_rock_stairs_inner", - "x": 180, - "y": 180, - "uvlock": true + "facing=east,half=top,shape=outer_left": { + "model": "malum:block/polished_twisted_rock_stairs_outer", + "uvlock": true, + "x": 180 }, - "facing=east,half=top,shape=inner_left": { - "model": "malum:block/polished_twisted_rock_stairs_inner", + "facing=east,half=top,shape=outer_right": { + "model": "malum:block/polished_twisted_rock_stairs_outer", + "uvlock": true, "x": 180, - "uvlock": true + "y": 90 + }, + "facing=east,half=top,shape=straight": { + "model": "malum:block/polished_twisted_rock_stairs", + "uvlock": true, + "x": 180 }, "facing=north,half=bottom,shape=inner_left": { "model": "malum:block/polished_twisted_rock_stairs_inner", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=south,half=bottom,shape=inner_left": { - "model": "malum:block/polished_twisted_rock_stairs_inner" - }, - "facing=west,half=bottom,shape=inner_left": { + "facing=north,half=bottom,shape=inner_right": { "model": "malum:block/polished_twisted_rock_stairs_inner", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 270 }, - "facing=east,half=bottom,shape=inner_left": { - "model": "malum:block/polished_twisted_rock_stairs_inner", - "y": 270, - "uvlock": true + "facing=north,half=bottom,shape=outer_left": { + "model": "malum:block/polished_twisted_rock_stairs_outer", + "uvlock": true, + "y": 180 }, - "facing=north,half=top,shape=inner_right": { - "model": "malum:block/polished_twisted_rock_stairs_inner", - "x": 180, - "uvlock": true + "facing=north,half=bottom,shape=outer_right": { + "model": "malum:block/polished_twisted_rock_stairs_outer", + "uvlock": true, + "y": 270 }, - "facing=south,half=top,shape=inner_right": { + "facing=north,half=bottom,shape=straight": { + "model": "malum:block/polished_twisted_rock_stairs", + "uvlock": true, + "y": 270 + }, + "facing=north,half=top,shape=inner_left": { "model": "malum:block/polished_twisted_rock_stairs_inner", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 270 }, - "facing=west,half=top,shape=inner_right": { + "facing=north,half=top,shape=inner_right": { "model": "malum:block/polished_twisted_rock_stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=outer_left": { + "model": "malum:block/polished_twisted_rock_stairs_outer", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 270 }, - "facing=east,half=top,shape=inner_right": { - "model": "malum:block/polished_twisted_rock_stairs_inner", + "facing=north,half=top,shape=outer_right": { + "model": "malum:block/polished_twisted_rock_stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=straight": { + "model": "malum:block/polished_twisted_rock_stairs", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 270 }, - "facing=north,half=bottom,shape=inner_right": { - "model": "malum:block/polished_twisted_rock_stairs_inner", - "y": 270, - "uvlock": true + "facing=south,half=bottom,shape=inner_left": { + "model": "malum:block/polished_twisted_rock_stairs_inner" }, "facing=south,half=bottom,shape=inner_right": { "model": "malum:block/polished_twisted_rock_stairs_inner", - "y": 90, - "uvlock": true - }, - "facing=west,half=bottom,shape=inner_right": { - "model": "malum:block/polished_twisted_rock_stairs_inner", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 90 }, - "facing=east,half=bottom,shape=inner_right": { - "model": "malum:block/polished_twisted_rock_stairs_inner" + "facing=south,half=bottom,shape=outer_left": { + "model": "malum:block/polished_twisted_rock_stairs_outer" }, - "facing=north,half=top,shape=outer_left": { + "facing=south,half=bottom,shape=outer_right": { "model": "malum:block/polished_twisted_rock_stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=straight": { + "model": "malum:block/polished_twisted_rock_stairs", + "uvlock": true, + "y": 90 + }, + "facing=south,half=top,shape=inner_left": { + "model": "malum:block/polished_twisted_rock_stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=inner_right": { + "model": "malum:block/polished_twisted_rock_stairs_inner", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 180 }, "facing=south,half=top,shape=outer_left": { "model": "malum:block/polished_twisted_rock_stairs_outer", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 90 }, - "facing=west,half=top,shape=outer_left": { + "facing=south,half=top,shape=outer_right": { "model": "malum:block/polished_twisted_rock_stairs_outer", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 180 }, - "facing=east,half=top,shape=outer_left": { - "model": "malum:block/polished_twisted_rock_stairs_outer", + "facing=south,half=top,shape=straight": { + "model": "malum:block/polished_twisted_rock_stairs", + "uvlock": true, "x": 180, - "uvlock": true + "y": 90 }, - "facing=north,half=bottom,shape=outer_left": { - "model": "malum:block/polished_twisted_rock_stairs_outer", - "y": 180, - "uvlock": true + "facing=west,half=bottom,shape=inner_left": { + "model": "malum:block/polished_twisted_rock_stairs_inner", + "uvlock": true, + "y": 90 }, - "facing=south,half=bottom,shape=outer_left": { - "model": "malum:block/polished_twisted_rock_stairs_outer" + "facing=west,half=bottom,shape=inner_right": { + "model": "malum:block/polished_twisted_rock_stairs_inner", + "uvlock": true, + "y": 180 }, "facing=west,half=bottom,shape=outer_left": { "model": "malum:block/polished_twisted_rock_stairs_outer", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 90 }, - "facing=east,half=bottom,shape=outer_left": { + "facing=west,half=bottom,shape=outer_right": { "model": "malum:block/polished_twisted_rock_stairs_outer", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=north,half=top,shape=outer_right": { - "model": "malum:block/polished_twisted_rock_stairs_outer", - "x": 180, - "uvlock": true + "facing=west,half=bottom,shape=straight": { + "model": "malum:block/polished_twisted_rock_stairs", + "uvlock": true, + "y": 180 }, - "facing=south,half=top,shape=outer_right": { - "model": "malum:block/polished_twisted_rock_stairs_outer", + "facing=west,half=top,shape=inner_left": { + "model": "malum:block/polished_twisted_rock_stairs_inner", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 180 }, - "facing=west,half=top,shape=outer_right": { - "model": "malum:block/polished_twisted_rock_stairs_outer", + "facing=west,half=top,shape=inner_right": { + "model": "malum:block/polished_twisted_rock_stairs_inner", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 270 }, - "facing=east,half=top,shape=outer_right": { + "facing=west,half=top,shape=outer_left": { "model": "malum:block/polished_twisted_rock_stairs_outer", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true - }, - "facing=north,half=bottom,shape=outer_right": { - "model": "malum:block/polished_twisted_rock_stairs_outer", - "y": 270, - "uvlock": true - }, - "facing=south,half=bottom,shape=outer_right": { - "model": "malum:block/polished_twisted_rock_stairs_outer", - "y": 90, - "uvlock": true + "y": 180 }, - "facing=west,half=bottom,shape=outer_right": { + "facing=west,half=top,shape=outer_right": { "model": "malum:block/polished_twisted_rock_stairs_outer", - "y": 180, - "uvlock": true + "uvlock": true, + "x": 180, + "y": 270 }, - "facing=east,half=bottom,shape=outer_right": { - "model": "malum:block/polished_twisted_rock_stairs_outer" + "facing=west,half=top,shape=straight": { + "model": "malum:block/polished_twisted_rock_stairs", + "uvlock": true, + "x": 180, + "y": 180 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/blockstates/runewood_door.json b/src/generated/resources/assets/malum/blockstates/runewood_door.json index 21537f848..b0ac3e488 100644 --- a/src/generated/resources/assets/malum/blockstates/runewood_door.json +++ b/src/generated/resources/assets/malum/blockstates/runewood_door.json @@ -1,124 +1,124 @@ { "variants": { - "facing=north,half=upper,hinge=left,open=false": { - "model": "malum:block/runewood_door_top", - "y": 270 + "facing=east,half=lower,hinge=left,open=false": { + "model": "malum:block/runewood_door_bottom_left" }, - "facing=south,half=upper,hinge=left,open=false": { - "model": "malum:block/runewood_door_top", + "facing=east,half=lower,hinge=left,open=true": { + "model": "malum:block/runewood_door_bottom_left_open", "y": 90 }, - "facing=west,half=upper,hinge=left,open=false": { - "model": "malum:block/runewood_door_top", - "y": 180 + "facing=east,half=lower,hinge=right,open=false": { + "model": "malum:block/runewood_door_bottom_right" + }, + "facing=east,half=lower,hinge=right,open=true": { + "model": "malum:block/runewood_door_bottom_right_open", + "y": 270 }, "facing=east,half=upper,hinge=left,open=false": { - "model": "malum:block/runewood_door_top" + "model": "malum:block/runewood_door_top_left" + }, + "facing=east,half=upper,hinge=left,open=true": { + "model": "malum:block/runewood_door_top_left_open", + "y": 90 + }, + "facing=east,half=upper,hinge=right,open=false": { + "model": "malum:block/runewood_door_top_right" + }, + "facing=east,half=upper,hinge=right,open=true": { + "model": "malum:block/runewood_door_top_right_open", + "y": 270 }, "facing=north,half=lower,hinge=left,open=false": { - "model": "malum:block/runewood_door_bottom", + "model": "malum:block/runewood_door_bottom_left", "y": 270 }, - "facing=south,half=lower,hinge=left,open=false": { - "model": "malum:block/runewood_door_bottom", - "y": 90 + "facing=north,half=lower,hinge=left,open=true": { + "model": "malum:block/runewood_door_bottom_left_open" }, - "facing=west,half=lower,hinge=left,open=false": { - "model": "malum:block/runewood_door_bottom", + "facing=north,half=lower,hinge=right,open=false": { + "model": "malum:block/runewood_door_bottom_right", + "y": 270 + }, + "facing=north,half=lower,hinge=right,open=true": { + "model": "malum:block/runewood_door_bottom_right_open", "y": 180 }, - "facing=east,half=lower,hinge=left,open=false": { - "model": "malum:block/runewood_door_bottom" + "facing=north,half=upper,hinge=left,open=false": { + "model": "malum:block/runewood_door_top_left", + "y": 270 + }, + "facing=north,half=upper,hinge=left,open=true": { + "model": "malum:block/runewood_door_top_left_open" }, "facing=north,half=upper,hinge=right,open=false": { - "model": "malum:block/runewood_door_top_hinge", + "model": "malum:block/runewood_door_top_right", "y": 270 }, - "facing=south,half=upper,hinge=right,open=false": { - "model": "malum:block/runewood_door_top_hinge", - "y": 90 - }, - "facing=west,half=upper,hinge=right,open=false": { - "model": "malum:block/runewood_door_top_hinge", + "facing=north,half=upper,hinge=right,open=true": { + "model": "malum:block/runewood_door_top_right_open", "y": 180 }, - "facing=east,half=upper,hinge=right,open=false": { - "model": "malum:block/runewood_door_top_hinge" + "facing=south,half=lower,hinge=left,open=false": { + "model": "malum:block/runewood_door_bottom_left", + "y": 90 }, - "facing=north,half=lower,hinge=right,open=false": { - "model": "malum:block/runewood_door_bottom_hinge", - "y": 270 + "facing=south,half=lower,hinge=left,open=true": { + "model": "malum:block/runewood_door_bottom_left_open", + "y": 180 }, "facing=south,half=lower,hinge=right,open=false": { - "model": "malum:block/runewood_door_bottom_hinge", + "model": "malum:block/runewood_door_bottom_right", "y": 90 }, - "facing=west,half=lower,hinge=right,open=false": { - "model": "malum:block/runewood_door_bottom_hinge", - "y": 180 - }, - "facing=east,half=lower,hinge=right,open=false": { - "model": "malum:block/runewood_door_bottom_hinge" + "facing=south,half=lower,hinge=right,open=true": { + "model": "malum:block/runewood_door_bottom_right_open" }, - "facing=north,half=upper,hinge=left,open=true": { - "model": "malum:block/runewood_door_top_hinge" + "facing=south,half=upper,hinge=left,open=false": { + "model": "malum:block/runewood_door_top_left", + "y": 90 }, "facing=south,half=upper,hinge=left,open=true": { - "model": "malum:block/runewood_door_top_hinge", + "model": "malum:block/runewood_door_top_left_open", "y": 180 }, - "facing=west,half=upper,hinge=left,open=true": { - "model": "malum:block/runewood_door_top_hinge", - "y": 270 - }, - "facing=east,half=upper,hinge=left,open=true": { - "model": "malum:block/runewood_door_top_hinge", + "facing=south,half=upper,hinge=right,open=false": { + "model": "malum:block/runewood_door_top_right", "y": 90 }, - "facing=north,half=lower,hinge=left,open=true": { - "model": "malum:block/runewood_door_bottom_hinge" + "facing=south,half=upper,hinge=right,open=true": { + "model": "malum:block/runewood_door_top_right_open" }, - "facing=south,half=lower,hinge=left,open=true": { - "model": "malum:block/runewood_door_bottom_hinge", + "facing=west,half=lower,hinge=left,open=false": { + "model": "malum:block/runewood_door_bottom_left", "y": 180 }, "facing=west,half=lower,hinge=left,open=true": { - "model": "malum:block/runewood_door_bottom_hinge", + "model": "malum:block/runewood_door_bottom_left_open", "y": 270 }, - "facing=east,half=lower,hinge=left,open=true": { - "model": "malum:block/runewood_door_bottom_hinge", - "y": 90 - }, - "facing=north,half=upper,hinge=right,open=true": { - "model": "malum:block/runewood_door_top", + "facing=west,half=lower,hinge=right,open=false": { + "model": "malum:block/runewood_door_bottom_right", "y": 180 }, - "facing=south,half=upper,hinge=right,open=true": { - "model": "malum:block/runewood_door_top" - }, - "facing=west,half=upper,hinge=right,open=true": { - "model": "malum:block/runewood_door_top", + "facing=west,half=lower,hinge=right,open=true": { + "model": "malum:block/runewood_door_bottom_right_open", "y": 90 }, - "facing=east,half=upper,hinge=right,open=true": { - "model": "malum:block/runewood_door_top", + "facing=west,half=upper,hinge=left,open=false": { + "model": "malum:block/runewood_door_top_left", + "y": 180 + }, + "facing=west,half=upper,hinge=left,open=true": { + "model": "malum:block/runewood_door_top_left_open", "y": 270 }, - "facing=north,half=lower,hinge=right,open=true": { - "model": "malum:block/runewood_door_bottom", + "facing=west,half=upper,hinge=right,open=false": { + "model": "malum:block/runewood_door_top_right", "y": 180 }, - "facing=south,half=lower,hinge=right,open=true": { - "model": "malum:block/runewood_door_bottom" - }, - "facing=west,half=lower,hinge=right,open=true": { - "model": "malum:block/runewood_door_bottom", + "facing=west,half=upper,hinge=right,open=true": { + "model": "malum:block/runewood_door_top_right_open", "y": 90 - }, - "facing=east,half=lower,hinge=right,open=true": { - "model": "malum:block/runewood_door_bottom", - "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/blockstates/runewood_item_stand.json b/src/generated/resources/assets/malum/blockstates/runewood_item_stand.json index 1baae2a63..d0d9f1876 100644 --- a/src/generated/resources/assets/malum/blockstates/runewood_item_stand.json +++ b/src/generated/resources/assets/malum/blockstates/runewood_item_stand.json @@ -4,53 +4,53 @@ "model": "malum:block/runewood_item_stand", "x": 180 }, - "facing=up,waterlogged=false": { - "model": "malum:block/runewood_item_stand" - }, - "facing=north,waterlogged=false": { - "model": "malum:block/runewood_item_stand", - "x": 90 - }, - "facing=south,waterlogged=false": { + "facing=down,waterlogged=true": { "model": "malum:block/runewood_item_stand", - "x": 90, - "y": 180 + "x": 180 }, - "facing=west,waterlogged=false": { + "facing=east,waterlogged=false": { "model": "malum:block/runewood_item_stand", "x": 90, - "y": 270 + "y": 90 }, - "facing=east,waterlogged=false": { + "facing=east,waterlogged=true": { "model": "malum:block/runewood_item_stand", "x": 90, "y": 90 }, - "facing=down,waterlogged=true": { + "facing=north,waterlogged=false": { "model": "malum:block/runewood_item_stand", - "x": 180 - }, - "facing=up,waterlogged=true": { - "model": "malum:block/runewood_item_stand" + "x": 90 }, "facing=north,waterlogged=true": { "model": "malum:block/runewood_item_stand", "x": 90 }, + "facing=south,waterlogged=false": { + "model": "malum:block/runewood_item_stand", + "x": 90, + "y": 180 + }, "facing=south,waterlogged=true": { "model": "malum:block/runewood_item_stand", "x": 90, "y": 180 }, - "facing=west,waterlogged=true": { + "facing=up,waterlogged=false": { + "model": "malum:block/runewood_item_stand" + }, + "facing=up,waterlogged=true": { + "model": "malum:block/runewood_item_stand" + }, + "facing=west,waterlogged=false": { "model": "malum:block/runewood_item_stand", "x": 90, "y": 270 }, - "facing=east,waterlogged=true": { + "facing=west,waterlogged=true": { "model": "malum:block/runewood_item_stand", "x": 90, - "y": 90 + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/blockstates/runewood_panel_slab.json b/src/generated/resources/assets/malum/blockstates/runewood_panel_slab.json index faa2a8c26..3788ffa19 100644 --- a/src/generated/resources/assets/malum/blockstates/runewood_panel_slab.json +++ b/src/generated/resources/assets/malum/blockstates/runewood_panel_slab.json @@ -1,13 +1,13 @@ { "variants": { - "type=top": { - "model": "malum:block/runewood_panel_slab_top" - }, "type=bottom": { "model": "malum:block/runewood_panel_slab" }, "type=double": { "model": "malum:block/runewood_panel" + }, + "type=top": { + "model": "malum:block/runewood_panel_slab_top" } } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/blockstates/runewood_panel_stairs.json b/src/generated/resources/assets/malum/blockstates/runewood_panel_stairs.json index c3d0a5a84..32be3c57f 100644 --- a/src/generated/resources/assets/malum/blockstates/runewood_panel_stairs.json +++ b/src/generated/resources/assets/malum/blockstates/runewood_panel_stairs.json @@ -1,209 +1,209 @@ { "variants": { - "facing=north,half=top,shape=straight": { - "model": "malum:block/runewood_panel_stairs", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=south,half=top,shape=straight": { - "model": "malum:block/runewood_panel_stairs", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=west,half=top,shape=straight": { - "model": "malum:block/runewood_panel_stairs", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=east,half=top,shape=straight": { - "model": "malum:block/runewood_panel_stairs", - "x": 180, - "uvlock": true + "facing=east,half=bottom,shape=inner_left": { + "model": "malum:block/runewood_panel_stairs_inner", + "uvlock": true, + "y": 270 }, - "facing=north,half=bottom,shape=straight": { - "model": "malum:block/runewood_panel_stairs", - "y": 270, - "uvlock": true + "facing=east,half=bottom,shape=inner_right": { + "model": "malum:block/runewood_panel_stairs_inner" }, - "facing=south,half=bottom,shape=straight": { - "model": "malum:block/runewood_panel_stairs", - "y": 90, - "uvlock": true + "facing=east,half=bottom,shape=outer_left": { + "model": "malum:block/runewood_panel_stairs_outer", + "uvlock": true, + "y": 270 }, - "facing=west,half=bottom,shape=straight": { - "model": "malum:block/runewood_panel_stairs", - "y": 180, - "uvlock": true + "facing=east,half=bottom,shape=outer_right": { + "model": "malum:block/runewood_panel_stairs_outer" }, "facing=east,half=bottom,shape=straight": { "model": "malum:block/runewood_panel_stairs" }, - "facing=north,half=top,shape=inner_left": { + "facing=east,half=top,shape=inner_left": { "model": "malum:block/runewood_panel_stairs_inner", - "x": 180, - "y": 270, - "uvlock": true + "uvlock": true, + "x": 180 }, - "facing=south,half=top,shape=inner_left": { + "facing=east,half=top,shape=inner_right": { "model": "malum:block/runewood_panel_stairs_inner", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 90 }, - "facing=west,half=top,shape=inner_left": { - "model": "malum:block/runewood_panel_stairs_inner", - "x": 180, - "y": 180, - "uvlock": true + "facing=east,half=top,shape=outer_left": { + "model": "malum:block/runewood_panel_stairs_outer", + "uvlock": true, + "x": 180 }, - "facing=east,half=top,shape=inner_left": { - "model": "malum:block/runewood_panel_stairs_inner", + "facing=east,half=top,shape=outer_right": { + "model": "malum:block/runewood_panel_stairs_outer", + "uvlock": true, "x": 180, - "uvlock": true + "y": 90 + }, + "facing=east,half=top,shape=straight": { + "model": "malum:block/runewood_panel_stairs", + "uvlock": true, + "x": 180 }, "facing=north,half=bottom,shape=inner_left": { "model": "malum:block/runewood_panel_stairs_inner", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=south,half=bottom,shape=inner_left": { - "model": "malum:block/runewood_panel_stairs_inner" - }, - "facing=west,half=bottom,shape=inner_left": { + "facing=north,half=bottom,shape=inner_right": { "model": "malum:block/runewood_panel_stairs_inner", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 270 }, - "facing=east,half=bottom,shape=inner_left": { - "model": "malum:block/runewood_panel_stairs_inner", - "y": 270, - "uvlock": true + "facing=north,half=bottom,shape=outer_left": { + "model": "malum:block/runewood_panel_stairs_outer", + "uvlock": true, + "y": 180 }, - "facing=north,half=top,shape=inner_right": { - "model": "malum:block/runewood_panel_stairs_inner", - "x": 180, - "uvlock": true + "facing=north,half=bottom,shape=outer_right": { + "model": "malum:block/runewood_panel_stairs_outer", + "uvlock": true, + "y": 270 }, - "facing=south,half=top,shape=inner_right": { + "facing=north,half=bottom,shape=straight": { + "model": "malum:block/runewood_panel_stairs", + "uvlock": true, + "y": 270 + }, + "facing=north,half=top,shape=inner_left": { "model": "malum:block/runewood_panel_stairs_inner", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 270 }, - "facing=west,half=top,shape=inner_right": { + "facing=north,half=top,shape=inner_right": { "model": "malum:block/runewood_panel_stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=outer_left": { + "model": "malum:block/runewood_panel_stairs_outer", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 270 }, - "facing=east,half=top,shape=inner_right": { - "model": "malum:block/runewood_panel_stairs_inner", + "facing=north,half=top,shape=outer_right": { + "model": "malum:block/runewood_panel_stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=straight": { + "model": "malum:block/runewood_panel_stairs", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 270 }, - "facing=north,half=bottom,shape=inner_right": { - "model": "malum:block/runewood_panel_stairs_inner", - "y": 270, - "uvlock": true + "facing=south,half=bottom,shape=inner_left": { + "model": "malum:block/runewood_panel_stairs_inner" }, "facing=south,half=bottom,shape=inner_right": { "model": "malum:block/runewood_panel_stairs_inner", - "y": 90, - "uvlock": true - }, - "facing=west,half=bottom,shape=inner_right": { - "model": "malum:block/runewood_panel_stairs_inner", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 90 }, - "facing=east,half=bottom,shape=inner_right": { - "model": "malum:block/runewood_panel_stairs_inner" + "facing=south,half=bottom,shape=outer_left": { + "model": "malum:block/runewood_panel_stairs_outer" }, - "facing=north,half=top,shape=outer_left": { + "facing=south,half=bottom,shape=outer_right": { "model": "malum:block/runewood_panel_stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=straight": { + "model": "malum:block/runewood_panel_stairs", + "uvlock": true, + "y": 90 + }, + "facing=south,half=top,shape=inner_left": { + "model": "malum:block/runewood_panel_stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=inner_right": { + "model": "malum:block/runewood_panel_stairs_inner", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 180 }, "facing=south,half=top,shape=outer_left": { "model": "malum:block/runewood_panel_stairs_outer", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 90 }, - "facing=west,half=top,shape=outer_left": { + "facing=south,half=top,shape=outer_right": { "model": "malum:block/runewood_panel_stairs_outer", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 180 }, - "facing=east,half=top,shape=outer_left": { - "model": "malum:block/runewood_panel_stairs_outer", + "facing=south,half=top,shape=straight": { + "model": "malum:block/runewood_panel_stairs", + "uvlock": true, "x": 180, - "uvlock": true + "y": 90 }, - "facing=north,half=bottom,shape=outer_left": { - "model": "malum:block/runewood_panel_stairs_outer", - "y": 180, - "uvlock": true + "facing=west,half=bottom,shape=inner_left": { + "model": "malum:block/runewood_panel_stairs_inner", + "uvlock": true, + "y": 90 }, - "facing=south,half=bottom,shape=outer_left": { - "model": "malum:block/runewood_panel_stairs_outer" + "facing=west,half=bottom,shape=inner_right": { + "model": "malum:block/runewood_panel_stairs_inner", + "uvlock": true, + "y": 180 }, "facing=west,half=bottom,shape=outer_left": { "model": "malum:block/runewood_panel_stairs_outer", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 90 }, - "facing=east,half=bottom,shape=outer_left": { + "facing=west,half=bottom,shape=outer_right": { "model": "malum:block/runewood_panel_stairs_outer", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=north,half=top,shape=outer_right": { - "model": "malum:block/runewood_panel_stairs_outer", - "x": 180, - "uvlock": true + "facing=west,half=bottom,shape=straight": { + "model": "malum:block/runewood_panel_stairs", + "uvlock": true, + "y": 180 }, - "facing=south,half=top,shape=outer_right": { - "model": "malum:block/runewood_panel_stairs_outer", + "facing=west,half=top,shape=inner_left": { + "model": "malum:block/runewood_panel_stairs_inner", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 180 }, - "facing=west,half=top,shape=outer_right": { - "model": "malum:block/runewood_panel_stairs_outer", + "facing=west,half=top,shape=inner_right": { + "model": "malum:block/runewood_panel_stairs_inner", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 270 }, - "facing=east,half=top,shape=outer_right": { + "facing=west,half=top,shape=outer_left": { "model": "malum:block/runewood_panel_stairs_outer", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true - }, - "facing=north,half=bottom,shape=outer_right": { - "model": "malum:block/runewood_panel_stairs_outer", - "y": 270, - "uvlock": true - }, - "facing=south,half=bottom,shape=outer_right": { - "model": "malum:block/runewood_panel_stairs_outer", - "y": 90, - "uvlock": true + "y": 180 }, - "facing=west,half=bottom,shape=outer_right": { + "facing=west,half=top,shape=outer_right": { "model": "malum:block/runewood_panel_stairs_outer", - "y": 180, - "uvlock": true + "uvlock": true, + "x": 180, + "y": 270 }, - "facing=east,half=bottom,shape=outer_right": { - "model": "malum:block/runewood_panel_stairs_outer" + "facing=west,half=top,shape=straight": { + "model": "malum:block/runewood_panel_stairs", + "uvlock": true, + "x": 180, + "y": 180 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/blockstates/runewood_planks_button.json b/src/generated/resources/assets/malum/blockstates/runewood_planks_button.json index 994c2171b..7fa72e205 100644 --- a/src/generated/resources/assets/malum/blockstates/runewood_planks_button.json +++ b/src/generated/resources/assets/malum/blockstates/runewood_planks_button.json @@ -1,117 +1,117 @@ { "variants": { - "face=floor,facing=north,powered=false": { - "model": "malum:block/runewood_planks_button" - }, - "face=wall,facing=north,powered=false": { + "face=ceiling,facing=east,powered=false": { "model": "malum:block/runewood_planks_button", - "x": 90, - "uvlock": true + "x": 180, + "y": 270 + }, + "face=ceiling,facing=east,powered=true": { + "model": "malum:block/runewood_planks_button_pressed", + "x": 180, + "y": 270 }, "face=ceiling,facing=north,powered=false": { "model": "malum:block/runewood_planks_button", "x": 180, "y": 180 }, - "face=floor,facing=south,powered=false": { - "model": "malum:block/runewood_planks_button", + "face=ceiling,facing=north,powered=true": { + "model": "malum:block/runewood_planks_button_pressed", + "x": 180, "y": 180 }, - "face=wall,facing=south,powered=false": { - "model": "malum:block/runewood_planks_button", - "x": 90, - "y": 180, - "uvlock": true - }, "face=ceiling,facing=south,powered=false": { "model": "malum:block/runewood_planks_button", "x": 180 }, - "face=floor,facing=west,powered=false": { - "model": "malum:block/runewood_planks_button", - "y": 270 - }, - "face=wall,facing=west,powered=false": { - "model": "malum:block/runewood_planks_button", - "x": 90, - "y": 270, - "uvlock": true + "face=ceiling,facing=south,powered=true": { + "model": "malum:block/runewood_planks_button_pressed", + "x": 180 }, "face=ceiling,facing=west,powered=false": { "model": "malum:block/runewood_planks_button", "x": 180, "y": 90 }, + "face=ceiling,facing=west,powered=true": { + "model": "malum:block/runewood_planks_button_pressed", + "x": 180, + "y": 90 + }, "face=floor,facing=east,powered=false": { "model": "malum:block/runewood_planks_button", "y": 90 }, - "face=wall,facing=east,powered=false": { - "model": "malum:block/runewood_planks_button", - "x": 90, - "y": 90, - "uvlock": true + "face=floor,facing=east,powered=true": { + "model": "malum:block/runewood_planks_button_pressed", + "y": 90 }, - "face=ceiling,facing=east,powered=false": { - "model": "malum:block/runewood_planks_button", - "x": 180, - "y": 270 + "face=floor,facing=north,powered=false": { + "model": "malum:block/runewood_planks_button" }, "face=floor,facing=north,powered=true": { "model": "malum:block/runewood_planks_button_pressed" }, - "face=wall,facing=north,powered=true": { - "model": "malum:block/runewood_planks_button_pressed", - "x": 90, - "uvlock": true - }, - "face=ceiling,facing=north,powered=true": { - "model": "malum:block/runewood_planks_button_pressed", - "x": 180, + "face=floor,facing=south,powered=false": { + "model": "malum:block/runewood_planks_button", "y": 180 }, "face=floor,facing=south,powered=true": { "model": "malum:block/runewood_planks_button_pressed", "y": 180 }, - "face=wall,facing=south,powered=true": { - "model": "malum:block/runewood_planks_button_pressed", - "x": 90, - "y": 180, - "uvlock": true - }, - "face=ceiling,facing=south,powered=true": { - "model": "malum:block/runewood_planks_button_pressed", - "x": 180 + "face=floor,facing=west,powered=false": { + "model": "malum:block/runewood_planks_button", + "y": 270 }, "face=floor,facing=west,powered=true": { "model": "malum:block/runewood_planks_button_pressed", "y": 270 }, - "face=wall,facing=west,powered=true": { - "model": "malum:block/runewood_planks_button_pressed", + "face=wall,facing=east,powered=false": { + "model": "malum:block/runewood_planks_button", + "uvlock": true, "x": 90, - "y": 270, - "uvlock": true + "y": 90 }, - "face=ceiling,facing=west,powered=true": { + "face=wall,facing=east,powered=true": { "model": "malum:block/runewood_planks_button_pressed", - "x": 180, + "uvlock": true, + "x": 90, "y": 90 }, - "face=floor,facing=east,powered=true": { + "face=wall,facing=north,powered=false": { + "model": "malum:block/runewood_planks_button", + "uvlock": true, + "x": 90 + }, + "face=wall,facing=north,powered=true": { "model": "malum:block/runewood_planks_button_pressed", - "y": 90 + "uvlock": true, + "x": 90 }, - "face=wall,facing=east,powered=true": { + "face=wall,facing=south,powered=false": { + "model": "malum:block/runewood_planks_button", + "uvlock": true, + "x": 90, + "y": 180 + }, + "face=wall,facing=south,powered=true": { "model": "malum:block/runewood_planks_button_pressed", + "uvlock": true, "x": 90, - "y": 90, - "uvlock": true + "y": 180 }, - "face=ceiling,facing=east,powered=true": { + "face=wall,facing=west,powered=false": { + "model": "malum:block/runewood_planks_button", + "uvlock": true, + "x": 90, + "y": 270 + }, + "face=wall,facing=west,powered=true": { "model": "malum:block/runewood_planks_button_pressed", - "x": 180, + "uvlock": true, + "x": 90, "y": 270 } } diff --git a/src/generated/resources/assets/malum/blockstates/runewood_planks_fence.json b/src/generated/resources/assets/malum/blockstates/runewood_planks_fence.json index 7c6d9ce0d..8290f52a6 100644 --- a/src/generated/resources/assets/malum/blockstates/runewood_planks_fence.json +++ b/src/generated/resources/assets/malum/blockstates/runewood_planks_fence.json @@ -6,42 +6,42 @@ } }, { - "when": { - "north": "true" - }, "apply": { "model": "malum:block/runewood_planks_fence_side", "uvlock": true + }, + "when": { + "north": "true" } }, { - "when": { - "south": "true" - }, "apply": { "model": "malum:block/runewood_planks_fence_side", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 + }, + "when": { + "south": "true" } }, { - "when": { - "west": "true" - }, "apply": { "model": "malum:block/runewood_planks_fence_side", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 270 + }, + "when": { + "west": "true" } }, { - "when": { - "east": "true" - }, "apply": { "model": "malum:block/runewood_planks_fence_side", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 90 + }, + "when": { + "east": "true" } } ] diff --git a/src/generated/resources/assets/malum/blockstates/runewood_planks_fence_gate.json b/src/generated/resources/assets/malum/blockstates/runewood_planks_fence_gate.json index 0f801d6c4..ac52c0c82 100644 --- a/src/generated/resources/assets/malum/blockstates/runewood_planks_fence_gate.json +++ b/src/generated/resources/assets/malum/blockstates/runewood_planks_fence_gate.json @@ -1,80 +1,80 @@ { "variants": { - "facing=north,in_wall=false,open=false": { - "model": "malum:block/runewood_planks_fence_gate", - "y": 180, - "uvlock": true - }, - "facing=south,in_wall=false,open=false": { - "model": "malum:block/runewood_planks_fence_gate", - "uvlock": true - }, - "facing=west,in_wall=false,open=false": { - "model": "malum:block/runewood_planks_fence_gate", - "y": 90, - "uvlock": true - }, "facing=east,in_wall=false,open=false": { "model": "malum:block/runewood_planks_fence_gate", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 270 }, - "facing=north,in_wall=true,open=false": { - "model": "malum:block/runewood_planks_fence_gate_wall", - "y": 180, - "uvlock": true + "facing=east,in_wall=false,open=true": { + "model": "malum:block/runewood_planks_fence_gate_open", + "uvlock": true, + "y": 270 }, - "facing=south,in_wall=true,open=false": { + "facing=east,in_wall=true,open=false": { "model": "malum:block/runewood_planks_fence_gate_wall", - "uvlock": true + "uvlock": true, + "y": 270 }, - "facing=west,in_wall=true,open=false": { - "model": "malum:block/runewood_planks_fence_gate_wall", - "y": 90, - "uvlock": true + "facing=east,in_wall=true,open=true": { + "model": "malum:block/runewood_planks_fence_gate_wall_open", + "uvlock": true, + "y": 270 }, - "facing=east,in_wall=true,open=false": { - "model": "malum:block/runewood_planks_fence_gate_wall", - "y": 270, - "uvlock": true + "facing=north,in_wall=false,open=false": { + "model": "malum:block/runewood_planks_fence_gate", + "uvlock": true, + "y": 180 }, "facing=north,in_wall=false,open=true": { "model": "malum:block/runewood_planks_fence_gate_open", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=south,in_wall=false,open=true": { - "model": "malum:block/runewood_planks_fence_gate_open", - "uvlock": true + "facing=north,in_wall=true,open=false": { + "model": "malum:block/runewood_planks_fence_gate_wall", + "uvlock": true, + "y": 180 }, - "facing=west,in_wall=false,open=true": { - "model": "malum:block/runewood_planks_fence_gate_open", - "y": 90, + "facing=north,in_wall=true,open=true": { + "model": "malum:block/runewood_planks_fence_gate_wall_open", + "uvlock": true, + "y": 180 + }, + "facing=south,in_wall=false,open=false": { + "model": "malum:block/runewood_planks_fence_gate", "uvlock": true }, - "facing=east,in_wall=false,open=true": { + "facing=south,in_wall=false,open=true": { "model": "malum:block/runewood_planks_fence_gate_open", - "y": 270, "uvlock": true }, - "facing=north,in_wall=true,open=true": { - "model": "malum:block/runewood_planks_fence_gate_wall_open", - "y": 180, + "facing=south,in_wall=true,open=false": { + "model": "malum:block/runewood_planks_fence_gate_wall", "uvlock": true }, "facing=south,in_wall=true,open=true": { "model": "malum:block/runewood_planks_fence_gate_wall_open", "uvlock": true }, - "facing=west,in_wall=true,open=true": { - "model": "malum:block/runewood_planks_fence_gate_wall_open", - "y": 90, - "uvlock": true + "facing=west,in_wall=false,open=false": { + "model": "malum:block/runewood_planks_fence_gate", + "uvlock": true, + "y": 90 }, - "facing=east,in_wall=true,open=true": { + "facing=west,in_wall=false,open=true": { + "model": "malum:block/runewood_planks_fence_gate_open", + "uvlock": true, + "y": 90 + }, + "facing=west,in_wall=true,open=false": { + "model": "malum:block/runewood_planks_fence_gate_wall", + "uvlock": true, + "y": 90 + }, + "facing=west,in_wall=true,open=true": { "model": "malum:block/runewood_planks_fence_gate_wall_open", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 90 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/blockstates/runewood_planks_slab.json b/src/generated/resources/assets/malum/blockstates/runewood_planks_slab.json index 24caaa6a4..fd2433fd6 100644 --- a/src/generated/resources/assets/malum/blockstates/runewood_planks_slab.json +++ b/src/generated/resources/assets/malum/blockstates/runewood_planks_slab.json @@ -1,13 +1,13 @@ { "variants": { - "type=top": { - "model": "malum:block/runewood_planks_slab_top" - }, "type=bottom": { "model": "malum:block/runewood_planks_slab" }, "type=double": { "model": "malum:block/runewood_planks" + }, + "type=top": { + "model": "malum:block/runewood_planks_slab_top" } } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/blockstates/runewood_planks_stairs.json b/src/generated/resources/assets/malum/blockstates/runewood_planks_stairs.json index bef0ec507..3d3a05d9e 100644 --- a/src/generated/resources/assets/malum/blockstates/runewood_planks_stairs.json +++ b/src/generated/resources/assets/malum/blockstates/runewood_planks_stairs.json @@ -1,209 +1,209 @@ { "variants": { - "facing=north,half=top,shape=straight": { - "model": "malum:block/runewood_planks_stairs", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=south,half=top,shape=straight": { - "model": "malum:block/runewood_planks_stairs", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=west,half=top,shape=straight": { - "model": "malum:block/runewood_planks_stairs", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=east,half=top,shape=straight": { - "model": "malum:block/runewood_planks_stairs", - "x": 180, - "uvlock": true + "facing=east,half=bottom,shape=inner_left": { + "model": "malum:block/runewood_planks_stairs_inner", + "uvlock": true, + "y": 270 }, - "facing=north,half=bottom,shape=straight": { - "model": "malum:block/runewood_planks_stairs", - "y": 270, - "uvlock": true + "facing=east,half=bottom,shape=inner_right": { + "model": "malum:block/runewood_planks_stairs_inner" }, - "facing=south,half=bottom,shape=straight": { - "model": "malum:block/runewood_planks_stairs", - "y": 90, - "uvlock": true + "facing=east,half=bottom,shape=outer_left": { + "model": "malum:block/runewood_planks_stairs_outer", + "uvlock": true, + "y": 270 }, - "facing=west,half=bottom,shape=straight": { - "model": "malum:block/runewood_planks_stairs", - "y": 180, - "uvlock": true + "facing=east,half=bottom,shape=outer_right": { + "model": "malum:block/runewood_planks_stairs_outer" }, "facing=east,half=bottom,shape=straight": { "model": "malum:block/runewood_planks_stairs" }, - "facing=north,half=top,shape=inner_left": { + "facing=east,half=top,shape=inner_left": { "model": "malum:block/runewood_planks_stairs_inner", - "x": 180, - "y": 270, - "uvlock": true + "uvlock": true, + "x": 180 }, - "facing=south,half=top,shape=inner_left": { + "facing=east,half=top,shape=inner_right": { "model": "malum:block/runewood_planks_stairs_inner", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 90 }, - "facing=west,half=top,shape=inner_left": { - "model": "malum:block/runewood_planks_stairs_inner", - "x": 180, - "y": 180, - "uvlock": true + "facing=east,half=top,shape=outer_left": { + "model": "malum:block/runewood_planks_stairs_outer", + "uvlock": true, + "x": 180 }, - "facing=east,half=top,shape=inner_left": { - "model": "malum:block/runewood_planks_stairs_inner", + "facing=east,half=top,shape=outer_right": { + "model": "malum:block/runewood_planks_stairs_outer", + "uvlock": true, "x": 180, - "uvlock": true + "y": 90 + }, + "facing=east,half=top,shape=straight": { + "model": "malum:block/runewood_planks_stairs", + "uvlock": true, + "x": 180 }, "facing=north,half=bottom,shape=inner_left": { "model": "malum:block/runewood_planks_stairs_inner", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=south,half=bottom,shape=inner_left": { - "model": "malum:block/runewood_planks_stairs_inner" - }, - "facing=west,half=bottom,shape=inner_left": { + "facing=north,half=bottom,shape=inner_right": { "model": "malum:block/runewood_planks_stairs_inner", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 270 }, - "facing=east,half=bottom,shape=inner_left": { - "model": "malum:block/runewood_planks_stairs_inner", - "y": 270, - "uvlock": true + "facing=north,half=bottom,shape=outer_left": { + "model": "malum:block/runewood_planks_stairs_outer", + "uvlock": true, + "y": 180 }, - "facing=north,half=top,shape=inner_right": { - "model": "malum:block/runewood_planks_stairs_inner", - "x": 180, - "uvlock": true + "facing=north,half=bottom,shape=outer_right": { + "model": "malum:block/runewood_planks_stairs_outer", + "uvlock": true, + "y": 270 }, - "facing=south,half=top,shape=inner_right": { + "facing=north,half=bottom,shape=straight": { + "model": "malum:block/runewood_planks_stairs", + "uvlock": true, + "y": 270 + }, + "facing=north,half=top,shape=inner_left": { "model": "malum:block/runewood_planks_stairs_inner", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 270 }, - "facing=west,half=top,shape=inner_right": { + "facing=north,half=top,shape=inner_right": { "model": "malum:block/runewood_planks_stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=outer_left": { + "model": "malum:block/runewood_planks_stairs_outer", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 270 }, - "facing=east,half=top,shape=inner_right": { - "model": "malum:block/runewood_planks_stairs_inner", + "facing=north,half=top,shape=outer_right": { + "model": "malum:block/runewood_planks_stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=straight": { + "model": "malum:block/runewood_planks_stairs", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 270 }, - "facing=north,half=bottom,shape=inner_right": { - "model": "malum:block/runewood_planks_stairs_inner", - "y": 270, - "uvlock": true + "facing=south,half=bottom,shape=inner_left": { + "model": "malum:block/runewood_planks_stairs_inner" }, "facing=south,half=bottom,shape=inner_right": { "model": "malum:block/runewood_planks_stairs_inner", - "y": 90, - "uvlock": true - }, - "facing=west,half=bottom,shape=inner_right": { - "model": "malum:block/runewood_planks_stairs_inner", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 90 }, - "facing=east,half=bottom,shape=inner_right": { - "model": "malum:block/runewood_planks_stairs_inner" + "facing=south,half=bottom,shape=outer_left": { + "model": "malum:block/runewood_planks_stairs_outer" }, - "facing=north,half=top,shape=outer_left": { + "facing=south,half=bottom,shape=outer_right": { "model": "malum:block/runewood_planks_stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=straight": { + "model": "malum:block/runewood_planks_stairs", + "uvlock": true, + "y": 90 + }, + "facing=south,half=top,shape=inner_left": { + "model": "malum:block/runewood_planks_stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=inner_right": { + "model": "malum:block/runewood_planks_stairs_inner", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 180 }, "facing=south,half=top,shape=outer_left": { "model": "malum:block/runewood_planks_stairs_outer", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 90 }, - "facing=west,half=top,shape=outer_left": { + "facing=south,half=top,shape=outer_right": { "model": "malum:block/runewood_planks_stairs_outer", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 180 }, - "facing=east,half=top,shape=outer_left": { - "model": "malum:block/runewood_planks_stairs_outer", + "facing=south,half=top,shape=straight": { + "model": "malum:block/runewood_planks_stairs", + "uvlock": true, "x": 180, - "uvlock": true + "y": 90 }, - "facing=north,half=bottom,shape=outer_left": { - "model": "malum:block/runewood_planks_stairs_outer", - "y": 180, - "uvlock": true + "facing=west,half=bottom,shape=inner_left": { + "model": "malum:block/runewood_planks_stairs_inner", + "uvlock": true, + "y": 90 }, - "facing=south,half=bottom,shape=outer_left": { - "model": "malum:block/runewood_planks_stairs_outer" + "facing=west,half=bottom,shape=inner_right": { + "model": "malum:block/runewood_planks_stairs_inner", + "uvlock": true, + "y": 180 }, "facing=west,half=bottom,shape=outer_left": { "model": "malum:block/runewood_planks_stairs_outer", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 90 }, - "facing=east,half=bottom,shape=outer_left": { + "facing=west,half=bottom,shape=outer_right": { "model": "malum:block/runewood_planks_stairs_outer", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=north,half=top,shape=outer_right": { - "model": "malum:block/runewood_planks_stairs_outer", - "x": 180, - "uvlock": true + "facing=west,half=bottom,shape=straight": { + "model": "malum:block/runewood_planks_stairs", + "uvlock": true, + "y": 180 }, - "facing=south,half=top,shape=outer_right": { - "model": "malum:block/runewood_planks_stairs_outer", + "facing=west,half=top,shape=inner_left": { + "model": "malum:block/runewood_planks_stairs_inner", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 180 }, - "facing=west,half=top,shape=outer_right": { - "model": "malum:block/runewood_planks_stairs_outer", + "facing=west,half=top,shape=inner_right": { + "model": "malum:block/runewood_planks_stairs_inner", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 270 }, - "facing=east,half=top,shape=outer_right": { + "facing=west,half=top,shape=outer_left": { "model": "malum:block/runewood_planks_stairs_outer", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true - }, - "facing=north,half=bottom,shape=outer_right": { - "model": "malum:block/runewood_planks_stairs_outer", - "y": 270, - "uvlock": true - }, - "facing=south,half=bottom,shape=outer_right": { - "model": "malum:block/runewood_planks_stairs_outer", - "y": 90, - "uvlock": true + "y": 180 }, - "facing=west,half=bottom,shape=outer_right": { + "facing=west,half=top,shape=outer_right": { "model": "malum:block/runewood_planks_stairs_outer", - "y": 180, - "uvlock": true + "uvlock": true, + "x": 180, + "y": 270 }, - "facing=east,half=bottom,shape=outer_right": { - "model": "malum:block/runewood_planks_stairs_outer" + "facing=west,half=top,shape=straight": { + "model": "malum:block/runewood_planks_stairs", + "uvlock": true, + "x": 180, + "y": 180 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/blockstates/runewood_sign.json b/src/generated/resources/assets/malum/blockstates/runewood_sign.json index b985ea63d..3dbe0f16c 100644 --- a/src/generated/resources/assets/malum/blockstates/runewood_sign.json +++ b/src/generated/resources/assets/malum/blockstates/runewood_sign.json @@ -3,97 +3,97 @@ "rotation=0,waterlogged=false": { "model": "malum:block/runewood_sign" }, - "rotation=1,waterlogged=false": { - "model": "malum:block/runewood_sign" - }, - "rotation=2,waterlogged=false": { + "rotation=0,waterlogged=true": { "model": "malum:block/runewood_sign" }, - "rotation=3,waterlogged=false": { + "rotation=1,waterlogged=false": { "model": "malum:block/runewood_sign" }, - "rotation=4,waterlogged=false": { + "rotation=1,waterlogged=true": { "model": "malum:block/runewood_sign" }, - "rotation=5,waterlogged=false": { + "rotation=10,waterlogged=false": { "model": "malum:block/runewood_sign" }, - "rotation=6,waterlogged=false": { + "rotation=10,waterlogged=true": { "model": "malum:block/runewood_sign" }, - "rotation=7,waterlogged=false": { + "rotation=11,waterlogged=false": { "model": "malum:block/runewood_sign" }, - "rotation=8,waterlogged=false": { + "rotation=11,waterlogged=true": { "model": "malum:block/runewood_sign" }, - "rotation=9,waterlogged=false": { + "rotation=12,waterlogged=false": { "model": "malum:block/runewood_sign" }, - "rotation=10,waterlogged=false": { + "rotation=12,waterlogged=true": { "model": "malum:block/runewood_sign" }, - "rotation=11,waterlogged=false": { + "rotation=13,waterlogged=false": { "model": "malum:block/runewood_sign" }, - "rotation=12,waterlogged=false": { + "rotation=13,waterlogged=true": { "model": "malum:block/runewood_sign" }, - "rotation=13,waterlogged=false": { + "rotation=14,waterlogged=false": { "model": "malum:block/runewood_sign" }, - "rotation=14,waterlogged=false": { + "rotation=14,waterlogged=true": { "model": "malum:block/runewood_sign" }, "rotation=15,waterlogged=false": { "model": "malum:block/runewood_sign" }, - "rotation=0,waterlogged=true": { + "rotation=15,waterlogged=true": { "model": "malum:block/runewood_sign" }, - "rotation=1,waterlogged=true": { + "rotation=2,waterlogged=false": { "model": "malum:block/runewood_sign" }, "rotation=2,waterlogged=true": { "model": "malum:block/runewood_sign" }, + "rotation=3,waterlogged=false": { + "model": "malum:block/runewood_sign" + }, "rotation=3,waterlogged=true": { "model": "malum:block/runewood_sign" }, - "rotation=4,waterlogged=true": { + "rotation=4,waterlogged=false": { "model": "malum:block/runewood_sign" }, - "rotation=5,waterlogged=true": { + "rotation=4,waterlogged=true": { "model": "malum:block/runewood_sign" }, - "rotation=6,waterlogged=true": { + "rotation=5,waterlogged=false": { "model": "malum:block/runewood_sign" }, - "rotation=7,waterlogged=true": { + "rotation=5,waterlogged=true": { "model": "malum:block/runewood_sign" }, - "rotation=8,waterlogged=true": { + "rotation=6,waterlogged=false": { "model": "malum:block/runewood_sign" }, - "rotation=9,waterlogged=true": { + "rotation=6,waterlogged=true": { "model": "malum:block/runewood_sign" }, - "rotation=10,waterlogged=true": { + "rotation=7,waterlogged=false": { "model": "malum:block/runewood_sign" }, - "rotation=11,waterlogged=true": { + "rotation=7,waterlogged=true": { "model": "malum:block/runewood_sign" }, - "rotation=12,waterlogged=true": { + "rotation=8,waterlogged=false": { "model": "malum:block/runewood_sign" }, - "rotation=13,waterlogged=true": { + "rotation=8,waterlogged=true": { "model": "malum:block/runewood_sign" }, - "rotation=14,waterlogged=true": { + "rotation=9,waterlogged=false": { "model": "malum:block/runewood_sign" }, - "rotation=15,waterlogged=true": { + "rotation=9,waterlogged=true": { "model": "malum:block/runewood_sign" } } diff --git a/src/generated/resources/assets/malum/blockstates/runewood_tiles_slab.json b/src/generated/resources/assets/malum/blockstates/runewood_tiles_slab.json index 82f4f817a..7f31b310d 100644 --- a/src/generated/resources/assets/malum/blockstates/runewood_tiles_slab.json +++ b/src/generated/resources/assets/malum/blockstates/runewood_tiles_slab.json @@ -1,13 +1,13 @@ { "variants": { - "type=top": { - "model": "malum:block/runewood_tiles_slab_top" - }, "type=bottom": { "model": "malum:block/runewood_tiles_slab" }, "type=double": { "model": "malum:block/runewood_tiles" + }, + "type=top": { + "model": "malum:block/runewood_tiles_slab_top" } } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/blockstates/runewood_tiles_stairs.json b/src/generated/resources/assets/malum/blockstates/runewood_tiles_stairs.json index a1761500f..ee9261867 100644 --- a/src/generated/resources/assets/malum/blockstates/runewood_tiles_stairs.json +++ b/src/generated/resources/assets/malum/blockstates/runewood_tiles_stairs.json @@ -1,209 +1,209 @@ { "variants": { - "facing=north,half=top,shape=straight": { - "model": "malum:block/runewood_tiles_stairs", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=south,half=top,shape=straight": { - "model": "malum:block/runewood_tiles_stairs", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=west,half=top,shape=straight": { - "model": "malum:block/runewood_tiles_stairs", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=east,half=top,shape=straight": { - "model": "malum:block/runewood_tiles_stairs", - "x": 180, - "uvlock": true + "facing=east,half=bottom,shape=inner_left": { + "model": "malum:block/runewood_tiles_stairs_inner", + "uvlock": true, + "y": 270 }, - "facing=north,half=bottom,shape=straight": { - "model": "malum:block/runewood_tiles_stairs", - "y": 270, - "uvlock": true + "facing=east,half=bottom,shape=inner_right": { + "model": "malum:block/runewood_tiles_stairs_inner" }, - "facing=south,half=bottom,shape=straight": { - "model": "malum:block/runewood_tiles_stairs", - "y": 90, - "uvlock": true + "facing=east,half=bottom,shape=outer_left": { + "model": "malum:block/runewood_tiles_stairs_outer", + "uvlock": true, + "y": 270 }, - "facing=west,half=bottom,shape=straight": { - "model": "malum:block/runewood_tiles_stairs", - "y": 180, - "uvlock": true + "facing=east,half=bottom,shape=outer_right": { + "model": "malum:block/runewood_tiles_stairs_outer" }, "facing=east,half=bottom,shape=straight": { "model": "malum:block/runewood_tiles_stairs" }, - "facing=north,half=top,shape=inner_left": { + "facing=east,half=top,shape=inner_left": { "model": "malum:block/runewood_tiles_stairs_inner", - "x": 180, - "y": 270, - "uvlock": true + "uvlock": true, + "x": 180 }, - "facing=south,half=top,shape=inner_left": { + "facing=east,half=top,shape=inner_right": { "model": "malum:block/runewood_tiles_stairs_inner", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 90 }, - "facing=west,half=top,shape=inner_left": { - "model": "malum:block/runewood_tiles_stairs_inner", - "x": 180, - "y": 180, - "uvlock": true + "facing=east,half=top,shape=outer_left": { + "model": "malum:block/runewood_tiles_stairs_outer", + "uvlock": true, + "x": 180 }, - "facing=east,half=top,shape=inner_left": { - "model": "malum:block/runewood_tiles_stairs_inner", + "facing=east,half=top,shape=outer_right": { + "model": "malum:block/runewood_tiles_stairs_outer", + "uvlock": true, "x": 180, - "uvlock": true + "y": 90 + }, + "facing=east,half=top,shape=straight": { + "model": "malum:block/runewood_tiles_stairs", + "uvlock": true, + "x": 180 }, "facing=north,half=bottom,shape=inner_left": { "model": "malum:block/runewood_tiles_stairs_inner", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=south,half=bottom,shape=inner_left": { - "model": "malum:block/runewood_tiles_stairs_inner" - }, - "facing=west,half=bottom,shape=inner_left": { + "facing=north,half=bottom,shape=inner_right": { "model": "malum:block/runewood_tiles_stairs_inner", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 270 }, - "facing=east,half=bottom,shape=inner_left": { - "model": "malum:block/runewood_tiles_stairs_inner", - "y": 270, - "uvlock": true + "facing=north,half=bottom,shape=outer_left": { + "model": "malum:block/runewood_tiles_stairs_outer", + "uvlock": true, + "y": 180 }, - "facing=north,half=top,shape=inner_right": { - "model": "malum:block/runewood_tiles_stairs_inner", - "x": 180, - "uvlock": true + "facing=north,half=bottom,shape=outer_right": { + "model": "malum:block/runewood_tiles_stairs_outer", + "uvlock": true, + "y": 270 }, - "facing=south,half=top,shape=inner_right": { + "facing=north,half=bottom,shape=straight": { + "model": "malum:block/runewood_tiles_stairs", + "uvlock": true, + "y": 270 + }, + "facing=north,half=top,shape=inner_left": { "model": "malum:block/runewood_tiles_stairs_inner", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 270 }, - "facing=west,half=top,shape=inner_right": { + "facing=north,half=top,shape=inner_right": { "model": "malum:block/runewood_tiles_stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=outer_left": { + "model": "malum:block/runewood_tiles_stairs_outer", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 270 }, - "facing=east,half=top,shape=inner_right": { - "model": "malum:block/runewood_tiles_stairs_inner", + "facing=north,half=top,shape=outer_right": { + "model": "malum:block/runewood_tiles_stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=straight": { + "model": "malum:block/runewood_tiles_stairs", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 270 }, - "facing=north,half=bottom,shape=inner_right": { - "model": "malum:block/runewood_tiles_stairs_inner", - "y": 270, - "uvlock": true + "facing=south,half=bottom,shape=inner_left": { + "model": "malum:block/runewood_tiles_stairs_inner" }, "facing=south,half=bottom,shape=inner_right": { "model": "malum:block/runewood_tiles_stairs_inner", - "y": 90, - "uvlock": true - }, - "facing=west,half=bottom,shape=inner_right": { - "model": "malum:block/runewood_tiles_stairs_inner", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 90 }, - "facing=east,half=bottom,shape=inner_right": { - "model": "malum:block/runewood_tiles_stairs_inner" + "facing=south,half=bottom,shape=outer_left": { + "model": "malum:block/runewood_tiles_stairs_outer" }, - "facing=north,half=top,shape=outer_left": { + "facing=south,half=bottom,shape=outer_right": { "model": "malum:block/runewood_tiles_stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=straight": { + "model": "malum:block/runewood_tiles_stairs", + "uvlock": true, + "y": 90 + }, + "facing=south,half=top,shape=inner_left": { + "model": "malum:block/runewood_tiles_stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=inner_right": { + "model": "malum:block/runewood_tiles_stairs_inner", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 180 }, "facing=south,half=top,shape=outer_left": { "model": "malum:block/runewood_tiles_stairs_outer", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 90 }, - "facing=west,half=top,shape=outer_left": { + "facing=south,half=top,shape=outer_right": { "model": "malum:block/runewood_tiles_stairs_outer", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 180 }, - "facing=east,half=top,shape=outer_left": { - "model": "malum:block/runewood_tiles_stairs_outer", + "facing=south,half=top,shape=straight": { + "model": "malum:block/runewood_tiles_stairs", + "uvlock": true, "x": 180, - "uvlock": true + "y": 90 }, - "facing=north,half=bottom,shape=outer_left": { - "model": "malum:block/runewood_tiles_stairs_outer", - "y": 180, - "uvlock": true + "facing=west,half=bottom,shape=inner_left": { + "model": "malum:block/runewood_tiles_stairs_inner", + "uvlock": true, + "y": 90 }, - "facing=south,half=bottom,shape=outer_left": { - "model": "malum:block/runewood_tiles_stairs_outer" + "facing=west,half=bottom,shape=inner_right": { + "model": "malum:block/runewood_tiles_stairs_inner", + "uvlock": true, + "y": 180 }, "facing=west,half=bottom,shape=outer_left": { "model": "malum:block/runewood_tiles_stairs_outer", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 90 }, - "facing=east,half=bottom,shape=outer_left": { + "facing=west,half=bottom,shape=outer_right": { "model": "malum:block/runewood_tiles_stairs_outer", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=north,half=top,shape=outer_right": { - "model": "malum:block/runewood_tiles_stairs_outer", - "x": 180, - "uvlock": true + "facing=west,half=bottom,shape=straight": { + "model": "malum:block/runewood_tiles_stairs", + "uvlock": true, + "y": 180 }, - "facing=south,half=top,shape=outer_right": { - "model": "malum:block/runewood_tiles_stairs_outer", + "facing=west,half=top,shape=inner_left": { + "model": "malum:block/runewood_tiles_stairs_inner", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 180 }, - "facing=west,half=top,shape=outer_right": { - "model": "malum:block/runewood_tiles_stairs_outer", + "facing=west,half=top,shape=inner_right": { + "model": "malum:block/runewood_tiles_stairs_inner", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 270 }, - "facing=east,half=top,shape=outer_right": { + "facing=west,half=top,shape=outer_left": { "model": "malum:block/runewood_tiles_stairs_outer", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true - }, - "facing=north,half=bottom,shape=outer_right": { - "model": "malum:block/runewood_tiles_stairs_outer", - "y": 270, - "uvlock": true - }, - "facing=south,half=bottom,shape=outer_right": { - "model": "malum:block/runewood_tiles_stairs_outer", - "y": 90, - "uvlock": true + "y": 180 }, - "facing=west,half=bottom,shape=outer_right": { + "facing=west,half=top,shape=outer_right": { "model": "malum:block/runewood_tiles_stairs_outer", - "y": 180, - "uvlock": true + "uvlock": true, + "x": 180, + "y": 270 }, - "facing=east,half=bottom,shape=outer_right": { - "model": "malum:block/runewood_tiles_stairs_outer" + "facing=west,half=top,shape=straight": { + "model": "malum:block/runewood_tiles_stairs", + "uvlock": true, + "x": 180, + "y": 180 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/blockstates/runewood_totem_pole.json b/src/generated/resources/assets/malum/blockstates/runewood_totem_pole.json index 35de0d02d..6a812d3e6 100644 --- a/src/generated/resources/assets/malum/blockstates/runewood_totem_pole.json +++ b/src/generated/resources/assets/malum/blockstates/runewood_totem_pole.json @@ -1,124 +1,124 @@ { "variants": { - "facing=north,spirit_type=aerial": { - "model": "malum:block/runewood_totem_pole_aerial" - }, - "facing=south,spirit_type=aerial": { + "facing=east,spirit_type=aerial": { "model": "malum:block/runewood_totem_pole_aerial", - "y": 180 + "y": 90 }, - "facing=west,spirit_type=aerial": { - "model": "malum:block/runewood_totem_pole_aerial", - "y": 270 + "facing=east,spirit_type=aqueous": { + "model": "malum:block/runewood_totem_pole_aqueous", + "y": 90 }, - "facing=east,spirit_type=aerial": { - "model": "malum:block/runewood_totem_pole_aerial", + "facing=east,spirit_type=arcane": { + "model": "malum:block/runewood_totem_pole_arcane", "y": 90 }, - "facing=north,spirit_type=aqueous": { - "model": "malum:block/runewood_totem_pole_aqueous" + "facing=east,spirit_type=earthen": { + "model": "malum:block/runewood_totem_pole_earthen", + "y": 90 }, - "facing=south,spirit_type=aqueous": { - "model": "malum:block/runewood_totem_pole_aqueous", - "y": 180 + "facing=east,spirit_type=eldritch": { + "model": "malum:block/runewood_totem_pole_eldritch", + "y": 90 }, - "facing=west,spirit_type=aqueous": { - "model": "malum:block/runewood_totem_pole_aqueous", - "y": 270 + "facing=east,spirit_type=infernal": { + "model": "malum:block/runewood_totem_pole_infernal", + "y": 90 }, - "facing=east,spirit_type=aqueous": { - "model": "malum:block/runewood_totem_pole_aqueous", + "facing=east,spirit_type=sacred": { + "model": "malum:block/runewood_totem_pole_sacred", "y": 90 }, + "facing=east,spirit_type=wicked": { + "model": "malum:block/runewood_totem_pole_wicked", + "y": 90 + }, + "facing=north,spirit_type=aerial": { + "model": "malum:block/runewood_totem_pole_aerial" + }, + "facing=north,spirit_type=aqueous": { + "model": "malum:block/runewood_totem_pole_aqueous" + }, "facing=north,spirit_type=arcane": { "model": "malum:block/runewood_totem_pole_arcane" }, - "facing=south,spirit_type=arcane": { - "model": "malum:block/runewood_totem_pole_arcane", + "facing=north,spirit_type=earthen": { + "model": "malum:block/runewood_totem_pole_earthen" + }, + "facing=north,spirit_type=eldritch": { + "model": "malum:block/runewood_totem_pole_eldritch" + }, + "facing=north,spirit_type=infernal": { + "model": "malum:block/runewood_totem_pole_infernal" + }, + "facing=north,spirit_type=sacred": { + "model": "malum:block/runewood_totem_pole_sacred" + }, + "facing=north,spirit_type=wicked": { + "model": "malum:block/runewood_totem_pole_wicked" + }, + "facing=south,spirit_type=aerial": { + "model": "malum:block/runewood_totem_pole_aerial", "y": 180 }, - "facing=west,spirit_type=arcane": { - "model": "malum:block/runewood_totem_pole_arcane", - "y": 270 + "facing=south,spirit_type=aqueous": { + "model": "malum:block/runewood_totem_pole_aqueous", + "y": 180 }, - "facing=east,spirit_type=arcane": { + "facing=south,spirit_type=arcane": { "model": "malum:block/runewood_totem_pole_arcane", - "y": 90 - }, - "facing=north,spirit_type=earthen": { - "model": "malum:block/runewood_totem_pole_earthen" + "y": 180 }, "facing=south,spirit_type=earthen": { "model": "malum:block/runewood_totem_pole_earthen", "y": 180 }, - "facing=west,spirit_type=earthen": { - "model": "malum:block/runewood_totem_pole_earthen", - "y": 270 + "facing=south,spirit_type=eldritch": { + "model": "malum:block/runewood_totem_pole_eldritch", + "y": 180 }, - "facing=east,spirit_type=earthen": { - "model": "malum:block/runewood_totem_pole_earthen", - "y": 90 + "facing=south,spirit_type=infernal": { + "model": "malum:block/runewood_totem_pole_infernal", + "y": 180 }, - "facing=north,spirit_type=eldritch": { - "model": "malum:block/runewood_totem_pole_eldritch" + "facing=south,spirit_type=sacred": { + "model": "malum:block/runewood_totem_pole_sacred", + "y": 180 }, - "facing=south,spirit_type=eldritch": { - "model": "malum:block/runewood_totem_pole_eldritch", + "facing=south,spirit_type=wicked": { + "model": "malum:block/runewood_totem_pole_wicked", "y": 180 }, - "facing=west,spirit_type=eldritch": { - "model": "malum:block/runewood_totem_pole_eldritch", + "facing=west,spirit_type=aerial": { + "model": "malum:block/runewood_totem_pole_aerial", "y": 270 }, - "facing=east,spirit_type=eldritch": { - "model": "malum:block/runewood_totem_pole_eldritch", - "y": 90 + "facing=west,spirit_type=aqueous": { + "model": "malum:block/runewood_totem_pole_aqueous", + "y": 270 }, - "facing=north,spirit_type=infernal": { - "model": "malum:block/runewood_totem_pole_infernal" + "facing=west,spirit_type=arcane": { + "model": "malum:block/runewood_totem_pole_arcane", + "y": 270 }, - "facing=south,spirit_type=infernal": { - "model": "malum:block/runewood_totem_pole_infernal", - "y": 180 + "facing=west,spirit_type=earthen": { + "model": "malum:block/runewood_totem_pole_earthen", + "y": 270 }, - "facing=west,spirit_type=infernal": { - "model": "malum:block/runewood_totem_pole_infernal", + "facing=west,spirit_type=eldritch": { + "model": "malum:block/runewood_totem_pole_eldritch", "y": 270 }, - "facing=east,spirit_type=infernal": { + "facing=west,spirit_type=infernal": { "model": "malum:block/runewood_totem_pole_infernal", - "y": 90 - }, - "facing=north,spirit_type=sacred": { - "model": "malum:block/runewood_totem_pole_sacred" - }, - "facing=south,spirit_type=sacred": { - "model": "malum:block/runewood_totem_pole_sacred", - "y": 180 + "y": 270 }, "facing=west,spirit_type=sacred": { "model": "malum:block/runewood_totem_pole_sacred", "y": 270 }, - "facing=east,spirit_type=sacred": { - "model": "malum:block/runewood_totem_pole_sacred", - "y": 90 - }, - "facing=north,spirit_type=wicked": { - "model": "malum:block/runewood_totem_pole_wicked" - }, - "facing=south,spirit_type=wicked": { - "model": "malum:block/runewood_totem_pole_wicked", - "y": 180 - }, "facing=west,spirit_type=wicked": { "model": "malum:block/runewood_totem_pole_wicked", "y": 270 - }, - "facing=east,spirit_type=wicked": { - "model": "malum:block/runewood_totem_pole_wicked", - "y": 90 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/blockstates/runewood_trapdoor.json b/src/generated/resources/assets/malum/blockstates/runewood_trapdoor.json index 773253c39..64ae29296 100644 --- a/src/generated/resources/assets/malum/blockstates/runewood_trapdoor.json +++ b/src/generated/resources/assets/malum/blockstates/runewood_trapdoor.json @@ -1,67 +1,67 @@ { "variants": { - "facing=north,half=top,open=false": { - "model": "malum:block/runewood_trapdoor_top" - }, - "facing=south,half=top,open=false": { - "model": "malum:block/runewood_trapdoor_top", - "y": 180 + "facing=east,half=bottom,open=false": { + "model": "malum:block/runewood_trapdoor_bottom", + "y": 90 }, - "facing=west,half=top,open=false": { - "model": "malum:block/runewood_trapdoor_top", - "y": 270 + "facing=east,half=bottom,open=true": { + "model": "malum:block/runewood_trapdoor_open", + "y": 90 }, "facing=east,half=top,open=false": { "model": "malum:block/runewood_trapdoor_top", "y": 90 }, + "facing=east,half=top,open=true": { + "model": "malum:block/runewood_trapdoor_open", + "x": 180, + "y": 270 + }, "facing=north,half=bottom,open=false": { "model": "malum:block/runewood_trapdoor_bottom" }, - "facing=south,half=bottom,open=false": { - "model": "malum:block/runewood_trapdoor_bottom", - "y": 180 - }, - "facing=west,half=bottom,open=false": { - "model": "malum:block/runewood_trapdoor_bottom", - "y": 270 + "facing=north,half=bottom,open=true": { + "model": "malum:block/runewood_trapdoor_open" }, - "facing=east,half=bottom,open=false": { - "model": "malum:block/runewood_trapdoor_bottom", - "y": 90 + "facing=north,half=top,open=false": { + "model": "malum:block/runewood_trapdoor_top" }, "facing=north,half=top,open=true": { "model": "malum:block/runewood_trapdoor_open", "x": 180, "y": 180 }, - "facing=south,half=top,open=true": { - "model": "malum:block/runewood_trapdoor_open", - "x": 180 - }, - "facing=west,half=top,open=true": { - "model": "malum:block/runewood_trapdoor_open", - "x": 180, - "y": 90 + "facing=south,half=bottom,open=false": { + "model": "malum:block/runewood_trapdoor_bottom", + "y": 180 }, - "facing=east,half=top,open=true": { + "facing=south,half=bottom,open=true": { "model": "malum:block/runewood_trapdoor_open", - "x": 180, - "y": 270 + "y": 180 }, - "facing=north,half=bottom,open=true": { - "model": "malum:block/runewood_trapdoor_open" + "facing=south,half=top,open=false": { + "model": "malum:block/runewood_trapdoor_top", + "y": 180 }, - "facing=south,half=bottom,open=true": { + "facing=south,half=top,open=true": { "model": "malum:block/runewood_trapdoor_open", - "y": 180 + "x": 180 + }, + "facing=west,half=bottom,open=false": { + "model": "malum:block/runewood_trapdoor_bottom", + "y": 270 }, "facing=west,half=bottom,open=true": { "model": "malum:block/runewood_trapdoor_open", "y": 270 }, - "facing=east,half=bottom,open=true": { + "facing=west,half=top,open=false": { + "model": "malum:block/runewood_trapdoor_top", + "y": 270 + }, + "facing=west,half=top,open=true": { "model": "malum:block/runewood_trapdoor_open", + "x": 180, "y": 90 } } diff --git a/src/generated/resources/assets/malum/blockstates/runewood_wall_sign.json b/src/generated/resources/assets/malum/blockstates/runewood_wall_sign.json index ad07f5d08..53984b08c 100644 --- a/src/generated/resources/assets/malum/blockstates/runewood_wall_sign.json +++ b/src/generated/resources/assets/malum/blockstates/runewood_wall_sign.json @@ -1,27 +1,27 @@ { "variants": { - "facing=north,waterlogged=false": { + "facing=east,waterlogged=false": { "model": "malum:block/runewood_wall_sign" }, - "facing=south,waterlogged=false": { + "facing=east,waterlogged=true": { "model": "malum:block/runewood_wall_sign" }, - "facing=west,waterlogged=false": { + "facing=north,waterlogged=false": { "model": "malum:block/runewood_wall_sign" }, - "facing=east,waterlogged=false": { + "facing=north,waterlogged=true": { "model": "malum:block/runewood_wall_sign" }, - "facing=north,waterlogged=true": { + "facing=south,waterlogged=false": { "model": "malum:block/runewood_wall_sign" }, "facing=south,waterlogged=true": { "model": "malum:block/runewood_wall_sign" }, - "facing=west,waterlogged=true": { + "facing=west,waterlogged=false": { "model": "malum:block/runewood_wall_sign" }, - "facing=east,waterlogged=true": { + "facing=west,waterlogged=true": { "model": "malum:block/runewood_wall_sign" } } diff --git a/src/generated/resources/assets/malum/blockstates/runic_small_tainted_rock_bricks_slab.json b/src/generated/resources/assets/malum/blockstates/runic_small_tainted_rock_bricks_slab.json index 194b4b60b..9dd4755f5 100644 --- a/src/generated/resources/assets/malum/blockstates/runic_small_tainted_rock_bricks_slab.json +++ b/src/generated/resources/assets/malum/blockstates/runic_small_tainted_rock_bricks_slab.json @@ -1,13 +1,13 @@ { "variants": { - "type=top": { - "model": "malum:block/runic_small_tainted_rock_bricks_slab_top" - }, "type=bottom": { "model": "malum:block/runic_small_tainted_rock_bricks_slab" }, "type=double": { "model": "malum:block/runic_small_tainted_rock_bricks" + }, + "type=top": { + "model": "malum:block/runic_small_tainted_rock_bricks_slab_top" } } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/blockstates/runic_small_tainted_rock_bricks_stairs.json b/src/generated/resources/assets/malum/blockstates/runic_small_tainted_rock_bricks_stairs.json index 8bda645a2..5371aec89 100644 --- a/src/generated/resources/assets/malum/blockstates/runic_small_tainted_rock_bricks_stairs.json +++ b/src/generated/resources/assets/malum/blockstates/runic_small_tainted_rock_bricks_stairs.json @@ -1,209 +1,209 @@ { "variants": { - "facing=north,half=top,shape=straight": { - "model": "malum:block/runic_small_tainted_rock_bricks_stairs", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=south,half=top,shape=straight": { - "model": "malum:block/runic_small_tainted_rock_bricks_stairs", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=west,half=top,shape=straight": { - "model": "malum:block/runic_small_tainted_rock_bricks_stairs", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=east,half=top,shape=straight": { - "model": "malum:block/runic_small_tainted_rock_bricks_stairs", - "x": 180, - "uvlock": true + "facing=east,half=bottom,shape=inner_left": { + "model": "malum:block/runic_small_tainted_rock_bricks_stairs_inner", + "uvlock": true, + "y": 270 }, - "facing=north,half=bottom,shape=straight": { - "model": "malum:block/runic_small_tainted_rock_bricks_stairs", - "y": 270, - "uvlock": true + "facing=east,half=bottom,shape=inner_right": { + "model": "malum:block/runic_small_tainted_rock_bricks_stairs_inner" }, - "facing=south,half=bottom,shape=straight": { - "model": "malum:block/runic_small_tainted_rock_bricks_stairs", - "y": 90, - "uvlock": true + "facing=east,half=bottom,shape=outer_left": { + "model": "malum:block/runic_small_tainted_rock_bricks_stairs_outer", + "uvlock": true, + "y": 270 }, - "facing=west,half=bottom,shape=straight": { - "model": "malum:block/runic_small_tainted_rock_bricks_stairs", - "y": 180, - "uvlock": true + "facing=east,half=bottom,shape=outer_right": { + "model": "malum:block/runic_small_tainted_rock_bricks_stairs_outer" }, "facing=east,half=bottom,shape=straight": { "model": "malum:block/runic_small_tainted_rock_bricks_stairs" }, - "facing=north,half=top,shape=inner_left": { + "facing=east,half=top,shape=inner_left": { "model": "malum:block/runic_small_tainted_rock_bricks_stairs_inner", - "x": 180, - "y": 270, - "uvlock": true + "uvlock": true, + "x": 180 }, - "facing=south,half=top,shape=inner_left": { + "facing=east,half=top,shape=inner_right": { "model": "malum:block/runic_small_tainted_rock_bricks_stairs_inner", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 90 }, - "facing=west,half=top,shape=inner_left": { - "model": "malum:block/runic_small_tainted_rock_bricks_stairs_inner", - "x": 180, - "y": 180, - "uvlock": true + "facing=east,half=top,shape=outer_left": { + "model": "malum:block/runic_small_tainted_rock_bricks_stairs_outer", + "uvlock": true, + "x": 180 }, - "facing=east,half=top,shape=inner_left": { - "model": "malum:block/runic_small_tainted_rock_bricks_stairs_inner", + "facing=east,half=top,shape=outer_right": { + "model": "malum:block/runic_small_tainted_rock_bricks_stairs_outer", + "uvlock": true, "x": 180, - "uvlock": true + "y": 90 + }, + "facing=east,half=top,shape=straight": { + "model": "malum:block/runic_small_tainted_rock_bricks_stairs", + "uvlock": true, + "x": 180 }, "facing=north,half=bottom,shape=inner_left": { "model": "malum:block/runic_small_tainted_rock_bricks_stairs_inner", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=south,half=bottom,shape=inner_left": { - "model": "malum:block/runic_small_tainted_rock_bricks_stairs_inner" - }, - "facing=west,half=bottom,shape=inner_left": { + "facing=north,half=bottom,shape=inner_right": { "model": "malum:block/runic_small_tainted_rock_bricks_stairs_inner", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 270 }, - "facing=east,half=bottom,shape=inner_left": { - "model": "malum:block/runic_small_tainted_rock_bricks_stairs_inner", - "y": 270, - "uvlock": true + "facing=north,half=bottom,shape=outer_left": { + "model": "malum:block/runic_small_tainted_rock_bricks_stairs_outer", + "uvlock": true, + "y": 180 }, - "facing=north,half=top,shape=inner_right": { - "model": "malum:block/runic_small_tainted_rock_bricks_stairs_inner", - "x": 180, - "uvlock": true + "facing=north,half=bottom,shape=outer_right": { + "model": "malum:block/runic_small_tainted_rock_bricks_stairs_outer", + "uvlock": true, + "y": 270 }, - "facing=south,half=top,shape=inner_right": { + "facing=north,half=bottom,shape=straight": { + "model": "malum:block/runic_small_tainted_rock_bricks_stairs", + "uvlock": true, + "y": 270 + }, + "facing=north,half=top,shape=inner_left": { "model": "malum:block/runic_small_tainted_rock_bricks_stairs_inner", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 270 }, - "facing=west,half=top,shape=inner_right": { + "facing=north,half=top,shape=inner_right": { "model": "malum:block/runic_small_tainted_rock_bricks_stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=outer_left": { + "model": "malum:block/runic_small_tainted_rock_bricks_stairs_outer", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 270 }, - "facing=east,half=top,shape=inner_right": { - "model": "malum:block/runic_small_tainted_rock_bricks_stairs_inner", + "facing=north,half=top,shape=outer_right": { + "model": "malum:block/runic_small_tainted_rock_bricks_stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=straight": { + "model": "malum:block/runic_small_tainted_rock_bricks_stairs", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 270 }, - "facing=north,half=bottom,shape=inner_right": { - "model": "malum:block/runic_small_tainted_rock_bricks_stairs_inner", - "y": 270, - "uvlock": true + "facing=south,half=bottom,shape=inner_left": { + "model": "malum:block/runic_small_tainted_rock_bricks_stairs_inner" }, "facing=south,half=bottom,shape=inner_right": { "model": "malum:block/runic_small_tainted_rock_bricks_stairs_inner", - "y": 90, - "uvlock": true - }, - "facing=west,half=bottom,shape=inner_right": { - "model": "malum:block/runic_small_tainted_rock_bricks_stairs_inner", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 90 }, - "facing=east,half=bottom,shape=inner_right": { - "model": "malum:block/runic_small_tainted_rock_bricks_stairs_inner" + "facing=south,half=bottom,shape=outer_left": { + "model": "malum:block/runic_small_tainted_rock_bricks_stairs_outer" }, - "facing=north,half=top,shape=outer_left": { + "facing=south,half=bottom,shape=outer_right": { "model": "malum:block/runic_small_tainted_rock_bricks_stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=straight": { + "model": "malum:block/runic_small_tainted_rock_bricks_stairs", + "uvlock": true, + "y": 90 + }, + "facing=south,half=top,shape=inner_left": { + "model": "malum:block/runic_small_tainted_rock_bricks_stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=inner_right": { + "model": "malum:block/runic_small_tainted_rock_bricks_stairs_inner", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 180 }, "facing=south,half=top,shape=outer_left": { "model": "malum:block/runic_small_tainted_rock_bricks_stairs_outer", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 90 }, - "facing=west,half=top,shape=outer_left": { + "facing=south,half=top,shape=outer_right": { "model": "malum:block/runic_small_tainted_rock_bricks_stairs_outer", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 180 }, - "facing=east,half=top,shape=outer_left": { - "model": "malum:block/runic_small_tainted_rock_bricks_stairs_outer", + "facing=south,half=top,shape=straight": { + "model": "malum:block/runic_small_tainted_rock_bricks_stairs", + "uvlock": true, "x": 180, - "uvlock": true + "y": 90 }, - "facing=north,half=bottom,shape=outer_left": { - "model": "malum:block/runic_small_tainted_rock_bricks_stairs_outer", - "y": 180, - "uvlock": true + "facing=west,half=bottom,shape=inner_left": { + "model": "malum:block/runic_small_tainted_rock_bricks_stairs_inner", + "uvlock": true, + "y": 90 }, - "facing=south,half=bottom,shape=outer_left": { - "model": "malum:block/runic_small_tainted_rock_bricks_stairs_outer" + "facing=west,half=bottom,shape=inner_right": { + "model": "malum:block/runic_small_tainted_rock_bricks_stairs_inner", + "uvlock": true, + "y": 180 }, "facing=west,half=bottom,shape=outer_left": { "model": "malum:block/runic_small_tainted_rock_bricks_stairs_outer", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 90 }, - "facing=east,half=bottom,shape=outer_left": { + "facing=west,half=bottom,shape=outer_right": { "model": "malum:block/runic_small_tainted_rock_bricks_stairs_outer", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=north,half=top,shape=outer_right": { - "model": "malum:block/runic_small_tainted_rock_bricks_stairs_outer", - "x": 180, - "uvlock": true + "facing=west,half=bottom,shape=straight": { + "model": "malum:block/runic_small_tainted_rock_bricks_stairs", + "uvlock": true, + "y": 180 }, - "facing=south,half=top,shape=outer_right": { - "model": "malum:block/runic_small_tainted_rock_bricks_stairs_outer", + "facing=west,half=top,shape=inner_left": { + "model": "malum:block/runic_small_tainted_rock_bricks_stairs_inner", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 180 }, - "facing=west,half=top,shape=outer_right": { - "model": "malum:block/runic_small_tainted_rock_bricks_stairs_outer", + "facing=west,half=top,shape=inner_right": { + "model": "malum:block/runic_small_tainted_rock_bricks_stairs_inner", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 270 }, - "facing=east,half=top,shape=outer_right": { + "facing=west,half=top,shape=outer_left": { "model": "malum:block/runic_small_tainted_rock_bricks_stairs_outer", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true - }, - "facing=north,half=bottom,shape=outer_right": { - "model": "malum:block/runic_small_tainted_rock_bricks_stairs_outer", - "y": 270, - "uvlock": true - }, - "facing=south,half=bottom,shape=outer_right": { - "model": "malum:block/runic_small_tainted_rock_bricks_stairs_outer", - "y": 90, - "uvlock": true + "y": 180 }, - "facing=west,half=bottom,shape=outer_right": { + "facing=west,half=top,shape=outer_right": { "model": "malum:block/runic_small_tainted_rock_bricks_stairs_outer", - "y": 180, - "uvlock": true + "uvlock": true, + "x": 180, + "y": 270 }, - "facing=east,half=bottom,shape=outer_right": { - "model": "malum:block/runic_small_tainted_rock_bricks_stairs_outer" + "facing=west,half=top,shape=straight": { + "model": "malum:block/runic_small_tainted_rock_bricks_stairs", + "uvlock": true, + "x": 180, + "y": 180 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/blockstates/runic_small_tainted_rock_bricks_wall.json b/src/generated/resources/assets/malum/blockstates/runic_small_tainted_rock_bricks_wall.json index e9d7d36f5..a02b9b6e9 100644 --- a/src/generated/resources/assets/malum/blockstates/runic_small_tainted_rock_bricks_wall.json +++ b/src/generated/resources/assets/malum/blockstates/runic_small_tainted_rock_bricks_wall.json @@ -1,89 +1,89 @@ { "multipart": [ { - "when": { - "up": "true" - }, "apply": { "model": "malum:block/runic_small_tainted_rock_bricks_wall_post" + }, + "when": { + "up": "true" } }, { - "when": { - "east": "low" - }, "apply": { "model": "malum:block/runic_small_tainted_rock_bricks_wall_side", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 90 + }, + "when": { + "east": "low" } }, { - "when": { - "east": "tall" - }, "apply": { "model": "malum:block/runic_small_tainted_rock_bricks_wall_side_tall", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 90 + }, + "when": { + "east": "tall" } }, { - "when": { - "north": "low" - }, "apply": { "model": "malum:block/runic_small_tainted_rock_bricks_wall_side", "uvlock": true + }, + "when": { + "north": "low" } }, { - "when": { - "north": "tall" - }, "apply": { "model": "malum:block/runic_small_tainted_rock_bricks_wall_side_tall", "uvlock": true + }, + "when": { + "north": "tall" } }, { - "when": { - "south": "low" - }, "apply": { "model": "malum:block/runic_small_tainted_rock_bricks_wall_side", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 + }, + "when": { + "south": "low" } }, { - "when": { - "south": "tall" - }, "apply": { "model": "malum:block/runic_small_tainted_rock_bricks_wall_side_tall", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 + }, + "when": { + "south": "tall" } }, { - "when": { - "west": "low" - }, "apply": { "model": "malum:block/runic_small_tainted_rock_bricks_wall_side", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 270 + }, + "when": { + "west": "low" } }, { - "when": { - "west": "tall" - }, "apply": { "model": "malum:block/runic_small_tainted_rock_bricks_wall_side_tall", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 270 + }, + "when": { + "west": "tall" } } ] diff --git a/src/generated/resources/assets/malum/blockstates/runic_small_twisted_rock_bricks_slab.json b/src/generated/resources/assets/malum/blockstates/runic_small_twisted_rock_bricks_slab.json index 4c8944c9f..25537efa0 100644 --- a/src/generated/resources/assets/malum/blockstates/runic_small_twisted_rock_bricks_slab.json +++ b/src/generated/resources/assets/malum/blockstates/runic_small_twisted_rock_bricks_slab.json @@ -1,13 +1,13 @@ { "variants": { - "type=top": { - "model": "malum:block/runic_small_twisted_rock_bricks_slab_top" - }, "type=bottom": { "model": "malum:block/runic_small_twisted_rock_bricks_slab" }, "type=double": { "model": "malum:block/runic_small_twisted_rock_bricks" + }, + "type=top": { + "model": "malum:block/runic_small_twisted_rock_bricks_slab_top" } } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/blockstates/runic_small_twisted_rock_bricks_stairs.json b/src/generated/resources/assets/malum/blockstates/runic_small_twisted_rock_bricks_stairs.json index 4b89e971c..2f31ee8b2 100644 --- a/src/generated/resources/assets/malum/blockstates/runic_small_twisted_rock_bricks_stairs.json +++ b/src/generated/resources/assets/malum/blockstates/runic_small_twisted_rock_bricks_stairs.json @@ -1,209 +1,209 @@ { "variants": { - "facing=north,half=top,shape=straight": { - "model": "malum:block/runic_small_twisted_rock_bricks_stairs", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=south,half=top,shape=straight": { - "model": "malum:block/runic_small_twisted_rock_bricks_stairs", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=west,half=top,shape=straight": { - "model": "malum:block/runic_small_twisted_rock_bricks_stairs", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=east,half=top,shape=straight": { - "model": "malum:block/runic_small_twisted_rock_bricks_stairs", - "x": 180, - "uvlock": true + "facing=east,half=bottom,shape=inner_left": { + "model": "malum:block/runic_small_twisted_rock_bricks_stairs_inner", + "uvlock": true, + "y": 270 }, - "facing=north,half=bottom,shape=straight": { - "model": "malum:block/runic_small_twisted_rock_bricks_stairs", - "y": 270, - "uvlock": true + "facing=east,half=bottom,shape=inner_right": { + "model": "malum:block/runic_small_twisted_rock_bricks_stairs_inner" }, - "facing=south,half=bottom,shape=straight": { - "model": "malum:block/runic_small_twisted_rock_bricks_stairs", - "y": 90, - "uvlock": true + "facing=east,half=bottom,shape=outer_left": { + "model": "malum:block/runic_small_twisted_rock_bricks_stairs_outer", + "uvlock": true, + "y": 270 }, - "facing=west,half=bottom,shape=straight": { - "model": "malum:block/runic_small_twisted_rock_bricks_stairs", - "y": 180, - "uvlock": true + "facing=east,half=bottom,shape=outer_right": { + "model": "malum:block/runic_small_twisted_rock_bricks_stairs_outer" }, "facing=east,half=bottom,shape=straight": { "model": "malum:block/runic_small_twisted_rock_bricks_stairs" }, - "facing=north,half=top,shape=inner_left": { + "facing=east,half=top,shape=inner_left": { "model": "malum:block/runic_small_twisted_rock_bricks_stairs_inner", - "x": 180, - "y": 270, - "uvlock": true + "uvlock": true, + "x": 180 }, - "facing=south,half=top,shape=inner_left": { + "facing=east,half=top,shape=inner_right": { "model": "malum:block/runic_small_twisted_rock_bricks_stairs_inner", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 90 }, - "facing=west,half=top,shape=inner_left": { - "model": "malum:block/runic_small_twisted_rock_bricks_stairs_inner", - "x": 180, - "y": 180, - "uvlock": true + "facing=east,half=top,shape=outer_left": { + "model": "malum:block/runic_small_twisted_rock_bricks_stairs_outer", + "uvlock": true, + "x": 180 }, - "facing=east,half=top,shape=inner_left": { - "model": "malum:block/runic_small_twisted_rock_bricks_stairs_inner", + "facing=east,half=top,shape=outer_right": { + "model": "malum:block/runic_small_twisted_rock_bricks_stairs_outer", + "uvlock": true, "x": 180, - "uvlock": true + "y": 90 + }, + "facing=east,half=top,shape=straight": { + "model": "malum:block/runic_small_twisted_rock_bricks_stairs", + "uvlock": true, + "x": 180 }, "facing=north,half=bottom,shape=inner_left": { "model": "malum:block/runic_small_twisted_rock_bricks_stairs_inner", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=south,half=bottom,shape=inner_left": { - "model": "malum:block/runic_small_twisted_rock_bricks_stairs_inner" - }, - "facing=west,half=bottom,shape=inner_left": { + "facing=north,half=bottom,shape=inner_right": { "model": "malum:block/runic_small_twisted_rock_bricks_stairs_inner", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 270 }, - "facing=east,half=bottom,shape=inner_left": { - "model": "malum:block/runic_small_twisted_rock_bricks_stairs_inner", - "y": 270, - "uvlock": true + "facing=north,half=bottom,shape=outer_left": { + "model": "malum:block/runic_small_twisted_rock_bricks_stairs_outer", + "uvlock": true, + "y": 180 }, - "facing=north,half=top,shape=inner_right": { - "model": "malum:block/runic_small_twisted_rock_bricks_stairs_inner", - "x": 180, - "uvlock": true + "facing=north,half=bottom,shape=outer_right": { + "model": "malum:block/runic_small_twisted_rock_bricks_stairs_outer", + "uvlock": true, + "y": 270 }, - "facing=south,half=top,shape=inner_right": { + "facing=north,half=bottom,shape=straight": { + "model": "malum:block/runic_small_twisted_rock_bricks_stairs", + "uvlock": true, + "y": 270 + }, + "facing=north,half=top,shape=inner_left": { "model": "malum:block/runic_small_twisted_rock_bricks_stairs_inner", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 270 }, - "facing=west,half=top,shape=inner_right": { + "facing=north,half=top,shape=inner_right": { "model": "malum:block/runic_small_twisted_rock_bricks_stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=outer_left": { + "model": "malum:block/runic_small_twisted_rock_bricks_stairs_outer", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 270 }, - "facing=east,half=top,shape=inner_right": { - "model": "malum:block/runic_small_twisted_rock_bricks_stairs_inner", + "facing=north,half=top,shape=outer_right": { + "model": "malum:block/runic_small_twisted_rock_bricks_stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=straight": { + "model": "malum:block/runic_small_twisted_rock_bricks_stairs", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 270 }, - "facing=north,half=bottom,shape=inner_right": { - "model": "malum:block/runic_small_twisted_rock_bricks_stairs_inner", - "y": 270, - "uvlock": true + "facing=south,half=bottom,shape=inner_left": { + "model": "malum:block/runic_small_twisted_rock_bricks_stairs_inner" }, "facing=south,half=bottom,shape=inner_right": { "model": "malum:block/runic_small_twisted_rock_bricks_stairs_inner", - "y": 90, - "uvlock": true - }, - "facing=west,half=bottom,shape=inner_right": { - "model": "malum:block/runic_small_twisted_rock_bricks_stairs_inner", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 90 }, - "facing=east,half=bottom,shape=inner_right": { - "model": "malum:block/runic_small_twisted_rock_bricks_stairs_inner" + "facing=south,half=bottom,shape=outer_left": { + "model": "malum:block/runic_small_twisted_rock_bricks_stairs_outer" }, - "facing=north,half=top,shape=outer_left": { + "facing=south,half=bottom,shape=outer_right": { "model": "malum:block/runic_small_twisted_rock_bricks_stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=straight": { + "model": "malum:block/runic_small_twisted_rock_bricks_stairs", + "uvlock": true, + "y": 90 + }, + "facing=south,half=top,shape=inner_left": { + "model": "malum:block/runic_small_twisted_rock_bricks_stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=inner_right": { + "model": "malum:block/runic_small_twisted_rock_bricks_stairs_inner", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 180 }, "facing=south,half=top,shape=outer_left": { "model": "malum:block/runic_small_twisted_rock_bricks_stairs_outer", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 90 }, - "facing=west,half=top,shape=outer_left": { + "facing=south,half=top,shape=outer_right": { "model": "malum:block/runic_small_twisted_rock_bricks_stairs_outer", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 180 }, - "facing=east,half=top,shape=outer_left": { - "model": "malum:block/runic_small_twisted_rock_bricks_stairs_outer", + "facing=south,half=top,shape=straight": { + "model": "malum:block/runic_small_twisted_rock_bricks_stairs", + "uvlock": true, "x": 180, - "uvlock": true + "y": 90 }, - "facing=north,half=bottom,shape=outer_left": { - "model": "malum:block/runic_small_twisted_rock_bricks_stairs_outer", - "y": 180, - "uvlock": true + "facing=west,half=bottom,shape=inner_left": { + "model": "malum:block/runic_small_twisted_rock_bricks_stairs_inner", + "uvlock": true, + "y": 90 }, - "facing=south,half=bottom,shape=outer_left": { - "model": "malum:block/runic_small_twisted_rock_bricks_stairs_outer" + "facing=west,half=bottom,shape=inner_right": { + "model": "malum:block/runic_small_twisted_rock_bricks_stairs_inner", + "uvlock": true, + "y": 180 }, "facing=west,half=bottom,shape=outer_left": { "model": "malum:block/runic_small_twisted_rock_bricks_stairs_outer", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 90 }, - "facing=east,half=bottom,shape=outer_left": { + "facing=west,half=bottom,shape=outer_right": { "model": "malum:block/runic_small_twisted_rock_bricks_stairs_outer", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=north,half=top,shape=outer_right": { - "model": "malum:block/runic_small_twisted_rock_bricks_stairs_outer", - "x": 180, - "uvlock": true + "facing=west,half=bottom,shape=straight": { + "model": "malum:block/runic_small_twisted_rock_bricks_stairs", + "uvlock": true, + "y": 180 }, - "facing=south,half=top,shape=outer_right": { - "model": "malum:block/runic_small_twisted_rock_bricks_stairs_outer", + "facing=west,half=top,shape=inner_left": { + "model": "malum:block/runic_small_twisted_rock_bricks_stairs_inner", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 180 }, - "facing=west,half=top,shape=outer_right": { - "model": "malum:block/runic_small_twisted_rock_bricks_stairs_outer", + "facing=west,half=top,shape=inner_right": { + "model": "malum:block/runic_small_twisted_rock_bricks_stairs_inner", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 270 }, - "facing=east,half=top,shape=outer_right": { + "facing=west,half=top,shape=outer_left": { "model": "malum:block/runic_small_twisted_rock_bricks_stairs_outer", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true - }, - "facing=north,half=bottom,shape=outer_right": { - "model": "malum:block/runic_small_twisted_rock_bricks_stairs_outer", - "y": 270, - "uvlock": true - }, - "facing=south,half=bottom,shape=outer_right": { - "model": "malum:block/runic_small_twisted_rock_bricks_stairs_outer", - "y": 90, - "uvlock": true + "y": 180 }, - "facing=west,half=bottom,shape=outer_right": { + "facing=west,half=top,shape=outer_right": { "model": "malum:block/runic_small_twisted_rock_bricks_stairs_outer", - "y": 180, - "uvlock": true + "uvlock": true, + "x": 180, + "y": 270 }, - "facing=east,half=bottom,shape=outer_right": { - "model": "malum:block/runic_small_twisted_rock_bricks_stairs_outer" + "facing=west,half=top,shape=straight": { + "model": "malum:block/runic_small_twisted_rock_bricks_stairs", + "uvlock": true, + "x": 180, + "y": 180 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/blockstates/runic_small_twisted_rock_bricks_wall.json b/src/generated/resources/assets/malum/blockstates/runic_small_twisted_rock_bricks_wall.json index 769e8c7bd..b31bed9b7 100644 --- a/src/generated/resources/assets/malum/blockstates/runic_small_twisted_rock_bricks_wall.json +++ b/src/generated/resources/assets/malum/blockstates/runic_small_twisted_rock_bricks_wall.json @@ -1,89 +1,89 @@ { "multipart": [ { - "when": { - "up": "true" - }, "apply": { "model": "malum:block/runic_small_twisted_rock_bricks_wall_post" + }, + "when": { + "up": "true" } }, { - "when": { - "east": "low" - }, "apply": { "model": "malum:block/runic_small_twisted_rock_bricks_wall_side", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 90 + }, + "when": { + "east": "low" } }, { - "when": { - "east": "tall" - }, "apply": { "model": "malum:block/runic_small_twisted_rock_bricks_wall_side_tall", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 90 + }, + "when": { + "east": "tall" } }, { - "when": { - "north": "low" - }, "apply": { "model": "malum:block/runic_small_twisted_rock_bricks_wall_side", "uvlock": true + }, + "when": { + "north": "low" } }, { - "when": { - "north": "tall" - }, "apply": { "model": "malum:block/runic_small_twisted_rock_bricks_wall_side_tall", "uvlock": true + }, + "when": { + "north": "tall" } }, { - "when": { - "south": "low" - }, "apply": { "model": "malum:block/runic_small_twisted_rock_bricks_wall_side", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 + }, + "when": { + "south": "low" } }, { - "when": { - "south": "tall" - }, "apply": { "model": "malum:block/runic_small_twisted_rock_bricks_wall_side_tall", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 + }, + "when": { + "south": "tall" } }, { - "when": { - "west": "low" - }, "apply": { "model": "malum:block/runic_small_twisted_rock_bricks_wall_side", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 270 + }, + "when": { + "west": "low" } }, { - "when": { - "west": "tall" - }, "apply": { "model": "malum:block/runic_small_twisted_rock_bricks_wall_side_tall", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 270 + }, + "when": { + "west": "tall" } } ] diff --git a/src/generated/resources/assets/malum/blockstates/runic_tainted_rock_bricks_slab.json b/src/generated/resources/assets/malum/blockstates/runic_tainted_rock_bricks_slab.json index 5992a3208..8f5371645 100644 --- a/src/generated/resources/assets/malum/blockstates/runic_tainted_rock_bricks_slab.json +++ b/src/generated/resources/assets/malum/blockstates/runic_tainted_rock_bricks_slab.json @@ -1,13 +1,13 @@ { "variants": { - "type=top": { - "model": "malum:block/runic_tainted_rock_bricks_slab_top" - }, "type=bottom": { "model": "malum:block/runic_tainted_rock_bricks_slab" }, "type=double": { "model": "malum:block/runic_tainted_rock_bricks" + }, + "type=top": { + "model": "malum:block/runic_tainted_rock_bricks_slab_top" } } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/blockstates/runic_tainted_rock_bricks_stairs.json b/src/generated/resources/assets/malum/blockstates/runic_tainted_rock_bricks_stairs.json index 2a4137d56..d96d21528 100644 --- a/src/generated/resources/assets/malum/blockstates/runic_tainted_rock_bricks_stairs.json +++ b/src/generated/resources/assets/malum/blockstates/runic_tainted_rock_bricks_stairs.json @@ -1,209 +1,209 @@ { "variants": { - "facing=north,half=top,shape=straight": { - "model": "malum:block/runic_tainted_rock_bricks_stairs", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=south,half=top,shape=straight": { - "model": "malum:block/runic_tainted_rock_bricks_stairs", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=west,half=top,shape=straight": { - "model": "malum:block/runic_tainted_rock_bricks_stairs", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=east,half=top,shape=straight": { - "model": "malum:block/runic_tainted_rock_bricks_stairs", - "x": 180, - "uvlock": true + "facing=east,half=bottom,shape=inner_left": { + "model": "malum:block/runic_tainted_rock_bricks_stairs_inner", + "uvlock": true, + "y": 270 }, - "facing=north,half=bottom,shape=straight": { - "model": "malum:block/runic_tainted_rock_bricks_stairs", - "y": 270, - "uvlock": true + "facing=east,half=bottom,shape=inner_right": { + "model": "malum:block/runic_tainted_rock_bricks_stairs_inner" }, - "facing=south,half=bottom,shape=straight": { - "model": "malum:block/runic_tainted_rock_bricks_stairs", - "y": 90, - "uvlock": true + "facing=east,half=bottom,shape=outer_left": { + "model": "malum:block/runic_tainted_rock_bricks_stairs_outer", + "uvlock": true, + "y": 270 }, - "facing=west,half=bottom,shape=straight": { - "model": "malum:block/runic_tainted_rock_bricks_stairs", - "y": 180, - "uvlock": true + "facing=east,half=bottom,shape=outer_right": { + "model": "malum:block/runic_tainted_rock_bricks_stairs_outer" }, "facing=east,half=bottom,shape=straight": { "model": "malum:block/runic_tainted_rock_bricks_stairs" }, - "facing=north,half=top,shape=inner_left": { + "facing=east,half=top,shape=inner_left": { "model": "malum:block/runic_tainted_rock_bricks_stairs_inner", - "x": 180, - "y": 270, - "uvlock": true + "uvlock": true, + "x": 180 }, - "facing=south,half=top,shape=inner_left": { + "facing=east,half=top,shape=inner_right": { "model": "malum:block/runic_tainted_rock_bricks_stairs_inner", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 90 }, - "facing=west,half=top,shape=inner_left": { - "model": "malum:block/runic_tainted_rock_bricks_stairs_inner", - "x": 180, - "y": 180, - "uvlock": true + "facing=east,half=top,shape=outer_left": { + "model": "malum:block/runic_tainted_rock_bricks_stairs_outer", + "uvlock": true, + "x": 180 }, - "facing=east,half=top,shape=inner_left": { - "model": "malum:block/runic_tainted_rock_bricks_stairs_inner", + "facing=east,half=top,shape=outer_right": { + "model": "malum:block/runic_tainted_rock_bricks_stairs_outer", + "uvlock": true, "x": 180, - "uvlock": true + "y": 90 + }, + "facing=east,half=top,shape=straight": { + "model": "malum:block/runic_tainted_rock_bricks_stairs", + "uvlock": true, + "x": 180 }, "facing=north,half=bottom,shape=inner_left": { "model": "malum:block/runic_tainted_rock_bricks_stairs_inner", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=south,half=bottom,shape=inner_left": { - "model": "malum:block/runic_tainted_rock_bricks_stairs_inner" - }, - "facing=west,half=bottom,shape=inner_left": { + "facing=north,half=bottom,shape=inner_right": { "model": "malum:block/runic_tainted_rock_bricks_stairs_inner", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 270 }, - "facing=east,half=bottom,shape=inner_left": { - "model": "malum:block/runic_tainted_rock_bricks_stairs_inner", - "y": 270, - "uvlock": true + "facing=north,half=bottom,shape=outer_left": { + "model": "malum:block/runic_tainted_rock_bricks_stairs_outer", + "uvlock": true, + "y": 180 }, - "facing=north,half=top,shape=inner_right": { - "model": "malum:block/runic_tainted_rock_bricks_stairs_inner", - "x": 180, - "uvlock": true + "facing=north,half=bottom,shape=outer_right": { + "model": "malum:block/runic_tainted_rock_bricks_stairs_outer", + "uvlock": true, + "y": 270 }, - "facing=south,half=top,shape=inner_right": { + "facing=north,half=bottom,shape=straight": { + "model": "malum:block/runic_tainted_rock_bricks_stairs", + "uvlock": true, + "y": 270 + }, + "facing=north,half=top,shape=inner_left": { "model": "malum:block/runic_tainted_rock_bricks_stairs_inner", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 270 }, - "facing=west,half=top,shape=inner_right": { + "facing=north,half=top,shape=inner_right": { "model": "malum:block/runic_tainted_rock_bricks_stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=outer_left": { + "model": "malum:block/runic_tainted_rock_bricks_stairs_outer", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 270 }, - "facing=east,half=top,shape=inner_right": { - "model": "malum:block/runic_tainted_rock_bricks_stairs_inner", + "facing=north,half=top,shape=outer_right": { + "model": "malum:block/runic_tainted_rock_bricks_stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=straight": { + "model": "malum:block/runic_tainted_rock_bricks_stairs", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 270 }, - "facing=north,half=bottom,shape=inner_right": { - "model": "malum:block/runic_tainted_rock_bricks_stairs_inner", - "y": 270, - "uvlock": true + "facing=south,half=bottom,shape=inner_left": { + "model": "malum:block/runic_tainted_rock_bricks_stairs_inner" }, "facing=south,half=bottom,shape=inner_right": { "model": "malum:block/runic_tainted_rock_bricks_stairs_inner", - "y": 90, - "uvlock": true - }, - "facing=west,half=bottom,shape=inner_right": { - "model": "malum:block/runic_tainted_rock_bricks_stairs_inner", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 90 }, - "facing=east,half=bottom,shape=inner_right": { - "model": "malum:block/runic_tainted_rock_bricks_stairs_inner" + "facing=south,half=bottom,shape=outer_left": { + "model": "malum:block/runic_tainted_rock_bricks_stairs_outer" }, - "facing=north,half=top,shape=outer_left": { + "facing=south,half=bottom,shape=outer_right": { "model": "malum:block/runic_tainted_rock_bricks_stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=straight": { + "model": "malum:block/runic_tainted_rock_bricks_stairs", + "uvlock": true, + "y": 90 + }, + "facing=south,half=top,shape=inner_left": { + "model": "malum:block/runic_tainted_rock_bricks_stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=inner_right": { + "model": "malum:block/runic_tainted_rock_bricks_stairs_inner", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 180 }, "facing=south,half=top,shape=outer_left": { "model": "malum:block/runic_tainted_rock_bricks_stairs_outer", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 90 }, - "facing=west,half=top,shape=outer_left": { + "facing=south,half=top,shape=outer_right": { "model": "malum:block/runic_tainted_rock_bricks_stairs_outer", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 180 }, - "facing=east,half=top,shape=outer_left": { - "model": "malum:block/runic_tainted_rock_bricks_stairs_outer", + "facing=south,half=top,shape=straight": { + "model": "malum:block/runic_tainted_rock_bricks_stairs", + "uvlock": true, "x": 180, - "uvlock": true + "y": 90 }, - "facing=north,half=bottom,shape=outer_left": { - "model": "malum:block/runic_tainted_rock_bricks_stairs_outer", - "y": 180, - "uvlock": true + "facing=west,half=bottom,shape=inner_left": { + "model": "malum:block/runic_tainted_rock_bricks_stairs_inner", + "uvlock": true, + "y": 90 }, - "facing=south,half=bottom,shape=outer_left": { - "model": "malum:block/runic_tainted_rock_bricks_stairs_outer" + "facing=west,half=bottom,shape=inner_right": { + "model": "malum:block/runic_tainted_rock_bricks_stairs_inner", + "uvlock": true, + "y": 180 }, "facing=west,half=bottom,shape=outer_left": { "model": "malum:block/runic_tainted_rock_bricks_stairs_outer", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 90 }, - "facing=east,half=bottom,shape=outer_left": { + "facing=west,half=bottom,shape=outer_right": { "model": "malum:block/runic_tainted_rock_bricks_stairs_outer", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=north,half=top,shape=outer_right": { - "model": "malum:block/runic_tainted_rock_bricks_stairs_outer", - "x": 180, - "uvlock": true + "facing=west,half=bottom,shape=straight": { + "model": "malum:block/runic_tainted_rock_bricks_stairs", + "uvlock": true, + "y": 180 }, - "facing=south,half=top,shape=outer_right": { - "model": "malum:block/runic_tainted_rock_bricks_stairs_outer", + "facing=west,half=top,shape=inner_left": { + "model": "malum:block/runic_tainted_rock_bricks_stairs_inner", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 180 }, - "facing=west,half=top,shape=outer_right": { - "model": "malum:block/runic_tainted_rock_bricks_stairs_outer", + "facing=west,half=top,shape=inner_right": { + "model": "malum:block/runic_tainted_rock_bricks_stairs_inner", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 270 }, - "facing=east,half=top,shape=outer_right": { + "facing=west,half=top,shape=outer_left": { "model": "malum:block/runic_tainted_rock_bricks_stairs_outer", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true - }, - "facing=north,half=bottom,shape=outer_right": { - "model": "malum:block/runic_tainted_rock_bricks_stairs_outer", - "y": 270, - "uvlock": true - }, - "facing=south,half=bottom,shape=outer_right": { - "model": "malum:block/runic_tainted_rock_bricks_stairs_outer", - "y": 90, - "uvlock": true + "y": 180 }, - "facing=west,half=bottom,shape=outer_right": { + "facing=west,half=top,shape=outer_right": { "model": "malum:block/runic_tainted_rock_bricks_stairs_outer", - "y": 180, - "uvlock": true + "uvlock": true, + "x": 180, + "y": 270 }, - "facing=east,half=bottom,shape=outer_right": { - "model": "malum:block/runic_tainted_rock_bricks_stairs_outer" + "facing=west,half=top,shape=straight": { + "model": "malum:block/runic_tainted_rock_bricks_stairs", + "uvlock": true, + "x": 180, + "y": 180 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/blockstates/runic_tainted_rock_bricks_wall.json b/src/generated/resources/assets/malum/blockstates/runic_tainted_rock_bricks_wall.json index 4993f0c7a..1f3a3730c 100644 --- a/src/generated/resources/assets/malum/blockstates/runic_tainted_rock_bricks_wall.json +++ b/src/generated/resources/assets/malum/blockstates/runic_tainted_rock_bricks_wall.json @@ -1,89 +1,89 @@ { "multipart": [ { - "when": { - "up": "true" - }, "apply": { "model": "malum:block/runic_tainted_rock_bricks_wall_post" + }, + "when": { + "up": "true" } }, { - "when": { - "east": "low" - }, "apply": { "model": "malum:block/runic_tainted_rock_bricks_wall_side", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 90 + }, + "when": { + "east": "low" } }, { - "when": { - "east": "tall" - }, "apply": { "model": "malum:block/runic_tainted_rock_bricks_wall_side_tall", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 90 + }, + "when": { + "east": "tall" } }, { - "when": { - "north": "low" - }, "apply": { "model": "malum:block/runic_tainted_rock_bricks_wall_side", "uvlock": true + }, + "when": { + "north": "low" } }, { - "when": { - "north": "tall" - }, "apply": { "model": "malum:block/runic_tainted_rock_bricks_wall_side_tall", "uvlock": true + }, + "when": { + "north": "tall" } }, { - "when": { - "south": "low" - }, "apply": { "model": "malum:block/runic_tainted_rock_bricks_wall_side", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 + }, + "when": { + "south": "low" } }, { - "when": { - "south": "tall" - }, "apply": { "model": "malum:block/runic_tainted_rock_bricks_wall_side_tall", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 + }, + "when": { + "south": "tall" } }, { - "when": { - "west": "low" - }, "apply": { "model": "malum:block/runic_tainted_rock_bricks_wall_side", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 270 + }, + "when": { + "west": "low" } }, { - "when": { - "west": "tall" - }, "apply": { "model": "malum:block/runic_tainted_rock_bricks_wall_side_tall", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 270 + }, + "when": { + "west": "tall" } } ] diff --git a/src/generated/resources/assets/malum/blockstates/runic_tainted_rock_tiles_slab.json b/src/generated/resources/assets/malum/blockstates/runic_tainted_rock_tiles_slab.json index d04658dc4..51773b9c6 100644 --- a/src/generated/resources/assets/malum/blockstates/runic_tainted_rock_tiles_slab.json +++ b/src/generated/resources/assets/malum/blockstates/runic_tainted_rock_tiles_slab.json @@ -1,13 +1,13 @@ { "variants": { - "type=top": { - "model": "malum:block/runic_tainted_rock_tiles_slab_top" - }, "type=bottom": { "model": "malum:block/runic_tainted_rock_tiles_slab" }, "type=double": { "model": "malum:block/runic_tainted_rock_tiles" + }, + "type=top": { + "model": "malum:block/runic_tainted_rock_tiles_slab_top" } } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/blockstates/runic_tainted_rock_tiles_stairs.json b/src/generated/resources/assets/malum/blockstates/runic_tainted_rock_tiles_stairs.json index 3a4bb986f..cee3365bc 100644 --- a/src/generated/resources/assets/malum/blockstates/runic_tainted_rock_tiles_stairs.json +++ b/src/generated/resources/assets/malum/blockstates/runic_tainted_rock_tiles_stairs.json @@ -1,209 +1,209 @@ { "variants": { - "facing=north,half=top,shape=straight": { - "model": "malum:block/runic_tainted_rock_tiles_stairs", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=south,half=top,shape=straight": { - "model": "malum:block/runic_tainted_rock_tiles_stairs", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=west,half=top,shape=straight": { - "model": "malum:block/runic_tainted_rock_tiles_stairs", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=east,half=top,shape=straight": { - "model": "malum:block/runic_tainted_rock_tiles_stairs", - "x": 180, - "uvlock": true + "facing=east,half=bottom,shape=inner_left": { + "model": "malum:block/runic_tainted_rock_tiles_stairs_inner", + "uvlock": true, + "y": 270 }, - "facing=north,half=bottom,shape=straight": { - "model": "malum:block/runic_tainted_rock_tiles_stairs", - "y": 270, - "uvlock": true + "facing=east,half=bottom,shape=inner_right": { + "model": "malum:block/runic_tainted_rock_tiles_stairs_inner" }, - "facing=south,half=bottom,shape=straight": { - "model": "malum:block/runic_tainted_rock_tiles_stairs", - "y": 90, - "uvlock": true + "facing=east,half=bottom,shape=outer_left": { + "model": "malum:block/runic_tainted_rock_tiles_stairs_outer", + "uvlock": true, + "y": 270 }, - "facing=west,half=bottom,shape=straight": { - "model": "malum:block/runic_tainted_rock_tiles_stairs", - "y": 180, - "uvlock": true + "facing=east,half=bottom,shape=outer_right": { + "model": "malum:block/runic_tainted_rock_tiles_stairs_outer" }, "facing=east,half=bottom,shape=straight": { "model": "malum:block/runic_tainted_rock_tiles_stairs" }, - "facing=north,half=top,shape=inner_left": { + "facing=east,half=top,shape=inner_left": { "model": "malum:block/runic_tainted_rock_tiles_stairs_inner", - "x": 180, - "y": 270, - "uvlock": true + "uvlock": true, + "x": 180 }, - "facing=south,half=top,shape=inner_left": { + "facing=east,half=top,shape=inner_right": { "model": "malum:block/runic_tainted_rock_tiles_stairs_inner", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 90 }, - "facing=west,half=top,shape=inner_left": { - "model": "malum:block/runic_tainted_rock_tiles_stairs_inner", - "x": 180, - "y": 180, - "uvlock": true + "facing=east,half=top,shape=outer_left": { + "model": "malum:block/runic_tainted_rock_tiles_stairs_outer", + "uvlock": true, + "x": 180 }, - "facing=east,half=top,shape=inner_left": { - "model": "malum:block/runic_tainted_rock_tiles_stairs_inner", + "facing=east,half=top,shape=outer_right": { + "model": "malum:block/runic_tainted_rock_tiles_stairs_outer", + "uvlock": true, "x": 180, - "uvlock": true + "y": 90 + }, + "facing=east,half=top,shape=straight": { + "model": "malum:block/runic_tainted_rock_tiles_stairs", + "uvlock": true, + "x": 180 }, "facing=north,half=bottom,shape=inner_left": { "model": "malum:block/runic_tainted_rock_tiles_stairs_inner", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=south,half=bottom,shape=inner_left": { - "model": "malum:block/runic_tainted_rock_tiles_stairs_inner" - }, - "facing=west,half=bottom,shape=inner_left": { + "facing=north,half=bottom,shape=inner_right": { "model": "malum:block/runic_tainted_rock_tiles_stairs_inner", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 270 }, - "facing=east,half=bottom,shape=inner_left": { - "model": "malum:block/runic_tainted_rock_tiles_stairs_inner", - "y": 270, - "uvlock": true + "facing=north,half=bottom,shape=outer_left": { + "model": "malum:block/runic_tainted_rock_tiles_stairs_outer", + "uvlock": true, + "y": 180 }, - "facing=north,half=top,shape=inner_right": { - "model": "malum:block/runic_tainted_rock_tiles_stairs_inner", - "x": 180, - "uvlock": true + "facing=north,half=bottom,shape=outer_right": { + "model": "malum:block/runic_tainted_rock_tiles_stairs_outer", + "uvlock": true, + "y": 270 }, - "facing=south,half=top,shape=inner_right": { + "facing=north,half=bottom,shape=straight": { + "model": "malum:block/runic_tainted_rock_tiles_stairs", + "uvlock": true, + "y": 270 + }, + "facing=north,half=top,shape=inner_left": { "model": "malum:block/runic_tainted_rock_tiles_stairs_inner", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 270 }, - "facing=west,half=top,shape=inner_right": { + "facing=north,half=top,shape=inner_right": { "model": "malum:block/runic_tainted_rock_tiles_stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=outer_left": { + "model": "malum:block/runic_tainted_rock_tiles_stairs_outer", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 270 }, - "facing=east,half=top,shape=inner_right": { - "model": "malum:block/runic_tainted_rock_tiles_stairs_inner", + "facing=north,half=top,shape=outer_right": { + "model": "malum:block/runic_tainted_rock_tiles_stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=straight": { + "model": "malum:block/runic_tainted_rock_tiles_stairs", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 270 }, - "facing=north,half=bottom,shape=inner_right": { - "model": "malum:block/runic_tainted_rock_tiles_stairs_inner", - "y": 270, - "uvlock": true + "facing=south,half=bottom,shape=inner_left": { + "model": "malum:block/runic_tainted_rock_tiles_stairs_inner" }, "facing=south,half=bottom,shape=inner_right": { "model": "malum:block/runic_tainted_rock_tiles_stairs_inner", - "y": 90, - "uvlock": true - }, - "facing=west,half=bottom,shape=inner_right": { - "model": "malum:block/runic_tainted_rock_tiles_stairs_inner", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 90 }, - "facing=east,half=bottom,shape=inner_right": { - "model": "malum:block/runic_tainted_rock_tiles_stairs_inner" + "facing=south,half=bottom,shape=outer_left": { + "model": "malum:block/runic_tainted_rock_tiles_stairs_outer" }, - "facing=north,half=top,shape=outer_left": { + "facing=south,half=bottom,shape=outer_right": { "model": "malum:block/runic_tainted_rock_tiles_stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=straight": { + "model": "malum:block/runic_tainted_rock_tiles_stairs", + "uvlock": true, + "y": 90 + }, + "facing=south,half=top,shape=inner_left": { + "model": "malum:block/runic_tainted_rock_tiles_stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=inner_right": { + "model": "malum:block/runic_tainted_rock_tiles_stairs_inner", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 180 }, "facing=south,half=top,shape=outer_left": { "model": "malum:block/runic_tainted_rock_tiles_stairs_outer", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 90 }, - "facing=west,half=top,shape=outer_left": { + "facing=south,half=top,shape=outer_right": { "model": "malum:block/runic_tainted_rock_tiles_stairs_outer", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 180 }, - "facing=east,half=top,shape=outer_left": { - "model": "malum:block/runic_tainted_rock_tiles_stairs_outer", + "facing=south,half=top,shape=straight": { + "model": "malum:block/runic_tainted_rock_tiles_stairs", + "uvlock": true, "x": 180, - "uvlock": true + "y": 90 }, - "facing=north,half=bottom,shape=outer_left": { - "model": "malum:block/runic_tainted_rock_tiles_stairs_outer", - "y": 180, - "uvlock": true + "facing=west,half=bottom,shape=inner_left": { + "model": "malum:block/runic_tainted_rock_tiles_stairs_inner", + "uvlock": true, + "y": 90 }, - "facing=south,half=bottom,shape=outer_left": { - "model": "malum:block/runic_tainted_rock_tiles_stairs_outer" + "facing=west,half=bottom,shape=inner_right": { + "model": "malum:block/runic_tainted_rock_tiles_stairs_inner", + "uvlock": true, + "y": 180 }, "facing=west,half=bottom,shape=outer_left": { "model": "malum:block/runic_tainted_rock_tiles_stairs_outer", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 90 }, - "facing=east,half=bottom,shape=outer_left": { + "facing=west,half=bottom,shape=outer_right": { "model": "malum:block/runic_tainted_rock_tiles_stairs_outer", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=north,half=top,shape=outer_right": { - "model": "malum:block/runic_tainted_rock_tiles_stairs_outer", - "x": 180, - "uvlock": true + "facing=west,half=bottom,shape=straight": { + "model": "malum:block/runic_tainted_rock_tiles_stairs", + "uvlock": true, + "y": 180 }, - "facing=south,half=top,shape=outer_right": { - "model": "malum:block/runic_tainted_rock_tiles_stairs_outer", + "facing=west,half=top,shape=inner_left": { + "model": "malum:block/runic_tainted_rock_tiles_stairs_inner", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 180 }, - "facing=west,half=top,shape=outer_right": { - "model": "malum:block/runic_tainted_rock_tiles_stairs_outer", + "facing=west,half=top,shape=inner_right": { + "model": "malum:block/runic_tainted_rock_tiles_stairs_inner", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 270 }, - "facing=east,half=top,shape=outer_right": { + "facing=west,half=top,shape=outer_left": { "model": "malum:block/runic_tainted_rock_tiles_stairs_outer", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true - }, - "facing=north,half=bottom,shape=outer_right": { - "model": "malum:block/runic_tainted_rock_tiles_stairs_outer", - "y": 270, - "uvlock": true - }, - "facing=south,half=bottom,shape=outer_right": { - "model": "malum:block/runic_tainted_rock_tiles_stairs_outer", - "y": 90, - "uvlock": true + "y": 180 }, - "facing=west,half=bottom,shape=outer_right": { + "facing=west,half=top,shape=outer_right": { "model": "malum:block/runic_tainted_rock_tiles_stairs_outer", - "y": 180, - "uvlock": true + "uvlock": true, + "x": 180, + "y": 270 }, - "facing=east,half=bottom,shape=outer_right": { - "model": "malum:block/runic_tainted_rock_tiles_stairs_outer" + "facing=west,half=top,shape=straight": { + "model": "malum:block/runic_tainted_rock_tiles_stairs", + "uvlock": true, + "x": 180, + "y": 180 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/blockstates/runic_tainted_rock_tiles_wall.json b/src/generated/resources/assets/malum/blockstates/runic_tainted_rock_tiles_wall.json index 92fc66d34..791e6b9ce 100644 --- a/src/generated/resources/assets/malum/blockstates/runic_tainted_rock_tiles_wall.json +++ b/src/generated/resources/assets/malum/blockstates/runic_tainted_rock_tiles_wall.json @@ -1,89 +1,89 @@ { "multipart": [ { - "when": { - "up": "true" - }, "apply": { "model": "malum:block/runic_tainted_rock_tiles_wall_post" + }, + "when": { + "up": "true" } }, { - "when": { - "east": "low" - }, "apply": { "model": "malum:block/runic_tainted_rock_tiles_wall_side", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 90 + }, + "when": { + "east": "low" } }, { - "when": { - "east": "tall" - }, "apply": { "model": "malum:block/runic_tainted_rock_tiles_wall_side_tall", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 90 + }, + "when": { + "east": "tall" } }, { - "when": { - "north": "low" - }, "apply": { "model": "malum:block/runic_tainted_rock_tiles_wall_side", "uvlock": true + }, + "when": { + "north": "low" } }, { - "when": { - "north": "tall" - }, "apply": { "model": "malum:block/runic_tainted_rock_tiles_wall_side_tall", "uvlock": true + }, + "when": { + "north": "tall" } }, { - "when": { - "south": "low" - }, "apply": { "model": "malum:block/runic_tainted_rock_tiles_wall_side", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 + }, + "when": { + "south": "low" } }, { - "when": { - "south": "tall" - }, "apply": { "model": "malum:block/runic_tainted_rock_tiles_wall_side_tall", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 + }, + "when": { + "south": "tall" } }, { - "when": { - "west": "low" - }, "apply": { "model": "malum:block/runic_tainted_rock_tiles_wall_side", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 270 + }, + "when": { + "west": "low" } }, { - "when": { - "west": "tall" - }, "apply": { "model": "malum:block/runic_tainted_rock_tiles_wall_side_tall", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 270 + }, + "when": { + "west": "tall" } } ] diff --git a/src/generated/resources/assets/malum/blockstates/runic_twisted_rock_bricks_slab.json b/src/generated/resources/assets/malum/blockstates/runic_twisted_rock_bricks_slab.json index 4b5136c8c..30a8332d9 100644 --- a/src/generated/resources/assets/malum/blockstates/runic_twisted_rock_bricks_slab.json +++ b/src/generated/resources/assets/malum/blockstates/runic_twisted_rock_bricks_slab.json @@ -1,13 +1,13 @@ { "variants": { - "type=top": { - "model": "malum:block/runic_twisted_rock_bricks_slab_top" - }, "type=bottom": { "model": "malum:block/runic_twisted_rock_bricks_slab" }, "type=double": { "model": "malum:block/runic_twisted_rock_bricks" + }, + "type=top": { + "model": "malum:block/runic_twisted_rock_bricks_slab_top" } } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/blockstates/runic_twisted_rock_bricks_stairs.json b/src/generated/resources/assets/malum/blockstates/runic_twisted_rock_bricks_stairs.json index 86d2a3576..66eda91a0 100644 --- a/src/generated/resources/assets/malum/blockstates/runic_twisted_rock_bricks_stairs.json +++ b/src/generated/resources/assets/malum/blockstates/runic_twisted_rock_bricks_stairs.json @@ -1,209 +1,209 @@ { "variants": { - "facing=north,half=top,shape=straight": { - "model": "malum:block/runic_twisted_rock_bricks_stairs", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=south,half=top,shape=straight": { - "model": "malum:block/runic_twisted_rock_bricks_stairs", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=west,half=top,shape=straight": { - "model": "malum:block/runic_twisted_rock_bricks_stairs", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=east,half=top,shape=straight": { - "model": "malum:block/runic_twisted_rock_bricks_stairs", - "x": 180, - "uvlock": true + "facing=east,half=bottom,shape=inner_left": { + "model": "malum:block/runic_twisted_rock_bricks_stairs_inner", + "uvlock": true, + "y": 270 }, - "facing=north,half=bottom,shape=straight": { - "model": "malum:block/runic_twisted_rock_bricks_stairs", - "y": 270, - "uvlock": true + "facing=east,half=bottom,shape=inner_right": { + "model": "malum:block/runic_twisted_rock_bricks_stairs_inner" }, - "facing=south,half=bottom,shape=straight": { - "model": "malum:block/runic_twisted_rock_bricks_stairs", - "y": 90, - "uvlock": true + "facing=east,half=bottom,shape=outer_left": { + "model": "malum:block/runic_twisted_rock_bricks_stairs_outer", + "uvlock": true, + "y": 270 }, - "facing=west,half=bottom,shape=straight": { - "model": "malum:block/runic_twisted_rock_bricks_stairs", - "y": 180, - "uvlock": true + "facing=east,half=bottom,shape=outer_right": { + "model": "malum:block/runic_twisted_rock_bricks_stairs_outer" }, "facing=east,half=bottom,shape=straight": { "model": "malum:block/runic_twisted_rock_bricks_stairs" }, - "facing=north,half=top,shape=inner_left": { + "facing=east,half=top,shape=inner_left": { "model": "malum:block/runic_twisted_rock_bricks_stairs_inner", - "x": 180, - "y": 270, - "uvlock": true + "uvlock": true, + "x": 180 }, - "facing=south,half=top,shape=inner_left": { + "facing=east,half=top,shape=inner_right": { "model": "malum:block/runic_twisted_rock_bricks_stairs_inner", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 90 }, - "facing=west,half=top,shape=inner_left": { - "model": "malum:block/runic_twisted_rock_bricks_stairs_inner", - "x": 180, - "y": 180, - "uvlock": true + "facing=east,half=top,shape=outer_left": { + "model": "malum:block/runic_twisted_rock_bricks_stairs_outer", + "uvlock": true, + "x": 180 }, - "facing=east,half=top,shape=inner_left": { - "model": "malum:block/runic_twisted_rock_bricks_stairs_inner", + "facing=east,half=top,shape=outer_right": { + "model": "malum:block/runic_twisted_rock_bricks_stairs_outer", + "uvlock": true, "x": 180, - "uvlock": true + "y": 90 + }, + "facing=east,half=top,shape=straight": { + "model": "malum:block/runic_twisted_rock_bricks_stairs", + "uvlock": true, + "x": 180 }, "facing=north,half=bottom,shape=inner_left": { "model": "malum:block/runic_twisted_rock_bricks_stairs_inner", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=south,half=bottom,shape=inner_left": { - "model": "malum:block/runic_twisted_rock_bricks_stairs_inner" - }, - "facing=west,half=bottom,shape=inner_left": { + "facing=north,half=bottom,shape=inner_right": { "model": "malum:block/runic_twisted_rock_bricks_stairs_inner", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 270 }, - "facing=east,half=bottom,shape=inner_left": { - "model": "malum:block/runic_twisted_rock_bricks_stairs_inner", - "y": 270, - "uvlock": true + "facing=north,half=bottom,shape=outer_left": { + "model": "malum:block/runic_twisted_rock_bricks_stairs_outer", + "uvlock": true, + "y": 180 }, - "facing=north,half=top,shape=inner_right": { - "model": "malum:block/runic_twisted_rock_bricks_stairs_inner", - "x": 180, - "uvlock": true + "facing=north,half=bottom,shape=outer_right": { + "model": "malum:block/runic_twisted_rock_bricks_stairs_outer", + "uvlock": true, + "y": 270 }, - "facing=south,half=top,shape=inner_right": { + "facing=north,half=bottom,shape=straight": { + "model": "malum:block/runic_twisted_rock_bricks_stairs", + "uvlock": true, + "y": 270 + }, + "facing=north,half=top,shape=inner_left": { "model": "malum:block/runic_twisted_rock_bricks_stairs_inner", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 270 }, - "facing=west,half=top,shape=inner_right": { + "facing=north,half=top,shape=inner_right": { "model": "malum:block/runic_twisted_rock_bricks_stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=outer_left": { + "model": "malum:block/runic_twisted_rock_bricks_stairs_outer", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 270 }, - "facing=east,half=top,shape=inner_right": { - "model": "malum:block/runic_twisted_rock_bricks_stairs_inner", + "facing=north,half=top,shape=outer_right": { + "model": "malum:block/runic_twisted_rock_bricks_stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=straight": { + "model": "malum:block/runic_twisted_rock_bricks_stairs", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 270 }, - "facing=north,half=bottom,shape=inner_right": { - "model": "malum:block/runic_twisted_rock_bricks_stairs_inner", - "y": 270, - "uvlock": true + "facing=south,half=bottom,shape=inner_left": { + "model": "malum:block/runic_twisted_rock_bricks_stairs_inner" }, "facing=south,half=bottom,shape=inner_right": { "model": "malum:block/runic_twisted_rock_bricks_stairs_inner", - "y": 90, - "uvlock": true - }, - "facing=west,half=bottom,shape=inner_right": { - "model": "malum:block/runic_twisted_rock_bricks_stairs_inner", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 90 }, - "facing=east,half=bottom,shape=inner_right": { - "model": "malum:block/runic_twisted_rock_bricks_stairs_inner" + "facing=south,half=bottom,shape=outer_left": { + "model": "malum:block/runic_twisted_rock_bricks_stairs_outer" }, - "facing=north,half=top,shape=outer_left": { + "facing=south,half=bottom,shape=outer_right": { "model": "malum:block/runic_twisted_rock_bricks_stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=straight": { + "model": "malum:block/runic_twisted_rock_bricks_stairs", + "uvlock": true, + "y": 90 + }, + "facing=south,half=top,shape=inner_left": { + "model": "malum:block/runic_twisted_rock_bricks_stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=inner_right": { + "model": "malum:block/runic_twisted_rock_bricks_stairs_inner", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 180 }, "facing=south,half=top,shape=outer_left": { "model": "malum:block/runic_twisted_rock_bricks_stairs_outer", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 90 }, - "facing=west,half=top,shape=outer_left": { + "facing=south,half=top,shape=outer_right": { "model": "malum:block/runic_twisted_rock_bricks_stairs_outer", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 180 }, - "facing=east,half=top,shape=outer_left": { - "model": "malum:block/runic_twisted_rock_bricks_stairs_outer", + "facing=south,half=top,shape=straight": { + "model": "malum:block/runic_twisted_rock_bricks_stairs", + "uvlock": true, "x": 180, - "uvlock": true + "y": 90 }, - "facing=north,half=bottom,shape=outer_left": { - "model": "malum:block/runic_twisted_rock_bricks_stairs_outer", - "y": 180, - "uvlock": true + "facing=west,half=bottom,shape=inner_left": { + "model": "malum:block/runic_twisted_rock_bricks_stairs_inner", + "uvlock": true, + "y": 90 }, - "facing=south,half=bottom,shape=outer_left": { - "model": "malum:block/runic_twisted_rock_bricks_stairs_outer" + "facing=west,half=bottom,shape=inner_right": { + "model": "malum:block/runic_twisted_rock_bricks_stairs_inner", + "uvlock": true, + "y": 180 }, "facing=west,half=bottom,shape=outer_left": { "model": "malum:block/runic_twisted_rock_bricks_stairs_outer", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 90 }, - "facing=east,half=bottom,shape=outer_left": { + "facing=west,half=bottom,shape=outer_right": { "model": "malum:block/runic_twisted_rock_bricks_stairs_outer", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=north,half=top,shape=outer_right": { - "model": "malum:block/runic_twisted_rock_bricks_stairs_outer", - "x": 180, - "uvlock": true + "facing=west,half=bottom,shape=straight": { + "model": "malum:block/runic_twisted_rock_bricks_stairs", + "uvlock": true, + "y": 180 }, - "facing=south,half=top,shape=outer_right": { - "model": "malum:block/runic_twisted_rock_bricks_stairs_outer", + "facing=west,half=top,shape=inner_left": { + "model": "malum:block/runic_twisted_rock_bricks_stairs_inner", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 180 }, - "facing=west,half=top,shape=outer_right": { - "model": "malum:block/runic_twisted_rock_bricks_stairs_outer", + "facing=west,half=top,shape=inner_right": { + "model": "malum:block/runic_twisted_rock_bricks_stairs_inner", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 270 }, - "facing=east,half=top,shape=outer_right": { + "facing=west,half=top,shape=outer_left": { "model": "malum:block/runic_twisted_rock_bricks_stairs_outer", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true - }, - "facing=north,half=bottom,shape=outer_right": { - "model": "malum:block/runic_twisted_rock_bricks_stairs_outer", - "y": 270, - "uvlock": true - }, - "facing=south,half=bottom,shape=outer_right": { - "model": "malum:block/runic_twisted_rock_bricks_stairs_outer", - "y": 90, - "uvlock": true + "y": 180 }, - "facing=west,half=bottom,shape=outer_right": { + "facing=west,half=top,shape=outer_right": { "model": "malum:block/runic_twisted_rock_bricks_stairs_outer", - "y": 180, - "uvlock": true + "uvlock": true, + "x": 180, + "y": 270 }, - "facing=east,half=bottom,shape=outer_right": { - "model": "malum:block/runic_twisted_rock_bricks_stairs_outer" + "facing=west,half=top,shape=straight": { + "model": "malum:block/runic_twisted_rock_bricks_stairs", + "uvlock": true, + "x": 180, + "y": 180 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/blockstates/runic_twisted_rock_bricks_wall.json b/src/generated/resources/assets/malum/blockstates/runic_twisted_rock_bricks_wall.json index c0a3d65d2..3de0fb489 100644 --- a/src/generated/resources/assets/malum/blockstates/runic_twisted_rock_bricks_wall.json +++ b/src/generated/resources/assets/malum/blockstates/runic_twisted_rock_bricks_wall.json @@ -1,89 +1,89 @@ { "multipart": [ { - "when": { - "up": "true" - }, "apply": { "model": "malum:block/runic_twisted_rock_bricks_wall_post" + }, + "when": { + "up": "true" } }, { - "when": { - "east": "low" - }, "apply": { "model": "malum:block/runic_twisted_rock_bricks_wall_side", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 90 + }, + "when": { + "east": "low" } }, { - "when": { - "east": "tall" - }, "apply": { "model": "malum:block/runic_twisted_rock_bricks_wall_side_tall", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 90 + }, + "when": { + "east": "tall" } }, { - "when": { - "north": "low" - }, "apply": { "model": "malum:block/runic_twisted_rock_bricks_wall_side", "uvlock": true + }, + "when": { + "north": "low" } }, { - "when": { - "north": "tall" - }, "apply": { "model": "malum:block/runic_twisted_rock_bricks_wall_side_tall", "uvlock": true + }, + "when": { + "north": "tall" } }, { - "when": { - "south": "low" - }, "apply": { "model": "malum:block/runic_twisted_rock_bricks_wall_side", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 + }, + "when": { + "south": "low" } }, { - "when": { - "south": "tall" - }, "apply": { "model": "malum:block/runic_twisted_rock_bricks_wall_side_tall", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 + }, + "when": { + "south": "tall" } }, { - "when": { - "west": "low" - }, "apply": { "model": "malum:block/runic_twisted_rock_bricks_wall_side", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 270 + }, + "when": { + "west": "low" } }, { - "when": { - "west": "tall" - }, "apply": { "model": "malum:block/runic_twisted_rock_bricks_wall_side_tall", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 270 + }, + "when": { + "west": "tall" } } ] diff --git a/src/generated/resources/assets/malum/blockstates/runic_twisted_rock_tiles_slab.json b/src/generated/resources/assets/malum/blockstates/runic_twisted_rock_tiles_slab.json index 05e2b3fea..d1c639b3f 100644 --- a/src/generated/resources/assets/malum/blockstates/runic_twisted_rock_tiles_slab.json +++ b/src/generated/resources/assets/malum/blockstates/runic_twisted_rock_tiles_slab.json @@ -1,13 +1,13 @@ { "variants": { - "type=top": { - "model": "malum:block/runic_twisted_rock_tiles_slab_top" - }, "type=bottom": { "model": "malum:block/runic_twisted_rock_tiles_slab" }, "type=double": { "model": "malum:block/runic_twisted_rock_tiles" + }, + "type=top": { + "model": "malum:block/runic_twisted_rock_tiles_slab_top" } } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/blockstates/runic_twisted_rock_tiles_stairs.json b/src/generated/resources/assets/malum/blockstates/runic_twisted_rock_tiles_stairs.json index ff2791ef5..7c479f28c 100644 --- a/src/generated/resources/assets/malum/blockstates/runic_twisted_rock_tiles_stairs.json +++ b/src/generated/resources/assets/malum/blockstates/runic_twisted_rock_tiles_stairs.json @@ -1,209 +1,209 @@ { "variants": { - "facing=north,half=top,shape=straight": { - "model": "malum:block/runic_twisted_rock_tiles_stairs", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=south,half=top,shape=straight": { - "model": "malum:block/runic_twisted_rock_tiles_stairs", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=west,half=top,shape=straight": { - "model": "malum:block/runic_twisted_rock_tiles_stairs", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=east,half=top,shape=straight": { - "model": "malum:block/runic_twisted_rock_tiles_stairs", - "x": 180, - "uvlock": true + "facing=east,half=bottom,shape=inner_left": { + "model": "malum:block/runic_twisted_rock_tiles_stairs_inner", + "uvlock": true, + "y": 270 }, - "facing=north,half=bottom,shape=straight": { - "model": "malum:block/runic_twisted_rock_tiles_stairs", - "y": 270, - "uvlock": true + "facing=east,half=bottom,shape=inner_right": { + "model": "malum:block/runic_twisted_rock_tiles_stairs_inner" }, - "facing=south,half=bottom,shape=straight": { - "model": "malum:block/runic_twisted_rock_tiles_stairs", - "y": 90, - "uvlock": true + "facing=east,half=bottom,shape=outer_left": { + "model": "malum:block/runic_twisted_rock_tiles_stairs_outer", + "uvlock": true, + "y": 270 }, - "facing=west,half=bottom,shape=straight": { - "model": "malum:block/runic_twisted_rock_tiles_stairs", - "y": 180, - "uvlock": true + "facing=east,half=bottom,shape=outer_right": { + "model": "malum:block/runic_twisted_rock_tiles_stairs_outer" }, "facing=east,half=bottom,shape=straight": { "model": "malum:block/runic_twisted_rock_tiles_stairs" }, - "facing=north,half=top,shape=inner_left": { + "facing=east,half=top,shape=inner_left": { "model": "malum:block/runic_twisted_rock_tiles_stairs_inner", - "x": 180, - "y": 270, - "uvlock": true + "uvlock": true, + "x": 180 }, - "facing=south,half=top,shape=inner_left": { + "facing=east,half=top,shape=inner_right": { "model": "malum:block/runic_twisted_rock_tiles_stairs_inner", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 90 }, - "facing=west,half=top,shape=inner_left": { - "model": "malum:block/runic_twisted_rock_tiles_stairs_inner", - "x": 180, - "y": 180, - "uvlock": true + "facing=east,half=top,shape=outer_left": { + "model": "malum:block/runic_twisted_rock_tiles_stairs_outer", + "uvlock": true, + "x": 180 }, - "facing=east,half=top,shape=inner_left": { - "model": "malum:block/runic_twisted_rock_tiles_stairs_inner", + "facing=east,half=top,shape=outer_right": { + "model": "malum:block/runic_twisted_rock_tiles_stairs_outer", + "uvlock": true, "x": 180, - "uvlock": true + "y": 90 + }, + "facing=east,half=top,shape=straight": { + "model": "malum:block/runic_twisted_rock_tiles_stairs", + "uvlock": true, + "x": 180 }, "facing=north,half=bottom,shape=inner_left": { "model": "malum:block/runic_twisted_rock_tiles_stairs_inner", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=south,half=bottom,shape=inner_left": { - "model": "malum:block/runic_twisted_rock_tiles_stairs_inner" - }, - "facing=west,half=bottom,shape=inner_left": { + "facing=north,half=bottom,shape=inner_right": { "model": "malum:block/runic_twisted_rock_tiles_stairs_inner", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 270 }, - "facing=east,half=bottom,shape=inner_left": { - "model": "malum:block/runic_twisted_rock_tiles_stairs_inner", - "y": 270, - "uvlock": true + "facing=north,half=bottom,shape=outer_left": { + "model": "malum:block/runic_twisted_rock_tiles_stairs_outer", + "uvlock": true, + "y": 180 }, - "facing=north,half=top,shape=inner_right": { - "model": "malum:block/runic_twisted_rock_tiles_stairs_inner", - "x": 180, - "uvlock": true + "facing=north,half=bottom,shape=outer_right": { + "model": "malum:block/runic_twisted_rock_tiles_stairs_outer", + "uvlock": true, + "y": 270 }, - "facing=south,half=top,shape=inner_right": { + "facing=north,half=bottom,shape=straight": { + "model": "malum:block/runic_twisted_rock_tiles_stairs", + "uvlock": true, + "y": 270 + }, + "facing=north,half=top,shape=inner_left": { "model": "malum:block/runic_twisted_rock_tiles_stairs_inner", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 270 }, - "facing=west,half=top,shape=inner_right": { + "facing=north,half=top,shape=inner_right": { "model": "malum:block/runic_twisted_rock_tiles_stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=outer_left": { + "model": "malum:block/runic_twisted_rock_tiles_stairs_outer", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 270 }, - "facing=east,half=top,shape=inner_right": { - "model": "malum:block/runic_twisted_rock_tiles_stairs_inner", + "facing=north,half=top,shape=outer_right": { + "model": "malum:block/runic_twisted_rock_tiles_stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=straight": { + "model": "malum:block/runic_twisted_rock_tiles_stairs", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 270 }, - "facing=north,half=bottom,shape=inner_right": { - "model": "malum:block/runic_twisted_rock_tiles_stairs_inner", - "y": 270, - "uvlock": true + "facing=south,half=bottom,shape=inner_left": { + "model": "malum:block/runic_twisted_rock_tiles_stairs_inner" }, "facing=south,half=bottom,shape=inner_right": { "model": "malum:block/runic_twisted_rock_tiles_stairs_inner", - "y": 90, - "uvlock": true - }, - "facing=west,half=bottom,shape=inner_right": { - "model": "malum:block/runic_twisted_rock_tiles_stairs_inner", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 90 }, - "facing=east,half=bottom,shape=inner_right": { - "model": "malum:block/runic_twisted_rock_tiles_stairs_inner" + "facing=south,half=bottom,shape=outer_left": { + "model": "malum:block/runic_twisted_rock_tiles_stairs_outer" }, - "facing=north,half=top,shape=outer_left": { + "facing=south,half=bottom,shape=outer_right": { "model": "malum:block/runic_twisted_rock_tiles_stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=straight": { + "model": "malum:block/runic_twisted_rock_tiles_stairs", + "uvlock": true, + "y": 90 + }, + "facing=south,half=top,shape=inner_left": { + "model": "malum:block/runic_twisted_rock_tiles_stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=inner_right": { + "model": "malum:block/runic_twisted_rock_tiles_stairs_inner", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 180 }, "facing=south,half=top,shape=outer_left": { "model": "malum:block/runic_twisted_rock_tiles_stairs_outer", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 90 }, - "facing=west,half=top,shape=outer_left": { + "facing=south,half=top,shape=outer_right": { "model": "malum:block/runic_twisted_rock_tiles_stairs_outer", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 180 }, - "facing=east,half=top,shape=outer_left": { - "model": "malum:block/runic_twisted_rock_tiles_stairs_outer", + "facing=south,half=top,shape=straight": { + "model": "malum:block/runic_twisted_rock_tiles_stairs", + "uvlock": true, "x": 180, - "uvlock": true + "y": 90 }, - "facing=north,half=bottom,shape=outer_left": { - "model": "malum:block/runic_twisted_rock_tiles_stairs_outer", - "y": 180, - "uvlock": true + "facing=west,half=bottom,shape=inner_left": { + "model": "malum:block/runic_twisted_rock_tiles_stairs_inner", + "uvlock": true, + "y": 90 }, - "facing=south,half=bottom,shape=outer_left": { - "model": "malum:block/runic_twisted_rock_tiles_stairs_outer" + "facing=west,half=bottom,shape=inner_right": { + "model": "malum:block/runic_twisted_rock_tiles_stairs_inner", + "uvlock": true, + "y": 180 }, "facing=west,half=bottom,shape=outer_left": { "model": "malum:block/runic_twisted_rock_tiles_stairs_outer", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 90 }, - "facing=east,half=bottom,shape=outer_left": { + "facing=west,half=bottom,shape=outer_right": { "model": "malum:block/runic_twisted_rock_tiles_stairs_outer", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=north,half=top,shape=outer_right": { - "model": "malum:block/runic_twisted_rock_tiles_stairs_outer", - "x": 180, - "uvlock": true + "facing=west,half=bottom,shape=straight": { + "model": "malum:block/runic_twisted_rock_tiles_stairs", + "uvlock": true, + "y": 180 }, - "facing=south,half=top,shape=outer_right": { - "model": "malum:block/runic_twisted_rock_tiles_stairs_outer", + "facing=west,half=top,shape=inner_left": { + "model": "malum:block/runic_twisted_rock_tiles_stairs_inner", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 180 }, - "facing=west,half=top,shape=outer_right": { - "model": "malum:block/runic_twisted_rock_tiles_stairs_outer", + "facing=west,half=top,shape=inner_right": { + "model": "malum:block/runic_twisted_rock_tiles_stairs_inner", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 270 }, - "facing=east,half=top,shape=outer_right": { + "facing=west,half=top,shape=outer_left": { "model": "malum:block/runic_twisted_rock_tiles_stairs_outer", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true - }, - "facing=north,half=bottom,shape=outer_right": { - "model": "malum:block/runic_twisted_rock_tiles_stairs_outer", - "y": 270, - "uvlock": true - }, - "facing=south,half=bottom,shape=outer_right": { - "model": "malum:block/runic_twisted_rock_tiles_stairs_outer", - "y": 90, - "uvlock": true + "y": 180 }, - "facing=west,half=bottom,shape=outer_right": { + "facing=west,half=top,shape=outer_right": { "model": "malum:block/runic_twisted_rock_tiles_stairs_outer", - "y": 180, - "uvlock": true + "uvlock": true, + "x": 180, + "y": 270 }, - "facing=east,half=bottom,shape=outer_right": { - "model": "malum:block/runic_twisted_rock_tiles_stairs_outer" + "facing=west,half=top,shape=straight": { + "model": "malum:block/runic_twisted_rock_tiles_stairs", + "uvlock": true, + "x": 180, + "y": 180 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/blockstates/runic_twisted_rock_tiles_wall.json b/src/generated/resources/assets/malum/blockstates/runic_twisted_rock_tiles_wall.json index e85001af1..886f6f721 100644 --- a/src/generated/resources/assets/malum/blockstates/runic_twisted_rock_tiles_wall.json +++ b/src/generated/resources/assets/malum/blockstates/runic_twisted_rock_tiles_wall.json @@ -1,89 +1,89 @@ { "multipart": [ { - "when": { - "up": "true" - }, "apply": { "model": "malum:block/runic_twisted_rock_tiles_wall_post" + }, + "when": { + "up": "true" } }, { - "when": { - "east": "low" - }, "apply": { "model": "malum:block/runic_twisted_rock_tiles_wall_side", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 90 + }, + "when": { + "east": "low" } }, { - "when": { - "east": "tall" - }, "apply": { "model": "malum:block/runic_twisted_rock_tiles_wall_side_tall", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 90 + }, + "when": { + "east": "tall" } }, { - "when": { - "north": "low" - }, "apply": { "model": "malum:block/runic_twisted_rock_tiles_wall_side", "uvlock": true + }, + "when": { + "north": "low" } }, { - "when": { - "north": "tall" - }, "apply": { "model": "malum:block/runic_twisted_rock_tiles_wall_side_tall", "uvlock": true + }, + "when": { + "north": "tall" } }, { - "when": { - "south": "low" - }, "apply": { "model": "malum:block/runic_twisted_rock_tiles_wall_side", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 + }, + "when": { + "south": "low" } }, { - "when": { - "south": "tall" - }, "apply": { "model": "malum:block/runic_twisted_rock_tiles_wall_side_tall", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 + }, + "when": { + "south": "tall" } }, { - "when": { - "west": "low" - }, "apply": { "model": "malum:block/runic_twisted_rock_tiles_wall_side", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 270 + }, + "when": { + "west": "low" } }, { - "when": { - "west": "tall" - }, "apply": { "model": "malum:block/runic_twisted_rock_tiles_wall_side_tall", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 270 + }, + "when": { + "west": "tall" } } ] diff --git a/src/generated/resources/assets/malum/blockstates/small_tainted_rock_bricks_slab.json b/src/generated/resources/assets/malum/blockstates/small_tainted_rock_bricks_slab.json index 4c7ee7f9d..5a532b778 100644 --- a/src/generated/resources/assets/malum/blockstates/small_tainted_rock_bricks_slab.json +++ b/src/generated/resources/assets/malum/blockstates/small_tainted_rock_bricks_slab.json @@ -1,13 +1,13 @@ { "variants": { - "type=top": { - "model": "malum:block/small_tainted_rock_bricks_slab_top" - }, "type=bottom": { "model": "malum:block/small_tainted_rock_bricks_slab" }, "type=double": { "model": "malum:block/small_tainted_rock_bricks" + }, + "type=top": { + "model": "malum:block/small_tainted_rock_bricks_slab_top" } } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/blockstates/small_tainted_rock_bricks_stairs.json b/src/generated/resources/assets/malum/blockstates/small_tainted_rock_bricks_stairs.json index 0bbebc1de..cd8b747b7 100644 --- a/src/generated/resources/assets/malum/blockstates/small_tainted_rock_bricks_stairs.json +++ b/src/generated/resources/assets/malum/blockstates/small_tainted_rock_bricks_stairs.json @@ -1,209 +1,209 @@ { "variants": { - "facing=north,half=top,shape=straight": { - "model": "malum:block/small_tainted_rock_bricks_stairs", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=south,half=top,shape=straight": { - "model": "malum:block/small_tainted_rock_bricks_stairs", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=west,half=top,shape=straight": { - "model": "malum:block/small_tainted_rock_bricks_stairs", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=east,half=top,shape=straight": { - "model": "malum:block/small_tainted_rock_bricks_stairs", - "x": 180, - "uvlock": true + "facing=east,half=bottom,shape=inner_left": { + "model": "malum:block/small_tainted_rock_bricks_stairs_inner", + "uvlock": true, + "y": 270 }, - "facing=north,half=bottom,shape=straight": { - "model": "malum:block/small_tainted_rock_bricks_stairs", - "y": 270, - "uvlock": true + "facing=east,half=bottom,shape=inner_right": { + "model": "malum:block/small_tainted_rock_bricks_stairs_inner" }, - "facing=south,half=bottom,shape=straight": { - "model": "malum:block/small_tainted_rock_bricks_stairs", - "y": 90, - "uvlock": true + "facing=east,half=bottom,shape=outer_left": { + "model": "malum:block/small_tainted_rock_bricks_stairs_outer", + "uvlock": true, + "y": 270 }, - "facing=west,half=bottom,shape=straight": { - "model": "malum:block/small_tainted_rock_bricks_stairs", - "y": 180, - "uvlock": true + "facing=east,half=bottom,shape=outer_right": { + "model": "malum:block/small_tainted_rock_bricks_stairs_outer" }, "facing=east,half=bottom,shape=straight": { "model": "malum:block/small_tainted_rock_bricks_stairs" }, - "facing=north,half=top,shape=inner_left": { + "facing=east,half=top,shape=inner_left": { "model": "malum:block/small_tainted_rock_bricks_stairs_inner", - "x": 180, - "y": 270, - "uvlock": true + "uvlock": true, + "x": 180 }, - "facing=south,half=top,shape=inner_left": { + "facing=east,half=top,shape=inner_right": { "model": "malum:block/small_tainted_rock_bricks_stairs_inner", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 90 }, - "facing=west,half=top,shape=inner_left": { - "model": "malum:block/small_tainted_rock_bricks_stairs_inner", - "x": 180, - "y": 180, - "uvlock": true + "facing=east,half=top,shape=outer_left": { + "model": "malum:block/small_tainted_rock_bricks_stairs_outer", + "uvlock": true, + "x": 180 }, - "facing=east,half=top,shape=inner_left": { - "model": "malum:block/small_tainted_rock_bricks_stairs_inner", + "facing=east,half=top,shape=outer_right": { + "model": "malum:block/small_tainted_rock_bricks_stairs_outer", + "uvlock": true, "x": 180, - "uvlock": true + "y": 90 + }, + "facing=east,half=top,shape=straight": { + "model": "malum:block/small_tainted_rock_bricks_stairs", + "uvlock": true, + "x": 180 }, "facing=north,half=bottom,shape=inner_left": { "model": "malum:block/small_tainted_rock_bricks_stairs_inner", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=south,half=bottom,shape=inner_left": { - "model": "malum:block/small_tainted_rock_bricks_stairs_inner" - }, - "facing=west,half=bottom,shape=inner_left": { + "facing=north,half=bottom,shape=inner_right": { "model": "malum:block/small_tainted_rock_bricks_stairs_inner", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 270 }, - "facing=east,half=bottom,shape=inner_left": { - "model": "malum:block/small_tainted_rock_bricks_stairs_inner", - "y": 270, - "uvlock": true + "facing=north,half=bottom,shape=outer_left": { + "model": "malum:block/small_tainted_rock_bricks_stairs_outer", + "uvlock": true, + "y": 180 }, - "facing=north,half=top,shape=inner_right": { - "model": "malum:block/small_tainted_rock_bricks_stairs_inner", - "x": 180, - "uvlock": true + "facing=north,half=bottom,shape=outer_right": { + "model": "malum:block/small_tainted_rock_bricks_stairs_outer", + "uvlock": true, + "y": 270 }, - "facing=south,half=top,shape=inner_right": { + "facing=north,half=bottom,shape=straight": { + "model": "malum:block/small_tainted_rock_bricks_stairs", + "uvlock": true, + "y": 270 + }, + "facing=north,half=top,shape=inner_left": { "model": "malum:block/small_tainted_rock_bricks_stairs_inner", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 270 }, - "facing=west,half=top,shape=inner_right": { + "facing=north,half=top,shape=inner_right": { "model": "malum:block/small_tainted_rock_bricks_stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=outer_left": { + "model": "malum:block/small_tainted_rock_bricks_stairs_outer", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 270 }, - "facing=east,half=top,shape=inner_right": { - "model": "malum:block/small_tainted_rock_bricks_stairs_inner", + "facing=north,half=top,shape=outer_right": { + "model": "malum:block/small_tainted_rock_bricks_stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=straight": { + "model": "malum:block/small_tainted_rock_bricks_stairs", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 270 }, - "facing=north,half=bottom,shape=inner_right": { - "model": "malum:block/small_tainted_rock_bricks_stairs_inner", - "y": 270, - "uvlock": true + "facing=south,half=bottom,shape=inner_left": { + "model": "malum:block/small_tainted_rock_bricks_stairs_inner" }, "facing=south,half=bottom,shape=inner_right": { "model": "malum:block/small_tainted_rock_bricks_stairs_inner", - "y": 90, - "uvlock": true - }, - "facing=west,half=bottom,shape=inner_right": { - "model": "malum:block/small_tainted_rock_bricks_stairs_inner", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 90 }, - "facing=east,half=bottom,shape=inner_right": { - "model": "malum:block/small_tainted_rock_bricks_stairs_inner" + "facing=south,half=bottom,shape=outer_left": { + "model": "malum:block/small_tainted_rock_bricks_stairs_outer" }, - "facing=north,half=top,shape=outer_left": { + "facing=south,half=bottom,shape=outer_right": { "model": "malum:block/small_tainted_rock_bricks_stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=straight": { + "model": "malum:block/small_tainted_rock_bricks_stairs", + "uvlock": true, + "y": 90 + }, + "facing=south,half=top,shape=inner_left": { + "model": "malum:block/small_tainted_rock_bricks_stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=inner_right": { + "model": "malum:block/small_tainted_rock_bricks_stairs_inner", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 180 }, "facing=south,half=top,shape=outer_left": { "model": "malum:block/small_tainted_rock_bricks_stairs_outer", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 90 }, - "facing=west,half=top,shape=outer_left": { + "facing=south,half=top,shape=outer_right": { "model": "malum:block/small_tainted_rock_bricks_stairs_outer", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 180 }, - "facing=east,half=top,shape=outer_left": { - "model": "malum:block/small_tainted_rock_bricks_stairs_outer", + "facing=south,half=top,shape=straight": { + "model": "malum:block/small_tainted_rock_bricks_stairs", + "uvlock": true, "x": 180, - "uvlock": true + "y": 90 }, - "facing=north,half=bottom,shape=outer_left": { - "model": "malum:block/small_tainted_rock_bricks_stairs_outer", - "y": 180, - "uvlock": true + "facing=west,half=bottom,shape=inner_left": { + "model": "malum:block/small_tainted_rock_bricks_stairs_inner", + "uvlock": true, + "y": 90 }, - "facing=south,half=bottom,shape=outer_left": { - "model": "malum:block/small_tainted_rock_bricks_stairs_outer" + "facing=west,half=bottom,shape=inner_right": { + "model": "malum:block/small_tainted_rock_bricks_stairs_inner", + "uvlock": true, + "y": 180 }, "facing=west,half=bottom,shape=outer_left": { "model": "malum:block/small_tainted_rock_bricks_stairs_outer", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 90 }, - "facing=east,half=bottom,shape=outer_left": { + "facing=west,half=bottom,shape=outer_right": { "model": "malum:block/small_tainted_rock_bricks_stairs_outer", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=north,half=top,shape=outer_right": { - "model": "malum:block/small_tainted_rock_bricks_stairs_outer", - "x": 180, - "uvlock": true + "facing=west,half=bottom,shape=straight": { + "model": "malum:block/small_tainted_rock_bricks_stairs", + "uvlock": true, + "y": 180 }, - "facing=south,half=top,shape=outer_right": { - "model": "malum:block/small_tainted_rock_bricks_stairs_outer", + "facing=west,half=top,shape=inner_left": { + "model": "malum:block/small_tainted_rock_bricks_stairs_inner", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 180 }, - "facing=west,half=top,shape=outer_right": { - "model": "malum:block/small_tainted_rock_bricks_stairs_outer", + "facing=west,half=top,shape=inner_right": { + "model": "malum:block/small_tainted_rock_bricks_stairs_inner", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 270 }, - "facing=east,half=top,shape=outer_right": { + "facing=west,half=top,shape=outer_left": { "model": "malum:block/small_tainted_rock_bricks_stairs_outer", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true - }, - "facing=north,half=bottom,shape=outer_right": { - "model": "malum:block/small_tainted_rock_bricks_stairs_outer", - "y": 270, - "uvlock": true - }, - "facing=south,half=bottom,shape=outer_right": { - "model": "malum:block/small_tainted_rock_bricks_stairs_outer", - "y": 90, - "uvlock": true + "y": 180 }, - "facing=west,half=bottom,shape=outer_right": { + "facing=west,half=top,shape=outer_right": { "model": "malum:block/small_tainted_rock_bricks_stairs_outer", - "y": 180, - "uvlock": true + "uvlock": true, + "x": 180, + "y": 270 }, - "facing=east,half=bottom,shape=outer_right": { - "model": "malum:block/small_tainted_rock_bricks_stairs_outer" + "facing=west,half=top,shape=straight": { + "model": "malum:block/small_tainted_rock_bricks_stairs", + "uvlock": true, + "x": 180, + "y": 180 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/blockstates/small_tainted_rock_bricks_wall.json b/src/generated/resources/assets/malum/blockstates/small_tainted_rock_bricks_wall.json index ab7730a53..d7d397b56 100644 --- a/src/generated/resources/assets/malum/blockstates/small_tainted_rock_bricks_wall.json +++ b/src/generated/resources/assets/malum/blockstates/small_tainted_rock_bricks_wall.json @@ -1,89 +1,89 @@ { "multipart": [ { - "when": { - "up": "true" - }, "apply": { "model": "malum:block/small_tainted_rock_bricks_wall_post" + }, + "when": { + "up": "true" } }, { - "when": { - "east": "low" - }, "apply": { "model": "malum:block/small_tainted_rock_bricks_wall_side", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 90 + }, + "when": { + "east": "low" } }, { - "when": { - "east": "tall" - }, "apply": { "model": "malum:block/small_tainted_rock_bricks_wall_side_tall", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 90 + }, + "when": { + "east": "tall" } }, { - "when": { - "north": "low" - }, "apply": { "model": "malum:block/small_tainted_rock_bricks_wall_side", "uvlock": true + }, + "when": { + "north": "low" } }, { - "when": { - "north": "tall" - }, "apply": { "model": "malum:block/small_tainted_rock_bricks_wall_side_tall", "uvlock": true + }, + "when": { + "north": "tall" } }, { - "when": { - "south": "low" - }, "apply": { "model": "malum:block/small_tainted_rock_bricks_wall_side", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 + }, + "when": { + "south": "low" } }, { - "when": { - "south": "tall" - }, "apply": { "model": "malum:block/small_tainted_rock_bricks_wall_side_tall", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 + }, + "when": { + "south": "tall" } }, { - "when": { - "west": "low" - }, "apply": { "model": "malum:block/small_tainted_rock_bricks_wall_side", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 270 + }, + "when": { + "west": "low" } }, { - "when": { - "west": "tall" - }, "apply": { "model": "malum:block/small_tainted_rock_bricks_wall_side_tall", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 270 + }, + "when": { + "west": "tall" } } ] diff --git a/src/generated/resources/assets/malum/blockstates/small_twisted_rock_bricks_slab.json b/src/generated/resources/assets/malum/blockstates/small_twisted_rock_bricks_slab.json index 18974ff2e..b0643eaea 100644 --- a/src/generated/resources/assets/malum/blockstates/small_twisted_rock_bricks_slab.json +++ b/src/generated/resources/assets/malum/blockstates/small_twisted_rock_bricks_slab.json @@ -1,13 +1,13 @@ { "variants": { - "type=top": { - "model": "malum:block/small_twisted_rock_bricks_slab_top" - }, "type=bottom": { "model": "malum:block/small_twisted_rock_bricks_slab" }, "type=double": { "model": "malum:block/small_twisted_rock_bricks" + }, + "type=top": { + "model": "malum:block/small_twisted_rock_bricks_slab_top" } } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/blockstates/small_twisted_rock_bricks_stairs.json b/src/generated/resources/assets/malum/blockstates/small_twisted_rock_bricks_stairs.json index 0944c69a7..abc342405 100644 --- a/src/generated/resources/assets/malum/blockstates/small_twisted_rock_bricks_stairs.json +++ b/src/generated/resources/assets/malum/blockstates/small_twisted_rock_bricks_stairs.json @@ -1,209 +1,209 @@ { "variants": { - "facing=north,half=top,shape=straight": { - "model": "malum:block/small_twisted_rock_bricks_stairs", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=south,half=top,shape=straight": { - "model": "malum:block/small_twisted_rock_bricks_stairs", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=west,half=top,shape=straight": { - "model": "malum:block/small_twisted_rock_bricks_stairs", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=east,half=top,shape=straight": { - "model": "malum:block/small_twisted_rock_bricks_stairs", - "x": 180, - "uvlock": true + "facing=east,half=bottom,shape=inner_left": { + "model": "malum:block/small_twisted_rock_bricks_stairs_inner", + "uvlock": true, + "y": 270 }, - "facing=north,half=bottom,shape=straight": { - "model": "malum:block/small_twisted_rock_bricks_stairs", - "y": 270, - "uvlock": true + "facing=east,half=bottom,shape=inner_right": { + "model": "malum:block/small_twisted_rock_bricks_stairs_inner" }, - "facing=south,half=bottom,shape=straight": { - "model": "malum:block/small_twisted_rock_bricks_stairs", - "y": 90, - "uvlock": true + "facing=east,half=bottom,shape=outer_left": { + "model": "malum:block/small_twisted_rock_bricks_stairs_outer", + "uvlock": true, + "y": 270 }, - "facing=west,half=bottom,shape=straight": { - "model": "malum:block/small_twisted_rock_bricks_stairs", - "y": 180, - "uvlock": true + "facing=east,half=bottom,shape=outer_right": { + "model": "malum:block/small_twisted_rock_bricks_stairs_outer" }, "facing=east,half=bottom,shape=straight": { "model": "malum:block/small_twisted_rock_bricks_stairs" }, - "facing=north,half=top,shape=inner_left": { + "facing=east,half=top,shape=inner_left": { "model": "malum:block/small_twisted_rock_bricks_stairs_inner", - "x": 180, - "y": 270, - "uvlock": true + "uvlock": true, + "x": 180 }, - "facing=south,half=top,shape=inner_left": { + "facing=east,half=top,shape=inner_right": { "model": "malum:block/small_twisted_rock_bricks_stairs_inner", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 90 }, - "facing=west,half=top,shape=inner_left": { - "model": "malum:block/small_twisted_rock_bricks_stairs_inner", - "x": 180, - "y": 180, - "uvlock": true + "facing=east,half=top,shape=outer_left": { + "model": "malum:block/small_twisted_rock_bricks_stairs_outer", + "uvlock": true, + "x": 180 }, - "facing=east,half=top,shape=inner_left": { - "model": "malum:block/small_twisted_rock_bricks_stairs_inner", + "facing=east,half=top,shape=outer_right": { + "model": "malum:block/small_twisted_rock_bricks_stairs_outer", + "uvlock": true, "x": 180, - "uvlock": true + "y": 90 + }, + "facing=east,half=top,shape=straight": { + "model": "malum:block/small_twisted_rock_bricks_stairs", + "uvlock": true, + "x": 180 }, "facing=north,half=bottom,shape=inner_left": { "model": "malum:block/small_twisted_rock_bricks_stairs_inner", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=south,half=bottom,shape=inner_left": { - "model": "malum:block/small_twisted_rock_bricks_stairs_inner" - }, - "facing=west,half=bottom,shape=inner_left": { + "facing=north,half=bottom,shape=inner_right": { "model": "malum:block/small_twisted_rock_bricks_stairs_inner", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 270 }, - "facing=east,half=bottom,shape=inner_left": { - "model": "malum:block/small_twisted_rock_bricks_stairs_inner", - "y": 270, - "uvlock": true + "facing=north,half=bottom,shape=outer_left": { + "model": "malum:block/small_twisted_rock_bricks_stairs_outer", + "uvlock": true, + "y": 180 }, - "facing=north,half=top,shape=inner_right": { - "model": "malum:block/small_twisted_rock_bricks_stairs_inner", - "x": 180, - "uvlock": true + "facing=north,half=bottom,shape=outer_right": { + "model": "malum:block/small_twisted_rock_bricks_stairs_outer", + "uvlock": true, + "y": 270 }, - "facing=south,half=top,shape=inner_right": { + "facing=north,half=bottom,shape=straight": { + "model": "malum:block/small_twisted_rock_bricks_stairs", + "uvlock": true, + "y": 270 + }, + "facing=north,half=top,shape=inner_left": { "model": "malum:block/small_twisted_rock_bricks_stairs_inner", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 270 }, - "facing=west,half=top,shape=inner_right": { + "facing=north,half=top,shape=inner_right": { "model": "malum:block/small_twisted_rock_bricks_stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=outer_left": { + "model": "malum:block/small_twisted_rock_bricks_stairs_outer", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 270 }, - "facing=east,half=top,shape=inner_right": { - "model": "malum:block/small_twisted_rock_bricks_stairs_inner", + "facing=north,half=top,shape=outer_right": { + "model": "malum:block/small_twisted_rock_bricks_stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=straight": { + "model": "malum:block/small_twisted_rock_bricks_stairs", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 270 }, - "facing=north,half=bottom,shape=inner_right": { - "model": "malum:block/small_twisted_rock_bricks_stairs_inner", - "y": 270, - "uvlock": true + "facing=south,half=bottom,shape=inner_left": { + "model": "malum:block/small_twisted_rock_bricks_stairs_inner" }, "facing=south,half=bottom,shape=inner_right": { "model": "malum:block/small_twisted_rock_bricks_stairs_inner", - "y": 90, - "uvlock": true - }, - "facing=west,half=bottom,shape=inner_right": { - "model": "malum:block/small_twisted_rock_bricks_stairs_inner", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 90 }, - "facing=east,half=bottom,shape=inner_right": { - "model": "malum:block/small_twisted_rock_bricks_stairs_inner" + "facing=south,half=bottom,shape=outer_left": { + "model": "malum:block/small_twisted_rock_bricks_stairs_outer" }, - "facing=north,half=top,shape=outer_left": { + "facing=south,half=bottom,shape=outer_right": { "model": "malum:block/small_twisted_rock_bricks_stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=straight": { + "model": "malum:block/small_twisted_rock_bricks_stairs", + "uvlock": true, + "y": 90 + }, + "facing=south,half=top,shape=inner_left": { + "model": "malum:block/small_twisted_rock_bricks_stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=inner_right": { + "model": "malum:block/small_twisted_rock_bricks_stairs_inner", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 180 }, "facing=south,half=top,shape=outer_left": { "model": "malum:block/small_twisted_rock_bricks_stairs_outer", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 90 }, - "facing=west,half=top,shape=outer_left": { + "facing=south,half=top,shape=outer_right": { "model": "malum:block/small_twisted_rock_bricks_stairs_outer", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 180 }, - "facing=east,half=top,shape=outer_left": { - "model": "malum:block/small_twisted_rock_bricks_stairs_outer", + "facing=south,half=top,shape=straight": { + "model": "malum:block/small_twisted_rock_bricks_stairs", + "uvlock": true, "x": 180, - "uvlock": true + "y": 90 }, - "facing=north,half=bottom,shape=outer_left": { - "model": "malum:block/small_twisted_rock_bricks_stairs_outer", - "y": 180, - "uvlock": true + "facing=west,half=bottom,shape=inner_left": { + "model": "malum:block/small_twisted_rock_bricks_stairs_inner", + "uvlock": true, + "y": 90 }, - "facing=south,half=bottom,shape=outer_left": { - "model": "malum:block/small_twisted_rock_bricks_stairs_outer" + "facing=west,half=bottom,shape=inner_right": { + "model": "malum:block/small_twisted_rock_bricks_stairs_inner", + "uvlock": true, + "y": 180 }, "facing=west,half=bottom,shape=outer_left": { "model": "malum:block/small_twisted_rock_bricks_stairs_outer", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 90 }, - "facing=east,half=bottom,shape=outer_left": { + "facing=west,half=bottom,shape=outer_right": { "model": "malum:block/small_twisted_rock_bricks_stairs_outer", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=north,half=top,shape=outer_right": { - "model": "malum:block/small_twisted_rock_bricks_stairs_outer", - "x": 180, - "uvlock": true + "facing=west,half=bottom,shape=straight": { + "model": "malum:block/small_twisted_rock_bricks_stairs", + "uvlock": true, + "y": 180 }, - "facing=south,half=top,shape=outer_right": { - "model": "malum:block/small_twisted_rock_bricks_stairs_outer", + "facing=west,half=top,shape=inner_left": { + "model": "malum:block/small_twisted_rock_bricks_stairs_inner", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 180 }, - "facing=west,half=top,shape=outer_right": { - "model": "malum:block/small_twisted_rock_bricks_stairs_outer", + "facing=west,half=top,shape=inner_right": { + "model": "malum:block/small_twisted_rock_bricks_stairs_inner", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 270 }, - "facing=east,half=top,shape=outer_right": { + "facing=west,half=top,shape=outer_left": { "model": "malum:block/small_twisted_rock_bricks_stairs_outer", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true - }, - "facing=north,half=bottom,shape=outer_right": { - "model": "malum:block/small_twisted_rock_bricks_stairs_outer", - "y": 270, - "uvlock": true - }, - "facing=south,half=bottom,shape=outer_right": { - "model": "malum:block/small_twisted_rock_bricks_stairs_outer", - "y": 90, - "uvlock": true + "y": 180 }, - "facing=west,half=bottom,shape=outer_right": { + "facing=west,half=top,shape=outer_right": { "model": "malum:block/small_twisted_rock_bricks_stairs_outer", - "y": 180, - "uvlock": true + "uvlock": true, + "x": 180, + "y": 270 }, - "facing=east,half=bottom,shape=outer_right": { - "model": "malum:block/small_twisted_rock_bricks_stairs_outer" + "facing=west,half=top,shape=straight": { + "model": "malum:block/small_twisted_rock_bricks_stairs", + "uvlock": true, + "x": 180, + "y": 180 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/blockstates/small_twisted_rock_bricks_wall.json b/src/generated/resources/assets/malum/blockstates/small_twisted_rock_bricks_wall.json index 98f58c1d2..2c880e52d 100644 --- a/src/generated/resources/assets/malum/blockstates/small_twisted_rock_bricks_wall.json +++ b/src/generated/resources/assets/malum/blockstates/small_twisted_rock_bricks_wall.json @@ -1,89 +1,89 @@ { "multipart": [ { - "when": { - "up": "true" - }, "apply": { "model": "malum:block/small_twisted_rock_bricks_wall_post" + }, + "when": { + "up": "true" } }, { - "when": { - "east": "low" - }, "apply": { "model": "malum:block/small_twisted_rock_bricks_wall_side", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 90 + }, + "when": { + "east": "low" } }, { - "when": { - "east": "tall" - }, "apply": { "model": "malum:block/small_twisted_rock_bricks_wall_side_tall", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 90 + }, + "when": { + "east": "tall" } }, { - "when": { - "north": "low" - }, "apply": { "model": "malum:block/small_twisted_rock_bricks_wall_side", "uvlock": true + }, + "when": { + "north": "low" } }, { - "when": { - "north": "tall" - }, "apply": { "model": "malum:block/small_twisted_rock_bricks_wall_side_tall", "uvlock": true + }, + "when": { + "north": "tall" } }, { - "when": { - "south": "low" - }, "apply": { "model": "malum:block/small_twisted_rock_bricks_wall_side", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 + }, + "when": { + "south": "low" } }, { - "when": { - "south": "tall" - }, "apply": { "model": "malum:block/small_twisted_rock_bricks_wall_side_tall", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 + }, + "when": { + "south": "tall" } }, { - "when": { - "west": "low" - }, "apply": { "model": "malum:block/small_twisted_rock_bricks_wall_side", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 270 + }, + "when": { + "west": "low" } }, { - "when": { - "west": "tall" - }, "apply": { "model": "malum:block/small_twisted_rock_bricks_wall_side_tall", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 270 + }, + "when": { + "west": "tall" } } ] diff --git a/src/generated/resources/assets/malum/blockstates/smooth_tainted_rock_slab.json b/src/generated/resources/assets/malum/blockstates/smooth_tainted_rock_slab.json index 31e3a0088..c701799c1 100644 --- a/src/generated/resources/assets/malum/blockstates/smooth_tainted_rock_slab.json +++ b/src/generated/resources/assets/malum/blockstates/smooth_tainted_rock_slab.json @@ -1,13 +1,13 @@ { "variants": { - "type=top": { - "model": "malum:block/smooth_tainted_rock_slab_top" - }, "type=bottom": { "model": "malum:block/smooth_tainted_rock_slab" }, "type=double": { "model": "malum:block/smooth_tainted_rock" + }, + "type=top": { + "model": "malum:block/smooth_tainted_rock_slab_top" } } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/blockstates/smooth_tainted_rock_stairs.json b/src/generated/resources/assets/malum/blockstates/smooth_tainted_rock_stairs.json index 4621a0381..354149a5b 100644 --- a/src/generated/resources/assets/malum/blockstates/smooth_tainted_rock_stairs.json +++ b/src/generated/resources/assets/malum/blockstates/smooth_tainted_rock_stairs.json @@ -1,209 +1,209 @@ { "variants": { - "facing=north,half=top,shape=straight": { - "model": "malum:block/smooth_tainted_rock_stairs", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=south,half=top,shape=straight": { - "model": "malum:block/smooth_tainted_rock_stairs", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=west,half=top,shape=straight": { - "model": "malum:block/smooth_tainted_rock_stairs", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=east,half=top,shape=straight": { - "model": "malum:block/smooth_tainted_rock_stairs", - "x": 180, - "uvlock": true + "facing=east,half=bottom,shape=inner_left": { + "model": "malum:block/smooth_tainted_rock_stairs_inner", + "uvlock": true, + "y": 270 }, - "facing=north,half=bottom,shape=straight": { - "model": "malum:block/smooth_tainted_rock_stairs", - "y": 270, - "uvlock": true + "facing=east,half=bottom,shape=inner_right": { + "model": "malum:block/smooth_tainted_rock_stairs_inner" }, - "facing=south,half=bottom,shape=straight": { - "model": "malum:block/smooth_tainted_rock_stairs", - "y": 90, - "uvlock": true + "facing=east,half=bottom,shape=outer_left": { + "model": "malum:block/smooth_tainted_rock_stairs_outer", + "uvlock": true, + "y": 270 }, - "facing=west,half=bottom,shape=straight": { - "model": "malum:block/smooth_tainted_rock_stairs", - "y": 180, - "uvlock": true + "facing=east,half=bottom,shape=outer_right": { + "model": "malum:block/smooth_tainted_rock_stairs_outer" }, "facing=east,half=bottom,shape=straight": { "model": "malum:block/smooth_tainted_rock_stairs" }, - "facing=north,half=top,shape=inner_left": { + "facing=east,half=top,shape=inner_left": { "model": "malum:block/smooth_tainted_rock_stairs_inner", - "x": 180, - "y": 270, - "uvlock": true + "uvlock": true, + "x": 180 }, - "facing=south,half=top,shape=inner_left": { + "facing=east,half=top,shape=inner_right": { "model": "malum:block/smooth_tainted_rock_stairs_inner", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 90 }, - "facing=west,half=top,shape=inner_left": { - "model": "malum:block/smooth_tainted_rock_stairs_inner", - "x": 180, - "y": 180, - "uvlock": true + "facing=east,half=top,shape=outer_left": { + "model": "malum:block/smooth_tainted_rock_stairs_outer", + "uvlock": true, + "x": 180 }, - "facing=east,half=top,shape=inner_left": { - "model": "malum:block/smooth_tainted_rock_stairs_inner", + "facing=east,half=top,shape=outer_right": { + "model": "malum:block/smooth_tainted_rock_stairs_outer", + "uvlock": true, "x": 180, - "uvlock": true + "y": 90 + }, + "facing=east,half=top,shape=straight": { + "model": "malum:block/smooth_tainted_rock_stairs", + "uvlock": true, + "x": 180 }, "facing=north,half=bottom,shape=inner_left": { "model": "malum:block/smooth_tainted_rock_stairs_inner", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=south,half=bottom,shape=inner_left": { - "model": "malum:block/smooth_tainted_rock_stairs_inner" - }, - "facing=west,half=bottom,shape=inner_left": { + "facing=north,half=bottom,shape=inner_right": { "model": "malum:block/smooth_tainted_rock_stairs_inner", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 270 }, - "facing=east,half=bottom,shape=inner_left": { - "model": "malum:block/smooth_tainted_rock_stairs_inner", - "y": 270, - "uvlock": true + "facing=north,half=bottom,shape=outer_left": { + "model": "malum:block/smooth_tainted_rock_stairs_outer", + "uvlock": true, + "y": 180 }, - "facing=north,half=top,shape=inner_right": { - "model": "malum:block/smooth_tainted_rock_stairs_inner", - "x": 180, - "uvlock": true + "facing=north,half=bottom,shape=outer_right": { + "model": "malum:block/smooth_tainted_rock_stairs_outer", + "uvlock": true, + "y": 270 }, - "facing=south,half=top,shape=inner_right": { + "facing=north,half=bottom,shape=straight": { + "model": "malum:block/smooth_tainted_rock_stairs", + "uvlock": true, + "y": 270 + }, + "facing=north,half=top,shape=inner_left": { "model": "malum:block/smooth_tainted_rock_stairs_inner", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 270 }, - "facing=west,half=top,shape=inner_right": { + "facing=north,half=top,shape=inner_right": { "model": "malum:block/smooth_tainted_rock_stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=outer_left": { + "model": "malum:block/smooth_tainted_rock_stairs_outer", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 270 }, - "facing=east,half=top,shape=inner_right": { - "model": "malum:block/smooth_tainted_rock_stairs_inner", + "facing=north,half=top,shape=outer_right": { + "model": "malum:block/smooth_tainted_rock_stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=straight": { + "model": "malum:block/smooth_tainted_rock_stairs", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 270 }, - "facing=north,half=bottom,shape=inner_right": { - "model": "malum:block/smooth_tainted_rock_stairs_inner", - "y": 270, - "uvlock": true + "facing=south,half=bottom,shape=inner_left": { + "model": "malum:block/smooth_tainted_rock_stairs_inner" }, "facing=south,half=bottom,shape=inner_right": { "model": "malum:block/smooth_tainted_rock_stairs_inner", - "y": 90, - "uvlock": true - }, - "facing=west,half=bottom,shape=inner_right": { - "model": "malum:block/smooth_tainted_rock_stairs_inner", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 90 }, - "facing=east,half=bottom,shape=inner_right": { - "model": "malum:block/smooth_tainted_rock_stairs_inner" + "facing=south,half=bottom,shape=outer_left": { + "model": "malum:block/smooth_tainted_rock_stairs_outer" }, - "facing=north,half=top,shape=outer_left": { + "facing=south,half=bottom,shape=outer_right": { "model": "malum:block/smooth_tainted_rock_stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=straight": { + "model": "malum:block/smooth_tainted_rock_stairs", + "uvlock": true, + "y": 90 + }, + "facing=south,half=top,shape=inner_left": { + "model": "malum:block/smooth_tainted_rock_stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=inner_right": { + "model": "malum:block/smooth_tainted_rock_stairs_inner", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 180 }, "facing=south,half=top,shape=outer_left": { "model": "malum:block/smooth_tainted_rock_stairs_outer", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 90 }, - "facing=west,half=top,shape=outer_left": { + "facing=south,half=top,shape=outer_right": { "model": "malum:block/smooth_tainted_rock_stairs_outer", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 180 }, - "facing=east,half=top,shape=outer_left": { - "model": "malum:block/smooth_tainted_rock_stairs_outer", + "facing=south,half=top,shape=straight": { + "model": "malum:block/smooth_tainted_rock_stairs", + "uvlock": true, "x": 180, - "uvlock": true + "y": 90 }, - "facing=north,half=bottom,shape=outer_left": { - "model": "malum:block/smooth_tainted_rock_stairs_outer", - "y": 180, - "uvlock": true + "facing=west,half=bottom,shape=inner_left": { + "model": "malum:block/smooth_tainted_rock_stairs_inner", + "uvlock": true, + "y": 90 }, - "facing=south,half=bottom,shape=outer_left": { - "model": "malum:block/smooth_tainted_rock_stairs_outer" + "facing=west,half=bottom,shape=inner_right": { + "model": "malum:block/smooth_tainted_rock_stairs_inner", + "uvlock": true, + "y": 180 }, "facing=west,half=bottom,shape=outer_left": { "model": "malum:block/smooth_tainted_rock_stairs_outer", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 90 }, - "facing=east,half=bottom,shape=outer_left": { + "facing=west,half=bottom,shape=outer_right": { "model": "malum:block/smooth_tainted_rock_stairs_outer", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=north,half=top,shape=outer_right": { - "model": "malum:block/smooth_tainted_rock_stairs_outer", - "x": 180, - "uvlock": true + "facing=west,half=bottom,shape=straight": { + "model": "malum:block/smooth_tainted_rock_stairs", + "uvlock": true, + "y": 180 }, - "facing=south,half=top,shape=outer_right": { - "model": "malum:block/smooth_tainted_rock_stairs_outer", + "facing=west,half=top,shape=inner_left": { + "model": "malum:block/smooth_tainted_rock_stairs_inner", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 180 }, - "facing=west,half=top,shape=outer_right": { - "model": "malum:block/smooth_tainted_rock_stairs_outer", + "facing=west,half=top,shape=inner_right": { + "model": "malum:block/smooth_tainted_rock_stairs_inner", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 270 }, - "facing=east,half=top,shape=outer_right": { + "facing=west,half=top,shape=outer_left": { "model": "malum:block/smooth_tainted_rock_stairs_outer", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true - }, - "facing=north,half=bottom,shape=outer_right": { - "model": "malum:block/smooth_tainted_rock_stairs_outer", - "y": 270, - "uvlock": true - }, - "facing=south,half=bottom,shape=outer_right": { - "model": "malum:block/smooth_tainted_rock_stairs_outer", - "y": 90, - "uvlock": true + "y": 180 }, - "facing=west,half=bottom,shape=outer_right": { + "facing=west,half=top,shape=outer_right": { "model": "malum:block/smooth_tainted_rock_stairs_outer", - "y": 180, - "uvlock": true + "uvlock": true, + "x": 180, + "y": 270 }, - "facing=east,half=bottom,shape=outer_right": { - "model": "malum:block/smooth_tainted_rock_stairs_outer" + "facing=west,half=top,shape=straight": { + "model": "malum:block/smooth_tainted_rock_stairs", + "uvlock": true, + "x": 180, + "y": 180 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/blockstates/smooth_twisted_rock_slab.json b/src/generated/resources/assets/malum/blockstates/smooth_twisted_rock_slab.json index a3d06fc16..b2d0979cf 100644 --- a/src/generated/resources/assets/malum/blockstates/smooth_twisted_rock_slab.json +++ b/src/generated/resources/assets/malum/blockstates/smooth_twisted_rock_slab.json @@ -1,13 +1,13 @@ { "variants": { - "type=top": { - "model": "malum:block/smooth_twisted_rock_slab_top" - }, "type=bottom": { "model": "malum:block/smooth_twisted_rock_slab" }, "type=double": { "model": "malum:block/smooth_twisted_rock" + }, + "type=top": { + "model": "malum:block/smooth_twisted_rock_slab_top" } } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/blockstates/smooth_twisted_rock_stairs.json b/src/generated/resources/assets/malum/blockstates/smooth_twisted_rock_stairs.json index 5ee3622b2..f015afed9 100644 --- a/src/generated/resources/assets/malum/blockstates/smooth_twisted_rock_stairs.json +++ b/src/generated/resources/assets/malum/blockstates/smooth_twisted_rock_stairs.json @@ -1,209 +1,209 @@ { "variants": { - "facing=north,half=top,shape=straight": { - "model": "malum:block/smooth_twisted_rock_stairs", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=south,half=top,shape=straight": { - "model": "malum:block/smooth_twisted_rock_stairs", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=west,half=top,shape=straight": { - "model": "malum:block/smooth_twisted_rock_stairs", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=east,half=top,shape=straight": { - "model": "malum:block/smooth_twisted_rock_stairs", - "x": 180, - "uvlock": true + "facing=east,half=bottom,shape=inner_left": { + "model": "malum:block/smooth_twisted_rock_stairs_inner", + "uvlock": true, + "y": 270 }, - "facing=north,half=bottom,shape=straight": { - "model": "malum:block/smooth_twisted_rock_stairs", - "y": 270, - "uvlock": true + "facing=east,half=bottom,shape=inner_right": { + "model": "malum:block/smooth_twisted_rock_stairs_inner" }, - "facing=south,half=bottom,shape=straight": { - "model": "malum:block/smooth_twisted_rock_stairs", - "y": 90, - "uvlock": true + "facing=east,half=bottom,shape=outer_left": { + "model": "malum:block/smooth_twisted_rock_stairs_outer", + "uvlock": true, + "y": 270 }, - "facing=west,half=bottom,shape=straight": { - "model": "malum:block/smooth_twisted_rock_stairs", - "y": 180, - "uvlock": true + "facing=east,half=bottom,shape=outer_right": { + "model": "malum:block/smooth_twisted_rock_stairs_outer" }, "facing=east,half=bottom,shape=straight": { "model": "malum:block/smooth_twisted_rock_stairs" }, - "facing=north,half=top,shape=inner_left": { + "facing=east,half=top,shape=inner_left": { "model": "malum:block/smooth_twisted_rock_stairs_inner", - "x": 180, - "y": 270, - "uvlock": true + "uvlock": true, + "x": 180 }, - "facing=south,half=top,shape=inner_left": { + "facing=east,half=top,shape=inner_right": { "model": "malum:block/smooth_twisted_rock_stairs_inner", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 90 }, - "facing=west,half=top,shape=inner_left": { - "model": "malum:block/smooth_twisted_rock_stairs_inner", - "x": 180, - "y": 180, - "uvlock": true + "facing=east,half=top,shape=outer_left": { + "model": "malum:block/smooth_twisted_rock_stairs_outer", + "uvlock": true, + "x": 180 }, - "facing=east,half=top,shape=inner_left": { - "model": "malum:block/smooth_twisted_rock_stairs_inner", + "facing=east,half=top,shape=outer_right": { + "model": "malum:block/smooth_twisted_rock_stairs_outer", + "uvlock": true, "x": 180, - "uvlock": true + "y": 90 + }, + "facing=east,half=top,shape=straight": { + "model": "malum:block/smooth_twisted_rock_stairs", + "uvlock": true, + "x": 180 }, "facing=north,half=bottom,shape=inner_left": { "model": "malum:block/smooth_twisted_rock_stairs_inner", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=south,half=bottom,shape=inner_left": { - "model": "malum:block/smooth_twisted_rock_stairs_inner" - }, - "facing=west,half=bottom,shape=inner_left": { + "facing=north,half=bottom,shape=inner_right": { "model": "malum:block/smooth_twisted_rock_stairs_inner", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 270 }, - "facing=east,half=bottom,shape=inner_left": { - "model": "malum:block/smooth_twisted_rock_stairs_inner", - "y": 270, - "uvlock": true + "facing=north,half=bottom,shape=outer_left": { + "model": "malum:block/smooth_twisted_rock_stairs_outer", + "uvlock": true, + "y": 180 }, - "facing=north,half=top,shape=inner_right": { - "model": "malum:block/smooth_twisted_rock_stairs_inner", - "x": 180, - "uvlock": true + "facing=north,half=bottom,shape=outer_right": { + "model": "malum:block/smooth_twisted_rock_stairs_outer", + "uvlock": true, + "y": 270 }, - "facing=south,half=top,shape=inner_right": { + "facing=north,half=bottom,shape=straight": { + "model": "malum:block/smooth_twisted_rock_stairs", + "uvlock": true, + "y": 270 + }, + "facing=north,half=top,shape=inner_left": { "model": "malum:block/smooth_twisted_rock_stairs_inner", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 270 }, - "facing=west,half=top,shape=inner_right": { + "facing=north,half=top,shape=inner_right": { "model": "malum:block/smooth_twisted_rock_stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=outer_left": { + "model": "malum:block/smooth_twisted_rock_stairs_outer", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 270 }, - "facing=east,half=top,shape=inner_right": { - "model": "malum:block/smooth_twisted_rock_stairs_inner", + "facing=north,half=top,shape=outer_right": { + "model": "malum:block/smooth_twisted_rock_stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=straight": { + "model": "malum:block/smooth_twisted_rock_stairs", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 270 }, - "facing=north,half=bottom,shape=inner_right": { - "model": "malum:block/smooth_twisted_rock_stairs_inner", - "y": 270, - "uvlock": true + "facing=south,half=bottom,shape=inner_left": { + "model": "malum:block/smooth_twisted_rock_stairs_inner" }, "facing=south,half=bottom,shape=inner_right": { "model": "malum:block/smooth_twisted_rock_stairs_inner", - "y": 90, - "uvlock": true - }, - "facing=west,half=bottom,shape=inner_right": { - "model": "malum:block/smooth_twisted_rock_stairs_inner", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 90 }, - "facing=east,half=bottom,shape=inner_right": { - "model": "malum:block/smooth_twisted_rock_stairs_inner" + "facing=south,half=bottom,shape=outer_left": { + "model": "malum:block/smooth_twisted_rock_stairs_outer" }, - "facing=north,half=top,shape=outer_left": { + "facing=south,half=bottom,shape=outer_right": { "model": "malum:block/smooth_twisted_rock_stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=straight": { + "model": "malum:block/smooth_twisted_rock_stairs", + "uvlock": true, + "y": 90 + }, + "facing=south,half=top,shape=inner_left": { + "model": "malum:block/smooth_twisted_rock_stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=inner_right": { + "model": "malum:block/smooth_twisted_rock_stairs_inner", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 180 }, "facing=south,half=top,shape=outer_left": { "model": "malum:block/smooth_twisted_rock_stairs_outer", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 90 }, - "facing=west,half=top,shape=outer_left": { + "facing=south,half=top,shape=outer_right": { "model": "malum:block/smooth_twisted_rock_stairs_outer", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 180 }, - "facing=east,half=top,shape=outer_left": { - "model": "malum:block/smooth_twisted_rock_stairs_outer", + "facing=south,half=top,shape=straight": { + "model": "malum:block/smooth_twisted_rock_stairs", + "uvlock": true, "x": 180, - "uvlock": true + "y": 90 }, - "facing=north,half=bottom,shape=outer_left": { - "model": "malum:block/smooth_twisted_rock_stairs_outer", - "y": 180, - "uvlock": true + "facing=west,half=bottom,shape=inner_left": { + "model": "malum:block/smooth_twisted_rock_stairs_inner", + "uvlock": true, + "y": 90 }, - "facing=south,half=bottom,shape=outer_left": { - "model": "malum:block/smooth_twisted_rock_stairs_outer" + "facing=west,half=bottom,shape=inner_right": { + "model": "malum:block/smooth_twisted_rock_stairs_inner", + "uvlock": true, + "y": 180 }, "facing=west,half=bottom,shape=outer_left": { "model": "malum:block/smooth_twisted_rock_stairs_outer", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 90 }, - "facing=east,half=bottom,shape=outer_left": { + "facing=west,half=bottom,shape=outer_right": { "model": "malum:block/smooth_twisted_rock_stairs_outer", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=north,half=top,shape=outer_right": { - "model": "malum:block/smooth_twisted_rock_stairs_outer", - "x": 180, - "uvlock": true + "facing=west,half=bottom,shape=straight": { + "model": "malum:block/smooth_twisted_rock_stairs", + "uvlock": true, + "y": 180 }, - "facing=south,half=top,shape=outer_right": { - "model": "malum:block/smooth_twisted_rock_stairs_outer", + "facing=west,half=top,shape=inner_left": { + "model": "malum:block/smooth_twisted_rock_stairs_inner", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 180 }, - "facing=west,half=top,shape=outer_right": { - "model": "malum:block/smooth_twisted_rock_stairs_outer", + "facing=west,half=top,shape=inner_right": { + "model": "malum:block/smooth_twisted_rock_stairs_inner", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 270 }, - "facing=east,half=top,shape=outer_right": { + "facing=west,half=top,shape=outer_left": { "model": "malum:block/smooth_twisted_rock_stairs_outer", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true - }, - "facing=north,half=bottom,shape=outer_right": { - "model": "malum:block/smooth_twisted_rock_stairs_outer", - "y": 270, - "uvlock": true - }, - "facing=south,half=bottom,shape=outer_right": { - "model": "malum:block/smooth_twisted_rock_stairs_outer", - "y": 90, - "uvlock": true + "y": 180 }, - "facing=west,half=bottom,shape=outer_right": { + "facing=west,half=top,shape=outer_right": { "model": "malum:block/smooth_twisted_rock_stairs_outer", - "y": 180, - "uvlock": true + "uvlock": true, + "x": 180, + "y": 270 }, - "facing=east,half=bottom,shape=outer_right": { - "model": "malum:block/smooth_twisted_rock_stairs_outer" + "facing=west,half=top,shape=straight": { + "model": "malum:block/smooth_twisted_rock_stairs", + "uvlock": true, + "x": 180, + "y": 180 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/blockstates/solid_runewood_trapdoor.json b/src/generated/resources/assets/malum/blockstates/solid_runewood_trapdoor.json index 7574afd99..46df5d4b9 100644 --- a/src/generated/resources/assets/malum/blockstates/solid_runewood_trapdoor.json +++ b/src/generated/resources/assets/malum/blockstates/solid_runewood_trapdoor.json @@ -1,67 +1,67 @@ { "variants": { - "facing=north,half=top,open=false": { - "model": "malum:block/solid_runewood_trapdoor_top" - }, - "facing=south,half=top,open=false": { - "model": "malum:block/solid_runewood_trapdoor_top", - "y": 180 + "facing=east,half=bottom,open=false": { + "model": "malum:block/solid_runewood_trapdoor_bottom", + "y": 90 }, - "facing=west,half=top,open=false": { - "model": "malum:block/solid_runewood_trapdoor_top", - "y": 270 + "facing=east,half=bottom,open=true": { + "model": "malum:block/solid_runewood_trapdoor_open", + "y": 90 }, "facing=east,half=top,open=false": { "model": "malum:block/solid_runewood_trapdoor_top", "y": 90 }, + "facing=east,half=top,open=true": { + "model": "malum:block/solid_runewood_trapdoor_open", + "x": 180, + "y": 270 + }, "facing=north,half=bottom,open=false": { "model": "malum:block/solid_runewood_trapdoor_bottom" }, - "facing=south,half=bottom,open=false": { - "model": "malum:block/solid_runewood_trapdoor_bottom", - "y": 180 - }, - "facing=west,half=bottom,open=false": { - "model": "malum:block/solid_runewood_trapdoor_bottom", - "y": 270 + "facing=north,half=bottom,open=true": { + "model": "malum:block/solid_runewood_trapdoor_open" }, - "facing=east,half=bottom,open=false": { - "model": "malum:block/solid_runewood_trapdoor_bottom", - "y": 90 + "facing=north,half=top,open=false": { + "model": "malum:block/solid_runewood_trapdoor_top" }, "facing=north,half=top,open=true": { "model": "malum:block/solid_runewood_trapdoor_open", "x": 180, "y": 180 }, - "facing=south,half=top,open=true": { - "model": "malum:block/solid_runewood_trapdoor_open", - "x": 180 - }, - "facing=west,half=top,open=true": { - "model": "malum:block/solid_runewood_trapdoor_open", - "x": 180, - "y": 90 + "facing=south,half=bottom,open=false": { + "model": "malum:block/solid_runewood_trapdoor_bottom", + "y": 180 }, - "facing=east,half=top,open=true": { + "facing=south,half=bottom,open=true": { "model": "malum:block/solid_runewood_trapdoor_open", - "x": 180, - "y": 270 + "y": 180 }, - "facing=north,half=bottom,open=true": { - "model": "malum:block/solid_runewood_trapdoor_open" + "facing=south,half=top,open=false": { + "model": "malum:block/solid_runewood_trapdoor_top", + "y": 180 }, - "facing=south,half=bottom,open=true": { + "facing=south,half=top,open=true": { "model": "malum:block/solid_runewood_trapdoor_open", - "y": 180 + "x": 180 + }, + "facing=west,half=bottom,open=false": { + "model": "malum:block/solid_runewood_trapdoor_bottom", + "y": 270 }, "facing=west,half=bottom,open=true": { "model": "malum:block/solid_runewood_trapdoor_open", "y": 270 }, - "facing=east,half=bottom,open=true": { + "facing=west,half=top,open=false": { + "model": "malum:block/solid_runewood_trapdoor_top", + "y": 270 + }, + "facing=west,half=top,open=true": { "model": "malum:block/solid_runewood_trapdoor_open", + "x": 180, "y": 90 } } diff --git a/src/generated/resources/assets/malum/blockstates/solid_soulwood_trapdoor.json b/src/generated/resources/assets/malum/blockstates/solid_soulwood_trapdoor.json index 75b0c414a..5a499630e 100644 --- a/src/generated/resources/assets/malum/blockstates/solid_soulwood_trapdoor.json +++ b/src/generated/resources/assets/malum/blockstates/solid_soulwood_trapdoor.json @@ -1,67 +1,67 @@ { "variants": { - "facing=north,half=top,open=false": { - "model": "malum:block/solid_soulwood_trapdoor_top" - }, - "facing=south,half=top,open=false": { - "model": "malum:block/solid_soulwood_trapdoor_top", - "y": 180 + "facing=east,half=bottom,open=false": { + "model": "malum:block/solid_soulwood_trapdoor_bottom", + "y": 90 }, - "facing=west,half=top,open=false": { - "model": "malum:block/solid_soulwood_trapdoor_top", - "y": 270 + "facing=east,half=bottom,open=true": { + "model": "malum:block/solid_soulwood_trapdoor_open", + "y": 90 }, "facing=east,half=top,open=false": { "model": "malum:block/solid_soulwood_trapdoor_top", "y": 90 }, + "facing=east,half=top,open=true": { + "model": "malum:block/solid_soulwood_trapdoor_open", + "x": 180, + "y": 270 + }, "facing=north,half=bottom,open=false": { "model": "malum:block/solid_soulwood_trapdoor_bottom" }, - "facing=south,half=bottom,open=false": { - "model": "malum:block/solid_soulwood_trapdoor_bottom", - "y": 180 - }, - "facing=west,half=bottom,open=false": { - "model": "malum:block/solid_soulwood_trapdoor_bottom", - "y": 270 + "facing=north,half=bottom,open=true": { + "model": "malum:block/solid_soulwood_trapdoor_open" }, - "facing=east,half=bottom,open=false": { - "model": "malum:block/solid_soulwood_trapdoor_bottom", - "y": 90 + "facing=north,half=top,open=false": { + "model": "malum:block/solid_soulwood_trapdoor_top" }, "facing=north,half=top,open=true": { "model": "malum:block/solid_soulwood_trapdoor_open", "x": 180, "y": 180 }, - "facing=south,half=top,open=true": { - "model": "malum:block/solid_soulwood_trapdoor_open", - "x": 180 - }, - "facing=west,half=top,open=true": { - "model": "malum:block/solid_soulwood_trapdoor_open", - "x": 180, - "y": 90 + "facing=south,half=bottom,open=false": { + "model": "malum:block/solid_soulwood_trapdoor_bottom", + "y": 180 }, - "facing=east,half=top,open=true": { + "facing=south,half=bottom,open=true": { "model": "malum:block/solid_soulwood_trapdoor_open", - "x": 180, - "y": 270 + "y": 180 }, - "facing=north,half=bottom,open=true": { - "model": "malum:block/solid_soulwood_trapdoor_open" + "facing=south,half=top,open=false": { + "model": "malum:block/solid_soulwood_trapdoor_top", + "y": 180 }, - "facing=south,half=bottom,open=true": { + "facing=south,half=top,open=true": { "model": "malum:block/solid_soulwood_trapdoor_open", - "y": 180 + "x": 180 + }, + "facing=west,half=bottom,open=false": { + "model": "malum:block/solid_soulwood_trapdoor_bottom", + "y": 270 }, "facing=west,half=bottom,open=true": { "model": "malum:block/solid_soulwood_trapdoor_open", "y": 270 }, - "facing=east,half=bottom,open=true": { + "facing=west,half=top,open=false": { + "model": "malum:block/solid_soulwood_trapdoor_top", + "y": 270 + }, + "facing=west,half=top,open=true": { "model": "malum:block/solid_soulwood_trapdoor_open", + "x": 180, "y": 90 } } diff --git a/src/generated/resources/assets/malum/blockstates/soulwood_door.json b/src/generated/resources/assets/malum/blockstates/soulwood_door.json index 22b6e52c5..38e464dba 100644 --- a/src/generated/resources/assets/malum/blockstates/soulwood_door.json +++ b/src/generated/resources/assets/malum/blockstates/soulwood_door.json @@ -1,124 +1,124 @@ { "variants": { - "facing=north,half=upper,hinge=left,open=false": { - "model": "malum:block/soulwood_door_top", - "y": 270 + "facing=east,half=lower,hinge=left,open=false": { + "model": "malum:block/soulwood_door_bottom_left" }, - "facing=south,half=upper,hinge=left,open=false": { - "model": "malum:block/soulwood_door_top", + "facing=east,half=lower,hinge=left,open=true": { + "model": "malum:block/soulwood_door_bottom_left_open", "y": 90 }, - "facing=west,half=upper,hinge=left,open=false": { - "model": "malum:block/soulwood_door_top", - "y": 180 + "facing=east,half=lower,hinge=right,open=false": { + "model": "malum:block/soulwood_door_bottom_right" + }, + "facing=east,half=lower,hinge=right,open=true": { + "model": "malum:block/soulwood_door_bottom_right_open", + "y": 270 }, "facing=east,half=upper,hinge=left,open=false": { - "model": "malum:block/soulwood_door_top" + "model": "malum:block/soulwood_door_top_left" + }, + "facing=east,half=upper,hinge=left,open=true": { + "model": "malum:block/soulwood_door_top_left_open", + "y": 90 + }, + "facing=east,half=upper,hinge=right,open=false": { + "model": "malum:block/soulwood_door_top_right" + }, + "facing=east,half=upper,hinge=right,open=true": { + "model": "malum:block/soulwood_door_top_right_open", + "y": 270 }, "facing=north,half=lower,hinge=left,open=false": { - "model": "malum:block/soulwood_door_bottom", + "model": "malum:block/soulwood_door_bottom_left", "y": 270 }, - "facing=south,half=lower,hinge=left,open=false": { - "model": "malum:block/soulwood_door_bottom", - "y": 90 + "facing=north,half=lower,hinge=left,open=true": { + "model": "malum:block/soulwood_door_bottom_left_open" }, - "facing=west,half=lower,hinge=left,open=false": { - "model": "malum:block/soulwood_door_bottom", + "facing=north,half=lower,hinge=right,open=false": { + "model": "malum:block/soulwood_door_bottom_right", + "y": 270 + }, + "facing=north,half=lower,hinge=right,open=true": { + "model": "malum:block/soulwood_door_bottom_right_open", "y": 180 }, - "facing=east,half=lower,hinge=left,open=false": { - "model": "malum:block/soulwood_door_bottom" + "facing=north,half=upper,hinge=left,open=false": { + "model": "malum:block/soulwood_door_top_left", + "y": 270 + }, + "facing=north,half=upper,hinge=left,open=true": { + "model": "malum:block/soulwood_door_top_left_open" }, "facing=north,half=upper,hinge=right,open=false": { - "model": "malum:block/soulwood_door_top_hinge", + "model": "malum:block/soulwood_door_top_right", "y": 270 }, - "facing=south,half=upper,hinge=right,open=false": { - "model": "malum:block/soulwood_door_top_hinge", - "y": 90 - }, - "facing=west,half=upper,hinge=right,open=false": { - "model": "malum:block/soulwood_door_top_hinge", + "facing=north,half=upper,hinge=right,open=true": { + "model": "malum:block/soulwood_door_top_right_open", "y": 180 }, - "facing=east,half=upper,hinge=right,open=false": { - "model": "malum:block/soulwood_door_top_hinge" + "facing=south,half=lower,hinge=left,open=false": { + "model": "malum:block/soulwood_door_bottom_left", + "y": 90 }, - "facing=north,half=lower,hinge=right,open=false": { - "model": "malum:block/soulwood_door_bottom_hinge", - "y": 270 + "facing=south,half=lower,hinge=left,open=true": { + "model": "malum:block/soulwood_door_bottom_left_open", + "y": 180 }, "facing=south,half=lower,hinge=right,open=false": { - "model": "malum:block/soulwood_door_bottom_hinge", + "model": "malum:block/soulwood_door_bottom_right", "y": 90 }, - "facing=west,half=lower,hinge=right,open=false": { - "model": "malum:block/soulwood_door_bottom_hinge", - "y": 180 - }, - "facing=east,half=lower,hinge=right,open=false": { - "model": "malum:block/soulwood_door_bottom_hinge" + "facing=south,half=lower,hinge=right,open=true": { + "model": "malum:block/soulwood_door_bottom_right_open" }, - "facing=north,half=upper,hinge=left,open=true": { - "model": "malum:block/soulwood_door_top_hinge" + "facing=south,half=upper,hinge=left,open=false": { + "model": "malum:block/soulwood_door_top_left", + "y": 90 }, "facing=south,half=upper,hinge=left,open=true": { - "model": "malum:block/soulwood_door_top_hinge", + "model": "malum:block/soulwood_door_top_left_open", "y": 180 }, - "facing=west,half=upper,hinge=left,open=true": { - "model": "malum:block/soulwood_door_top_hinge", - "y": 270 - }, - "facing=east,half=upper,hinge=left,open=true": { - "model": "malum:block/soulwood_door_top_hinge", + "facing=south,half=upper,hinge=right,open=false": { + "model": "malum:block/soulwood_door_top_right", "y": 90 }, - "facing=north,half=lower,hinge=left,open=true": { - "model": "malum:block/soulwood_door_bottom_hinge" + "facing=south,half=upper,hinge=right,open=true": { + "model": "malum:block/soulwood_door_top_right_open" }, - "facing=south,half=lower,hinge=left,open=true": { - "model": "malum:block/soulwood_door_bottom_hinge", + "facing=west,half=lower,hinge=left,open=false": { + "model": "malum:block/soulwood_door_bottom_left", "y": 180 }, "facing=west,half=lower,hinge=left,open=true": { - "model": "malum:block/soulwood_door_bottom_hinge", + "model": "malum:block/soulwood_door_bottom_left_open", "y": 270 }, - "facing=east,half=lower,hinge=left,open=true": { - "model": "malum:block/soulwood_door_bottom_hinge", - "y": 90 - }, - "facing=north,half=upper,hinge=right,open=true": { - "model": "malum:block/soulwood_door_top", + "facing=west,half=lower,hinge=right,open=false": { + "model": "malum:block/soulwood_door_bottom_right", "y": 180 }, - "facing=south,half=upper,hinge=right,open=true": { - "model": "malum:block/soulwood_door_top" - }, - "facing=west,half=upper,hinge=right,open=true": { - "model": "malum:block/soulwood_door_top", + "facing=west,half=lower,hinge=right,open=true": { + "model": "malum:block/soulwood_door_bottom_right_open", "y": 90 }, - "facing=east,half=upper,hinge=right,open=true": { - "model": "malum:block/soulwood_door_top", + "facing=west,half=upper,hinge=left,open=false": { + "model": "malum:block/soulwood_door_top_left", + "y": 180 + }, + "facing=west,half=upper,hinge=left,open=true": { + "model": "malum:block/soulwood_door_top_left_open", "y": 270 }, - "facing=north,half=lower,hinge=right,open=true": { - "model": "malum:block/soulwood_door_bottom", + "facing=west,half=upper,hinge=right,open=false": { + "model": "malum:block/soulwood_door_top_right", "y": 180 }, - "facing=south,half=lower,hinge=right,open=true": { - "model": "malum:block/soulwood_door_bottom" - }, - "facing=west,half=lower,hinge=right,open=true": { - "model": "malum:block/soulwood_door_bottom", + "facing=west,half=upper,hinge=right,open=true": { + "model": "malum:block/soulwood_door_top_right_open", "y": 90 - }, - "facing=east,half=lower,hinge=right,open=true": { - "model": "malum:block/soulwood_door_bottom", - "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/blockstates/soulwood_item_stand.json b/src/generated/resources/assets/malum/blockstates/soulwood_item_stand.json index d387cbf9b..6c7b31a60 100644 --- a/src/generated/resources/assets/malum/blockstates/soulwood_item_stand.json +++ b/src/generated/resources/assets/malum/blockstates/soulwood_item_stand.json @@ -4,53 +4,53 @@ "model": "malum:block/soulwood_item_stand", "x": 180 }, - "facing=up,waterlogged=false": { - "model": "malum:block/soulwood_item_stand" - }, - "facing=north,waterlogged=false": { - "model": "malum:block/soulwood_item_stand", - "x": 90 - }, - "facing=south,waterlogged=false": { + "facing=down,waterlogged=true": { "model": "malum:block/soulwood_item_stand", - "x": 90, - "y": 180 + "x": 180 }, - "facing=west,waterlogged=false": { + "facing=east,waterlogged=false": { "model": "malum:block/soulwood_item_stand", "x": 90, - "y": 270 + "y": 90 }, - "facing=east,waterlogged=false": { + "facing=east,waterlogged=true": { "model": "malum:block/soulwood_item_stand", "x": 90, "y": 90 }, - "facing=down,waterlogged=true": { + "facing=north,waterlogged=false": { "model": "malum:block/soulwood_item_stand", - "x": 180 - }, - "facing=up,waterlogged=true": { - "model": "malum:block/soulwood_item_stand" + "x": 90 }, "facing=north,waterlogged=true": { "model": "malum:block/soulwood_item_stand", "x": 90 }, + "facing=south,waterlogged=false": { + "model": "malum:block/soulwood_item_stand", + "x": 90, + "y": 180 + }, "facing=south,waterlogged=true": { "model": "malum:block/soulwood_item_stand", "x": 90, "y": 180 }, - "facing=west,waterlogged=true": { + "facing=up,waterlogged=false": { + "model": "malum:block/soulwood_item_stand" + }, + "facing=up,waterlogged=true": { + "model": "malum:block/soulwood_item_stand" + }, + "facing=west,waterlogged=false": { "model": "malum:block/soulwood_item_stand", "x": 90, "y": 270 }, - "facing=east,waterlogged=true": { + "facing=west,waterlogged=true": { "model": "malum:block/soulwood_item_stand", "x": 90, - "y": 90 + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/blockstates/soulwood_panel_slab.json b/src/generated/resources/assets/malum/blockstates/soulwood_panel_slab.json index 358ea3541..6e49bee3b 100644 --- a/src/generated/resources/assets/malum/blockstates/soulwood_panel_slab.json +++ b/src/generated/resources/assets/malum/blockstates/soulwood_panel_slab.json @@ -1,13 +1,13 @@ { "variants": { - "type=top": { - "model": "malum:block/soulwood_panel_slab_top" - }, "type=bottom": { "model": "malum:block/soulwood_panel_slab" }, "type=double": { "model": "malum:block/soulwood_panel" + }, + "type=top": { + "model": "malum:block/soulwood_panel_slab_top" } } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/blockstates/soulwood_panel_stairs.json b/src/generated/resources/assets/malum/blockstates/soulwood_panel_stairs.json index 3488c8051..3d44765d5 100644 --- a/src/generated/resources/assets/malum/blockstates/soulwood_panel_stairs.json +++ b/src/generated/resources/assets/malum/blockstates/soulwood_panel_stairs.json @@ -1,209 +1,209 @@ { "variants": { - "facing=north,half=top,shape=straight": { - "model": "malum:block/soulwood_panel_stairs", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=south,half=top,shape=straight": { - "model": "malum:block/soulwood_panel_stairs", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=west,half=top,shape=straight": { - "model": "malum:block/soulwood_panel_stairs", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=east,half=top,shape=straight": { - "model": "malum:block/soulwood_panel_stairs", - "x": 180, - "uvlock": true + "facing=east,half=bottom,shape=inner_left": { + "model": "malum:block/soulwood_panel_stairs_inner", + "uvlock": true, + "y": 270 }, - "facing=north,half=bottom,shape=straight": { - "model": "malum:block/soulwood_panel_stairs", - "y": 270, - "uvlock": true + "facing=east,half=bottom,shape=inner_right": { + "model": "malum:block/soulwood_panel_stairs_inner" }, - "facing=south,half=bottom,shape=straight": { - "model": "malum:block/soulwood_panel_stairs", - "y": 90, - "uvlock": true + "facing=east,half=bottom,shape=outer_left": { + "model": "malum:block/soulwood_panel_stairs_outer", + "uvlock": true, + "y": 270 }, - "facing=west,half=bottom,shape=straight": { - "model": "malum:block/soulwood_panel_stairs", - "y": 180, - "uvlock": true + "facing=east,half=bottom,shape=outer_right": { + "model": "malum:block/soulwood_panel_stairs_outer" }, "facing=east,half=bottom,shape=straight": { "model": "malum:block/soulwood_panel_stairs" }, - "facing=north,half=top,shape=inner_left": { + "facing=east,half=top,shape=inner_left": { "model": "malum:block/soulwood_panel_stairs_inner", - "x": 180, - "y": 270, - "uvlock": true + "uvlock": true, + "x": 180 }, - "facing=south,half=top,shape=inner_left": { + "facing=east,half=top,shape=inner_right": { "model": "malum:block/soulwood_panel_stairs_inner", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 90 }, - "facing=west,half=top,shape=inner_left": { - "model": "malum:block/soulwood_panel_stairs_inner", - "x": 180, - "y": 180, - "uvlock": true + "facing=east,half=top,shape=outer_left": { + "model": "malum:block/soulwood_panel_stairs_outer", + "uvlock": true, + "x": 180 }, - "facing=east,half=top,shape=inner_left": { - "model": "malum:block/soulwood_panel_stairs_inner", + "facing=east,half=top,shape=outer_right": { + "model": "malum:block/soulwood_panel_stairs_outer", + "uvlock": true, "x": 180, - "uvlock": true + "y": 90 + }, + "facing=east,half=top,shape=straight": { + "model": "malum:block/soulwood_panel_stairs", + "uvlock": true, + "x": 180 }, "facing=north,half=bottom,shape=inner_left": { "model": "malum:block/soulwood_panel_stairs_inner", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=south,half=bottom,shape=inner_left": { - "model": "malum:block/soulwood_panel_stairs_inner" - }, - "facing=west,half=bottom,shape=inner_left": { + "facing=north,half=bottom,shape=inner_right": { "model": "malum:block/soulwood_panel_stairs_inner", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 270 }, - "facing=east,half=bottom,shape=inner_left": { - "model": "malum:block/soulwood_panel_stairs_inner", - "y": 270, - "uvlock": true + "facing=north,half=bottom,shape=outer_left": { + "model": "malum:block/soulwood_panel_stairs_outer", + "uvlock": true, + "y": 180 }, - "facing=north,half=top,shape=inner_right": { - "model": "malum:block/soulwood_panel_stairs_inner", - "x": 180, - "uvlock": true + "facing=north,half=bottom,shape=outer_right": { + "model": "malum:block/soulwood_panel_stairs_outer", + "uvlock": true, + "y": 270 }, - "facing=south,half=top,shape=inner_right": { + "facing=north,half=bottom,shape=straight": { + "model": "malum:block/soulwood_panel_stairs", + "uvlock": true, + "y": 270 + }, + "facing=north,half=top,shape=inner_left": { "model": "malum:block/soulwood_panel_stairs_inner", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 270 }, - "facing=west,half=top,shape=inner_right": { + "facing=north,half=top,shape=inner_right": { "model": "malum:block/soulwood_panel_stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=outer_left": { + "model": "malum:block/soulwood_panel_stairs_outer", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 270 }, - "facing=east,half=top,shape=inner_right": { - "model": "malum:block/soulwood_panel_stairs_inner", + "facing=north,half=top,shape=outer_right": { + "model": "malum:block/soulwood_panel_stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=straight": { + "model": "malum:block/soulwood_panel_stairs", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 270 }, - "facing=north,half=bottom,shape=inner_right": { - "model": "malum:block/soulwood_panel_stairs_inner", - "y": 270, - "uvlock": true + "facing=south,half=bottom,shape=inner_left": { + "model": "malum:block/soulwood_panel_stairs_inner" }, "facing=south,half=bottom,shape=inner_right": { "model": "malum:block/soulwood_panel_stairs_inner", - "y": 90, - "uvlock": true - }, - "facing=west,half=bottom,shape=inner_right": { - "model": "malum:block/soulwood_panel_stairs_inner", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 90 }, - "facing=east,half=bottom,shape=inner_right": { - "model": "malum:block/soulwood_panel_stairs_inner" + "facing=south,half=bottom,shape=outer_left": { + "model": "malum:block/soulwood_panel_stairs_outer" }, - "facing=north,half=top,shape=outer_left": { + "facing=south,half=bottom,shape=outer_right": { "model": "malum:block/soulwood_panel_stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=straight": { + "model": "malum:block/soulwood_panel_stairs", + "uvlock": true, + "y": 90 + }, + "facing=south,half=top,shape=inner_left": { + "model": "malum:block/soulwood_panel_stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=inner_right": { + "model": "malum:block/soulwood_panel_stairs_inner", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 180 }, "facing=south,half=top,shape=outer_left": { "model": "malum:block/soulwood_panel_stairs_outer", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 90 }, - "facing=west,half=top,shape=outer_left": { + "facing=south,half=top,shape=outer_right": { "model": "malum:block/soulwood_panel_stairs_outer", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 180 }, - "facing=east,half=top,shape=outer_left": { - "model": "malum:block/soulwood_panel_stairs_outer", + "facing=south,half=top,shape=straight": { + "model": "malum:block/soulwood_panel_stairs", + "uvlock": true, "x": 180, - "uvlock": true + "y": 90 }, - "facing=north,half=bottom,shape=outer_left": { - "model": "malum:block/soulwood_panel_stairs_outer", - "y": 180, - "uvlock": true + "facing=west,half=bottom,shape=inner_left": { + "model": "malum:block/soulwood_panel_stairs_inner", + "uvlock": true, + "y": 90 }, - "facing=south,half=bottom,shape=outer_left": { - "model": "malum:block/soulwood_panel_stairs_outer" + "facing=west,half=bottom,shape=inner_right": { + "model": "malum:block/soulwood_panel_stairs_inner", + "uvlock": true, + "y": 180 }, "facing=west,half=bottom,shape=outer_left": { "model": "malum:block/soulwood_panel_stairs_outer", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 90 }, - "facing=east,half=bottom,shape=outer_left": { + "facing=west,half=bottom,shape=outer_right": { "model": "malum:block/soulwood_panel_stairs_outer", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=north,half=top,shape=outer_right": { - "model": "malum:block/soulwood_panel_stairs_outer", - "x": 180, - "uvlock": true + "facing=west,half=bottom,shape=straight": { + "model": "malum:block/soulwood_panel_stairs", + "uvlock": true, + "y": 180 }, - "facing=south,half=top,shape=outer_right": { - "model": "malum:block/soulwood_panel_stairs_outer", + "facing=west,half=top,shape=inner_left": { + "model": "malum:block/soulwood_panel_stairs_inner", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 180 }, - "facing=west,half=top,shape=outer_right": { - "model": "malum:block/soulwood_panel_stairs_outer", + "facing=west,half=top,shape=inner_right": { + "model": "malum:block/soulwood_panel_stairs_inner", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 270 }, - "facing=east,half=top,shape=outer_right": { + "facing=west,half=top,shape=outer_left": { "model": "malum:block/soulwood_panel_stairs_outer", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true - }, - "facing=north,half=bottom,shape=outer_right": { - "model": "malum:block/soulwood_panel_stairs_outer", - "y": 270, - "uvlock": true - }, - "facing=south,half=bottom,shape=outer_right": { - "model": "malum:block/soulwood_panel_stairs_outer", - "y": 90, - "uvlock": true + "y": 180 }, - "facing=west,half=bottom,shape=outer_right": { + "facing=west,half=top,shape=outer_right": { "model": "malum:block/soulwood_panel_stairs_outer", - "y": 180, - "uvlock": true + "uvlock": true, + "x": 180, + "y": 270 }, - "facing=east,half=bottom,shape=outer_right": { - "model": "malum:block/soulwood_panel_stairs_outer" + "facing=west,half=top,shape=straight": { + "model": "malum:block/soulwood_panel_stairs", + "uvlock": true, + "x": 180, + "y": 180 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/blockstates/soulwood_planks_button.json b/src/generated/resources/assets/malum/blockstates/soulwood_planks_button.json index 6181bb51a..76623ba90 100644 --- a/src/generated/resources/assets/malum/blockstates/soulwood_planks_button.json +++ b/src/generated/resources/assets/malum/blockstates/soulwood_planks_button.json @@ -1,117 +1,117 @@ { "variants": { - "face=floor,facing=north,powered=false": { - "model": "malum:block/soulwood_planks_button" - }, - "face=wall,facing=north,powered=false": { + "face=ceiling,facing=east,powered=false": { "model": "malum:block/soulwood_planks_button", - "x": 90, - "uvlock": true + "x": 180, + "y": 270 + }, + "face=ceiling,facing=east,powered=true": { + "model": "malum:block/soulwood_planks_button_pressed", + "x": 180, + "y": 270 }, "face=ceiling,facing=north,powered=false": { "model": "malum:block/soulwood_planks_button", "x": 180, "y": 180 }, - "face=floor,facing=south,powered=false": { - "model": "malum:block/soulwood_planks_button", + "face=ceiling,facing=north,powered=true": { + "model": "malum:block/soulwood_planks_button_pressed", + "x": 180, "y": 180 }, - "face=wall,facing=south,powered=false": { - "model": "malum:block/soulwood_planks_button", - "x": 90, - "y": 180, - "uvlock": true - }, "face=ceiling,facing=south,powered=false": { "model": "malum:block/soulwood_planks_button", "x": 180 }, - "face=floor,facing=west,powered=false": { - "model": "malum:block/soulwood_planks_button", - "y": 270 - }, - "face=wall,facing=west,powered=false": { - "model": "malum:block/soulwood_planks_button", - "x": 90, - "y": 270, - "uvlock": true + "face=ceiling,facing=south,powered=true": { + "model": "malum:block/soulwood_planks_button_pressed", + "x": 180 }, "face=ceiling,facing=west,powered=false": { "model": "malum:block/soulwood_planks_button", "x": 180, "y": 90 }, + "face=ceiling,facing=west,powered=true": { + "model": "malum:block/soulwood_planks_button_pressed", + "x": 180, + "y": 90 + }, "face=floor,facing=east,powered=false": { "model": "malum:block/soulwood_planks_button", "y": 90 }, - "face=wall,facing=east,powered=false": { - "model": "malum:block/soulwood_planks_button", - "x": 90, - "y": 90, - "uvlock": true + "face=floor,facing=east,powered=true": { + "model": "malum:block/soulwood_planks_button_pressed", + "y": 90 }, - "face=ceiling,facing=east,powered=false": { - "model": "malum:block/soulwood_planks_button", - "x": 180, - "y": 270 + "face=floor,facing=north,powered=false": { + "model": "malum:block/soulwood_planks_button" }, "face=floor,facing=north,powered=true": { "model": "malum:block/soulwood_planks_button_pressed" }, - "face=wall,facing=north,powered=true": { - "model": "malum:block/soulwood_planks_button_pressed", - "x": 90, - "uvlock": true - }, - "face=ceiling,facing=north,powered=true": { - "model": "malum:block/soulwood_planks_button_pressed", - "x": 180, + "face=floor,facing=south,powered=false": { + "model": "malum:block/soulwood_planks_button", "y": 180 }, "face=floor,facing=south,powered=true": { "model": "malum:block/soulwood_planks_button_pressed", "y": 180 }, - "face=wall,facing=south,powered=true": { - "model": "malum:block/soulwood_planks_button_pressed", - "x": 90, - "y": 180, - "uvlock": true - }, - "face=ceiling,facing=south,powered=true": { - "model": "malum:block/soulwood_planks_button_pressed", - "x": 180 + "face=floor,facing=west,powered=false": { + "model": "malum:block/soulwood_planks_button", + "y": 270 }, "face=floor,facing=west,powered=true": { "model": "malum:block/soulwood_planks_button_pressed", "y": 270 }, - "face=wall,facing=west,powered=true": { - "model": "malum:block/soulwood_planks_button_pressed", + "face=wall,facing=east,powered=false": { + "model": "malum:block/soulwood_planks_button", + "uvlock": true, "x": 90, - "y": 270, - "uvlock": true + "y": 90 }, - "face=ceiling,facing=west,powered=true": { + "face=wall,facing=east,powered=true": { "model": "malum:block/soulwood_planks_button_pressed", - "x": 180, + "uvlock": true, + "x": 90, "y": 90 }, - "face=floor,facing=east,powered=true": { + "face=wall,facing=north,powered=false": { + "model": "malum:block/soulwood_planks_button", + "uvlock": true, + "x": 90 + }, + "face=wall,facing=north,powered=true": { "model": "malum:block/soulwood_planks_button_pressed", - "y": 90 + "uvlock": true, + "x": 90 }, - "face=wall,facing=east,powered=true": { + "face=wall,facing=south,powered=false": { + "model": "malum:block/soulwood_planks_button", + "uvlock": true, + "x": 90, + "y": 180 + }, + "face=wall,facing=south,powered=true": { "model": "malum:block/soulwood_planks_button_pressed", + "uvlock": true, "x": 90, - "y": 90, - "uvlock": true + "y": 180 }, - "face=ceiling,facing=east,powered=true": { + "face=wall,facing=west,powered=false": { + "model": "malum:block/soulwood_planks_button", + "uvlock": true, + "x": 90, + "y": 270 + }, + "face=wall,facing=west,powered=true": { "model": "malum:block/soulwood_planks_button_pressed", - "x": 180, + "uvlock": true, + "x": 90, "y": 270 } } diff --git a/src/generated/resources/assets/malum/blockstates/soulwood_planks_fence.json b/src/generated/resources/assets/malum/blockstates/soulwood_planks_fence.json index 45bd4226d..1b9a15546 100644 --- a/src/generated/resources/assets/malum/blockstates/soulwood_planks_fence.json +++ b/src/generated/resources/assets/malum/blockstates/soulwood_planks_fence.json @@ -6,42 +6,42 @@ } }, { - "when": { - "north": "true" - }, "apply": { "model": "malum:block/soulwood_planks_fence_side", "uvlock": true + }, + "when": { + "north": "true" } }, { - "when": { - "south": "true" - }, "apply": { "model": "malum:block/soulwood_planks_fence_side", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 + }, + "when": { + "south": "true" } }, { - "when": { - "west": "true" - }, "apply": { "model": "malum:block/soulwood_planks_fence_side", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 270 + }, + "when": { + "west": "true" } }, { - "when": { - "east": "true" - }, "apply": { "model": "malum:block/soulwood_planks_fence_side", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 90 + }, + "when": { + "east": "true" } } ] diff --git a/src/generated/resources/assets/malum/blockstates/soulwood_planks_fence_gate.json b/src/generated/resources/assets/malum/blockstates/soulwood_planks_fence_gate.json index 17dd955ff..65d2dbeda 100644 --- a/src/generated/resources/assets/malum/blockstates/soulwood_planks_fence_gate.json +++ b/src/generated/resources/assets/malum/blockstates/soulwood_planks_fence_gate.json @@ -1,80 +1,80 @@ { "variants": { - "facing=north,in_wall=false,open=false": { - "model": "malum:block/soulwood_planks_fence_gate", - "y": 180, - "uvlock": true - }, - "facing=south,in_wall=false,open=false": { - "model": "malum:block/soulwood_planks_fence_gate", - "uvlock": true - }, - "facing=west,in_wall=false,open=false": { - "model": "malum:block/soulwood_planks_fence_gate", - "y": 90, - "uvlock": true - }, "facing=east,in_wall=false,open=false": { "model": "malum:block/soulwood_planks_fence_gate", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 270 }, - "facing=north,in_wall=true,open=false": { - "model": "malum:block/soulwood_planks_fence_gate_wall", - "y": 180, - "uvlock": true + "facing=east,in_wall=false,open=true": { + "model": "malum:block/soulwood_planks_fence_gate_open", + "uvlock": true, + "y": 270 }, - "facing=south,in_wall=true,open=false": { + "facing=east,in_wall=true,open=false": { "model": "malum:block/soulwood_planks_fence_gate_wall", - "uvlock": true + "uvlock": true, + "y": 270 }, - "facing=west,in_wall=true,open=false": { - "model": "malum:block/soulwood_planks_fence_gate_wall", - "y": 90, - "uvlock": true + "facing=east,in_wall=true,open=true": { + "model": "malum:block/soulwood_planks_fence_gate_wall_open", + "uvlock": true, + "y": 270 }, - "facing=east,in_wall=true,open=false": { - "model": "malum:block/soulwood_planks_fence_gate_wall", - "y": 270, - "uvlock": true + "facing=north,in_wall=false,open=false": { + "model": "malum:block/soulwood_planks_fence_gate", + "uvlock": true, + "y": 180 }, "facing=north,in_wall=false,open=true": { "model": "malum:block/soulwood_planks_fence_gate_open", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=south,in_wall=false,open=true": { - "model": "malum:block/soulwood_planks_fence_gate_open", - "uvlock": true + "facing=north,in_wall=true,open=false": { + "model": "malum:block/soulwood_planks_fence_gate_wall", + "uvlock": true, + "y": 180 }, - "facing=west,in_wall=false,open=true": { - "model": "malum:block/soulwood_planks_fence_gate_open", - "y": 90, + "facing=north,in_wall=true,open=true": { + "model": "malum:block/soulwood_planks_fence_gate_wall_open", + "uvlock": true, + "y": 180 + }, + "facing=south,in_wall=false,open=false": { + "model": "malum:block/soulwood_planks_fence_gate", "uvlock": true }, - "facing=east,in_wall=false,open=true": { + "facing=south,in_wall=false,open=true": { "model": "malum:block/soulwood_planks_fence_gate_open", - "y": 270, "uvlock": true }, - "facing=north,in_wall=true,open=true": { - "model": "malum:block/soulwood_planks_fence_gate_wall_open", - "y": 180, + "facing=south,in_wall=true,open=false": { + "model": "malum:block/soulwood_planks_fence_gate_wall", "uvlock": true }, "facing=south,in_wall=true,open=true": { "model": "malum:block/soulwood_planks_fence_gate_wall_open", "uvlock": true }, - "facing=west,in_wall=true,open=true": { - "model": "malum:block/soulwood_planks_fence_gate_wall_open", - "y": 90, - "uvlock": true + "facing=west,in_wall=false,open=false": { + "model": "malum:block/soulwood_planks_fence_gate", + "uvlock": true, + "y": 90 }, - "facing=east,in_wall=true,open=true": { + "facing=west,in_wall=false,open=true": { + "model": "malum:block/soulwood_planks_fence_gate_open", + "uvlock": true, + "y": 90 + }, + "facing=west,in_wall=true,open=false": { + "model": "malum:block/soulwood_planks_fence_gate_wall", + "uvlock": true, + "y": 90 + }, + "facing=west,in_wall=true,open=true": { "model": "malum:block/soulwood_planks_fence_gate_wall_open", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 90 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/blockstates/soulwood_planks_slab.json b/src/generated/resources/assets/malum/blockstates/soulwood_planks_slab.json index 3140586aa..c1f27adc2 100644 --- a/src/generated/resources/assets/malum/blockstates/soulwood_planks_slab.json +++ b/src/generated/resources/assets/malum/blockstates/soulwood_planks_slab.json @@ -1,13 +1,13 @@ { "variants": { - "type=top": { - "model": "malum:block/soulwood_planks_slab_top" - }, "type=bottom": { "model": "malum:block/soulwood_planks_slab" }, "type=double": { "model": "malum:block/soulwood_planks" + }, + "type=top": { + "model": "malum:block/soulwood_planks_slab_top" } } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/blockstates/soulwood_planks_stairs.json b/src/generated/resources/assets/malum/blockstates/soulwood_planks_stairs.json index 18d45b01c..aa2aed62d 100644 --- a/src/generated/resources/assets/malum/blockstates/soulwood_planks_stairs.json +++ b/src/generated/resources/assets/malum/blockstates/soulwood_planks_stairs.json @@ -1,209 +1,209 @@ { "variants": { - "facing=north,half=top,shape=straight": { - "model": "malum:block/soulwood_planks_stairs", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=south,half=top,shape=straight": { - "model": "malum:block/soulwood_planks_stairs", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=west,half=top,shape=straight": { - "model": "malum:block/soulwood_planks_stairs", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=east,half=top,shape=straight": { - "model": "malum:block/soulwood_planks_stairs", - "x": 180, - "uvlock": true + "facing=east,half=bottom,shape=inner_left": { + "model": "malum:block/soulwood_planks_stairs_inner", + "uvlock": true, + "y": 270 }, - "facing=north,half=bottom,shape=straight": { - "model": "malum:block/soulwood_planks_stairs", - "y": 270, - "uvlock": true + "facing=east,half=bottom,shape=inner_right": { + "model": "malum:block/soulwood_planks_stairs_inner" }, - "facing=south,half=bottom,shape=straight": { - "model": "malum:block/soulwood_planks_stairs", - "y": 90, - "uvlock": true + "facing=east,half=bottom,shape=outer_left": { + "model": "malum:block/soulwood_planks_stairs_outer", + "uvlock": true, + "y": 270 }, - "facing=west,half=bottom,shape=straight": { - "model": "malum:block/soulwood_planks_stairs", - "y": 180, - "uvlock": true + "facing=east,half=bottom,shape=outer_right": { + "model": "malum:block/soulwood_planks_stairs_outer" }, "facing=east,half=bottom,shape=straight": { "model": "malum:block/soulwood_planks_stairs" }, - "facing=north,half=top,shape=inner_left": { + "facing=east,half=top,shape=inner_left": { "model": "malum:block/soulwood_planks_stairs_inner", - "x": 180, - "y": 270, - "uvlock": true + "uvlock": true, + "x": 180 }, - "facing=south,half=top,shape=inner_left": { + "facing=east,half=top,shape=inner_right": { "model": "malum:block/soulwood_planks_stairs_inner", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 90 }, - "facing=west,half=top,shape=inner_left": { - "model": "malum:block/soulwood_planks_stairs_inner", - "x": 180, - "y": 180, - "uvlock": true + "facing=east,half=top,shape=outer_left": { + "model": "malum:block/soulwood_planks_stairs_outer", + "uvlock": true, + "x": 180 }, - "facing=east,half=top,shape=inner_left": { - "model": "malum:block/soulwood_planks_stairs_inner", + "facing=east,half=top,shape=outer_right": { + "model": "malum:block/soulwood_planks_stairs_outer", + "uvlock": true, "x": 180, - "uvlock": true + "y": 90 + }, + "facing=east,half=top,shape=straight": { + "model": "malum:block/soulwood_planks_stairs", + "uvlock": true, + "x": 180 }, "facing=north,half=bottom,shape=inner_left": { "model": "malum:block/soulwood_planks_stairs_inner", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=south,half=bottom,shape=inner_left": { - "model": "malum:block/soulwood_planks_stairs_inner" - }, - "facing=west,half=bottom,shape=inner_left": { + "facing=north,half=bottom,shape=inner_right": { "model": "malum:block/soulwood_planks_stairs_inner", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 270 }, - "facing=east,half=bottom,shape=inner_left": { - "model": "malum:block/soulwood_planks_stairs_inner", - "y": 270, - "uvlock": true + "facing=north,half=bottom,shape=outer_left": { + "model": "malum:block/soulwood_planks_stairs_outer", + "uvlock": true, + "y": 180 }, - "facing=north,half=top,shape=inner_right": { - "model": "malum:block/soulwood_planks_stairs_inner", - "x": 180, - "uvlock": true + "facing=north,half=bottom,shape=outer_right": { + "model": "malum:block/soulwood_planks_stairs_outer", + "uvlock": true, + "y": 270 }, - "facing=south,half=top,shape=inner_right": { + "facing=north,half=bottom,shape=straight": { + "model": "malum:block/soulwood_planks_stairs", + "uvlock": true, + "y": 270 + }, + "facing=north,half=top,shape=inner_left": { "model": "malum:block/soulwood_planks_stairs_inner", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 270 }, - "facing=west,half=top,shape=inner_right": { + "facing=north,half=top,shape=inner_right": { "model": "malum:block/soulwood_planks_stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=outer_left": { + "model": "malum:block/soulwood_planks_stairs_outer", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 270 }, - "facing=east,half=top,shape=inner_right": { - "model": "malum:block/soulwood_planks_stairs_inner", + "facing=north,half=top,shape=outer_right": { + "model": "malum:block/soulwood_planks_stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=straight": { + "model": "malum:block/soulwood_planks_stairs", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 270 }, - "facing=north,half=bottom,shape=inner_right": { - "model": "malum:block/soulwood_planks_stairs_inner", - "y": 270, - "uvlock": true + "facing=south,half=bottom,shape=inner_left": { + "model": "malum:block/soulwood_planks_stairs_inner" }, "facing=south,half=bottom,shape=inner_right": { "model": "malum:block/soulwood_planks_stairs_inner", - "y": 90, - "uvlock": true - }, - "facing=west,half=bottom,shape=inner_right": { - "model": "malum:block/soulwood_planks_stairs_inner", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 90 }, - "facing=east,half=bottom,shape=inner_right": { - "model": "malum:block/soulwood_planks_stairs_inner" + "facing=south,half=bottom,shape=outer_left": { + "model": "malum:block/soulwood_planks_stairs_outer" }, - "facing=north,half=top,shape=outer_left": { + "facing=south,half=bottom,shape=outer_right": { "model": "malum:block/soulwood_planks_stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=straight": { + "model": "malum:block/soulwood_planks_stairs", + "uvlock": true, + "y": 90 + }, + "facing=south,half=top,shape=inner_left": { + "model": "malum:block/soulwood_planks_stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=inner_right": { + "model": "malum:block/soulwood_planks_stairs_inner", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 180 }, "facing=south,half=top,shape=outer_left": { "model": "malum:block/soulwood_planks_stairs_outer", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 90 }, - "facing=west,half=top,shape=outer_left": { + "facing=south,half=top,shape=outer_right": { "model": "malum:block/soulwood_planks_stairs_outer", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 180 }, - "facing=east,half=top,shape=outer_left": { - "model": "malum:block/soulwood_planks_stairs_outer", + "facing=south,half=top,shape=straight": { + "model": "malum:block/soulwood_planks_stairs", + "uvlock": true, "x": 180, - "uvlock": true + "y": 90 }, - "facing=north,half=bottom,shape=outer_left": { - "model": "malum:block/soulwood_planks_stairs_outer", - "y": 180, - "uvlock": true + "facing=west,half=bottom,shape=inner_left": { + "model": "malum:block/soulwood_planks_stairs_inner", + "uvlock": true, + "y": 90 }, - "facing=south,half=bottom,shape=outer_left": { - "model": "malum:block/soulwood_planks_stairs_outer" + "facing=west,half=bottom,shape=inner_right": { + "model": "malum:block/soulwood_planks_stairs_inner", + "uvlock": true, + "y": 180 }, "facing=west,half=bottom,shape=outer_left": { "model": "malum:block/soulwood_planks_stairs_outer", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 90 }, - "facing=east,half=bottom,shape=outer_left": { + "facing=west,half=bottom,shape=outer_right": { "model": "malum:block/soulwood_planks_stairs_outer", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=north,half=top,shape=outer_right": { - "model": "malum:block/soulwood_planks_stairs_outer", - "x": 180, - "uvlock": true + "facing=west,half=bottom,shape=straight": { + "model": "malum:block/soulwood_planks_stairs", + "uvlock": true, + "y": 180 }, - "facing=south,half=top,shape=outer_right": { - "model": "malum:block/soulwood_planks_stairs_outer", + "facing=west,half=top,shape=inner_left": { + "model": "malum:block/soulwood_planks_stairs_inner", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 180 }, - "facing=west,half=top,shape=outer_right": { - "model": "malum:block/soulwood_planks_stairs_outer", + "facing=west,half=top,shape=inner_right": { + "model": "malum:block/soulwood_planks_stairs_inner", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 270 }, - "facing=east,half=top,shape=outer_right": { + "facing=west,half=top,shape=outer_left": { "model": "malum:block/soulwood_planks_stairs_outer", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true - }, - "facing=north,half=bottom,shape=outer_right": { - "model": "malum:block/soulwood_planks_stairs_outer", - "y": 270, - "uvlock": true - }, - "facing=south,half=bottom,shape=outer_right": { - "model": "malum:block/soulwood_planks_stairs_outer", - "y": 90, - "uvlock": true + "y": 180 }, - "facing=west,half=bottom,shape=outer_right": { + "facing=west,half=top,shape=outer_right": { "model": "malum:block/soulwood_planks_stairs_outer", - "y": 180, - "uvlock": true + "uvlock": true, + "x": 180, + "y": 270 }, - "facing=east,half=bottom,shape=outer_right": { - "model": "malum:block/soulwood_planks_stairs_outer" + "facing=west,half=top,shape=straight": { + "model": "malum:block/soulwood_planks_stairs", + "uvlock": true, + "x": 180, + "y": 180 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/blockstates/soulwood_sign.json b/src/generated/resources/assets/malum/blockstates/soulwood_sign.json index 96283bc28..a4beadb1d 100644 --- a/src/generated/resources/assets/malum/blockstates/soulwood_sign.json +++ b/src/generated/resources/assets/malum/blockstates/soulwood_sign.json @@ -3,97 +3,97 @@ "rotation=0,waterlogged=false": { "model": "malum:block/soulwood_sign" }, - "rotation=1,waterlogged=false": { - "model": "malum:block/soulwood_sign" - }, - "rotation=2,waterlogged=false": { + "rotation=0,waterlogged=true": { "model": "malum:block/soulwood_sign" }, - "rotation=3,waterlogged=false": { + "rotation=1,waterlogged=false": { "model": "malum:block/soulwood_sign" }, - "rotation=4,waterlogged=false": { + "rotation=1,waterlogged=true": { "model": "malum:block/soulwood_sign" }, - "rotation=5,waterlogged=false": { + "rotation=10,waterlogged=false": { "model": "malum:block/soulwood_sign" }, - "rotation=6,waterlogged=false": { + "rotation=10,waterlogged=true": { "model": "malum:block/soulwood_sign" }, - "rotation=7,waterlogged=false": { + "rotation=11,waterlogged=false": { "model": "malum:block/soulwood_sign" }, - "rotation=8,waterlogged=false": { + "rotation=11,waterlogged=true": { "model": "malum:block/soulwood_sign" }, - "rotation=9,waterlogged=false": { + "rotation=12,waterlogged=false": { "model": "malum:block/soulwood_sign" }, - "rotation=10,waterlogged=false": { + "rotation=12,waterlogged=true": { "model": "malum:block/soulwood_sign" }, - "rotation=11,waterlogged=false": { + "rotation=13,waterlogged=false": { "model": "malum:block/soulwood_sign" }, - "rotation=12,waterlogged=false": { + "rotation=13,waterlogged=true": { "model": "malum:block/soulwood_sign" }, - "rotation=13,waterlogged=false": { + "rotation=14,waterlogged=false": { "model": "malum:block/soulwood_sign" }, - "rotation=14,waterlogged=false": { + "rotation=14,waterlogged=true": { "model": "malum:block/soulwood_sign" }, "rotation=15,waterlogged=false": { "model": "malum:block/soulwood_sign" }, - "rotation=0,waterlogged=true": { + "rotation=15,waterlogged=true": { "model": "malum:block/soulwood_sign" }, - "rotation=1,waterlogged=true": { + "rotation=2,waterlogged=false": { "model": "malum:block/soulwood_sign" }, "rotation=2,waterlogged=true": { "model": "malum:block/soulwood_sign" }, + "rotation=3,waterlogged=false": { + "model": "malum:block/soulwood_sign" + }, "rotation=3,waterlogged=true": { "model": "malum:block/soulwood_sign" }, - "rotation=4,waterlogged=true": { + "rotation=4,waterlogged=false": { "model": "malum:block/soulwood_sign" }, - "rotation=5,waterlogged=true": { + "rotation=4,waterlogged=true": { "model": "malum:block/soulwood_sign" }, - "rotation=6,waterlogged=true": { + "rotation=5,waterlogged=false": { "model": "malum:block/soulwood_sign" }, - "rotation=7,waterlogged=true": { + "rotation=5,waterlogged=true": { "model": "malum:block/soulwood_sign" }, - "rotation=8,waterlogged=true": { + "rotation=6,waterlogged=false": { "model": "malum:block/soulwood_sign" }, - "rotation=9,waterlogged=true": { + "rotation=6,waterlogged=true": { "model": "malum:block/soulwood_sign" }, - "rotation=10,waterlogged=true": { + "rotation=7,waterlogged=false": { "model": "malum:block/soulwood_sign" }, - "rotation=11,waterlogged=true": { + "rotation=7,waterlogged=true": { "model": "malum:block/soulwood_sign" }, - "rotation=12,waterlogged=true": { + "rotation=8,waterlogged=false": { "model": "malum:block/soulwood_sign" }, - "rotation=13,waterlogged=true": { + "rotation=8,waterlogged=true": { "model": "malum:block/soulwood_sign" }, - "rotation=14,waterlogged=true": { + "rotation=9,waterlogged=false": { "model": "malum:block/soulwood_sign" }, - "rotation=15,waterlogged=true": { + "rotation=9,waterlogged=true": { "model": "malum:block/soulwood_sign" } } diff --git a/src/generated/resources/assets/malum/blockstates/soulwood_tiles_slab.json b/src/generated/resources/assets/malum/blockstates/soulwood_tiles_slab.json index 845081b21..c83381110 100644 --- a/src/generated/resources/assets/malum/blockstates/soulwood_tiles_slab.json +++ b/src/generated/resources/assets/malum/blockstates/soulwood_tiles_slab.json @@ -1,13 +1,13 @@ { "variants": { - "type=top": { - "model": "malum:block/soulwood_tiles_slab_top" - }, "type=bottom": { "model": "malum:block/soulwood_tiles_slab" }, "type=double": { "model": "malum:block/soulwood_tiles" + }, + "type=top": { + "model": "malum:block/soulwood_tiles_slab_top" } } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/blockstates/soulwood_tiles_stairs.json b/src/generated/resources/assets/malum/blockstates/soulwood_tiles_stairs.json index 49e4d5104..e9e4faf1d 100644 --- a/src/generated/resources/assets/malum/blockstates/soulwood_tiles_stairs.json +++ b/src/generated/resources/assets/malum/blockstates/soulwood_tiles_stairs.json @@ -1,209 +1,209 @@ { "variants": { - "facing=north,half=top,shape=straight": { - "model": "malum:block/soulwood_tiles_stairs", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=south,half=top,shape=straight": { - "model": "malum:block/soulwood_tiles_stairs", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=west,half=top,shape=straight": { - "model": "malum:block/soulwood_tiles_stairs", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=east,half=top,shape=straight": { - "model": "malum:block/soulwood_tiles_stairs", - "x": 180, - "uvlock": true + "facing=east,half=bottom,shape=inner_left": { + "model": "malum:block/soulwood_tiles_stairs_inner", + "uvlock": true, + "y": 270 }, - "facing=north,half=bottom,shape=straight": { - "model": "malum:block/soulwood_tiles_stairs", - "y": 270, - "uvlock": true + "facing=east,half=bottom,shape=inner_right": { + "model": "malum:block/soulwood_tiles_stairs_inner" }, - "facing=south,half=bottom,shape=straight": { - "model": "malum:block/soulwood_tiles_stairs", - "y": 90, - "uvlock": true + "facing=east,half=bottom,shape=outer_left": { + "model": "malum:block/soulwood_tiles_stairs_outer", + "uvlock": true, + "y": 270 }, - "facing=west,half=bottom,shape=straight": { - "model": "malum:block/soulwood_tiles_stairs", - "y": 180, - "uvlock": true + "facing=east,half=bottom,shape=outer_right": { + "model": "malum:block/soulwood_tiles_stairs_outer" }, "facing=east,half=bottom,shape=straight": { "model": "malum:block/soulwood_tiles_stairs" }, - "facing=north,half=top,shape=inner_left": { + "facing=east,half=top,shape=inner_left": { "model": "malum:block/soulwood_tiles_stairs_inner", - "x": 180, - "y": 270, - "uvlock": true + "uvlock": true, + "x": 180 }, - "facing=south,half=top,shape=inner_left": { + "facing=east,half=top,shape=inner_right": { "model": "malum:block/soulwood_tiles_stairs_inner", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 90 }, - "facing=west,half=top,shape=inner_left": { - "model": "malum:block/soulwood_tiles_stairs_inner", - "x": 180, - "y": 180, - "uvlock": true + "facing=east,half=top,shape=outer_left": { + "model": "malum:block/soulwood_tiles_stairs_outer", + "uvlock": true, + "x": 180 }, - "facing=east,half=top,shape=inner_left": { - "model": "malum:block/soulwood_tiles_stairs_inner", + "facing=east,half=top,shape=outer_right": { + "model": "malum:block/soulwood_tiles_stairs_outer", + "uvlock": true, "x": 180, - "uvlock": true + "y": 90 + }, + "facing=east,half=top,shape=straight": { + "model": "malum:block/soulwood_tiles_stairs", + "uvlock": true, + "x": 180 }, "facing=north,half=bottom,shape=inner_left": { "model": "malum:block/soulwood_tiles_stairs_inner", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=south,half=bottom,shape=inner_left": { - "model": "malum:block/soulwood_tiles_stairs_inner" - }, - "facing=west,half=bottom,shape=inner_left": { + "facing=north,half=bottom,shape=inner_right": { "model": "malum:block/soulwood_tiles_stairs_inner", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 270 }, - "facing=east,half=bottom,shape=inner_left": { - "model": "malum:block/soulwood_tiles_stairs_inner", - "y": 270, - "uvlock": true + "facing=north,half=bottom,shape=outer_left": { + "model": "malum:block/soulwood_tiles_stairs_outer", + "uvlock": true, + "y": 180 }, - "facing=north,half=top,shape=inner_right": { - "model": "malum:block/soulwood_tiles_stairs_inner", - "x": 180, - "uvlock": true + "facing=north,half=bottom,shape=outer_right": { + "model": "malum:block/soulwood_tiles_stairs_outer", + "uvlock": true, + "y": 270 }, - "facing=south,half=top,shape=inner_right": { + "facing=north,half=bottom,shape=straight": { + "model": "malum:block/soulwood_tiles_stairs", + "uvlock": true, + "y": 270 + }, + "facing=north,half=top,shape=inner_left": { "model": "malum:block/soulwood_tiles_stairs_inner", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 270 }, - "facing=west,half=top,shape=inner_right": { + "facing=north,half=top,shape=inner_right": { "model": "malum:block/soulwood_tiles_stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=outer_left": { + "model": "malum:block/soulwood_tiles_stairs_outer", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 270 }, - "facing=east,half=top,shape=inner_right": { - "model": "malum:block/soulwood_tiles_stairs_inner", + "facing=north,half=top,shape=outer_right": { + "model": "malum:block/soulwood_tiles_stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=straight": { + "model": "malum:block/soulwood_tiles_stairs", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 270 }, - "facing=north,half=bottom,shape=inner_right": { - "model": "malum:block/soulwood_tiles_stairs_inner", - "y": 270, - "uvlock": true + "facing=south,half=bottom,shape=inner_left": { + "model": "malum:block/soulwood_tiles_stairs_inner" }, "facing=south,half=bottom,shape=inner_right": { "model": "malum:block/soulwood_tiles_stairs_inner", - "y": 90, - "uvlock": true - }, - "facing=west,half=bottom,shape=inner_right": { - "model": "malum:block/soulwood_tiles_stairs_inner", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 90 }, - "facing=east,half=bottom,shape=inner_right": { - "model": "malum:block/soulwood_tiles_stairs_inner" + "facing=south,half=bottom,shape=outer_left": { + "model": "malum:block/soulwood_tiles_stairs_outer" }, - "facing=north,half=top,shape=outer_left": { + "facing=south,half=bottom,shape=outer_right": { "model": "malum:block/soulwood_tiles_stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=straight": { + "model": "malum:block/soulwood_tiles_stairs", + "uvlock": true, + "y": 90 + }, + "facing=south,half=top,shape=inner_left": { + "model": "malum:block/soulwood_tiles_stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=inner_right": { + "model": "malum:block/soulwood_tiles_stairs_inner", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 180 }, "facing=south,half=top,shape=outer_left": { "model": "malum:block/soulwood_tiles_stairs_outer", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 90 }, - "facing=west,half=top,shape=outer_left": { + "facing=south,half=top,shape=outer_right": { "model": "malum:block/soulwood_tiles_stairs_outer", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 180 }, - "facing=east,half=top,shape=outer_left": { - "model": "malum:block/soulwood_tiles_stairs_outer", + "facing=south,half=top,shape=straight": { + "model": "malum:block/soulwood_tiles_stairs", + "uvlock": true, "x": 180, - "uvlock": true + "y": 90 }, - "facing=north,half=bottom,shape=outer_left": { - "model": "malum:block/soulwood_tiles_stairs_outer", - "y": 180, - "uvlock": true + "facing=west,half=bottom,shape=inner_left": { + "model": "malum:block/soulwood_tiles_stairs_inner", + "uvlock": true, + "y": 90 }, - "facing=south,half=bottom,shape=outer_left": { - "model": "malum:block/soulwood_tiles_stairs_outer" + "facing=west,half=bottom,shape=inner_right": { + "model": "malum:block/soulwood_tiles_stairs_inner", + "uvlock": true, + "y": 180 }, "facing=west,half=bottom,shape=outer_left": { "model": "malum:block/soulwood_tiles_stairs_outer", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 90 }, - "facing=east,half=bottom,shape=outer_left": { + "facing=west,half=bottom,shape=outer_right": { "model": "malum:block/soulwood_tiles_stairs_outer", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=north,half=top,shape=outer_right": { - "model": "malum:block/soulwood_tiles_stairs_outer", - "x": 180, - "uvlock": true + "facing=west,half=bottom,shape=straight": { + "model": "malum:block/soulwood_tiles_stairs", + "uvlock": true, + "y": 180 }, - "facing=south,half=top,shape=outer_right": { - "model": "malum:block/soulwood_tiles_stairs_outer", + "facing=west,half=top,shape=inner_left": { + "model": "malum:block/soulwood_tiles_stairs_inner", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 180 }, - "facing=west,half=top,shape=outer_right": { - "model": "malum:block/soulwood_tiles_stairs_outer", + "facing=west,half=top,shape=inner_right": { + "model": "malum:block/soulwood_tiles_stairs_inner", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 270 }, - "facing=east,half=top,shape=outer_right": { + "facing=west,half=top,shape=outer_left": { "model": "malum:block/soulwood_tiles_stairs_outer", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true - }, - "facing=north,half=bottom,shape=outer_right": { - "model": "malum:block/soulwood_tiles_stairs_outer", - "y": 270, - "uvlock": true - }, - "facing=south,half=bottom,shape=outer_right": { - "model": "malum:block/soulwood_tiles_stairs_outer", - "y": 90, - "uvlock": true + "y": 180 }, - "facing=west,half=bottom,shape=outer_right": { + "facing=west,half=top,shape=outer_right": { "model": "malum:block/soulwood_tiles_stairs_outer", - "y": 180, - "uvlock": true + "uvlock": true, + "x": 180, + "y": 270 }, - "facing=east,half=bottom,shape=outer_right": { - "model": "malum:block/soulwood_tiles_stairs_outer" + "facing=west,half=top,shape=straight": { + "model": "malum:block/soulwood_tiles_stairs", + "uvlock": true, + "x": 180, + "y": 180 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/blockstates/soulwood_totem_pole.json b/src/generated/resources/assets/malum/blockstates/soulwood_totem_pole.json index 651a40d6c..46583fe04 100644 --- a/src/generated/resources/assets/malum/blockstates/soulwood_totem_pole.json +++ b/src/generated/resources/assets/malum/blockstates/soulwood_totem_pole.json @@ -1,124 +1,124 @@ { "variants": { - "facing=north,spirit_type=aerial": { - "model": "malum:block/soulwood_totem_pole_aerial" - }, - "facing=south,spirit_type=aerial": { + "facing=east,spirit_type=aerial": { "model": "malum:block/soulwood_totem_pole_aerial", - "y": 180 + "y": 90 }, - "facing=west,spirit_type=aerial": { - "model": "malum:block/soulwood_totem_pole_aerial", - "y": 270 + "facing=east,spirit_type=aqueous": { + "model": "malum:block/soulwood_totem_pole_aqueous", + "y": 90 }, - "facing=east,spirit_type=aerial": { - "model": "malum:block/soulwood_totem_pole_aerial", + "facing=east,spirit_type=arcane": { + "model": "malum:block/soulwood_totem_pole_arcane", "y": 90 }, - "facing=north,spirit_type=aqueous": { - "model": "malum:block/soulwood_totem_pole_aqueous" + "facing=east,spirit_type=earthen": { + "model": "malum:block/soulwood_totem_pole_earthen", + "y": 90 }, - "facing=south,spirit_type=aqueous": { - "model": "malum:block/soulwood_totem_pole_aqueous", - "y": 180 + "facing=east,spirit_type=eldritch": { + "model": "malum:block/soulwood_totem_pole_eldritch", + "y": 90 }, - "facing=west,spirit_type=aqueous": { - "model": "malum:block/soulwood_totem_pole_aqueous", - "y": 270 + "facing=east,spirit_type=infernal": { + "model": "malum:block/soulwood_totem_pole_infernal", + "y": 90 }, - "facing=east,spirit_type=aqueous": { - "model": "malum:block/soulwood_totem_pole_aqueous", + "facing=east,spirit_type=sacred": { + "model": "malum:block/soulwood_totem_pole_sacred", "y": 90 }, + "facing=east,spirit_type=wicked": { + "model": "malum:block/soulwood_totem_pole_wicked", + "y": 90 + }, + "facing=north,spirit_type=aerial": { + "model": "malum:block/soulwood_totem_pole_aerial" + }, + "facing=north,spirit_type=aqueous": { + "model": "malum:block/soulwood_totem_pole_aqueous" + }, "facing=north,spirit_type=arcane": { "model": "malum:block/soulwood_totem_pole_arcane" }, - "facing=south,spirit_type=arcane": { - "model": "malum:block/soulwood_totem_pole_arcane", + "facing=north,spirit_type=earthen": { + "model": "malum:block/soulwood_totem_pole_earthen" + }, + "facing=north,spirit_type=eldritch": { + "model": "malum:block/soulwood_totem_pole_eldritch" + }, + "facing=north,spirit_type=infernal": { + "model": "malum:block/soulwood_totem_pole_infernal" + }, + "facing=north,spirit_type=sacred": { + "model": "malum:block/soulwood_totem_pole_sacred" + }, + "facing=north,spirit_type=wicked": { + "model": "malum:block/soulwood_totem_pole_wicked" + }, + "facing=south,spirit_type=aerial": { + "model": "malum:block/soulwood_totem_pole_aerial", "y": 180 }, - "facing=west,spirit_type=arcane": { - "model": "malum:block/soulwood_totem_pole_arcane", - "y": 270 + "facing=south,spirit_type=aqueous": { + "model": "malum:block/soulwood_totem_pole_aqueous", + "y": 180 }, - "facing=east,spirit_type=arcane": { + "facing=south,spirit_type=arcane": { "model": "malum:block/soulwood_totem_pole_arcane", - "y": 90 - }, - "facing=north,spirit_type=earthen": { - "model": "malum:block/soulwood_totem_pole_earthen" + "y": 180 }, "facing=south,spirit_type=earthen": { "model": "malum:block/soulwood_totem_pole_earthen", "y": 180 }, - "facing=west,spirit_type=earthen": { - "model": "malum:block/soulwood_totem_pole_earthen", - "y": 270 + "facing=south,spirit_type=eldritch": { + "model": "malum:block/soulwood_totem_pole_eldritch", + "y": 180 }, - "facing=east,spirit_type=earthen": { - "model": "malum:block/soulwood_totem_pole_earthen", - "y": 90 + "facing=south,spirit_type=infernal": { + "model": "malum:block/soulwood_totem_pole_infernal", + "y": 180 }, - "facing=north,spirit_type=eldritch": { - "model": "malum:block/soulwood_totem_pole_eldritch" + "facing=south,spirit_type=sacred": { + "model": "malum:block/soulwood_totem_pole_sacred", + "y": 180 }, - "facing=south,spirit_type=eldritch": { - "model": "malum:block/soulwood_totem_pole_eldritch", + "facing=south,spirit_type=wicked": { + "model": "malum:block/soulwood_totem_pole_wicked", "y": 180 }, - "facing=west,spirit_type=eldritch": { - "model": "malum:block/soulwood_totem_pole_eldritch", + "facing=west,spirit_type=aerial": { + "model": "malum:block/soulwood_totem_pole_aerial", "y": 270 }, - "facing=east,spirit_type=eldritch": { - "model": "malum:block/soulwood_totem_pole_eldritch", - "y": 90 + "facing=west,spirit_type=aqueous": { + "model": "malum:block/soulwood_totem_pole_aqueous", + "y": 270 }, - "facing=north,spirit_type=infernal": { - "model": "malum:block/soulwood_totem_pole_infernal" + "facing=west,spirit_type=arcane": { + "model": "malum:block/soulwood_totem_pole_arcane", + "y": 270 }, - "facing=south,spirit_type=infernal": { - "model": "malum:block/soulwood_totem_pole_infernal", - "y": 180 + "facing=west,spirit_type=earthen": { + "model": "malum:block/soulwood_totem_pole_earthen", + "y": 270 }, - "facing=west,spirit_type=infernal": { - "model": "malum:block/soulwood_totem_pole_infernal", + "facing=west,spirit_type=eldritch": { + "model": "malum:block/soulwood_totem_pole_eldritch", "y": 270 }, - "facing=east,spirit_type=infernal": { + "facing=west,spirit_type=infernal": { "model": "malum:block/soulwood_totem_pole_infernal", - "y": 90 - }, - "facing=north,spirit_type=sacred": { - "model": "malum:block/soulwood_totem_pole_sacred" - }, - "facing=south,spirit_type=sacred": { - "model": "malum:block/soulwood_totem_pole_sacred", - "y": 180 + "y": 270 }, "facing=west,spirit_type=sacred": { "model": "malum:block/soulwood_totem_pole_sacred", "y": 270 }, - "facing=east,spirit_type=sacred": { - "model": "malum:block/soulwood_totem_pole_sacred", - "y": 90 - }, - "facing=north,spirit_type=wicked": { - "model": "malum:block/soulwood_totem_pole_wicked" - }, - "facing=south,spirit_type=wicked": { - "model": "malum:block/soulwood_totem_pole_wicked", - "y": 180 - }, "facing=west,spirit_type=wicked": { "model": "malum:block/soulwood_totem_pole_wicked", "y": 270 - }, - "facing=east,spirit_type=wicked": { - "model": "malum:block/soulwood_totem_pole_wicked", - "y": 90 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/blockstates/soulwood_trapdoor.json b/src/generated/resources/assets/malum/blockstates/soulwood_trapdoor.json index 3f55353cf..00ceca56f 100644 --- a/src/generated/resources/assets/malum/blockstates/soulwood_trapdoor.json +++ b/src/generated/resources/assets/malum/blockstates/soulwood_trapdoor.json @@ -1,67 +1,67 @@ { "variants": { - "facing=north,half=top,open=false": { - "model": "malum:block/soulwood_trapdoor_top" - }, - "facing=south,half=top,open=false": { - "model": "malum:block/soulwood_trapdoor_top", - "y": 180 + "facing=east,half=bottom,open=false": { + "model": "malum:block/soulwood_trapdoor_bottom", + "y": 90 }, - "facing=west,half=top,open=false": { - "model": "malum:block/soulwood_trapdoor_top", - "y": 270 + "facing=east,half=bottom,open=true": { + "model": "malum:block/soulwood_trapdoor_open", + "y": 90 }, "facing=east,half=top,open=false": { "model": "malum:block/soulwood_trapdoor_top", "y": 90 }, + "facing=east,half=top,open=true": { + "model": "malum:block/soulwood_trapdoor_open", + "x": 180, + "y": 270 + }, "facing=north,half=bottom,open=false": { "model": "malum:block/soulwood_trapdoor_bottom" }, - "facing=south,half=bottom,open=false": { - "model": "malum:block/soulwood_trapdoor_bottom", - "y": 180 - }, - "facing=west,half=bottom,open=false": { - "model": "malum:block/soulwood_trapdoor_bottom", - "y": 270 + "facing=north,half=bottom,open=true": { + "model": "malum:block/soulwood_trapdoor_open" }, - "facing=east,half=bottom,open=false": { - "model": "malum:block/soulwood_trapdoor_bottom", - "y": 90 + "facing=north,half=top,open=false": { + "model": "malum:block/soulwood_trapdoor_top" }, "facing=north,half=top,open=true": { "model": "malum:block/soulwood_trapdoor_open", "x": 180, "y": 180 }, - "facing=south,half=top,open=true": { - "model": "malum:block/soulwood_trapdoor_open", - "x": 180 - }, - "facing=west,half=top,open=true": { - "model": "malum:block/soulwood_trapdoor_open", - "x": 180, - "y": 90 + "facing=south,half=bottom,open=false": { + "model": "malum:block/soulwood_trapdoor_bottom", + "y": 180 }, - "facing=east,half=top,open=true": { + "facing=south,half=bottom,open=true": { "model": "malum:block/soulwood_trapdoor_open", - "x": 180, - "y": 270 + "y": 180 }, - "facing=north,half=bottom,open=true": { - "model": "malum:block/soulwood_trapdoor_open" + "facing=south,half=top,open=false": { + "model": "malum:block/soulwood_trapdoor_top", + "y": 180 }, - "facing=south,half=bottom,open=true": { + "facing=south,half=top,open=true": { "model": "malum:block/soulwood_trapdoor_open", - "y": 180 + "x": 180 + }, + "facing=west,half=bottom,open=false": { + "model": "malum:block/soulwood_trapdoor_bottom", + "y": 270 }, "facing=west,half=bottom,open=true": { "model": "malum:block/soulwood_trapdoor_open", "y": 270 }, - "facing=east,half=bottom,open=true": { + "facing=west,half=top,open=false": { + "model": "malum:block/soulwood_trapdoor_top", + "y": 270 + }, + "facing=west,half=top,open=true": { "model": "malum:block/soulwood_trapdoor_open", + "x": 180, "y": 90 } } diff --git a/src/generated/resources/assets/malum/blockstates/soulwood_wall_sign.json b/src/generated/resources/assets/malum/blockstates/soulwood_wall_sign.json index f4a9e6a85..630413f23 100644 --- a/src/generated/resources/assets/malum/blockstates/soulwood_wall_sign.json +++ b/src/generated/resources/assets/malum/blockstates/soulwood_wall_sign.json @@ -1,27 +1,27 @@ { "variants": { - "facing=north,waterlogged=false": { + "facing=east,waterlogged=false": { "model": "malum:block/soulwood_wall_sign" }, - "facing=south,waterlogged=false": { + "facing=east,waterlogged=true": { "model": "malum:block/soulwood_wall_sign" }, - "facing=west,waterlogged=false": { + "facing=north,waterlogged=false": { "model": "malum:block/soulwood_wall_sign" }, - "facing=east,waterlogged=false": { + "facing=north,waterlogged=true": { "model": "malum:block/soulwood_wall_sign" }, - "facing=north,waterlogged=true": { + "facing=south,waterlogged=false": { "model": "malum:block/soulwood_wall_sign" }, "facing=south,waterlogged=true": { "model": "malum:block/soulwood_wall_sign" }, - "facing=west,waterlogged=true": { + "facing=west,waterlogged=false": { "model": "malum:block/soulwood_wall_sign" }, - "facing=east,waterlogged=true": { + "facing=west,waterlogged=true": { "model": "malum:block/soulwood_wall_sign" } } diff --git a/src/generated/resources/assets/malum/blockstates/spirit_catalyzer.json b/src/generated/resources/assets/malum/blockstates/spirit_catalyzer.json index 5da48e699..48938eecb 100644 --- a/src/generated/resources/assets/malum/blockstates/spirit_catalyzer.json +++ b/src/generated/resources/assets/malum/blockstates/spirit_catalyzer.json @@ -1,34 +1,34 @@ { "variants": { - "facing=north,waterlogged=false": { - "model": "malum:block/spirit_catalyzer" - }, - "facing=south,waterlogged=false": { - "model": "malum:block/spirit_catalyzer", - "y": 180 - }, - "facing=west,waterlogged=false": { + "facing=east,waterlogged=false": { "model": "malum:block/spirit_catalyzer", - "y": 270 + "y": 90 }, - "facing=east,waterlogged=false": { + "facing=east,waterlogged=true": { "model": "malum:block/spirit_catalyzer", "y": 90 }, + "facing=north,waterlogged=false": { + "model": "malum:block/spirit_catalyzer" + }, "facing=north,waterlogged=true": { "model": "malum:block/spirit_catalyzer" }, + "facing=south,waterlogged=false": { + "model": "malum:block/spirit_catalyzer", + "y": 180 + }, "facing=south,waterlogged=true": { "model": "malum:block/spirit_catalyzer", "y": 180 }, - "facing=west,waterlogged=true": { + "facing=west,waterlogged=false": { "model": "malum:block/spirit_catalyzer", "y": 270 }, - "facing=east,waterlogged=true": { + "facing=west,waterlogged=true": { "model": "malum:block/spirit_catalyzer", - "y": 90 + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/blockstates/spirit_catalyzer_component.json b/src/generated/resources/assets/malum/blockstates/spirit_catalyzer_component.json index 8cc36f87a..3d294fb91 100644 --- a/src/generated/resources/assets/malum/blockstates/spirit_catalyzer_component.json +++ b/src/generated/resources/assets/malum/blockstates/spirit_catalyzer_component.json @@ -1,5 +1,9 @@ { "variants": { + "facing=east": { + "model": "malum:block/spirit_catalyzer_component", + "y": 90 + }, "facing=north": { "model": "malum:block/spirit_catalyzer_component" }, @@ -10,10 +14,6 @@ "facing=west": { "model": "malum:block/spirit_catalyzer_component", "y": 270 - }, - "facing=east": { - "model": "malum:block/spirit_catalyzer_component", - "y": 90 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/blockstates/tainted_rock_bricks_slab.json b/src/generated/resources/assets/malum/blockstates/tainted_rock_bricks_slab.json index 66747a077..881cbba54 100644 --- a/src/generated/resources/assets/malum/blockstates/tainted_rock_bricks_slab.json +++ b/src/generated/resources/assets/malum/blockstates/tainted_rock_bricks_slab.json @@ -1,13 +1,13 @@ { "variants": { - "type=top": { - "model": "malum:block/tainted_rock_bricks_slab_top" - }, "type=bottom": { "model": "malum:block/tainted_rock_bricks_slab" }, "type=double": { "model": "malum:block/tainted_rock_bricks" + }, + "type=top": { + "model": "malum:block/tainted_rock_bricks_slab_top" } } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/blockstates/tainted_rock_bricks_stairs.json b/src/generated/resources/assets/malum/blockstates/tainted_rock_bricks_stairs.json index 3b212f54f..a01ba4de8 100644 --- a/src/generated/resources/assets/malum/blockstates/tainted_rock_bricks_stairs.json +++ b/src/generated/resources/assets/malum/blockstates/tainted_rock_bricks_stairs.json @@ -1,209 +1,209 @@ { "variants": { - "facing=north,half=top,shape=straight": { - "model": "malum:block/tainted_rock_bricks_stairs", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=south,half=top,shape=straight": { - "model": "malum:block/tainted_rock_bricks_stairs", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=west,half=top,shape=straight": { - "model": "malum:block/tainted_rock_bricks_stairs", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=east,half=top,shape=straight": { - "model": "malum:block/tainted_rock_bricks_stairs", - "x": 180, - "uvlock": true + "facing=east,half=bottom,shape=inner_left": { + "model": "malum:block/tainted_rock_bricks_stairs_inner", + "uvlock": true, + "y": 270 }, - "facing=north,half=bottom,shape=straight": { - "model": "malum:block/tainted_rock_bricks_stairs", - "y": 270, - "uvlock": true + "facing=east,half=bottom,shape=inner_right": { + "model": "malum:block/tainted_rock_bricks_stairs_inner" }, - "facing=south,half=bottom,shape=straight": { - "model": "malum:block/tainted_rock_bricks_stairs", - "y": 90, - "uvlock": true + "facing=east,half=bottom,shape=outer_left": { + "model": "malum:block/tainted_rock_bricks_stairs_outer", + "uvlock": true, + "y": 270 }, - "facing=west,half=bottom,shape=straight": { - "model": "malum:block/tainted_rock_bricks_stairs", - "y": 180, - "uvlock": true + "facing=east,half=bottom,shape=outer_right": { + "model": "malum:block/tainted_rock_bricks_stairs_outer" }, "facing=east,half=bottom,shape=straight": { "model": "malum:block/tainted_rock_bricks_stairs" }, - "facing=north,half=top,shape=inner_left": { + "facing=east,half=top,shape=inner_left": { "model": "malum:block/tainted_rock_bricks_stairs_inner", - "x": 180, - "y": 270, - "uvlock": true + "uvlock": true, + "x": 180 }, - "facing=south,half=top,shape=inner_left": { + "facing=east,half=top,shape=inner_right": { "model": "malum:block/tainted_rock_bricks_stairs_inner", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 90 }, - "facing=west,half=top,shape=inner_left": { - "model": "malum:block/tainted_rock_bricks_stairs_inner", - "x": 180, - "y": 180, - "uvlock": true + "facing=east,half=top,shape=outer_left": { + "model": "malum:block/tainted_rock_bricks_stairs_outer", + "uvlock": true, + "x": 180 }, - "facing=east,half=top,shape=inner_left": { - "model": "malum:block/tainted_rock_bricks_stairs_inner", + "facing=east,half=top,shape=outer_right": { + "model": "malum:block/tainted_rock_bricks_stairs_outer", + "uvlock": true, "x": 180, - "uvlock": true + "y": 90 + }, + "facing=east,half=top,shape=straight": { + "model": "malum:block/tainted_rock_bricks_stairs", + "uvlock": true, + "x": 180 }, "facing=north,half=bottom,shape=inner_left": { "model": "malum:block/tainted_rock_bricks_stairs_inner", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=south,half=bottom,shape=inner_left": { - "model": "malum:block/tainted_rock_bricks_stairs_inner" - }, - "facing=west,half=bottom,shape=inner_left": { + "facing=north,half=bottom,shape=inner_right": { "model": "malum:block/tainted_rock_bricks_stairs_inner", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 270 }, - "facing=east,half=bottom,shape=inner_left": { - "model": "malum:block/tainted_rock_bricks_stairs_inner", - "y": 270, - "uvlock": true + "facing=north,half=bottom,shape=outer_left": { + "model": "malum:block/tainted_rock_bricks_stairs_outer", + "uvlock": true, + "y": 180 }, - "facing=north,half=top,shape=inner_right": { - "model": "malum:block/tainted_rock_bricks_stairs_inner", - "x": 180, - "uvlock": true + "facing=north,half=bottom,shape=outer_right": { + "model": "malum:block/tainted_rock_bricks_stairs_outer", + "uvlock": true, + "y": 270 }, - "facing=south,half=top,shape=inner_right": { + "facing=north,half=bottom,shape=straight": { + "model": "malum:block/tainted_rock_bricks_stairs", + "uvlock": true, + "y": 270 + }, + "facing=north,half=top,shape=inner_left": { "model": "malum:block/tainted_rock_bricks_stairs_inner", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 270 }, - "facing=west,half=top,shape=inner_right": { + "facing=north,half=top,shape=inner_right": { "model": "malum:block/tainted_rock_bricks_stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=outer_left": { + "model": "malum:block/tainted_rock_bricks_stairs_outer", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 270 }, - "facing=east,half=top,shape=inner_right": { - "model": "malum:block/tainted_rock_bricks_stairs_inner", + "facing=north,half=top,shape=outer_right": { + "model": "malum:block/tainted_rock_bricks_stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=straight": { + "model": "malum:block/tainted_rock_bricks_stairs", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 270 }, - "facing=north,half=bottom,shape=inner_right": { - "model": "malum:block/tainted_rock_bricks_stairs_inner", - "y": 270, - "uvlock": true + "facing=south,half=bottom,shape=inner_left": { + "model": "malum:block/tainted_rock_bricks_stairs_inner" }, "facing=south,half=bottom,shape=inner_right": { "model": "malum:block/tainted_rock_bricks_stairs_inner", - "y": 90, - "uvlock": true - }, - "facing=west,half=bottom,shape=inner_right": { - "model": "malum:block/tainted_rock_bricks_stairs_inner", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 90 }, - "facing=east,half=bottom,shape=inner_right": { - "model": "malum:block/tainted_rock_bricks_stairs_inner" + "facing=south,half=bottom,shape=outer_left": { + "model": "malum:block/tainted_rock_bricks_stairs_outer" }, - "facing=north,half=top,shape=outer_left": { + "facing=south,half=bottom,shape=outer_right": { "model": "malum:block/tainted_rock_bricks_stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=straight": { + "model": "malum:block/tainted_rock_bricks_stairs", + "uvlock": true, + "y": 90 + }, + "facing=south,half=top,shape=inner_left": { + "model": "malum:block/tainted_rock_bricks_stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=inner_right": { + "model": "malum:block/tainted_rock_bricks_stairs_inner", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 180 }, "facing=south,half=top,shape=outer_left": { "model": "malum:block/tainted_rock_bricks_stairs_outer", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 90 }, - "facing=west,half=top,shape=outer_left": { + "facing=south,half=top,shape=outer_right": { "model": "malum:block/tainted_rock_bricks_stairs_outer", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 180 }, - "facing=east,half=top,shape=outer_left": { - "model": "malum:block/tainted_rock_bricks_stairs_outer", + "facing=south,half=top,shape=straight": { + "model": "malum:block/tainted_rock_bricks_stairs", + "uvlock": true, "x": 180, - "uvlock": true + "y": 90 }, - "facing=north,half=bottom,shape=outer_left": { - "model": "malum:block/tainted_rock_bricks_stairs_outer", - "y": 180, - "uvlock": true + "facing=west,half=bottom,shape=inner_left": { + "model": "malum:block/tainted_rock_bricks_stairs_inner", + "uvlock": true, + "y": 90 }, - "facing=south,half=bottom,shape=outer_left": { - "model": "malum:block/tainted_rock_bricks_stairs_outer" + "facing=west,half=bottom,shape=inner_right": { + "model": "malum:block/tainted_rock_bricks_stairs_inner", + "uvlock": true, + "y": 180 }, "facing=west,half=bottom,shape=outer_left": { "model": "malum:block/tainted_rock_bricks_stairs_outer", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 90 }, - "facing=east,half=bottom,shape=outer_left": { + "facing=west,half=bottom,shape=outer_right": { "model": "malum:block/tainted_rock_bricks_stairs_outer", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=north,half=top,shape=outer_right": { - "model": "malum:block/tainted_rock_bricks_stairs_outer", - "x": 180, - "uvlock": true + "facing=west,half=bottom,shape=straight": { + "model": "malum:block/tainted_rock_bricks_stairs", + "uvlock": true, + "y": 180 }, - "facing=south,half=top,shape=outer_right": { - "model": "malum:block/tainted_rock_bricks_stairs_outer", + "facing=west,half=top,shape=inner_left": { + "model": "malum:block/tainted_rock_bricks_stairs_inner", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 180 }, - "facing=west,half=top,shape=outer_right": { - "model": "malum:block/tainted_rock_bricks_stairs_outer", + "facing=west,half=top,shape=inner_right": { + "model": "malum:block/tainted_rock_bricks_stairs_inner", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 270 }, - "facing=east,half=top,shape=outer_right": { + "facing=west,half=top,shape=outer_left": { "model": "malum:block/tainted_rock_bricks_stairs_outer", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true - }, - "facing=north,half=bottom,shape=outer_right": { - "model": "malum:block/tainted_rock_bricks_stairs_outer", - "y": 270, - "uvlock": true - }, - "facing=south,half=bottom,shape=outer_right": { - "model": "malum:block/tainted_rock_bricks_stairs_outer", - "y": 90, - "uvlock": true + "y": 180 }, - "facing=west,half=bottom,shape=outer_right": { + "facing=west,half=top,shape=outer_right": { "model": "malum:block/tainted_rock_bricks_stairs_outer", - "y": 180, - "uvlock": true + "uvlock": true, + "x": 180, + "y": 270 }, - "facing=east,half=bottom,shape=outer_right": { - "model": "malum:block/tainted_rock_bricks_stairs_outer" + "facing=west,half=top,shape=straight": { + "model": "malum:block/tainted_rock_bricks_stairs", + "uvlock": true, + "x": 180, + "y": 180 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/blockstates/tainted_rock_bricks_wall.json b/src/generated/resources/assets/malum/blockstates/tainted_rock_bricks_wall.json index 51f3aa45d..f4968a680 100644 --- a/src/generated/resources/assets/malum/blockstates/tainted_rock_bricks_wall.json +++ b/src/generated/resources/assets/malum/blockstates/tainted_rock_bricks_wall.json @@ -1,89 +1,89 @@ { "multipart": [ { - "when": { - "up": "true" - }, "apply": { "model": "malum:block/tainted_rock_bricks_wall_post" + }, + "when": { + "up": "true" } }, { - "when": { - "east": "low" - }, "apply": { "model": "malum:block/tainted_rock_bricks_wall_side", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 90 + }, + "when": { + "east": "low" } }, { - "when": { - "east": "tall" - }, "apply": { "model": "malum:block/tainted_rock_bricks_wall_side_tall", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 90 + }, + "when": { + "east": "tall" } }, { - "when": { - "north": "low" - }, "apply": { "model": "malum:block/tainted_rock_bricks_wall_side", "uvlock": true + }, + "when": { + "north": "low" } }, { - "when": { - "north": "tall" - }, "apply": { "model": "malum:block/tainted_rock_bricks_wall_side_tall", "uvlock": true + }, + "when": { + "north": "tall" } }, { - "when": { - "south": "low" - }, "apply": { "model": "malum:block/tainted_rock_bricks_wall_side", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 + }, + "when": { + "south": "low" } }, { - "when": { - "south": "tall" - }, "apply": { "model": "malum:block/tainted_rock_bricks_wall_side_tall", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 + }, + "when": { + "south": "tall" } }, { - "when": { - "west": "low" - }, "apply": { "model": "malum:block/tainted_rock_bricks_wall_side", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 270 + }, + "when": { + "west": "low" } }, { - "when": { - "west": "tall" - }, "apply": { "model": "malum:block/tainted_rock_bricks_wall_side_tall", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 270 + }, + "when": { + "west": "tall" } } ] diff --git a/src/generated/resources/assets/malum/blockstates/tainted_rock_button.json b/src/generated/resources/assets/malum/blockstates/tainted_rock_button.json index 8a5ae2f96..3a2b1adad 100644 --- a/src/generated/resources/assets/malum/blockstates/tainted_rock_button.json +++ b/src/generated/resources/assets/malum/blockstates/tainted_rock_button.json @@ -1,117 +1,117 @@ { "variants": { - "face=floor,facing=north,powered=false": { - "model": "malum:block/tainted_rock_button" - }, - "face=wall,facing=north,powered=false": { + "face=ceiling,facing=east,powered=false": { "model": "malum:block/tainted_rock_button", - "x": 90, - "uvlock": true + "x": 180, + "y": 270 + }, + "face=ceiling,facing=east,powered=true": { + "model": "malum:block/tainted_rock_button_pressed", + "x": 180, + "y": 270 }, "face=ceiling,facing=north,powered=false": { "model": "malum:block/tainted_rock_button", "x": 180, "y": 180 }, - "face=floor,facing=south,powered=false": { - "model": "malum:block/tainted_rock_button", + "face=ceiling,facing=north,powered=true": { + "model": "malum:block/tainted_rock_button_pressed", + "x": 180, "y": 180 }, - "face=wall,facing=south,powered=false": { - "model": "malum:block/tainted_rock_button", - "x": 90, - "y": 180, - "uvlock": true - }, "face=ceiling,facing=south,powered=false": { "model": "malum:block/tainted_rock_button", "x": 180 }, - "face=floor,facing=west,powered=false": { - "model": "malum:block/tainted_rock_button", - "y": 270 - }, - "face=wall,facing=west,powered=false": { - "model": "malum:block/tainted_rock_button", - "x": 90, - "y": 270, - "uvlock": true + "face=ceiling,facing=south,powered=true": { + "model": "malum:block/tainted_rock_button_pressed", + "x": 180 }, "face=ceiling,facing=west,powered=false": { "model": "malum:block/tainted_rock_button", "x": 180, "y": 90 }, + "face=ceiling,facing=west,powered=true": { + "model": "malum:block/tainted_rock_button_pressed", + "x": 180, + "y": 90 + }, "face=floor,facing=east,powered=false": { "model": "malum:block/tainted_rock_button", "y": 90 }, - "face=wall,facing=east,powered=false": { - "model": "malum:block/tainted_rock_button", - "x": 90, - "y": 90, - "uvlock": true + "face=floor,facing=east,powered=true": { + "model": "malum:block/tainted_rock_button_pressed", + "y": 90 }, - "face=ceiling,facing=east,powered=false": { - "model": "malum:block/tainted_rock_button", - "x": 180, - "y": 270 + "face=floor,facing=north,powered=false": { + "model": "malum:block/tainted_rock_button" }, "face=floor,facing=north,powered=true": { "model": "malum:block/tainted_rock_button_pressed" }, - "face=wall,facing=north,powered=true": { - "model": "malum:block/tainted_rock_button_pressed", - "x": 90, - "uvlock": true - }, - "face=ceiling,facing=north,powered=true": { - "model": "malum:block/tainted_rock_button_pressed", - "x": 180, + "face=floor,facing=south,powered=false": { + "model": "malum:block/tainted_rock_button", "y": 180 }, "face=floor,facing=south,powered=true": { "model": "malum:block/tainted_rock_button_pressed", "y": 180 }, - "face=wall,facing=south,powered=true": { - "model": "malum:block/tainted_rock_button_pressed", - "x": 90, - "y": 180, - "uvlock": true - }, - "face=ceiling,facing=south,powered=true": { - "model": "malum:block/tainted_rock_button_pressed", - "x": 180 + "face=floor,facing=west,powered=false": { + "model": "malum:block/tainted_rock_button", + "y": 270 }, "face=floor,facing=west,powered=true": { "model": "malum:block/tainted_rock_button_pressed", "y": 270 }, - "face=wall,facing=west,powered=true": { - "model": "malum:block/tainted_rock_button_pressed", + "face=wall,facing=east,powered=false": { + "model": "malum:block/tainted_rock_button", + "uvlock": true, "x": 90, - "y": 270, - "uvlock": true + "y": 90 }, - "face=ceiling,facing=west,powered=true": { + "face=wall,facing=east,powered=true": { "model": "malum:block/tainted_rock_button_pressed", - "x": 180, + "uvlock": true, + "x": 90, "y": 90 }, - "face=floor,facing=east,powered=true": { + "face=wall,facing=north,powered=false": { + "model": "malum:block/tainted_rock_button", + "uvlock": true, + "x": 90 + }, + "face=wall,facing=north,powered=true": { "model": "malum:block/tainted_rock_button_pressed", - "y": 90 + "uvlock": true, + "x": 90 }, - "face=wall,facing=east,powered=true": { + "face=wall,facing=south,powered=false": { + "model": "malum:block/tainted_rock_button", + "uvlock": true, + "x": 90, + "y": 180 + }, + "face=wall,facing=south,powered=true": { "model": "malum:block/tainted_rock_button_pressed", + "uvlock": true, "x": 90, - "y": 90, - "uvlock": true + "y": 180 }, - "face=ceiling,facing=east,powered=true": { + "face=wall,facing=west,powered=false": { + "model": "malum:block/tainted_rock_button", + "uvlock": true, + "x": 90, + "y": 270 + }, + "face=wall,facing=west,powered=true": { "model": "malum:block/tainted_rock_button_pressed", - "x": 180, + "uvlock": true, + "x": 90, "y": 270 } } diff --git a/src/generated/resources/assets/malum/blockstates/tainted_rock_column_cap.json b/src/generated/resources/assets/malum/blockstates/tainted_rock_column_cap.json index 6dc95e5f0..c19578a4a 100644 --- a/src/generated/resources/assets/malum/blockstates/tainted_rock_column_cap.json +++ b/src/generated/resources/assets/malum/blockstates/tainted_rock_column_cap.json @@ -4,8 +4,10 @@ "model": "malum:block/tainted_rock_column_cap", "x": 180 }, - "facing=up": { - "model": "malum:block/tainted_rock_column_cap" + "facing=east": { + "model": "malum:block/tainted_rock_column_cap", + "x": 90, + "y": 90 }, "facing=north": { "model": "malum:block/tainted_rock_column_cap", @@ -16,15 +18,13 @@ "x": 90, "y": 180 }, + "facing=up": { + "model": "malum:block/tainted_rock_column_cap" + }, "facing=west": { "model": "malum:block/tainted_rock_column_cap", "x": 90, "y": 270 - }, - "facing=east": { - "model": "malum:block/tainted_rock_column_cap", - "x": 90, - "y": 90 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/blockstates/tainted_rock_item_stand.json b/src/generated/resources/assets/malum/blockstates/tainted_rock_item_stand.json index 6dd055af2..23cea3dac 100644 --- a/src/generated/resources/assets/malum/blockstates/tainted_rock_item_stand.json +++ b/src/generated/resources/assets/malum/blockstates/tainted_rock_item_stand.json @@ -4,53 +4,53 @@ "model": "malum:block/tainted_rock_item_stand", "x": 180 }, - "facing=up,waterlogged=false": { - "model": "malum:block/tainted_rock_item_stand" - }, - "facing=north,waterlogged=false": { - "model": "malum:block/tainted_rock_item_stand", - "x": 90 - }, - "facing=south,waterlogged=false": { + "facing=down,waterlogged=true": { "model": "malum:block/tainted_rock_item_stand", - "x": 90, - "y": 180 + "x": 180 }, - "facing=west,waterlogged=false": { + "facing=east,waterlogged=false": { "model": "malum:block/tainted_rock_item_stand", "x": 90, - "y": 270 + "y": 90 }, - "facing=east,waterlogged=false": { + "facing=east,waterlogged=true": { "model": "malum:block/tainted_rock_item_stand", "x": 90, "y": 90 }, - "facing=down,waterlogged=true": { + "facing=north,waterlogged=false": { "model": "malum:block/tainted_rock_item_stand", - "x": 180 - }, - "facing=up,waterlogged=true": { - "model": "malum:block/tainted_rock_item_stand" + "x": 90 }, "facing=north,waterlogged=true": { "model": "malum:block/tainted_rock_item_stand", "x": 90 }, + "facing=south,waterlogged=false": { + "model": "malum:block/tainted_rock_item_stand", + "x": 90, + "y": 180 + }, "facing=south,waterlogged=true": { "model": "malum:block/tainted_rock_item_stand", "x": 90, "y": 180 }, - "facing=west,waterlogged=true": { + "facing=up,waterlogged=false": { + "model": "malum:block/tainted_rock_item_stand" + }, + "facing=up,waterlogged=true": { + "model": "malum:block/tainted_rock_item_stand" + }, + "facing=west,waterlogged=false": { "model": "malum:block/tainted_rock_item_stand", "x": 90, "y": 270 }, - "facing=east,waterlogged=true": { + "facing=west,waterlogged=true": { "model": "malum:block/tainted_rock_item_stand", "x": 90, - "y": 90 + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/blockstates/tainted_rock_slab.json b/src/generated/resources/assets/malum/blockstates/tainted_rock_slab.json index 76c4ec771..c5c803284 100644 --- a/src/generated/resources/assets/malum/blockstates/tainted_rock_slab.json +++ b/src/generated/resources/assets/malum/blockstates/tainted_rock_slab.json @@ -1,13 +1,13 @@ { "variants": { - "type=top": { - "model": "malum:block/tainted_rock_slab_top" - }, "type=bottom": { "model": "malum:block/tainted_rock_slab" }, "type=double": { "model": "malum:block/tainted_rock" + }, + "type=top": { + "model": "malum:block/tainted_rock_slab_top" } } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/blockstates/tainted_rock_stairs.json b/src/generated/resources/assets/malum/blockstates/tainted_rock_stairs.json index 482911aa2..ee5682243 100644 --- a/src/generated/resources/assets/malum/blockstates/tainted_rock_stairs.json +++ b/src/generated/resources/assets/malum/blockstates/tainted_rock_stairs.json @@ -1,209 +1,209 @@ { "variants": { - "facing=north,half=top,shape=straight": { - "model": "malum:block/tainted_rock_stairs", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=south,half=top,shape=straight": { - "model": "malum:block/tainted_rock_stairs", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=west,half=top,shape=straight": { - "model": "malum:block/tainted_rock_stairs", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=east,half=top,shape=straight": { - "model": "malum:block/tainted_rock_stairs", - "x": 180, - "uvlock": true + "facing=east,half=bottom,shape=inner_left": { + "model": "malum:block/tainted_rock_stairs_inner", + "uvlock": true, + "y": 270 }, - "facing=north,half=bottom,shape=straight": { - "model": "malum:block/tainted_rock_stairs", - "y": 270, - "uvlock": true + "facing=east,half=bottom,shape=inner_right": { + "model": "malum:block/tainted_rock_stairs_inner" }, - "facing=south,half=bottom,shape=straight": { - "model": "malum:block/tainted_rock_stairs", - "y": 90, - "uvlock": true + "facing=east,half=bottom,shape=outer_left": { + "model": "malum:block/tainted_rock_stairs_outer", + "uvlock": true, + "y": 270 }, - "facing=west,half=bottom,shape=straight": { - "model": "malum:block/tainted_rock_stairs", - "y": 180, - "uvlock": true + "facing=east,half=bottom,shape=outer_right": { + "model": "malum:block/tainted_rock_stairs_outer" }, "facing=east,half=bottom,shape=straight": { "model": "malum:block/tainted_rock_stairs" }, - "facing=north,half=top,shape=inner_left": { + "facing=east,half=top,shape=inner_left": { "model": "malum:block/tainted_rock_stairs_inner", - "x": 180, - "y": 270, - "uvlock": true + "uvlock": true, + "x": 180 }, - "facing=south,half=top,shape=inner_left": { + "facing=east,half=top,shape=inner_right": { "model": "malum:block/tainted_rock_stairs_inner", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 90 }, - "facing=west,half=top,shape=inner_left": { - "model": "malum:block/tainted_rock_stairs_inner", - "x": 180, - "y": 180, - "uvlock": true + "facing=east,half=top,shape=outer_left": { + "model": "malum:block/tainted_rock_stairs_outer", + "uvlock": true, + "x": 180 }, - "facing=east,half=top,shape=inner_left": { - "model": "malum:block/tainted_rock_stairs_inner", + "facing=east,half=top,shape=outer_right": { + "model": "malum:block/tainted_rock_stairs_outer", + "uvlock": true, "x": 180, - "uvlock": true + "y": 90 + }, + "facing=east,half=top,shape=straight": { + "model": "malum:block/tainted_rock_stairs", + "uvlock": true, + "x": 180 }, "facing=north,half=bottom,shape=inner_left": { "model": "malum:block/tainted_rock_stairs_inner", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=south,half=bottom,shape=inner_left": { - "model": "malum:block/tainted_rock_stairs_inner" - }, - "facing=west,half=bottom,shape=inner_left": { + "facing=north,half=bottom,shape=inner_right": { "model": "malum:block/tainted_rock_stairs_inner", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 270 }, - "facing=east,half=bottom,shape=inner_left": { - "model": "malum:block/tainted_rock_stairs_inner", - "y": 270, - "uvlock": true + "facing=north,half=bottom,shape=outer_left": { + "model": "malum:block/tainted_rock_stairs_outer", + "uvlock": true, + "y": 180 }, - "facing=north,half=top,shape=inner_right": { - "model": "malum:block/tainted_rock_stairs_inner", - "x": 180, - "uvlock": true + "facing=north,half=bottom,shape=outer_right": { + "model": "malum:block/tainted_rock_stairs_outer", + "uvlock": true, + "y": 270 }, - "facing=south,half=top,shape=inner_right": { + "facing=north,half=bottom,shape=straight": { + "model": "malum:block/tainted_rock_stairs", + "uvlock": true, + "y": 270 + }, + "facing=north,half=top,shape=inner_left": { "model": "malum:block/tainted_rock_stairs_inner", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 270 }, - "facing=west,half=top,shape=inner_right": { + "facing=north,half=top,shape=inner_right": { "model": "malum:block/tainted_rock_stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=outer_left": { + "model": "malum:block/tainted_rock_stairs_outer", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 270 }, - "facing=east,half=top,shape=inner_right": { - "model": "malum:block/tainted_rock_stairs_inner", + "facing=north,half=top,shape=outer_right": { + "model": "malum:block/tainted_rock_stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=straight": { + "model": "malum:block/tainted_rock_stairs", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 270 }, - "facing=north,half=bottom,shape=inner_right": { - "model": "malum:block/tainted_rock_stairs_inner", - "y": 270, - "uvlock": true + "facing=south,half=bottom,shape=inner_left": { + "model": "malum:block/tainted_rock_stairs_inner" }, "facing=south,half=bottom,shape=inner_right": { "model": "malum:block/tainted_rock_stairs_inner", - "y": 90, - "uvlock": true - }, - "facing=west,half=bottom,shape=inner_right": { - "model": "malum:block/tainted_rock_stairs_inner", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 90 }, - "facing=east,half=bottom,shape=inner_right": { - "model": "malum:block/tainted_rock_stairs_inner" + "facing=south,half=bottom,shape=outer_left": { + "model": "malum:block/tainted_rock_stairs_outer" }, - "facing=north,half=top,shape=outer_left": { + "facing=south,half=bottom,shape=outer_right": { "model": "malum:block/tainted_rock_stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=straight": { + "model": "malum:block/tainted_rock_stairs", + "uvlock": true, + "y": 90 + }, + "facing=south,half=top,shape=inner_left": { + "model": "malum:block/tainted_rock_stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=inner_right": { + "model": "malum:block/tainted_rock_stairs_inner", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 180 }, "facing=south,half=top,shape=outer_left": { "model": "malum:block/tainted_rock_stairs_outer", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 90 }, - "facing=west,half=top,shape=outer_left": { + "facing=south,half=top,shape=outer_right": { "model": "malum:block/tainted_rock_stairs_outer", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 180 }, - "facing=east,half=top,shape=outer_left": { - "model": "malum:block/tainted_rock_stairs_outer", + "facing=south,half=top,shape=straight": { + "model": "malum:block/tainted_rock_stairs", + "uvlock": true, "x": 180, - "uvlock": true + "y": 90 }, - "facing=north,half=bottom,shape=outer_left": { - "model": "malum:block/tainted_rock_stairs_outer", - "y": 180, - "uvlock": true + "facing=west,half=bottom,shape=inner_left": { + "model": "malum:block/tainted_rock_stairs_inner", + "uvlock": true, + "y": 90 }, - "facing=south,half=bottom,shape=outer_left": { - "model": "malum:block/tainted_rock_stairs_outer" + "facing=west,half=bottom,shape=inner_right": { + "model": "malum:block/tainted_rock_stairs_inner", + "uvlock": true, + "y": 180 }, "facing=west,half=bottom,shape=outer_left": { "model": "malum:block/tainted_rock_stairs_outer", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 90 }, - "facing=east,half=bottom,shape=outer_left": { + "facing=west,half=bottom,shape=outer_right": { "model": "malum:block/tainted_rock_stairs_outer", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=north,half=top,shape=outer_right": { - "model": "malum:block/tainted_rock_stairs_outer", - "x": 180, - "uvlock": true + "facing=west,half=bottom,shape=straight": { + "model": "malum:block/tainted_rock_stairs", + "uvlock": true, + "y": 180 }, - "facing=south,half=top,shape=outer_right": { - "model": "malum:block/tainted_rock_stairs_outer", + "facing=west,half=top,shape=inner_left": { + "model": "malum:block/tainted_rock_stairs_inner", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 180 }, - "facing=west,half=top,shape=outer_right": { - "model": "malum:block/tainted_rock_stairs_outer", + "facing=west,half=top,shape=inner_right": { + "model": "malum:block/tainted_rock_stairs_inner", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 270 }, - "facing=east,half=top,shape=outer_right": { + "facing=west,half=top,shape=outer_left": { "model": "malum:block/tainted_rock_stairs_outer", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true - }, - "facing=north,half=bottom,shape=outer_right": { - "model": "malum:block/tainted_rock_stairs_outer", - "y": 270, - "uvlock": true - }, - "facing=south,half=bottom,shape=outer_right": { - "model": "malum:block/tainted_rock_stairs_outer", - "y": 90, - "uvlock": true + "y": 180 }, - "facing=west,half=bottom,shape=outer_right": { + "facing=west,half=top,shape=outer_right": { "model": "malum:block/tainted_rock_stairs_outer", - "y": 180, - "uvlock": true + "uvlock": true, + "x": 180, + "y": 270 }, - "facing=east,half=bottom,shape=outer_right": { - "model": "malum:block/tainted_rock_stairs_outer" + "facing=west,half=top,shape=straight": { + "model": "malum:block/tainted_rock_stairs", + "uvlock": true, + "x": 180, + "y": 180 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/blockstates/tainted_rock_tiles_slab.json b/src/generated/resources/assets/malum/blockstates/tainted_rock_tiles_slab.json index 293faec41..0d2292988 100644 --- a/src/generated/resources/assets/malum/blockstates/tainted_rock_tiles_slab.json +++ b/src/generated/resources/assets/malum/blockstates/tainted_rock_tiles_slab.json @@ -1,13 +1,13 @@ { "variants": { - "type=top": { - "model": "malum:block/tainted_rock_tiles_slab_top" - }, "type=bottom": { "model": "malum:block/tainted_rock_tiles_slab" }, "type=double": { "model": "malum:block/tainted_rock_tiles" + }, + "type=top": { + "model": "malum:block/tainted_rock_tiles_slab_top" } } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/blockstates/tainted_rock_tiles_stairs.json b/src/generated/resources/assets/malum/blockstates/tainted_rock_tiles_stairs.json index 09f69b1f7..3b62f7daa 100644 --- a/src/generated/resources/assets/malum/blockstates/tainted_rock_tiles_stairs.json +++ b/src/generated/resources/assets/malum/blockstates/tainted_rock_tiles_stairs.json @@ -1,209 +1,209 @@ { "variants": { - "facing=north,half=top,shape=straight": { - "model": "malum:block/tainted_rock_tiles_stairs", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=south,half=top,shape=straight": { - "model": "malum:block/tainted_rock_tiles_stairs", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=west,half=top,shape=straight": { - "model": "malum:block/tainted_rock_tiles_stairs", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=east,half=top,shape=straight": { - "model": "malum:block/tainted_rock_tiles_stairs", - "x": 180, - "uvlock": true + "facing=east,half=bottom,shape=inner_left": { + "model": "malum:block/tainted_rock_tiles_stairs_inner", + "uvlock": true, + "y": 270 }, - "facing=north,half=bottom,shape=straight": { - "model": "malum:block/tainted_rock_tiles_stairs", - "y": 270, - "uvlock": true + "facing=east,half=bottom,shape=inner_right": { + "model": "malum:block/tainted_rock_tiles_stairs_inner" }, - "facing=south,half=bottom,shape=straight": { - "model": "malum:block/tainted_rock_tiles_stairs", - "y": 90, - "uvlock": true + "facing=east,half=bottom,shape=outer_left": { + "model": "malum:block/tainted_rock_tiles_stairs_outer", + "uvlock": true, + "y": 270 }, - "facing=west,half=bottom,shape=straight": { - "model": "malum:block/tainted_rock_tiles_stairs", - "y": 180, - "uvlock": true + "facing=east,half=bottom,shape=outer_right": { + "model": "malum:block/tainted_rock_tiles_stairs_outer" }, "facing=east,half=bottom,shape=straight": { "model": "malum:block/tainted_rock_tiles_stairs" }, - "facing=north,half=top,shape=inner_left": { + "facing=east,half=top,shape=inner_left": { "model": "malum:block/tainted_rock_tiles_stairs_inner", - "x": 180, - "y": 270, - "uvlock": true + "uvlock": true, + "x": 180 }, - "facing=south,half=top,shape=inner_left": { + "facing=east,half=top,shape=inner_right": { "model": "malum:block/tainted_rock_tiles_stairs_inner", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 90 }, - "facing=west,half=top,shape=inner_left": { - "model": "malum:block/tainted_rock_tiles_stairs_inner", - "x": 180, - "y": 180, - "uvlock": true + "facing=east,half=top,shape=outer_left": { + "model": "malum:block/tainted_rock_tiles_stairs_outer", + "uvlock": true, + "x": 180 }, - "facing=east,half=top,shape=inner_left": { - "model": "malum:block/tainted_rock_tiles_stairs_inner", + "facing=east,half=top,shape=outer_right": { + "model": "malum:block/tainted_rock_tiles_stairs_outer", + "uvlock": true, "x": 180, - "uvlock": true + "y": 90 + }, + "facing=east,half=top,shape=straight": { + "model": "malum:block/tainted_rock_tiles_stairs", + "uvlock": true, + "x": 180 }, "facing=north,half=bottom,shape=inner_left": { "model": "malum:block/tainted_rock_tiles_stairs_inner", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=south,half=bottom,shape=inner_left": { - "model": "malum:block/tainted_rock_tiles_stairs_inner" - }, - "facing=west,half=bottom,shape=inner_left": { + "facing=north,half=bottom,shape=inner_right": { "model": "malum:block/tainted_rock_tiles_stairs_inner", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 270 }, - "facing=east,half=bottom,shape=inner_left": { - "model": "malum:block/tainted_rock_tiles_stairs_inner", - "y": 270, - "uvlock": true + "facing=north,half=bottom,shape=outer_left": { + "model": "malum:block/tainted_rock_tiles_stairs_outer", + "uvlock": true, + "y": 180 }, - "facing=north,half=top,shape=inner_right": { - "model": "malum:block/tainted_rock_tiles_stairs_inner", - "x": 180, - "uvlock": true + "facing=north,half=bottom,shape=outer_right": { + "model": "malum:block/tainted_rock_tiles_stairs_outer", + "uvlock": true, + "y": 270 }, - "facing=south,half=top,shape=inner_right": { + "facing=north,half=bottom,shape=straight": { + "model": "malum:block/tainted_rock_tiles_stairs", + "uvlock": true, + "y": 270 + }, + "facing=north,half=top,shape=inner_left": { "model": "malum:block/tainted_rock_tiles_stairs_inner", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 270 }, - "facing=west,half=top,shape=inner_right": { + "facing=north,half=top,shape=inner_right": { "model": "malum:block/tainted_rock_tiles_stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=outer_left": { + "model": "malum:block/tainted_rock_tiles_stairs_outer", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 270 }, - "facing=east,half=top,shape=inner_right": { - "model": "malum:block/tainted_rock_tiles_stairs_inner", + "facing=north,half=top,shape=outer_right": { + "model": "malum:block/tainted_rock_tiles_stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=straight": { + "model": "malum:block/tainted_rock_tiles_stairs", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 270 }, - "facing=north,half=bottom,shape=inner_right": { - "model": "malum:block/tainted_rock_tiles_stairs_inner", - "y": 270, - "uvlock": true + "facing=south,half=bottom,shape=inner_left": { + "model": "malum:block/tainted_rock_tiles_stairs_inner" }, "facing=south,half=bottom,shape=inner_right": { "model": "malum:block/tainted_rock_tiles_stairs_inner", - "y": 90, - "uvlock": true - }, - "facing=west,half=bottom,shape=inner_right": { - "model": "malum:block/tainted_rock_tiles_stairs_inner", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 90 }, - "facing=east,half=bottom,shape=inner_right": { - "model": "malum:block/tainted_rock_tiles_stairs_inner" + "facing=south,half=bottom,shape=outer_left": { + "model": "malum:block/tainted_rock_tiles_stairs_outer" }, - "facing=north,half=top,shape=outer_left": { + "facing=south,half=bottom,shape=outer_right": { "model": "malum:block/tainted_rock_tiles_stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=straight": { + "model": "malum:block/tainted_rock_tiles_stairs", + "uvlock": true, + "y": 90 + }, + "facing=south,half=top,shape=inner_left": { + "model": "malum:block/tainted_rock_tiles_stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=inner_right": { + "model": "malum:block/tainted_rock_tiles_stairs_inner", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 180 }, "facing=south,half=top,shape=outer_left": { "model": "malum:block/tainted_rock_tiles_stairs_outer", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 90 }, - "facing=west,half=top,shape=outer_left": { + "facing=south,half=top,shape=outer_right": { "model": "malum:block/tainted_rock_tiles_stairs_outer", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 180 }, - "facing=east,half=top,shape=outer_left": { - "model": "malum:block/tainted_rock_tiles_stairs_outer", + "facing=south,half=top,shape=straight": { + "model": "malum:block/tainted_rock_tiles_stairs", + "uvlock": true, "x": 180, - "uvlock": true + "y": 90 }, - "facing=north,half=bottom,shape=outer_left": { - "model": "malum:block/tainted_rock_tiles_stairs_outer", - "y": 180, - "uvlock": true + "facing=west,half=bottom,shape=inner_left": { + "model": "malum:block/tainted_rock_tiles_stairs_inner", + "uvlock": true, + "y": 90 }, - "facing=south,half=bottom,shape=outer_left": { - "model": "malum:block/tainted_rock_tiles_stairs_outer" + "facing=west,half=bottom,shape=inner_right": { + "model": "malum:block/tainted_rock_tiles_stairs_inner", + "uvlock": true, + "y": 180 }, "facing=west,half=bottom,shape=outer_left": { "model": "malum:block/tainted_rock_tiles_stairs_outer", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 90 }, - "facing=east,half=bottom,shape=outer_left": { + "facing=west,half=bottom,shape=outer_right": { "model": "malum:block/tainted_rock_tiles_stairs_outer", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=north,half=top,shape=outer_right": { - "model": "malum:block/tainted_rock_tiles_stairs_outer", - "x": 180, - "uvlock": true + "facing=west,half=bottom,shape=straight": { + "model": "malum:block/tainted_rock_tiles_stairs", + "uvlock": true, + "y": 180 }, - "facing=south,half=top,shape=outer_right": { - "model": "malum:block/tainted_rock_tiles_stairs_outer", + "facing=west,half=top,shape=inner_left": { + "model": "malum:block/tainted_rock_tiles_stairs_inner", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 180 }, - "facing=west,half=top,shape=outer_right": { - "model": "malum:block/tainted_rock_tiles_stairs_outer", + "facing=west,half=top,shape=inner_right": { + "model": "malum:block/tainted_rock_tiles_stairs_inner", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 270 }, - "facing=east,half=top,shape=outer_right": { + "facing=west,half=top,shape=outer_left": { "model": "malum:block/tainted_rock_tiles_stairs_outer", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true - }, - "facing=north,half=bottom,shape=outer_right": { - "model": "malum:block/tainted_rock_tiles_stairs_outer", - "y": 270, - "uvlock": true - }, - "facing=south,half=bottom,shape=outer_right": { - "model": "malum:block/tainted_rock_tiles_stairs_outer", - "y": 90, - "uvlock": true + "y": 180 }, - "facing=west,half=bottom,shape=outer_right": { + "facing=west,half=top,shape=outer_right": { "model": "malum:block/tainted_rock_tiles_stairs_outer", - "y": 180, - "uvlock": true + "uvlock": true, + "x": 180, + "y": 270 }, - "facing=east,half=bottom,shape=outer_right": { - "model": "malum:block/tainted_rock_tiles_stairs_outer" + "facing=west,half=top,shape=straight": { + "model": "malum:block/tainted_rock_tiles_stairs", + "uvlock": true, + "x": 180, + "y": 180 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/blockstates/tainted_rock_tiles_wall.json b/src/generated/resources/assets/malum/blockstates/tainted_rock_tiles_wall.json index 6fe0bf73d..823fa3e13 100644 --- a/src/generated/resources/assets/malum/blockstates/tainted_rock_tiles_wall.json +++ b/src/generated/resources/assets/malum/blockstates/tainted_rock_tiles_wall.json @@ -1,89 +1,89 @@ { "multipart": [ { - "when": { - "up": "true" - }, "apply": { "model": "malum:block/tainted_rock_tiles_wall_post" + }, + "when": { + "up": "true" } }, { - "when": { - "east": "low" - }, "apply": { "model": "malum:block/tainted_rock_tiles_wall_side", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 90 + }, + "when": { + "east": "low" } }, { - "when": { - "east": "tall" - }, "apply": { "model": "malum:block/tainted_rock_tiles_wall_side_tall", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 90 + }, + "when": { + "east": "tall" } }, { - "when": { - "north": "low" - }, "apply": { "model": "malum:block/tainted_rock_tiles_wall_side", "uvlock": true + }, + "when": { + "north": "low" } }, { - "when": { - "north": "tall" - }, "apply": { "model": "malum:block/tainted_rock_tiles_wall_side_tall", "uvlock": true + }, + "when": { + "north": "tall" } }, { - "when": { - "south": "low" - }, "apply": { "model": "malum:block/tainted_rock_tiles_wall_side", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 + }, + "when": { + "south": "low" } }, { - "when": { - "south": "tall" - }, "apply": { "model": "malum:block/tainted_rock_tiles_wall_side_tall", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 + }, + "when": { + "south": "tall" } }, { - "when": { - "west": "low" - }, "apply": { "model": "malum:block/tainted_rock_tiles_wall_side", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 270 + }, + "when": { + "west": "low" } }, { - "when": { - "west": "tall" - }, "apply": { "model": "malum:block/tainted_rock_tiles_wall_side_tall", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 270 + }, + "when": { + "west": "tall" } } ] diff --git a/src/generated/resources/assets/malum/blockstates/tainted_rock_wall.json b/src/generated/resources/assets/malum/blockstates/tainted_rock_wall.json index 1756675ea..36566f5a2 100644 --- a/src/generated/resources/assets/malum/blockstates/tainted_rock_wall.json +++ b/src/generated/resources/assets/malum/blockstates/tainted_rock_wall.json @@ -1,89 +1,89 @@ { "multipart": [ { - "when": { - "up": "true" - }, "apply": { "model": "malum:block/tainted_rock_wall_post" + }, + "when": { + "up": "true" } }, { - "when": { - "east": "low" - }, "apply": { "model": "malum:block/tainted_rock_wall_side", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 90 + }, + "when": { + "east": "low" } }, { - "when": { - "east": "tall" - }, "apply": { "model": "malum:block/tainted_rock_wall_side_tall", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 90 + }, + "when": { + "east": "tall" } }, { - "when": { - "north": "low" - }, "apply": { "model": "malum:block/tainted_rock_wall_side", "uvlock": true + }, + "when": { + "north": "low" } }, { - "when": { - "north": "tall" - }, "apply": { "model": "malum:block/tainted_rock_wall_side_tall", "uvlock": true + }, + "when": { + "north": "tall" } }, { - "when": { - "south": "low" - }, "apply": { "model": "malum:block/tainted_rock_wall_side", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 + }, + "when": { + "south": "low" } }, { - "when": { - "south": "tall" - }, "apply": { "model": "malum:block/tainted_rock_wall_side_tall", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 + }, + "when": { + "south": "tall" } }, { - "when": { - "west": "low" - }, "apply": { "model": "malum:block/tainted_rock_wall_side", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 270 + }, + "when": { + "west": "low" } }, { - "when": { - "west": "tall" - }, "apply": { "model": "malum:block/tainted_rock_wall_side_tall", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 270 + }, + "when": { + "west": "tall" } } ] diff --git a/src/generated/resources/assets/malum/blockstates/twisted_rock_bricks_slab.json b/src/generated/resources/assets/malum/blockstates/twisted_rock_bricks_slab.json index 8beb30569..c0c2e09e7 100644 --- a/src/generated/resources/assets/malum/blockstates/twisted_rock_bricks_slab.json +++ b/src/generated/resources/assets/malum/blockstates/twisted_rock_bricks_slab.json @@ -1,13 +1,13 @@ { "variants": { - "type=top": { - "model": "malum:block/twisted_rock_bricks_slab_top" - }, "type=bottom": { "model": "malum:block/twisted_rock_bricks_slab" }, "type=double": { "model": "malum:block/twisted_rock_bricks" + }, + "type=top": { + "model": "malum:block/twisted_rock_bricks_slab_top" } } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/blockstates/twisted_rock_bricks_stairs.json b/src/generated/resources/assets/malum/blockstates/twisted_rock_bricks_stairs.json index 963337fe2..deccf8cdf 100644 --- a/src/generated/resources/assets/malum/blockstates/twisted_rock_bricks_stairs.json +++ b/src/generated/resources/assets/malum/blockstates/twisted_rock_bricks_stairs.json @@ -1,209 +1,209 @@ { "variants": { - "facing=north,half=top,shape=straight": { - "model": "malum:block/twisted_rock_bricks_stairs", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=south,half=top,shape=straight": { - "model": "malum:block/twisted_rock_bricks_stairs", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=west,half=top,shape=straight": { - "model": "malum:block/twisted_rock_bricks_stairs", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=east,half=top,shape=straight": { - "model": "malum:block/twisted_rock_bricks_stairs", - "x": 180, - "uvlock": true + "facing=east,half=bottom,shape=inner_left": { + "model": "malum:block/twisted_rock_bricks_stairs_inner", + "uvlock": true, + "y": 270 }, - "facing=north,half=bottom,shape=straight": { - "model": "malum:block/twisted_rock_bricks_stairs", - "y": 270, - "uvlock": true + "facing=east,half=bottom,shape=inner_right": { + "model": "malum:block/twisted_rock_bricks_stairs_inner" }, - "facing=south,half=bottom,shape=straight": { - "model": "malum:block/twisted_rock_bricks_stairs", - "y": 90, - "uvlock": true + "facing=east,half=bottom,shape=outer_left": { + "model": "malum:block/twisted_rock_bricks_stairs_outer", + "uvlock": true, + "y": 270 }, - "facing=west,half=bottom,shape=straight": { - "model": "malum:block/twisted_rock_bricks_stairs", - "y": 180, - "uvlock": true + "facing=east,half=bottom,shape=outer_right": { + "model": "malum:block/twisted_rock_bricks_stairs_outer" }, "facing=east,half=bottom,shape=straight": { "model": "malum:block/twisted_rock_bricks_stairs" }, - "facing=north,half=top,shape=inner_left": { + "facing=east,half=top,shape=inner_left": { "model": "malum:block/twisted_rock_bricks_stairs_inner", - "x": 180, - "y": 270, - "uvlock": true + "uvlock": true, + "x": 180 }, - "facing=south,half=top,shape=inner_left": { + "facing=east,half=top,shape=inner_right": { "model": "malum:block/twisted_rock_bricks_stairs_inner", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 90 }, - "facing=west,half=top,shape=inner_left": { - "model": "malum:block/twisted_rock_bricks_stairs_inner", - "x": 180, - "y": 180, - "uvlock": true + "facing=east,half=top,shape=outer_left": { + "model": "malum:block/twisted_rock_bricks_stairs_outer", + "uvlock": true, + "x": 180 }, - "facing=east,half=top,shape=inner_left": { - "model": "malum:block/twisted_rock_bricks_stairs_inner", + "facing=east,half=top,shape=outer_right": { + "model": "malum:block/twisted_rock_bricks_stairs_outer", + "uvlock": true, "x": 180, - "uvlock": true + "y": 90 + }, + "facing=east,half=top,shape=straight": { + "model": "malum:block/twisted_rock_bricks_stairs", + "uvlock": true, + "x": 180 }, "facing=north,half=bottom,shape=inner_left": { "model": "malum:block/twisted_rock_bricks_stairs_inner", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=south,half=bottom,shape=inner_left": { - "model": "malum:block/twisted_rock_bricks_stairs_inner" - }, - "facing=west,half=bottom,shape=inner_left": { + "facing=north,half=bottom,shape=inner_right": { "model": "malum:block/twisted_rock_bricks_stairs_inner", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 270 }, - "facing=east,half=bottom,shape=inner_left": { - "model": "malum:block/twisted_rock_bricks_stairs_inner", - "y": 270, - "uvlock": true + "facing=north,half=bottom,shape=outer_left": { + "model": "malum:block/twisted_rock_bricks_stairs_outer", + "uvlock": true, + "y": 180 }, - "facing=north,half=top,shape=inner_right": { - "model": "malum:block/twisted_rock_bricks_stairs_inner", - "x": 180, - "uvlock": true + "facing=north,half=bottom,shape=outer_right": { + "model": "malum:block/twisted_rock_bricks_stairs_outer", + "uvlock": true, + "y": 270 }, - "facing=south,half=top,shape=inner_right": { + "facing=north,half=bottom,shape=straight": { + "model": "malum:block/twisted_rock_bricks_stairs", + "uvlock": true, + "y": 270 + }, + "facing=north,half=top,shape=inner_left": { "model": "malum:block/twisted_rock_bricks_stairs_inner", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 270 }, - "facing=west,half=top,shape=inner_right": { + "facing=north,half=top,shape=inner_right": { "model": "malum:block/twisted_rock_bricks_stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=outer_left": { + "model": "malum:block/twisted_rock_bricks_stairs_outer", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 270 }, - "facing=east,half=top,shape=inner_right": { - "model": "malum:block/twisted_rock_bricks_stairs_inner", + "facing=north,half=top,shape=outer_right": { + "model": "malum:block/twisted_rock_bricks_stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=straight": { + "model": "malum:block/twisted_rock_bricks_stairs", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 270 }, - "facing=north,half=bottom,shape=inner_right": { - "model": "malum:block/twisted_rock_bricks_stairs_inner", - "y": 270, - "uvlock": true + "facing=south,half=bottom,shape=inner_left": { + "model": "malum:block/twisted_rock_bricks_stairs_inner" }, "facing=south,half=bottom,shape=inner_right": { "model": "malum:block/twisted_rock_bricks_stairs_inner", - "y": 90, - "uvlock": true - }, - "facing=west,half=bottom,shape=inner_right": { - "model": "malum:block/twisted_rock_bricks_stairs_inner", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 90 }, - "facing=east,half=bottom,shape=inner_right": { - "model": "malum:block/twisted_rock_bricks_stairs_inner" + "facing=south,half=bottom,shape=outer_left": { + "model": "malum:block/twisted_rock_bricks_stairs_outer" }, - "facing=north,half=top,shape=outer_left": { + "facing=south,half=bottom,shape=outer_right": { "model": "malum:block/twisted_rock_bricks_stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=straight": { + "model": "malum:block/twisted_rock_bricks_stairs", + "uvlock": true, + "y": 90 + }, + "facing=south,half=top,shape=inner_left": { + "model": "malum:block/twisted_rock_bricks_stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=inner_right": { + "model": "malum:block/twisted_rock_bricks_stairs_inner", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 180 }, "facing=south,half=top,shape=outer_left": { "model": "malum:block/twisted_rock_bricks_stairs_outer", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 90 }, - "facing=west,half=top,shape=outer_left": { + "facing=south,half=top,shape=outer_right": { "model": "malum:block/twisted_rock_bricks_stairs_outer", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 180 }, - "facing=east,half=top,shape=outer_left": { - "model": "malum:block/twisted_rock_bricks_stairs_outer", + "facing=south,half=top,shape=straight": { + "model": "malum:block/twisted_rock_bricks_stairs", + "uvlock": true, "x": 180, - "uvlock": true + "y": 90 }, - "facing=north,half=bottom,shape=outer_left": { - "model": "malum:block/twisted_rock_bricks_stairs_outer", - "y": 180, - "uvlock": true + "facing=west,half=bottom,shape=inner_left": { + "model": "malum:block/twisted_rock_bricks_stairs_inner", + "uvlock": true, + "y": 90 }, - "facing=south,half=bottom,shape=outer_left": { - "model": "malum:block/twisted_rock_bricks_stairs_outer" + "facing=west,half=bottom,shape=inner_right": { + "model": "malum:block/twisted_rock_bricks_stairs_inner", + "uvlock": true, + "y": 180 }, "facing=west,half=bottom,shape=outer_left": { "model": "malum:block/twisted_rock_bricks_stairs_outer", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 90 }, - "facing=east,half=bottom,shape=outer_left": { + "facing=west,half=bottom,shape=outer_right": { "model": "malum:block/twisted_rock_bricks_stairs_outer", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=north,half=top,shape=outer_right": { - "model": "malum:block/twisted_rock_bricks_stairs_outer", - "x": 180, - "uvlock": true + "facing=west,half=bottom,shape=straight": { + "model": "malum:block/twisted_rock_bricks_stairs", + "uvlock": true, + "y": 180 }, - "facing=south,half=top,shape=outer_right": { - "model": "malum:block/twisted_rock_bricks_stairs_outer", + "facing=west,half=top,shape=inner_left": { + "model": "malum:block/twisted_rock_bricks_stairs_inner", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 180 }, - "facing=west,half=top,shape=outer_right": { - "model": "malum:block/twisted_rock_bricks_stairs_outer", + "facing=west,half=top,shape=inner_right": { + "model": "malum:block/twisted_rock_bricks_stairs_inner", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 270 }, - "facing=east,half=top,shape=outer_right": { + "facing=west,half=top,shape=outer_left": { "model": "malum:block/twisted_rock_bricks_stairs_outer", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true - }, - "facing=north,half=bottom,shape=outer_right": { - "model": "malum:block/twisted_rock_bricks_stairs_outer", - "y": 270, - "uvlock": true - }, - "facing=south,half=bottom,shape=outer_right": { - "model": "malum:block/twisted_rock_bricks_stairs_outer", - "y": 90, - "uvlock": true + "y": 180 }, - "facing=west,half=bottom,shape=outer_right": { + "facing=west,half=top,shape=outer_right": { "model": "malum:block/twisted_rock_bricks_stairs_outer", - "y": 180, - "uvlock": true + "uvlock": true, + "x": 180, + "y": 270 }, - "facing=east,half=bottom,shape=outer_right": { - "model": "malum:block/twisted_rock_bricks_stairs_outer" + "facing=west,half=top,shape=straight": { + "model": "malum:block/twisted_rock_bricks_stairs", + "uvlock": true, + "x": 180, + "y": 180 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/blockstates/twisted_rock_bricks_wall.json b/src/generated/resources/assets/malum/blockstates/twisted_rock_bricks_wall.json index 574c6441d..0fef5bcf0 100644 --- a/src/generated/resources/assets/malum/blockstates/twisted_rock_bricks_wall.json +++ b/src/generated/resources/assets/malum/blockstates/twisted_rock_bricks_wall.json @@ -1,89 +1,89 @@ { "multipart": [ { - "when": { - "up": "true" - }, "apply": { "model": "malum:block/twisted_rock_bricks_wall_post" + }, + "when": { + "up": "true" } }, { - "when": { - "east": "low" - }, "apply": { "model": "malum:block/twisted_rock_bricks_wall_side", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 90 + }, + "when": { + "east": "low" } }, { - "when": { - "east": "tall" - }, "apply": { "model": "malum:block/twisted_rock_bricks_wall_side_tall", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 90 + }, + "when": { + "east": "tall" } }, { - "when": { - "north": "low" - }, "apply": { "model": "malum:block/twisted_rock_bricks_wall_side", "uvlock": true + }, + "when": { + "north": "low" } }, { - "when": { - "north": "tall" - }, "apply": { "model": "malum:block/twisted_rock_bricks_wall_side_tall", "uvlock": true + }, + "when": { + "north": "tall" } }, { - "when": { - "south": "low" - }, "apply": { "model": "malum:block/twisted_rock_bricks_wall_side", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 + }, + "when": { + "south": "low" } }, { - "when": { - "south": "tall" - }, "apply": { "model": "malum:block/twisted_rock_bricks_wall_side_tall", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 + }, + "when": { + "south": "tall" } }, { - "when": { - "west": "low" - }, "apply": { "model": "malum:block/twisted_rock_bricks_wall_side", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 270 + }, + "when": { + "west": "low" } }, { - "when": { - "west": "tall" - }, "apply": { "model": "malum:block/twisted_rock_bricks_wall_side_tall", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 270 + }, + "when": { + "west": "tall" } } ] diff --git a/src/generated/resources/assets/malum/blockstates/twisted_rock_button.json b/src/generated/resources/assets/malum/blockstates/twisted_rock_button.json index bf1ae04ce..b767d358c 100644 --- a/src/generated/resources/assets/malum/blockstates/twisted_rock_button.json +++ b/src/generated/resources/assets/malum/blockstates/twisted_rock_button.json @@ -1,117 +1,117 @@ { "variants": { - "face=floor,facing=north,powered=false": { - "model": "malum:block/twisted_rock_button" - }, - "face=wall,facing=north,powered=false": { + "face=ceiling,facing=east,powered=false": { "model": "malum:block/twisted_rock_button", - "x": 90, - "uvlock": true + "x": 180, + "y": 270 + }, + "face=ceiling,facing=east,powered=true": { + "model": "malum:block/twisted_rock_button_pressed", + "x": 180, + "y": 270 }, "face=ceiling,facing=north,powered=false": { "model": "malum:block/twisted_rock_button", "x": 180, "y": 180 }, - "face=floor,facing=south,powered=false": { - "model": "malum:block/twisted_rock_button", + "face=ceiling,facing=north,powered=true": { + "model": "malum:block/twisted_rock_button_pressed", + "x": 180, "y": 180 }, - "face=wall,facing=south,powered=false": { - "model": "malum:block/twisted_rock_button", - "x": 90, - "y": 180, - "uvlock": true - }, "face=ceiling,facing=south,powered=false": { "model": "malum:block/twisted_rock_button", "x": 180 }, - "face=floor,facing=west,powered=false": { - "model": "malum:block/twisted_rock_button", - "y": 270 - }, - "face=wall,facing=west,powered=false": { - "model": "malum:block/twisted_rock_button", - "x": 90, - "y": 270, - "uvlock": true + "face=ceiling,facing=south,powered=true": { + "model": "malum:block/twisted_rock_button_pressed", + "x": 180 }, "face=ceiling,facing=west,powered=false": { "model": "malum:block/twisted_rock_button", "x": 180, "y": 90 }, + "face=ceiling,facing=west,powered=true": { + "model": "malum:block/twisted_rock_button_pressed", + "x": 180, + "y": 90 + }, "face=floor,facing=east,powered=false": { "model": "malum:block/twisted_rock_button", "y": 90 }, - "face=wall,facing=east,powered=false": { - "model": "malum:block/twisted_rock_button", - "x": 90, - "y": 90, - "uvlock": true + "face=floor,facing=east,powered=true": { + "model": "malum:block/twisted_rock_button_pressed", + "y": 90 }, - "face=ceiling,facing=east,powered=false": { - "model": "malum:block/twisted_rock_button", - "x": 180, - "y": 270 + "face=floor,facing=north,powered=false": { + "model": "malum:block/twisted_rock_button" }, "face=floor,facing=north,powered=true": { "model": "malum:block/twisted_rock_button_pressed" }, - "face=wall,facing=north,powered=true": { - "model": "malum:block/twisted_rock_button_pressed", - "x": 90, - "uvlock": true - }, - "face=ceiling,facing=north,powered=true": { - "model": "malum:block/twisted_rock_button_pressed", - "x": 180, + "face=floor,facing=south,powered=false": { + "model": "malum:block/twisted_rock_button", "y": 180 }, "face=floor,facing=south,powered=true": { "model": "malum:block/twisted_rock_button_pressed", "y": 180 }, - "face=wall,facing=south,powered=true": { - "model": "malum:block/twisted_rock_button_pressed", - "x": 90, - "y": 180, - "uvlock": true - }, - "face=ceiling,facing=south,powered=true": { - "model": "malum:block/twisted_rock_button_pressed", - "x": 180 + "face=floor,facing=west,powered=false": { + "model": "malum:block/twisted_rock_button", + "y": 270 }, "face=floor,facing=west,powered=true": { "model": "malum:block/twisted_rock_button_pressed", "y": 270 }, - "face=wall,facing=west,powered=true": { - "model": "malum:block/twisted_rock_button_pressed", + "face=wall,facing=east,powered=false": { + "model": "malum:block/twisted_rock_button", + "uvlock": true, "x": 90, - "y": 270, - "uvlock": true + "y": 90 }, - "face=ceiling,facing=west,powered=true": { + "face=wall,facing=east,powered=true": { "model": "malum:block/twisted_rock_button_pressed", - "x": 180, + "uvlock": true, + "x": 90, "y": 90 }, - "face=floor,facing=east,powered=true": { + "face=wall,facing=north,powered=false": { + "model": "malum:block/twisted_rock_button", + "uvlock": true, + "x": 90 + }, + "face=wall,facing=north,powered=true": { "model": "malum:block/twisted_rock_button_pressed", - "y": 90 + "uvlock": true, + "x": 90 }, - "face=wall,facing=east,powered=true": { + "face=wall,facing=south,powered=false": { + "model": "malum:block/twisted_rock_button", + "uvlock": true, + "x": 90, + "y": 180 + }, + "face=wall,facing=south,powered=true": { "model": "malum:block/twisted_rock_button_pressed", + "uvlock": true, "x": 90, - "y": 90, - "uvlock": true + "y": 180 }, - "face=ceiling,facing=east,powered=true": { + "face=wall,facing=west,powered=false": { + "model": "malum:block/twisted_rock_button", + "uvlock": true, + "x": 90, + "y": 270 + }, + "face=wall,facing=west,powered=true": { "model": "malum:block/twisted_rock_button_pressed", - "x": 180, + "uvlock": true, + "x": 90, "y": 270 } } diff --git a/src/generated/resources/assets/malum/blockstates/twisted_rock_column_cap.json b/src/generated/resources/assets/malum/blockstates/twisted_rock_column_cap.json index 5d1b0116b..4cd639a4b 100644 --- a/src/generated/resources/assets/malum/blockstates/twisted_rock_column_cap.json +++ b/src/generated/resources/assets/malum/blockstates/twisted_rock_column_cap.json @@ -4,8 +4,10 @@ "model": "malum:block/twisted_rock_column_cap", "x": 180 }, - "facing=up": { - "model": "malum:block/twisted_rock_column_cap" + "facing=east": { + "model": "malum:block/twisted_rock_column_cap", + "x": 90, + "y": 90 }, "facing=north": { "model": "malum:block/twisted_rock_column_cap", @@ -16,15 +18,13 @@ "x": 90, "y": 180 }, + "facing=up": { + "model": "malum:block/twisted_rock_column_cap" + }, "facing=west": { "model": "malum:block/twisted_rock_column_cap", "x": 90, "y": 270 - }, - "facing=east": { - "model": "malum:block/twisted_rock_column_cap", - "x": 90, - "y": 90 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/blockstates/twisted_rock_item_stand.json b/src/generated/resources/assets/malum/blockstates/twisted_rock_item_stand.json index d6a245f6f..67e2ecad3 100644 --- a/src/generated/resources/assets/malum/blockstates/twisted_rock_item_stand.json +++ b/src/generated/resources/assets/malum/blockstates/twisted_rock_item_stand.json @@ -4,53 +4,53 @@ "model": "malum:block/twisted_rock_item_stand", "x": 180 }, - "facing=up,waterlogged=false": { - "model": "malum:block/twisted_rock_item_stand" - }, - "facing=north,waterlogged=false": { - "model": "malum:block/twisted_rock_item_stand", - "x": 90 - }, - "facing=south,waterlogged=false": { + "facing=down,waterlogged=true": { "model": "malum:block/twisted_rock_item_stand", - "x": 90, - "y": 180 + "x": 180 }, - "facing=west,waterlogged=false": { + "facing=east,waterlogged=false": { "model": "malum:block/twisted_rock_item_stand", "x": 90, - "y": 270 + "y": 90 }, - "facing=east,waterlogged=false": { + "facing=east,waterlogged=true": { "model": "malum:block/twisted_rock_item_stand", "x": 90, "y": 90 }, - "facing=down,waterlogged=true": { + "facing=north,waterlogged=false": { "model": "malum:block/twisted_rock_item_stand", - "x": 180 - }, - "facing=up,waterlogged=true": { - "model": "malum:block/twisted_rock_item_stand" + "x": 90 }, "facing=north,waterlogged=true": { "model": "malum:block/twisted_rock_item_stand", "x": 90 }, + "facing=south,waterlogged=false": { + "model": "malum:block/twisted_rock_item_stand", + "x": 90, + "y": 180 + }, "facing=south,waterlogged=true": { "model": "malum:block/twisted_rock_item_stand", "x": 90, "y": 180 }, - "facing=west,waterlogged=true": { + "facing=up,waterlogged=false": { + "model": "malum:block/twisted_rock_item_stand" + }, + "facing=up,waterlogged=true": { + "model": "malum:block/twisted_rock_item_stand" + }, + "facing=west,waterlogged=false": { "model": "malum:block/twisted_rock_item_stand", "x": 90, "y": 270 }, - "facing=east,waterlogged=true": { + "facing=west,waterlogged=true": { "model": "malum:block/twisted_rock_item_stand", "x": 90, - "y": 90 + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/blockstates/twisted_rock_slab.json b/src/generated/resources/assets/malum/blockstates/twisted_rock_slab.json index 3553bed6a..4a3be9fc8 100644 --- a/src/generated/resources/assets/malum/blockstates/twisted_rock_slab.json +++ b/src/generated/resources/assets/malum/blockstates/twisted_rock_slab.json @@ -1,13 +1,13 @@ { "variants": { - "type=top": { - "model": "malum:block/twisted_rock_slab_top" - }, "type=bottom": { "model": "malum:block/twisted_rock_slab" }, "type=double": { "model": "malum:block/twisted_rock" + }, + "type=top": { + "model": "malum:block/twisted_rock_slab_top" } } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/blockstates/twisted_rock_stairs.json b/src/generated/resources/assets/malum/blockstates/twisted_rock_stairs.json index f1e6be117..2c955cb4b 100644 --- a/src/generated/resources/assets/malum/blockstates/twisted_rock_stairs.json +++ b/src/generated/resources/assets/malum/blockstates/twisted_rock_stairs.json @@ -1,209 +1,209 @@ { "variants": { - "facing=north,half=top,shape=straight": { - "model": "malum:block/twisted_rock_stairs", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=south,half=top,shape=straight": { - "model": "malum:block/twisted_rock_stairs", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=west,half=top,shape=straight": { - "model": "malum:block/twisted_rock_stairs", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=east,half=top,shape=straight": { - "model": "malum:block/twisted_rock_stairs", - "x": 180, - "uvlock": true + "facing=east,half=bottom,shape=inner_left": { + "model": "malum:block/twisted_rock_stairs_inner", + "uvlock": true, + "y": 270 }, - "facing=north,half=bottom,shape=straight": { - "model": "malum:block/twisted_rock_stairs", - "y": 270, - "uvlock": true + "facing=east,half=bottom,shape=inner_right": { + "model": "malum:block/twisted_rock_stairs_inner" }, - "facing=south,half=bottom,shape=straight": { - "model": "malum:block/twisted_rock_stairs", - "y": 90, - "uvlock": true + "facing=east,half=bottom,shape=outer_left": { + "model": "malum:block/twisted_rock_stairs_outer", + "uvlock": true, + "y": 270 }, - "facing=west,half=bottom,shape=straight": { - "model": "malum:block/twisted_rock_stairs", - "y": 180, - "uvlock": true + "facing=east,half=bottom,shape=outer_right": { + "model": "malum:block/twisted_rock_stairs_outer" }, "facing=east,half=bottom,shape=straight": { "model": "malum:block/twisted_rock_stairs" }, - "facing=north,half=top,shape=inner_left": { + "facing=east,half=top,shape=inner_left": { "model": "malum:block/twisted_rock_stairs_inner", - "x": 180, - "y": 270, - "uvlock": true + "uvlock": true, + "x": 180 }, - "facing=south,half=top,shape=inner_left": { + "facing=east,half=top,shape=inner_right": { "model": "malum:block/twisted_rock_stairs_inner", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 90 }, - "facing=west,half=top,shape=inner_left": { - "model": "malum:block/twisted_rock_stairs_inner", - "x": 180, - "y": 180, - "uvlock": true + "facing=east,half=top,shape=outer_left": { + "model": "malum:block/twisted_rock_stairs_outer", + "uvlock": true, + "x": 180 }, - "facing=east,half=top,shape=inner_left": { - "model": "malum:block/twisted_rock_stairs_inner", + "facing=east,half=top,shape=outer_right": { + "model": "malum:block/twisted_rock_stairs_outer", + "uvlock": true, "x": 180, - "uvlock": true + "y": 90 + }, + "facing=east,half=top,shape=straight": { + "model": "malum:block/twisted_rock_stairs", + "uvlock": true, + "x": 180 }, "facing=north,half=bottom,shape=inner_left": { "model": "malum:block/twisted_rock_stairs_inner", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=south,half=bottom,shape=inner_left": { - "model": "malum:block/twisted_rock_stairs_inner" - }, - "facing=west,half=bottom,shape=inner_left": { + "facing=north,half=bottom,shape=inner_right": { "model": "malum:block/twisted_rock_stairs_inner", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 270 }, - "facing=east,half=bottom,shape=inner_left": { - "model": "malum:block/twisted_rock_stairs_inner", - "y": 270, - "uvlock": true + "facing=north,half=bottom,shape=outer_left": { + "model": "malum:block/twisted_rock_stairs_outer", + "uvlock": true, + "y": 180 }, - "facing=north,half=top,shape=inner_right": { - "model": "malum:block/twisted_rock_stairs_inner", - "x": 180, - "uvlock": true + "facing=north,half=bottom,shape=outer_right": { + "model": "malum:block/twisted_rock_stairs_outer", + "uvlock": true, + "y": 270 }, - "facing=south,half=top,shape=inner_right": { + "facing=north,half=bottom,shape=straight": { + "model": "malum:block/twisted_rock_stairs", + "uvlock": true, + "y": 270 + }, + "facing=north,half=top,shape=inner_left": { "model": "malum:block/twisted_rock_stairs_inner", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 270 }, - "facing=west,half=top,shape=inner_right": { + "facing=north,half=top,shape=inner_right": { "model": "malum:block/twisted_rock_stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=outer_left": { + "model": "malum:block/twisted_rock_stairs_outer", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 270 }, - "facing=east,half=top,shape=inner_right": { - "model": "malum:block/twisted_rock_stairs_inner", + "facing=north,half=top,shape=outer_right": { + "model": "malum:block/twisted_rock_stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=straight": { + "model": "malum:block/twisted_rock_stairs", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 270 }, - "facing=north,half=bottom,shape=inner_right": { - "model": "malum:block/twisted_rock_stairs_inner", - "y": 270, - "uvlock": true + "facing=south,half=bottom,shape=inner_left": { + "model": "malum:block/twisted_rock_stairs_inner" }, "facing=south,half=bottom,shape=inner_right": { "model": "malum:block/twisted_rock_stairs_inner", - "y": 90, - "uvlock": true - }, - "facing=west,half=bottom,shape=inner_right": { - "model": "malum:block/twisted_rock_stairs_inner", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 90 }, - "facing=east,half=bottom,shape=inner_right": { - "model": "malum:block/twisted_rock_stairs_inner" + "facing=south,half=bottom,shape=outer_left": { + "model": "malum:block/twisted_rock_stairs_outer" }, - "facing=north,half=top,shape=outer_left": { + "facing=south,half=bottom,shape=outer_right": { "model": "malum:block/twisted_rock_stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=straight": { + "model": "malum:block/twisted_rock_stairs", + "uvlock": true, + "y": 90 + }, + "facing=south,half=top,shape=inner_left": { + "model": "malum:block/twisted_rock_stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=inner_right": { + "model": "malum:block/twisted_rock_stairs_inner", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 180 }, "facing=south,half=top,shape=outer_left": { "model": "malum:block/twisted_rock_stairs_outer", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 90 }, - "facing=west,half=top,shape=outer_left": { + "facing=south,half=top,shape=outer_right": { "model": "malum:block/twisted_rock_stairs_outer", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 180 }, - "facing=east,half=top,shape=outer_left": { - "model": "malum:block/twisted_rock_stairs_outer", + "facing=south,half=top,shape=straight": { + "model": "malum:block/twisted_rock_stairs", + "uvlock": true, "x": 180, - "uvlock": true + "y": 90 }, - "facing=north,half=bottom,shape=outer_left": { - "model": "malum:block/twisted_rock_stairs_outer", - "y": 180, - "uvlock": true + "facing=west,half=bottom,shape=inner_left": { + "model": "malum:block/twisted_rock_stairs_inner", + "uvlock": true, + "y": 90 }, - "facing=south,half=bottom,shape=outer_left": { - "model": "malum:block/twisted_rock_stairs_outer" + "facing=west,half=bottom,shape=inner_right": { + "model": "malum:block/twisted_rock_stairs_inner", + "uvlock": true, + "y": 180 }, "facing=west,half=bottom,shape=outer_left": { "model": "malum:block/twisted_rock_stairs_outer", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 90 }, - "facing=east,half=bottom,shape=outer_left": { + "facing=west,half=bottom,shape=outer_right": { "model": "malum:block/twisted_rock_stairs_outer", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=north,half=top,shape=outer_right": { - "model": "malum:block/twisted_rock_stairs_outer", - "x": 180, - "uvlock": true + "facing=west,half=bottom,shape=straight": { + "model": "malum:block/twisted_rock_stairs", + "uvlock": true, + "y": 180 }, - "facing=south,half=top,shape=outer_right": { - "model": "malum:block/twisted_rock_stairs_outer", + "facing=west,half=top,shape=inner_left": { + "model": "malum:block/twisted_rock_stairs_inner", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 180 }, - "facing=west,half=top,shape=outer_right": { - "model": "malum:block/twisted_rock_stairs_outer", + "facing=west,half=top,shape=inner_right": { + "model": "malum:block/twisted_rock_stairs_inner", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 270 }, - "facing=east,half=top,shape=outer_right": { + "facing=west,half=top,shape=outer_left": { "model": "malum:block/twisted_rock_stairs_outer", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true - }, - "facing=north,half=bottom,shape=outer_right": { - "model": "malum:block/twisted_rock_stairs_outer", - "y": 270, - "uvlock": true - }, - "facing=south,half=bottom,shape=outer_right": { - "model": "malum:block/twisted_rock_stairs_outer", - "y": 90, - "uvlock": true + "y": 180 }, - "facing=west,half=bottom,shape=outer_right": { + "facing=west,half=top,shape=outer_right": { "model": "malum:block/twisted_rock_stairs_outer", - "y": 180, - "uvlock": true + "uvlock": true, + "x": 180, + "y": 270 }, - "facing=east,half=bottom,shape=outer_right": { - "model": "malum:block/twisted_rock_stairs_outer" + "facing=west,half=top,shape=straight": { + "model": "malum:block/twisted_rock_stairs", + "uvlock": true, + "x": 180, + "y": 180 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/blockstates/twisted_rock_tiles_slab.json b/src/generated/resources/assets/malum/blockstates/twisted_rock_tiles_slab.json index 0cef2f918..2535fcb63 100644 --- a/src/generated/resources/assets/malum/blockstates/twisted_rock_tiles_slab.json +++ b/src/generated/resources/assets/malum/blockstates/twisted_rock_tiles_slab.json @@ -1,13 +1,13 @@ { "variants": { - "type=top": { - "model": "malum:block/twisted_rock_tiles_slab_top" - }, "type=bottom": { "model": "malum:block/twisted_rock_tiles_slab" }, "type=double": { "model": "malum:block/twisted_rock_tiles" + }, + "type=top": { + "model": "malum:block/twisted_rock_tiles_slab_top" } } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/blockstates/twisted_rock_tiles_stairs.json b/src/generated/resources/assets/malum/blockstates/twisted_rock_tiles_stairs.json index f50343844..dc1fb5ed8 100644 --- a/src/generated/resources/assets/malum/blockstates/twisted_rock_tiles_stairs.json +++ b/src/generated/resources/assets/malum/blockstates/twisted_rock_tiles_stairs.json @@ -1,209 +1,209 @@ { "variants": { - "facing=north,half=top,shape=straight": { - "model": "malum:block/twisted_rock_tiles_stairs", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=south,half=top,shape=straight": { - "model": "malum:block/twisted_rock_tiles_stairs", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=west,half=top,shape=straight": { - "model": "malum:block/twisted_rock_tiles_stairs", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=east,half=top,shape=straight": { - "model": "malum:block/twisted_rock_tiles_stairs", - "x": 180, - "uvlock": true + "facing=east,half=bottom,shape=inner_left": { + "model": "malum:block/twisted_rock_tiles_stairs_inner", + "uvlock": true, + "y": 270 }, - "facing=north,half=bottom,shape=straight": { - "model": "malum:block/twisted_rock_tiles_stairs", - "y": 270, - "uvlock": true + "facing=east,half=bottom,shape=inner_right": { + "model": "malum:block/twisted_rock_tiles_stairs_inner" }, - "facing=south,half=bottom,shape=straight": { - "model": "malum:block/twisted_rock_tiles_stairs", - "y": 90, - "uvlock": true + "facing=east,half=bottom,shape=outer_left": { + "model": "malum:block/twisted_rock_tiles_stairs_outer", + "uvlock": true, + "y": 270 }, - "facing=west,half=bottom,shape=straight": { - "model": "malum:block/twisted_rock_tiles_stairs", - "y": 180, - "uvlock": true + "facing=east,half=bottom,shape=outer_right": { + "model": "malum:block/twisted_rock_tiles_stairs_outer" }, "facing=east,half=bottom,shape=straight": { "model": "malum:block/twisted_rock_tiles_stairs" }, - "facing=north,half=top,shape=inner_left": { + "facing=east,half=top,shape=inner_left": { "model": "malum:block/twisted_rock_tiles_stairs_inner", - "x": 180, - "y": 270, - "uvlock": true + "uvlock": true, + "x": 180 }, - "facing=south,half=top,shape=inner_left": { + "facing=east,half=top,shape=inner_right": { "model": "malum:block/twisted_rock_tiles_stairs_inner", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 90 }, - "facing=west,half=top,shape=inner_left": { - "model": "malum:block/twisted_rock_tiles_stairs_inner", - "x": 180, - "y": 180, - "uvlock": true + "facing=east,half=top,shape=outer_left": { + "model": "malum:block/twisted_rock_tiles_stairs_outer", + "uvlock": true, + "x": 180 }, - "facing=east,half=top,shape=inner_left": { - "model": "malum:block/twisted_rock_tiles_stairs_inner", + "facing=east,half=top,shape=outer_right": { + "model": "malum:block/twisted_rock_tiles_stairs_outer", + "uvlock": true, "x": 180, - "uvlock": true + "y": 90 + }, + "facing=east,half=top,shape=straight": { + "model": "malum:block/twisted_rock_tiles_stairs", + "uvlock": true, + "x": 180 }, "facing=north,half=bottom,shape=inner_left": { "model": "malum:block/twisted_rock_tiles_stairs_inner", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=south,half=bottom,shape=inner_left": { - "model": "malum:block/twisted_rock_tiles_stairs_inner" - }, - "facing=west,half=bottom,shape=inner_left": { + "facing=north,half=bottom,shape=inner_right": { "model": "malum:block/twisted_rock_tiles_stairs_inner", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 270 }, - "facing=east,half=bottom,shape=inner_left": { - "model": "malum:block/twisted_rock_tiles_stairs_inner", - "y": 270, - "uvlock": true + "facing=north,half=bottom,shape=outer_left": { + "model": "malum:block/twisted_rock_tiles_stairs_outer", + "uvlock": true, + "y": 180 }, - "facing=north,half=top,shape=inner_right": { - "model": "malum:block/twisted_rock_tiles_stairs_inner", - "x": 180, - "uvlock": true + "facing=north,half=bottom,shape=outer_right": { + "model": "malum:block/twisted_rock_tiles_stairs_outer", + "uvlock": true, + "y": 270 }, - "facing=south,half=top,shape=inner_right": { + "facing=north,half=bottom,shape=straight": { + "model": "malum:block/twisted_rock_tiles_stairs", + "uvlock": true, + "y": 270 + }, + "facing=north,half=top,shape=inner_left": { "model": "malum:block/twisted_rock_tiles_stairs_inner", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 270 }, - "facing=west,half=top,shape=inner_right": { + "facing=north,half=top,shape=inner_right": { "model": "malum:block/twisted_rock_tiles_stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=outer_left": { + "model": "malum:block/twisted_rock_tiles_stairs_outer", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 270 }, - "facing=east,half=top,shape=inner_right": { - "model": "malum:block/twisted_rock_tiles_stairs_inner", + "facing=north,half=top,shape=outer_right": { + "model": "malum:block/twisted_rock_tiles_stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=straight": { + "model": "malum:block/twisted_rock_tiles_stairs", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 270 }, - "facing=north,half=bottom,shape=inner_right": { - "model": "malum:block/twisted_rock_tiles_stairs_inner", - "y": 270, - "uvlock": true + "facing=south,half=bottom,shape=inner_left": { + "model": "malum:block/twisted_rock_tiles_stairs_inner" }, "facing=south,half=bottom,shape=inner_right": { "model": "malum:block/twisted_rock_tiles_stairs_inner", - "y": 90, - "uvlock": true - }, - "facing=west,half=bottom,shape=inner_right": { - "model": "malum:block/twisted_rock_tiles_stairs_inner", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 90 }, - "facing=east,half=bottom,shape=inner_right": { - "model": "malum:block/twisted_rock_tiles_stairs_inner" + "facing=south,half=bottom,shape=outer_left": { + "model": "malum:block/twisted_rock_tiles_stairs_outer" }, - "facing=north,half=top,shape=outer_left": { + "facing=south,half=bottom,shape=outer_right": { "model": "malum:block/twisted_rock_tiles_stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=straight": { + "model": "malum:block/twisted_rock_tiles_stairs", + "uvlock": true, + "y": 90 + }, + "facing=south,half=top,shape=inner_left": { + "model": "malum:block/twisted_rock_tiles_stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=inner_right": { + "model": "malum:block/twisted_rock_tiles_stairs_inner", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 180 }, "facing=south,half=top,shape=outer_left": { "model": "malum:block/twisted_rock_tiles_stairs_outer", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 90 }, - "facing=west,half=top,shape=outer_left": { + "facing=south,half=top,shape=outer_right": { "model": "malum:block/twisted_rock_tiles_stairs_outer", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 180 }, - "facing=east,half=top,shape=outer_left": { - "model": "malum:block/twisted_rock_tiles_stairs_outer", + "facing=south,half=top,shape=straight": { + "model": "malum:block/twisted_rock_tiles_stairs", + "uvlock": true, "x": 180, - "uvlock": true + "y": 90 }, - "facing=north,half=bottom,shape=outer_left": { - "model": "malum:block/twisted_rock_tiles_stairs_outer", - "y": 180, - "uvlock": true + "facing=west,half=bottom,shape=inner_left": { + "model": "malum:block/twisted_rock_tiles_stairs_inner", + "uvlock": true, + "y": 90 }, - "facing=south,half=bottom,shape=outer_left": { - "model": "malum:block/twisted_rock_tiles_stairs_outer" + "facing=west,half=bottom,shape=inner_right": { + "model": "malum:block/twisted_rock_tiles_stairs_inner", + "uvlock": true, + "y": 180 }, "facing=west,half=bottom,shape=outer_left": { "model": "malum:block/twisted_rock_tiles_stairs_outer", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 90 }, - "facing=east,half=bottom,shape=outer_left": { + "facing=west,half=bottom,shape=outer_right": { "model": "malum:block/twisted_rock_tiles_stairs_outer", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=north,half=top,shape=outer_right": { - "model": "malum:block/twisted_rock_tiles_stairs_outer", - "x": 180, - "uvlock": true + "facing=west,half=bottom,shape=straight": { + "model": "malum:block/twisted_rock_tiles_stairs", + "uvlock": true, + "y": 180 }, - "facing=south,half=top,shape=outer_right": { - "model": "malum:block/twisted_rock_tiles_stairs_outer", + "facing=west,half=top,shape=inner_left": { + "model": "malum:block/twisted_rock_tiles_stairs_inner", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 180 }, - "facing=west,half=top,shape=outer_right": { - "model": "malum:block/twisted_rock_tiles_stairs_outer", + "facing=west,half=top,shape=inner_right": { + "model": "malum:block/twisted_rock_tiles_stairs_inner", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 270 }, - "facing=east,half=top,shape=outer_right": { + "facing=west,half=top,shape=outer_left": { "model": "malum:block/twisted_rock_tiles_stairs_outer", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true - }, - "facing=north,half=bottom,shape=outer_right": { - "model": "malum:block/twisted_rock_tiles_stairs_outer", - "y": 270, - "uvlock": true - }, - "facing=south,half=bottom,shape=outer_right": { - "model": "malum:block/twisted_rock_tiles_stairs_outer", - "y": 90, - "uvlock": true + "y": 180 }, - "facing=west,half=bottom,shape=outer_right": { + "facing=west,half=top,shape=outer_right": { "model": "malum:block/twisted_rock_tiles_stairs_outer", - "y": 180, - "uvlock": true + "uvlock": true, + "x": 180, + "y": 270 }, - "facing=east,half=bottom,shape=outer_right": { - "model": "malum:block/twisted_rock_tiles_stairs_outer" + "facing=west,half=top,shape=straight": { + "model": "malum:block/twisted_rock_tiles_stairs", + "uvlock": true, + "x": 180, + "y": 180 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/blockstates/twisted_rock_tiles_wall.json b/src/generated/resources/assets/malum/blockstates/twisted_rock_tiles_wall.json index 3c621a125..ef55fca85 100644 --- a/src/generated/resources/assets/malum/blockstates/twisted_rock_tiles_wall.json +++ b/src/generated/resources/assets/malum/blockstates/twisted_rock_tiles_wall.json @@ -1,89 +1,89 @@ { "multipart": [ { - "when": { - "up": "true" - }, "apply": { "model": "malum:block/twisted_rock_tiles_wall_post" + }, + "when": { + "up": "true" } }, { - "when": { - "east": "low" - }, "apply": { "model": "malum:block/twisted_rock_tiles_wall_side", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 90 + }, + "when": { + "east": "low" } }, { - "when": { - "east": "tall" - }, "apply": { "model": "malum:block/twisted_rock_tiles_wall_side_tall", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 90 + }, + "when": { + "east": "tall" } }, { - "when": { - "north": "low" - }, "apply": { "model": "malum:block/twisted_rock_tiles_wall_side", "uvlock": true + }, + "when": { + "north": "low" } }, { - "when": { - "north": "tall" - }, "apply": { "model": "malum:block/twisted_rock_tiles_wall_side_tall", "uvlock": true + }, + "when": { + "north": "tall" } }, { - "when": { - "south": "low" - }, "apply": { "model": "malum:block/twisted_rock_tiles_wall_side", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 + }, + "when": { + "south": "low" } }, { - "when": { - "south": "tall" - }, "apply": { "model": "malum:block/twisted_rock_tiles_wall_side_tall", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 + }, + "when": { + "south": "tall" } }, { - "when": { - "west": "low" - }, "apply": { "model": "malum:block/twisted_rock_tiles_wall_side", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 270 + }, + "when": { + "west": "low" } }, { - "when": { - "west": "tall" - }, "apply": { "model": "malum:block/twisted_rock_tiles_wall_side_tall", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 270 + }, + "when": { + "west": "tall" } } ] diff --git a/src/generated/resources/assets/malum/blockstates/twisted_rock_wall.json b/src/generated/resources/assets/malum/blockstates/twisted_rock_wall.json index eaac5a421..7a39472d6 100644 --- a/src/generated/resources/assets/malum/blockstates/twisted_rock_wall.json +++ b/src/generated/resources/assets/malum/blockstates/twisted_rock_wall.json @@ -1,89 +1,89 @@ { "multipart": [ { - "when": { - "up": "true" - }, "apply": { "model": "malum:block/twisted_rock_wall_post" + }, + "when": { + "up": "true" } }, { - "when": { - "east": "low" - }, "apply": { "model": "malum:block/twisted_rock_wall_side", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 90 + }, + "when": { + "east": "low" } }, { - "when": { - "east": "tall" - }, "apply": { "model": "malum:block/twisted_rock_wall_side_tall", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 90 + }, + "when": { + "east": "tall" } }, { - "when": { - "north": "low" - }, "apply": { "model": "malum:block/twisted_rock_wall_side", "uvlock": true + }, + "when": { + "north": "low" } }, { - "when": { - "north": "tall" - }, "apply": { "model": "malum:block/twisted_rock_wall_side_tall", "uvlock": true + }, + "when": { + "north": "tall" } }, { - "when": { - "south": "low" - }, "apply": { "model": "malum:block/twisted_rock_wall_side", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 + }, + "when": { + "south": "low" } }, { - "when": { - "south": "tall" - }, "apply": { "model": "malum:block/twisted_rock_wall_side_tall", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 + }, + "when": { + "south": "tall" } }, { - "when": { - "west": "low" - }, "apply": { "model": "malum:block/twisted_rock_wall_side", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 270 + }, + "when": { + "west": "low" } }, { - "when": { - "west": "tall" - }, "apply": { "model": "malum:block/twisted_rock_wall_side_tall", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 270 + }, + "when": { + "west": "tall" } } ] diff --git a/src/generated/resources/assets/malum/blockstates/twisted_tablet.json b/src/generated/resources/assets/malum/blockstates/twisted_tablet.json index c94d5f99e..05ac97c6f 100644 --- a/src/generated/resources/assets/malum/blockstates/twisted_tablet.json +++ b/src/generated/resources/assets/malum/blockstates/twisted_tablet.json @@ -4,53 +4,53 @@ "model": "malum:block/twisted_tablet", "x": 180 }, - "facing=up,waterlogged=false": { - "model": "malum:block/twisted_tablet" - }, - "facing=north,waterlogged=false": { - "model": "malum:block/twisted_tablet", - "x": 90 - }, - "facing=south,waterlogged=false": { + "facing=down,waterlogged=true": { "model": "malum:block/twisted_tablet", - "x": 90, - "y": 180 + "x": 180 }, - "facing=west,waterlogged=false": { + "facing=east,waterlogged=false": { "model": "malum:block/twisted_tablet", "x": 90, - "y": 270 + "y": 90 }, - "facing=east,waterlogged=false": { + "facing=east,waterlogged=true": { "model": "malum:block/twisted_tablet", "x": 90, "y": 90 }, - "facing=down,waterlogged=true": { + "facing=north,waterlogged=false": { "model": "malum:block/twisted_tablet", - "x": 180 - }, - "facing=up,waterlogged=true": { - "model": "malum:block/twisted_tablet" + "x": 90 }, "facing=north,waterlogged=true": { "model": "malum:block/twisted_tablet", "x": 90 }, + "facing=south,waterlogged=false": { + "model": "malum:block/twisted_tablet", + "x": 90, + "y": 180 + }, "facing=south,waterlogged=true": { "model": "malum:block/twisted_tablet", "x": 90, "y": 180 }, - "facing=west,waterlogged=true": { + "facing=up,waterlogged=false": { + "model": "malum:block/twisted_tablet" + }, + "facing=up,waterlogged=true": { + "model": "malum:block/twisted_tablet" + }, + "facing=west,waterlogged=false": { "model": "malum:block/twisted_tablet", "x": 90, "y": 270 }, - "facing=east,waterlogged=true": { + "facing=west,waterlogged=true": { "model": "malum:block/twisted_tablet", "x": 90, - "y": 90 + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/blockstates/vertical_runewood_planks_slab.json b/src/generated/resources/assets/malum/blockstates/vertical_runewood_planks_slab.json index d300cce29..5fe55f47d 100644 --- a/src/generated/resources/assets/malum/blockstates/vertical_runewood_planks_slab.json +++ b/src/generated/resources/assets/malum/blockstates/vertical_runewood_planks_slab.json @@ -1,13 +1,13 @@ { "variants": { - "type=top": { - "model": "malum:block/vertical_runewood_planks_slab_top" - }, "type=bottom": { "model": "malum:block/vertical_runewood_planks_slab" }, "type=double": { "model": "malum:block/vertical_runewood_planks" + }, + "type=top": { + "model": "malum:block/vertical_runewood_planks_slab_top" } } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/blockstates/vertical_runewood_planks_stairs.json b/src/generated/resources/assets/malum/blockstates/vertical_runewood_planks_stairs.json index e43966f02..0886f7bd1 100644 --- a/src/generated/resources/assets/malum/blockstates/vertical_runewood_planks_stairs.json +++ b/src/generated/resources/assets/malum/blockstates/vertical_runewood_planks_stairs.json @@ -1,209 +1,209 @@ { "variants": { - "facing=north,half=top,shape=straight": { - "model": "malum:block/vertical_runewood_planks_stairs", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=south,half=top,shape=straight": { - "model": "malum:block/vertical_runewood_planks_stairs", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=west,half=top,shape=straight": { - "model": "malum:block/vertical_runewood_planks_stairs", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=east,half=top,shape=straight": { - "model": "malum:block/vertical_runewood_planks_stairs", - "x": 180, - "uvlock": true + "facing=east,half=bottom,shape=inner_left": { + "model": "malum:block/vertical_runewood_planks_stairs_inner", + "uvlock": true, + "y": 270 }, - "facing=north,half=bottom,shape=straight": { - "model": "malum:block/vertical_runewood_planks_stairs", - "y": 270, - "uvlock": true + "facing=east,half=bottom,shape=inner_right": { + "model": "malum:block/vertical_runewood_planks_stairs_inner" }, - "facing=south,half=bottom,shape=straight": { - "model": "malum:block/vertical_runewood_planks_stairs", - "y": 90, - "uvlock": true + "facing=east,half=bottom,shape=outer_left": { + "model": "malum:block/vertical_runewood_planks_stairs_outer", + "uvlock": true, + "y": 270 }, - "facing=west,half=bottom,shape=straight": { - "model": "malum:block/vertical_runewood_planks_stairs", - "y": 180, - "uvlock": true + "facing=east,half=bottom,shape=outer_right": { + "model": "malum:block/vertical_runewood_planks_stairs_outer" }, "facing=east,half=bottom,shape=straight": { "model": "malum:block/vertical_runewood_planks_stairs" }, - "facing=north,half=top,shape=inner_left": { + "facing=east,half=top,shape=inner_left": { "model": "malum:block/vertical_runewood_planks_stairs_inner", - "x": 180, - "y": 270, - "uvlock": true + "uvlock": true, + "x": 180 }, - "facing=south,half=top,shape=inner_left": { + "facing=east,half=top,shape=inner_right": { "model": "malum:block/vertical_runewood_planks_stairs_inner", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 90 }, - "facing=west,half=top,shape=inner_left": { - "model": "malum:block/vertical_runewood_planks_stairs_inner", - "x": 180, - "y": 180, - "uvlock": true + "facing=east,half=top,shape=outer_left": { + "model": "malum:block/vertical_runewood_planks_stairs_outer", + "uvlock": true, + "x": 180 }, - "facing=east,half=top,shape=inner_left": { - "model": "malum:block/vertical_runewood_planks_stairs_inner", + "facing=east,half=top,shape=outer_right": { + "model": "malum:block/vertical_runewood_planks_stairs_outer", + "uvlock": true, "x": 180, - "uvlock": true + "y": 90 + }, + "facing=east,half=top,shape=straight": { + "model": "malum:block/vertical_runewood_planks_stairs", + "uvlock": true, + "x": 180 }, "facing=north,half=bottom,shape=inner_left": { "model": "malum:block/vertical_runewood_planks_stairs_inner", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=south,half=bottom,shape=inner_left": { - "model": "malum:block/vertical_runewood_planks_stairs_inner" - }, - "facing=west,half=bottom,shape=inner_left": { + "facing=north,half=bottom,shape=inner_right": { "model": "malum:block/vertical_runewood_planks_stairs_inner", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 270 }, - "facing=east,half=bottom,shape=inner_left": { - "model": "malum:block/vertical_runewood_planks_stairs_inner", - "y": 270, - "uvlock": true + "facing=north,half=bottom,shape=outer_left": { + "model": "malum:block/vertical_runewood_planks_stairs_outer", + "uvlock": true, + "y": 180 }, - "facing=north,half=top,shape=inner_right": { - "model": "malum:block/vertical_runewood_planks_stairs_inner", - "x": 180, - "uvlock": true + "facing=north,half=bottom,shape=outer_right": { + "model": "malum:block/vertical_runewood_planks_stairs_outer", + "uvlock": true, + "y": 270 }, - "facing=south,half=top,shape=inner_right": { + "facing=north,half=bottom,shape=straight": { + "model": "malum:block/vertical_runewood_planks_stairs", + "uvlock": true, + "y": 270 + }, + "facing=north,half=top,shape=inner_left": { "model": "malum:block/vertical_runewood_planks_stairs_inner", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 270 }, - "facing=west,half=top,shape=inner_right": { + "facing=north,half=top,shape=inner_right": { "model": "malum:block/vertical_runewood_planks_stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=outer_left": { + "model": "malum:block/vertical_runewood_planks_stairs_outer", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 270 }, - "facing=east,half=top,shape=inner_right": { - "model": "malum:block/vertical_runewood_planks_stairs_inner", + "facing=north,half=top,shape=outer_right": { + "model": "malum:block/vertical_runewood_planks_stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=straight": { + "model": "malum:block/vertical_runewood_planks_stairs", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 270 }, - "facing=north,half=bottom,shape=inner_right": { - "model": "malum:block/vertical_runewood_planks_stairs_inner", - "y": 270, - "uvlock": true + "facing=south,half=bottom,shape=inner_left": { + "model": "malum:block/vertical_runewood_planks_stairs_inner" }, "facing=south,half=bottom,shape=inner_right": { "model": "malum:block/vertical_runewood_planks_stairs_inner", - "y": 90, - "uvlock": true - }, - "facing=west,half=bottom,shape=inner_right": { - "model": "malum:block/vertical_runewood_planks_stairs_inner", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 90 }, - "facing=east,half=bottom,shape=inner_right": { - "model": "malum:block/vertical_runewood_planks_stairs_inner" + "facing=south,half=bottom,shape=outer_left": { + "model": "malum:block/vertical_runewood_planks_stairs_outer" }, - "facing=north,half=top,shape=outer_left": { + "facing=south,half=bottom,shape=outer_right": { "model": "malum:block/vertical_runewood_planks_stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=straight": { + "model": "malum:block/vertical_runewood_planks_stairs", + "uvlock": true, + "y": 90 + }, + "facing=south,half=top,shape=inner_left": { + "model": "malum:block/vertical_runewood_planks_stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=inner_right": { + "model": "malum:block/vertical_runewood_planks_stairs_inner", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 180 }, "facing=south,half=top,shape=outer_left": { "model": "malum:block/vertical_runewood_planks_stairs_outer", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 90 }, - "facing=west,half=top,shape=outer_left": { + "facing=south,half=top,shape=outer_right": { "model": "malum:block/vertical_runewood_planks_stairs_outer", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 180 }, - "facing=east,half=top,shape=outer_left": { - "model": "malum:block/vertical_runewood_planks_stairs_outer", + "facing=south,half=top,shape=straight": { + "model": "malum:block/vertical_runewood_planks_stairs", + "uvlock": true, "x": 180, - "uvlock": true + "y": 90 }, - "facing=north,half=bottom,shape=outer_left": { - "model": "malum:block/vertical_runewood_planks_stairs_outer", - "y": 180, - "uvlock": true + "facing=west,half=bottom,shape=inner_left": { + "model": "malum:block/vertical_runewood_planks_stairs_inner", + "uvlock": true, + "y": 90 }, - "facing=south,half=bottom,shape=outer_left": { - "model": "malum:block/vertical_runewood_planks_stairs_outer" + "facing=west,half=bottom,shape=inner_right": { + "model": "malum:block/vertical_runewood_planks_stairs_inner", + "uvlock": true, + "y": 180 }, "facing=west,half=bottom,shape=outer_left": { "model": "malum:block/vertical_runewood_planks_stairs_outer", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 90 }, - "facing=east,half=bottom,shape=outer_left": { + "facing=west,half=bottom,shape=outer_right": { "model": "malum:block/vertical_runewood_planks_stairs_outer", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=north,half=top,shape=outer_right": { - "model": "malum:block/vertical_runewood_planks_stairs_outer", - "x": 180, - "uvlock": true + "facing=west,half=bottom,shape=straight": { + "model": "malum:block/vertical_runewood_planks_stairs", + "uvlock": true, + "y": 180 }, - "facing=south,half=top,shape=outer_right": { - "model": "malum:block/vertical_runewood_planks_stairs_outer", + "facing=west,half=top,shape=inner_left": { + "model": "malum:block/vertical_runewood_planks_stairs_inner", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 180 }, - "facing=west,half=top,shape=outer_right": { - "model": "malum:block/vertical_runewood_planks_stairs_outer", + "facing=west,half=top,shape=inner_right": { + "model": "malum:block/vertical_runewood_planks_stairs_inner", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 270 }, - "facing=east,half=top,shape=outer_right": { + "facing=west,half=top,shape=outer_left": { "model": "malum:block/vertical_runewood_planks_stairs_outer", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true - }, - "facing=north,half=bottom,shape=outer_right": { - "model": "malum:block/vertical_runewood_planks_stairs_outer", - "y": 270, - "uvlock": true - }, - "facing=south,half=bottom,shape=outer_right": { - "model": "malum:block/vertical_runewood_planks_stairs_outer", - "y": 90, - "uvlock": true + "y": 180 }, - "facing=west,half=bottom,shape=outer_right": { + "facing=west,half=top,shape=outer_right": { "model": "malum:block/vertical_runewood_planks_stairs_outer", - "y": 180, - "uvlock": true + "uvlock": true, + "x": 180, + "y": 270 }, - "facing=east,half=bottom,shape=outer_right": { - "model": "malum:block/vertical_runewood_planks_stairs_outer" + "facing=west,half=top,shape=straight": { + "model": "malum:block/vertical_runewood_planks_stairs", + "uvlock": true, + "x": 180, + "y": 180 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/blockstates/vertical_soulwood_planks_slab.json b/src/generated/resources/assets/malum/blockstates/vertical_soulwood_planks_slab.json index 2a40eb110..bc22fa5e9 100644 --- a/src/generated/resources/assets/malum/blockstates/vertical_soulwood_planks_slab.json +++ b/src/generated/resources/assets/malum/blockstates/vertical_soulwood_planks_slab.json @@ -1,13 +1,13 @@ { "variants": { - "type=top": { - "model": "malum:block/vertical_soulwood_planks_slab_top" - }, "type=bottom": { "model": "malum:block/vertical_soulwood_planks_slab" }, "type=double": { "model": "malum:block/vertical_soulwood_planks" + }, + "type=top": { + "model": "malum:block/vertical_soulwood_planks_slab_top" } } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/blockstates/vertical_soulwood_planks_stairs.json b/src/generated/resources/assets/malum/blockstates/vertical_soulwood_planks_stairs.json index 3c695334d..fe0383d4d 100644 --- a/src/generated/resources/assets/malum/blockstates/vertical_soulwood_planks_stairs.json +++ b/src/generated/resources/assets/malum/blockstates/vertical_soulwood_planks_stairs.json @@ -1,209 +1,209 @@ { "variants": { - "facing=north,half=top,shape=straight": { - "model": "malum:block/vertical_soulwood_planks_stairs", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=south,half=top,shape=straight": { - "model": "malum:block/vertical_soulwood_planks_stairs", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=west,half=top,shape=straight": { - "model": "malum:block/vertical_soulwood_planks_stairs", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=east,half=top,shape=straight": { - "model": "malum:block/vertical_soulwood_planks_stairs", - "x": 180, - "uvlock": true + "facing=east,half=bottom,shape=inner_left": { + "model": "malum:block/vertical_soulwood_planks_stairs_inner", + "uvlock": true, + "y": 270 }, - "facing=north,half=bottom,shape=straight": { - "model": "malum:block/vertical_soulwood_planks_stairs", - "y": 270, - "uvlock": true + "facing=east,half=bottom,shape=inner_right": { + "model": "malum:block/vertical_soulwood_planks_stairs_inner" }, - "facing=south,half=bottom,shape=straight": { - "model": "malum:block/vertical_soulwood_planks_stairs", - "y": 90, - "uvlock": true + "facing=east,half=bottom,shape=outer_left": { + "model": "malum:block/vertical_soulwood_planks_stairs_outer", + "uvlock": true, + "y": 270 }, - "facing=west,half=bottom,shape=straight": { - "model": "malum:block/vertical_soulwood_planks_stairs", - "y": 180, - "uvlock": true + "facing=east,half=bottom,shape=outer_right": { + "model": "malum:block/vertical_soulwood_planks_stairs_outer" }, "facing=east,half=bottom,shape=straight": { "model": "malum:block/vertical_soulwood_planks_stairs" }, - "facing=north,half=top,shape=inner_left": { + "facing=east,half=top,shape=inner_left": { "model": "malum:block/vertical_soulwood_planks_stairs_inner", - "x": 180, - "y": 270, - "uvlock": true + "uvlock": true, + "x": 180 }, - "facing=south,half=top,shape=inner_left": { + "facing=east,half=top,shape=inner_right": { "model": "malum:block/vertical_soulwood_planks_stairs_inner", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 90 }, - "facing=west,half=top,shape=inner_left": { - "model": "malum:block/vertical_soulwood_planks_stairs_inner", - "x": 180, - "y": 180, - "uvlock": true + "facing=east,half=top,shape=outer_left": { + "model": "malum:block/vertical_soulwood_planks_stairs_outer", + "uvlock": true, + "x": 180 }, - "facing=east,half=top,shape=inner_left": { - "model": "malum:block/vertical_soulwood_planks_stairs_inner", + "facing=east,half=top,shape=outer_right": { + "model": "malum:block/vertical_soulwood_planks_stairs_outer", + "uvlock": true, "x": 180, - "uvlock": true + "y": 90 + }, + "facing=east,half=top,shape=straight": { + "model": "malum:block/vertical_soulwood_planks_stairs", + "uvlock": true, + "x": 180 }, "facing=north,half=bottom,shape=inner_left": { "model": "malum:block/vertical_soulwood_planks_stairs_inner", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=south,half=bottom,shape=inner_left": { - "model": "malum:block/vertical_soulwood_planks_stairs_inner" - }, - "facing=west,half=bottom,shape=inner_left": { + "facing=north,half=bottom,shape=inner_right": { "model": "malum:block/vertical_soulwood_planks_stairs_inner", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 270 }, - "facing=east,half=bottom,shape=inner_left": { - "model": "malum:block/vertical_soulwood_planks_stairs_inner", - "y": 270, - "uvlock": true + "facing=north,half=bottom,shape=outer_left": { + "model": "malum:block/vertical_soulwood_planks_stairs_outer", + "uvlock": true, + "y": 180 }, - "facing=north,half=top,shape=inner_right": { - "model": "malum:block/vertical_soulwood_planks_stairs_inner", - "x": 180, - "uvlock": true + "facing=north,half=bottom,shape=outer_right": { + "model": "malum:block/vertical_soulwood_planks_stairs_outer", + "uvlock": true, + "y": 270 }, - "facing=south,half=top,shape=inner_right": { + "facing=north,half=bottom,shape=straight": { + "model": "malum:block/vertical_soulwood_planks_stairs", + "uvlock": true, + "y": 270 + }, + "facing=north,half=top,shape=inner_left": { "model": "malum:block/vertical_soulwood_planks_stairs_inner", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 270 }, - "facing=west,half=top,shape=inner_right": { + "facing=north,half=top,shape=inner_right": { "model": "malum:block/vertical_soulwood_planks_stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=outer_left": { + "model": "malum:block/vertical_soulwood_planks_stairs_outer", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 270 }, - "facing=east,half=top,shape=inner_right": { - "model": "malum:block/vertical_soulwood_planks_stairs_inner", + "facing=north,half=top,shape=outer_right": { + "model": "malum:block/vertical_soulwood_planks_stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=straight": { + "model": "malum:block/vertical_soulwood_planks_stairs", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 270 }, - "facing=north,half=bottom,shape=inner_right": { - "model": "malum:block/vertical_soulwood_planks_stairs_inner", - "y": 270, - "uvlock": true + "facing=south,half=bottom,shape=inner_left": { + "model": "malum:block/vertical_soulwood_planks_stairs_inner" }, "facing=south,half=bottom,shape=inner_right": { "model": "malum:block/vertical_soulwood_planks_stairs_inner", - "y": 90, - "uvlock": true - }, - "facing=west,half=bottom,shape=inner_right": { - "model": "malum:block/vertical_soulwood_planks_stairs_inner", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 90 }, - "facing=east,half=bottom,shape=inner_right": { - "model": "malum:block/vertical_soulwood_planks_stairs_inner" + "facing=south,half=bottom,shape=outer_left": { + "model": "malum:block/vertical_soulwood_planks_stairs_outer" }, - "facing=north,half=top,shape=outer_left": { + "facing=south,half=bottom,shape=outer_right": { "model": "malum:block/vertical_soulwood_planks_stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=straight": { + "model": "malum:block/vertical_soulwood_planks_stairs", + "uvlock": true, + "y": 90 + }, + "facing=south,half=top,shape=inner_left": { + "model": "malum:block/vertical_soulwood_planks_stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=inner_right": { + "model": "malum:block/vertical_soulwood_planks_stairs_inner", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 180 }, "facing=south,half=top,shape=outer_left": { "model": "malum:block/vertical_soulwood_planks_stairs_outer", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 90 }, - "facing=west,half=top,shape=outer_left": { + "facing=south,half=top,shape=outer_right": { "model": "malum:block/vertical_soulwood_planks_stairs_outer", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 180 }, - "facing=east,half=top,shape=outer_left": { - "model": "malum:block/vertical_soulwood_planks_stairs_outer", + "facing=south,half=top,shape=straight": { + "model": "malum:block/vertical_soulwood_planks_stairs", + "uvlock": true, "x": 180, - "uvlock": true + "y": 90 }, - "facing=north,half=bottom,shape=outer_left": { - "model": "malum:block/vertical_soulwood_planks_stairs_outer", - "y": 180, - "uvlock": true + "facing=west,half=bottom,shape=inner_left": { + "model": "malum:block/vertical_soulwood_planks_stairs_inner", + "uvlock": true, + "y": 90 }, - "facing=south,half=bottom,shape=outer_left": { - "model": "malum:block/vertical_soulwood_planks_stairs_outer" + "facing=west,half=bottom,shape=inner_right": { + "model": "malum:block/vertical_soulwood_planks_stairs_inner", + "uvlock": true, + "y": 180 }, "facing=west,half=bottom,shape=outer_left": { "model": "malum:block/vertical_soulwood_planks_stairs_outer", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 90 }, - "facing=east,half=bottom,shape=outer_left": { + "facing=west,half=bottom,shape=outer_right": { "model": "malum:block/vertical_soulwood_planks_stairs_outer", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=north,half=top,shape=outer_right": { - "model": "malum:block/vertical_soulwood_planks_stairs_outer", - "x": 180, - "uvlock": true + "facing=west,half=bottom,shape=straight": { + "model": "malum:block/vertical_soulwood_planks_stairs", + "uvlock": true, + "y": 180 }, - "facing=south,half=top,shape=outer_right": { - "model": "malum:block/vertical_soulwood_planks_stairs_outer", + "facing=west,half=top,shape=inner_left": { + "model": "malum:block/vertical_soulwood_planks_stairs_inner", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 180 }, - "facing=west,half=top,shape=outer_right": { - "model": "malum:block/vertical_soulwood_planks_stairs_outer", + "facing=west,half=top,shape=inner_right": { + "model": "malum:block/vertical_soulwood_planks_stairs_inner", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 270 }, - "facing=east,half=top,shape=outer_right": { + "facing=west,half=top,shape=outer_left": { "model": "malum:block/vertical_soulwood_planks_stairs_outer", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true - }, - "facing=north,half=bottom,shape=outer_right": { - "model": "malum:block/vertical_soulwood_planks_stairs_outer", - "y": 270, - "uvlock": true - }, - "facing=south,half=bottom,shape=outer_right": { - "model": "malum:block/vertical_soulwood_planks_stairs_outer", - "y": 90, - "uvlock": true + "y": 180 }, - "facing=west,half=bottom,shape=outer_right": { + "facing=west,half=top,shape=outer_right": { "model": "malum:block/vertical_soulwood_planks_stairs_outer", - "y": 180, - "uvlock": true + "uvlock": true, + "x": 180, + "y": 270 }, - "facing=east,half=bottom,shape=outer_right": { - "model": "malum:block/vertical_soulwood_planks_stairs_outer" + "facing=west,half=top,shape=straight": { + "model": "malum:block/vertical_soulwood_planks_stairs", + "uvlock": true, + "x": 180, + "y": 180 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/blockstates/wall_ether_torch.json b/src/generated/resources/assets/malum/blockstates/wall_ether_torch.json index 5f3132860..13f8d6848 100644 --- a/src/generated/resources/assets/malum/blockstates/wall_ether_torch.json +++ b/src/generated/resources/assets/malum/blockstates/wall_ether_torch.json @@ -1,34 +1,34 @@ { "variants": { - "facing=north,waterlogged=false": { - "model": "malum:block/ether_torch_wall", - "y": 270 + "facing=east,waterlogged=false": { + "model": "malum:block/ether_torch_wall" }, - "facing=south,waterlogged=false": { - "model": "malum:block/ether_torch_wall", - "y": 90 + "facing=east,waterlogged=true": { + "model": "malum:block/ether_torch_wall" }, - "facing=west,waterlogged=false": { + "facing=north,waterlogged=false": { "model": "malum:block/ether_torch_wall", - "y": 180 - }, - "facing=east,waterlogged=false": { - "model": "malum:block/ether_torch_wall" + "y": 270 }, "facing=north,waterlogged=true": { "model": "malum:block/ether_torch_wall", "y": 270 }, + "facing=south,waterlogged=false": { + "model": "malum:block/ether_torch_wall", + "y": 90 + }, "facing=south,waterlogged=true": { "model": "malum:block/ether_torch_wall", "y": 90 }, - "facing=west,waterlogged=true": { + "facing=west,waterlogged=false": { "model": "malum:block/ether_torch_wall", "y": 180 }, - "facing=east,waterlogged=true": { - "model": "malum:block/ether_torch_wall" + "facing=west,waterlogged=true": { + "model": "malum:block/ether_torch_wall", + "y": 180 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/blockstates/weavers_workbench.json b/src/generated/resources/assets/malum/blockstates/weavers_workbench.json index 29cc0062d..cde8f7137 100644 --- a/src/generated/resources/assets/malum/blockstates/weavers_workbench.json +++ b/src/generated/resources/assets/malum/blockstates/weavers_workbench.json @@ -1,5 +1,9 @@ { "variants": { + "facing=east": { + "model": "malum:block/weavers_workbench", + "y": 90 + }, "facing=north": { "model": "malum:block/weavers_workbench" }, @@ -10,10 +14,6 @@ "facing=west": { "model": "malum:block/weavers_workbench", "y": 270 - }, - "facing=east": { - "model": "malum:block/weavers_workbench", - "y": 90 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/blockstates/weeping_well_core.json b/src/generated/resources/assets/malum/blockstates/weeping_well_core.json index abe5b3671..bbf8b8a4a 100644 --- a/src/generated/resources/assets/malum/blockstates/weeping_well_core.json +++ b/src/generated/resources/assets/malum/blockstates/weeping_well_core.json @@ -1,5 +1,9 @@ { "variants": { + "facing=east": { + "model": "malum:block/weeping_well_core", + "y": 90 + }, "facing=north": { "model": "malum:block/weeping_well_core" }, @@ -10,10 +14,6 @@ "facing=west": { "model": "malum:block/weeping_well_core", "y": 270 - }, - "facing=east": { - "model": "malum:block/weeping_well_core", - "y": 90 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/blockstates/weeping_well_corner.json b/src/generated/resources/assets/malum/blockstates/weeping_well_corner.json index 6078f456d..b0473518b 100644 --- a/src/generated/resources/assets/malum/blockstates/weeping_well_corner.json +++ b/src/generated/resources/assets/malum/blockstates/weeping_well_corner.json @@ -1,5 +1,9 @@ { "variants": { + "facing=east": { + "model": "malum:block/weeping_well_corner", + "y": 90 + }, "facing=north": { "model": "malum:block/weeping_well_corner" }, @@ -10,10 +14,6 @@ "facing=west": { "model": "malum:block/weeping_well_corner", "y": 270 - }, - "facing=east": { - "model": "malum:block/weeping_well_corner", - "y": 90 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/blockstates/weeping_well_side.json b/src/generated/resources/assets/malum/blockstates/weeping_well_side.json index c3e89e5e0..10f6c4637 100644 --- a/src/generated/resources/assets/malum/blockstates/weeping_well_side.json +++ b/src/generated/resources/assets/malum/blockstates/weeping_well_side.json @@ -1,5 +1,9 @@ { "variants": { + "facing=east": { + "model": "malum:block/weeping_well_side", + "y": 90 + }, "facing=north": { "model": "malum:block/weeping_well_side" }, @@ -10,10 +14,6 @@ "facing=west": { "model": "malum:block/weeping_well_side", "y": 270 - }, - "facing=east": { - "model": "malum:block/weeping_well_side", - "y": 90 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/lang/en_us.json b/src/generated/resources/assets/malum/lang/en_us.json index f305edf05..cb44fe070 100644 --- a/src/generated/resources/assets/malum/lang/en_us.json +++ b/src/generated/resources/assets/malum/lang/en_us.json @@ -611,7 +611,7 @@ "malum.gui.book.entry.page.text.blazing_quartz.1": "It stands to reason that a place like the nether would have a substance that was flammable, and Blazing Quartz certainly fits the bill. It acts much like coal, even being able to form torches. A useful substance, even if fairly mundane.", "malum.gui.book.entry.page.text.blight.arcane_rite.1": "That echo is why this substance is important for the Unchained Rite. The Rite remembers the violence of its creation, and resonates with the memory within the blight, applying its power to things laying on top of it.", "malum.gui.book.entry.page.text.blight.composition.1": "The Undirected Rite, as the name suggests, is random. It transmutes, but it has no pattern to transmute things to. So, instead, you get something random, bits of disparate matter all jumbled together into a foul-smelling powder. I wouldn't recommend eating it, or growing things on it, but it's otherwise harmless.", - "malum.gui.book.entry.page.text.blight.intro.1": "Blight. $iSomething which spoils or damages./$ What the Undirected Rite has created has many strange properties, and I intend to categorize them.\nThe na\u00EFve explanation is that it is simply another form of power that taints the world, but that isn't right. Blight isn't harmful, not inof itself. It's just... $igunk./$", + "malum.gui.book.entry.page.text.blight.intro.1": "Blight. $iSomething which spoils or damages./$ What the Undirected Rite has created has many strange properties, and I intend to categorize them.\nThe naïve explanation is that it is simply another form of power that taints the world, but that isn't right. Blight isn't harmful, not inof itself. It's just... $igunk./$", "malum.gui.book.entry.page.text.blight.spread.1": "Blight does not spread on its own. It's just random matter, after all. But it has a spiritual memory, a pattern which to replicate. When given arcana, or a valid fertilizer, blight will haphazardly echo this pattern on the nearby area.", "malum.gui.book.entry.page.text.brilliance.1": "Brilliance is a term I have heard bandied about for what others call experience. It is a part of the soul, though improperly attached, and can be collected and used for enchanting and repairs.", "malum.gui.book.entry.page.text.brilliance.2": "What many don't know is that it can condense into a physical form. I have heard rumors of solid Brilliance coming from crushing ore, but the most reliable source is small clusters of ore where a soul faded away, leaving its experiences engraved on the stone.", diff --git a/src/generated/resources/assets/malum/models/block/blighted_earth.json b/src/generated/resources/assets/malum/models/block/blighted_earth.json index ea138d93f..f891a2826 100644 --- a/src/generated/resources/assets/malum/models/block/blighted_earth.json +++ b/src/generated/resources/assets/malum/models/block/blighted_earth.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/cube_bottom_top", "textures": { - "side": "malum:block/blight/blighted_earth", "bottom": "minecraft:block/dirt", + "side": "malum:block/blight/blighted_earth", "top": "malum:block/blight/blighted_soil_0" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/blighted_soulwood.json b/src/generated/resources/assets/malum/models/block/blighted_soulwood.json index 31668c42c..5cb02e333 100644 --- a/src/generated/resources/assets/malum/models/block/blighted_soulwood.json +++ b/src/generated/resources/assets/malum/models/block/blighted_soulwood.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/cube_bottom_top", "textures": { - "side": "malum:block/blight/blighted_soulwood", "bottom": "malum:block/blight/blighted_soil_0", + "side": "malum:block/blight/blighted_soulwood", "top": "malum:block/soulwood/soulwood_log_top" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/cut_runewood_planks.json b/src/generated/resources/assets/malum/models/block/cut_runewood_planks.json index d9e1b64b1..5f234754c 100644 --- a/src/generated/resources/assets/malum/models/block/cut_runewood_planks.json +++ b/src/generated/resources/assets/malum/models/block/cut_runewood_planks.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/cube_bottom_top", "textures": { - "side": "malum:block/runewood/cut_runewood_planks", "bottom": "malum:block/runewood/runewood_planks", + "side": "malum:block/runewood/cut_runewood_planks", "top": "malum:block/runewood/runewood_planks" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/cut_soulwood_planks.json b/src/generated/resources/assets/malum/models/block/cut_soulwood_planks.json index 31d51e3cd..4a4c7f9d2 100644 --- a/src/generated/resources/assets/malum/models/block/cut_soulwood_planks.json +++ b/src/generated/resources/assets/malum/models/block/cut_soulwood_planks.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/cube_bottom_top", "textures": { - "side": "malum:block/soulwood/cut_soulwood_planks", "bottom": "malum:block/soulwood/soulwood_planks", + "side": "malum:block/soulwood/cut_soulwood_planks", "top": "malum:block/soulwood/soulwood_planks" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/cut_tainted_rock.json b/src/generated/resources/assets/malum/models/block/cut_tainted_rock.json index 2bfc53b02..813341d67 100644 --- a/src/generated/resources/assets/malum/models/block/cut_tainted_rock.json +++ b/src/generated/resources/assets/malum/models/block/cut_tainted_rock.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/cube_bottom_top", "textures": { - "side": "malum:block/arcane_rock/tainted/cut_tainted_rock", "bottom": "malum:block/arcane_rock/tainted/smooth_tainted_rock", + "side": "malum:block/arcane_rock/tainted/cut_tainted_rock", "top": "malum:block/arcane_rock/tainted/polished_tainted_rock" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/cut_twisted_rock.json b/src/generated/resources/assets/malum/models/block/cut_twisted_rock.json index 2be4b6c02..a3c5b520c 100644 --- a/src/generated/resources/assets/malum/models/block/cut_twisted_rock.json +++ b/src/generated/resources/assets/malum/models/block/cut_twisted_rock.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/cube_bottom_top", "textures": { - "side": "malum:block/arcane_rock/twisted/cut_twisted_rock", "bottom": "malum:block/arcane_rock/twisted/smooth_twisted_rock", + "side": "malum:block/arcane_rock/twisted/cut_twisted_rock", "top": "malum:block/arcane_rock/twisted/polished_twisted_rock" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/exposed_runewood_log.json b/src/generated/resources/assets/malum/models/block/exposed_runewood_log.json index 27b644fc2..cea40e0cb 100644 --- a/src/generated/resources/assets/malum/models/block/exposed_runewood_log.json +++ b/src/generated/resources/assets/malum/models/block/exposed_runewood_log.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/cube_column", "textures": { - "side": "malum:block/runewood/exposed_runewood_log", - "end": "malum:block/runewood/exposed_runewood_log_top" + "end": "malum:block/runewood/exposed_runewood_log_top", + "side": "malum:block/runewood/exposed_runewood_log" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/exposed_runewood_log_horizontal.json b/src/generated/resources/assets/malum/models/block/exposed_runewood_log_horizontal.json index cc161102c..3ea1c8a4d 100644 --- a/src/generated/resources/assets/malum/models/block/exposed_runewood_log_horizontal.json +++ b/src/generated/resources/assets/malum/models/block/exposed_runewood_log_horizontal.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/cube_column_horizontal", "textures": { - "side": "malum:block/runewood/exposed_runewood_log", - "end": "malum:block/runewood/exposed_runewood_log_top" + "end": "malum:block/runewood/exposed_runewood_log_top", + "side": "malum:block/runewood/exposed_runewood_log" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/exposed_soulwood_log.json b/src/generated/resources/assets/malum/models/block/exposed_soulwood_log.json index 3c0329536..e3cbbec94 100644 --- a/src/generated/resources/assets/malum/models/block/exposed_soulwood_log.json +++ b/src/generated/resources/assets/malum/models/block/exposed_soulwood_log.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/cube_column", "textures": { - "side": "malum:block/soulwood/exposed_soulwood_log", - "end": "malum:block/soulwood/exposed_soulwood_log_top" + "end": "malum:block/soulwood/exposed_soulwood_log_top", + "side": "malum:block/soulwood/exposed_soulwood_log" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/exposed_soulwood_log_horizontal.json b/src/generated/resources/assets/malum/models/block/exposed_soulwood_log_horizontal.json index 1d94d86af..914f9a14f 100644 --- a/src/generated/resources/assets/malum/models/block/exposed_soulwood_log_horizontal.json +++ b/src/generated/resources/assets/malum/models/block/exposed_soulwood_log_horizontal.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/cube_column_horizontal", "textures": { - "side": "malum:block/soulwood/exposed_soulwood_log", - "end": "malum:block/soulwood/exposed_soulwood_log_top" + "end": "malum:block/soulwood/exposed_soulwood_log_top", + "side": "malum:block/soulwood/exposed_soulwood_log" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/polished_tainted_rock_slab.json b/src/generated/resources/assets/malum/models/block/polished_tainted_rock_slab.json index f0d62f9e7..8291e3891 100644 --- a/src/generated/resources/assets/malum/models/block/polished_tainted_rock_slab.json +++ b/src/generated/resources/assets/malum/models/block/polished_tainted_rock_slab.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/slab", "textures": { - "side": "malum:block/arcane_rock/tainted/polished_tainted_rock", "bottom": "malum:block/arcane_rock/tainted/polished_tainted_rock", + "side": "malum:block/arcane_rock/tainted/polished_tainted_rock", "top": "malum:block/arcane_rock/tainted/polished_tainted_rock" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/polished_tainted_rock_slab_top.json b/src/generated/resources/assets/malum/models/block/polished_tainted_rock_slab_top.json index 9ba4bebc9..0d7e67b40 100644 --- a/src/generated/resources/assets/malum/models/block/polished_tainted_rock_slab_top.json +++ b/src/generated/resources/assets/malum/models/block/polished_tainted_rock_slab_top.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/slab_top", "textures": { - "side": "malum:block/arcane_rock/tainted/polished_tainted_rock", "bottom": "malum:block/arcane_rock/tainted/polished_tainted_rock", + "side": "malum:block/arcane_rock/tainted/polished_tainted_rock", "top": "malum:block/arcane_rock/tainted/polished_tainted_rock" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/polished_tainted_rock_stairs.json b/src/generated/resources/assets/malum/models/block/polished_tainted_rock_stairs.json index 189f22b97..3d914ffb5 100644 --- a/src/generated/resources/assets/malum/models/block/polished_tainted_rock_stairs.json +++ b/src/generated/resources/assets/malum/models/block/polished_tainted_rock_stairs.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/stairs", "textures": { - "side": "malum:block/arcane_rock/tainted/polished_tainted_rock", "bottom": "malum:block/arcane_rock/tainted/polished_tainted_rock", + "side": "malum:block/arcane_rock/tainted/polished_tainted_rock", "top": "malum:block/arcane_rock/tainted/polished_tainted_rock" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/polished_tainted_rock_stairs_inner.json b/src/generated/resources/assets/malum/models/block/polished_tainted_rock_stairs_inner.json index a42b9863b..dfc6d0ef6 100644 --- a/src/generated/resources/assets/malum/models/block/polished_tainted_rock_stairs_inner.json +++ b/src/generated/resources/assets/malum/models/block/polished_tainted_rock_stairs_inner.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/inner_stairs", "textures": { - "side": "malum:block/arcane_rock/tainted/polished_tainted_rock", "bottom": "malum:block/arcane_rock/tainted/polished_tainted_rock", + "side": "malum:block/arcane_rock/tainted/polished_tainted_rock", "top": "malum:block/arcane_rock/tainted/polished_tainted_rock" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/polished_tainted_rock_stairs_outer.json b/src/generated/resources/assets/malum/models/block/polished_tainted_rock_stairs_outer.json index f047e2797..426fad3c0 100644 --- a/src/generated/resources/assets/malum/models/block/polished_tainted_rock_stairs_outer.json +++ b/src/generated/resources/assets/malum/models/block/polished_tainted_rock_stairs_outer.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/outer_stairs", "textures": { - "side": "malum:block/arcane_rock/tainted/polished_tainted_rock", "bottom": "malum:block/arcane_rock/tainted/polished_tainted_rock", + "side": "malum:block/arcane_rock/tainted/polished_tainted_rock", "top": "malum:block/arcane_rock/tainted/polished_tainted_rock" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/polished_twisted_rock_slab.json b/src/generated/resources/assets/malum/models/block/polished_twisted_rock_slab.json index aaa5b6a8d..9d786e9e1 100644 --- a/src/generated/resources/assets/malum/models/block/polished_twisted_rock_slab.json +++ b/src/generated/resources/assets/malum/models/block/polished_twisted_rock_slab.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/slab", "textures": { - "side": "malum:block/arcane_rock/twisted/polished_twisted_rock", "bottom": "malum:block/arcane_rock/twisted/polished_twisted_rock", + "side": "malum:block/arcane_rock/twisted/polished_twisted_rock", "top": "malum:block/arcane_rock/twisted/polished_twisted_rock" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/polished_twisted_rock_slab_top.json b/src/generated/resources/assets/malum/models/block/polished_twisted_rock_slab_top.json index 61344f82b..b5ade8993 100644 --- a/src/generated/resources/assets/malum/models/block/polished_twisted_rock_slab_top.json +++ b/src/generated/resources/assets/malum/models/block/polished_twisted_rock_slab_top.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/slab_top", "textures": { - "side": "malum:block/arcane_rock/twisted/polished_twisted_rock", "bottom": "malum:block/arcane_rock/twisted/polished_twisted_rock", + "side": "malum:block/arcane_rock/twisted/polished_twisted_rock", "top": "malum:block/arcane_rock/twisted/polished_twisted_rock" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/polished_twisted_rock_stairs.json b/src/generated/resources/assets/malum/models/block/polished_twisted_rock_stairs.json index e01e0ab99..c3f3ca7f8 100644 --- a/src/generated/resources/assets/malum/models/block/polished_twisted_rock_stairs.json +++ b/src/generated/resources/assets/malum/models/block/polished_twisted_rock_stairs.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/stairs", "textures": { - "side": "malum:block/arcane_rock/twisted/polished_twisted_rock", "bottom": "malum:block/arcane_rock/twisted/polished_twisted_rock", + "side": "malum:block/arcane_rock/twisted/polished_twisted_rock", "top": "malum:block/arcane_rock/twisted/polished_twisted_rock" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/polished_twisted_rock_stairs_inner.json b/src/generated/resources/assets/malum/models/block/polished_twisted_rock_stairs_inner.json index 14583cdbc..7d724b59a 100644 --- a/src/generated/resources/assets/malum/models/block/polished_twisted_rock_stairs_inner.json +++ b/src/generated/resources/assets/malum/models/block/polished_twisted_rock_stairs_inner.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/inner_stairs", "textures": { - "side": "malum:block/arcane_rock/twisted/polished_twisted_rock", "bottom": "malum:block/arcane_rock/twisted/polished_twisted_rock", + "side": "malum:block/arcane_rock/twisted/polished_twisted_rock", "top": "malum:block/arcane_rock/twisted/polished_twisted_rock" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/polished_twisted_rock_stairs_outer.json b/src/generated/resources/assets/malum/models/block/polished_twisted_rock_stairs_outer.json index 15b730bdd..0b7f01b80 100644 --- a/src/generated/resources/assets/malum/models/block/polished_twisted_rock_stairs_outer.json +++ b/src/generated/resources/assets/malum/models/block/polished_twisted_rock_stairs_outer.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/outer_stairs", "textures": { - "side": "malum:block/arcane_rock/twisted/polished_twisted_rock", "bottom": "malum:block/arcane_rock/twisted/polished_twisted_rock", + "side": "malum:block/arcane_rock/twisted/polished_twisted_rock", "top": "malum:block/arcane_rock/twisted/polished_twisted_rock" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/revealed_runewood_log.json b/src/generated/resources/assets/malum/models/block/revealed_runewood_log.json index 05c3e97d6..a4360ff07 100644 --- a/src/generated/resources/assets/malum/models/block/revealed_runewood_log.json +++ b/src/generated/resources/assets/malum/models/block/revealed_runewood_log.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/cube_column", "textures": { - "side": "malum:block/runewood/revealed_runewood_log", - "end": "malum:block/runewood/revealed_runewood_log_top" + "end": "malum:block/runewood/revealed_runewood_log_top", + "side": "malum:block/runewood/revealed_runewood_log" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/revealed_runewood_log_horizontal.json b/src/generated/resources/assets/malum/models/block/revealed_runewood_log_horizontal.json index 92fc687e2..92bf7bbe6 100644 --- a/src/generated/resources/assets/malum/models/block/revealed_runewood_log_horizontal.json +++ b/src/generated/resources/assets/malum/models/block/revealed_runewood_log_horizontal.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/cube_column_horizontal", "textures": { - "side": "malum:block/runewood/revealed_runewood_log", - "end": "malum:block/runewood/revealed_runewood_log_top" + "end": "malum:block/runewood/revealed_runewood_log_top", + "side": "malum:block/runewood/revealed_runewood_log" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/revealed_soulwood_log.json b/src/generated/resources/assets/malum/models/block/revealed_soulwood_log.json index b34b5e336..226068559 100644 --- a/src/generated/resources/assets/malum/models/block/revealed_soulwood_log.json +++ b/src/generated/resources/assets/malum/models/block/revealed_soulwood_log.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/cube_column", "textures": { - "side": "malum:block/soulwood/revealed_soulwood_log", - "end": "malum:block/soulwood/revealed_soulwood_log_top" + "end": "malum:block/soulwood/revealed_soulwood_log_top", + "side": "malum:block/soulwood/revealed_soulwood_log" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/revealed_soulwood_log_horizontal.json b/src/generated/resources/assets/malum/models/block/revealed_soulwood_log_horizontal.json index 50e772a79..d3ffda906 100644 --- a/src/generated/resources/assets/malum/models/block/revealed_soulwood_log_horizontal.json +++ b/src/generated/resources/assets/malum/models/block/revealed_soulwood_log_horizontal.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/cube_column_horizontal", "textures": { - "side": "malum:block/soulwood/revealed_soulwood_log", - "end": "malum:block/soulwood/revealed_soulwood_log_top" + "end": "malum:block/soulwood/revealed_soulwood_log_top", + "side": "malum:block/soulwood/revealed_soulwood_log" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/runewood.json b/src/generated/resources/assets/malum/models/block/runewood.json index fbd2fcece..d0e956915 100644 --- a/src/generated/resources/assets/malum/models/block/runewood.json +++ b/src/generated/resources/assets/malum/models/block/runewood.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/cube_column", "textures": { - "side": "malum:block/runewood/runewood_log", - "end": "malum:block/runewood/runewood_log" + "end": "malum:block/runewood/runewood_log", + "side": "malum:block/runewood/runewood_log" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/runewood_beam.json b/src/generated/resources/assets/malum/models/block/runewood_beam.json index 01ad9ae33..dbd40c5ef 100644 --- a/src/generated/resources/assets/malum/models/block/runewood_beam.json +++ b/src/generated/resources/assets/malum/models/block/runewood_beam.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/cube_column", "textures": { - "side": "malum:block/runewood/runewood_beam", - "end": "malum:block/runewood/runewood_beam_top" + "end": "malum:block/runewood/runewood_beam_top", + "side": "malum:block/runewood/runewood_beam" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/runewood_beam_horizontal.json b/src/generated/resources/assets/malum/models/block/runewood_beam_horizontal.json index 856e24d51..9330466f6 100644 --- a/src/generated/resources/assets/malum/models/block/runewood_beam_horizontal.json +++ b/src/generated/resources/assets/malum/models/block/runewood_beam_horizontal.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/cube_column_horizontal", "textures": { - "side": "malum:block/runewood/runewood_beam", - "end": "malum:block/runewood/runewood_beam_top" + "end": "malum:block/runewood/runewood_beam_top", + "side": "malum:block/runewood/runewood_beam" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/runewood_door_top.json b/src/generated/resources/assets/malum/models/block/runewood_door_bottom_left.json similarity index 73% rename from src/generated/resources/assets/malum/models/block/runewood_door_top.json rename to src/generated/resources/assets/malum/models/block/runewood_door_bottom_left.json index 077b81768..f57e1a8bb 100644 --- a/src/generated/resources/assets/malum/models/block/runewood_door_top.json +++ b/src/generated/resources/assets/malum/models/block/runewood_door_bottom_left.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_top", + "parent": "minecraft:block/door_bottom_left", "textures": { "bottom": "malum:block/runewood/runewood_door_bottom", "top": "malum:block/runewood/runewood_door_top" diff --git a/src/generated/resources/assets/malum/models/block/runewood_door_bottom_left_open.json b/src/generated/resources/assets/malum/models/block/runewood_door_bottom_left_open.json new file mode 100644 index 000000000..0b62b9f95 --- /dev/null +++ b/src/generated/resources/assets/malum/models/block/runewood_door_bottom_left_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom_left_open", + "textures": { + "bottom": "malum:block/runewood/runewood_door_bottom", + "top": "malum:block/runewood/runewood_door_top" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/runewood_door_top_hinge.json b/src/generated/resources/assets/malum/models/block/runewood_door_bottom_right.json similarity index 73% rename from src/generated/resources/assets/malum/models/block/runewood_door_top_hinge.json rename to src/generated/resources/assets/malum/models/block/runewood_door_bottom_right.json index 8c4dfd1eb..8c96bfe24 100644 --- a/src/generated/resources/assets/malum/models/block/runewood_door_top_hinge.json +++ b/src/generated/resources/assets/malum/models/block/runewood_door_bottom_right.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_top_rh", + "parent": "minecraft:block/door_bottom_right", "textures": { "bottom": "malum:block/runewood/runewood_door_bottom", "top": "malum:block/runewood/runewood_door_top" diff --git a/src/generated/resources/assets/malum/models/block/runewood_door_bottom_right_open.json b/src/generated/resources/assets/malum/models/block/runewood_door_bottom_right_open.json new file mode 100644 index 000000000..9d12cecf1 --- /dev/null +++ b/src/generated/resources/assets/malum/models/block/runewood_door_bottom_right_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom_right_open", + "textures": { + "bottom": "malum:block/runewood/runewood_door_bottom", + "top": "malum:block/runewood/runewood_door_top" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/runewood_door_bottom.json b/src/generated/resources/assets/malum/models/block/runewood_door_top_left.json similarity index 74% rename from src/generated/resources/assets/malum/models/block/runewood_door_bottom.json rename to src/generated/resources/assets/malum/models/block/runewood_door_top_left.json index 52f712ee7..21cc5895a 100644 --- a/src/generated/resources/assets/malum/models/block/runewood_door_bottom.json +++ b/src/generated/resources/assets/malum/models/block/runewood_door_top_left.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_bottom", + "parent": "minecraft:block/door_top_left", "textures": { "bottom": "malum:block/runewood/runewood_door_bottom", "top": "malum:block/runewood/runewood_door_top" diff --git a/src/generated/resources/assets/malum/models/block/runewood_door_top_left_open.json b/src/generated/resources/assets/malum/models/block/runewood_door_top_left_open.json new file mode 100644 index 000000000..78f2d46b5 --- /dev/null +++ b/src/generated/resources/assets/malum/models/block/runewood_door_top_left_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top_left_open", + "textures": { + "bottom": "malum:block/runewood/runewood_door_bottom", + "top": "malum:block/runewood/runewood_door_top" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/runewood_door_bottom_hinge.json b/src/generated/resources/assets/malum/models/block/runewood_door_top_right.json similarity index 74% rename from src/generated/resources/assets/malum/models/block/runewood_door_bottom_hinge.json rename to src/generated/resources/assets/malum/models/block/runewood_door_top_right.json index 8510d8d4a..2a5238ec2 100644 --- a/src/generated/resources/assets/malum/models/block/runewood_door_bottom_hinge.json +++ b/src/generated/resources/assets/malum/models/block/runewood_door_top_right.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_bottom_rh", + "parent": "minecraft:block/door_top_right", "textures": { "bottom": "malum:block/runewood/runewood_door_bottom", "top": "malum:block/runewood/runewood_door_top" diff --git a/src/generated/resources/assets/malum/models/block/runewood_door_top_right_open.json b/src/generated/resources/assets/malum/models/block/runewood_door_top_right_open.json new file mode 100644 index 000000000..0e65359f5 --- /dev/null +++ b/src/generated/resources/assets/malum/models/block/runewood_door_top_right_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top_right_open", + "textures": { + "bottom": "malum:block/runewood/runewood_door_bottom", + "top": "malum:block/runewood/runewood_door_top" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/runewood_horizontal.json b/src/generated/resources/assets/malum/models/block/runewood_horizontal.json index 1305bf195..9964742fa 100644 --- a/src/generated/resources/assets/malum/models/block/runewood_horizontal.json +++ b/src/generated/resources/assets/malum/models/block/runewood_horizontal.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/cube_column_horizontal", "textures": { - "side": "malum:block/runewood/runewood_log", - "end": "malum:block/runewood/runewood_log" + "end": "malum:block/runewood/runewood_log", + "side": "malum:block/runewood/runewood_log" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/runewood_item_pedestal.json b/src/generated/resources/assets/malum/models/block/runewood_item_pedestal.json index 9a2178c19..8f84839fd 100644 --- a/src/generated/resources/assets/malum/models/block/runewood_item_pedestal.json +++ b/src/generated/resources/assets/malum/models/block/runewood_item_pedestal.json @@ -1,7 +1,7 @@ { "parent": "malum:block/templates/template_wooden_item_pedestal", "textures": { - "pedestal": "malum:block/runewood/runewood_item_pedestal", - "particle": "malum:block/runewood/runewood_planks" + "particle": "malum:block/runewood/runewood_planks", + "pedestal": "malum:block/runewood/runewood_item_pedestal" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/runewood_item_stand.json b/src/generated/resources/assets/malum/models/block/runewood_item_stand.json index f8d694b11..cf4264cd1 100644 --- a/src/generated/resources/assets/malum/models/block/runewood_item_stand.json +++ b/src/generated/resources/assets/malum/models/block/runewood_item_stand.json @@ -1,7 +1,7 @@ { "parent": "malum:block/templates/template_item_stand", "textures": { - "stand": "malum:block/runewood/runewood_item_stand", - "particle": "malum:block/runewood/runewood_planks" + "particle": "malum:block/runewood/runewood_planks", + "stand": "malum:block/runewood/runewood_item_stand" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/runewood_log.json b/src/generated/resources/assets/malum/models/block/runewood_log.json index 6130e4e6f..6fd554f9f 100644 --- a/src/generated/resources/assets/malum/models/block/runewood_log.json +++ b/src/generated/resources/assets/malum/models/block/runewood_log.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/cube_column", "textures": { - "side": "malum:block/runewood/runewood_log", - "end": "malum:block/runewood/runewood_log_top" + "end": "malum:block/runewood/runewood_log_top", + "side": "malum:block/runewood/runewood_log" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/runewood_log_horizontal.json b/src/generated/resources/assets/malum/models/block/runewood_log_horizontal.json index 19ff297c2..a10148456 100644 --- a/src/generated/resources/assets/malum/models/block/runewood_log_horizontal.json +++ b/src/generated/resources/assets/malum/models/block/runewood_log_horizontal.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/cube_column_horizontal", "textures": { - "side": "malum:block/runewood/runewood_log", - "end": "malum:block/runewood/runewood_log_top" + "end": "malum:block/runewood/runewood_log_top", + "side": "malum:block/runewood/runewood_log" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/runewood_panel_slab.json b/src/generated/resources/assets/malum/models/block/runewood_panel_slab.json index f420683c0..4fa15f3b1 100644 --- a/src/generated/resources/assets/malum/models/block/runewood_panel_slab.json +++ b/src/generated/resources/assets/malum/models/block/runewood_panel_slab.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/slab", "textures": { - "side": "malum:block/runewood/runewood_panel", "bottom": "malum:block/runewood/runewood_panel", + "side": "malum:block/runewood/runewood_panel", "top": "malum:block/runewood/runewood_panel" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/runewood_panel_slab_top.json b/src/generated/resources/assets/malum/models/block/runewood_panel_slab_top.json index 1ec56976e..79033ea90 100644 --- a/src/generated/resources/assets/malum/models/block/runewood_panel_slab_top.json +++ b/src/generated/resources/assets/malum/models/block/runewood_panel_slab_top.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/slab_top", "textures": { - "side": "malum:block/runewood/runewood_panel", "bottom": "malum:block/runewood/runewood_panel", + "side": "malum:block/runewood/runewood_panel", "top": "malum:block/runewood/runewood_panel" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/runewood_panel_stairs.json b/src/generated/resources/assets/malum/models/block/runewood_panel_stairs.json index 6fa9f030e..dd286211f 100644 --- a/src/generated/resources/assets/malum/models/block/runewood_panel_stairs.json +++ b/src/generated/resources/assets/malum/models/block/runewood_panel_stairs.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/stairs", "textures": { - "side": "malum:block/runewood/runewood_panel", "bottom": "malum:block/runewood/runewood_panel", + "side": "malum:block/runewood/runewood_panel", "top": "malum:block/runewood/runewood_panel" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/runewood_panel_stairs_inner.json b/src/generated/resources/assets/malum/models/block/runewood_panel_stairs_inner.json index cc84f4870..7df291ea7 100644 --- a/src/generated/resources/assets/malum/models/block/runewood_panel_stairs_inner.json +++ b/src/generated/resources/assets/malum/models/block/runewood_panel_stairs_inner.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/inner_stairs", "textures": { - "side": "malum:block/runewood/runewood_panel", "bottom": "malum:block/runewood/runewood_panel", + "side": "malum:block/runewood/runewood_panel", "top": "malum:block/runewood/runewood_panel" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/runewood_panel_stairs_outer.json b/src/generated/resources/assets/malum/models/block/runewood_panel_stairs_outer.json index 8444a3742..5d5f7905f 100644 --- a/src/generated/resources/assets/malum/models/block/runewood_panel_stairs_outer.json +++ b/src/generated/resources/assets/malum/models/block/runewood_panel_stairs_outer.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/outer_stairs", "textures": { - "side": "malum:block/runewood/runewood_panel", "bottom": "malum:block/runewood/runewood_panel", + "side": "malum:block/runewood/runewood_panel", "top": "malum:block/runewood/runewood_panel" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/runewood_planks_slab.json b/src/generated/resources/assets/malum/models/block/runewood_planks_slab.json index ea598b639..45a98e391 100644 --- a/src/generated/resources/assets/malum/models/block/runewood_planks_slab.json +++ b/src/generated/resources/assets/malum/models/block/runewood_planks_slab.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/slab", "textures": { - "side": "malum:block/runewood/runewood_planks", "bottom": "malum:block/runewood/runewood_planks", + "side": "malum:block/runewood/runewood_planks", "top": "malum:block/runewood/runewood_planks" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/runewood_planks_slab_top.json b/src/generated/resources/assets/malum/models/block/runewood_planks_slab_top.json index 2a941b0b5..5a72994b1 100644 --- a/src/generated/resources/assets/malum/models/block/runewood_planks_slab_top.json +++ b/src/generated/resources/assets/malum/models/block/runewood_planks_slab_top.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/slab_top", "textures": { - "side": "malum:block/runewood/runewood_planks", "bottom": "malum:block/runewood/runewood_planks", + "side": "malum:block/runewood/runewood_planks", "top": "malum:block/runewood/runewood_planks" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/runewood_planks_stairs.json b/src/generated/resources/assets/malum/models/block/runewood_planks_stairs.json index f84b3cbef..a8e55bb2e 100644 --- a/src/generated/resources/assets/malum/models/block/runewood_planks_stairs.json +++ b/src/generated/resources/assets/malum/models/block/runewood_planks_stairs.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/stairs", "textures": { - "side": "malum:block/runewood/runewood_planks", "bottom": "malum:block/runewood/runewood_planks", + "side": "malum:block/runewood/runewood_planks", "top": "malum:block/runewood/runewood_planks" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/runewood_planks_stairs_inner.json b/src/generated/resources/assets/malum/models/block/runewood_planks_stairs_inner.json index 736497129..9143d1f45 100644 --- a/src/generated/resources/assets/malum/models/block/runewood_planks_stairs_inner.json +++ b/src/generated/resources/assets/malum/models/block/runewood_planks_stairs_inner.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/inner_stairs", "textures": { - "side": "malum:block/runewood/runewood_planks", "bottom": "malum:block/runewood/runewood_planks", + "side": "malum:block/runewood/runewood_planks", "top": "malum:block/runewood/runewood_planks" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/runewood_planks_stairs_outer.json b/src/generated/resources/assets/malum/models/block/runewood_planks_stairs_outer.json index 50f184c92..40942c6bc 100644 --- a/src/generated/resources/assets/malum/models/block/runewood_planks_stairs_outer.json +++ b/src/generated/resources/assets/malum/models/block/runewood_planks_stairs_outer.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/outer_stairs", "textures": { - "side": "malum:block/runewood/runewood_planks", "bottom": "malum:block/runewood/runewood_planks", + "side": "malum:block/runewood/runewood_planks", "top": "malum:block/runewood/runewood_planks" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/runewood_tiles_slab.json b/src/generated/resources/assets/malum/models/block/runewood_tiles_slab.json index 8e01899ec..10a8ad7b7 100644 --- a/src/generated/resources/assets/malum/models/block/runewood_tiles_slab.json +++ b/src/generated/resources/assets/malum/models/block/runewood_tiles_slab.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/slab", "textures": { - "side": "malum:block/runewood/runewood_tiles", "bottom": "malum:block/runewood/runewood_tiles", + "side": "malum:block/runewood/runewood_tiles", "top": "malum:block/runewood/runewood_tiles" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/runewood_tiles_slab_top.json b/src/generated/resources/assets/malum/models/block/runewood_tiles_slab_top.json index ae70be956..9a308c053 100644 --- a/src/generated/resources/assets/malum/models/block/runewood_tiles_slab_top.json +++ b/src/generated/resources/assets/malum/models/block/runewood_tiles_slab_top.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/slab_top", "textures": { - "side": "malum:block/runewood/runewood_tiles", "bottom": "malum:block/runewood/runewood_tiles", + "side": "malum:block/runewood/runewood_tiles", "top": "malum:block/runewood/runewood_tiles" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/runewood_tiles_stairs.json b/src/generated/resources/assets/malum/models/block/runewood_tiles_stairs.json index 40666bd74..9cf0e8050 100644 --- a/src/generated/resources/assets/malum/models/block/runewood_tiles_stairs.json +++ b/src/generated/resources/assets/malum/models/block/runewood_tiles_stairs.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/stairs", "textures": { - "side": "malum:block/runewood/runewood_tiles", "bottom": "malum:block/runewood/runewood_tiles", + "side": "malum:block/runewood/runewood_tiles", "top": "malum:block/runewood/runewood_tiles" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/runewood_tiles_stairs_inner.json b/src/generated/resources/assets/malum/models/block/runewood_tiles_stairs_inner.json index 73b6f4ef2..8c7865496 100644 --- a/src/generated/resources/assets/malum/models/block/runewood_tiles_stairs_inner.json +++ b/src/generated/resources/assets/malum/models/block/runewood_tiles_stairs_inner.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/inner_stairs", "textures": { - "side": "malum:block/runewood/runewood_tiles", "bottom": "malum:block/runewood/runewood_tiles", + "side": "malum:block/runewood/runewood_tiles", "top": "malum:block/runewood/runewood_tiles" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/runewood_tiles_stairs_outer.json b/src/generated/resources/assets/malum/models/block/runewood_tiles_stairs_outer.json index 8cc41cb8e..4030f0e13 100644 --- a/src/generated/resources/assets/malum/models/block/runewood_tiles_stairs_outer.json +++ b/src/generated/resources/assets/malum/models/block/runewood_tiles_stairs_outer.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/outer_stairs", "textures": { - "side": "malum:block/runewood/runewood_tiles", "bottom": "malum:block/runewood/runewood_tiles", + "side": "malum:block/runewood/runewood_tiles", "top": "malum:block/runewood/runewood_tiles" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/runewood_totem_base.json b/src/generated/resources/assets/malum/models/block/runewood_totem_base.json index 62cdd530f..258a9c009 100644 --- a/src/generated/resources/assets/malum/models/block/runewood_totem_base.json +++ b/src/generated/resources/assets/malum/models/block/runewood_totem_base.json @@ -1,9 +1,9 @@ { "parent": "malum:block/templates/template_totem_base", "textures": { - "side": "malum:block/runewood/runewood_log", - "top": "malum:block/runewood/runewood_log_top", + "panel": "malum:block/runewood/runewood_panel", "planks": "malum:block/runewood/runewood_planks", - "panel": "malum:block/runewood/runewood_panel" + "side": "malum:block/runewood/runewood_log", + "top": "malum:block/runewood/runewood_log_top" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/runewood_totem_pole_aerial.json b/src/generated/resources/assets/malum/models/block/runewood_totem_pole_aerial.json index 2ef8553bd..088da4cb2 100644 --- a/src/generated/resources/assets/malum/models/block/runewood_totem_pole_aerial.json +++ b/src/generated/resources/assets/malum/models/block/runewood_totem_pole_aerial.json @@ -1,8 +1,8 @@ { "parent": "malum:block/templates/template_totem_pole", "textures": { + "front": "malum:block/runewood/totem_poles/aerial_runewood_cutout", "side": "malum:block/runewood/runewood_log", - "top": "malum:block/runewood/runewood_log_top", - "front": "malum:block/runewood/totem_poles/aerial_runewood_cutout" + "top": "malum:block/runewood/runewood_log_top" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/runewood_totem_pole_aqueous.json b/src/generated/resources/assets/malum/models/block/runewood_totem_pole_aqueous.json index 68709b429..8962dce49 100644 --- a/src/generated/resources/assets/malum/models/block/runewood_totem_pole_aqueous.json +++ b/src/generated/resources/assets/malum/models/block/runewood_totem_pole_aqueous.json @@ -1,8 +1,8 @@ { "parent": "malum:block/templates/template_totem_pole", "textures": { + "front": "malum:block/runewood/totem_poles/aqueous_runewood_cutout", "side": "malum:block/runewood/runewood_log", - "top": "malum:block/runewood/runewood_log_top", - "front": "malum:block/runewood/totem_poles/aqueous_runewood_cutout" + "top": "malum:block/runewood/runewood_log_top" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/runewood_totem_pole_arcane.json b/src/generated/resources/assets/malum/models/block/runewood_totem_pole_arcane.json index 6c0a313e8..e48949ce8 100644 --- a/src/generated/resources/assets/malum/models/block/runewood_totem_pole_arcane.json +++ b/src/generated/resources/assets/malum/models/block/runewood_totem_pole_arcane.json @@ -1,8 +1,8 @@ { "parent": "malum:block/templates/template_totem_pole", "textures": { + "front": "malum:block/runewood/totem_poles/arcane_runewood_cutout", "side": "malum:block/runewood/runewood_log", - "top": "malum:block/runewood/runewood_log_top", - "front": "malum:block/runewood/totem_poles/arcane_runewood_cutout" + "top": "malum:block/runewood/runewood_log_top" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/runewood_totem_pole_earthen.json b/src/generated/resources/assets/malum/models/block/runewood_totem_pole_earthen.json index 6bed34309..e13584f24 100644 --- a/src/generated/resources/assets/malum/models/block/runewood_totem_pole_earthen.json +++ b/src/generated/resources/assets/malum/models/block/runewood_totem_pole_earthen.json @@ -1,8 +1,8 @@ { "parent": "malum:block/templates/template_totem_pole", "textures": { + "front": "malum:block/runewood/totem_poles/earthen_runewood_cutout", "side": "malum:block/runewood/runewood_log", - "top": "malum:block/runewood/runewood_log_top", - "front": "malum:block/runewood/totem_poles/earthen_runewood_cutout" + "top": "malum:block/runewood/runewood_log_top" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/runewood_totem_pole_eldritch.json b/src/generated/resources/assets/malum/models/block/runewood_totem_pole_eldritch.json index 6d7b29525..949114952 100644 --- a/src/generated/resources/assets/malum/models/block/runewood_totem_pole_eldritch.json +++ b/src/generated/resources/assets/malum/models/block/runewood_totem_pole_eldritch.json @@ -1,8 +1,8 @@ { "parent": "malum:block/templates/template_totem_pole", "textures": { + "front": "malum:block/runewood/totem_poles/eldritch_runewood_cutout", "side": "malum:block/runewood/runewood_log", - "top": "malum:block/runewood/runewood_log_top", - "front": "malum:block/runewood/totem_poles/eldritch_runewood_cutout" + "top": "malum:block/runewood/runewood_log_top" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/runewood_totem_pole_infernal.json b/src/generated/resources/assets/malum/models/block/runewood_totem_pole_infernal.json index 50fa25d42..1e396de0b 100644 --- a/src/generated/resources/assets/malum/models/block/runewood_totem_pole_infernal.json +++ b/src/generated/resources/assets/malum/models/block/runewood_totem_pole_infernal.json @@ -1,8 +1,8 @@ { "parent": "malum:block/templates/template_totem_pole", "textures": { + "front": "malum:block/runewood/totem_poles/infernal_runewood_cutout", "side": "malum:block/runewood/runewood_log", - "top": "malum:block/runewood/runewood_log_top", - "front": "malum:block/runewood/totem_poles/infernal_runewood_cutout" + "top": "malum:block/runewood/runewood_log_top" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/runewood_totem_pole_sacred.json b/src/generated/resources/assets/malum/models/block/runewood_totem_pole_sacred.json index 185d1055f..95c7be50d 100644 --- a/src/generated/resources/assets/malum/models/block/runewood_totem_pole_sacred.json +++ b/src/generated/resources/assets/malum/models/block/runewood_totem_pole_sacred.json @@ -1,8 +1,8 @@ { "parent": "malum:block/templates/template_totem_pole", "textures": { + "front": "malum:block/runewood/totem_poles/sacred_runewood_cutout", "side": "malum:block/runewood/runewood_log", - "top": "malum:block/runewood/runewood_log_top", - "front": "malum:block/runewood/totem_poles/sacred_runewood_cutout" + "top": "malum:block/runewood/runewood_log_top" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/runewood_totem_pole_wicked.json b/src/generated/resources/assets/malum/models/block/runewood_totem_pole_wicked.json index 7ba1bb541..8d2f8d357 100644 --- a/src/generated/resources/assets/malum/models/block/runewood_totem_pole_wicked.json +++ b/src/generated/resources/assets/malum/models/block/runewood_totem_pole_wicked.json @@ -1,8 +1,8 @@ { "parent": "malum:block/templates/template_totem_pole", "textures": { + "front": "malum:block/runewood/totem_poles/wicked_runewood_cutout", "side": "malum:block/runewood/runewood_log", - "top": "malum:block/runewood/runewood_log_top", - "front": "malum:block/runewood/totem_poles/wicked_runewood_cutout" + "top": "malum:block/runewood/runewood_log_top" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/runic_small_tainted_rock_bricks_slab.json b/src/generated/resources/assets/malum/models/block/runic_small_tainted_rock_bricks_slab.json index 261ceee84..2629bfa0e 100644 --- a/src/generated/resources/assets/malum/models/block/runic_small_tainted_rock_bricks_slab.json +++ b/src/generated/resources/assets/malum/models/block/runic_small_tainted_rock_bricks_slab.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/slab", "textures": { - "side": "malum:block/arcane_rock/tainted/runic_small_tainted_rock_bricks", "bottom": "malum:block/arcane_rock/tainted/runic_small_tainted_rock_bricks", + "side": "malum:block/arcane_rock/tainted/runic_small_tainted_rock_bricks", "top": "malum:block/arcane_rock/tainted/runic_small_tainted_rock_bricks" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/runic_small_tainted_rock_bricks_slab_top.json b/src/generated/resources/assets/malum/models/block/runic_small_tainted_rock_bricks_slab_top.json index ac75e8dd3..94d64f38e 100644 --- a/src/generated/resources/assets/malum/models/block/runic_small_tainted_rock_bricks_slab_top.json +++ b/src/generated/resources/assets/malum/models/block/runic_small_tainted_rock_bricks_slab_top.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/slab_top", "textures": { - "side": "malum:block/arcane_rock/tainted/runic_small_tainted_rock_bricks", "bottom": "malum:block/arcane_rock/tainted/runic_small_tainted_rock_bricks", + "side": "malum:block/arcane_rock/tainted/runic_small_tainted_rock_bricks", "top": "malum:block/arcane_rock/tainted/runic_small_tainted_rock_bricks" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/runic_small_tainted_rock_bricks_stairs.json b/src/generated/resources/assets/malum/models/block/runic_small_tainted_rock_bricks_stairs.json index 269c643d9..b3f32524c 100644 --- a/src/generated/resources/assets/malum/models/block/runic_small_tainted_rock_bricks_stairs.json +++ b/src/generated/resources/assets/malum/models/block/runic_small_tainted_rock_bricks_stairs.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/stairs", "textures": { - "side": "malum:block/arcane_rock/tainted/runic_small_tainted_rock_bricks", "bottom": "malum:block/arcane_rock/tainted/runic_small_tainted_rock_bricks", + "side": "malum:block/arcane_rock/tainted/runic_small_tainted_rock_bricks", "top": "malum:block/arcane_rock/tainted/runic_small_tainted_rock_bricks" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/runic_small_tainted_rock_bricks_stairs_inner.json b/src/generated/resources/assets/malum/models/block/runic_small_tainted_rock_bricks_stairs_inner.json index 5070b6438..ea08bd4d8 100644 --- a/src/generated/resources/assets/malum/models/block/runic_small_tainted_rock_bricks_stairs_inner.json +++ b/src/generated/resources/assets/malum/models/block/runic_small_tainted_rock_bricks_stairs_inner.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/inner_stairs", "textures": { - "side": "malum:block/arcane_rock/tainted/runic_small_tainted_rock_bricks", "bottom": "malum:block/arcane_rock/tainted/runic_small_tainted_rock_bricks", + "side": "malum:block/arcane_rock/tainted/runic_small_tainted_rock_bricks", "top": "malum:block/arcane_rock/tainted/runic_small_tainted_rock_bricks" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/runic_small_tainted_rock_bricks_stairs_outer.json b/src/generated/resources/assets/malum/models/block/runic_small_tainted_rock_bricks_stairs_outer.json index 2b6845c7b..e58e8c44f 100644 --- a/src/generated/resources/assets/malum/models/block/runic_small_tainted_rock_bricks_stairs_outer.json +++ b/src/generated/resources/assets/malum/models/block/runic_small_tainted_rock_bricks_stairs_outer.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/outer_stairs", "textures": { - "side": "malum:block/arcane_rock/tainted/runic_small_tainted_rock_bricks", "bottom": "malum:block/arcane_rock/tainted/runic_small_tainted_rock_bricks", + "side": "malum:block/arcane_rock/tainted/runic_small_tainted_rock_bricks", "top": "malum:block/arcane_rock/tainted/runic_small_tainted_rock_bricks" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/runic_small_twisted_rock_bricks_slab.json b/src/generated/resources/assets/malum/models/block/runic_small_twisted_rock_bricks_slab.json index 180e64a15..6a6f58621 100644 --- a/src/generated/resources/assets/malum/models/block/runic_small_twisted_rock_bricks_slab.json +++ b/src/generated/resources/assets/malum/models/block/runic_small_twisted_rock_bricks_slab.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/slab", "textures": { - "side": "malum:block/arcane_rock/twisted/runic_small_twisted_rock_bricks", "bottom": "malum:block/arcane_rock/twisted/runic_small_twisted_rock_bricks", + "side": "malum:block/arcane_rock/twisted/runic_small_twisted_rock_bricks", "top": "malum:block/arcane_rock/twisted/runic_small_twisted_rock_bricks" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/runic_small_twisted_rock_bricks_slab_top.json b/src/generated/resources/assets/malum/models/block/runic_small_twisted_rock_bricks_slab_top.json index 18c517072..a8023bf60 100644 --- a/src/generated/resources/assets/malum/models/block/runic_small_twisted_rock_bricks_slab_top.json +++ b/src/generated/resources/assets/malum/models/block/runic_small_twisted_rock_bricks_slab_top.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/slab_top", "textures": { - "side": "malum:block/arcane_rock/twisted/runic_small_twisted_rock_bricks", "bottom": "malum:block/arcane_rock/twisted/runic_small_twisted_rock_bricks", + "side": "malum:block/arcane_rock/twisted/runic_small_twisted_rock_bricks", "top": "malum:block/arcane_rock/twisted/runic_small_twisted_rock_bricks" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/runic_small_twisted_rock_bricks_stairs.json b/src/generated/resources/assets/malum/models/block/runic_small_twisted_rock_bricks_stairs.json index 3d02f89ac..b2a3099f7 100644 --- a/src/generated/resources/assets/malum/models/block/runic_small_twisted_rock_bricks_stairs.json +++ b/src/generated/resources/assets/malum/models/block/runic_small_twisted_rock_bricks_stairs.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/stairs", "textures": { - "side": "malum:block/arcane_rock/twisted/runic_small_twisted_rock_bricks", "bottom": "malum:block/arcane_rock/twisted/runic_small_twisted_rock_bricks", + "side": "malum:block/arcane_rock/twisted/runic_small_twisted_rock_bricks", "top": "malum:block/arcane_rock/twisted/runic_small_twisted_rock_bricks" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/runic_small_twisted_rock_bricks_stairs_inner.json b/src/generated/resources/assets/malum/models/block/runic_small_twisted_rock_bricks_stairs_inner.json index 3aa537bf2..c3721d807 100644 --- a/src/generated/resources/assets/malum/models/block/runic_small_twisted_rock_bricks_stairs_inner.json +++ b/src/generated/resources/assets/malum/models/block/runic_small_twisted_rock_bricks_stairs_inner.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/inner_stairs", "textures": { - "side": "malum:block/arcane_rock/twisted/runic_small_twisted_rock_bricks", "bottom": "malum:block/arcane_rock/twisted/runic_small_twisted_rock_bricks", + "side": "malum:block/arcane_rock/twisted/runic_small_twisted_rock_bricks", "top": "malum:block/arcane_rock/twisted/runic_small_twisted_rock_bricks" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/runic_small_twisted_rock_bricks_stairs_outer.json b/src/generated/resources/assets/malum/models/block/runic_small_twisted_rock_bricks_stairs_outer.json index 693165847..7201912ae 100644 --- a/src/generated/resources/assets/malum/models/block/runic_small_twisted_rock_bricks_stairs_outer.json +++ b/src/generated/resources/assets/malum/models/block/runic_small_twisted_rock_bricks_stairs_outer.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/outer_stairs", "textures": { - "side": "malum:block/arcane_rock/twisted/runic_small_twisted_rock_bricks", "bottom": "malum:block/arcane_rock/twisted/runic_small_twisted_rock_bricks", + "side": "malum:block/arcane_rock/twisted/runic_small_twisted_rock_bricks", "top": "malum:block/arcane_rock/twisted/runic_small_twisted_rock_bricks" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/runic_tainted_rock_bricks_slab.json b/src/generated/resources/assets/malum/models/block/runic_tainted_rock_bricks_slab.json index 5a0fccc8a..79ea48e6a 100644 --- a/src/generated/resources/assets/malum/models/block/runic_tainted_rock_bricks_slab.json +++ b/src/generated/resources/assets/malum/models/block/runic_tainted_rock_bricks_slab.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/slab", "textures": { - "side": "malum:block/arcane_rock/tainted/runic_tainted_rock_bricks", "bottom": "malum:block/arcane_rock/tainted/runic_tainted_rock_bricks", + "side": "malum:block/arcane_rock/tainted/runic_tainted_rock_bricks", "top": "malum:block/arcane_rock/tainted/runic_tainted_rock_bricks" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/runic_tainted_rock_bricks_slab_top.json b/src/generated/resources/assets/malum/models/block/runic_tainted_rock_bricks_slab_top.json index ba0c37224..bd896c27c 100644 --- a/src/generated/resources/assets/malum/models/block/runic_tainted_rock_bricks_slab_top.json +++ b/src/generated/resources/assets/malum/models/block/runic_tainted_rock_bricks_slab_top.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/slab_top", "textures": { - "side": "malum:block/arcane_rock/tainted/runic_tainted_rock_bricks", "bottom": "malum:block/arcane_rock/tainted/runic_tainted_rock_bricks", + "side": "malum:block/arcane_rock/tainted/runic_tainted_rock_bricks", "top": "malum:block/arcane_rock/tainted/runic_tainted_rock_bricks" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/runic_tainted_rock_bricks_stairs.json b/src/generated/resources/assets/malum/models/block/runic_tainted_rock_bricks_stairs.json index cd3c19f4a..60fdf5a3f 100644 --- a/src/generated/resources/assets/malum/models/block/runic_tainted_rock_bricks_stairs.json +++ b/src/generated/resources/assets/malum/models/block/runic_tainted_rock_bricks_stairs.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/stairs", "textures": { - "side": "malum:block/arcane_rock/tainted/runic_tainted_rock_bricks", "bottom": "malum:block/arcane_rock/tainted/runic_tainted_rock_bricks", + "side": "malum:block/arcane_rock/tainted/runic_tainted_rock_bricks", "top": "malum:block/arcane_rock/tainted/runic_tainted_rock_bricks" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/runic_tainted_rock_bricks_stairs_inner.json b/src/generated/resources/assets/malum/models/block/runic_tainted_rock_bricks_stairs_inner.json index 0032cb2b5..170954899 100644 --- a/src/generated/resources/assets/malum/models/block/runic_tainted_rock_bricks_stairs_inner.json +++ b/src/generated/resources/assets/malum/models/block/runic_tainted_rock_bricks_stairs_inner.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/inner_stairs", "textures": { - "side": "malum:block/arcane_rock/tainted/runic_tainted_rock_bricks", "bottom": "malum:block/arcane_rock/tainted/runic_tainted_rock_bricks", + "side": "malum:block/arcane_rock/tainted/runic_tainted_rock_bricks", "top": "malum:block/arcane_rock/tainted/runic_tainted_rock_bricks" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/runic_tainted_rock_bricks_stairs_outer.json b/src/generated/resources/assets/malum/models/block/runic_tainted_rock_bricks_stairs_outer.json index 30f782b0a..a62ab2e5f 100644 --- a/src/generated/resources/assets/malum/models/block/runic_tainted_rock_bricks_stairs_outer.json +++ b/src/generated/resources/assets/malum/models/block/runic_tainted_rock_bricks_stairs_outer.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/outer_stairs", "textures": { - "side": "malum:block/arcane_rock/tainted/runic_tainted_rock_bricks", "bottom": "malum:block/arcane_rock/tainted/runic_tainted_rock_bricks", + "side": "malum:block/arcane_rock/tainted/runic_tainted_rock_bricks", "top": "malum:block/arcane_rock/tainted/runic_tainted_rock_bricks" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/runic_tainted_rock_tiles_slab.json b/src/generated/resources/assets/malum/models/block/runic_tainted_rock_tiles_slab.json index 76b280879..211760151 100644 --- a/src/generated/resources/assets/malum/models/block/runic_tainted_rock_tiles_slab.json +++ b/src/generated/resources/assets/malum/models/block/runic_tainted_rock_tiles_slab.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/slab", "textures": { - "side": "malum:block/arcane_rock/tainted/runic_tainted_rock_tiles", "bottom": "malum:block/arcane_rock/tainted/runic_tainted_rock_tiles", + "side": "malum:block/arcane_rock/tainted/runic_tainted_rock_tiles", "top": "malum:block/arcane_rock/tainted/runic_tainted_rock_tiles" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/runic_tainted_rock_tiles_slab_top.json b/src/generated/resources/assets/malum/models/block/runic_tainted_rock_tiles_slab_top.json index f3ae98008..859dd2a97 100644 --- a/src/generated/resources/assets/malum/models/block/runic_tainted_rock_tiles_slab_top.json +++ b/src/generated/resources/assets/malum/models/block/runic_tainted_rock_tiles_slab_top.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/slab_top", "textures": { - "side": "malum:block/arcane_rock/tainted/runic_tainted_rock_tiles", "bottom": "malum:block/arcane_rock/tainted/runic_tainted_rock_tiles", + "side": "malum:block/arcane_rock/tainted/runic_tainted_rock_tiles", "top": "malum:block/arcane_rock/tainted/runic_tainted_rock_tiles" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/runic_tainted_rock_tiles_stairs.json b/src/generated/resources/assets/malum/models/block/runic_tainted_rock_tiles_stairs.json index df60f185e..f581c31c2 100644 --- a/src/generated/resources/assets/malum/models/block/runic_tainted_rock_tiles_stairs.json +++ b/src/generated/resources/assets/malum/models/block/runic_tainted_rock_tiles_stairs.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/stairs", "textures": { - "side": "malum:block/arcane_rock/tainted/runic_tainted_rock_tiles", "bottom": "malum:block/arcane_rock/tainted/runic_tainted_rock_tiles", + "side": "malum:block/arcane_rock/tainted/runic_tainted_rock_tiles", "top": "malum:block/arcane_rock/tainted/runic_tainted_rock_tiles" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/runic_tainted_rock_tiles_stairs_inner.json b/src/generated/resources/assets/malum/models/block/runic_tainted_rock_tiles_stairs_inner.json index be57d2c96..b427e1449 100644 --- a/src/generated/resources/assets/malum/models/block/runic_tainted_rock_tiles_stairs_inner.json +++ b/src/generated/resources/assets/malum/models/block/runic_tainted_rock_tiles_stairs_inner.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/inner_stairs", "textures": { - "side": "malum:block/arcane_rock/tainted/runic_tainted_rock_tiles", "bottom": "malum:block/arcane_rock/tainted/runic_tainted_rock_tiles", + "side": "malum:block/arcane_rock/tainted/runic_tainted_rock_tiles", "top": "malum:block/arcane_rock/tainted/runic_tainted_rock_tiles" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/runic_tainted_rock_tiles_stairs_outer.json b/src/generated/resources/assets/malum/models/block/runic_tainted_rock_tiles_stairs_outer.json index d0e9909ca..0387d287f 100644 --- a/src/generated/resources/assets/malum/models/block/runic_tainted_rock_tiles_stairs_outer.json +++ b/src/generated/resources/assets/malum/models/block/runic_tainted_rock_tiles_stairs_outer.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/outer_stairs", "textures": { - "side": "malum:block/arcane_rock/tainted/runic_tainted_rock_tiles", "bottom": "malum:block/arcane_rock/tainted/runic_tainted_rock_tiles", + "side": "malum:block/arcane_rock/tainted/runic_tainted_rock_tiles", "top": "malum:block/arcane_rock/tainted/runic_tainted_rock_tiles" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/runic_twisted_rock_bricks_slab.json b/src/generated/resources/assets/malum/models/block/runic_twisted_rock_bricks_slab.json index 00d68e989..d24267648 100644 --- a/src/generated/resources/assets/malum/models/block/runic_twisted_rock_bricks_slab.json +++ b/src/generated/resources/assets/malum/models/block/runic_twisted_rock_bricks_slab.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/slab", "textures": { - "side": "malum:block/arcane_rock/twisted/runic_twisted_rock_bricks", "bottom": "malum:block/arcane_rock/twisted/runic_twisted_rock_bricks", + "side": "malum:block/arcane_rock/twisted/runic_twisted_rock_bricks", "top": "malum:block/arcane_rock/twisted/runic_twisted_rock_bricks" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/runic_twisted_rock_bricks_slab_top.json b/src/generated/resources/assets/malum/models/block/runic_twisted_rock_bricks_slab_top.json index 0d9d128d3..7e2511e4a 100644 --- a/src/generated/resources/assets/malum/models/block/runic_twisted_rock_bricks_slab_top.json +++ b/src/generated/resources/assets/malum/models/block/runic_twisted_rock_bricks_slab_top.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/slab_top", "textures": { - "side": "malum:block/arcane_rock/twisted/runic_twisted_rock_bricks", "bottom": "malum:block/arcane_rock/twisted/runic_twisted_rock_bricks", + "side": "malum:block/arcane_rock/twisted/runic_twisted_rock_bricks", "top": "malum:block/arcane_rock/twisted/runic_twisted_rock_bricks" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/runic_twisted_rock_bricks_stairs.json b/src/generated/resources/assets/malum/models/block/runic_twisted_rock_bricks_stairs.json index f366bdf39..cd503ed24 100644 --- a/src/generated/resources/assets/malum/models/block/runic_twisted_rock_bricks_stairs.json +++ b/src/generated/resources/assets/malum/models/block/runic_twisted_rock_bricks_stairs.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/stairs", "textures": { - "side": "malum:block/arcane_rock/twisted/runic_twisted_rock_bricks", "bottom": "malum:block/arcane_rock/twisted/runic_twisted_rock_bricks", + "side": "malum:block/arcane_rock/twisted/runic_twisted_rock_bricks", "top": "malum:block/arcane_rock/twisted/runic_twisted_rock_bricks" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/runic_twisted_rock_bricks_stairs_inner.json b/src/generated/resources/assets/malum/models/block/runic_twisted_rock_bricks_stairs_inner.json index d31b8883f..ecb8f6d77 100644 --- a/src/generated/resources/assets/malum/models/block/runic_twisted_rock_bricks_stairs_inner.json +++ b/src/generated/resources/assets/malum/models/block/runic_twisted_rock_bricks_stairs_inner.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/inner_stairs", "textures": { - "side": "malum:block/arcane_rock/twisted/runic_twisted_rock_bricks", "bottom": "malum:block/arcane_rock/twisted/runic_twisted_rock_bricks", + "side": "malum:block/arcane_rock/twisted/runic_twisted_rock_bricks", "top": "malum:block/arcane_rock/twisted/runic_twisted_rock_bricks" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/runic_twisted_rock_bricks_stairs_outer.json b/src/generated/resources/assets/malum/models/block/runic_twisted_rock_bricks_stairs_outer.json index c2fc7d7e9..ade8f2561 100644 --- a/src/generated/resources/assets/malum/models/block/runic_twisted_rock_bricks_stairs_outer.json +++ b/src/generated/resources/assets/malum/models/block/runic_twisted_rock_bricks_stairs_outer.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/outer_stairs", "textures": { - "side": "malum:block/arcane_rock/twisted/runic_twisted_rock_bricks", "bottom": "malum:block/arcane_rock/twisted/runic_twisted_rock_bricks", + "side": "malum:block/arcane_rock/twisted/runic_twisted_rock_bricks", "top": "malum:block/arcane_rock/twisted/runic_twisted_rock_bricks" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/runic_twisted_rock_tiles_slab.json b/src/generated/resources/assets/malum/models/block/runic_twisted_rock_tiles_slab.json index 814f202a9..a76c0f4a1 100644 --- a/src/generated/resources/assets/malum/models/block/runic_twisted_rock_tiles_slab.json +++ b/src/generated/resources/assets/malum/models/block/runic_twisted_rock_tiles_slab.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/slab", "textures": { - "side": "malum:block/arcane_rock/twisted/runic_twisted_rock_tiles", "bottom": "malum:block/arcane_rock/twisted/runic_twisted_rock_tiles", + "side": "malum:block/arcane_rock/twisted/runic_twisted_rock_tiles", "top": "malum:block/arcane_rock/twisted/runic_twisted_rock_tiles" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/runic_twisted_rock_tiles_slab_top.json b/src/generated/resources/assets/malum/models/block/runic_twisted_rock_tiles_slab_top.json index 6b4e0587d..7e17eb233 100644 --- a/src/generated/resources/assets/malum/models/block/runic_twisted_rock_tiles_slab_top.json +++ b/src/generated/resources/assets/malum/models/block/runic_twisted_rock_tiles_slab_top.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/slab_top", "textures": { - "side": "malum:block/arcane_rock/twisted/runic_twisted_rock_tiles", "bottom": "malum:block/arcane_rock/twisted/runic_twisted_rock_tiles", + "side": "malum:block/arcane_rock/twisted/runic_twisted_rock_tiles", "top": "malum:block/arcane_rock/twisted/runic_twisted_rock_tiles" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/runic_twisted_rock_tiles_stairs.json b/src/generated/resources/assets/malum/models/block/runic_twisted_rock_tiles_stairs.json index bd9bb6896..5b803835a 100644 --- a/src/generated/resources/assets/malum/models/block/runic_twisted_rock_tiles_stairs.json +++ b/src/generated/resources/assets/malum/models/block/runic_twisted_rock_tiles_stairs.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/stairs", "textures": { - "side": "malum:block/arcane_rock/twisted/runic_twisted_rock_tiles", "bottom": "malum:block/arcane_rock/twisted/runic_twisted_rock_tiles", + "side": "malum:block/arcane_rock/twisted/runic_twisted_rock_tiles", "top": "malum:block/arcane_rock/twisted/runic_twisted_rock_tiles" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/runic_twisted_rock_tiles_stairs_inner.json b/src/generated/resources/assets/malum/models/block/runic_twisted_rock_tiles_stairs_inner.json index e832b5e76..3d74316c2 100644 --- a/src/generated/resources/assets/malum/models/block/runic_twisted_rock_tiles_stairs_inner.json +++ b/src/generated/resources/assets/malum/models/block/runic_twisted_rock_tiles_stairs_inner.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/inner_stairs", "textures": { - "side": "malum:block/arcane_rock/twisted/runic_twisted_rock_tiles", "bottom": "malum:block/arcane_rock/twisted/runic_twisted_rock_tiles", + "side": "malum:block/arcane_rock/twisted/runic_twisted_rock_tiles", "top": "malum:block/arcane_rock/twisted/runic_twisted_rock_tiles" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/runic_twisted_rock_tiles_stairs_outer.json b/src/generated/resources/assets/malum/models/block/runic_twisted_rock_tiles_stairs_outer.json index 737490cf9..60e915807 100644 --- a/src/generated/resources/assets/malum/models/block/runic_twisted_rock_tiles_stairs_outer.json +++ b/src/generated/resources/assets/malum/models/block/runic_twisted_rock_tiles_stairs_outer.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/outer_stairs", "textures": { - "side": "malum:block/arcane_rock/twisted/runic_twisted_rock_tiles", "bottom": "malum:block/arcane_rock/twisted/runic_twisted_rock_tiles", + "side": "malum:block/arcane_rock/twisted/runic_twisted_rock_tiles", "top": "malum:block/arcane_rock/twisted/runic_twisted_rock_tiles" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/small_tainted_rock_bricks_slab.json b/src/generated/resources/assets/malum/models/block/small_tainted_rock_bricks_slab.json index bdeaa517b..5118cdbc5 100644 --- a/src/generated/resources/assets/malum/models/block/small_tainted_rock_bricks_slab.json +++ b/src/generated/resources/assets/malum/models/block/small_tainted_rock_bricks_slab.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/slab", "textures": { - "side": "malum:block/arcane_rock/tainted/small_tainted_rock_bricks", "bottom": "malum:block/arcane_rock/tainted/small_tainted_rock_bricks", + "side": "malum:block/arcane_rock/tainted/small_tainted_rock_bricks", "top": "malum:block/arcane_rock/tainted/small_tainted_rock_bricks" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/small_tainted_rock_bricks_slab_top.json b/src/generated/resources/assets/malum/models/block/small_tainted_rock_bricks_slab_top.json index ad6a56f4e..5b41b058a 100644 --- a/src/generated/resources/assets/malum/models/block/small_tainted_rock_bricks_slab_top.json +++ b/src/generated/resources/assets/malum/models/block/small_tainted_rock_bricks_slab_top.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/slab_top", "textures": { - "side": "malum:block/arcane_rock/tainted/small_tainted_rock_bricks", "bottom": "malum:block/arcane_rock/tainted/small_tainted_rock_bricks", + "side": "malum:block/arcane_rock/tainted/small_tainted_rock_bricks", "top": "malum:block/arcane_rock/tainted/small_tainted_rock_bricks" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/small_tainted_rock_bricks_stairs.json b/src/generated/resources/assets/malum/models/block/small_tainted_rock_bricks_stairs.json index 3a3b916e3..00bbea857 100644 --- a/src/generated/resources/assets/malum/models/block/small_tainted_rock_bricks_stairs.json +++ b/src/generated/resources/assets/malum/models/block/small_tainted_rock_bricks_stairs.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/stairs", "textures": { - "side": "malum:block/arcane_rock/tainted/small_tainted_rock_bricks", "bottom": "malum:block/arcane_rock/tainted/small_tainted_rock_bricks", + "side": "malum:block/arcane_rock/tainted/small_tainted_rock_bricks", "top": "malum:block/arcane_rock/tainted/small_tainted_rock_bricks" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/small_tainted_rock_bricks_stairs_inner.json b/src/generated/resources/assets/malum/models/block/small_tainted_rock_bricks_stairs_inner.json index f19a0e957..f6874cbad 100644 --- a/src/generated/resources/assets/malum/models/block/small_tainted_rock_bricks_stairs_inner.json +++ b/src/generated/resources/assets/malum/models/block/small_tainted_rock_bricks_stairs_inner.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/inner_stairs", "textures": { - "side": "malum:block/arcane_rock/tainted/small_tainted_rock_bricks", "bottom": "malum:block/arcane_rock/tainted/small_tainted_rock_bricks", + "side": "malum:block/arcane_rock/tainted/small_tainted_rock_bricks", "top": "malum:block/arcane_rock/tainted/small_tainted_rock_bricks" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/small_tainted_rock_bricks_stairs_outer.json b/src/generated/resources/assets/malum/models/block/small_tainted_rock_bricks_stairs_outer.json index 65001f5b1..e5831d1ee 100644 --- a/src/generated/resources/assets/malum/models/block/small_tainted_rock_bricks_stairs_outer.json +++ b/src/generated/resources/assets/malum/models/block/small_tainted_rock_bricks_stairs_outer.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/outer_stairs", "textures": { - "side": "malum:block/arcane_rock/tainted/small_tainted_rock_bricks", "bottom": "malum:block/arcane_rock/tainted/small_tainted_rock_bricks", + "side": "malum:block/arcane_rock/tainted/small_tainted_rock_bricks", "top": "malum:block/arcane_rock/tainted/small_tainted_rock_bricks" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/small_twisted_rock_bricks_slab.json b/src/generated/resources/assets/malum/models/block/small_twisted_rock_bricks_slab.json index d969e11f7..2be4a5b76 100644 --- a/src/generated/resources/assets/malum/models/block/small_twisted_rock_bricks_slab.json +++ b/src/generated/resources/assets/malum/models/block/small_twisted_rock_bricks_slab.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/slab", "textures": { - "side": "malum:block/arcane_rock/twisted/small_twisted_rock_bricks", "bottom": "malum:block/arcane_rock/twisted/small_twisted_rock_bricks", + "side": "malum:block/arcane_rock/twisted/small_twisted_rock_bricks", "top": "malum:block/arcane_rock/twisted/small_twisted_rock_bricks" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/small_twisted_rock_bricks_slab_top.json b/src/generated/resources/assets/malum/models/block/small_twisted_rock_bricks_slab_top.json index 0e3d24db4..2a9c7def4 100644 --- a/src/generated/resources/assets/malum/models/block/small_twisted_rock_bricks_slab_top.json +++ b/src/generated/resources/assets/malum/models/block/small_twisted_rock_bricks_slab_top.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/slab_top", "textures": { - "side": "malum:block/arcane_rock/twisted/small_twisted_rock_bricks", "bottom": "malum:block/arcane_rock/twisted/small_twisted_rock_bricks", + "side": "malum:block/arcane_rock/twisted/small_twisted_rock_bricks", "top": "malum:block/arcane_rock/twisted/small_twisted_rock_bricks" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/small_twisted_rock_bricks_stairs.json b/src/generated/resources/assets/malum/models/block/small_twisted_rock_bricks_stairs.json index b429502aa..9c96a0673 100644 --- a/src/generated/resources/assets/malum/models/block/small_twisted_rock_bricks_stairs.json +++ b/src/generated/resources/assets/malum/models/block/small_twisted_rock_bricks_stairs.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/stairs", "textures": { - "side": "malum:block/arcane_rock/twisted/small_twisted_rock_bricks", "bottom": "malum:block/arcane_rock/twisted/small_twisted_rock_bricks", + "side": "malum:block/arcane_rock/twisted/small_twisted_rock_bricks", "top": "malum:block/arcane_rock/twisted/small_twisted_rock_bricks" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/small_twisted_rock_bricks_stairs_inner.json b/src/generated/resources/assets/malum/models/block/small_twisted_rock_bricks_stairs_inner.json index 704b287d4..7dc01ba46 100644 --- a/src/generated/resources/assets/malum/models/block/small_twisted_rock_bricks_stairs_inner.json +++ b/src/generated/resources/assets/malum/models/block/small_twisted_rock_bricks_stairs_inner.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/inner_stairs", "textures": { - "side": "malum:block/arcane_rock/twisted/small_twisted_rock_bricks", "bottom": "malum:block/arcane_rock/twisted/small_twisted_rock_bricks", + "side": "malum:block/arcane_rock/twisted/small_twisted_rock_bricks", "top": "malum:block/arcane_rock/twisted/small_twisted_rock_bricks" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/small_twisted_rock_bricks_stairs_outer.json b/src/generated/resources/assets/malum/models/block/small_twisted_rock_bricks_stairs_outer.json index 3faa53fc1..fab38c218 100644 --- a/src/generated/resources/assets/malum/models/block/small_twisted_rock_bricks_stairs_outer.json +++ b/src/generated/resources/assets/malum/models/block/small_twisted_rock_bricks_stairs_outer.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/outer_stairs", "textures": { - "side": "malum:block/arcane_rock/twisted/small_twisted_rock_bricks", "bottom": "malum:block/arcane_rock/twisted/small_twisted_rock_bricks", + "side": "malum:block/arcane_rock/twisted/small_twisted_rock_bricks", "top": "malum:block/arcane_rock/twisted/small_twisted_rock_bricks" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/smooth_tainted_rock_slab.json b/src/generated/resources/assets/malum/models/block/smooth_tainted_rock_slab.json index d86317f29..a786cb29b 100644 --- a/src/generated/resources/assets/malum/models/block/smooth_tainted_rock_slab.json +++ b/src/generated/resources/assets/malum/models/block/smooth_tainted_rock_slab.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/slab", "textures": { - "side": "malum:block/arcane_rock/tainted/smooth_tainted_rock", "bottom": "malum:block/arcane_rock/tainted/smooth_tainted_rock", + "side": "malum:block/arcane_rock/tainted/smooth_tainted_rock", "top": "malum:block/arcane_rock/tainted/smooth_tainted_rock" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/smooth_tainted_rock_slab_top.json b/src/generated/resources/assets/malum/models/block/smooth_tainted_rock_slab_top.json index 7890f3984..7bfb2de67 100644 --- a/src/generated/resources/assets/malum/models/block/smooth_tainted_rock_slab_top.json +++ b/src/generated/resources/assets/malum/models/block/smooth_tainted_rock_slab_top.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/slab_top", "textures": { - "side": "malum:block/arcane_rock/tainted/smooth_tainted_rock", "bottom": "malum:block/arcane_rock/tainted/smooth_tainted_rock", + "side": "malum:block/arcane_rock/tainted/smooth_tainted_rock", "top": "malum:block/arcane_rock/tainted/smooth_tainted_rock" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/smooth_tainted_rock_stairs.json b/src/generated/resources/assets/malum/models/block/smooth_tainted_rock_stairs.json index 2353a0bb4..6f3c922a7 100644 --- a/src/generated/resources/assets/malum/models/block/smooth_tainted_rock_stairs.json +++ b/src/generated/resources/assets/malum/models/block/smooth_tainted_rock_stairs.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/stairs", "textures": { - "side": "malum:block/arcane_rock/tainted/smooth_tainted_rock", "bottom": "malum:block/arcane_rock/tainted/smooth_tainted_rock", + "side": "malum:block/arcane_rock/tainted/smooth_tainted_rock", "top": "malum:block/arcane_rock/tainted/smooth_tainted_rock" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/smooth_tainted_rock_stairs_inner.json b/src/generated/resources/assets/malum/models/block/smooth_tainted_rock_stairs_inner.json index 50949a4db..83a89e703 100644 --- a/src/generated/resources/assets/malum/models/block/smooth_tainted_rock_stairs_inner.json +++ b/src/generated/resources/assets/malum/models/block/smooth_tainted_rock_stairs_inner.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/inner_stairs", "textures": { - "side": "malum:block/arcane_rock/tainted/smooth_tainted_rock", "bottom": "malum:block/arcane_rock/tainted/smooth_tainted_rock", + "side": "malum:block/arcane_rock/tainted/smooth_tainted_rock", "top": "malum:block/arcane_rock/tainted/smooth_tainted_rock" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/smooth_tainted_rock_stairs_outer.json b/src/generated/resources/assets/malum/models/block/smooth_tainted_rock_stairs_outer.json index d21c023bb..2ca919173 100644 --- a/src/generated/resources/assets/malum/models/block/smooth_tainted_rock_stairs_outer.json +++ b/src/generated/resources/assets/malum/models/block/smooth_tainted_rock_stairs_outer.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/outer_stairs", "textures": { - "side": "malum:block/arcane_rock/tainted/smooth_tainted_rock", "bottom": "malum:block/arcane_rock/tainted/smooth_tainted_rock", + "side": "malum:block/arcane_rock/tainted/smooth_tainted_rock", "top": "malum:block/arcane_rock/tainted/smooth_tainted_rock" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/smooth_twisted_rock_slab.json b/src/generated/resources/assets/malum/models/block/smooth_twisted_rock_slab.json index 6b6398426..2adb7b174 100644 --- a/src/generated/resources/assets/malum/models/block/smooth_twisted_rock_slab.json +++ b/src/generated/resources/assets/malum/models/block/smooth_twisted_rock_slab.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/slab", "textures": { - "side": "malum:block/arcane_rock/twisted/smooth_twisted_rock", "bottom": "malum:block/arcane_rock/twisted/smooth_twisted_rock", + "side": "malum:block/arcane_rock/twisted/smooth_twisted_rock", "top": "malum:block/arcane_rock/twisted/smooth_twisted_rock" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/smooth_twisted_rock_slab_top.json b/src/generated/resources/assets/malum/models/block/smooth_twisted_rock_slab_top.json index 90c4c2dc8..3dc69534f 100644 --- a/src/generated/resources/assets/malum/models/block/smooth_twisted_rock_slab_top.json +++ b/src/generated/resources/assets/malum/models/block/smooth_twisted_rock_slab_top.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/slab_top", "textures": { - "side": "malum:block/arcane_rock/twisted/smooth_twisted_rock", "bottom": "malum:block/arcane_rock/twisted/smooth_twisted_rock", + "side": "malum:block/arcane_rock/twisted/smooth_twisted_rock", "top": "malum:block/arcane_rock/twisted/smooth_twisted_rock" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/smooth_twisted_rock_stairs.json b/src/generated/resources/assets/malum/models/block/smooth_twisted_rock_stairs.json index ddf162551..f75823c57 100644 --- a/src/generated/resources/assets/malum/models/block/smooth_twisted_rock_stairs.json +++ b/src/generated/resources/assets/malum/models/block/smooth_twisted_rock_stairs.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/stairs", "textures": { - "side": "malum:block/arcane_rock/twisted/smooth_twisted_rock", "bottom": "malum:block/arcane_rock/twisted/smooth_twisted_rock", + "side": "malum:block/arcane_rock/twisted/smooth_twisted_rock", "top": "malum:block/arcane_rock/twisted/smooth_twisted_rock" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/smooth_twisted_rock_stairs_inner.json b/src/generated/resources/assets/malum/models/block/smooth_twisted_rock_stairs_inner.json index 982eb1f83..76dd76bbb 100644 --- a/src/generated/resources/assets/malum/models/block/smooth_twisted_rock_stairs_inner.json +++ b/src/generated/resources/assets/malum/models/block/smooth_twisted_rock_stairs_inner.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/inner_stairs", "textures": { - "side": "malum:block/arcane_rock/twisted/smooth_twisted_rock", "bottom": "malum:block/arcane_rock/twisted/smooth_twisted_rock", + "side": "malum:block/arcane_rock/twisted/smooth_twisted_rock", "top": "malum:block/arcane_rock/twisted/smooth_twisted_rock" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/smooth_twisted_rock_stairs_outer.json b/src/generated/resources/assets/malum/models/block/smooth_twisted_rock_stairs_outer.json index 616c5eeff..03cbc776f 100644 --- a/src/generated/resources/assets/malum/models/block/smooth_twisted_rock_stairs_outer.json +++ b/src/generated/resources/assets/malum/models/block/smooth_twisted_rock_stairs_outer.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/outer_stairs", "textures": { - "side": "malum:block/arcane_rock/twisted/smooth_twisted_rock", "bottom": "malum:block/arcane_rock/twisted/smooth_twisted_rock", + "side": "malum:block/arcane_rock/twisted/smooth_twisted_rock", "top": "malum:block/arcane_rock/twisted/smooth_twisted_rock" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/soulwood.json b/src/generated/resources/assets/malum/models/block/soulwood.json index 5a9ef780a..0d772c873 100644 --- a/src/generated/resources/assets/malum/models/block/soulwood.json +++ b/src/generated/resources/assets/malum/models/block/soulwood.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/cube_column", "textures": { - "side": "malum:block/soulwood/soulwood_log", - "end": "malum:block/soulwood/soulwood_log" + "end": "malum:block/soulwood/soulwood_log", + "side": "malum:block/soulwood/soulwood_log" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/soulwood_beam.json b/src/generated/resources/assets/malum/models/block/soulwood_beam.json index b393127d2..5506ee16c 100644 --- a/src/generated/resources/assets/malum/models/block/soulwood_beam.json +++ b/src/generated/resources/assets/malum/models/block/soulwood_beam.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/cube_column", "textures": { - "side": "malum:block/soulwood/soulwood_beam", - "end": "malum:block/soulwood/soulwood_beam_top" + "end": "malum:block/soulwood/soulwood_beam_top", + "side": "malum:block/soulwood/soulwood_beam" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/soulwood_beam_horizontal.json b/src/generated/resources/assets/malum/models/block/soulwood_beam_horizontal.json index cb1b2709a..6e57cd9e5 100644 --- a/src/generated/resources/assets/malum/models/block/soulwood_beam_horizontal.json +++ b/src/generated/resources/assets/malum/models/block/soulwood_beam_horizontal.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/cube_column_horizontal", "textures": { - "side": "malum:block/soulwood/soulwood_beam", - "end": "malum:block/soulwood/soulwood_beam_top" + "end": "malum:block/soulwood/soulwood_beam_top", + "side": "malum:block/soulwood/soulwood_beam" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/soulwood_door_top.json b/src/generated/resources/assets/malum/models/block/soulwood_door_bottom_left.json similarity index 73% rename from src/generated/resources/assets/malum/models/block/soulwood_door_top.json rename to src/generated/resources/assets/malum/models/block/soulwood_door_bottom_left.json index efaec1058..68af38b1d 100644 --- a/src/generated/resources/assets/malum/models/block/soulwood_door_top.json +++ b/src/generated/resources/assets/malum/models/block/soulwood_door_bottom_left.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_top", + "parent": "minecraft:block/door_bottom_left", "textures": { "bottom": "malum:block/soulwood/soulwood_door_bottom", "top": "malum:block/soulwood/soulwood_door_top" diff --git a/src/generated/resources/assets/malum/models/block/soulwood_door_bottom_left_open.json b/src/generated/resources/assets/malum/models/block/soulwood_door_bottom_left_open.json new file mode 100644 index 000000000..3f6c77a70 --- /dev/null +++ b/src/generated/resources/assets/malum/models/block/soulwood_door_bottom_left_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom_left_open", + "textures": { + "bottom": "malum:block/soulwood/soulwood_door_bottom", + "top": "malum:block/soulwood/soulwood_door_top" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/soulwood_door_top_hinge.json b/src/generated/resources/assets/malum/models/block/soulwood_door_bottom_right.json similarity index 73% rename from src/generated/resources/assets/malum/models/block/soulwood_door_top_hinge.json rename to src/generated/resources/assets/malum/models/block/soulwood_door_bottom_right.json index a8ff3b569..2287821de 100644 --- a/src/generated/resources/assets/malum/models/block/soulwood_door_top_hinge.json +++ b/src/generated/resources/assets/malum/models/block/soulwood_door_bottom_right.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_top_rh", + "parent": "minecraft:block/door_bottom_right", "textures": { "bottom": "malum:block/soulwood/soulwood_door_bottom", "top": "malum:block/soulwood/soulwood_door_top" diff --git a/src/generated/resources/assets/malum/models/block/soulwood_door_bottom_right_open.json b/src/generated/resources/assets/malum/models/block/soulwood_door_bottom_right_open.json new file mode 100644 index 000000000..bab54e9ee --- /dev/null +++ b/src/generated/resources/assets/malum/models/block/soulwood_door_bottom_right_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom_right_open", + "textures": { + "bottom": "malum:block/soulwood/soulwood_door_bottom", + "top": "malum:block/soulwood/soulwood_door_top" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/soulwood_door_bottom.json b/src/generated/resources/assets/malum/models/block/soulwood_door_top_left.json similarity index 74% rename from src/generated/resources/assets/malum/models/block/soulwood_door_bottom.json rename to src/generated/resources/assets/malum/models/block/soulwood_door_top_left.json index 2ca9a5597..d15ddb47e 100644 --- a/src/generated/resources/assets/malum/models/block/soulwood_door_bottom.json +++ b/src/generated/resources/assets/malum/models/block/soulwood_door_top_left.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_bottom", + "parent": "minecraft:block/door_top_left", "textures": { "bottom": "malum:block/soulwood/soulwood_door_bottom", "top": "malum:block/soulwood/soulwood_door_top" diff --git a/src/generated/resources/assets/malum/models/block/soulwood_door_top_left_open.json b/src/generated/resources/assets/malum/models/block/soulwood_door_top_left_open.json new file mode 100644 index 000000000..b78deb060 --- /dev/null +++ b/src/generated/resources/assets/malum/models/block/soulwood_door_top_left_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top_left_open", + "textures": { + "bottom": "malum:block/soulwood/soulwood_door_bottom", + "top": "malum:block/soulwood/soulwood_door_top" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/soulwood_door_bottom_hinge.json b/src/generated/resources/assets/malum/models/block/soulwood_door_top_right.json similarity index 74% rename from src/generated/resources/assets/malum/models/block/soulwood_door_bottom_hinge.json rename to src/generated/resources/assets/malum/models/block/soulwood_door_top_right.json index 0d05a5e9d..9671b3204 100644 --- a/src/generated/resources/assets/malum/models/block/soulwood_door_bottom_hinge.json +++ b/src/generated/resources/assets/malum/models/block/soulwood_door_top_right.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_bottom_rh", + "parent": "minecraft:block/door_top_right", "textures": { "bottom": "malum:block/soulwood/soulwood_door_bottom", "top": "malum:block/soulwood/soulwood_door_top" diff --git a/src/generated/resources/assets/malum/models/block/soulwood_door_top_right_open.json b/src/generated/resources/assets/malum/models/block/soulwood_door_top_right_open.json new file mode 100644 index 000000000..1696cc1b1 --- /dev/null +++ b/src/generated/resources/assets/malum/models/block/soulwood_door_top_right_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top_right_open", + "textures": { + "bottom": "malum:block/soulwood/soulwood_door_bottom", + "top": "malum:block/soulwood/soulwood_door_top" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/soulwood_horizontal.json b/src/generated/resources/assets/malum/models/block/soulwood_horizontal.json index d337c2216..fc9f69aaf 100644 --- a/src/generated/resources/assets/malum/models/block/soulwood_horizontal.json +++ b/src/generated/resources/assets/malum/models/block/soulwood_horizontal.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/cube_column_horizontal", "textures": { - "side": "malum:block/soulwood/soulwood_log", - "end": "malum:block/soulwood/soulwood_log" + "end": "malum:block/soulwood/soulwood_log", + "side": "malum:block/soulwood/soulwood_log" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/soulwood_item_pedestal.json b/src/generated/resources/assets/malum/models/block/soulwood_item_pedestal.json index 05c2a0128..38cb64b4d 100644 --- a/src/generated/resources/assets/malum/models/block/soulwood_item_pedestal.json +++ b/src/generated/resources/assets/malum/models/block/soulwood_item_pedestal.json @@ -1,7 +1,7 @@ { "parent": "malum:block/templates/template_wooden_item_pedestal", "textures": { - "pedestal": "malum:block/soulwood/soulwood_item_pedestal", - "particle": "malum:block/soulwood/soulwood_planks" + "particle": "malum:block/soulwood/soulwood_planks", + "pedestal": "malum:block/soulwood/soulwood_item_pedestal" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/soulwood_item_stand.json b/src/generated/resources/assets/malum/models/block/soulwood_item_stand.json index f75e5c5c1..01ed68124 100644 --- a/src/generated/resources/assets/malum/models/block/soulwood_item_stand.json +++ b/src/generated/resources/assets/malum/models/block/soulwood_item_stand.json @@ -1,7 +1,7 @@ { "parent": "malum:block/templates/template_item_stand", "textures": { - "stand": "malum:block/soulwood/soulwood_item_stand", - "particle": "malum:block/soulwood/soulwood_planks" + "particle": "malum:block/soulwood/soulwood_planks", + "stand": "malum:block/soulwood/soulwood_item_stand" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/soulwood_log.json b/src/generated/resources/assets/malum/models/block/soulwood_log.json index 35cf1609f..3545c4581 100644 --- a/src/generated/resources/assets/malum/models/block/soulwood_log.json +++ b/src/generated/resources/assets/malum/models/block/soulwood_log.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/cube_column", "textures": { - "side": "malum:block/soulwood/soulwood_log", - "end": "malum:block/soulwood/soulwood_log_top" + "end": "malum:block/soulwood/soulwood_log_top", + "side": "malum:block/soulwood/soulwood_log" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/soulwood_log_horizontal.json b/src/generated/resources/assets/malum/models/block/soulwood_log_horizontal.json index 4a6a5ac3b..be7fac576 100644 --- a/src/generated/resources/assets/malum/models/block/soulwood_log_horizontal.json +++ b/src/generated/resources/assets/malum/models/block/soulwood_log_horizontal.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/cube_column_horizontal", "textures": { - "side": "malum:block/soulwood/soulwood_log", - "end": "malum:block/soulwood/soulwood_log_top" + "end": "malum:block/soulwood/soulwood_log_top", + "side": "malum:block/soulwood/soulwood_log" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/soulwood_panel_slab.json b/src/generated/resources/assets/malum/models/block/soulwood_panel_slab.json index c6e3b6fef..4067d8109 100644 --- a/src/generated/resources/assets/malum/models/block/soulwood_panel_slab.json +++ b/src/generated/resources/assets/malum/models/block/soulwood_panel_slab.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/slab", "textures": { - "side": "malum:block/soulwood/soulwood_panel", "bottom": "malum:block/soulwood/soulwood_panel", + "side": "malum:block/soulwood/soulwood_panel", "top": "malum:block/soulwood/soulwood_panel" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/soulwood_panel_slab_top.json b/src/generated/resources/assets/malum/models/block/soulwood_panel_slab_top.json index 11642b329..3c7eda03a 100644 --- a/src/generated/resources/assets/malum/models/block/soulwood_panel_slab_top.json +++ b/src/generated/resources/assets/malum/models/block/soulwood_panel_slab_top.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/slab_top", "textures": { - "side": "malum:block/soulwood/soulwood_panel", "bottom": "malum:block/soulwood/soulwood_panel", + "side": "malum:block/soulwood/soulwood_panel", "top": "malum:block/soulwood/soulwood_panel" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/soulwood_panel_stairs.json b/src/generated/resources/assets/malum/models/block/soulwood_panel_stairs.json index 02e60bc1a..3d6c548ac 100644 --- a/src/generated/resources/assets/malum/models/block/soulwood_panel_stairs.json +++ b/src/generated/resources/assets/malum/models/block/soulwood_panel_stairs.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/stairs", "textures": { - "side": "malum:block/soulwood/soulwood_panel", "bottom": "malum:block/soulwood/soulwood_panel", + "side": "malum:block/soulwood/soulwood_panel", "top": "malum:block/soulwood/soulwood_panel" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/soulwood_panel_stairs_inner.json b/src/generated/resources/assets/malum/models/block/soulwood_panel_stairs_inner.json index 519ecb177..80f85329e 100644 --- a/src/generated/resources/assets/malum/models/block/soulwood_panel_stairs_inner.json +++ b/src/generated/resources/assets/malum/models/block/soulwood_panel_stairs_inner.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/inner_stairs", "textures": { - "side": "malum:block/soulwood/soulwood_panel", "bottom": "malum:block/soulwood/soulwood_panel", + "side": "malum:block/soulwood/soulwood_panel", "top": "malum:block/soulwood/soulwood_panel" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/soulwood_panel_stairs_outer.json b/src/generated/resources/assets/malum/models/block/soulwood_panel_stairs_outer.json index 19bc056f2..4904b9fd0 100644 --- a/src/generated/resources/assets/malum/models/block/soulwood_panel_stairs_outer.json +++ b/src/generated/resources/assets/malum/models/block/soulwood_panel_stairs_outer.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/outer_stairs", "textures": { - "side": "malum:block/soulwood/soulwood_panel", "bottom": "malum:block/soulwood/soulwood_panel", + "side": "malum:block/soulwood/soulwood_panel", "top": "malum:block/soulwood/soulwood_panel" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/soulwood_planks_slab.json b/src/generated/resources/assets/malum/models/block/soulwood_planks_slab.json index ccc00570f..a4ed09b3d 100644 --- a/src/generated/resources/assets/malum/models/block/soulwood_planks_slab.json +++ b/src/generated/resources/assets/malum/models/block/soulwood_planks_slab.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/slab", "textures": { - "side": "malum:block/soulwood/soulwood_planks", "bottom": "malum:block/soulwood/soulwood_planks", + "side": "malum:block/soulwood/soulwood_planks", "top": "malum:block/soulwood/soulwood_planks" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/soulwood_planks_slab_top.json b/src/generated/resources/assets/malum/models/block/soulwood_planks_slab_top.json index 17f02f31d..a121b751c 100644 --- a/src/generated/resources/assets/malum/models/block/soulwood_planks_slab_top.json +++ b/src/generated/resources/assets/malum/models/block/soulwood_planks_slab_top.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/slab_top", "textures": { - "side": "malum:block/soulwood/soulwood_planks", "bottom": "malum:block/soulwood/soulwood_planks", + "side": "malum:block/soulwood/soulwood_planks", "top": "malum:block/soulwood/soulwood_planks" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/soulwood_planks_stairs.json b/src/generated/resources/assets/malum/models/block/soulwood_planks_stairs.json index 39c095285..da91fa782 100644 --- a/src/generated/resources/assets/malum/models/block/soulwood_planks_stairs.json +++ b/src/generated/resources/assets/malum/models/block/soulwood_planks_stairs.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/stairs", "textures": { - "side": "malum:block/soulwood/soulwood_planks", "bottom": "malum:block/soulwood/soulwood_planks", + "side": "malum:block/soulwood/soulwood_planks", "top": "malum:block/soulwood/soulwood_planks" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/soulwood_planks_stairs_inner.json b/src/generated/resources/assets/malum/models/block/soulwood_planks_stairs_inner.json index 2746a7a7a..ea1e87797 100644 --- a/src/generated/resources/assets/malum/models/block/soulwood_planks_stairs_inner.json +++ b/src/generated/resources/assets/malum/models/block/soulwood_planks_stairs_inner.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/inner_stairs", "textures": { - "side": "malum:block/soulwood/soulwood_planks", "bottom": "malum:block/soulwood/soulwood_planks", + "side": "malum:block/soulwood/soulwood_planks", "top": "malum:block/soulwood/soulwood_planks" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/soulwood_planks_stairs_outer.json b/src/generated/resources/assets/malum/models/block/soulwood_planks_stairs_outer.json index a17da0f54..e5fe9939b 100644 --- a/src/generated/resources/assets/malum/models/block/soulwood_planks_stairs_outer.json +++ b/src/generated/resources/assets/malum/models/block/soulwood_planks_stairs_outer.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/outer_stairs", "textures": { - "side": "malum:block/soulwood/soulwood_planks", "bottom": "malum:block/soulwood/soulwood_planks", + "side": "malum:block/soulwood/soulwood_planks", "top": "malum:block/soulwood/soulwood_planks" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/soulwood_tiles_slab.json b/src/generated/resources/assets/malum/models/block/soulwood_tiles_slab.json index e04f1b067..ba5c03099 100644 --- a/src/generated/resources/assets/malum/models/block/soulwood_tiles_slab.json +++ b/src/generated/resources/assets/malum/models/block/soulwood_tiles_slab.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/slab", "textures": { - "side": "malum:block/soulwood/soulwood_tiles", "bottom": "malum:block/soulwood/soulwood_tiles", + "side": "malum:block/soulwood/soulwood_tiles", "top": "malum:block/soulwood/soulwood_tiles" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/soulwood_tiles_slab_top.json b/src/generated/resources/assets/malum/models/block/soulwood_tiles_slab_top.json index 8be7c399d..26348e4cb 100644 --- a/src/generated/resources/assets/malum/models/block/soulwood_tiles_slab_top.json +++ b/src/generated/resources/assets/malum/models/block/soulwood_tiles_slab_top.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/slab_top", "textures": { - "side": "malum:block/soulwood/soulwood_tiles", "bottom": "malum:block/soulwood/soulwood_tiles", + "side": "malum:block/soulwood/soulwood_tiles", "top": "malum:block/soulwood/soulwood_tiles" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/soulwood_tiles_stairs.json b/src/generated/resources/assets/malum/models/block/soulwood_tiles_stairs.json index 3cdfbd21e..5f6f0e079 100644 --- a/src/generated/resources/assets/malum/models/block/soulwood_tiles_stairs.json +++ b/src/generated/resources/assets/malum/models/block/soulwood_tiles_stairs.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/stairs", "textures": { - "side": "malum:block/soulwood/soulwood_tiles", "bottom": "malum:block/soulwood/soulwood_tiles", + "side": "malum:block/soulwood/soulwood_tiles", "top": "malum:block/soulwood/soulwood_tiles" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/soulwood_tiles_stairs_inner.json b/src/generated/resources/assets/malum/models/block/soulwood_tiles_stairs_inner.json index 60a620b4f..846a78f8e 100644 --- a/src/generated/resources/assets/malum/models/block/soulwood_tiles_stairs_inner.json +++ b/src/generated/resources/assets/malum/models/block/soulwood_tiles_stairs_inner.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/inner_stairs", "textures": { - "side": "malum:block/soulwood/soulwood_tiles", "bottom": "malum:block/soulwood/soulwood_tiles", + "side": "malum:block/soulwood/soulwood_tiles", "top": "malum:block/soulwood/soulwood_tiles" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/soulwood_tiles_stairs_outer.json b/src/generated/resources/assets/malum/models/block/soulwood_tiles_stairs_outer.json index 6f2feee5b..8491a3629 100644 --- a/src/generated/resources/assets/malum/models/block/soulwood_tiles_stairs_outer.json +++ b/src/generated/resources/assets/malum/models/block/soulwood_tiles_stairs_outer.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/outer_stairs", "textures": { - "side": "malum:block/soulwood/soulwood_tiles", "bottom": "malum:block/soulwood/soulwood_tiles", + "side": "malum:block/soulwood/soulwood_tiles", "top": "malum:block/soulwood/soulwood_tiles" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/soulwood_totem_base.json b/src/generated/resources/assets/malum/models/block/soulwood_totem_base.json index dac66dc2e..15618a7d5 100644 --- a/src/generated/resources/assets/malum/models/block/soulwood_totem_base.json +++ b/src/generated/resources/assets/malum/models/block/soulwood_totem_base.json @@ -1,9 +1,9 @@ { "parent": "malum:block/templates/template_totem_base", "textures": { - "side": "malum:block/soulwood/soulwood_log", - "top": "malum:block/soulwood/soulwood_log_top", + "panel": "malum:block/soulwood/soulwood_panel", "planks": "malum:block/soulwood/soulwood_planks", - "panel": "malum:block/soulwood/soulwood_panel" + "side": "malum:block/soulwood/soulwood_log", + "top": "malum:block/soulwood/soulwood_log_top" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/soulwood_totem_pole_aerial.json b/src/generated/resources/assets/malum/models/block/soulwood_totem_pole_aerial.json index 8dfe60b30..485d4469b 100644 --- a/src/generated/resources/assets/malum/models/block/soulwood_totem_pole_aerial.json +++ b/src/generated/resources/assets/malum/models/block/soulwood_totem_pole_aerial.json @@ -1,8 +1,8 @@ { "parent": "malum:block/templates/template_totem_pole", "textures": { + "front": "malum:block/soulwood/totem_poles/aerial_soulwood_cutout", "side": "malum:block/soulwood/soulwood_log", - "top": "malum:block/soulwood/soulwood_log_top", - "front": "malum:block/soulwood/totem_poles/aerial_soulwood_cutout" + "top": "malum:block/soulwood/soulwood_log_top" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/soulwood_totem_pole_aqueous.json b/src/generated/resources/assets/malum/models/block/soulwood_totem_pole_aqueous.json index 3c438598e..0b3225f3c 100644 --- a/src/generated/resources/assets/malum/models/block/soulwood_totem_pole_aqueous.json +++ b/src/generated/resources/assets/malum/models/block/soulwood_totem_pole_aqueous.json @@ -1,8 +1,8 @@ { "parent": "malum:block/templates/template_totem_pole", "textures": { + "front": "malum:block/soulwood/totem_poles/aqueous_soulwood_cutout", "side": "malum:block/soulwood/soulwood_log", - "top": "malum:block/soulwood/soulwood_log_top", - "front": "malum:block/soulwood/totem_poles/aqueous_soulwood_cutout" + "top": "malum:block/soulwood/soulwood_log_top" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/soulwood_totem_pole_arcane.json b/src/generated/resources/assets/malum/models/block/soulwood_totem_pole_arcane.json index b24966d5b..84de95412 100644 --- a/src/generated/resources/assets/malum/models/block/soulwood_totem_pole_arcane.json +++ b/src/generated/resources/assets/malum/models/block/soulwood_totem_pole_arcane.json @@ -1,8 +1,8 @@ { "parent": "malum:block/templates/template_totem_pole", "textures": { + "front": "malum:block/soulwood/totem_poles/arcane_soulwood_cutout", "side": "malum:block/soulwood/soulwood_log", - "top": "malum:block/soulwood/soulwood_log_top", - "front": "malum:block/soulwood/totem_poles/arcane_soulwood_cutout" + "top": "malum:block/soulwood/soulwood_log_top" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/soulwood_totem_pole_earthen.json b/src/generated/resources/assets/malum/models/block/soulwood_totem_pole_earthen.json index 3ae4f6de8..73db740f0 100644 --- a/src/generated/resources/assets/malum/models/block/soulwood_totem_pole_earthen.json +++ b/src/generated/resources/assets/malum/models/block/soulwood_totem_pole_earthen.json @@ -1,8 +1,8 @@ { "parent": "malum:block/templates/template_totem_pole", "textures": { + "front": "malum:block/soulwood/totem_poles/earthen_soulwood_cutout", "side": "malum:block/soulwood/soulwood_log", - "top": "malum:block/soulwood/soulwood_log_top", - "front": "malum:block/soulwood/totem_poles/earthen_soulwood_cutout" + "top": "malum:block/soulwood/soulwood_log_top" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/soulwood_totem_pole_eldritch.json b/src/generated/resources/assets/malum/models/block/soulwood_totem_pole_eldritch.json index 3d964fa43..ba0f15b28 100644 --- a/src/generated/resources/assets/malum/models/block/soulwood_totem_pole_eldritch.json +++ b/src/generated/resources/assets/malum/models/block/soulwood_totem_pole_eldritch.json @@ -1,8 +1,8 @@ { "parent": "malum:block/templates/template_totem_pole", "textures": { + "front": "malum:block/soulwood/totem_poles/eldritch_soulwood_cutout", "side": "malum:block/soulwood/soulwood_log", - "top": "malum:block/soulwood/soulwood_log_top", - "front": "malum:block/soulwood/totem_poles/eldritch_soulwood_cutout" + "top": "malum:block/soulwood/soulwood_log_top" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/soulwood_totem_pole_infernal.json b/src/generated/resources/assets/malum/models/block/soulwood_totem_pole_infernal.json index 0ccfd272d..1ecf233a0 100644 --- a/src/generated/resources/assets/malum/models/block/soulwood_totem_pole_infernal.json +++ b/src/generated/resources/assets/malum/models/block/soulwood_totem_pole_infernal.json @@ -1,8 +1,8 @@ { "parent": "malum:block/templates/template_totem_pole", "textures": { + "front": "malum:block/soulwood/totem_poles/infernal_soulwood_cutout", "side": "malum:block/soulwood/soulwood_log", - "top": "malum:block/soulwood/soulwood_log_top", - "front": "malum:block/soulwood/totem_poles/infernal_soulwood_cutout" + "top": "malum:block/soulwood/soulwood_log_top" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/soulwood_totem_pole_sacred.json b/src/generated/resources/assets/malum/models/block/soulwood_totem_pole_sacred.json index 6b8cf50ff..9b7d064b4 100644 --- a/src/generated/resources/assets/malum/models/block/soulwood_totem_pole_sacred.json +++ b/src/generated/resources/assets/malum/models/block/soulwood_totem_pole_sacred.json @@ -1,8 +1,8 @@ { "parent": "malum:block/templates/template_totem_pole", "textures": { + "front": "malum:block/soulwood/totem_poles/sacred_soulwood_cutout", "side": "malum:block/soulwood/soulwood_log", - "top": "malum:block/soulwood/soulwood_log_top", - "front": "malum:block/soulwood/totem_poles/sacred_soulwood_cutout" + "top": "malum:block/soulwood/soulwood_log_top" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/soulwood_totem_pole_wicked.json b/src/generated/resources/assets/malum/models/block/soulwood_totem_pole_wicked.json index a4d9a286d..9026bc377 100644 --- a/src/generated/resources/assets/malum/models/block/soulwood_totem_pole_wicked.json +++ b/src/generated/resources/assets/malum/models/block/soulwood_totem_pole_wicked.json @@ -1,8 +1,8 @@ { "parent": "malum:block/templates/template_totem_pole", "textures": { + "front": "malum:block/soulwood/totem_poles/wicked_soulwood_cutout", "side": "malum:block/soulwood/soulwood_log", - "top": "malum:block/soulwood/soulwood_log_top", - "front": "malum:block/soulwood/totem_poles/wicked_soulwood_cutout" + "top": "malum:block/soulwood/soulwood_log_top" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/stripped_runewood.json b/src/generated/resources/assets/malum/models/block/stripped_runewood.json index ebc71bc80..67b364509 100644 --- a/src/generated/resources/assets/malum/models/block/stripped_runewood.json +++ b/src/generated/resources/assets/malum/models/block/stripped_runewood.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/cube_column", "textures": { - "side": "malum:block/runewood/stripped_runewood_log", - "end": "malum:block/runewood/stripped_runewood_log" + "end": "malum:block/runewood/stripped_runewood_log", + "side": "malum:block/runewood/stripped_runewood_log" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/stripped_runewood_horizontal.json b/src/generated/resources/assets/malum/models/block/stripped_runewood_horizontal.json index b46e6db48..e8c07bfb7 100644 --- a/src/generated/resources/assets/malum/models/block/stripped_runewood_horizontal.json +++ b/src/generated/resources/assets/malum/models/block/stripped_runewood_horizontal.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/cube_column_horizontal", "textures": { - "side": "malum:block/runewood/stripped_runewood_log", - "end": "malum:block/runewood/stripped_runewood_log" + "end": "malum:block/runewood/stripped_runewood_log", + "side": "malum:block/runewood/stripped_runewood_log" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/stripped_runewood_log.json b/src/generated/resources/assets/malum/models/block/stripped_runewood_log.json index c04ef922b..df218cbdb 100644 --- a/src/generated/resources/assets/malum/models/block/stripped_runewood_log.json +++ b/src/generated/resources/assets/malum/models/block/stripped_runewood_log.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/cube_column", "textures": { - "side": "malum:block/runewood/stripped_runewood_log", - "end": "malum:block/runewood/stripped_runewood_log_top" + "end": "malum:block/runewood/stripped_runewood_log_top", + "side": "malum:block/runewood/stripped_runewood_log" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/stripped_runewood_log_horizontal.json b/src/generated/resources/assets/malum/models/block/stripped_runewood_log_horizontal.json index 2e1ba875d..b149e067e 100644 --- a/src/generated/resources/assets/malum/models/block/stripped_runewood_log_horizontal.json +++ b/src/generated/resources/assets/malum/models/block/stripped_runewood_log_horizontal.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/cube_column_horizontal", "textures": { - "side": "malum:block/runewood/stripped_runewood_log", - "end": "malum:block/runewood/stripped_runewood_log_top" + "end": "malum:block/runewood/stripped_runewood_log_top", + "side": "malum:block/runewood/stripped_runewood_log" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/stripped_soulwood.json b/src/generated/resources/assets/malum/models/block/stripped_soulwood.json index 68cf9871a..87c457df6 100644 --- a/src/generated/resources/assets/malum/models/block/stripped_soulwood.json +++ b/src/generated/resources/assets/malum/models/block/stripped_soulwood.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/cube_column", "textures": { - "side": "malum:block/soulwood/stripped_soulwood_log", - "end": "malum:block/soulwood/stripped_soulwood_log" + "end": "malum:block/soulwood/stripped_soulwood_log", + "side": "malum:block/soulwood/stripped_soulwood_log" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/stripped_soulwood_horizontal.json b/src/generated/resources/assets/malum/models/block/stripped_soulwood_horizontal.json index 029d29f17..75194fa44 100644 --- a/src/generated/resources/assets/malum/models/block/stripped_soulwood_horizontal.json +++ b/src/generated/resources/assets/malum/models/block/stripped_soulwood_horizontal.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/cube_column_horizontal", "textures": { - "side": "malum:block/soulwood/stripped_soulwood_log", - "end": "malum:block/soulwood/stripped_soulwood_log" + "end": "malum:block/soulwood/stripped_soulwood_log", + "side": "malum:block/soulwood/stripped_soulwood_log" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/stripped_soulwood_log.json b/src/generated/resources/assets/malum/models/block/stripped_soulwood_log.json index 095b25110..c9e1a69ac 100644 --- a/src/generated/resources/assets/malum/models/block/stripped_soulwood_log.json +++ b/src/generated/resources/assets/malum/models/block/stripped_soulwood_log.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/cube_column", "textures": { - "side": "malum:block/soulwood/stripped_soulwood_log", - "end": "malum:block/soulwood/stripped_soulwood_log_top" + "end": "malum:block/soulwood/stripped_soulwood_log_top", + "side": "malum:block/soulwood/stripped_soulwood_log" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/stripped_soulwood_log_horizontal.json b/src/generated/resources/assets/malum/models/block/stripped_soulwood_log_horizontal.json index 4606c91d3..682bff23e 100644 --- a/src/generated/resources/assets/malum/models/block/stripped_soulwood_log_horizontal.json +++ b/src/generated/resources/assets/malum/models/block/stripped_soulwood_log_horizontal.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/cube_column_horizontal", "textures": { - "side": "malum:block/soulwood/stripped_soulwood_log", - "end": "malum:block/soulwood/stripped_soulwood_log_top" + "end": "malum:block/soulwood/stripped_soulwood_log_top", + "side": "malum:block/soulwood/stripped_soulwood_log" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/tainted_rock_bricks_slab.json b/src/generated/resources/assets/malum/models/block/tainted_rock_bricks_slab.json index 9db2ceb60..d2187da2e 100644 --- a/src/generated/resources/assets/malum/models/block/tainted_rock_bricks_slab.json +++ b/src/generated/resources/assets/malum/models/block/tainted_rock_bricks_slab.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/slab", "textures": { - "side": "malum:block/arcane_rock/tainted/tainted_rock_bricks", "bottom": "malum:block/arcane_rock/tainted/tainted_rock_bricks", + "side": "malum:block/arcane_rock/tainted/tainted_rock_bricks", "top": "malum:block/arcane_rock/tainted/tainted_rock_bricks" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/tainted_rock_bricks_slab_top.json b/src/generated/resources/assets/malum/models/block/tainted_rock_bricks_slab_top.json index 6444045a5..82249c0b3 100644 --- a/src/generated/resources/assets/malum/models/block/tainted_rock_bricks_slab_top.json +++ b/src/generated/resources/assets/malum/models/block/tainted_rock_bricks_slab_top.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/slab_top", "textures": { - "side": "malum:block/arcane_rock/tainted/tainted_rock_bricks", "bottom": "malum:block/arcane_rock/tainted/tainted_rock_bricks", + "side": "malum:block/arcane_rock/tainted/tainted_rock_bricks", "top": "malum:block/arcane_rock/tainted/tainted_rock_bricks" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/tainted_rock_bricks_stairs.json b/src/generated/resources/assets/malum/models/block/tainted_rock_bricks_stairs.json index de42244af..9f1028171 100644 --- a/src/generated/resources/assets/malum/models/block/tainted_rock_bricks_stairs.json +++ b/src/generated/resources/assets/malum/models/block/tainted_rock_bricks_stairs.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/stairs", "textures": { - "side": "malum:block/arcane_rock/tainted/tainted_rock_bricks", "bottom": "malum:block/arcane_rock/tainted/tainted_rock_bricks", + "side": "malum:block/arcane_rock/tainted/tainted_rock_bricks", "top": "malum:block/arcane_rock/tainted/tainted_rock_bricks" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/tainted_rock_bricks_stairs_inner.json b/src/generated/resources/assets/malum/models/block/tainted_rock_bricks_stairs_inner.json index 05e1e8371..42e8f50b4 100644 --- a/src/generated/resources/assets/malum/models/block/tainted_rock_bricks_stairs_inner.json +++ b/src/generated/resources/assets/malum/models/block/tainted_rock_bricks_stairs_inner.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/inner_stairs", "textures": { - "side": "malum:block/arcane_rock/tainted/tainted_rock_bricks", "bottom": "malum:block/arcane_rock/tainted/tainted_rock_bricks", + "side": "malum:block/arcane_rock/tainted/tainted_rock_bricks", "top": "malum:block/arcane_rock/tainted/tainted_rock_bricks" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/tainted_rock_bricks_stairs_outer.json b/src/generated/resources/assets/malum/models/block/tainted_rock_bricks_stairs_outer.json index 6e3eee53b..91175c339 100644 --- a/src/generated/resources/assets/malum/models/block/tainted_rock_bricks_stairs_outer.json +++ b/src/generated/resources/assets/malum/models/block/tainted_rock_bricks_stairs_outer.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/outer_stairs", "textures": { - "side": "malum:block/arcane_rock/tainted/tainted_rock_bricks", "bottom": "malum:block/arcane_rock/tainted/tainted_rock_bricks", + "side": "malum:block/arcane_rock/tainted/tainted_rock_bricks", "top": "malum:block/arcane_rock/tainted/tainted_rock_bricks" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/tainted_rock_column.json b/src/generated/resources/assets/malum/models/block/tainted_rock_column.json index a2e76b5dc..6fcfbce14 100644 --- a/src/generated/resources/assets/malum/models/block/tainted_rock_column.json +++ b/src/generated/resources/assets/malum/models/block/tainted_rock_column.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/cube_column", "textures": { - "side": "malum:block/arcane_rock/tainted/tainted_rock_column", - "end": "malum:block/arcane_rock/tainted/tainted_rock_column_top" + "end": "malum:block/arcane_rock/tainted/tainted_rock_column_top", + "side": "malum:block/arcane_rock/tainted/tainted_rock_column" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/tainted_rock_column_cap.json b/src/generated/resources/assets/malum/models/block/tainted_rock_column_cap.json index 8d6b7f269..009d33191 100644 --- a/src/generated/resources/assets/malum/models/block/tainted_rock_column_cap.json +++ b/src/generated/resources/assets/malum/models/block/tainted_rock_column_cap.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/cube_bottom_top", "textures": { - "side": "malum:block/arcane_rock/tainted/tainted_rock_column_cap", "bottom": "malum:block/arcane_rock/tainted/tainted_rock_column_top", + "side": "malum:block/arcane_rock/tainted/tainted_rock_column_cap", "top": "malum:block/arcane_rock/tainted/tainted_rock_column_cap_top" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/tainted_rock_column_horizontal.json b/src/generated/resources/assets/malum/models/block/tainted_rock_column_horizontal.json index d72996e7a..96eb6b476 100644 --- a/src/generated/resources/assets/malum/models/block/tainted_rock_column_horizontal.json +++ b/src/generated/resources/assets/malum/models/block/tainted_rock_column_horizontal.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/cube_column_horizontal", "textures": { - "side": "malum:block/arcane_rock/tainted/tainted_rock_column", - "end": "malum:block/arcane_rock/tainted/tainted_rock_column_top" + "end": "malum:block/arcane_rock/tainted/tainted_rock_column_top", + "side": "malum:block/arcane_rock/tainted/tainted_rock_column" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/tainted_rock_item_pedestal.json b/src/generated/resources/assets/malum/models/block/tainted_rock_item_pedestal.json index fc5752d37..d686411de 100644 --- a/src/generated/resources/assets/malum/models/block/tainted_rock_item_pedestal.json +++ b/src/generated/resources/assets/malum/models/block/tainted_rock_item_pedestal.json @@ -1,7 +1,7 @@ { "parent": "malum:block/templates/template_rock_item_pedestal", "textures": { - "pedestal": "malum:block/arcane_rock/tainted/tainted_rock_item_pedestal", - "particle": "malum:block/arcane_rock/tainted/tainted_rock" + "particle": "malum:block/arcane_rock/tainted/tainted_rock", + "pedestal": "malum:block/arcane_rock/tainted/tainted_rock_item_pedestal" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/tainted_rock_item_stand.json b/src/generated/resources/assets/malum/models/block/tainted_rock_item_stand.json index a1c58ab8a..bd4e38bce 100644 --- a/src/generated/resources/assets/malum/models/block/tainted_rock_item_stand.json +++ b/src/generated/resources/assets/malum/models/block/tainted_rock_item_stand.json @@ -1,7 +1,7 @@ { "parent": "malum:block/templates/template_item_stand", "textures": { - "stand": "malum:block/arcane_rock/tainted/tainted_rock_item_stand", - "particle": "malum:block/arcane_rock/tainted/tainted_rock" + "particle": "malum:block/arcane_rock/tainted/tainted_rock", + "stand": "malum:block/arcane_rock/tainted/tainted_rock_item_stand" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/tainted_rock_slab.json b/src/generated/resources/assets/malum/models/block/tainted_rock_slab.json index 38aed77fc..2320fef06 100644 --- a/src/generated/resources/assets/malum/models/block/tainted_rock_slab.json +++ b/src/generated/resources/assets/malum/models/block/tainted_rock_slab.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/slab", "textures": { - "side": "malum:block/arcane_rock/tainted/tainted_rock", "bottom": "malum:block/arcane_rock/tainted/tainted_rock", + "side": "malum:block/arcane_rock/tainted/tainted_rock", "top": "malum:block/arcane_rock/tainted/tainted_rock" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/tainted_rock_slab_top.json b/src/generated/resources/assets/malum/models/block/tainted_rock_slab_top.json index f3716c35d..2d39e5e2c 100644 --- a/src/generated/resources/assets/malum/models/block/tainted_rock_slab_top.json +++ b/src/generated/resources/assets/malum/models/block/tainted_rock_slab_top.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/slab_top", "textures": { - "side": "malum:block/arcane_rock/tainted/tainted_rock", "bottom": "malum:block/arcane_rock/tainted/tainted_rock", + "side": "malum:block/arcane_rock/tainted/tainted_rock", "top": "malum:block/arcane_rock/tainted/tainted_rock" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/tainted_rock_stairs.json b/src/generated/resources/assets/malum/models/block/tainted_rock_stairs.json index 8b37ff273..bf29e5cd7 100644 --- a/src/generated/resources/assets/malum/models/block/tainted_rock_stairs.json +++ b/src/generated/resources/assets/malum/models/block/tainted_rock_stairs.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/stairs", "textures": { - "side": "malum:block/arcane_rock/tainted/tainted_rock", "bottom": "malum:block/arcane_rock/tainted/tainted_rock", + "side": "malum:block/arcane_rock/tainted/tainted_rock", "top": "malum:block/arcane_rock/tainted/tainted_rock" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/tainted_rock_stairs_inner.json b/src/generated/resources/assets/malum/models/block/tainted_rock_stairs_inner.json index 1834eb544..e720e00c5 100644 --- a/src/generated/resources/assets/malum/models/block/tainted_rock_stairs_inner.json +++ b/src/generated/resources/assets/malum/models/block/tainted_rock_stairs_inner.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/inner_stairs", "textures": { - "side": "malum:block/arcane_rock/tainted/tainted_rock", "bottom": "malum:block/arcane_rock/tainted/tainted_rock", + "side": "malum:block/arcane_rock/tainted/tainted_rock", "top": "malum:block/arcane_rock/tainted/tainted_rock" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/tainted_rock_stairs_outer.json b/src/generated/resources/assets/malum/models/block/tainted_rock_stairs_outer.json index 1159b5e16..a5f02a0f6 100644 --- a/src/generated/resources/assets/malum/models/block/tainted_rock_stairs_outer.json +++ b/src/generated/resources/assets/malum/models/block/tainted_rock_stairs_outer.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/outer_stairs", "textures": { - "side": "malum:block/arcane_rock/tainted/tainted_rock", "bottom": "malum:block/arcane_rock/tainted/tainted_rock", + "side": "malum:block/arcane_rock/tainted/tainted_rock", "top": "malum:block/arcane_rock/tainted/tainted_rock" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/tainted_rock_tiles_slab.json b/src/generated/resources/assets/malum/models/block/tainted_rock_tiles_slab.json index f05f4de7c..25d383705 100644 --- a/src/generated/resources/assets/malum/models/block/tainted_rock_tiles_slab.json +++ b/src/generated/resources/assets/malum/models/block/tainted_rock_tiles_slab.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/slab", "textures": { - "side": "malum:block/arcane_rock/tainted/tainted_rock_tiles", "bottom": "malum:block/arcane_rock/tainted/tainted_rock_tiles", + "side": "malum:block/arcane_rock/tainted/tainted_rock_tiles", "top": "malum:block/arcane_rock/tainted/tainted_rock_tiles" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/tainted_rock_tiles_slab_top.json b/src/generated/resources/assets/malum/models/block/tainted_rock_tiles_slab_top.json index 0d4d803c8..f8d52ab1a 100644 --- a/src/generated/resources/assets/malum/models/block/tainted_rock_tiles_slab_top.json +++ b/src/generated/resources/assets/malum/models/block/tainted_rock_tiles_slab_top.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/slab_top", "textures": { - "side": "malum:block/arcane_rock/tainted/tainted_rock_tiles", "bottom": "malum:block/arcane_rock/tainted/tainted_rock_tiles", + "side": "malum:block/arcane_rock/tainted/tainted_rock_tiles", "top": "malum:block/arcane_rock/tainted/tainted_rock_tiles" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/tainted_rock_tiles_stairs.json b/src/generated/resources/assets/malum/models/block/tainted_rock_tiles_stairs.json index 00545ba30..76ed237a4 100644 --- a/src/generated/resources/assets/malum/models/block/tainted_rock_tiles_stairs.json +++ b/src/generated/resources/assets/malum/models/block/tainted_rock_tiles_stairs.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/stairs", "textures": { - "side": "malum:block/arcane_rock/tainted/tainted_rock_tiles", "bottom": "malum:block/arcane_rock/tainted/tainted_rock_tiles", + "side": "malum:block/arcane_rock/tainted/tainted_rock_tiles", "top": "malum:block/arcane_rock/tainted/tainted_rock_tiles" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/tainted_rock_tiles_stairs_inner.json b/src/generated/resources/assets/malum/models/block/tainted_rock_tiles_stairs_inner.json index 7b9f13081..4c5ed3e61 100644 --- a/src/generated/resources/assets/malum/models/block/tainted_rock_tiles_stairs_inner.json +++ b/src/generated/resources/assets/malum/models/block/tainted_rock_tiles_stairs_inner.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/inner_stairs", "textures": { - "side": "malum:block/arcane_rock/tainted/tainted_rock_tiles", "bottom": "malum:block/arcane_rock/tainted/tainted_rock_tiles", + "side": "malum:block/arcane_rock/tainted/tainted_rock_tiles", "top": "malum:block/arcane_rock/tainted/tainted_rock_tiles" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/tainted_rock_tiles_stairs_outer.json b/src/generated/resources/assets/malum/models/block/tainted_rock_tiles_stairs_outer.json index 460d53be0..5c5644110 100644 --- a/src/generated/resources/assets/malum/models/block/tainted_rock_tiles_stairs_outer.json +++ b/src/generated/resources/assets/malum/models/block/tainted_rock_tiles_stairs_outer.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/outer_stairs", "textures": { - "side": "malum:block/arcane_rock/tainted/tainted_rock_tiles", "bottom": "malum:block/arcane_rock/tainted/tainted_rock_tiles", + "side": "malum:block/arcane_rock/tainted/tainted_rock_tiles", "top": "malum:block/arcane_rock/tainted/tainted_rock_tiles" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/twisted_rock_bricks_slab.json b/src/generated/resources/assets/malum/models/block/twisted_rock_bricks_slab.json index 74e56a144..31285747d 100644 --- a/src/generated/resources/assets/malum/models/block/twisted_rock_bricks_slab.json +++ b/src/generated/resources/assets/malum/models/block/twisted_rock_bricks_slab.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/slab", "textures": { - "side": "malum:block/arcane_rock/twisted/twisted_rock_bricks", "bottom": "malum:block/arcane_rock/twisted/twisted_rock_bricks", + "side": "malum:block/arcane_rock/twisted/twisted_rock_bricks", "top": "malum:block/arcane_rock/twisted/twisted_rock_bricks" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/twisted_rock_bricks_slab_top.json b/src/generated/resources/assets/malum/models/block/twisted_rock_bricks_slab_top.json index 770ae9e14..6e88e35fb 100644 --- a/src/generated/resources/assets/malum/models/block/twisted_rock_bricks_slab_top.json +++ b/src/generated/resources/assets/malum/models/block/twisted_rock_bricks_slab_top.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/slab_top", "textures": { - "side": "malum:block/arcane_rock/twisted/twisted_rock_bricks", "bottom": "malum:block/arcane_rock/twisted/twisted_rock_bricks", + "side": "malum:block/arcane_rock/twisted/twisted_rock_bricks", "top": "malum:block/arcane_rock/twisted/twisted_rock_bricks" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/twisted_rock_bricks_stairs.json b/src/generated/resources/assets/malum/models/block/twisted_rock_bricks_stairs.json index 22962eeef..7d7d718b1 100644 --- a/src/generated/resources/assets/malum/models/block/twisted_rock_bricks_stairs.json +++ b/src/generated/resources/assets/malum/models/block/twisted_rock_bricks_stairs.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/stairs", "textures": { - "side": "malum:block/arcane_rock/twisted/twisted_rock_bricks", "bottom": "malum:block/arcane_rock/twisted/twisted_rock_bricks", + "side": "malum:block/arcane_rock/twisted/twisted_rock_bricks", "top": "malum:block/arcane_rock/twisted/twisted_rock_bricks" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/twisted_rock_bricks_stairs_inner.json b/src/generated/resources/assets/malum/models/block/twisted_rock_bricks_stairs_inner.json index b71045c22..b8ab875de 100644 --- a/src/generated/resources/assets/malum/models/block/twisted_rock_bricks_stairs_inner.json +++ b/src/generated/resources/assets/malum/models/block/twisted_rock_bricks_stairs_inner.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/inner_stairs", "textures": { - "side": "malum:block/arcane_rock/twisted/twisted_rock_bricks", "bottom": "malum:block/arcane_rock/twisted/twisted_rock_bricks", + "side": "malum:block/arcane_rock/twisted/twisted_rock_bricks", "top": "malum:block/arcane_rock/twisted/twisted_rock_bricks" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/twisted_rock_bricks_stairs_outer.json b/src/generated/resources/assets/malum/models/block/twisted_rock_bricks_stairs_outer.json index 4f2f2d599..512871657 100644 --- a/src/generated/resources/assets/malum/models/block/twisted_rock_bricks_stairs_outer.json +++ b/src/generated/resources/assets/malum/models/block/twisted_rock_bricks_stairs_outer.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/outer_stairs", "textures": { - "side": "malum:block/arcane_rock/twisted/twisted_rock_bricks", "bottom": "malum:block/arcane_rock/twisted/twisted_rock_bricks", + "side": "malum:block/arcane_rock/twisted/twisted_rock_bricks", "top": "malum:block/arcane_rock/twisted/twisted_rock_bricks" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/twisted_rock_column.json b/src/generated/resources/assets/malum/models/block/twisted_rock_column.json index 89b872982..42513fd01 100644 --- a/src/generated/resources/assets/malum/models/block/twisted_rock_column.json +++ b/src/generated/resources/assets/malum/models/block/twisted_rock_column.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/cube_column", "textures": { - "side": "malum:block/arcane_rock/twisted/twisted_rock_column", - "end": "malum:block/arcane_rock/twisted/twisted_rock_column_top" + "end": "malum:block/arcane_rock/twisted/twisted_rock_column_top", + "side": "malum:block/arcane_rock/twisted/twisted_rock_column" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/twisted_rock_column_cap.json b/src/generated/resources/assets/malum/models/block/twisted_rock_column_cap.json index bdd14c9f4..d7a1c46b0 100644 --- a/src/generated/resources/assets/malum/models/block/twisted_rock_column_cap.json +++ b/src/generated/resources/assets/malum/models/block/twisted_rock_column_cap.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/cube_bottom_top", "textures": { - "side": "malum:block/arcane_rock/twisted/twisted_rock_column_cap", "bottom": "malum:block/arcane_rock/twisted/twisted_rock_column_top", + "side": "malum:block/arcane_rock/twisted/twisted_rock_column_cap", "top": "malum:block/arcane_rock/twisted/twisted_rock_column_cap_top" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/twisted_rock_column_horizontal.json b/src/generated/resources/assets/malum/models/block/twisted_rock_column_horizontal.json index 9af130d20..c1ed2461b 100644 --- a/src/generated/resources/assets/malum/models/block/twisted_rock_column_horizontal.json +++ b/src/generated/resources/assets/malum/models/block/twisted_rock_column_horizontal.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/cube_column_horizontal", "textures": { - "side": "malum:block/arcane_rock/twisted/twisted_rock_column", - "end": "malum:block/arcane_rock/twisted/twisted_rock_column_top" + "end": "malum:block/arcane_rock/twisted/twisted_rock_column_top", + "side": "malum:block/arcane_rock/twisted/twisted_rock_column" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/twisted_rock_item_pedestal.json b/src/generated/resources/assets/malum/models/block/twisted_rock_item_pedestal.json index 5ce434bbf..c227cf82a 100644 --- a/src/generated/resources/assets/malum/models/block/twisted_rock_item_pedestal.json +++ b/src/generated/resources/assets/malum/models/block/twisted_rock_item_pedestal.json @@ -1,7 +1,7 @@ { "parent": "malum:block/templates/template_rock_item_pedestal", "textures": { - "pedestal": "malum:block/arcane_rock/twisted/twisted_rock_item_pedestal", - "particle": "malum:block/arcane_rock/twisted/twisted_rock" + "particle": "malum:block/arcane_rock/twisted/twisted_rock", + "pedestal": "malum:block/arcane_rock/twisted/twisted_rock_item_pedestal" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/twisted_rock_item_stand.json b/src/generated/resources/assets/malum/models/block/twisted_rock_item_stand.json index 1e547a71e..380f74c34 100644 --- a/src/generated/resources/assets/malum/models/block/twisted_rock_item_stand.json +++ b/src/generated/resources/assets/malum/models/block/twisted_rock_item_stand.json @@ -1,7 +1,7 @@ { "parent": "malum:block/templates/template_item_stand", "textures": { - "stand": "malum:block/arcane_rock/twisted/twisted_rock_item_stand", - "particle": "malum:block/arcane_rock/twisted/twisted_rock" + "particle": "malum:block/arcane_rock/twisted/twisted_rock", + "stand": "malum:block/arcane_rock/twisted/twisted_rock_item_stand" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/twisted_rock_slab.json b/src/generated/resources/assets/malum/models/block/twisted_rock_slab.json index 7f278dc76..156c129ba 100644 --- a/src/generated/resources/assets/malum/models/block/twisted_rock_slab.json +++ b/src/generated/resources/assets/malum/models/block/twisted_rock_slab.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/slab", "textures": { - "side": "malum:block/arcane_rock/twisted/twisted_rock", "bottom": "malum:block/arcane_rock/twisted/twisted_rock", + "side": "malum:block/arcane_rock/twisted/twisted_rock", "top": "malum:block/arcane_rock/twisted/twisted_rock" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/twisted_rock_slab_top.json b/src/generated/resources/assets/malum/models/block/twisted_rock_slab_top.json index 181af9365..d5964a963 100644 --- a/src/generated/resources/assets/malum/models/block/twisted_rock_slab_top.json +++ b/src/generated/resources/assets/malum/models/block/twisted_rock_slab_top.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/slab_top", "textures": { - "side": "malum:block/arcane_rock/twisted/twisted_rock", "bottom": "malum:block/arcane_rock/twisted/twisted_rock", + "side": "malum:block/arcane_rock/twisted/twisted_rock", "top": "malum:block/arcane_rock/twisted/twisted_rock" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/twisted_rock_stairs.json b/src/generated/resources/assets/malum/models/block/twisted_rock_stairs.json index b3ae8848e..05b0ed4b0 100644 --- a/src/generated/resources/assets/malum/models/block/twisted_rock_stairs.json +++ b/src/generated/resources/assets/malum/models/block/twisted_rock_stairs.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/stairs", "textures": { - "side": "malum:block/arcane_rock/twisted/twisted_rock", "bottom": "malum:block/arcane_rock/twisted/twisted_rock", + "side": "malum:block/arcane_rock/twisted/twisted_rock", "top": "malum:block/arcane_rock/twisted/twisted_rock" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/twisted_rock_stairs_inner.json b/src/generated/resources/assets/malum/models/block/twisted_rock_stairs_inner.json index 358032871..edc2af2ed 100644 --- a/src/generated/resources/assets/malum/models/block/twisted_rock_stairs_inner.json +++ b/src/generated/resources/assets/malum/models/block/twisted_rock_stairs_inner.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/inner_stairs", "textures": { - "side": "malum:block/arcane_rock/twisted/twisted_rock", "bottom": "malum:block/arcane_rock/twisted/twisted_rock", + "side": "malum:block/arcane_rock/twisted/twisted_rock", "top": "malum:block/arcane_rock/twisted/twisted_rock" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/twisted_rock_stairs_outer.json b/src/generated/resources/assets/malum/models/block/twisted_rock_stairs_outer.json index 7e2018c8a..5b0094799 100644 --- a/src/generated/resources/assets/malum/models/block/twisted_rock_stairs_outer.json +++ b/src/generated/resources/assets/malum/models/block/twisted_rock_stairs_outer.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/outer_stairs", "textures": { - "side": "malum:block/arcane_rock/twisted/twisted_rock", "bottom": "malum:block/arcane_rock/twisted/twisted_rock", + "side": "malum:block/arcane_rock/twisted/twisted_rock", "top": "malum:block/arcane_rock/twisted/twisted_rock" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/twisted_rock_tiles_slab.json b/src/generated/resources/assets/malum/models/block/twisted_rock_tiles_slab.json index b76d7de83..1eabd102b 100644 --- a/src/generated/resources/assets/malum/models/block/twisted_rock_tiles_slab.json +++ b/src/generated/resources/assets/malum/models/block/twisted_rock_tiles_slab.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/slab", "textures": { - "side": "malum:block/arcane_rock/twisted/twisted_rock_tiles", "bottom": "malum:block/arcane_rock/twisted/twisted_rock_tiles", + "side": "malum:block/arcane_rock/twisted/twisted_rock_tiles", "top": "malum:block/arcane_rock/twisted/twisted_rock_tiles" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/twisted_rock_tiles_slab_top.json b/src/generated/resources/assets/malum/models/block/twisted_rock_tiles_slab_top.json index 85264d1a2..17cdad531 100644 --- a/src/generated/resources/assets/malum/models/block/twisted_rock_tiles_slab_top.json +++ b/src/generated/resources/assets/malum/models/block/twisted_rock_tiles_slab_top.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/slab_top", "textures": { - "side": "malum:block/arcane_rock/twisted/twisted_rock_tiles", "bottom": "malum:block/arcane_rock/twisted/twisted_rock_tiles", + "side": "malum:block/arcane_rock/twisted/twisted_rock_tiles", "top": "malum:block/arcane_rock/twisted/twisted_rock_tiles" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/twisted_rock_tiles_stairs.json b/src/generated/resources/assets/malum/models/block/twisted_rock_tiles_stairs.json index 1306da3ff..ed9da9fa3 100644 --- a/src/generated/resources/assets/malum/models/block/twisted_rock_tiles_stairs.json +++ b/src/generated/resources/assets/malum/models/block/twisted_rock_tiles_stairs.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/stairs", "textures": { - "side": "malum:block/arcane_rock/twisted/twisted_rock_tiles", "bottom": "malum:block/arcane_rock/twisted/twisted_rock_tiles", + "side": "malum:block/arcane_rock/twisted/twisted_rock_tiles", "top": "malum:block/arcane_rock/twisted/twisted_rock_tiles" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/twisted_rock_tiles_stairs_inner.json b/src/generated/resources/assets/malum/models/block/twisted_rock_tiles_stairs_inner.json index b7a340f68..e903ec7ec 100644 --- a/src/generated/resources/assets/malum/models/block/twisted_rock_tiles_stairs_inner.json +++ b/src/generated/resources/assets/malum/models/block/twisted_rock_tiles_stairs_inner.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/inner_stairs", "textures": { - "side": "malum:block/arcane_rock/twisted/twisted_rock_tiles", "bottom": "malum:block/arcane_rock/twisted/twisted_rock_tiles", + "side": "malum:block/arcane_rock/twisted/twisted_rock_tiles", "top": "malum:block/arcane_rock/twisted/twisted_rock_tiles" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/twisted_rock_tiles_stairs_outer.json b/src/generated/resources/assets/malum/models/block/twisted_rock_tiles_stairs_outer.json index 862fa0c6b..7bd8cecc3 100644 --- a/src/generated/resources/assets/malum/models/block/twisted_rock_tiles_stairs_outer.json +++ b/src/generated/resources/assets/malum/models/block/twisted_rock_tiles_stairs_outer.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/outer_stairs", "textures": { - "side": "malum:block/arcane_rock/twisted/twisted_rock_tiles", "bottom": "malum:block/arcane_rock/twisted/twisted_rock_tiles", + "side": "malum:block/arcane_rock/twisted/twisted_rock_tiles", "top": "malum:block/arcane_rock/twisted/twisted_rock_tiles" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/vertical_runewood_planks_slab.json b/src/generated/resources/assets/malum/models/block/vertical_runewood_planks_slab.json index b1830ff02..f93c244e4 100644 --- a/src/generated/resources/assets/malum/models/block/vertical_runewood_planks_slab.json +++ b/src/generated/resources/assets/malum/models/block/vertical_runewood_planks_slab.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/slab", "textures": { - "side": "malum:block/runewood/vertical_runewood_planks", "bottom": "malum:block/runewood/vertical_runewood_planks", + "side": "malum:block/runewood/vertical_runewood_planks", "top": "malum:block/runewood/vertical_runewood_planks" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/vertical_runewood_planks_slab_top.json b/src/generated/resources/assets/malum/models/block/vertical_runewood_planks_slab_top.json index c48cbc98f..f58454296 100644 --- a/src/generated/resources/assets/malum/models/block/vertical_runewood_planks_slab_top.json +++ b/src/generated/resources/assets/malum/models/block/vertical_runewood_planks_slab_top.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/slab_top", "textures": { - "side": "malum:block/runewood/vertical_runewood_planks", "bottom": "malum:block/runewood/vertical_runewood_planks", + "side": "malum:block/runewood/vertical_runewood_planks", "top": "malum:block/runewood/vertical_runewood_planks" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/vertical_runewood_planks_stairs.json b/src/generated/resources/assets/malum/models/block/vertical_runewood_planks_stairs.json index ae2022474..27c6ec2bb 100644 --- a/src/generated/resources/assets/malum/models/block/vertical_runewood_planks_stairs.json +++ b/src/generated/resources/assets/malum/models/block/vertical_runewood_planks_stairs.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/stairs", "textures": { - "side": "malum:block/runewood/vertical_runewood_planks", "bottom": "malum:block/runewood/vertical_runewood_planks", + "side": "malum:block/runewood/vertical_runewood_planks", "top": "malum:block/runewood/vertical_runewood_planks" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/vertical_runewood_planks_stairs_inner.json b/src/generated/resources/assets/malum/models/block/vertical_runewood_planks_stairs_inner.json index 47e4f38a2..74d4ae54c 100644 --- a/src/generated/resources/assets/malum/models/block/vertical_runewood_planks_stairs_inner.json +++ b/src/generated/resources/assets/malum/models/block/vertical_runewood_planks_stairs_inner.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/inner_stairs", "textures": { - "side": "malum:block/runewood/vertical_runewood_planks", "bottom": "malum:block/runewood/vertical_runewood_planks", + "side": "malum:block/runewood/vertical_runewood_planks", "top": "malum:block/runewood/vertical_runewood_planks" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/vertical_runewood_planks_stairs_outer.json b/src/generated/resources/assets/malum/models/block/vertical_runewood_planks_stairs_outer.json index 8ea03ff2c..e7734e89a 100644 --- a/src/generated/resources/assets/malum/models/block/vertical_runewood_planks_stairs_outer.json +++ b/src/generated/resources/assets/malum/models/block/vertical_runewood_planks_stairs_outer.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/outer_stairs", "textures": { - "side": "malum:block/runewood/vertical_runewood_planks", "bottom": "malum:block/runewood/vertical_runewood_planks", + "side": "malum:block/runewood/vertical_runewood_planks", "top": "malum:block/runewood/vertical_runewood_planks" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/vertical_soulwood_planks_slab.json b/src/generated/resources/assets/malum/models/block/vertical_soulwood_planks_slab.json index da977b414..aaa92f8c6 100644 --- a/src/generated/resources/assets/malum/models/block/vertical_soulwood_planks_slab.json +++ b/src/generated/resources/assets/malum/models/block/vertical_soulwood_planks_slab.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/slab", "textures": { - "side": "malum:block/soulwood/vertical_soulwood_planks", "bottom": "malum:block/soulwood/vertical_soulwood_planks", + "side": "malum:block/soulwood/vertical_soulwood_planks", "top": "malum:block/soulwood/vertical_soulwood_planks" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/vertical_soulwood_planks_slab_top.json b/src/generated/resources/assets/malum/models/block/vertical_soulwood_planks_slab_top.json index 4b1de67e2..af92d909e 100644 --- a/src/generated/resources/assets/malum/models/block/vertical_soulwood_planks_slab_top.json +++ b/src/generated/resources/assets/malum/models/block/vertical_soulwood_planks_slab_top.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/slab_top", "textures": { - "side": "malum:block/soulwood/vertical_soulwood_planks", "bottom": "malum:block/soulwood/vertical_soulwood_planks", + "side": "malum:block/soulwood/vertical_soulwood_planks", "top": "malum:block/soulwood/vertical_soulwood_planks" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/vertical_soulwood_planks_stairs.json b/src/generated/resources/assets/malum/models/block/vertical_soulwood_planks_stairs.json index da89f5c9b..7ebce8031 100644 --- a/src/generated/resources/assets/malum/models/block/vertical_soulwood_planks_stairs.json +++ b/src/generated/resources/assets/malum/models/block/vertical_soulwood_planks_stairs.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/stairs", "textures": { - "side": "malum:block/soulwood/vertical_soulwood_planks", "bottom": "malum:block/soulwood/vertical_soulwood_planks", + "side": "malum:block/soulwood/vertical_soulwood_planks", "top": "malum:block/soulwood/vertical_soulwood_planks" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/vertical_soulwood_planks_stairs_inner.json b/src/generated/resources/assets/malum/models/block/vertical_soulwood_planks_stairs_inner.json index 106be9d02..28e746418 100644 --- a/src/generated/resources/assets/malum/models/block/vertical_soulwood_planks_stairs_inner.json +++ b/src/generated/resources/assets/malum/models/block/vertical_soulwood_planks_stairs_inner.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/inner_stairs", "textures": { - "side": "malum:block/soulwood/vertical_soulwood_planks", "bottom": "malum:block/soulwood/vertical_soulwood_planks", + "side": "malum:block/soulwood/vertical_soulwood_planks", "top": "malum:block/soulwood/vertical_soulwood_planks" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/block/vertical_soulwood_planks_stairs_outer.json b/src/generated/resources/assets/malum/models/block/vertical_soulwood_planks_stairs_outer.json index 37dbddc49..5137d5bf5 100644 --- a/src/generated/resources/assets/malum/models/block/vertical_soulwood_planks_stairs_outer.json +++ b/src/generated/resources/assets/malum/models/block/vertical_soulwood_planks_stairs_outer.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/outer_stairs", "textures": { - "side": "malum:block/soulwood/vertical_soulwood_planks", "bottom": "malum:block/soulwood/vertical_soulwood_planks", + "side": "malum:block/soulwood/vertical_soulwood_planks", "top": "malum:block/soulwood/vertical_soulwood_planks" } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/item/soul_hunter_boots.json b/src/generated/resources/assets/malum/models/item/soul_hunter_boots.json index 15dd20d48..9c9de5a15 100644 --- a/src/generated/resources/assets/malum/models/item/soul_hunter_boots.json +++ b/src/generated/resources/assets/malum/models/item/soul_hunter_boots.json @@ -1,152 +1,152 @@ { "parent": "minecraft:item/generated", - "textures": { - "layer0": "malum:item/soul_hunter_boots" - }, "overrides": [ { + "model": "malum:item/ace_socks", "predicate": { "malum:item_skin": 0.0 - }, - "model": "malum:item/ace_socks" + } }, { + "model": "malum:item/agender_socks", "predicate": { "malum:item_skin": 1.0 - }, - "model": "malum:item/agender_socks" + } }, { + "model": "malum:item/aro_socks", "predicate": { "malum:item_skin": 2.0 - }, - "model": "malum:item/aro_socks" + } }, { + "model": "malum:item/aroace_socks", "predicate": { "malum:item_skin": 3.0 - }, - "model": "malum:item/aroace_socks" + } }, { + "model": "malum:item/bi_socks", "predicate": { "malum:item_skin": 4.0 - }, - "model": "malum:item/bi_socks" + } }, { + "model": "malum:item/demiboy_socks", "predicate": { "malum:item_skin": 5.0 - }, - "model": "malum:item/demiboy_socks" + } }, { + "model": "malum:item/demigirl_socks", "predicate": { "malum:item_skin": 6.0 - }, - "model": "malum:item/demigirl_socks" + } }, { + "model": "malum:item/enby_socks", "predicate": { "malum:item_skin": 7.0 - }, - "model": "malum:item/enby_socks" + } }, { + "model": "malum:item/gay_socks", "predicate": { "malum:item_skin": 8.0 - }, - "model": "malum:item/gay_socks" + } }, { + "model": "malum:item/genderfluid_socks", "predicate": { "malum:item_skin": 9.0 - }, - "model": "malum:item/genderfluid_socks" + } }, { + "model": "malum:item/genderqueer_socks", "predicate": { "malum:item_skin": 10.0 - }, - "model": "malum:item/genderqueer_socks" + } }, { + "model": "malum:item/intersex_socks", "predicate": { "malum:item_skin": 11.0 - }, - "model": "malum:item/intersex_socks" + } }, { + "model": "malum:item/lesbian_socks", "predicate": { "malum:item_skin": 12.0 - }, - "model": "malum:item/lesbian_socks" + } }, { + "model": "malum:item/pan_socks", "predicate": { "malum:item_skin": 13.0 - }, - "model": "malum:item/pan_socks" + } }, { + "model": "malum:item/plural_socks", "predicate": { "malum:item_skin": 14.0 - }, - "model": "malum:item/plural_socks" + } }, { + "model": "malum:item/poly_socks", "predicate": { "malum:item_skin": 15.0 - }, - "model": "malum:item/poly_socks" + } }, { + "model": "malum:item/pride_socks", "predicate": { "malum:item_skin": 16.0 - }, - "model": "malum:item/pride_socks" + } }, { + "model": "malum:item/trans_socks", "predicate": { "malum:item_skin": 17.0 - }, - "model": "malum:item/trans_socks" + } }, { + "model": "malum:item/executioner_drip_boots", "predicate": { "malum:item_skin": 18.0 - }, - "model": "malum:item/executioner_drip_boots" + } }, { + "model": "malum:item/commando_drip_boots", "predicate": { "malum:item_skin": 19.0 - }, - "model": "malum:item/commando_drip_boots" + } }, { + "model": "malum:item/ultrakill_v1_boots", "predicate": { "malum:item_skin": 20.0 - }, - "model": "malum:item/ultrakill_v1_boots" + } }, { + "model": "malum:item/ultrakill_v2_boots", "predicate": { "malum:item_skin": 21.0 - }, - "model": "malum:item/ultrakill_v2_boots" + } }, { + "model": "malum:item/ancient_cloth_boots", "predicate": { "malum:item_skin": 22.0 - }, - "model": "malum:item/ancient_cloth_boots" + } }, { + "model": "malum:item/ancient_metal_boots", "predicate": { "malum:item_skin": 23.0 - }, - "model": "malum:item/ancient_metal_boots" + } } - ] + ], + "textures": { + "layer0": "malum:item/soul_hunter_boots" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/item/soul_hunter_cloak.json b/src/generated/resources/assets/malum/models/item/soul_hunter_cloak.json index 739bde8f6..306480bd4 100644 --- a/src/generated/resources/assets/malum/models/item/soul_hunter_cloak.json +++ b/src/generated/resources/assets/malum/models/item/soul_hunter_cloak.json @@ -1,152 +1,152 @@ { "parent": "minecraft:item/generated", - "textures": { - "layer0": "malum:item/soul_hunter_cloak" - }, "overrides": [ { + "model": "malum:item/ace_beanie", "predicate": { "malum:item_skin": 0.0 - }, - "model": "malum:item/ace_beanie" + } }, { + "model": "malum:item/agender_beanie", "predicate": { "malum:item_skin": 1.0 - }, - "model": "malum:item/agender_beanie" + } }, { + "model": "malum:item/aro_beanie", "predicate": { "malum:item_skin": 2.0 - }, - "model": "malum:item/aro_beanie" + } }, { + "model": "malum:item/aroace_beanie", "predicate": { "malum:item_skin": 3.0 - }, - "model": "malum:item/aroace_beanie" + } }, { + "model": "malum:item/bi_beanie", "predicate": { "malum:item_skin": 4.0 - }, - "model": "malum:item/bi_beanie" + } }, { + "model": "malum:item/demiboy_beanie", "predicate": { "malum:item_skin": 5.0 - }, - "model": "malum:item/demiboy_beanie" + } }, { + "model": "malum:item/demigirl_beanie", "predicate": { "malum:item_skin": 6.0 - }, - "model": "malum:item/demigirl_beanie" + } }, { + "model": "malum:item/enby_beanie", "predicate": { "malum:item_skin": 7.0 - }, - "model": "malum:item/enby_beanie" + } }, { + "model": "malum:item/gay_beanie", "predicate": { "malum:item_skin": 8.0 - }, - "model": "malum:item/gay_beanie" + } }, { + "model": "malum:item/genderfluid_beanie", "predicate": { "malum:item_skin": 9.0 - }, - "model": "malum:item/genderfluid_beanie" + } }, { + "model": "malum:item/genderqueer_beanie", "predicate": { "malum:item_skin": 10.0 - }, - "model": "malum:item/genderqueer_beanie" + } }, { + "model": "malum:item/intersex_beanie", "predicate": { "malum:item_skin": 11.0 - }, - "model": "malum:item/intersex_beanie" + } }, { + "model": "malum:item/lesbian_beanie", "predicate": { "malum:item_skin": 12.0 - }, - "model": "malum:item/lesbian_beanie" + } }, { + "model": "malum:item/pan_beanie", "predicate": { "malum:item_skin": 13.0 - }, - "model": "malum:item/pan_beanie" + } }, { + "model": "malum:item/plural_beanie", "predicate": { "malum:item_skin": 14.0 - }, - "model": "malum:item/plural_beanie" + } }, { + "model": "malum:item/poly_beanie", "predicate": { "malum:item_skin": 15.0 - }, - "model": "malum:item/poly_beanie" + } }, { + "model": "malum:item/pride_beanie", "predicate": { "malum:item_skin": 16.0 - }, - "model": "malum:item/pride_beanie" + } }, { + "model": "malum:item/trans_beanie", "predicate": { "malum:item_skin": 17.0 - }, - "model": "malum:item/trans_beanie" + } }, { + "model": "malum:item/executioner_drip_visor", "predicate": { "malum:item_skin": 18.0 - }, - "model": "malum:item/executioner_drip_visor" + } }, { + "model": "malum:item/commando_drip_visor", "predicate": { "malum:item_skin": 19.0 - }, - "model": "malum:item/commando_drip_visor" + } }, { + "model": "malum:item/ultrakill_v1_visor", "predicate": { "malum:item_skin": 20.0 - }, - "model": "malum:item/ultrakill_v1_visor" + } }, { + "model": "malum:item/ultrakill_v2_visor", "predicate": { "malum:item_skin": 21.0 - }, - "model": "malum:item/ultrakill_v2_visor" + } }, { + "model": "malum:item/ancient_cloth_cloak", "predicate": { "malum:item_skin": 22.0 - }, - "model": "malum:item/ancient_cloth_cloak" + } }, { + "model": "malum:item/ancient_metal_helmet", "predicate": { "malum:item_skin": 23.0 - }, - "model": "malum:item/ancient_metal_helmet" + } } - ] + ], + "textures": { + "layer0": "malum:item/soul_hunter_cloak" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/item/soul_hunter_leggings.json b/src/generated/resources/assets/malum/models/item/soul_hunter_leggings.json index 7b5ab6085..127815664 100644 --- a/src/generated/resources/assets/malum/models/item/soul_hunter_leggings.json +++ b/src/generated/resources/assets/malum/models/item/soul_hunter_leggings.json @@ -1,152 +1,152 @@ { "parent": "minecraft:item/generated", - "textures": { - "layer0": "malum:item/soul_hunter_leggings" - }, "overrides": [ { + "model": "malum:item/ace_shorts", "predicate": { "malum:item_skin": 0.0 - }, - "model": "malum:item/ace_shorts" + } }, { + "model": "malum:item/agender_shorts", "predicate": { "malum:item_skin": 1.0 - }, - "model": "malum:item/agender_shorts" + } }, { + "model": "malum:item/aro_shorts", "predicate": { "malum:item_skin": 2.0 - }, - "model": "malum:item/aro_shorts" + } }, { + "model": "malum:item/aroace_shorts", "predicate": { "malum:item_skin": 3.0 - }, - "model": "malum:item/aroace_shorts" + } }, { + "model": "malum:item/bi_shorts", "predicate": { "malum:item_skin": 4.0 - }, - "model": "malum:item/bi_shorts" + } }, { + "model": "malum:item/demiboy_shorts", "predicate": { "malum:item_skin": 5.0 - }, - "model": "malum:item/demiboy_shorts" + } }, { + "model": "malum:item/demigirl_shorts", "predicate": { "malum:item_skin": 6.0 - }, - "model": "malum:item/demigirl_shorts" + } }, { + "model": "malum:item/enby_shorts", "predicate": { "malum:item_skin": 7.0 - }, - "model": "malum:item/enby_shorts" + } }, { + "model": "malum:item/gay_shorts", "predicate": { "malum:item_skin": 8.0 - }, - "model": "malum:item/gay_shorts" + } }, { + "model": "malum:item/genderfluid_shorts", "predicate": { "malum:item_skin": 9.0 - }, - "model": "malum:item/genderfluid_shorts" + } }, { + "model": "malum:item/genderqueer_shorts", "predicate": { "malum:item_skin": 10.0 - }, - "model": "malum:item/genderqueer_shorts" + } }, { + "model": "malum:item/intersex_shorts", "predicate": { "malum:item_skin": 11.0 - }, - "model": "malum:item/intersex_shorts" + } }, { + "model": "malum:item/lesbian_shorts", "predicate": { "malum:item_skin": 12.0 - }, - "model": "malum:item/lesbian_shorts" + } }, { + "model": "malum:item/pan_shorts", "predicate": { "malum:item_skin": 13.0 - }, - "model": "malum:item/pan_shorts" + } }, { + "model": "malum:item/plural_shorts", "predicate": { "malum:item_skin": 14.0 - }, - "model": "malum:item/plural_shorts" + } }, { + "model": "malum:item/poly_shorts", "predicate": { "malum:item_skin": 15.0 - }, - "model": "malum:item/poly_shorts" + } }, { + "model": "malum:item/pride_shorts", "predicate": { "malum:item_skin": 16.0 - }, - "model": "malum:item/pride_shorts" + } }, { + "model": "malum:item/trans_shorts", "predicate": { "malum:item_skin": 17.0 - }, - "model": "malum:item/trans_shorts" + } }, { + "model": "malum:item/executioner_drip_leggings", "predicate": { "malum:item_skin": 18.0 - }, - "model": "malum:item/executioner_drip_leggings" + } }, { + "model": "malum:item/commando_drip_leggings", "predicate": { "malum:item_skin": 19.0 - }, - "model": "malum:item/commando_drip_leggings" + } }, { + "model": "malum:item/ultrakill_v1_leggings", "predicate": { "malum:item_skin": 20.0 - }, - "model": "malum:item/ultrakill_v1_leggings" + } }, { + "model": "malum:item/ultrakill_v2_leggings", "predicate": { "malum:item_skin": 21.0 - }, - "model": "malum:item/ultrakill_v2_leggings" + } }, { + "model": "malum:item/ancient_cloth_leggings", "predicate": { "malum:item_skin": 22.0 - }, - "model": "malum:item/ancient_cloth_leggings" + } }, { + "model": "malum:item/ancient_metal_leggings", "predicate": { "malum:item_skin": 23.0 - }, - "model": "malum:item/ancient_metal_leggings" + } } - ] + ], + "textures": { + "layer0": "malum:item/soul_hunter_leggings" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/item/soul_hunter_robe.json b/src/generated/resources/assets/malum/models/item/soul_hunter_robe.json index ea7572a8b..19ea992a2 100644 --- a/src/generated/resources/assets/malum/models/item/soul_hunter_robe.json +++ b/src/generated/resources/assets/malum/models/item/soul_hunter_robe.json @@ -1,152 +1,152 @@ { "parent": "minecraft:item/generated", - "textures": { - "layer0": "malum:item/soul_hunter_robe" - }, "overrides": [ { + "model": "malum:item/ace_hoodie", "predicate": { "malum:item_skin": 0.0 - }, - "model": "malum:item/ace_hoodie" + } }, { + "model": "malum:item/agender_hoodie", "predicate": { "malum:item_skin": 1.0 - }, - "model": "malum:item/agender_hoodie" + } }, { + "model": "malum:item/aro_hoodie", "predicate": { "malum:item_skin": 2.0 - }, - "model": "malum:item/aro_hoodie" + } }, { + "model": "malum:item/aroace_hoodie", "predicate": { "malum:item_skin": 3.0 - }, - "model": "malum:item/aroace_hoodie" + } }, { + "model": "malum:item/bi_hoodie", "predicate": { "malum:item_skin": 4.0 - }, - "model": "malum:item/bi_hoodie" + } }, { + "model": "malum:item/demiboy_hoodie", "predicate": { "malum:item_skin": 5.0 - }, - "model": "malum:item/demiboy_hoodie" + } }, { + "model": "malum:item/demigirl_hoodie", "predicate": { "malum:item_skin": 6.0 - }, - "model": "malum:item/demigirl_hoodie" + } }, { + "model": "malum:item/enby_hoodie", "predicate": { "malum:item_skin": 7.0 - }, - "model": "malum:item/enby_hoodie" + } }, { + "model": "malum:item/gay_hoodie", "predicate": { "malum:item_skin": 8.0 - }, - "model": "malum:item/gay_hoodie" + } }, { + "model": "malum:item/genderfluid_hoodie", "predicate": { "malum:item_skin": 9.0 - }, - "model": "malum:item/genderfluid_hoodie" + } }, { + "model": "malum:item/genderqueer_hoodie", "predicate": { "malum:item_skin": 10.0 - }, - "model": "malum:item/genderqueer_hoodie" + } }, { + "model": "malum:item/intersex_hoodie", "predicate": { "malum:item_skin": 11.0 - }, - "model": "malum:item/intersex_hoodie" + } }, { + "model": "malum:item/lesbian_hoodie", "predicate": { "malum:item_skin": 12.0 - }, - "model": "malum:item/lesbian_hoodie" + } }, { + "model": "malum:item/pan_hoodie", "predicate": { "malum:item_skin": 13.0 - }, - "model": "malum:item/pan_hoodie" + } }, { + "model": "malum:item/plural_hoodie", "predicate": { "malum:item_skin": 14.0 - }, - "model": "malum:item/plural_hoodie" + } }, { + "model": "malum:item/poly_hoodie", "predicate": { "malum:item_skin": 15.0 - }, - "model": "malum:item/poly_hoodie" + } }, { + "model": "malum:item/pride_hoodie", "predicate": { "malum:item_skin": 16.0 - }, - "model": "malum:item/pride_hoodie" + } }, { + "model": "malum:item/trans_hoodie", "predicate": { "malum:item_skin": 17.0 - }, - "model": "malum:item/trans_hoodie" + } }, { + "model": "malum:item/executioner_drip_chestplate", "predicate": { "malum:item_skin": 18.0 - }, - "model": "malum:item/executioner_drip_chestplate" + } }, { + "model": "malum:item/commando_drip_chestplate", "predicate": { "malum:item_skin": 19.0 - }, - "model": "malum:item/commando_drip_chestplate" + } }, { + "model": "malum:item/ultrakill_v1_chestplate", "predicate": { "malum:item_skin": 20.0 - }, - "model": "malum:item/ultrakill_v1_chestplate" + } }, { + "model": "malum:item/ultrakill_v2_chestplate", "predicate": { "malum:item_skin": 21.0 - }, - "model": "malum:item/ultrakill_v2_chestplate" + } }, { + "model": "malum:item/ancient_cloth_robe", "predicate": { "malum:item_skin": 22.0 - }, - "model": "malum:item/ancient_cloth_robe" + } }, { + "model": "malum:item/ancient_metal_chestplate", "predicate": { "malum:item_skin": 23.0 - }, - "model": "malum:item/ancient_metal_chestplate" + } } - ] + ], + "textures": { + "layer0": "malum:item/soul_hunter_robe" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/item/soul_stained_steel_boots.json b/src/generated/resources/assets/malum/models/item/soul_stained_steel_boots.json index e51a49003..2fa7e9b9a 100644 --- a/src/generated/resources/assets/malum/models/item/soul_stained_steel_boots.json +++ b/src/generated/resources/assets/malum/models/item/soul_stained_steel_boots.json @@ -1,152 +1,152 @@ { "parent": "minecraft:item/generated", - "textures": { - "layer0": "malum:item/soul_stained_steel_boots" - }, "overrides": [ { + "model": "malum:item/ace_socks", "predicate": { "malum:item_skin": 0.0 - }, - "model": "malum:item/ace_socks" + } }, { + "model": "malum:item/agender_socks", "predicate": { "malum:item_skin": 1.0 - }, - "model": "malum:item/agender_socks" + } }, { + "model": "malum:item/aro_socks", "predicate": { "malum:item_skin": 2.0 - }, - "model": "malum:item/aro_socks" + } }, { + "model": "malum:item/aroace_socks", "predicate": { "malum:item_skin": 3.0 - }, - "model": "malum:item/aroace_socks" + } }, { + "model": "malum:item/bi_socks", "predicate": { "malum:item_skin": 4.0 - }, - "model": "malum:item/bi_socks" + } }, { + "model": "malum:item/demiboy_socks", "predicate": { "malum:item_skin": 5.0 - }, - "model": "malum:item/demiboy_socks" + } }, { + "model": "malum:item/demigirl_socks", "predicate": { "malum:item_skin": 6.0 - }, - "model": "malum:item/demigirl_socks" + } }, { + "model": "malum:item/enby_socks", "predicate": { "malum:item_skin": 7.0 - }, - "model": "malum:item/enby_socks" + } }, { + "model": "malum:item/gay_socks", "predicate": { "malum:item_skin": 8.0 - }, - "model": "malum:item/gay_socks" + } }, { + "model": "malum:item/genderfluid_socks", "predicate": { "malum:item_skin": 9.0 - }, - "model": "malum:item/genderfluid_socks" + } }, { + "model": "malum:item/genderqueer_socks", "predicate": { "malum:item_skin": 10.0 - }, - "model": "malum:item/genderqueer_socks" + } }, { + "model": "malum:item/intersex_socks", "predicate": { "malum:item_skin": 11.0 - }, - "model": "malum:item/intersex_socks" + } }, { + "model": "malum:item/lesbian_socks", "predicate": { "malum:item_skin": 12.0 - }, - "model": "malum:item/lesbian_socks" + } }, { + "model": "malum:item/pan_socks", "predicate": { "malum:item_skin": 13.0 - }, - "model": "malum:item/pan_socks" + } }, { + "model": "malum:item/plural_socks", "predicate": { "malum:item_skin": 14.0 - }, - "model": "malum:item/plural_socks" + } }, { + "model": "malum:item/poly_socks", "predicate": { "malum:item_skin": 15.0 - }, - "model": "malum:item/poly_socks" + } }, { + "model": "malum:item/pride_socks", "predicate": { "malum:item_skin": 16.0 - }, - "model": "malum:item/pride_socks" + } }, { + "model": "malum:item/trans_socks", "predicate": { "malum:item_skin": 17.0 - }, - "model": "malum:item/trans_socks" + } }, { + "model": "malum:item/executioner_drip_boots", "predicate": { "malum:item_skin": 18.0 - }, - "model": "malum:item/executioner_drip_boots" + } }, { + "model": "malum:item/commando_drip_boots", "predicate": { "malum:item_skin": 19.0 - }, - "model": "malum:item/commando_drip_boots" + } }, { + "model": "malum:item/ultrakill_v1_boots", "predicate": { "malum:item_skin": 20.0 - }, - "model": "malum:item/ultrakill_v1_boots" + } }, { + "model": "malum:item/ultrakill_v2_boots", "predicate": { "malum:item_skin": 21.0 - }, - "model": "malum:item/ultrakill_v2_boots" + } }, { + "model": "malum:item/ancient_cloth_boots", "predicate": { "malum:item_skin": 22.0 - }, - "model": "malum:item/ancient_cloth_boots" + } }, { + "model": "malum:item/ancient_metal_boots", "predicate": { "malum:item_skin": 23.0 - }, - "model": "malum:item/ancient_metal_boots" + } } - ] + ], + "textures": { + "layer0": "malum:item/soul_stained_steel_boots" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/item/soul_stained_steel_chestplate.json b/src/generated/resources/assets/malum/models/item/soul_stained_steel_chestplate.json index da27ba4bc..21fbb2343 100644 --- a/src/generated/resources/assets/malum/models/item/soul_stained_steel_chestplate.json +++ b/src/generated/resources/assets/malum/models/item/soul_stained_steel_chestplate.json @@ -1,152 +1,152 @@ { "parent": "minecraft:item/generated", - "textures": { - "layer0": "malum:item/soul_stained_steel_chestplate" - }, "overrides": [ { + "model": "malum:item/ace_hoodie", "predicate": { "malum:item_skin": 0.0 - }, - "model": "malum:item/ace_hoodie" + } }, { + "model": "malum:item/agender_hoodie", "predicate": { "malum:item_skin": 1.0 - }, - "model": "malum:item/agender_hoodie" + } }, { + "model": "malum:item/aro_hoodie", "predicate": { "malum:item_skin": 2.0 - }, - "model": "malum:item/aro_hoodie" + } }, { + "model": "malum:item/aroace_hoodie", "predicate": { "malum:item_skin": 3.0 - }, - "model": "malum:item/aroace_hoodie" + } }, { + "model": "malum:item/bi_hoodie", "predicate": { "malum:item_skin": 4.0 - }, - "model": "malum:item/bi_hoodie" + } }, { + "model": "malum:item/demiboy_hoodie", "predicate": { "malum:item_skin": 5.0 - }, - "model": "malum:item/demiboy_hoodie" + } }, { + "model": "malum:item/demigirl_hoodie", "predicate": { "malum:item_skin": 6.0 - }, - "model": "malum:item/demigirl_hoodie" + } }, { + "model": "malum:item/enby_hoodie", "predicate": { "malum:item_skin": 7.0 - }, - "model": "malum:item/enby_hoodie" + } }, { + "model": "malum:item/gay_hoodie", "predicate": { "malum:item_skin": 8.0 - }, - "model": "malum:item/gay_hoodie" + } }, { + "model": "malum:item/genderfluid_hoodie", "predicate": { "malum:item_skin": 9.0 - }, - "model": "malum:item/genderfluid_hoodie" + } }, { + "model": "malum:item/genderqueer_hoodie", "predicate": { "malum:item_skin": 10.0 - }, - "model": "malum:item/genderqueer_hoodie" + } }, { + "model": "malum:item/intersex_hoodie", "predicate": { "malum:item_skin": 11.0 - }, - "model": "malum:item/intersex_hoodie" + } }, { + "model": "malum:item/lesbian_hoodie", "predicate": { "malum:item_skin": 12.0 - }, - "model": "malum:item/lesbian_hoodie" + } }, { + "model": "malum:item/pan_hoodie", "predicate": { "malum:item_skin": 13.0 - }, - "model": "malum:item/pan_hoodie" + } }, { + "model": "malum:item/plural_hoodie", "predicate": { "malum:item_skin": 14.0 - }, - "model": "malum:item/plural_hoodie" + } }, { + "model": "malum:item/poly_hoodie", "predicate": { "malum:item_skin": 15.0 - }, - "model": "malum:item/poly_hoodie" + } }, { + "model": "malum:item/pride_hoodie", "predicate": { "malum:item_skin": 16.0 - }, - "model": "malum:item/pride_hoodie" + } }, { + "model": "malum:item/trans_hoodie", "predicate": { "malum:item_skin": 17.0 - }, - "model": "malum:item/trans_hoodie" + } }, { + "model": "malum:item/executioner_drip_chestplate", "predicate": { "malum:item_skin": 18.0 - }, - "model": "malum:item/executioner_drip_chestplate" + } }, { + "model": "malum:item/commando_drip_chestplate", "predicate": { "malum:item_skin": 19.0 - }, - "model": "malum:item/commando_drip_chestplate" + } }, { + "model": "malum:item/ultrakill_v1_chestplate", "predicate": { "malum:item_skin": 20.0 - }, - "model": "malum:item/ultrakill_v1_chestplate" + } }, { + "model": "malum:item/ultrakill_v2_chestplate", "predicate": { "malum:item_skin": 21.0 - }, - "model": "malum:item/ultrakill_v2_chestplate" + } }, { + "model": "malum:item/ancient_cloth_robe", "predicate": { "malum:item_skin": 22.0 - }, - "model": "malum:item/ancient_cloth_robe" + } }, { + "model": "malum:item/ancient_metal_chestplate", "predicate": { "malum:item_skin": 23.0 - }, - "model": "malum:item/ancient_metal_chestplate" + } } - ] + ], + "textures": { + "layer0": "malum:item/soul_stained_steel_chestplate" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/item/soul_stained_steel_helmet.json b/src/generated/resources/assets/malum/models/item/soul_stained_steel_helmet.json index 8d233b2ce..510abb85a 100644 --- a/src/generated/resources/assets/malum/models/item/soul_stained_steel_helmet.json +++ b/src/generated/resources/assets/malum/models/item/soul_stained_steel_helmet.json @@ -1,152 +1,152 @@ { "parent": "minecraft:item/generated", - "textures": { - "layer0": "malum:item/soul_stained_steel_helmet" - }, "overrides": [ { + "model": "malum:item/ace_beanie", "predicate": { "malum:item_skin": 0.0 - }, - "model": "malum:item/ace_beanie" + } }, { + "model": "malum:item/agender_beanie", "predicate": { "malum:item_skin": 1.0 - }, - "model": "malum:item/agender_beanie" + } }, { + "model": "malum:item/aro_beanie", "predicate": { "malum:item_skin": 2.0 - }, - "model": "malum:item/aro_beanie" + } }, { + "model": "malum:item/aroace_beanie", "predicate": { "malum:item_skin": 3.0 - }, - "model": "malum:item/aroace_beanie" + } }, { + "model": "malum:item/bi_beanie", "predicate": { "malum:item_skin": 4.0 - }, - "model": "malum:item/bi_beanie" + } }, { + "model": "malum:item/demiboy_beanie", "predicate": { "malum:item_skin": 5.0 - }, - "model": "malum:item/demiboy_beanie" + } }, { + "model": "malum:item/demigirl_beanie", "predicate": { "malum:item_skin": 6.0 - }, - "model": "malum:item/demigirl_beanie" + } }, { + "model": "malum:item/enby_beanie", "predicate": { "malum:item_skin": 7.0 - }, - "model": "malum:item/enby_beanie" + } }, { + "model": "malum:item/gay_beanie", "predicate": { "malum:item_skin": 8.0 - }, - "model": "malum:item/gay_beanie" + } }, { + "model": "malum:item/genderfluid_beanie", "predicate": { "malum:item_skin": 9.0 - }, - "model": "malum:item/genderfluid_beanie" + } }, { + "model": "malum:item/genderqueer_beanie", "predicate": { "malum:item_skin": 10.0 - }, - "model": "malum:item/genderqueer_beanie" + } }, { + "model": "malum:item/intersex_beanie", "predicate": { "malum:item_skin": 11.0 - }, - "model": "malum:item/intersex_beanie" + } }, { + "model": "malum:item/lesbian_beanie", "predicate": { "malum:item_skin": 12.0 - }, - "model": "malum:item/lesbian_beanie" + } }, { + "model": "malum:item/pan_beanie", "predicate": { "malum:item_skin": 13.0 - }, - "model": "malum:item/pan_beanie" + } }, { + "model": "malum:item/plural_beanie", "predicate": { "malum:item_skin": 14.0 - }, - "model": "malum:item/plural_beanie" + } }, { + "model": "malum:item/poly_beanie", "predicate": { "malum:item_skin": 15.0 - }, - "model": "malum:item/poly_beanie" + } }, { + "model": "malum:item/pride_beanie", "predicate": { "malum:item_skin": 16.0 - }, - "model": "malum:item/pride_beanie" + } }, { + "model": "malum:item/trans_beanie", "predicate": { "malum:item_skin": 17.0 - }, - "model": "malum:item/trans_beanie" + } }, { + "model": "malum:item/executioner_drip_visor", "predicate": { "malum:item_skin": 18.0 - }, - "model": "malum:item/executioner_drip_visor" + } }, { + "model": "malum:item/commando_drip_visor", "predicate": { "malum:item_skin": 19.0 - }, - "model": "malum:item/commando_drip_visor" + } }, { + "model": "malum:item/ultrakill_v1_visor", "predicate": { "malum:item_skin": 20.0 - }, - "model": "malum:item/ultrakill_v1_visor" + } }, { + "model": "malum:item/ultrakill_v2_visor", "predicate": { "malum:item_skin": 21.0 - }, - "model": "malum:item/ultrakill_v2_visor" + } }, { + "model": "malum:item/ancient_cloth_cloak", "predicate": { "malum:item_skin": 22.0 - }, - "model": "malum:item/ancient_cloth_cloak" + } }, { + "model": "malum:item/ancient_metal_helmet", "predicate": { "malum:item_skin": 23.0 - }, - "model": "malum:item/ancient_metal_helmet" + } } - ] + ], + "textures": { + "layer0": "malum:item/soul_stained_steel_helmet" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/malum/models/item/soul_stained_steel_leggings.json b/src/generated/resources/assets/malum/models/item/soul_stained_steel_leggings.json index a25eef0b0..cf48b0cf9 100644 --- a/src/generated/resources/assets/malum/models/item/soul_stained_steel_leggings.json +++ b/src/generated/resources/assets/malum/models/item/soul_stained_steel_leggings.json @@ -1,152 +1,152 @@ { "parent": "minecraft:item/generated", - "textures": { - "layer0": "malum:item/soul_stained_steel_leggings" - }, "overrides": [ { + "model": "malum:item/ace_shorts", "predicate": { "malum:item_skin": 0.0 - }, - "model": "malum:item/ace_shorts" + } }, { + "model": "malum:item/agender_shorts", "predicate": { "malum:item_skin": 1.0 - }, - "model": "malum:item/agender_shorts" + } }, { + "model": "malum:item/aro_shorts", "predicate": { "malum:item_skin": 2.0 - }, - "model": "malum:item/aro_shorts" + } }, { + "model": "malum:item/aroace_shorts", "predicate": { "malum:item_skin": 3.0 - }, - "model": "malum:item/aroace_shorts" + } }, { + "model": "malum:item/bi_shorts", "predicate": { "malum:item_skin": 4.0 - }, - "model": "malum:item/bi_shorts" + } }, { + "model": "malum:item/demiboy_shorts", "predicate": { "malum:item_skin": 5.0 - }, - "model": "malum:item/demiboy_shorts" + } }, { + "model": "malum:item/demigirl_shorts", "predicate": { "malum:item_skin": 6.0 - }, - "model": "malum:item/demigirl_shorts" + } }, { + "model": "malum:item/enby_shorts", "predicate": { "malum:item_skin": 7.0 - }, - "model": "malum:item/enby_shorts" + } }, { + "model": "malum:item/gay_shorts", "predicate": { "malum:item_skin": 8.0 - }, - "model": "malum:item/gay_shorts" + } }, { + "model": "malum:item/genderfluid_shorts", "predicate": { "malum:item_skin": 9.0 - }, - "model": "malum:item/genderfluid_shorts" + } }, { + "model": "malum:item/genderqueer_shorts", "predicate": { "malum:item_skin": 10.0 - }, - "model": "malum:item/genderqueer_shorts" + } }, { + "model": "malum:item/intersex_shorts", "predicate": { "malum:item_skin": 11.0 - }, - "model": "malum:item/intersex_shorts" + } }, { + "model": "malum:item/lesbian_shorts", "predicate": { "malum:item_skin": 12.0 - }, - "model": "malum:item/lesbian_shorts" + } }, { + "model": "malum:item/pan_shorts", "predicate": { "malum:item_skin": 13.0 - }, - "model": "malum:item/pan_shorts" + } }, { + "model": "malum:item/plural_shorts", "predicate": { "malum:item_skin": 14.0 - }, - "model": "malum:item/plural_shorts" + } }, { + "model": "malum:item/poly_shorts", "predicate": { "malum:item_skin": 15.0 - }, - "model": "malum:item/poly_shorts" + } }, { + "model": "malum:item/pride_shorts", "predicate": { "malum:item_skin": 16.0 - }, - "model": "malum:item/pride_shorts" + } }, { + "model": "malum:item/trans_shorts", "predicate": { "malum:item_skin": 17.0 - }, - "model": "malum:item/trans_shorts" + } }, { + "model": "malum:item/executioner_drip_leggings", "predicate": { "malum:item_skin": 18.0 - }, - "model": "malum:item/executioner_drip_leggings" + } }, { + "model": "malum:item/commando_drip_leggings", "predicate": { "malum:item_skin": 19.0 - }, - "model": "malum:item/commando_drip_leggings" + } }, { + "model": "malum:item/ultrakill_v1_leggings", "predicate": { "malum:item_skin": 20.0 - }, - "model": "malum:item/ultrakill_v1_leggings" + } }, { + "model": "malum:item/ultrakill_v2_leggings", "predicate": { "malum:item_skin": 21.0 - }, - "model": "malum:item/ultrakill_v2_leggings" + } }, { + "model": "malum:item/ancient_cloth_leggings", "predicate": { "malum:item_skin": 22.0 - }, - "model": "malum:item/ancient_cloth_leggings" + } }, { + "model": "malum:item/ancient_metal_leggings", "predicate": { "malum:item_skin": 23.0 - }, - "model": "malum:item/ancient_metal_leggings" + } } - ] + ], + "textures": { + "layer0": "malum:item/soul_stained_steel_leggings" + } } \ No newline at end of file diff --git a/src/generated/resources/data/farmersdelight/tags/blocks/heat_sources.json b/src/generated/resources/data/farmersdelight/tags/blocks/heat_sources.json deleted file mode 100644 index b80129976..000000000 --- a/src/generated/resources/data/farmersdelight/tags/blocks/heat_sources.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "malum:block_of_blazing_quartz" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/farmersdelight/tags/blocks/tray_heat_sources.json b/src/generated/resources/data/farmersdelight/tags/blocks/tray_heat_sources.json deleted file mode 100644 index 2a5c1a74d..000000000 --- a/src/generated/resources/data/farmersdelight/tags/blocks/tray_heat_sources.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "replace": false, - "values": [ - "malum:tainted_iridescent_ether_brazier", - "malum:iridescent_ether", - "malum:iridescent_ether", - "malum:twisted_iridescent_ether_brazier", - "malum:iridescent_wall_ether_torch", - "malum:wall_ether_torch", - "malum:iridescent_ether_torch", - "malum:twisted_ether_brazier", - "malum:ether", - "malum:ether", - "malum:ether_torch", - "malum:tainted_ether_brazier" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/farmersdelight/tags/items/tools/knives.json b/src/generated/resources/data/farmersdelight/tags/items/tools/knives.json deleted file mode 100644 index c4702cdb9..000000000 --- a/src/generated/resources/data/farmersdelight/tags/items/tools/knives.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "malum:soul_stained_steel_knife" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/blocks/fence_gates/wooden.json b/src/generated/resources/data/forge/tags/blocks/fence_gates/wooden.json deleted file mode 100644 index d411d0bcc..000000000 --- a/src/generated/resources/data/forge/tags/blocks/fence_gates/wooden.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "replace": false, - "values": [ - "malum:soulwood_planks_fence_gate", - "malum:runewood_planks_fence_gate" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/blocks/ores.json b/src/generated/resources/data/forge/tags/blocks/ores.json deleted file mode 100644 index 4ff667411..000000000 --- a/src/generated/resources/data/forge/tags/blocks/ores.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "replace": false, - "values": [ - "malum:blazing_quartz_ore", - "malum:soulstone_ore", - "malum:block_of_cthonic_gold", - "malum:brilliant_stone", - "malum:natural_quartz_ore", - "malum:brilliant_deepslate", - "malum:deepslate_quartz_ore", - "malum:deepslate_soulstone_ore" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks.json b/src/generated/resources/data/forge/tags/blocks/storage_blocks.json deleted file mode 100644 index c8b2c429b..000000000 --- a/src/generated/resources/data/forge/tags/blocks/storage_blocks.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "replace": false, - "values": [ - "malum:block_of_grim_talc", - "malum:block_of_astral_weave", - "malum:block_of_cursed_grit", - "malum:block_of_alchemical_calx", - "malum:mass_of_blighted_gunk", - "malum:block_of_blazing_quartz", - "malum:block_of_void_salts", - "malum:block_of_soulstone", - "malum:block_of_arcane_charcoal", - "malum:block_of_soul_stained_steel", - "malum:block_of_hallowed_gold", - "malum:block_of_rotting_essence", - "malum:block_of_hex_ash", - "malum:block_of_raw_soulstone", - "malum:block_of_brilliance" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/blocks/stripped_logs.json b/src/generated/resources/data/forge/tags/blocks/stripped_logs.json deleted file mode 100644 index b3199d588..000000000 --- a/src/generated/resources/data/forge/tags/blocks/stripped_logs.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "replace": false, - "values": [ - "malum:stripped_soulwood_log", - "malum:stripped_runewood", - "malum:stripped_runewood_log", - "malum:exposed_runewood_log", - "malum:revealed_soulwood_log", - "malum:stripped_soulwood" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/gems.json b/src/generated/resources/data/forge/tags/items/gems.json deleted file mode 100644 index 021915b04..000000000 --- a/src/generated/resources/data/forge/tags/items/gems.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "replace": false, - "values": [ - "malum:processed_soulstone", - "malum:blazing_quartz", - "malum:natural_quartz", - "malum:blazing_quartz", - "malum:cluster_of_brilliance" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/gems/quartz.json b/src/generated/resources/data/forge/tags/items/gems/quartz.json deleted file mode 100644 index 2ee6a86a8..000000000 --- a/src/generated/resources/data/forge/tags/items/gems/quartz.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "malum:natural_quartz" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/ingots.json b/src/generated/resources/data/forge/tags/items/ingots.json deleted file mode 100644 index 031cc5035..000000000 --- a/src/generated/resources/data/forge/tags/items/ingots.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "replace": false, - "values": [ - "malum:soul_stained_steel_ingot", - "malum:hallowed_gold_ingot" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/nuggets.json b/src/generated/resources/data/forge/tags/items/nuggets.json deleted file mode 100644 index 8f7f53f2f..000000000 --- a/src/generated/resources/data/forge/tags/items/nuggets.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "replace": false, - "values": [ - "malum:copper_nugget", - "malum:hallowed_gold_nugget", - "malum:soul_stained_steel_nugget" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/nuggets/copper.json b/src/generated/resources/data/forge/tags/items/nuggets/copper.json deleted file mode 100644 index 4c8bbace8..000000000 --- a/src/generated/resources/data/forge/tags/items/nuggets/copper.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "malum:copper_nugget" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/ores.json b/src/generated/resources/data/forge/tags/items/ores.json deleted file mode 100644 index 4ff667411..000000000 --- a/src/generated/resources/data/forge/tags/items/ores.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "replace": false, - "values": [ - "malum:blazing_quartz_ore", - "malum:soulstone_ore", - "malum:block_of_cthonic_gold", - "malum:brilliant_stone", - "malum:natural_quartz_ore", - "malum:brilliant_deepslate", - "malum:deepslate_quartz_ore", - "malum:deepslate_soulstone_ore" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/ores/quartz.json b/src/generated/resources/data/forge/tags/items/ores/quartz.json deleted file mode 100644 index 44114224c..000000000 --- a/src/generated/resources/data/forge/tags/items/ores/quartz.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "replace": false, - "values": [ - "malum:natural_quartz_ore", - "malum:deepslate_quartz_ore" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/slimeballs.json b/src/generated/resources/data/forge/tags/items/slimeballs.json deleted file mode 100644 index c15efd1c1..000000000 --- a/src/generated/resources/data/forge/tags/items/slimeballs.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "replace": false, - "values": [ - "malum:holy_sapball", - "malum:unholy_sapball" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks.json b/src/generated/resources/data/forge/tags/items/storage_blocks.json deleted file mode 100644 index c8b2c429b..000000000 --- a/src/generated/resources/data/forge/tags/items/storage_blocks.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "replace": false, - "values": [ - "malum:block_of_grim_talc", - "malum:block_of_astral_weave", - "malum:block_of_cursed_grit", - "malum:block_of_alchemical_calx", - "malum:mass_of_blighted_gunk", - "malum:block_of_blazing_quartz", - "malum:block_of_void_salts", - "malum:block_of_soulstone", - "malum:block_of_arcane_charcoal", - "malum:block_of_soul_stained_steel", - "malum:block_of_hallowed_gold", - "malum:block_of_rotting_essence", - "malum:block_of_hex_ash", - "malum:block_of_raw_soulstone", - "malum:block_of_brilliance" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/stripped_logs.json b/src/generated/resources/data/forge/tags/items/stripped_logs.json deleted file mode 100644 index b3199d588..000000000 --- a/src/generated/resources/data/forge/tags/items/stripped_logs.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "replace": false, - "values": [ - "malum:stripped_soulwood_log", - "malum:stripped_runewood", - "malum:stripped_runewood_log", - "malum:exposed_runewood_log", - "malum:revealed_soulwood_log", - "malum:stripped_soulwood" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/tools/knives.json b/src/generated/resources/data/forge/tags/items/tools/knives.json deleted file mode 100644 index c4702cdb9..000000000 --- a/src/generated/resources/data/forge/tags/items/tools/knives.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "malum:soul_stained_steel_knife" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/aluminum_from_node_blasting.json b/src/generated/resources/data/malum/advancements/recipes/aluminum_from_node_blasting.json index b77c7f25a..8f74ca607 100644 --- a/src/generated/resources/data/malum/advancements/recipes/aluminum_from_node_blasting.json +++ b/src/generated/resources/data/malum/advancements/recipes/aluminum_from_node_blasting.json @@ -1,19 +1,20 @@ { "advancements": [ { + "advancement": { + "criteria": {}, + "requirements": [], + "sends_telemetry_event": true + }, "conditions": [ { + "type": "forge:not", "value": { - "tag": "forge:nuggets/aluminum", - "type": "forge:tag_empty" - }, - "type": "forge:not" + "type": "forge:tag_empty", + "tag": "forge:nuggets/aluminum" + } } - ], - "advancement": { - "criteria": {}, - "requirements": [] - } + ] } ] } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/aluminum_from_node_smelting.json b/src/generated/resources/data/malum/advancements/recipes/aluminum_from_node_smelting.json index b77c7f25a..8f74ca607 100644 --- a/src/generated/resources/data/malum/advancements/recipes/aluminum_from_node_smelting.json +++ b/src/generated/resources/data/malum/advancements/recipes/aluminum_from_node_smelting.json @@ -1,19 +1,20 @@ { "advancements": [ { + "advancement": { + "criteria": {}, + "requirements": [], + "sends_telemetry_event": true + }, "conditions": [ { + "type": "forge:not", "value": { - "tag": "forge:nuggets/aluminum", - "type": "forge:tag_empty" - }, - "type": "forge:not" + "type": "forge:tag_empty", + "tag": "forge:nuggets/aluminum" + } } - ], - "advancement": { - "criteria": {}, - "requirements": [] - } + ] } ] } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/impetus_creation_aluminum.json b/src/generated/resources/data/malum/advancements/recipes/impetus_creation_aluminum.json index 1c71a92d1..0f8971862 100644 --- a/src/generated/resources/data/malum/advancements/recipes/impetus_creation_aluminum.json +++ b/src/generated/resources/data/malum/advancements/recipes/impetus_creation_aluminum.json @@ -3,11 +3,11 @@ { "conditions": [ { + "type": "forge:not", "value": { - "tag": "forge:ingots/aluminum", - "type": "forge:tag_empty" - }, - "type": "forge:not" + "type": "forge:tag_empty", + "tag": "forge:ingots/aluminum" + } } ] } diff --git a/src/generated/resources/data/malum/advancements/recipes/impetus_creation_lead.json b/src/generated/resources/data/malum/advancements/recipes/impetus_creation_lead.json index afe8ba7e0..92c18a3fa 100644 --- a/src/generated/resources/data/malum/advancements/recipes/impetus_creation_lead.json +++ b/src/generated/resources/data/malum/advancements/recipes/impetus_creation_lead.json @@ -3,11 +3,11 @@ { "conditions": [ { + "type": "forge:not", "value": { - "tag": "forge:ingots/lead", - "type": "forge:tag_empty" - }, - "type": "forge:not" + "type": "forge:tag_empty", + "tag": "forge:ingots/lead" + } } ] } diff --git a/src/generated/resources/data/malum/advancements/recipes/impetus_creation_nickel.json b/src/generated/resources/data/malum/advancements/recipes/impetus_creation_nickel.json index ded09bbe9..a09e8323e 100644 --- a/src/generated/resources/data/malum/advancements/recipes/impetus_creation_nickel.json +++ b/src/generated/resources/data/malum/advancements/recipes/impetus_creation_nickel.json @@ -3,11 +3,11 @@ { "conditions": [ { + "type": "forge:not", "value": { - "tag": "forge:ingots/nickel", - "type": "forge:tag_empty" - }, - "type": "forge:not" + "type": "forge:tag_empty", + "tag": "forge:ingots/nickel" + } } ] } diff --git a/src/generated/resources/data/malum/advancements/recipes/impetus_creation_osmium.json b/src/generated/resources/data/malum/advancements/recipes/impetus_creation_osmium.json index 44e0ba9fa..270152dbf 100644 --- a/src/generated/resources/data/malum/advancements/recipes/impetus_creation_osmium.json +++ b/src/generated/resources/data/malum/advancements/recipes/impetus_creation_osmium.json @@ -3,11 +3,11 @@ { "conditions": [ { + "type": "forge:not", "value": { - "tag": "forge:ingots/osmium", - "type": "forge:tag_empty" - }, - "type": "forge:not" + "type": "forge:tag_empty", + "tag": "forge:ingots/osmium" + } } ] } diff --git a/src/generated/resources/data/malum/advancements/recipes/impetus_creation_silver.json b/src/generated/resources/data/malum/advancements/recipes/impetus_creation_silver.json index 78db5180f..51c2137fa 100644 --- a/src/generated/resources/data/malum/advancements/recipes/impetus_creation_silver.json +++ b/src/generated/resources/data/malum/advancements/recipes/impetus_creation_silver.json @@ -3,11 +3,11 @@ { "conditions": [ { + "type": "forge:not", "value": { - "tag": "forge:ingots/silver", - "type": "forge:tag_empty" - }, - "type": "forge:not" + "type": "forge:tag_empty", + "tag": "forge:ingots/silver" + } } ] } diff --git a/src/generated/resources/data/malum/advancements/recipes/impetus_creation_tin.json b/src/generated/resources/data/malum/advancements/recipes/impetus_creation_tin.json index acc4b6662..3e6072026 100644 --- a/src/generated/resources/data/malum/advancements/recipes/impetus_creation_tin.json +++ b/src/generated/resources/data/malum/advancements/recipes/impetus_creation_tin.json @@ -3,11 +3,11 @@ { "conditions": [ { + "type": "forge:not", "value": { - "tag": "forge:ingots/tin", - "type": "forge:tag_empty" - }, - "type": "forge:not" + "type": "forge:tag_empty", + "tag": "forge:ingots/tin" + } } ] } diff --git a/src/generated/resources/data/malum/advancements/recipes/impetus_creation_uranium.json b/src/generated/resources/data/malum/advancements/recipes/impetus_creation_uranium.json index d121a1e42..8adc77cc1 100644 --- a/src/generated/resources/data/malum/advancements/recipes/impetus_creation_uranium.json +++ b/src/generated/resources/data/malum/advancements/recipes/impetus_creation_uranium.json @@ -3,11 +3,11 @@ { "conditions": [ { + "type": "forge:not", "value": { - "tag": "forge:ingots/uranium", - "type": "forge:tag_empty" - }, - "type": "forge:not" + "type": "forge:tag_empty", + "tag": "forge:ingots/uranium" + } } ] } diff --git a/src/generated/resources/data/malum/advancements/recipes/impetus_creation_zinc.json b/src/generated/resources/data/malum/advancements/recipes/impetus_creation_zinc.json index e2d2d37da..333b0a7a7 100644 --- a/src/generated/resources/data/malum/advancements/recipes/impetus_creation_zinc.json +++ b/src/generated/resources/data/malum/advancements/recipes/impetus_creation_zinc.json @@ -3,11 +3,11 @@ { "conditions": [ { + "type": "forge:not", "value": { - "tag": "forge:ingots/zinc", - "type": "forge:tag_empty" - }, - "type": "forge:not" + "type": "forge:tag_empty", + "tag": "forge:ingots/zinc" + } } ] } diff --git a/src/generated/resources/data/malum/advancements/recipes/lead_from_node_blasting.json b/src/generated/resources/data/malum/advancements/recipes/lead_from_node_blasting.json index e8b9faa95..51f652386 100644 --- a/src/generated/resources/data/malum/advancements/recipes/lead_from_node_blasting.json +++ b/src/generated/resources/data/malum/advancements/recipes/lead_from_node_blasting.json @@ -1,19 +1,20 @@ { "advancements": [ { + "advancement": { + "criteria": {}, + "requirements": [], + "sends_telemetry_event": true + }, "conditions": [ { + "type": "forge:not", "value": { - "tag": "forge:nuggets/lead", - "type": "forge:tag_empty" - }, - "type": "forge:not" + "type": "forge:tag_empty", + "tag": "forge:nuggets/lead" + } } - ], - "advancement": { - "criteria": {}, - "requirements": [] - } + ] } ] } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/lead_from_node_smelting.json b/src/generated/resources/data/malum/advancements/recipes/lead_from_node_smelting.json index e8b9faa95..51f652386 100644 --- a/src/generated/resources/data/malum/advancements/recipes/lead_from_node_smelting.json +++ b/src/generated/resources/data/malum/advancements/recipes/lead_from_node_smelting.json @@ -1,19 +1,20 @@ { "advancements": [ { + "advancement": { + "criteria": {}, + "requirements": [], + "sends_telemetry_event": true + }, "conditions": [ { + "type": "forge:not", "value": { - "tag": "forge:nuggets/lead", - "type": "forge:tag_empty" - }, - "type": "forge:not" + "type": "forge:tag_empty", + "tag": "forge:nuggets/lead" + } } - ], - "advancement": { - "criteria": {}, - "requirements": [] - } + ] } ] } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_cosmetics/ace_prideweave.json b/src/generated/resources/data/malum/advancements/recipes/misc/ace_prideweave.json similarity index 76% rename from src/generated/resources/data/malum/advancements/recipes/malum_cosmetics/ace_prideweave.json rename to src/generated/resources/data/malum/advancements/recipes/misc/ace_prideweave.json index 26e973485..42494329c 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_cosmetics/ace_prideweave.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/ace_prideweave.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:ace_prideweave" - ] - }, "criteria": { "has_spool": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:ace_prideweave" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_spool", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:ace_prideweave" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_cosmetics/agender_prideweave.json b/src/generated/resources/data/malum/advancements/recipes/misc/agender_prideweave.json similarity index 76% rename from src/generated/resources/data/malum/advancements/recipes/malum_cosmetics/agender_prideweave.json rename to src/generated/resources/data/malum/advancements/recipes/misc/agender_prideweave.json index a5f7ec13c..3d224bd2d 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_cosmetics/agender_prideweave.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/agender_prideweave.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:agender_prideweave" - ] - }, "criteria": { "has_spool": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:agender_prideweave" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_spool", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:agender_prideweave" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/alchemical_calx_from_block.json b/src/generated/resources/data/malum/advancements/recipes/misc/alchemical_calx_from_block.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/alchemical_calx_from_block.json rename to src/generated/resources/data/malum/advancements/recipes/misc/alchemical_calx_from_block.json index 1b5b7b89a..d27f6b656 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/alchemical_calx_from_block.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/alchemical_calx_from_block.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:alchemical_calx_from_block" - ] - }, "criteria": { "has_alchemical_calx": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:alchemical_calx_from_block" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_alchemical_calx", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:alchemical_calx_from_block" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_cosmetics/ancient_weave.json b/src/generated/resources/data/malum/advancements/recipes/misc/ancient_weave.json similarity index 76% rename from src/generated/resources/data/malum/advancements/recipes/malum_cosmetics/ancient_weave.json rename to src/generated/resources/data/malum/advancements/recipes/misc/ancient_weave.json index 1e1224e37..aea5b327e 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_cosmetics/ancient_weave.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/ancient_weave.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:ancient_weave" - ] - }, "criteria": { "has_spool": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:ancient_weave" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_spool", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:ancient_weave" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/arcane_charcoal_fragment.json b/src/generated/resources/data/malum/advancements/recipes/misc/arcane_charcoal_fragment.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/arcane_charcoal_fragment.json rename to src/generated/resources/data/malum/advancements/recipes/misc/arcane_charcoal_fragment.json index 70c1ae792..2dbb74bd6 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/arcane_charcoal_fragment.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/arcane_charcoal_fragment.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:arcane_charcoal_fragment" - ] - }, "criteria": { "has_arcane_charcoal": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:arcane_charcoal_fragment" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_arcane_charcoal", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:arcane_charcoal_fragment" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/arcane_charcoal_from_block.json b/src/generated/resources/data/malum/advancements/recipes/misc/arcane_charcoal_from_block.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/arcane_charcoal_from_block.json rename to src/generated/resources/data/malum/advancements/recipes/misc/arcane_charcoal_from_block.json index afb6fedb2..9cc6ce7e6 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/arcane_charcoal_from_block.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/arcane_charcoal_from_block.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:arcane_charcoal_from_block" - ] - }, "criteria": { "has_arcane_charcoal": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:arcane_charcoal_from_block" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_arcane_charcoal", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:arcane_charcoal_from_block" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/arcane_charcoal_from_fragment.json b/src/generated/resources/data/malum/advancements/recipes/misc/arcane_charcoal_from_fragment.json similarity index 78% rename from src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/arcane_charcoal_from_fragment.json rename to src/generated/resources/data/malum/advancements/recipes/misc/arcane_charcoal_from_fragment.json index c0c4d1f57..4825d3637 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/arcane_charcoal_from_fragment.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/arcane_charcoal_from_fragment.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:arcane_charcoal_from_fragment" - ] - }, "criteria": { "has_arcane_charcoal": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:arcane_charcoal_from_fragment" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_arcane_charcoal", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:arcane_charcoal_from_fragment" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/arcane_charcoal_from_runewood.json b/src/generated/resources/data/malum/advancements/recipes/misc/arcane_charcoal_from_runewood.json similarity index 76% rename from src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/arcane_charcoal_from_runewood.json rename to src/generated/resources/data/malum/advancements/recipes/misc/arcane_charcoal_from_runewood.json index 2253c2cca..e75dea841 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/arcane_charcoal_from_runewood.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/arcane_charcoal_from_runewood.json @@ -1,26 +1,21 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:arcane_charcoal_from_runewood" - ] - }, "criteria": { "has_runewood_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { "tag": "malum:runewood_logs" } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:arcane_charcoal_from_runewood" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -28,5 +23,11 @@ "has_runewood_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:arcane_charcoal_from_runewood" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/arcane_charcoal_from_soulwood.json b/src/generated/resources/data/malum/advancements/recipes/misc/arcane_charcoal_from_soulwood.json similarity index 76% rename from src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/arcane_charcoal_from_soulwood.json rename to src/generated/resources/data/malum/advancements/recipes/misc/arcane_charcoal_from_soulwood.json index 9006b3a1d..6844ad026 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/arcane_charcoal_from_soulwood.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/arcane_charcoal_from_soulwood.json @@ -1,26 +1,21 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:arcane_charcoal_from_soulwood" - ] - }, "criteria": { "has_soulwood_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { "tag": "malum:soulwood_logs" } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:arcane_charcoal_from_soulwood" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -28,5 +23,11 @@ "has_soulwood_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:arcane_charcoal_from_soulwood" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_cosmetics/aro_prideweave.json b/src/generated/resources/data/malum/advancements/recipes/misc/aro_prideweave.json similarity index 76% rename from src/generated/resources/data/malum/advancements/recipes/malum_cosmetics/aro_prideweave.json rename to src/generated/resources/data/malum/advancements/recipes/misc/aro_prideweave.json index 0b8e045a3..ccebd4964 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_cosmetics/aro_prideweave.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/aro_prideweave.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:aro_prideweave" - ] - }, "criteria": { "has_spool": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:aro_prideweave" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_spool", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:aro_prideweave" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_cosmetics/aroace_prideweave.json b/src/generated/resources/data/malum/advancements/recipes/misc/aroace_prideweave.json similarity index 76% rename from src/generated/resources/data/malum/advancements/recipes/malum_cosmetics/aroace_prideweave.json rename to src/generated/resources/data/malum/advancements/recipes/misc/aroace_prideweave.json index 05faa6015..1457710d0 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_cosmetics/aroace_prideweave.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/aroace_prideweave.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:aroace_prideweave" - ] - }, "criteria": { "has_spool": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:aroace_prideweave" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_spool", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:aroace_prideweave" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/astral_weave_from_block.json b/src/generated/resources/data/malum/advancements/recipes/misc/astral_weave_from_block.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/astral_weave_from_block.json rename to src/generated/resources/data/malum/advancements/recipes/misc/astral_weave_from_block.json index fcd026932..36bee723c 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/astral_weave_from_block.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/astral_weave_from_block.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:astral_weave_from_block" - ] - }, "criteria": { "has_astral_weave": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:astral_weave_from_block" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_astral_weave", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:astral_weave_from_block" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_cosmetics/bi_prideweave.json b/src/generated/resources/data/malum/advancements/recipes/misc/bi_prideweave.json similarity index 76% rename from src/generated/resources/data/malum/advancements/recipes/malum_cosmetics/bi_prideweave.json rename to src/generated/resources/data/malum/advancements/recipes/misc/bi_prideweave.json index 1f2067aa4..7180c68b1 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_cosmetics/bi_prideweave.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/bi_prideweave.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:bi_prideweave" - ] - }, "criteria": { "has_spool": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:bi_prideweave" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_spool", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:bi_prideweave" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/blazing_quartz_fragment.json b/src/generated/resources/data/malum/advancements/recipes/misc/blazing_quartz_fragment.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/blazing_quartz_fragment.json rename to src/generated/resources/data/malum/advancements/recipes/misc/blazing_quartz_fragment.json index a99ea8865..9628ff73d 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/blazing_quartz_fragment.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/blazing_quartz_fragment.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:blazing_quartz_fragment" - ] - }, "criteria": { "has_blazing_quartz": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:blazing_quartz_fragment" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_blazing_quartz", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:blazing_quartz_fragment" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/blazing_quartz_from_blasting.json b/src/generated/resources/data/malum/advancements/recipes/misc/blazing_quartz_from_blasting.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/blazing_quartz_from_blasting.json rename to src/generated/resources/data/malum/advancements/recipes/misc/blazing_quartz_from_blasting.json index ea02876b0..4cb605eff 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/blazing_quartz_from_blasting.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/blazing_quartz_from_blasting.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:blazing_quartz_from_blasting" - ] - }, "criteria": { "has_blazing_quartz": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:blazing_quartz_from_blasting" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_blazing_quartz", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:blazing_quartz_from_blasting" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/blazing_quartz_from_block.json b/src/generated/resources/data/malum/advancements/recipes/misc/blazing_quartz_from_block.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/blazing_quartz_from_block.json rename to src/generated/resources/data/malum/advancements/recipes/misc/blazing_quartz_from_block.json index 3e41b2044..c99f74efb 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/blazing_quartz_from_block.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/blazing_quartz_from_block.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:blazing_quartz_from_block" - ] - }, "criteria": { "has_blazing_quartz": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:blazing_quartz_from_block" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_blazing_quartz", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:blazing_quartz_from_block" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/blazing_quartz_from_fragment.json b/src/generated/resources/data/malum/advancements/recipes/misc/blazing_quartz_from_fragment.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/blazing_quartz_from_fragment.json rename to src/generated/resources/data/malum/advancements/recipes/misc/blazing_quartz_from_fragment.json index 60cfc62c1..092813118 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/blazing_quartz_from_fragment.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/blazing_quartz_from_fragment.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:blazing_quartz_from_fragment" - ] - }, "criteria": { "has_blazing_quartz": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:blazing_quartz_from_fragment" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_blazing_quartz", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:blazing_quartz_from_fragment" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/blazing_quartz_from_smelting.json b/src/generated/resources/data/malum/advancements/recipes/misc/blazing_quartz_from_smelting.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/blazing_quartz_from_smelting.json rename to src/generated/resources/data/malum/advancements/recipes/misc/blazing_quartz_from_smelting.json index cb8fb7c0f..c66c53de8 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/blazing_quartz_from_smelting.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/blazing_quartz_from_smelting.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:blazing_quartz_from_smelting" - ] - }, "criteria": { "has_blazing_quartz": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:blazing_quartz_from_smelting" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_blazing_quartz", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:blazing_quartz_from_smelting" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/decorations/blazing_torch.json b/src/generated/resources/data/malum/advancements/recipes/misc/blazing_torch.json similarity index 76% rename from src/generated/resources/data/malum/advancements/recipes/decorations/blazing_torch.json rename to src/generated/resources/data/malum/advancements/recipes/misc/blazing_torch.json index 42c69d0b4..2b3995a26 100644 --- a/src/generated/resources/data/malum/advancements/recipes/decorations/blazing_torch.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/blazing_torch.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:blazing_torch" - ] - }, "criteria": { "has_blazing_quartz": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:blazing_torch" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_blazing_quartz", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:blazing_torch" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/bligh.json b/src/generated/resources/data/malum/advancements/recipes/misc/bligh.json similarity index 76% rename from src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/bligh.json rename to src/generated/resources/data/malum/advancements/recipes/misc/bligh.json index 49b7e6610..95794f48c 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/bligh.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/bligh.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:bligh" - ] - }, "criteria": { "has_blighted_gunk": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:bligh" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_blighted_gunk", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:bligh" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/blighted_gunk_from_mass.json b/src/generated/resources/data/malum/advancements/recipes/misc/blighted_gunk_from_mass.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/blighted_gunk_from_mass.json rename to src/generated/resources/data/malum/advancements/recipes/misc/blighted_gunk_from_mass.json index cd4bf1aeb..f0ef9cf3b 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/blighted_gunk_from_mass.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/blighted_gunk_from_mass.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:blighted_gunk_from_mass" - ] - }, "criteria": { "has_blighted_gunk": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:blighted_gunk_from_mass" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_blighted_gunk", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:blighted_gunk_from_mass" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/block_of_alchemical_calx.json b/src/generated/resources/data/malum/advancements/recipes/misc/block_of_alchemical_calx.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/block_of_alchemical_calx.json rename to src/generated/resources/data/malum/advancements/recipes/misc/block_of_alchemical_calx.json index 7bb7ed136..ea31a1107 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/block_of_alchemical_calx.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/block_of_alchemical_calx.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:block_of_alchemical_calx" - ] - }, "criteria": { "has_alchemical_calx": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:block_of_alchemical_calx" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_alchemical_calx", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:block_of_alchemical_calx" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/block_of_arcane_charcoal.json b/src/generated/resources/data/malum/advancements/recipes/misc/block_of_arcane_charcoal.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/block_of_arcane_charcoal.json rename to src/generated/resources/data/malum/advancements/recipes/misc/block_of_arcane_charcoal.json index 500d6f5d3..25b468acb 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/block_of_arcane_charcoal.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/block_of_arcane_charcoal.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:block_of_arcane_charcoal" - ] - }, "criteria": { "has_arcane_charcoal": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:block_of_arcane_charcoal" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_arcane_charcoal", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:block_of_arcane_charcoal" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/block_of_astral_weave.json b/src/generated/resources/data/malum/advancements/recipes/misc/block_of_astral_weave.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/block_of_astral_weave.json rename to src/generated/resources/data/malum/advancements/recipes/misc/block_of_astral_weave.json index 00cc90d1a..e02c31e8b 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/block_of_astral_weave.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/block_of_astral_weave.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:block_of_astral_weave" - ] - }, "criteria": { "has_astral_weave": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:block_of_astral_weave" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_astral_weave", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:block_of_astral_weave" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/block_of_blazing_quartz.json b/src/generated/resources/data/malum/advancements/recipes/misc/block_of_blazing_quartz.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/block_of_blazing_quartz.json rename to src/generated/resources/data/malum/advancements/recipes/misc/block_of_blazing_quartz.json index 0fed9719b..a207817ca 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/block_of_blazing_quartz.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/block_of_blazing_quartz.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:block_of_blazing_quartz" - ] - }, "criteria": { "has_blazing_quartz": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:block_of_blazing_quartz" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_blazing_quartz", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:block_of_blazing_quartz" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/block_of_brilliance.json b/src/generated/resources/data/malum/advancements/recipes/misc/block_of_brilliance.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/block_of_brilliance.json rename to src/generated/resources/data/malum/advancements/recipes/misc/block_of_brilliance.json index 0a280698c..e7b774a92 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/block_of_brilliance.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/block_of_brilliance.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:block_of_brilliance" - ] - }, "criteria": { "has_brilliance": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:block_of_brilliance" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_brilliance", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:block_of_brilliance" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/block_of_cursed_grit.json b/src/generated/resources/data/malum/advancements/recipes/misc/block_of_cursed_grit.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/block_of_cursed_grit.json rename to src/generated/resources/data/malum/advancements/recipes/misc/block_of_cursed_grit.json index f90aa3e88..665f967d6 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/block_of_cursed_grit.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/block_of_cursed_grit.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:block_of_cursed_grit" - ] - }, "criteria": { "has_cursed_grit": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:block_of_cursed_grit" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_cursed_grit", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:block_of_cursed_grit" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/block_of_grim_talc.json b/src/generated/resources/data/malum/advancements/recipes/misc/block_of_grim_talc.json similarity index 76% rename from src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/block_of_grim_talc.json rename to src/generated/resources/data/malum/advancements/recipes/misc/block_of_grim_talc.json index 1ea18bd87..7aa04b340 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/block_of_grim_talc.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/block_of_grim_talc.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:block_of_grim_talc" - ] - }, "criteria": { "has_grim_talc": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:block_of_grim_talc" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_grim_talc", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:block_of_grim_talc" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/block_of_hallowed_gold.json b/src/generated/resources/data/malum/advancements/recipes/misc/block_of_hallowed_gold.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/block_of_hallowed_gold.json rename to src/generated/resources/data/malum/advancements/recipes/misc/block_of_hallowed_gold.json index dba23dc58..93ae43dbb 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/block_of_hallowed_gold.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/block_of_hallowed_gold.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:block_of_hallowed_gold" - ] - }, "criteria": { "has_hallowed_gold": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:block_of_hallowed_gold" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_hallowed_gold", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:block_of_hallowed_gold" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/block_of_hex_ash.json b/src/generated/resources/data/malum/advancements/recipes/misc/block_of_hex_ash.json similarity index 76% rename from src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/block_of_hex_ash.json rename to src/generated/resources/data/malum/advancements/recipes/misc/block_of_hex_ash.json index e80dac8f9..55c6031cb 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/block_of_hex_ash.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/block_of_hex_ash.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:block_of_hex_ash" - ] - }, "criteria": { "has_hex_ash": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:block_of_hex_ash" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_hex_ash", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:block_of_hex_ash" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/block_of_rotting_essence.json b/src/generated/resources/data/malum/advancements/recipes/misc/block_of_rotting_essence.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/block_of_rotting_essence.json rename to src/generated/resources/data/malum/advancements/recipes/misc/block_of_rotting_essence.json index 69f353924..3be33eab7 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/block_of_rotting_essence.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/block_of_rotting_essence.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:block_of_rotting_essence" - ] - }, "criteria": { "has_rotting_essence": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:block_of_rotting_essence" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_rotting_essence", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:block_of_rotting_essence" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/block_of_soul_stained_steel.json b/src/generated/resources/data/malum/advancements/recipes/misc/block_of_soul_stained_steel.json similarity index 78% rename from src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/block_of_soul_stained_steel.json rename to src/generated/resources/data/malum/advancements/recipes/misc/block_of_soul_stained_steel.json index d06807961..5461e3f93 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/block_of_soul_stained_steel.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/block_of_soul_stained_steel.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:block_of_soul_stained_steel" - ] - }, "criteria": { "has_soul_stained_steel": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:block_of_soul_stained_steel" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_soul_stained_steel", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:block_of_soul_stained_steel" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/block_of_soulstone.json b/src/generated/resources/data/malum/advancements/recipes/misc/block_of_soulstone.json similarity index 76% rename from src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/block_of_soulstone.json rename to src/generated/resources/data/malum/advancements/recipes/misc/block_of_soulstone.json index 91acf086d..0710e801d 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/block_of_soulstone.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/block_of_soulstone.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:block_of_soulstone" - ] - }, "criteria": { "has_soulstone": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:block_of_soulstone" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_soulstone", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:block_of_soulstone" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/misc/bonemeal_from_grim_talc.json b/src/generated/resources/data/malum/advancements/recipes/misc/bonemeal_from_grim_talc.json index af6902ef8..ed90c1b7c 100644 --- a/src/generated/resources/data/malum/advancements/recipes/misc/bonemeal_from_grim_talc.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/bonemeal_from_grim_talc.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:bonemeal_from_grim_talc" - ] - }, "criteria": { "has_grim_talc": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:bonemeal_from_grim_talc" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_grim_talc", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:bonemeal_from_grim_talc" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/misc/brilliance_from_blasting.json b/src/generated/resources/data/malum/advancements/recipes/misc/brilliance_from_blasting.json index aa52cb5f2..ef051f35a 100644 --- a/src/generated/resources/data/malum/advancements/recipes/misc/brilliance_from_blasting.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/brilliance_from_blasting.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:brilliance_from_blasting" - ] - }, "criteria": { "has_brilliance": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:brilliance_from_blasting" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_brilliance", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:brilliance_from_blasting" + ] + }, + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/brilliance_from_block.json b/src/generated/resources/data/malum/advancements/recipes/misc/brilliance_from_block.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/brilliance_from_block.json rename to src/generated/resources/data/malum/advancements/recipes/misc/brilliance_from_block.json index a966b5676..d0c568ad0 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/brilliance_from_block.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/brilliance_from_block.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:brilliance_from_block" - ] - }, "criteria": { "has_brilliance": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:brilliance_from_block" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_brilliance", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:brilliance_from_block" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/misc/brilliance_from_crushed_blasting.json b/src/generated/resources/data/malum/advancements/recipes/misc/brilliance_from_crushed_blasting.json index 59daeb6a4..4f80b3fd1 100644 --- a/src/generated/resources/data/malum/advancements/recipes/misc/brilliance_from_crushed_blasting.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/brilliance_from_crushed_blasting.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:brilliance_from_crushed_blasting" - ] - }, "criteria": { "has_brilliance": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:brilliance_from_crushed_blasting" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_brilliance", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:brilliance_from_crushed_blasting" + ] + }, + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/misc/brilliance_from_crushed_smelting.json b/src/generated/resources/data/malum/advancements/recipes/misc/brilliance_from_crushed_smelting.json index 7650be3e6..87ea69b57 100644 --- a/src/generated/resources/data/malum/advancements/recipes/misc/brilliance_from_crushed_smelting.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/brilliance_from_crushed_smelting.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:brilliance_from_crushed_smelting" - ] - }, "criteria": { "has_brilliance": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:brilliance_from_crushed_smelting" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_brilliance", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:brilliance_from_crushed_smelting" + ] + }, + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/misc/brilliance_from_deepslate_blasting.json b/src/generated/resources/data/malum/advancements/recipes/misc/brilliance_from_deepslate_blasting.json index 057a26ef8..a86c3d45b 100644 --- a/src/generated/resources/data/malum/advancements/recipes/misc/brilliance_from_deepslate_blasting.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/brilliance_from_deepslate_blasting.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:brilliance_from_deepslate_blasting" - ] - }, "criteria": { "has_brilliance": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:brilliance_from_deepslate_blasting" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_brilliance", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:brilliance_from_deepslate_blasting" + ] + }, + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/misc/brilliance_from_deepslate_smelting.json b/src/generated/resources/data/malum/advancements/recipes/misc/brilliance_from_deepslate_smelting.json index 3dbed7a33..3513cca7b 100644 --- a/src/generated/resources/data/malum/advancements/recipes/misc/brilliance_from_deepslate_smelting.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/brilliance_from_deepslate_smelting.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:brilliance_from_deepslate_smelting" - ] - }, "criteria": { "has_brilliance": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:brilliance_from_deepslate_smelting" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_brilliance", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:brilliance_from_deepslate_smelting" + ] + }, + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/misc/brilliance_from_raw_blasting.json b/src/generated/resources/data/malum/advancements/recipes/misc/brilliance_from_raw_blasting.json index 5c454a940..e38bb94bd 100644 --- a/src/generated/resources/data/malum/advancements/recipes/misc/brilliance_from_raw_blasting.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/brilliance_from_raw_blasting.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:brilliance_from_raw_blasting" - ] - }, "criteria": { "has_brilliance": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:brilliance_from_raw_blasting" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_brilliance", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:brilliance_from_raw_blasting" + ] + }, + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/misc/brilliance_from_raw_smelting.json b/src/generated/resources/data/malum/advancements/recipes/misc/brilliance_from_raw_smelting.json index b07702781..3b4832b5e 100644 --- a/src/generated/resources/data/malum/advancements/recipes/misc/brilliance_from_raw_smelting.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/brilliance_from_raw_smelting.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:brilliance_from_raw_smelting" - ] - }, "criteria": { "has_brilliance": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:brilliance_from_raw_smelting" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_brilliance", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:brilliance_from_raw_smelting" + ] + }, + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/misc/brilliance_from_smelting.json b/src/generated/resources/data/malum/advancements/recipes/misc/brilliance_from_smelting.json index ed1892891..76465cfda 100644 --- a/src/generated/resources/data/malum/advancements/recipes/misc/brilliance_from_smelting.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/brilliance_from_smelting.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:brilliance_from_smelting" - ] - }, "criteria": { "has_brilliance": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:brilliance_from_smelting" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_brilliance", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:brilliance_from_smelting" + ] + }, + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/misc/charcoal_fragment.json b/src/generated/resources/data/malum/advancements/recipes/misc/charcoal_fragment.json index ed826b48b..6c3c8a783 100644 --- a/src/generated/resources/data/malum/advancements/recipes/misc/charcoal_fragment.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/charcoal_fragment.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:charcoal_fragment" - ] - }, "criteria": { "has_charcoal": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:charcoal_fragment" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_charcoal", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:charcoal_fragment" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/misc/charcoal_from_fragment.json b/src/generated/resources/data/malum/advancements/recipes/misc/charcoal_from_fragment.json index 89a5550cc..0ed330c9d 100644 --- a/src/generated/resources/data/malum/advancements/recipes/misc/charcoal_from_fragment.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/charcoal_from_fragment.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:charcoal_from_fragment" - ] - }, "criteria": { "has_charcoal": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:charcoal_from_fragment" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_charcoal", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:charcoal_from_fragment" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/chiseled_tainted_rock.json b/src/generated/resources/data/malum/advancements/recipes/misc/chiseled_tainted_rock.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/chiseled_tainted_rock.json rename to src/generated/resources/data/malum/advancements/recipes/misc/chiseled_tainted_rock.json index a92f1db0b..d4feb0c2c 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/chiseled_tainted_rock.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/chiseled_tainted_rock.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:chiseled_tainted_rock" - ] - }, "criteria": { "has_tainted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:chiseled_tainted_rock" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_tainted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:chiseled_tainted_rock" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/chiseled_tainted_rock_bricks_stonecutting.json b/src/generated/resources/data/malum/advancements/recipes/misc/chiseled_tainted_rock_bricks_stonecutting.json similarity index 78% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/chiseled_tainted_rock_bricks_stonecutting.json rename to src/generated/resources/data/malum/advancements/recipes/misc/chiseled_tainted_rock_bricks_stonecutting.json index 798186265..87d4e6491 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/chiseled_tainted_rock_bricks_stonecutting.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/chiseled_tainted_rock_bricks_stonecutting.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:chiseled_tainted_rock_bricks_stonecutting" - ] - }, "criteria": { "has_tainted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:chiseled_tainted_rock_bricks_stonecutting" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_tainted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:chiseled_tainted_rock_bricks_stonecutting" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/chiseled_tainted_rock_bricks_stonecutting_alt.json b/src/generated/resources/data/malum/advancements/recipes/misc/chiseled_tainted_rock_bricks_stonecutting_alt.json similarity index 78% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/chiseled_tainted_rock_bricks_stonecutting_alt.json rename to src/generated/resources/data/malum/advancements/recipes/misc/chiseled_tainted_rock_bricks_stonecutting_alt.json index be515f3d8..9f9c582d8 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/chiseled_tainted_rock_bricks_stonecutting_alt.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/chiseled_tainted_rock_bricks_stonecutting_alt.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:chiseled_tainted_rock_bricks_stonecutting_alt" - ] - }, "criteria": { "has_tainted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:chiseled_tainted_rock_bricks_stonecutting_alt" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_tainted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:chiseled_tainted_rock_bricks_stonecutting_alt" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/chiseled_twisted_rock.json b/src/generated/resources/data/malum/advancements/recipes/misc/chiseled_twisted_rock.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/chiseled_twisted_rock.json rename to src/generated/resources/data/malum/advancements/recipes/misc/chiseled_twisted_rock.json index 8127c5f5c..59b73a669 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/chiseled_twisted_rock.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/chiseled_twisted_rock.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:chiseled_twisted_rock" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "malum:chiseled_twisted_rock" + }, + "trigger": "minecraft:recipe_unlocked" + }, "has_twisted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "malum:chiseled_twisted_rock" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_twisted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:chiseled_twisted_rock" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/chiseled_twisted_rock_bricks_stonecutting.json b/src/generated/resources/data/malum/advancements/recipes/misc/chiseled_twisted_rock_bricks_stonecutting.json similarity index 78% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/chiseled_twisted_rock_bricks_stonecutting.json rename to src/generated/resources/data/malum/advancements/recipes/misc/chiseled_twisted_rock_bricks_stonecutting.json index 21f90a1b6..0296bc210 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/chiseled_twisted_rock_bricks_stonecutting.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/chiseled_twisted_rock_bricks_stonecutting.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:chiseled_twisted_rock_bricks_stonecutting" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "malum:chiseled_twisted_rock_bricks_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + }, "has_twisted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "malum:chiseled_twisted_rock_bricks_stonecutting" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_twisted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:chiseled_twisted_rock_bricks_stonecutting" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/chiseled_twisted_rock_bricks_stonecutting_alt.json b/src/generated/resources/data/malum/advancements/recipes/misc/chiseled_twisted_rock_bricks_stonecutting_alt.json similarity index 78% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/chiseled_twisted_rock_bricks_stonecutting_alt.json rename to src/generated/resources/data/malum/advancements/recipes/misc/chiseled_twisted_rock_bricks_stonecutting_alt.json index aeffc4b0c..8735a23d9 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/chiseled_twisted_rock_bricks_stonecutting_alt.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/chiseled_twisted_rock_bricks_stonecutting_alt.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:chiseled_twisted_rock_bricks_stonecutting_alt" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "malum:chiseled_twisted_rock_bricks_stonecutting_alt" + }, + "trigger": "minecraft:recipe_unlocked" + }, "has_twisted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "malum:chiseled_twisted_rock_bricks_stonecutting_alt" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_twisted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:chiseled_twisted_rock_bricks_stonecutting_alt" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/misc/coal_fragment.json b/src/generated/resources/data/malum/advancements/recipes/misc/coal_fragment.json index 949c3439a..d06a4635d 100644 --- a/src/generated/resources/data/malum/advancements/recipes/misc/coal_fragment.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/coal_fragment.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:coal_fragment" - ] - }, "criteria": { "has_coal": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:coal_fragment" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_coal", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:coal_fragment" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/misc/coal_from_fragment.json b/src/generated/resources/data/malum/advancements/recipes/misc/coal_from_fragment.json index c35e1e3dc..8721be199 100644 --- a/src/generated/resources/data/malum/advancements/recipes/misc/coal_from_fragment.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/coal_from_fragment.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:coal_from_fragment" - ] - }, "criteria": { "has_coal": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:coal_from_fragment" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_coal", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:coal_from_fragment" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/misc/copper_from_node_blasting.json b/src/generated/resources/data/malum/advancements/recipes/misc/copper_from_node_blasting.json index dbe9c7e89..687e60a58 100644 --- a/src/generated/resources/data/malum/advancements/recipes/misc/copper_from_node_blasting.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/copper_from_node_blasting.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:copper_from_node_blasting" - ] - }, "criteria": { "has_impetus": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:copper_from_node_blasting" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_impetus", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:copper_from_node_blasting" + ] + }, + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/misc/copper_from_node_smelting.json b/src/generated/resources/data/malum/advancements/recipes/misc/copper_from_node_smelting.json index 8dd895f1f..72405acd1 100644 --- a/src/generated/resources/data/malum/advancements/recipes/misc/copper_from_node_smelting.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/copper_from_node_smelting.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:copper_from_node_smelting" - ] - }, "criteria": { "has_impetus": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:copper_from_node_smelting" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_impetus", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:copper_from_node_smelting" + ] + }, + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/misc/copper_ingot_from_nugget.json b/src/generated/resources/data/malum/advancements/recipes/misc/copper_ingot_from_nugget.json index 7a1ebb0c2..184403ae8 100644 --- a/src/generated/resources/data/malum/advancements/recipes/misc/copper_ingot_from_nugget.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/copper_ingot_from_nugget.json @@ -1,26 +1,21 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:copper_ingot_from_nugget" - ] - }, "criteria": { "has_copper": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { "tag": "forge:ingots/copper" } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:copper_ingot_from_nugget" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -28,5 +23,11 @@ "has_copper", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:copper_ingot_from_nugget" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/misc/copper_nugget_from_ingot.json b/src/generated/resources/data/malum/advancements/recipes/misc/copper_nugget_from_ingot.json index a9f8733b5..7af400480 100644 --- a/src/generated/resources/data/malum/advancements/recipes/misc/copper_nugget_from_ingot.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/copper_nugget_from_ingot.json @@ -1,26 +1,21 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:copper_nugget_from_ingot" - ] - }, "criteria": { "has_copper": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { "tag": "forge:ingots/copper" } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:copper_nugget_from_ingot" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -28,5 +23,11 @@ "has_copper", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:copper_nugget_from_ingot" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_cosmetics/cornered_weave.json b/src/generated/resources/data/malum/advancements/recipes/misc/cornered_weave.json similarity index 76% rename from src/generated/resources/data/malum/advancements/recipes/malum_cosmetics/cornered_weave.json rename to src/generated/resources/data/malum/advancements/recipes/misc/cornered_weave.json index 21f851395..86b76fee4 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_cosmetics/cornered_weave.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/cornered_weave.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:cornered_weave" - ] - }, "criteria": { "has_spool": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:cornered_weave" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_spool", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:cornered_weave" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/cracked_small_tainted_rock_bricks_slab_stonecutting.json b/src/generated/resources/data/malum/advancements/recipes/misc/cracked_small_tainted_rock_bricks_slab_stonecutting.json similarity index 79% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/cracked_small_tainted_rock_bricks_slab_stonecutting.json rename to src/generated/resources/data/malum/advancements/recipes/misc/cracked_small_tainted_rock_bricks_slab_stonecutting.json index f4cf09d41..6bfe14f92 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/cracked_small_tainted_rock_bricks_slab_stonecutting.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/cracked_small_tainted_rock_bricks_slab_stonecutting.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:cracked_small_tainted_rock_bricks_slab_stonecutting" - ] - }, "criteria": { "has_tainted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:cracked_small_tainted_rock_bricks_slab_stonecutting" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_tainted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:cracked_small_tainted_rock_bricks_slab_stonecutting" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/cracked_small_tainted_rock_bricks_smelting.json b/src/generated/resources/data/malum/advancements/recipes/misc/cracked_small_tainted_rock_bricks_smelting.json similarity index 78% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/cracked_small_tainted_rock_bricks_smelting.json rename to src/generated/resources/data/malum/advancements/recipes/misc/cracked_small_tainted_rock_bricks_smelting.json index 986ff1880..80d33eafd 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/cracked_small_tainted_rock_bricks_smelting.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/cracked_small_tainted_rock_bricks_smelting.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:cracked_small_tainted_rock_bricks_smelting" - ] - }, "criteria": { "has_tainted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:cracked_small_tainted_rock_bricks_smelting" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_tainted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:cracked_small_tainted_rock_bricks_smelting" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/cracked_small_tainted_rock_bricks_stairs_stonecutting.json b/src/generated/resources/data/malum/advancements/recipes/misc/cracked_small_tainted_rock_bricks_stairs_stonecutting.json similarity index 79% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/cracked_small_tainted_rock_bricks_stairs_stonecutting.json rename to src/generated/resources/data/malum/advancements/recipes/misc/cracked_small_tainted_rock_bricks_stairs_stonecutting.json index 03ca6f53e..6c23878cf 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/cracked_small_tainted_rock_bricks_stairs_stonecutting.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/cracked_small_tainted_rock_bricks_stairs_stonecutting.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:cracked_small_tainted_rock_bricks_stairs_stonecutting" - ] - }, "criteria": { "has_tainted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:cracked_small_tainted_rock_bricks_stairs_stonecutting" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_tainted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:cracked_small_tainted_rock_bricks_stairs_stonecutting" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/cracked_small_tainted_rock_bricks_stonecutting_alt.json b/src/generated/resources/data/malum/advancements/recipes/misc/cracked_small_tainted_rock_bricks_stonecutting_alt.json similarity index 79% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/cracked_small_tainted_rock_bricks_stonecutting_alt.json rename to src/generated/resources/data/malum/advancements/recipes/misc/cracked_small_tainted_rock_bricks_stonecutting_alt.json index cbbf596cc..9ae2460fa 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/cracked_small_tainted_rock_bricks_stonecutting_alt.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/cracked_small_tainted_rock_bricks_stonecutting_alt.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:cracked_small_tainted_rock_bricks_stonecutting_alt" - ] - }, "criteria": { "has_tainted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:cracked_small_tainted_rock_bricks_stonecutting_alt" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_tainted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:cracked_small_tainted_rock_bricks_stonecutting_alt" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/cracked_small_tainted_rock_bricks_wall_stonecutting.json b/src/generated/resources/data/malum/advancements/recipes/misc/cracked_small_tainted_rock_bricks_wall_stonecutting.json similarity index 79% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/cracked_small_tainted_rock_bricks_wall_stonecutting.json rename to src/generated/resources/data/malum/advancements/recipes/misc/cracked_small_tainted_rock_bricks_wall_stonecutting.json index 954470ffa..ebd685c22 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/cracked_small_tainted_rock_bricks_wall_stonecutting.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/cracked_small_tainted_rock_bricks_wall_stonecutting.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:cracked_small_tainted_rock_bricks_wall_stonecutting" - ] - }, "criteria": { "has_tainted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:cracked_small_tainted_rock_bricks_wall_stonecutting" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_tainted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:cracked_small_tainted_rock_bricks_wall_stonecutting" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/cracked_small_twisted_rock_bricks_slab_stonecutting.json b/src/generated/resources/data/malum/advancements/recipes/misc/cracked_small_twisted_rock_bricks_slab_stonecutting.json similarity index 79% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/cracked_small_twisted_rock_bricks_slab_stonecutting.json rename to src/generated/resources/data/malum/advancements/recipes/misc/cracked_small_twisted_rock_bricks_slab_stonecutting.json index f63627cbc..9ecef1d44 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/cracked_small_twisted_rock_bricks_slab_stonecutting.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/cracked_small_twisted_rock_bricks_slab_stonecutting.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:cracked_small_twisted_rock_bricks_slab_stonecutting" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "malum:cracked_small_twisted_rock_bricks_slab_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + }, "has_twisted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "malum:cracked_small_twisted_rock_bricks_slab_stonecutting" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_twisted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:cracked_small_twisted_rock_bricks_slab_stonecutting" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/cracked_small_twisted_rock_bricks_smelting.json b/src/generated/resources/data/malum/advancements/recipes/misc/cracked_small_twisted_rock_bricks_smelting.json similarity index 78% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/cracked_small_twisted_rock_bricks_smelting.json rename to src/generated/resources/data/malum/advancements/recipes/misc/cracked_small_twisted_rock_bricks_smelting.json index 09f986365..379e3e22d 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/cracked_small_twisted_rock_bricks_smelting.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/cracked_small_twisted_rock_bricks_smelting.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:cracked_small_twisted_rock_bricks_smelting" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "malum:cracked_small_twisted_rock_bricks_smelting" + }, + "trigger": "minecraft:recipe_unlocked" + }, "has_twisted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "malum:cracked_small_twisted_rock_bricks_smelting" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_twisted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:cracked_small_twisted_rock_bricks_smelting" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/cracked_small_twisted_rock_bricks_stairs_stonecutting.json b/src/generated/resources/data/malum/advancements/recipes/misc/cracked_small_twisted_rock_bricks_stairs_stonecutting.json similarity index 79% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/cracked_small_twisted_rock_bricks_stairs_stonecutting.json rename to src/generated/resources/data/malum/advancements/recipes/misc/cracked_small_twisted_rock_bricks_stairs_stonecutting.json index c6f7fddb8..a414fc0f7 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/cracked_small_twisted_rock_bricks_stairs_stonecutting.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/cracked_small_twisted_rock_bricks_stairs_stonecutting.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:cracked_small_twisted_rock_bricks_stairs_stonecutting" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "malum:cracked_small_twisted_rock_bricks_stairs_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + }, "has_twisted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "malum:cracked_small_twisted_rock_bricks_stairs_stonecutting" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_twisted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:cracked_small_twisted_rock_bricks_stairs_stonecutting" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/cracked_small_twisted_rock_bricks_stonecutting_alt.json b/src/generated/resources/data/malum/advancements/recipes/misc/cracked_small_twisted_rock_bricks_stonecutting_alt.json similarity index 79% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/cracked_small_twisted_rock_bricks_stonecutting_alt.json rename to src/generated/resources/data/malum/advancements/recipes/misc/cracked_small_twisted_rock_bricks_stonecutting_alt.json index 7999c95c3..1458a9849 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/cracked_small_twisted_rock_bricks_stonecutting_alt.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/cracked_small_twisted_rock_bricks_stonecutting_alt.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:cracked_small_twisted_rock_bricks_stonecutting_alt" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "malum:cracked_small_twisted_rock_bricks_stonecutting_alt" + }, + "trigger": "minecraft:recipe_unlocked" + }, "has_twisted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "malum:cracked_small_twisted_rock_bricks_stonecutting_alt" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_twisted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:cracked_small_twisted_rock_bricks_stonecutting_alt" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/cracked_small_twisted_rock_bricks_wall_stonecutting.json b/src/generated/resources/data/malum/advancements/recipes/misc/cracked_small_twisted_rock_bricks_wall_stonecutting.json similarity index 79% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/cracked_small_twisted_rock_bricks_wall_stonecutting.json rename to src/generated/resources/data/malum/advancements/recipes/misc/cracked_small_twisted_rock_bricks_wall_stonecutting.json index 3abb35f21..c96abdf00 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/cracked_small_twisted_rock_bricks_wall_stonecutting.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/cracked_small_twisted_rock_bricks_wall_stonecutting.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:cracked_small_twisted_rock_bricks_wall_stonecutting" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "malum:cracked_small_twisted_rock_bricks_wall_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + }, "has_twisted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "malum:cracked_small_twisted_rock_bricks_wall_stonecutting" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_twisted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:cracked_small_twisted_rock_bricks_wall_stonecutting" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/cracked_tainted_rock_bricks_slab_stonecutting.json b/src/generated/resources/data/malum/advancements/recipes/misc/cracked_tainted_rock_bricks_slab_stonecutting.json similarity index 80% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/cracked_tainted_rock_bricks_slab_stonecutting.json rename to src/generated/resources/data/malum/advancements/recipes/misc/cracked_tainted_rock_bricks_slab_stonecutting.json index a40e062d2..1c9effff6 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/cracked_tainted_rock_bricks_slab_stonecutting.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/cracked_tainted_rock_bricks_slab_stonecutting.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:cracked_tainted_rock_bricks_slab_stonecutting" - ] - }, "criteria": { "has_cracked_tainted_rock_bricks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:cracked_tainted_rock_bricks_slab_stonecutting" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_cracked_tainted_rock_bricks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:cracked_tainted_rock_bricks_slab_stonecutting" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/cracked_tainted_rock_bricks_stairs_stonecutting.json b/src/generated/resources/data/malum/advancements/recipes/misc/cracked_tainted_rock_bricks_stairs_stonecutting.json similarity index 80% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/cracked_tainted_rock_bricks_stairs_stonecutting.json rename to src/generated/resources/data/malum/advancements/recipes/misc/cracked_tainted_rock_bricks_stairs_stonecutting.json index 564e5247f..6226cdace 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/cracked_tainted_rock_bricks_stairs_stonecutting.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/cracked_tainted_rock_bricks_stairs_stonecutting.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:cracked_tainted_rock_bricks_stairs_stonecutting" - ] - }, "criteria": { "has_cracked_tainted_rock_bricks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:cracked_tainted_rock_bricks_stairs_stonecutting" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_cracked_tainted_rock_bricks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:cracked_tainted_rock_bricks_stairs_stonecutting" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/cracked_tainted_rock_tiles_slab_stonecutting.json b/src/generated/resources/data/malum/advancements/recipes/misc/cracked_tainted_rock_tiles_slab_stonecutting.json similarity index 79% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/cracked_tainted_rock_tiles_slab_stonecutting.json rename to src/generated/resources/data/malum/advancements/recipes/misc/cracked_tainted_rock_tiles_slab_stonecutting.json index 1708fb290..beaa56de7 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/cracked_tainted_rock_tiles_slab_stonecutting.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/cracked_tainted_rock_tiles_slab_stonecutting.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:cracked_tainted_rock_tiles_slab_stonecutting" - ] - }, "criteria": { "has_cracked_tainted_rock_tiles": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:cracked_tainted_rock_tiles_slab_stonecutting" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_cracked_tainted_rock_tiles", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:cracked_tainted_rock_tiles_slab_stonecutting" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/cracked_tainted_rock_tiles_stairs_stonecutting.json b/src/generated/resources/data/malum/advancements/recipes/misc/cracked_tainted_rock_tiles_stairs_stonecutting.json similarity index 80% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/cracked_tainted_rock_tiles_stairs_stonecutting.json rename to src/generated/resources/data/malum/advancements/recipes/misc/cracked_tainted_rock_tiles_stairs_stonecutting.json index 944b27066..7b383e0f7 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/cracked_tainted_rock_tiles_stairs_stonecutting.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/cracked_tainted_rock_tiles_stairs_stonecutting.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:cracked_tainted_rock_tiles_stairs_stonecutting" - ] - }, "criteria": { "has_cracked_tainted_rock_tiles": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:cracked_tainted_rock_tiles_stairs_stonecutting" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_cracked_tainted_rock_tiles", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:cracked_tainted_rock_tiles_stairs_stonecutting" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/cracked_tainted_rock_tiles_stonecutting.json b/src/generated/resources/data/malum/advancements/recipes/misc/cracked_tainted_rock_tiles_stonecutting.json similarity index 78% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/cracked_tainted_rock_tiles_stonecutting.json rename to src/generated/resources/data/malum/advancements/recipes/misc/cracked_tainted_rock_tiles_stonecutting.json index 15676f496..67ea43689 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/cracked_tainted_rock_tiles_stonecutting.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/cracked_tainted_rock_tiles_stonecutting.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:cracked_tainted_rock_tiles_stonecutting" - ] - }, "criteria": { "has_tainted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:cracked_tainted_rock_tiles_stonecutting" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_tainted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:cracked_tainted_rock_tiles_stonecutting" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/cracked_tainted_rock_tiles_wall_stonecutting.json b/src/generated/resources/data/malum/advancements/recipes/misc/cracked_tainted_rock_tiles_wall_stonecutting.json similarity index 78% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/cracked_tainted_rock_tiles_wall_stonecutting.json rename to src/generated/resources/data/malum/advancements/recipes/misc/cracked_tainted_rock_tiles_wall_stonecutting.json index 2c635a94a..ae05fd553 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/cracked_tainted_rock_tiles_wall_stonecutting.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/cracked_tainted_rock_tiles_wall_stonecutting.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:cracked_tainted_rock_tiles_wall_stonecutting" - ] - }, "criteria": { "has_tainted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:cracked_tainted_rock_tiles_wall_stonecutting" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_tainted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:cracked_tainted_rock_tiles_wall_stonecutting" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/cracked_twisted_rock_bricks_slab_stonecutting.json b/src/generated/resources/data/malum/advancements/recipes/misc/cracked_twisted_rock_bricks_slab_stonecutting.json similarity index 80% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/cracked_twisted_rock_bricks_slab_stonecutting.json rename to src/generated/resources/data/malum/advancements/recipes/misc/cracked_twisted_rock_bricks_slab_stonecutting.json index 87f34d8da..673118ecf 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/cracked_twisted_rock_bricks_slab_stonecutting.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/cracked_twisted_rock_bricks_slab_stonecutting.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:cracked_twisted_rock_bricks_slab_stonecutting" - ] - }, "criteria": { "has_cracked_twisted_rock_bricks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:cracked_twisted_rock_bricks_slab_stonecutting" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_cracked_twisted_rock_bricks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:cracked_twisted_rock_bricks_slab_stonecutting" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/cracked_twisted_rock_bricks_stairs_stonecutting.json b/src/generated/resources/data/malum/advancements/recipes/misc/cracked_twisted_rock_bricks_stairs_stonecutting.json similarity index 80% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/cracked_twisted_rock_bricks_stairs_stonecutting.json rename to src/generated/resources/data/malum/advancements/recipes/misc/cracked_twisted_rock_bricks_stairs_stonecutting.json index 02b6d62b9..471149a2c 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/cracked_twisted_rock_bricks_stairs_stonecutting.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/cracked_twisted_rock_bricks_stairs_stonecutting.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:cracked_twisted_rock_bricks_stairs_stonecutting" - ] - }, "criteria": { "has_cracked_twisted_rock_bricks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:cracked_twisted_rock_bricks_stairs_stonecutting" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_cracked_twisted_rock_bricks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:cracked_twisted_rock_bricks_stairs_stonecutting" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/cracked_twisted_rock_tiles_slab_stonecutting.json b/src/generated/resources/data/malum/advancements/recipes/misc/cracked_twisted_rock_tiles_slab_stonecutting.json similarity index 79% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/cracked_twisted_rock_tiles_slab_stonecutting.json rename to src/generated/resources/data/malum/advancements/recipes/misc/cracked_twisted_rock_tiles_slab_stonecutting.json index 6bd6cfaf7..1ab19b756 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/cracked_twisted_rock_tiles_slab_stonecutting.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/cracked_twisted_rock_tiles_slab_stonecutting.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:cracked_twisted_rock_tiles_slab_stonecutting" - ] - }, "criteria": { "has_cracked_twisted_rock_tiles": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:cracked_twisted_rock_tiles_slab_stonecutting" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_cracked_twisted_rock_tiles", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:cracked_twisted_rock_tiles_slab_stonecutting" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/cracked_twisted_rock_tiles_stairs_stonecutting.json b/src/generated/resources/data/malum/advancements/recipes/misc/cracked_twisted_rock_tiles_stairs_stonecutting.json similarity index 80% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/cracked_twisted_rock_tiles_stairs_stonecutting.json rename to src/generated/resources/data/malum/advancements/recipes/misc/cracked_twisted_rock_tiles_stairs_stonecutting.json index 32e1ae507..fb9dcc933 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/cracked_twisted_rock_tiles_stairs_stonecutting.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/cracked_twisted_rock_tiles_stairs_stonecutting.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:cracked_twisted_rock_tiles_stairs_stonecutting" - ] - }, "criteria": { "has_cracked_twisted_rock_tiles": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:cracked_twisted_rock_tiles_stairs_stonecutting" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_cracked_twisted_rock_tiles", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:cracked_twisted_rock_tiles_stairs_stonecutting" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/cracked_twisted_rock_tiles_stonecutting.json b/src/generated/resources/data/malum/advancements/recipes/misc/cracked_twisted_rock_tiles_stonecutting.json similarity index 78% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/cracked_twisted_rock_tiles_stonecutting.json rename to src/generated/resources/data/malum/advancements/recipes/misc/cracked_twisted_rock_tiles_stonecutting.json index cb6fa600f..462772c59 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/cracked_twisted_rock_tiles_stonecutting.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/cracked_twisted_rock_tiles_stonecutting.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:cracked_twisted_rock_tiles_stonecutting" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "malum:cracked_twisted_rock_tiles_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + }, "has_twisted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "malum:cracked_twisted_rock_tiles_stonecutting" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_twisted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:cracked_twisted_rock_tiles_stonecutting" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/cracked_twisted_rock_tiles_wall_stonecutting.json b/src/generated/resources/data/malum/advancements/recipes/misc/cracked_twisted_rock_tiles_wall_stonecutting.json similarity index 78% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/cracked_twisted_rock_tiles_wall_stonecutting.json rename to src/generated/resources/data/malum/advancements/recipes/misc/cracked_twisted_rock_tiles_wall_stonecutting.json index e2473e2a0..43bb1419f 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/cracked_twisted_rock_tiles_wall_stonecutting.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/cracked_twisted_rock_tiles_wall_stonecutting.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:cracked_twisted_rock_tiles_wall_stonecutting" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "malum:cracked_twisted_rock_tiles_wall_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + }, "has_twisted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "malum:cracked_twisted_rock_tiles_wall_stonecutting" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_twisted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:cracked_twisted_rock_tiles_wall_stonecutting" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/crude_scythe.json b/src/generated/resources/data/malum/advancements/recipes/misc/crude_scythe.json similarity index 76% rename from src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/crude_scythe.json rename to src/generated/resources/data/malum/advancements/recipes/misc/crude_scythe.json index 140d47cfe..02023d8a0 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/crude_scythe.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/crude_scythe.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:crude_scythe" - ] - }, "criteria": { "has_soulstone": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:crude_scythe" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_soulstone", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:crude_scythe" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/cthonic_gold_from_blasting.json b/src/generated/resources/data/malum/advancements/recipes/misc/cthonic_gold_from_blasting.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/cthonic_gold_from_blasting.json rename to src/generated/resources/data/malum/advancements/recipes/misc/cthonic_gold_from_blasting.json index 532f9e5b1..65802d863 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/cthonic_gold_from_blasting.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/cthonic_gold_from_blasting.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:cthonic_gold_from_blasting" - ] - }, "criteria": { "has_cthonic_gold": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:cthonic_gold_from_blasting" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_cthonic_gold", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:cthonic_gold_from_blasting" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/cthonic_gold_from_smelting.json b/src/generated/resources/data/malum/advancements/recipes/misc/cthonic_gold_from_smelting.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/cthonic_gold_from_smelting.json rename to src/generated/resources/data/malum/advancements/recipes/misc/cthonic_gold_from_smelting.json index e6b57d2b5..465581d3d 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/cthonic_gold_from_smelting.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/cthonic_gold_from_smelting.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:cthonic_gold_from_smelting" - ] - }, "criteria": { "has_cthonic_gold": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:cthonic_gold_from_smelting" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_cthonic_gold", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:cthonic_gold_from_smelting" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/cursed_grit_from_block.json b/src/generated/resources/data/malum/advancements/recipes/misc/cursed_grit_from_block.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/cursed_grit_from_block.json rename to src/generated/resources/data/malum/advancements/recipes/misc/cursed_grit_from_block.json index 16a00755a..393487c17 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/cursed_grit_from_block.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/cursed_grit_from_block.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:cursed_grit_from_block" - ] - }, "criteria": { "has_cursed_grit": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:cursed_grit_from_block" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_cursed_grit", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:cursed_grit_from_block" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/cut_runewood_planks.json b/src/generated/resources/data/malum/advancements/recipes/misc/cut_runewood_planks.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/cut_runewood_planks.json rename to src/generated/resources/data/malum/advancements/recipes/misc/cut_runewood_planks.json index f8e71c9c1..3b5f018a6 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/cut_runewood_planks.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/cut_runewood_planks.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:cut_runewood_planks" - ] - }, "criteria": { "has_runewood_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:cut_runewood_planks" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_runewood_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:cut_runewood_planks" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/cut_soulwood_planks.json b/src/generated/resources/data/malum/advancements/recipes/misc/cut_soulwood_planks.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/cut_soulwood_planks.json rename to src/generated/resources/data/malum/advancements/recipes/misc/cut_soulwood_planks.json index e430c0d18..57ca14396 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/cut_soulwood_planks.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/cut_soulwood_planks.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:cut_soulwood_planks" - ] - }, "criteria": { "has_soulwood_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:cut_soulwood_planks" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_soulwood_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:cut_soulwood_planks" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/cut_tainted_rock.json b/src/generated/resources/data/malum/advancements/recipes/misc/cut_tainted_rock.json similarity index 76% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/cut_tainted_rock.json rename to src/generated/resources/data/malum/advancements/recipes/misc/cut_tainted_rock.json index f6832bb11..811f28699 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/cut_tainted_rock.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/cut_tainted_rock.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:cut_tainted_rock" - ] - }, "criteria": { "has_tainted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:cut_tainted_rock" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_tainted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:cut_tainted_rock" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/cut_tainted_rock_stonecutting.json b/src/generated/resources/data/malum/advancements/recipes/misc/cut_tainted_rock_stonecutting.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/cut_tainted_rock_stonecutting.json rename to src/generated/resources/data/malum/advancements/recipes/misc/cut_tainted_rock_stonecutting.json index d25f30783..fc5d57ca0 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/cut_tainted_rock_stonecutting.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/cut_tainted_rock_stonecutting.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:cut_tainted_rock_stonecutting" - ] - }, "criteria": { "has_tainted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:cut_tainted_rock_stonecutting" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_tainted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:cut_tainted_rock_stonecutting" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/cut_twisted_rock.json b/src/generated/resources/data/malum/advancements/recipes/misc/cut_twisted_rock.json similarity index 76% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/cut_twisted_rock.json rename to src/generated/resources/data/malum/advancements/recipes/misc/cut_twisted_rock.json index ea3749604..c92e68751 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/cut_twisted_rock.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/cut_twisted_rock.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:cut_twisted_rock" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "malum:cut_twisted_rock" + }, + "trigger": "minecraft:recipe_unlocked" + }, "has_twisted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "malum:cut_twisted_rock" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_twisted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:cut_twisted_rock" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/cut_twisted_rock_stonecutting.json b/src/generated/resources/data/malum/advancements/recipes/misc/cut_twisted_rock_stonecutting.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/cut_twisted_rock_stonecutting.json rename to src/generated/resources/data/malum/advancements/recipes/misc/cut_twisted_rock_stonecutting.json index 611c8f48f..fb77169ad 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/cut_twisted_rock_stonecutting.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/cut_twisted_rock_stonecutting.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:cut_twisted_rock_stonecutting" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "malum:cut_twisted_rock_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + }, "has_twisted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "malum:cut_twisted_rock_stonecutting" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_twisted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:cut_twisted_rock_stonecutting" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_cosmetics/demiboy_prideweave.json b/src/generated/resources/data/malum/advancements/recipes/misc/demiboy_prideweave.json similarity index 76% rename from src/generated/resources/data/malum/advancements/recipes/malum_cosmetics/demiboy_prideweave.json rename to src/generated/resources/data/malum/advancements/recipes/misc/demiboy_prideweave.json index 878419065..f67c920e2 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_cosmetics/demiboy_prideweave.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/demiboy_prideweave.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:demiboy_prideweave" - ] - }, "criteria": { "has_spool": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:demiboy_prideweave" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_spool", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:demiboy_prideweave" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_cosmetics/demigirl_prideweave.json b/src/generated/resources/data/malum/advancements/recipes/misc/demigirl_prideweave.json similarity index 76% rename from src/generated/resources/data/malum/advancements/recipes/malum_cosmetics/demigirl_prideweave.json rename to src/generated/resources/data/malum/advancements/recipes/misc/demigirl_prideweave.json index 5f7e74748..cb3c18321 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_cosmetics/demigirl_prideweave.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/demigirl_prideweave.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:demigirl_prideweave" - ] - }, "criteria": { "has_spool": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:demigirl_prideweave" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_spool", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:demigirl_prideweave" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_cosmetics/dreaded_weave.json b/src/generated/resources/data/malum/advancements/recipes/misc/dreaded_weave.json similarity index 76% rename from src/generated/resources/data/malum/advancements/recipes/malum_cosmetics/dreaded_weave.json rename to src/generated/resources/data/malum/advancements/recipes/misc/dreaded_weave.json index b7fefc932..392c5b9f7 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_cosmetics/dreaded_weave.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/dreaded_weave.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:dreaded_weave" - ] - }, "criteria": { "has_spool": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:dreaded_weave" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_spool", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:dreaded_weave" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_cosmetics/enby_prideweave.json b/src/generated/resources/data/malum/advancements/recipes/misc/enby_prideweave.json similarity index 76% rename from src/generated/resources/data/malum/advancements/recipes/malum_cosmetics/enby_prideweave.json rename to src/generated/resources/data/malum/advancements/recipes/misc/enby_prideweave.json index 6ecc1694f..307e2d215 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_cosmetics/enby_prideweave.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/enby_prideweave.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:enby_prideweave" - ] - }, "criteria": { "has_spool": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:enby_prideweave" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_spool", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:enby_prideweave" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/encyclopedia_arcana.json b/src/generated/resources/data/malum/advancements/recipes/misc/encyclopedia_arcana.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/encyclopedia_arcana.json rename to src/generated/resources/data/malum/advancements/recipes/misc/encyclopedia_arcana.json index 654cba35b..0bd01a59b 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/encyclopedia_arcana.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/encyclopedia_arcana.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:encyclopedia_arcana" - ] - }, "criteria": { "has_soulstone": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:encyclopedia_arcana" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_soulstone", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:encyclopedia_arcana" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/misc/experience_bottle_from_brilliance.json b/src/generated/resources/data/malum/advancements/recipes/misc/experience_bottle_from_brilliance.json index a8ebc7340..db0137018 100644 --- a/src/generated/resources/data/malum/advancements/recipes/misc/experience_bottle_from_brilliance.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/experience_bottle_from_brilliance.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:experience_bottle_from_brilliance" - ] - }, "criteria": { "has_brilliance": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:experience_bottle_from_brilliance" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_brilliance", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:experience_bottle_from_brilliance" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_cosmetics/gay_prideweave.json b/src/generated/resources/data/malum/advancements/recipes/misc/gay_prideweave.json similarity index 76% rename from src/generated/resources/data/malum/advancements/recipes/malum_cosmetics/gay_prideweave.json rename to src/generated/resources/data/malum/advancements/recipes/misc/gay_prideweave.json index cfc6f02b0..95d8ef2d3 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_cosmetics/gay_prideweave.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/gay_prideweave.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:gay_prideweave" - ] - }, "criteria": { "has_spool": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:gay_prideweave" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_spool", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:gay_prideweave" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_cosmetics/genderfluid_prideweave.json b/src/generated/resources/data/malum/advancements/recipes/misc/genderfluid_prideweave.json similarity index 76% rename from src/generated/resources/data/malum/advancements/recipes/malum_cosmetics/genderfluid_prideweave.json rename to src/generated/resources/data/malum/advancements/recipes/misc/genderfluid_prideweave.json index ae657f5a5..9ba768088 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_cosmetics/genderfluid_prideweave.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/genderfluid_prideweave.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:genderfluid_prideweave" - ] - }, "criteria": { "has_spool": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:genderfluid_prideweave" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_spool", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:genderfluid_prideweave" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_cosmetics/genderqueer_prideweave.json b/src/generated/resources/data/malum/advancements/recipes/misc/genderqueer_prideweave.json similarity index 76% rename from src/generated/resources/data/malum/advancements/recipes/malum_cosmetics/genderqueer_prideweave.json rename to src/generated/resources/data/malum/advancements/recipes/misc/genderqueer_prideweave.json index fb974e59a..4d1d94431 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_cosmetics/genderqueer_prideweave.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/genderqueer_prideweave.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:genderqueer_prideweave" - ] - }, "criteria": { "has_spool": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:genderqueer_prideweave" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_spool", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:genderqueer_prideweave" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/gilded_belt.json b/src/generated/resources/data/malum/advancements/recipes/misc/gilded_belt.json similarity index 76% rename from src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/gilded_belt.json rename to src/generated/resources/data/malum/advancements/recipes/misc/gilded_belt.json index c1a026790..4c02e4b0d 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/gilded_belt.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/gilded_belt.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:gilded_belt" - ] - }, "criteria": { "has_hallowed_gold": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:gilded_belt" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_hallowed_gold", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:gilded_belt" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/gilded_ring.json b/src/generated/resources/data/malum/advancements/recipes/misc/gilded_ring.json similarity index 76% rename from src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/gilded_ring.json rename to src/generated/resources/data/malum/advancements/recipes/misc/gilded_ring.json index 3365c72cf..a98ec3234 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/gilded_ring.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/gilded_ring.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:gilded_ring" - ] - }, "criteria": { "has_hallowed_gold": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:gilded_ring" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_hallowed_gold", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:gilded_ring" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/misc/gold_from_node_blasting.json b/src/generated/resources/data/malum/advancements/recipes/misc/gold_from_node_blasting.json index 15d6b0a1d..5410a5d4d 100644 --- a/src/generated/resources/data/malum/advancements/recipes/misc/gold_from_node_blasting.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/gold_from_node_blasting.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:gold_from_node_blasting" - ] - }, "criteria": { "has_impetus": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:gold_from_node_blasting" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_impetus", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:gold_from_node_blasting" + ] + }, + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/misc/gold_from_node_smelting.json b/src/generated/resources/data/malum/advancements/recipes/misc/gold_from_node_smelting.json index 046eb393f..b89198aa4 100644 --- a/src/generated/resources/data/malum/advancements/recipes/misc/gold_from_node_smelting.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/gold_from_node_smelting.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:gold_from_node_smelting" - ] - }, "criteria": { "has_impetus": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:gold_from_node_smelting" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_impetus", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:gold_from_node_smelting" + ] + }, + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/grim_talc_from_block.json b/src/generated/resources/data/malum/advancements/recipes/misc/grim_talc_from_block.json similarity index 76% rename from src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/grim_talc_from_block.json rename to src/generated/resources/data/malum/advancements/recipes/misc/grim_talc_from_block.json index 9f860ccdf..33ba1a028 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/grim_talc_from_block.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/grim_talc_from_block.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:grim_talc_from_block" - ] - }, "criteria": { "has_grim_talc": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:grim_talc_from_block" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_grim_talc", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:grim_talc_from_block" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/hallowed_gold_from_block.json b/src/generated/resources/data/malum/advancements/recipes/misc/hallowed_gold_from_block.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/hallowed_gold_from_block.json rename to src/generated/resources/data/malum/advancements/recipes/misc/hallowed_gold_from_block.json index 285acabbc..9f36e7fab 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/hallowed_gold_from_block.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/hallowed_gold_from_block.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:hallowed_gold_from_block" - ] - }, "criteria": { "has_hallowed_gold": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:hallowed_gold_from_block" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_hallowed_gold", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:hallowed_gold_from_block" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/hallowed_gold_from_nuggets.json b/src/generated/resources/data/malum/advancements/recipes/misc/hallowed_gold_from_nuggets.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/hallowed_gold_from_nuggets.json rename to src/generated/resources/data/malum/advancements/recipes/misc/hallowed_gold_from_nuggets.json index a5c5637a6..28325dd7e 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/hallowed_gold_from_nuggets.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/hallowed_gold_from_nuggets.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:hallowed_gold_from_nuggets" - ] - }, "criteria": { "has_hallowed_gold": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:hallowed_gold_from_nuggets" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_hallowed_gold", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:hallowed_gold_from_nuggets" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/hallowed_gold_nugget.json b/src/generated/resources/data/malum/advancements/recipes/misc/hallowed_gold_nugget.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/hallowed_gold_nugget.json rename to src/generated/resources/data/malum/advancements/recipes/misc/hallowed_gold_nugget.json index bb45fd92f..937671377 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/hallowed_gold_nugget.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/hallowed_gold_nugget.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:hallowed_gold_nugget" - ] - }, "criteria": { "has_hallowed_gold": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:hallowed_gold_nugget" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_hallowed_gold", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:hallowed_gold_nugget" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/hex_ash_from_block.json b/src/generated/resources/data/malum/advancements/recipes/misc/hex_ash_from_block.json similarity index 76% rename from src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/hex_ash_from_block.json rename to src/generated/resources/data/malum/advancements/recipes/misc/hex_ash_from_block.json index 33bf8cb3d..c5e725a21 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/hex_ash_from_block.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/hex_ash_from_block.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:hex_ash_from_block" - ] - }, "criteria": { "has_hex_ash": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:hex_ash_from_block" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_hex_ash", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:hex_ash_from_block" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/holy_sap_from_smelting.json b/src/generated/resources/data/malum/advancements/recipes/misc/holy_sap_from_smelting.json similarity index 76% rename from src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/holy_sap_from_smelting.json rename to src/generated/resources/data/malum/advancements/recipes/misc/holy_sap_from_smelting.json index de938a541..59a1b5d8a 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/holy_sap_from_smelting.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/holy_sap_from_smelting.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:holy_sap_from_smelting" - ] - }, "criteria": { "has_holy_sap": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:holy_sap_from_smelting" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_holy_sap", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:holy_sap_from_smelting" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/holy_sap_from_smoking.json b/src/generated/resources/data/malum/advancements/recipes/misc/holy_sap_from_smoking.json similarity index 76% rename from src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/holy_sap_from_smoking.json rename to src/generated/resources/data/malum/advancements/recipes/misc/holy_sap_from_smoking.json index 70e8de103..4e94c37f6 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/holy_sap_from_smoking.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/holy_sap_from_smoking.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:holy_sap_from_smoking" - ] - }, "criteria": { "has_holy_sap": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:holy_sap_from_smoking" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_holy_sap", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:holy_sap_from_smoking" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/holy_sapball.json b/src/generated/resources/data/malum/advancements/recipes/misc/holy_sapball.json similarity index 76% rename from src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/holy_sapball.json rename to src/generated/resources/data/malum/advancements/recipes/misc/holy_sapball.json index e0c6c166e..130536070 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/holy_sapball.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/holy_sapball.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:holy_sapball" - ] - }, "criteria": { "has_holy_sap": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:holy_sapball" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_holy_sap", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:holy_sapball" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_cosmetics/intersex_prideweave.json b/src/generated/resources/data/malum/advancements/recipes/misc/intersex_prideweave.json similarity index 76% rename from src/generated/resources/data/malum/advancements/recipes/malum_cosmetics/intersex_prideweave.json rename to src/generated/resources/data/malum/advancements/recipes/misc/intersex_prideweave.json index dcd93093e..e011fc60c 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_cosmetics/intersex_prideweave.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/intersex_prideweave.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:intersex_prideweave" - ] - }, "criteria": { "has_spool": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:intersex_prideweave" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_spool", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:intersex_prideweave" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/misc/iron_from_node_blasting.json b/src/generated/resources/data/malum/advancements/recipes/misc/iron_from_node_blasting.json index b363b98f1..5eb43e4ea 100644 --- a/src/generated/resources/data/malum/advancements/recipes/misc/iron_from_node_blasting.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/iron_from_node_blasting.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:iron_from_node_blasting" - ] - }, "criteria": { "has_impetus": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:iron_from_node_blasting" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_impetus", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:iron_from_node_blasting" + ] + }, + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/misc/iron_from_node_smelting.json b/src/generated/resources/data/malum/advancements/recipes/misc/iron_from_node_smelting.json index 2b0e452ea..cacef44a0 100644 --- a/src/generated/resources/data/malum/advancements/recipes/misc/iron_from_node_smelting.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/iron_from_node_smelting.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:iron_from_node_smelting" - ] - }, "criteria": { "has_impetus": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:iron_from_node_smelting" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_impetus", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:iron_from_node_smelting" + ] + }, + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/tools/lead_from_sapballs.json b/src/generated/resources/data/malum/advancements/recipes/misc/lead_from_sapballs.json similarity index 75% rename from src/generated/resources/data/malum/advancements/recipes/tools/lead_from_sapballs.json rename to src/generated/resources/data/malum/advancements/recipes/misc/lead_from_sapballs.json index 65e981e13..d902d0484 100644 --- a/src/generated/resources/data/malum/advancements/recipes/tools/lead_from_sapballs.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/lead_from_sapballs.json @@ -1,26 +1,21 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:lead_from_sapballs" - ] - }, "criteria": { "has_sapball": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { "tag": "malum:sapballs" } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:lead_from_sapballs" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -28,5 +23,11 @@ "has_sapball", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:lead_from_sapballs" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_cosmetics/lesbian_prideweave.json b/src/generated/resources/data/malum/advancements/recipes/misc/lesbian_prideweave.json similarity index 76% rename from src/generated/resources/data/malum/advancements/recipes/malum_cosmetics/lesbian_prideweave.json rename to src/generated/resources/data/malum/advancements/recipes/misc/lesbian_prideweave.json index 21f4d7a5d..3a0fafd8e 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_cosmetics/lesbian_prideweave.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/lesbian_prideweave.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:lesbian_prideweave" - ] - }, "criteria": { "has_spool": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:lesbian_prideweave" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_spool", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:lesbian_prideweave" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/brewing/magma_cream_from_sapballs.json b/src/generated/resources/data/malum/advancements/recipes/misc/magma_cream_from_sapballs.json similarity index 75% rename from src/generated/resources/data/malum/advancements/recipes/brewing/magma_cream_from_sapballs.json rename to src/generated/resources/data/malum/advancements/recipes/misc/magma_cream_from_sapballs.json index afd4f9ae1..32e4c2ab0 100644 --- a/src/generated/resources/data/malum/advancements/recipes/brewing/magma_cream_from_sapballs.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/magma_cream_from_sapballs.json @@ -1,26 +1,21 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:magma_cream_from_sapballs" - ] - }, "criteria": { "has_sapball": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { "tag": "malum:sapballs" } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:magma_cream_from_sapballs" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -28,5 +23,11 @@ "has_sapball", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:magma_cream_from_sapballs" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_cosmetics/mechanical_weave_v1.json b/src/generated/resources/data/malum/advancements/recipes/misc/mechanical_weave_v1.json similarity index 76% rename from src/generated/resources/data/malum/advancements/recipes/malum_cosmetics/mechanical_weave_v1.json rename to src/generated/resources/data/malum/advancements/recipes/misc/mechanical_weave_v1.json index a76b1c2b8..c3a08c3da 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_cosmetics/mechanical_weave_v1.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/mechanical_weave_v1.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:mechanical_weave_v1" - ] - }, "criteria": { "has_spool": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:mechanical_weave_v1" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_spool", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:mechanical_weave_v1" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_cosmetics/mechanical_weave_v2.json b/src/generated/resources/data/malum/advancements/recipes/misc/mechanical_weave_v2.json similarity index 76% rename from src/generated/resources/data/malum/advancements/recipes/malum_cosmetics/mechanical_weave_v2.json rename to src/generated/resources/data/malum/advancements/recipes/misc/mechanical_weave_v2.json index e0799cac2..ccc3647ee 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_cosmetics/mechanical_weave_v2.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/mechanical_weave_v2.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:mechanical_weave_v2" - ] - }, "criteria": { "has_spool": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:mechanical_weave_v2" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_spool", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:mechanical_weave_v2" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/natural_quartz_from_blasting.json b/src/generated/resources/data/malum/advancements/recipes/misc/natural_quartz_from_blasting.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/natural_quartz_from_blasting.json rename to src/generated/resources/data/malum/advancements/recipes/misc/natural_quartz_from_blasting.json index 26934ac3e..f9785ca9b 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/natural_quartz_from_blasting.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/natural_quartz_from_blasting.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:natural_quartz_from_blasting" - ] - }, "criteria": { "has_natural_quartz": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:natural_quartz_from_blasting" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_natural_quartz", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:natural_quartz_from_blasting" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/natural_quartz_from_deepslate_blasting.json b/src/generated/resources/data/malum/advancements/recipes/misc/natural_quartz_from_deepslate_blasting.json similarity index 78% rename from src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/natural_quartz_from_deepslate_blasting.json rename to src/generated/resources/data/malum/advancements/recipes/misc/natural_quartz_from_deepslate_blasting.json index 5ca8aa630..1d0ac21de 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/natural_quartz_from_deepslate_blasting.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/natural_quartz_from_deepslate_blasting.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:natural_quartz_from_deepslate_blasting" - ] - }, "criteria": { "has_natural_quartz": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:natural_quartz_from_deepslate_blasting" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_natural_quartz", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:natural_quartz_from_deepslate_blasting" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/natural_quartz_from_deepslate_smelting.json b/src/generated/resources/data/malum/advancements/recipes/misc/natural_quartz_from_deepslate_smelting.json similarity index 78% rename from src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/natural_quartz_from_deepslate_smelting.json rename to src/generated/resources/data/malum/advancements/recipes/misc/natural_quartz_from_deepslate_smelting.json index 607bf2b35..d71b136e7 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/natural_quartz_from_deepslate_smelting.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/natural_quartz_from_deepslate_smelting.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:natural_quartz_from_deepslate_smelting" - ] - }, "criteria": { "has_natural_quartz": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:natural_quartz_from_deepslate_smelting" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_natural_quartz", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:natural_quartz_from_deepslate_smelting" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/natural_quartz_from_smelting.json b/src/generated/resources/data/malum/advancements/recipes/misc/natural_quartz_from_smelting.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/natural_quartz_from_smelting.json rename to src/generated/resources/data/malum/advancements/recipes/misc/natural_quartz_from_smelting.json index c502a47a8..234adb2d2 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/natural_quartz_from_smelting.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/natural_quartz_from_smelting.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:natural_quartz_from_smelting" - ] - }, "criteria": { "has_natural_quartz": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:natural_quartz_from_smelting" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_natural_quartz", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:natural_quartz_from_smelting" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/building_blocks/netherrack_from_blazing_quartz.json b/src/generated/resources/data/malum/advancements/recipes/misc/netherrack_from_blazing_quartz.json similarity index 78% rename from src/generated/resources/data/malum/advancements/recipes/building_blocks/netherrack_from_blazing_quartz.json rename to src/generated/resources/data/malum/advancements/recipes/misc/netherrack_from_blazing_quartz.json index 244acc3c7..c867b125d 100644 --- a/src/generated/resources/data/malum/advancements/recipes/building_blocks/netherrack_from_blazing_quartz.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/netherrack_from_blazing_quartz.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:netherrack_from_blazing_quartz" - ] - }, "criteria": { "has_blazing_quartz": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:netherrack_from_blazing_quartz" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_blazing_quartz", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:netherrack_from_blazing_quartz" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/ornate_necklace.json b/src/generated/resources/data/malum/advancements/recipes/misc/ornate_necklace.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/ornate_necklace.json rename to src/generated/resources/data/malum/advancements/recipes/misc/ornate_necklace.json index f10772eb2..16f18c940 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/ornate_necklace.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/ornate_necklace.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:ornate_necklace" - ] - }, "criteria": { "has_soul_stained_steel": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:ornate_necklace" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_soul_stained_steel", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:ornate_necklace" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/ornate_ring.json b/src/generated/resources/data/malum/advancements/recipes/misc/ornate_ring.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/ornate_ring.json rename to src/generated/resources/data/malum/advancements/recipes/misc/ornate_ring.json index b5616e420..362359ba9 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/ornate_ring.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/ornate_ring.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:ornate_ring" - ] - }, "criteria": { "has_soul_stained_steel": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:ornate_ring" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_soul_stained_steel", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:ornate_ring" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_cosmetics/pan_prideweave.json b/src/generated/resources/data/malum/advancements/recipes/misc/pan_prideweave.json similarity index 76% rename from src/generated/resources/data/malum/advancements/recipes/malum_cosmetics/pan_prideweave.json rename to src/generated/resources/data/malum/advancements/recipes/misc/pan_prideweave.json index 2a045e4d1..9d895bb66 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_cosmetics/pan_prideweave.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/pan_prideweave.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:pan_prideweave" - ] - }, "criteria": { "has_spool": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:pan_prideweave" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_spool", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:pan_prideweave" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_cosmetics/plural_prideweave.json b/src/generated/resources/data/malum/advancements/recipes/misc/plural_prideweave.json similarity index 76% rename from src/generated/resources/data/malum/advancements/recipes/malum_cosmetics/plural_prideweave.json rename to src/generated/resources/data/malum/advancements/recipes/misc/plural_prideweave.json index 0b8a22777..5992b56fa 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_cosmetics/plural_prideweave.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/plural_prideweave.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:plural_prideweave" - ] - }, "criteria": { "has_spool": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:plural_prideweave" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_spool", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:plural_prideweave" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/polished_tainted_rock.json b/src/generated/resources/data/malum/advancements/recipes/misc/polished_tainted_rock.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/polished_tainted_rock.json rename to src/generated/resources/data/malum/advancements/recipes/misc/polished_tainted_rock.json index 7f906094b..373348838 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/polished_tainted_rock.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/polished_tainted_rock.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:polished_tainted_rock" - ] - }, "criteria": { "has_tainted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:polished_tainted_rock" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_tainted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:polished_tainted_rock" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/polished_tainted_rock_slab.json b/src/generated/resources/data/malum/advancements/recipes/misc/polished_tainted_rock_slab.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/polished_tainted_rock_slab.json rename to src/generated/resources/data/malum/advancements/recipes/misc/polished_tainted_rock_slab.json index 7c9d7a988..8d9ae3c09 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/polished_tainted_rock_slab.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/polished_tainted_rock_slab.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:polished_tainted_rock_slab" - ] - }, "criteria": { "has_tainted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:polished_tainted_rock_slab" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_tainted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:polished_tainted_rock_slab" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/polished_tainted_rock_slab_stonecutting.json b/src/generated/resources/data/malum/advancements/recipes/misc/polished_tainted_rock_slab_stonecutting.json similarity index 79% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/polished_tainted_rock_slab_stonecutting.json rename to src/generated/resources/data/malum/advancements/recipes/misc/polished_tainted_rock_slab_stonecutting.json index 180cc0ac8..3ada2e842 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/polished_tainted_rock_slab_stonecutting.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/polished_tainted_rock_slab_stonecutting.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:polished_tainted_rock_slab_stonecutting" - ] - }, "criteria": { "has_polished_tainted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:polished_tainted_rock_slab_stonecutting" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_polished_tainted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:polished_tainted_rock_slab_stonecutting" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/polished_tainted_rock_stairs.json b/src/generated/resources/data/malum/advancements/recipes/misc/polished_tainted_rock_stairs.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/polished_tainted_rock_stairs.json rename to src/generated/resources/data/malum/advancements/recipes/misc/polished_tainted_rock_stairs.json index fe61c5037..b44a0edca 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/polished_tainted_rock_stairs.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/polished_tainted_rock_stairs.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:polished_tainted_rock_stairs" - ] - }, "criteria": { "has_tainted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:polished_tainted_rock_stairs" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_tainted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:polished_tainted_rock_stairs" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/polished_tainted_rock_stairs_stonecutting.json b/src/generated/resources/data/malum/advancements/recipes/misc/polished_tainted_rock_stairs_stonecutting.json similarity index 79% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/polished_tainted_rock_stairs_stonecutting.json rename to src/generated/resources/data/malum/advancements/recipes/misc/polished_tainted_rock_stairs_stonecutting.json index 7f3aa0993..4f2274a60 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/polished_tainted_rock_stairs_stonecutting.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/polished_tainted_rock_stairs_stonecutting.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:polished_tainted_rock_stairs_stonecutting" - ] - }, "criteria": { "has_polished_tainted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:polished_tainted_rock_stairs_stonecutting" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_polished_tainted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:polished_tainted_rock_stairs_stonecutting" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/polished_tainted_rock_stonecutting.json b/src/generated/resources/data/malum/advancements/recipes/misc/polished_tainted_rock_stonecutting.json similarity index 78% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/polished_tainted_rock_stonecutting.json rename to src/generated/resources/data/malum/advancements/recipes/misc/polished_tainted_rock_stonecutting.json index ffc2044cc..972dbb59a 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/polished_tainted_rock_stonecutting.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/polished_tainted_rock_stonecutting.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:polished_tainted_rock_stonecutting" - ] - }, "criteria": { "has_tainted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:polished_tainted_rock_stonecutting" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_tainted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:polished_tainted_rock_stonecutting" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/polished_twisted_rock.json b/src/generated/resources/data/malum/advancements/recipes/misc/polished_twisted_rock.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/polished_twisted_rock.json rename to src/generated/resources/data/malum/advancements/recipes/misc/polished_twisted_rock.json index b374f9872..bae847027 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/polished_twisted_rock.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/polished_twisted_rock.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:polished_twisted_rock" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "malum:polished_twisted_rock" + }, + "trigger": "minecraft:recipe_unlocked" + }, "has_twisted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "malum:polished_twisted_rock" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_twisted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:polished_twisted_rock" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/polished_twisted_rock_slab.json b/src/generated/resources/data/malum/advancements/recipes/misc/polished_twisted_rock_slab.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/polished_twisted_rock_slab.json rename to src/generated/resources/data/malum/advancements/recipes/misc/polished_twisted_rock_slab.json index 074e49ee7..8c47c7a07 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/polished_twisted_rock_slab.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/polished_twisted_rock_slab.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:polished_twisted_rock_slab" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "malum:polished_twisted_rock_slab" + }, + "trigger": "minecraft:recipe_unlocked" + }, "has_twisted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "malum:polished_twisted_rock_slab" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_twisted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:polished_twisted_rock_slab" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/polished_twisted_rock_slab_stonecutting.json b/src/generated/resources/data/malum/advancements/recipes/misc/polished_twisted_rock_slab_stonecutting.json similarity index 79% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/polished_twisted_rock_slab_stonecutting.json rename to src/generated/resources/data/malum/advancements/recipes/misc/polished_twisted_rock_slab_stonecutting.json index 3aaa380c0..26c19a1f2 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/polished_twisted_rock_slab_stonecutting.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/polished_twisted_rock_slab_stonecutting.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:polished_twisted_rock_slab_stonecutting" - ] - }, "criteria": { "has_polished_twisted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:polished_twisted_rock_slab_stonecutting" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_polished_twisted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:polished_twisted_rock_slab_stonecutting" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/polished_twisted_rock_stairs.json b/src/generated/resources/data/malum/advancements/recipes/misc/polished_twisted_rock_stairs.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/polished_twisted_rock_stairs.json rename to src/generated/resources/data/malum/advancements/recipes/misc/polished_twisted_rock_stairs.json index 1838db38b..60bb5fbe5 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/polished_twisted_rock_stairs.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/polished_twisted_rock_stairs.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:polished_twisted_rock_stairs" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "malum:polished_twisted_rock_stairs" + }, + "trigger": "minecraft:recipe_unlocked" + }, "has_twisted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "malum:polished_twisted_rock_stairs" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_twisted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:polished_twisted_rock_stairs" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/polished_twisted_rock_stairs_stonecutting.json b/src/generated/resources/data/malum/advancements/recipes/misc/polished_twisted_rock_stairs_stonecutting.json similarity index 79% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/polished_twisted_rock_stairs_stonecutting.json rename to src/generated/resources/data/malum/advancements/recipes/misc/polished_twisted_rock_stairs_stonecutting.json index c61be83cf..f3668cc71 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/polished_twisted_rock_stairs_stonecutting.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/polished_twisted_rock_stairs_stonecutting.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:polished_twisted_rock_stairs_stonecutting" - ] - }, "criteria": { "has_polished_twisted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:polished_twisted_rock_stairs_stonecutting" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_polished_twisted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:polished_twisted_rock_stairs_stonecutting" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/polished_twisted_rock_stonecutting.json b/src/generated/resources/data/malum/advancements/recipes/misc/polished_twisted_rock_stonecutting.json similarity index 78% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/polished_twisted_rock_stonecutting.json rename to src/generated/resources/data/malum/advancements/recipes/misc/polished_twisted_rock_stonecutting.json index 305ae5a1b..dd41efbed 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/polished_twisted_rock_stonecutting.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/polished_twisted_rock_stonecutting.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:polished_twisted_rock_stonecutting" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "malum:polished_twisted_rock_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + }, "has_twisted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "malum:polished_twisted_rock_stonecutting" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_twisted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:polished_twisted_rock_stonecutting" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_cosmetics/poly_prideweave.json b/src/generated/resources/data/malum/advancements/recipes/misc/poly_prideweave.json similarity index 76% rename from src/generated/resources/data/malum/advancements/recipes/malum_cosmetics/poly_prideweave.json rename to src/generated/resources/data/malum/advancements/recipes/misc/poly_prideweave.json index 13d58e490..094311996 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_cosmetics/poly_prideweave.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/poly_prideweave.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:poly_prideweave" - ] - }, "criteria": { "has_spool": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:poly_prideweave" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_spool", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:poly_prideweave" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_cosmetics/pride_prideweave.json b/src/generated/resources/data/malum/advancements/recipes/misc/pride_prideweave.json similarity index 76% rename from src/generated/resources/data/malum/advancements/recipes/malum_cosmetics/pride_prideweave.json rename to src/generated/resources/data/malum/advancements/recipes/misc/pride_prideweave.json index 9ad2bbe70..3949105e4 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_cosmetics/pride_prideweave.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/pride_prideweave.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:pride_prideweave" - ] - }, "criteria": { "has_spool": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:pride_prideweave" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_spool", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:pride_prideweave" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/raw_soulstone_block.json b/src/generated/resources/data/malum/advancements/recipes/misc/raw_soulstone_block.json similarity index 76% rename from src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/raw_soulstone_block.json rename to src/generated/resources/data/malum/advancements/recipes/misc/raw_soulstone_block.json index 6c518d8cd..e9bed052d 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/raw_soulstone_block.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/raw_soulstone_block.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:raw_soulstone_block" - ] - }, "criteria": { "has_soulstone": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:raw_soulstone_block" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_soulstone", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:raw_soulstone_block" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/raw_soulstone_from_block.json b/src/generated/resources/data/malum/advancements/recipes/misc/raw_soulstone_from_block.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/raw_soulstone_from_block.json rename to src/generated/resources/data/malum/advancements/recipes/misc/raw_soulstone_from_block.json index 3f350f7e0..ab04df4b2 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/raw_soulstone_from_block.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/raw_soulstone_from_block.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:raw_soulstone_from_block" - ] - }, "criteria": { "has_soulstone": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:raw_soulstone_from_block" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_soulstone", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:raw_soulstone_from_block" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/rotting_essence_from_block.json b/src/generated/resources/data/malum/advancements/recipes/misc/rotting_essence_from_block.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/rotting_essence_from_block.json rename to src/generated/resources/data/malum/advancements/recipes/misc/rotting_essence_from_block.json index 0035a11e6..1b5f4b18e 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/rotting_essence_from_block.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/rotting_essence_from_block.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:rotting_essence_from_block" - ] - }, "criteria": { "has_rotting_essence": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:rotting_essence_from_block" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_rotting_essence", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:rotting_essence_from_block" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/runewood.json b/src/generated/resources/data/malum/advancements/recipes/misc/runewood.json similarity index 75% rename from src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/runewood.json rename to src/generated/resources/data/malum/advancements/recipes/misc/runewood.json index f58ae658b..7c6d546e1 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/runewood.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/runewood.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:runewood" - ] - }, "criteria": { "has_log": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:runewood" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_log", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:runewood" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/runewood_beam.json b/src/generated/resources/data/malum/advancements/recipes/misc/runewood_beam.json similarity index 76% rename from src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/runewood_beam.json rename to src/generated/resources/data/malum/advancements/recipes/misc/runewood_beam.json index 13fb88380..564484368 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/runewood_beam.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/runewood_beam.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:runewood_beam" - ] - }, "criteria": { "has_runewood_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:runewood_beam" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_runewood_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:runewood_beam" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/runewood_boat.json b/src/generated/resources/data/malum/advancements/recipes/misc/runewood_boat.json similarity index 76% rename from src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/runewood_boat.json rename to src/generated/resources/data/malum/advancements/recipes/misc/runewood_boat.json index faf607897..e8431fe87 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/runewood_boat.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/runewood_boat.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:runewood_boat" - ] - }, "criteria": { "has_runewood_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:runewood_boat" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_runewood_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:runewood_boat" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/runewood_door.json b/src/generated/resources/data/malum/advancements/recipes/misc/runewood_door.json similarity index 76% rename from src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/runewood_door.json rename to src/generated/resources/data/malum/advancements/recipes/misc/runewood_door.json index 505fd614f..254764ca0 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/runewood_door.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/runewood_door.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:runewood_door" - ] - }, "criteria": { "has_input": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:runewood_door" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_input", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:runewood_door" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/runewood_item_pedestal.json b/src/generated/resources/data/malum/advancements/recipes/misc/runewood_item_pedestal.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/runewood_item_pedestal.json rename to src/generated/resources/data/malum/advancements/recipes/misc/runewood_item_pedestal.json index 02b0bcc6a..f18c4bfb1 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/runewood_item_pedestal.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/runewood_item_pedestal.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:runewood_item_pedestal" - ] - }, "criteria": { "has_runewood_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:runewood_item_pedestal" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_runewood_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:runewood_item_pedestal" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/runewood_item_stand.json b/src/generated/resources/data/malum/advancements/recipes/misc/runewood_item_stand.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/runewood_item_stand.json rename to src/generated/resources/data/malum/advancements/recipes/misc/runewood_item_stand.json index 1d38a6c1c..0b820930c 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/runewood_item_stand.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/runewood_item_stand.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:runewood_item_stand" - ] - }, "criteria": { "has_runewood_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:runewood_item_stand" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_runewood_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:runewood_item_stand" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/runewood_panel.json b/src/generated/resources/data/malum/advancements/recipes/misc/runewood_panel.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/runewood_panel.json rename to src/generated/resources/data/malum/advancements/recipes/misc/runewood_panel.json index 948ebfa1c..2d95b8c99 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/runewood_panel.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/runewood_panel.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:runewood_panel" - ] - }, "criteria": { "has_runewood_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:runewood_panel" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_runewood_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:runewood_panel" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/runewood_panel_slab.json b/src/generated/resources/data/malum/advancements/recipes/misc/runewood_panel_slab.json similarity index 76% rename from src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/runewood_panel_slab.json rename to src/generated/resources/data/malum/advancements/recipes/misc/runewood_panel_slab.json index 3184ddab1..ed5de8e9b 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/runewood_panel_slab.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/runewood_panel_slab.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:runewood_panel_slab" - ] - }, "criteria": { "has_input": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:runewood_panel_slab" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_input", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:runewood_panel_slab" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/runewood_panel_stairs.json b/src/generated/resources/data/malum/advancements/recipes/misc/runewood_panel_stairs.json similarity index 76% rename from src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/runewood_panel_stairs.json rename to src/generated/resources/data/malum/advancements/recipes/misc/runewood_panel_stairs.json index 39fea7f96..9ea38511f 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/runewood_panel_stairs.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/runewood_panel_stairs.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:runewood_panel_stairs" - ] - }, "criteria": { "has_input": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:runewood_panel_stairs" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_input", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:runewood_panel_stairs" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/runewood_planks.json b/src/generated/resources/data/malum/advancements/recipes/misc/runewood_planks.json similarity index 74% rename from src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/runewood_planks.json rename to src/generated/resources/data/malum/advancements/recipes/misc/runewood_planks.json index 07b959e29..c2a045df7 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/runewood_planks.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/runewood_planks.json @@ -1,26 +1,21 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:runewood_planks" - ] - }, "criteria": { "has_logs": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { "tag": "malum:runewood_logs" } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:runewood_planks" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -28,5 +23,11 @@ "has_logs", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:runewood_planks" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/runewood_planks_button.json b/src/generated/resources/data/malum/advancements/recipes/misc/runewood_planks_button.json similarity index 76% rename from src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/runewood_planks_button.json rename to src/generated/resources/data/malum/advancements/recipes/misc/runewood_planks_button.json index 67908b25d..8f1be398f 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/runewood_planks_button.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/runewood_planks_button.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:runewood_planks_button" - ] - }, "criteria": { "has_input": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:runewood_planks_button" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_input", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:runewood_planks_button" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/runewood_planks_fence.json b/src/generated/resources/data/malum/advancements/recipes/misc/runewood_planks_fence.json similarity index 76% rename from src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/runewood_planks_fence.json rename to src/generated/resources/data/malum/advancements/recipes/misc/runewood_planks_fence.json index f159d5310..671f5d40b 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/runewood_planks_fence.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/runewood_planks_fence.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:runewood_planks_fence" - ] - }, "criteria": { "has_input": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:runewood_planks_fence" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_input", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:runewood_planks_fence" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/runewood_planks_fence_gate.json b/src/generated/resources/data/malum/advancements/recipes/misc/runewood_planks_fence_gate.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/runewood_planks_fence_gate.json rename to src/generated/resources/data/malum/advancements/recipes/misc/runewood_planks_fence_gate.json index 43c4eba54..8a8d9fb7e 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/runewood_planks_fence_gate.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/runewood_planks_fence_gate.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:runewood_planks_fence_gate" - ] - }, "criteria": { "has_input": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:runewood_planks_fence_gate" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_input", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:runewood_planks_fence_gate" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/runewood_planks_pressure_plate.json b/src/generated/resources/data/malum/advancements/recipes/misc/runewood_planks_pressure_plate.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/runewood_planks_pressure_plate.json rename to src/generated/resources/data/malum/advancements/recipes/misc/runewood_planks_pressure_plate.json index 079018891..285868930 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/runewood_planks_pressure_plate.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/runewood_planks_pressure_plate.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:runewood_planks_pressure_plate" - ] - }, "criteria": { "has_input": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:runewood_planks_pressure_plate" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_input", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:runewood_planks_pressure_plate" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/runewood_planks_slab.json b/src/generated/resources/data/malum/advancements/recipes/misc/runewood_planks_slab.json similarity index 76% rename from src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/runewood_planks_slab.json rename to src/generated/resources/data/malum/advancements/recipes/misc/runewood_planks_slab.json index fcab1b5a2..4d4b50f17 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/runewood_planks_slab.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/runewood_planks_slab.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:runewood_planks_slab" - ] - }, "criteria": { "has_input": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:runewood_planks_slab" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_input", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:runewood_planks_slab" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/runewood_planks_stairs.json b/src/generated/resources/data/malum/advancements/recipes/misc/runewood_planks_stairs.json similarity index 76% rename from src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/runewood_planks_stairs.json rename to src/generated/resources/data/malum/advancements/recipes/misc/runewood_planks_stairs.json index 27c25f4c4..018b52d30 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/runewood_planks_stairs.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/runewood_planks_stairs.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:runewood_planks_stairs" - ] - }, "criteria": { "has_input": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:runewood_planks_stairs" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_input", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:runewood_planks_stairs" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/runewood_sign.json b/src/generated/resources/data/malum/advancements/recipes/misc/runewood_sign.json similarity index 76% rename from src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/runewood_sign.json rename to src/generated/resources/data/malum/advancements/recipes/misc/runewood_sign.json index 04f74886a..b84d4e12d 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/runewood_sign.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/runewood_sign.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:runewood_sign" - ] - }, "criteria": { "has_runewood_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:runewood_sign" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_runewood_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:runewood_sign" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/runewood_tiles.json b/src/generated/resources/data/malum/advancements/recipes/misc/runewood_tiles.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/runewood_tiles.json rename to src/generated/resources/data/malum/advancements/recipes/misc/runewood_tiles.json index a9c1ee688..b2965b6d5 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/runewood_tiles.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/runewood_tiles.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:runewood_tiles" - ] - }, "criteria": { "has_runewood_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:runewood_tiles" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_runewood_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:runewood_tiles" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/runewood_tiles_slab.json b/src/generated/resources/data/malum/advancements/recipes/misc/runewood_tiles_slab.json similarity index 76% rename from src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/runewood_tiles_slab.json rename to src/generated/resources/data/malum/advancements/recipes/misc/runewood_tiles_slab.json index 1be664cdc..089e8c456 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/runewood_tiles_slab.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/runewood_tiles_slab.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:runewood_tiles_slab" - ] - }, "criteria": { "has_input": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:runewood_tiles_slab" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_input", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:runewood_tiles_slab" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/runewood_tiles_stairs.json b/src/generated/resources/data/malum/advancements/recipes/misc/runewood_tiles_stairs.json similarity index 76% rename from src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/runewood_tiles_stairs.json rename to src/generated/resources/data/malum/advancements/recipes/misc/runewood_tiles_stairs.json index 99039ba4c..c49aa7ec7 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/runewood_tiles_stairs.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/runewood_tiles_stairs.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:runewood_tiles_stairs" - ] - }, "criteria": { "has_input": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:runewood_tiles_stairs" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_input", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:runewood_tiles_stairs" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/runewood_trapdoor.json b/src/generated/resources/data/malum/advancements/recipes/misc/runewood_trapdoor.json similarity index 76% rename from src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/runewood_trapdoor.json rename to src/generated/resources/data/malum/advancements/recipes/misc/runewood_trapdoor.json index 6fada67cc..16ddcfcc3 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/runewood_trapdoor.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/runewood_trapdoor.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:runewood_trapdoor" - ] - }, "criteria": { "has_input": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:runewood_trapdoor" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_input", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:runewood_trapdoor" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/runewood_trapdoor_from_solid.json b/src/generated/resources/data/malum/advancements/recipes/misc/runewood_trapdoor_from_solid.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/runewood_trapdoor_from_solid.json rename to src/generated/resources/data/malum/advancements/recipes/misc/runewood_trapdoor_from_solid.json index 9ab8a2b83..f0a6ae39e 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/runewood_trapdoor_from_solid.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/runewood_trapdoor_from_solid.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:runewood_trapdoor_from_solid" - ] - }, "criteria": { "has_input": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:runewood_trapdoor_from_solid" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_input", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:runewood_trapdoor_from_solid" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/runic_small_tainted_rock_bricks_slab.json b/src/generated/resources/data/malum/advancements/recipes/misc/runic_small_tainted_rock_bricks_slab.json similarity index 78% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/runic_small_tainted_rock_bricks_slab.json rename to src/generated/resources/data/malum/advancements/recipes/misc/runic_small_tainted_rock_bricks_slab.json index ce02b18cc..181c7dee3 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/runic_small_tainted_rock_bricks_slab.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/runic_small_tainted_rock_bricks_slab.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:runic_small_tainted_rock_bricks_slab" - ] - }, "criteria": { "has_tainted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:runic_small_tainted_rock_bricks_slab" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_tainted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:runic_small_tainted_rock_bricks_slab" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/runic_small_tainted_rock_bricks_stairs.json b/src/generated/resources/data/malum/advancements/recipes/misc/runic_small_tainted_rock_bricks_stairs.json similarity index 78% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/runic_small_tainted_rock_bricks_stairs.json rename to src/generated/resources/data/malum/advancements/recipes/misc/runic_small_tainted_rock_bricks_stairs.json index 84fc809e6..77bb7dcd5 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/runic_small_tainted_rock_bricks_stairs.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/runic_small_tainted_rock_bricks_stairs.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:runic_small_tainted_rock_bricks_stairs" - ] - }, "criteria": { "has_tainted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:runic_small_tainted_rock_bricks_stairs" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_tainted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:runic_small_tainted_rock_bricks_stairs" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/runic_small_tainted_rock_bricks_wall.json b/src/generated/resources/data/malum/advancements/recipes/misc/runic_small_tainted_rock_bricks_wall.json similarity index 78% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/runic_small_tainted_rock_bricks_wall.json rename to src/generated/resources/data/malum/advancements/recipes/misc/runic_small_tainted_rock_bricks_wall.json index b9be169f3..d95527e0d 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/runic_small_tainted_rock_bricks_wall.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/runic_small_tainted_rock_bricks_wall.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:runic_small_tainted_rock_bricks_wall" - ] - }, "criteria": { "has_tainted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:runic_small_tainted_rock_bricks_wall" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_tainted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:runic_small_tainted_rock_bricks_wall" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/runic_small_twisted_rock_bricks_slab.json b/src/generated/resources/data/malum/advancements/recipes/misc/runic_small_twisted_rock_bricks_slab.json similarity index 78% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/runic_small_twisted_rock_bricks_slab.json rename to src/generated/resources/data/malum/advancements/recipes/misc/runic_small_twisted_rock_bricks_slab.json index 6bab9069c..bf96b755b 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/runic_small_twisted_rock_bricks_slab.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/runic_small_twisted_rock_bricks_slab.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:runic_small_twisted_rock_bricks_slab" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "malum:runic_small_twisted_rock_bricks_slab" + }, + "trigger": "minecraft:recipe_unlocked" + }, "has_twisted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "malum:runic_small_twisted_rock_bricks_slab" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_twisted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:runic_small_twisted_rock_bricks_slab" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/runic_small_twisted_rock_bricks_stairs.json b/src/generated/resources/data/malum/advancements/recipes/misc/runic_small_twisted_rock_bricks_stairs.json similarity index 78% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/runic_small_twisted_rock_bricks_stairs.json rename to src/generated/resources/data/malum/advancements/recipes/misc/runic_small_twisted_rock_bricks_stairs.json index 51d050073..e48a94631 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/runic_small_twisted_rock_bricks_stairs.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/runic_small_twisted_rock_bricks_stairs.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:runic_small_twisted_rock_bricks_stairs" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "malum:runic_small_twisted_rock_bricks_stairs" + }, + "trigger": "minecraft:recipe_unlocked" + }, "has_twisted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "malum:runic_small_twisted_rock_bricks_stairs" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_twisted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:runic_small_twisted_rock_bricks_stairs" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/runic_small_twisted_rock_bricks_wall.json b/src/generated/resources/data/malum/advancements/recipes/misc/runic_small_twisted_rock_bricks_wall.json similarity index 78% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/runic_small_twisted_rock_bricks_wall.json rename to src/generated/resources/data/malum/advancements/recipes/misc/runic_small_twisted_rock_bricks_wall.json index 13b93f17b..a00a2625e 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/runic_small_twisted_rock_bricks_wall.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/runic_small_twisted_rock_bricks_wall.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:runic_small_twisted_rock_bricks_wall" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "malum:runic_small_twisted_rock_bricks_wall" + }, + "trigger": "minecraft:recipe_unlocked" + }, "has_twisted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "malum:runic_small_twisted_rock_bricks_wall" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_twisted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:runic_small_twisted_rock_bricks_wall" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/runic_tainted_rock_bricks.json b/src/generated/resources/data/malum/advancements/recipes/misc/runic_tainted_rock_bricks.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/runic_tainted_rock_bricks.json rename to src/generated/resources/data/malum/advancements/recipes/misc/runic_tainted_rock_bricks.json index 3165788dd..b5a9dfc81 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/runic_tainted_rock_bricks.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/runic_tainted_rock_bricks.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:runic_tainted_rock_bricks" - ] - }, "criteria": { "has_tainted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:runic_tainted_rock_bricks" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_tainted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:runic_tainted_rock_bricks" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/runic_tainted_rock_bricks_slab.json b/src/generated/resources/data/malum/advancements/recipes/misc/runic_tainted_rock_bricks_slab.json similarity index 78% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/runic_tainted_rock_bricks_slab.json rename to src/generated/resources/data/malum/advancements/recipes/misc/runic_tainted_rock_bricks_slab.json index 8c481cf65..d0d5c9d20 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/runic_tainted_rock_bricks_slab.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/runic_tainted_rock_bricks_slab.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:runic_tainted_rock_bricks_slab" - ] - }, "criteria": { "has_cracked_tainted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:runic_tainted_rock_bricks_slab" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_cracked_tainted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:runic_tainted_rock_bricks_slab" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/runic_tainted_rock_bricks_stairs.json b/src/generated/resources/data/malum/advancements/recipes/misc/runic_tainted_rock_bricks_stairs.json similarity index 78% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/runic_tainted_rock_bricks_stairs.json rename to src/generated/resources/data/malum/advancements/recipes/misc/runic_tainted_rock_bricks_stairs.json index fcb32121c..75d5d7ce8 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/runic_tainted_rock_bricks_stairs.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/runic_tainted_rock_bricks_stairs.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:runic_tainted_rock_bricks_stairs" - ] - }, "criteria": { "has_cracked_tainted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:runic_tainted_rock_bricks_stairs" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_cracked_tainted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:runic_tainted_rock_bricks_stairs" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/runic_tainted_rock_bricks_wall.json b/src/generated/resources/data/malum/advancements/recipes/misc/runic_tainted_rock_bricks_wall.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/runic_tainted_rock_bricks_wall.json rename to src/generated/resources/data/malum/advancements/recipes/misc/runic_tainted_rock_bricks_wall.json index 9ec697ddd..8e3fdf4a2 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/runic_tainted_rock_bricks_wall.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/runic_tainted_rock_bricks_wall.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:runic_tainted_rock_bricks_wall" - ] - }, "criteria": { "has_tainted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:runic_tainted_rock_bricks_wall" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_tainted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:runic_tainted_rock_bricks_wall" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/runic_tainted_rock_tiles.json b/src/generated/resources/data/malum/advancements/recipes/misc/runic_tainted_rock_tiles.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/runic_tainted_rock_tiles.json rename to src/generated/resources/data/malum/advancements/recipes/misc/runic_tainted_rock_tiles.json index 697922317..b89403d08 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/runic_tainted_rock_tiles.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/runic_tainted_rock_tiles.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:runic_tainted_rock_tiles" - ] - }, "criteria": { "has_tainted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:runic_tainted_rock_tiles" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_tainted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:runic_tainted_rock_tiles" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/runic_tainted_rock_tiles_slab.json b/src/generated/resources/data/malum/advancements/recipes/misc/runic_tainted_rock_tiles_slab.json similarity index 78% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/runic_tainted_rock_tiles_slab.json rename to src/generated/resources/data/malum/advancements/recipes/misc/runic_tainted_rock_tiles_slab.json index 7c6426992..dc9b0217a 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/runic_tainted_rock_tiles_slab.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/runic_tainted_rock_tiles_slab.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:runic_tainted_rock_tiles_slab" - ] - }, "criteria": { "has_cracked_tainted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:runic_tainted_rock_tiles_slab" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_cracked_tainted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:runic_tainted_rock_tiles_slab" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/runic_tainted_rock_tiles_stairs.json b/src/generated/resources/data/malum/advancements/recipes/misc/runic_tainted_rock_tiles_stairs.json similarity index 78% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/runic_tainted_rock_tiles_stairs.json rename to src/generated/resources/data/malum/advancements/recipes/misc/runic_tainted_rock_tiles_stairs.json index 3a272dc5a..5a367c23f 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/runic_tainted_rock_tiles_stairs.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/runic_tainted_rock_tiles_stairs.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:runic_tainted_rock_tiles_stairs" - ] - }, "criteria": { "has_cracked_tainted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:runic_tainted_rock_tiles_stairs" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_cracked_tainted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:runic_tainted_rock_tiles_stairs" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/runic_tainted_rock_tiles_wall.json b/src/generated/resources/data/malum/advancements/recipes/misc/runic_tainted_rock_tiles_wall.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/runic_tainted_rock_tiles_wall.json rename to src/generated/resources/data/malum/advancements/recipes/misc/runic_tainted_rock_tiles_wall.json index d6c0e4a0c..596089545 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/runic_tainted_rock_tiles_wall.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/runic_tainted_rock_tiles_wall.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:runic_tainted_rock_tiles_wall" - ] - }, "criteria": { "has_tainted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:runic_tainted_rock_tiles_wall" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_tainted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:runic_tainted_rock_tiles_wall" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/runic_twisted_rock_bricks.json b/src/generated/resources/data/malum/advancements/recipes/misc/runic_twisted_rock_bricks.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/runic_twisted_rock_bricks.json rename to src/generated/resources/data/malum/advancements/recipes/misc/runic_twisted_rock_bricks.json index 264d3c36f..1cf8f2a6f 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/runic_twisted_rock_bricks.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/runic_twisted_rock_bricks.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:runic_twisted_rock_bricks" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "malum:runic_twisted_rock_bricks" + }, + "trigger": "minecraft:recipe_unlocked" + }, "has_twisted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "malum:runic_twisted_rock_bricks" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_twisted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:runic_twisted_rock_bricks" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/runic_twisted_rock_bricks_slab.json b/src/generated/resources/data/malum/advancements/recipes/misc/runic_twisted_rock_bricks_slab.json similarity index 78% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/runic_twisted_rock_bricks_slab.json rename to src/generated/resources/data/malum/advancements/recipes/misc/runic_twisted_rock_bricks_slab.json index 80a7569a4..349ae2542 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/runic_twisted_rock_bricks_slab.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/runic_twisted_rock_bricks_slab.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:runic_twisted_rock_bricks_slab" - ] - }, "criteria": { "has_cracked_twisted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:runic_twisted_rock_bricks_slab" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_cracked_twisted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:runic_twisted_rock_bricks_slab" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/runic_twisted_rock_bricks_stairs.json b/src/generated/resources/data/malum/advancements/recipes/misc/runic_twisted_rock_bricks_stairs.json similarity index 78% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/runic_twisted_rock_bricks_stairs.json rename to src/generated/resources/data/malum/advancements/recipes/misc/runic_twisted_rock_bricks_stairs.json index d38fe96a6..679187d73 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/runic_twisted_rock_bricks_stairs.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/runic_twisted_rock_bricks_stairs.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:runic_twisted_rock_bricks_stairs" - ] - }, "criteria": { "has_cracked_twisted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:runic_twisted_rock_bricks_stairs" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_cracked_twisted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:runic_twisted_rock_bricks_stairs" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/runic_twisted_rock_bricks_wall.json b/src/generated/resources/data/malum/advancements/recipes/misc/runic_twisted_rock_bricks_wall.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/runic_twisted_rock_bricks_wall.json rename to src/generated/resources/data/malum/advancements/recipes/misc/runic_twisted_rock_bricks_wall.json index 79c197278..413ed763c 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/runic_twisted_rock_bricks_wall.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/runic_twisted_rock_bricks_wall.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:runic_twisted_rock_bricks_wall" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "malum:runic_twisted_rock_bricks_wall" + }, + "trigger": "minecraft:recipe_unlocked" + }, "has_twisted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "malum:runic_twisted_rock_bricks_wall" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_twisted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:runic_twisted_rock_bricks_wall" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/runic_twisted_rock_tiles.json b/src/generated/resources/data/malum/advancements/recipes/misc/runic_twisted_rock_tiles.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/runic_twisted_rock_tiles.json rename to src/generated/resources/data/malum/advancements/recipes/misc/runic_twisted_rock_tiles.json index f86de08f3..e6b95a545 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/runic_twisted_rock_tiles.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/runic_twisted_rock_tiles.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:runic_twisted_rock_tiles" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "malum:runic_twisted_rock_tiles" + }, + "trigger": "minecraft:recipe_unlocked" + }, "has_twisted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "malum:runic_twisted_rock_tiles" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_twisted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:runic_twisted_rock_tiles" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/runic_twisted_rock_tiles_slab.json b/src/generated/resources/data/malum/advancements/recipes/misc/runic_twisted_rock_tiles_slab.json similarity index 78% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/runic_twisted_rock_tiles_slab.json rename to src/generated/resources/data/malum/advancements/recipes/misc/runic_twisted_rock_tiles_slab.json index 041df6a55..17de3e638 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/runic_twisted_rock_tiles_slab.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/runic_twisted_rock_tiles_slab.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:runic_twisted_rock_tiles_slab" - ] - }, "criteria": { "has_cracked_twisted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:runic_twisted_rock_tiles_slab" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_cracked_twisted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:runic_twisted_rock_tiles_slab" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/runic_twisted_rock_tiles_stairs.json b/src/generated/resources/data/malum/advancements/recipes/misc/runic_twisted_rock_tiles_stairs.json similarity index 78% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/runic_twisted_rock_tiles_stairs.json rename to src/generated/resources/data/malum/advancements/recipes/misc/runic_twisted_rock_tiles_stairs.json index 7d3841140..814a862cd 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/runic_twisted_rock_tiles_stairs.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/runic_twisted_rock_tiles_stairs.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:runic_twisted_rock_tiles_stairs" - ] - }, "criteria": { "has_cracked_twisted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:runic_twisted_rock_tiles_stairs" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_cracked_twisted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:runic_twisted_rock_tiles_stairs" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/runic_twisted_rock_tiles_wall.json b/src/generated/resources/data/malum/advancements/recipes/misc/runic_twisted_rock_tiles_wall.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/runic_twisted_rock_tiles_wall.json rename to src/generated/resources/data/malum/advancements/recipes/misc/runic_twisted_rock_tiles_wall.json index c97d07c67..165706816 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/runic_twisted_rock_tiles_wall.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/runic_twisted_rock_tiles_wall.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:runic_twisted_rock_tiles_wall" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "malum:runic_twisted_rock_tiles_wall" + }, + "trigger": "minecraft:recipe_unlocked" + }, "has_twisted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "malum:runic_twisted_rock_tiles_wall" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_twisted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:runic_twisted_rock_tiles_wall" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/decorations/skeleton_skull_from_grim_talc.json b/src/generated/resources/data/malum/advancements/recipes/misc/skeleton_skull_from_grim_talc.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/decorations/skeleton_skull_from_grim_talc.json rename to src/generated/resources/data/malum/advancements/recipes/misc/skeleton_skull_from_grim_talc.json index b2a5a58eb..6c3ce6404 100644 --- a/src/generated/resources/data/malum/advancements/recipes/decorations/skeleton_skull_from_grim_talc.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/skeleton_skull_from_grim_talc.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:skeleton_skull_from_grim_talc" - ] - }, "criteria": { "has_grim_talc": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:skeleton_skull_from_grim_talc" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_grim_talc", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:skeleton_skull_from_grim_talc" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/small_tainted_rock_bricks.json b/src/generated/resources/data/malum/advancements/recipes/misc/small_tainted_rock_bricks.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/small_tainted_rock_bricks.json rename to src/generated/resources/data/malum/advancements/recipes/misc/small_tainted_rock_bricks.json index 02f964395..56e0b802f 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/small_tainted_rock_bricks.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/small_tainted_rock_bricks.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:small_tainted_rock_bricks" - ] - }, "criteria": { "has_tainted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:small_tainted_rock_bricks" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_tainted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:small_tainted_rock_bricks" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/small_tainted_rock_bricks_slab.json b/src/generated/resources/data/malum/advancements/recipes/misc/small_tainted_rock_bricks_slab.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/small_tainted_rock_bricks_slab.json rename to src/generated/resources/data/malum/advancements/recipes/misc/small_tainted_rock_bricks_slab.json index 958d468ff..41cb38de1 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/small_tainted_rock_bricks_slab.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/small_tainted_rock_bricks_slab.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:small_tainted_rock_bricks_slab" - ] - }, "criteria": { "has_tainted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:small_tainted_rock_bricks_slab" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_tainted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:small_tainted_rock_bricks_slab" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/small_tainted_rock_bricks_slab_stonecutting.json b/src/generated/resources/data/malum/advancements/recipes/misc/small_tainted_rock_bricks_slab_stonecutting.json similarity index 78% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/small_tainted_rock_bricks_slab_stonecutting.json rename to src/generated/resources/data/malum/advancements/recipes/misc/small_tainted_rock_bricks_slab_stonecutting.json index 9f3a843ba..3dba4ad40 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/small_tainted_rock_bricks_slab_stonecutting.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/small_tainted_rock_bricks_slab_stonecutting.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:small_tainted_rock_bricks_slab_stonecutting" - ] - }, "criteria": { "has_tainted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:small_tainted_rock_bricks_slab_stonecutting" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_tainted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:small_tainted_rock_bricks_slab_stonecutting" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/small_tainted_rock_bricks_stairs.json b/src/generated/resources/data/malum/advancements/recipes/misc/small_tainted_rock_bricks_stairs.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/small_tainted_rock_bricks_stairs.json rename to src/generated/resources/data/malum/advancements/recipes/misc/small_tainted_rock_bricks_stairs.json index b8e2f8e5c..42a2863f4 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/small_tainted_rock_bricks_stairs.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/small_tainted_rock_bricks_stairs.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:small_tainted_rock_bricks_stairs" - ] - }, "criteria": { "has_tainted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:small_tainted_rock_bricks_stairs" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_tainted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:small_tainted_rock_bricks_stairs" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/small_tainted_rock_bricks_stairs_stonecutting.json b/src/generated/resources/data/malum/advancements/recipes/misc/small_tainted_rock_bricks_stairs_stonecutting.json similarity index 78% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/small_tainted_rock_bricks_stairs_stonecutting.json rename to src/generated/resources/data/malum/advancements/recipes/misc/small_tainted_rock_bricks_stairs_stonecutting.json index e4f1da91f..91611c50f 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/small_tainted_rock_bricks_stairs_stonecutting.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/small_tainted_rock_bricks_stairs_stonecutting.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:small_tainted_rock_bricks_stairs_stonecutting" - ] - }, "criteria": { "has_tainted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:small_tainted_rock_bricks_stairs_stonecutting" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_tainted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:small_tainted_rock_bricks_stairs_stonecutting" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/small_tainted_rock_bricks_stonecutting.json b/src/generated/resources/data/malum/advancements/recipes/misc/small_tainted_rock_bricks_stonecutting.json similarity index 78% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/small_tainted_rock_bricks_stonecutting.json rename to src/generated/resources/data/malum/advancements/recipes/misc/small_tainted_rock_bricks_stonecutting.json index 109272f02..80965d843 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/small_tainted_rock_bricks_stonecutting.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/small_tainted_rock_bricks_stonecutting.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:small_tainted_rock_bricks_stonecutting" - ] - }, "criteria": { "has_tainted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:small_tainted_rock_bricks_stonecutting" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_tainted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:small_tainted_rock_bricks_stonecutting" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/small_tainted_rock_bricks_stonecutting_alt.json b/src/generated/resources/data/malum/advancements/recipes/misc/small_tainted_rock_bricks_stonecutting_alt.json similarity index 78% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/small_tainted_rock_bricks_stonecutting_alt.json rename to src/generated/resources/data/malum/advancements/recipes/misc/small_tainted_rock_bricks_stonecutting_alt.json index 0e58019d2..912edcacf 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/small_tainted_rock_bricks_stonecutting_alt.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/small_tainted_rock_bricks_stonecutting_alt.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:small_tainted_rock_bricks_stonecutting_alt" - ] - }, "criteria": { "has_tainted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:small_tainted_rock_bricks_stonecutting_alt" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_tainted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:small_tainted_rock_bricks_stonecutting_alt" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/small_tainted_rock_bricks_stonecutting_from_bricks.json b/src/generated/resources/data/malum/advancements/recipes/misc/small_tainted_rock_bricks_stonecutting_from_bricks.json similarity index 79% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/small_tainted_rock_bricks_stonecutting_from_bricks.json rename to src/generated/resources/data/malum/advancements/recipes/misc/small_tainted_rock_bricks_stonecutting_from_bricks.json index 5f79a5ff0..e316a0783 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/small_tainted_rock_bricks_stonecutting_from_bricks.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/small_tainted_rock_bricks_stonecutting_from_bricks.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:small_tainted_rock_bricks_stonecutting_from_bricks" - ] - }, "criteria": { "has_tainted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:small_tainted_rock_bricks_stonecutting_from_bricks" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_tainted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:small_tainted_rock_bricks_stonecutting_from_bricks" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/small_tainted_rock_bricks_stonecutting_from_tiles.json b/src/generated/resources/data/malum/advancements/recipes/misc/small_tainted_rock_bricks_stonecutting_from_tiles.json similarity index 79% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/small_tainted_rock_bricks_stonecutting_from_tiles.json rename to src/generated/resources/data/malum/advancements/recipes/misc/small_tainted_rock_bricks_stonecutting_from_tiles.json index 2f9f73d68..ddefde6e2 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/small_tainted_rock_bricks_stonecutting_from_tiles.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/small_tainted_rock_bricks_stonecutting_from_tiles.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:small_tainted_rock_bricks_stonecutting_from_tiles" - ] - }, "criteria": { "has_tainted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:small_tainted_rock_bricks_stonecutting_from_tiles" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_tainted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:small_tainted_rock_bricks_stonecutting_from_tiles" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/small_tainted_rock_bricks_wall.json b/src/generated/resources/data/malum/advancements/recipes/misc/small_tainted_rock_bricks_wall.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/small_tainted_rock_bricks_wall.json rename to src/generated/resources/data/malum/advancements/recipes/misc/small_tainted_rock_bricks_wall.json index f7c22e5e0..e81194170 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/small_tainted_rock_bricks_wall.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/small_tainted_rock_bricks_wall.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:small_tainted_rock_bricks_wall" - ] - }, "criteria": { "has_tainted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:small_tainted_rock_bricks_wall" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_tainted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:small_tainted_rock_bricks_wall" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/small_tainted_rock_bricks_wall_stonecutting.json b/src/generated/resources/data/malum/advancements/recipes/misc/small_tainted_rock_bricks_wall_stonecutting.json similarity index 78% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/small_tainted_rock_bricks_wall_stonecutting.json rename to src/generated/resources/data/malum/advancements/recipes/misc/small_tainted_rock_bricks_wall_stonecutting.json index 10154c678..1a0463f00 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/small_tainted_rock_bricks_wall_stonecutting.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/small_tainted_rock_bricks_wall_stonecutting.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:small_tainted_rock_bricks_wall_stonecutting" - ] - }, "criteria": { "has_tainted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:small_tainted_rock_bricks_wall_stonecutting" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_tainted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:small_tainted_rock_bricks_wall_stonecutting" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/small_twisted_rock_bricks.json b/src/generated/resources/data/malum/advancements/recipes/misc/small_twisted_rock_bricks.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/small_twisted_rock_bricks.json rename to src/generated/resources/data/malum/advancements/recipes/misc/small_twisted_rock_bricks.json index 27e547286..5c6764964 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/small_twisted_rock_bricks.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/small_twisted_rock_bricks.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:small_twisted_rock_bricks" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "malum:small_twisted_rock_bricks" + }, + "trigger": "minecraft:recipe_unlocked" + }, "has_twisted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "malum:small_twisted_rock_bricks" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_twisted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:small_twisted_rock_bricks" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/small_twisted_rock_bricks_slab.json b/src/generated/resources/data/malum/advancements/recipes/misc/small_twisted_rock_bricks_slab.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/small_twisted_rock_bricks_slab.json rename to src/generated/resources/data/malum/advancements/recipes/misc/small_twisted_rock_bricks_slab.json index 192fd2de2..4c21d99cd 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/small_twisted_rock_bricks_slab.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/small_twisted_rock_bricks_slab.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:small_twisted_rock_bricks_slab" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "malum:small_twisted_rock_bricks_slab" + }, + "trigger": "minecraft:recipe_unlocked" + }, "has_twisted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "malum:small_twisted_rock_bricks_slab" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_twisted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:small_twisted_rock_bricks_slab" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/small_twisted_rock_bricks_slab_stonecutting.json b/src/generated/resources/data/malum/advancements/recipes/misc/small_twisted_rock_bricks_slab_stonecutting.json similarity index 78% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/small_twisted_rock_bricks_slab_stonecutting.json rename to src/generated/resources/data/malum/advancements/recipes/misc/small_twisted_rock_bricks_slab_stonecutting.json index a6080e35f..45b7128bd 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/small_twisted_rock_bricks_slab_stonecutting.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/small_twisted_rock_bricks_slab_stonecutting.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:small_twisted_rock_bricks_slab_stonecutting" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "malum:small_twisted_rock_bricks_slab_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + }, "has_twisted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "malum:small_twisted_rock_bricks_slab_stonecutting" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_twisted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:small_twisted_rock_bricks_slab_stonecutting" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/small_twisted_rock_bricks_stairs.json b/src/generated/resources/data/malum/advancements/recipes/misc/small_twisted_rock_bricks_stairs.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/small_twisted_rock_bricks_stairs.json rename to src/generated/resources/data/malum/advancements/recipes/misc/small_twisted_rock_bricks_stairs.json index b907815d5..ab5fb8076 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/small_twisted_rock_bricks_stairs.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/small_twisted_rock_bricks_stairs.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:small_twisted_rock_bricks_stairs" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "malum:small_twisted_rock_bricks_stairs" + }, + "trigger": "minecraft:recipe_unlocked" + }, "has_twisted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "malum:small_twisted_rock_bricks_stairs" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_twisted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:small_twisted_rock_bricks_stairs" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/small_twisted_rock_bricks_stairs_stonecutting.json b/src/generated/resources/data/malum/advancements/recipes/misc/small_twisted_rock_bricks_stairs_stonecutting.json similarity index 78% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/small_twisted_rock_bricks_stairs_stonecutting.json rename to src/generated/resources/data/malum/advancements/recipes/misc/small_twisted_rock_bricks_stairs_stonecutting.json index 3bf2c16b2..4d80d00ce 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/small_twisted_rock_bricks_stairs_stonecutting.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/small_twisted_rock_bricks_stairs_stonecutting.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:small_twisted_rock_bricks_stairs_stonecutting" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "malum:small_twisted_rock_bricks_stairs_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + }, "has_twisted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "malum:small_twisted_rock_bricks_stairs_stonecutting" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_twisted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:small_twisted_rock_bricks_stairs_stonecutting" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/small_twisted_rock_bricks_stonecutting.json b/src/generated/resources/data/malum/advancements/recipes/misc/small_twisted_rock_bricks_stonecutting.json similarity index 78% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/small_twisted_rock_bricks_stonecutting.json rename to src/generated/resources/data/malum/advancements/recipes/misc/small_twisted_rock_bricks_stonecutting.json index a03f8c6c8..1e4063c3a 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/small_twisted_rock_bricks_stonecutting.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/small_twisted_rock_bricks_stonecutting.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:small_twisted_rock_bricks_stonecutting" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "malum:small_twisted_rock_bricks_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + }, "has_twisted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "malum:small_twisted_rock_bricks_stonecutting" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_twisted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:small_twisted_rock_bricks_stonecutting" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/small_twisted_rock_bricks_stonecutting_alt.json b/src/generated/resources/data/malum/advancements/recipes/misc/small_twisted_rock_bricks_stonecutting_alt.json similarity index 78% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/small_twisted_rock_bricks_stonecutting_alt.json rename to src/generated/resources/data/malum/advancements/recipes/misc/small_twisted_rock_bricks_stonecutting_alt.json index dc459af5b..feb813ff7 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/small_twisted_rock_bricks_stonecutting_alt.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/small_twisted_rock_bricks_stonecutting_alt.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:small_twisted_rock_bricks_stonecutting_alt" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "malum:small_twisted_rock_bricks_stonecutting_alt" + }, + "trigger": "minecraft:recipe_unlocked" + }, "has_twisted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "malum:small_twisted_rock_bricks_stonecutting_alt" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_twisted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:small_twisted_rock_bricks_stonecutting_alt" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/small_twisted_rock_bricks_stonecutting_from_bricks.json b/src/generated/resources/data/malum/advancements/recipes/misc/small_twisted_rock_bricks_stonecutting_from_bricks.json similarity index 79% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/small_twisted_rock_bricks_stonecutting_from_bricks.json rename to src/generated/resources/data/malum/advancements/recipes/misc/small_twisted_rock_bricks_stonecutting_from_bricks.json index 960464eb7..f37fce5ee 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/small_twisted_rock_bricks_stonecutting_from_bricks.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/small_twisted_rock_bricks_stonecutting_from_bricks.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:small_twisted_rock_bricks_stonecutting_from_bricks" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "malum:small_twisted_rock_bricks_stonecutting_from_bricks" + }, + "trigger": "minecraft:recipe_unlocked" + }, "has_twisted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "malum:small_twisted_rock_bricks_stonecutting_from_bricks" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_twisted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:small_twisted_rock_bricks_stonecutting_from_bricks" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/small_twisted_rock_bricks_stonecutting_from_tiles.json b/src/generated/resources/data/malum/advancements/recipes/misc/small_twisted_rock_bricks_stonecutting_from_tiles.json similarity index 79% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/small_twisted_rock_bricks_stonecutting_from_tiles.json rename to src/generated/resources/data/malum/advancements/recipes/misc/small_twisted_rock_bricks_stonecutting_from_tiles.json index 786511e17..b43daa81b 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/small_twisted_rock_bricks_stonecutting_from_tiles.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/small_twisted_rock_bricks_stonecutting_from_tiles.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:small_twisted_rock_bricks_stonecutting_from_tiles" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "malum:small_twisted_rock_bricks_stonecutting_from_tiles" + }, + "trigger": "minecraft:recipe_unlocked" + }, "has_twisted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "malum:small_twisted_rock_bricks_stonecutting_from_tiles" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_twisted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:small_twisted_rock_bricks_stonecutting_from_tiles" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/small_twisted_rock_bricks_wall.json b/src/generated/resources/data/malum/advancements/recipes/misc/small_twisted_rock_bricks_wall.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/small_twisted_rock_bricks_wall.json rename to src/generated/resources/data/malum/advancements/recipes/misc/small_twisted_rock_bricks_wall.json index 7606fc36a..ecc23c545 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/small_twisted_rock_bricks_wall.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/small_twisted_rock_bricks_wall.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:small_twisted_rock_bricks_wall" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "malum:small_twisted_rock_bricks_wall" + }, + "trigger": "minecraft:recipe_unlocked" + }, "has_twisted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "malum:small_twisted_rock_bricks_wall" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_twisted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:small_twisted_rock_bricks_wall" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/small_twisted_rock_bricks_wall_stonecutting.json b/src/generated/resources/data/malum/advancements/recipes/misc/small_twisted_rock_bricks_wall_stonecutting.json similarity index 78% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/small_twisted_rock_bricks_wall_stonecutting.json rename to src/generated/resources/data/malum/advancements/recipes/misc/small_twisted_rock_bricks_wall_stonecutting.json index 4de52e3f2..5803b01aa 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/small_twisted_rock_bricks_wall_stonecutting.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/small_twisted_rock_bricks_wall_stonecutting.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:small_twisted_rock_bricks_wall_stonecutting" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "malum:small_twisted_rock_bricks_wall_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + }, "has_twisted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "malum:small_twisted_rock_bricks_wall_stonecutting" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_twisted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:small_twisted_rock_bricks_wall_stonecutting" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/smooth_tainted_rock.json b/src/generated/resources/data/malum/advancements/recipes/misc/smooth_tainted_rock.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/smooth_tainted_rock.json rename to src/generated/resources/data/malum/advancements/recipes/misc/smooth_tainted_rock.json index 8322f5b6c..9cdba071c 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/smooth_tainted_rock.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/smooth_tainted_rock.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:smooth_tainted_rock" - ] - }, "criteria": { "has_tainted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:smooth_tainted_rock" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_tainted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:smooth_tainted_rock" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/smooth_tainted_rock_slab.json b/src/generated/resources/data/malum/advancements/recipes/misc/smooth_tainted_rock_slab.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/smooth_tainted_rock_slab.json rename to src/generated/resources/data/malum/advancements/recipes/misc/smooth_tainted_rock_slab.json index 9b6cd2a05..b11fcf5ce 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/smooth_tainted_rock_slab.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/smooth_tainted_rock_slab.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:smooth_tainted_rock_slab" - ] - }, "criteria": { "has_tainted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:smooth_tainted_rock_slab" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_tainted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:smooth_tainted_rock_slab" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/smooth_tainted_rock_slab_stonecutting.json b/src/generated/resources/data/malum/advancements/recipes/misc/smooth_tainted_rock_slab_stonecutting.json similarity index 79% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/smooth_tainted_rock_slab_stonecutting.json rename to src/generated/resources/data/malum/advancements/recipes/misc/smooth_tainted_rock_slab_stonecutting.json index b77709295..e57deac14 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/smooth_tainted_rock_slab_stonecutting.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/smooth_tainted_rock_slab_stonecutting.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:smooth_tainted_rock_slab_stonecutting" - ] - }, "criteria": { "has_smooth_tainted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:smooth_tainted_rock_slab_stonecutting" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_smooth_tainted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:smooth_tainted_rock_slab_stonecutting" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/smooth_tainted_rock_stairs.json b/src/generated/resources/data/malum/advancements/recipes/misc/smooth_tainted_rock_stairs.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/smooth_tainted_rock_stairs.json rename to src/generated/resources/data/malum/advancements/recipes/misc/smooth_tainted_rock_stairs.json index 2beff05e5..7d727a13f 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/smooth_tainted_rock_stairs.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/smooth_tainted_rock_stairs.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:smooth_tainted_rock_stairs" - ] - }, "criteria": { "has_tainted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:smooth_tainted_rock_stairs" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_tainted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:smooth_tainted_rock_stairs" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/smooth_tainted_rock_stairs_stonecutting.json b/src/generated/resources/data/malum/advancements/recipes/misc/smooth_tainted_rock_stairs_stonecutting.json similarity index 79% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/smooth_tainted_rock_stairs_stonecutting.json rename to src/generated/resources/data/malum/advancements/recipes/misc/smooth_tainted_rock_stairs_stonecutting.json index 28feecd8a..41f97b42e 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/smooth_tainted_rock_stairs_stonecutting.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/smooth_tainted_rock_stairs_stonecutting.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:smooth_tainted_rock_stairs_stonecutting" - ] - }, "criteria": { "has_smooth_tainted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:smooth_tainted_rock_stairs_stonecutting" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_smooth_tainted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:smooth_tainted_rock_stairs_stonecutting" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/smooth_tainted_rock_stonecutting.json b/src/generated/resources/data/malum/advancements/recipes/misc/smooth_tainted_rock_stonecutting.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/smooth_tainted_rock_stonecutting.json rename to src/generated/resources/data/malum/advancements/recipes/misc/smooth_tainted_rock_stonecutting.json index 94ae6b9ff..bdd89e6d1 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/smooth_tainted_rock_stonecutting.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/smooth_tainted_rock_stonecutting.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:smooth_tainted_rock_stonecutting" - ] - }, "criteria": { "has_tainted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:smooth_tainted_rock_stonecutting" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_tainted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:smooth_tainted_rock_stonecutting" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/smooth_twisted_rock.json b/src/generated/resources/data/malum/advancements/recipes/misc/smooth_twisted_rock.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/smooth_twisted_rock.json rename to src/generated/resources/data/malum/advancements/recipes/misc/smooth_twisted_rock.json index 9ba8fe3b3..f37b9a6d8 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/smooth_twisted_rock.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/smooth_twisted_rock.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:smooth_twisted_rock" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "malum:smooth_twisted_rock" + }, + "trigger": "minecraft:recipe_unlocked" + }, "has_twisted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "malum:smooth_twisted_rock" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_twisted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:smooth_twisted_rock" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/smooth_twisted_rock_slab.json b/src/generated/resources/data/malum/advancements/recipes/misc/smooth_twisted_rock_slab.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/smooth_twisted_rock_slab.json rename to src/generated/resources/data/malum/advancements/recipes/misc/smooth_twisted_rock_slab.json index 5b2cf49ac..b6b5a75c1 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/smooth_twisted_rock_slab.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/smooth_twisted_rock_slab.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:smooth_twisted_rock_slab" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "malum:smooth_twisted_rock_slab" + }, + "trigger": "minecraft:recipe_unlocked" + }, "has_twisted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "malum:smooth_twisted_rock_slab" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_twisted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:smooth_twisted_rock_slab" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/smooth_twisted_rock_slab_stonecutting.json b/src/generated/resources/data/malum/advancements/recipes/misc/smooth_twisted_rock_slab_stonecutting.json similarity index 79% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/smooth_twisted_rock_slab_stonecutting.json rename to src/generated/resources/data/malum/advancements/recipes/misc/smooth_twisted_rock_slab_stonecutting.json index ae4b95d06..579e0ad24 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/smooth_twisted_rock_slab_stonecutting.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/smooth_twisted_rock_slab_stonecutting.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:smooth_twisted_rock_slab_stonecutting" - ] - }, "criteria": { "has_smooth_twisted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:smooth_twisted_rock_slab_stonecutting" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_smooth_twisted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:smooth_twisted_rock_slab_stonecutting" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/smooth_twisted_rock_stairs.json b/src/generated/resources/data/malum/advancements/recipes/misc/smooth_twisted_rock_stairs.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/smooth_twisted_rock_stairs.json rename to src/generated/resources/data/malum/advancements/recipes/misc/smooth_twisted_rock_stairs.json index 2721c8ab5..1d8a09941 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/smooth_twisted_rock_stairs.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/smooth_twisted_rock_stairs.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:smooth_twisted_rock_stairs" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "malum:smooth_twisted_rock_stairs" + }, + "trigger": "minecraft:recipe_unlocked" + }, "has_twisted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "malum:smooth_twisted_rock_stairs" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_twisted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:smooth_twisted_rock_stairs" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/smooth_twisted_rock_stairs_stonecutting.json b/src/generated/resources/data/malum/advancements/recipes/misc/smooth_twisted_rock_stairs_stonecutting.json similarity index 79% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/smooth_twisted_rock_stairs_stonecutting.json rename to src/generated/resources/data/malum/advancements/recipes/misc/smooth_twisted_rock_stairs_stonecutting.json index f6235f6c3..ced5bc59f 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/smooth_twisted_rock_stairs_stonecutting.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/smooth_twisted_rock_stairs_stonecutting.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:smooth_twisted_rock_stairs_stonecutting" - ] - }, "criteria": { "has_smooth_twisted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:smooth_twisted_rock_stairs_stonecutting" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_smooth_twisted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:smooth_twisted_rock_stairs_stonecutting" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/smooth_twisted_rock_stonecutting.json b/src/generated/resources/data/malum/advancements/recipes/misc/smooth_twisted_rock_stonecutting.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/smooth_twisted_rock_stonecutting.json rename to src/generated/resources/data/malum/advancements/recipes/misc/smooth_twisted_rock_stonecutting.json index 533073c8e..3e6b7a806 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/smooth_twisted_rock_stonecutting.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/smooth_twisted_rock_stonecutting.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:smooth_twisted_rock_stonecutting" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "malum:smooth_twisted_rock_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + }, "has_twisted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "malum:smooth_twisted_rock_stonecutting" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_twisted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:smooth_twisted_rock_stonecutting" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/solid_runewood_trapdoor.json b/src/generated/resources/data/malum/advancements/recipes/misc/solid_runewood_trapdoor.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/solid_runewood_trapdoor.json rename to src/generated/resources/data/malum/advancements/recipes/misc/solid_runewood_trapdoor.json index 5fb69ac3a..fb9d005af 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/solid_runewood_trapdoor.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/solid_runewood_trapdoor.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:solid_runewood_trapdoor" - ] - }, "criteria": { "has_input": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:solid_runewood_trapdoor" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_input", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:solid_runewood_trapdoor" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/solid_soulwood_trapdoor.json b/src/generated/resources/data/malum/advancements/recipes/misc/solid_soulwood_trapdoor.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/solid_soulwood_trapdoor.json rename to src/generated/resources/data/malum/advancements/recipes/misc/solid_soulwood_trapdoor.json index 56c70a9cc..c07394cd0 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/solid_soulwood_trapdoor.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/solid_soulwood_trapdoor.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:solid_soulwood_trapdoor" - ] - }, "criteria": { "has_input": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:solid_soulwood_trapdoor" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_input", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:solid_soulwood_trapdoor" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/soul_stained_steel_axe.json b/src/generated/resources/data/malum/advancements/recipes/misc/soul_stained_steel_axe.json similarity index 78% rename from src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/soul_stained_steel_axe.json rename to src/generated/resources/data/malum/advancements/recipes/misc/soul_stained_steel_axe.json index a67eb8537..1e10d5cc1 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/soul_stained_steel_axe.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/soul_stained_steel_axe.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:soul_stained_steel_axe" - ] - }, "criteria": { "has_soul_stained_steel": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:soul_stained_steel_axe" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_soul_stained_steel", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:soul_stained_steel_axe" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/soul_stained_steel_from_block.json b/src/generated/resources/data/malum/advancements/recipes/misc/soul_stained_steel_from_block.json similarity index 78% rename from src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/soul_stained_steel_from_block.json rename to src/generated/resources/data/malum/advancements/recipes/misc/soul_stained_steel_from_block.json index b7a65a913..020caab0a 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/soul_stained_steel_from_block.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/soul_stained_steel_from_block.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:soul_stained_steel_from_block" - ] - }, "criteria": { "has_soul_stained_steel": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:soul_stained_steel_from_block" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_soul_stained_steel", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:soul_stained_steel_from_block" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/soul_stained_steel_from_nuggets.json b/src/generated/resources/data/malum/advancements/recipes/misc/soul_stained_steel_from_nuggets.json similarity index 78% rename from src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/soul_stained_steel_from_nuggets.json rename to src/generated/resources/data/malum/advancements/recipes/misc/soul_stained_steel_from_nuggets.json index 8cbf72744..84745fe08 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/soul_stained_steel_from_nuggets.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/soul_stained_steel_from_nuggets.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:soul_stained_steel_from_nuggets" - ] - }, "criteria": { "has_soul_stained_steel": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:soul_stained_steel_from_nuggets" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_soul_stained_steel", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:soul_stained_steel_from_nuggets" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/soul_stained_steel_hoe.json b/src/generated/resources/data/malum/advancements/recipes/misc/soul_stained_steel_hoe.json similarity index 78% rename from src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/soul_stained_steel_hoe.json rename to src/generated/resources/data/malum/advancements/recipes/misc/soul_stained_steel_hoe.json index 17c105094..04cff9925 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/soul_stained_steel_hoe.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/soul_stained_steel_hoe.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:soul_stained_steel_hoe" - ] - }, "criteria": { "has_soul_stained_steel": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:soul_stained_steel_hoe" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_soul_stained_steel", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:soul_stained_steel_hoe" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/soul_stained_steel_nugget.json b/src/generated/resources/data/malum/advancements/recipes/misc/soul_stained_steel_nugget.json similarity index 78% rename from src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/soul_stained_steel_nugget.json rename to src/generated/resources/data/malum/advancements/recipes/misc/soul_stained_steel_nugget.json index aa95e082a..297b89466 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/soul_stained_steel_nugget.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/soul_stained_steel_nugget.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:soul_stained_steel_nugget" - ] - }, "criteria": { "has_soul_stained_steel": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:soul_stained_steel_nugget" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_soul_stained_steel", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:soul_stained_steel_nugget" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/soul_stained_steel_pickaxe.json b/src/generated/resources/data/malum/advancements/recipes/misc/soul_stained_steel_pickaxe.json similarity index 78% rename from src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/soul_stained_steel_pickaxe.json rename to src/generated/resources/data/malum/advancements/recipes/misc/soul_stained_steel_pickaxe.json index 295e2eb8b..1435db724 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/soul_stained_steel_pickaxe.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/soul_stained_steel_pickaxe.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:soul_stained_steel_pickaxe" - ] - }, "criteria": { "has_soul_stained_steel": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:soul_stained_steel_pickaxe" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_soul_stained_steel", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:soul_stained_steel_pickaxe" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/soul_stained_steel_shovel.json b/src/generated/resources/data/malum/advancements/recipes/misc/soul_stained_steel_shovel.json similarity index 78% rename from src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/soul_stained_steel_shovel.json rename to src/generated/resources/data/malum/advancements/recipes/misc/soul_stained_steel_shovel.json index a8e130a7e..a940dee9b 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/soul_stained_steel_shovel.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/soul_stained_steel_shovel.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:soul_stained_steel_shovel" - ] - }, "criteria": { "has_soul_stained_steel": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:soul_stained_steel_shovel" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_soul_stained_steel", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:soul_stained_steel_shovel" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/soul_stained_steel_sword.json b/src/generated/resources/data/malum/advancements/recipes/misc/soul_stained_steel_sword.json similarity index 78% rename from src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/soul_stained_steel_sword.json rename to src/generated/resources/data/malum/advancements/recipes/misc/soul_stained_steel_sword.json index 75a2c846f..986a50b18 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/soul_stained_steel_sword.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/soul_stained_steel_sword.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:soul_stained_steel_sword" - ] - }, "criteria": { "has_soul_stained_steel": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:soul_stained_steel_sword" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_soul_stained_steel", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:soul_stained_steel_sword" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/soulstone_from_blasting.json b/src/generated/resources/data/malum/advancements/recipes/misc/soulstone_from_blasting.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/soulstone_from_blasting.json rename to src/generated/resources/data/malum/advancements/recipes/misc/soulstone_from_blasting.json index 0dd7afbc4..9789da5de 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/soulstone_from_blasting.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/soulstone_from_blasting.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:soulstone_from_blasting" - ] - }, "criteria": { "has_soulstone": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:soulstone_from_blasting" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_soulstone", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:soulstone_from_blasting" + ] + }, + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/soulstone_from_block.json b/src/generated/resources/data/malum/advancements/recipes/misc/soulstone_from_block.json similarity index 76% rename from src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/soulstone_from_block.json rename to src/generated/resources/data/malum/advancements/recipes/misc/soulstone_from_block.json index e98c34b8e..72f287558 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/soulstone_from_block.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/soulstone_from_block.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:soulstone_from_block" - ] - }, "criteria": { "has_soulstone": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:soulstone_from_block" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_soulstone", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:soulstone_from_block" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/soulstone_from_crushed_blasting.json b/src/generated/resources/data/malum/advancements/recipes/misc/soulstone_from_crushed_blasting.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/soulstone_from_crushed_blasting.json rename to src/generated/resources/data/malum/advancements/recipes/misc/soulstone_from_crushed_blasting.json index b9da4dbd2..603e3ad3a 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/soulstone_from_crushed_blasting.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/soulstone_from_crushed_blasting.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:soulstone_from_crushed_blasting" - ] - }, "criteria": { "has_soulstone": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:soulstone_from_crushed_blasting" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_soulstone", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:soulstone_from_crushed_blasting" + ] + }, + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/soulstone_from_crushed_smelting.json b/src/generated/resources/data/malum/advancements/recipes/misc/soulstone_from_crushed_smelting.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/soulstone_from_crushed_smelting.json rename to src/generated/resources/data/malum/advancements/recipes/misc/soulstone_from_crushed_smelting.json index d677a002a..a14edaa2b 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/soulstone_from_crushed_smelting.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/soulstone_from_crushed_smelting.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:soulstone_from_crushed_smelting" - ] - }, "criteria": { "has_soulstone": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:soulstone_from_crushed_smelting" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_soulstone", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:soulstone_from_crushed_smelting" + ] + }, + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/soulstone_from_deepslate_blasting.json b/src/generated/resources/data/malum/advancements/recipes/misc/soulstone_from_deepslate_blasting.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/soulstone_from_deepslate_blasting.json rename to src/generated/resources/data/malum/advancements/recipes/misc/soulstone_from_deepslate_blasting.json index 75e4724d7..62ae2331f 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/soulstone_from_deepslate_blasting.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/soulstone_from_deepslate_blasting.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:soulstone_from_deepslate_blasting" - ] - }, "criteria": { "has_soulstone": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:soulstone_from_deepslate_blasting" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_soulstone", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:soulstone_from_deepslate_blasting" + ] + }, + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/soulstone_from_deepslate_smelting.json b/src/generated/resources/data/malum/advancements/recipes/misc/soulstone_from_deepslate_smelting.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/soulstone_from_deepslate_smelting.json rename to src/generated/resources/data/malum/advancements/recipes/misc/soulstone_from_deepslate_smelting.json index 070ce21b7..0a10c9e39 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/soulstone_from_deepslate_smelting.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/soulstone_from_deepslate_smelting.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:soulstone_from_deepslate_smelting" - ] - }, "criteria": { "has_soulstone": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:soulstone_from_deepslate_smelting" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_soulstone", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:soulstone_from_deepslate_smelting" + ] + }, + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/soulstone_from_raw_blasting.json b/src/generated/resources/data/malum/advancements/recipes/misc/soulstone_from_raw_blasting.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/soulstone_from_raw_blasting.json rename to src/generated/resources/data/malum/advancements/recipes/misc/soulstone_from_raw_blasting.json index c5f386479..7feffd756 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/soulstone_from_raw_blasting.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/soulstone_from_raw_blasting.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:soulstone_from_raw_blasting" - ] - }, "criteria": { "has_soulstone": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:soulstone_from_raw_blasting" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_soulstone", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:soulstone_from_raw_blasting" + ] + }, + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/soulstone_from_raw_smelting.json b/src/generated/resources/data/malum/advancements/recipes/misc/soulstone_from_raw_smelting.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/soulstone_from_raw_smelting.json rename to src/generated/resources/data/malum/advancements/recipes/misc/soulstone_from_raw_smelting.json index 208b51af2..d18ac5213 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/soulstone_from_raw_smelting.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/soulstone_from_raw_smelting.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:soulstone_from_raw_smelting" - ] - }, "criteria": { "has_soulstone": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:soulstone_from_raw_smelting" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_soulstone", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:soulstone_from_raw_smelting" + ] + }, + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/soulstone_from_smelting.json b/src/generated/resources/data/malum/advancements/recipes/misc/soulstone_from_smelting.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/soulstone_from_smelting.json rename to src/generated/resources/data/malum/advancements/recipes/misc/soulstone_from_smelting.json index 007de6b2f..0e4d93e2b 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/soulstone_from_smelting.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/soulstone_from_smelting.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:soulstone_from_smelting" - ] - }, "criteria": { "has_soulstone": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:soulstone_from_smelting" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_soulstone", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:soulstone_from_smelting" + ] + }, + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/soulwood.json b/src/generated/resources/data/malum/advancements/recipes/misc/soulwood.json similarity index 75% rename from src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/soulwood.json rename to src/generated/resources/data/malum/advancements/recipes/misc/soulwood.json index bf252b3ea..6b72e14cf 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/soulwood.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/soulwood.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:soulwood" - ] - }, "criteria": { "has_log": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:soulwood" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_log", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:soulwood" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/soulwood_beam.json b/src/generated/resources/data/malum/advancements/recipes/misc/soulwood_beam.json similarity index 76% rename from src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/soulwood_beam.json rename to src/generated/resources/data/malum/advancements/recipes/misc/soulwood_beam.json index f3ddce379..8ad9afdd5 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/soulwood_beam.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/soulwood_beam.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:soulwood_beam" - ] - }, "criteria": { "has_soulwood_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:soulwood_beam" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_soulwood_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:soulwood_beam" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/soulwood_boat.json b/src/generated/resources/data/malum/advancements/recipes/misc/soulwood_boat.json similarity index 76% rename from src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/soulwood_boat.json rename to src/generated/resources/data/malum/advancements/recipes/misc/soulwood_boat.json index 93166bc85..9024581e5 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/soulwood_boat.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/soulwood_boat.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:soulwood_boat" - ] - }, "criteria": { "has_soulwood_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:soulwood_boat" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_soulwood_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:soulwood_boat" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/soulwood_door.json b/src/generated/resources/data/malum/advancements/recipes/misc/soulwood_door.json similarity index 76% rename from src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/soulwood_door.json rename to src/generated/resources/data/malum/advancements/recipes/misc/soulwood_door.json index 64c43cd94..5a9ad5d83 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/soulwood_door.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/soulwood_door.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:soulwood_door" - ] - }, "criteria": { "has_input": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:soulwood_door" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_input", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:soulwood_door" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/soulwood_item_pedestal.json b/src/generated/resources/data/malum/advancements/recipes/misc/soulwood_item_pedestal.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/soulwood_item_pedestal.json rename to src/generated/resources/data/malum/advancements/recipes/misc/soulwood_item_pedestal.json index 89da580f6..441f82358 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/soulwood_item_pedestal.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/soulwood_item_pedestal.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:soulwood_item_pedestal" - ] - }, "criteria": { "has_soulwood_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:soulwood_item_pedestal" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_soulwood_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:soulwood_item_pedestal" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/soulwood_item_stand.json b/src/generated/resources/data/malum/advancements/recipes/misc/soulwood_item_stand.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/soulwood_item_stand.json rename to src/generated/resources/data/malum/advancements/recipes/misc/soulwood_item_stand.json index cda7447e7..67f96c5e6 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/soulwood_item_stand.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/soulwood_item_stand.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:soulwood_item_stand" - ] - }, "criteria": { "has_soulwood_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:soulwood_item_stand" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_soulwood_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:soulwood_item_stand" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/soulwood_panel.json b/src/generated/resources/data/malum/advancements/recipes/misc/soulwood_panel.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/soulwood_panel.json rename to src/generated/resources/data/malum/advancements/recipes/misc/soulwood_panel.json index 303f55d2d..2ab33eac4 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/soulwood_panel.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/soulwood_panel.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:soulwood_panel" - ] - }, "criteria": { "has_soulwood_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:soulwood_panel" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_soulwood_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:soulwood_panel" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/soulwood_panel_slab.json b/src/generated/resources/data/malum/advancements/recipes/misc/soulwood_panel_slab.json similarity index 76% rename from src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/soulwood_panel_slab.json rename to src/generated/resources/data/malum/advancements/recipes/misc/soulwood_panel_slab.json index bc6609935..3bcb658bc 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/soulwood_panel_slab.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/soulwood_panel_slab.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:soulwood_panel_slab" - ] - }, "criteria": { "has_input": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:soulwood_panel_slab" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_input", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:soulwood_panel_slab" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/soulwood_panel_stairs.json b/src/generated/resources/data/malum/advancements/recipes/misc/soulwood_panel_stairs.json similarity index 76% rename from src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/soulwood_panel_stairs.json rename to src/generated/resources/data/malum/advancements/recipes/misc/soulwood_panel_stairs.json index ae899ffdb..21bcfed07 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/soulwood_panel_stairs.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/soulwood_panel_stairs.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:soulwood_panel_stairs" - ] - }, "criteria": { "has_input": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:soulwood_panel_stairs" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_input", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:soulwood_panel_stairs" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/soulwood_planks.json b/src/generated/resources/data/malum/advancements/recipes/misc/soulwood_planks.json similarity index 74% rename from src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/soulwood_planks.json rename to src/generated/resources/data/malum/advancements/recipes/misc/soulwood_planks.json index dbe3c68fd..688c06674 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/soulwood_planks.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/soulwood_planks.json @@ -1,26 +1,21 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:soulwood_planks" - ] - }, "criteria": { "has_logs": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { "tag": "malum:soulwood_logs" } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:soulwood_planks" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -28,5 +23,11 @@ "has_logs", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:soulwood_planks" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/soulwood_planks_button.json b/src/generated/resources/data/malum/advancements/recipes/misc/soulwood_planks_button.json similarity index 76% rename from src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/soulwood_planks_button.json rename to src/generated/resources/data/malum/advancements/recipes/misc/soulwood_planks_button.json index 77bdb7dea..6a711b0ac 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/soulwood_planks_button.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/soulwood_planks_button.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:soulwood_planks_button" - ] - }, "criteria": { "has_input": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:soulwood_planks_button" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_input", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:soulwood_planks_button" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/soulwood_planks_fence.json b/src/generated/resources/data/malum/advancements/recipes/misc/soulwood_planks_fence.json similarity index 76% rename from src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/soulwood_planks_fence.json rename to src/generated/resources/data/malum/advancements/recipes/misc/soulwood_planks_fence.json index 50b67eef7..f4fa2f4da 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/soulwood_planks_fence.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/soulwood_planks_fence.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:soulwood_planks_fence" - ] - }, "criteria": { "has_input": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:soulwood_planks_fence" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_input", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:soulwood_planks_fence" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/soulwood_planks_fence_gate.json b/src/generated/resources/data/malum/advancements/recipes/misc/soulwood_planks_fence_gate.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/soulwood_planks_fence_gate.json rename to src/generated/resources/data/malum/advancements/recipes/misc/soulwood_planks_fence_gate.json index 771d47c49..044d7aa7e 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/soulwood_planks_fence_gate.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/soulwood_planks_fence_gate.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:soulwood_planks_fence_gate" - ] - }, "criteria": { "has_input": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:soulwood_planks_fence_gate" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_input", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:soulwood_planks_fence_gate" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/soulwood_planks_pressure_plate.json b/src/generated/resources/data/malum/advancements/recipes/misc/soulwood_planks_pressure_plate.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/soulwood_planks_pressure_plate.json rename to src/generated/resources/data/malum/advancements/recipes/misc/soulwood_planks_pressure_plate.json index a37ad6ef4..2917d9a83 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/soulwood_planks_pressure_plate.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/soulwood_planks_pressure_plate.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:soulwood_planks_pressure_plate" - ] - }, "criteria": { "has_input": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:soulwood_planks_pressure_plate" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_input", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:soulwood_planks_pressure_plate" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/soulwood_planks_slab.json b/src/generated/resources/data/malum/advancements/recipes/misc/soulwood_planks_slab.json similarity index 76% rename from src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/soulwood_planks_slab.json rename to src/generated/resources/data/malum/advancements/recipes/misc/soulwood_planks_slab.json index 057edd715..8bc72ce09 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/soulwood_planks_slab.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/soulwood_planks_slab.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:soulwood_planks_slab" - ] - }, "criteria": { "has_input": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:soulwood_planks_slab" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_input", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:soulwood_planks_slab" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/soulwood_planks_stairs.json b/src/generated/resources/data/malum/advancements/recipes/misc/soulwood_planks_stairs.json similarity index 76% rename from src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/soulwood_planks_stairs.json rename to src/generated/resources/data/malum/advancements/recipes/misc/soulwood_planks_stairs.json index c690eeb73..b45d11013 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/soulwood_planks_stairs.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/soulwood_planks_stairs.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:soulwood_planks_stairs" - ] - }, "criteria": { "has_input": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:soulwood_planks_stairs" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_input", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:soulwood_planks_stairs" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/soulwood_sign.json b/src/generated/resources/data/malum/advancements/recipes/misc/soulwood_sign.json similarity index 76% rename from src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/soulwood_sign.json rename to src/generated/resources/data/malum/advancements/recipes/misc/soulwood_sign.json index 99f59fa4e..fa4ecf94f 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/soulwood_sign.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/soulwood_sign.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:soulwood_sign" - ] - }, "criteria": { "has_soulwood_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:soulwood_sign" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_soulwood_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:soulwood_sign" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/soulwood_tiles.json b/src/generated/resources/data/malum/advancements/recipes/misc/soulwood_tiles.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/soulwood_tiles.json rename to src/generated/resources/data/malum/advancements/recipes/misc/soulwood_tiles.json index 5d8b6f715..abfb0898d 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/soulwood_tiles.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/soulwood_tiles.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:soulwood_tiles" - ] - }, "criteria": { "has_soulwood_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:soulwood_tiles" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_soulwood_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:soulwood_tiles" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/soulwood_tiles_slab.json b/src/generated/resources/data/malum/advancements/recipes/misc/soulwood_tiles_slab.json similarity index 76% rename from src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/soulwood_tiles_slab.json rename to src/generated/resources/data/malum/advancements/recipes/misc/soulwood_tiles_slab.json index 5c522a864..fa4489476 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/soulwood_tiles_slab.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/soulwood_tiles_slab.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:soulwood_tiles_slab" - ] - }, "criteria": { "has_input": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:soulwood_tiles_slab" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_input", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:soulwood_tiles_slab" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/soulwood_tiles_stairs.json b/src/generated/resources/data/malum/advancements/recipes/misc/soulwood_tiles_stairs.json similarity index 76% rename from src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/soulwood_tiles_stairs.json rename to src/generated/resources/data/malum/advancements/recipes/misc/soulwood_tiles_stairs.json index d4d9545d5..8661711cc 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/soulwood_tiles_stairs.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/soulwood_tiles_stairs.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:soulwood_tiles_stairs" - ] - }, "criteria": { "has_input": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:soulwood_tiles_stairs" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_input", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:soulwood_tiles_stairs" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/soulwood_trapdoor.json b/src/generated/resources/data/malum/advancements/recipes/misc/soulwood_trapdoor.json similarity index 76% rename from src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/soulwood_trapdoor.json rename to src/generated/resources/data/malum/advancements/recipes/misc/soulwood_trapdoor.json index 878179540..8894b99df 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/soulwood_trapdoor.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/soulwood_trapdoor.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:soulwood_trapdoor" - ] - }, "criteria": { "has_input": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:soulwood_trapdoor" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_input", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:soulwood_trapdoor" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/soulwood_trapdoor_from_solid.json b/src/generated/resources/data/malum/advancements/recipes/misc/soulwood_trapdoor_from_solid.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/soulwood_trapdoor_from_solid.json rename to src/generated/resources/data/malum/advancements/recipes/misc/soulwood_trapdoor_from_solid.json index b35d675ab..a21652c6d 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/soulwood_trapdoor_from_solid.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/soulwood_trapdoor_from_solid.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:soulwood_trapdoor_from_solid" - ] - }, "criteria": { "has_input": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:soulwood_trapdoor_from_solid" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_input", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:soulwood_trapdoor_from_solid" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/spectral_lens.json b/src/generated/resources/data/malum/advancements/recipes/misc/spectral_lens.json similarity index 76% rename from src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/spectral_lens.json rename to src/generated/resources/data/malum/advancements/recipes/misc/spectral_lens.json index 008429dc3..4c7e491f2 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/spectral_lens.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/spectral_lens.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:spectral_lens" - ] - }, "criteria": { "has_hex_ash": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:spectral_lens" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_hex_ash", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:spectral_lens" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/spectral_optic.json b/src/generated/resources/data/malum/advancements/recipes/misc/spectral_optic.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/spectral_optic.json rename to src/generated/resources/data/malum/advancements/recipes/misc/spectral_optic.json index 20f10f757..897c8e0ea 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/spectral_optic.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/spectral_optic.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:spectral_optic" - ] - }, "criteria": { "has_hallowed_gold": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:spectral_optic" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_hallowed_gold", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:spectral_optic" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/spirit_altar.json b/src/generated/resources/data/malum/advancements/recipes/misc/spirit_altar.json similarity index 76% rename from src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/spirit_altar.json rename to src/generated/resources/data/malum/advancements/recipes/misc/spirit_altar.json index 8ea1eb3fd..2dee5bc2b 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/spirit_altar.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/spirit_altar.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:spirit_altar" - ] - }, "criteria": { "has_soulstone": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:spirit_altar" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_soulstone", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:spirit_altar" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/spirit_jar.json b/src/generated/resources/data/malum/advancements/recipes/misc/spirit_jar.json similarity index 76% rename from src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/spirit_jar.json rename to src/generated/resources/data/malum/advancements/recipes/misc/spirit_jar.json index faa26611c..8fb3f6b1d 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/spirit_jar.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/spirit_jar.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:spirit_jar" - ] - }, "criteria": { "has_hallowed_gold": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:spirit_jar" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_hallowed_gold", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:spirit_jar" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/spirit_pouch.json b/src/generated/resources/data/malum/advancements/recipes/misc/spirit_pouch.json similarity index 76% rename from src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/spirit_pouch.json rename to src/generated/resources/data/malum/advancements/recipes/misc/spirit_pouch.json index 3d3330f15..c5bc62fe7 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/spirit_pouch.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/spirit_pouch.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:spirit_pouch" - ] - }, "criteria": { "has_spirit_fabric": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:spirit_pouch" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_spirit_fabric", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:spirit_pouch" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/redstone/sticky_piston_from_sapballs.json b/src/generated/resources/data/malum/advancements/recipes/misc/sticky_piston_from_sapballs.json similarity index 75% rename from src/generated/resources/data/malum/advancements/recipes/redstone/sticky_piston_from_sapballs.json rename to src/generated/resources/data/malum/advancements/recipes/misc/sticky_piston_from_sapballs.json index fb7013c3a..581ca4a03 100644 --- a/src/generated/resources/data/malum/advancements/recipes/redstone/sticky_piston_from_sapballs.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/sticky_piston_from_sapballs.json @@ -1,26 +1,21 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:sticky_piston_from_sapballs" - ] - }, "criteria": { "has_sapball": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { "tag": "malum:sapballs" } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:sticky_piston_from_sapballs" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -28,5 +23,11 @@ "has_sapball", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:sticky_piston_from_sapballs" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/stripped_runewood.json b/src/generated/resources/data/malum/advancements/recipes/misc/stripped_runewood.json similarity index 76% rename from src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/stripped_runewood.json rename to src/generated/resources/data/malum/advancements/recipes/misc/stripped_runewood.json index 32c170dcf..59013b058 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/stripped_runewood.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/stripped_runewood.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:stripped_runewood" - ] - }, "criteria": { "has_log": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:stripped_runewood" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_log", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:stripped_runewood" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/stripped_soulwood.json b/src/generated/resources/data/malum/advancements/recipes/misc/stripped_soulwood.json similarity index 76% rename from src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/stripped_soulwood.json rename to src/generated/resources/data/malum/advancements/recipes/misc/stripped_soulwood.json index 00625358e..5e723da8c 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/stripped_soulwood.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/stripped_soulwood.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:stripped_soulwood" - ] - }, "criteria": { "has_log": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:stripped_soulwood" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_log", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:stripped_soulwood" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_brick_wall_stonecutting.json b/src/generated/resources/data/malum/advancements/recipes/misc/tainted_rock_brick_wall_stonecutting.json similarity index 78% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_brick_wall_stonecutting.json rename to src/generated/resources/data/malum/advancements/recipes/misc/tainted_rock_brick_wall_stonecutting.json index c9cc54088..b80feb87b 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_brick_wall_stonecutting.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/tainted_rock_brick_wall_stonecutting.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:tainted_rock_brick_wall_stonecutting" - ] - }, "criteria": { "has_tainted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:tainted_rock_brick_wall_stonecutting" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_tainted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:tainted_rock_brick_wall_stonecutting" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_bricks.json b/src/generated/resources/data/malum/advancements/recipes/misc/tainted_rock_bricks.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_bricks.json rename to src/generated/resources/data/malum/advancements/recipes/misc/tainted_rock_bricks.json index 39d435a15..4fd721439 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_bricks.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/tainted_rock_bricks.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:tainted_rock_bricks" - ] - }, "criteria": { "has_tainted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:tainted_rock_bricks" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_tainted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:tainted_rock_bricks" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_bricks_from_small_bricks.json b/src/generated/resources/data/malum/advancements/recipes/misc/tainted_rock_bricks_from_small_bricks.json similarity index 78% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_bricks_from_small_bricks.json rename to src/generated/resources/data/malum/advancements/recipes/misc/tainted_rock_bricks_from_small_bricks.json index 2e7fe5c32..68372a674 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_bricks_from_small_bricks.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/tainted_rock_bricks_from_small_bricks.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:tainted_rock_bricks_from_small_bricks" - ] - }, "criteria": { "has_tainted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:tainted_rock_bricks_from_small_bricks" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_tainted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:tainted_rock_bricks_from_small_bricks" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_bricks_slab.json b/src/generated/resources/data/malum/advancements/recipes/misc/tainted_rock_bricks_slab.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_bricks_slab.json rename to src/generated/resources/data/malum/advancements/recipes/misc/tainted_rock_bricks_slab.json index 2c91d6097..f3c025398 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_bricks_slab.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/tainted_rock_bricks_slab.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:tainted_rock_bricks_slab" - ] - }, "criteria": { "has_tainted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:tainted_rock_bricks_slab" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_tainted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:tainted_rock_bricks_slab" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_bricks_slab_stonecutting.json b/src/generated/resources/data/malum/advancements/recipes/misc/tainted_rock_bricks_slab_stonecutting.json similarity index 78% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_bricks_slab_stonecutting.json rename to src/generated/resources/data/malum/advancements/recipes/misc/tainted_rock_bricks_slab_stonecutting.json index 2cbc1715f..b9c64bdaa 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_bricks_slab_stonecutting.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/tainted_rock_bricks_slab_stonecutting.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:tainted_rock_bricks_slab_stonecutting" - ] - }, "criteria": { "has_tainted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:tainted_rock_bricks_slab_stonecutting" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_tainted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:tainted_rock_bricks_slab_stonecutting" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_bricks_stairs.json b/src/generated/resources/data/malum/advancements/recipes/misc/tainted_rock_bricks_stairs.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_bricks_stairs.json rename to src/generated/resources/data/malum/advancements/recipes/misc/tainted_rock_bricks_stairs.json index 70154c9da..bb0db5edb 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_bricks_stairs.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/tainted_rock_bricks_stairs.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:tainted_rock_bricks_stairs" - ] - }, "criteria": { "has_tainted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:tainted_rock_bricks_stairs" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_tainted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:tainted_rock_bricks_stairs" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_bricks_stairs_stonecutting.json b/src/generated/resources/data/malum/advancements/recipes/misc/tainted_rock_bricks_stairs_stonecutting.json similarity index 78% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_bricks_stairs_stonecutting.json rename to src/generated/resources/data/malum/advancements/recipes/misc/tainted_rock_bricks_stairs_stonecutting.json index 2be10c725..880f324f9 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_bricks_stairs_stonecutting.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/tainted_rock_bricks_stairs_stonecutting.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:tainted_rock_bricks_stairs_stonecutting" - ] - }, "criteria": { "has_tainted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:tainted_rock_bricks_stairs_stonecutting" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_tainted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:tainted_rock_bricks_stairs_stonecutting" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_bricks_stonecutting.json b/src/generated/resources/data/malum/advancements/recipes/misc/tainted_rock_bricks_stonecutting.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_bricks_stonecutting.json rename to src/generated/resources/data/malum/advancements/recipes/misc/tainted_rock_bricks_stonecutting.json index 6647f0e5b..10c10071d 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_bricks_stonecutting.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/tainted_rock_bricks_stonecutting.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:tainted_rock_bricks_stonecutting" - ] - }, "criteria": { "has_tainted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:tainted_rock_bricks_stonecutting" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_tainted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:tainted_rock_bricks_stonecutting" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_bricks_stonecutting_from_polished.json b/src/generated/resources/data/malum/advancements/recipes/misc/tainted_rock_bricks_stonecutting_from_polished.json similarity index 78% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_bricks_stonecutting_from_polished.json rename to src/generated/resources/data/malum/advancements/recipes/misc/tainted_rock_bricks_stonecutting_from_polished.json index 810391246..3f140bdd5 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_bricks_stonecutting_from_polished.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/tainted_rock_bricks_stonecutting_from_polished.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:tainted_rock_bricks_stonecutting_from_polished" - ] - }, "criteria": { "has_tainted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:tainted_rock_bricks_stonecutting_from_polished" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_tainted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:tainted_rock_bricks_stonecutting_from_polished" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_bricks_wall.json b/src/generated/resources/data/malum/advancements/recipes/misc/tainted_rock_bricks_wall.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_bricks_wall.json rename to src/generated/resources/data/malum/advancements/recipes/misc/tainted_rock_bricks_wall.json index 29e6a2f88..2463ee1dd 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_bricks_wall.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/tainted_rock_bricks_wall.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:tainted_rock_bricks_wall" - ] - }, "criteria": { "has_tainted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:tainted_rock_bricks_wall" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_tainted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:tainted_rock_bricks_wall" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_button.json b/src/generated/resources/data/malum/advancements/recipes/misc/tainted_rock_button.json similarity index 76% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_button.json rename to src/generated/resources/data/malum/advancements/recipes/misc/tainted_rock_button.json index e4d17fe3a..04729cdda 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_button.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/tainted_rock_button.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:tainted_rock_button" - ] - }, "criteria": { "has_input": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:tainted_rock_button" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_input", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:tainted_rock_button" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_column.json b/src/generated/resources/data/malum/advancements/recipes/misc/tainted_rock_column.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_column.json rename to src/generated/resources/data/malum/advancements/recipes/misc/tainted_rock_column.json index 1c7135c60..9fd948bfd 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_column.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/tainted_rock_column.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:tainted_rock_column" - ] - }, "criteria": { "has_tainted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:tainted_rock_column" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_tainted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:tainted_rock_column" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_column_cap.json b/src/generated/resources/data/malum/advancements/recipes/misc/tainted_rock_column_cap.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_column_cap.json rename to src/generated/resources/data/malum/advancements/recipes/misc/tainted_rock_column_cap.json index cecaa81be..e16d6d879 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_column_cap.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/tainted_rock_column_cap.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:tainted_rock_column_cap" - ] - }, "criteria": { "has_tainted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:tainted_rock_column_cap" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_tainted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:tainted_rock_column_cap" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_column_cap_stonecutting.json b/src/generated/resources/data/malum/advancements/recipes/misc/tainted_rock_column_cap_stonecutting.json similarity index 78% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_column_cap_stonecutting.json rename to src/generated/resources/data/malum/advancements/recipes/misc/tainted_rock_column_cap_stonecutting.json index 5a870cebf..bd57375a3 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_column_cap_stonecutting.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/tainted_rock_column_cap_stonecutting.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:tainted_rock_column_cap_stonecutting" - ] - }, "criteria": { "has_tainted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:tainted_rock_column_cap_stonecutting" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_tainted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:tainted_rock_column_cap_stonecutting" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_column_from_cap.json b/src/generated/resources/data/malum/advancements/recipes/misc/tainted_rock_column_from_cap.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_column_from_cap.json rename to src/generated/resources/data/malum/advancements/recipes/misc/tainted_rock_column_from_cap.json index e324518aa..3457a32c2 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_column_from_cap.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/tainted_rock_column_from_cap.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:tainted_rock_column_from_cap" - ] - }, "criteria": { "has_tainted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:tainted_rock_column_from_cap" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_tainted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:tainted_rock_column_from_cap" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_column_stonecutting.json b/src/generated/resources/data/malum/advancements/recipes/misc/tainted_rock_column_stonecutting.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_column_stonecutting.json rename to src/generated/resources/data/malum/advancements/recipes/misc/tainted_rock_column_stonecutting.json index f5a0888c3..914e6940c 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_column_stonecutting.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/tainted_rock_column_stonecutting.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:tainted_rock_column_stonecutting" - ] - }, "criteria": { "has_tainted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:tainted_rock_column_stonecutting" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_tainted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:tainted_rock_column_stonecutting" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_item_pedestal.json b/src/generated/resources/data/malum/advancements/recipes/misc/tainted_rock_item_pedestal.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_item_pedestal.json rename to src/generated/resources/data/malum/advancements/recipes/misc/tainted_rock_item_pedestal.json index ec2729605..c8c7d83d4 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_item_pedestal.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/tainted_rock_item_pedestal.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:tainted_rock_item_pedestal" - ] - }, "criteria": { "has_tainted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:tainted_rock_item_pedestal" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_tainted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:tainted_rock_item_pedestal" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_item_stand.json b/src/generated/resources/data/malum/advancements/recipes/misc/tainted_rock_item_stand.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_item_stand.json rename to src/generated/resources/data/malum/advancements/recipes/misc/tainted_rock_item_stand.json index 9ac7a4b93..362346601 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_item_stand.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/tainted_rock_item_stand.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:tainted_rock_item_stand" - ] - }, "criteria": { "has_tainted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:tainted_rock_item_stand" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_tainted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:tainted_rock_item_stand" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_pressure_plate.json b/src/generated/resources/data/malum/advancements/recipes/misc/tainted_rock_pressure_plate.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_pressure_plate.json rename to src/generated/resources/data/malum/advancements/recipes/misc/tainted_rock_pressure_plate.json index 69d2fd5be..32fcdcb80 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_pressure_plate.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/tainted_rock_pressure_plate.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:tainted_rock_pressure_plate" - ] - }, "criteria": { "has_input": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:tainted_rock_pressure_plate" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_input", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:tainted_rock_pressure_plate" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_slab.json b/src/generated/resources/data/malum/advancements/recipes/misc/tainted_rock_slab.json similarity index 76% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_slab.json rename to src/generated/resources/data/malum/advancements/recipes/misc/tainted_rock_slab.json index ce3f31cc1..9a5905a95 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_slab.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/tainted_rock_slab.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:tainted_rock_slab" - ] - }, "criteria": { "has_tainted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:tainted_rock_slab" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_tainted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:tainted_rock_slab" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_slab_stonecutting.json b/src/generated/resources/data/malum/advancements/recipes/misc/tainted_rock_slab_stonecutting.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_slab_stonecutting.json rename to src/generated/resources/data/malum/advancements/recipes/misc/tainted_rock_slab_stonecutting.json index 59a3c74d9..ac744fcb2 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_slab_stonecutting.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/tainted_rock_slab_stonecutting.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:tainted_rock_slab_stonecutting" - ] - }, "criteria": { "has_tainted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:tainted_rock_slab_stonecutting" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_tainted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:tainted_rock_slab_stonecutting" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_stairs.json b/src/generated/resources/data/malum/advancements/recipes/misc/tainted_rock_stairs.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_stairs.json rename to src/generated/resources/data/malum/advancements/recipes/misc/tainted_rock_stairs.json index f4cd2dd27..5043868e6 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_stairs.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/tainted_rock_stairs.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:tainted_rock_stairs" - ] - }, "criteria": { "has_tainted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:tainted_rock_stairs" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_tainted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:tainted_rock_stairs" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_stairs_stonecutting.json b/src/generated/resources/data/malum/advancements/recipes/misc/tainted_rock_stairs_stonecutting.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_stairs_stonecutting.json rename to src/generated/resources/data/malum/advancements/recipes/misc/tainted_rock_stairs_stonecutting.json index e9e6a2a07..867e7efd1 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_stairs_stonecutting.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/tainted_rock_stairs_stonecutting.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:tainted_rock_stairs_stonecutting" - ] - }, "criteria": { "has_tainted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:tainted_rock_stairs_stonecutting" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_tainted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:tainted_rock_stairs_stonecutting" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_tiles.json b/src/generated/resources/data/malum/advancements/recipes/misc/tainted_rock_tiles.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_tiles.json rename to src/generated/resources/data/malum/advancements/recipes/misc/tainted_rock_tiles.json index 523ac4917..7a647a756 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_tiles.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/tainted_rock_tiles.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:tainted_rock_tiles" - ] - }, "criteria": { "has_tainted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:tainted_rock_tiles" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_tainted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:tainted_rock_tiles" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_tiles_slab.json b/src/generated/resources/data/malum/advancements/recipes/misc/tainted_rock_tiles_slab.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_tiles_slab.json rename to src/generated/resources/data/malum/advancements/recipes/misc/tainted_rock_tiles_slab.json index b32e18933..9185569c5 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_tiles_slab.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/tainted_rock_tiles_slab.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:tainted_rock_tiles_slab" - ] - }, "criteria": { "has_tainted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:tainted_rock_tiles_slab" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_tainted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:tainted_rock_tiles_slab" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_tiles_slab_stonecutting.json b/src/generated/resources/data/malum/advancements/recipes/misc/tainted_rock_tiles_slab_stonecutting.json similarity index 78% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_tiles_slab_stonecutting.json rename to src/generated/resources/data/malum/advancements/recipes/misc/tainted_rock_tiles_slab_stonecutting.json index 844a8769c..e8328df2d 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_tiles_slab_stonecutting.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/tainted_rock_tiles_slab_stonecutting.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:tainted_rock_tiles_slab_stonecutting" - ] - }, "criteria": { "has_tainted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:tainted_rock_tiles_slab_stonecutting" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_tainted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:tainted_rock_tiles_slab_stonecutting" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_tiles_stairs.json b/src/generated/resources/data/malum/advancements/recipes/misc/tainted_rock_tiles_stairs.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_tiles_stairs.json rename to src/generated/resources/data/malum/advancements/recipes/misc/tainted_rock_tiles_stairs.json index 4f8fa23d6..ae515276d 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_tiles_stairs.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/tainted_rock_tiles_stairs.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:tainted_rock_tiles_stairs" - ] - }, "criteria": { "has_tainted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:tainted_rock_tiles_stairs" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_tainted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:tainted_rock_tiles_stairs" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_tiles_stairs_stonecutting.json b/src/generated/resources/data/malum/advancements/recipes/misc/tainted_rock_tiles_stairs_stonecutting.json similarity index 78% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_tiles_stairs_stonecutting.json rename to src/generated/resources/data/malum/advancements/recipes/misc/tainted_rock_tiles_stairs_stonecutting.json index 5b27e3fef..ddb23a8bf 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_tiles_stairs_stonecutting.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/tainted_rock_tiles_stairs_stonecutting.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:tainted_rock_tiles_stairs_stonecutting" - ] - }, "criteria": { "has_tainted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:tainted_rock_tiles_stairs_stonecutting" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_tainted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:tainted_rock_tiles_stairs_stonecutting" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_tiles_stonecutting.json b/src/generated/resources/data/malum/advancements/recipes/misc/tainted_rock_tiles_stonecutting.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_tiles_stonecutting.json rename to src/generated/resources/data/malum/advancements/recipes/misc/tainted_rock_tiles_stonecutting.json index 28b24c2be..d4b4059a6 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_tiles_stonecutting.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/tainted_rock_tiles_stonecutting.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:tainted_rock_tiles_stonecutting" - ] - }, "criteria": { "has_tainted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:tainted_rock_tiles_stonecutting" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_tainted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:tainted_rock_tiles_stonecutting" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_tiles_stonecutting_from_bricks.json b/src/generated/resources/data/malum/advancements/recipes/misc/tainted_rock_tiles_stonecutting_from_bricks.json similarity index 78% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_tiles_stonecutting_from_bricks.json rename to src/generated/resources/data/malum/advancements/recipes/misc/tainted_rock_tiles_stonecutting_from_bricks.json index 03ee16ff7..a37e8c2ab 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_tiles_stonecutting_from_bricks.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/tainted_rock_tiles_stonecutting_from_bricks.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:tainted_rock_tiles_stonecutting_from_bricks" - ] - }, "criteria": { "has_tainted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:tainted_rock_tiles_stonecutting_from_bricks" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_tainted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:tainted_rock_tiles_stonecutting_from_bricks" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_tiles_stonecutting_from_polished.json b/src/generated/resources/data/malum/advancements/recipes/misc/tainted_rock_tiles_stonecutting_from_polished.json similarity index 78% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_tiles_stonecutting_from_polished.json rename to src/generated/resources/data/malum/advancements/recipes/misc/tainted_rock_tiles_stonecutting_from_polished.json index 4c95fb67c..5a65b98fc 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_tiles_stonecutting_from_polished.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/tainted_rock_tiles_stonecutting_from_polished.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:tainted_rock_tiles_stonecutting_from_polished" - ] - }, "criteria": { "has_tainted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:tainted_rock_tiles_stonecutting_from_polished" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_tainted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:tainted_rock_tiles_stonecutting_from_polished" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_tiles_wall.json b/src/generated/resources/data/malum/advancements/recipes/misc/tainted_rock_tiles_wall.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_tiles_wall.json rename to src/generated/resources/data/malum/advancements/recipes/misc/tainted_rock_tiles_wall.json index 67f6e239e..3f49f61db 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_tiles_wall.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/tainted_rock_tiles_wall.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:tainted_rock_tiles_wall" - ] - }, "criteria": { "has_tainted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:tainted_rock_tiles_wall" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_tainted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:tainted_rock_tiles_wall" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_tiles_wall_stonecutting.json b/src/generated/resources/data/malum/advancements/recipes/misc/tainted_rock_tiles_wall_stonecutting.json similarity index 78% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_tiles_wall_stonecutting.json rename to src/generated/resources/data/malum/advancements/recipes/misc/tainted_rock_tiles_wall_stonecutting.json index 4d302106e..3078ad4a9 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_tiles_wall_stonecutting.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/tainted_rock_tiles_wall_stonecutting.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:tainted_rock_tiles_wall_stonecutting" - ] - }, "criteria": { "has_tainted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:tainted_rock_tiles_wall_stonecutting" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_tainted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:tainted_rock_tiles_wall_stonecutting" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_wall.json b/src/generated/resources/data/malum/advancements/recipes/misc/tainted_rock_wall.json similarity index 76% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_wall.json rename to src/generated/resources/data/malum/advancements/recipes/misc/tainted_rock_wall.json index dcaf1293a..fceeac627 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_wall.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/tainted_rock_wall.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:tainted_rock_wall" - ] - }, "criteria": { "has_tainted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:tainted_rock_wall" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_tainted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:tainted_rock_wall" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_wall_stonecutting.json b/src/generated/resources/data/malum/advancements/recipes/misc/tainted_rock_wall_stonecutting.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_wall_stonecutting.json rename to src/generated/resources/data/malum/advancements/recipes/misc/tainted_rock_wall_stonecutting.json index 7c5a94f07..fe2724e2f 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/tainted_rock_wall_stonecutting.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/tainted_rock_wall_stonecutting.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:tainted_rock_wall_stonecutting" - ] - }, "criteria": { "has_tainted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:tainted_rock_wall_stonecutting" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_tainted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:tainted_rock_wall_stonecutting" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_cosmetics/trans_prideweave.json b/src/generated/resources/data/malum/advancements/recipes/misc/trans_prideweave.json similarity index 76% rename from src/generated/resources/data/malum/advancements/recipes/malum_cosmetics/trans_prideweave.json rename to src/generated/resources/data/malum/advancements/recipes/misc/trans_prideweave.json index 4329353f7..58bc0ae00 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_cosmetics/trans_prideweave.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/trans_prideweave.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:trans_prideweave" - ] - }, "criteria": { "has_spool": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:trans_prideweave" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_spool", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:trans_prideweave" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_brick_wall_stonecutting.json b/src/generated/resources/data/malum/advancements/recipes/misc/twisted_rock_brick_wall_stonecutting.json similarity index 78% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_brick_wall_stonecutting.json rename to src/generated/resources/data/malum/advancements/recipes/misc/twisted_rock_brick_wall_stonecutting.json index f92257c32..503864667 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_brick_wall_stonecutting.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/twisted_rock_brick_wall_stonecutting.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:twisted_rock_brick_wall_stonecutting" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "malum:twisted_rock_brick_wall_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + }, "has_twisted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "malum:twisted_rock_brick_wall_stonecutting" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_twisted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:twisted_rock_brick_wall_stonecutting" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_bricks.json b/src/generated/resources/data/malum/advancements/recipes/misc/twisted_rock_bricks.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_bricks.json rename to src/generated/resources/data/malum/advancements/recipes/misc/twisted_rock_bricks.json index b3e035bbe..050bf775d 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_bricks.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/twisted_rock_bricks.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:twisted_rock_bricks" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "malum:twisted_rock_bricks" + }, + "trigger": "minecraft:recipe_unlocked" + }, "has_twisted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "malum:twisted_rock_bricks" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_twisted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:twisted_rock_bricks" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_bricks_from_small_bricks.json b/src/generated/resources/data/malum/advancements/recipes/misc/twisted_rock_bricks_from_small_bricks.json similarity index 78% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_bricks_from_small_bricks.json rename to src/generated/resources/data/malum/advancements/recipes/misc/twisted_rock_bricks_from_small_bricks.json index 76041ee61..f063e3939 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_bricks_from_small_bricks.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/twisted_rock_bricks_from_small_bricks.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:twisted_rock_bricks_from_small_bricks" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "malum:twisted_rock_bricks_from_small_bricks" + }, + "trigger": "minecraft:recipe_unlocked" + }, "has_twisted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "malum:twisted_rock_bricks_from_small_bricks" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_twisted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:twisted_rock_bricks_from_small_bricks" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_bricks_slab.json b/src/generated/resources/data/malum/advancements/recipes/misc/twisted_rock_bricks_slab.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_bricks_slab.json rename to src/generated/resources/data/malum/advancements/recipes/misc/twisted_rock_bricks_slab.json index 6ee0f7841..d89079c78 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_bricks_slab.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/twisted_rock_bricks_slab.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:twisted_rock_bricks_slab" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "malum:twisted_rock_bricks_slab" + }, + "trigger": "minecraft:recipe_unlocked" + }, "has_twisted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "malum:twisted_rock_bricks_slab" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_twisted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:twisted_rock_bricks_slab" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_bricks_slab_stonecutting.json b/src/generated/resources/data/malum/advancements/recipes/misc/twisted_rock_bricks_slab_stonecutting.json similarity index 78% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_bricks_slab_stonecutting.json rename to src/generated/resources/data/malum/advancements/recipes/misc/twisted_rock_bricks_slab_stonecutting.json index ee10ec7de..7eb280b7b 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_bricks_slab_stonecutting.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/twisted_rock_bricks_slab_stonecutting.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:twisted_rock_bricks_slab_stonecutting" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "malum:twisted_rock_bricks_slab_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + }, "has_twisted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "malum:twisted_rock_bricks_slab_stonecutting" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_twisted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:twisted_rock_bricks_slab_stonecutting" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_bricks_stairs.json b/src/generated/resources/data/malum/advancements/recipes/misc/twisted_rock_bricks_stairs.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_bricks_stairs.json rename to src/generated/resources/data/malum/advancements/recipes/misc/twisted_rock_bricks_stairs.json index 71c631c05..f5faa9441 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_bricks_stairs.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/twisted_rock_bricks_stairs.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:twisted_rock_bricks_stairs" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "malum:twisted_rock_bricks_stairs" + }, + "trigger": "minecraft:recipe_unlocked" + }, "has_twisted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "malum:twisted_rock_bricks_stairs" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_twisted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:twisted_rock_bricks_stairs" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_bricks_stairs_stonecutting.json b/src/generated/resources/data/malum/advancements/recipes/misc/twisted_rock_bricks_stairs_stonecutting.json similarity index 78% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_bricks_stairs_stonecutting.json rename to src/generated/resources/data/malum/advancements/recipes/misc/twisted_rock_bricks_stairs_stonecutting.json index 1f4d8b45c..9d400d67e 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_bricks_stairs_stonecutting.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/twisted_rock_bricks_stairs_stonecutting.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:twisted_rock_bricks_stairs_stonecutting" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "malum:twisted_rock_bricks_stairs_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + }, "has_twisted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "malum:twisted_rock_bricks_stairs_stonecutting" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_twisted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:twisted_rock_bricks_stairs_stonecutting" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_bricks_stonecutting.json b/src/generated/resources/data/malum/advancements/recipes/misc/twisted_rock_bricks_stonecutting.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_bricks_stonecutting.json rename to src/generated/resources/data/malum/advancements/recipes/misc/twisted_rock_bricks_stonecutting.json index 797da63fd..d0b764fd3 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_bricks_stonecutting.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/twisted_rock_bricks_stonecutting.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:twisted_rock_bricks_stonecutting" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "malum:twisted_rock_bricks_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + }, "has_twisted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "malum:twisted_rock_bricks_stonecutting" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_twisted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:twisted_rock_bricks_stonecutting" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_bricks_stonecutting_from_polished.json b/src/generated/resources/data/malum/advancements/recipes/misc/twisted_rock_bricks_stonecutting_from_polished.json similarity index 78% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_bricks_stonecutting_from_polished.json rename to src/generated/resources/data/malum/advancements/recipes/misc/twisted_rock_bricks_stonecutting_from_polished.json index d1354a5d5..581bb9b3f 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_bricks_stonecutting_from_polished.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/twisted_rock_bricks_stonecutting_from_polished.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:twisted_rock_bricks_stonecutting_from_polished" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "malum:twisted_rock_bricks_stonecutting_from_polished" + }, + "trigger": "minecraft:recipe_unlocked" + }, "has_twisted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "malum:twisted_rock_bricks_stonecutting_from_polished" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_twisted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:twisted_rock_bricks_stonecutting_from_polished" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_bricks_wall.json b/src/generated/resources/data/malum/advancements/recipes/misc/twisted_rock_bricks_wall.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_bricks_wall.json rename to src/generated/resources/data/malum/advancements/recipes/misc/twisted_rock_bricks_wall.json index 611b070fa..cc7123c37 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_bricks_wall.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/twisted_rock_bricks_wall.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:twisted_rock_bricks_wall" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "malum:twisted_rock_bricks_wall" + }, + "trigger": "minecraft:recipe_unlocked" + }, "has_twisted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "malum:twisted_rock_bricks_wall" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_twisted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:twisted_rock_bricks_wall" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_button.json b/src/generated/resources/data/malum/advancements/recipes/misc/twisted_rock_button.json similarity index 76% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_button.json rename to src/generated/resources/data/malum/advancements/recipes/misc/twisted_rock_button.json index bc8b24d81..353ae9f98 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_button.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/twisted_rock_button.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:twisted_rock_button" - ] - }, "criteria": { "has_input": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:twisted_rock_button" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_input", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:twisted_rock_button" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_column.json b/src/generated/resources/data/malum/advancements/recipes/misc/twisted_rock_column.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_column.json rename to src/generated/resources/data/malum/advancements/recipes/misc/twisted_rock_column.json index 3fa5e728b..c59d0eaba 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_column.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/twisted_rock_column.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:twisted_rock_column" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "malum:twisted_rock_column" + }, + "trigger": "minecraft:recipe_unlocked" + }, "has_twisted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "malum:twisted_rock_column" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_twisted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:twisted_rock_column" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_column_cap.json b/src/generated/resources/data/malum/advancements/recipes/misc/twisted_rock_column_cap.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_column_cap.json rename to src/generated/resources/data/malum/advancements/recipes/misc/twisted_rock_column_cap.json index 1c3f0408f..0d26f1f10 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_column_cap.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/twisted_rock_column_cap.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:twisted_rock_column_cap" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "malum:twisted_rock_column_cap" + }, + "trigger": "minecraft:recipe_unlocked" + }, "has_twisted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "malum:twisted_rock_column_cap" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_twisted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:twisted_rock_column_cap" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_column_cap_stonecutting.json b/src/generated/resources/data/malum/advancements/recipes/misc/twisted_rock_column_cap_stonecutting.json similarity index 78% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_column_cap_stonecutting.json rename to src/generated/resources/data/malum/advancements/recipes/misc/twisted_rock_column_cap_stonecutting.json index 449700fc0..2f26328f1 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_column_cap_stonecutting.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/twisted_rock_column_cap_stonecutting.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:twisted_rock_column_cap_stonecutting" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "malum:twisted_rock_column_cap_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + }, "has_twisted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "malum:twisted_rock_column_cap_stonecutting" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_twisted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:twisted_rock_column_cap_stonecutting" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_column_from_cap.json b/src/generated/resources/data/malum/advancements/recipes/misc/twisted_rock_column_from_cap.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_column_from_cap.json rename to src/generated/resources/data/malum/advancements/recipes/misc/twisted_rock_column_from_cap.json index fd0b691b4..19d154a44 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_column_from_cap.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/twisted_rock_column_from_cap.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:twisted_rock_column_from_cap" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "malum:twisted_rock_column_from_cap" + }, + "trigger": "minecraft:recipe_unlocked" + }, "has_twisted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "malum:twisted_rock_column_from_cap" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_twisted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:twisted_rock_column_from_cap" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_column_stonecutting.json b/src/generated/resources/data/malum/advancements/recipes/misc/twisted_rock_column_stonecutting.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_column_stonecutting.json rename to src/generated/resources/data/malum/advancements/recipes/misc/twisted_rock_column_stonecutting.json index 852d65fab..1b80fecb9 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_column_stonecutting.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/twisted_rock_column_stonecutting.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:twisted_rock_column_stonecutting" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "malum:twisted_rock_column_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + }, "has_twisted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "malum:twisted_rock_column_stonecutting" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_twisted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:twisted_rock_column_stonecutting" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_item_pedestal.json b/src/generated/resources/data/malum/advancements/recipes/misc/twisted_rock_item_pedestal.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_item_pedestal.json rename to src/generated/resources/data/malum/advancements/recipes/misc/twisted_rock_item_pedestal.json index 8069debbb..a913e7999 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_item_pedestal.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/twisted_rock_item_pedestal.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:twisted_rock_item_pedestal" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "malum:twisted_rock_item_pedestal" + }, + "trigger": "minecraft:recipe_unlocked" + }, "has_twisted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "malum:twisted_rock_item_pedestal" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_twisted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:twisted_rock_item_pedestal" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_item_stand.json b/src/generated/resources/data/malum/advancements/recipes/misc/twisted_rock_item_stand.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_item_stand.json rename to src/generated/resources/data/malum/advancements/recipes/misc/twisted_rock_item_stand.json index afb9e515e..562b4695d 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_item_stand.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/twisted_rock_item_stand.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:twisted_rock_item_stand" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "malum:twisted_rock_item_stand" + }, + "trigger": "minecraft:recipe_unlocked" + }, "has_twisted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "malum:twisted_rock_item_stand" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_twisted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:twisted_rock_item_stand" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_pressure_plate.json b/src/generated/resources/data/malum/advancements/recipes/misc/twisted_rock_pressure_plate.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_pressure_plate.json rename to src/generated/resources/data/malum/advancements/recipes/misc/twisted_rock_pressure_plate.json index 2aa9e391c..017fc49e6 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_pressure_plate.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/twisted_rock_pressure_plate.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:twisted_rock_pressure_plate" - ] - }, "criteria": { "has_input": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:twisted_rock_pressure_plate" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_input", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:twisted_rock_pressure_plate" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_slab.json b/src/generated/resources/data/malum/advancements/recipes/misc/twisted_rock_slab.json similarity index 76% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_slab.json rename to src/generated/resources/data/malum/advancements/recipes/misc/twisted_rock_slab.json index 67074907e..f1f22a3b1 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_slab.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/twisted_rock_slab.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:twisted_rock_slab" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "malum:twisted_rock_slab" + }, + "trigger": "minecraft:recipe_unlocked" + }, "has_twisted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "malum:twisted_rock_slab" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_twisted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:twisted_rock_slab" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_slab_stonecutting.json b/src/generated/resources/data/malum/advancements/recipes/misc/twisted_rock_slab_stonecutting.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_slab_stonecutting.json rename to src/generated/resources/data/malum/advancements/recipes/misc/twisted_rock_slab_stonecutting.json index 63b6ecd19..79b6c9b8d 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_slab_stonecutting.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/twisted_rock_slab_stonecutting.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:twisted_rock_slab_stonecutting" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "malum:twisted_rock_slab_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + }, "has_twisted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "malum:twisted_rock_slab_stonecutting" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_twisted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:twisted_rock_slab_stonecutting" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_stairs.json b/src/generated/resources/data/malum/advancements/recipes/misc/twisted_rock_stairs.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_stairs.json rename to src/generated/resources/data/malum/advancements/recipes/misc/twisted_rock_stairs.json index 72ddfe4e6..1a49a37cc 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_stairs.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/twisted_rock_stairs.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:twisted_rock_stairs" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "malum:twisted_rock_stairs" + }, + "trigger": "minecraft:recipe_unlocked" + }, "has_twisted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "malum:twisted_rock_stairs" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_twisted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:twisted_rock_stairs" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_stairs_stonecutting.json b/src/generated/resources/data/malum/advancements/recipes/misc/twisted_rock_stairs_stonecutting.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_stairs_stonecutting.json rename to src/generated/resources/data/malum/advancements/recipes/misc/twisted_rock_stairs_stonecutting.json index d59cf7c5f..09cf06950 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_stairs_stonecutting.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/twisted_rock_stairs_stonecutting.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:twisted_rock_stairs_stonecutting" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "malum:twisted_rock_stairs_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + }, "has_twisted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "malum:twisted_rock_stairs_stonecutting" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_twisted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:twisted_rock_stairs_stonecutting" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_tiles.json b/src/generated/resources/data/malum/advancements/recipes/misc/twisted_rock_tiles.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_tiles.json rename to src/generated/resources/data/malum/advancements/recipes/misc/twisted_rock_tiles.json index 23544b231..239485bdb 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_tiles.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/twisted_rock_tiles.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:twisted_rock_tiles" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "malum:twisted_rock_tiles" + }, + "trigger": "minecraft:recipe_unlocked" + }, "has_twisted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "malum:twisted_rock_tiles" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_twisted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:twisted_rock_tiles" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_tiles_slab.json b/src/generated/resources/data/malum/advancements/recipes/misc/twisted_rock_tiles_slab.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_tiles_slab.json rename to src/generated/resources/data/malum/advancements/recipes/misc/twisted_rock_tiles_slab.json index 723a2af06..36c53bc24 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_tiles_slab.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/twisted_rock_tiles_slab.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:twisted_rock_tiles_slab" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "malum:twisted_rock_tiles_slab" + }, + "trigger": "minecraft:recipe_unlocked" + }, "has_twisted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "malum:twisted_rock_tiles_slab" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_twisted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:twisted_rock_tiles_slab" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_tiles_slab_stonecutting.json b/src/generated/resources/data/malum/advancements/recipes/misc/twisted_rock_tiles_slab_stonecutting.json similarity index 78% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_tiles_slab_stonecutting.json rename to src/generated/resources/data/malum/advancements/recipes/misc/twisted_rock_tiles_slab_stonecutting.json index 683d2a965..e1ef6b838 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_tiles_slab_stonecutting.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/twisted_rock_tiles_slab_stonecutting.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:twisted_rock_tiles_slab_stonecutting" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "malum:twisted_rock_tiles_slab_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + }, "has_twisted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "malum:twisted_rock_tiles_slab_stonecutting" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_twisted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:twisted_rock_tiles_slab_stonecutting" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_tiles_stairs.json b/src/generated/resources/data/malum/advancements/recipes/misc/twisted_rock_tiles_stairs.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_tiles_stairs.json rename to src/generated/resources/data/malum/advancements/recipes/misc/twisted_rock_tiles_stairs.json index 63ea870a4..b7e8d5a89 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_tiles_stairs.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/twisted_rock_tiles_stairs.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:twisted_rock_tiles_stairs" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "malum:twisted_rock_tiles_stairs" + }, + "trigger": "minecraft:recipe_unlocked" + }, "has_twisted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "malum:twisted_rock_tiles_stairs" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_twisted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:twisted_rock_tiles_stairs" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_tiles_stairs_stonecutting.json b/src/generated/resources/data/malum/advancements/recipes/misc/twisted_rock_tiles_stairs_stonecutting.json similarity index 78% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_tiles_stairs_stonecutting.json rename to src/generated/resources/data/malum/advancements/recipes/misc/twisted_rock_tiles_stairs_stonecutting.json index 17bdc44ba..fdbb0040a 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_tiles_stairs_stonecutting.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/twisted_rock_tiles_stairs_stonecutting.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:twisted_rock_tiles_stairs_stonecutting" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "malum:twisted_rock_tiles_stairs_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + }, "has_twisted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "malum:twisted_rock_tiles_stairs_stonecutting" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_twisted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:twisted_rock_tiles_stairs_stonecutting" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_tiles_stonecutting.json b/src/generated/resources/data/malum/advancements/recipes/misc/twisted_rock_tiles_stonecutting.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_tiles_stonecutting.json rename to src/generated/resources/data/malum/advancements/recipes/misc/twisted_rock_tiles_stonecutting.json index 2dbf888c3..1a7637d4c 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_tiles_stonecutting.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/twisted_rock_tiles_stonecutting.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:twisted_rock_tiles_stonecutting" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "malum:twisted_rock_tiles_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + }, "has_twisted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "malum:twisted_rock_tiles_stonecutting" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_twisted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:twisted_rock_tiles_stonecutting" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_tiles_stonecutting_from_bricks.json b/src/generated/resources/data/malum/advancements/recipes/misc/twisted_rock_tiles_stonecutting_from_bricks.json similarity index 78% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_tiles_stonecutting_from_bricks.json rename to src/generated/resources/data/malum/advancements/recipes/misc/twisted_rock_tiles_stonecutting_from_bricks.json index cbdbcc280..a2a5187c6 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_tiles_stonecutting_from_bricks.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/twisted_rock_tiles_stonecutting_from_bricks.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:twisted_rock_tiles_stonecutting_from_bricks" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "malum:twisted_rock_tiles_stonecutting_from_bricks" + }, + "trigger": "minecraft:recipe_unlocked" + }, "has_twisted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "malum:twisted_rock_tiles_stonecutting_from_bricks" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_twisted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:twisted_rock_tiles_stonecutting_from_bricks" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_tiles_stonecutting_from_polished.json b/src/generated/resources/data/malum/advancements/recipes/misc/twisted_rock_tiles_stonecutting_from_polished.json similarity index 78% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_tiles_stonecutting_from_polished.json rename to src/generated/resources/data/malum/advancements/recipes/misc/twisted_rock_tiles_stonecutting_from_polished.json index cd856abd5..7c7f29bfc 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_tiles_stonecutting_from_polished.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/twisted_rock_tiles_stonecutting_from_polished.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:twisted_rock_tiles_stonecutting_from_polished" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "malum:twisted_rock_tiles_stonecutting_from_polished" + }, + "trigger": "minecraft:recipe_unlocked" + }, "has_twisted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "malum:twisted_rock_tiles_stonecutting_from_polished" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_twisted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:twisted_rock_tiles_stonecutting_from_polished" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_tiles_wall.json b/src/generated/resources/data/malum/advancements/recipes/misc/twisted_rock_tiles_wall.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_tiles_wall.json rename to src/generated/resources/data/malum/advancements/recipes/misc/twisted_rock_tiles_wall.json index 0267515df..ec3fb31ff 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_tiles_wall.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/twisted_rock_tiles_wall.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:twisted_rock_tiles_wall" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "malum:twisted_rock_tiles_wall" + }, + "trigger": "minecraft:recipe_unlocked" + }, "has_twisted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "malum:twisted_rock_tiles_wall" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_twisted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:twisted_rock_tiles_wall" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_tiles_wall_stonecutting.json b/src/generated/resources/data/malum/advancements/recipes/misc/twisted_rock_tiles_wall_stonecutting.json similarity index 78% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_tiles_wall_stonecutting.json rename to src/generated/resources/data/malum/advancements/recipes/misc/twisted_rock_tiles_wall_stonecutting.json index f32877085..b4805456f 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_tiles_wall_stonecutting.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/twisted_rock_tiles_wall_stonecutting.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:twisted_rock_tiles_wall_stonecutting" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "malum:twisted_rock_tiles_wall_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + }, "has_twisted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "malum:twisted_rock_tiles_wall_stonecutting" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_twisted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:twisted_rock_tiles_wall_stonecutting" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_wall.json b/src/generated/resources/data/malum/advancements/recipes/misc/twisted_rock_wall.json similarity index 76% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_wall.json rename to src/generated/resources/data/malum/advancements/recipes/misc/twisted_rock_wall.json index 5fc8e060c..a05df39b8 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_wall.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/twisted_rock_wall.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:twisted_rock_wall" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "malum:twisted_rock_wall" + }, + "trigger": "minecraft:recipe_unlocked" + }, "has_twisted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "malum:twisted_rock_wall" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_twisted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:twisted_rock_wall" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_wall_stonecutting.json b/src/generated/resources/data/malum/advancements/recipes/misc/twisted_rock_wall_stonecutting.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_wall_stonecutting.json rename to src/generated/resources/data/malum/advancements/recipes/misc/twisted_rock_wall_stonecutting.json index cb0518032..750c42b4d 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_arcane_construct/twisted_rock_wall_stonecutting.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/twisted_rock_wall_stonecutting.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:twisted_rock_wall_stonecutting" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "malum:twisted_rock_wall_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + }, "has_twisted_rock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "malum:twisted_rock_wall_stonecutting" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_twisted_rock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:twisted_rock_wall_stonecutting" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/unholy_sap_from_smelting.json b/src/generated/resources/data/malum/advancements/recipes/misc/unholy_sap_from_smelting.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/unholy_sap_from_smelting.json rename to src/generated/resources/data/malum/advancements/recipes/misc/unholy_sap_from_smelting.json index 682c1ac26..069ff4bfd 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/unholy_sap_from_smelting.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/unholy_sap_from_smelting.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:unholy_sap_from_smelting" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "malum:unholy_sap_from_smelting" + }, + "trigger": "minecraft:recipe_unlocked" + }, "has_unholy_sap": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "malum:unholy_sap_from_smelting" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_unholy_sap", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:unholy_sap_from_smelting" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/unholy_sap_from_smoking.json b/src/generated/resources/data/malum/advancements/recipes/misc/unholy_sap_from_smoking.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/unholy_sap_from_smoking.json rename to src/generated/resources/data/malum/advancements/recipes/misc/unholy_sap_from_smoking.json index 273bf2aa5..59163a0d4 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/unholy_sap_from_smoking.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/unholy_sap_from_smoking.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:unholy_sap_from_smoking" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "malum:unholy_sap_from_smoking" + }, + "trigger": "minecraft:recipe_unlocked" + }, "has_unholy_sap": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "malum:unholy_sap_from_smoking" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_unholy_sap", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:unholy_sap_from_smoking" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/unholy_sapball.json b/src/generated/resources/data/malum/advancements/recipes/misc/unholy_sapball.json similarity index 76% rename from src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/unholy_sapball.json rename to src/generated/resources/data/malum/advancements/recipes/misc/unholy_sapball.json index ddd6e9ef7..cb68d10e9 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/unholy_sapball.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/unholy_sapball.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:unholy_sapball" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "malum:unholy_sapball" + }, + "trigger": "minecraft:recipe_unlocked" + }, "has_unholy_sap": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "malum:unholy_sapball" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_unholy_sap", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:unholy_sapball" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/vertical_runewood_planks.json b/src/generated/resources/data/malum/advancements/recipes/misc/vertical_runewood_planks.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/vertical_runewood_planks.json rename to src/generated/resources/data/malum/advancements/recipes/misc/vertical_runewood_planks.json index 78a7ba2c1..3e53821ed 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/vertical_runewood_planks.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/vertical_runewood_planks.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:vertical_runewood_planks" - ] - }, "criteria": { "has_runewood_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:vertical_runewood_planks" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_runewood_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:vertical_runewood_planks" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/vertical_runewood_planks_slab.json b/src/generated/resources/data/malum/advancements/recipes/misc/vertical_runewood_planks_slab.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/vertical_runewood_planks_slab.json rename to src/generated/resources/data/malum/advancements/recipes/misc/vertical_runewood_planks_slab.json index b1d61bcbd..ae7ee47bb 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/vertical_runewood_planks_slab.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/vertical_runewood_planks_slab.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:vertical_runewood_planks_slab" - ] - }, "criteria": { "has_input": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:vertical_runewood_planks_slab" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_input", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:vertical_runewood_planks_slab" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/vertical_runewood_planks_stairs.json b/src/generated/resources/data/malum/advancements/recipes/misc/vertical_runewood_planks_stairs.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/vertical_runewood_planks_stairs.json rename to src/generated/resources/data/malum/advancements/recipes/misc/vertical_runewood_planks_stairs.json index e7651e7d6..52013b3f1 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/vertical_runewood_planks_stairs.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/vertical_runewood_planks_stairs.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:vertical_runewood_planks_stairs" - ] - }, "criteria": { "has_input": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:vertical_runewood_planks_stairs" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_input", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:vertical_runewood_planks_stairs" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/vertical_soulwood_planks.json b/src/generated/resources/data/malum/advancements/recipes/misc/vertical_soulwood_planks.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/vertical_soulwood_planks.json rename to src/generated/resources/data/malum/advancements/recipes/misc/vertical_soulwood_planks.json index 05eb5e4f4..38f435ba5 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/vertical_soulwood_planks.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/vertical_soulwood_planks.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:vertical_soulwood_planks" - ] - }, "criteria": { "has_soulwood_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:vertical_soulwood_planks" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_soulwood_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:vertical_soulwood_planks" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/vertical_soulwood_planks_slab.json b/src/generated/resources/data/malum/advancements/recipes/misc/vertical_soulwood_planks_slab.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/vertical_soulwood_planks_slab.json rename to src/generated/resources/data/malum/advancements/recipes/misc/vertical_soulwood_planks_slab.json index 3b082ada0..15a5dee85 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/vertical_soulwood_planks_slab.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/vertical_soulwood_planks_slab.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:vertical_soulwood_planks_slab" - ] - }, "criteria": { "has_input": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:vertical_soulwood_planks_slab" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_input", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:vertical_soulwood_planks_slab" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/vertical_soulwood_planks_stairs.json b/src/generated/resources/data/malum/advancements/recipes/misc/vertical_soulwood_planks_stairs.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/vertical_soulwood_planks_stairs.json rename to src/generated/resources/data/malum/advancements/recipes/misc/vertical_soulwood_planks_stairs.json index a2ead37fb..ce2b5fc63 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_natural_wonders/vertical_soulwood_planks_stairs.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/vertical_soulwood_planks_stairs.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:vertical_soulwood_planks_stairs" - ] - }, "criteria": { "has_input": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:vertical_soulwood_planks_stairs" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_input", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:vertical_soulwood_planks_stairs" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/malum_cosmetics/weavers_workbench.json b/src/generated/resources/data/malum/advancements/recipes/misc/weavers_workbench.json similarity index 76% rename from src/generated/resources/data/malum/advancements/recipes/malum_cosmetics/weavers_workbench.json rename to src/generated/resources/data/malum/advancements/recipes/misc/weavers_workbench.json index 2443b09e1..26c2011db 100644 --- a/src/generated/resources/data/malum/advancements/recipes/malum_cosmetics/weavers_workbench.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/weavers_workbench.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:weavers_workbench" - ] - }, "criteria": { "has_hex_ash": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:weavers_workbench" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_hex_ash", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:weavers_workbench" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/decorations/zombie_head_from_grim_talc.json b/src/generated/resources/data/malum/advancements/recipes/misc/zombie_head_from_grim_talc.json similarity index 77% rename from src/generated/resources/data/malum/advancements/recipes/decorations/zombie_head_from_grim_talc.json rename to src/generated/resources/data/malum/advancements/recipes/misc/zombie_head_from_grim_talc.json index c5988c845..b54b1dc15 100644 --- a/src/generated/resources/data/malum/advancements/recipes/decorations/zombie_head_from_grim_talc.json +++ b/src/generated/resources/data/malum/advancements/recipes/misc/zombie_head_from_grim_talc.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:zombie_head_from_grim_talc" - ] - }, "criteria": { "has_grim_talc": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:zombie_head_from_grim_talc" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_grim_talc", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:zombie_head_from_grim_talc" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/nickel_from_node_blasting.json b/src/generated/resources/data/malum/advancements/recipes/nickel_from_node_blasting.json index 230711ad7..5d66b0cd5 100644 --- a/src/generated/resources/data/malum/advancements/recipes/nickel_from_node_blasting.json +++ b/src/generated/resources/data/malum/advancements/recipes/nickel_from_node_blasting.json @@ -1,19 +1,20 @@ { "advancements": [ { + "advancement": { + "criteria": {}, + "requirements": [], + "sends_telemetry_event": true + }, "conditions": [ { + "type": "forge:not", "value": { - "tag": "forge:nuggets/nickel", - "type": "forge:tag_empty" - }, - "type": "forge:not" + "type": "forge:tag_empty", + "tag": "forge:nuggets/nickel" + } } - ], - "advancement": { - "criteria": {}, - "requirements": [] - } + ] } ] } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/nickel_from_node_smelting.json b/src/generated/resources/data/malum/advancements/recipes/nickel_from_node_smelting.json index 230711ad7..5d66b0cd5 100644 --- a/src/generated/resources/data/malum/advancements/recipes/nickel_from_node_smelting.json +++ b/src/generated/resources/data/malum/advancements/recipes/nickel_from_node_smelting.json @@ -1,19 +1,20 @@ { "advancements": [ { + "advancement": { + "criteria": {}, + "requirements": [], + "sends_telemetry_event": true + }, "conditions": [ { + "type": "forge:not", "value": { - "tag": "forge:nuggets/nickel", - "type": "forge:tag_empty" - }, - "type": "forge:not" + "type": "forge:tag_empty", + "tag": "forge:nuggets/nickel" + } } - ], - "advancement": { - "criteria": {}, - "requirements": [] - } + ] } ] } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/node_focusing_aluminum.json b/src/generated/resources/data/malum/advancements/recipes/node_focusing_aluminum.json index 230efa52b..638568ca7 100644 --- a/src/generated/resources/data/malum/advancements/recipes/node_focusing_aluminum.json +++ b/src/generated/resources/data/malum/advancements/recipes/node_focusing_aluminum.json @@ -3,11 +3,11 @@ { "conditions": [ { + "type": "forge:not", "value": { - "tag": "forge:nuggets/aluminum", - "type": "forge:tag_empty" - }, - "type": "forge:not" + "type": "forge:tag_empty", + "tag": "forge:nuggets/aluminum" + } } ] } diff --git a/src/generated/resources/data/malum/advancements/recipes/node_focusing_lead.json b/src/generated/resources/data/malum/advancements/recipes/node_focusing_lead.json index 92868dc9f..312a4f01b 100644 --- a/src/generated/resources/data/malum/advancements/recipes/node_focusing_lead.json +++ b/src/generated/resources/data/malum/advancements/recipes/node_focusing_lead.json @@ -3,11 +3,11 @@ { "conditions": [ { + "type": "forge:not", "value": { - "tag": "forge:nuggets/lead", - "type": "forge:tag_empty" - }, - "type": "forge:not" + "type": "forge:tag_empty", + "tag": "forge:nuggets/lead" + } } ] } diff --git a/src/generated/resources/data/malum/advancements/recipes/node_focusing_nickel.json b/src/generated/resources/data/malum/advancements/recipes/node_focusing_nickel.json index 89ef22f2d..d631e6515 100644 --- a/src/generated/resources/data/malum/advancements/recipes/node_focusing_nickel.json +++ b/src/generated/resources/data/malum/advancements/recipes/node_focusing_nickel.json @@ -3,11 +3,11 @@ { "conditions": [ { + "type": "forge:not", "value": { - "tag": "forge:nuggets/nickel", - "type": "forge:tag_empty" - }, - "type": "forge:not" + "type": "forge:tag_empty", + "tag": "forge:nuggets/nickel" + } } ] } diff --git a/src/generated/resources/data/malum/advancements/recipes/node_focusing_osmium.json b/src/generated/resources/data/malum/advancements/recipes/node_focusing_osmium.json index 84cbb509f..f3a11e620 100644 --- a/src/generated/resources/data/malum/advancements/recipes/node_focusing_osmium.json +++ b/src/generated/resources/data/malum/advancements/recipes/node_focusing_osmium.json @@ -3,11 +3,11 @@ { "conditions": [ { + "type": "forge:not", "value": { - "tag": "forge:nuggets/osmium", - "type": "forge:tag_empty" - }, - "type": "forge:not" + "type": "forge:tag_empty", + "tag": "forge:nuggets/osmium" + } } ] } diff --git a/src/generated/resources/data/malum/advancements/recipes/node_focusing_silver.json b/src/generated/resources/data/malum/advancements/recipes/node_focusing_silver.json index ad6d8e6ca..8ad1ac82a 100644 --- a/src/generated/resources/data/malum/advancements/recipes/node_focusing_silver.json +++ b/src/generated/resources/data/malum/advancements/recipes/node_focusing_silver.json @@ -3,11 +3,11 @@ { "conditions": [ { + "type": "forge:not", "value": { - "tag": "forge:nuggets/silver", - "type": "forge:tag_empty" - }, - "type": "forge:not" + "type": "forge:tag_empty", + "tag": "forge:nuggets/silver" + } } ] } diff --git a/src/generated/resources/data/malum/advancements/recipes/node_focusing_tin.json b/src/generated/resources/data/malum/advancements/recipes/node_focusing_tin.json index 4e0a35638..106688980 100644 --- a/src/generated/resources/data/malum/advancements/recipes/node_focusing_tin.json +++ b/src/generated/resources/data/malum/advancements/recipes/node_focusing_tin.json @@ -3,11 +3,11 @@ { "conditions": [ { + "type": "forge:not", "value": { - "tag": "forge:nuggets/tin", - "type": "forge:tag_empty" - }, - "type": "forge:not" + "type": "forge:tag_empty", + "tag": "forge:nuggets/tin" + } } ] } diff --git a/src/generated/resources/data/malum/advancements/recipes/node_focusing_uranium.json b/src/generated/resources/data/malum/advancements/recipes/node_focusing_uranium.json index 039e53c23..e193de202 100644 --- a/src/generated/resources/data/malum/advancements/recipes/node_focusing_uranium.json +++ b/src/generated/resources/data/malum/advancements/recipes/node_focusing_uranium.json @@ -3,11 +3,11 @@ { "conditions": [ { + "type": "forge:not", "value": { - "tag": "forge:nuggets/uranium", - "type": "forge:tag_empty" - }, - "type": "forge:not" + "type": "forge:tag_empty", + "tag": "forge:nuggets/uranium" + } } ] } diff --git a/src/generated/resources/data/malum/advancements/recipes/node_focusing_zinc.json b/src/generated/resources/data/malum/advancements/recipes/node_focusing_zinc.json index d713cafa8..cea24ef71 100644 --- a/src/generated/resources/data/malum/advancements/recipes/node_focusing_zinc.json +++ b/src/generated/resources/data/malum/advancements/recipes/node_focusing_zinc.json @@ -3,11 +3,11 @@ { "conditions": [ { + "type": "forge:not", "value": { - "tag": "forge:nuggets/zinc", - "type": "forge:tag_empty" - }, - "type": "forge:not" + "type": "forge:tag_empty", + "tag": "forge:nuggets/zinc" + } } ] } diff --git a/src/generated/resources/data/malum/advancements/recipes/osmium_from_node_blasting.json b/src/generated/resources/data/malum/advancements/recipes/osmium_from_node_blasting.json index 88517975d..1cd3ecf7c 100644 --- a/src/generated/resources/data/malum/advancements/recipes/osmium_from_node_blasting.json +++ b/src/generated/resources/data/malum/advancements/recipes/osmium_from_node_blasting.json @@ -1,19 +1,20 @@ { "advancements": [ { + "advancement": { + "criteria": {}, + "requirements": [], + "sends_telemetry_event": true + }, "conditions": [ { + "type": "forge:not", "value": { - "tag": "forge:nuggets/osmium", - "type": "forge:tag_empty" - }, - "type": "forge:not" + "type": "forge:tag_empty", + "tag": "forge:nuggets/osmium" + } } - ], - "advancement": { - "criteria": {}, - "requirements": [] - } + ] } ] } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/osmium_from_node_smelting.json b/src/generated/resources/data/malum/advancements/recipes/osmium_from_node_smelting.json index 88517975d..1cd3ecf7c 100644 --- a/src/generated/resources/data/malum/advancements/recipes/osmium_from_node_smelting.json +++ b/src/generated/resources/data/malum/advancements/recipes/osmium_from_node_smelting.json @@ -1,19 +1,20 @@ { "advancements": [ { + "advancement": { + "criteria": {}, + "requirements": [], + "sends_telemetry_event": true + }, "conditions": [ { + "type": "forge:not", "value": { - "tag": "forge:nuggets/osmium", - "type": "forge:tag_empty" - }, - "type": "forge:not" + "type": "forge:tag_empty", + "tag": "forge:nuggets/osmium" + } } - ], - "advancement": { - "criteria": {}, - "requirements": [] - } + ] } ] } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/silver_from_node_blasting.json b/src/generated/resources/data/malum/advancements/recipes/silver_from_node_blasting.json index 518845f24..49f55b836 100644 --- a/src/generated/resources/data/malum/advancements/recipes/silver_from_node_blasting.json +++ b/src/generated/resources/data/malum/advancements/recipes/silver_from_node_blasting.json @@ -1,19 +1,20 @@ { "advancements": [ { + "advancement": { + "criteria": {}, + "requirements": [], + "sends_telemetry_event": true + }, "conditions": [ { + "type": "forge:not", "value": { - "tag": "forge:nuggets/silver", - "type": "forge:tag_empty" - }, - "type": "forge:not" + "type": "forge:tag_empty", + "tag": "forge:nuggets/silver" + } } - ], - "advancement": { - "criteria": {}, - "requirements": [] - } + ] } ] } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/silver_from_node_smelting.json b/src/generated/resources/data/malum/advancements/recipes/silver_from_node_smelting.json index 518845f24..49f55b836 100644 --- a/src/generated/resources/data/malum/advancements/recipes/silver_from_node_smelting.json +++ b/src/generated/resources/data/malum/advancements/recipes/silver_from_node_smelting.json @@ -1,19 +1,20 @@ { "advancements": [ { + "advancement": { + "criteria": {}, + "requirements": [], + "sends_telemetry_event": true + }, "conditions": [ { + "type": "forge:not", "value": { - "tag": "forge:nuggets/silver", - "type": "forge:tag_empty" - }, - "type": "forge:not" + "type": "forge:tag_empty", + "tag": "forge:nuggets/silver" + } } - ], - "advancement": { - "criteria": {}, - "requirements": [] - } + ] } ] } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/the_device/the_device.json b/src/generated/resources/data/malum/advancements/recipes/the_device/the_device.json index ae1c5cd51..7023b8ed3 100644 --- a/src/generated/resources/data/malum/advancements/recipes/the_device/the_device.json +++ b/src/generated/resources/data/malum/advancements/recipes/the_device/the_device.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:the_device" - ] - }, "criteria": { "has_bedrock": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "malum:the_device" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_bedrock", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "malum:the_device" + ] + }, + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/tin_from_node_blasting.json b/src/generated/resources/data/malum/advancements/recipes/tin_from_node_blasting.json index 02922ea74..e3df5e4ee 100644 --- a/src/generated/resources/data/malum/advancements/recipes/tin_from_node_blasting.json +++ b/src/generated/resources/data/malum/advancements/recipes/tin_from_node_blasting.json @@ -1,19 +1,20 @@ { "advancements": [ { + "advancement": { + "criteria": {}, + "requirements": [], + "sends_telemetry_event": true + }, "conditions": [ { + "type": "forge:not", "value": { - "tag": "forge:nuggets/tin", - "type": "forge:tag_empty" - }, - "type": "forge:not" + "type": "forge:tag_empty", + "tag": "forge:nuggets/tin" + } } - ], - "advancement": { - "criteria": {}, - "requirements": [] - } + ] } ] } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/tin_from_node_smelting.json b/src/generated/resources/data/malum/advancements/recipes/tin_from_node_smelting.json index 02922ea74..e3df5e4ee 100644 --- a/src/generated/resources/data/malum/advancements/recipes/tin_from_node_smelting.json +++ b/src/generated/resources/data/malum/advancements/recipes/tin_from_node_smelting.json @@ -1,19 +1,20 @@ { "advancements": [ { + "advancement": { + "criteria": {}, + "requirements": [], + "sends_telemetry_event": true + }, "conditions": [ { + "type": "forge:not", "value": { - "tag": "forge:nuggets/tin", - "type": "forge:tag_empty" - }, - "type": "forge:not" + "type": "forge:tag_empty", + "tag": "forge:nuggets/tin" + } } - ], - "advancement": { - "criteria": {}, - "requirements": [] - } + ] } ] } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/uranium_from_node_blasting.json b/src/generated/resources/data/malum/advancements/recipes/uranium_from_node_blasting.json index 5e3818688..a57da5269 100644 --- a/src/generated/resources/data/malum/advancements/recipes/uranium_from_node_blasting.json +++ b/src/generated/resources/data/malum/advancements/recipes/uranium_from_node_blasting.json @@ -1,19 +1,20 @@ { "advancements": [ { + "advancement": { + "criteria": {}, + "requirements": [], + "sends_telemetry_event": true + }, "conditions": [ { + "type": "forge:not", "value": { - "tag": "forge:nuggets/uranium", - "type": "forge:tag_empty" - }, - "type": "forge:not" + "type": "forge:tag_empty", + "tag": "forge:nuggets/uranium" + } } - ], - "advancement": { - "criteria": {}, - "requirements": [] - } + ] } ] } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/uranium_from_node_smelting.json b/src/generated/resources/data/malum/advancements/recipes/uranium_from_node_smelting.json index 5e3818688..a57da5269 100644 --- a/src/generated/resources/data/malum/advancements/recipes/uranium_from_node_smelting.json +++ b/src/generated/resources/data/malum/advancements/recipes/uranium_from_node_smelting.json @@ -1,19 +1,20 @@ { "advancements": [ { + "advancement": { + "criteria": {}, + "requirements": [], + "sends_telemetry_event": true + }, "conditions": [ { + "type": "forge:not", "value": { - "tag": "forge:nuggets/uranium", - "type": "forge:tag_empty" - }, - "type": "forge:not" + "type": "forge:tag_empty", + "tag": "forge:nuggets/uranium" + } } - ], - "advancement": { - "criteria": {}, - "requirements": [] - } + ] } ] } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/zinc_from_node_blasting.json b/src/generated/resources/data/malum/advancements/recipes/zinc_from_node_blasting.json index 875392742..7fc6329e6 100644 --- a/src/generated/resources/data/malum/advancements/recipes/zinc_from_node_blasting.json +++ b/src/generated/resources/data/malum/advancements/recipes/zinc_from_node_blasting.json @@ -1,19 +1,20 @@ { "advancements": [ { + "advancement": { + "criteria": {}, + "requirements": [], + "sends_telemetry_event": true + }, "conditions": [ { + "type": "forge:not", "value": { - "tag": "forge:nuggets/zinc", - "type": "forge:tag_empty" - }, - "type": "forge:not" + "type": "forge:tag_empty", + "tag": "forge:nuggets/zinc" + } } - ], - "advancement": { - "criteria": {}, - "requirements": [] - } + ] } ] } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancements/recipes/zinc_from_node_smelting.json b/src/generated/resources/data/malum/advancements/recipes/zinc_from_node_smelting.json index 875392742..7fc6329e6 100644 --- a/src/generated/resources/data/malum/advancements/recipes/zinc_from_node_smelting.json +++ b/src/generated/resources/data/malum/advancements/recipes/zinc_from_node_smelting.json @@ -1,19 +1,20 @@ { "advancements": [ { + "advancement": { + "criteria": {}, + "requirements": [], + "sends_telemetry_event": true + }, "conditions": [ { + "type": "forge:not", "value": { - "tag": "forge:nuggets/zinc", - "type": "forge:tag_empty" - }, - "type": "forge:not" + "type": "forge:tag_empty", + "tag": "forge:nuggets/zinc" + } } - ], - "advancement": { - "criteria": {}, - "requirements": [] - } + ] } ] } \ No newline at end of file diff --git a/src/generated/resources/data/malum/forge/biome_modifier/brilliant_ore.json b/src/generated/resources/data/malum/forge/biome_modifier/brilliant_ore.json new file mode 100644 index 000000000..ec43e8dba --- /dev/null +++ b/src/generated/resources/data/malum/forge/biome_modifier/brilliant_ore.json @@ -0,0 +1,6 @@ +{ + "type": "forge:add_features", + "biomes": "#malum:has_brilliant", + "features": "malum:ore_brilliant", + "step": "underground_ores" +} \ No newline at end of file diff --git a/src/generated/resources/data/malum/forge/biome_modifier/natural_quartz_ore.json b/src/generated/resources/data/malum/forge/biome_modifier/natural_quartz_ore.json new file mode 100644 index 000000000..6e6067dfc --- /dev/null +++ b/src/generated/resources/data/malum/forge/biome_modifier/natural_quartz_ore.json @@ -0,0 +1,6 @@ +{ + "type": "forge:add_features", + "biomes": "#malum:has_soulstone", + "features": "malum:ore_natural_quartz", + "step": "underground_ores" +} \ No newline at end of file diff --git a/src/generated/resources/data/malum/forge/biome_modifier/soulstone_ore.json b/src/generated/resources/data/malum/forge/biome_modifier/soulstone_ore.json new file mode 100644 index 000000000..c24d20b81 --- /dev/null +++ b/src/generated/resources/data/malum/forge/biome_modifier/soulstone_ore.json @@ -0,0 +1,6 @@ +{ + "type": "forge:add_features", + "biomes": "#malum:has_soulstone", + "features": "malum:ore_soulstone", + "step": "underground_ores" +} \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/blazing_quartz_ore.json b/src/generated/resources/data/malum/loot_tables/blocks/blazing_quartz_ore.json index 163806aa2..ad86329b1 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/blazing_quartz_ore.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/blazing_quartz_ore.json @@ -2,7 +2,6 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { @@ -31,9 +30,9 @@ "type": "minecraft:item", "functions": [ { - "function": "minecraft:apply_bonus", "enchantment": "minecraft:fortune", - "formula": "minecraft:ore_drops" + "formula": "minecraft:ore_drops", + "function": "minecraft:apply_bonus" }, { "function": "minecraft:explosion_decay" @@ -43,7 +42,9 @@ } ] } - ] + ], + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/blazing_quartz_ore" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/blighted_earth.json b/src/generated/resources/data/malum/loot_tables/blocks/blighted_earth.json index b431b8504..5870b9d3a 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/blighted_earth.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/blighted_earth.json @@ -2,7 +2,6 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { @@ -36,19 +35,19 @@ ], "functions": [ { - "function": "minecraft:set_count", + "add": false, "count": 4.0, - "add": false + "function": "minecraft:set_count" } ], "name": "malum:blighted_gunk" } ] } - ] + ], + "rolls": 1.0 }, { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { @@ -60,7 +59,9 @@ ], "name": "minecraft:dirt" } - ] + ], + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/blighted_earth" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/blighted_soil.json b/src/generated/resources/data/malum/loot_tables/blocks/blighted_soil.json index b4e91453c..41149d306 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/blighted_soil.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/blighted_soil.json @@ -2,7 +2,6 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { @@ -36,16 +35,18 @@ ], "functions": [ { - "function": "minecraft:set_count", + "add": false, "count": 4.0, - "add": false + "function": "minecraft:set_count" } ], "name": "malum:blighted_gunk" } ] } - ] + ], + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/blighted_soil" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/blighted_soulwood.json b/src/generated/resources/data/malum/loot_tables/blocks/blighted_soulwood.json index 56cd0c22f..fc7c804d3 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/blighted_soulwood.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/blighted_soulwood.json @@ -2,7 +2,6 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { @@ -38,7 +37,9 @@ } ] } - ] + ], + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/blighted_soulwood" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/blighted_tumor.json b/src/generated/resources/data/malum/loot_tables/blocks/blighted_tumor.json index f42916bfd..42df21c6f 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/blighted_tumor.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/blighted_tumor.json @@ -2,7 +2,6 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { @@ -12,7 +11,7 @@ "type": "minecraft:item", "conditions": [ { - "condition": "minecraft:alternative", + "condition": "minecraft:any_of", "terms": [ { "condition": "minecraft:match_tool", @@ -49,16 +48,18 @@ ], "functions": [ { - "function": "minecraft:set_count", + "add": false, "count": 2.0, - "add": false + "function": "minecraft:set_count" } ], "name": "malum:blighted_gunk" } ] } - ] + ], + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/blighted_tumor" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/blighted_weed.json b/src/generated/resources/data/malum/loot_tables/blocks/blighted_weed.json index 24666a39e..e01203952 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/blighted_weed.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/blighted_weed.json @@ -2,7 +2,6 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { @@ -12,7 +11,7 @@ "type": "minecraft:item", "conditions": [ { - "condition": "minecraft:alternative", + "condition": "minecraft:any_of", "terms": [ { "condition": "minecraft:match_tool", @@ -49,16 +48,18 @@ ], "functions": [ { - "function": "minecraft:set_count", + "add": false, "count": 1.0, - "add": false + "function": "minecraft:set_count" } ], "name": "malum:blighted_gunk" } ] } - ] + ], + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/blighted_weed" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/block_of_alchemical_calx.json b/src/generated/resources/data/malum/loot_tables/blocks/block_of_alchemical_calx.json index f447247bc..01886d456 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/block_of_alchemical_calx.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/block_of_alchemical_calx.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:block_of_alchemical_calx" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/block_of_alchemical_calx" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/block_of_arcane_charcoal.json b/src/generated/resources/data/malum/loot_tables/blocks/block_of_arcane_charcoal.json index 6a18161d5..18692852e 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/block_of_arcane_charcoal.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/block_of_arcane_charcoal.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:block_of_arcane_charcoal" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/block_of_arcane_charcoal" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/block_of_astral_weave.json b/src/generated/resources/data/malum/loot_tables/blocks/block_of_astral_weave.json index 9e1e226d4..8a91a5c71 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/block_of_astral_weave.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/block_of_astral_weave.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:block_of_astral_weave" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/block_of_astral_weave" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/block_of_blazing_quartz.json b/src/generated/resources/data/malum/loot_tables/blocks/block_of_blazing_quartz.json index 6240a0b14..0323edaca 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/block_of_blazing_quartz.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/block_of_blazing_quartz.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:block_of_blazing_quartz" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/block_of_blazing_quartz" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/block_of_brilliance.json b/src/generated/resources/data/malum/loot_tables/blocks/block_of_brilliance.json index 01e94be44..fd7da5e13 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/block_of_brilliance.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/block_of_brilliance.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:block_of_brilliance" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/block_of_brilliance" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/block_of_cthonic_gold.json b/src/generated/resources/data/malum/loot_tables/blocks/block_of_cthonic_gold.json index 90be02707..abfc60679 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/block_of_cthonic_gold.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/block_of_cthonic_gold.json @@ -2,7 +2,6 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { @@ -38,7 +37,9 @@ } ] } - ] + ], + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/block_of_cthonic_gold" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/block_of_cursed_grit.json b/src/generated/resources/data/malum/loot_tables/blocks/block_of_cursed_grit.json index ba3b7f1ff..b542a0a4f 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/block_of_cursed_grit.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/block_of_cursed_grit.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:block_of_cursed_grit" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/block_of_cursed_grit" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/block_of_grim_talc.json b/src/generated/resources/data/malum/loot_tables/blocks/block_of_grim_talc.json index a0e582c98..37422066f 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/block_of_grim_talc.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/block_of_grim_talc.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:block_of_grim_talc" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/block_of_grim_talc" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/block_of_hallowed_gold.json b/src/generated/resources/data/malum/loot_tables/blocks/block_of_hallowed_gold.json index 3536e92a1..3042b88e2 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/block_of_hallowed_gold.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/block_of_hallowed_gold.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:block_of_hallowed_gold" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/block_of_hallowed_gold" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/block_of_hex_ash.json b/src/generated/resources/data/malum/loot_tables/blocks/block_of_hex_ash.json index 3f2f740e8..d4e0b7b40 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/block_of_hex_ash.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/block_of_hex_ash.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:block_of_hex_ash" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/block_of_hex_ash" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/block_of_raw_soulstone.json b/src/generated/resources/data/malum/loot_tables/blocks/block_of_raw_soulstone.json index 681e8951d..621b72fb6 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/block_of_raw_soulstone.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/block_of_raw_soulstone.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:block_of_raw_soulstone" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/block_of_raw_soulstone" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/block_of_rotting_essence.json b/src/generated/resources/data/malum/loot_tables/blocks/block_of_rotting_essence.json index a6888eb84..5de4d3bda 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/block_of_rotting_essence.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/block_of_rotting_essence.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:block_of_rotting_essence" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/block_of_rotting_essence" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/block_of_soul_stained_steel.json b/src/generated/resources/data/malum/loot_tables/blocks/block_of_soul_stained_steel.json index 9649a34a4..0846be062 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/block_of_soul_stained_steel.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/block_of_soul_stained_steel.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:block_of_soul_stained_steel" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/block_of_soul_stained_steel" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/block_of_soulstone.json b/src/generated/resources/data/malum/loot_tables/blocks/block_of_soulstone.json index 1154b77f7..2a71c02bf 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/block_of_soulstone.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/block_of_soulstone.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:block_of_soulstone" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/block_of_soulstone" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/block_of_void_salts.json b/src/generated/resources/data/malum/loot_tables/blocks/block_of_void_salts.json index 7cdcd140a..1f89d6fd8 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/block_of_void_salts.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/block_of_void_salts.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:block_of_void_salts" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/block_of_void_salts" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/brilliant_deepslate.json b/src/generated/resources/data/malum/loot_tables/blocks/brilliant_deepslate.json index c9dd1ef81..cb0add3a2 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/brilliant_deepslate.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/brilliant_deepslate.json @@ -2,7 +2,6 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { @@ -31,9 +30,9 @@ "type": "minecraft:item", "functions": [ { - "function": "minecraft:apply_bonus", "enchantment": "minecraft:fortune", - "formula": "minecraft:ore_drops" + "formula": "minecraft:ore_drops", + "function": "minecraft:apply_bonus" }, { "function": "minecraft:explosion_decay" @@ -43,7 +42,9 @@ } ] } - ] + ], + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/brilliant_deepslate" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/brilliant_obelisk.json b/src/generated/resources/data/malum/loot_tables/blocks/brilliant_obelisk.json index e618a1f8e..ec7ddb951 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/brilliant_obelisk.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/brilliant_obelisk.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:brilliant_obelisk" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/brilliant_obelisk" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/brilliant_stone.json b/src/generated/resources/data/malum/loot_tables/blocks/brilliant_stone.json index c4aa8a495..fc57a6905 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/brilliant_stone.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/brilliant_stone.json @@ -2,7 +2,6 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { @@ -31,9 +30,9 @@ "type": "minecraft:item", "functions": [ { - "function": "minecraft:apply_bonus", "enchantment": "minecraft:fortune", - "formula": "minecraft:ore_drops" + "formula": "minecraft:ore_drops", + "function": "minecraft:apply_bonus" }, { "function": "minecraft:explosion_decay" @@ -43,7 +42,9 @@ } ] } - ] + ], + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/brilliant_stone" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/chiseled_tainted_rock.json b/src/generated/resources/data/malum/loot_tables/blocks/chiseled_tainted_rock.json index 2bdeaf0d6..2536a1659 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/chiseled_tainted_rock.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/chiseled_tainted_rock.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:chiseled_tainted_rock" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/chiseled_tainted_rock" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/chiseled_twisted_rock.json b/src/generated/resources/data/malum/loot_tables/blocks/chiseled_twisted_rock.json index 40ef5cbbf..1e889cbb1 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/chiseled_twisted_rock.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/chiseled_twisted_rock.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:chiseled_twisted_rock" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/chiseled_twisted_rock" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/cut_runewood_planks.json b/src/generated/resources/data/malum/loot_tables/blocks/cut_runewood_planks.json index c8493b2d4..fd633c09e 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/cut_runewood_planks.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/cut_runewood_planks.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:cut_runewood_planks" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/cut_runewood_planks" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/cut_soulwood_planks.json b/src/generated/resources/data/malum/loot_tables/blocks/cut_soulwood_planks.json index a87365a7e..9f8cedfcb 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/cut_soulwood_planks.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/cut_soulwood_planks.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:cut_soulwood_planks" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/cut_soulwood_planks" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/cut_tainted_rock.json b/src/generated/resources/data/malum/loot_tables/blocks/cut_tainted_rock.json index b59790167..00d309f0b 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/cut_tainted_rock.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/cut_tainted_rock.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:cut_tainted_rock" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/cut_tainted_rock" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/cut_twisted_rock.json b/src/generated/resources/data/malum/loot_tables/blocks/cut_twisted_rock.json index e74a5dcac..c45426bd6 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/cut_twisted_rock.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/cut_twisted_rock.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:cut_twisted_rock" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/cut_twisted_rock" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/deepslate_quartz_ore.json b/src/generated/resources/data/malum/loot_tables/blocks/deepslate_quartz_ore.json index 37949e0b1..691159674 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/deepslate_quartz_ore.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/deepslate_quartz_ore.json @@ -2,7 +2,6 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { @@ -31,9 +30,9 @@ "type": "minecraft:item", "functions": [ { - "function": "minecraft:apply_bonus", "enchantment": "minecraft:fortune", - "formula": "minecraft:ore_drops" + "formula": "minecraft:ore_drops", + "function": "minecraft:apply_bonus" }, { "function": "minecraft:explosion_decay" @@ -43,7 +42,9 @@ } ] } - ] + ], + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/deepslate_quartz_ore" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/deepslate_soulstone_ore.json b/src/generated/resources/data/malum/loot_tables/blocks/deepslate_soulstone_ore.json index 0efde098d..6310169af 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/deepslate_soulstone_ore.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/deepslate_soulstone_ore.json @@ -2,7 +2,6 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { @@ -31,9 +30,9 @@ "type": "minecraft:item", "functions": [ { - "function": "minecraft:apply_bonus", "enchantment": "minecraft:fortune", - "formula": "minecraft:ore_drops" + "formula": "minecraft:ore_drops", + "function": "minecraft:apply_bonus" }, { "function": "minecraft:explosion_decay" @@ -43,7 +42,9 @@ } ] } - ] + ], + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/deepslate_soulstone_ore" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/ether.json b/src/generated/resources/data/malum/loot_tables/blocks/ether.json index 63bc70c67..6e9e39aa2 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/ether.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/ether.json @@ -2,8 +2,12 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", @@ -14,29 +18,26 @@ }, { "function": "minecraft:copy_nbt", - "source": "block_entity", "ops": [ { + "op": "replace", "source": "firstColor", - "target": "display.firstColor", - "op": "replace" + "target": "display.firstColor" }, { + "op": "replace", "source": "secondColor", - "target": "display.secondColor", - "op": "replace" + "target": "display.secondColor" } - ] + ], + "source": "block_entity" } ], "name": "malum:ether" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/ether" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/ether_torch.json b/src/generated/resources/data/malum/loot_tables/blocks/ether_torch.json index 7f435da09..1cc011152 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/ether_torch.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/ether_torch.json @@ -2,8 +2,12 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", @@ -14,29 +18,26 @@ }, { "function": "minecraft:copy_nbt", - "source": "block_entity", "ops": [ { + "op": "replace", "source": "firstColor", - "target": "display.firstColor", - "op": "replace" + "target": "display.firstColor" }, { + "op": "replace", "source": "secondColor", - "target": "display.secondColor", - "op": "replace" + "target": "display.secondColor" } - ] + ], + "source": "block_entity" } ], "name": "malum:ether_torch" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/ether_torch" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/exposed_runewood_log.json b/src/generated/resources/data/malum/loot_tables/blocks/exposed_runewood_log.json index 7a0d64ff1..843e54fae 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/exposed_runewood_log.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/exposed_runewood_log.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:exposed_runewood_log" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/exposed_runewood_log" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/exposed_soulwood_log.json b/src/generated/resources/data/malum/loot_tables/blocks/exposed_soulwood_log.json index 409f86d31..3a18f35f5 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/exposed_soulwood_log.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/exposed_soulwood_log.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:exposed_soulwood_log" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/exposed_soulwood_log" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/iridescent_ether.json b/src/generated/resources/data/malum/loot_tables/blocks/iridescent_ether.json index 1d2107f76..598896491 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/iridescent_ether.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/iridescent_ether.json @@ -2,8 +2,12 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", @@ -14,29 +18,26 @@ }, { "function": "minecraft:copy_nbt", - "source": "block_entity", "ops": [ { + "op": "replace", "source": "firstColor", - "target": "display.firstColor", - "op": "replace" + "target": "display.firstColor" }, { + "op": "replace", "source": "secondColor", - "target": "display.secondColor", - "op": "replace" + "target": "display.secondColor" } - ] + ], + "source": "block_entity" } ], "name": "malum:iridescent_ether" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/iridescent_ether" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/iridescent_ether_torch.json b/src/generated/resources/data/malum/loot_tables/blocks/iridescent_ether_torch.json index 8c57f523b..4993b25ba 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/iridescent_ether_torch.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/iridescent_ether_torch.json @@ -2,8 +2,12 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", @@ -14,29 +18,26 @@ }, { "function": "minecraft:copy_nbt", - "source": "block_entity", "ops": [ { + "op": "replace", "source": "firstColor", - "target": "display.firstColor", - "op": "replace" + "target": "display.firstColor" }, { + "op": "replace", "source": "secondColor", - "target": "display.secondColor", - "op": "replace" + "target": "display.secondColor" } - ] + ], + "source": "block_entity" } ], "name": "malum:iridescent_ether_torch" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/iridescent_ether_torch" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/mass_of_blighted_gunk.json b/src/generated/resources/data/malum/loot_tables/blocks/mass_of_blighted_gunk.json index c584c9abd..e1efce0b2 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/mass_of_blighted_gunk.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/mass_of_blighted_gunk.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:mass_of_blighted_gunk" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/mass_of_blighted_gunk" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/mote_of_aerial_arcana.json b/src/generated/resources/data/malum/loot_tables/blocks/mote_of_aerial_arcana.json index 3da3a59b4..ca0478fe7 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/mote_of_aerial_arcana.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/mote_of_aerial_arcana.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "minecraft:air" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/mote_of_aerial_arcana" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/mote_of_aqueous_arcana.json b/src/generated/resources/data/malum/loot_tables/blocks/mote_of_aqueous_arcana.json index 3da3a59b4..318243f97 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/mote_of_aqueous_arcana.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/mote_of_aqueous_arcana.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "minecraft:air" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/mote_of_aqueous_arcana" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/mote_of_earthen_arcana.json b/src/generated/resources/data/malum/loot_tables/blocks/mote_of_earthen_arcana.json index 3da3a59b4..fd88ad568 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/mote_of_earthen_arcana.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/mote_of_earthen_arcana.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "minecraft:air" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/mote_of_earthen_arcana" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/mote_of_eldritch_arcana.json b/src/generated/resources/data/malum/loot_tables/blocks/mote_of_eldritch_arcana.json index 3da3a59b4..1b751ff1a 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/mote_of_eldritch_arcana.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/mote_of_eldritch_arcana.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "minecraft:air" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/mote_of_eldritch_arcana" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/mote_of_infernal_arcana.json b/src/generated/resources/data/malum/loot_tables/blocks/mote_of_infernal_arcana.json index 3da3a59b4..d3f2211dc 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/mote_of_infernal_arcana.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/mote_of_infernal_arcana.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "minecraft:air" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/mote_of_infernal_arcana" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/mote_of_raw_arcana.json b/src/generated/resources/data/malum/loot_tables/blocks/mote_of_raw_arcana.json index 3da3a59b4..4377a223a 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/mote_of_raw_arcana.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/mote_of_raw_arcana.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "minecraft:air" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/mote_of_raw_arcana" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/mote_of_sacred_arcana.json b/src/generated/resources/data/malum/loot_tables/blocks/mote_of_sacred_arcana.json index 3da3a59b4..08d72ff64 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/mote_of_sacred_arcana.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/mote_of_sacred_arcana.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "minecraft:air" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/mote_of_sacred_arcana" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/mote_of_wicked_arcana.json b/src/generated/resources/data/malum/loot_tables/blocks/mote_of_wicked_arcana.json index 3da3a59b4..b4df480e7 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/mote_of_wicked_arcana.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/mote_of_wicked_arcana.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "minecraft:air" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/mote_of_wicked_arcana" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/natural_quartz_cluster.json b/src/generated/resources/data/malum/loot_tables/blocks/natural_quartz_cluster.json index 4b4a79107..053ab6ae6 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/natural_quartz_cluster.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/natural_quartz_cluster.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:natural_quartz" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/natural_quartz_cluster" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/natural_quartz_ore.json b/src/generated/resources/data/malum/loot_tables/blocks/natural_quartz_ore.json index d064cc0d6..7825ab86a 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/natural_quartz_ore.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/natural_quartz_ore.json @@ -2,7 +2,6 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { @@ -31,9 +30,9 @@ "type": "minecraft:item", "functions": [ { - "function": "minecraft:apply_bonus", "enchantment": "minecraft:fortune", - "formula": "minecraft:ore_drops" + "formula": "minecraft:ore_drops", + "function": "minecraft:apply_bonus" }, { "function": "minecraft:explosion_decay" @@ -43,7 +42,9 @@ } ] } - ] + ], + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/natural_quartz_ore" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/polished_tainted_rock.json b/src/generated/resources/data/malum/loot_tables/blocks/polished_tainted_rock.json index 758657a9b..ac543575e 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/polished_tainted_rock.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/polished_tainted_rock.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:polished_tainted_rock" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/polished_tainted_rock" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/polished_tainted_rock_slab.json b/src/generated/resources/data/malum/loot_tables/blocks/polished_tainted_rock_slab.json index 96996fbac..b984629a7 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/polished_tainted_rock_slab.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/polished_tainted_rock_slab.json @@ -2,25 +2,24 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "functions": [ { - "function": "minecraft:set_count", + "add": false, "conditions": [ { - "condition": "minecraft:block_state_property", "block": "malum:polished_tainted_rock_slab", + "condition": "minecraft:block_state_property", "properties": { "type": "double" } } ], "count": 2.0, - "add": false + "function": "minecraft:set_count" }, { "function": "minecraft:explosion_decay" @@ -28,7 +27,9 @@ ], "name": "malum:polished_tainted_rock_slab" } - ] + ], + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/polished_tainted_rock_slab" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/polished_tainted_rock_stairs.json b/src/generated/resources/data/malum/loot_tables/blocks/polished_tainted_rock_stairs.json index 2ecbafa36..8333de999 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/polished_tainted_rock_stairs.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/polished_tainted_rock_stairs.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:polished_tainted_rock_stairs" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/polished_tainted_rock_stairs" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/polished_twisted_rock.json b/src/generated/resources/data/malum/loot_tables/blocks/polished_twisted_rock.json index d06229672..f5875b90a 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/polished_twisted_rock.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/polished_twisted_rock.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:polished_twisted_rock" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/polished_twisted_rock" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/polished_twisted_rock_slab.json b/src/generated/resources/data/malum/loot_tables/blocks/polished_twisted_rock_slab.json index ff9ba8d8f..d7340f813 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/polished_twisted_rock_slab.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/polished_twisted_rock_slab.json @@ -2,25 +2,24 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "functions": [ { - "function": "minecraft:set_count", + "add": false, "conditions": [ { - "condition": "minecraft:block_state_property", "block": "malum:polished_twisted_rock_slab", + "condition": "minecraft:block_state_property", "properties": { "type": "double" } } ], "count": 2.0, - "add": false + "function": "minecraft:set_count" }, { "function": "minecraft:explosion_decay" @@ -28,7 +27,9 @@ ], "name": "malum:polished_twisted_rock_slab" } - ] + ], + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/polished_twisted_rock_slab" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/polished_twisted_rock_stairs.json b/src/generated/resources/data/malum/loot_tables/blocks/polished_twisted_rock_stairs.json index 25c633943..b3c4bc139 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/polished_twisted_rock_stairs.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/polished_twisted_rock_stairs.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:polished_twisted_rock_stairs" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/polished_twisted_rock_stairs" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/primordial_soup.json b/src/generated/resources/data/malum/loot_tables/blocks/primordial_soup.json index 31efeb219..ccbe54218 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/primordial_soup.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/primordial_soup.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:primordial_soup" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/primordial_soup" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/revealed_runewood_log.json b/src/generated/resources/data/malum/loot_tables/blocks/revealed_runewood_log.json index cdfebdbf8..4846bee1d 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/revealed_runewood_log.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/revealed_runewood_log.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:revealed_runewood_log" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/revealed_runewood_log" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/revealed_soulwood_log.json b/src/generated/resources/data/malum/loot_tables/blocks/revealed_soulwood_log.json index aa6a71cb5..04444bd97 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/revealed_soulwood_log.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/revealed_soulwood_log.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:revealed_soulwood_log" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/revealed_soulwood_log" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/runewood.json b/src/generated/resources/data/malum/loot_tables/blocks/runewood.json index e3401a909..6d424f983 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/runewood.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/runewood.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:runewood" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/runewood" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/runewood_beam.json b/src/generated/resources/data/malum/loot_tables/blocks/runewood_beam.json index 373d03485..504a57ede 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/runewood_beam.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/runewood_beam.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:runewood_beam" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/runewood_beam" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/runewood_door.json b/src/generated/resources/data/malum/loot_tables/blocks/runewood_door.json index a675b6d05..93526b364 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/runewood_door.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/runewood_door.json @@ -2,15 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "conditions": [ { - "condition": "minecraft:block_state_property", "block": "malum:runewood_door", + "condition": "minecraft:block_state_property", "properties": { "half": "lower" } @@ -19,11 +23,8 @@ "name": "malum:runewood_door" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/runewood_door" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/runewood_item_pedestal.json b/src/generated/resources/data/malum/loot_tables/blocks/runewood_item_pedestal.json index 3ea347d36..563338d0e 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/runewood_item_pedestal.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/runewood_item_pedestal.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:runewood_item_pedestal" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/runewood_item_pedestal" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/runewood_item_stand.json b/src/generated/resources/data/malum/loot_tables/blocks/runewood_item_stand.json index 2b52f57ee..2256507e4 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/runewood_item_stand.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/runewood_item_stand.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:runewood_item_stand" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/runewood_item_stand" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/runewood_leaves.json b/src/generated/resources/data/malum/loot_tables/blocks/runewood_leaves.json index 86540dcd4..d0b3e827a 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/runewood_leaves.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/runewood_leaves.json @@ -2,7 +2,6 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { @@ -12,7 +11,7 @@ "type": "minecraft:item", "conditions": [ { - "condition": "minecraft:alternative", + "condition": "minecraft:any_of", "terms": [ { "condition": "minecraft:match_tool", @@ -47,63 +46,30 @@ "condition": "minecraft:survives_explosion" }, { - "condition": "minecraft:table_bonus", - "enchantment": "minecraft:fortune", "chances": [ 0.015, 0.0225, 0.033333335, 0.05 - ] + ], + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune" } ], "name": "malum:runewood_sapling" } ] } - ] + ], + "rolls": 1.0 }, { - "rolls": 1.0, "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:table_bonus", - "enchantment": "minecraft:fortune", - "chances": [ - 0.02, - 0.022222223, - 0.025, - 0.033333335, - 0.1 - ] - } - ], - "functions": [ - { - "function": "minecraft:set_count", - "count": { - "type": "minecraft:uniform", - "min": 1.0, - "max": 2.0 - }, - "add": false - }, - { - "function": "minecraft:explosion_decay" - } - ], - "name": "minecraft:stick" - } - ], "conditions": [ { "condition": "minecraft:inverted", "term": { - "condition": "minecraft:alternative", + "condition": "minecraft:any_of", "terms": [ { "condition": "minecraft:match_tool", @@ -129,7 +95,42 @@ ] } } - ] + ], + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "chances": [ + 0.02, + 0.022222223, + 0.025, + 0.033333335, + 0.1 + ], + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune" + } + ], + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 2.0, + "min": 1.0 + }, + "function": "minecraft:set_count" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "minecraft:stick" + } + ], + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/runewood_leaves" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/runewood_log.json b/src/generated/resources/data/malum/loot_tables/blocks/runewood_log.json index 246e1492e..5b29e115e 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/runewood_log.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/runewood_log.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:runewood_log" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/runewood_log" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/runewood_obelisk.json b/src/generated/resources/data/malum/loot_tables/blocks/runewood_obelisk.json index 717b7d46e..af1b30677 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/runewood_obelisk.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/runewood_obelisk.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:runewood_obelisk" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/runewood_obelisk" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/runewood_panel.json b/src/generated/resources/data/malum/loot_tables/blocks/runewood_panel.json index 031379476..be3e5a6b6 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/runewood_panel.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/runewood_panel.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:runewood_panel" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/runewood_panel" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/runewood_panel_slab.json b/src/generated/resources/data/malum/loot_tables/blocks/runewood_panel_slab.json index 1947f4ddd..271a6d85c 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/runewood_panel_slab.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/runewood_panel_slab.json @@ -2,25 +2,24 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "functions": [ { - "function": "minecraft:set_count", + "add": false, "conditions": [ { - "condition": "minecraft:block_state_property", "block": "malum:runewood_panel_slab", + "condition": "minecraft:block_state_property", "properties": { "type": "double" } } ], "count": 2.0, - "add": false + "function": "minecraft:set_count" }, { "function": "minecraft:explosion_decay" @@ -28,7 +27,9 @@ ], "name": "malum:runewood_panel_slab" } - ] + ], + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/runewood_panel_slab" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/runewood_panel_stairs.json b/src/generated/resources/data/malum/loot_tables/blocks/runewood_panel_stairs.json index e62dab354..3d2fbe490 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/runewood_panel_stairs.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/runewood_panel_stairs.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:runewood_panel_stairs" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/runewood_panel_stairs" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/runewood_planks.json b/src/generated/resources/data/malum/loot_tables/blocks/runewood_planks.json index 6b48825c4..faf36d023 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/runewood_planks.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/runewood_planks.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:runewood_planks" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/runewood_planks" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/runewood_planks_button.json b/src/generated/resources/data/malum/loot_tables/blocks/runewood_planks_button.json index 292204a13..9c14352c4 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/runewood_planks_button.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/runewood_planks_button.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:runewood_planks_button" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/runewood_planks_button" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/runewood_planks_fence.json b/src/generated/resources/data/malum/loot_tables/blocks/runewood_planks_fence.json index a969c2faa..741b38d72 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/runewood_planks_fence.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/runewood_planks_fence.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:runewood_planks_fence" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/runewood_planks_fence" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/runewood_planks_fence_gate.json b/src/generated/resources/data/malum/loot_tables/blocks/runewood_planks_fence_gate.json index f933a8eb6..cdb306e5e 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/runewood_planks_fence_gate.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/runewood_planks_fence_gate.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:runewood_planks_fence_gate" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/runewood_planks_fence_gate" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/runewood_planks_pressure_plate.json b/src/generated/resources/data/malum/loot_tables/blocks/runewood_planks_pressure_plate.json index 28987aadf..87d3796e9 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/runewood_planks_pressure_plate.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/runewood_planks_pressure_plate.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:runewood_planks_pressure_plate" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/runewood_planks_pressure_plate" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/runewood_planks_slab.json b/src/generated/resources/data/malum/loot_tables/blocks/runewood_planks_slab.json index 7612edb9d..cd2784705 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/runewood_planks_slab.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/runewood_planks_slab.json @@ -2,25 +2,24 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "functions": [ { - "function": "minecraft:set_count", + "add": false, "conditions": [ { - "condition": "minecraft:block_state_property", "block": "malum:runewood_planks_slab", + "condition": "minecraft:block_state_property", "properties": { "type": "double" } } ], "count": 2.0, - "add": false + "function": "minecraft:set_count" }, { "function": "minecraft:explosion_decay" @@ -28,7 +27,9 @@ ], "name": "malum:runewood_planks_slab" } - ] + ], + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/runewood_planks_slab" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/runewood_planks_stairs.json b/src/generated/resources/data/malum/loot_tables/blocks/runewood_planks_stairs.json index 26167f6ec..4bfe18771 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/runewood_planks_stairs.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/runewood_planks_stairs.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:runewood_planks_stairs" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/runewood_planks_stairs" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/runewood_sapling.json b/src/generated/resources/data/malum/loot_tables/blocks/runewood_sapling.json index 412941617..806bd8b18 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/runewood_sapling.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/runewood_sapling.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:runewood_sapling" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/runewood_sapling" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/runewood_sign.json b/src/generated/resources/data/malum/loot_tables/blocks/runewood_sign.json index 12642670a..47d55a634 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/runewood_sign.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/runewood_sign.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:runewood_sign" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/runewood_sign" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/runewood_tiles.json b/src/generated/resources/data/malum/loot_tables/blocks/runewood_tiles.json index 89d2d23ff..3e8721062 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/runewood_tiles.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/runewood_tiles.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:runewood_tiles" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/runewood_tiles" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/runewood_tiles_slab.json b/src/generated/resources/data/malum/loot_tables/blocks/runewood_tiles_slab.json index 5767bf104..f563078c5 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/runewood_tiles_slab.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/runewood_tiles_slab.json @@ -2,25 +2,24 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "functions": [ { - "function": "minecraft:set_count", + "add": false, "conditions": [ { - "condition": "minecraft:block_state_property", "block": "malum:runewood_tiles_slab", + "condition": "minecraft:block_state_property", "properties": { "type": "double" } } ], "count": 2.0, - "add": false + "function": "minecraft:set_count" }, { "function": "minecraft:explosion_decay" @@ -28,7 +27,9 @@ ], "name": "malum:runewood_tiles_slab" } - ] + ], + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/runewood_tiles_slab" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/runewood_tiles_stairs.json b/src/generated/resources/data/malum/loot_tables/blocks/runewood_tiles_stairs.json index 6f838126c..52ad20f08 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/runewood_tiles_stairs.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/runewood_tiles_stairs.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:runewood_tiles_stairs" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/runewood_tiles_stairs" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/runewood_totem_base.json b/src/generated/resources/data/malum/loot_tables/blocks/runewood_totem_base.json index cd2f3189b..94dc32d70 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/runewood_totem_base.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/runewood_totem_base.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:runewood_totem_base" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/runewood_totem_base" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/runewood_trapdoor.json b/src/generated/resources/data/malum/loot_tables/blocks/runewood_trapdoor.json index 601b55147..6795a10a7 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/runewood_trapdoor.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/runewood_trapdoor.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:runewood_trapdoor" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/runewood_trapdoor" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/runewood_wall_sign.json b/src/generated/resources/data/malum/loot_tables/blocks/runewood_wall_sign.json index 12642670a..ee5a132e9 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/runewood_wall_sign.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/runewood_wall_sign.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:runewood_sign" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/runewood_wall_sign" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/runic_small_tainted_rock_bricks.json b/src/generated/resources/data/malum/loot_tables/blocks/runic_small_tainted_rock_bricks.json index 7435ddc86..8ac130e49 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/runic_small_tainted_rock_bricks.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/runic_small_tainted_rock_bricks.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:runic_small_tainted_rock_bricks" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/runic_small_tainted_rock_bricks" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/runic_small_tainted_rock_bricks_slab.json b/src/generated/resources/data/malum/loot_tables/blocks/runic_small_tainted_rock_bricks_slab.json index d3b5837b4..6bd3b4c15 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/runic_small_tainted_rock_bricks_slab.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/runic_small_tainted_rock_bricks_slab.json @@ -2,25 +2,24 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "functions": [ { - "function": "minecraft:set_count", + "add": false, "conditions": [ { - "condition": "minecraft:block_state_property", "block": "malum:runic_small_tainted_rock_bricks_slab", + "condition": "minecraft:block_state_property", "properties": { "type": "double" } } ], "count": 2.0, - "add": false + "function": "minecraft:set_count" }, { "function": "minecraft:explosion_decay" @@ -28,7 +27,9 @@ ], "name": "malum:runic_small_tainted_rock_bricks_slab" } - ] + ], + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/runic_small_tainted_rock_bricks_slab" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/runic_small_tainted_rock_bricks_stairs.json b/src/generated/resources/data/malum/loot_tables/blocks/runic_small_tainted_rock_bricks_stairs.json index a5cea7ec8..b7d0f25a2 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/runic_small_tainted_rock_bricks_stairs.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/runic_small_tainted_rock_bricks_stairs.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:runic_small_tainted_rock_bricks_stairs" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/runic_small_tainted_rock_bricks_stairs" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/runic_small_tainted_rock_bricks_wall.json b/src/generated/resources/data/malum/loot_tables/blocks/runic_small_tainted_rock_bricks_wall.json index de154950d..fb88a4c06 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/runic_small_tainted_rock_bricks_wall.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/runic_small_tainted_rock_bricks_wall.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:runic_small_tainted_rock_bricks_wall" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/runic_small_tainted_rock_bricks_wall" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/runic_small_twisted_rock_bricks.json b/src/generated/resources/data/malum/loot_tables/blocks/runic_small_twisted_rock_bricks.json index c73ce6915..ac05b768e 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/runic_small_twisted_rock_bricks.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/runic_small_twisted_rock_bricks.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:runic_small_twisted_rock_bricks" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/runic_small_twisted_rock_bricks" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/runic_small_twisted_rock_bricks_slab.json b/src/generated/resources/data/malum/loot_tables/blocks/runic_small_twisted_rock_bricks_slab.json index 712c2b45e..1e7220c18 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/runic_small_twisted_rock_bricks_slab.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/runic_small_twisted_rock_bricks_slab.json @@ -2,25 +2,24 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "functions": [ { - "function": "minecraft:set_count", + "add": false, "conditions": [ { - "condition": "minecraft:block_state_property", "block": "malum:runic_small_twisted_rock_bricks_slab", + "condition": "minecraft:block_state_property", "properties": { "type": "double" } } ], "count": 2.0, - "add": false + "function": "minecraft:set_count" }, { "function": "minecraft:explosion_decay" @@ -28,7 +27,9 @@ ], "name": "malum:runic_small_twisted_rock_bricks_slab" } - ] + ], + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/runic_small_twisted_rock_bricks_slab" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/runic_small_twisted_rock_bricks_stairs.json b/src/generated/resources/data/malum/loot_tables/blocks/runic_small_twisted_rock_bricks_stairs.json index fb9e172d7..2c7c18b00 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/runic_small_twisted_rock_bricks_stairs.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/runic_small_twisted_rock_bricks_stairs.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:runic_small_twisted_rock_bricks_stairs" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/runic_small_twisted_rock_bricks_stairs" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/runic_small_twisted_rock_bricks_wall.json b/src/generated/resources/data/malum/loot_tables/blocks/runic_small_twisted_rock_bricks_wall.json index ed8ef119e..d45e505af 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/runic_small_twisted_rock_bricks_wall.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/runic_small_twisted_rock_bricks_wall.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:runic_small_twisted_rock_bricks_wall" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/runic_small_twisted_rock_bricks_wall" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/runic_tainted_rock_bricks.json b/src/generated/resources/data/malum/loot_tables/blocks/runic_tainted_rock_bricks.json index a63ad0b72..718d067c9 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/runic_tainted_rock_bricks.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/runic_tainted_rock_bricks.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:runic_tainted_rock_bricks" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/runic_tainted_rock_bricks" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/runic_tainted_rock_bricks_slab.json b/src/generated/resources/data/malum/loot_tables/blocks/runic_tainted_rock_bricks_slab.json index 32bfbc357..58ede8e86 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/runic_tainted_rock_bricks_slab.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/runic_tainted_rock_bricks_slab.json @@ -2,25 +2,24 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "functions": [ { - "function": "minecraft:set_count", + "add": false, "conditions": [ { - "condition": "minecraft:block_state_property", "block": "malum:runic_tainted_rock_bricks_slab", + "condition": "minecraft:block_state_property", "properties": { "type": "double" } } ], "count": 2.0, - "add": false + "function": "minecraft:set_count" }, { "function": "minecraft:explosion_decay" @@ -28,7 +27,9 @@ ], "name": "malum:runic_tainted_rock_bricks_slab" } - ] + ], + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/runic_tainted_rock_bricks_slab" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/runic_tainted_rock_bricks_stairs.json b/src/generated/resources/data/malum/loot_tables/blocks/runic_tainted_rock_bricks_stairs.json index ac77ba6c9..29af04057 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/runic_tainted_rock_bricks_stairs.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/runic_tainted_rock_bricks_stairs.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:runic_tainted_rock_bricks_stairs" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/runic_tainted_rock_bricks_stairs" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/runic_tainted_rock_bricks_wall.json b/src/generated/resources/data/malum/loot_tables/blocks/runic_tainted_rock_bricks_wall.json index 6d6ccac54..41da0b2de 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/runic_tainted_rock_bricks_wall.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/runic_tainted_rock_bricks_wall.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:runic_tainted_rock_bricks_wall" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/runic_tainted_rock_bricks_wall" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/runic_tainted_rock_tiles.json b/src/generated/resources/data/malum/loot_tables/blocks/runic_tainted_rock_tiles.json index 09406f4aa..22f4cf461 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/runic_tainted_rock_tiles.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/runic_tainted_rock_tiles.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:runic_tainted_rock_tiles" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/runic_tainted_rock_tiles" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/runic_tainted_rock_tiles_slab.json b/src/generated/resources/data/malum/loot_tables/blocks/runic_tainted_rock_tiles_slab.json index c02f843e2..6e789fdb2 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/runic_tainted_rock_tiles_slab.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/runic_tainted_rock_tiles_slab.json @@ -2,25 +2,24 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "functions": [ { - "function": "minecraft:set_count", + "add": false, "conditions": [ { - "condition": "minecraft:block_state_property", "block": "malum:runic_tainted_rock_tiles_slab", + "condition": "minecraft:block_state_property", "properties": { "type": "double" } } ], "count": 2.0, - "add": false + "function": "minecraft:set_count" }, { "function": "minecraft:explosion_decay" @@ -28,7 +27,9 @@ ], "name": "malum:runic_tainted_rock_tiles_slab" } - ] + ], + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/runic_tainted_rock_tiles_slab" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/runic_tainted_rock_tiles_stairs.json b/src/generated/resources/data/malum/loot_tables/blocks/runic_tainted_rock_tiles_stairs.json index 28ab07fed..8fb1a9cce 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/runic_tainted_rock_tiles_stairs.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/runic_tainted_rock_tiles_stairs.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:runic_tainted_rock_tiles_stairs" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/runic_tainted_rock_tiles_stairs" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/runic_tainted_rock_tiles_wall.json b/src/generated/resources/data/malum/loot_tables/blocks/runic_tainted_rock_tiles_wall.json index db769f198..6a4fa2bc8 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/runic_tainted_rock_tiles_wall.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/runic_tainted_rock_tiles_wall.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:runic_tainted_rock_tiles_wall" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/runic_tainted_rock_tiles_wall" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/runic_twisted_rock_bricks.json b/src/generated/resources/data/malum/loot_tables/blocks/runic_twisted_rock_bricks.json index ad120f537..a19a07da9 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/runic_twisted_rock_bricks.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/runic_twisted_rock_bricks.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:runic_twisted_rock_bricks" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/runic_twisted_rock_bricks" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/runic_twisted_rock_bricks_slab.json b/src/generated/resources/data/malum/loot_tables/blocks/runic_twisted_rock_bricks_slab.json index 0ccf7dac4..925d480f8 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/runic_twisted_rock_bricks_slab.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/runic_twisted_rock_bricks_slab.json @@ -2,25 +2,24 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "functions": [ { - "function": "minecraft:set_count", + "add": false, "conditions": [ { - "condition": "minecraft:block_state_property", "block": "malum:runic_twisted_rock_bricks_slab", + "condition": "minecraft:block_state_property", "properties": { "type": "double" } } ], "count": 2.0, - "add": false + "function": "minecraft:set_count" }, { "function": "minecraft:explosion_decay" @@ -28,7 +27,9 @@ ], "name": "malum:runic_twisted_rock_bricks_slab" } - ] + ], + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/runic_twisted_rock_bricks_slab" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/runic_twisted_rock_bricks_stairs.json b/src/generated/resources/data/malum/loot_tables/blocks/runic_twisted_rock_bricks_stairs.json index 25aece73f..f58fc391b 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/runic_twisted_rock_bricks_stairs.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/runic_twisted_rock_bricks_stairs.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:runic_twisted_rock_bricks_stairs" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/runic_twisted_rock_bricks_stairs" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/runic_twisted_rock_bricks_wall.json b/src/generated/resources/data/malum/loot_tables/blocks/runic_twisted_rock_bricks_wall.json index ae5befb0f..12fa2d623 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/runic_twisted_rock_bricks_wall.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/runic_twisted_rock_bricks_wall.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:runic_twisted_rock_bricks_wall" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/runic_twisted_rock_bricks_wall" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/runic_twisted_rock_tiles.json b/src/generated/resources/data/malum/loot_tables/blocks/runic_twisted_rock_tiles.json index 3c409c70e..8cdd9be9d 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/runic_twisted_rock_tiles.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/runic_twisted_rock_tiles.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:runic_twisted_rock_tiles" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/runic_twisted_rock_tiles" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/runic_twisted_rock_tiles_slab.json b/src/generated/resources/data/malum/loot_tables/blocks/runic_twisted_rock_tiles_slab.json index 7b46af220..0694613d1 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/runic_twisted_rock_tiles_slab.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/runic_twisted_rock_tiles_slab.json @@ -2,25 +2,24 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "functions": [ { - "function": "minecraft:set_count", + "add": false, "conditions": [ { - "condition": "minecraft:block_state_property", "block": "malum:runic_twisted_rock_tiles_slab", + "condition": "minecraft:block_state_property", "properties": { "type": "double" } } ], "count": 2.0, - "add": false + "function": "minecraft:set_count" }, { "function": "minecraft:explosion_decay" @@ -28,7 +27,9 @@ ], "name": "malum:runic_twisted_rock_tiles_slab" } - ] + ], + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/runic_twisted_rock_tiles_slab" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/runic_twisted_rock_tiles_stairs.json b/src/generated/resources/data/malum/loot_tables/blocks/runic_twisted_rock_tiles_stairs.json index acf125e03..dfec8bcc1 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/runic_twisted_rock_tiles_stairs.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/runic_twisted_rock_tiles_stairs.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:runic_twisted_rock_tiles_stairs" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/runic_twisted_rock_tiles_stairs" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/runic_twisted_rock_tiles_wall.json b/src/generated/resources/data/malum/loot_tables/blocks/runic_twisted_rock_tiles_wall.json index 1c0743237..8e65c714b 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/runic_twisted_rock_tiles_wall.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/runic_twisted_rock_tiles_wall.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:runic_twisted_rock_tiles_wall" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/runic_twisted_rock_tiles_wall" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/small_tainted_rock_bricks.json b/src/generated/resources/data/malum/loot_tables/blocks/small_tainted_rock_bricks.json index 5d28e20a2..17ad3a27d 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/small_tainted_rock_bricks.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/small_tainted_rock_bricks.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:small_tainted_rock_bricks" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/small_tainted_rock_bricks" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/small_tainted_rock_bricks_slab.json b/src/generated/resources/data/malum/loot_tables/blocks/small_tainted_rock_bricks_slab.json index c34e48e95..25ce23362 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/small_tainted_rock_bricks_slab.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/small_tainted_rock_bricks_slab.json @@ -2,25 +2,24 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "functions": [ { - "function": "minecraft:set_count", + "add": false, "conditions": [ { - "condition": "minecraft:block_state_property", "block": "malum:small_tainted_rock_bricks_slab", + "condition": "minecraft:block_state_property", "properties": { "type": "double" } } ], "count": 2.0, - "add": false + "function": "minecraft:set_count" }, { "function": "minecraft:explosion_decay" @@ -28,7 +27,9 @@ ], "name": "malum:small_tainted_rock_bricks_slab" } - ] + ], + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/small_tainted_rock_bricks_slab" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/small_tainted_rock_bricks_stairs.json b/src/generated/resources/data/malum/loot_tables/blocks/small_tainted_rock_bricks_stairs.json index 768744772..fb1757a46 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/small_tainted_rock_bricks_stairs.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/small_tainted_rock_bricks_stairs.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:small_tainted_rock_bricks_stairs" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/small_tainted_rock_bricks_stairs" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/small_tainted_rock_bricks_wall.json b/src/generated/resources/data/malum/loot_tables/blocks/small_tainted_rock_bricks_wall.json index 330817e64..606f7041c 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/small_tainted_rock_bricks_wall.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/small_tainted_rock_bricks_wall.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:small_tainted_rock_bricks_wall" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/small_tainted_rock_bricks_wall" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/small_twisted_rock_bricks.json b/src/generated/resources/data/malum/loot_tables/blocks/small_twisted_rock_bricks.json index 37724af7a..e16f7eff6 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/small_twisted_rock_bricks.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/small_twisted_rock_bricks.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:small_twisted_rock_bricks" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/small_twisted_rock_bricks" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/small_twisted_rock_bricks_slab.json b/src/generated/resources/data/malum/loot_tables/blocks/small_twisted_rock_bricks_slab.json index 796c4a5d0..f2b4c8d57 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/small_twisted_rock_bricks_slab.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/small_twisted_rock_bricks_slab.json @@ -2,25 +2,24 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "functions": [ { - "function": "minecraft:set_count", + "add": false, "conditions": [ { - "condition": "minecraft:block_state_property", "block": "malum:small_twisted_rock_bricks_slab", + "condition": "minecraft:block_state_property", "properties": { "type": "double" } } ], "count": 2.0, - "add": false + "function": "minecraft:set_count" }, { "function": "minecraft:explosion_decay" @@ -28,7 +27,9 @@ ], "name": "malum:small_twisted_rock_bricks_slab" } - ] + ], + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/small_twisted_rock_bricks_slab" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/small_twisted_rock_bricks_stairs.json b/src/generated/resources/data/malum/loot_tables/blocks/small_twisted_rock_bricks_stairs.json index a6d026598..03ff8b869 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/small_twisted_rock_bricks_stairs.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/small_twisted_rock_bricks_stairs.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:small_twisted_rock_bricks_stairs" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/small_twisted_rock_bricks_stairs" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/small_twisted_rock_bricks_wall.json b/src/generated/resources/data/malum/loot_tables/blocks/small_twisted_rock_bricks_wall.json index 8d3bf60c6..2be248abf 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/small_twisted_rock_bricks_wall.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/small_twisted_rock_bricks_wall.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:small_twisted_rock_bricks_wall" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/small_twisted_rock_bricks_wall" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/smooth_tainted_rock.json b/src/generated/resources/data/malum/loot_tables/blocks/smooth_tainted_rock.json index bc04425a7..386186ab2 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/smooth_tainted_rock.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/smooth_tainted_rock.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:smooth_tainted_rock" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/smooth_tainted_rock" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/smooth_tainted_rock_slab.json b/src/generated/resources/data/malum/loot_tables/blocks/smooth_tainted_rock_slab.json index ebc11b063..149340169 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/smooth_tainted_rock_slab.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/smooth_tainted_rock_slab.json @@ -2,25 +2,24 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "functions": [ { - "function": "minecraft:set_count", + "add": false, "conditions": [ { - "condition": "minecraft:block_state_property", "block": "malum:smooth_tainted_rock_slab", + "condition": "minecraft:block_state_property", "properties": { "type": "double" } } ], "count": 2.0, - "add": false + "function": "minecraft:set_count" }, { "function": "minecraft:explosion_decay" @@ -28,7 +27,9 @@ ], "name": "malum:smooth_tainted_rock_slab" } - ] + ], + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/smooth_tainted_rock_slab" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/smooth_tainted_rock_stairs.json b/src/generated/resources/data/malum/loot_tables/blocks/smooth_tainted_rock_stairs.json index e75f48e8e..22806ec33 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/smooth_tainted_rock_stairs.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/smooth_tainted_rock_stairs.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:smooth_tainted_rock_stairs" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/smooth_tainted_rock_stairs" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/smooth_twisted_rock.json b/src/generated/resources/data/malum/loot_tables/blocks/smooth_twisted_rock.json index 0ea584642..2000eb4f1 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/smooth_twisted_rock.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/smooth_twisted_rock.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:smooth_twisted_rock" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/smooth_twisted_rock" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/smooth_twisted_rock_slab.json b/src/generated/resources/data/malum/loot_tables/blocks/smooth_twisted_rock_slab.json index 464abe515..f09136d14 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/smooth_twisted_rock_slab.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/smooth_twisted_rock_slab.json @@ -2,25 +2,24 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "functions": [ { - "function": "minecraft:set_count", + "add": false, "conditions": [ { - "condition": "minecraft:block_state_property", "block": "malum:smooth_twisted_rock_slab", + "condition": "minecraft:block_state_property", "properties": { "type": "double" } } ], "count": 2.0, - "add": false + "function": "minecraft:set_count" }, { "function": "minecraft:explosion_decay" @@ -28,7 +27,9 @@ ], "name": "malum:smooth_twisted_rock_slab" } - ] + ], + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/smooth_twisted_rock_slab" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/smooth_twisted_rock_stairs.json b/src/generated/resources/data/malum/loot_tables/blocks/smooth_twisted_rock_stairs.json index 00a76f31d..87a1012ea 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/smooth_twisted_rock_stairs.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/smooth_twisted_rock_stairs.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:smooth_twisted_rock_stairs" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/smooth_twisted_rock_stairs" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/solid_runewood_trapdoor.json b/src/generated/resources/data/malum/loot_tables/blocks/solid_runewood_trapdoor.json index 63b47adb1..dccee231f 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/solid_runewood_trapdoor.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/solid_runewood_trapdoor.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:solid_runewood_trapdoor" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/solid_runewood_trapdoor" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/solid_soulwood_trapdoor.json b/src/generated/resources/data/malum/loot_tables/blocks/solid_soulwood_trapdoor.json index 9d8289a18..8a84a9647 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/solid_soulwood_trapdoor.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/solid_soulwood_trapdoor.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:solid_soulwood_trapdoor" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/solid_soulwood_trapdoor" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/soul_vial.json b/src/generated/resources/data/malum/loot_tables/blocks/soul_vial.json index 63feb4496..ba5139280 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/soul_vial.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/soul_vial.json @@ -2,8 +2,12 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", @@ -14,24 +18,21 @@ }, { "function": "minecraft:copy_nbt", - "source": "block_entity", "ops": [ { + "op": "replace", "source": "spirit_data", - "target": "spirit_data", - "op": "replace" + "target": "spirit_data" } - ] + ], + "source": "block_entity" } ], "name": "malum:soul_vial" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/soul_vial" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/soulstone_ore.json b/src/generated/resources/data/malum/loot_tables/blocks/soulstone_ore.json index 27e747f41..ace630227 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/soulstone_ore.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/soulstone_ore.json @@ -2,7 +2,6 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { @@ -31,9 +30,9 @@ "type": "minecraft:item", "functions": [ { - "function": "minecraft:apply_bonus", "enchantment": "minecraft:fortune", - "formula": "minecraft:ore_drops" + "formula": "minecraft:ore_drops", + "function": "minecraft:apply_bonus" }, { "function": "minecraft:explosion_decay" @@ -43,7 +42,9 @@ } ] } - ] + ], + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/soulstone_ore" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/soulwood.json b/src/generated/resources/data/malum/loot_tables/blocks/soulwood.json index a4e1ddd12..5f5b10fcb 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/soulwood.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/soulwood.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:soulwood" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/soulwood" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/soulwood_beam.json b/src/generated/resources/data/malum/loot_tables/blocks/soulwood_beam.json index 79ef7e2fe..61e64cb33 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/soulwood_beam.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/soulwood_beam.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:soulwood_beam" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/soulwood_beam" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/soulwood_door.json b/src/generated/resources/data/malum/loot_tables/blocks/soulwood_door.json index bb8cc710c..c0b9a5d09 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/soulwood_door.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/soulwood_door.json @@ -2,15 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "conditions": [ { - "condition": "minecraft:block_state_property", "block": "malum:soulwood_door", + "condition": "minecraft:block_state_property", "properties": { "half": "lower" } @@ -19,11 +23,8 @@ "name": "malum:soulwood_door" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/soulwood_door" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/soulwood_growth.json b/src/generated/resources/data/malum/loot_tables/blocks/soulwood_growth.json index a7db6077e..f656e4296 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/soulwood_growth.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/soulwood_growth.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:soulwood_growth" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/soulwood_growth" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/soulwood_item_pedestal.json b/src/generated/resources/data/malum/loot_tables/blocks/soulwood_item_pedestal.json index a1458d067..3059c1ce2 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/soulwood_item_pedestal.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/soulwood_item_pedestal.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:soulwood_item_pedestal" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/soulwood_item_pedestal" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/soulwood_item_stand.json b/src/generated/resources/data/malum/loot_tables/blocks/soulwood_item_stand.json index b2c2acf95..d9f7cf145 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/soulwood_item_stand.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/soulwood_item_stand.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:soulwood_item_stand" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/soulwood_item_stand" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/soulwood_leaves.json b/src/generated/resources/data/malum/loot_tables/blocks/soulwood_leaves.json index f72c41053..42241287f 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/soulwood_leaves.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/soulwood_leaves.json @@ -2,7 +2,6 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { @@ -12,7 +11,7 @@ "type": "minecraft:item", "conditions": [ { - "condition": "minecraft:alternative", + "condition": "minecraft:any_of", "terms": [ { "condition": "minecraft:match_tool", @@ -47,63 +46,30 @@ "condition": "minecraft:survives_explosion" }, { - "condition": "minecraft:table_bonus", - "enchantment": "minecraft:fortune", "chances": [ 0.015, 0.0225, 0.033333335, 0.05 - ] + ], + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune" } ], "name": "malum:soulwood_growth" } ] } - ] + ], + "rolls": 1.0 }, { - "rolls": 1.0, "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:table_bonus", - "enchantment": "minecraft:fortune", - "chances": [ - 0.02, - 0.022222223, - 0.025, - 0.033333335, - 0.1 - ] - } - ], - "functions": [ - { - "function": "minecraft:set_count", - "count": { - "type": "minecraft:uniform", - "min": 1.0, - "max": 2.0 - }, - "add": false - }, - { - "function": "minecraft:explosion_decay" - } - ], - "name": "minecraft:stick" - } - ], "conditions": [ { "condition": "minecraft:inverted", "term": { - "condition": "minecraft:alternative", + "condition": "minecraft:any_of", "terms": [ { "condition": "minecraft:match_tool", @@ -129,7 +95,42 @@ ] } } - ] + ], + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "chances": [ + 0.02, + 0.022222223, + 0.025, + 0.033333335, + 0.1 + ], + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune" + } + ], + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 2.0, + "min": 1.0 + }, + "function": "minecraft:set_count" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "minecraft:stick" + } + ], + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/soulwood_leaves" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/soulwood_log.json b/src/generated/resources/data/malum/loot_tables/blocks/soulwood_log.json index 6e03a0e23..067040558 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/soulwood_log.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/soulwood_log.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:soulwood_log" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/soulwood_log" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/soulwood_panel.json b/src/generated/resources/data/malum/loot_tables/blocks/soulwood_panel.json index 3389de928..8ff9d446b 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/soulwood_panel.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/soulwood_panel.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:soulwood_panel" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/soulwood_panel" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/soulwood_panel_slab.json b/src/generated/resources/data/malum/loot_tables/blocks/soulwood_panel_slab.json index a14620dea..df01ac528 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/soulwood_panel_slab.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/soulwood_panel_slab.json @@ -2,25 +2,24 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "functions": [ { - "function": "minecraft:set_count", + "add": false, "conditions": [ { - "condition": "minecraft:block_state_property", "block": "malum:soulwood_panel_slab", + "condition": "minecraft:block_state_property", "properties": { "type": "double" } } ], "count": 2.0, - "add": false + "function": "minecraft:set_count" }, { "function": "minecraft:explosion_decay" @@ -28,7 +27,9 @@ ], "name": "malum:soulwood_panel_slab" } - ] + ], + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/soulwood_panel_slab" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/soulwood_panel_stairs.json b/src/generated/resources/data/malum/loot_tables/blocks/soulwood_panel_stairs.json index cc973a1ed..a31660f43 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/soulwood_panel_stairs.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/soulwood_panel_stairs.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:soulwood_panel_stairs" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/soulwood_panel_stairs" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/soulwood_planks.json b/src/generated/resources/data/malum/loot_tables/blocks/soulwood_planks.json index a9d28d80a..e27c4c689 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/soulwood_planks.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/soulwood_planks.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:soulwood_planks" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/soulwood_planks" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/soulwood_planks_button.json b/src/generated/resources/data/malum/loot_tables/blocks/soulwood_planks_button.json index 4bc6e3dd0..2ff0071f4 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/soulwood_planks_button.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/soulwood_planks_button.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:soulwood_planks_button" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/soulwood_planks_button" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/soulwood_planks_fence.json b/src/generated/resources/data/malum/loot_tables/blocks/soulwood_planks_fence.json index 35db67abb..208e38a6c 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/soulwood_planks_fence.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/soulwood_planks_fence.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:soulwood_planks_fence" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/soulwood_planks_fence" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/soulwood_planks_fence_gate.json b/src/generated/resources/data/malum/loot_tables/blocks/soulwood_planks_fence_gate.json index ef2209b07..753b8f108 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/soulwood_planks_fence_gate.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/soulwood_planks_fence_gate.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:soulwood_planks_fence_gate" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/soulwood_planks_fence_gate" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/soulwood_planks_pressure_plate.json b/src/generated/resources/data/malum/loot_tables/blocks/soulwood_planks_pressure_plate.json index 70de02ef6..44e0f8b4c 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/soulwood_planks_pressure_plate.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/soulwood_planks_pressure_plate.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:soulwood_planks_pressure_plate" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/soulwood_planks_pressure_plate" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/soulwood_planks_slab.json b/src/generated/resources/data/malum/loot_tables/blocks/soulwood_planks_slab.json index a3abc72f3..0a884fe3f 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/soulwood_planks_slab.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/soulwood_planks_slab.json @@ -2,25 +2,24 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "functions": [ { - "function": "minecraft:set_count", + "add": false, "conditions": [ { - "condition": "minecraft:block_state_property", "block": "malum:soulwood_planks_slab", + "condition": "minecraft:block_state_property", "properties": { "type": "double" } } ], "count": 2.0, - "add": false + "function": "minecraft:set_count" }, { "function": "minecraft:explosion_decay" @@ -28,7 +27,9 @@ ], "name": "malum:soulwood_planks_slab" } - ] + ], + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/soulwood_planks_slab" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/soulwood_planks_stairs.json b/src/generated/resources/data/malum/loot_tables/blocks/soulwood_planks_stairs.json index af3e6cc9b..13164d0fd 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/soulwood_planks_stairs.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/soulwood_planks_stairs.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:soulwood_planks_stairs" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/soulwood_planks_stairs" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/soulwood_sign.json b/src/generated/resources/data/malum/loot_tables/blocks/soulwood_sign.json index 4a5ebbd1c..a2381f670 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/soulwood_sign.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/soulwood_sign.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:soulwood_sign" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/soulwood_sign" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/soulwood_tiles.json b/src/generated/resources/data/malum/loot_tables/blocks/soulwood_tiles.json index df43762fa..f701e19fd 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/soulwood_tiles.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/soulwood_tiles.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:soulwood_tiles" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/soulwood_tiles" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/soulwood_tiles_slab.json b/src/generated/resources/data/malum/loot_tables/blocks/soulwood_tiles_slab.json index 2198e7989..96d95c1a2 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/soulwood_tiles_slab.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/soulwood_tiles_slab.json @@ -2,25 +2,24 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "functions": [ { - "function": "minecraft:set_count", + "add": false, "conditions": [ { - "condition": "minecraft:block_state_property", "block": "malum:soulwood_tiles_slab", + "condition": "minecraft:block_state_property", "properties": { "type": "double" } } ], "count": 2.0, - "add": false + "function": "minecraft:set_count" }, { "function": "minecraft:explosion_decay" @@ -28,7 +27,9 @@ ], "name": "malum:soulwood_tiles_slab" } - ] + ], + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/soulwood_tiles_slab" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/soulwood_tiles_stairs.json b/src/generated/resources/data/malum/loot_tables/blocks/soulwood_tiles_stairs.json index fbc1d0e7e..ff297604f 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/soulwood_tiles_stairs.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/soulwood_tiles_stairs.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:soulwood_tiles_stairs" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/soulwood_tiles_stairs" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/soulwood_totem_base.json b/src/generated/resources/data/malum/loot_tables/blocks/soulwood_totem_base.json index 42e7905eb..6a23c324f 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/soulwood_totem_base.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/soulwood_totem_base.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:soulwood_totem_base" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/soulwood_totem_base" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/soulwood_trapdoor.json b/src/generated/resources/data/malum/loot_tables/blocks/soulwood_trapdoor.json index e4be130c0..32a31c3e5 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/soulwood_trapdoor.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/soulwood_trapdoor.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:soulwood_trapdoor" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/soulwood_trapdoor" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/soulwood_wall_sign.json b/src/generated/resources/data/malum/loot_tables/blocks/soulwood_wall_sign.json index 4a5ebbd1c..25cf62ec4 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/soulwood_wall_sign.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/soulwood_wall_sign.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:soulwood_sign" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/soulwood_wall_sign" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/spirit_altar.json b/src/generated/resources/data/malum/loot_tables/blocks/spirit_altar.json index bb76fd647..cb712d1eb 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/spirit_altar.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/spirit_altar.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:spirit_altar" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/spirit_altar" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/spirit_catalyzer.json b/src/generated/resources/data/malum/loot_tables/blocks/spirit_catalyzer.json index fa7b4b81d..29d4e1b8c 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/spirit_catalyzer.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/spirit_catalyzer.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:spirit_catalyzer" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/spirit_catalyzer" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/spirit_crucible.json b/src/generated/resources/data/malum/loot_tables/blocks/spirit_crucible.json index 3931cc324..fa80f4651 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/spirit_crucible.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/spirit_crucible.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:spirit_crucible" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/spirit_crucible" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/spirit_jar.json b/src/generated/resources/data/malum/loot_tables/blocks/spirit_jar.json index ac64886af..e422449be 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/spirit_jar.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/spirit_jar.json @@ -2,8 +2,12 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", @@ -14,29 +18,26 @@ }, { "function": "minecraft:copy_nbt", - "source": "block_entity", "ops": [ { + "op": "replace", "source": "spirit", - "target": "spirit", - "op": "replace" + "target": "spirit" }, { + "op": "replace", "source": "count", - "target": "count", - "op": "replace" + "target": "count" } - ] + ], + "source": "block_entity" } ], "name": "malum:spirit_jar" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/spirit_jar" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/stripped_runewood.json b/src/generated/resources/data/malum/loot_tables/blocks/stripped_runewood.json index db9551069..a18349129 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/stripped_runewood.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/stripped_runewood.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:stripped_runewood" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/stripped_runewood" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/stripped_runewood_log.json b/src/generated/resources/data/malum/loot_tables/blocks/stripped_runewood_log.json index db1eebb09..08e20b514 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/stripped_runewood_log.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/stripped_runewood_log.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:stripped_runewood_log" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/stripped_runewood_log" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/stripped_soulwood.json b/src/generated/resources/data/malum/loot_tables/blocks/stripped_soulwood.json index c7706a6b2..441980775 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/stripped_soulwood.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/stripped_soulwood.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:stripped_soulwood" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/stripped_soulwood" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/stripped_soulwood_log.json b/src/generated/resources/data/malum/loot_tables/blocks/stripped_soulwood_log.json index 9913fb917..eb4bcea92 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/stripped_soulwood_log.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/stripped_soulwood_log.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:stripped_soulwood_log" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/stripped_soulwood_log" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/tainted_ether_brazier.json b/src/generated/resources/data/malum/loot_tables/blocks/tainted_ether_brazier.json index 9432a8032..fe547df8c 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/tainted_ether_brazier.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/tainted_ether_brazier.json @@ -2,8 +2,12 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", @@ -14,29 +18,26 @@ }, { "function": "minecraft:copy_nbt", - "source": "block_entity", "ops": [ { + "op": "replace", "source": "firstColor", - "target": "display.firstColor", - "op": "replace" + "target": "display.firstColor" }, { + "op": "replace", "source": "secondColor", - "target": "display.secondColor", - "op": "replace" + "target": "display.secondColor" } - ] + ], + "source": "block_entity" } ], "name": "malum:tainted_ether_brazier" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/tainted_ether_brazier" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/tainted_iridescent_ether_brazier.json b/src/generated/resources/data/malum/loot_tables/blocks/tainted_iridescent_ether_brazier.json index 5e306be15..1e1eec9b0 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/tainted_iridescent_ether_brazier.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/tainted_iridescent_ether_brazier.json @@ -2,8 +2,12 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", @@ -14,29 +18,26 @@ }, { "function": "minecraft:copy_nbt", - "source": "block_entity", "ops": [ { + "op": "replace", "source": "firstColor", - "target": "display.firstColor", - "op": "replace" + "target": "display.firstColor" }, { + "op": "replace", "source": "secondColor", - "target": "display.secondColor", - "op": "replace" + "target": "display.secondColor" } - ] + ], + "source": "block_entity" } ], "name": "malum:tainted_iridescent_ether_brazier" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/tainted_iridescent_ether_brazier" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/tainted_rock.json b/src/generated/resources/data/malum/loot_tables/blocks/tainted_rock.json index d377db6b2..3bc51df54 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/tainted_rock.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/tainted_rock.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:tainted_rock" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/tainted_rock" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/tainted_rock_bricks.json b/src/generated/resources/data/malum/loot_tables/blocks/tainted_rock_bricks.json index 51c3767be..bd47569d4 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/tainted_rock_bricks.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/tainted_rock_bricks.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:tainted_rock_bricks" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/tainted_rock_bricks" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/tainted_rock_bricks_slab.json b/src/generated/resources/data/malum/loot_tables/blocks/tainted_rock_bricks_slab.json index 0d35994af..275ec97e4 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/tainted_rock_bricks_slab.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/tainted_rock_bricks_slab.json @@ -2,25 +2,24 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "functions": [ { - "function": "minecraft:set_count", + "add": false, "conditions": [ { - "condition": "minecraft:block_state_property", "block": "malum:tainted_rock_bricks_slab", + "condition": "minecraft:block_state_property", "properties": { "type": "double" } } ], "count": 2.0, - "add": false + "function": "minecraft:set_count" }, { "function": "minecraft:explosion_decay" @@ -28,7 +27,9 @@ ], "name": "malum:tainted_rock_bricks_slab" } - ] + ], + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/tainted_rock_bricks_slab" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/tainted_rock_bricks_stairs.json b/src/generated/resources/data/malum/loot_tables/blocks/tainted_rock_bricks_stairs.json index 89400e768..fdb63d42f 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/tainted_rock_bricks_stairs.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/tainted_rock_bricks_stairs.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:tainted_rock_bricks_stairs" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/tainted_rock_bricks_stairs" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/tainted_rock_bricks_wall.json b/src/generated/resources/data/malum/loot_tables/blocks/tainted_rock_bricks_wall.json index 4f59face7..0f2a3149e 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/tainted_rock_bricks_wall.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/tainted_rock_bricks_wall.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:tainted_rock_bricks_wall" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/tainted_rock_bricks_wall" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/tainted_rock_button.json b/src/generated/resources/data/malum/loot_tables/blocks/tainted_rock_button.json index c0cbf206a..4801230f9 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/tainted_rock_button.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/tainted_rock_button.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:tainted_rock_button" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/tainted_rock_button" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/tainted_rock_column.json b/src/generated/resources/data/malum/loot_tables/blocks/tainted_rock_column.json index b338ee018..ce1ba5d26 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/tainted_rock_column.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/tainted_rock_column.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:tainted_rock_column" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/tainted_rock_column" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/tainted_rock_column_cap.json b/src/generated/resources/data/malum/loot_tables/blocks/tainted_rock_column_cap.json index 53527c287..87d81b015 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/tainted_rock_column_cap.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/tainted_rock_column_cap.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:tainted_rock_column_cap" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/tainted_rock_column_cap" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/tainted_rock_item_pedestal.json b/src/generated/resources/data/malum/loot_tables/blocks/tainted_rock_item_pedestal.json index 642d1e262..7a21707a7 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/tainted_rock_item_pedestal.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/tainted_rock_item_pedestal.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:tainted_rock_item_pedestal" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/tainted_rock_item_pedestal" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/tainted_rock_item_stand.json b/src/generated/resources/data/malum/loot_tables/blocks/tainted_rock_item_stand.json index ababfb01e..5a41ad57b 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/tainted_rock_item_stand.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/tainted_rock_item_stand.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:tainted_rock_item_stand" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/tainted_rock_item_stand" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/tainted_rock_pressure_plate.json b/src/generated/resources/data/malum/loot_tables/blocks/tainted_rock_pressure_plate.json index ca4434518..0eac42988 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/tainted_rock_pressure_plate.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/tainted_rock_pressure_plate.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:tainted_rock_pressure_plate" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/tainted_rock_pressure_plate" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/tainted_rock_slab.json b/src/generated/resources/data/malum/loot_tables/blocks/tainted_rock_slab.json index 76c4d412a..badda851d 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/tainted_rock_slab.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/tainted_rock_slab.json @@ -2,25 +2,24 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "functions": [ { - "function": "minecraft:set_count", + "add": false, "conditions": [ { - "condition": "minecraft:block_state_property", "block": "malum:tainted_rock_slab", + "condition": "minecraft:block_state_property", "properties": { "type": "double" } } ], "count": 2.0, - "add": false + "function": "minecraft:set_count" }, { "function": "minecraft:explosion_decay" @@ -28,7 +27,9 @@ ], "name": "malum:tainted_rock_slab" } - ] + ], + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/tainted_rock_slab" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/tainted_rock_stairs.json b/src/generated/resources/data/malum/loot_tables/blocks/tainted_rock_stairs.json index 35ddfb06e..50e9af503 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/tainted_rock_stairs.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/tainted_rock_stairs.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:tainted_rock_stairs" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/tainted_rock_stairs" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/tainted_rock_tiles.json b/src/generated/resources/data/malum/loot_tables/blocks/tainted_rock_tiles.json index aca6f3ab8..19723d8f0 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/tainted_rock_tiles.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/tainted_rock_tiles.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:tainted_rock_tiles" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/tainted_rock_tiles" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/tainted_rock_tiles_slab.json b/src/generated/resources/data/malum/loot_tables/blocks/tainted_rock_tiles_slab.json index 65d61e93b..47af207f0 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/tainted_rock_tiles_slab.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/tainted_rock_tiles_slab.json @@ -2,25 +2,24 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "functions": [ { - "function": "minecraft:set_count", + "add": false, "conditions": [ { - "condition": "minecraft:block_state_property", "block": "malum:tainted_rock_tiles_slab", + "condition": "minecraft:block_state_property", "properties": { "type": "double" } } ], "count": 2.0, - "add": false + "function": "minecraft:set_count" }, { "function": "minecraft:explosion_decay" @@ -28,7 +27,9 @@ ], "name": "malum:tainted_rock_tiles_slab" } - ] + ], + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/tainted_rock_tiles_slab" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/tainted_rock_tiles_stairs.json b/src/generated/resources/data/malum/loot_tables/blocks/tainted_rock_tiles_stairs.json index 0ea2ffa37..a096ebeb5 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/tainted_rock_tiles_stairs.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/tainted_rock_tiles_stairs.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:tainted_rock_tiles_stairs" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/tainted_rock_tiles_stairs" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/tainted_rock_tiles_wall.json b/src/generated/resources/data/malum/loot_tables/blocks/tainted_rock_tiles_wall.json index 8dd0fd3e7..62e5ece3f 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/tainted_rock_tiles_wall.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/tainted_rock_tiles_wall.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:tainted_rock_tiles_wall" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/tainted_rock_tiles_wall" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/tainted_rock_wall.json b/src/generated/resources/data/malum/loot_tables/blocks/tainted_rock_wall.json index e5f0216d8..7aa40f92d 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/tainted_rock_wall.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/tainted_rock_wall.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:tainted_rock_wall" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/tainted_rock_wall" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/the_device.json b/src/generated/resources/data/malum/loot_tables/blocks/the_device.json index fe159cad3..519e02ede 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/the_device.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/the_device.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:the_device" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/the_device" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/the_vessel.json b/src/generated/resources/data/malum/loot_tables/blocks/the_vessel.json index 240676d32..6479213b0 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/the_vessel.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/the_vessel.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:the_vessel" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/the_vessel" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/twisted_ether_brazier.json b/src/generated/resources/data/malum/loot_tables/blocks/twisted_ether_brazier.json index e432bc6f6..d9627a607 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/twisted_ether_brazier.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/twisted_ether_brazier.json @@ -2,8 +2,12 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", @@ -14,29 +18,26 @@ }, { "function": "minecraft:copy_nbt", - "source": "block_entity", "ops": [ { + "op": "replace", "source": "firstColor", - "target": "display.firstColor", - "op": "replace" + "target": "display.firstColor" }, { + "op": "replace", "source": "secondColor", - "target": "display.secondColor", - "op": "replace" + "target": "display.secondColor" } - ] + ], + "source": "block_entity" } ], "name": "malum:twisted_ether_brazier" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/twisted_ether_brazier" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/twisted_iridescent_ether_brazier.json b/src/generated/resources/data/malum/loot_tables/blocks/twisted_iridescent_ether_brazier.json index 53a6009e9..36eae25c2 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/twisted_iridescent_ether_brazier.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/twisted_iridescent_ether_brazier.json @@ -2,8 +2,12 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", @@ -14,29 +18,26 @@ }, { "function": "minecraft:copy_nbt", - "source": "block_entity", "ops": [ { + "op": "replace", "source": "firstColor", - "target": "display.firstColor", - "op": "replace" + "target": "display.firstColor" }, { + "op": "replace", "source": "secondColor", - "target": "display.secondColor", - "op": "replace" + "target": "display.secondColor" } - ] + ], + "source": "block_entity" } ], "name": "malum:twisted_iridescent_ether_brazier" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/twisted_iridescent_ether_brazier" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/twisted_rock.json b/src/generated/resources/data/malum/loot_tables/blocks/twisted_rock.json index d5d901f25..a48b4910e 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/twisted_rock.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/twisted_rock.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:twisted_rock" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/twisted_rock" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/twisted_rock_bricks.json b/src/generated/resources/data/malum/loot_tables/blocks/twisted_rock_bricks.json index f6cd3748e..2ab5fd88b 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/twisted_rock_bricks.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/twisted_rock_bricks.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:twisted_rock_bricks" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/twisted_rock_bricks" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/twisted_rock_bricks_slab.json b/src/generated/resources/data/malum/loot_tables/blocks/twisted_rock_bricks_slab.json index 1eb99a64f..d9e1bc6ad 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/twisted_rock_bricks_slab.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/twisted_rock_bricks_slab.json @@ -2,25 +2,24 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "functions": [ { - "function": "minecraft:set_count", + "add": false, "conditions": [ { - "condition": "minecraft:block_state_property", "block": "malum:twisted_rock_bricks_slab", + "condition": "minecraft:block_state_property", "properties": { "type": "double" } } ], "count": 2.0, - "add": false + "function": "minecraft:set_count" }, { "function": "minecraft:explosion_decay" @@ -28,7 +27,9 @@ ], "name": "malum:twisted_rock_bricks_slab" } - ] + ], + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/twisted_rock_bricks_slab" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/twisted_rock_bricks_stairs.json b/src/generated/resources/data/malum/loot_tables/blocks/twisted_rock_bricks_stairs.json index f3a33f184..423616e45 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/twisted_rock_bricks_stairs.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/twisted_rock_bricks_stairs.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:twisted_rock_bricks_stairs" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/twisted_rock_bricks_stairs" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/twisted_rock_bricks_wall.json b/src/generated/resources/data/malum/loot_tables/blocks/twisted_rock_bricks_wall.json index 24b7030a8..8d445019b 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/twisted_rock_bricks_wall.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/twisted_rock_bricks_wall.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:twisted_rock_bricks_wall" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/twisted_rock_bricks_wall" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/twisted_rock_button.json b/src/generated/resources/data/malum/loot_tables/blocks/twisted_rock_button.json index c44afa7e0..6bcfb4fd3 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/twisted_rock_button.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/twisted_rock_button.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:twisted_rock_button" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/twisted_rock_button" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/twisted_rock_column.json b/src/generated/resources/data/malum/loot_tables/blocks/twisted_rock_column.json index d8dafadd4..ae4cd0658 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/twisted_rock_column.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/twisted_rock_column.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:twisted_rock_column" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/twisted_rock_column" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/twisted_rock_column_cap.json b/src/generated/resources/data/malum/loot_tables/blocks/twisted_rock_column_cap.json index 103d3666d..09419928c 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/twisted_rock_column_cap.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/twisted_rock_column_cap.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:twisted_rock_column_cap" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/twisted_rock_column_cap" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/twisted_rock_item_pedestal.json b/src/generated/resources/data/malum/loot_tables/blocks/twisted_rock_item_pedestal.json index 29977de64..d686d9c57 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/twisted_rock_item_pedestal.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/twisted_rock_item_pedestal.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:twisted_rock_item_pedestal" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/twisted_rock_item_pedestal" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/twisted_rock_item_stand.json b/src/generated/resources/data/malum/loot_tables/blocks/twisted_rock_item_stand.json index 5278efb10..b9af066eb 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/twisted_rock_item_stand.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/twisted_rock_item_stand.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:twisted_rock_item_stand" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/twisted_rock_item_stand" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/twisted_rock_pressure_plate.json b/src/generated/resources/data/malum/loot_tables/blocks/twisted_rock_pressure_plate.json index 7bacda0d5..51f4a6222 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/twisted_rock_pressure_plate.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/twisted_rock_pressure_plate.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:twisted_rock_pressure_plate" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/twisted_rock_pressure_plate" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/twisted_rock_slab.json b/src/generated/resources/data/malum/loot_tables/blocks/twisted_rock_slab.json index 1f69755fc..29777d9be 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/twisted_rock_slab.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/twisted_rock_slab.json @@ -2,25 +2,24 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "functions": [ { - "function": "minecraft:set_count", + "add": false, "conditions": [ { - "condition": "minecraft:block_state_property", "block": "malum:twisted_rock_slab", + "condition": "minecraft:block_state_property", "properties": { "type": "double" } } ], "count": 2.0, - "add": false + "function": "minecraft:set_count" }, { "function": "minecraft:explosion_decay" @@ -28,7 +27,9 @@ ], "name": "malum:twisted_rock_slab" } - ] + ], + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/twisted_rock_slab" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/twisted_rock_stairs.json b/src/generated/resources/data/malum/loot_tables/blocks/twisted_rock_stairs.json index e241f8586..14bfd53fd 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/twisted_rock_stairs.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/twisted_rock_stairs.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:twisted_rock_stairs" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/twisted_rock_stairs" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/twisted_rock_tiles.json b/src/generated/resources/data/malum/loot_tables/blocks/twisted_rock_tiles.json index c7bfca4e9..4cf1e72ad 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/twisted_rock_tiles.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/twisted_rock_tiles.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:twisted_rock_tiles" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/twisted_rock_tiles" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/twisted_rock_tiles_slab.json b/src/generated/resources/data/malum/loot_tables/blocks/twisted_rock_tiles_slab.json index 79c7c0858..ec748e1a4 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/twisted_rock_tiles_slab.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/twisted_rock_tiles_slab.json @@ -2,25 +2,24 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "functions": [ { - "function": "minecraft:set_count", + "add": false, "conditions": [ { - "condition": "minecraft:block_state_property", "block": "malum:twisted_rock_tiles_slab", + "condition": "minecraft:block_state_property", "properties": { "type": "double" } } ], "count": 2.0, - "add": false + "function": "minecraft:set_count" }, { "function": "minecraft:explosion_decay" @@ -28,7 +27,9 @@ ], "name": "malum:twisted_rock_tiles_slab" } - ] + ], + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/twisted_rock_tiles_slab" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/twisted_rock_tiles_stairs.json b/src/generated/resources/data/malum/loot_tables/blocks/twisted_rock_tiles_stairs.json index 8dd3d86d5..16b3dc9c3 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/twisted_rock_tiles_stairs.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/twisted_rock_tiles_stairs.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:twisted_rock_tiles_stairs" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/twisted_rock_tiles_stairs" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/twisted_rock_tiles_wall.json b/src/generated/resources/data/malum/loot_tables/blocks/twisted_rock_tiles_wall.json index f2db14029..e3dbfda23 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/twisted_rock_tiles_wall.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/twisted_rock_tiles_wall.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:twisted_rock_tiles_wall" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/twisted_rock_tiles_wall" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/twisted_rock_wall.json b/src/generated/resources/data/malum/loot_tables/blocks/twisted_rock_wall.json index dbd66f99e..9c0d3c17a 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/twisted_rock_wall.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/twisted_rock_wall.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:twisted_rock_wall" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/twisted_rock_wall" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/twisted_tablet.json b/src/generated/resources/data/malum/loot_tables/blocks/twisted_tablet.json index 604387ec1..f8f3f6948 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/twisted_tablet.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/twisted_tablet.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:twisted_tablet" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/twisted_tablet" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/vertical_runewood_planks.json b/src/generated/resources/data/malum/loot_tables/blocks/vertical_runewood_planks.json index 7ac1e6871..4cead19cf 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/vertical_runewood_planks.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/vertical_runewood_planks.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:vertical_runewood_planks" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/vertical_runewood_planks" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/vertical_runewood_planks_slab.json b/src/generated/resources/data/malum/loot_tables/blocks/vertical_runewood_planks_slab.json index 15415ed0b..eea3286e0 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/vertical_runewood_planks_slab.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/vertical_runewood_planks_slab.json @@ -2,25 +2,24 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "functions": [ { - "function": "minecraft:set_count", + "add": false, "conditions": [ { - "condition": "minecraft:block_state_property", "block": "malum:vertical_runewood_planks_slab", + "condition": "minecraft:block_state_property", "properties": { "type": "double" } } ], "count": 2.0, - "add": false + "function": "minecraft:set_count" }, { "function": "minecraft:explosion_decay" @@ -28,7 +27,9 @@ ], "name": "malum:vertical_runewood_planks_slab" } - ] + ], + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/vertical_runewood_planks_slab" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/vertical_runewood_planks_stairs.json b/src/generated/resources/data/malum/loot_tables/blocks/vertical_runewood_planks_stairs.json index ebaed5a91..501ec6e64 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/vertical_runewood_planks_stairs.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/vertical_runewood_planks_stairs.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:vertical_runewood_planks_stairs" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/vertical_runewood_planks_stairs" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/vertical_soulwood_planks.json b/src/generated/resources/data/malum/loot_tables/blocks/vertical_soulwood_planks.json index 09042b9f9..ba4c36507 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/vertical_soulwood_planks.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/vertical_soulwood_planks.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:vertical_soulwood_planks" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/vertical_soulwood_planks" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/vertical_soulwood_planks_slab.json b/src/generated/resources/data/malum/loot_tables/blocks/vertical_soulwood_planks_slab.json index 4a30aff95..cf1cbd267 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/vertical_soulwood_planks_slab.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/vertical_soulwood_planks_slab.json @@ -2,25 +2,24 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "functions": [ { - "function": "minecraft:set_count", + "add": false, "conditions": [ { - "condition": "minecraft:block_state_property", "block": "malum:vertical_soulwood_planks_slab", + "condition": "minecraft:block_state_property", "properties": { "type": "double" } } ], "count": 2.0, - "add": false + "function": "minecraft:set_count" }, { "function": "minecraft:explosion_decay" @@ -28,7 +27,9 @@ ], "name": "malum:vertical_soulwood_planks_slab" } - ] + ], + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/vertical_soulwood_planks_slab" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/vertical_soulwood_planks_stairs.json b/src/generated/resources/data/malum/loot_tables/blocks/vertical_soulwood_planks_stairs.json index d1d7f1bdd..c11000f7e 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/vertical_soulwood_planks_stairs.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/vertical_soulwood_planks_stairs.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:vertical_soulwood_planks_stairs" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/vertical_soulwood_planks_stairs" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/void_conduit.json b/src/generated/resources/data/malum/loot_tables/blocks/void_conduit.json index 3da3a59b4..07302a6ef 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/void_conduit.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/void_conduit.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "minecraft:air" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/void_conduit" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/weavers_workbench.json b/src/generated/resources/data/malum/loot_tables/blocks/weavers_workbench.json index 1e1adc00d..c684f0d5b 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/weavers_workbench.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/weavers_workbench.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "malum:weavers_workbench" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/weavers_workbench" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/weeping_well_core.json b/src/generated/resources/data/malum/loot_tables/blocks/weeping_well_core.json index 3da3a59b4..304d85893 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/weeping_well_core.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/weeping_well_core.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "minecraft:air" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/weeping_well_core" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/weeping_well_corner.json b/src/generated/resources/data/malum/loot_tables/blocks/weeping_well_corner.json index 3da3a59b4..2ee385521 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/weeping_well_corner.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/weeping_well_corner.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "minecraft:air" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/weeping_well_corner" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/loot_tables/blocks/weeping_well_side.json b/src/generated/resources/data/malum/loot_tables/blocks/weeping_well_side.json index 3da3a59b4..8d370691d 100644 --- a/src/generated/resources/data/malum/loot_tables/blocks/weeping_well_side.json +++ b/src/generated/resources/data/malum/loot_tables/blocks/weeping_well_side.json @@ -2,19 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "minecraft:air" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "malum:blocks/weeping_well_side" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/ace_prideweave.json b/src/generated/resources/data/malum/recipes/ace_prideweave.json index 29c4f1461..ba653af5f 100644 --- a/src/generated/resources/data/malum/recipes/ace_prideweave.json +++ b/src/generated/resources/data/malum/recipes/ace_prideweave.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ { "item": "malum:esoteric_spool" diff --git a/src/generated/resources/data/malum/recipes/agender_prideweave.json b/src/generated/resources/data/malum/recipes/agender_prideweave.json index 2da4f62ef..eac993329 100644 --- a/src/generated/resources/data/malum/recipes/agender_prideweave.json +++ b/src/generated/resources/data/malum/recipes/agender_prideweave.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ { "item": "malum:esoteric_spool" diff --git a/src/generated/resources/data/malum/recipes/alchemical_calx_from_block.json b/src/generated/resources/data/malum/recipes/alchemical_calx_from_block.json index cd39b845d..096b98433 100644 --- a/src/generated/resources/data/malum/recipes/alchemical_calx_from_block.json +++ b/src/generated/resources/data/malum/recipes/alchemical_calx_from_block.json @@ -1,12 +1,13 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ { "item": "malum:block_of_alchemical_calx" } ], "result": { - "item": "malum:alchemical_calx", - "count": 9 + "count": 9, + "item": "malum:alchemical_calx" } } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/aluminum_from_node_blasting.json b/src/generated/resources/data/malum/recipes/aluminum_from_node_blasting.json index c3c5ebce0..7d31b2010 100644 --- a/src/generated/resources/data/malum/recipes/aluminum_from_node_blasting.json +++ b/src/generated/resources/data/malum/recipes/aluminum_from_node_blasting.json @@ -4,24 +4,24 @@ { "conditions": [ { + "type": "forge:not", "value": { - "tag": "forge:nuggets/aluminum", - "type": "forge:tag_empty" - }, - "type": "forge:not" + "type": "forge:tag_empty", + "tag": "forge:nuggets/aluminum" + } } ], "recipe": { "type": "malum:node_blasting", + "cookingtime": 100, + "experience": 0.25, "ingredient": { "item": "malum:aluminum_node" }, "result": { - "tag": "forge:nuggets/aluminum", - "count": 6 - }, - "experience": 0.25, - "cookingtime": 100 + "count": 6, + "tag": "forge:nuggets/aluminum" + } } } ] diff --git a/src/generated/resources/data/malum/recipes/aluminum_from_node_smelting.json b/src/generated/resources/data/malum/recipes/aluminum_from_node_smelting.json index 3dff746ca..329a893c9 100644 --- a/src/generated/resources/data/malum/recipes/aluminum_from_node_smelting.json +++ b/src/generated/resources/data/malum/recipes/aluminum_from_node_smelting.json @@ -4,24 +4,24 @@ { "conditions": [ { + "type": "forge:not", "value": { - "tag": "forge:nuggets/aluminum", - "type": "forge:tag_empty" - }, - "type": "forge:not" + "type": "forge:tag_empty", + "tag": "forge:nuggets/aluminum" + } } ], "recipe": { "type": "malum:node_smelting", + "cookingtime": 200, + "experience": 0.25, "ingredient": { "item": "malum:aluminum_node" }, "result": { - "tag": "forge:nuggets/aluminum", - "count": 6 - }, - "experience": 0.25, - "cookingtime": 200 + "count": 6, + "tag": "forge:nuggets/aluminum" + } } } ] diff --git a/src/generated/resources/data/malum/recipes/ancient_weave.json b/src/generated/resources/data/malum/recipes/ancient_weave.json index 2b3fb5f00..7c4a3dbf0 100644 --- a/src/generated/resources/data/malum/recipes/ancient_weave.json +++ b/src/generated/resources/data/malum/recipes/ancient_weave.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ { "item": "malum:esoteric_spool" diff --git a/src/generated/resources/data/malum/recipes/arcane_charcoal_fragment.json b/src/generated/resources/data/malum/recipes/arcane_charcoal_fragment.json index 5924a9569..c2aef5afb 100644 --- a/src/generated/resources/data/malum/recipes/arcane_charcoal_fragment.json +++ b/src/generated/resources/data/malum/recipes/arcane_charcoal_fragment.json @@ -1,12 +1,13 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ { "item": "malum:arcane_charcoal" } ], "result": { - "item": "malum:arcane_charcoal_fragment", - "count": 8 + "count": 8, + "item": "malum:arcane_charcoal_fragment" } } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/arcane_charcoal_from_block.json b/src/generated/resources/data/malum/recipes/arcane_charcoal_from_block.json index 6b6d535c4..83b0ede38 100644 --- a/src/generated/resources/data/malum/recipes/arcane_charcoal_from_block.json +++ b/src/generated/resources/data/malum/recipes/arcane_charcoal_from_block.json @@ -1,12 +1,13 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ { "item": "malum:block_of_arcane_charcoal" } ], "result": { - "item": "malum:arcane_charcoal", - "count": 9 + "count": 9, + "item": "malum:arcane_charcoal" } } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/arcane_charcoal_from_fragment.json b/src/generated/resources/data/malum/recipes/arcane_charcoal_from_fragment.json index df8969abe..e1649843d 100644 --- a/src/generated/resources/data/malum/recipes/arcane_charcoal_from_fragment.json +++ b/src/generated/resources/data/malum/recipes/arcane_charcoal_from_fragment.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ { "item": "malum:arcane_charcoal_fragment" diff --git a/src/generated/resources/data/malum/recipes/arcane_charcoal_from_runewood.json b/src/generated/resources/data/malum/recipes/arcane_charcoal_from_runewood.json index bfcb38851..15d169f3c 100644 --- a/src/generated/resources/data/malum/recipes/arcane_charcoal_from_runewood.json +++ b/src/generated/resources/data/malum/recipes/arcane_charcoal_from_runewood.json @@ -1,9 +1,10 @@ { "type": "minecraft:smelting", + "category": "misc", + "cookingtime": 200, + "experience": 0.25, "ingredient": { "tag": "malum:runewood_logs" }, - "result": "malum:arcane_charcoal", - "experience": 0.25, - "cookingtime": 200 + "result": "malum:arcane_charcoal" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/arcane_charcoal_from_soulwood.json b/src/generated/resources/data/malum/recipes/arcane_charcoal_from_soulwood.json index 3f9e26a44..398a93d77 100644 --- a/src/generated/resources/data/malum/recipes/arcane_charcoal_from_soulwood.json +++ b/src/generated/resources/data/malum/recipes/arcane_charcoal_from_soulwood.json @@ -1,9 +1,10 @@ { "type": "minecraft:smelting", + "category": "misc", + "cookingtime": 200, + "experience": 0.25, "ingredient": { "tag": "malum:soulwood_logs" }, - "result": "malum:arcane_charcoal", - "experience": 0.25, - "cookingtime": 200 + "result": "malum:arcane_charcoal" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/aro_prideweave.json b/src/generated/resources/data/malum/recipes/aro_prideweave.json index c808ed7c5..94c9172cf 100644 --- a/src/generated/resources/data/malum/recipes/aro_prideweave.json +++ b/src/generated/resources/data/malum/recipes/aro_prideweave.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ { "item": "malum:esoteric_spool" diff --git a/src/generated/resources/data/malum/recipes/aroace_prideweave.json b/src/generated/resources/data/malum/recipes/aroace_prideweave.json index 55b3152f3..68adf3dd3 100644 --- a/src/generated/resources/data/malum/recipes/aroace_prideweave.json +++ b/src/generated/resources/data/malum/recipes/aroace_prideweave.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ { "item": "malum:esoteric_spool" diff --git a/src/generated/resources/data/malum/recipes/astral_weave_from_block.json b/src/generated/resources/data/malum/recipes/astral_weave_from_block.json index 1483875b7..a49faddcf 100644 --- a/src/generated/resources/data/malum/recipes/astral_weave_from_block.json +++ b/src/generated/resources/data/malum/recipes/astral_weave_from_block.json @@ -1,12 +1,13 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ { "item": "malum:block_of_astral_weave" } ], "result": { - "item": "malum:astral_weave", - "count": 9 + "count": 9, + "item": "malum:astral_weave" } } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/bi_prideweave.json b/src/generated/resources/data/malum/recipes/bi_prideweave.json index 4c94f19fc..0372aae46 100644 --- a/src/generated/resources/data/malum/recipes/bi_prideweave.json +++ b/src/generated/resources/data/malum/recipes/bi_prideweave.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ { "item": "malum:esoteric_spool" diff --git a/src/generated/resources/data/malum/recipes/blazing_quartz_fragment.json b/src/generated/resources/data/malum/recipes/blazing_quartz_fragment.json index 9879156d7..80e43c203 100644 --- a/src/generated/resources/data/malum/recipes/blazing_quartz_fragment.json +++ b/src/generated/resources/data/malum/recipes/blazing_quartz_fragment.json @@ -1,12 +1,13 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ { "item": "malum:blazing_quartz" } ], "result": { - "item": "malum:blazing_quartz_fragment", - "count": 8 + "count": 8, + "item": "malum:blazing_quartz_fragment" } } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/blazing_quartz_from_blasting.json b/src/generated/resources/data/malum/recipes/blazing_quartz_from_blasting.json index 65405687e..3b6ccd128 100644 --- a/src/generated/resources/data/malum/recipes/blazing_quartz_from_blasting.json +++ b/src/generated/resources/data/malum/recipes/blazing_quartz_from_blasting.json @@ -1,9 +1,10 @@ { "type": "minecraft:blasting", + "category": "misc", + "cookingtime": 100, + "experience": 0.25, "ingredient": { "item": "malum:blazing_quartz_ore" }, - "result": "malum:blazing_quartz", - "experience": 0.25, - "cookingtime": 100 + "result": "malum:blazing_quartz" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/blazing_quartz_from_block.json b/src/generated/resources/data/malum/recipes/blazing_quartz_from_block.json index 14fa43c81..81711e747 100644 --- a/src/generated/resources/data/malum/recipes/blazing_quartz_from_block.json +++ b/src/generated/resources/data/malum/recipes/blazing_quartz_from_block.json @@ -1,12 +1,13 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ { "item": "malum:block_of_blazing_quartz" } ], "result": { - "item": "malum:blazing_quartz", - "count": 9 + "count": 9, + "item": "malum:blazing_quartz" } } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/blazing_quartz_from_fragment.json b/src/generated/resources/data/malum/recipes/blazing_quartz_from_fragment.json index 1dfbac4f7..89fe12649 100644 --- a/src/generated/resources/data/malum/recipes/blazing_quartz_from_fragment.json +++ b/src/generated/resources/data/malum/recipes/blazing_quartz_from_fragment.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ { "item": "malum:blazing_quartz_fragment" diff --git a/src/generated/resources/data/malum/recipes/blazing_quartz_from_smelting.json b/src/generated/resources/data/malum/recipes/blazing_quartz_from_smelting.json index 340e821dc..0ec395908 100644 --- a/src/generated/resources/data/malum/recipes/blazing_quartz_from_smelting.json +++ b/src/generated/resources/data/malum/recipes/blazing_quartz_from_smelting.json @@ -1,9 +1,10 @@ { "type": "minecraft:smelting", + "category": "misc", + "cookingtime": 200, + "experience": 0.25, "ingredient": { "item": "malum:blazing_quartz_ore" }, - "result": "malum:blazing_quartz", - "experience": 0.25, - "cookingtime": 200 + "result": "malum:blazing_quartz" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/blazing_torch.json b/src/generated/resources/data/malum/recipes/blazing_torch.json index d56046caf..4cbaf322f 100644 --- a/src/generated/resources/data/malum/recipes/blazing_torch.json +++ b/src/generated/resources/data/malum/recipes/blazing_torch.json @@ -1,19 +1,21 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "#", - "\u0026" - ], + "category": "misc", "key": { "#": { "item": "malum:blazing_quartz" }, - "\u0026": { + "&": { "item": "minecraft:stick" } }, + "pattern": [ + "#", + "&" + ], "result": { - "item": "minecraft:torch", - "count": 6 - } + "count": 6, + "item": "minecraft:torch" + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/bligh.json b/src/generated/resources/data/malum/recipes/bligh.json index 7ea73cf85..664b371ff 100644 --- a/src/generated/resources/data/malum/recipes/bligh.json +++ b/src/generated/resources/data/malum/recipes/bligh.json @@ -1,16 +1,18 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "###", - "###", - "###" - ], + "category": "misc", "key": { "#": { "item": "malum:blighted_gunk" } }, + "pattern": [ + "###", + "###", + "###" + ], "result": { "item": "malum:mass_of_blighted_gunk" - } + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/blighted_gunk_from_mass.json b/src/generated/resources/data/malum/recipes/blighted_gunk_from_mass.json index c9b3a4e38..ec72cd9e4 100644 --- a/src/generated/resources/data/malum/recipes/blighted_gunk_from_mass.json +++ b/src/generated/resources/data/malum/recipes/blighted_gunk_from_mass.json @@ -1,12 +1,13 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ { "item": "malum:mass_of_blighted_gunk" } ], "result": { - "item": "malum:blighted_gunk", - "count": 9 + "count": 9, + "item": "malum:blighted_gunk" } } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/block_of_alchemical_calx.json b/src/generated/resources/data/malum/recipes/block_of_alchemical_calx.json index 5e7743d60..4521e89d0 100644 --- a/src/generated/resources/data/malum/recipes/block_of_alchemical_calx.json +++ b/src/generated/resources/data/malum/recipes/block_of_alchemical_calx.json @@ -1,16 +1,18 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "###", - "###", - "###" - ], + "category": "misc", "key": { "#": { "item": "malum:alchemical_calx" } }, + "pattern": [ + "###", + "###", + "###" + ], "result": { "item": "malum:block_of_alchemical_calx" - } + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/block_of_arcane_charcoal.json b/src/generated/resources/data/malum/recipes/block_of_arcane_charcoal.json index d5a9f79f6..2d8631721 100644 --- a/src/generated/resources/data/malum/recipes/block_of_arcane_charcoal.json +++ b/src/generated/resources/data/malum/recipes/block_of_arcane_charcoal.json @@ -1,16 +1,18 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "###", - "###", - "###" - ], + "category": "misc", "key": { "#": { "item": "malum:arcane_charcoal" } }, + "pattern": [ + "###", + "###", + "###" + ], "result": { "item": "malum:block_of_arcane_charcoal" - } + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/block_of_astral_weave.json b/src/generated/resources/data/malum/recipes/block_of_astral_weave.json index 93dfa683e..9007d18d2 100644 --- a/src/generated/resources/data/malum/recipes/block_of_astral_weave.json +++ b/src/generated/resources/data/malum/recipes/block_of_astral_weave.json @@ -1,16 +1,18 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "###", - "###", - "###" - ], + "category": "misc", "key": { "#": { "item": "malum:astral_weave" } }, + "pattern": [ + "###", + "###", + "###" + ], "result": { "item": "malum:block_of_astral_weave" - } + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/block_of_blazing_quartz.json b/src/generated/resources/data/malum/recipes/block_of_blazing_quartz.json index dea4ba0cc..73ea76f05 100644 --- a/src/generated/resources/data/malum/recipes/block_of_blazing_quartz.json +++ b/src/generated/resources/data/malum/recipes/block_of_blazing_quartz.json @@ -1,16 +1,18 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "###", - "###", - "###" - ], + "category": "misc", "key": { "#": { "item": "malum:blazing_quartz" } }, + "pattern": [ + "###", + "###", + "###" + ], "result": { "item": "malum:block_of_blazing_quartz" - } + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/block_of_brilliance.json b/src/generated/resources/data/malum/recipes/block_of_brilliance.json index c700e38f3..59c4ad978 100644 --- a/src/generated/resources/data/malum/recipes/block_of_brilliance.json +++ b/src/generated/resources/data/malum/recipes/block_of_brilliance.json @@ -1,16 +1,18 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "###", - "###", - "###" - ], + "category": "misc", "key": { "#": { "item": "malum:cluster_of_brilliance" } }, + "pattern": [ + "###", + "###", + "###" + ], "result": { "item": "malum:block_of_brilliance" - } + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/block_of_cursed_grit.json b/src/generated/resources/data/malum/recipes/block_of_cursed_grit.json index 9bc059504..9c9296ac6 100644 --- a/src/generated/resources/data/malum/recipes/block_of_cursed_grit.json +++ b/src/generated/resources/data/malum/recipes/block_of_cursed_grit.json @@ -1,16 +1,18 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "###", - "###", - "###" - ], + "category": "misc", "key": { "#": { "item": "malum:cursed_grit" } }, + "pattern": [ + "###", + "###", + "###" + ], "result": { "item": "malum:block_of_cursed_grit" - } + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/block_of_grim_talc.json b/src/generated/resources/data/malum/recipes/block_of_grim_talc.json index cf3eb1b80..77c143346 100644 --- a/src/generated/resources/data/malum/recipes/block_of_grim_talc.json +++ b/src/generated/resources/data/malum/recipes/block_of_grim_talc.json @@ -1,16 +1,18 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "###", - "###", - "###" - ], + "category": "misc", "key": { "#": { "item": "malum:grim_talc" } }, + "pattern": [ + "###", + "###", + "###" + ], "result": { "item": "malum:block_of_grim_talc" - } + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/block_of_hallowed_gold.json b/src/generated/resources/data/malum/recipes/block_of_hallowed_gold.json index f279e59f8..98ec59100 100644 --- a/src/generated/resources/data/malum/recipes/block_of_hallowed_gold.json +++ b/src/generated/resources/data/malum/recipes/block_of_hallowed_gold.json @@ -1,16 +1,18 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "###", - "###", - "###" - ], + "category": "misc", "key": { "#": { "item": "malum:hallowed_gold_ingot" } }, + "pattern": [ + "###", + "###", + "###" + ], "result": { "item": "malum:block_of_hallowed_gold" - } + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/block_of_hex_ash.json b/src/generated/resources/data/malum/recipes/block_of_hex_ash.json index ee1b53c83..03556e8cc 100644 --- a/src/generated/resources/data/malum/recipes/block_of_hex_ash.json +++ b/src/generated/resources/data/malum/recipes/block_of_hex_ash.json @@ -1,16 +1,18 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "###", - "###", - "###" - ], + "category": "misc", "key": { "#": { "item": "malum:hex_ash" } }, + "pattern": [ + "###", + "###", + "###" + ], "result": { "item": "malum:block_of_hex_ash" - } + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/block_of_rotting_essence.json b/src/generated/resources/data/malum/recipes/block_of_rotting_essence.json index 40d1f22e9..968e69624 100644 --- a/src/generated/resources/data/malum/recipes/block_of_rotting_essence.json +++ b/src/generated/resources/data/malum/recipes/block_of_rotting_essence.json @@ -1,16 +1,18 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "###", - "###", - "###" - ], + "category": "misc", "key": { "#": { "item": "malum:rotting_essence" } }, + "pattern": [ + "###", + "###", + "###" + ], "result": { "item": "malum:block_of_rotting_essence" - } + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/block_of_soul_stained_steel.json b/src/generated/resources/data/malum/recipes/block_of_soul_stained_steel.json index 06a162f60..688a525b2 100644 --- a/src/generated/resources/data/malum/recipes/block_of_soul_stained_steel.json +++ b/src/generated/resources/data/malum/recipes/block_of_soul_stained_steel.json @@ -1,16 +1,18 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "###", - "###", - "###" - ], + "category": "misc", "key": { "#": { "item": "malum:soul_stained_steel_ingot" } }, + "pattern": [ + "###", + "###", + "###" + ], "result": { "item": "malum:block_of_soul_stained_steel" - } + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/block_of_soulstone.json b/src/generated/resources/data/malum/recipes/block_of_soulstone.json index f22c671c8..495e190d3 100644 --- a/src/generated/resources/data/malum/recipes/block_of_soulstone.json +++ b/src/generated/resources/data/malum/recipes/block_of_soulstone.json @@ -1,16 +1,18 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "###", - "###", - "###" - ], + "category": "misc", "key": { "#": { "item": "malum:processed_soulstone" } }, + "pattern": [ + "###", + "###", + "###" + ], "result": { "item": "malum:block_of_soulstone" - } + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/bonemeal_from_grim_talc.json b/src/generated/resources/data/malum/recipes/bonemeal_from_grim_talc.json index 473274447..47896f1f4 100644 --- a/src/generated/resources/data/malum/recipes/bonemeal_from_grim_talc.json +++ b/src/generated/resources/data/malum/recipes/bonemeal_from_grim_talc.json @@ -1,12 +1,13 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ { "item": "malum:grim_talc" } ], "result": { - "item": "minecraft:bone_meal", - "count": 6 + "count": 6, + "item": "minecraft:bone_meal" } } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/brilliance_from_blasting.json b/src/generated/resources/data/malum/recipes/brilliance_from_blasting.json index d5efdbd80..95d092968 100644 --- a/src/generated/resources/data/malum/recipes/brilliance_from_blasting.json +++ b/src/generated/resources/data/malum/recipes/brilliance_from_blasting.json @@ -1,12 +1,12 @@ { "type": "minecraft:blasting", + "cookingtime": 100, + "experience": 1.0, "ingredient": { "item": "malum:brilliant_stone" }, "result": { - "item": "malum:chunk_of_brilliance", - "count": 2 - }, - "experience": 1.0, - "cookingtime": 100 + "count": 2, + "item": "malum:chunk_of_brilliance" + } } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/brilliance_from_block.json b/src/generated/resources/data/malum/recipes/brilliance_from_block.json index 01fe1c73f..6a6865c69 100644 --- a/src/generated/resources/data/malum/recipes/brilliance_from_block.json +++ b/src/generated/resources/data/malum/recipes/brilliance_from_block.json @@ -1,12 +1,13 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ { "item": "malum:block_of_brilliance" } ], "result": { - "item": "malum:cluster_of_brilliance", - "count": 9 + "count": 9, + "item": "malum:cluster_of_brilliance" } } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/brilliance_from_crushed_blasting.json b/src/generated/resources/data/malum/recipes/brilliance_from_crushed_blasting.json index 7cf367f23..fa8d83bb2 100644 --- a/src/generated/resources/data/malum/recipes/brilliance_from_crushed_blasting.json +++ b/src/generated/resources/data/malum/recipes/brilliance_from_crushed_blasting.json @@ -1,12 +1,12 @@ { "type": "minecraft:blasting", + "cookingtime": 100, + "experience": 1.0, "ingredient": { "item": "malum:crushed_brilliance" }, "result": { - "item": "malum:chunk_of_brilliance", - "count": 2 - }, - "experience": 1.0, - "cookingtime": 100 + "count": 2, + "item": "malum:chunk_of_brilliance" + } } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/brilliance_from_crushed_smelting.json b/src/generated/resources/data/malum/recipes/brilliance_from_crushed_smelting.json index b3b0354de..ef9318304 100644 --- a/src/generated/resources/data/malum/recipes/brilliance_from_crushed_smelting.json +++ b/src/generated/resources/data/malum/recipes/brilliance_from_crushed_smelting.json @@ -1,12 +1,12 @@ { "type": "minecraft:smelting", + "cookingtime": 200, + "experience": 1.0, "ingredient": { "item": "malum:crushed_brilliance" }, "result": { - "item": "malum:chunk_of_brilliance", - "count": 2 - }, - "experience": 1.0, - "cookingtime": 200 + "count": 2, + "item": "malum:chunk_of_brilliance" + } } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/brilliance_from_deepslate_blasting.json b/src/generated/resources/data/malum/recipes/brilliance_from_deepslate_blasting.json index 58809c8f8..8d8342663 100644 --- a/src/generated/resources/data/malum/recipes/brilliance_from_deepslate_blasting.json +++ b/src/generated/resources/data/malum/recipes/brilliance_from_deepslate_blasting.json @@ -1,12 +1,12 @@ { "type": "minecraft:blasting", + "cookingtime": 100, + "experience": 1.0, "ingredient": { "item": "malum:brilliant_deepslate" }, "result": { - "item": "malum:chunk_of_brilliance", - "count": 2 - }, - "experience": 1.0, - "cookingtime": 100 + "count": 2, + "item": "malum:chunk_of_brilliance" + } } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/brilliance_from_deepslate_smelting.json b/src/generated/resources/data/malum/recipes/brilliance_from_deepslate_smelting.json index 96d185c47..0a8c502b9 100644 --- a/src/generated/resources/data/malum/recipes/brilliance_from_deepslate_smelting.json +++ b/src/generated/resources/data/malum/recipes/brilliance_from_deepslate_smelting.json @@ -1,12 +1,12 @@ { "type": "minecraft:smelting", + "cookingtime": 200, + "experience": 1.0, "ingredient": { "item": "malum:brilliant_deepslate" }, "result": { - "item": "malum:chunk_of_brilliance", - "count": 2 - }, - "experience": 1.0, - "cookingtime": 200 + "count": 2, + "item": "malum:chunk_of_brilliance" + } } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/brilliance_from_raw_blasting.json b/src/generated/resources/data/malum/recipes/brilliance_from_raw_blasting.json index 8e21d5c8d..08b6fc4f2 100644 --- a/src/generated/resources/data/malum/recipes/brilliance_from_raw_blasting.json +++ b/src/generated/resources/data/malum/recipes/brilliance_from_raw_blasting.json @@ -1,12 +1,12 @@ { "type": "minecraft:blasting", + "cookingtime": 100, + "experience": 1.0, "ingredient": { "item": "malum:cluster_of_brilliance" }, "result": { - "item": "malum:chunk_of_brilliance", - "count": 2 - }, - "experience": 1.0, - "cookingtime": 100 + "count": 2, + "item": "malum:chunk_of_brilliance" + } } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/brilliance_from_raw_smelting.json b/src/generated/resources/data/malum/recipes/brilliance_from_raw_smelting.json index ce52d77a0..47a9ab88b 100644 --- a/src/generated/resources/data/malum/recipes/brilliance_from_raw_smelting.json +++ b/src/generated/resources/data/malum/recipes/brilliance_from_raw_smelting.json @@ -1,12 +1,12 @@ { "type": "minecraft:smelting", + "cookingtime": 200, + "experience": 1.0, "ingredient": { "item": "malum:cluster_of_brilliance" }, "result": { - "item": "malum:chunk_of_brilliance", - "count": 2 - }, - "experience": 1.0, - "cookingtime": 200 + "count": 2, + "item": "malum:chunk_of_brilliance" + } } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/brilliance_from_smelting.json b/src/generated/resources/data/malum/recipes/brilliance_from_smelting.json index 34fafb108..d17bdc54d 100644 --- a/src/generated/resources/data/malum/recipes/brilliance_from_smelting.json +++ b/src/generated/resources/data/malum/recipes/brilliance_from_smelting.json @@ -1,12 +1,12 @@ { "type": "minecraft:smelting", + "cookingtime": 200, + "experience": 1.0, "ingredient": { "item": "malum:brilliant_stone" }, "result": { - "item": "malum:chunk_of_brilliance", - "count": 2 - }, - "experience": 1.0, - "cookingtime": 200 + "count": 2, + "item": "malum:chunk_of_brilliance" + } } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/charcoal_fragment.json b/src/generated/resources/data/malum/recipes/charcoal_fragment.json index 1aecdd536..684c96155 100644 --- a/src/generated/resources/data/malum/recipes/charcoal_fragment.json +++ b/src/generated/resources/data/malum/recipes/charcoal_fragment.json @@ -1,12 +1,13 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ { "item": "minecraft:charcoal" } ], "result": { - "item": "malum:charcoal_fragment", - "count": 8 + "count": 8, + "item": "malum:charcoal_fragment" } } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/charcoal_from_fragment.json b/src/generated/resources/data/malum/recipes/charcoal_from_fragment.json index cba0ab9ba..1894de2ca 100644 --- a/src/generated/resources/data/malum/recipes/charcoal_from_fragment.json +++ b/src/generated/resources/data/malum/recipes/charcoal_from_fragment.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ { "item": "malum:charcoal_fragment" diff --git a/src/generated/resources/data/malum/recipes/chiseled_tainted_rock.json b/src/generated/resources/data/malum/recipes/chiseled_tainted_rock.json index d2b4d5569..cb9e1dc01 100644 --- a/src/generated/resources/data/malum/recipes/chiseled_tainted_rock.json +++ b/src/generated/resources/data/malum/recipes/chiseled_tainted_rock.json @@ -1,15 +1,17 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "#", - "#" - ], + "category": "misc", "key": { "#": { "item": "malum:tainted_rock_slab" } }, + "pattern": [ + "#", + "#" + ], "result": { "item": "malum:chiseled_tainted_rock" - } + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/chiseled_tainted_rock_bricks_stonecutting.json b/src/generated/resources/data/malum/recipes/chiseled_tainted_rock_bricks_stonecutting.json index 87a03bc3f..3d8c40d74 100644 --- a/src/generated/resources/data/malum/recipes/chiseled_tainted_rock_bricks_stonecutting.json +++ b/src/generated/resources/data/malum/recipes/chiseled_tainted_rock_bricks_stonecutting.json @@ -1,8 +1,8 @@ { "type": "minecraft:stonecutting", + "count": 1, "ingredient": { "item": "malum:tainted_rock" }, - "result": "malum:chiseled_tainted_rock", - "count": 1 + "result": "malum:chiseled_tainted_rock" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/chiseled_tainted_rock_bricks_stonecutting_alt.json b/src/generated/resources/data/malum/recipes/chiseled_tainted_rock_bricks_stonecutting_alt.json index 8f5a2da87..da8c42335 100644 --- a/src/generated/resources/data/malum/recipes/chiseled_tainted_rock_bricks_stonecutting_alt.json +++ b/src/generated/resources/data/malum/recipes/chiseled_tainted_rock_bricks_stonecutting_alt.json @@ -1,8 +1,8 @@ { "type": "minecraft:stonecutting", + "count": 1, "ingredient": { "item": "malum:tainted_rock_bricks" }, - "result": "malum:chiseled_tainted_rock", - "count": 1 + "result": "malum:chiseled_tainted_rock" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/chiseled_twisted_rock.json b/src/generated/resources/data/malum/recipes/chiseled_twisted_rock.json index 3ab6878f6..cd11950da 100644 --- a/src/generated/resources/data/malum/recipes/chiseled_twisted_rock.json +++ b/src/generated/resources/data/malum/recipes/chiseled_twisted_rock.json @@ -1,15 +1,17 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "#", - "#" - ], + "category": "misc", "key": { "#": { "item": "malum:twisted_rock_slab" } }, + "pattern": [ + "#", + "#" + ], "result": { "item": "malum:chiseled_twisted_rock" - } + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/chiseled_twisted_rock_bricks_stonecutting.json b/src/generated/resources/data/malum/recipes/chiseled_twisted_rock_bricks_stonecutting.json index 074fc29bf..daa91c7d2 100644 --- a/src/generated/resources/data/malum/recipes/chiseled_twisted_rock_bricks_stonecutting.json +++ b/src/generated/resources/data/malum/recipes/chiseled_twisted_rock_bricks_stonecutting.json @@ -1,8 +1,8 @@ { "type": "minecraft:stonecutting", + "count": 1, "ingredient": { "item": "malum:twisted_rock" }, - "result": "malum:chiseled_twisted_rock", - "count": 1 + "result": "malum:chiseled_twisted_rock" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/chiseled_twisted_rock_bricks_stonecutting_alt.json b/src/generated/resources/data/malum/recipes/chiseled_twisted_rock_bricks_stonecutting_alt.json index 733e4830c..49b43455a 100644 --- a/src/generated/resources/data/malum/recipes/chiseled_twisted_rock_bricks_stonecutting_alt.json +++ b/src/generated/resources/data/malum/recipes/chiseled_twisted_rock_bricks_stonecutting_alt.json @@ -1,8 +1,8 @@ { "type": "minecraft:stonecutting", + "count": 1, "ingredient": { "item": "malum:twisted_rock_bricks" }, - "result": "malum:chiseled_twisted_rock", - "count": 1 + "result": "malum:chiseled_twisted_rock" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/coal_fragment.json b/src/generated/resources/data/malum/recipes/coal_fragment.json index 42cee01b1..8805b1c3a 100644 --- a/src/generated/resources/data/malum/recipes/coal_fragment.json +++ b/src/generated/resources/data/malum/recipes/coal_fragment.json @@ -1,12 +1,13 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ { "item": "minecraft:coal" } ], "result": { - "item": "malum:coal_fragment", - "count": 8 + "count": 8, + "item": "malum:coal_fragment" } } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/coal_from_fragment.json b/src/generated/resources/data/malum/recipes/coal_from_fragment.json index 5fbab2a28..0b5b3200f 100644 --- a/src/generated/resources/data/malum/recipes/coal_from_fragment.json +++ b/src/generated/resources/data/malum/recipes/coal_from_fragment.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ { "item": "malum:coal_fragment" diff --git a/src/generated/resources/data/malum/recipes/copper_from_node_blasting.json b/src/generated/resources/data/malum/recipes/copper_from_node_blasting.json index 1a434c363..fe7842fb4 100644 --- a/src/generated/resources/data/malum/recipes/copper_from_node_blasting.json +++ b/src/generated/resources/data/malum/recipes/copper_from_node_blasting.json @@ -1,12 +1,12 @@ { "type": "minecraft:blasting", + "cookingtime": 100, + "experience": 0.25, "ingredient": { "item": "malum:copper_node" }, "result": { - "item": "malum:copper_nugget", - "count": 6 - }, - "experience": 0.25, - "cookingtime": 100 + "count": 6, + "item": "malum:copper_nugget" + } } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/copper_from_node_smelting.json b/src/generated/resources/data/malum/recipes/copper_from_node_smelting.json index d853f1b2e..b16af57d9 100644 --- a/src/generated/resources/data/malum/recipes/copper_from_node_smelting.json +++ b/src/generated/resources/data/malum/recipes/copper_from_node_smelting.json @@ -1,12 +1,12 @@ { "type": "minecraft:smelting", + "cookingtime": 200, + "experience": 0.25, "ingredient": { "item": "malum:copper_node" }, "result": { - "item": "malum:copper_nugget", - "count": 6 - }, - "experience": 0.25, - "cookingtime": 200 + "count": 6, + "item": "malum:copper_nugget" + } } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/copper_ingot_from_nugget.json b/src/generated/resources/data/malum/recipes/copper_ingot_from_nugget.json index 0e3a40cc3..4a78be00e 100644 --- a/src/generated/resources/data/malum/recipes/copper_ingot_from_nugget.json +++ b/src/generated/resources/data/malum/recipes/copper_ingot_from_nugget.json @@ -1,16 +1,18 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "###", - "###", - "###" - ], + "category": "misc", "key": { "#": { "tag": "forge:nuggets/copper" } }, + "pattern": [ + "###", + "###", + "###" + ], "result": { "item": "minecraft:copper_ingot" - } + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/copper_nugget_from_ingot.json b/src/generated/resources/data/malum/recipes/copper_nugget_from_ingot.json index 619c586f3..38cec6645 100644 --- a/src/generated/resources/data/malum/recipes/copper_nugget_from_ingot.json +++ b/src/generated/resources/data/malum/recipes/copper_nugget_from_ingot.json @@ -1,12 +1,13 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ { "tag": "forge:ingots/copper" } ], "result": { - "item": "malum:copper_nugget", - "count": 9 + "count": 9, + "item": "malum:copper_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/cornered_weave.json b/src/generated/resources/data/malum/recipes/cornered_weave.json index 1b3f2d63e..846791e2d 100644 --- a/src/generated/resources/data/malum/recipes/cornered_weave.json +++ b/src/generated/resources/data/malum/recipes/cornered_weave.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ { "item": "malum:esoteric_spool" diff --git a/src/generated/resources/data/malum/recipes/cracked_small_tainted_rock_bricks_slab_stonecutting.json b/src/generated/resources/data/malum/recipes/cracked_small_tainted_rock_bricks_slab_stonecutting.json index f071d2534..7813a2b6c 100644 --- a/src/generated/resources/data/malum/recipes/cracked_small_tainted_rock_bricks_slab_stonecutting.json +++ b/src/generated/resources/data/malum/recipes/cracked_small_tainted_rock_bricks_slab_stonecutting.json @@ -1,8 +1,8 @@ { "type": "minecraft:stonecutting", + "count": 2, "ingredient": { "item": "malum:runic_small_tainted_rock_bricks" }, - "result": "malum:runic_small_tainted_rock_bricks_slab", - "count": 2 + "result": "malum:runic_small_tainted_rock_bricks_slab" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/cracked_small_tainted_rock_bricks_smelting.json b/src/generated/resources/data/malum/recipes/cracked_small_tainted_rock_bricks_smelting.json index 849ed0018..aaeff10da 100644 --- a/src/generated/resources/data/malum/recipes/cracked_small_tainted_rock_bricks_smelting.json +++ b/src/generated/resources/data/malum/recipes/cracked_small_tainted_rock_bricks_smelting.json @@ -1,9 +1,10 @@ { "type": "minecraft:smelting", + "category": "blocks", + "cookingtime": 200, + "experience": 0.1, "ingredient": { "item": "malum:small_tainted_rock_bricks" }, - "result": "malum:runic_small_tainted_rock_bricks", - "experience": 0.1, - "cookingtime": 200 + "result": "malum:runic_small_tainted_rock_bricks" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/cracked_small_tainted_rock_bricks_stairs_stonecutting.json b/src/generated/resources/data/malum/recipes/cracked_small_tainted_rock_bricks_stairs_stonecutting.json index 73742310a..7fe33ed2f 100644 --- a/src/generated/resources/data/malum/recipes/cracked_small_tainted_rock_bricks_stairs_stonecutting.json +++ b/src/generated/resources/data/malum/recipes/cracked_small_tainted_rock_bricks_stairs_stonecutting.json @@ -1,8 +1,8 @@ { "type": "minecraft:stonecutting", + "count": 1, "ingredient": { "item": "malum:runic_small_tainted_rock_bricks" }, - "result": "malum:runic_small_tainted_rock_bricks_stairs", - "count": 1 + "result": "malum:runic_small_tainted_rock_bricks_stairs" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/cracked_small_tainted_rock_bricks_stonecutting_alt.json b/src/generated/resources/data/malum/recipes/cracked_small_tainted_rock_bricks_stonecutting_alt.json index 19b351219..86dd2b3d1 100644 --- a/src/generated/resources/data/malum/recipes/cracked_small_tainted_rock_bricks_stonecutting_alt.json +++ b/src/generated/resources/data/malum/recipes/cracked_small_tainted_rock_bricks_stonecutting_alt.json @@ -1,8 +1,8 @@ { "type": "minecraft:stonecutting", + "count": 1, "ingredient": { "item": "malum:tainted_rock_bricks" }, - "result": "malum:runic_small_tainted_rock_bricks", - "count": 1 + "result": "malum:runic_small_tainted_rock_bricks" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/cracked_small_tainted_rock_bricks_wall_stonecutting.json b/src/generated/resources/data/malum/recipes/cracked_small_tainted_rock_bricks_wall_stonecutting.json index d346fac49..b38361ba8 100644 --- a/src/generated/resources/data/malum/recipes/cracked_small_tainted_rock_bricks_wall_stonecutting.json +++ b/src/generated/resources/data/malum/recipes/cracked_small_tainted_rock_bricks_wall_stonecutting.json @@ -1,8 +1,8 @@ { "type": "minecraft:stonecutting", + "count": 1, "ingredient": { "item": "malum:runic_small_tainted_rock_bricks" }, - "result": "malum:runic_small_tainted_rock_bricks_wall", - "count": 1 + "result": "malum:runic_small_tainted_rock_bricks_wall" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/cracked_small_twisted_rock_bricks_slab_stonecutting.json b/src/generated/resources/data/malum/recipes/cracked_small_twisted_rock_bricks_slab_stonecutting.json index c7e83b6b3..61366fb15 100644 --- a/src/generated/resources/data/malum/recipes/cracked_small_twisted_rock_bricks_slab_stonecutting.json +++ b/src/generated/resources/data/malum/recipes/cracked_small_twisted_rock_bricks_slab_stonecutting.json @@ -1,8 +1,8 @@ { "type": "minecraft:stonecutting", + "count": 2, "ingredient": { "item": "malum:runic_small_twisted_rock_bricks" }, - "result": "malum:runic_small_twisted_rock_bricks_slab", - "count": 2 + "result": "malum:runic_small_twisted_rock_bricks_slab" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/cracked_small_twisted_rock_bricks_smelting.json b/src/generated/resources/data/malum/recipes/cracked_small_twisted_rock_bricks_smelting.json index 11d8c43a9..6bdf47249 100644 --- a/src/generated/resources/data/malum/recipes/cracked_small_twisted_rock_bricks_smelting.json +++ b/src/generated/resources/data/malum/recipes/cracked_small_twisted_rock_bricks_smelting.json @@ -1,9 +1,10 @@ { "type": "minecraft:smelting", + "category": "blocks", + "cookingtime": 200, + "experience": 0.1, "ingredient": { "item": "malum:small_twisted_rock_bricks" }, - "result": "malum:runic_small_twisted_rock_bricks", - "experience": 0.1, - "cookingtime": 200 + "result": "malum:runic_small_twisted_rock_bricks" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/cracked_small_twisted_rock_bricks_stairs_stonecutting.json b/src/generated/resources/data/malum/recipes/cracked_small_twisted_rock_bricks_stairs_stonecutting.json index e1b039506..c8ba45220 100644 --- a/src/generated/resources/data/malum/recipes/cracked_small_twisted_rock_bricks_stairs_stonecutting.json +++ b/src/generated/resources/data/malum/recipes/cracked_small_twisted_rock_bricks_stairs_stonecutting.json @@ -1,8 +1,8 @@ { "type": "minecraft:stonecutting", + "count": 1, "ingredient": { "item": "malum:runic_small_twisted_rock_bricks" }, - "result": "malum:runic_small_twisted_rock_bricks_stairs", - "count": 1 + "result": "malum:runic_small_twisted_rock_bricks_stairs" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/cracked_small_twisted_rock_bricks_stonecutting_alt.json b/src/generated/resources/data/malum/recipes/cracked_small_twisted_rock_bricks_stonecutting_alt.json index 2822e9edc..00b94b263 100644 --- a/src/generated/resources/data/malum/recipes/cracked_small_twisted_rock_bricks_stonecutting_alt.json +++ b/src/generated/resources/data/malum/recipes/cracked_small_twisted_rock_bricks_stonecutting_alt.json @@ -1,8 +1,8 @@ { "type": "minecraft:stonecutting", + "count": 1, "ingredient": { "item": "malum:twisted_rock_bricks" }, - "result": "malum:runic_small_twisted_rock_bricks", - "count": 1 + "result": "malum:runic_small_twisted_rock_bricks" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/cracked_small_twisted_rock_bricks_wall_stonecutting.json b/src/generated/resources/data/malum/recipes/cracked_small_twisted_rock_bricks_wall_stonecutting.json index 686bd0f8c..f8bcb03f3 100644 --- a/src/generated/resources/data/malum/recipes/cracked_small_twisted_rock_bricks_wall_stonecutting.json +++ b/src/generated/resources/data/malum/recipes/cracked_small_twisted_rock_bricks_wall_stonecutting.json @@ -1,8 +1,8 @@ { "type": "minecraft:stonecutting", + "count": 1, "ingredient": { "item": "malum:runic_small_twisted_rock_bricks" }, - "result": "malum:runic_small_twisted_rock_bricks_wall", - "count": 1 + "result": "malum:runic_small_twisted_rock_bricks_wall" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/cracked_tainted_rock_bricks_slab_stonecutting.json b/src/generated/resources/data/malum/recipes/cracked_tainted_rock_bricks_slab_stonecutting.json index 86c55e49d..f671ca8ba 100644 --- a/src/generated/resources/data/malum/recipes/cracked_tainted_rock_bricks_slab_stonecutting.json +++ b/src/generated/resources/data/malum/recipes/cracked_tainted_rock_bricks_slab_stonecutting.json @@ -1,8 +1,8 @@ { "type": "minecraft:stonecutting", + "count": 2, "ingredient": { "item": "malum:runic_tainted_rock_bricks" }, - "result": "malum:runic_tainted_rock_bricks_slab", - "count": 2 + "result": "malum:runic_tainted_rock_bricks_slab" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/cracked_tainted_rock_bricks_stairs_stonecutting.json b/src/generated/resources/data/malum/recipes/cracked_tainted_rock_bricks_stairs_stonecutting.json index 83f8b0952..18f5fdff5 100644 --- a/src/generated/resources/data/malum/recipes/cracked_tainted_rock_bricks_stairs_stonecutting.json +++ b/src/generated/resources/data/malum/recipes/cracked_tainted_rock_bricks_stairs_stonecutting.json @@ -1,8 +1,8 @@ { "type": "minecraft:stonecutting", + "count": 1, "ingredient": { "item": "malum:runic_tainted_rock_bricks" }, - "result": "malum:runic_tainted_rock_bricks_stairs", - "count": 1 + "result": "malum:runic_tainted_rock_bricks_stairs" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/cracked_tainted_rock_tiles_slab_stonecutting.json b/src/generated/resources/data/malum/recipes/cracked_tainted_rock_tiles_slab_stonecutting.json index 13626dfaa..62ed2fd8a 100644 --- a/src/generated/resources/data/malum/recipes/cracked_tainted_rock_tiles_slab_stonecutting.json +++ b/src/generated/resources/data/malum/recipes/cracked_tainted_rock_tiles_slab_stonecutting.json @@ -1,8 +1,8 @@ { "type": "minecraft:stonecutting", + "count": 2, "ingredient": { "item": "malum:runic_tainted_rock_tiles" }, - "result": "malum:runic_tainted_rock_tiles_slab", - "count": 2 + "result": "malum:runic_tainted_rock_tiles_slab" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/cracked_tainted_rock_tiles_stairs_stonecutting.json b/src/generated/resources/data/malum/recipes/cracked_tainted_rock_tiles_stairs_stonecutting.json index 93b8d6643..5a3b97d4a 100644 --- a/src/generated/resources/data/malum/recipes/cracked_tainted_rock_tiles_stairs_stonecutting.json +++ b/src/generated/resources/data/malum/recipes/cracked_tainted_rock_tiles_stairs_stonecutting.json @@ -1,8 +1,8 @@ { "type": "minecraft:stonecutting", + "count": 1, "ingredient": { "item": "malum:runic_tainted_rock_tiles" }, - "result": "malum:runic_tainted_rock_tiles_stairs", - "count": 1 + "result": "malum:runic_tainted_rock_tiles_stairs" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/cracked_tainted_rock_tiles_stonecutting.json b/src/generated/resources/data/malum/recipes/cracked_tainted_rock_tiles_stonecutting.json index 1f2d1aa03..6327103fd 100644 --- a/src/generated/resources/data/malum/recipes/cracked_tainted_rock_tiles_stonecutting.json +++ b/src/generated/resources/data/malum/recipes/cracked_tainted_rock_tiles_stonecutting.json @@ -1,8 +1,8 @@ { "type": "minecraft:stonecutting", + "count": 1, "ingredient": { "item": "malum:runic_tainted_rock_bricks" }, - "result": "malum:runic_tainted_rock_tiles", - "count": 1 + "result": "malum:runic_tainted_rock_tiles" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/cracked_tainted_rock_tiles_wall_stonecutting.json b/src/generated/resources/data/malum/recipes/cracked_tainted_rock_tiles_wall_stonecutting.json index 0ad9beb0f..92d5288c5 100644 --- a/src/generated/resources/data/malum/recipes/cracked_tainted_rock_tiles_wall_stonecutting.json +++ b/src/generated/resources/data/malum/recipes/cracked_tainted_rock_tiles_wall_stonecutting.json @@ -1,8 +1,8 @@ { "type": "minecraft:stonecutting", + "count": 1, "ingredient": { "item": "malum:runic_tainted_rock_tiles" }, - "result": "malum:runic_tainted_rock_tiles_wall", - "count": 1 + "result": "malum:runic_tainted_rock_tiles_wall" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/cracked_twisted_rock_bricks_slab_stonecutting.json b/src/generated/resources/data/malum/recipes/cracked_twisted_rock_bricks_slab_stonecutting.json index b5fe75833..6dc535c9d 100644 --- a/src/generated/resources/data/malum/recipes/cracked_twisted_rock_bricks_slab_stonecutting.json +++ b/src/generated/resources/data/malum/recipes/cracked_twisted_rock_bricks_slab_stonecutting.json @@ -1,8 +1,8 @@ { "type": "minecraft:stonecutting", + "count": 2, "ingredient": { "item": "malum:runic_twisted_rock_bricks" }, - "result": "malum:runic_twisted_rock_bricks_slab", - "count": 2 + "result": "malum:runic_twisted_rock_bricks_slab" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/cracked_twisted_rock_bricks_stairs_stonecutting.json b/src/generated/resources/data/malum/recipes/cracked_twisted_rock_bricks_stairs_stonecutting.json index 9a67b7012..0c0cb860f 100644 --- a/src/generated/resources/data/malum/recipes/cracked_twisted_rock_bricks_stairs_stonecutting.json +++ b/src/generated/resources/data/malum/recipes/cracked_twisted_rock_bricks_stairs_stonecutting.json @@ -1,8 +1,8 @@ { "type": "minecraft:stonecutting", + "count": 1, "ingredient": { "item": "malum:runic_twisted_rock_bricks" }, - "result": "malum:runic_twisted_rock_bricks_stairs", - "count": 1 + "result": "malum:runic_twisted_rock_bricks_stairs" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/cracked_twisted_rock_tiles_slab_stonecutting.json b/src/generated/resources/data/malum/recipes/cracked_twisted_rock_tiles_slab_stonecutting.json index 9dccf5dea..eefcfac48 100644 --- a/src/generated/resources/data/malum/recipes/cracked_twisted_rock_tiles_slab_stonecutting.json +++ b/src/generated/resources/data/malum/recipes/cracked_twisted_rock_tiles_slab_stonecutting.json @@ -1,8 +1,8 @@ { "type": "minecraft:stonecutting", + "count": 2, "ingredient": { "item": "malum:runic_twisted_rock_tiles" }, - "result": "malum:runic_twisted_rock_tiles_slab", - "count": 2 + "result": "malum:runic_twisted_rock_tiles_slab" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/cracked_twisted_rock_tiles_stairs_stonecutting.json b/src/generated/resources/data/malum/recipes/cracked_twisted_rock_tiles_stairs_stonecutting.json index df018330f..5d6bd1302 100644 --- a/src/generated/resources/data/malum/recipes/cracked_twisted_rock_tiles_stairs_stonecutting.json +++ b/src/generated/resources/data/malum/recipes/cracked_twisted_rock_tiles_stairs_stonecutting.json @@ -1,8 +1,8 @@ { "type": "minecraft:stonecutting", + "count": 1, "ingredient": { "item": "malum:runic_twisted_rock_tiles" }, - "result": "malum:runic_twisted_rock_tiles_stairs", - "count": 1 + "result": "malum:runic_twisted_rock_tiles_stairs" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/cracked_twisted_rock_tiles_stonecutting.json b/src/generated/resources/data/malum/recipes/cracked_twisted_rock_tiles_stonecutting.json index 97f0ea2ad..89e87a4c0 100644 --- a/src/generated/resources/data/malum/recipes/cracked_twisted_rock_tiles_stonecutting.json +++ b/src/generated/resources/data/malum/recipes/cracked_twisted_rock_tiles_stonecutting.json @@ -1,8 +1,8 @@ { "type": "minecraft:stonecutting", + "count": 1, "ingredient": { "item": "malum:runic_twisted_rock_bricks" }, - "result": "malum:runic_twisted_rock_tiles", - "count": 1 + "result": "malum:runic_twisted_rock_tiles" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/cracked_twisted_rock_tiles_wall_stonecutting.json b/src/generated/resources/data/malum/recipes/cracked_twisted_rock_tiles_wall_stonecutting.json index ea1192b8f..50b03d3d4 100644 --- a/src/generated/resources/data/malum/recipes/cracked_twisted_rock_tiles_wall_stonecutting.json +++ b/src/generated/resources/data/malum/recipes/cracked_twisted_rock_tiles_wall_stonecutting.json @@ -1,8 +1,8 @@ { "type": "minecraft:stonecutting", + "count": 1, "ingredient": { "item": "malum:runic_twisted_rock_tiles" }, - "result": "malum:runic_twisted_rock_tiles_wall", - "count": 1 + "result": "malum:runic_twisted_rock_tiles_wall" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/crude_scythe.json b/src/generated/resources/data/malum/recipes/crude_scythe.json index 90df0ff0d..c80239c2e 100644 --- a/src/generated/resources/data/malum/recipes/crude_scythe.json +++ b/src/generated/resources/data/malum/recipes/crude_scythe.json @@ -1,22 +1,24 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "XXY", - " #X", - "# " - ], + "category": "misc", "key": { "#": { "tag": "forge:rods/wooden" }, - "Y": { - "item": "malum:processed_soulstone" - }, "X": { "tag": "forge:ingots/iron" + }, + "Y": { + "item": "malum:processed_soulstone" } }, + "pattern": [ + "XXY", + " #X", + "# " + ], "result": { "item": "malum:crude_scythe" - } + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/cthonic_gold_from_blasting.json b/src/generated/resources/data/malum/recipes/cthonic_gold_from_blasting.json index db8c5345b..94dda2838 100644 --- a/src/generated/resources/data/malum/recipes/cthonic_gold_from_blasting.json +++ b/src/generated/resources/data/malum/recipes/cthonic_gold_from_blasting.json @@ -1,9 +1,10 @@ { "type": "minecraft:blasting", + "category": "misc", + "cookingtime": 100, + "experience": 2.0, "ingredient": { "item": "malum:block_of_cthonic_gold" }, - "result": "malum:cthonic_gold", - "experience": 2.0, - "cookingtime": 100 + "result": "malum:cthonic_gold" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/cthonic_gold_from_smelting.json b/src/generated/resources/data/malum/recipes/cthonic_gold_from_smelting.json index 360600e6d..9bb691f70 100644 --- a/src/generated/resources/data/malum/recipes/cthonic_gold_from_smelting.json +++ b/src/generated/resources/data/malum/recipes/cthonic_gold_from_smelting.json @@ -1,9 +1,10 @@ { "type": "minecraft:smelting", + "category": "misc", + "cookingtime": 200, + "experience": 2.0, "ingredient": { "item": "malum:block_of_cthonic_gold" }, - "result": "malum:cthonic_gold", - "experience": 2.0, - "cookingtime": 200 + "result": "malum:cthonic_gold" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/cursed_grit_from_block.json b/src/generated/resources/data/malum/recipes/cursed_grit_from_block.json index 6dda5d0e5..de2c53b6a 100644 --- a/src/generated/resources/data/malum/recipes/cursed_grit_from_block.json +++ b/src/generated/resources/data/malum/recipes/cursed_grit_from_block.json @@ -1,12 +1,13 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ { "item": "malum:block_of_cursed_grit" } ], "result": { - "item": "malum:cursed_grit", - "count": 9 + "count": 9, + "item": "malum:cursed_grit" } } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/cut_runewood_planks.json b/src/generated/resources/data/malum/recipes/cut_runewood_planks.json index b1f8690ba..94ad57fc2 100644 --- a/src/generated/resources/data/malum/recipes/cut_runewood_planks.json +++ b/src/generated/resources/data/malum/recipes/cut_runewood_planks.json @@ -1,9 +1,6 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "#", - "X" - ], + "category": "misc", "key": { "#": { "item": "malum:runewood_panel" @@ -12,8 +9,13 @@ "item": "malum:runewood_planks" } }, + "pattern": [ + "#", + "X" + ], "result": { - "item": "malum:cut_runewood_planks", - "count": 2 - } + "count": 2, + "item": "malum:cut_runewood_planks" + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/cut_soulwood_planks.json b/src/generated/resources/data/malum/recipes/cut_soulwood_planks.json index 766edc190..fdbf76846 100644 --- a/src/generated/resources/data/malum/recipes/cut_soulwood_planks.json +++ b/src/generated/resources/data/malum/recipes/cut_soulwood_planks.json @@ -1,9 +1,6 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "#", - "X" - ], + "category": "misc", "key": { "#": { "item": "malum:soulwood_panel" @@ -12,8 +9,13 @@ "item": "malum:soulwood_planks" } }, + "pattern": [ + "#", + "X" + ], "result": { - "item": "malum:cut_soulwood_planks", - "count": 2 - } + "count": 2, + "item": "malum:cut_soulwood_planks" + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/cut_tainted_rock.json b/src/generated/resources/data/malum/recipes/cut_tainted_rock.json index 04b947518..9203bce08 100644 --- a/src/generated/resources/data/malum/recipes/cut_tainted_rock.json +++ b/src/generated/resources/data/malum/recipes/cut_tainted_rock.json @@ -1,16 +1,18 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "##", - "##" - ], + "category": "misc", "key": { "#": { "item": "malum:smooth_tainted_rock" } }, + "pattern": [ + "##", + "##" + ], "result": { - "item": "malum:cut_tainted_rock", - "count": 4 - } + "count": 4, + "item": "malum:cut_tainted_rock" + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/cut_tainted_rock_stonecutting.json b/src/generated/resources/data/malum/recipes/cut_tainted_rock_stonecutting.json index 67c3f7d3f..36ea92c82 100644 --- a/src/generated/resources/data/malum/recipes/cut_tainted_rock_stonecutting.json +++ b/src/generated/resources/data/malum/recipes/cut_tainted_rock_stonecutting.json @@ -1,8 +1,8 @@ { "type": "minecraft:stonecutting", + "count": 1, "ingredient": { "item": "malum:tainted_rock" }, - "result": "malum:cut_tainted_rock", - "count": 1 + "result": "malum:cut_tainted_rock" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/cut_twisted_rock.json b/src/generated/resources/data/malum/recipes/cut_twisted_rock.json index 8d116bd20..afd0dff42 100644 --- a/src/generated/resources/data/malum/recipes/cut_twisted_rock.json +++ b/src/generated/resources/data/malum/recipes/cut_twisted_rock.json @@ -1,16 +1,18 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "##", - "##" - ], + "category": "misc", "key": { "#": { "item": "malum:smooth_twisted_rock" } }, + "pattern": [ + "##", + "##" + ], "result": { - "item": "malum:cut_twisted_rock", - "count": 4 - } + "count": 4, + "item": "malum:cut_twisted_rock" + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/cut_twisted_rock_stonecutting.json b/src/generated/resources/data/malum/recipes/cut_twisted_rock_stonecutting.json index 56c59162a..b26c2427b 100644 --- a/src/generated/resources/data/malum/recipes/cut_twisted_rock_stonecutting.json +++ b/src/generated/resources/data/malum/recipes/cut_twisted_rock_stonecutting.json @@ -1,8 +1,8 @@ { "type": "minecraft:stonecutting", + "count": 1, "ingredient": { "item": "malum:twisted_rock" }, - "result": "malum:cut_twisted_rock", - "count": 1 + "result": "malum:cut_twisted_rock" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/demiboy_prideweave.json b/src/generated/resources/data/malum/recipes/demiboy_prideweave.json index 4f9d7dea7..a080cb645 100644 --- a/src/generated/resources/data/malum/recipes/demiboy_prideweave.json +++ b/src/generated/resources/data/malum/recipes/demiboy_prideweave.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ { "item": "malum:esoteric_spool" diff --git a/src/generated/resources/data/malum/recipes/demigirl_prideweave.json b/src/generated/resources/data/malum/recipes/demigirl_prideweave.json index 80887c1cb..f394c5224 100644 --- a/src/generated/resources/data/malum/recipes/demigirl_prideweave.json +++ b/src/generated/resources/data/malum/recipes/demigirl_prideweave.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ { "item": "malum:esoteric_spool" diff --git a/src/generated/resources/data/malum/recipes/dreaded_weave.json b/src/generated/resources/data/malum/recipes/dreaded_weave.json index 63cdfadcc..6d975ff4d 100644 --- a/src/generated/resources/data/malum/recipes/dreaded_weave.json +++ b/src/generated/resources/data/malum/recipes/dreaded_weave.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ { "item": "malum:esoteric_spool" diff --git a/src/generated/resources/data/malum/recipes/enby_prideweave.json b/src/generated/resources/data/malum/recipes/enby_prideweave.json index f82a227eb..c218a9181 100644 --- a/src/generated/resources/data/malum/recipes/enby_prideweave.json +++ b/src/generated/resources/data/malum/recipes/enby_prideweave.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ { "item": "malum:esoteric_spool" diff --git a/src/generated/resources/data/malum/recipes/encyclopedia_arcana.json b/src/generated/resources/data/malum/recipes/encyclopedia_arcana.json index d9f51bcb7..07f5e581f 100644 --- a/src/generated/resources/data/malum/recipes/encyclopedia_arcana.json +++ b/src/generated/resources/data/malum/recipes/encyclopedia_arcana.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ { "item": "minecraft:book" diff --git a/src/generated/resources/data/malum/recipes/experience_bottle_from_brilliance.json b/src/generated/resources/data/malum/recipes/experience_bottle_from_brilliance.json index cc245915b..de246698a 100644 --- a/src/generated/resources/data/malum/recipes/experience_bottle_from_brilliance.json +++ b/src/generated/resources/data/malum/recipes/experience_bottle_from_brilliance.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ { "item": "malum:chunk_of_brilliance" diff --git a/src/generated/resources/data/malum/recipes/gay_prideweave.json b/src/generated/resources/data/malum/recipes/gay_prideweave.json index d87df2ca8..a679946c9 100644 --- a/src/generated/resources/data/malum/recipes/gay_prideweave.json +++ b/src/generated/resources/data/malum/recipes/gay_prideweave.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ { "item": "malum:esoteric_spool" diff --git a/src/generated/resources/data/malum/recipes/genderfluid_prideweave.json b/src/generated/resources/data/malum/recipes/genderfluid_prideweave.json index eac739405..16f79d95e 100644 --- a/src/generated/resources/data/malum/recipes/genderfluid_prideweave.json +++ b/src/generated/resources/data/malum/recipes/genderfluid_prideweave.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ { "item": "malum:esoteric_spool" diff --git a/src/generated/resources/data/malum/recipes/genderqueer_prideweave.json b/src/generated/resources/data/malum/recipes/genderqueer_prideweave.json index 6df561190..fd661c052 100644 --- a/src/generated/resources/data/malum/recipes/genderqueer_prideweave.json +++ b/src/generated/resources/data/malum/recipes/genderqueer_prideweave.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ { "item": "malum:esoteric_spool" diff --git a/src/generated/resources/data/malum/recipes/gilded_belt.json b/src/generated/resources/data/malum/recipes/gilded_belt.json index 8c8027b54..b66c919cd 100644 --- a/src/generated/resources/data/malum/recipes/gilded_belt.json +++ b/src/generated/resources/data/malum/recipes/gilded_belt.json @@ -1,10 +1,6 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "#Y#", - " # " - ], + "category": "misc", "key": { "#": { "item": "malum:hallowed_gold_ingot" @@ -16,7 +12,13 @@ "item": "malum:processed_soulstone" } }, + "pattern": [ + "XXX", + "#Y#", + " # " + ], "result": { "item": "malum:gilded_belt" - } + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/gilded_ring.json b/src/generated/resources/data/malum/recipes/gilded_ring.json index 74a1f82ab..f5346cde2 100644 --- a/src/generated/resources/data/malum/recipes/gilded_ring.json +++ b/src/generated/resources/data/malum/recipes/gilded_ring.json @@ -1,10 +1,6 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - " X#", - "X X", - " X " - ], + "category": "misc", "key": { "#": { "item": "malum:hallowed_gold_ingot" @@ -13,7 +9,13 @@ "tag": "forge:leather" } }, + "pattern": [ + " X#", + "X X", + " X " + ], "result": { "item": "malum:gilded_ring" - } + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/gold_from_node_blasting.json b/src/generated/resources/data/malum/recipes/gold_from_node_blasting.json index dea5b856d..d91d25db9 100644 --- a/src/generated/resources/data/malum/recipes/gold_from_node_blasting.json +++ b/src/generated/resources/data/malum/recipes/gold_from_node_blasting.json @@ -1,12 +1,12 @@ { "type": "minecraft:blasting", + "cookingtime": 100, + "experience": 0.25, "ingredient": { "item": "malum:gold_node" }, "result": { - "item": "minecraft:gold_nugget", - "count": 6 - }, - "experience": 0.25, - "cookingtime": 100 + "count": 6, + "item": "minecraft:gold_nugget" + } } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/gold_from_node_smelting.json b/src/generated/resources/data/malum/recipes/gold_from_node_smelting.json index 19a7cd99c..b2bca3718 100644 --- a/src/generated/resources/data/malum/recipes/gold_from_node_smelting.json +++ b/src/generated/resources/data/malum/recipes/gold_from_node_smelting.json @@ -1,12 +1,12 @@ { "type": "minecraft:smelting", + "cookingtime": 200, + "experience": 0.25, "ingredient": { "item": "malum:gold_node" }, "result": { - "item": "minecraft:gold_nugget", - "count": 6 - }, - "experience": 0.25, - "cookingtime": 200 + "count": 6, + "item": "minecraft:gold_nugget" + } } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/grim_talc_from_block.json b/src/generated/resources/data/malum/recipes/grim_talc_from_block.json index c97127083..3b6f97bc1 100644 --- a/src/generated/resources/data/malum/recipes/grim_talc_from_block.json +++ b/src/generated/resources/data/malum/recipes/grim_talc_from_block.json @@ -1,12 +1,13 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ { "item": "malum:block_of_grim_talc" } ], "result": { - "item": "malum:grim_talc", - "count": 9 + "count": 9, + "item": "malum:grim_talc" } } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/hallowed_gold_from_block.json b/src/generated/resources/data/malum/recipes/hallowed_gold_from_block.json index 46380819c..37d889385 100644 --- a/src/generated/resources/data/malum/recipes/hallowed_gold_from_block.json +++ b/src/generated/resources/data/malum/recipes/hallowed_gold_from_block.json @@ -1,12 +1,13 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ { "item": "malum:block_of_hallowed_gold" } ], "result": { - "item": "malum:hallowed_gold_ingot", - "count": 9 + "count": 9, + "item": "malum:hallowed_gold_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/hallowed_gold_from_nuggets.json b/src/generated/resources/data/malum/recipes/hallowed_gold_from_nuggets.json index 80eda8d77..98ebf1100 100644 --- a/src/generated/resources/data/malum/recipes/hallowed_gold_from_nuggets.json +++ b/src/generated/resources/data/malum/recipes/hallowed_gold_from_nuggets.json @@ -1,16 +1,18 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "###", - "###", - "###" - ], + "category": "misc", "key": { "#": { "item": "malum:hallowed_gold_nugget" } }, + "pattern": [ + "###", + "###", + "###" + ], "result": { "item": "malum:hallowed_gold_ingot" - } + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/hallowed_gold_nugget.json b/src/generated/resources/data/malum/recipes/hallowed_gold_nugget.json index c0f4b2642..682f279fa 100644 --- a/src/generated/resources/data/malum/recipes/hallowed_gold_nugget.json +++ b/src/generated/resources/data/malum/recipes/hallowed_gold_nugget.json @@ -1,12 +1,13 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ { "item": "malum:hallowed_gold_ingot" } ], "result": { - "item": "malum:hallowed_gold_nugget", - "count": 9 + "count": 9, + "item": "malum:hallowed_gold_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/hex_ash_from_block.json b/src/generated/resources/data/malum/recipes/hex_ash_from_block.json index 20d588bf6..628e72833 100644 --- a/src/generated/resources/data/malum/recipes/hex_ash_from_block.json +++ b/src/generated/resources/data/malum/recipes/hex_ash_from_block.json @@ -1,12 +1,13 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ { "item": "malum:block_of_hex_ash" } ], "result": { - "item": "malum:hex_ash", - "count": 9 + "count": 9, + "item": "malum:hex_ash" } } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/holy_sap_from_smelting.json b/src/generated/resources/data/malum/recipes/holy_sap_from_smelting.json index 6436fc669..c6132f4e4 100644 --- a/src/generated/resources/data/malum/recipes/holy_sap_from_smelting.json +++ b/src/generated/resources/data/malum/recipes/holy_sap_from_smelting.json @@ -1,9 +1,10 @@ { "type": "minecraft:smelting", + "category": "food", + "cookingtime": 200, + "experience": 0.1, "ingredient": { "item": "malum:holy_sap" }, - "result": "malum:holy_syrup", - "experience": 0.1, - "cookingtime": 200 + "result": "malum:holy_syrup" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/holy_sap_from_smoking.json b/src/generated/resources/data/malum/recipes/holy_sap_from_smoking.json index bde501386..d8f1081de 100644 --- a/src/generated/resources/data/malum/recipes/holy_sap_from_smoking.json +++ b/src/generated/resources/data/malum/recipes/holy_sap_from_smoking.json @@ -1,9 +1,10 @@ { "type": "minecraft:smoking", + "category": "food", + "cookingtime": 100, + "experience": 0.1, "ingredient": { "item": "malum:holy_sap" }, - "result": "malum:holy_syrup", - "experience": 0.1, - "cookingtime": 100 + "result": "malum:holy_syrup" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/holy_sapball.json b/src/generated/resources/data/malum/recipes/holy_sapball.json index 734d07fb3..67821fb8e 100644 --- a/src/generated/resources/data/malum/recipes/holy_sapball.json +++ b/src/generated/resources/data/malum/recipes/holy_sapball.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ { "item": "malum:holy_sap" @@ -9,7 +10,7 @@ } ], "result": { - "item": "malum:holy_sapball", - "count": 3 + "count": 3, + "item": "malum:holy_sapball" } } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/impetus_creation_aluminum.json b/src/generated/resources/data/malum/recipes/impetus_creation_aluminum.json index 548f94c9a..53a47415c 100644 --- a/src/generated/resources/data/malum/recipes/impetus_creation_aluminum.json +++ b/src/generated/resources/data/malum/recipes/impetus_creation_aluminum.json @@ -4,36 +4,36 @@ { "conditions": [ { + "type": "forge:not", "value": { - "tag": "forge:ingots/aluminum", - "type": "forge:tag_empty" - }, - "type": "forge:not" + "type": "forge:tag_empty", + "tag": "forge:ingots/aluminum" + } } ], "recipe": { "type": "malum:spirit_infusion", - "input": { - "item": "malum:alchemical_impetus", - "count": 1 - }, - "output": { - "item": "malum:aluminum_impetus" - }, "extra_items": [ { - "tag": "forge:gunpowder", - "count": 4 + "count": 4, + "tag": "forge:gunpowder" }, { - "item": "malum:cthonic_gold", - "count": 1 + "count": 1, + "item": "malum:cthonic_gold" }, { - "tag": "forge:ingots/aluminum", - "count": 6 + "count": 6, + "tag": "forge:ingots/aluminum" } ], + "input": { + "count": 1, + "item": "malum:alchemical_impetus" + }, + "output": { + "item": "malum:aluminum_impetus" + }, "spirits": [ { "type": "earthen", diff --git a/src/generated/resources/data/malum/recipes/impetus_creation_lead.json b/src/generated/resources/data/malum/recipes/impetus_creation_lead.json index 340947582..42e0a1aa9 100644 --- a/src/generated/resources/data/malum/recipes/impetus_creation_lead.json +++ b/src/generated/resources/data/malum/recipes/impetus_creation_lead.json @@ -4,36 +4,36 @@ { "conditions": [ { + "type": "forge:not", "value": { - "tag": "forge:ingots/lead", - "type": "forge:tag_empty" - }, - "type": "forge:not" + "type": "forge:tag_empty", + "tag": "forge:ingots/lead" + } } ], "recipe": { "type": "malum:spirit_infusion", - "input": { - "item": "malum:alchemical_impetus", - "count": 1 - }, - "output": { - "item": "malum:lead_impetus" - }, "extra_items": [ { - "tag": "forge:gunpowder", - "count": 4 + "count": 4, + "tag": "forge:gunpowder" }, { - "item": "malum:cthonic_gold", - "count": 1 + "count": 1, + "item": "malum:cthonic_gold" }, { - "tag": "forge:ingots/lead", - "count": 6 + "count": 6, + "tag": "forge:ingots/lead" } ], + "input": { + "count": 1, + "item": "malum:alchemical_impetus" + }, + "output": { + "item": "malum:lead_impetus" + }, "spirits": [ { "type": "earthen", diff --git a/src/generated/resources/data/malum/recipes/impetus_creation_nickel.json b/src/generated/resources/data/malum/recipes/impetus_creation_nickel.json index d41c6eda2..5c3aca960 100644 --- a/src/generated/resources/data/malum/recipes/impetus_creation_nickel.json +++ b/src/generated/resources/data/malum/recipes/impetus_creation_nickel.json @@ -4,36 +4,36 @@ { "conditions": [ { + "type": "forge:not", "value": { - "tag": "forge:ingots/nickel", - "type": "forge:tag_empty" - }, - "type": "forge:not" + "type": "forge:tag_empty", + "tag": "forge:ingots/nickel" + } } ], "recipe": { "type": "malum:spirit_infusion", - "input": { - "item": "malum:alchemical_impetus", - "count": 1 - }, - "output": { - "item": "malum:nickel_impetus" - }, "extra_items": [ { - "tag": "forge:gunpowder", - "count": 4 + "count": 4, + "tag": "forge:gunpowder" }, { - "item": "malum:cthonic_gold", - "count": 1 + "count": 1, + "item": "malum:cthonic_gold" }, { - "tag": "forge:ingots/nickel", - "count": 6 + "count": 6, + "tag": "forge:ingots/nickel" } ], + "input": { + "count": 1, + "item": "malum:alchemical_impetus" + }, + "output": { + "item": "malum:nickel_impetus" + }, "spirits": [ { "type": "earthen", diff --git a/src/generated/resources/data/malum/recipes/impetus_creation_osmium.json b/src/generated/resources/data/malum/recipes/impetus_creation_osmium.json index 66d5d4178..a8bfda193 100644 --- a/src/generated/resources/data/malum/recipes/impetus_creation_osmium.json +++ b/src/generated/resources/data/malum/recipes/impetus_creation_osmium.json @@ -4,36 +4,36 @@ { "conditions": [ { + "type": "forge:not", "value": { - "tag": "forge:ingots/osmium", - "type": "forge:tag_empty" - }, - "type": "forge:not" + "type": "forge:tag_empty", + "tag": "forge:ingots/osmium" + } } ], "recipe": { "type": "malum:spirit_infusion", - "input": { - "item": "malum:alchemical_impetus", - "count": 1 - }, - "output": { - "item": "malum:osmium_impetus" - }, "extra_items": [ { - "tag": "forge:gunpowder", - "count": 4 + "count": 4, + "tag": "forge:gunpowder" }, { - "item": "malum:cthonic_gold", - "count": 1 + "count": 1, + "item": "malum:cthonic_gold" }, { - "tag": "forge:ingots/osmium", - "count": 6 + "count": 6, + "tag": "forge:ingots/osmium" } ], + "input": { + "count": 1, + "item": "malum:alchemical_impetus" + }, + "output": { + "item": "malum:osmium_impetus" + }, "spirits": [ { "type": "earthen", diff --git a/src/generated/resources/data/malum/recipes/impetus_creation_silver.json b/src/generated/resources/data/malum/recipes/impetus_creation_silver.json index a75c08a6f..7ca494c29 100644 --- a/src/generated/resources/data/malum/recipes/impetus_creation_silver.json +++ b/src/generated/resources/data/malum/recipes/impetus_creation_silver.json @@ -4,36 +4,36 @@ { "conditions": [ { + "type": "forge:not", "value": { - "tag": "forge:ingots/silver", - "type": "forge:tag_empty" - }, - "type": "forge:not" + "type": "forge:tag_empty", + "tag": "forge:ingots/silver" + } } ], "recipe": { "type": "malum:spirit_infusion", - "input": { - "item": "malum:alchemical_impetus", - "count": 1 - }, - "output": { - "item": "malum:silver_impetus" - }, "extra_items": [ { - "tag": "forge:gunpowder", - "count": 4 + "count": 4, + "tag": "forge:gunpowder" }, { - "item": "malum:cthonic_gold", - "count": 1 + "count": 1, + "item": "malum:cthonic_gold" }, { - "tag": "forge:ingots/silver", - "count": 6 + "count": 6, + "tag": "forge:ingots/silver" } ], + "input": { + "count": 1, + "item": "malum:alchemical_impetus" + }, + "output": { + "item": "malum:silver_impetus" + }, "spirits": [ { "type": "earthen", diff --git a/src/generated/resources/data/malum/recipes/impetus_creation_tin.json b/src/generated/resources/data/malum/recipes/impetus_creation_tin.json index dba725464..4c598f3cc 100644 --- a/src/generated/resources/data/malum/recipes/impetus_creation_tin.json +++ b/src/generated/resources/data/malum/recipes/impetus_creation_tin.json @@ -4,36 +4,36 @@ { "conditions": [ { + "type": "forge:not", "value": { - "tag": "forge:ingots/tin", - "type": "forge:tag_empty" - }, - "type": "forge:not" + "type": "forge:tag_empty", + "tag": "forge:ingots/tin" + } } ], "recipe": { "type": "malum:spirit_infusion", - "input": { - "item": "malum:alchemical_impetus", - "count": 1 - }, - "output": { - "item": "malum:tin_impetus" - }, "extra_items": [ { - "tag": "forge:gunpowder", - "count": 4 + "count": 4, + "tag": "forge:gunpowder" }, { - "item": "malum:cthonic_gold", - "count": 1 + "count": 1, + "item": "malum:cthonic_gold" }, { - "tag": "forge:ingots/tin", - "count": 6 + "count": 6, + "tag": "forge:ingots/tin" } ], + "input": { + "count": 1, + "item": "malum:alchemical_impetus" + }, + "output": { + "item": "malum:tin_impetus" + }, "spirits": [ { "type": "earthen", diff --git a/src/generated/resources/data/malum/recipes/impetus_creation_uranium.json b/src/generated/resources/data/malum/recipes/impetus_creation_uranium.json index 122ab3062..ab3d9ef62 100644 --- a/src/generated/resources/data/malum/recipes/impetus_creation_uranium.json +++ b/src/generated/resources/data/malum/recipes/impetus_creation_uranium.json @@ -4,36 +4,36 @@ { "conditions": [ { + "type": "forge:not", "value": { - "tag": "forge:ingots/uranium", - "type": "forge:tag_empty" - }, - "type": "forge:not" + "type": "forge:tag_empty", + "tag": "forge:ingots/uranium" + } } ], "recipe": { "type": "malum:spirit_infusion", - "input": { - "item": "malum:alchemical_impetus", - "count": 1 - }, - "output": { - "item": "malum:uranium_impetus" - }, "extra_items": [ { - "tag": "forge:gunpowder", - "count": 4 + "count": 4, + "tag": "forge:gunpowder" }, { - "item": "malum:cthonic_gold", - "count": 1 + "count": 1, + "item": "malum:cthonic_gold" }, { - "tag": "forge:ingots/uranium", - "count": 6 + "count": 6, + "tag": "forge:ingots/uranium" } ], + "input": { + "count": 1, + "item": "malum:alchemical_impetus" + }, + "output": { + "item": "malum:uranium_impetus" + }, "spirits": [ { "type": "earthen", diff --git a/src/generated/resources/data/malum/recipes/impetus_creation_zinc.json b/src/generated/resources/data/malum/recipes/impetus_creation_zinc.json index 407dd470d..5db4db078 100644 --- a/src/generated/resources/data/malum/recipes/impetus_creation_zinc.json +++ b/src/generated/resources/data/malum/recipes/impetus_creation_zinc.json @@ -4,36 +4,36 @@ { "conditions": [ { + "type": "forge:not", "value": { - "tag": "forge:ingots/zinc", - "type": "forge:tag_empty" - }, - "type": "forge:not" + "type": "forge:tag_empty", + "tag": "forge:ingots/zinc" + } } ], "recipe": { "type": "malum:spirit_infusion", - "input": { - "item": "malum:alchemical_impetus", - "count": 1 - }, - "output": { - "item": "malum:zinc_impetus" - }, "extra_items": [ { - "tag": "forge:gunpowder", - "count": 4 + "count": 4, + "tag": "forge:gunpowder" }, { - "item": "malum:cthonic_gold", - "count": 1 + "count": 1, + "item": "malum:cthonic_gold" }, { - "tag": "forge:ingots/zinc", - "count": 6 + "count": 6, + "tag": "forge:ingots/zinc" } ], + "input": { + "count": 1, + "item": "malum:alchemical_impetus" + }, + "output": { + "item": "malum:zinc_impetus" + }, "spirits": [ { "type": "earthen", diff --git a/src/generated/resources/data/malum/recipes/intersex_prideweave.json b/src/generated/resources/data/malum/recipes/intersex_prideweave.json index 6bc5e2110..35864e914 100644 --- a/src/generated/resources/data/malum/recipes/intersex_prideweave.json +++ b/src/generated/resources/data/malum/recipes/intersex_prideweave.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ { "item": "malum:esoteric_spool" diff --git a/src/generated/resources/data/malum/recipes/iron_from_node_blasting.json b/src/generated/resources/data/malum/recipes/iron_from_node_blasting.json index c070de00c..94ead6405 100644 --- a/src/generated/resources/data/malum/recipes/iron_from_node_blasting.json +++ b/src/generated/resources/data/malum/recipes/iron_from_node_blasting.json @@ -1,12 +1,12 @@ { "type": "minecraft:blasting", + "cookingtime": 100, + "experience": 0.25, "ingredient": { "item": "malum:iron_node" }, "result": { - "item": "minecraft:iron_nugget", - "count": 6 - }, - "experience": 0.25, - "cookingtime": 100 + "count": 6, + "item": "minecraft:iron_nugget" + } } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/iron_from_node_smelting.json b/src/generated/resources/data/malum/recipes/iron_from_node_smelting.json index df159563f..554b1f7cc 100644 --- a/src/generated/resources/data/malum/recipes/iron_from_node_smelting.json +++ b/src/generated/resources/data/malum/recipes/iron_from_node_smelting.json @@ -1,12 +1,12 @@ { "type": "minecraft:smelting", + "cookingtime": 200, + "experience": 0.25, "ingredient": { "item": "malum:iron_node" }, "result": { - "item": "minecraft:iron_nugget", - "count": 6 - }, - "experience": 0.25, - "cookingtime": 200 + "count": 6, + "item": "minecraft:iron_nugget" + } } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/lead_from_node_blasting.json b/src/generated/resources/data/malum/recipes/lead_from_node_blasting.json index 1433df3a6..c0c5361a7 100644 --- a/src/generated/resources/data/malum/recipes/lead_from_node_blasting.json +++ b/src/generated/resources/data/malum/recipes/lead_from_node_blasting.json @@ -4,24 +4,24 @@ { "conditions": [ { + "type": "forge:not", "value": { - "tag": "forge:nuggets/lead", - "type": "forge:tag_empty" - }, - "type": "forge:not" + "type": "forge:tag_empty", + "tag": "forge:nuggets/lead" + } } ], "recipe": { "type": "malum:node_blasting", + "cookingtime": 100, + "experience": 0.25, "ingredient": { "item": "malum:lead_node" }, "result": { - "tag": "forge:nuggets/lead", - "count": 6 - }, - "experience": 0.25, - "cookingtime": 100 + "count": 6, + "tag": "forge:nuggets/lead" + } } } ] diff --git a/src/generated/resources/data/malum/recipes/lead_from_node_smelting.json b/src/generated/resources/data/malum/recipes/lead_from_node_smelting.json index e079a0b84..265013712 100644 --- a/src/generated/resources/data/malum/recipes/lead_from_node_smelting.json +++ b/src/generated/resources/data/malum/recipes/lead_from_node_smelting.json @@ -4,24 +4,24 @@ { "conditions": [ { + "type": "forge:not", "value": { - "tag": "forge:nuggets/lead", - "type": "forge:tag_empty" - }, - "type": "forge:not" + "type": "forge:tag_empty", + "tag": "forge:nuggets/lead" + } } ], "recipe": { "type": "malum:node_smelting", + "cookingtime": 200, + "experience": 0.25, "ingredient": { "item": "malum:lead_node" }, "result": { - "tag": "forge:nuggets/lead", - "count": 6 - }, - "experience": 0.25, - "cookingtime": 200 + "count": 6, + "tag": "forge:nuggets/lead" + } } } ] diff --git a/src/generated/resources/data/malum/recipes/lead_from_sapballs.json b/src/generated/resources/data/malum/recipes/lead_from_sapballs.json index 98f6f8ce6..50cebe51a 100644 --- a/src/generated/resources/data/malum/recipes/lead_from_sapballs.json +++ b/src/generated/resources/data/malum/recipes/lead_from_sapballs.json @@ -1,20 +1,22 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "~~ ", - "~O ", - " ~" - ], + "category": "misc", "key": { - "~": { - "tag": "forge:string" - }, "O": { "tag": "malum:sapballs" + }, + "~": { + "tag": "forge:string" } }, + "pattern": [ + "~~ ", + "~O ", + " ~" + ], "result": { - "item": "minecraft:lead", - "count": 2 - } + "count": 2, + "item": "minecraft:lead" + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/lesbian_prideweave.json b/src/generated/resources/data/malum/recipes/lesbian_prideweave.json index 291300fb9..224552159 100644 --- a/src/generated/resources/data/malum/recipes/lesbian_prideweave.json +++ b/src/generated/resources/data/malum/recipes/lesbian_prideweave.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ { "item": "malum:esoteric_spool" diff --git a/src/generated/resources/data/malum/recipes/magma_cream_from_sapballs.json b/src/generated/resources/data/malum/recipes/magma_cream_from_sapballs.json index b3775502c..50e95456f 100644 --- a/src/generated/resources/data/malum/recipes/magma_cream_from_sapballs.json +++ b/src/generated/resources/data/malum/recipes/magma_cream_from_sapballs.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ { "item": "minecraft:blaze_powder" diff --git a/src/generated/resources/data/malum/recipes/mechanical_weave_v1.json b/src/generated/resources/data/malum/recipes/mechanical_weave_v1.json index 714f91f20..79d715150 100644 --- a/src/generated/resources/data/malum/recipes/mechanical_weave_v1.json +++ b/src/generated/resources/data/malum/recipes/mechanical_weave_v1.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ { "item": "malum:esoteric_spool" diff --git a/src/generated/resources/data/malum/recipes/mechanical_weave_v2.json b/src/generated/resources/data/malum/recipes/mechanical_weave_v2.json index 574f779b3..af5485da1 100644 --- a/src/generated/resources/data/malum/recipes/mechanical_weave_v2.json +++ b/src/generated/resources/data/malum/recipes/mechanical_weave_v2.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ { "item": "malum:esoteric_spool" diff --git a/src/generated/resources/data/malum/recipes/natural_quartz_from_blasting.json b/src/generated/resources/data/malum/recipes/natural_quartz_from_blasting.json index 6de1dbbf1..5ca731a2f 100644 --- a/src/generated/resources/data/malum/recipes/natural_quartz_from_blasting.json +++ b/src/generated/resources/data/malum/recipes/natural_quartz_from_blasting.json @@ -1,9 +1,10 @@ { "type": "minecraft:blasting", + "category": "blocks", + "cookingtime": 100, + "experience": 0.25, "ingredient": { "item": "malum:natural_quartz_ore" }, - "result": "malum:natural_quartz", - "experience": 0.25, - "cookingtime": 100 + "result": "malum:natural_quartz" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/natural_quartz_from_deepslate_blasting.json b/src/generated/resources/data/malum/recipes/natural_quartz_from_deepslate_blasting.json index 8a9668975..16c92627d 100644 --- a/src/generated/resources/data/malum/recipes/natural_quartz_from_deepslate_blasting.json +++ b/src/generated/resources/data/malum/recipes/natural_quartz_from_deepslate_blasting.json @@ -1,9 +1,10 @@ { "type": "minecraft:blasting", + "category": "blocks", + "cookingtime": 100, + "experience": 0.25, "ingredient": { "item": "malum:deepslate_quartz_ore" }, - "result": "malum:natural_quartz", - "experience": 0.25, - "cookingtime": 100 + "result": "malum:natural_quartz" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/natural_quartz_from_deepslate_smelting.json b/src/generated/resources/data/malum/recipes/natural_quartz_from_deepslate_smelting.json index c61cda863..0f39703d8 100644 --- a/src/generated/resources/data/malum/recipes/natural_quartz_from_deepslate_smelting.json +++ b/src/generated/resources/data/malum/recipes/natural_quartz_from_deepslate_smelting.json @@ -1,9 +1,10 @@ { "type": "minecraft:smelting", + "category": "blocks", + "cookingtime": 200, + "experience": 0.25, "ingredient": { "item": "malum:deepslate_quartz_ore" }, - "result": "malum:natural_quartz", - "experience": 0.25, - "cookingtime": 200 + "result": "malum:natural_quartz" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/natural_quartz_from_smelting.json b/src/generated/resources/data/malum/recipes/natural_quartz_from_smelting.json index 55d83849d..2423f1de8 100644 --- a/src/generated/resources/data/malum/recipes/natural_quartz_from_smelting.json +++ b/src/generated/resources/data/malum/recipes/natural_quartz_from_smelting.json @@ -1,9 +1,10 @@ { "type": "minecraft:smelting", + "category": "blocks", + "cookingtime": 200, + "experience": 0.25, "ingredient": { "item": "malum:natural_quartz_ore" }, - "result": "malum:natural_quartz", - "experience": 0.25, - "cookingtime": 200 + "result": "malum:natural_quartz" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/netherrack_from_blazing_quartz.json b/src/generated/resources/data/malum/recipes/netherrack_from_blazing_quartz.json index f33416c21..2fdebacbb 100644 --- a/src/generated/resources/data/malum/recipes/netherrack_from_blazing_quartz.json +++ b/src/generated/resources/data/malum/recipes/netherrack_from_blazing_quartz.json @@ -1,19 +1,21 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "ZY", - "YZ" - ], + "category": "misc", "key": { - "Z": { - "item": "malum:blazing_quartz" - }, "Y": { "tag": "forge:cobblestone" + }, + "Z": { + "item": "malum:blazing_quartz" } }, + "pattern": [ + "ZY", + "YZ" + ], "result": { - "item": "minecraft:netherrack", - "count": 2 - } + "count": 2, + "item": "minecraft:netherrack" + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/nickel_from_node_blasting.json b/src/generated/resources/data/malum/recipes/nickel_from_node_blasting.json index a8c12b91d..2525d35c3 100644 --- a/src/generated/resources/data/malum/recipes/nickel_from_node_blasting.json +++ b/src/generated/resources/data/malum/recipes/nickel_from_node_blasting.json @@ -4,24 +4,24 @@ { "conditions": [ { + "type": "forge:not", "value": { - "tag": "forge:nuggets/nickel", - "type": "forge:tag_empty" - }, - "type": "forge:not" + "type": "forge:tag_empty", + "tag": "forge:nuggets/nickel" + } } ], "recipe": { "type": "malum:node_blasting", + "cookingtime": 100, + "experience": 0.25, "ingredient": { "item": "malum:nickel_node" }, "result": { - "tag": "forge:nuggets/nickel", - "count": 6 - }, - "experience": 0.25, - "cookingtime": 100 + "count": 6, + "tag": "forge:nuggets/nickel" + } } } ] diff --git a/src/generated/resources/data/malum/recipes/nickel_from_node_smelting.json b/src/generated/resources/data/malum/recipes/nickel_from_node_smelting.json index dfb88f699..d7e1c8f38 100644 --- a/src/generated/resources/data/malum/recipes/nickel_from_node_smelting.json +++ b/src/generated/resources/data/malum/recipes/nickel_from_node_smelting.json @@ -4,24 +4,24 @@ { "conditions": [ { + "type": "forge:not", "value": { - "tag": "forge:nuggets/nickel", - "type": "forge:tag_empty" - }, - "type": "forge:not" + "type": "forge:tag_empty", + "tag": "forge:nuggets/nickel" + } } ], "recipe": { "type": "malum:node_smelting", + "cookingtime": 200, + "experience": 0.25, "ingredient": { "item": "malum:nickel_node" }, "result": { - "tag": "forge:nuggets/nickel", - "count": 6 - }, - "experience": 0.25, - "cookingtime": 200 + "count": 6, + "tag": "forge:nuggets/nickel" + } } } ] diff --git a/src/generated/resources/data/malum/recipes/node_focusing_aluminum.json b/src/generated/resources/data/malum/recipes/node_focusing_aluminum.json index 74115dc7c..9ec16fa71 100644 --- a/src/generated/resources/data/malum/recipes/node_focusing_aluminum.json +++ b/src/generated/resources/data/malum/recipes/node_focusing_aluminum.json @@ -4,23 +4,22 @@ { "conditions": [ { + "type": "forge:not", "value": { - "tag": "forge:nuggets/aluminum", - "type": "forge:tag_empty" - }, - "type": "forge:not" + "type": "forge:tag_empty", + "tag": "forge:nuggets/aluminum" + } } ], "recipe": { "type": "malum:spirit_focusing", - "time": 900, "durabilityCost": 2, "input": { "item": "malum:aluminum_impetus" }, "output": { - "item": "malum:aluminum_node", - "count": 3 + "count": 3, + "item": "malum:aluminum_node" }, "spirits": [ { @@ -30,7 +29,8 @@ { "type": "infernal" } - ] + ], + "time": 900 } } ] diff --git a/src/generated/resources/data/malum/recipes/node_focusing_copper.json b/src/generated/resources/data/malum/recipes/node_focusing_copper.json index f7f679ed3..0f349f84f 100644 --- a/src/generated/resources/data/malum/recipes/node_focusing_copper.json +++ b/src/generated/resources/data/malum/recipes/node_focusing_copper.json @@ -1,13 +1,12 @@ { "type": "malum:spirit_focusing", - "time": 900, "durabilityCost": 2, "input": { "item": "malum:copper_impetus" }, "output": { - "item": "malum:copper_node", - "count": 3 + "count": 3, + "item": "malum:copper_node" }, "spirits": [ { @@ -18,5 +17,6 @@ "type": "infernal", "count": 4 } - ] + ], + "time": 900 } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/node_focusing_gold.json b/src/generated/resources/data/malum/recipes/node_focusing_gold.json index 2943fc34c..40d4167a3 100644 --- a/src/generated/resources/data/malum/recipes/node_focusing_gold.json +++ b/src/generated/resources/data/malum/recipes/node_focusing_gold.json @@ -1,13 +1,12 @@ { "type": "malum:spirit_focusing", - "time": 900, "durabilityCost": 2, "input": { "item": "malum:gold_impetus" }, "output": { - "item": "malum:gold_node", - "count": 3 + "count": 3, + "item": "malum:gold_node" }, "spirits": [ { @@ -18,5 +17,6 @@ "type": "infernal", "count": 4 } - ] + ], + "time": 900 } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/node_focusing_iron.json b/src/generated/resources/data/malum/recipes/node_focusing_iron.json index 32467ffdd..3b2dda01e 100644 --- a/src/generated/resources/data/malum/recipes/node_focusing_iron.json +++ b/src/generated/resources/data/malum/recipes/node_focusing_iron.json @@ -1,13 +1,12 @@ { "type": "malum:spirit_focusing", - "time": 900, "durabilityCost": 2, "input": { "item": "malum:iron_impetus" }, "output": { - "item": "malum:iron_node", - "count": 3 + "count": 3, + "item": "malum:iron_node" }, "spirits": [ { @@ -18,5 +17,6 @@ "type": "infernal", "count": 4 } - ] + ], + "time": 900 } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/node_focusing_lead.json b/src/generated/resources/data/malum/recipes/node_focusing_lead.json index b833d9339..2e8d93526 100644 --- a/src/generated/resources/data/malum/recipes/node_focusing_lead.json +++ b/src/generated/resources/data/malum/recipes/node_focusing_lead.json @@ -4,23 +4,22 @@ { "conditions": [ { + "type": "forge:not", "value": { - "tag": "forge:nuggets/lead", - "type": "forge:tag_empty" - }, - "type": "forge:not" + "type": "forge:tag_empty", + "tag": "forge:nuggets/lead" + } } ], "recipe": { "type": "malum:spirit_focusing", - "time": 900, "durabilityCost": 2, "input": { "item": "malum:lead_impetus" }, "output": { - "item": "malum:lead_node", - "count": 3 + "count": 3, + "item": "malum:lead_node" }, "spirits": [ { @@ -30,7 +29,8 @@ { "type": "infernal" } - ] + ], + "time": 900 } } ] diff --git a/src/generated/resources/data/malum/recipes/node_focusing_nickel.json b/src/generated/resources/data/malum/recipes/node_focusing_nickel.json index 985ce0cd6..dcb9e18ac 100644 --- a/src/generated/resources/data/malum/recipes/node_focusing_nickel.json +++ b/src/generated/resources/data/malum/recipes/node_focusing_nickel.json @@ -4,23 +4,22 @@ { "conditions": [ { + "type": "forge:not", "value": { - "tag": "forge:nuggets/nickel", - "type": "forge:tag_empty" - }, - "type": "forge:not" + "type": "forge:tag_empty", + "tag": "forge:nuggets/nickel" + } } ], "recipe": { "type": "malum:spirit_focusing", - "time": 900, "durabilityCost": 2, "input": { "item": "malum:nickel_impetus" }, "output": { - "item": "malum:nickel_node", - "count": 3 + "count": 3, + "item": "malum:nickel_node" }, "spirits": [ { @@ -30,7 +29,8 @@ { "type": "infernal" } - ] + ], + "time": 900 } } ] diff --git a/src/generated/resources/data/malum/recipes/node_focusing_osmium.json b/src/generated/resources/data/malum/recipes/node_focusing_osmium.json index ddd03f789..e1ac7ad37 100644 --- a/src/generated/resources/data/malum/recipes/node_focusing_osmium.json +++ b/src/generated/resources/data/malum/recipes/node_focusing_osmium.json @@ -4,23 +4,22 @@ { "conditions": [ { + "type": "forge:not", "value": { - "tag": "forge:nuggets/osmium", - "type": "forge:tag_empty" - }, - "type": "forge:not" + "type": "forge:tag_empty", + "tag": "forge:nuggets/osmium" + } } ], "recipe": { "type": "malum:spirit_focusing", - "time": 900, "durabilityCost": 2, "input": { "item": "malum:osmium_impetus" }, "output": { - "item": "malum:osmium_node", - "count": 3 + "count": 3, + "item": "malum:osmium_node" }, "spirits": [ { @@ -30,7 +29,8 @@ { "type": "infernal" } - ] + ], + "time": 900 } } ] diff --git a/src/generated/resources/data/malum/recipes/node_focusing_silver.json b/src/generated/resources/data/malum/recipes/node_focusing_silver.json index 1a044b2e8..5630cfc79 100644 --- a/src/generated/resources/data/malum/recipes/node_focusing_silver.json +++ b/src/generated/resources/data/malum/recipes/node_focusing_silver.json @@ -4,23 +4,22 @@ { "conditions": [ { + "type": "forge:not", "value": { - "tag": "forge:nuggets/silver", - "type": "forge:tag_empty" - }, - "type": "forge:not" + "type": "forge:tag_empty", + "tag": "forge:nuggets/silver" + } } ], "recipe": { "type": "malum:spirit_focusing", - "time": 900, "durabilityCost": 2, "input": { "item": "malum:silver_impetus" }, "output": { - "item": "malum:silver_node", - "count": 3 + "count": 3, + "item": "malum:silver_node" }, "spirits": [ { @@ -30,7 +29,8 @@ { "type": "infernal" } - ] + ], + "time": 900 } } ] diff --git a/src/generated/resources/data/malum/recipes/node_focusing_tin.json b/src/generated/resources/data/malum/recipes/node_focusing_tin.json index eeaa9431f..115026fea 100644 --- a/src/generated/resources/data/malum/recipes/node_focusing_tin.json +++ b/src/generated/resources/data/malum/recipes/node_focusing_tin.json @@ -4,23 +4,22 @@ { "conditions": [ { + "type": "forge:not", "value": { - "tag": "forge:nuggets/tin", - "type": "forge:tag_empty" - }, - "type": "forge:not" + "type": "forge:tag_empty", + "tag": "forge:nuggets/tin" + } } ], "recipe": { "type": "malum:spirit_focusing", - "time": 900, "durabilityCost": 2, "input": { "item": "malum:tin_impetus" }, "output": { - "item": "malum:tin_node", - "count": 3 + "count": 3, + "item": "malum:tin_node" }, "spirits": [ { @@ -30,7 +29,8 @@ { "type": "infernal" } - ] + ], + "time": 900 } } ] diff --git a/src/generated/resources/data/malum/recipes/node_focusing_uranium.json b/src/generated/resources/data/malum/recipes/node_focusing_uranium.json index a28cdd078..33fda68da 100644 --- a/src/generated/resources/data/malum/recipes/node_focusing_uranium.json +++ b/src/generated/resources/data/malum/recipes/node_focusing_uranium.json @@ -4,23 +4,22 @@ { "conditions": [ { + "type": "forge:not", "value": { - "tag": "forge:nuggets/uranium", - "type": "forge:tag_empty" - }, - "type": "forge:not" + "type": "forge:tag_empty", + "tag": "forge:nuggets/uranium" + } } ], "recipe": { "type": "malum:spirit_focusing", - "time": 900, "durabilityCost": 2, "input": { "item": "malum:uranium_impetus" }, "output": { - "item": "malum:uranium_node", - "count": 3 + "count": 3, + "item": "malum:uranium_node" }, "spirits": [ { @@ -30,7 +29,8 @@ { "type": "infernal" } - ] + ], + "time": 900 } } ] diff --git a/src/generated/resources/data/malum/recipes/node_focusing_zinc.json b/src/generated/resources/data/malum/recipes/node_focusing_zinc.json index df8dcc6ab..0332d3d5b 100644 --- a/src/generated/resources/data/malum/recipes/node_focusing_zinc.json +++ b/src/generated/resources/data/malum/recipes/node_focusing_zinc.json @@ -4,23 +4,22 @@ { "conditions": [ { + "type": "forge:not", "value": { - "tag": "forge:nuggets/zinc", - "type": "forge:tag_empty" - }, - "type": "forge:not" + "type": "forge:tag_empty", + "tag": "forge:nuggets/zinc" + } } ], "recipe": { "type": "malum:spirit_focusing", - "time": 900, "durabilityCost": 2, "input": { "item": "malum:zinc_impetus" }, "output": { - "item": "malum:zinc_node", - "count": 3 + "count": 3, + "item": "malum:zinc_node" }, "spirits": [ { @@ -30,7 +29,8 @@ { "type": "infernal" } - ] + ], + "time": 900 } } ] diff --git a/src/generated/resources/data/malum/recipes/ornate_necklace.json b/src/generated/resources/data/malum/recipes/ornate_necklace.json index 3c4f0151c..a482d75bf 100644 --- a/src/generated/resources/data/malum/recipes/ornate_necklace.json +++ b/src/generated/resources/data/malum/recipes/ornate_necklace.json @@ -1,10 +1,6 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - " X ", - "X X", - " # " - ], + "category": "misc", "key": { "#": { "item": "malum:soul_stained_steel_ingot" @@ -13,7 +9,13 @@ "tag": "forge:string" } }, + "pattern": [ + " X ", + "X X", + " # " + ], "result": { "item": "malum:ornate_necklace" - } + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/ornate_ring.json b/src/generated/resources/data/malum/recipes/ornate_ring.json index 218f5f4d8..03ba396b2 100644 --- a/src/generated/resources/data/malum/recipes/ornate_ring.json +++ b/src/generated/resources/data/malum/recipes/ornate_ring.json @@ -1,10 +1,6 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - " X#", - "X X", - " X " - ], + "category": "misc", "key": { "#": { "item": "malum:soul_stained_steel_ingot" @@ -13,7 +9,13 @@ "tag": "forge:leather" } }, + "pattern": [ + " X#", + "X X", + " X " + ], "result": { "item": "malum:ornate_ring" - } + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/osmium_from_node_blasting.json b/src/generated/resources/data/malum/recipes/osmium_from_node_blasting.json index f18013f82..d9839540e 100644 --- a/src/generated/resources/data/malum/recipes/osmium_from_node_blasting.json +++ b/src/generated/resources/data/malum/recipes/osmium_from_node_blasting.json @@ -4,24 +4,24 @@ { "conditions": [ { + "type": "forge:not", "value": { - "tag": "forge:nuggets/osmium", - "type": "forge:tag_empty" - }, - "type": "forge:not" + "type": "forge:tag_empty", + "tag": "forge:nuggets/osmium" + } } ], "recipe": { "type": "malum:node_blasting", + "cookingtime": 100, + "experience": 0.25, "ingredient": { "item": "malum:osmium_node" }, "result": { - "tag": "forge:nuggets/osmium", - "count": 6 - }, - "experience": 0.25, - "cookingtime": 100 + "count": 6, + "tag": "forge:nuggets/osmium" + } } } ] diff --git a/src/generated/resources/data/malum/recipes/osmium_from_node_smelting.json b/src/generated/resources/data/malum/recipes/osmium_from_node_smelting.json index 6eddef6cb..08ac27e90 100644 --- a/src/generated/resources/data/malum/recipes/osmium_from_node_smelting.json +++ b/src/generated/resources/data/malum/recipes/osmium_from_node_smelting.json @@ -4,24 +4,24 @@ { "conditions": [ { + "type": "forge:not", "value": { - "tag": "forge:nuggets/osmium", - "type": "forge:tag_empty" - }, - "type": "forge:not" + "type": "forge:tag_empty", + "tag": "forge:nuggets/osmium" + } } ], "recipe": { "type": "malum:node_smelting", + "cookingtime": 200, + "experience": 0.25, "ingredient": { "item": "malum:osmium_node" }, "result": { - "tag": "forge:nuggets/osmium", - "count": 6 - }, - "experience": 0.25, - "cookingtime": 200 + "count": 6, + "tag": "forge:nuggets/osmium" + } } } ] diff --git a/src/generated/resources/data/malum/recipes/pan_prideweave.json b/src/generated/resources/data/malum/recipes/pan_prideweave.json index 065629bab..8295d805e 100644 --- a/src/generated/resources/data/malum/recipes/pan_prideweave.json +++ b/src/generated/resources/data/malum/recipes/pan_prideweave.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ { "item": "malum:esoteric_spool" diff --git a/src/generated/resources/data/malum/recipes/plural_prideweave.json b/src/generated/resources/data/malum/recipes/plural_prideweave.json index 526a98440..f9b1f7b97 100644 --- a/src/generated/resources/data/malum/recipes/plural_prideweave.json +++ b/src/generated/resources/data/malum/recipes/plural_prideweave.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ { "item": "malum:esoteric_spool" diff --git a/src/generated/resources/data/malum/recipes/polished_tainted_rock.json b/src/generated/resources/data/malum/recipes/polished_tainted_rock.json index 5c9d2188b..ea16847ff 100644 --- a/src/generated/resources/data/malum/recipes/polished_tainted_rock.json +++ b/src/generated/resources/data/malum/recipes/polished_tainted_rock.json @@ -1,16 +1,18 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "##", - "##" - ], + "category": "misc", "key": { "#": { "item": "malum:tainted_rock" } }, + "pattern": [ + "##", + "##" + ], "result": { - "item": "malum:polished_tainted_rock", - "count": 4 - } + "count": 4, + "item": "malum:polished_tainted_rock" + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/polished_tainted_rock_slab.json b/src/generated/resources/data/malum/recipes/polished_tainted_rock_slab.json index 53ff2ad20..b6f53070f 100644 --- a/src/generated/resources/data/malum/recipes/polished_tainted_rock_slab.json +++ b/src/generated/resources/data/malum/recipes/polished_tainted_rock_slab.json @@ -1,15 +1,17 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "###" - ], + "category": "misc", "key": { "#": { "item": "malum:polished_tainted_rock" } }, + "pattern": [ + "###" + ], "result": { - "item": "malum:polished_tainted_rock_slab", - "count": 6 - } + "count": 6, + "item": "malum:polished_tainted_rock_slab" + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/polished_tainted_rock_slab_stonecutting.json b/src/generated/resources/data/malum/recipes/polished_tainted_rock_slab_stonecutting.json index 142301219..44f5bdfcd 100644 --- a/src/generated/resources/data/malum/recipes/polished_tainted_rock_slab_stonecutting.json +++ b/src/generated/resources/data/malum/recipes/polished_tainted_rock_slab_stonecutting.json @@ -1,8 +1,8 @@ { "type": "minecraft:stonecutting", + "count": 2, "ingredient": { "item": "malum:polished_tainted_rock" }, - "result": "malum:polished_tainted_rock_slab", - "count": 2 + "result": "malum:polished_tainted_rock_slab" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/polished_tainted_rock_stairs.json b/src/generated/resources/data/malum/recipes/polished_tainted_rock_stairs.json index ed00a1ae7..6d59e26aa 100644 --- a/src/generated/resources/data/malum/recipes/polished_tainted_rock_stairs.json +++ b/src/generated/resources/data/malum/recipes/polished_tainted_rock_stairs.json @@ -1,17 +1,19 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "# ", - "## ", - "###" - ], + "category": "misc", "key": { "#": { "item": "malum:polished_tainted_rock" } }, + "pattern": [ + "# ", + "## ", + "###" + ], "result": { - "item": "malum:polished_tainted_rock_stairs", - "count": 4 - } + "count": 4, + "item": "malum:polished_tainted_rock_stairs" + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/polished_tainted_rock_stairs_stonecutting.json b/src/generated/resources/data/malum/recipes/polished_tainted_rock_stairs_stonecutting.json index 8a2a58fa0..99ea9fb49 100644 --- a/src/generated/resources/data/malum/recipes/polished_tainted_rock_stairs_stonecutting.json +++ b/src/generated/resources/data/malum/recipes/polished_tainted_rock_stairs_stonecutting.json @@ -1,8 +1,8 @@ { "type": "minecraft:stonecutting", + "count": 1, "ingredient": { "item": "malum:polished_tainted_rock" }, - "result": "malum:polished_tainted_rock_stairs", - "count": 1 + "result": "malum:polished_tainted_rock_stairs" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/polished_tainted_rock_stonecutting.json b/src/generated/resources/data/malum/recipes/polished_tainted_rock_stonecutting.json index 20a001243..cb3ff8e41 100644 --- a/src/generated/resources/data/malum/recipes/polished_tainted_rock_stonecutting.json +++ b/src/generated/resources/data/malum/recipes/polished_tainted_rock_stonecutting.json @@ -1,8 +1,8 @@ { "type": "minecraft:stonecutting", + "count": 1, "ingredient": { "item": "malum:tainted_rock" }, - "result": "malum:polished_tainted_rock", - "count": 1 + "result": "malum:polished_tainted_rock" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/polished_twisted_rock.json b/src/generated/resources/data/malum/recipes/polished_twisted_rock.json index ed87715b2..fdee22d92 100644 --- a/src/generated/resources/data/malum/recipes/polished_twisted_rock.json +++ b/src/generated/resources/data/malum/recipes/polished_twisted_rock.json @@ -1,16 +1,18 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "##", - "##" - ], + "category": "misc", "key": { "#": { "item": "malum:twisted_rock" } }, + "pattern": [ + "##", + "##" + ], "result": { - "item": "malum:polished_twisted_rock", - "count": 4 - } + "count": 4, + "item": "malum:polished_twisted_rock" + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/polished_twisted_rock_slab.json b/src/generated/resources/data/malum/recipes/polished_twisted_rock_slab.json index fca54ba39..fe53eb9e9 100644 --- a/src/generated/resources/data/malum/recipes/polished_twisted_rock_slab.json +++ b/src/generated/resources/data/malum/recipes/polished_twisted_rock_slab.json @@ -1,15 +1,17 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "###" - ], + "category": "misc", "key": { "#": { "item": "malum:polished_twisted_rock" } }, + "pattern": [ + "###" + ], "result": { - "item": "malum:polished_twisted_rock_slab", - "count": 6 - } + "count": 6, + "item": "malum:polished_twisted_rock_slab" + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/polished_twisted_rock_slab_stonecutting.json b/src/generated/resources/data/malum/recipes/polished_twisted_rock_slab_stonecutting.json index 481bfe51b..cb0ef0ccb 100644 --- a/src/generated/resources/data/malum/recipes/polished_twisted_rock_slab_stonecutting.json +++ b/src/generated/resources/data/malum/recipes/polished_twisted_rock_slab_stonecutting.json @@ -1,8 +1,8 @@ { "type": "minecraft:stonecutting", + "count": 2, "ingredient": { "item": "malum:polished_twisted_rock" }, - "result": "malum:polished_twisted_rock_slab", - "count": 2 + "result": "malum:polished_twisted_rock_slab" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/polished_twisted_rock_stairs.json b/src/generated/resources/data/malum/recipes/polished_twisted_rock_stairs.json index 688169dec..099f82b13 100644 --- a/src/generated/resources/data/malum/recipes/polished_twisted_rock_stairs.json +++ b/src/generated/resources/data/malum/recipes/polished_twisted_rock_stairs.json @@ -1,17 +1,19 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "# ", - "## ", - "###" - ], + "category": "misc", "key": { "#": { "item": "malum:polished_twisted_rock" } }, + "pattern": [ + "# ", + "## ", + "###" + ], "result": { - "item": "malum:polished_twisted_rock_stairs", - "count": 4 - } + "count": 4, + "item": "malum:polished_twisted_rock_stairs" + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/polished_twisted_rock_stairs_stonecutting.json b/src/generated/resources/data/malum/recipes/polished_twisted_rock_stairs_stonecutting.json index 59b0a395d..efd396824 100644 --- a/src/generated/resources/data/malum/recipes/polished_twisted_rock_stairs_stonecutting.json +++ b/src/generated/resources/data/malum/recipes/polished_twisted_rock_stairs_stonecutting.json @@ -1,8 +1,8 @@ { "type": "minecraft:stonecutting", + "count": 1, "ingredient": { "item": "malum:polished_twisted_rock" }, - "result": "malum:polished_twisted_rock_stairs", - "count": 1 + "result": "malum:polished_twisted_rock_stairs" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/polished_twisted_rock_stonecutting.json b/src/generated/resources/data/malum/recipes/polished_twisted_rock_stonecutting.json index 61abfbcbe..7de347593 100644 --- a/src/generated/resources/data/malum/recipes/polished_twisted_rock_stonecutting.json +++ b/src/generated/resources/data/malum/recipes/polished_twisted_rock_stonecutting.json @@ -1,8 +1,8 @@ { "type": "minecraft:stonecutting", + "count": 1, "ingredient": { "item": "malum:twisted_rock" }, - "result": "malum:polished_twisted_rock", - "count": 1 + "result": "malum:polished_twisted_rock" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/poly_prideweave.json b/src/generated/resources/data/malum/recipes/poly_prideweave.json index 3516171ce..a4e38ea57 100644 --- a/src/generated/resources/data/malum/recipes/poly_prideweave.json +++ b/src/generated/resources/data/malum/recipes/poly_prideweave.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ { "item": "malum:esoteric_spool" diff --git a/src/generated/resources/data/malum/recipes/pride_prideweave.json b/src/generated/resources/data/malum/recipes/pride_prideweave.json index 5fd6a94ba..7f781a77f 100644 --- a/src/generated/resources/data/malum/recipes/pride_prideweave.json +++ b/src/generated/resources/data/malum/recipes/pride_prideweave.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ { "item": "malum:esoteric_spool" diff --git a/src/generated/resources/data/malum/recipes/raw_soulstone_block.json b/src/generated/resources/data/malum/recipes/raw_soulstone_block.json index 8d71aff1d..a0c3cb8bb 100644 --- a/src/generated/resources/data/malum/recipes/raw_soulstone_block.json +++ b/src/generated/resources/data/malum/recipes/raw_soulstone_block.json @@ -1,16 +1,18 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "###", - "###", - "###" - ], + "category": "misc", "key": { "#": { "item": "malum:raw_soulstone" } }, + "pattern": [ + "###", + "###", + "###" + ], "result": { "item": "malum:block_of_raw_soulstone" - } + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/raw_soulstone_from_block.json b/src/generated/resources/data/malum/recipes/raw_soulstone_from_block.json index 85a435b4f..d425e6f34 100644 --- a/src/generated/resources/data/malum/recipes/raw_soulstone_from_block.json +++ b/src/generated/resources/data/malum/recipes/raw_soulstone_from_block.json @@ -1,12 +1,13 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ { "item": "malum:block_of_raw_soulstone" } ], "result": { - "item": "malum:raw_soulstone", - "count": 9 + "count": 9, + "item": "malum:raw_soulstone" } } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/rotting_essence_from_block.json b/src/generated/resources/data/malum/recipes/rotting_essence_from_block.json index 5a34c65a3..ce67112e4 100644 --- a/src/generated/resources/data/malum/recipes/rotting_essence_from_block.json +++ b/src/generated/resources/data/malum/recipes/rotting_essence_from_block.json @@ -1,12 +1,13 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ { "item": "malum:block_of_rotting_essence" } ], "result": { - "item": "malum:rotting_essence", - "count": 9 + "count": 9, + "item": "malum:rotting_essence" } } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/runewood.json b/src/generated/resources/data/malum/recipes/runewood.json index 7d1b6cd63..5748b49d6 100644 --- a/src/generated/resources/data/malum/recipes/runewood.json +++ b/src/generated/resources/data/malum/recipes/runewood.json @@ -1,17 +1,19 @@ { "type": "minecraft:crafting_shaped", + "category": "misc", "group": "bark", - "pattern": [ - "##", - "##" - ], "key": { "#": { "item": "malum:runewood_log" } }, + "pattern": [ + "##", + "##" + ], "result": { - "item": "malum:runewood", - "count": 3 - } + "count": 3, + "item": "malum:runewood" + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/runewood_beam.json b/src/generated/resources/data/malum/recipes/runewood_beam.json index 47f018c9a..aff8f3b4b 100644 --- a/src/generated/resources/data/malum/recipes/runewood_beam.json +++ b/src/generated/resources/data/malum/recipes/runewood_beam.json @@ -1,17 +1,19 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "#", - "#", - "#" - ], + "category": "misc", "key": { "#": { "item": "malum:vertical_runewood_planks" } }, + "pattern": [ + "#", + "#", + "#" + ], "result": { - "item": "malum:runewood_beam", - "count": 3 - } + "count": 3, + "item": "malum:runewood_beam" + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/runewood_boat.json b/src/generated/resources/data/malum/recipes/runewood_boat.json index 5d488d8c8..901fc1af5 100644 --- a/src/generated/resources/data/malum/recipes/runewood_boat.json +++ b/src/generated/resources/data/malum/recipes/runewood_boat.json @@ -1,15 +1,17 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "# #", - "###" - ], + "category": "misc", "key": { "#": { "item": "malum:runewood_planks" } }, + "pattern": [ + "# #", + "###" + ], "result": { "item": "malum:runewood_boat" - } + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/runewood_door.json b/src/generated/resources/data/malum/recipes/runewood_door.json index 0d8c2b620..3dea6e5eb 100644 --- a/src/generated/resources/data/malum/recipes/runewood_door.json +++ b/src/generated/resources/data/malum/recipes/runewood_door.json @@ -1,17 +1,19 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "##", - "##", - "##" - ], + "category": "misc", "key": { "#": { "item": "malum:runewood_planks" } }, + "pattern": [ + "##", + "##", + "##" + ], "result": { - "item": "malum:runewood_door", - "count": 3 - } + "count": 3, + "item": "malum:runewood_door" + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/runewood_item_pedestal.json b/src/generated/resources/data/malum/recipes/runewood_item_pedestal.json index 154c11cc8..18c6815e4 100644 --- a/src/generated/resources/data/malum/recipes/runewood_item_pedestal.json +++ b/src/generated/resources/data/malum/recipes/runewood_item_pedestal.json @@ -1,10 +1,6 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "YYY", - " X ", - "YYY" - ], + "category": "misc", "key": { "X": { "item": "malum:runewood_planks" @@ -13,7 +9,13 @@ "item": "malum:runewood_planks_slab" } }, + "pattern": [ + "YYY", + " X ", + "YYY" + ], "result": { "item": "malum:runewood_item_pedestal" - } + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/runewood_item_stand.json b/src/generated/resources/data/malum/recipes/runewood_item_stand.json index 4765363cb..36140ca28 100644 --- a/src/generated/resources/data/malum/recipes/runewood_item_stand.json +++ b/src/generated/resources/data/malum/recipes/runewood_item_stand.json @@ -1,9 +1,6 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "YYY", - "XXX" - ], + "category": "misc", "key": { "X": { "item": "malum:runewood_planks" @@ -12,8 +9,13 @@ "item": "malum:runewood_planks_slab" } }, + "pattern": [ + "YYY", + "XXX" + ], "result": { - "item": "malum:runewood_item_stand", - "count": 2 - } + "count": 2, + "item": "malum:runewood_item_stand" + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/runewood_panel.json b/src/generated/resources/data/malum/recipes/runewood_panel.json index 775b7664d..f11f355e4 100644 --- a/src/generated/resources/data/malum/recipes/runewood_panel.json +++ b/src/generated/resources/data/malum/recipes/runewood_panel.json @@ -1,17 +1,19 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - " # ", - "# #", - " # " - ], + "category": "misc", "key": { "#": { "item": "malum:runewood_planks" } }, + "pattern": [ + " # ", + "# #", + " # " + ], "result": { - "item": "malum:runewood_panel", - "count": 4 - } + "count": 4, + "item": "malum:runewood_panel" + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/runewood_panel_slab.json b/src/generated/resources/data/malum/recipes/runewood_panel_slab.json index 3aa7c64c8..452661016 100644 --- a/src/generated/resources/data/malum/recipes/runewood_panel_slab.json +++ b/src/generated/resources/data/malum/recipes/runewood_panel_slab.json @@ -1,15 +1,17 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "###" - ], + "category": "misc", "key": { "#": { "item": "malum:runewood_panel" } }, + "pattern": [ + "###" + ], "result": { - "item": "malum:runewood_panel_slab", - "count": 6 - } + "count": 6, + "item": "malum:runewood_panel_slab" + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/runewood_panel_stairs.json b/src/generated/resources/data/malum/recipes/runewood_panel_stairs.json index c24ef56d4..7d79d7f0b 100644 --- a/src/generated/resources/data/malum/recipes/runewood_panel_stairs.json +++ b/src/generated/resources/data/malum/recipes/runewood_panel_stairs.json @@ -1,17 +1,19 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "# ", - "## ", - "###" - ], + "category": "misc", "key": { "#": { "item": "malum:runewood_panel" } }, + "pattern": [ + "# ", + "## ", + "###" + ], "result": { - "item": "malum:runewood_panel_stairs", - "count": 4 - } + "count": 4, + "item": "malum:runewood_panel_stairs" + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/runewood_planks.json b/src/generated/resources/data/malum/recipes/runewood_planks.json index d5dabecdd..50537f532 100644 --- a/src/generated/resources/data/malum/recipes/runewood_planks.json +++ b/src/generated/resources/data/malum/recipes/runewood_planks.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "planks", "ingredients": [ { @@ -7,7 +8,7 @@ } ], "result": { - "item": "malum:runewood_planks", - "count": 4 + "count": 4, + "item": "malum:runewood_planks" } } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/runewood_planks_button.json b/src/generated/resources/data/malum/recipes/runewood_planks_button.json index 427df7926..99a273182 100644 --- a/src/generated/resources/data/malum/recipes/runewood_planks_button.json +++ b/src/generated/resources/data/malum/recipes/runewood_planks_button.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ { "item": "malum:runewood_planks" diff --git a/src/generated/resources/data/malum/recipes/runewood_planks_fence.json b/src/generated/resources/data/malum/recipes/runewood_planks_fence.json index f6a89920a..bdbc0c800 100644 --- a/src/generated/resources/data/malum/recipes/runewood_planks_fence.json +++ b/src/generated/resources/data/malum/recipes/runewood_planks_fence.json @@ -1,9 +1,6 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "W#W", - "W#W" - ], + "category": "misc", "key": { "#": { "tag": "forge:rods/wooden" @@ -12,8 +9,13 @@ "item": "malum:runewood_planks" } }, + "pattern": [ + "W#W", + "W#W" + ], "result": { - "item": "malum:runewood_planks_fence", - "count": 3 - } + "count": 3, + "item": "malum:runewood_planks_fence" + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/runewood_planks_fence_gate.json b/src/generated/resources/data/malum/recipes/runewood_planks_fence_gate.json index 2926dc49b..3d18ffba6 100644 --- a/src/generated/resources/data/malum/recipes/runewood_planks_fence_gate.json +++ b/src/generated/resources/data/malum/recipes/runewood_planks_fence_gate.json @@ -1,9 +1,6 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "#W#", - "#W#" - ], + "category": "misc", "key": { "#": { "tag": "forge:rods/wooden" @@ -12,7 +9,12 @@ "item": "malum:runewood_planks" } }, + "pattern": [ + "#W#", + "#W#" + ], "result": { "item": "malum:runewood_planks_fence_gate" - } + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/runewood_planks_pressure_plate.json b/src/generated/resources/data/malum/recipes/runewood_planks_pressure_plate.json index 6522d5a6f..c6bb494e4 100644 --- a/src/generated/resources/data/malum/recipes/runewood_planks_pressure_plate.json +++ b/src/generated/resources/data/malum/recipes/runewood_planks_pressure_plate.json @@ -1,14 +1,16 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "##" - ], + "category": "misc", "key": { "#": { "item": "malum:runewood_planks" } }, + "pattern": [ + "##" + ], "result": { "item": "malum:runewood_planks_pressure_plate" - } + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/runewood_planks_slab.json b/src/generated/resources/data/malum/recipes/runewood_planks_slab.json index b4ee0715b..b34bfa7a9 100644 --- a/src/generated/resources/data/malum/recipes/runewood_planks_slab.json +++ b/src/generated/resources/data/malum/recipes/runewood_planks_slab.json @@ -1,15 +1,17 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "###" - ], + "category": "misc", "key": { "#": { "item": "malum:runewood_planks" } }, + "pattern": [ + "###" + ], "result": { - "item": "malum:runewood_planks_slab", - "count": 6 - } + "count": 6, + "item": "malum:runewood_planks_slab" + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/runewood_planks_stairs.json b/src/generated/resources/data/malum/recipes/runewood_planks_stairs.json index 1026f232a..5e683e97e 100644 --- a/src/generated/resources/data/malum/recipes/runewood_planks_stairs.json +++ b/src/generated/resources/data/malum/recipes/runewood_planks_stairs.json @@ -1,17 +1,19 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "# ", - "## ", - "###" - ], + "category": "misc", "key": { "#": { "item": "malum:runewood_planks" } }, + "pattern": [ + "# ", + "## ", + "###" + ], "result": { - "item": "malum:runewood_planks_stairs", - "count": 4 - } + "count": 4, + "item": "malum:runewood_planks_stairs" + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/runewood_sign.json b/src/generated/resources/data/malum/recipes/runewood_sign.json index 09811e72e..e41481ce6 100644 --- a/src/generated/resources/data/malum/recipes/runewood_sign.json +++ b/src/generated/resources/data/malum/recipes/runewood_sign.json @@ -1,11 +1,7 @@ { "type": "minecraft:crafting_shaped", + "category": "misc", "group": "sign", - "pattern": [ - "###", - "###", - " X " - ], "key": { "#": { "item": "malum:runewood_planks" @@ -14,8 +10,14 @@ "tag": "forge:rods/wooden" } }, + "pattern": [ + "###", + "###", + " X " + ], "result": { - "item": "malum:runewood_sign", - "count": 3 - } + "count": 3, + "item": "malum:runewood_sign" + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/runewood_tiles.json b/src/generated/resources/data/malum/recipes/runewood_tiles.json index c5a76848b..aae611067 100644 --- a/src/generated/resources/data/malum/recipes/runewood_tiles.json +++ b/src/generated/resources/data/malum/recipes/runewood_tiles.json @@ -1,17 +1,19 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - " # ", - "# #", - " # " - ], + "category": "misc", "key": { "#": { "item": "malum:runewood_panel" } }, + "pattern": [ + " # ", + "# #", + " # " + ], "result": { - "item": "malum:runewood_tiles", - "count": 4 - } + "count": 4, + "item": "malum:runewood_tiles" + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/runewood_tiles_slab.json b/src/generated/resources/data/malum/recipes/runewood_tiles_slab.json index b67094246..b8c5d3b80 100644 --- a/src/generated/resources/data/malum/recipes/runewood_tiles_slab.json +++ b/src/generated/resources/data/malum/recipes/runewood_tiles_slab.json @@ -1,15 +1,17 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "###" - ], + "category": "misc", "key": { "#": { "item": "malum:runewood_tiles" } }, + "pattern": [ + "###" + ], "result": { - "item": "malum:runewood_tiles_slab", - "count": 6 - } + "count": 6, + "item": "malum:runewood_tiles_slab" + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/runewood_tiles_stairs.json b/src/generated/resources/data/malum/recipes/runewood_tiles_stairs.json index 58381f7fb..8fbb6ae01 100644 --- a/src/generated/resources/data/malum/recipes/runewood_tiles_stairs.json +++ b/src/generated/resources/data/malum/recipes/runewood_tiles_stairs.json @@ -1,17 +1,19 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "# ", - "## ", - "###" - ], + "category": "misc", "key": { "#": { "item": "malum:runewood_tiles" } }, + "pattern": [ + "# ", + "## ", + "###" + ], "result": { - "item": "malum:runewood_tiles_stairs", - "count": 4 - } + "count": 4, + "item": "malum:runewood_tiles_stairs" + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/runewood_trapdoor.json b/src/generated/resources/data/malum/recipes/runewood_trapdoor.json index aef750f15..7d03de554 100644 --- a/src/generated/resources/data/malum/recipes/runewood_trapdoor.json +++ b/src/generated/resources/data/malum/recipes/runewood_trapdoor.json @@ -1,16 +1,18 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "###", - "###" - ], + "category": "misc", "key": { "#": { "item": "malum:runewood_planks" } }, + "pattern": [ + "###", + "###" + ], "result": { - "item": "malum:runewood_trapdoor", - "count": 2 - } + "count": 2, + "item": "malum:runewood_trapdoor" + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/runewood_trapdoor_from_solid.json b/src/generated/resources/data/malum/recipes/runewood_trapdoor_from_solid.json index 077a99bd6..6b02c03d3 100644 --- a/src/generated/resources/data/malum/recipes/runewood_trapdoor_from_solid.json +++ b/src/generated/resources/data/malum/recipes/runewood_trapdoor_from_solid.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ { "item": "malum:solid_runewood_trapdoor" diff --git a/src/generated/resources/data/malum/recipes/runic_small_tainted_rock_bricks_slab.json b/src/generated/resources/data/malum/recipes/runic_small_tainted_rock_bricks_slab.json index bc9f53344..dc417999a 100644 --- a/src/generated/resources/data/malum/recipes/runic_small_tainted_rock_bricks_slab.json +++ b/src/generated/resources/data/malum/recipes/runic_small_tainted_rock_bricks_slab.json @@ -1,15 +1,17 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "###" - ], + "category": "misc", "key": { "#": { "item": "malum:runic_small_tainted_rock_bricks" } }, + "pattern": [ + "###" + ], "result": { - "item": "malum:runic_small_tainted_rock_bricks_slab", - "count": 6 - } + "count": 6, + "item": "malum:runic_small_tainted_rock_bricks_slab" + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/runic_small_tainted_rock_bricks_stairs.json b/src/generated/resources/data/malum/recipes/runic_small_tainted_rock_bricks_stairs.json index 0328ad109..ffed9c22b 100644 --- a/src/generated/resources/data/malum/recipes/runic_small_tainted_rock_bricks_stairs.json +++ b/src/generated/resources/data/malum/recipes/runic_small_tainted_rock_bricks_stairs.json @@ -1,17 +1,19 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "# ", - "## ", - "###" - ], + "category": "misc", "key": { "#": { "item": "malum:runic_small_tainted_rock_bricks" } }, + "pattern": [ + "# ", + "## ", + "###" + ], "result": { - "item": "malum:runic_small_tainted_rock_bricks_stairs", - "count": 4 - } + "count": 4, + "item": "malum:runic_small_tainted_rock_bricks_stairs" + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/runic_small_tainted_rock_bricks_wall.json b/src/generated/resources/data/malum/recipes/runic_small_tainted_rock_bricks_wall.json index 97101bfee..b58153b44 100644 --- a/src/generated/resources/data/malum/recipes/runic_small_tainted_rock_bricks_wall.json +++ b/src/generated/resources/data/malum/recipes/runic_small_tainted_rock_bricks_wall.json @@ -1,16 +1,18 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "###", - "###" - ], + "category": "misc", "key": { "#": { "item": "malum:runic_small_tainted_rock_bricks" } }, + "pattern": [ + "###", + "###" + ], "result": { - "item": "malum:runic_small_tainted_rock_bricks_wall", - "count": 6 - } + "count": 6, + "item": "malum:runic_small_tainted_rock_bricks_wall" + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/runic_small_twisted_rock_bricks_slab.json b/src/generated/resources/data/malum/recipes/runic_small_twisted_rock_bricks_slab.json index fa9786d97..00c732981 100644 --- a/src/generated/resources/data/malum/recipes/runic_small_twisted_rock_bricks_slab.json +++ b/src/generated/resources/data/malum/recipes/runic_small_twisted_rock_bricks_slab.json @@ -1,15 +1,17 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "###" - ], + "category": "misc", "key": { "#": { "item": "malum:runic_small_twisted_rock_bricks" } }, + "pattern": [ + "###" + ], "result": { - "item": "malum:runic_small_twisted_rock_bricks_slab", - "count": 6 - } + "count": 6, + "item": "malum:runic_small_twisted_rock_bricks_slab" + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/runic_small_twisted_rock_bricks_stairs.json b/src/generated/resources/data/malum/recipes/runic_small_twisted_rock_bricks_stairs.json index 916849d21..a10a8d317 100644 --- a/src/generated/resources/data/malum/recipes/runic_small_twisted_rock_bricks_stairs.json +++ b/src/generated/resources/data/malum/recipes/runic_small_twisted_rock_bricks_stairs.json @@ -1,17 +1,19 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "# ", - "## ", - "###" - ], + "category": "misc", "key": { "#": { "item": "malum:runic_small_twisted_rock_bricks" } }, + "pattern": [ + "# ", + "## ", + "###" + ], "result": { - "item": "malum:runic_small_twisted_rock_bricks_stairs", - "count": 4 - } + "count": 4, + "item": "malum:runic_small_twisted_rock_bricks_stairs" + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/runic_small_twisted_rock_bricks_wall.json b/src/generated/resources/data/malum/recipes/runic_small_twisted_rock_bricks_wall.json index c6a41ccb7..15fb42110 100644 --- a/src/generated/resources/data/malum/recipes/runic_small_twisted_rock_bricks_wall.json +++ b/src/generated/resources/data/malum/recipes/runic_small_twisted_rock_bricks_wall.json @@ -1,16 +1,18 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "###", - "###" - ], + "category": "misc", "key": { "#": { "item": "malum:runic_small_twisted_rock_bricks" } }, + "pattern": [ + "###", + "###" + ], "result": { - "item": "malum:runic_small_twisted_rock_bricks_wall", - "count": 6 - } + "count": 6, + "item": "malum:runic_small_twisted_rock_bricks_wall" + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/runic_tainted_rock_bricks.json b/src/generated/resources/data/malum/recipes/runic_tainted_rock_bricks.json index 2c66fc25a..5b866d3a7 100644 --- a/src/generated/resources/data/malum/recipes/runic_tainted_rock_bricks.json +++ b/src/generated/resources/data/malum/recipes/runic_tainted_rock_bricks.json @@ -1,9 +1,10 @@ { "type": "minecraft:smelting", + "category": "blocks", + "cookingtime": 200, + "experience": 0.1, "ingredient": { "item": "malum:tainted_rock_bricks" }, - "result": "malum:runic_tainted_rock_bricks", - "experience": 0.1, - "cookingtime": 200 + "result": "malum:runic_tainted_rock_bricks" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/runic_tainted_rock_bricks_slab.json b/src/generated/resources/data/malum/recipes/runic_tainted_rock_bricks_slab.json index e8911f7bc..df64ff8f5 100644 --- a/src/generated/resources/data/malum/recipes/runic_tainted_rock_bricks_slab.json +++ b/src/generated/resources/data/malum/recipes/runic_tainted_rock_bricks_slab.json @@ -1,15 +1,17 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "###" - ], + "category": "misc", "key": { "#": { "item": "malum:runic_tainted_rock_bricks" } }, + "pattern": [ + "###" + ], "result": { - "item": "malum:runic_tainted_rock_bricks_slab", - "count": 6 - } + "count": 6, + "item": "malum:runic_tainted_rock_bricks_slab" + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/runic_tainted_rock_bricks_stairs.json b/src/generated/resources/data/malum/recipes/runic_tainted_rock_bricks_stairs.json index 5eed6e3b6..b6da177a7 100644 --- a/src/generated/resources/data/malum/recipes/runic_tainted_rock_bricks_stairs.json +++ b/src/generated/resources/data/malum/recipes/runic_tainted_rock_bricks_stairs.json @@ -1,17 +1,19 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "# ", - "## ", - "###" - ], + "category": "misc", "key": { "#": { "item": "malum:runic_tainted_rock_bricks" } }, + "pattern": [ + "# ", + "## ", + "###" + ], "result": { - "item": "malum:runic_tainted_rock_bricks_stairs", - "count": 4 - } + "count": 4, + "item": "malum:runic_tainted_rock_bricks_stairs" + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/runic_tainted_rock_bricks_wall.json b/src/generated/resources/data/malum/recipes/runic_tainted_rock_bricks_wall.json index 2c9452ed2..a20f4670d 100644 --- a/src/generated/resources/data/malum/recipes/runic_tainted_rock_bricks_wall.json +++ b/src/generated/resources/data/malum/recipes/runic_tainted_rock_bricks_wall.json @@ -1,16 +1,18 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "###", - "###" - ], + "category": "misc", "key": { "#": { "item": "malum:runic_tainted_rock_bricks" } }, + "pattern": [ + "###", + "###" + ], "result": { - "item": "malum:runic_tainted_rock_bricks_wall", - "count": 6 - } + "count": 6, + "item": "malum:runic_tainted_rock_bricks_wall" + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/runic_tainted_rock_tiles.json b/src/generated/resources/data/malum/recipes/runic_tainted_rock_tiles.json index ba2ec4eaf..2307efead 100644 --- a/src/generated/resources/data/malum/recipes/runic_tainted_rock_tiles.json +++ b/src/generated/resources/data/malum/recipes/runic_tainted_rock_tiles.json @@ -1,9 +1,10 @@ { "type": "minecraft:smelting", + "category": "blocks", + "cookingtime": 200, + "experience": 0.1, "ingredient": { "item": "malum:tainted_rock_tiles" }, - "result": "malum:runic_tainted_rock_tiles", - "experience": 0.1, - "cookingtime": 200 + "result": "malum:runic_tainted_rock_tiles" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/runic_tainted_rock_tiles_slab.json b/src/generated/resources/data/malum/recipes/runic_tainted_rock_tiles_slab.json index ac651a8f7..b5a54c9f6 100644 --- a/src/generated/resources/data/malum/recipes/runic_tainted_rock_tiles_slab.json +++ b/src/generated/resources/data/malum/recipes/runic_tainted_rock_tiles_slab.json @@ -1,15 +1,17 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "###" - ], + "category": "misc", "key": { "#": { "item": "malum:runic_tainted_rock_tiles" } }, + "pattern": [ + "###" + ], "result": { - "item": "malum:runic_tainted_rock_tiles_slab", - "count": 6 - } + "count": 6, + "item": "malum:runic_tainted_rock_tiles_slab" + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/runic_tainted_rock_tiles_stairs.json b/src/generated/resources/data/malum/recipes/runic_tainted_rock_tiles_stairs.json index dd8efa4f2..2d6c012d0 100644 --- a/src/generated/resources/data/malum/recipes/runic_tainted_rock_tiles_stairs.json +++ b/src/generated/resources/data/malum/recipes/runic_tainted_rock_tiles_stairs.json @@ -1,17 +1,19 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "# ", - "## ", - "###" - ], + "category": "misc", "key": { "#": { "item": "malum:runic_tainted_rock_tiles" } }, + "pattern": [ + "# ", + "## ", + "###" + ], "result": { - "item": "malum:runic_tainted_rock_tiles_stairs", - "count": 4 - } + "count": 4, + "item": "malum:runic_tainted_rock_tiles_stairs" + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/runic_tainted_rock_tiles_wall.json b/src/generated/resources/data/malum/recipes/runic_tainted_rock_tiles_wall.json index d8f603544..2be42c45f 100644 --- a/src/generated/resources/data/malum/recipes/runic_tainted_rock_tiles_wall.json +++ b/src/generated/resources/data/malum/recipes/runic_tainted_rock_tiles_wall.json @@ -1,16 +1,18 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "###", - "###" - ], + "category": "misc", "key": { "#": { "item": "malum:runic_tainted_rock_tiles" } }, + "pattern": [ + "###", + "###" + ], "result": { - "item": "malum:runic_tainted_rock_tiles_wall", - "count": 6 - } + "count": 6, + "item": "malum:runic_tainted_rock_tiles_wall" + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/runic_twisted_rock_bricks.json b/src/generated/resources/data/malum/recipes/runic_twisted_rock_bricks.json index 26e498c83..11f3c2b71 100644 --- a/src/generated/resources/data/malum/recipes/runic_twisted_rock_bricks.json +++ b/src/generated/resources/data/malum/recipes/runic_twisted_rock_bricks.json @@ -1,9 +1,10 @@ { "type": "minecraft:smelting", + "category": "blocks", + "cookingtime": 200, + "experience": 0.1, "ingredient": { "item": "malum:twisted_rock_bricks" }, - "result": "malum:runic_twisted_rock_bricks", - "experience": 0.1, - "cookingtime": 200 + "result": "malum:runic_twisted_rock_bricks" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/runic_twisted_rock_bricks_slab.json b/src/generated/resources/data/malum/recipes/runic_twisted_rock_bricks_slab.json index fdbe22bf4..952870b06 100644 --- a/src/generated/resources/data/malum/recipes/runic_twisted_rock_bricks_slab.json +++ b/src/generated/resources/data/malum/recipes/runic_twisted_rock_bricks_slab.json @@ -1,15 +1,17 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "###" - ], + "category": "misc", "key": { "#": { "item": "malum:runic_twisted_rock_bricks" } }, + "pattern": [ + "###" + ], "result": { - "item": "malum:runic_twisted_rock_bricks_slab", - "count": 6 - } + "count": 6, + "item": "malum:runic_twisted_rock_bricks_slab" + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/runic_twisted_rock_bricks_stairs.json b/src/generated/resources/data/malum/recipes/runic_twisted_rock_bricks_stairs.json index 15ccc6730..9770fb680 100644 --- a/src/generated/resources/data/malum/recipes/runic_twisted_rock_bricks_stairs.json +++ b/src/generated/resources/data/malum/recipes/runic_twisted_rock_bricks_stairs.json @@ -1,17 +1,19 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "# ", - "## ", - "###" - ], + "category": "misc", "key": { "#": { "item": "malum:runic_twisted_rock_bricks" } }, + "pattern": [ + "# ", + "## ", + "###" + ], "result": { - "item": "malum:runic_twisted_rock_bricks_stairs", - "count": 4 - } + "count": 4, + "item": "malum:runic_twisted_rock_bricks_stairs" + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/runic_twisted_rock_bricks_wall.json b/src/generated/resources/data/malum/recipes/runic_twisted_rock_bricks_wall.json index bac130fa4..552e3c41d 100644 --- a/src/generated/resources/data/malum/recipes/runic_twisted_rock_bricks_wall.json +++ b/src/generated/resources/data/malum/recipes/runic_twisted_rock_bricks_wall.json @@ -1,16 +1,18 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "###", - "###" - ], + "category": "misc", "key": { "#": { "item": "malum:runic_twisted_rock_bricks" } }, + "pattern": [ + "###", + "###" + ], "result": { - "item": "malum:runic_twisted_rock_bricks_wall", - "count": 6 - } + "count": 6, + "item": "malum:runic_twisted_rock_bricks_wall" + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/runic_twisted_rock_tiles.json b/src/generated/resources/data/malum/recipes/runic_twisted_rock_tiles.json index c3180dc7a..bb3dcc845 100644 --- a/src/generated/resources/data/malum/recipes/runic_twisted_rock_tiles.json +++ b/src/generated/resources/data/malum/recipes/runic_twisted_rock_tiles.json @@ -1,9 +1,10 @@ { "type": "minecraft:smelting", + "category": "blocks", + "cookingtime": 200, + "experience": 0.1, "ingredient": { "item": "malum:twisted_rock_tiles" }, - "result": "malum:runic_twisted_rock_tiles", - "experience": 0.1, - "cookingtime": 200 + "result": "malum:runic_twisted_rock_tiles" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/runic_twisted_rock_tiles_slab.json b/src/generated/resources/data/malum/recipes/runic_twisted_rock_tiles_slab.json index ba001665d..c46462264 100644 --- a/src/generated/resources/data/malum/recipes/runic_twisted_rock_tiles_slab.json +++ b/src/generated/resources/data/malum/recipes/runic_twisted_rock_tiles_slab.json @@ -1,15 +1,17 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "###" - ], + "category": "misc", "key": { "#": { "item": "malum:runic_twisted_rock_tiles" } }, + "pattern": [ + "###" + ], "result": { - "item": "malum:runic_twisted_rock_tiles_slab", - "count": 6 - } + "count": 6, + "item": "malum:runic_twisted_rock_tiles_slab" + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/runic_twisted_rock_tiles_stairs.json b/src/generated/resources/data/malum/recipes/runic_twisted_rock_tiles_stairs.json index 78438d22c..1791e21e8 100644 --- a/src/generated/resources/data/malum/recipes/runic_twisted_rock_tiles_stairs.json +++ b/src/generated/resources/data/malum/recipes/runic_twisted_rock_tiles_stairs.json @@ -1,17 +1,19 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "# ", - "## ", - "###" - ], + "category": "misc", "key": { "#": { "item": "malum:runic_twisted_rock_tiles" } }, + "pattern": [ + "# ", + "## ", + "###" + ], "result": { - "item": "malum:runic_twisted_rock_tiles_stairs", - "count": 4 - } + "count": 4, + "item": "malum:runic_twisted_rock_tiles_stairs" + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/runic_twisted_rock_tiles_wall.json b/src/generated/resources/data/malum/recipes/runic_twisted_rock_tiles_wall.json index fe53830c1..295093ae1 100644 --- a/src/generated/resources/data/malum/recipes/runic_twisted_rock_tiles_wall.json +++ b/src/generated/resources/data/malum/recipes/runic_twisted_rock_tiles_wall.json @@ -1,16 +1,18 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "###", - "###" - ], + "category": "misc", "key": { "#": { "item": "malum:runic_twisted_rock_tiles" } }, + "pattern": [ + "###", + "###" + ], "result": { - "item": "malum:runic_twisted_rock_tiles_wall", - "count": 6 - } + "count": 6, + "item": "malum:runic_twisted_rock_tiles_wall" + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/silver_from_node_blasting.json b/src/generated/resources/data/malum/recipes/silver_from_node_blasting.json index 7abfa5865..7e72bda92 100644 --- a/src/generated/resources/data/malum/recipes/silver_from_node_blasting.json +++ b/src/generated/resources/data/malum/recipes/silver_from_node_blasting.json @@ -4,24 +4,24 @@ { "conditions": [ { + "type": "forge:not", "value": { - "tag": "forge:nuggets/silver", - "type": "forge:tag_empty" - }, - "type": "forge:not" + "type": "forge:tag_empty", + "tag": "forge:nuggets/silver" + } } ], "recipe": { "type": "malum:node_blasting", + "cookingtime": 100, + "experience": 0.25, "ingredient": { "item": "malum:silver_node" }, "result": { - "tag": "forge:nuggets/silver", - "count": 6 - }, - "experience": 0.25, - "cookingtime": 100 + "count": 6, + "tag": "forge:nuggets/silver" + } } } ] diff --git a/src/generated/resources/data/malum/recipes/silver_from_node_smelting.json b/src/generated/resources/data/malum/recipes/silver_from_node_smelting.json index 26424dcdb..fb043c44d 100644 --- a/src/generated/resources/data/malum/recipes/silver_from_node_smelting.json +++ b/src/generated/resources/data/malum/recipes/silver_from_node_smelting.json @@ -4,24 +4,24 @@ { "conditions": [ { + "type": "forge:not", "value": { - "tag": "forge:nuggets/silver", - "type": "forge:tag_empty" - }, - "type": "forge:not" + "type": "forge:tag_empty", + "tag": "forge:nuggets/silver" + } } ], "recipe": { "type": "malum:node_smelting", + "cookingtime": 200, + "experience": 0.25, "ingredient": { "item": "malum:silver_node" }, "result": { - "tag": "forge:nuggets/silver", - "count": 6 - }, - "experience": 0.25, - "cookingtime": 200 + "count": 6, + "tag": "forge:nuggets/silver" + } } } ] diff --git a/src/generated/resources/data/malum/recipes/skeleton_skull_from_grim_talc.json b/src/generated/resources/data/malum/recipes/skeleton_skull_from_grim_talc.json index 615993114..6c842058f 100644 --- a/src/generated/resources/data/malum/recipes/skeleton_skull_from_grim_talc.json +++ b/src/generated/resources/data/malum/recipes/skeleton_skull_from_grim_talc.json @@ -1,19 +1,21 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "\u0026\u0026\u0026", - "\u0026#\u0026", - "\u0026\u0026\u0026" - ], + "category": "misc", "key": { "#": { "item": "malum:grim_talc" }, - "\u0026": { + "&": { "tag": "forge:bones" } }, + "pattern": [ + "&&&", + "&#&", + "&&&" + ], "result": { "item": "minecraft:skeleton_skull" - } + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/small_tainted_rock_bricks.json b/src/generated/resources/data/malum/recipes/small_tainted_rock_bricks.json index 1e1702875..d5d3d3bef 100644 --- a/src/generated/resources/data/malum/recipes/small_tainted_rock_bricks.json +++ b/src/generated/resources/data/malum/recipes/small_tainted_rock_bricks.json @@ -1,16 +1,18 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "##", - "##" - ], + "category": "misc", "key": { "#": { "item": "malum:tainted_rock_tiles" } }, + "pattern": [ + "##", + "##" + ], "result": { - "item": "malum:small_tainted_rock_bricks", - "count": 4 - } + "count": 4, + "item": "malum:small_tainted_rock_bricks" + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/small_tainted_rock_bricks_slab.json b/src/generated/resources/data/malum/recipes/small_tainted_rock_bricks_slab.json index 68cad1206..20dd4120b 100644 --- a/src/generated/resources/data/malum/recipes/small_tainted_rock_bricks_slab.json +++ b/src/generated/resources/data/malum/recipes/small_tainted_rock_bricks_slab.json @@ -1,15 +1,17 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "###" - ], + "category": "misc", "key": { "#": { "item": "malum:small_tainted_rock_bricks" } }, + "pattern": [ + "###" + ], "result": { - "item": "malum:small_tainted_rock_bricks_slab", - "count": 6 - } + "count": 6, + "item": "malum:small_tainted_rock_bricks_slab" + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/small_tainted_rock_bricks_slab_stonecutting.json b/src/generated/resources/data/malum/recipes/small_tainted_rock_bricks_slab_stonecutting.json index ba05e792e..48ad74182 100644 --- a/src/generated/resources/data/malum/recipes/small_tainted_rock_bricks_slab_stonecutting.json +++ b/src/generated/resources/data/malum/recipes/small_tainted_rock_bricks_slab_stonecutting.json @@ -1,8 +1,8 @@ { "type": "minecraft:stonecutting", + "count": 2, "ingredient": { "item": "malum:small_tainted_rock_bricks" }, - "result": "malum:small_tainted_rock_bricks_slab", - "count": 2 + "result": "malum:small_tainted_rock_bricks_slab" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/small_tainted_rock_bricks_stairs.json b/src/generated/resources/data/malum/recipes/small_tainted_rock_bricks_stairs.json index dc37bf511..7c2d56938 100644 --- a/src/generated/resources/data/malum/recipes/small_tainted_rock_bricks_stairs.json +++ b/src/generated/resources/data/malum/recipes/small_tainted_rock_bricks_stairs.json @@ -1,17 +1,19 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "# ", - "## ", - "###" - ], + "category": "misc", "key": { "#": { "item": "malum:small_tainted_rock_bricks" } }, + "pattern": [ + "# ", + "## ", + "###" + ], "result": { - "item": "malum:small_tainted_rock_bricks_stairs", - "count": 4 - } + "count": 4, + "item": "malum:small_tainted_rock_bricks_stairs" + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/small_tainted_rock_bricks_stairs_stonecutting.json b/src/generated/resources/data/malum/recipes/small_tainted_rock_bricks_stairs_stonecutting.json index e15a15098..a017580ff 100644 --- a/src/generated/resources/data/malum/recipes/small_tainted_rock_bricks_stairs_stonecutting.json +++ b/src/generated/resources/data/malum/recipes/small_tainted_rock_bricks_stairs_stonecutting.json @@ -1,8 +1,8 @@ { "type": "minecraft:stonecutting", + "count": 1, "ingredient": { "item": "malum:small_tainted_rock_bricks" }, - "result": "malum:small_tainted_rock_bricks_stairs", - "count": 1 + "result": "malum:small_tainted_rock_bricks_stairs" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/small_tainted_rock_bricks_stonecutting.json b/src/generated/resources/data/malum/recipes/small_tainted_rock_bricks_stonecutting.json index 40390c52a..dc76dc4be 100644 --- a/src/generated/resources/data/malum/recipes/small_tainted_rock_bricks_stonecutting.json +++ b/src/generated/resources/data/malum/recipes/small_tainted_rock_bricks_stonecutting.json @@ -1,8 +1,8 @@ { "type": "minecraft:stonecutting", + "count": 1, "ingredient": { "item": "malum:tainted_rock" }, - "result": "malum:small_tainted_rock_bricks", - "count": 1 + "result": "malum:small_tainted_rock_bricks" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/small_tainted_rock_bricks_stonecutting_alt.json b/src/generated/resources/data/malum/recipes/small_tainted_rock_bricks_stonecutting_alt.json index 3288bb8bf..e2bce95c9 100644 --- a/src/generated/resources/data/malum/recipes/small_tainted_rock_bricks_stonecutting_alt.json +++ b/src/generated/resources/data/malum/recipes/small_tainted_rock_bricks_stonecutting_alt.json @@ -1,8 +1,8 @@ { "type": "minecraft:stonecutting", + "count": 1, "ingredient": { "item": "malum:tainted_rock_bricks" }, - "result": "malum:small_tainted_rock_bricks", - "count": 1 + "result": "malum:small_tainted_rock_bricks" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/small_tainted_rock_bricks_stonecutting_from_bricks.json b/src/generated/resources/data/malum/recipes/small_tainted_rock_bricks_stonecutting_from_bricks.json index 3288bb8bf..e2bce95c9 100644 --- a/src/generated/resources/data/malum/recipes/small_tainted_rock_bricks_stonecutting_from_bricks.json +++ b/src/generated/resources/data/malum/recipes/small_tainted_rock_bricks_stonecutting_from_bricks.json @@ -1,8 +1,8 @@ { "type": "minecraft:stonecutting", + "count": 1, "ingredient": { "item": "malum:tainted_rock_bricks" }, - "result": "malum:small_tainted_rock_bricks", - "count": 1 + "result": "malum:small_tainted_rock_bricks" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/small_tainted_rock_bricks_stonecutting_from_tiles.json b/src/generated/resources/data/malum/recipes/small_tainted_rock_bricks_stonecutting_from_tiles.json index a8ffa7c83..62b475649 100644 --- a/src/generated/resources/data/malum/recipes/small_tainted_rock_bricks_stonecutting_from_tiles.json +++ b/src/generated/resources/data/malum/recipes/small_tainted_rock_bricks_stonecutting_from_tiles.json @@ -1,8 +1,8 @@ { "type": "minecraft:stonecutting", + "count": 1, "ingredient": { "item": "malum:tainted_rock_tiles" }, - "result": "malum:small_tainted_rock_bricks", - "count": 1 + "result": "malum:small_tainted_rock_bricks" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/small_tainted_rock_bricks_wall.json b/src/generated/resources/data/malum/recipes/small_tainted_rock_bricks_wall.json index 8f4bcc75d..0774a28f5 100644 --- a/src/generated/resources/data/malum/recipes/small_tainted_rock_bricks_wall.json +++ b/src/generated/resources/data/malum/recipes/small_tainted_rock_bricks_wall.json @@ -1,16 +1,18 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "###", - "###" - ], + "category": "misc", "key": { "#": { "item": "malum:small_tainted_rock_bricks" } }, + "pattern": [ + "###", + "###" + ], "result": { - "item": "malum:small_tainted_rock_bricks_wall", - "count": 6 - } + "count": 6, + "item": "malum:small_tainted_rock_bricks_wall" + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/small_tainted_rock_bricks_wall_stonecutting.json b/src/generated/resources/data/malum/recipes/small_tainted_rock_bricks_wall_stonecutting.json index 684727e26..e7b7377ff 100644 --- a/src/generated/resources/data/malum/recipes/small_tainted_rock_bricks_wall_stonecutting.json +++ b/src/generated/resources/data/malum/recipes/small_tainted_rock_bricks_wall_stonecutting.json @@ -1,8 +1,8 @@ { "type": "minecraft:stonecutting", + "count": 1, "ingredient": { "item": "malum:small_tainted_rock_bricks" }, - "result": "malum:small_tainted_rock_bricks_wall", - "count": 1 + "result": "malum:small_tainted_rock_bricks_wall" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/small_twisted_rock_bricks.json b/src/generated/resources/data/malum/recipes/small_twisted_rock_bricks.json index f0cb3b8b5..0c209ef9e 100644 --- a/src/generated/resources/data/malum/recipes/small_twisted_rock_bricks.json +++ b/src/generated/resources/data/malum/recipes/small_twisted_rock_bricks.json @@ -1,16 +1,18 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "##", - "##" - ], + "category": "misc", "key": { "#": { "item": "malum:twisted_rock_tiles" } }, + "pattern": [ + "##", + "##" + ], "result": { - "item": "malum:small_twisted_rock_bricks", - "count": 4 - } + "count": 4, + "item": "malum:small_twisted_rock_bricks" + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/small_twisted_rock_bricks_slab.json b/src/generated/resources/data/malum/recipes/small_twisted_rock_bricks_slab.json index c97172ede..e3437f818 100644 --- a/src/generated/resources/data/malum/recipes/small_twisted_rock_bricks_slab.json +++ b/src/generated/resources/data/malum/recipes/small_twisted_rock_bricks_slab.json @@ -1,15 +1,17 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "###" - ], + "category": "misc", "key": { "#": { "item": "malum:small_twisted_rock_bricks" } }, + "pattern": [ + "###" + ], "result": { - "item": "malum:small_twisted_rock_bricks_slab", - "count": 6 - } + "count": 6, + "item": "malum:small_twisted_rock_bricks_slab" + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/small_twisted_rock_bricks_slab_stonecutting.json b/src/generated/resources/data/malum/recipes/small_twisted_rock_bricks_slab_stonecutting.json index edd9336c6..0c7465b22 100644 --- a/src/generated/resources/data/malum/recipes/small_twisted_rock_bricks_slab_stonecutting.json +++ b/src/generated/resources/data/malum/recipes/small_twisted_rock_bricks_slab_stonecutting.json @@ -1,8 +1,8 @@ { "type": "minecraft:stonecutting", + "count": 2, "ingredient": { "item": "malum:small_twisted_rock_bricks" }, - "result": "malum:small_twisted_rock_bricks_slab", - "count": 2 + "result": "malum:small_twisted_rock_bricks_slab" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/small_twisted_rock_bricks_stairs.json b/src/generated/resources/data/malum/recipes/small_twisted_rock_bricks_stairs.json index 49976f4e5..78807e673 100644 --- a/src/generated/resources/data/malum/recipes/small_twisted_rock_bricks_stairs.json +++ b/src/generated/resources/data/malum/recipes/small_twisted_rock_bricks_stairs.json @@ -1,17 +1,19 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "# ", - "## ", - "###" - ], + "category": "misc", "key": { "#": { "item": "malum:small_twisted_rock_bricks" } }, + "pattern": [ + "# ", + "## ", + "###" + ], "result": { - "item": "malum:small_twisted_rock_bricks_stairs", - "count": 4 - } + "count": 4, + "item": "malum:small_twisted_rock_bricks_stairs" + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/small_twisted_rock_bricks_stairs_stonecutting.json b/src/generated/resources/data/malum/recipes/small_twisted_rock_bricks_stairs_stonecutting.json index a2fe304a0..271ac7cc1 100644 --- a/src/generated/resources/data/malum/recipes/small_twisted_rock_bricks_stairs_stonecutting.json +++ b/src/generated/resources/data/malum/recipes/small_twisted_rock_bricks_stairs_stonecutting.json @@ -1,8 +1,8 @@ { "type": "minecraft:stonecutting", + "count": 1, "ingredient": { "item": "malum:small_twisted_rock_bricks" }, - "result": "malum:small_twisted_rock_bricks_stairs", - "count": 1 + "result": "malum:small_twisted_rock_bricks_stairs" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/small_twisted_rock_bricks_stonecutting.json b/src/generated/resources/data/malum/recipes/small_twisted_rock_bricks_stonecutting.json index cc30bd9f5..ae966eab3 100644 --- a/src/generated/resources/data/malum/recipes/small_twisted_rock_bricks_stonecutting.json +++ b/src/generated/resources/data/malum/recipes/small_twisted_rock_bricks_stonecutting.json @@ -1,8 +1,8 @@ { "type": "minecraft:stonecutting", + "count": 1, "ingredient": { "item": "malum:twisted_rock" }, - "result": "malum:small_twisted_rock_bricks", - "count": 1 + "result": "malum:small_twisted_rock_bricks" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/small_twisted_rock_bricks_stonecutting_alt.json b/src/generated/resources/data/malum/recipes/small_twisted_rock_bricks_stonecutting_alt.json index 608e16f5f..a0982e904 100644 --- a/src/generated/resources/data/malum/recipes/small_twisted_rock_bricks_stonecutting_alt.json +++ b/src/generated/resources/data/malum/recipes/small_twisted_rock_bricks_stonecutting_alt.json @@ -1,8 +1,8 @@ { "type": "minecraft:stonecutting", + "count": 1, "ingredient": { "item": "malum:twisted_rock_bricks" }, - "result": "malum:small_twisted_rock_bricks", - "count": 1 + "result": "malum:small_twisted_rock_bricks" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/small_twisted_rock_bricks_stonecutting_from_bricks.json b/src/generated/resources/data/malum/recipes/small_twisted_rock_bricks_stonecutting_from_bricks.json index 608e16f5f..a0982e904 100644 --- a/src/generated/resources/data/malum/recipes/small_twisted_rock_bricks_stonecutting_from_bricks.json +++ b/src/generated/resources/data/malum/recipes/small_twisted_rock_bricks_stonecutting_from_bricks.json @@ -1,8 +1,8 @@ { "type": "minecraft:stonecutting", + "count": 1, "ingredient": { "item": "malum:twisted_rock_bricks" }, - "result": "malum:small_twisted_rock_bricks", - "count": 1 + "result": "malum:small_twisted_rock_bricks" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/small_twisted_rock_bricks_stonecutting_from_tiles.json b/src/generated/resources/data/malum/recipes/small_twisted_rock_bricks_stonecutting_from_tiles.json index 9a3a2b4c7..bf75fe9d5 100644 --- a/src/generated/resources/data/malum/recipes/small_twisted_rock_bricks_stonecutting_from_tiles.json +++ b/src/generated/resources/data/malum/recipes/small_twisted_rock_bricks_stonecutting_from_tiles.json @@ -1,8 +1,8 @@ { "type": "minecraft:stonecutting", + "count": 1, "ingredient": { "item": "malum:twisted_rock_tiles" }, - "result": "malum:small_twisted_rock_bricks", - "count": 1 + "result": "malum:small_twisted_rock_bricks" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/small_twisted_rock_bricks_wall.json b/src/generated/resources/data/malum/recipes/small_twisted_rock_bricks_wall.json index 5f8bdd561..1eadc8a4f 100644 --- a/src/generated/resources/data/malum/recipes/small_twisted_rock_bricks_wall.json +++ b/src/generated/resources/data/malum/recipes/small_twisted_rock_bricks_wall.json @@ -1,16 +1,18 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "###", - "###" - ], + "category": "misc", "key": { "#": { "item": "malum:small_twisted_rock_bricks" } }, + "pattern": [ + "###", + "###" + ], "result": { - "item": "malum:small_twisted_rock_bricks_wall", - "count": 6 - } + "count": 6, + "item": "malum:small_twisted_rock_bricks_wall" + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/small_twisted_rock_bricks_wall_stonecutting.json b/src/generated/resources/data/malum/recipes/small_twisted_rock_bricks_wall_stonecutting.json index cf4f1c9b3..30c923157 100644 --- a/src/generated/resources/data/malum/recipes/small_twisted_rock_bricks_wall_stonecutting.json +++ b/src/generated/resources/data/malum/recipes/small_twisted_rock_bricks_wall_stonecutting.json @@ -1,8 +1,8 @@ { "type": "minecraft:stonecutting", + "count": 1, "ingredient": { "item": "malum:small_twisted_rock_bricks" }, - "result": "malum:small_twisted_rock_bricks_wall", - "count": 1 + "result": "malum:small_twisted_rock_bricks_wall" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/smooth_tainted_rock.json b/src/generated/resources/data/malum/recipes/smooth_tainted_rock.json index 7be40236d..85a19a3c8 100644 --- a/src/generated/resources/data/malum/recipes/smooth_tainted_rock.json +++ b/src/generated/resources/data/malum/recipes/smooth_tainted_rock.json @@ -1,9 +1,10 @@ { "type": "minecraft:smelting", + "category": "blocks", + "cookingtime": 200, + "experience": 0.1, "ingredient": { "item": "malum:tainted_rock" }, - "result": "malum:smooth_tainted_rock", - "experience": 0.1, - "cookingtime": 200 + "result": "malum:smooth_tainted_rock" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/smooth_tainted_rock_slab.json b/src/generated/resources/data/malum/recipes/smooth_tainted_rock_slab.json index 40dcaf678..c4bab81eb 100644 --- a/src/generated/resources/data/malum/recipes/smooth_tainted_rock_slab.json +++ b/src/generated/resources/data/malum/recipes/smooth_tainted_rock_slab.json @@ -1,15 +1,17 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "###" - ], + "category": "misc", "key": { "#": { "item": "malum:smooth_tainted_rock" } }, + "pattern": [ + "###" + ], "result": { - "item": "malum:smooth_tainted_rock_slab", - "count": 6 - } + "count": 6, + "item": "malum:smooth_tainted_rock_slab" + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/smooth_tainted_rock_slab_stonecutting.json b/src/generated/resources/data/malum/recipes/smooth_tainted_rock_slab_stonecutting.json index de9061d8b..8a97e8fc7 100644 --- a/src/generated/resources/data/malum/recipes/smooth_tainted_rock_slab_stonecutting.json +++ b/src/generated/resources/data/malum/recipes/smooth_tainted_rock_slab_stonecutting.json @@ -1,8 +1,8 @@ { "type": "minecraft:stonecutting", + "count": 2, "ingredient": { "item": "malum:smooth_tainted_rock" }, - "result": "malum:smooth_tainted_rock_slab", - "count": 2 + "result": "malum:smooth_tainted_rock_slab" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/smooth_tainted_rock_stairs.json b/src/generated/resources/data/malum/recipes/smooth_tainted_rock_stairs.json index 416758a43..e62a6d3d8 100644 --- a/src/generated/resources/data/malum/recipes/smooth_tainted_rock_stairs.json +++ b/src/generated/resources/data/malum/recipes/smooth_tainted_rock_stairs.json @@ -1,17 +1,19 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "# ", - "## ", - "###" - ], + "category": "misc", "key": { "#": { "item": "malum:smooth_tainted_rock" } }, + "pattern": [ + "# ", + "## ", + "###" + ], "result": { - "item": "malum:smooth_tainted_rock_stairs", - "count": 4 - } + "count": 4, + "item": "malum:smooth_tainted_rock_stairs" + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/smooth_tainted_rock_stairs_stonecutting.json b/src/generated/resources/data/malum/recipes/smooth_tainted_rock_stairs_stonecutting.json index 621b39ee1..68c52b210 100644 --- a/src/generated/resources/data/malum/recipes/smooth_tainted_rock_stairs_stonecutting.json +++ b/src/generated/resources/data/malum/recipes/smooth_tainted_rock_stairs_stonecutting.json @@ -1,8 +1,8 @@ { "type": "minecraft:stonecutting", + "count": 1, "ingredient": { "item": "malum:smooth_tainted_rock" }, - "result": "malum:smooth_tainted_rock_stairs", - "count": 1 + "result": "malum:smooth_tainted_rock_stairs" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/smooth_tainted_rock_stonecutting.json b/src/generated/resources/data/malum/recipes/smooth_tainted_rock_stonecutting.json index aa851f1d1..bbd416221 100644 --- a/src/generated/resources/data/malum/recipes/smooth_tainted_rock_stonecutting.json +++ b/src/generated/resources/data/malum/recipes/smooth_tainted_rock_stonecutting.json @@ -1,8 +1,8 @@ { "type": "minecraft:stonecutting", + "count": 1, "ingredient": { "item": "malum:tainted_rock" }, - "result": "malum:smooth_tainted_rock", - "count": 1 + "result": "malum:smooth_tainted_rock" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/smooth_twisted_rock.json b/src/generated/resources/data/malum/recipes/smooth_twisted_rock.json index fe10639a1..928516442 100644 --- a/src/generated/resources/data/malum/recipes/smooth_twisted_rock.json +++ b/src/generated/resources/data/malum/recipes/smooth_twisted_rock.json @@ -1,9 +1,10 @@ { "type": "minecraft:smelting", + "category": "blocks", + "cookingtime": 200, + "experience": 0.1, "ingredient": { "item": "malum:twisted_rock" }, - "result": "malum:smooth_twisted_rock", - "experience": 0.1, - "cookingtime": 200 + "result": "malum:smooth_twisted_rock" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/smooth_twisted_rock_slab.json b/src/generated/resources/data/malum/recipes/smooth_twisted_rock_slab.json index dace21e6c..ae2e2015c 100644 --- a/src/generated/resources/data/malum/recipes/smooth_twisted_rock_slab.json +++ b/src/generated/resources/data/malum/recipes/smooth_twisted_rock_slab.json @@ -1,15 +1,17 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "###" - ], + "category": "misc", "key": { "#": { "item": "malum:smooth_twisted_rock" } }, + "pattern": [ + "###" + ], "result": { - "item": "malum:smooth_twisted_rock_slab", - "count": 6 - } + "count": 6, + "item": "malum:smooth_twisted_rock_slab" + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/smooth_twisted_rock_slab_stonecutting.json b/src/generated/resources/data/malum/recipes/smooth_twisted_rock_slab_stonecutting.json index e61381592..b44d9624e 100644 --- a/src/generated/resources/data/malum/recipes/smooth_twisted_rock_slab_stonecutting.json +++ b/src/generated/resources/data/malum/recipes/smooth_twisted_rock_slab_stonecutting.json @@ -1,8 +1,8 @@ { "type": "minecraft:stonecutting", + "count": 2, "ingredient": { "item": "malum:smooth_twisted_rock" }, - "result": "malum:smooth_twisted_rock_slab", - "count": 2 + "result": "malum:smooth_twisted_rock_slab" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/smooth_twisted_rock_stairs.json b/src/generated/resources/data/malum/recipes/smooth_twisted_rock_stairs.json index 935e6b466..fd9bcdc6d 100644 --- a/src/generated/resources/data/malum/recipes/smooth_twisted_rock_stairs.json +++ b/src/generated/resources/data/malum/recipes/smooth_twisted_rock_stairs.json @@ -1,17 +1,19 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "# ", - "## ", - "###" - ], + "category": "misc", "key": { "#": { "item": "malum:smooth_twisted_rock" } }, + "pattern": [ + "# ", + "## ", + "###" + ], "result": { - "item": "malum:smooth_twisted_rock_stairs", - "count": 4 - } + "count": 4, + "item": "malum:smooth_twisted_rock_stairs" + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/smooth_twisted_rock_stairs_stonecutting.json b/src/generated/resources/data/malum/recipes/smooth_twisted_rock_stairs_stonecutting.json index e42507433..060a34d05 100644 --- a/src/generated/resources/data/malum/recipes/smooth_twisted_rock_stairs_stonecutting.json +++ b/src/generated/resources/data/malum/recipes/smooth_twisted_rock_stairs_stonecutting.json @@ -1,8 +1,8 @@ { "type": "minecraft:stonecutting", + "count": 1, "ingredient": { "item": "malum:smooth_twisted_rock" }, - "result": "malum:smooth_twisted_rock_stairs", - "count": 1 + "result": "malum:smooth_twisted_rock_stairs" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/smooth_twisted_rock_stonecutting.json b/src/generated/resources/data/malum/recipes/smooth_twisted_rock_stonecutting.json index 318520d95..22907079b 100644 --- a/src/generated/resources/data/malum/recipes/smooth_twisted_rock_stonecutting.json +++ b/src/generated/resources/data/malum/recipes/smooth_twisted_rock_stonecutting.json @@ -1,8 +1,8 @@ { "type": "minecraft:stonecutting", + "count": 1, "ingredient": { "item": "malum:twisted_rock" }, - "result": "malum:smooth_twisted_rock", - "count": 1 + "result": "malum:smooth_twisted_rock" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/solid_runewood_trapdoor.json b/src/generated/resources/data/malum/recipes/solid_runewood_trapdoor.json index 7e1a07142..636c0bb8a 100644 --- a/src/generated/resources/data/malum/recipes/solid_runewood_trapdoor.json +++ b/src/generated/resources/data/malum/recipes/solid_runewood_trapdoor.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ { "item": "malum:runewood_trapdoor" diff --git a/src/generated/resources/data/malum/recipes/solid_soulwood_trapdoor.json b/src/generated/resources/data/malum/recipes/solid_soulwood_trapdoor.json index 5da3612aa..0b835cdc7 100644 --- a/src/generated/resources/data/malum/recipes/solid_soulwood_trapdoor.json +++ b/src/generated/resources/data/malum/recipes/solid_soulwood_trapdoor.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ { "item": "malum:soulwood_trapdoor" diff --git a/src/generated/resources/data/malum/recipes/soul_stained_steel_axe.json b/src/generated/resources/data/malum/recipes/soul_stained_steel_axe.json index 70e216413..a7549812f 100644 --- a/src/generated/resources/data/malum/recipes/soul_stained_steel_axe.json +++ b/src/generated/resources/data/malum/recipes/soul_stained_steel_axe.json @@ -1,10 +1,6 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "XX ", - "X# ", - " # " - ], + "category": "misc", "key": { "#": { "tag": "forge:rods/wooden" @@ -13,7 +9,13 @@ "item": "malum:soul_stained_steel_ingot" } }, + "pattern": [ + "XX ", + "X# ", + " # " + ], "result": { "item": "malum:soul_stained_steel_axe" - } + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/soul_stained_steel_from_block.json b/src/generated/resources/data/malum/recipes/soul_stained_steel_from_block.json index 2ac97ad5c..11b80d728 100644 --- a/src/generated/resources/data/malum/recipes/soul_stained_steel_from_block.json +++ b/src/generated/resources/data/malum/recipes/soul_stained_steel_from_block.json @@ -1,12 +1,13 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ { "item": "malum:block_of_soul_stained_steel" } ], "result": { - "item": "malum:soul_stained_steel_ingot", - "count": 9 + "count": 9, + "item": "malum:soul_stained_steel_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/soul_stained_steel_from_nuggets.json b/src/generated/resources/data/malum/recipes/soul_stained_steel_from_nuggets.json index ca4d2848c..6995094fd 100644 --- a/src/generated/resources/data/malum/recipes/soul_stained_steel_from_nuggets.json +++ b/src/generated/resources/data/malum/recipes/soul_stained_steel_from_nuggets.json @@ -1,16 +1,18 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "###", - "###", - "###" - ], + "category": "misc", "key": { "#": { "item": "malum:soul_stained_steel_nugget" } }, + "pattern": [ + "###", + "###", + "###" + ], "result": { "item": "malum:soul_stained_steel_ingot" - } + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/soul_stained_steel_hoe.json b/src/generated/resources/data/malum/recipes/soul_stained_steel_hoe.json index 400863c49..cac884ab0 100644 --- a/src/generated/resources/data/malum/recipes/soul_stained_steel_hoe.json +++ b/src/generated/resources/data/malum/recipes/soul_stained_steel_hoe.json @@ -1,10 +1,6 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "XX", - " #", - " #" - ], + "category": "misc", "key": { "#": { "tag": "forge:rods/wooden" @@ -13,7 +9,13 @@ "item": "malum:soul_stained_steel_ingot" } }, + "pattern": [ + "XX", + " #", + " #" + ], "result": { "item": "malum:soul_stained_steel_hoe" - } + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/soul_stained_steel_nugget.json b/src/generated/resources/data/malum/recipes/soul_stained_steel_nugget.json index 754e520ac..be7456951 100644 --- a/src/generated/resources/data/malum/recipes/soul_stained_steel_nugget.json +++ b/src/generated/resources/data/malum/recipes/soul_stained_steel_nugget.json @@ -1,12 +1,13 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ { "item": "malum:soul_stained_steel_ingot" } ], "result": { - "item": "malum:soul_stained_steel_nugget", - "count": 9 + "count": 9, + "item": "malum:soul_stained_steel_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/soul_stained_steel_pickaxe.json b/src/generated/resources/data/malum/recipes/soul_stained_steel_pickaxe.json index 65f14d750..ea090f26e 100644 --- a/src/generated/resources/data/malum/recipes/soul_stained_steel_pickaxe.json +++ b/src/generated/resources/data/malum/recipes/soul_stained_steel_pickaxe.json @@ -1,10 +1,6 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - " # ", - " # " - ], + "category": "misc", "key": { "#": { "tag": "forge:rods/wooden" @@ -13,7 +9,13 @@ "item": "malum:soul_stained_steel_ingot" } }, + "pattern": [ + "XXX", + " # ", + " # " + ], "result": { "item": "malum:soul_stained_steel_pickaxe" - } + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/soul_stained_steel_shovel.json b/src/generated/resources/data/malum/recipes/soul_stained_steel_shovel.json index 1df44d9fb..3e3621f11 100644 --- a/src/generated/resources/data/malum/recipes/soul_stained_steel_shovel.json +++ b/src/generated/resources/data/malum/recipes/soul_stained_steel_shovel.json @@ -1,10 +1,6 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "#", - "#" - ], + "category": "misc", "key": { "#": { "tag": "forge:rods/wooden" @@ -13,7 +9,13 @@ "item": "malum:soul_stained_steel_ingot" } }, + "pattern": [ + "X", + "#", + "#" + ], "result": { "item": "malum:soul_stained_steel_shovel" - } + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/soul_stained_steel_sword.json b/src/generated/resources/data/malum/recipes/soul_stained_steel_sword.json index 4ea7503b6..843a8ef58 100644 --- a/src/generated/resources/data/malum/recipes/soul_stained_steel_sword.json +++ b/src/generated/resources/data/malum/recipes/soul_stained_steel_sword.json @@ -1,10 +1,6 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "X", - "#" - ], + "category": "misc", "key": { "#": { "tag": "forge:rods/wooden" @@ -13,7 +9,13 @@ "item": "malum:soul_stained_steel_ingot" } }, + "pattern": [ + "X", + "X", + "#" + ], "result": { "item": "malum:soul_stained_steel_sword" - } + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/soulstone_from_blasting.json b/src/generated/resources/data/malum/recipes/soulstone_from_blasting.json index 1a6a43247..644af745b 100644 --- a/src/generated/resources/data/malum/recipes/soulstone_from_blasting.json +++ b/src/generated/resources/data/malum/recipes/soulstone_from_blasting.json @@ -1,12 +1,12 @@ { "type": "minecraft:blasting", + "cookingtime": 100, + "experience": 0.25, "ingredient": { "item": "malum:soulstone_ore" }, "result": { - "item": "malum:processed_soulstone", - "count": 2 - }, - "experience": 0.25, - "cookingtime": 100 + "count": 2, + "item": "malum:processed_soulstone" + } } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/soulstone_from_block.json b/src/generated/resources/data/malum/recipes/soulstone_from_block.json index 17c69718a..5b92712fb 100644 --- a/src/generated/resources/data/malum/recipes/soulstone_from_block.json +++ b/src/generated/resources/data/malum/recipes/soulstone_from_block.json @@ -1,12 +1,13 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ { "item": "malum:block_of_soulstone" } ], "result": { - "item": "malum:processed_soulstone", - "count": 9 + "count": 9, + "item": "malum:processed_soulstone" } } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/soulstone_from_crushed_blasting.json b/src/generated/resources/data/malum/recipes/soulstone_from_crushed_blasting.json index fbde674ea..a7b246270 100644 --- a/src/generated/resources/data/malum/recipes/soulstone_from_crushed_blasting.json +++ b/src/generated/resources/data/malum/recipes/soulstone_from_crushed_blasting.json @@ -1,12 +1,12 @@ { "type": "minecraft:blasting", + "cookingtime": 100, + "experience": 0.25, "ingredient": { "item": "malum:crushed_soulstone" }, "result": { - "item": "malum:processed_soulstone", - "count": 2 - }, - "experience": 0.25, - "cookingtime": 100 + "count": 2, + "item": "malum:processed_soulstone" + } } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/soulstone_from_crushed_smelting.json b/src/generated/resources/data/malum/recipes/soulstone_from_crushed_smelting.json index d32e418ab..9e2d40a68 100644 --- a/src/generated/resources/data/malum/recipes/soulstone_from_crushed_smelting.json +++ b/src/generated/resources/data/malum/recipes/soulstone_from_crushed_smelting.json @@ -1,12 +1,12 @@ { "type": "minecraft:smelting", + "cookingtime": 200, + "experience": 0.25, "ingredient": { "item": "malum:crushed_soulstone" }, "result": { - "item": "malum:processed_soulstone", - "count": 2 - }, - "experience": 0.25, - "cookingtime": 200 + "count": 2, + "item": "malum:processed_soulstone" + } } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/soulstone_from_deepslate_blasting.json b/src/generated/resources/data/malum/recipes/soulstone_from_deepslate_blasting.json index d294fe5d4..42d133137 100644 --- a/src/generated/resources/data/malum/recipes/soulstone_from_deepslate_blasting.json +++ b/src/generated/resources/data/malum/recipes/soulstone_from_deepslate_blasting.json @@ -1,12 +1,12 @@ { "type": "minecraft:blasting", + "cookingtime": 100, + "experience": 0.25, "ingredient": { "item": "malum:deepslate_soulstone_ore" }, "result": { - "item": "malum:processed_soulstone", - "count": 2 - }, - "experience": 0.25, - "cookingtime": 100 + "count": 2, + "item": "malum:processed_soulstone" + } } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/soulstone_from_deepslate_smelting.json b/src/generated/resources/data/malum/recipes/soulstone_from_deepslate_smelting.json index 19664c245..5289077da 100644 --- a/src/generated/resources/data/malum/recipes/soulstone_from_deepslate_smelting.json +++ b/src/generated/resources/data/malum/recipes/soulstone_from_deepslate_smelting.json @@ -1,12 +1,12 @@ { "type": "minecraft:smelting", + "cookingtime": 200, + "experience": 0.25, "ingredient": { "item": "malum:deepslate_soulstone_ore" }, "result": { - "item": "malum:processed_soulstone", - "count": 2 - }, - "experience": 0.25, - "cookingtime": 200 + "count": 2, + "item": "malum:processed_soulstone" + } } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/soulstone_from_raw_blasting.json b/src/generated/resources/data/malum/recipes/soulstone_from_raw_blasting.json index 843180c51..2b5b5fc27 100644 --- a/src/generated/resources/data/malum/recipes/soulstone_from_raw_blasting.json +++ b/src/generated/resources/data/malum/recipes/soulstone_from_raw_blasting.json @@ -1,12 +1,12 @@ { "type": "minecraft:blasting", + "cookingtime": 100, + "experience": 0.25, "ingredient": { "item": "malum:raw_soulstone" }, "result": { - "item": "malum:processed_soulstone", - "count": 2 - }, - "experience": 0.25, - "cookingtime": 100 + "count": 2, + "item": "malum:processed_soulstone" + } } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/soulstone_from_raw_smelting.json b/src/generated/resources/data/malum/recipes/soulstone_from_raw_smelting.json index 5ca35c73a..67a35f8fe 100644 --- a/src/generated/resources/data/malum/recipes/soulstone_from_raw_smelting.json +++ b/src/generated/resources/data/malum/recipes/soulstone_from_raw_smelting.json @@ -1,12 +1,12 @@ { "type": "minecraft:smelting", + "cookingtime": 200, + "experience": 0.25, "ingredient": { "item": "malum:raw_soulstone" }, "result": { - "item": "malum:processed_soulstone", - "count": 2 - }, - "experience": 0.25, - "cookingtime": 200 + "count": 2, + "item": "malum:processed_soulstone" + } } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/soulstone_from_smelting.json b/src/generated/resources/data/malum/recipes/soulstone_from_smelting.json index e20ac2f27..9e5721f2c 100644 --- a/src/generated/resources/data/malum/recipes/soulstone_from_smelting.json +++ b/src/generated/resources/data/malum/recipes/soulstone_from_smelting.json @@ -1,12 +1,12 @@ { "type": "minecraft:smelting", + "cookingtime": 200, + "experience": 0.25, "ingredient": { "item": "malum:soulstone_ore" }, "result": { - "item": "malum:processed_soulstone", - "count": 2 - }, - "experience": 0.25, - "cookingtime": 200 + "count": 2, + "item": "malum:processed_soulstone" + } } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/soulwood.json b/src/generated/resources/data/malum/recipes/soulwood.json index d9525b937..075ee4971 100644 --- a/src/generated/resources/data/malum/recipes/soulwood.json +++ b/src/generated/resources/data/malum/recipes/soulwood.json @@ -1,17 +1,19 @@ { "type": "minecraft:crafting_shaped", + "category": "misc", "group": "bark", - "pattern": [ - "##", - "##" - ], "key": { "#": { "item": "malum:soulwood_log" } }, + "pattern": [ + "##", + "##" + ], "result": { - "item": "malum:soulwood", - "count": 3 - } + "count": 3, + "item": "malum:soulwood" + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/soulwood_beam.json b/src/generated/resources/data/malum/recipes/soulwood_beam.json index 2c50f8ea2..b6da24ede 100644 --- a/src/generated/resources/data/malum/recipes/soulwood_beam.json +++ b/src/generated/resources/data/malum/recipes/soulwood_beam.json @@ -1,17 +1,19 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "#", - "#", - "#" - ], + "category": "misc", "key": { "#": { "item": "malum:vertical_soulwood_planks" } }, + "pattern": [ + "#", + "#", + "#" + ], "result": { - "item": "malum:soulwood_beam", - "count": 3 - } + "count": 3, + "item": "malum:soulwood_beam" + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/soulwood_boat.json b/src/generated/resources/data/malum/recipes/soulwood_boat.json index cd51e3812..96c20ae25 100644 --- a/src/generated/resources/data/malum/recipes/soulwood_boat.json +++ b/src/generated/resources/data/malum/recipes/soulwood_boat.json @@ -1,15 +1,17 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "# #", - "###" - ], + "category": "misc", "key": { "#": { "item": "malum:soulwood_planks" } }, + "pattern": [ + "# #", + "###" + ], "result": { "item": "malum:soulwood_boat" - } + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/soulwood_door.json b/src/generated/resources/data/malum/recipes/soulwood_door.json index da840c843..6310bf19e 100644 --- a/src/generated/resources/data/malum/recipes/soulwood_door.json +++ b/src/generated/resources/data/malum/recipes/soulwood_door.json @@ -1,17 +1,19 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "##", - "##", - "##" - ], + "category": "misc", "key": { "#": { "item": "malum:soulwood_planks" } }, + "pattern": [ + "##", + "##", + "##" + ], "result": { - "item": "malum:soulwood_door", - "count": 3 - } + "count": 3, + "item": "malum:soulwood_door" + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/soulwood_item_pedestal.json b/src/generated/resources/data/malum/recipes/soulwood_item_pedestal.json index 971bb4be4..d3887cafc 100644 --- a/src/generated/resources/data/malum/recipes/soulwood_item_pedestal.json +++ b/src/generated/resources/data/malum/recipes/soulwood_item_pedestal.json @@ -1,10 +1,6 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "YYY", - " X ", - "YYY" - ], + "category": "misc", "key": { "X": { "item": "malum:soulwood_planks" @@ -13,7 +9,13 @@ "item": "malum:soulwood_planks_slab" } }, + "pattern": [ + "YYY", + " X ", + "YYY" + ], "result": { "item": "malum:soulwood_item_pedestal" - } + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/soulwood_item_stand.json b/src/generated/resources/data/malum/recipes/soulwood_item_stand.json index 02b4afceb..319649143 100644 --- a/src/generated/resources/data/malum/recipes/soulwood_item_stand.json +++ b/src/generated/resources/data/malum/recipes/soulwood_item_stand.json @@ -1,9 +1,6 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "YYY", - "XXX" - ], + "category": "misc", "key": { "X": { "item": "malum:soulwood_planks" @@ -12,8 +9,13 @@ "item": "malum:soulwood_planks_slab" } }, + "pattern": [ + "YYY", + "XXX" + ], "result": { - "item": "malum:soulwood_item_stand", - "count": 2 - } + "count": 2, + "item": "malum:soulwood_item_stand" + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/soulwood_panel.json b/src/generated/resources/data/malum/recipes/soulwood_panel.json index 8d1664957..a247c71b8 100644 --- a/src/generated/resources/data/malum/recipes/soulwood_panel.json +++ b/src/generated/resources/data/malum/recipes/soulwood_panel.json @@ -1,17 +1,19 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - " # ", - "# #", - " # " - ], + "category": "misc", "key": { "#": { "item": "malum:soulwood_planks" } }, + "pattern": [ + " # ", + "# #", + " # " + ], "result": { - "item": "malum:soulwood_panel", - "count": 4 - } + "count": 4, + "item": "malum:soulwood_panel" + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/soulwood_panel_slab.json b/src/generated/resources/data/malum/recipes/soulwood_panel_slab.json index f79fc8cde..1bf96b33a 100644 --- a/src/generated/resources/data/malum/recipes/soulwood_panel_slab.json +++ b/src/generated/resources/data/malum/recipes/soulwood_panel_slab.json @@ -1,15 +1,17 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "###" - ], + "category": "misc", "key": { "#": { "item": "malum:soulwood_panel" } }, + "pattern": [ + "###" + ], "result": { - "item": "malum:soulwood_panel_slab", - "count": 6 - } + "count": 6, + "item": "malum:soulwood_panel_slab" + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/soulwood_panel_stairs.json b/src/generated/resources/data/malum/recipes/soulwood_panel_stairs.json index 38dec2274..f22d8e978 100644 --- a/src/generated/resources/data/malum/recipes/soulwood_panel_stairs.json +++ b/src/generated/resources/data/malum/recipes/soulwood_panel_stairs.json @@ -1,17 +1,19 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "# ", - "## ", - "###" - ], + "category": "misc", "key": { "#": { "item": "malum:soulwood_panel" } }, + "pattern": [ + "# ", + "## ", + "###" + ], "result": { - "item": "malum:soulwood_panel_stairs", - "count": 4 - } + "count": 4, + "item": "malum:soulwood_panel_stairs" + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/soulwood_planks.json b/src/generated/resources/data/malum/recipes/soulwood_planks.json index 4bcd99b97..6dd6477a0 100644 --- a/src/generated/resources/data/malum/recipes/soulwood_planks.json +++ b/src/generated/resources/data/malum/recipes/soulwood_planks.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "planks", "ingredients": [ { @@ -7,7 +8,7 @@ } ], "result": { - "item": "malum:soulwood_planks", - "count": 4 + "count": 4, + "item": "malum:soulwood_planks" } } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/soulwood_planks_button.json b/src/generated/resources/data/malum/recipes/soulwood_planks_button.json index e82d84d0a..ca38720e3 100644 --- a/src/generated/resources/data/malum/recipes/soulwood_planks_button.json +++ b/src/generated/resources/data/malum/recipes/soulwood_planks_button.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ { "item": "malum:soulwood_planks" diff --git a/src/generated/resources/data/malum/recipes/soulwood_planks_fence.json b/src/generated/resources/data/malum/recipes/soulwood_planks_fence.json index 26aa5fc89..3ef83bb40 100644 --- a/src/generated/resources/data/malum/recipes/soulwood_planks_fence.json +++ b/src/generated/resources/data/malum/recipes/soulwood_planks_fence.json @@ -1,9 +1,6 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "W#W", - "W#W" - ], + "category": "misc", "key": { "#": { "tag": "forge:rods/wooden" @@ -12,8 +9,13 @@ "item": "malum:soulwood_planks" } }, + "pattern": [ + "W#W", + "W#W" + ], "result": { - "item": "malum:soulwood_planks_fence", - "count": 3 - } + "count": 3, + "item": "malum:soulwood_planks_fence" + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/soulwood_planks_fence_gate.json b/src/generated/resources/data/malum/recipes/soulwood_planks_fence_gate.json index a2a714a0e..0f4e74c86 100644 --- a/src/generated/resources/data/malum/recipes/soulwood_planks_fence_gate.json +++ b/src/generated/resources/data/malum/recipes/soulwood_planks_fence_gate.json @@ -1,9 +1,6 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "#W#", - "#W#" - ], + "category": "misc", "key": { "#": { "tag": "forge:rods/wooden" @@ -12,7 +9,12 @@ "item": "malum:soulwood_planks" } }, + "pattern": [ + "#W#", + "#W#" + ], "result": { "item": "malum:soulwood_planks_fence_gate" - } + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/soulwood_planks_pressure_plate.json b/src/generated/resources/data/malum/recipes/soulwood_planks_pressure_plate.json index d5f2ef3da..34483db00 100644 --- a/src/generated/resources/data/malum/recipes/soulwood_planks_pressure_plate.json +++ b/src/generated/resources/data/malum/recipes/soulwood_planks_pressure_plate.json @@ -1,14 +1,16 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "##" - ], + "category": "misc", "key": { "#": { "item": "malum:soulwood_planks" } }, + "pattern": [ + "##" + ], "result": { "item": "malum:soulwood_planks_pressure_plate" - } + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/soulwood_planks_slab.json b/src/generated/resources/data/malum/recipes/soulwood_planks_slab.json index bac718eb0..f122a7255 100644 --- a/src/generated/resources/data/malum/recipes/soulwood_planks_slab.json +++ b/src/generated/resources/data/malum/recipes/soulwood_planks_slab.json @@ -1,15 +1,17 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "###" - ], + "category": "misc", "key": { "#": { "item": "malum:soulwood_planks" } }, + "pattern": [ + "###" + ], "result": { - "item": "malum:soulwood_planks_slab", - "count": 6 - } + "count": 6, + "item": "malum:soulwood_planks_slab" + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/soulwood_planks_stairs.json b/src/generated/resources/data/malum/recipes/soulwood_planks_stairs.json index cf3ac2665..3b1c738bf 100644 --- a/src/generated/resources/data/malum/recipes/soulwood_planks_stairs.json +++ b/src/generated/resources/data/malum/recipes/soulwood_planks_stairs.json @@ -1,17 +1,19 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "# ", - "## ", - "###" - ], + "category": "misc", "key": { "#": { "item": "malum:soulwood_planks" } }, + "pattern": [ + "# ", + "## ", + "###" + ], "result": { - "item": "malum:soulwood_planks_stairs", - "count": 4 - } + "count": 4, + "item": "malum:soulwood_planks_stairs" + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/soulwood_sign.json b/src/generated/resources/data/malum/recipes/soulwood_sign.json index df5048082..a959351b3 100644 --- a/src/generated/resources/data/malum/recipes/soulwood_sign.json +++ b/src/generated/resources/data/malum/recipes/soulwood_sign.json @@ -1,11 +1,7 @@ { "type": "minecraft:crafting_shaped", + "category": "misc", "group": "sign", - "pattern": [ - "###", - "###", - " X " - ], "key": { "#": { "item": "malum:soulwood_planks" @@ -14,8 +10,14 @@ "tag": "forge:rods/wooden" } }, + "pattern": [ + "###", + "###", + " X " + ], "result": { - "item": "malum:soulwood_sign", - "count": 3 - } + "count": 3, + "item": "malum:soulwood_sign" + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/soulwood_tiles.json b/src/generated/resources/data/malum/recipes/soulwood_tiles.json index fab01650e..508d23f09 100644 --- a/src/generated/resources/data/malum/recipes/soulwood_tiles.json +++ b/src/generated/resources/data/malum/recipes/soulwood_tiles.json @@ -1,17 +1,19 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - " # ", - "# #", - " # " - ], + "category": "misc", "key": { "#": { "item": "malum:soulwood_panel" } }, + "pattern": [ + " # ", + "# #", + " # " + ], "result": { - "item": "malum:soulwood_tiles", - "count": 4 - } + "count": 4, + "item": "malum:soulwood_tiles" + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/soulwood_tiles_slab.json b/src/generated/resources/data/malum/recipes/soulwood_tiles_slab.json index 816c4bddf..5e4ddb0e1 100644 --- a/src/generated/resources/data/malum/recipes/soulwood_tiles_slab.json +++ b/src/generated/resources/data/malum/recipes/soulwood_tiles_slab.json @@ -1,15 +1,17 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "###" - ], + "category": "misc", "key": { "#": { "item": "malum:soulwood_tiles" } }, + "pattern": [ + "###" + ], "result": { - "item": "malum:soulwood_tiles_slab", - "count": 6 - } + "count": 6, + "item": "malum:soulwood_tiles_slab" + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/soulwood_tiles_stairs.json b/src/generated/resources/data/malum/recipes/soulwood_tiles_stairs.json index 81c85a801..c4aad7053 100644 --- a/src/generated/resources/data/malum/recipes/soulwood_tiles_stairs.json +++ b/src/generated/resources/data/malum/recipes/soulwood_tiles_stairs.json @@ -1,17 +1,19 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "# ", - "## ", - "###" - ], + "category": "misc", "key": { "#": { "item": "malum:soulwood_tiles" } }, + "pattern": [ + "# ", + "## ", + "###" + ], "result": { - "item": "malum:soulwood_tiles_stairs", - "count": 4 - } + "count": 4, + "item": "malum:soulwood_tiles_stairs" + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/soulwood_trapdoor.json b/src/generated/resources/data/malum/recipes/soulwood_trapdoor.json index a6ff5a73e..a79ea98fd 100644 --- a/src/generated/resources/data/malum/recipes/soulwood_trapdoor.json +++ b/src/generated/resources/data/malum/recipes/soulwood_trapdoor.json @@ -1,16 +1,18 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "###", - "###" - ], + "category": "misc", "key": { "#": { "item": "malum:soulwood_planks" } }, + "pattern": [ + "###", + "###" + ], "result": { - "item": "malum:soulwood_trapdoor", - "count": 2 - } + "count": 2, + "item": "malum:soulwood_trapdoor" + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/soulwood_trapdoor_from_solid.json b/src/generated/resources/data/malum/recipes/soulwood_trapdoor_from_solid.json index 810baef37..362eb26f1 100644 --- a/src/generated/resources/data/malum/recipes/soulwood_trapdoor_from_solid.json +++ b/src/generated/resources/data/malum/recipes/soulwood_trapdoor_from_solid.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ { "item": "malum:solid_soulwood_trapdoor" diff --git a/src/generated/resources/data/malum/recipes/spectral_lens.json b/src/generated/resources/data/malum/recipes/spectral_lens.json index 8b56bc794..bb991d8d6 100644 --- a/src/generated/resources/data/malum/recipes/spectral_lens.json +++ b/src/generated/resources/data/malum/recipes/spectral_lens.json @@ -1,10 +1,6 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - " X ", - "XYX", - " X " - ], + "category": "misc", "key": { "X": { "item": "malum:hex_ash" @@ -13,7 +9,13 @@ "tag": "forge:glass_panes" } }, + "pattern": [ + " X ", + "XYX", + " X " + ], "result": { "item": "malum:spectral_lens" - } + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/spectral_optic.json b/src/generated/resources/data/malum/recipes/spectral_optic.json index 41e539e61..21fae8e40 100644 --- a/src/generated/resources/data/malum/recipes/spectral_optic.json +++ b/src/generated/resources/data/malum/recipes/spectral_optic.json @@ -1,10 +1,6 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - " X ", - "#Y#", - " X " - ], + "category": "misc", "key": { "#": { "item": "malum:hallowed_gold_ingot" @@ -16,8 +12,14 @@ "item": "malum:spectral_lens" } }, + "pattern": [ + " X ", + "#Y#", + " X " + ], "result": { - "item": "malum:spectral_optic", - "count": 2 - } + "count": 2, + "item": "malum:spectral_optic" + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/spirit_altar.json b/src/generated/resources/data/malum/recipes/spirit_altar.json index 075733255..d79f504f8 100644 --- a/src/generated/resources/data/malum/recipes/spirit_altar.json +++ b/src/generated/resources/data/malum/recipes/spirit_altar.json @@ -1,22 +1,24 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - " Y ", - "ZXZ", - "XXX" - ], + "category": "misc", "key": { - "Z": { - "tag": "forge:ingots/gold" + "X": { + "item": "malum:runewood_planks" }, "Y": { "item": "malum:processed_soulstone" }, - "X": { - "item": "malum:runewood_planks" + "Z": { + "tag": "forge:ingots/gold" } }, + "pattern": [ + " Y ", + "ZXZ", + "XXX" + ], "result": { "item": "malum:spirit_altar" - } + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/spirit_crucible/amethyst_shard.json b/src/generated/resources/data/malum/recipes/spirit_crucible/amethyst_shard.json index 5f9672872..134df93e1 100644 --- a/src/generated/resources/data/malum/recipes/spirit_crucible/amethyst_shard.json +++ b/src/generated/resources/data/malum/recipes/spirit_crucible/amethyst_shard.json @@ -1,13 +1,12 @@ { "type": "malum:spirit_focusing", - "time": 300, "durabilityCost": 1, "input": { "item": "malum:alchemical_impetus" }, "output": { - "item": "minecraft:amethyst_shard", - "count": 8 + "count": 8, + "item": "minecraft:amethyst_shard" }, "spirits": [ { @@ -18,5 +17,6 @@ "type": "arcane", "count": 2 } - ] + ], + "time": 300 } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/spirit_crucible/blazing_quartz.json b/src/generated/resources/data/malum/recipes/spirit_crucible/blazing_quartz.json index 441e271f0..2d92cb2ea 100644 --- a/src/generated/resources/data/malum/recipes/spirit_crucible/blazing_quartz.json +++ b/src/generated/resources/data/malum/recipes/spirit_crucible/blazing_quartz.json @@ -1,13 +1,12 @@ { "type": "malum:spirit_focusing", - "time": 300, "durabilityCost": 1, "input": { "item": "malum:alchemical_impetus" }, "output": { - "item": "malum:blazing_quartz", - "count": 4 + "count": 4, + "item": "malum:blazing_quartz" }, "spirits": [ { @@ -18,5 +17,6 @@ "type": "arcane", "count": 2 } - ] + ], + "time": 300 } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/spirit_crucible/glowstone_dust.json b/src/generated/resources/data/malum/recipes/spirit_crucible/glowstone_dust.json index 9d02d3bb7..59a2c1b48 100644 --- a/src/generated/resources/data/malum/recipes/spirit_crucible/glowstone_dust.json +++ b/src/generated/resources/data/malum/recipes/spirit_crucible/glowstone_dust.json @@ -1,17 +1,17 @@ { "type": "malum:spirit_focusing", - "time": 300, "durabilityCost": 1, "input": { "item": "malum:alchemical_impetus" }, "output": { - "item": "minecraft:glowstone_dust", - "count": 8 + "count": 8, + "item": "minecraft:glowstone_dust" }, "spirits": [ { "type": "infernal" } - ] + ], + "time": 300 } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/spirit_crucible/gunpowder.json b/src/generated/resources/data/malum/recipes/spirit_crucible/gunpowder.json index 829bf6477..81d35734e 100644 --- a/src/generated/resources/data/malum/recipes/spirit_crucible/gunpowder.json +++ b/src/generated/resources/data/malum/recipes/spirit_crucible/gunpowder.json @@ -1,17 +1,17 @@ { "type": "malum:spirit_focusing", - "time": 300, "durabilityCost": 1, "input": { "item": "malum:alchemical_impetus" }, "output": { - "item": "minecraft:gunpowder", - "count": 8 + "count": 8, + "item": "minecraft:gunpowder" }, "spirits": [ { "type": "earthen" } - ] + ], + "time": 300 } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/spirit_crucible/prismarine_shard.json b/src/generated/resources/data/malum/recipes/spirit_crucible/prismarine_shard.json index 5413032d1..d6bb199c3 100644 --- a/src/generated/resources/data/malum/recipes/spirit_crucible/prismarine_shard.json +++ b/src/generated/resources/data/malum/recipes/spirit_crucible/prismarine_shard.json @@ -1,13 +1,12 @@ { "type": "malum:spirit_focusing", - "time": 300, "durabilityCost": 1, "input": { "item": "malum:alchemical_impetus" }, "output": { - "item": "minecraft:prismarine_shard", - "count": 8 + "count": 8, + "item": "minecraft:prismarine_shard" }, "spirits": [ { @@ -18,5 +17,6 @@ "type": "arcane", "count": 2 } - ] + ], + "time": 300 } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/spirit_crucible/quartz.json b/src/generated/resources/data/malum/recipes/spirit_crucible/quartz.json index afdca8ee2..453b3f557 100644 --- a/src/generated/resources/data/malum/recipes/spirit_crucible/quartz.json +++ b/src/generated/resources/data/malum/recipes/spirit_crucible/quartz.json @@ -1,13 +1,12 @@ { "type": "malum:spirit_focusing", - "time": 300, "durabilityCost": 1, "input": { "item": "malum:alchemical_impetus" }, "output": { - "item": "minecraft:quartz", - "count": 4 + "count": 4, + "item": "minecraft:quartz" }, "spirits": [ { @@ -18,5 +17,6 @@ "type": "arcane", "count": 2 } - ] + ], + "time": 300 } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/spirit_crucible/redstone.json b/src/generated/resources/data/malum/recipes/spirit_crucible/redstone.json index 7c389b3ed..1d990f52e 100644 --- a/src/generated/resources/data/malum/recipes/spirit_crucible/redstone.json +++ b/src/generated/resources/data/malum/recipes/spirit_crucible/redstone.json @@ -1,17 +1,17 @@ { "type": "malum:spirit_focusing", - "time": 300, "durabilityCost": 1, "input": { "item": "malum:alchemical_impetus" }, "output": { - "item": "minecraft:redstone", - "count": 8 + "count": 8, + "item": "minecraft:redstone" }, "spirits": [ { "type": "arcane" } - ] + ], + "time": 300 } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/spirit_crucible/repair/alchemical_impetus_restoration.json b/src/generated/resources/data/malum/recipes/spirit_crucible/repair/alchemical_impetus_restoration.json index 84916b8cd..69d8b8e1a 100644 --- a/src/generated/resources/data/malum/recipes/spirit_crucible/repair/alchemical_impetus_restoration.json +++ b/src/generated/resources/data/malum/recipes/spirit_crucible/repair/alchemical_impetus_restoration.json @@ -1,14 +1,14 @@ { "type": "malum:spirit_repair", - "itemIdRegex": "none", - "modIdRegex": "", "durabilityPercentage": 1.0, "inputs": [ "malum:cracked_alchemical_impetus" ], + "itemIdRegex": "none", + "modIdRegex": "", "repairMaterial": { - "item": "malum:arcane_spirit", - "count": 8 + "count": 8, + "item": "malum:arcane_spirit" }, "spirits": [] } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/spirit_crucible/repair/copper.json b/src/generated/resources/data/malum/recipes/spirit_crucible/repair/copper.json index c85633d99..97c149b39 100644 --- a/src/generated/resources/data/malum/recipes/spirit_crucible/repair/copper.json +++ b/src/generated/resources/data/malum/recipes/spirit_crucible/repair/copper.json @@ -1,12 +1,12 @@ { "type": "malum:spirit_repair", - "itemIdRegex": "copper_.+", - "modIdRegex": "", "durabilityPercentage": 0.5, "inputs": [], + "itemIdRegex": "copper_.+", + "modIdRegex": "", "repairMaterial": { - "tag": "forge:ingots/copper", - "count": 2 + "count": 2, + "tag": "forge:ingots/copper" }, "spirits": [ { diff --git a/src/generated/resources/data/malum/recipes/spirit_crucible/repair/diamond.json b/src/generated/resources/data/malum/recipes/spirit_crucible/repair/diamond.json index 665d2d7aa..1b568a61f 100644 --- a/src/generated/resources/data/malum/recipes/spirit_crucible/repair/diamond.json +++ b/src/generated/resources/data/malum/recipes/spirit_crucible/repair/diamond.json @@ -1,12 +1,12 @@ { "type": "malum:spirit_repair", - "itemIdRegex": "diamond_.+", - "modIdRegex": "", "durabilityPercentage": 0.5, "inputs": [], + "itemIdRegex": "diamond_.+", + "modIdRegex": "", "repairMaterial": { - "tag": "forge:gems/diamond", - "count": 2 + "count": 2, + "tag": "forge:gems/diamond" }, "spirits": [ { diff --git a/src/generated/resources/data/malum/recipes/spirit_crucible/repair/flint.json b/src/generated/resources/data/malum/recipes/spirit_crucible/repair/flint.json index 70a4cd733..003c77a0b 100644 --- a/src/generated/resources/data/malum/recipes/spirit_crucible/repair/flint.json +++ b/src/generated/resources/data/malum/recipes/spirit_crucible/repair/flint.json @@ -1,12 +1,12 @@ { "type": "malum:spirit_repair", - "itemIdRegex": "flint_.+", - "modIdRegex": "", "durabilityPercentage": 0.5, "inputs": [], + "itemIdRegex": "flint_.+", + "modIdRegex": "", "repairMaterial": { - "item": "minecraft:flint", - "count": 2 + "count": 2, + "item": "minecraft:flint" }, "spirits": [ { diff --git a/src/generated/resources/data/malum/recipes/spirit_crucible/repair/gold.json b/src/generated/resources/data/malum/recipes/spirit_crucible/repair/gold.json index 2afb5f911..982582477 100644 --- a/src/generated/resources/data/malum/recipes/spirit_crucible/repair/gold.json +++ b/src/generated/resources/data/malum/recipes/spirit_crucible/repair/gold.json @@ -1,12 +1,12 @@ { "type": "malum:spirit_repair", - "itemIdRegex": "golden_.+", - "modIdRegex": "", "durabilityPercentage": 0.5, "inputs": [], + "itemIdRegex": "golden_.+", + "modIdRegex": "", "repairMaterial": { - "tag": "forge:ingots/gold", - "count": 2 + "count": 2, + "tag": "forge:ingots/gold" }, "spirits": [ { diff --git a/src/generated/resources/data/malum/recipes/spirit_crucible/repair/iron.json b/src/generated/resources/data/malum/recipes/spirit_crucible/repair/iron.json index ad376da35..b3d556398 100644 --- a/src/generated/resources/data/malum/recipes/spirit_crucible/repair/iron.json +++ b/src/generated/resources/data/malum/recipes/spirit_crucible/repair/iron.json @@ -1,14 +1,14 @@ { "type": "malum:spirit_repair", - "itemIdRegex": "iron_.+", - "modIdRegex": "", "durabilityPercentage": 0.5, "inputs": [ "malum:crude_scythe" ], + "itemIdRegex": "iron_.+", + "modIdRegex": "", "repairMaterial": { - "tag": "forge:ingots/iron", - "count": 2 + "count": 2, + "tag": "forge:ingots/iron" }, "spirits": [ { diff --git a/src/generated/resources/data/malum/recipes/spirit_crucible/repair/metal_impetus_restoration.json b/src/generated/resources/data/malum/recipes/spirit_crucible/repair/metal_impetus_restoration.json index 38f6e8c44..70a6edbbc 100644 --- a/src/generated/resources/data/malum/recipes/spirit_crucible/repair/metal_impetus_restoration.json +++ b/src/generated/resources/data/malum/recipes/spirit_crucible/repair/metal_impetus_restoration.json @@ -1,7 +1,5 @@ { "type": "malum:spirit_repair", - "itemIdRegex": "none", - "modIdRegex": "", "durabilityPercentage": 1.0, "inputs": [ "malum:cracked_iron_impetus", @@ -16,9 +14,11 @@ "malum:cracked_zinc_impetus", "malum:cracked_tin_impetus" ], + "itemIdRegex": "none", + "modIdRegex": "", "repairMaterial": { - "item": "malum:infernal_spirit", - "count": 8 + "count": 8, + "item": "malum:infernal_spirit" }, "spirits": [] } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/spirit_crucible/repair/netherite.json b/src/generated/resources/data/malum/recipes/spirit_crucible/repair/netherite.json index 49c7d82ee..be737525f 100644 --- a/src/generated/resources/data/malum/recipes/spirit_crucible/repair/netherite.json +++ b/src/generated/resources/data/malum/recipes/spirit_crucible/repair/netherite.json @@ -1,12 +1,12 @@ { "type": "malum:spirit_repair", - "itemIdRegex": "netherite_.+", - "modIdRegex": "", "durabilityPercentage": 0.5, "inputs": [], + "itemIdRegex": "netherite_.+", + "modIdRegex": "", "repairMaterial": { - "tag": "forge:ingots/netherite", - "count": 1 + "count": 1, + "tag": "forge:ingots/netherite" }, "spirits": [ { diff --git a/src/generated/resources/data/malum/recipes/spirit_crucible/repair/soul_hunter_armor.json b/src/generated/resources/data/malum/recipes/spirit_crucible/repair/soul_hunter_armor.json index 63e90104c..9274fadc2 100644 --- a/src/generated/resources/data/malum/recipes/spirit_crucible/repair/soul_hunter_armor.json +++ b/src/generated/resources/data/malum/recipes/spirit_crucible/repair/soul_hunter_armor.json @@ -1,7 +1,5 @@ { "type": "malum:spirit_repair", - "itemIdRegex": "", - "modIdRegex": "", "durabilityPercentage": 0.75, "inputs": [ "malum:soul_hunter_cloak", @@ -9,9 +7,11 @@ "malum:soul_hunter_leggings", "malum:soul_hunter_boots" ], + "itemIdRegex": "", + "modIdRegex": "", "repairMaterial": { - "item": "malum:spirit_fabric", - "count": 4 + "count": 4, + "item": "malum:spirit_fabric" }, "spirits": [ { diff --git a/src/generated/resources/data/malum/recipes/spirit_crucible/repair/soul_stained_steel.json b/src/generated/resources/data/malum/recipes/spirit_crucible/repair/soul_stained_steel.json index 7fac22219..fe47613b5 100644 --- a/src/generated/resources/data/malum/recipes/spirit_crucible/repair/soul_stained_steel.json +++ b/src/generated/resources/data/malum/recipes/spirit_crucible/repair/soul_stained_steel.json @@ -1,7 +1,5 @@ { "type": "malum:spirit_repair", - "itemIdRegex": "", - "modIdRegex": "", "durabilityPercentage": 0.75, "inputs": [ "malum:soul_stained_steel_sword", @@ -11,9 +9,11 @@ "malum:soul_stained_steel_hoe", "malum:soul_stained_steel_knife" ], + "itemIdRegex": "", + "modIdRegex": "", "repairMaterial": { - "item": "malum:soul_stained_steel_ingot", - "count": 2 + "count": 2, + "item": "malum:soul_stained_steel_ingot" }, "spirits": [ { diff --git a/src/generated/resources/data/malum/recipes/spirit_crucible/repair/special_soul_stained_steel.json b/src/generated/resources/data/malum/recipes/spirit_crucible/repair/special_soul_stained_steel.json index 284c3c305..052f8d67e 100644 --- a/src/generated/resources/data/malum/recipes/spirit_crucible/repair/special_soul_stained_steel.json +++ b/src/generated/resources/data/malum/recipes/spirit_crucible/repair/special_soul_stained_steel.json @@ -1,7 +1,5 @@ { "type": "malum:spirit_repair", - "itemIdRegex": "", - "modIdRegex": "", "durabilityPercentage": 0.75, "inputs": [ "malum:soul_stained_steel_scythe", @@ -10,9 +8,11 @@ "malum:soul_stained_steel_leggings", "malum:soul_stained_steel_boots" ], + "itemIdRegex": "", + "modIdRegex": "", "repairMaterial": { - "item": "malum:soul_stained_steel_ingot", - "count": 4 + "count": 4, + "item": "malum:soul_stained_steel_ingot" }, "spirits": [ { diff --git a/src/generated/resources/data/malum/recipes/spirit_crucible/repair/stone.json b/src/generated/resources/data/malum/recipes/spirit_crucible/repair/stone.json index 22f1f9662..245a51ab8 100644 --- a/src/generated/resources/data/malum/recipes/spirit_crucible/repair/stone.json +++ b/src/generated/resources/data/malum/recipes/spirit_crucible/repair/stone.json @@ -1,12 +1,12 @@ { "type": "malum:spirit_repair", - "itemIdRegex": "stone_.+", - "modIdRegex": "", "durabilityPercentage": 0.5, "inputs": [], + "itemIdRegex": "stone_.+", + "modIdRegex": "", "repairMaterial": { - "tag": "minecraft:stone_tool_materials", - "count": 2 + "count": 2, + "tag": "minecraft:stone_tool_materials" }, "spirits": [ { diff --git a/src/generated/resources/data/malum/recipes/spirit_crucible/repair/trident.json b/src/generated/resources/data/malum/recipes/spirit_crucible/repair/trident.json index 0534ed496..a7c517a1d 100644 --- a/src/generated/resources/data/malum/recipes/spirit_crucible/repair/trident.json +++ b/src/generated/resources/data/malum/recipes/spirit_crucible/repair/trident.json @@ -1,14 +1,14 @@ { "type": "malum:spirit_repair", - "itemIdRegex": "", - "modIdRegex": "", "durabilityPercentage": 1.0, "inputs": [ "minecraft:trident" ], + "itemIdRegex": "", + "modIdRegex": "", "repairMaterial": { - "item": "minecraft:heart_of_the_sea", - "count": 1 + "count": 1, + "item": "minecraft:heart_of_the_sea" }, "spirits": [ { diff --git a/src/generated/resources/data/malum/recipes/spirit_crucible/repair/tyrving.json b/src/generated/resources/data/malum/recipes/spirit_crucible/repair/tyrving.json index 0562f75e0..b78aeaba5 100644 --- a/src/generated/resources/data/malum/recipes/spirit_crucible/repair/tyrving.json +++ b/src/generated/resources/data/malum/recipes/spirit_crucible/repair/tyrving.json @@ -1,14 +1,14 @@ { "type": "malum:spirit_repair", - "itemIdRegex": "", - "modIdRegex": "", "durabilityPercentage": 0.75, "inputs": [ "malum:tyrving" ], + "itemIdRegex": "", + "modIdRegex": "", "repairMaterial": { - "item": "malum:twisted_rock", - "count": 8 + "count": 8, + "item": "malum:twisted_rock" }, "spirits": [ { diff --git a/src/generated/resources/data/malum/recipes/spirit_crucible/repair/wooden.json b/src/generated/resources/data/malum/recipes/spirit_crucible/repair/wooden.json index e745c10bb..eebbb142b 100644 --- a/src/generated/resources/data/malum/recipes/spirit_crucible/repair/wooden.json +++ b/src/generated/resources/data/malum/recipes/spirit_crucible/repair/wooden.json @@ -1,12 +1,12 @@ { "type": "malum:spirit_repair", - "itemIdRegex": "wooden_.+", - "modIdRegex": "", "durabilityPercentage": 0.5, "inputs": [], + "itemIdRegex": "wooden_.+", + "modIdRegex": "", "repairMaterial": { - "tag": "minecraft:planks", - "count": 4 + "count": 4, + "tag": "minecraft:planks" }, "spirits": [ { diff --git a/src/generated/resources/data/malum/recipes/spirit_infusion/alchemical_calx.json b/src/generated/resources/data/malum/recipes/spirit_infusion/alchemical_calx.json index 587bde7c6..39b1a08c0 100644 --- a/src/generated/resources/data/malum/recipes/spirit_infusion/alchemical_calx.json +++ b/src/generated/resources/data/malum/recipes/spirit_infusion/alchemical_calx.json @@ -1,14 +1,14 @@ { "type": "malum:spirit_infusion", + "extra_items": [], "input": { - "item": "minecraft:clay_ball", - "count": 4 + "count": 4, + "item": "minecraft:clay_ball" }, "output": { - "item": "malum:alchemical_calx", - "count": 4 + "count": 4, + "item": "malum:alchemical_calx" }, - "extra_items": [], "spirits": [ { "type": "arcane", diff --git a/src/generated/resources/data/malum/recipes/spirit_infusion/alchemical_impetus.json b/src/generated/resources/data/malum/recipes/spirit_infusion/alchemical_impetus.json index d17369f62..ce5be7042 100644 --- a/src/generated/resources/data/malum/recipes/spirit_infusion/alchemical_impetus.json +++ b/src/generated/resources/data/malum/recipes/spirit_infusion/alchemical_impetus.json @@ -1,22 +1,22 @@ { "type": "malum:spirit_infusion", - "input": { - "item": "malum:alchemical_calx", - "count": 8 - }, - "output": { - "item": "malum:alchemical_impetus" - }, "extra_items": [ { - "item": "malum:processed_soulstone", - "count": 3 + "count": 3, + "item": "malum:processed_soulstone" }, { - "item": "malum:hex_ash", - "count": 1 + "count": 1, + "item": "malum:hex_ash" } ], + "input": { + "count": 8, + "item": "malum:alchemical_calx" + }, + "output": { + "item": "malum:alchemical_impetus" + }, "spirits": [ { "type": "arcane", diff --git a/src/generated/resources/data/malum/recipes/spirit_infusion/arcane_charcoal.json b/src/generated/resources/data/malum/recipes/spirit_infusion/arcane_charcoal.json index 276165a5f..8d993fe55 100644 --- a/src/generated/resources/data/malum/recipes/spirit_infusion/arcane_charcoal.json +++ b/src/generated/resources/data/malum/recipes/spirit_infusion/arcane_charcoal.json @@ -1,14 +1,14 @@ { "type": "malum:spirit_infusion", + "extra_items": [], "input": { - "tag": "minecraft:coals", - "count": 4 + "count": 4, + "tag": "minecraft:coals" }, "output": { - "item": "malum:arcane_charcoal", - "count": 4 + "count": 4, + "item": "malum:arcane_charcoal" }, - "extra_items": [], "spirits": [ { "type": "arcane" diff --git a/src/generated/resources/data/malum/recipes/spirit_infusion/belt_of_the_magebane.json b/src/generated/resources/data/malum/recipes/spirit_infusion/belt_of_the_magebane.json index 309045ac4..327ebd3ca 100644 --- a/src/generated/resources/data/malum/recipes/spirit_infusion/belt_of_the_magebane.json +++ b/src/generated/resources/data/malum/recipes/spirit_infusion/belt_of_the_magebane.json @@ -1,30 +1,30 @@ { "type": "malum:spirit_infusion", - "input": { - "item": "malum:gilded_belt", - "count": 1 - }, - "output": { - "item": "malum:belt_of_the_magebane" - }, "extra_items": [ { - "item": "malum:twisted_rock", - "count": 16 + "count": 16, + "item": "malum:twisted_rock" }, { - "item": "malum:soulwood_planks", - "count": 8 + "count": 8, + "item": "malum:soulwood_planks" }, { - "item": "malum:soul_stained_steel_ingot", - "count": 6 + "count": 6, + "item": "malum:soul_stained_steel_ingot" }, { - "item": "malum:corrupted_resonance", - "count": 1 + "count": 1, + "item": "malum:corrupted_resonance" } ], + "input": { + "count": 1, + "item": "malum:gilded_belt" + }, + "output": { + "item": "malum:belt_of_the_magebane" + }, "spirits": [ { "type": "wicked", diff --git a/src/generated/resources/data/malum/recipes/spirit_infusion/belt_of_the_prospector.json b/src/generated/resources/data/malum/recipes/spirit_infusion/belt_of_the_prospector.json index 38fb0a7e3..43ed19407 100644 --- a/src/generated/resources/data/malum/recipes/spirit_infusion/belt_of_the_prospector.json +++ b/src/generated/resources/data/malum/recipes/spirit_infusion/belt_of_the_prospector.json @@ -1,30 +1,30 @@ { "type": "malum:spirit_infusion", - "input": { - "item": "malum:gilded_belt", - "count": 1 - }, - "output": { - "item": "malum:belt_of_the_prospector" - }, "extra_items": [ { - "item": "malum:cthonic_gold", - "count": 1 + "count": 1, + "item": "malum:cthonic_gold" }, { - "item": "minecraft:raw_gold", - "count": 4 + "count": 4, + "item": "minecraft:raw_gold" }, { - "item": "minecraft:raw_iron", - "count": 4 + "count": 4, + "item": "minecraft:raw_iron" }, { - "item": "minecraft:raw_copper", - "count": 4 + "count": 4, + "item": "minecraft:raw_copper" } ], + "input": { + "count": 1, + "item": "malum:gilded_belt" + }, + "output": { + "item": "malum:belt_of_the_prospector" + }, "spirits": [ { "type": "earthen", diff --git a/src/generated/resources/data/malum/recipes/spirit_infusion/belt_of_the_starved.json b/src/generated/resources/data/malum/recipes/spirit_infusion/belt_of_the_starved.json index e4ebc7009..7d8c08eae 100644 --- a/src/generated/resources/data/malum/recipes/spirit_infusion/belt_of_the_starved.json +++ b/src/generated/resources/data/malum/recipes/spirit_infusion/belt_of_the_starved.json @@ -1,30 +1,30 @@ { "type": "malum:spirit_infusion", - "input": { - "item": "malum:gilded_belt", - "count": 1 - }, - "output": { - "item": "malum:belt_of_the_starved" - }, "extra_items": [ { - "item": "minecraft:bone", - "count": 2 + "count": 2, + "item": "minecraft:bone" }, { - "item": "malum:grim_talc", - "count": 4 + "count": 4, + "item": "malum:grim_talc" }, { - "item": "malum:rotting_essence", - "count": 2 + "count": 2, + "item": "malum:rotting_essence" }, { - "item": "malum:processed_soulstone", - "count": 4 + "count": 4, + "item": "malum:processed_soulstone" } ], + "input": { + "count": 1, + "item": "malum:gilded_belt" + }, + "output": { + "item": "malum:belt_of_the_starved" + }, "spirits": [ { "type": "wicked", diff --git a/src/generated/resources/data/malum/recipes/spirit_infusion/brilliant_obelisk.json b/src/generated/resources/data/malum/recipes/spirit_infusion/brilliant_obelisk.json index 41faaed6e..405453ef7 100644 --- a/src/generated/resources/data/malum/recipes/spirit_infusion/brilliant_obelisk.json +++ b/src/generated/resources/data/malum/recipes/spirit_infusion/brilliant_obelisk.json @@ -1,22 +1,22 @@ { "type": "malum:spirit_infusion", - "input": { - "item": "malum:runewood_planks", - "count": 2 - }, - "output": { - "item": "malum:brilliant_obelisk" - }, "extra_items": [ { - "item": "malum:cluster_of_brilliance", - "count": 2 + "count": 2, + "item": "malum:cluster_of_brilliance" }, { - "item": "malum:hex_ash", - "count": 1 + "count": 1, + "item": "malum:hex_ash" } ], + "input": { + "count": 2, + "item": "malum:runewood_planks" + }, + "output": { + "item": "malum:brilliant_obelisk" + }, "spirits": [ { "type": "aerial", diff --git a/src/generated/resources/data/malum/recipes/spirit_infusion/copper_impetus.json b/src/generated/resources/data/malum/recipes/spirit_infusion/copper_impetus.json index 67e0a67c8..f4b390f26 100644 --- a/src/generated/resources/data/malum/recipes/spirit_infusion/copper_impetus.json +++ b/src/generated/resources/data/malum/recipes/spirit_infusion/copper_impetus.json @@ -1,26 +1,26 @@ { "type": "malum:spirit_infusion", - "input": { - "item": "malum:alchemical_impetus", - "count": 1 - }, - "output": { - "item": "malum:copper_impetus" - }, "extra_items": [ { - "tag": "forge:gunpowder", - "count": 4 + "count": 4, + "tag": "forge:gunpowder" }, { - "item": "malum:cthonic_gold", - "count": 1 + "count": 1, + "item": "malum:cthonic_gold" }, { - "item": "minecraft:copper_ingot", - "count": 6 + "count": 6, + "item": "minecraft:copper_ingot" } ], + "input": { + "count": 1, + "item": "malum:alchemical_impetus" + }, + "output": { + "item": "malum:copper_impetus" + }, "spirits": [ { "type": "earthen", diff --git a/src/generated/resources/data/malum/recipes/spirit_infusion/corrupted_resonance.json b/src/generated/resources/data/malum/recipes/spirit_infusion/corrupted_resonance.json index 80d3c4b89..cd7f7f7c3 100644 --- a/src/generated/resources/data/malum/recipes/spirit_infusion/corrupted_resonance.json +++ b/src/generated/resources/data/malum/recipes/spirit_infusion/corrupted_resonance.json @@ -1,30 +1,30 @@ { "type": "malum:spirit_infusion", - "input": { - "item": "malum:raw_soulstone", - "count": 16 - }, - "output": { - "item": "malum:corrupted_resonance" - }, "extra_items": [ { - "item": "malum:cluster_of_brilliance", - "count": 2 + "count": 2, + "item": "malum:cluster_of_brilliance" }, { - "item": "minecraft:lapis_lazuli", - "count": 4 + "count": 4, + "item": "minecraft:lapis_lazuli" }, { - "tag": "forge:gems/diamond", - "count": 4 + "count": 4, + "tag": "forge:gems/diamond" }, { - "item": "malum:hex_ash", - "count": 2 + "count": 2, + "item": "malum:hex_ash" } ], + "input": { + "count": 16, + "item": "malum:raw_soulstone" + }, + "output": { + "item": "malum:corrupted_resonance" + }, "spirits": [ { "type": "arcane", diff --git a/src/generated/resources/data/malum/recipes/spirit_infusion/cursed_grit.json b/src/generated/resources/data/malum/recipes/spirit_infusion/cursed_grit.json index 9fd260190..3d2a514af 100644 --- a/src/generated/resources/data/malum/recipes/spirit_infusion/cursed_grit.json +++ b/src/generated/resources/data/malum/recipes/spirit_infusion/cursed_grit.json @@ -1,14 +1,14 @@ { "type": "malum:spirit_infusion", + "extra_items": [], "input": { - "item": "minecraft:glowstone_dust", - "count": 4 + "count": 4, + "item": "minecraft:glowstone_dust" }, "output": { - "item": "malum:cursed_grit", - "count": 4 + "count": 4, + "item": "malum:cursed_grit" }, - "extra_items": [], "spirits": [ { "type": "infernal", diff --git a/src/generated/resources/data/malum/recipes/spirit_infusion/esoteric_spool.json b/src/generated/resources/data/malum/recipes/spirit_infusion/esoteric_spool.json index da4d80f19..474ca5f10 100644 --- a/src/generated/resources/data/malum/recipes/spirit_infusion/esoteric_spool.json +++ b/src/generated/resources/data/malum/recipes/spirit_infusion/esoteric_spool.json @@ -1,19 +1,19 @@ { "type": "malum:spirit_infusion", - "input": { - "tag": "forge:ingots/iron", - "count": 4 - }, - "output": { - "item": "malum:esoteric_spool", - "count": 4 - }, "extra_items": [ { - "item": "malum:hex_ash", - "count": 2 + "count": 2, + "item": "malum:hex_ash" } ], + "input": { + "count": 4, + "tag": "forge:ingots/iron" + }, + "output": { + "count": 4, + "item": "malum:esoteric_spool" + }, "spirits": [ { "type": "arcane", diff --git a/src/generated/resources/data/malum/recipes/spirit_infusion/ether.json b/src/generated/resources/data/malum/recipes/spirit_infusion/ether.json index 615dc484a..cf6c99df7 100644 --- a/src/generated/resources/data/malum/recipes/spirit_infusion/ether.json +++ b/src/generated/resources/data/malum/recipes/spirit_infusion/ether.json @@ -1,23 +1,23 @@ { "type": "malum:spirit_infusion", - "input": { - "item": "minecraft:glowstone_dust", - "count": 4 - }, - "output": { - "item": "malum:ether", - "count": 2 - }, "extra_items": [ { - "item": "malum:blazing_quartz", - "count": 1 + "count": 1, + "item": "malum:blazing_quartz" }, { - "item": "minecraft:blaze_powder", - "count": 1 + "count": 1, + "item": "minecraft:blaze_powder" } ], + "input": { + "count": 4, + "item": "minecraft:glowstone_dust" + }, + "output": { + "count": 2, + "item": "malum:ether" + }, "spirits": [ { "type": "infernal", diff --git a/src/generated/resources/data/malum/recipes/spirit_infusion/etheric_nitrate.json b/src/generated/resources/data/malum/recipes/spirit_infusion/etheric_nitrate.json index 8101748ec..5de530112 100644 --- a/src/generated/resources/data/malum/recipes/spirit_infusion/etheric_nitrate.json +++ b/src/generated/resources/data/malum/recipes/spirit_infusion/etheric_nitrate.json @@ -1,27 +1,27 @@ { "type": "malum:spirit_infusion", - "input": { - "item": "minecraft:tnt", - "count": 1 - }, - "output": { - "item": "malum:etheric_nitrate", - "count": 4 - }, "extra_items": [ { - "item": "malum:ether", - "count": 1 + "count": 1, + "item": "malum:ether" }, { - "tag": "forge:gunpowder", - "count": 4 + "count": 4, + "tag": "forge:gunpowder" }, { - "item": "malum:cursed_grit", - "count": 2 + "count": 2, + "item": "malum:cursed_grit" } ], + "input": { + "count": 1, + "item": "minecraft:tnt" + }, + "output": { + "count": 4, + "item": "malum:etheric_nitrate" + }, "spirits": [ { "type": "infernal", diff --git a/src/generated/resources/data/malum/recipes/spirit_infusion/gold_impetus.json b/src/generated/resources/data/malum/recipes/spirit_infusion/gold_impetus.json index 95bf6d21e..d51a0e9e0 100644 --- a/src/generated/resources/data/malum/recipes/spirit_infusion/gold_impetus.json +++ b/src/generated/resources/data/malum/recipes/spirit_infusion/gold_impetus.json @@ -1,26 +1,26 @@ { "type": "malum:spirit_infusion", - "input": { - "item": "malum:alchemical_impetus", - "count": 1 - }, - "output": { - "item": "malum:gold_impetus" - }, "extra_items": [ { - "tag": "forge:gunpowder", - "count": 4 + "count": 4, + "tag": "forge:gunpowder" }, { - "item": "malum:cthonic_gold", - "count": 1 + "count": 1, + "item": "malum:cthonic_gold" }, { - "item": "minecraft:gold_ingot", - "count": 6 + "count": 6, + "item": "minecraft:gold_ingot" } ], + "input": { + "count": 1, + "item": "malum:alchemical_impetus" + }, + "output": { + "item": "malum:gold_impetus" + }, "spirits": [ { "type": "earthen", diff --git a/src/generated/resources/data/malum/recipes/spirit_infusion/hallowed_gold_ingot.json b/src/generated/resources/data/malum/recipes/spirit_infusion/hallowed_gold_ingot.json index 9bd8908ca..8f5bbdb8c 100644 --- a/src/generated/resources/data/malum/recipes/spirit_infusion/hallowed_gold_ingot.json +++ b/src/generated/resources/data/malum/recipes/spirit_infusion/hallowed_gold_ingot.json @@ -1,18 +1,18 @@ { "type": "malum:spirit_infusion", + "extra_items": [ + { + "count": 4, + "tag": "forge:gems/quartz" + } + ], "input": { - "item": "minecraft:gold_ingot", - "count": 1 + "count": 1, + "item": "minecraft:gold_ingot" }, "output": { "item": "malum:hallowed_gold_ingot" }, - "extra_items": [ - { - "tag": "forge:gems/quartz", - "count": 4 - } - ], "spirits": [ { "type": "sacred", diff --git a/src/generated/resources/data/malum/recipes/spirit_infusion/hex_ash.json b/src/generated/resources/data/malum/recipes/spirit_infusion/hex_ash.json index ffcd1d9f0..53d73d26a 100644 --- a/src/generated/resources/data/malum/recipes/spirit_infusion/hex_ash.json +++ b/src/generated/resources/data/malum/recipes/spirit_infusion/hex_ash.json @@ -1,13 +1,13 @@ { "type": "malum:spirit_infusion", + "extra_items": [], "input": { - "item": "minecraft:gunpowder", - "count": 1 + "count": 1, + "item": "minecraft:gunpowder" }, "output": { "item": "malum:hex_ash" }, - "extra_items": [], "spirits": [ { "type": "arcane" diff --git a/src/generated/resources/data/malum/recipes/spirit_infusion/iridescent_ether.json b/src/generated/resources/data/malum/recipes/spirit_infusion/iridescent_ether.json index 667679b89..2cd22f05d 100644 --- a/src/generated/resources/data/malum/recipes/spirit_infusion/iridescent_ether.json +++ b/src/generated/resources/data/malum/recipes/spirit_infusion/iridescent_ether.json @@ -1,22 +1,22 @@ { "type": "malum:spirit_infusion", - "input": { - "item": "malum:ether", - "count": 1 - }, - "output": { - "item": "malum:iridescent_ether" - }, "extra_items": [ { - "item": "minecraft:prismarine_crystals", - "count": 1 + "count": 1, + "item": "minecraft:prismarine_crystals" }, { - "item": "malum:arcane_charcoal", - "count": 1 + "count": 1, + "item": "malum:arcane_charcoal" } ], + "input": { + "count": 1, + "item": "malum:ether" + }, + "output": { + "item": "malum:iridescent_ether" + }, "spirits": [ { "type": "aqueous", diff --git a/src/generated/resources/data/malum/recipes/spirit_infusion/iron_impetus.json b/src/generated/resources/data/malum/recipes/spirit_infusion/iron_impetus.json index 5badaf2da..eabb05491 100644 --- a/src/generated/resources/data/malum/recipes/spirit_infusion/iron_impetus.json +++ b/src/generated/resources/data/malum/recipes/spirit_infusion/iron_impetus.json @@ -1,26 +1,26 @@ { "type": "malum:spirit_infusion", - "input": { - "item": "malum:alchemical_impetus", - "count": 1 - }, - "output": { - "item": "malum:iron_impetus" - }, "extra_items": [ { - "tag": "forge:gunpowder", - "count": 4 + "count": 4, + "tag": "forge:gunpowder" }, { - "item": "malum:cthonic_gold", - "count": 1 + "count": 1, + "item": "malum:cthonic_gold" }, { - "item": "minecraft:iron_ingot", - "count": 6 + "count": 6, + "item": "minecraft:iron_ingot" } ], + "input": { + "count": 1, + "item": "malum:alchemical_impetus" + }, + "output": { + "item": "malum:iron_impetus" + }, "spirits": [ { "type": "earthen", diff --git a/src/generated/resources/data/malum/recipes/spirit_infusion/necklace_of_blissful_harmony.json b/src/generated/resources/data/malum/recipes/spirit_infusion/necklace_of_blissful_harmony.json index 111a97f9e..5c7f37546 100644 --- a/src/generated/resources/data/malum/recipes/spirit_infusion/necklace_of_blissful_harmony.json +++ b/src/generated/resources/data/malum/recipes/spirit_infusion/necklace_of_blissful_harmony.json @@ -1,30 +1,30 @@ { "type": "malum:spirit_infusion", - "input": { - "item": "malum:ornate_necklace", - "count": 1 - }, - "output": { - "item": "malum:necklace_of_blissful_harmony" - }, "extra_items": [ { - "tag": "forge:ingots/iron", - "count": 6 + "count": 6, + "tag": "forge:ingots/iron" }, { - "item": "minecraft:phantom_membrane", - "count": 4 + "count": 4, + "item": "minecraft:phantom_membrane" }, { - "item": "malum:astral_weave", - "count": 2 + "count": 2, + "item": "malum:astral_weave" }, { - "item": "minecraft:diamond", - "count": 2 + "count": 2, + "item": "minecraft:diamond" } ], + "input": { + "count": 1, + "item": "malum:ornate_necklace" + }, + "output": { + "item": "malum:necklace_of_blissful_harmony" + }, "spirits": [ { "type": "aerial", diff --git a/src/generated/resources/data/malum/recipes/spirit_infusion/necklace_of_the_mystic_mirror.json b/src/generated/resources/data/malum/recipes/spirit_infusion/necklace_of_the_mystic_mirror.json index f435c71e6..cba44e8e0 100644 --- a/src/generated/resources/data/malum/recipes/spirit_infusion/necklace_of_the_mystic_mirror.json +++ b/src/generated/resources/data/malum/recipes/spirit_infusion/necklace_of_the_mystic_mirror.json @@ -1,26 +1,26 @@ { "type": "malum:spirit_infusion", - "input": { - "item": "malum:ornate_necklace", - "count": 1 - }, - "output": { - "item": "malum:necklace_of_the_mystic_mirror" - }, "extra_items": [ { - "item": "malum:runewood_planks", - "count": 8 + "count": 8, + "item": "malum:runewood_planks" }, { - "item": "malum:spectral_optic", - "count": 4 + "count": 4, + "item": "malum:spectral_optic" }, { - "item": "minecraft:ender_eye", - "count": 1 + "count": 1, + "item": "minecraft:ender_eye" } ], + "input": { + "count": 1, + "item": "malum:ornate_necklace" + }, + "output": { + "item": "malum:necklace_of_the_mystic_mirror" + }, "spirits": [ { "type": "sacred", diff --git a/src/generated/resources/data/malum/recipes/spirit_infusion/necklace_of_the_narrow_edge.json b/src/generated/resources/data/malum/recipes/spirit_infusion/necklace_of_the_narrow_edge.json index 00841f2e0..7faba4bf0 100644 --- a/src/generated/resources/data/malum/recipes/spirit_infusion/necklace_of_the_narrow_edge.json +++ b/src/generated/resources/data/malum/recipes/spirit_infusion/necklace_of_the_narrow_edge.json @@ -1,22 +1,22 @@ { "type": "malum:spirit_infusion", - "input": { - "item": "malum:ornate_necklace", - "count": 1 - }, - "output": { - "item": "malum:necklace_of_the_narrow_edge" - }, "extra_items": [ { - "tag": "forge:storage_blocks/iron", - "count": 1 + "count": 1, + "tag": "forge:storage_blocks/iron" }, { - "tag": "forge:ingots/iron", - "count": 2 + "count": 2, + "tag": "forge:ingots/iron" } ], + "input": { + "count": 1, + "item": "malum:ornate_necklace" + }, + "output": { + "item": "malum:necklace_of_the_narrow_edge" + }, "spirits": [ { "type": "wicked", diff --git a/src/generated/resources/data/malum/recipes/spirit_infusion/necklace_of_tidal_affinity.json b/src/generated/resources/data/malum/recipes/spirit_infusion/necklace_of_tidal_affinity.json index 4538d24d9..28315d41a 100644 --- a/src/generated/resources/data/malum/recipes/spirit_infusion/necklace_of_tidal_affinity.json +++ b/src/generated/resources/data/malum/recipes/spirit_infusion/necklace_of_tidal_affinity.json @@ -1,26 +1,26 @@ { "type": "malum:spirit_infusion", - "input": { - "item": "malum:ornate_necklace", - "count": 1 - }, - "output": { - "item": "malum:necklace_of_tidal_affinity" - }, "extra_items": [ { - "item": "malum:gold_node", - "count": 6 + "count": 6, + "item": "malum:gold_node" }, { - "item": "minecraft:heart_of_the_sea", - "count": 1 + "count": 1, + "item": "minecraft:heart_of_the_sea" }, { - "item": "minecraft:nautilus_shell", - "count": 2 + "count": 2, + "item": "minecraft:nautilus_shell" } ], + "input": { + "count": 1, + "item": "malum:ornate_necklace" + }, + "output": { + "item": "malum:necklace_of_tidal_affinity" + }, "spirits": [ { "type": "aqueous", diff --git a/src/generated/resources/data/malum/recipes/spirit_infusion/poppet.json b/src/generated/resources/data/malum/recipes/spirit_infusion/poppet.json index bb1fb44eb..4f2f01cbc 100644 --- a/src/generated/resources/data/malum/recipes/spirit_infusion/poppet.json +++ b/src/generated/resources/data/malum/recipes/spirit_infusion/poppet.json @@ -1,23 +1,23 @@ { "type": "malum:spirit_infusion", - "input": { - "item": "minecraft:hay_block", - "count": 1 - }, - "output": { - "item": "malum:poppet", - "count": 2 - }, "extra_items": [ { - "item": "minecraft:wheat", - "count": 2 + "count": 2, + "item": "minecraft:wheat" }, { - "item": "malum:hex_ash", - "count": 1 + "count": 1, + "item": "malum:hex_ash" } ], + "input": { + "count": 1, + "item": "minecraft:hay_block" + }, + "output": { + "count": 2, + "item": "malum:poppet" + }, "spirits": [ { "type": "wicked", diff --git a/src/generated/resources/data/malum/recipes/spirit_infusion/ring_of_alchemical_mastery.json b/src/generated/resources/data/malum/recipes/spirit_infusion/ring_of_alchemical_mastery.json index a6bd6052f..4066caa06 100644 --- a/src/generated/resources/data/malum/recipes/spirit_infusion/ring_of_alchemical_mastery.json +++ b/src/generated/resources/data/malum/recipes/spirit_infusion/ring_of_alchemical_mastery.json @@ -1,30 +1,30 @@ { "type": "malum:spirit_infusion", - "input": { - "item": "malum:gilded_ring", - "count": 1 - }, - "output": { - "item": "malum:ring_of_alchemical_mastery" - }, "extra_items": [ { - "item": "malum:hex_ash", - "count": 2 + "count": 2, + "item": "malum:hex_ash" }, { - "item": "minecraft:nether_wart", - "count": 4 + "count": 4, + "item": "minecraft:nether_wart" }, { - "item": "minecraft:fermented_spider_eye", - "count": 1 + "count": 1, + "item": "minecraft:fermented_spider_eye" }, { - "item": "malum:alchemical_calx", - "count": 4 + "count": 4, + "item": "malum:alchemical_calx" } ], + "input": { + "count": 1, + "item": "malum:gilded_ring" + }, + "output": { + "item": "malum:ring_of_alchemical_mastery" + }, "spirits": [ { "type": "arcane", diff --git a/src/generated/resources/data/malum/recipes/spirit_infusion/ring_of_arcane_prowess.json b/src/generated/resources/data/malum/recipes/spirit_infusion/ring_of_arcane_prowess.json index 6d2534ec7..2bbd71d1d 100644 --- a/src/generated/resources/data/malum/recipes/spirit_infusion/ring_of_arcane_prowess.json +++ b/src/generated/resources/data/malum/recipes/spirit_infusion/ring_of_arcane_prowess.json @@ -1,22 +1,22 @@ { "type": "malum:spirit_infusion", - "input": { - "item": "malum:gilded_ring", - "count": 1 - }, - "output": { - "item": "malum:ring_of_arcane_prowess" - }, "extra_items": [ { - "item": "malum:cluster_of_brilliance", - "count": 4 + "count": 4, + "item": "malum:cluster_of_brilliance" }, { - "item": "malum:alchemical_calx", - "count": 4 + "count": 4, + "item": "malum:alchemical_calx" } ], + "input": { + "count": 1, + "item": "malum:gilded_ring" + }, + "output": { + "item": "malum:ring_of_arcane_prowess" + }, "spirits": [ { "type": "arcane", diff --git a/src/generated/resources/data/malum/recipes/spirit_infusion/ring_of_curative_talent.json b/src/generated/resources/data/malum/recipes/spirit_infusion/ring_of_curative_talent.json index 74bb38576..0d57383c1 100644 --- a/src/generated/resources/data/malum/recipes/spirit_infusion/ring_of_curative_talent.json +++ b/src/generated/resources/data/malum/recipes/spirit_infusion/ring_of_curative_talent.json @@ -1,26 +1,26 @@ { "type": "malum:spirit_infusion", - "input": { - "item": "malum:gilded_ring", - "count": 1 - }, - "output": { - "item": "malum:ring_of_curative_talent" - }, "extra_items": [ { - "item": "malum:hex_ash", - "count": 2 + "count": 2, + "item": "malum:hex_ash" }, { - "item": "minecraft:ghast_tear", - "count": 1 + "count": 1, + "item": "minecraft:ghast_tear" }, { - "item": "malum:alchemical_calx", - "count": 4 + "count": 4, + "item": "malum:alchemical_calx" } ], + "input": { + "count": 1, + "item": "malum:gilded_ring" + }, + "output": { + "item": "malum:ring_of_curative_talent" + }, "spirits": [ { "type": "sacred", diff --git a/src/generated/resources/data/malum/recipes/spirit_infusion/ring_of_desperate_voracity.json b/src/generated/resources/data/malum/recipes/spirit_infusion/ring_of_desperate_voracity.json index ad69aa25c..7257e6721 100644 --- a/src/generated/resources/data/malum/recipes/spirit_infusion/ring_of_desperate_voracity.json +++ b/src/generated/resources/data/malum/recipes/spirit_infusion/ring_of_desperate_voracity.json @@ -1,30 +1,30 @@ { "type": "malum:spirit_infusion", - "input": { - "item": "malum:ornate_ring", - "count": 1 - }, - "output": { - "item": "malum:ring_of_desperate_voracity" - }, "extra_items": [ { - "item": "minecraft:bone", - "count": 2 + "count": 2, + "item": "minecraft:bone" }, { - "item": "malum:grim_talc", - "count": 2 + "count": 2, + "item": "malum:grim_talc" }, { - "item": "minecraft:rotten_flesh", - "count": 8 + "count": 8, + "item": "minecraft:rotten_flesh" }, { - "item": "malum:hex_ash", - "count": 2 + "count": 2, + "item": "malum:hex_ash" } ], + "input": { + "count": 1, + "item": "malum:ornate_ring" + }, + "output": { + "item": "malum:ring_of_desperate_voracity" + }, "spirits": [ { "type": "wicked", diff --git a/src/generated/resources/data/malum/recipes/spirit_infusion/ring_of_esoteric_spoils.json b/src/generated/resources/data/malum/recipes/spirit_infusion/ring_of_esoteric_spoils.json index adeb8e978..faa81dad6 100644 --- a/src/generated/resources/data/malum/recipes/spirit_infusion/ring_of_esoteric_spoils.json +++ b/src/generated/resources/data/malum/recipes/spirit_infusion/ring_of_esoteric_spoils.json @@ -1,18 +1,18 @@ { "type": "malum:spirit_infusion", + "extra_items": [ + { + "count": 8, + "item": "malum:processed_soulstone" + } + ], "input": { - "item": "malum:ornate_ring", - "count": 1 + "count": 1, + "item": "malum:ornate_ring" }, "output": { "item": "malum:ring_of_esoteric_spoils" }, - "extra_items": [ - { - "item": "malum:processed_soulstone", - "count": 8 - } - ], "spirits": [ { "type": "wicked", diff --git a/src/generated/resources/data/malum/recipes/spirit_infusion/ring_of_the_demolitionist.json b/src/generated/resources/data/malum/recipes/spirit_infusion/ring_of_the_demolitionist.json index 3fa36d4b9..19d7983b8 100644 --- a/src/generated/resources/data/malum/recipes/spirit_infusion/ring_of_the_demolitionist.json +++ b/src/generated/resources/data/malum/recipes/spirit_infusion/ring_of_the_demolitionist.json @@ -1,26 +1,26 @@ { "type": "malum:spirit_infusion", - "input": { - "item": "malum:ornate_ring", - "count": 1 - }, - "output": { - "item": "malum:ring_of_the_demolitionist" - }, "extra_items": [ { - "item": "malum:copper_node", - "count": 6 + "count": 6, + "item": "malum:copper_node" }, { - "item": "minecraft:gunpowder", - "count": 4 + "count": 4, + "item": "minecraft:gunpowder" }, { - "item": "malum:cursed_grit", - "count": 4 + "count": 4, + "item": "malum:cursed_grit" } ], + "input": { + "count": 1, + "item": "malum:ornate_ring" + }, + "output": { + "item": "malum:ring_of_the_demolitionist" + }, "spirits": [ { "type": "infernal", diff --git a/src/generated/resources/data/malum/recipes/spirit_infusion/ring_of_the_hoarder.json b/src/generated/resources/data/malum/recipes/spirit_infusion/ring_of_the_hoarder.json index 89ed112ab..1b337d09e 100644 --- a/src/generated/resources/data/malum/recipes/spirit_infusion/ring_of_the_hoarder.json +++ b/src/generated/resources/data/malum/recipes/spirit_infusion/ring_of_the_hoarder.json @@ -1,26 +1,26 @@ { "type": "malum:spirit_infusion", - "input": { - "item": "malum:gilded_ring", - "count": 1 - }, - "output": { - "item": "malum:ring_of_the_hoarder" - }, "extra_items": [ { - "item": "minecraft:ender_pearl", - "count": 2 + "count": 2, + "item": "minecraft:ender_pearl" }, { - "tag": "forge:ingots/iron", - "count": 4 + "count": 4, + "tag": "forge:ingots/iron" }, { - "item": "minecraft:gunpowder", - "count": 8 + "count": 8, + "item": "minecraft:gunpowder" } ], + "input": { + "count": 1, + "item": "malum:gilded_ring" + }, + "output": { + "item": "malum:ring_of_the_hoarder" + }, "spirits": [ { "type": "earthen", diff --git a/src/generated/resources/data/malum/recipes/spirit_infusion/runewood_obelisk.json b/src/generated/resources/data/malum/recipes/spirit_infusion/runewood_obelisk.json index 4e71d00c5..49efdbd9f 100644 --- a/src/generated/resources/data/malum/recipes/spirit_infusion/runewood_obelisk.json +++ b/src/generated/resources/data/malum/recipes/spirit_infusion/runewood_obelisk.json @@ -1,22 +1,22 @@ { "type": "malum:spirit_infusion", - "input": { - "item": "malum:runewood_planks", - "count": 2 - }, - "output": { - "item": "malum:runewood_obelisk" - }, "extra_items": [ { - "item": "malum:hallowed_gold_ingot", - "count": 2 + "count": 2, + "item": "malum:hallowed_gold_ingot" }, { - "item": "malum:hex_ash", - "count": 1 + "count": 1, + "item": "malum:hex_ash" } ], + "input": { + "count": 2, + "item": "malum:runewood_planks" + }, + "output": { + "item": "malum:runewood_obelisk" + }, "spirits": [ { "type": "aerial", diff --git a/src/generated/resources/data/malum/recipes/spirit_infusion/runewood_totem_base.json b/src/generated/resources/data/malum/recipes/spirit_infusion/runewood_totem_base.json index 8a5c8364f..3daece817 100644 --- a/src/generated/resources/data/malum/recipes/spirit_infusion/runewood_totem_base.json +++ b/src/generated/resources/data/malum/recipes/spirit_infusion/runewood_totem_base.json @@ -1,23 +1,23 @@ { "type": "malum:spirit_infusion", - "input": { - "item": "malum:runewood_log", - "count": 4 - }, - "output": { - "item": "malum:runewood_totem_base", - "count": 4 - }, "extra_items": [ { - "item": "malum:runewood_planks", - "count": 6 + "count": 6, + "item": "malum:runewood_planks" }, { - "item": "malum:hex_ash", - "count": 2 + "count": 2, + "item": "malum:hex_ash" } ], + "input": { + "count": 4, + "item": "malum:runewood_log" + }, + "output": { + "count": 4, + "item": "malum:runewood_totem_base" + }, "spirits": [ { "type": "aerial", diff --git a/src/generated/resources/data/malum/recipes/spirit_infusion/soul_hunter_boots.json b/src/generated/resources/data/malum/recipes/spirit_infusion/soul_hunter_boots.json index fe00e5142..6bc55ac7e 100644 --- a/src/generated/resources/data/malum/recipes/spirit_infusion/soul_hunter_boots.json +++ b/src/generated/resources/data/malum/recipes/spirit_infusion/soul_hunter_boots.json @@ -1,30 +1,30 @@ { "type": "malum:spirit_infusion", - "input": { - "item": "minecraft:leather_boots", - "count": 1 - }, - "output": { - "item": "malum:soul_hunter_boots" - }, "extra_items": [ { - "item": "malum:spirit_fabric", - "count": 4 + "count": 4, + "item": "malum:spirit_fabric" }, { - "item": "malum:processed_soulstone", - "count": 4 + "count": 4, + "item": "malum:processed_soulstone" }, { - "tag": "forge:leather", - "count": 2 + "count": 2, + "tag": "forge:leather" }, { - "tag": "forge:feathers", - "count": 2 + "count": 2, + "tag": "forge:feathers" } ], + "input": { + "count": 1, + "item": "minecraft:leather_boots" + }, + "output": { + "item": "malum:soul_hunter_boots" + }, "spirits": [ { "type": "aerial", diff --git a/src/generated/resources/data/malum/recipes/spirit_infusion/soul_hunter_cloak.json b/src/generated/resources/data/malum/recipes/spirit_infusion/soul_hunter_cloak.json index 4e83702ff..2e7ec3986 100644 --- a/src/generated/resources/data/malum/recipes/spirit_infusion/soul_hunter_cloak.json +++ b/src/generated/resources/data/malum/recipes/spirit_infusion/soul_hunter_cloak.json @@ -1,26 +1,26 @@ { "type": "malum:spirit_infusion", - "input": { - "item": "minecraft:leather_helmet", - "count": 1 - }, - "output": { - "item": "malum:soul_hunter_cloak" - }, "extra_items": [ { - "item": "malum:spirit_fabric", - "count": 4 + "count": 4, + "item": "malum:spirit_fabric" }, { - "item": "malum:processed_soulstone", - "count": 4 + "count": 4, + "item": "malum:processed_soulstone" }, { - "tag": "forge:leather", - "count": 2 + "count": 2, + "tag": "forge:leather" } ], + "input": { + "count": 1, + "item": "minecraft:leather_helmet" + }, + "output": { + "item": "malum:soul_hunter_cloak" + }, "spirits": [ { "type": "aerial", diff --git a/src/generated/resources/data/malum/recipes/spirit_infusion/soul_hunter_leggings.json b/src/generated/resources/data/malum/recipes/spirit_infusion/soul_hunter_leggings.json index 55f4b2e64..db6fea965 100644 --- a/src/generated/resources/data/malum/recipes/spirit_infusion/soul_hunter_leggings.json +++ b/src/generated/resources/data/malum/recipes/spirit_infusion/soul_hunter_leggings.json @@ -1,26 +1,26 @@ { "type": "malum:spirit_infusion", - "input": { - "item": "minecraft:leather_leggings", - "count": 1 - }, - "output": { - "item": "malum:soul_hunter_leggings" - }, "extra_items": [ { - "item": "malum:spirit_fabric", - "count": 4 + "count": 4, + "item": "malum:spirit_fabric" }, { - "item": "malum:processed_soulstone", - "count": 4 + "count": 4, + "item": "malum:processed_soulstone" }, { - "tag": "forge:leather", - "count": 2 + "count": 2, + "tag": "forge:leather" } ], + "input": { + "count": 1, + "item": "minecraft:leather_leggings" + }, + "output": { + "item": "malum:soul_hunter_leggings" + }, "spirits": [ { "type": "aerial", diff --git a/src/generated/resources/data/malum/recipes/spirit_infusion/soul_hunter_robe.json b/src/generated/resources/data/malum/recipes/spirit_infusion/soul_hunter_robe.json index 7dd185681..bba709635 100644 --- a/src/generated/resources/data/malum/recipes/spirit_infusion/soul_hunter_robe.json +++ b/src/generated/resources/data/malum/recipes/spirit_infusion/soul_hunter_robe.json @@ -1,26 +1,26 @@ { "type": "malum:spirit_infusion", - "input": { - "item": "minecraft:leather_chestplate", - "count": 1 - }, - "output": { - "item": "malum:soul_hunter_robe" - }, "extra_items": [ { - "item": "malum:spirit_fabric", - "count": 4 + "count": 4, + "item": "malum:spirit_fabric" }, { - "item": "malum:processed_soulstone", - "count": 4 + "count": 4, + "item": "malum:processed_soulstone" }, { - "tag": "forge:leather", - "count": 2 + "count": 2, + "tag": "forge:leather" } ], + "input": { + "count": 1, + "item": "minecraft:leather_chestplate" + }, + "output": { + "item": "malum:soul_hunter_robe" + }, "spirits": [ { "type": "aerial", diff --git a/src/generated/resources/data/malum/recipes/spirit_infusion/soul_stained_steel_boots.json b/src/generated/resources/data/malum/recipes/spirit_infusion/soul_stained_steel_boots.json index 153722cb5..f6b41466e 100644 --- a/src/generated/resources/data/malum/recipes/spirit_infusion/soul_stained_steel_boots.json +++ b/src/generated/resources/data/malum/recipes/spirit_infusion/soul_stained_steel_boots.json @@ -1,34 +1,34 @@ { "type": "malum:spirit_infusion", - "input": { - "item": "minecraft:iron_boots", - "count": 1 - }, - "output": { - "item": "malum:soul_stained_steel_boots" - }, "extra_items": [ { - "item": "malum:soul_stained_steel_ingot", - "count": 4 + "count": 4, + "item": "malum:soul_stained_steel_ingot" }, { - "item": "malum:hex_ash", - "count": 1 + "count": 1, + "item": "malum:hex_ash" }, { - "item": "malum:processed_soulstone", - "count": 2 + "count": 2, + "item": "malum:processed_soulstone" }, { - "item": "malum:twisted_rock", - "count": 8 + "count": 8, + "item": "malum:twisted_rock" }, { - "tag": "forge:gems/diamond", - "count": 1 + "count": 1, + "tag": "forge:gems/diamond" } ], + "input": { + "count": 1, + "item": "minecraft:iron_boots" + }, + "output": { + "item": "malum:soul_stained_steel_boots" + }, "spirits": [ { "type": "earthen", diff --git a/src/generated/resources/data/malum/recipes/spirit_infusion/soul_stained_steel_chestplate.json b/src/generated/resources/data/malum/recipes/spirit_infusion/soul_stained_steel_chestplate.json index 048b03e69..3949d1406 100644 --- a/src/generated/resources/data/malum/recipes/spirit_infusion/soul_stained_steel_chestplate.json +++ b/src/generated/resources/data/malum/recipes/spirit_infusion/soul_stained_steel_chestplate.json @@ -1,34 +1,34 @@ { "type": "malum:spirit_infusion", - "input": { - "item": "minecraft:iron_chestplate", - "count": 1 - }, - "output": { - "item": "malum:soul_stained_steel_chestplate" - }, "extra_items": [ { - "item": "malum:soul_stained_steel_ingot", - "count": 4 + "count": 4, + "item": "malum:soul_stained_steel_ingot" }, { - "item": "malum:hex_ash", - "count": 1 + "count": 1, + "item": "malum:hex_ash" }, { - "item": "malum:processed_soulstone", - "count": 2 + "count": 2, + "item": "malum:processed_soulstone" }, { - "item": "malum:twisted_rock", - "count": 8 + "count": 8, + "item": "malum:twisted_rock" }, { - "tag": "forge:gems/diamond", - "count": 1 + "count": 1, + "tag": "forge:gems/diamond" } ], + "input": { + "count": 1, + "item": "minecraft:iron_chestplate" + }, + "output": { + "item": "malum:soul_stained_steel_chestplate" + }, "spirits": [ { "type": "earthen", diff --git a/src/generated/resources/data/malum/recipes/spirit_infusion/soul_stained_steel_helmet.json b/src/generated/resources/data/malum/recipes/spirit_infusion/soul_stained_steel_helmet.json index b872a9424..7bedec608 100644 --- a/src/generated/resources/data/malum/recipes/spirit_infusion/soul_stained_steel_helmet.json +++ b/src/generated/resources/data/malum/recipes/spirit_infusion/soul_stained_steel_helmet.json @@ -1,34 +1,34 @@ { "type": "malum:spirit_infusion", - "input": { - "item": "minecraft:iron_helmet", - "count": 1 - }, - "output": { - "item": "malum:soul_stained_steel_helmet" - }, "extra_items": [ { - "item": "malum:soul_stained_steel_ingot", - "count": 4 + "count": 4, + "item": "malum:soul_stained_steel_ingot" }, { - "item": "malum:hex_ash", - "count": 1 + "count": 1, + "item": "malum:hex_ash" }, { - "item": "malum:processed_soulstone", - "count": 2 + "count": 2, + "item": "malum:processed_soulstone" }, { - "item": "malum:twisted_rock", - "count": 8 + "count": 8, + "item": "malum:twisted_rock" }, { - "tag": "forge:gems/diamond", - "count": 1 + "count": 1, + "tag": "forge:gems/diamond" } ], + "input": { + "count": 1, + "item": "minecraft:iron_helmet" + }, + "output": { + "item": "malum:soul_stained_steel_helmet" + }, "spirits": [ { "type": "earthen", diff --git a/src/generated/resources/data/malum/recipes/spirit_infusion/soul_stained_steel_ingot.json b/src/generated/resources/data/malum/recipes/spirit_infusion/soul_stained_steel_ingot.json index 597975ab0..b652c863b 100644 --- a/src/generated/resources/data/malum/recipes/spirit_infusion/soul_stained_steel_ingot.json +++ b/src/generated/resources/data/malum/recipes/spirit_infusion/soul_stained_steel_ingot.json @@ -1,18 +1,18 @@ { "type": "malum:spirit_infusion", + "extra_items": [ + { + "count": 4, + "item": "malum:processed_soulstone" + } + ], "input": { - "item": "minecraft:iron_ingot", - "count": 1 + "count": 1, + "item": "minecraft:iron_ingot" }, "output": { "item": "malum:soul_stained_steel_ingot" }, - "extra_items": [ - { - "item": "malum:processed_soulstone", - "count": 4 - } - ], "spirits": [ { "type": "wicked", diff --git a/src/generated/resources/data/malum/recipes/spirit_infusion/soul_stained_steel_leggings.json b/src/generated/resources/data/malum/recipes/spirit_infusion/soul_stained_steel_leggings.json index 04ec666cd..c5d072954 100644 --- a/src/generated/resources/data/malum/recipes/spirit_infusion/soul_stained_steel_leggings.json +++ b/src/generated/resources/data/malum/recipes/spirit_infusion/soul_stained_steel_leggings.json @@ -1,34 +1,34 @@ { "type": "malum:spirit_infusion", - "input": { - "item": "minecraft:iron_leggings", - "count": 1 - }, - "output": { - "item": "malum:soul_stained_steel_leggings" - }, "extra_items": [ { - "item": "malum:soul_stained_steel_ingot", - "count": 4 + "count": 4, + "item": "malum:soul_stained_steel_ingot" }, { - "item": "malum:hex_ash", - "count": 1 + "count": 1, + "item": "malum:hex_ash" }, { - "item": "malum:processed_soulstone", - "count": 2 + "count": 2, + "item": "malum:processed_soulstone" }, { - "item": "malum:twisted_rock", - "count": 8 + "count": 8, + "item": "malum:twisted_rock" }, { - "tag": "forge:gems/diamond", - "count": 1 + "count": 1, + "tag": "forge:gems/diamond" } ], + "input": { + "count": 1, + "item": "minecraft:iron_leggings" + }, + "output": { + "item": "malum:soul_stained_steel_leggings" + }, "spirits": [ { "type": "earthen", diff --git a/src/generated/resources/data/malum/recipes/spirit_infusion/soul_stained_steel_scythe.json b/src/generated/resources/data/malum/recipes/spirit_infusion/soul_stained_steel_scythe.json index 3c07144de..7f876946f 100644 --- a/src/generated/resources/data/malum/recipes/spirit_infusion/soul_stained_steel_scythe.json +++ b/src/generated/resources/data/malum/recipes/spirit_infusion/soul_stained_steel_scythe.json @@ -1,26 +1,26 @@ { "type": "malum:spirit_infusion", - "input": { - "item": "malum:crude_scythe", - "count": 1 - }, - "output": { - "item": "malum:soul_stained_steel_scythe" - }, "extra_items": [ { - "item": "malum:soul_stained_steel_ingot", - "count": 4 + "count": 4, + "item": "malum:soul_stained_steel_ingot" }, { - "item": "malum:hex_ash", - "count": 2 + "count": 2, + "item": "malum:hex_ash" }, { - "item": "malum:processed_soulstone", - "count": 4 + "count": 4, + "item": "malum:processed_soulstone" } ], + "input": { + "count": 1, + "item": "malum:crude_scythe" + }, + "output": { + "item": "malum:soul_stained_steel_scythe" + }, "spirits": [ { "type": "earthen", diff --git a/src/generated/resources/data/malum/recipes/spirit_infusion/soulwood_totem_base.json b/src/generated/resources/data/malum/recipes/spirit_infusion/soulwood_totem_base.json index 7637656d9..350ca09e0 100644 --- a/src/generated/resources/data/malum/recipes/spirit_infusion/soulwood_totem_base.json +++ b/src/generated/resources/data/malum/recipes/spirit_infusion/soulwood_totem_base.json @@ -1,23 +1,23 @@ { "type": "malum:spirit_infusion", - "input": { - "item": "malum:soulwood_log", - "count": 4 - }, - "output": { - "item": "malum:soulwood_totem_base", - "count": 4 - }, "extra_items": [ { - "item": "malum:soulwood_planks", - "count": 6 + "count": 6, + "item": "malum:soulwood_planks" }, { - "item": "malum:hex_ash", - "count": 2 + "count": 2, + "item": "malum:hex_ash" } ], + "input": { + "count": 4, + "item": "malum:soulwood_log" + }, + "output": { + "count": 4, + "item": "malum:soulwood_totem_base" + }, "spirits": [ { "type": "aerial", diff --git a/src/generated/resources/data/malum/recipes/spirit_infusion/spirit_catalyzer.json b/src/generated/resources/data/malum/recipes/spirit_infusion/spirit_catalyzer.json index ac4b56dc1..4f2d08975 100644 --- a/src/generated/resources/data/malum/recipes/spirit_infusion/spirit_catalyzer.json +++ b/src/generated/resources/data/malum/recipes/spirit_infusion/spirit_catalyzer.json @@ -1,27 +1,27 @@ { "type": "malum:spirit_infusion", - "input": { - "item": "malum:twisted_rock_item_pedestal", - "count": 2 - }, - "output": { - "item": "malum:spirit_catalyzer", - "count": 2 - }, "extra_items": [ { - "item": "malum:ether", - "count": 1 + "count": 1, + "item": "malum:ether" }, { - "item": "malum:tainted_rock", - "count": 8 + "count": 8, + "item": "malum:tainted_rock" }, { - "item": "malum:twisted_rock", - "count": 8 + "count": 8, + "item": "malum:twisted_rock" } ], + "input": { + "count": 2, + "item": "malum:twisted_rock_item_pedestal" + }, + "output": { + "count": 2, + "item": "malum:spirit_catalyzer" + }, "spirits": [ { "type": "infernal", diff --git a/src/generated/resources/data/malum/recipes/spirit_infusion/spirit_crucible.json b/src/generated/resources/data/malum/recipes/spirit_infusion/spirit_crucible.json index b90d78a08..732e58d2e 100644 --- a/src/generated/resources/data/malum/recipes/spirit_infusion/spirit_crucible.json +++ b/src/generated/resources/data/malum/recipes/spirit_infusion/spirit_crucible.json @@ -1,26 +1,26 @@ { "type": "malum:spirit_infusion", - "input": { - "item": "minecraft:furnace", - "count": 1 - }, - "output": { - "item": "malum:spirit_crucible" - }, "extra_items": [ { - "item": "malum:hex_ash", - "count": 2 + "count": 2, + "item": "malum:hex_ash" }, { - "item": "malum:tainted_rock", - "count": 8 + "count": 8, + "item": "malum:tainted_rock" }, { - "item": "malum:twisted_rock", - "count": 8 + "count": 8, + "item": "malum:twisted_rock" } ], + "input": { + "count": 1, + "item": "minecraft:furnace" + }, + "output": { + "item": "malum:spirit_crucible" + }, "spirits": [ { "type": "infernal", diff --git a/src/generated/resources/data/malum/recipes/spirit_infusion/spirit_fabric.json b/src/generated/resources/data/malum/recipes/spirit_infusion/spirit_fabric.json index 0b592996f..64750a4de 100644 --- a/src/generated/resources/data/malum/recipes/spirit_infusion/spirit_fabric.json +++ b/src/generated/resources/data/malum/recipes/spirit_infusion/spirit_fabric.json @@ -1,23 +1,23 @@ { "type": "malum:spirit_infusion", - "input": { - "tag": "minecraft:wool", - "count": 2 - }, - "output": { - "item": "malum:spirit_fabric", - "count": 4 - }, "extra_items": [ { - "tag": "forge:string", - "count": 2 + "count": 2, + "tag": "forge:string" }, { - "item": "malum:hex_ash", - "count": 1 + "count": 1, + "item": "malum:hex_ash" } ], + "input": { + "count": 2, + "tag": "minecraft:wool" + }, + "output": { + "count": 4, + "item": "malum:spirit_fabric" + }, "spirits": [ { "type": "wicked", diff --git a/src/generated/resources/data/malum/recipes/spirit_infusion/tainted_rock.json b/src/generated/resources/data/malum/recipes/spirit_infusion/tainted_rock.json index b78d3d1e5..aa1c14954 100644 --- a/src/generated/resources/data/malum/recipes/spirit_infusion/tainted_rock.json +++ b/src/generated/resources/data/malum/recipes/spirit_infusion/tainted_rock.json @@ -1,14 +1,14 @@ { "type": "malum:spirit_infusion", + "extra_items": [], "input": { - "tag": "minecraft:stone_tool_materials", - "count": 16 + "count": 16, + "tag": "minecraft:stone_tool_materials" }, "output": { - "item": "malum:tainted_rock", - "count": 16 + "count": 16, + "item": "malum:tainted_rock" }, - "extra_items": [], "spirits": [ { "type": "sacred" diff --git a/src/generated/resources/data/malum/recipes/spirit_infusion/twisted_rock.json b/src/generated/resources/data/malum/recipes/spirit_infusion/twisted_rock.json index 1b3e6c082..a61e6c23e 100644 --- a/src/generated/resources/data/malum/recipes/spirit_infusion/twisted_rock.json +++ b/src/generated/resources/data/malum/recipes/spirit_infusion/twisted_rock.json @@ -1,14 +1,14 @@ { "type": "malum:spirit_infusion", + "extra_items": [], "input": { - "tag": "minecraft:stone_tool_materials", - "count": 16 + "count": 16, + "tag": "minecraft:stone_tool_materials" }, "output": { - "item": "malum:twisted_rock", - "count": 16 + "count": 16, + "item": "malum:twisted_rock" }, - "extra_items": [], "spirits": [ { "type": "wicked" diff --git a/src/generated/resources/data/malum/recipes/spirit_infusion/twisted_tablet.json b/src/generated/resources/data/malum/recipes/spirit_infusion/twisted_tablet.json index ea0cfbfdf..10b8b1633 100644 --- a/src/generated/resources/data/malum/recipes/spirit_infusion/twisted_tablet.json +++ b/src/generated/resources/data/malum/recipes/spirit_infusion/twisted_tablet.json @@ -1,22 +1,22 @@ { "type": "malum:spirit_infusion", - "input": { - "item": "malum:tainted_rock_item_stand", - "count": 1 - }, - "output": { - "item": "malum:twisted_tablet" - }, "extra_items": [ { - "item": "malum:tainted_rock", - "count": 4 + "count": 4, + "item": "malum:tainted_rock" }, { - "item": "malum:twisted_rock", - "count": 4 + "count": 4, + "item": "malum:twisted_rock" } ], + "input": { + "count": 1, + "item": "malum:tainted_rock_item_stand" + }, + "output": { + "item": "malum:twisted_tablet" + }, "spirits": [ { "type": "aerial", diff --git a/src/generated/resources/data/malum/recipes/spirit_infusion/tyrving.json b/src/generated/resources/data/malum/recipes/spirit_infusion/tyrving.json index 7a1c5be03..b50d0c609 100644 --- a/src/generated/resources/data/malum/recipes/spirit_infusion/tyrving.json +++ b/src/generated/resources/data/malum/recipes/spirit_infusion/tyrving.json @@ -1,34 +1,34 @@ { "type": "malum:spirit_infusion", - "input": { - "item": "malum:soul_stained_steel_sword", - "count": 1 - }, - "output": { - "item": "malum:tyrving" - }, "extra_items": [ { - "item": "malum:twisted_rock", - "count": 16 + "count": 16, + "item": "malum:twisted_rock" }, { - "item": "malum:soulwood_planks", - "count": 8 + "count": 8, + "item": "malum:soulwood_planks" }, { - "item": "malum:hex_ash", - "count": 4 + "count": 4, + "item": "malum:hex_ash" }, { - "tag": "forge:obsidian", - "count": 4 + "count": 4, + "tag": "forge:obsidian" }, { - "item": "malum:corrupted_resonance", - "count": 1 + "count": 1, + "item": "malum:corrupted_resonance" } ], + "input": { + "count": 1, + "item": "malum:soul_stained_steel_sword" + }, + "output": { + "item": "malum:tyrving" + }, "spirits": [ { "type": "wicked", diff --git a/src/generated/resources/data/malum/recipes/spirit_infusion/vivid_nitrate.json b/src/generated/resources/data/malum/recipes/spirit_infusion/vivid_nitrate.json index 1b67be693..fb8cda38b 100644 --- a/src/generated/resources/data/malum/recipes/spirit_infusion/vivid_nitrate.json +++ b/src/generated/resources/data/malum/recipes/spirit_infusion/vivid_nitrate.json @@ -1,27 +1,27 @@ { "type": "malum:spirit_infusion", - "input": { - "item": "malum:etheric_nitrate", - "count": 8 - }, - "output": { - "item": "malum:vivid_nitrate", - "count": 8 - }, "extra_items": [ { - "item": "malum:cursed_grit", - "count": 4 + "count": 4, + "item": "malum:cursed_grit" }, { - "tag": "forge:gunpowder", - "count": 4 + "count": 4, + "tag": "forge:gunpowder" }, { - "tag": "forge:gems/prismarine", - "count": 2 + "count": 2, + "tag": "forge:gems/prismarine" } ], + "input": { + "count": 8, + "item": "malum:etheric_nitrate" + }, + "output": { + "count": 8, + "item": "malum:vivid_nitrate" + }, "spirits": [ { "type": "aerial", diff --git a/src/generated/resources/data/malum/recipes/spirit_jar.json b/src/generated/resources/data/malum/recipes/spirit_jar.json index a9196857c..e30b8f156 100644 --- a/src/generated/resources/data/malum/recipes/spirit_jar.json +++ b/src/generated/resources/data/malum/recipes/spirit_jar.json @@ -1,19 +1,21 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "YZY", - "Y Y", - "YYY" - ], + "category": "misc", "key": { - "Z": { - "item": "malum:hallowed_gold_ingot" - }, "Y": { "tag": "forge:glass_panes" + }, + "Z": { + "item": "malum:hallowed_gold_ingot" } }, + "pattern": [ + "YZY", + "Y Y", + "YYY" + ], "result": { "item": "malum:spirit_jar" - } + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/spirit_pouch.json b/src/generated/resources/data/malum/recipes/spirit_pouch.json index 1407864a8..f09065675 100644 --- a/src/generated/resources/data/malum/recipes/spirit_pouch.json +++ b/src/generated/resources/data/malum/recipes/spirit_pouch.json @@ -1,10 +1,6 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - " X ", - "YZY", - " Y " - ], + "category": "misc", "key": { "X": { "tag": "forge:string" @@ -16,7 +12,13 @@ "tag": "minecraft:soul_fire_base_blocks" } }, + "pattern": [ + " X ", + "YZY", + " Y " + ], "result": { "item": "malum:spirit_pouch" - } + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/spirit_transmutation/soulwood/beam.json b/src/generated/resources/data/malum/recipes/spirit_transmutation/soulwood/beam.json index ef6ded6ae..16d79fe47 100644 --- a/src/generated/resources/data/malum/recipes/spirit_transmutation/soulwood/beam.json +++ b/src/generated/resources/data/malum/recipes/spirit_transmutation/soulwood/beam.json @@ -1,10 +1,10 @@ { "type": "malum:spirit_transmutation", + "group": "soulwood", "input": { "item": "malum:runewood_beam" }, "output": { "item": "malum:soulwood_beam" - }, - "group": "soulwood" + } } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/spirit_transmutation/soulwood/cut_planks.json b/src/generated/resources/data/malum/recipes/spirit_transmutation/soulwood/cut_planks.json index 1069054c1..ebac05fdb 100644 --- a/src/generated/resources/data/malum/recipes/spirit_transmutation/soulwood/cut_planks.json +++ b/src/generated/resources/data/malum/recipes/spirit_transmutation/soulwood/cut_planks.json @@ -1,10 +1,10 @@ { "type": "malum:spirit_transmutation", + "group": "soulwood", "input": { "item": "malum:cut_runewood_planks" }, "output": { "item": "malum:cut_soulwood_planks" - }, - "group": "soulwood" + } } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/spirit_transmutation/soulwood/door.json b/src/generated/resources/data/malum/recipes/spirit_transmutation/soulwood/door.json index a1ae41a4e..46a2eeb8e 100644 --- a/src/generated/resources/data/malum/recipes/spirit_transmutation/soulwood/door.json +++ b/src/generated/resources/data/malum/recipes/spirit_transmutation/soulwood/door.json @@ -1,10 +1,10 @@ { "type": "malum:spirit_transmutation", + "group": "soulwood", "input": { "item": "malum:runewood_door" }, "output": { "item": "malum:soulwood_door" - }, - "group": "soulwood" + } } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/spirit_transmutation/soulwood/exposed_log.json b/src/generated/resources/data/malum/recipes/spirit_transmutation/soulwood/exposed_log.json index f464651db..e52619a01 100644 --- a/src/generated/resources/data/malum/recipes/spirit_transmutation/soulwood/exposed_log.json +++ b/src/generated/resources/data/malum/recipes/spirit_transmutation/soulwood/exposed_log.json @@ -1,10 +1,10 @@ { "type": "malum:spirit_transmutation", + "group": "soulwood", "input": { "item": "malum:exposed_runewood_log" }, "output": { "item": "malum:exposed_soulwood_log" - }, - "group": "soulwood" + } } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/spirit_transmutation/soulwood/growth.json b/src/generated/resources/data/malum/recipes/spirit_transmutation/soulwood/growth.json index d36b5bec6..e5aeb0737 100644 --- a/src/generated/resources/data/malum/recipes/spirit_transmutation/soulwood/growth.json +++ b/src/generated/resources/data/malum/recipes/spirit_transmutation/soulwood/growth.json @@ -1,10 +1,10 @@ { "type": "malum:spirit_transmutation", + "group": "soulwood", "input": { "item": "malum:runewood_sapling" }, "output": { "item": "malum:soulwood_growth" - }, - "group": "soulwood" + } } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/spirit_transmutation/soulwood/item_pedestal.json b/src/generated/resources/data/malum/recipes/spirit_transmutation/soulwood/item_pedestal.json index f0e239dd1..6645c06f0 100644 --- a/src/generated/resources/data/malum/recipes/spirit_transmutation/soulwood/item_pedestal.json +++ b/src/generated/resources/data/malum/recipes/spirit_transmutation/soulwood/item_pedestal.json @@ -1,10 +1,10 @@ { "type": "malum:spirit_transmutation", + "group": "soulwood", "input": { "item": "malum:runewood_item_pedestal" }, "output": { "item": "malum:soulwood_item_pedestal" - }, - "group": "soulwood" + } } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/spirit_transmutation/soulwood/item_stand.json b/src/generated/resources/data/malum/recipes/spirit_transmutation/soulwood/item_stand.json index 8856c84fb..f9660309f 100644 --- a/src/generated/resources/data/malum/recipes/spirit_transmutation/soulwood/item_stand.json +++ b/src/generated/resources/data/malum/recipes/spirit_transmutation/soulwood/item_stand.json @@ -1,10 +1,10 @@ { "type": "malum:spirit_transmutation", + "group": "soulwood", "input": { "item": "malum:runewood_item_stand" }, "output": { "item": "malum:soulwood_item_stand" - }, - "group": "soulwood" + } } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/spirit_transmutation/soulwood/leaves.json b/src/generated/resources/data/malum/recipes/spirit_transmutation/soulwood/leaves.json index 740365aae..5066af2be 100644 --- a/src/generated/resources/data/malum/recipes/spirit_transmutation/soulwood/leaves.json +++ b/src/generated/resources/data/malum/recipes/spirit_transmutation/soulwood/leaves.json @@ -1,10 +1,10 @@ { "type": "malum:spirit_transmutation", + "group": "soulwood", "input": { "item": "malum:runewood_leaves" }, "output": { "item": "malum:soulwood_leaves" - }, - "group": "soulwood" + } } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/spirit_transmutation/soulwood/log.json b/src/generated/resources/data/malum/recipes/spirit_transmutation/soulwood/log.json index 34a10db64..21ca14aff 100644 --- a/src/generated/resources/data/malum/recipes/spirit_transmutation/soulwood/log.json +++ b/src/generated/resources/data/malum/recipes/spirit_transmutation/soulwood/log.json @@ -1,10 +1,10 @@ { "type": "malum:spirit_transmutation", + "group": "soulwood", "input": { "item": "malum:runewood_log" }, "output": { "item": "malum:soulwood_log" - }, - "group": "soulwood" + } } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/spirit_transmutation/soulwood/panel.json b/src/generated/resources/data/malum/recipes/spirit_transmutation/soulwood/panel.json index c011409d6..6624a3c75 100644 --- a/src/generated/resources/data/malum/recipes/spirit_transmutation/soulwood/panel.json +++ b/src/generated/resources/data/malum/recipes/spirit_transmutation/soulwood/panel.json @@ -1,10 +1,10 @@ { "type": "malum:spirit_transmutation", + "group": "soulwood", "input": { "item": "malum:runewood_panel" }, "output": { "item": "malum:soulwood_panel" - }, - "group": "soulwood" + } } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/spirit_transmutation/soulwood/panel_slab.json b/src/generated/resources/data/malum/recipes/spirit_transmutation/soulwood/panel_slab.json index b3f21ceae..8fafc7328 100644 --- a/src/generated/resources/data/malum/recipes/spirit_transmutation/soulwood/panel_slab.json +++ b/src/generated/resources/data/malum/recipes/spirit_transmutation/soulwood/panel_slab.json @@ -1,10 +1,10 @@ { "type": "malum:spirit_transmutation", + "group": "soulwood", "input": { "item": "malum:runewood_panel_slab" }, "output": { "item": "malum:soulwood_panel_slab" - }, - "group": "soulwood" + } } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/spirit_transmutation/soulwood/panel_stairs.json b/src/generated/resources/data/malum/recipes/spirit_transmutation/soulwood/panel_stairs.json index d76870cf8..d75c13bbd 100644 --- a/src/generated/resources/data/malum/recipes/spirit_transmutation/soulwood/panel_stairs.json +++ b/src/generated/resources/data/malum/recipes/spirit_transmutation/soulwood/panel_stairs.json @@ -1,10 +1,10 @@ { "type": "malum:spirit_transmutation", + "group": "soulwood", "input": { "item": "malum:runewood_panel_stairs" }, "output": { "item": "malum:soulwood_panel_stairs" - }, - "group": "soulwood" + } } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/spirit_transmutation/soulwood/planks.json b/src/generated/resources/data/malum/recipes/spirit_transmutation/soulwood/planks.json index 74fd27863..490613623 100644 --- a/src/generated/resources/data/malum/recipes/spirit_transmutation/soulwood/planks.json +++ b/src/generated/resources/data/malum/recipes/spirit_transmutation/soulwood/planks.json @@ -1,10 +1,10 @@ { "type": "malum:spirit_transmutation", + "group": "soulwood", "input": { "item": "malum:runewood_planks" }, "output": { "item": "malum:soulwood_planks" - }, - "group": "soulwood" + } } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/spirit_transmutation/soulwood/planks_button.json b/src/generated/resources/data/malum/recipes/spirit_transmutation/soulwood/planks_button.json index 6ff96de8b..e6ef7b63c 100644 --- a/src/generated/resources/data/malum/recipes/spirit_transmutation/soulwood/planks_button.json +++ b/src/generated/resources/data/malum/recipes/spirit_transmutation/soulwood/planks_button.json @@ -1,10 +1,10 @@ { "type": "malum:spirit_transmutation", + "group": "soulwood", "input": { "item": "malum:runewood_planks_button" }, "output": { "item": "malum:soulwood_planks_button" - }, - "group": "soulwood" + } } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/spirit_transmutation/soulwood/planks_fence.json b/src/generated/resources/data/malum/recipes/spirit_transmutation/soulwood/planks_fence.json index 42dca6c6a..90ac69c1d 100644 --- a/src/generated/resources/data/malum/recipes/spirit_transmutation/soulwood/planks_fence.json +++ b/src/generated/resources/data/malum/recipes/spirit_transmutation/soulwood/planks_fence.json @@ -1,10 +1,10 @@ { "type": "malum:spirit_transmutation", + "group": "soulwood", "input": { "item": "malum:runewood_planks_fence" }, "output": { "item": "malum:soulwood_planks_fence" - }, - "group": "soulwood" + } } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/spirit_transmutation/soulwood/planks_fence_gate.json b/src/generated/resources/data/malum/recipes/spirit_transmutation/soulwood/planks_fence_gate.json index e78fa4341..5357be5e7 100644 --- a/src/generated/resources/data/malum/recipes/spirit_transmutation/soulwood/planks_fence_gate.json +++ b/src/generated/resources/data/malum/recipes/spirit_transmutation/soulwood/planks_fence_gate.json @@ -1,10 +1,10 @@ { "type": "malum:spirit_transmutation", + "group": "soulwood", "input": { "item": "malum:runewood_planks_fence_gate" }, "output": { "item": "malum:soulwood_planks_fence_gate" - }, - "group": "soulwood" + } } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/spirit_transmutation/soulwood/planks_pressure_plate.json b/src/generated/resources/data/malum/recipes/spirit_transmutation/soulwood/planks_pressure_plate.json index 40f81f1be..85e8e9586 100644 --- a/src/generated/resources/data/malum/recipes/spirit_transmutation/soulwood/planks_pressure_plate.json +++ b/src/generated/resources/data/malum/recipes/spirit_transmutation/soulwood/planks_pressure_plate.json @@ -1,10 +1,10 @@ { "type": "malum:spirit_transmutation", + "group": "soulwood", "input": { "item": "malum:runewood_planks_pressure_plate" }, "output": { "item": "malum:soulwood_planks_pressure_plate" - }, - "group": "soulwood" + } } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/spirit_transmutation/soulwood/planks_slab.json b/src/generated/resources/data/malum/recipes/spirit_transmutation/soulwood/planks_slab.json index c2a64dabf..a6f7e4df5 100644 --- a/src/generated/resources/data/malum/recipes/spirit_transmutation/soulwood/planks_slab.json +++ b/src/generated/resources/data/malum/recipes/spirit_transmutation/soulwood/planks_slab.json @@ -1,10 +1,10 @@ { "type": "malum:spirit_transmutation", + "group": "soulwood", "input": { "item": "malum:runewood_planks_slab" }, "output": { "item": "malum:soulwood_planks_slab" - }, - "group": "soulwood" + } } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/spirit_transmutation/soulwood/planks_stairs.json b/src/generated/resources/data/malum/recipes/spirit_transmutation/soulwood/planks_stairs.json index e16021587..79ba28ea5 100644 --- a/src/generated/resources/data/malum/recipes/spirit_transmutation/soulwood/planks_stairs.json +++ b/src/generated/resources/data/malum/recipes/spirit_transmutation/soulwood/planks_stairs.json @@ -1,10 +1,10 @@ { "type": "malum:spirit_transmutation", + "group": "soulwood", "input": { "item": "malum:runewood_planks_stairs" }, "output": { "item": "malum:soulwood_planks_stairs" - }, - "group": "soulwood" + } } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/spirit_transmutation/soulwood/revealed_log.json b/src/generated/resources/data/malum/recipes/spirit_transmutation/soulwood/revealed_log.json index 754e797c6..bf1045e7b 100644 --- a/src/generated/resources/data/malum/recipes/spirit_transmutation/soulwood/revealed_log.json +++ b/src/generated/resources/data/malum/recipes/spirit_transmutation/soulwood/revealed_log.json @@ -1,10 +1,10 @@ { "type": "malum:spirit_transmutation", + "group": "soulwood", "input": { "item": "malum:revealed_runewood_log" }, "output": { "item": "malum:revealed_soulwood_log" - }, - "group": "soulwood" + } } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/spirit_transmutation/soulwood/sign.json b/src/generated/resources/data/malum/recipes/spirit_transmutation/soulwood/sign.json index 8b939e6b3..8a42ffeb7 100644 --- a/src/generated/resources/data/malum/recipes/spirit_transmutation/soulwood/sign.json +++ b/src/generated/resources/data/malum/recipes/spirit_transmutation/soulwood/sign.json @@ -1,10 +1,10 @@ { "type": "malum:spirit_transmutation", + "group": "soulwood", "input": { "item": "malum:runewood_sign" }, "output": { "item": "malum:soulwood_sign" - }, - "group": "soulwood" + } } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/spirit_transmutation/soulwood/solid_trapdoor.json b/src/generated/resources/data/malum/recipes/spirit_transmutation/soulwood/solid_trapdoor.json index 00bf13ef6..b882e0e5c 100644 --- a/src/generated/resources/data/malum/recipes/spirit_transmutation/soulwood/solid_trapdoor.json +++ b/src/generated/resources/data/malum/recipes/spirit_transmutation/soulwood/solid_trapdoor.json @@ -1,10 +1,10 @@ { "type": "malum:spirit_transmutation", + "group": "soulwood", "input": { "item": "malum:solid_runewood_trapdoor" }, "output": { "item": "malum:solid_soulwood_trapdoor" - }, - "group": "soulwood" + } } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/spirit_transmutation/soulwood/soulwood.json b/src/generated/resources/data/malum/recipes/spirit_transmutation/soulwood/soulwood.json index 965b82b42..f17411c9a 100644 --- a/src/generated/resources/data/malum/recipes/spirit_transmutation/soulwood/soulwood.json +++ b/src/generated/resources/data/malum/recipes/spirit_transmutation/soulwood/soulwood.json @@ -1,10 +1,10 @@ { "type": "malum:spirit_transmutation", + "group": "soulwood", "input": { "item": "malum:runewood" }, "output": { "item": "malum:soulwood" - }, - "group": "soulwood" + } } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/spirit_transmutation/soulwood/stripped.json b/src/generated/resources/data/malum/recipes/spirit_transmutation/soulwood/stripped.json index b098a77a6..08686e4d3 100644 --- a/src/generated/resources/data/malum/recipes/spirit_transmutation/soulwood/stripped.json +++ b/src/generated/resources/data/malum/recipes/spirit_transmutation/soulwood/stripped.json @@ -1,10 +1,10 @@ { "type": "malum:spirit_transmutation", + "group": "soulwood", "input": { "item": "malum:stripped_runewood" }, "output": { "item": "malum:stripped_soulwood" - }, - "group": "soulwood" + } } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/spirit_transmutation/soulwood/stripped_log.json b/src/generated/resources/data/malum/recipes/spirit_transmutation/soulwood/stripped_log.json index e38f257c5..198bf4c31 100644 --- a/src/generated/resources/data/malum/recipes/spirit_transmutation/soulwood/stripped_log.json +++ b/src/generated/resources/data/malum/recipes/spirit_transmutation/soulwood/stripped_log.json @@ -1,10 +1,10 @@ { "type": "malum:spirit_transmutation", + "group": "soulwood", "input": { "item": "malum:stripped_runewood_log" }, "output": { "item": "malum:stripped_soulwood_log" - }, - "group": "soulwood" + } } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/spirit_transmutation/soulwood/tiles.json b/src/generated/resources/data/malum/recipes/spirit_transmutation/soulwood/tiles.json index 7974a01b7..75c9023d5 100644 --- a/src/generated/resources/data/malum/recipes/spirit_transmutation/soulwood/tiles.json +++ b/src/generated/resources/data/malum/recipes/spirit_transmutation/soulwood/tiles.json @@ -1,10 +1,10 @@ { "type": "malum:spirit_transmutation", + "group": "soulwood", "input": { "item": "malum:runewood_tiles" }, "output": { "item": "malum:soulwood_tiles" - }, - "group": "soulwood" + } } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/spirit_transmutation/soulwood/tiles_slab.json b/src/generated/resources/data/malum/recipes/spirit_transmutation/soulwood/tiles_slab.json index c52fb843f..a8179ba06 100644 --- a/src/generated/resources/data/malum/recipes/spirit_transmutation/soulwood/tiles_slab.json +++ b/src/generated/resources/data/malum/recipes/spirit_transmutation/soulwood/tiles_slab.json @@ -1,10 +1,10 @@ { "type": "malum:spirit_transmutation", + "group": "soulwood", "input": { "item": "malum:runewood_tiles_slab" }, "output": { "item": "malum:soulwood_tiles_slab" - }, - "group": "soulwood" + } } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/spirit_transmutation/soulwood/tiles_stairs.json b/src/generated/resources/data/malum/recipes/spirit_transmutation/soulwood/tiles_stairs.json index 671e092b2..9f4a37e2a 100644 --- a/src/generated/resources/data/malum/recipes/spirit_transmutation/soulwood/tiles_stairs.json +++ b/src/generated/resources/data/malum/recipes/spirit_transmutation/soulwood/tiles_stairs.json @@ -1,10 +1,10 @@ { "type": "malum:spirit_transmutation", + "group": "soulwood", "input": { "item": "malum:runewood_tiles_stairs" }, "output": { "item": "malum:soulwood_tiles_stairs" - }, - "group": "soulwood" + } } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/spirit_transmutation/soulwood/trapdoor.json b/src/generated/resources/data/malum/recipes/spirit_transmutation/soulwood/trapdoor.json index 0f65f9060..ab019ce0a 100644 --- a/src/generated/resources/data/malum/recipes/spirit_transmutation/soulwood/trapdoor.json +++ b/src/generated/resources/data/malum/recipes/spirit_transmutation/soulwood/trapdoor.json @@ -1,10 +1,10 @@ { "type": "malum:spirit_transmutation", + "group": "soulwood", "input": { "item": "malum:runewood_trapdoor" }, "output": { "item": "malum:soulwood_trapdoor" - }, - "group": "soulwood" + } } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/spirit_transmutation/soulwood/vertical_planks.json b/src/generated/resources/data/malum/recipes/spirit_transmutation/soulwood/vertical_planks.json index 40a50aeac..5bad046e4 100644 --- a/src/generated/resources/data/malum/recipes/spirit_transmutation/soulwood/vertical_planks.json +++ b/src/generated/resources/data/malum/recipes/spirit_transmutation/soulwood/vertical_planks.json @@ -1,10 +1,10 @@ { "type": "malum:spirit_transmutation", + "group": "soulwood", "input": { "item": "malum:vertical_runewood_planks" }, "output": { "item": "malum:vertical_soulwood_planks" - }, - "group": "soulwood" + } } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/spirit_transmutation/soulwood/vertical_planks_slab.json b/src/generated/resources/data/malum/recipes/spirit_transmutation/soulwood/vertical_planks_slab.json index 9e49d371b..d7f1e97f8 100644 --- a/src/generated/resources/data/malum/recipes/spirit_transmutation/soulwood/vertical_planks_slab.json +++ b/src/generated/resources/data/malum/recipes/spirit_transmutation/soulwood/vertical_planks_slab.json @@ -1,10 +1,10 @@ { "type": "malum:spirit_transmutation", + "group": "soulwood", "input": { "item": "malum:vertical_runewood_planks_slab" }, "output": { "item": "malum:vertical_soulwood_planks_slab" - }, - "group": "soulwood" + } } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/spirit_transmutation/soulwood/vertical_planks_stairs.json b/src/generated/resources/data/malum/recipes/spirit_transmutation/soulwood/vertical_planks_stairs.json index ea040ff40..56098c929 100644 --- a/src/generated/resources/data/malum/recipes/spirit_transmutation/soulwood/vertical_planks_stairs.json +++ b/src/generated/resources/data/malum/recipes/spirit_transmutation/soulwood/vertical_planks_stairs.json @@ -1,10 +1,10 @@ { "type": "malum:spirit_transmutation", + "group": "soulwood", "input": { "item": "malum:vertical_runewood_planks_stairs" }, "output": { "item": "malum:vertical_soulwood_planks_stairs" - }, - "group": "soulwood" + } } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/sticky_piston_from_sapballs.json b/src/generated/resources/data/malum/recipes/sticky_piston_from_sapballs.json index e7b59c414..2ebe076a9 100644 --- a/src/generated/resources/data/malum/recipes/sticky_piston_from_sapballs.json +++ b/src/generated/resources/data/malum/recipes/sticky_piston_from_sapballs.json @@ -1,9 +1,6 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "S", - "P" - ], + "category": "misc", "key": { "P": { "item": "minecraft:piston" @@ -12,7 +9,12 @@ "tag": "malum:sapballs" } }, + "pattern": [ + "S", + "P" + ], "result": { "item": "minecraft:sticky_piston" - } + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/stripped_runewood.json b/src/generated/resources/data/malum/recipes/stripped_runewood.json index 26ce0d73f..f8725903d 100644 --- a/src/generated/resources/data/malum/recipes/stripped_runewood.json +++ b/src/generated/resources/data/malum/recipes/stripped_runewood.json @@ -1,17 +1,19 @@ { "type": "minecraft:crafting_shaped", + "category": "misc", "group": "bark", - "pattern": [ - "##", - "##" - ], "key": { "#": { "item": "malum:stripped_runewood_log" } }, + "pattern": [ + "##", + "##" + ], "result": { - "item": "malum:stripped_runewood", - "count": 3 - } + "count": 3, + "item": "malum:stripped_runewood" + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/stripped_soulwood.json b/src/generated/resources/data/malum/recipes/stripped_soulwood.json index eb67d5bd3..08e1b6fa5 100644 --- a/src/generated/resources/data/malum/recipes/stripped_soulwood.json +++ b/src/generated/resources/data/malum/recipes/stripped_soulwood.json @@ -1,17 +1,19 @@ { "type": "minecraft:crafting_shaped", + "category": "misc", "group": "bark", - "pattern": [ - "##", - "##" - ], "key": { "#": { "item": "malum:stripped_soulwood_log" } }, + "pattern": [ + "##", + "##" + ], "result": { - "item": "malum:stripped_soulwood", - "count": 3 - } + "count": 3, + "item": "malum:stripped_soulwood" + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/tainted_rock_brick_wall_stonecutting.json b/src/generated/resources/data/malum/recipes/tainted_rock_brick_wall_stonecutting.json index 7115b27a6..381b7bb25 100644 --- a/src/generated/resources/data/malum/recipes/tainted_rock_brick_wall_stonecutting.json +++ b/src/generated/resources/data/malum/recipes/tainted_rock_brick_wall_stonecutting.json @@ -1,8 +1,8 @@ { "type": "minecraft:stonecutting", + "count": 1, "ingredient": { "item": "malum:tainted_rock_bricks" }, - "result": "malum:tainted_rock_bricks_wall", - "count": 1 + "result": "malum:tainted_rock_bricks_wall" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/tainted_rock_bricks.json b/src/generated/resources/data/malum/recipes/tainted_rock_bricks.json index 659117aa3..1e16509d7 100644 --- a/src/generated/resources/data/malum/recipes/tainted_rock_bricks.json +++ b/src/generated/resources/data/malum/recipes/tainted_rock_bricks.json @@ -1,16 +1,18 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "##", - "##" - ], + "category": "misc", "key": { "#": { "item": "malum:polished_tainted_rock" } }, + "pattern": [ + "##", + "##" + ], "result": { - "item": "malum:tainted_rock_bricks", - "count": 4 - } + "count": 4, + "item": "malum:tainted_rock_bricks" + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/tainted_rock_bricks_from_small_bricks.json b/src/generated/resources/data/malum/recipes/tainted_rock_bricks_from_small_bricks.json index e1448fff0..81a821204 100644 --- a/src/generated/resources/data/malum/recipes/tainted_rock_bricks_from_small_bricks.json +++ b/src/generated/resources/data/malum/recipes/tainted_rock_bricks_from_small_bricks.json @@ -1,16 +1,18 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "##", - "##" - ], + "category": "misc", "key": { "#": { "item": "malum:small_tainted_rock_bricks" } }, + "pattern": [ + "##", + "##" + ], "result": { - "item": "malum:tainted_rock_bricks", - "count": 4 - } + "count": 4, + "item": "malum:tainted_rock_bricks" + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/tainted_rock_bricks_slab.json b/src/generated/resources/data/malum/recipes/tainted_rock_bricks_slab.json index 88c1a47b6..12c737544 100644 --- a/src/generated/resources/data/malum/recipes/tainted_rock_bricks_slab.json +++ b/src/generated/resources/data/malum/recipes/tainted_rock_bricks_slab.json @@ -1,15 +1,17 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "###" - ], + "category": "misc", "key": { "#": { "item": "malum:tainted_rock_bricks" } }, + "pattern": [ + "###" + ], "result": { - "item": "malum:tainted_rock_bricks_slab", - "count": 6 - } + "count": 6, + "item": "malum:tainted_rock_bricks_slab" + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/tainted_rock_bricks_slab_stonecutting.json b/src/generated/resources/data/malum/recipes/tainted_rock_bricks_slab_stonecutting.json index cff1d840a..a0df2ad53 100644 --- a/src/generated/resources/data/malum/recipes/tainted_rock_bricks_slab_stonecutting.json +++ b/src/generated/resources/data/malum/recipes/tainted_rock_bricks_slab_stonecutting.json @@ -1,8 +1,8 @@ { "type": "minecraft:stonecutting", + "count": 2, "ingredient": { "item": "malum:tainted_rock_bricks" }, - "result": "malum:tainted_rock_bricks_slab", - "count": 2 + "result": "malum:tainted_rock_bricks_slab" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/tainted_rock_bricks_stairs.json b/src/generated/resources/data/malum/recipes/tainted_rock_bricks_stairs.json index 9d04ec63c..3335cb018 100644 --- a/src/generated/resources/data/malum/recipes/tainted_rock_bricks_stairs.json +++ b/src/generated/resources/data/malum/recipes/tainted_rock_bricks_stairs.json @@ -1,17 +1,19 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "# ", - "## ", - "###" - ], + "category": "misc", "key": { "#": { "item": "malum:tainted_rock_bricks" } }, + "pattern": [ + "# ", + "## ", + "###" + ], "result": { - "item": "malum:tainted_rock_bricks_stairs", - "count": 4 - } + "count": 4, + "item": "malum:tainted_rock_bricks_stairs" + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/tainted_rock_bricks_stairs_stonecutting.json b/src/generated/resources/data/malum/recipes/tainted_rock_bricks_stairs_stonecutting.json index 632d150c5..98c403f70 100644 --- a/src/generated/resources/data/malum/recipes/tainted_rock_bricks_stairs_stonecutting.json +++ b/src/generated/resources/data/malum/recipes/tainted_rock_bricks_stairs_stonecutting.json @@ -1,8 +1,8 @@ { "type": "minecraft:stonecutting", + "count": 1, "ingredient": { "item": "malum:tainted_rock_bricks" }, - "result": "malum:tainted_rock_bricks_stairs", - "count": 1 + "result": "malum:tainted_rock_bricks_stairs" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/tainted_rock_bricks_stonecutting.json b/src/generated/resources/data/malum/recipes/tainted_rock_bricks_stonecutting.json index 52cd98a7d..ff2af3c4e 100644 --- a/src/generated/resources/data/malum/recipes/tainted_rock_bricks_stonecutting.json +++ b/src/generated/resources/data/malum/recipes/tainted_rock_bricks_stonecutting.json @@ -1,8 +1,8 @@ { "type": "minecraft:stonecutting", + "count": 1, "ingredient": { "item": "malum:tainted_rock" }, - "result": "malum:tainted_rock_bricks", - "count": 1 + "result": "malum:tainted_rock_bricks" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/tainted_rock_bricks_stonecutting_from_polished.json b/src/generated/resources/data/malum/recipes/tainted_rock_bricks_stonecutting_from_polished.json index 99e3a491f..bd664d2a6 100644 --- a/src/generated/resources/data/malum/recipes/tainted_rock_bricks_stonecutting_from_polished.json +++ b/src/generated/resources/data/malum/recipes/tainted_rock_bricks_stonecutting_from_polished.json @@ -1,8 +1,8 @@ { "type": "minecraft:stonecutting", + "count": 1, "ingredient": { "item": "malum:polished_tainted_rock" }, - "result": "malum:tainted_rock_bricks", - "count": 1 + "result": "malum:tainted_rock_bricks" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/tainted_rock_bricks_wall.json b/src/generated/resources/data/malum/recipes/tainted_rock_bricks_wall.json index 04623bfd9..9f8f7f342 100644 --- a/src/generated/resources/data/malum/recipes/tainted_rock_bricks_wall.json +++ b/src/generated/resources/data/malum/recipes/tainted_rock_bricks_wall.json @@ -1,16 +1,18 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "###", - "###" - ], + "category": "misc", "key": { "#": { "item": "malum:tainted_rock_bricks" } }, + "pattern": [ + "###", + "###" + ], "result": { - "item": "malum:tainted_rock_bricks_wall", - "count": 6 - } + "count": 6, + "item": "malum:tainted_rock_bricks_wall" + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/tainted_rock_button.json b/src/generated/resources/data/malum/recipes/tainted_rock_button.json index 8218b545b..dd4b496d1 100644 --- a/src/generated/resources/data/malum/recipes/tainted_rock_button.json +++ b/src/generated/resources/data/malum/recipes/tainted_rock_button.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ { "item": "malum:tainted_rock" diff --git a/src/generated/resources/data/malum/recipes/tainted_rock_column.json b/src/generated/resources/data/malum/recipes/tainted_rock_column.json index 4fb33c76c..af53f4a3e 100644 --- a/src/generated/resources/data/malum/recipes/tainted_rock_column.json +++ b/src/generated/resources/data/malum/recipes/tainted_rock_column.json @@ -1,16 +1,18 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "#", - "#" - ], + "category": "misc", "key": { "#": { "item": "malum:tainted_rock_bricks" } }, + "pattern": [ + "#", + "#" + ], "result": { - "item": "malum:tainted_rock_column", - "count": 2 - } + "count": 2, + "item": "malum:tainted_rock_column" + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/tainted_rock_column_cap.json b/src/generated/resources/data/malum/recipes/tainted_rock_column_cap.json index d5a01e65b..5d093c5d4 100644 --- a/src/generated/resources/data/malum/recipes/tainted_rock_column_cap.json +++ b/src/generated/resources/data/malum/recipes/tainted_rock_column_cap.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ { "item": "malum:tainted_rock_column" diff --git a/src/generated/resources/data/malum/recipes/tainted_rock_column_cap_stonecutting.json b/src/generated/resources/data/malum/recipes/tainted_rock_column_cap_stonecutting.json index fd8706a4b..fd4da4ef9 100644 --- a/src/generated/resources/data/malum/recipes/tainted_rock_column_cap_stonecutting.json +++ b/src/generated/resources/data/malum/recipes/tainted_rock_column_cap_stonecutting.json @@ -1,8 +1,8 @@ { "type": "minecraft:stonecutting", + "count": 1, "ingredient": { "item": "malum:tainted_rock" }, - "result": "malum:tainted_rock_column_cap", - "count": 1 + "result": "malum:tainted_rock_column_cap" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/tainted_rock_column_from_cap.json b/src/generated/resources/data/malum/recipes/tainted_rock_column_from_cap.json index 44c058cbc..3b71d6f4b 100644 --- a/src/generated/resources/data/malum/recipes/tainted_rock_column_from_cap.json +++ b/src/generated/resources/data/malum/recipes/tainted_rock_column_from_cap.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ { "item": "malum:tainted_rock_column_cap" diff --git a/src/generated/resources/data/malum/recipes/tainted_rock_column_stonecutting.json b/src/generated/resources/data/malum/recipes/tainted_rock_column_stonecutting.json index 1777f27ae..bfb3aa6a0 100644 --- a/src/generated/resources/data/malum/recipes/tainted_rock_column_stonecutting.json +++ b/src/generated/resources/data/malum/recipes/tainted_rock_column_stonecutting.json @@ -1,8 +1,8 @@ { "type": "minecraft:stonecutting", + "count": 1, "ingredient": { "item": "malum:tainted_rock" }, - "result": "malum:tainted_rock_column", - "count": 1 + "result": "malum:tainted_rock_column" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/tainted_rock_item_pedestal.json b/src/generated/resources/data/malum/recipes/tainted_rock_item_pedestal.json index ac7b50730..f354b242d 100644 --- a/src/generated/resources/data/malum/recipes/tainted_rock_item_pedestal.json +++ b/src/generated/resources/data/malum/recipes/tainted_rock_item_pedestal.json @@ -1,10 +1,6 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "YYY", - " X ", - "YYY" - ], + "category": "misc", "key": { "X": { "item": "malum:tainted_rock" @@ -13,7 +9,13 @@ "item": "malum:tainted_rock_slab" } }, + "pattern": [ + "YYY", + " X ", + "YYY" + ], "result": { "item": "malum:tainted_rock_item_pedestal" - } + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/tainted_rock_item_stand.json b/src/generated/resources/data/malum/recipes/tainted_rock_item_stand.json index 9bd153d9d..c81dcd3d2 100644 --- a/src/generated/resources/data/malum/recipes/tainted_rock_item_stand.json +++ b/src/generated/resources/data/malum/recipes/tainted_rock_item_stand.json @@ -1,9 +1,6 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "YYY", - "XXX" - ], + "category": "misc", "key": { "X": { "item": "malum:tainted_rock" @@ -12,8 +9,13 @@ "item": "malum:tainted_rock_slab" } }, + "pattern": [ + "YYY", + "XXX" + ], "result": { - "item": "malum:tainted_rock_item_stand", - "count": 2 - } + "count": 2, + "item": "malum:tainted_rock_item_stand" + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/tainted_rock_pressure_plate.json b/src/generated/resources/data/malum/recipes/tainted_rock_pressure_plate.json index 71a115a41..dd5939efe 100644 --- a/src/generated/resources/data/malum/recipes/tainted_rock_pressure_plate.json +++ b/src/generated/resources/data/malum/recipes/tainted_rock_pressure_plate.json @@ -1,14 +1,16 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "##" - ], + "category": "misc", "key": { "#": { "item": "malum:tainted_rock" } }, + "pattern": [ + "##" + ], "result": { "item": "malum:tainted_rock_pressure_plate" - } + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/tainted_rock_slab.json b/src/generated/resources/data/malum/recipes/tainted_rock_slab.json index 60ef077e8..ef4575abe 100644 --- a/src/generated/resources/data/malum/recipes/tainted_rock_slab.json +++ b/src/generated/resources/data/malum/recipes/tainted_rock_slab.json @@ -1,15 +1,17 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "###" - ], + "category": "misc", "key": { "#": { "item": "malum:tainted_rock" } }, + "pattern": [ + "###" + ], "result": { - "item": "malum:tainted_rock_slab", - "count": 6 - } + "count": 6, + "item": "malum:tainted_rock_slab" + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/tainted_rock_slab_stonecutting.json b/src/generated/resources/data/malum/recipes/tainted_rock_slab_stonecutting.json index 5e5479605..dade65d14 100644 --- a/src/generated/resources/data/malum/recipes/tainted_rock_slab_stonecutting.json +++ b/src/generated/resources/data/malum/recipes/tainted_rock_slab_stonecutting.json @@ -1,8 +1,8 @@ { "type": "minecraft:stonecutting", + "count": 2, "ingredient": { "item": "malum:tainted_rock" }, - "result": "malum:tainted_rock_slab", - "count": 2 + "result": "malum:tainted_rock_slab" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/tainted_rock_stairs.json b/src/generated/resources/data/malum/recipes/tainted_rock_stairs.json index 41f48bc5e..17e23a26d 100644 --- a/src/generated/resources/data/malum/recipes/tainted_rock_stairs.json +++ b/src/generated/resources/data/malum/recipes/tainted_rock_stairs.json @@ -1,17 +1,19 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "# ", - "## ", - "###" - ], + "category": "misc", "key": { "#": { "item": "malum:tainted_rock" } }, + "pattern": [ + "# ", + "## ", + "###" + ], "result": { - "item": "malum:tainted_rock_stairs", - "count": 4 - } + "count": 4, + "item": "malum:tainted_rock_stairs" + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/tainted_rock_stairs_stonecutting.json b/src/generated/resources/data/malum/recipes/tainted_rock_stairs_stonecutting.json index 17c48e1e3..062203d79 100644 --- a/src/generated/resources/data/malum/recipes/tainted_rock_stairs_stonecutting.json +++ b/src/generated/resources/data/malum/recipes/tainted_rock_stairs_stonecutting.json @@ -1,8 +1,8 @@ { "type": "minecraft:stonecutting", + "count": 1, "ingredient": { "item": "malum:tainted_rock" }, - "result": "malum:tainted_rock_stairs", - "count": 1 + "result": "malum:tainted_rock_stairs" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/tainted_rock_tiles.json b/src/generated/resources/data/malum/recipes/tainted_rock_tiles.json index 6b19cea29..1bb2d1522 100644 --- a/src/generated/resources/data/malum/recipes/tainted_rock_tiles.json +++ b/src/generated/resources/data/malum/recipes/tainted_rock_tiles.json @@ -1,16 +1,18 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "##", - "##" - ], + "category": "misc", "key": { "#": { "item": "malum:tainted_rock_bricks" } }, + "pattern": [ + "##", + "##" + ], "result": { - "item": "malum:tainted_rock_tiles", - "count": 4 - } + "count": 4, + "item": "malum:tainted_rock_tiles" + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/tainted_rock_tiles_slab.json b/src/generated/resources/data/malum/recipes/tainted_rock_tiles_slab.json index e24d2d129..3cb9ff213 100644 --- a/src/generated/resources/data/malum/recipes/tainted_rock_tiles_slab.json +++ b/src/generated/resources/data/malum/recipes/tainted_rock_tiles_slab.json @@ -1,15 +1,17 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "###" - ], + "category": "misc", "key": { "#": { "item": "malum:tainted_rock_tiles" } }, + "pattern": [ + "###" + ], "result": { - "item": "malum:tainted_rock_tiles_slab", - "count": 6 - } + "count": 6, + "item": "malum:tainted_rock_tiles_slab" + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/tainted_rock_tiles_slab_stonecutting.json b/src/generated/resources/data/malum/recipes/tainted_rock_tiles_slab_stonecutting.json index 4a7752b0e..a0a1dcc54 100644 --- a/src/generated/resources/data/malum/recipes/tainted_rock_tiles_slab_stonecutting.json +++ b/src/generated/resources/data/malum/recipes/tainted_rock_tiles_slab_stonecutting.json @@ -1,8 +1,8 @@ { "type": "minecraft:stonecutting", + "count": 2, "ingredient": { "item": "malum:tainted_rock_tiles" }, - "result": "malum:tainted_rock_tiles_slab", - "count": 2 + "result": "malum:tainted_rock_tiles_slab" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/tainted_rock_tiles_stairs.json b/src/generated/resources/data/malum/recipes/tainted_rock_tiles_stairs.json index 4f2ab9df1..3df204c73 100644 --- a/src/generated/resources/data/malum/recipes/tainted_rock_tiles_stairs.json +++ b/src/generated/resources/data/malum/recipes/tainted_rock_tiles_stairs.json @@ -1,17 +1,19 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "# ", - "## ", - "###" - ], + "category": "misc", "key": { "#": { "item": "malum:tainted_rock_tiles" } }, + "pattern": [ + "# ", + "## ", + "###" + ], "result": { - "item": "malum:tainted_rock_tiles_stairs", - "count": 4 - } + "count": 4, + "item": "malum:tainted_rock_tiles_stairs" + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/tainted_rock_tiles_stairs_stonecutting.json b/src/generated/resources/data/malum/recipes/tainted_rock_tiles_stairs_stonecutting.json index e7dde3eac..0df5d1b81 100644 --- a/src/generated/resources/data/malum/recipes/tainted_rock_tiles_stairs_stonecutting.json +++ b/src/generated/resources/data/malum/recipes/tainted_rock_tiles_stairs_stonecutting.json @@ -1,8 +1,8 @@ { "type": "minecraft:stonecutting", + "count": 1, "ingredient": { "item": "malum:tainted_rock_tiles" }, - "result": "malum:tainted_rock_tiles_stairs", - "count": 1 + "result": "malum:tainted_rock_tiles_stairs" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/tainted_rock_tiles_stonecutting.json b/src/generated/resources/data/malum/recipes/tainted_rock_tiles_stonecutting.json index 5dad32be0..358e89b3c 100644 --- a/src/generated/resources/data/malum/recipes/tainted_rock_tiles_stonecutting.json +++ b/src/generated/resources/data/malum/recipes/tainted_rock_tiles_stonecutting.json @@ -1,8 +1,8 @@ { "type": "minecraft:stonecutting", + "count": 1, "ingredient": { "item": "malum:tainted_rock" }, - "result": "malum:tainted_rock_tiles", - "count": 1 + "result": "malum:tainted_rock_tiles" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/tainted_rock_tiles_stonecutting_from_bricks.json b/src/generated/resources/data/malum/recipes/tainted_rock_tiles_stonecutting_from_bricks.json index d15e68faf..2545fb966 100644 --- a/src/generated/resources/data/malum/recipes/tainted_rock_tiles_stonecutting_from_bricks.json +++ b/src/generated/resources/data/malum/recipes/tainted_rock_tiles_stonecutting_from_bricks.json @@ -1,8 +1,8 @@ { "type": "minecraft:stonecutting", + "count": 1, "ingredient": { "item": "malum:tainted_rock_bricks" }, - "result": "malum:tainted_rock_tiles", - "count": 1 + "result": "malum:tainted_rock_tiles" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/tainted_rock_tiles_stonecutting_from_polished.json b/src/generated/resources/data/malum/recipes/tainted_rock_tiles_stonecutting_from_polished.json index 746d11c60..ef3673fe3 100644 --- a/src/generated/resources/data/malum/recipes/tainted_rock_tiles_stonecutting_from_polished.json +++ b/src/generated/resources/data/malum/recipes/tainted_rock_tiles_stonecutting_from_polished.json @@ -1,8 +1,8 @@ { "type": "minecraft:stonecutting", + "count": 1, "ingredient": { "item": "malum:polished_tainted_rock" }, - "result": "malum:tainted_rock_tiles", - "count": 1 + "result": "malum:tainted_rock_tiles" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/tainted_rock_tiles_wall.json b/src/generated/resources/data/malum/recipes/tainted_rock_tiles_wall.json index de51302aa..a759c78a8 100644 --- a/src/generated/resources/data/malum/recipes/tainted_rock_tiles_wall.json +++ b/src/generated/resources/data/malum/recipes/tainted_rock_tiles_wall.json @@ -1,16 +1,18 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "###", - "###" - ], + "category": "misc", "key": { "#": { "item": "malum:tainted_rock_tiles" } }, + "pattern": [ + "###", + "###" + ], "result": { - "item": "malum:tainted_rock_tiles_wall", - "count": 6 - } + "count": 6, + "item": "malum:tainted_rock_tiles_wall" + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/tainted_rock_tiles_wall_stonecutting.json b/src/generated/resources/data/malum/recipes/tainted_rock_tiles_wall_stonecutting.json index e4504ef20..9fd42ee5f 100644 --- a/src/generated/resources/data/malum/recipes/tainted_rock_tiles_wall_stonecutting.json +++ b/src/generated/resources/data/malum/recipes/tainted_rock_tiles_wall_stonecutting.json @@ -1,8 +1,8 @@ { "type": "minecraft:stonecutting", + "count": 1, "ingredient": { "item": "malum:tainted_rock_tiles" }, - "result": "malum:tainted_rock_tiles_wall", - "count": 1 + "result": "malum:tainted_rock_tiles_wall" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/tainted_rock_wall.json b/src/generated/resources/data/malum/recipes/tainted_rock_wall.json index 880358dc9..e1dcb467a 100644 --- a/src/generated/resources/data/malum/recipes/tainted_rock_wall.json +++ b/src/generated/resources/data/malum/recipes/tainted_rock_wall.json @@ -1,16 +1,18 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "###", - "###" - ], + "category": "misc", "key": { "#": { "item": "malum:tainted_rock" } }, + "pattern": [ + "###", + "###" + ], "result": { - "item": "malum:tainted_rock_wall", - "count": 6 - } + "count": 6, + "item": "malum:tainted_rock_wall" + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/tainted_rock_wall_stonecutting.json b/src/generated/resources/data/malum/recipes/tainted_rock_wall_stonecutting.json index aad7c72b6..ecb8b95c9 100644 --- a/src/generated/resources/data/malum/recipes/tainted_rock_wall_stonecutting.json +++ b/src/generated/resources/data/malum/recipes/tainted_rock_wall_stonecutting.json @@ -1,8 +1,8 @@ { "type": "minecraft:stonecutting", + "count": 1, "ingredient": { "item": "malum:tainted_rock" }, - "result": "malum:tainted_rock_wall", - "count": 1 + "result": "malum:tainted_rock_wall" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/the_device.json b/src/generated/resources/data/malum/recipes/the_device.json index d46a67e97..ea7b29b8c 100644 --- a/src/generated/resources/data/malum/recipes/the_device.json +++ b/src/generated/resources/data/malum/recipes/the_device.json @@ -1,10 +1,6 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "XYX", - "YXY", - "XYX" - ], + "category": "misc", "key": { "X": { "item": "malum:twisted_rock" @@ -13,7 +9,13 @@ "item": "malum:tainted_rock" } }, + "pattern": [ + "XYX", + "YXY", + "XYX" + ], "result": { "item": "malum:the_device" - } + }, + "show_notification": false } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/tin_from_node_blasting.json b/src/generated/resources/data/malum/recipes/tin_from_node_blasting.json index 7eb4862b8..93573c727 100644 --- a/src/generated/resources/data/malum/recipes/tin_from_node_blasting.json +++ b/src/generated/resources/data/malum/recipes/tin_from_node_blasting.json @@ -4,24 +4,24 @@ { "conditions": [ { + "type": "forge:not", "value": { - "tag": "forge:nuggets/tin", - "type": "forge:tag_empty" - }, - "type": "forge:not" + "type": "forge:tag_empty", + "tag": "forge:nuggets/tin" + } } ], "recipe": { "type": "malum:node_blasting", + "cookingtime": 100, + "experience": 0.25, "ingredient": { "item": "malum:tin_node" }, "result": { - "tag": "forge:nuggets/tin", - "count": 6 - }, - "experience": 0.25, - "cookingtime": 100 + "count": 6, + "tag": "forge:nuggets/tin" + } } } ] diff --git a/src/generated/resources/data/malum/recipes/tin_from_node_smelting.json b/src/generated/resources/data/malum/recipes/tin_from_node_smelting.json index c6f2821e4..cfd65b901 100644 --- a/src/generated/resources/data/malum/recipes/tin_from_node_smelting.json +++ b/src/generated/resources/data/malum/recipes/tin_from_node_smelting.json @@ -4,24 +4,24 @@ { "conditions": [ { + "type": "forge:not", "value": { - "tag": "forge:nuggets/tin", - "type": "forge:tag_empty" - }, - "type": "forge:not" + "type": "forge:tag_empty", + "tag": "forge:nuggets/tin" + } } ], "recipe": { "type": "malum:node_smelting", + "cookingtime": 200, + "experience": 0.25, "ingredient": { "item": "malum:tin_node" }, "result": { - "tag": "forge:nuggets/tin", - "count": 6 - }, - "experience": 0.25, - "cookingtime": 200 + "count": 6, + "tag": "forge:nuggets/tin" + } } } ] diff --git a/src/generated/resources/data/malum/recipes/trans_prideweave.json b/src/generated/resources/data/malum/recipes/trans_prideweave.json index 2ebdfd227..bebd9f5ae 100644 --- a/src/generated/resources/data/malum/recipes/trans_prideweave.json +++ b/src/generated/resources/data/malum/recipes/trans_prideweave.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ { "item": "malum:esoteric_spool" diff --git a/src/generated/resources/data/malum/recipes/twisted_rock_brick_wall_stonecutting.json b/src/generated/resources/data/malum/recipes/twisted_rock_brick_wall_stonecutting.json index 8e496dcc7..90d645309 100644 --- a/src/generated/resources/data/malum/recipes/twisted_rock_brick_wall_stonecutting.json +++ b/src/generated/resources/data/malum/recipes/twisted_rock_brick_wall_stonecutting.json @@ -1,8 +1,8 @@ { "type": "minecraft:stonecutting", + "count": 1, "ingredient": { "item": "malum:twisted_rock_bricks" }, - "result": "malum:twisted_rock_bricks_wall", - "count": 1 + "result": "malum:twisted_rock_bricks_wall" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/twisted_rock_bricks.json b/src/generated/resources/data/malum/recipes/twisted_rock_bricks.json index 42cc8a1fa..1da8fde26 100644 --- a/src/generated/resources/data/malum/recipes/twisted_rock_bricks.json +++ b/src/generated/resources/data/malum/recipes/twisted_rock_bricks.json @@ -1,16 +1,18 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "##", - "##" - ], + "category": "misc", "key": { "#": { "item": "malum:polished_twisted_rock" } }, + "pattern": [ + "##", + "##" + ], "result": { - "item": "malum:twisted_rock_bricks", - "count": 4 - } + "count": 4, + "item": "malum:twisted_rock_bricks" + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/twisted_rock_bricks_from_small_bricks.json b/src/generated/resources/data/malum/recipes/twisted_rock_bricks_from_small_bricks.json index 3ce8fdbe7..8f44be65c 100644 --- a/src/generated/resources/data/malum/recipes/twisted_rock_bricks_from_small_bricks.json +++ b/src/generated/resources/data/malum/recipes/twisted_rock_bricks_from_small_bricks.json @@ -1,16 +1,18 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "##", - "##" - ], + "category": "misc", "key": { "#": { "item": "malum:small_twisted_rock_bricks" } }, + "pattern": [ + "##", + "##" + ], "result": { - "item": "malum:twisted_rock_bricks", - "count": 4 - } + "count": 4, + "item": "malum:twisted_rock_bricks" + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/twisted_rock_bricks_slab.json b/src/generated/resources/data/malum/recipes/twisted_rock_bricks_slab.json index 517d18ba1..839e8cdba 100644 --- a/src/generated/resources/data/malum/recipes/twisted_rock_bricks_slab.json +++ b/src/generated/resources/data/malum/recipes/twisted_rock_bricks_slab.json @@ -1,15 +1,17 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "###" - ], + "category": "misc", "key": { "#": { "item": "malum:twisted_rock_bricks" } }, + "pattern": [ + "###" + ], "result": { - "item": "malum:twisted_rock_bricks_slab", - "count": 6 - } + "count": 6, + "item": "malum:twisted_rock_bricks_slab" + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/twisted_rock_bricks_slab_stonecutting.json b/src/generated/resources/data/malum/recipes/twisted_rock_bricks_slab_stonecutting.json index 7e574650b..572ed4d40 100644 --- a/src/generated/resources/data/malum/recipes/twisted_rock_bricks_slab_stonecutting.json +++ b/src/generated/resources/data/malum/recipes/twisted_rock_bricks_slab_stonecutting.json @@ -1,8 +1,8 @@ { "type": "minecraft:stonecutting", + "count": 2, "ingredient": { "item": "malum:twisted_rock_bricks" }, - "result": "malum:twisted_rock_bricks_slab", - "count": 2 + "result": "malum:twisted_rock_bricks_slab" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/twisted_rock_bricks_stairs.json b/src/generated/resources/data/malum/recipes/twisted_rock_bricks_stairs.json index b6a9402a1..38da274a3 100644 --- a/src/generated/resources/data/malum/recipes/twisted_rock_bricks_stairs.json +++ b/src/generated/resources/data/malum/recipes/twisted_rock_bricks_stairs.json @@ -1,17 +1,19 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "# ", - "## ", - "###" - ], + "category": "misc", "key": { "#": { "item": "malum:twisted_rock_bricks" } }, + "pattern": [ + "# ", + "## ", + "###" + ], "result": { - "item": "malum:twisted_rock_bricks_stairs", - "count": 4 - } + "count": 4, + "item": "malum:twisted_rock_bricks_stairs" + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/twisted_rock_bricks_stairs_stonecutting.json b/src/generated/resources/data/malum/recipes/twisted_rock_bricks_stairs_stonecutting.json index 71492b1b9..0ff5087f3 100644 --- a/src/generated/resources/data/malum/recipes/twisted_rock_bricks_stairs_stonecutting.json +++ b/src/generated/resources/data/malum/recipes/twisted_rock_bricks_stairs_stonecutting.json @@ -1,8 +1,8 @@ { "type": "minecraft:stonecutting", + "count": 1, "ingredient": { "item": "malum:twisted_rock_bricks" }, - "result": "malum:twisted_rock_bricks_stairs", - "count": 1 + "result": "malum:twisted_rock_bricks_stairs" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/twisted_rock_bricks_stonecutting.json b/src/generated/resources/data/malum/recipes/twisted_rock_bricks_stonecutting.json index ef054e1ac..a7b18c7f2 100644 --- a/src/generated/resources/data/malum/recipes/twisted_rock_bricks_stonecutting.json +++ b/src/generated/resources/data/malum/recipes/twisted_rock_bricks_stonecutting.json @@ -1,8 +1,8 @@ { "type": "minecraft:stonecutting", + "count": 1, "ingredient": { "item": "malum:twisted_rock" }, - "result": "malum:twisted_rock_bricks", - "count": 1 + "result": "malum:twisted_rock_bricks" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/twisted_rock_bricks_stonecutting_from_polished.json b/src/generated/resources/data/malum/recipes/twisted_rock_bricks_stonecutting_from_polished.json index 467c6f78b..1778f8eee 100644 --- a/src/generated/resources/data/malum/recipes/twisted_rock_bricks_stonecutting_from_polished.json +++ b/src/generated/resources/data/malum/recipes/twisted_rock_bricks_stonecutting_from_polished.json @@ -1,8 +1,8 @@ { "type": "minecraft:stonecutting", + "count": 1, "ingredient": { "item": "malum:polished_twisted_rock" }, - "result": "malum:twisted_rock_bricks", - "count": 1 + "result": "malum:twisted_rock_bricks" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/twisted_rock_bricks_wall.json b/src/generated/resources/data/malum/recipes/twisted_rock_bricks_wall.json index 4d2541b02..a6d2a4e69 100644 --- a/src/generated/resources/data/malum/recipes/twisted_rock_bricks_wall.json +++ b/src/generated/resources/data/malum/recipes/twisted_rock_bricks_wall.json @@ -1,16 +1,18 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "###", - "###" - ], + "category": "misc", "key": { "#": { "item": "malum:twisted_rock_bricks" } }, + "pattern": [ + "###", + "###" + ], "result": { - "item": "malum:twisted_rock_bricks_wall", - "count": 6 - } + "count": 6, + "item": "malum:twisted_rock_bricks_wall" + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/twisted_rock_button.json b/src/generated/resources/data/malum/recipes/twisted_rock_button.json index 9c92f1f4e..98804eee5 100644 --- a/src/generated/resources/data/malum/recipes/twisted_rock_button.json +++ b/src/generated/resources/data/malum/recipes/twisted_rock_button.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ { "item": "malum:twisted_rock" diff --git a/src/generated/resources/data/malum/recipes/twisted_rock_column.json b/src/generated/resources/data/malum/recipes/twisted_rock_column.json index cd8ff8884..f95b39e03 100644 --- a/src/generated/resources/data/malum/recipes/twisted_rock_column.json +++ b/src/generated/resources/data/malum/recipes/twisted_rock_column.json @@ -1,16 +1,18 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "#", - "#" - ], + "category": "misc", "key": { "#": { "item": "malum:twisted_rock_bricks" } }, + "pattern": [ + "#", + "#" + ], "result": { - "item": "malum:twisted_rock_column", - "count": 2 - } + "count": 2, + "item": "malum:twisted_rock_column" + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/twisted_rock_column_cap.json b/src/generated/resources/data/malum/recipes/twisted_rock_column_cap.json index e23372f8b..99d0acdc4 100644 --- a/src/generated/resources/data/malum/recipes/twisted_rock_column_cap.json +++ b/src/generated/resources/data/malum/recipes/twisted_rock_column_cap.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ { "item": "malum:twisted_rock_column" diff --git a/src/generated/resources/data/malum/recipes/twisted_rock_column_cap_stonecutting.json b/src/generated/resources/data/malum/recipes/twisted_rock_column_cap_stonecutting.json index f884d554e..b78d040d9 100644 --- a/src/generated/resources/data/malum/recipes/twisted_rock_column_cap_stonecutting.json +++ b/src/generated/resources/data/malum/recipes/twisted_rock_column_cap_stonecutting.json @@ -1,8 +1,8 @@ { "type": "minecraft:stonecutting", + "count": 1, "ingredient": { "item": "malum:twisted_rock" }, - "result": "malum:twisted_rock_column_cap", - "count": 1 + "result": "malum:twisted_rock_column_cap" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/twisted_rock_column_from_cap.json b/src/generated/resources/data/malum/recipes/twisted_rock_column_from_cap.json index 507a621fa..886529764 100644 --- a/src/generated/resources/data/malum/recipes/twisted_rock_column_from_cap.json +++ b/src/generated/resources/data/malum/recipes/twisted_rock_column_from_cap.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ { "item": "malum:twisted_rock_column_cap" diff --git a/src/generated/resources/data/malum/recipes/twisted_rock_column_stonecutting.json b/src/generated/resources/data/malum/recipes/twisted_rock_column_stonecutting.json index d6cd02d60..bed125d0e 100644 --- a/src/generated/resources/data/malum/recipes/twisted_rock_column_stonecutting.json +++ b/src/generated/resources/data/malum/recipes/twisted_rock_column_stonecutting.json @@ -1,8 +1,8 @@ { "type": "minecraft:stonecutting", + "count": 1, "ingredient": { "item": "malum:twisted_rock" }, - "result": "malum:twisted_rock_column", - "count": 1 + "result": "malum:twisted_rock_column" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/twisted_rock_item_pedestal.json b/src/generated/resources/data/malum/recipes/twisted_rock_item_pedestal.json index 26799575a..74c9269d8 100644 --- a/src/generated/resources/data/malum/recipes/twisted_rock_item_pedestal.json +++ b/src/generated/resources/data/malum/recipes/twisted_rock_item_pedestal.json @@ -1,10 +1,6 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "YYY", - " X ", - "YYY" - ], + "category": "misc", "key": { "X": { "item": "malum:twisted_rock" @@ -13,7 +9,13 @@ "item": "malum:twisted_rock_slab" } }, + "pattern": [ + "YYY", + " X ", + "YYY" + ], "result": { "item": "malum:twisted_rock_item_pedestal" - } + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/twisted_rock_item_stand.json b/src/generated/resources/data/malum/recipes/twisted_rock_item_stand.json index 6e71c66db..189f6614c 100644 --- a/src/generated/resources/data/malum/recipes/twisted_rock_item_stand.json +++ b/src/generated/resources/data/malum/recipes/twisted_rock_item_stand.json @@ -1,9 +1,6 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "YYY", - "XXX" - ], + "category": "misc", "key": { "X": { "item": "malum:twisted_rock" @@ -12,8 +9,13 @@ "item": "malum:twisted_rock_slab" } }, + "pattern": [ + "YYY", + "XXX" + ], "result": { - "item": "malum:twisted_rock_item_stand", - "count": 2 - } + "count": 2, + "item": "malum:twisted_rock_item_stand" + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/twisted_rock_pressure_plate.json b/src/generated/resources/data/malum/recipes/twisted_rock_pressure_plate.json index ed759327b..39bced147 100644 --- a/src/generated/resources/data/malum/recipes/twisted_rock_pressure_plate.json +++ b/src/generated/resources/data/malum/recipes/twisted_rock_pressure_plate.json @@ -1,14 +1,16 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "##" - ], + "category": "misc", "key": { "#": { "item": "malum:twisted_rock" } }, + "pattern": [ + "##" + ], "result": { "item": "malum:twisted_rock_pressure_plate" - } + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/twisted_rock_slab.json b/src/generated/resources/data/malum/recipes/twisted_rock_slab.json index f09f64622..8cf0da53a 100644 --- a/src/generated/resources/data/malum/recipes/twisted_rock_slab.json +++ b/src/generated/resources/data/malum/recipes/twisted_rock_slab.json @@ -1,15 +1,17 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "###" - ], + "category": "misc", "key": { "#": { "item": "malum:twisted_rock" } }, + "pattern": [ + "###" + ], "result": { - "item": "malum:twisted_rock_slab", - "count": 6 - } + "count": 6, + "item": "malum:twisted_rock_slab" + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/twisted_rock_slab_stonecutting.json b/src/generated/resources/data/malum/recipes/twisted_rock_slab_stonecutting.json index 8efc32a03..8998522e7 100644 --- a/src/generated/resources/data/malum/recipes/twisted_rock_slab_stonecutting.json +++ b/src/generated/resources/data/malum/recipes/twisted_rock_slab_stonecutting.json @@ -1,8 +1,8 @@ { "type": "minecraft:stonecutting", + "count": 2, "ingredient": { "item": "malum:twisted_rock" }, - "result": "malum:twisted_rock_slab", - "count": 2 + "result": "malum:twisted_rock_slab" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/twisted_rock_stairs.json b/src/generated/resources/data/malum/recipes/twisted_rock_stairs.json index f3d89d022..10af9e053 100644 --- a/src/generated/resources/data/malum/recipes/twisted_rock_stairs.json +++ b/src/generated/resources/data/malum/recipes/twisted_rock_stairs.json @@ -1,17 +1,19 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "# ", - "## ", - "###" - ], + "category": "misc", "key": { "#": { "item": "malum:twisted_rock" } }, + "pattern": [ + "# ", + "## ", + "###" + ], "result": { - "item": "malum:twisted_rock_stairs", - "count": 4 - } + "count": 4, + "item": "malum:twisted_rock_stairs" + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/twisted_rock_stairs_stonecutting.json b/src/generated/resources/data/malum/recipes/twisted_rock_stairs_stonecutting.json index 91dc27d53..b8f96a151 100644 --- a/src/generated/resources/data/malum/recipes/twisted_rock_stairs_stonecutting.json +++ b/src/generated/resources/data/malum/recipes/twisted_rock_stairs_stonecutting.json @@ -1,8 +1,8 @@ { "type": "minecraft:stonecutting", + "count": 1, "ingredient": { "item": "malum:twisted_rock" }, - "result": "malum:twisted_rock_stairs", - "count": 1 + "result": "malum:twisted_rock_stairs" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/twisted_rock_tiles.json b/src/generated/resources/data/malum/recipes/twisted_rock_tiles.json index 54eb49bdc..acb7a7996 100644 --- a/src/generated/resources/data/malum/recipes/twisted_rock_tiles.json +++ b/src/generated/resources/data/malum/recipes/twisted_rock_tiles.json @@ -1,16 +1,18 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "##", - "##" - ], + "category": "misc", "key": { "#": { "item": "malum:twisted_rock_bricks" } }, + "pattern": [ + "##", + "##" + ], "result": { - "item": "malum:twisted_rock_tiles", - "count": 4 - } + "count": 4, + "item": "malum:twisted_rock_tiles" + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/twisted_rock_tiles_slab.json b/src/generated/resources/data/malum/recipes/twisted_rock_tiles_slab.json index e6a317011..95b1b9324 100644 --- a/src/generated/resources/data/malum/recipes/twisted_rock_tiles_slab.json +++ b/src/generated/resources/data/malum/recipes/twisted_rock_tiles_slab.json @@ -1,15 +1,17 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "###" - ], + "category": "misc", "key": { "#": { "item": "malum:twisted_rock_tiles" } }, + "pattern": [ + "###" + ], "result": { - "item": "malum:twisted_rock_tiles_slab", - "count": 6 - } + "count": 6, + "item": "malum:twisted_rock_tiles_slab" + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/twisted_rock_tiles_slab_stonecutting.json b/src/generated/resources/data/malum/recipes/twisted_rock_tiles_slab_stonecutting.json index 2516a1c0b..f5c74e2b9 100644 --- a/src/generated/resources/data/malum/recipes/twisted_rock_tiles_slab_stonecutting.json +++ b/src/generated/resources/data/malum/recipes/twisted_rock_tiles_slab_stonecutting.json @@ -1,8 +1,8 @@ { "type": "minecraft:stonecutting", + "count": 2, "ingredient": { "item": "malum:twisted_rock_tiles" }, - "result": "malum:twisted_rock_tiles_slab", - "count": 2 + "result": "malum:twisted_rock_tiles_slab" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/twisted_rock_tiles_stairs.json b/src/generated/resources/data/malum/recipes/twisted_rock_tiles_stairs.json index ff55f3842..388a9be61 100644 --- a/src/generated/resources/data/malum/recipes/twisted_rock_tiles_stairs.json +++ b/src/generated/resources/data/malum/recipes/twisted_rock_tiles_stairs.json @@ -1,17 +1,19 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "# ", - "## ", - "###" - ], + "category": "misc", "key": { "#": { "item": "malum:twisted_rock_tiles" } }, + "pattern": [ + "# ", + "## ", + "###" + ], "result": { - "item": "malum:twisted_rock_tiles_stairs", - "count": 4 - } + "count": 4, + "item": "malum:twisted_rock_tiles_stairs" + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/twisted_rock_tiles_stairs_stonecutting.json b/src/generated/resources/data/malum/recipes/twisted_rock_tiles_stairs_stonecutting.json index c9fac7520..17128fbbe 100644 --- a/src/generated/resources/data/malum/recipes/twisted_rock_tiles_stairs_stonecutting.json +++ b/src/generated/resources/data/malum/recipes/twisted_rock_tiles_stairs_stonecutting.json @@ -1,8 +1,8 @@ { "type": "minecraft:stonecutting", + "count": 1, "ingredient": { "item": "malum:twisted_rock_tiles" }, - "result": "malum:twisted_rock_tiles_stairs", - "count": 1 + "result": "malum:twisted_rock_tiles_stairs" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/twisted_rock_tiles_stonecutting.json b/src/generated/resources/data/malum/recipes/twisted_rock_tiles_stonecutting.json index c1b3e2550..9a60a2a19 100644 --- a/src/generated/resources/data/malum/recipes/twisted_rock_tiles_stonecutting.json +++ b/src/generated/resources/data/malum/recipes/twisted_rock_tiles_stonecutting.json @@ -1,8 +1,8 @@ { "type": "minecraft:stonecutting", + "count": 1, "ingredient": { "item": "malum:twisted_rock" }, - "result": "malum:twisted_rock_tiles", - "count": 1 + "result": "malum:twisted_rock_tiles" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/twisted_rock_tiles_stonecutting_from_bricks.json b/src/generated/resources/data/malum/recipes/twisted_rock_tiles_stonecutting_from_bricks.json index f7b5d27ec..aa9093279 100644 --- a/src/generated/resources/data/malum/recipes/twisted_rock_tiles_stonecutting_from_bricks.json +++ b/src/generated/resources/data/malum/recipes/twisted_rock_tiles_stonecutting_from_bricks.json @@ -1,8 +1,8 @@ { "type": "minecraft:stonecutting", + "count": 1, "ingredient": { "item": "malum:twisted_rock_bricks" }, - "result": "malum:twisted_rock_tiles", - "count": 1 + "result": "malum:twisted_rock_tiles" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/twisted_rock_tiles_stonecutting_from_polished.json b/src/generated/resources/data/malum/recipes/twisted_rock_tiles_stonecutting_from_polished.json index 28de1cc24..d0c134b08 100644 --- a/src/generated/resources/data/malum/recipes/twisted_rock_tiles_stonecutting_from_polished.json +++ b/src/generated/resources/data/malum/recipes/twisted_rock_tiles_stonecutting_from_polished.json @@ -1,8 +1,8 @@ { "type": "minecraft:stonecutting", + "count": 1, "ingredient": { "item": "malum:polished_twisted_rock" }, - "result": "malum:twisted_rock_tiles", - "count": 1 + "result": "malum:twisted_rock_tiles" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/twisted_rock_tiles_wall.json b/src/generated/resources/data/malum/recipes/twisted_rock_tiles_wall.json index 8b3852856..847897fc4 100644 --- a/src/generated/resources/data/malum/recipes/twisted_rock_tiles_wall.json +++ b/src/generated/resources/data/malum/recipes/twisted_rock_tiles_wall.json @@ -1,16 +1,18 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "###", - "###" - ], + "category": "misc", "key": { "#": { "item": "malum:twisted_rock_tiles" } }, + "pattern": [ + "###", + "###" + ], "result": { - "item": "malum:twisted_rock_tiles_wall", - "count": 6 - } + "count": 6, + "item": "malum:twisted_rock_tiles_wall" + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/twisted_rock_tiles_wall_stonecutting.json b/src/generated/resources/data/malum/recipes/twisted_rock_tiles_wall_stonecutting.json index db0a490ab..39ea96a22 100644 --- a/src/generated/resources/data/malum/recipes/twisted_rock_tiles_wall_stonecutting.json +++ b/src/generated/resources/data/malum/recipes/twisted_rock_tiles_wall_stonecutting.json @@ -1,8 +1,8 @@ { "type": "minecraft:stonecutting", + "count": 1, "ingredient": { "item": "malum:twisted_rock_tiles" }, - "result": "malum:twisted_rock_tiles_wall", - "count": 1 + "result": "malum:twisted_rock_tiles_wall" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/twisted_rock_wall.json b/src/generated/resources/data/malum/recipes/twisted_rock_wall.json index d1a4c7308..cdb56276d 100644 --- a/src/generated/resources/data/malum/recipes/twisted_rock_wall.json +++ b/src/generated/resources/data/malum/recipes/twisted_rock_wall.json @@ -1,16 +1,18 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "###", - "###" - ], + "category": "misc", "key": { "#": { "item": "malum:twisted_rock" } }, + "pattern": [ + "###", + "###" + ], "result": { - "item": "malum:twisted_rock_wall", - "count": 6 - } + "count": 6, + "item": "malum:twisted_rock_wall" + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/twisted_rock_wall_stonecutting.json b/src/generated/resources/data/malum/recipes/twisted_rock_wall_stonecutting.json index d5cb7cdeb..0894c5b4d 100644 --- a/src/generated/resources/data/malum/recipes/twisted_rock_wall_stonecutting.json +++ b/src/generated/resources/data/malum/recipes/twisted_rock_wall_stonecutting.json @@ -1,8 +1,8 @@ { "type": "minecraft:stonecutting", + "count": 1, "ingredient": { "item": "malum:twisted_rock" }, - "result": "malum:twisted_rock_wall", - "count": 1 + "result": "malum:twisted_rock_wall" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/unholy_sap_from_smelting.json b/src/generated/resources/data/malum/recipes/unholy_sap_from_smelting.json index ede2f7190..19d2f94db 100644 --- a/src/generated/resources/data/malum/recipes/unholy_sap_from_smelting.json +++ b/src/generated/resources/data/malum/recipes/unholy_sap_from_smelting.json @@ -1,9 +1,10 @@ { "type": "minecraft:smelting", + "category": "food", + "cookingtime": 200, + "experience": 0.1, "ingredient": { "item": "malum:unholy_sap" }, - "result": "malum:unholy_syrup", - "experience": 0.1, - "cookingtime": 200 + "result": "malum:unholy_syrup" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/unholy_sap_from_smoking.json b/src/generated/resources/data/malum/recipes/unholy_sap_from_smoking.json index 40e4e0cd8..cd813b300 100644 --- a/src/generated/resources/data/malum/recipes/unholy_sap_from_smoking.json +++ b/src/generated/resources/data/malum/recipes/unholy_sap_from_smoking.json @@ -1,9 +1,10 @@ { "type": "minecraft:smoking", + "category": "food", + "cookingtime": 100, + "experience": 0.1, "ingredient": { "item": "malum:unholy_sap" }, - "result": "malum:unholy_syrup", - "experience": 0.1, - "cookingtime": 100 + "result": "malum:unholy_syrup" } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/unholy_sapball.json b/src/generated/resources/data/malum/recipes/unholy_sapball.json index d4c84ea95..53553ac4d 100644 --- a/src/generated/resources/data/malum/recipes/unholy_sapball.json +++ b/src/generated/resources/data/malum/recipes/unholy_sapball.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ { "item": "malum:unholy_sap" @@ -9,7 +10,7 @@ } ], "result": { - "item": "malum:unholy_sapball", - "count": 3 + "count": 3, + "item": "malum:unholy_sapball" } } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/uranium_from_node_blasting.json b/src/generated/resources/data/malum/recipes/uranium_from_node_blasting.json index 1bebb9c57..e2a8478e7 100644 --- a/src/generated/resources/data/malum/recipes/uranium_from_node_blasting.json +++ b/src/generated/resources/data/malum/recipes/uranium_from_node_blasting.json @@ -4,24 +4,24 @@ { "conditions": [ { + "type": "forge:not", "value": { - "tag": "forge:nuggets/uranium", - "type": "forge:tag_empty" - }, - "type": "forge:not" + "type": "forge:tag_empty", + "tag": "forge:nuggets/uranium" + } } ], "recipe": { "type": "malum:node_blasting", + "cookingtime": 100, + "experience": 0.25, "ingredient": { "item": "malum:uranium_node" }, "result": { - "tag": "forge:nuggets/uranium", - "count": 6 - }, - "experience": 0.25, - "cookingtime": 100 + "count": 6, + "tag": "forge:nuggets/uranium" + } } } ] diff --git a/src/generated/resources/data/malum/recipes/uranium_from_node_smelting.json b/src/generated/resources/data/malum/recipes/uranium_from_node_smelting.json index 65d38e65b..08b2bea94 100644 --- a/src/generated/resources/data/malum/recipes/uranium_from_node_smelting.json +++ b/src/generated/resources/data/malum/recipes/uranium_from_node_smelting.json @@ -4,24 +4,24 @@ { "conditions": [ { + "type": "forge:not", "value": { - "tag": "forge:nuggets/uranium", - "type": "forge:tag_empty" - }, - "type": "forge:not" + "type": "forge:tag_empty", + "tag": "forge:nuggets/uranium" + } } ], "recipe": { "type": "malum:node_smelting", + "cookingtime": 200, + "experience": 0.25, "ingredient": { "item": "malum:uranium_node" }, "result": { - "tag": "forge:nuggets/uranium", - "count": 6 - }, - "experience": 0.25, - "cookingtime": 200 + "count": 6, + "tag": "forge:nuggets/uranium" + } } } ] diff --git a/src/generated/resources/data/malum/recipes/vertical_runewood_planks.json b/src/generated/resources/data/malum/recipes/vertical_runewood_planks.json index 1af976299..543f00b72 100644 --- a/src/generated/resources/data/malum/recipes/vertical_runewood_planks.json +++ b/src/generated/resources/data/malum/recipes/vertical_runewood_planks.json @@ -1,17 +1,19 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "#", - "#", - "#" - ], + "category": "misc", "key": { "#": { "item": "malum:runewood_planks" } }, + "pattern": [ + "#", + "#", + "#" + ], "result": { - "item": "malum:vertical_runewood_planks", - "count": 3 - } + "count": 3, + "item": "malum:vertical_runewood_planks" + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/vertical_runewood_planks_slab.json b/src/generated/resources/data/malum/recipes/vertical_runewood_planks_slab.json index 9632b2263..620584fbf 100644 --- a/src/generated/resources/data/malum/recipes/vertical_runewood_planks_slab.json +++ b/src/generated/resources/data/malum/recipes/vertical_runewood_planks_slab.json @@ -1,15 +1,17 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "###" - ], + "category": "misc", "key": { "#": { "item": "malum:vertical_runewood_planks" } }, + "pattern": [ + "###" + ], "result": { - "item": "malum:vertical_runewood_planks_slab", - "count": 6 - } + "count": 6, + "item": "malum:vertical_runewood_planks_slab" + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/vertical_runewood_planks_stairs.json b/src/generated/resources/data/malum/recipes/vertical_runewood_planks_stairs.json index 17b0ecc4a..564bbea8c 100644 --- a/src/generated/resources/data/malum/recipes/vertical_runewood_planks_stairs.json +++ b/src/generated/resources/data/malum/recipes/vertical_runewood_planks_stairs.json @@ -1,17 +1,19 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "# ", - "## ", - "###" - ], + "category": "misc", "key": { "#": { "item": "malum:vertical_runewood_planks" } }, + "pattern": [ + "# ", + "## ", + "###" + ], "result": { - "item": "malum:vertical_runewood_planks_stairs", - "count": 4 - } + "count": 4, + "item": "malum:vertical_runewood_planks_stairs" + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/vertical_soulwood_planks.json b/src/generated/resources/data/malum/recipes/vertical_soulwood_planks.json index 7ef760eec..d2d864c60 100644 --- a/src/generated/resources/data/malum/recipes/vertical_soulwood_planks.json +++ b/src/generated/resources/data/malum/recipes/vertical_soulwood_planks.json @@ -1,17 +1,19 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "#", - "#", - "#" - ], + "category": "misc", "key": { "#": { "item": "malum:soulwood_planks" } }, + "pattern": [ + "#", + "#", + "#" + ], "result": { - "item": "malum:vertical_soulwood_planks", - "count": 3 - } + "count": 3, + "item": "malum:vertical_soulwood_planks" + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/vertical_soulwood_planks_slab.json b/src/generated/resources/data/malum/recipes/vertical_soulwood_planks_slab.json index 8c4752e14..1e9a9fed8 100644 --- a/src/generated/resources/data/malum/recipes/vertical_soulwood_planks_slab.json +++ b/src/generated/resources/data/malum/recipes/vertical_soulwood_planks_slab.json @@ -1,15 +1,17 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "###" - ], + "category": "misc", "key": { "#": { "item": "malum:vertical_soulwood_planks" } }, + "pattern": [ + "###" + ], "result": { - "item": "malum:vertical_soulwood_planks_slab", - "count": 6 - } + "count": 6, + "item": "malum:vertical_soulwood_planks_slab" + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/vertical_soulwood_planks_stairs.json b/src/generated/resources/data/malum/recipes/vertical_soulwood_planks_stairs.json index 619fe834e..325e36e5a 100644 --- a/src/generated/resources/data/malum/recipes/vertical_soulwood_planks_stairs.json +++ b/src/generated/resources/data/malum/recipes/vertical_soulwood_planks_stairs.json @@ -1,17 +1,19 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "# ", - "## ", - "###" - ], + "category": "misc", "key": { "#": { "item": "malum:vertical_soulwood_planks" } }, + "pattern": [ + "# ", + "## ", + "###" + ], "result": { - "item": "malum:vertical_soulwood_planks_stairs", - "count": 4 - } + "count": 4, + "item": "malum:vertical_soulwood_planks_stairs" + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/weavers_workbench.json b/src/generated/resources/data/malum/recipes/weavers_workbench.json index 5796b04a2..217cbe253 100644 --- a/src/generated/resources/data/malum/recipes/weavers_workbench.json +++ b/src/generated/resources/data/malum/recipes/weavers_workbench.json @@ -1,21 +1,23 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "XYX", - "XZX" - ], + "category": "misc", "key": { - "Z": { - "tag": "forge:ingots/gold" + "X": { + "item": "malum:runewood_planks" }, "Y": { "item": "malum:hex_ash" }, - "X": { - "item": "malum:runewood_planks" + "Z": { + "tag": "forge:ingots/gold" } }, + "pattern": [ + "XYX", + "XZX" + ], "result": { "item": "malum:weavers_workbench" - } + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/recipes/zinc_from_node_blasting.json b/src/generated/resources/data/malum/recipes/zinc_from_node_blasting.json index 32af67e81..1180cc459 100644 --- a/src/generated/resources/data/malum/recipes/zinc_from_node_blasting.json +++ b/src/generated/resources/data/malum/recipes/zinc_from_node_blasting.json @@ -4,24 +4,24 @@ { "conditions": [ { + "type": "forge:not", "value": { - "tag": "forge:nuggets/zinc", - "type": "forge:tag_empty" - }, - "type": "forge:not" + "type": "forge:tag_empty", + "tag": "forge:nuggets/zinc" + } } ], "recipe": { "type": "malum:node_blasting", + "cookingtime": 100, + "experience": 0.25, "ingredient": { "item": "malum:zinc_node" }, "result": { - "tag": "forge:nuggets/zinc", - "count": 6 - }, - "experience": 0.25, - "cookingtime": 100 + "count": 6, + "tag": "forge:nuggets/zinc" + } } } ] diff --git a/src/generated/resources/data/malum/recipes/zinc_from_node_smelting.json b/src/generated/resources/data/malum/recipes/zinc_from_node_smelting.json index 8de793b7a..72ac880e9 100644 --- a/src/generated/resources/data/malum/recipes/zinc_from_node_smelting.json +++ b/src/generated/resources/data/malum/recipes/zinc_from_node_smelting.json @@ -4,24 +4,24 @@ { "conditions": [ { + "type": "forge:not", "value": { - "tag": "forge:nuggets/zinc", - "type": "forge:tag_empty" - }, - "type": "forge:not" + "type": "forge:tag_empty", + "tag": "forge:nuggets/zinc" + } } ], "recipe": { "type": "malum:node_smelting", + "cookingtime": 200, + "experience": 0.25, "ingredient": { "item": "malum:zinc_node" }, "result": { - "tag": "forge:nuggets/zinc", - "count": 6 - }, - "experience": 0.25, - "cookingtime": 200 + "count": 6, + "tag": "forge:nuggets/zinc" + } } } ] diff --git a/src/generated/resources/data/malum/recipes/zombie_head_from_grim_talc.json b/src/generated/resources/data/malum/recipes/zombie_head_from_grim_talc.json index dc7142550..b5f08146b 100644 --- a/src/generated/resources/data/malum/recipes/zombie_head_from_grim_talc.json +++ b/src/generated/resources/data/malum/recipes/zombie_head_from_grim_talc.json @@ -1,19 +1,21 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "\u0026\u0026\u0026", - "\u0026#\u0026", - "\u0026\u0026\u0026" - ], + "category": "misc", "key": { "#": { "item": "malum:grim_talc" }, - "\u0026": { + "&": { "item": "minecraft:rotten_flesh" } }, + "pattern": [ + "&&&", + "&#&", + "&&&" + ], "result": { "item": "minecraft:zombie_head" - } + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/malum/tags/blocks/blighted_blocks.json b/src/generated/resources/data/malum/tags/blocks/blighted_blocks.json deleted file mode 100644 index e87c026a4..000000000 --- a/src/generated/resources/data/malum/tags/blocks/blighted_blocks.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "replace": false, - "values": [ - "malum:mass_of_blighted_gunk", - "malum:blighted_earth", - "malum:blighted_soil" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/malum/tags/blocks/blighted_plants.json b/src/generated/resources/data/malum/tags/blocks/blighted_plants.json deleted file mode 100644 index 5c8e56bbe..000000000 --- a/src/generated/resources/data/malum/tags/blocks/blighted_plants.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "replace": false, - "values": [ - "malum:soulwood_growth", - "malum:blighted_weed", - "malum:blighted_tumor" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/malum/tags/blocks/endless_flame.json b/src/generated/resources/data/malum/tags/blocks/endless_flame.json deleted file mode 100644 index 5e8aecc98..000000000 --- a/src/generated/resources/data/malum/tags/blocks/endless_flame.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "replace": false, - "values": [] -} \ No newline at end of file diff --git a/src/generated/resources/data/malum/tags/blocks/greater_aerial_whitelist.json b/src/generated/resources/data/malum/tags/blocks/greater_aerial_whitelist.json deleted file mode 100644 index 5e8aecc98..000000000 --- a/src/generated/resources/data/malum/tags/blocks/greater_aerial_whitelist.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "replace": false, - "values": [] -} \ No newline at end of file diff --git a/src/generated/resources/data/malum/tags/blocks/rite_immune.json b/src/generated/resources/data/malum/tags/blocks/rite_immune.json deleted file mode 100644 index 7ec92dab4..000000000 --- a/src/generated/resources/data/malum/tags/blocks/rite_immune.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "replace": false, - "values": [ - "#malum:tainted_rock", - "#malum:twisted_rock", - "malum:runewood_totem_base", - "malum:soulwood_totem_base", - "malum:runewood_totem_pole", - "malum:soulwood_totem_pole" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/malum/tags/blocks/runewood_logs.json b/src/generated/resources/data/malum/tags/blocks/runewood_logs.json deleted file mode 100644 index dcf13cbab..000000000 --- a/src/generated/resources/data/malum/tags/blocks/runewood_logs.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "replace": false, - "values": [ - "malum:revealed_runewood_log", - "malum:runewood", - "malum:stripped_runewood", - "malum:stripped_runewood_log", - "malum:exposed_runewood_log", - "malum:runewood_log" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/malum/tags/blocks/soulwood_logs.json b/src/generated/resources/data/malum/tags/blocks/soulwood_logs.json deleted file mode 100644 index 2906a10e4..000000000 --- a/src/generated/resources/data/malum/tags/blocks/soulwood_logs.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "replace": false, - "values": [ - "malum:soulwood", - "malum:exposed_soulwood_log", - "malum:stripped_soulwood_log", - "malum:soulwood_log", - "malum:revealed_soulwood_log", - "malum:stripped_soulwood" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/malum/tags/blocks/tainted_rock.json b/src/generated/resources/data/malum/tags/blocks/tainted_rock.json deleted file mode 100644 index b3ef477cf..000000000 --- a/src/generated/resources/data/malum/tags/blocks/tainted_rock.json +++ /dev/null @@ -1,55 +0,0 @@ -{ - "replace": false, - "values": [ - "malum:runic_tainted_rock_bricks", - "malum:runic_tainted_rock_tiles", - "malum:tainted_rock_tiles_wall", - "malum:small_tainted_rock_bricks_stairs", - "malum:spirit_crucible_component", - "malum:runic_tainted_rock_bricks_slab", - "malum:tainted_rock_tiles", - "malum:tainted_rock_stairs", - "malum:twisted_tablet", - "malum:tainted_rock_button", - "malum:tainted_rock_pressure_plate", - "malum:tainted_iridescent_ether_brazier", - "malum:tainted_rock_wall", - "malum:polished_tainted_rock_slab", - "malum:runic_small_tainted_rock_bricks_wall", - "malum:tainted_rock_column", - "malum:small_tainted_rock_bricks_wall", - "malum:smooth_tainted_rock_stairs", - "malum:tainted_rock_bricks_wall", - "malum:small_tainted_rock_bricks_slab", - "malum:tainted_rock_slab", - "malum:spirit_crucible", - "malum:tainted_rock_item_pedestal", - "malum:runic_small_tainted_rock_bricks_slab", - "malum:polished_tainted_rock_stairs", - "malum:tainted_rock_bricks_stairs", - "malum:runic_small_tainted_rock_bricks", - "malum:spirit_catalyzer_component", - "malum:tainted_rock_bricks_slab", - "malum:spirit_catalyzer", - "malum:runic_tainted_rock_tiles_wall", - "malum:smooth_tainted_rock_slab", - "malum:runic_tainted_rock_bricks_stairs", - "malum:tainted_rock", - "malum:runic_small_tainted_rock_bricks_stairs", - "malum:tainted_rock_bricks", - "malum:small_tainted_rock_bricks", - "malum:tainted_rock_item_stand", - "malum:tainted_rock_tiles_slab", - "malum:runic_tainted_rock_bricks_wall", - "malum:the_device", - "malum:cut_tainted_rock", - "malum:tainted_rock_column_cap", - "malum:smooth_tainted_rock", - "malum:polished_tainted_rock", - "malum:chiseled_tainted_rock", - "malum:runic_tainted_rock_tiles_slab", - "malum:tainted_rock_tiles_stairs", - "malum:runic_tainted_rock_tiles_stairs", - "malum:tainted_ether_brazier" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/malum/tags/blocks/twisted_rock.json b/src/generated/resources/data/malum/tags/blocks/twisted_rock.json deleted file mode 100644 index 4101e96d7..000000000 --- a/src/generated/resources/data/malum/tags/blocks/twisted_rock.json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "replace": false, - "values": [ - "malum:runic_twisted_rock_bricks_stairs", - "malum:twisted_rock_pressure_plate", - "malum:twisted_rock_bricks_stairs", - "malum:polished_twisted_rock", - "malum:twisted_rock", - "malum:polished_twisted_rock_slab", - "malum:twisted_rock_tiles_wall", - "malum:small_twisted_rock_bricks_slab", - "malum:twisted_rock_column", - "malum:twisted_rock_bricks_wall", - "malum:runic_twisted_rock_bricks", - "malum:twisted_rock_item_stand", - "malum:runic_twisted_rock_bricks_wall", - "malum:twisted_iridescent_ether_brazier", - "malum:twisted_rock_tiles_slab", - "malum:twisted_rock_tiles", - "malum:runic_twisted_rock_bricks_slab", - "malum:runic_twisted_rock_tiles_stairs", - "malum:the_vessel", - "malum:small_twisted_rock_bricks", - "malum:twisted_rock_tiles_stairs", - "malum:smooth_twisted_rock_stairs", - "malum:runic_small_twisted_rock_bricks_stairs", - "malum:twisted_rock_bricks", - "malum:runic_small_twisted_rock_bricks_wall", - "malum:small_twisted_rock_bricks_wall", - "malum:runic_twisted_rock_tiles_slab", - "malum:twisted_rock_item_pedestal", - "malum:twisted_rock_bricks_slab", - "malum:cut_twisted_rock", - "malum:smooth_twisted_rock", - "malum:runic_small_twisted_rock_bricks", - "malum:twisted_rock_column_cap", - "malum:twisted_rock_wall", - "malum:twisted_ether_brazier", - "malum:runic_small_twisted_rock_bricks_slab", - "malum:chiseled_twisted_rock", - "malum:smooth_twisted_rock_slab", - "malum:runic_twisted_rock_tiles_wall", - "malum:runic_twisted_rock_tiles", - "malum:polished_twisted_rock_stairs", - "malum:twisted_rock_slab", - "malum:small_twisted_rock_bricks_stairs", - "malum:twisted_rock_stairs", - "malum:twisted_rock_button" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/malum/tags/items/gross_foods.json b/src/generated/resources/data/malum/tags/items/gross_foods.json deleted file mode 100644 index ef5229b7d..000000000 --- a/src/generated/resources/data/malum/tags/items/gross_foods.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:rotten_flesh", - "malum:rotting_essence" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/malum/tags/items/metal_nodes.json b/src/generated/resources/data/malum/tags/items/metal_nodes.json deleted file mode 100644 index 7cbefdd64..000000000 --- a/src/generated/resources/data/malum/tags/items/metal_nodes.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "replace": false, - "values": [ - "malum:iron_node", - "malum:copper_node", - "malum:gold_node", - "malum:lead_node", - "malum:silver_node", - "malum:aluminum_node", - "malum:nickel_node", - "malum:uranium_node", - "malum:osmium_node", - "malum:zinc_node", - "malum:tin_node" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/malum/tags/items/prospectors_treasure.json b/src/generated/resources/data/malum/tags/items/prospectors_treasure.json deleted file mode 100644 index d5698391e..000000000 --- a/src/generated/resources/data/malum/tags/items/prospectors_treasure.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "replace": false, - "values": [ - "#forge:ores", - "#forge:storage_blocks", - "#forge:ingots", - "#forge:nuggets", - "#forge:gems", - "#forge:raw_materials", - "#minecraft:coals", - "#malum:metal_nodes", - { - "id": "tetra:geode", - "required": false - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/malum/tags/items/runewood_logs.json b/src/generated/resources/data/malum/tags/items/runewood_logs.json deleted file mode 100644 index 1cd249922..000000000 --- a/src/generated/resources/data/malum/tags/items/runewood_logs.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "replace": false, - "values": [ - "malum:runewood_log", - "malum:stripped_runewood_log", - "malum:runewood", - "malum:stripped_runewood", - "malum:exposed_runewood_log", - "malum:revealed_runewood_log" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/malum/tags/items/sapballs.json b/src/generated/resources/data/malum/tags/items/sapballs.json deleted file mode 100644 index c15efd1c1..000000000 --- a/src/generated/resources/data/malum/tags/items/sapballs.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "replace": false, - "values": [ - "malum:holy_sapball", - "malum:unholy_sapball" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/malum/tags/items/scythe.json b/src/generated/resources/data/malum/tags/items/scythe.json deleted file mode 100644 index 06c691e40..000000000 --- a/src/generated/resources/data/malum/tags/items/scythe.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "replace": false, - "values": [ - "malum:crude_scythe", - "malum:soul_stained_steel_scythe", - "malum:creative_scythe" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/malum/tags/items/soul_hunter_weapon.json b/src/generated/resources/data/malum/tags/items/soul_hunter_weapon.json deleted file mode 100644 index 582583c45..000000000 --- a/src/generated/resources/data/malum/tags/items/soul_hunter_weapon.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "replace": false, - "values": [ - "malum:tyrving", - "malum:crude_scythe", - "malum:soul_stained_steel_scythe", - "malum:creative_scythe", - "malum:soul_stained_steel_axe", - "malum:soul_stained_steel_pickaxe", - "malum:soul_stained_steel_shovel", - "malum:soul_stained_steel_sword", - "malum:soul_stained_steel_hoe", - "malum:soul_stained_steel_knife" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/malum/tags/items/soulwood_logs.json b/src/generated/resources/data/malum/tags/items/soulwood_logs.json deleted file mode 100644 index 184090bff..000000000 --- a/src/generated/resources/data/malum/tags/items/soulwood_logs.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "replace": false, - "values": [ - "malum:soulwood_log", - "malum:stripped_soulwood_log", - "malum:soulwood", - "malum:stripped_soulwood", - "malum:exposed_soulwood_log", - "malum:revealed_soulwood_log", - "malum:blighted_soulwood" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/malum/tags/worldgen/biome/has_blazing_quartz.json b/src/generated/resources/data/malum/tags/worldgen/biome/has_blazing_quartz.json new file mode 100644 index 000000000..f7e672b8c --- /dev/null +++ b/src/generated/resources/data/malum/tags/worldgen/biome/has_blazing_quartz.json @@ -0,0 +1,5 @@ +{ + "values": [ + "#minecraft:is_nether" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/malum/tags/worldgen/biome/has_brilliant.json b/src/generated/resources/data/malum/tags/worldgen/biome/has_brilliant.json new file mode 100644 index 000000000..d3152c5b0 --- /dev/null +++ b/src/generated/resources/data/malum/tags/worldgen/biome/has_brilliant.json @@ -0,0 +1,5 @@ +{ + "values": [ + "#minecraft:is_overworld" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/malum/tags/worldgen/biome/has_runewood.json b/src/generated/resources/data/malum/tags/worldgen/biome/has_runewood.json new file mode 100644 index 000000000..d3152c5b0 --- /dev/null +++ b/src/generated/resources/data/malum/tags/worldgen/biome/has_runewood.json @@ -0,0 +1,5 @@ +{ + "values": [ + "#minecraft:is_overworld" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/malum/tags/worldgen/biome/has_soulstone.json b/src/generated/resources/data/malum/tags/worldgen/biome/has_soulstone.json new file mode 100644 index 000000000..d3152c5b0 --- /dev/null +++ b/src/generated/resources/data/malum/tags/worldgen/biome/has_soulstone.json @@ -0,0 +1,5 @@ +{ + "values": [ + "#minecraft:is_overworld" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/malum/worldgen/configured_feature/brilliant_ore.json b/src/generated/resources/data/malum/worldgen/configured_feature/brilliant_ore.json new file mode 100644 index 000000000..733cc0ce0 --- /dev/null +++ b/src/generated/resources/data/malum/worldgen/configured_feature/brilliant_ore.json @@ -0,0 +1,27 @@ +{ + "type": "minecraft:ore", + "config": { + "discard_chance_on_air_exposure": 0.0, + "size": 30, + "targets": [ + { + "state": { + "Name": "malum:brilliant_stone" + }, + "target": { + "predicate_type": "minecraft:tag_match", + "tag": "minecraft:stone_ore_replaceables" + } + }, + { + "state": { + "Name": "malum:brilliant_deepslate" + }, + "target": { + "predicate_type": "minecraft:tag_match", + "tag": "minecraft:deepslate_ore_replaceables" + } + } + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/malum/worldgen/configured_feature/natural_quartz_ore.json b/src/generated/resources/data/malum/worldgen/configured_feature/natural_quartz_ore.json new file mode 100644 index 000000000..80edd638e --- /dev/null +++ b/src/generated/resources/data/malum/worldgen/configured_feature/natural_quartz_ore.json @@ -0,0 +1,27 @@ +{ + "type": "minecraft:ore", + "config": { + "discard_chance_on_air_exposure": 0.0, + "size": 30, + "targets": [ + { + "state": { + "Name": "malum:natural_quartz_ore" + }, + "target": { + "predicate_type": "minecraft:tag_match", + "tag": "minecraft:stone_ore_replaceables" + } + }, + { + "state": { + "Name": "malum:deepslate_quartz_ore" + }, + "target": { + "predicate_type": "minecraft:tag_match", + "tag": "minecraft:deepslate_ore_replaceables" + } + } + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/malum/worldgen/configured_feature/runewood_tree.json b/src/generated/resources/data/malum/worldgen/configured_feature/runewood_tree.json new file mode 100644 index 000000000..6d4ffa711 --- /dev/null +++ b/src/generated/resources/data/malum/worldgen/configured_feature/runewood_tree.json @@ -0,0 +1,4 @@ +{ + "type": "malum:runewood_tree", + "config": {} +} \ No newline at end of file diff --git a/src/generated/resources/data/malum/worldgen/configured_feature/soulstone_ore.json b/src/generated/resources/data/malum/worldgen/configured_feature/soulstone_ore.json new file mode 100644 index 000000000..731fd9253 --- /dev/null +++ b/src/generated/resources/data/malum/worldgen/configured_feature/soulstone_ore.json @@ -0,0 +1,27 @@ +{ + "type": "minecraft:ore", + "config": { + "discard_chance_on_air_exposure": 0.0, + "size": 30, + "targets": [ + { + "state": { + "Name": "malum:soulstone_ore" + }, + "target": { + "predicate_type": "minecraft:tag_match", + "tag": "minecraft:stone_ore_replaceables" + } + }, + { + "state": { + "Name": "malum:deepslate_soulstone_ore" + }, + "target": { + "predicate_type": "minecraft:tag_match", + "tag": "minecraft:deepslate_ore_replaceables" + } + } + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/malum/worldgen/configured_feature/soulwood_tree.json b/src/generated/resources/data/malum/worldgen/configured_feature/soulwood_tree.json new file mode 100644 index 000000000..e69de29bb diff --git a/src/generated/resources/data/malum/worldgen/placed_feature/ore_brilliant.json b/src/generated/resources/data/malum/worldgen/placed_feature/ore_brilliant.json new file mode 100644 index 000000000..aa47c245e --- /dev/null +++ b/src/generated/resources/data/malum/worldgen/placed_feature/ore_brilliant.json @@ -0,0 +1,27 @@ +{ + "feature": "malum:brilliant_ore", + "placement": [ + { + "type": "minecraft:height_range", + "height": { + "type": "minecraft:trapezoid", + "max_inclusive": { + "absolute": 112 + }, + "min_inclusive": { + "absolute": -16 + } + } + }, + { + "type": "minecraft:count", + "count": 16 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:biome" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/malum/worldgen/placed_feature/ore_natural_quartz.json b/src/generated/resources/data/malum/worldgen/placed_feature/ore_natural_quartz.json new file mode 100644 index 000000000..261a2d70e --- /dev/null +++ b/src/generated/resources/data/malum/worldgen/placed_feature/ore_natural_quartz.json @@ -0,0 +1,27 @@ +{ + "feature": "malum:natural_quartz_ore", + "placement": [ + { + "type": "minecraft:height_range", + "height": { + "type": "minecraft:trapezoid", + "max_inclusive": { + "absolute": 112 + }, + "min_inclusive": { + "absolute": -16 + } + } + }, + { + "type": "minecraft:count", + "count": 16 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:biome" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/malum/worldgen/placed_feature/ore_soulstone.json b/src/generated/resources/data/malum/worldgen/placed_feature/ore_soulstone.json new file mode 100644 index 000000000..ca59627b6 --- /dev/null +++ b/src/generated/resources/data/malum/worldgen/placed_feature/ore_soulstone.json @@ -0,0 +1,27 @@ +{ + "feature": "malum:soulstone_ore", + "placement": [ + { + "type": "minecraft:height_range", + "height": { + "type": "minecraft:trapezoid", + "max_inclusive": { + "absolute": 112 + }, + "min_inclusive": { + "absolute": -16 + } + } + }, + { + "type": "minecraft:count", + "count": 16 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:biome" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/advancements/recipes/malum_basis_of_magic/ether_torch_alternative.json b/src/generated/resources/data/minecraft/advancements/recipes/ether_torch_alternative.json similarity index 77% rename from src/generated/resources/data/minecraft/advancements/recipes/malum_basis_of_magic/ether_torch_alternative.json rename to src/generated/resources/data/minecraft/advancements/recipes/ether_torch_alternative.json index 35b5a9cfe..bbc6e271b 100644 --- a/src/generated/resources/data/minecraft/advancements/recipes/malum_basis_of_magic/ether_torch_alternative.json +++ b/src/generated/resources/data/minecraft/advancements/recipes/ether_torch_alternative.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "minecraft:ether_torch_alternative" - ] - }, "criteria": { "has_ether": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "minecraft:ether_torch_alternative" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_ether", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "minecraft:ether_torch_alternative" + ] + }, + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/advancements/recipes/malum_basis_of_magic/iridescent_ether_torch_alternative.json b/src/generated/resources/data/minecraft/advancements/recipes/iridescent_ether_torch_alternative.json similarity index 77% rename from src/generated/resources/data/minecraft/advancements/recipes/malum_basis_of_magic/iridescent_ether_torch_alternative.json rename to src/generated/resources/data/minecraft/advancements/recipes/iridescent_ether_torch_alternative.json index 0a4d82343..5010709b1 100644 --- a/src/generated/resources/data/minecraft/advancements/recipes/malum_basis_of_magic/iridescent_ether_torch_alternative.json +++ b/src/generated/resources/data/minecraft/advancements/recipes/iridescent_ether_torch_alternative.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "minecraft:iridescent_ether_torch_alternative" - ] - }, "criteria": { "has_ether": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "minecraft:iridescent_ether_torch_alternative" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_ether", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "minecraft:iridescent_ether_torch_alternative" + ] + }, + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/advancements/recipes/malum_basis_of_magic/tainted_ether_brazier.json b/src/generated/resources/data/minecraft/advancements/recipes/tainted_ether_brazier.json similarity index 76% rename from src/generated/resources/data/minecraft/advancements/recipes/malum_basis_of_magic/tainted_ether_brazier.json rename to src/generated/resources/data/minecraft/advancements/recipes/tainted_ether_brazier.json index a0d79ef1f..799c938d6 100644 --- a/src/generated/resources/data/minecraft/advancements/recipes/malum_basis_of_magic/tainted_ether_brazier.json +++ b/src/generated/resources/data/minecraft/advancements/recipes/tainted_ether_brazier.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "minecraft:tainted_ether_brazier" - ] - }, "criteria": { "has_ether": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "minecraft:tainted_ether_brazier" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_ether", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "minecraft:tainted_ether_brazier" + ] + }, + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/advancements/recipes/malum_basis_of_magic/tainted_iridescent_ether_brazier.json b/src/generated/resources/data/minecraft/advancements/recipes/tainted_iridescent_ether_brazier.json similarity index 77% rename from src/generated/resources/data/minecraft/advancements/recipes/malum_basis_of_magic/tainted_iridescent_ether_brazier.json rename to src/generated/resources/data/minecraft/advancements/recipes/tainted_iridescent_ether_brazier.json index 0785d3a9d..ff5de6bf3 100644 --- a/src/generated/resources/data/minecraft/advancements/recipes/malum_basis_of_magic/tainted_iridescent_ether_brazier.json +++ b/src/generated/resources/data/minecraft/advancements/recipes/tainted_iridescent_ether_brazier.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "minecraft:tainted_iridescent_ether_brazier" - ] - }, "criteria": { "has_ether": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "minecraft:tainted_iridescent_ether_brazier" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_ether", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "minecraft:tainted_iridescent_ether_brazier" + ] + }, + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/advancements/recipes/malum_basis_of_magic/twisted_ether_brazier.json b/src/generated/resources/data/minecraft/advancements/recipes/twisted_ether_brazier.json similarity index 76% rename from src/generated/resources/data/minecraft/advancements/recipes/malum_basis_of_magic/twisted_ether_brazier.json rename to src/generated/resources/data/minecraft/advancements/recipes/twisted_ether_brazier.json index a8b065ebf..ac12cc3c8 100644 --- a/src/generated/resources/data/minecraft/advancements/recipes/malum_basis_of_magic/twisted_ether_brazier.json +++ b/src/generated/resources/data/minecraft/advancements/recipes/twisted_ether_brazier.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "minecraft:twisted_ether_brazier" - ] - }, "criteria": { "has_ether": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "minecraft:twisted_ether_brazier" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_ether", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "minecraft:twisted_ether_brazier" + ] + }, + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/advancements/recipes/malum_basis_of_magic/twisted_iridescent_ether_brazier.json b/src/generated/resources/data/minecraft/advancements/recipes/twisted_iridescent_ether_brazier.json similarity index 77% rename from src/generated/resources/data/minecraft/advancements/recipes/malum_basis_of_magic/twisted_iridescent_ether_brazier.json rename to src/generated/resources/data/minecraft/advancements/recipes/twisted_iridescent_ether_brazier.json index c7df3da6a..a46daa4a2 100644 --- a/src/generated/resources/data/minecraft/advancements/recipes/malum_basis_of_magic/twisted_iridescent_ether_brazier.json +++ b/src/generated/resources/data/minecraft/advancements/recipes/twisted_iridescent_ether_brazier.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "minecraft:twisted_iridescent_ether_brazier" - ] - }, "criteria": { "has_ether": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "minecraft:twisted_iridescent_ether_brazier" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,11 @@ "has_ether", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "minecraft:twisted_iridescent_ether_brazier" + ] + }, + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/recipes/comparator.json b/src/generated/resources/data/minecraft/recipes/comparator.json deleted file mode 100644 index 1d28a50c8..000000000 --- a/src/generated/resources/data/minecraft/recipes/comparator.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - " # ", - "#X#", - "III" - ], - "key": { - "#": { - "item": "minecraft:redstone_torch" - }, - "X": { - "tag": "forge:gems/quartz" - }, - "I": { - "item": "minecraft:stone" - } - }, - "result": { - "item": "minecraft:comparator" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/recipes/daylight_detector.json b/src/generated/resources/data/minecraft/recipes/daylight_detector.json deleted file mode 100644 index a2633d6b7..000000000 --- a/src/generated/resources/data/minecraft/recipes/daylight_detector.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "GGG", - "QQQ", - "WWW" - ], - "key": { - "Q": { - "tag": "forge:gems/quartz" - }, - "G": { - "item": "minecraft:glass" - }, - "W": { - "tag": "minecraft:wooden_slabs" - } - }, - "result": { - "item": "minecraft:daylight_detector" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/recipes/diorite.json b/src/generated/resources/data/minecraft/recipes/diorite.json deleted file mode 100644 index 909d8b863..000000000 --- a/src/generated/resources/data/minecraft/recipes/diorite.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "CQ", - "QC" - ], - "key": { - "Q": { - "tag": "forge:gems/quartz" - }, - "C": { - "item": "minecraft:cobblestone" - } - }, - "result": { - "item": "minecraft:diorite", - "count": 2 - } -} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/recipes/ether_torch_alternative.json b/src/generated/resources/data/minecraft/recipes/ether_torch_alternative.json index 6f13a2494..34660f7e1 100644 --- a/src/generated/resources/data/minecraft/recipes/ether_torch_alternative.json +++ b/src/generated/resources/data/minecraft/recipes/ether_torch_alternative.json @@ -1,9 +1,5 @@ { "type": "lodestone:nbt_carry", - "pattern": [ - "X", - "#" - ], "key": { "#": { "tag": "forge:rods/wooden" @@ -15,8 +11,12 @@ "nbtCarry": { "item": "malum:ether" }, + "pattern": [ + "X", + "#" + ], "result": { - "item": "malum:ether_torch", - "count": 4 + "count": 4, + "item": "malum:ether_torch" } } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/recipes/granite.json b/src/generated/resources/data/minecraft/recipes/granite.json deleted file mode 100644 index 76f219101..000000000 --- a/src/generated/resources/data/minecraft/recipes/granite.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "minecraft:diorite" - }, - { - "tag": "forge:gems/quartz" - } - ], - "result": { - "item": "minecraft:granite" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/recipes/iridescent_ether_torch_alternative.json b/src/generated/resources/data/minecraft/recipes/iridescent_ether_torch_alternative.json index 6331017b5..041bd557b 100644 --- a/src/generated/resources/data/minecraft/recipes/iridescent_ether_torch_alternative.json +++ b/src/generated/resources/data/minecraft/recipes/iridescent_ether_torch_alternative.json @@ -1,9 +1,5 @@ { "type": "lodestone:nbt_carry", - "pattern": [ - "X", - "#" - ], "key": { "#": { "tag": "forge:rods/wooden" @@ -15,8 +11,12 @@ "nbtCarry": { "item": "malum:iridescent_ether" }, + "pattern": [ + "X", + "#" + ], "result": { - "item": "malum:iridescent_ether_torch", - "count": 4 + "count": 4, + "item": "malum:iridescent_ether_torch" } } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/recipes/observer.json b/src/generated/resources/data/minecraft/recipes/observer.json deleted file mode 100644 index fc2e01510..000000000 --- a/src/generated/resources/data/minecraft/recipes/observer.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "###", - "RRQ", - "###" - ], - "key": { - "Q": { - "tag": "forge:gems/quartz" - }, - "R": { - "item": "minecraft:redstone" - }, - "#": { - "item": "minecraft:cobblestone" - } - }, - "result": { - "item": "minecraft:observer" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/recipes/quartz_block.json b/src/generated/resources/data/minecraft/recipes/quartz_block.json deleted file mode 100644 index 0ae43aaf6..000000000 --- a/src/generated/resources/data/minecraft/recipes/quartz_block.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "##", - "##" - ], - "key": { - "#": { - "tag": "forge:gems/quartz" - } - }, - "result": { - "item": "minecraft:quartz_block" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/recipes/tainted_ether_brazier.json b/src/generated/resources/data/minecraft/recipes/tainted_ether_brazier.json index 4a3fe9647..eed7b86da 100644 --- a/src/generated/resources/data/minecraft/recipes/tainted_ether_brazier.json +++ b/src/generated/resources/data/minecraft/recipes/tainted_ether_brazier.json @@ -1,9 +1,5 @@ { "type": "lodestone:nbt_carry", - "pattern": [ - "#X#", - "S#S" - ], "key": { "#": { "item": "malum:tainted_rock" @@ -18,8 +14,12 @@ "nbtCarry": { "item": "malum:ether" }, + "pattern": [ + "#X#", + "S#S" + ], "result": { - "item": "malum:tainted_ether_brazier", - "count": 2 + "count": 2, + "item": "malum:tainted_ether_brazier" } } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/recipes/tainted_iridescent_ether_brazier.json b/src/generated/resources/data/minecraft/recipes/tainted_iridescent_ether_brazier.json index 9dbf6cce3..b12533e67 100644 --- a/src/generated/resources/data/minecraft/recipes/tainted_iridescent_ether_brazier.json +++ b/src/generated/resources/data/minecraft/recipes/tainted_iridescent_ether_brazier.json @@ -1,9 +1,5 @@ { "type": "lodestone:nbt_carry", - "pattern": [ - "#X#", - "S#S" - ], "key": { "#": { "item": "malum:tainted_rock" @@ -18,8 +14,12 @@ "nbtCarry": { "item": "malum:iridescent_ether" }, + "pattern": [ + "#X#", + "S#S" + ], "result": { - "item": "malum:tainted_iridescent_ether_brazier", - "count": 2 + "count": 2, + "item": "malum:tainted_iridescent_ether_brazier" } } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/recipes/twisted_ether_brazier.json b/src/generated/resources/data/minecraft/recipes/twisted_ether_brazier.json index 9f61eba1a..f51d6ba3b 100644 --- a/src/generated/resources/data/minecraft/recipes/twisted_ether_brazier.json +++ b/src/generated/resources/data/minecraft/recipes/twisted_ether_brazier.json @@ -1,9 +1,5 @@ { "type": "lodestone:nbt_carry", - "pattern": [ - "#X#", - "S#S" - ], "key": { "#": { "item": "malum:twisted_rock" @@ -18,8 +14,12 @@ "nbtCarry": { "item": "malum:ether" }, + "pattern": [ + "#X#", + "S#S" + ], "result": { - "item": "malum:twisted_ether_brazier", - "count": 2 + "count": 2, + "item": "malum:twisted_ether_brazier" } } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/recipes/twisted_iridescent_ether_brazier.json b/src/generated/resources/data/minecraft/recipes/twisted_iridescent_ether_brazier.json index 71c09776b..a88fad798 100644 --- a/src/generated/resources/data/minecraft/recipes/twisted_iridescent_ether_brazier.json +++ b/src/generated/resources/data/minecraft/recipes/twisted_iridescent_ether_brazier.json @@ -1,9 +1,5 @@ { "type": "lodestone:nbt_carry", - "pattern": [ - "#X#", - "S#S" - ], "key": { "#": { "item": "malum:twisted_rock" @@ -18,8 +14,12 @@ "nbtCarry": { "item": "malum:iridescent_ether" }, + "pattern": [ + "#X#", + "S#S" + ], "result": { - "item": "malum:twisted_iridescent_ether_brazier", - "count": 2 + "count": 2, + "item": "malum:twisted_iridescent_ether_brazier" } } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/beacon_base_blocks.json b/src/generated/resources/data/minecraft/tags/blocks/beacon_base_blocks.json deleted file mode 100644 index 38168308d..000000000 --- a/src/generated/resources/data/minecraft/tags/blocks/beacon_base_blocks.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "replace": false, - "values": [ - "malum:block_of_blazing_quartz", - "malum:block_of_soulstone", - "malum:block_of_soul_stained_steel", - "malum:block_of_hallowed_gold", - "malum:block_of_raw_soulstone", - "malum:block_of_brilliance" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/buttons.json b/src/generated/resources/data/minecraft/tags/blocks/buttons.json deleted file mode 100644 index ee1f755bd..000000000 --- a/src/generated/resources/data/minecraft/tags/blocks/buttons.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "replace": false, - "values": [ - "malum:soulwood_planks_button", - "malum:tainted_rock_button", - "malum:runewood_planks_button", - "malum:runewood_planks_button", - "malum:twisted_rock_button" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/doors.json b/src/generated/resources/data/minecraft/tags/blocks/doors.json deleted file mode 100644 index 10a8f4036..000000000 --- a/src/generated/resources/data/minecraft/tags/blocks/doors.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "replace": false, - "values": [ - "malum:soulwood_door", - "malum:runewood_door" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/fence_gates.json b/src/generated/resources/data/minecraft/tags/blocks/fence_gates.json deleted file mode 100644 index d411d0bcc..000000000 --- a/src/generated/resources/data/minecraft/tags/blocks/fence_gates.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "replace": false, - "values": [ - "malum:soulwood_planks_fence_gate", - "malum:runewood_planks_fence_gate" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/fences.json b/src/generated/resources/data/minecraft/tags/blocks/fences.json deleted file mode 100644 index 2f9c1dcf6..000000000 --- a/src/generated/resources/data/minecraft/tags/blocks/fences.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "replace": false, - "values": [ - "malum:runewood_planks_fence", - "malum:soulwood_planks_fence" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/leaves.json b/src/generated/resources/data/minecraft/tags/blocks/leaves.json deleted file mode 100644 index dea6a178a..000000000 --- a/src/generated/resources/data/minecraft/tags/blocks/leaves.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "replace": false, - "values": [ - "malum:soulwood_leaves", - "malum:runewood_leaves", - "malum:runewood_leaves" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/logs.json b/src/generated/resources/data/minecraft/tags/blocks/logs.json deleted file mode 100644 index 74f38d335..000000000 --- a/src/generated/resources/data/minecraft/tags/blocks/logs.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "replace": false, - "values": [ - "malum:revealed_runewood_log", - "malum:soulwood", - "malum:exposed_soulwood_log", - "malum:runewood", - "malum:stripped_soulwood_log", - "malum:stripped_runewood", - "malum:soulwood_log", - "malum:stripped_runewood_log", - "malum:exposed_runewood_log", - "malum:revealed_soulwood_log", - "malum:runewood_log", - "malum:stripped_soulwood" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/mineable/axe.json b/src/generated/resources/data/minecraft/tags/blocks/mineable/axe.json deleted file mode 100644 index a648679bd..000000000 --- a/src/generated/resources/data/minecraft/tags/blocks/mineable/axe.json +++ /dev/null @@ -1,82 +0,0 @@ -{ - "replace": false, - "values": [ - "malum:soulwood_planks_button", - "malum:runewood_tiles_stairs", - "malum:soulwood_tiles_stairs", - "malum:runewood_planks_slab", - "malum:brilliant_obelisk_component", - "malum:revealed_runewood_log", - "malum:soulwood_panel_slab", - "malum:runewood_planks_stairs", - "malum:soulwood_panel", - "malum:runewood_obelisk", - "malum:soulwood_item_stand", - "malum:soulwood", - "malum:exposed_soulwood_log", - "malum:runewood_obelisk_component", - "malum:runewood", - "malum:solid_soulwood_trapdoor", - "malum:runewood_item_pedestal", - "malum:vertical_soulwood_planks_slab", - "malum:runewood_item_stand", - "malum:soulwood_planks_slab", - "malum:vertical_soulwood_planks", - "malum:runewood_tiles_slab", - "malum:stripped_soulwood_log", - "malum:weavers_workbench", - "malum:stripped_runewood", - "malum:runewood_planks_fence", - "malum:vertical_runewood_planks_stairs", - "malum:runewood_planks_pressure_plate", - "malum:soulwood_tiles_slab", - "malum:runewood_totem_base", - "malum:soulwood_totem_base", - "malum:iridescent_wall_ether_torch", - "malum:runewood_trapdoor", - "malum:wall_ether_torch", - "malum:vertical_runewood_planks", - "malum:vertical_runewood_planks_slab", - "malum:soulwood_tiles", - "malum:iridescent_ether_torch", - "malum:soulwood_trapdoor", - "malum:runewood_panel", - "malum:runewood_wall_sign", - "malum:soulwood_panel_stairs", - "malum:soulwood_log", - "malum:solid_runewood_trapdoor", - "malum:soulwood_item_pedestal", - "malum:soulwood_beam", - "malum:soulwood_door", - "malum:stripped_runewood_log", - "malum:vertical_soulwood_planks_stairs", - "malum:cut_soulwood_planks", - "malum:runewood_panel_stairs", - "malum:exposed_runewood_log", - "malum:blighted_soulwood", - "malum:ether_torch", - "malum:runewood_sign", - "malum:spirit_altar", - "malum:runewood_planks_button", - "malum:cut_runewood_planks", - "malum:revealed_soulwood_log", - "malum:runewood_log", - "malum:runewood_door", - "malum:runewood_beam", - "malum:soulwood_wall_sign", - "malum:stripped_soulwood", - "malum:runewood_panel_slab", - "malum:soulwood_planks_fence", - "malum:runewood_totem_pole", - "malum:soulwood_sign", - "malum:runewood_planks", - "malum:soulwood_planks_stairs", - "malum:soulwood_planks_fence_gate", - "malum:brilliant_obelisk", - "malum:runewood_tiles", - "malum:soulwood_planks", - "malum:soulwood_planks_pressure_plate", - "malum:soulwood_totem_pole", - "malum:runewood_planks_fence_gate" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/mineable/hoe.json b/src/generated/resources/data/minecraft/tags/blocks/mineable/hoe.json deleted file mode 100644 index c2fcd4995..000000000 --- a/src/generated/resources/data/minecraft/tags/blocks/mineable/hoe.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "replace": false, - "values": [ - "malum:block_of_astral_weave", - "malum:mass_of_blighted_gunk", - "malum:blighted_earth", - "malum:soulwood_leaves", - "malum:blighted_soil", - "malum:runewood_leaves", - "malum:block_of_hex_ash" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json b/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json deleted file mode 100644 index ced02957f..000000000 --- a/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json +++ /dev/null @@ -1,135 +0,0 @@ -{ - "replace": false, - "values": [ - "malum:runic_tainted_rock_bricks", - "malum:runic_tainted_rock_tiles", - "malum:runic_twisted_rock_bricks_stairs", - "malum:tainted_rock_tiles_wall", - "malum:twisted_rock_pressure_plate", - "malum:small_tainted_rock_bricks_stairs", - "malum:twisted_rock_bricks_stairs", - "malum:block_of_grim_talc", - "malum:spirit_crucible_component", - "malum:polished_twisted_rock", - "malum:block_of_astral_weave", - "malum:runic_tainted_rock_bricks_slab", - "malum:twisted_rock", - "malum:polished_twisted_rock_slab", - "malum:tainted_rock_tiles", - "malum:blazing_quartz_ore", - "malum:tainted_rock_stairs", - "malum:twisted_rock_tiles_wall", - "malum:twisted_tablet", - "malum:tainted_rock_button", - "malum:small_twisted_rock_bricks_slab", - "malum:tainted_rock_pressure_plate", - "malum:mote_of_raw_arcana", - "malum:weeping_well_core", - "malum:tainted_iridescent_ether_brazier", - "malum:block_of_cursed_grit", - "malum:tainted_rock_wall", - "malum:twisted_rock_column", - "malum:soulstone_ore", - "malum:block_of_cthonic_gold", - "malum:block_of_alchemical_calx", - "malum:polished_tainted_rock_slab", - "malum:runic_small_tainted_rock_bricks_wall", - "malum:tainted_rock_column", - "malum:small_tainted_rock_bricks_wall", - "malum:mote_of_infernal_arcana", - "malum:twisted_rock_bricks_wall", - "malum:mote_of_aqueous_arcana", - "malum:mass_of_blighted_gunk", - "malum:brilliant_stone", - "malum:runic_twisted_rock_bricks", - "malum:natural_quartz_ore", - "malum:smooth_tainted_rock_stairs", - "malum:twisted_rock_item_stand", - "malum:runic_twisted_rock_bricks_wall", - "malum:twisted_iridescent_ether_brazier", - "malum:block_of_blazing_quartz", - "malum:tainted_rock_bricks_wall", - "malum:twisted_rock_tiles_slab", - "malum:twisted_rock_tiles", - "malum:runic_twisted_rock_bricks_slab", - "malum:runic_twisted_rock_tiles_stairs", - "malum:the_vessel", - "malum:small_twisted_rock_bricks", - "malum:small_tainted_rock_bricks_slab", - "malum:brilliant_deepslate", - "malum:twisted_rock_tiles_stairs", - "malum:smooth_twisted_rock_stairs", - "malum:runic_small_twisted_rock_bricks_stairs", - "malum:weeping_well_corner", - "malum:tainted_rock_slab", - "malum:twisted_rock_bricks", - "malum:natural_quartz_cluster", - "malum:spirit_crucible", - "malum:runic_small_twisted_rock_bricks_wall", - "malum:tainted_rock_item_pedestal", - "malum:small_twisted_rock_bricks_wall", - "malum:runic_twisted_rock_tiles_slab", - "malum:block_of_void_salts", - "malum:runic_small_tainted_rock_bricks_slab", - "malum:twisted_rock_item_pedestal", - "malum:mote_of_aerial_arcana", - "malum:polished_tainted_rock_stairs", - "malum:deepslate_quartz_ore", - "malum:twisted_rock_bricks_slab", - "malum:cut_twisted_rock", - "malum:tainted_rock_bricks_stairs", - "malum:block_of_soulstone", - "malum:smooth_twisted_rock", - "malum:mote_of_eldritch_arcana", - "malum:runic_small_tainted_rock_bricks", - "malum:spirit_catalyzer_component", - "malum:tainted_rock_bricks_slab", - "malum:spirit_catalyzer", - "malum:weeping_well_side", - "malum:runic_tainted_rock_tiles_wall", - "malum:runic_small_twisted_rock_bricks", - "malum:smooth_tainted_rock_slab", - "malum:runic_tainted_rock_bricks_stairs", - "malum:twisted_rock_column_cap", - "malum:twisted_rock_wall", - "malum:mote_of_sacred_arcana", - "malum:twisted_ether_brazier", - "malum:deepslate_soulstone_ore", - "malum:tainted_rock", - "malum:block_of_arcane_charcoal", - "malum:runic_small_twisted_rock_bricks_slab", - "malum:chiseled_twisted_rock", - "malum:smooth_twisted_rock_slab", - "malum:runic_small_tainted_rock_bricks_stairs", - "malum:runic_twisted_rock_tiles_wall", - "malum:tainted_rock_bricks", - "malum:small_tainted_rock_bricks", - "malum:block_of_soul_stained_steel", - "malum:tainted_rock_item_stand", - "malum:block_of_hallowed_gold", - "malum:tainted_rock_tiles_slab", - "malum:block_of_rotting_essence", - "malum:runic_tainted_rock_bricks_wall", - "malum:runic_twisted_rock_tiles", - "malum:polished_twisted_rock_stairs", - "malum:the_device", - "malum:cut_tainted_rock", - "malum:tainted_rock_column_cap", - "malum:smooth_tainted_rock", - "malum:polished_tainted_rock", - "malum:chiseled_tainted_rock", - "malum:twisted_rock_slab", - "malum:runic_tainted_rock_tiles_slab", - "malum:mote_of_earthen_arcana", - "malum:block_of_hex_ash", - "malum:mote_of_wicked_arcana", - "malum:tainted_rock_tiles_stairs", - "malum:runic_tainted_rock_tiles_stairs", - "malum:tainted_ether_brazier", - "malum:block_of_raw_soulstone", - "malum:small_twisted_rock_bricks_stairs", - "malum:block_of_brilliance", - "malum:twisted_rock_stairs", - "malum:twisted_rock_button" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/mineable/shovel.json b/src/generated/resources/data/minecraft/tags/blocks/mineable/shovel.json deleted file mode 100644 index be02717cb..000000000 --- a/src/generated/resources/data/minecraft/tags/blocks/mineable/shovel.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "replace": false, - "values": [ - "malum:block_of_cursed_grit", - "malum:mass_of_blighted_gunk", - "malum:blighted_earth", - "malum:block_of_void_salts", - "malum:blighted_soil" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/planks.json b/src/generated/resources/data/minecraft/tags/blocks/planks.json deleted file mode 100644 index 50bb42736..000000000 --- a/src/generated/resources/data/minecraft/tags/blocks/planks.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "replace": false, - "values": [ - "malum:vertical_soulwood_planks", - "malum:vertical_runewood_planks", - "malum:cut_soulwood_planks", - "malum:cut_runewood_planks", - "malum:runewood_planks", - "malum:soulwood_planks" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/pressure_plates.json b/src/generated/resources/data/minecraft/tags/blocks/pressure_plates.json deleted file mode 100644 index cc2507a4d..000000000 --- a/src/generated/resources/data/minecraft/tags/blocks/pressure_plates.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "replace": false, - "values": [ - "malum:twisted_rock_pressure_plate", - "malum:tainted_rock_pressure_plate", - "malum:runewood_planks_pressure_plate", - "malum:soulwood_planks_pressure_plate" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/saplings.json b/src/generated/resources/data/minecraft/tags/blocks/saplings.json deleted file mode 100644 index 16d4a4fb6..000000000 --- a/src/generated/resources/data/minecraft/tags/blocks/saplings.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "malum:runewood_sapling" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/signs.json b/src/generated/resources/data/minecraft/tags/blocks/signs.json deleted file mode 100644 index de25e4a2a..000000000 --- a/src/generated/resources/data/minecraft/tags/blocks/signs.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "replace": false, - "values": [ - "malum:runewood_wall_sign", - "malum:runewood_sign", - "malum:soulwood_wall_sign", - "malum:soulwood_sign" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/slabs.json b/src/generated/resources/data/minecraft/tags/blocks/slabs.json deleted file mode 100644 index a9a9fc922..000000000 --- a/src/generated/resources/data/minecraft/tags/blocks/slabs.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "replace": false, - "values": [ - "malum:runewood_planks_slab", - "malum:runic_tainted_rock_bricks_slab", - "malum:polished_twisted_rock_slab", - "malum:soulwood_panel_slab", - "malum:small_twisted_rock_bricks_slab", - "malum:polished_tainted_rock_slab", - "malum:vertical_soulwood_planks_slab", - "malum:soulwood_planks_slab", - "malum:runewood_tiles_slab", - "malum:twisted_rock_tiles_slab", - "malum:runic_twisted_rock_bricks_slab", - "malum:soulwood_tiles_slab", - "malum:small_tainted_rock_bricks_slab", - "malum:tainted_rock_slab", - "malum:runic_twisted_rock_tiles_slab", - "malum:runic_small_tainted_rock_bricks_slab", - "malum:vertical_runewood_planks_slab", - "malum:twisted_rock_bricks_slab", - "malum:tainted_rock_bricks_slab", - "malum:smooth_tainted_rock_slab", - "malum:runic_small_twisted_rock_bricks_slab", - "malum:smooth_twisted_rock_slab", - "malum:tainted_rock_tiles_slab", - "malum:runewood_panel_slab", - "malum:twisted_rock_slab", - "malum:runic_tainted_rock_tiles_slab" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/stairs.json b/src/generated/resources/data/minecraft/tags/blocks/stairs.json deleted file mode 100644 index df85536e3..000000000 --- a/src/generated/resources/data/minecraft/tags/blocks/stairs.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "replace": false, - "values": [ - "malum:runewood_tiles_stairs", - "malum:runic_twisted_rock_bricks_stairs", - "malum:soulwood_tiles_stairs", - "malum:small_tainted_rock_bricks_stairs", - "malum:twisted_rock_bricks_stairs", - "malum:runewood_planks_stairs", - "malum:tainted_rock_stairs", - "malum:smooth_tainted_rock_stairs", - "malum:vertical_runewood_planks_stairs", - "malum:runic_twisted_rock_tiles_stairs", - "malum:twisted_rock_tiles_stairs", - "malum:smooth_twisted_rock_stairs", - "malum:runic_small_twisted_rock_bricks_stairs", - "malum:polished_tainted_rock_stairs", - "malum:tainted_rock_bricks_stairs", - "malum:soulwood_panel_stairs", - "malum:vertical_soulwood_planks_stairs", - "malum:runic_tainted_rock_bricks_stairs", - "malum:runic_small_tainted_rock_bricks_stairs", - "malum:runewood_panel_stairs", - "malum:polished_twisted_rock_stairs", - "malum:soulwood_planks_stairs", - "malum:tainted_rock_tiles_stairs", - "malum:runic_tainted_rock_tiles_stairs", - "malum:small_twisted_rock_bricks_stairs", - "malum:twisted_rock_stairs" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/standing_signs.json b/src/generated/resources/data/minecraft/tags/blocks/standing_signs.json deleted file mode 100644 index f3702af72..000000000 --- a/src/generated/resources/data/minecraft/tags/blocks/standing_signs.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "replace": false, - "values": [ - "malum:runewood_sign", - "malum:soulwood_sign" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/trapdoors.json b/src/generated/resources/data/minecraft/tags/blocks/trapdoors.json deleted file mode 100644 index f3448d977..000000000 --- a/src/generated/resources/data/minecraft/tags/blocks/trapdoors.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "replace": false, - "values": [ - "malum:solid_soulwood_trapdoor", - "malum:runewood_trapdoor", - "malum:soulwood_trapdoor", - "malum:solid_runewood_trapdoor" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/wall_signs.json b/src/generated/resources/data/minecraft/tags/blocks/wall_signs.json deleted file mode 100644 index ccb76ded7..000000000 --- a/src/generated/resources/data/minecraft/tags/blocks/wall_signs.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "replace": false, - "values": [ - "malum:runewood_wall_sign", - "malum:soulwood_wall_sign" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/walls.json b/src/generated/resources/data/minecraft/tags/blocks/walls.json deleted file mode 100644 index 55c8dbc93..000000000 --- a/src/generated/resources/data/minecraft/tags/blocks/walls.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "replace": false, - "values": [ - "malum:tainted_rock_tiles_wall", - "malum:twisted_rock_tiles_wall", - "malum:tainted_rock_wall", - "malum:runic_small_tainted_rock_bricks_wall", - "malum:small_tainted_rock_bricks_wall", - "malum:twisted_rock_bricks_wall", - "malum:runic_twisted_rock_bricks_wall", - "malum:tainted_rock_bricks_wall", - "malum:runic_small_twisted_rock_bricks_wall", - "malum:small_twisted_rock_bricks_wall", - "malum:runic_tainted_rock_tiles_wall", - "malum:twisted_rock_wall", - "malum:runic_twisted_rock_tiles_wall", - "malum:runic_tainted_rock_bricks_wall" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/wooden_buttons.json b/src/generated/resources/data/minecraft/tags/blocks/wooden_buttons.json deleted file mode 100644 index b1fffd6e8..000000000 --- a/src/generated/resources/data/minecraft/tags/blocks/wooden_buttons.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "replace": false, - "values": [ - "malum:soulwood_planks_button", - "malum:runewood_planks_button", - "malum:runewood_planks_button" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/wooden_doors.json b/src/generated/resources/data/minecraft/tags/blocks/wooden_doors.json deleted file mode 100644 index 10a8f4036..000000000 --- a/src/generated/resources/data/minecraft/tags/blocks/wooden_doors.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "replace": false, - "values": [ - "malum:soulwood_door", - "malum:runewood_door" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/wooden_fences.json b/src/generated/resources/data/minecraft/tags/blocks/wooden_fences.json deleted file mode 100644 index 2f9c1dcf6..000000000 --- a/src/generated/resources/data/minecraft/tags/blocks/wooden_fences.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "replace": false, - "values": [ - "malum:runewood_planks_fence", - "malum:soulwood_planks_fence" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/wooden_pressure_plates.json b/src/generated/resources/data/minecraft/tags/blocks/wooden_pressure_plates.json deleted file mode 100644 index 2c30dba8e..000000000 --- a/src/generated/resources/data/minecraft/tags/blocks/wooden_pressure_plates.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "replace": false, - "values": [ - "malum:runewood_planks_pressure_plate", - "malum:soulwood_planks_pressure_plate" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/wooden_slabs.json b/src/generated/resources/data/minecraft/tags/blocks/wooden_slabs.json deleted file mode 100644 index f9f35e036..000000000 --- a/src/generated/resources/data/minecraft/tags/blocks/wooden_slabs.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "replace": false, - "values": [ - "malum:runewood_planks_slab", - "malum:soulwood_panel_slab", - "malum:vertical_soulwood_planks_slab", - "malum:soulwood_planks_slab", - "malum:runewood_tiles_slab", - "malum:soulwood_tiles_slab", - "malum:vertical_runewood_planks_slab", - "malum:runewood_panel_slab" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/wooden_stairs.json b/src/generated/resources/data/minecraft/tags/blocks/wooden_stairs.json deleted file mode 100644 index abf4c34be..000000000 --- a/src/generated/resources/data/minecraft/tags/blocks/wooden_stairs.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "replace": false, - "values": [ - "malum:runewood_tiles_stairs", - "malum:soulwood_tiles_stairs", - "malum:runewood_planks_stairs", - "malum:vertical_runewood_planks_stairs", - "malum:soulwood_panel_stairs", - "malum:vertical_soulwood_planks_stairs", - "malum:runewood_panel_stairs", - "malum:soulwood_planks_stairs" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/wooden_trapdoors.json b/src/generated/resources/data/minecraft/tags/blocks/wooden_trapdoors.json deleted file mode 100644 index f3448d977..000000000 --- a/src/generated/resources/data/minecraft/tags/blocks/wooden_trapdoors.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "replace": false, - "values": [ - "malum:solid_soulwood_trapdoor", - "malum:runewood_trapdoor", - "malum:soulwood_trapdoor", - "malum:solid_runewood_trapdoor" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/items/anvil.json b/src/generated/resources/data/minecraft/tags/items/anvil.json deleted file mode 100644 index 5e8aecc98..000000000 --- a/src/generated/resources/data/minecraft/tags/items/anvil.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "replace": false, - "values": [] -} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/items/beds.json b/src/generated/resources/data/minecraft/tags/items/beds.json deleted file mode 100644 index 5e8aecc98..000000000 --- a/src/generated/resources/data/minecraft/tags/items/beds.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "replace": false, - "values": [] -} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/items/buttons.json b/src/generated/resources/data/minecraft/tags/items/buttons.json deleted file mode 100644 index ee1f755bd..000000000 --- a/src/generated/resources/data/minecraft/tags/items/buttons.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "replace": false, - "values": [ - "malum:soulwood_planks_button", - "malum:tainted_rock_button", - "malum:runewood_planks_button", - "malum:runewood_planks_button", - "malum:twisted_rock_button" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/items/carpets.json b/src/generated/resources/data/minecraft/tags/items/carpets.json deleted file mode 100644 index 5e8aecc98..000000000 --- a/src/generated/resources/data/minecraft/tags/items/carpets.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "replace": false, - "values": [] -} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/items/doors.json b/src/generated/resources/data/minecraft/tags/items/doors.json deleted file mode 100644 index 10a8f4036..000000000 --- a/src/generated/resources/data/minecraft/tags/items/doors.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "replace": false, - "values": [ - "malum:soulwood_door", - "malum:runewood_door" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/items/fences.json b/src/generated/resources/data/minecraft/tags/items/fences.json deleted file mode 100644 index 2f9c1dcf6..000000000 --- a/src/generated/resources/data/minecraft/tags/items/fences.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "replace": false, - "values": [ - "malum:runewood_planks_fence", - "malum:soulwood_planks_fence" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/items/flowers.json b/src/generated/resources/data/minecraft/tags/items/flowers.json deleted file mode 100644 index 5e8aecc98..000000000 --- a/src/generated/resources/data/minecraft/tags/items/flowers.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "replace": false, - "values": [] -} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/items/gold_ores.json b/src/generated/resources/data/minecraft/tags/items/gold_ores.json deleted file mode 100644 index 5e8aecc98..000000000 --- a/src/generated/resources/data/minecraft/tags/items/gold_ores.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "replace": false, - "values": [] -} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/items/leaves.json b/src/generated/resources/data/minecraft/tags/items/leaves.json deleted file mode 100644 index dea6a178a..000000000 --- a/src/generated/resources/data/minecraft/tags/items/leaves.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "replace": false, - "values": [ - "malum:soulwood_leaves", - "malum:runewood_leaves", - "malum:runewood_leaves" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/items/logs.json b/src/generated/resources/data/minecraft/tags/items/logs.json deleted file mode 100644 index 74f38d335..000000000 --- a/src/generated/resources/data/minecraft/tags/items/logs.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "replace": false, - "values": [ - "malum:revealed_runewood_log", - "malum:soulwood", - "malum:exposed_soulwood_log", - "malum:runewood", - "malum:stripped_soulwood_log", - "malum:stripped_runewood", - "malum:soulwood_log", - "malum:stripped_runewood_log", - "malum:exposed_runewood_log", - "malum:revealed_soulwood_log", - "malum:runewood_log", - "malum:stripped_soulwood" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/items/logs_that_burn.json b/src/generated/resources/data/minecraft/tags/items/logs_that_burn.json deleted file mode 100644 index 5e8aecc98..000000000 --- a/src/generated/resources/data/minecraft/tags/items/logs_that_burn.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "replace": false, - "values": [] -} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/items/planks.json b/src/generated/resources/data/minecraft/tags/items/planks.json deleted file mode 100644 index 50bb42736..000000000 --- a/src/generated/resources/data/minecraft/tags/items/planks.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "replace": false, - "values": [ - "malum:vertical_soulwood_planks", - "malum:vertical_runewood_planks", - "malum:cut_soulwood_planks", - "malum:cut_runewood_planks", - "malum:runewood_planks", - "malum:soulwood_planks" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/items/sand.json b/src/generated/resources/data/minecraft/tags/items/sand.json deleted file mode 100644 index 5e8aecc98..000000000 --- a/src/generated/resources/data/minecraft/tags/items/sand.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "replace": false, - "values": [] -} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/items/slabs.json b/src/generated/resources/data/minecraft/tags/items/slabs.json deleted file mode 100644 index a9a9fc922..000000000 --- a/src/generated/resources/data/minecraft/tags/items/slabs.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "replace": false, - "values": [ - "malum:runewood_planks_slab", - "malum:runic_tainted_rock_bricks_slab", - "malum:polished_twisted_rock_slab", - "malum:soulwood_panel_slab", - "malum:small_twisted_rock_bricks_slab", - "malum:polished_tainted_rock_slab", - "malum:vertical_soulwood_planks_slab", - "malum:soulwood_planks_slab", - "malum:runewood_tiles_slab", - "malum:twisted_rock_tiles_slab", - "malum:runic_twisted_rock_bricks_slab", - "malum:soulwood_tiles_slab", - "malum:small_tainted_rock_bricks_slab", - "malum:tainted_rock_slab", - "malum:runic_twisted_rock_tiles_slab", - "malum:runic_small_tainted_rock_bricks_slab", - "malum:vertical_runewood_planks_slab", - "malum:twisted_rock_bricks_slab", - "malum:tainted_rock_bricks_slab", - "malum:smooth_tainted_rock_slab", - "malum:runic_small_twisted_rock_bricks_slab", - "malum:smooth_twisted_rock_slab", - "malum:tainted_rock_tiles_slab", - "malum:runewood_panel_slab", - "malum:twisted_rock_slab", - "malum:runic_tainted_rock_tiles_slab" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/items/small_flowers.json b/src/generated/resources/data/minecraft/tags/items/small_flowers.json deleted file mode 100644 index 5e8aecc98..000000000 --- a/src/generated/resources/data/minecraft/tags/items/small_flowers.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "replace": false, - "values": [] -} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/items/soul_fire_base_blocks.json b/src/generated/resources/data/minecraft/tags/items/soul_fire_base_blocks.json deleted file mode 100644 index 5e8aecc98..000000000 --- a/src/generated/resources/data/minecraft/tags/items/soul_fire_base_blocks.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "replace": false, - "values": [] -} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/items/stairs.json b/src/generated/resources/data/minecraft/tags/items/stairs.json deleted file mode 100644 index df85536e3..000000000 --- a/src/generated/resources/data/minecraft/tags/items/stairs.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "replace": false, - "values": [ - "malum:runewood_tiles_stairs", - "malum:runic_twisted_rock_bricks_stairs", - "malum:soulwood_tiles_stairs", - "malum:small_tainted_rock_bricks_stairs", - "malum:twisted_rock_bricks_stairs", - "malum:runewood_planks_stairs", - "malum:tainted_rock_stairs", - "malum:smooth_tainted_rock_stairs", - "malum:vertical_runewood_planks_stairs", - "malum:runic_twisted_rock_tiles_stairs", - "malum:twisted_rock_tiles_stairs", - "malum:smooth_twisted_rock_stairs", - "malum:runic_small_twisted_rock_bricks_stairs", - "malum:polished_tainted_rock_stairs", - "malum:tainted_rock_bricks_stairs", - "malum:soulwood_panel_stairs", - "malum:vertical_soulwood_planks_stairs", - "malum:runic_tainted_rock_bricks_stairs", - "malum:runic_small_tainted_rock_bricks_stairs", - "malum:runewood_panel_stairs", - "malum:polished_twisted_rock_stairs", - "malum:soulwood_planks_stairs", - "malum:tainted_rock_tiles_stairs", - "malum:runic_tainted_rock_tiles_stairs", - "malum:small_twisted_rock_bricks_stairs", - "malum:twisted_rock_stairs" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/items/stone_bricks.json b/src/generated/resources/data/minecraft/tags/items/stone_bricks.json deleted file mode 100644 index 5e8aecc98..000000000 --- a/src/generated/resources/data/minecraft/tags/items/stone_bricks.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "replace": false, - "values": [] -} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/items/tall_flowers.json b/src/generated/resources/data/minecraft/tags/items/tall_flowers.json deleted file mode 100644 index 5e8aecc98..000000000 --- a/src/generated/resources/data/minecraft/tags/items/tall_flowers.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "replace": false, - "values": [] -} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/items/trapdoors.json b/src/generated/resources/data/minecraft/tags/items/trapdoors.json deleted file mode 100644 index f3448d977..000000000 --- a/src/generated/resources/data/minecraft/tags/items/trapdoors.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "replace": false, - "values": [ - "malum:solid_soulwood_trapdoor", - "malum:runewood_trapdoor", - "malum:soulwood_trapdoor", - "malum:solid_runewood_trapdoor" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/items/walls.json b/src/generated/resources/data/minecraft/tags/items/walls.json deleted file mode 100644 index 55c8dbc93..000000000 --- a/src/generated/resources/data/minecraft/tags/items/walls.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "replace": false, - "values": [ - "malum:tainted_rock_tiles_wall", - "malum:twisted_rock_tiles_wall", - "malum:tainted_rock_wall", - "malum:runic_small_tainted_rock_bricks_wall", - "malum:small_tainted_rock_bricks_wall", - "malum:twisted_rock_bricks_wall", - "malum:runic_twisted_rock_bricks_wall", - "malum:tainted_rock_bricks_wall", - "malum:runic_small_twisted_rock_bricks_wall", - "malum:small_twisted_rock_bricks_wall", - "malum:runic_tainted_rock_tiles_wall", - "malum:twisted_rock_wall", - "malum:runic_twisted_rock_tiles_wall", - "malum:runic_tainted_rock_bricks_wall" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/items/wooden_buttons.json b/src/generated/resources/data/minecraft/tags/items/wooden_buttons.json deleted file mode 100644 index b1fffd6e8..000000000 --- a/src/generated/resources/data/minecraft/tags/items/wooden_buttons.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "replace": false, - "values": [ - "malum:soulwood_planks_button", - "malum:runewood_planks_button", - "malum:runewood_planks_button" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/items/wooden_doors.json b/src/generated/resources/data/minecraft/tags/items/wooden_doors.json deleted file mode 100644 index 10a8f4036..000000000 --- a/src/generated/resources/data/minecraft/tags/items/wooden_doors.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "replace": false, - "values": [ - "malum:soulwood_door", - "malum:runewood_door" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/items/wooden_fences.json b/src/generated/resources/data/minecraft/tags/items/wooden_fences.json deleted file mode 100644 index 2f9c1dcf6..000000000 --- a/src/generated/resources/data/minecraft/tags/items/wooden_fences.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "replace": false, - "values": [ - "malum:runewood_planks_fence", - "malum:soulwood_planks_fence" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/items/wooden_pressure_plates.json b/src/generated/resources/data/minecraft/tags/items/wooden_pressure_plates.json deleted file mode 100644 index 2c30dba8e..000000000 --- a/src/generated/resources/data/minecraft/tags/items/wooden_pressure_plates.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "replace": false, - "values": [ - "malum:runewood_planks_pressure_plate", - "malum:soulwood_planks_pressure_plate" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/items/wooden_slabs.json b/src/generated/resources/data/minecraft/tags/items/wooden_slabs.json deleted file mode 100644 index f9f35e036..000000000 --- a/src/generated/resources/data/minecraft/tags/items/wooden_slabs.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "replace": false, - "values": [ - "malum:runewood_planks_slab", - "malum:soulwood_panel_slab", - "malum:vertical_soulwood_planks_slab", - "malum:soulwood_planks_slab", - "malum:runewood_tiles_slab", - "malum:soulwood_tiles_slab", - "malum:vertical_runewood_planks_slab", - "malum:runewood_panel_slab" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/items/wooden_stairs.json b/src/generated/resources/data/minecraft/tags/items/wooden_stairs.json deleted file mode 100644 index abf4c34be..000000000 --- a/src/generated/resources/data/minecraft/tags/items/wooden_stairs.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "replace": false, - "values": [ - "malum:runewood_tiles_stairs", - "malum:soulwood_tiles_stairs", - "malum:runewood_planks_stairs", - "malum:vertical_runewood_planks_stairs", - "malum:soulwood_panel_stairs", - "malum:vertical_soulwood_planks_stairs", - "malum:runewood_panel_stairs", - "malum:soulwood_planks_stairs" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/items/wooden_trapdoors.json b/src/generated/resources/data/minecraft/tags/items/wooden_trapdoors.json deleted file mode 100644 index f3448d977..000000000 --- a/src/generated/resources/data/minecraft/tags/items/wooden_trapdoors.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "replace": false, - "values": [ - "malum:solid_soulwood_trapdoor", - "malum:runewood_trapdoor", - "malum:soulwood_trapdoor", - "malum:solid_runewood_trapdoor" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/items/wool.json b/src/generated/resources/data/minecraft/tags/items/wool.json deleted file mode 100644 index 5e8aecc98..000000000 --- a/src/generated/resources/data/minecraft/tags/items/wool.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "replace": false, - "values": [] -} \ No newline at end of file diff --git a/src/main/java/com/sammy/malum/MalumMod.java b/src/main/java/com/sammy/malum/MalumMod.java index d482044f2..55fcca08c 100644 --- a/src/main/java/com/sammy/malum/MalumMod.java +++ b/src/main/java/com/sammy/malum/MalumMod.java @@ -1,47 +1,58 @@ package com.sammy.malum; -import com.sammy.malum.compability.create.*; -import com.sammy.malum.compability.farmersdelight.*; -import com.sammy.malum.compability.tetra.*; -import com.sammy.malum.config.*; -import com.sammy.malum.data.*; -import com.sammy.malum.data.block.*; -import com.sammy.malum.data.item.*; -import com.sammy.malum.data.recipe.*; +import com.sammy.malum.compability.create.CreateCompat; +import com.sammy.malum.compability.farmersdelight.FarmersDelightCompat; +import com.sammy.malum.config.ClientConfig; +import com.sammy.malum.config.CommonConfig; +import com.sammy.malum.data.MalumBiomeTags; +import com.sammy.malum.data.MalumLang; +import com.sammy.malum.data.RegistryDataGenerator; +import com.sammy.malum.data.block.MalumBlockLootTables; +import com.sammy.malum.data.block.MalumBlockStates; +import com.sammy.malum.data.block.MalumBlockTags; +import com.sammy.malum.data.item.MalumItemModels; +import com.sammy.malum.registry.common.item.tabs.CreativeTabRegistry; +import net.minecraft.DetectedVersion; import net.minecraft.core.HolderLookup; -import net.minecraft.data.*; -import net.minecraft.data.tags.*; -import net.minecraft.resources.*; +import net.minecraft.data.DataGenerator; +import net.minecraft.data.PackOutput; +import net.minecraft.data.metadata.PackMetadataGenerator; +import net.minecraft.network.chat.Component; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.server.packs.PackType; +import net.minecraft.server.packs.metadata.pack.PackMetadataSection; import net.minecraft.util.RandomSource; -import net.minecraft.world.entity.*; -import net.minecraft.world.item.*; -import net.minecraftforge.common.data.BlockTagsProvider; import net.minecraftforge.common.data.ExistingFileHelper; import net.minecraftforge.data.event.GatherDataEvent; -import net.minecraftforge.eventbus.api.*; -import net.minecraftforge.fml.*; -import net.minecraftforge.fml.common.*; -import net.minecraftforge.fml.config.*; -import net.minecraftforge.fml.javafmlmod.*; -import org.apache.logging.log4j.*; - -import java.util.*; +import net.minecraftforge.eventbus.api.IEventBus; +import net.minecraftforge.eventbus.api.SubscribeEvent; +import net.minecraftforge.fml.ModLoadingContext; +import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.fml.config.ModConfig; +import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +import java.util.Arrays; import java.util.concurrent.CompletableFuture; -import java.util.function.*; - -import static com.sammy.malum.registry.client.ParticleRegistry.*; -import static com.sammy.malum.registry.common.AttributeRegistry.*; -import static com.sammy.malum.registry.common.ContainerRegistry.*; -import static com.sammy.malum.registry.common.MobEffectRegistry.*; -import static com.sammy.malum.registry.common.SoundRegistry.*; -import static com.sammy.malum.registry.common.block.BlockEntityRegistry.*; -import static com.sammy.malum.registry.common.block.BlockRegistry.*; -import static com.sammy.malum.registry.common.entity.EntityRegistry.*; -import static com.sammy.malum.registry.common.item.EnchantmentRegistry.*; -import static com.sammy.malum.registry.common.item.ItemRegistry.*; -import static com.sammy.malum.registry.common.recipe.RecipeSerializerRegistry.*; -import static com.sammy.malum.registry.common.recipe.RecipeTypeRegistry.*; -import static com.sammy.malum.registry.common.worldgen.FeatureRegistry.*; +import java.util.function.Function; +import java.util.stream.Collectors; + +import static com.sammy.malum.registry.client.ParticleRegistry.PARTICLES; +import static com.sammy.malum.registry.common.AttributeRegistry.ATTRIBUTES; +import static com.sammy.malum.registry.common.ContainerRegistry.CONTAINERS; +import static com.sammy.malum.registry.common.MobEffectRegistry.EFFECTS; +import static com.sammy.malum.registry.common.SoundRegistry.SOUNDS; +import static com.sammy.malum.registry.common.block.BlockEntityRegistry.BLOCK_ENTITY_TYPES; +import static com.sammy.malum.registry.common.block.BlockRegistry.BLOCKS; +import static com.sammy.malum.registry.common.entity.EntityRegistry.ENTITY_TYPES; +import static com.sammy.malum.registry.common.item.EnchantmentRegistry.ENCHANTMENTS; +import static com.sammy.malum.registry.common.item.ItemRegistry.ITEMS; +import static com.sammy.malum.registry.common.item.tabs.CreativeTabRegistry.CREATIVE_MODE_TABS; +import static com.sammy.malum.registry.common.recipe.RecipeSerializerRegistry.RECIPE_SERIALIZERS; +import static com.sammy.malum.registry.common.recipe.RecipeTypeRegistry.RECIPE_TYPES; +import static com.sammy.malum.registry.common.worldgen.FeatureRegistry.FEATURE_TYPES; +import static com.sammy.malum.registry.common.worldgen.StructureRegistry.STRUCTURES; @SuppressWarnings("unused") @Mod(MalumMod.MALUM) @@ -69,56 +80,17 @@ public MalumMod() { RECIPE_TYPES.register(modBus); RECIPE_SERIALIZERS.register(modBus); FEATURE_TYPES.register(modBus); + STRUCTURES.register(modBus); + CREATIVE_MODE_TABS.register(modBus); //TetraCompat.init(); FarmersDelightCompat.init(); CreateCompat.init(); - modBus.addListener(DataOnly::gatherData); + modBus.addListener(CreativeTabRegistry::populateItemGroups); } public static ResourceLocation malumPath(String path) { return new ResourceLocation(MALUM, path); } - - - public static class DataOnly { - public static void gatherData(GatherDataEvent event) { - DataGenerator generator = event.getGenerator(); - PackOutput output = generator.getPackOutput(); - CompletableFuture provider = event.getLookupProvider(); - ExistingFileHelper helper = event.getExistingFileHelper(); - - BlockTagsProvider blockTagsProvider = new MalumBlockTags(output, provider, helper); - MalumItemModels itemModelsProvider = new MalumItemModels(output, helper); - MalumItemTags itemTagsProvider = new MalumItemTags(output, provider, blockTagsProvider.contentsGetter(), helper); - MalumBlockStates blockStateProvider = new MalumBlockStates(output, helper, itemModelsProvider); - MalumLang langProvider = new MalumLang(generator); - MalumBlockLootTables lootTablesProvider = new MalumBlockLootTables(output); - MalumRecipes recipeProvider = new MalumRecipes(output); - MalumVanillaRecipeReplacements vanillaRecipeReplacementsProvider = new MalumVanillaRecipeReplacements(output); - MalumSpiritInfusionRecipes spiritInfusionRecipesProvider = new MalumSpiritInfusionRecipes(output); - MalumSpiritFocusingRecipes spiritFocusingRecipesProvider = new MalumSpiritFocusingRecipes(output); - MalumSpiritTransmutationRecipes spiritTransmutationRecipesProvider =new MalumSpiritTransmutationRecipes(output); - MalumVoidFavorRecipes voidFavorRecipesProvider = new MalumVoidFavorRecipes(output); - - - - generator.addProvider(event.includeClient(), blockStateProvider); - generator.addProvider(event.includeClient(), itemModelsProvider); - generator.addProvider(event.includeClient(), langProvider); - - generator.addProvider(event.includeServer(), blockTagsProvider); - generator.addProvider(event.includeServer(), lootTablesProvider); - generator.addProvider(event.includeServer(), itemTagsProvider); - - - generator.addProvider(event.includeServer(), recipeProvider); - generator.addProvider(event.includeServer(), vanillaRecipeReplacementsProvider); - generator.addProvider(event.includeServer(), spiritInfusionRecipesProvider); - generator.addProvider(event.includeServer(), spiritFocusingRecipesProvider); - generator.addProvider(event.includeServer(), spiritTransmutationRecipesProvider); - generator.addProvider(event.includeServer(), voidFavorRecipesProvider); - } - } } \ No newline at end of file diff --git a/src/main/java/com/sammy/malum/client/cosmetic/ArmorSkinRenderingData.java b/src/main/java/com/sammy/malum/client/cosmetic/ArmorSkinRenderingData.java index 525c43227..083b65a68 100644 --- a/src/main/java/com/sammy/malum/client/cosmetic/ArmorSkinRenderingData.java +++ b/src/main/java/com/sammy/malum/client/cosmetic/ArmorSkinRenderingData.java @@ -1,13 +1,13 @@ package com.sammy.malum.client.cosmetic; -import com.sammy.malum.common.item.cosmetic.skins.*; -import net.minecraft.*; -import net.minecraft.client.player.*; -import net.minecraft.resources.*; -import net.minecraft.world.entity.*; -import team.lodestar.lodestone.systems.model.*; - -import java.util.function.*; +import com.sammy.malum.common.item.cosmetic.skins.ArmorSkin; +import net.minecraft.Util; +import net.minecraft.client.player.AbstractClientPlayer; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.entity.LivingEntity; +import team.lodestar.lodestone.systems.model.LodestoneArmorModel; + +import java.util.function.Function; public abstract class ArmorSkinRenderingData { diff --git a/src/main/java/com/sammy/malum/client/cosmetic/PrideArmorSkinRenderingData.java b/src/main/java/com/sammy/malum/client/cosmetic/PrideArmorSkinRenderingData.java index c924c1b66..67864355f 100644 --- a/src/main/java/com/sammy/malum/client/cosmetic/PrideArmorSkinRenderingData.java +++ b/src/main/java/com/sammy/malum/client/cosmetic/PrideArmorSkinRenderingData.java @@ -1,11 +1,11 @@ package com.sammy.malum.client.cosmetic; -import com.sammy.malum.registry.client.*; -import net.minecraft.resources.*; -import net.minecraft.world.entity.*; -import team.lodestar.lodestone.systems.model.*; +import com.sammy.malum.registry.client.ModelRegistry; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.entity.LivingEntity; +import team.lodestar.lodestone.systems.model.LodestoneArmorModel; -import static com.sammy.malum.MalumMod.*; +import static com.sammy.malum.MalumMod.malumPath; public class PrideArmorSkinRenderingData extends ArmorSkinRenderingData { @@ -16,6 +16,7 @@ public PrideArmorSkinRenderingData(String type) { this.slimTexture = malumPath("textures/armor/cosmetic/pride/" + type + "_drip_slim.png"); this.standardTexture = malumPath("textures/armor/cosmetic/pride/" + type + "_drip.png"); } + @Override public ResourceLocation getTexture(LivingEntity livingEntity, boolean slim) { return slim ? this.slimTexture : standardTexture; diff --git a/src/main/java/com/sammy/malum/client/cosmetic/SimpleArmorSkinRenderingData.java b/src/main/java/com/sammy/malum/client/cosmetic/SimpleArmorSkinRenderingData.java index 949fac6ea..c966692f6 100644 --- a/src/main/java/com/sammy/malum/client/cosmetic/SimpleArmorSkinRenderingData.java +++ b/src/main/java/com/sammy/malum/client/cosmetic/SimpleArmorSkinRenderingData.java @@ -1,8 +1,8 @@ package com.sammy.malum.client.cosmetic; -import net.minecraft.resources.*; -import net.minecraft.world.entity.*; -import team.lodestar.lodestone.systems.model.*; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.entity.LivingEntity; +import team.lodestar.lodestone.systems.model.LodestoneArmorModel; public class SimpleArmorSkinRenderingData extends ArmorSkinRenderingData { diff --git a/src/main/java/com/sammy/malum/client/model/HeadOverlayModel.java b/src/main/java/com/sammy/malum/client/model/HeadOverlayModel.java index 9d7454e09..e99ae9c4a 100644 --- a/src/main/java/com/sammy/malum/client/model/HeadOverlayModel.java +++ b/src/main/java/com/sammy/malum/client/model/HeadOverlayModel.java @@ -12,30 +12,30 @@ public class HeadOverlayModel extends EntityModel { - public static ModelLayerLocation LAYER = new ModelLayerLocation(MalumMod.malumPath("head_overlay"), "main"); - public final ModelPart overlay; + public static ModelLayerLocation LAYER = new ModelLayerLocation(MalumMod.malumPath("head_overlay"), "main"); + public final ModelPart overlay; - public HeadOverlayModel(ModelPart root) { - this.overlay = root.getChild("overlay"); - } + public HeadOverlayModel(ModelPart root) { + this.overlay = root.getChild("overlay"); + } - public static LayerDefinition createBodyLayer() { - MeshDefinition meshdefinition = new MeshDefinition(); - PartDefinition partdefinition = meshdefinition.getRoot(); + public static LayerDefinition createBodyLayer() { + MeshDefinition meshdefinition = new MeshDefinition(); + PartDefinition partdefinition = meshdefinition.getRoot(); - PartDefinition overlay = partdefinition.addOrReplaceChild("overlay", CubeListBuilder.create().texOffs(32, 0).addBox(-4.0F, -8.0F, -4.0F, 8.0F, 8.0F, 8.0F, new CubeDeformation(0.51F)) - .texOffs(0, 0).addBox(-4.0F, -8.0F, -4.0F, 8.0F, 8.0F, 8.0F, new CubeDeformation(0.001F)), PartPose.offset(0.0F, 0.0F, 0.0F)); + PartDefinition overlay = partdefinition.addOrReplaceChild("overlay", CubeListBuilder.create().texOffs(32, 0).addBox(-4.0F, -8.0F, -4.0F, 8.0F, 8.0F, 8.0F, new CubeDeformation(0.51F)) + .texOffs(0, 0).addBox(-4.0F, -8.0F, -4.0F, 8.0F, 8.0F, 8.0F, new CubeDeformation(0.001F)), PartPose.offset(0.0F, 0.0F, 0.0F)); - return LayerDefinition.create(meshdefinition, 64, 64); - } + return LayerDefinition.create(meshdefinition, 64, 64); + } - @Override - public void setupAnim(Player entity, float limbSwing, float limbSwingAmount, float ageInTicks, float netHeadYaw, float headPitch) { + @Override + public void setupAnim(Player entity, float limbSwing, float limbSwingAmount, float ageInTicks, float netHeadYaw, float headPitch) { - } + } - @Override - public void renderToBuffer(PoseStack poseStack, VertexConsumer buffer, int packedLight, int packedOverlay, float red, float green, float blue, float alpha) { - overlay.render(poseStack, buffer, packedLight, packedOverlay); - } + @Override + public void renderToBuffer(PoseStack poseStack, VertexConsumer buffer, int packedLight, int packedOverlay, float red, float green, float blue, float alpha) { + overlay.render(poseStack, buffer, packedLight, packedOverlay); + } } \ No newline at end of file diff --git a/src/main/java/com/sammy/malum/client/model/SoulHunterArmorModel.java b/src/main/java/com/sammy/malum/client/model/SoulHunterArmorModel.java index e215e0cee..471c4d4dd 100644 --- a/src/main/java/com/sammy/malum/client/model/SoulHunterArmorModel.java +++ b/src/main/java/com/sammy/malum/client/model/SoulHunterArmorModel.java @@ -19,162 +19,161 @@ import team.lodestar.lodestone.systems.model.LodestoneArmorModel; public class SoulHunterArmorModel extends LodestoneArmorModel { - public static ModelLayerLocation LAYER = new ModelLayerLocation(MalumMod.malumPath("soul_hunter_armor"), "main"); - - public ModelPart cape; - public ModelPart lowered_hood; - - public SoulHunterArmorModel(ModelPart root) { - super(root); - this.cape = root.getChild("cape"); - this.lowered_hood = root.getChild("lowered_hood"); - } - - @Override - protected Iterable bodyParts() { - if (this.slot == EquipmentSlot.CHEST) { - return ImmutableList.of(this.body, this.leftArm, this.rightArm, this.cape, this.lowered_hood); - } else if (this.slot == EquipmentSlot.LEGS) { - return ImmutableList.of(this.leftLegging, this.rightLegging, this.leggings); - } else { - return this.slot == EquipmentSlot.FEET ? ImmutableList.of(this.leftFoot, this.rightFoot) : ImmutableList.of(); - } - } - - @Override - public void copyFromDefault(HumanoidModel model) { - super.copyFromDefault(model); - cape.copyFrom(model.body); - lowered_hood.copyFrom(model.body); - } - - @Override - public void setupAnim(LivingEntity pEntity, float pLimbSwing, float pLimbSwingAmount, float pAgeInTicks, float pNetHeadYaw, float pHeadPitch) { - float pPartialTicks = Minecraft.getInstance().getDeltaFrameTime(); - - lowered_hood.visible = pEntity.getItemBySlot(EquipmentSlot.HEAD).isEmpty(); - if (pEntity instanceof AbstractClientPlayer clientPlayer) { - double d0 = Mth.lerp(pPartialTicks, clientPlayer.xCloakO, clientPlayer.xCloak) - Mth.lerp(pPartialTicks, pEntity.xo, pEntity.getX()); - double d1 = Mth.lerp(pPartialTicks, clientPlayer.yCloakO, clientPlayer.yCloak) - Mth.lerp(pPartialTicks, pEntity.yo, pEntity.getY()); - double d2 = Mth.lerp(pPartialTicks, clientPlayer.zCloakO, clientPlayer.zCloak) - Mth.lerp(pPartialTicks, pEntity.zo, pEntity.getZ()); - float f = pEntity.yBodyRotO + (pEntity.yBodyRot - pEntity.yBodyRotO); - double d3 = Mth.sin(f * ((float) Math.PI / 180F)); - double d4 = (-Mth.cos(f * ((float) Math.PI / 180F))); - float f1 = (float) d1 * 10.0F; - f1 = Mth.clamp(f1, -6.0F, 16.0F); - float f2 = (float) (d0 * d3 + d2 * d4) * 65.0F; - f2 = Mth.clamp(f2, 0.0F, 75.0F); - float f3 = (float) (d0 * d4 - d2 * d3) * 100.0F; - f3 = Mth.clamp(f3, -20.0F, 20.0F); - if (f2 < 0.0F) { - f2 = 0.0F; - } - float f4 = Mth.lerp(pPartialTicks, clientPlayer.oBob, clientPlayer.bob); - f1 += Mth.sin(Mth.lerp(pPartialTicks, pEntity.walkDistO, pEntity.walkDist) * 6.0F) * 32.0F * f4; - if (pEntity.isCrouching()) { - f1 += 25.0F; - } - float x = (float) Math.toRadians(6.0F + f2 / 2.0F + f1); - float y = (float) Math.toRadians(f3 / 2.0F); - float z = (float) Math.toRadians(f3 / 2.0F); - cape.xRot = x; - cape.yRot = y; - cape.zRot = z; - lowered_hood.xRot = x/3f; - lowered_hood.yRot = y/3f; - lowered_hood.zRot = z/3f; - } - else { - cape.xRot = 0; - cape.yRot = 0; - cape.zRot = 0; - lowered_hood.xRot = 0; - lowered_hood.yRot = 0; - lowered_hood.zRot = 0; - } - super.setupAnim(pEntity, pLimbSwing, pLimbSwingAmount, pAgeInTicks, pNetHeadYaw, pHeadPitch); - } - - public static LayerDefinition createBodyLayer() { - MeshDefinition mesh = HumanoidModel.createMesh(new CubeDeformation(0), 0); - PartDefinition root = createHumanoidAlias(mesh); - PartDefinition cape = root.addOrReplaceChild("cape", new CubeListBuilder(), PartPose.ZERO); - PartDefinition lowered_hood = root.addOrReplaceChild("lowered_hood", new CubeListBuilder(), PartPose.ZERO); - - PartDefinition body = root.getChild("body"); - PartDefinition torso = body.addOrReplaceChild("torso", CubeListBuilder.create().texOffs(0, 18).addBox(-4.5F, -0.5F, -2.5F, 9.0F, 10.0F, 5.0F, new CubeDeformation(0.0F)) - .texOffs(28, 18).addBox(-4.5F, -0.5F, -2.5F, 9.0F, 10.0F, 5.0F, new CubeDeformation(0.25F)), PartPose.offset(0.0F, 0.0F, 0.0F)); - PartDefinition left_stripe = torso.addOrReplaceChild("left_stripe", CubeListBuilder.create().texOffs(0, 33).addBox(-1.9074F, 0.0F, -0.6014F, 3.0F, 10.0F, 1.0F, new CubeDeformation(0.01F)), PartPose.offsetAndRotation(-2.5F, -0.5F, -2.5F, -0.0892F, 0.3487F, -0.0061F)); - PartDefinition right_stripe = torso.addOrReplaceChild("right_stripe", CubeListBuilder.create().texOffs(0, 33).mirror().addBox(-1.0926F, 0.0F, -0.6014F, 3.0F, 10.0F, 1.0F, new CubeDeformation(0.01F)).mirror(false), PartPose.offsetAndRotation(2.5F, -0.5F, -2.5F, -0.0892F, -0.3487F, 0.0061F)); - - PartDefinition leggings = root.getChild("leggings"); - PartDefinition codpiece = leggings.addOrReplaceChild("codpiece", CubeListBuilder.create().texOffs(0, 84).addBox(-5.0F, -14.5F, -3.5F, 10.0F, 3.0F, 7.0F, new CubeDeformation(0.01F)) - .texOffs(34, 84).addBox(-5.0F, -14.5F, -3.5F, 10.0F, 3.0F, 7.0F, new CubeDeformation(0.26F)), PartPose.offset(0.0F, 24.0F, 0.0F)); - - PartDefinition right_legging = root.getChild("right_legging"); - PartDefinition right_leg = right_legging.addOrReplaceChild("right_leg", CubeListBuilder.create().texOffs(39, 103).addBox(-2.5F, -0.5F, -2.5F, 5.0F, 8.0F, 5.0F, new CubeDeformation(0.01F)), PartPose.offset(0, 0, 0.0F)); - PartDefinition right_leg_robe = right_legging.addOrReplaceChild("right_leg_robe", CubeListBuilder.create().texOffs(0, 118).addBox(-1.0F, 3.0F, -5.0F, 1.0F, 3.0F, 7.0F, new CubeDeformation(0.25F)) - .texOffs(0, 108).addBox(-1.0F, 3.0F, -5.0F, 1.0F, 3.0F, 7.0F, new CubeDeformation(0.0F)) - .texOffs(22, 94).addBox(0.0F, -1.0F, -5.0F, 4.0F, 7.0F, 7.0F, new CubeDeformation(0.25F)) - .texOffs(0, 94).addBox(0.0F, -1.0F, -5.0F, 4.0F, 7.0F, 7.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(-3.0F, -0.5F, 1.5F, 0.0F, 0.0F, 0.1745F)); - - PartDefinition right_foot = root.getChild("right_foot"); - PartDefinition right_boot = right_foot.addOrReplaceChild("right_boot", CubeListBuilder.create().texOffs(16, 116).addBox(-3.0F, 7.0F, -3.0F, 6.0F, 6.0F, 6.0F, new CubeDeformation(0.0F)) - .texOffs(40, 116).addBox(-3.0F, 7.0F, -3.0F, 6.0F, 6.0F, 6.0F, new CubeDeformation(0.25F)), PartPose.offset(0.0F, 0.0F, 0.0F)); - - PartDefinition right_arm = root.getChild("right_arm"); - PartDefinition right_shoulder = right_arm.addOrReplaceChild("right_shoulder", CubeListBuilder.create().texOffs(0, 44).mirror().addBox(-4.5F, 5.5F, -2.5F, 5.0F, 5.0F, 5.0F, new CubeDeformation(0.01F)).mirror(false) - .texOffs(20, 44).mirror().addBox(-4.5F, 5.5F, -2.5F, 5.0F, 5.0F, 5.0F, new CubeDeformation(0.26F)).mirror(false) - .texOffs(40, 46).mirror().addBox(-5.5F, 4.5F, -1.5F, 2.0F, 5.0F, 3.0F, new CubeDeformation(0.0F)).mirror(false) - .texOffs(50, 46).mirror().addBox(-5.5F, 4.5F, -1.5F, 2.0F, 5.0F, 3.0F, new CubeDeformation(0.25F)).mirror(false) - .texOffs(8, 33).mirror().addBox(-4.5F, -2.5F, -2.5F, 5.0F, 6.0F, 5.0F, new CubeDeformation(0.01F)).mirror(false) - .texOffs(28, 33).mirror().addBox(-4.5F, -2.5F, -2.5F, 5.0F, 6.0F, 5.0F, new CubeDeformation(0.26F)).mirror(false), PartPose.offset(1, 0, 0.0F)); - - PartDefinition left_legging = root.getChild("left_legging"); - PartDefinition left_leg = left_legging.addOrReplaceChild("left_leg", CubeListBuilder.create().texOffs(39, 103).mirror().addBox(-2.5F, -0.5F, -2.5F, 5.0F, 8.0F, 5.0F, new CubeDeformation(0.0F)).mirror(false), PartPose.offset(0, 0, 0.0F)); - PartDefinition left_leg_robe = left_legging.addOrReplaceChild("left_leg_robe", CubeListBuilder.create().texOffs(0, 118).mirror().addBox(0.0F, 3.0F, -5.0F, 1.0F, 3.0F, 7.0F, new CubeDeformation(0.25F)).mirror(false) - .texOffs(0, 108).mirror().addBox(0.0F, 3.0F, -5.0F, 1.0F, 3.0F, 7.0F, new CubeDeformation(0.0F)).mirror(false) - .texOffs(22, 94).mirror().addBox(-4.0F, -1.0F, -5.0F, 4.0F, 7.0F, 7.0F, new CubeDeformation(0.25F)).mirror(false) - .texOffs(0, 94).mirror().addBox(-4.0F, -1.0F, -5.0F, 4.0F, 7.0F, 7.0F, new CubeDeformation(0.0F)).mirror(false), PartPose.offsetAndRotation(3.0F, -0.5F, 1.5F, 0.0F, 0.0F, -0.1745F)); - - PartDefinition left_foot = root.getChild("left_foot"); - PartDefinition left_boot = left_foot.addOrReplaceChild("left_boot", CubeListBuilder.create().texOffs(16, 116).mirror().addBox(-3.0F, 7.0F, -3.0F, 6.0F, 6.0F, 6.0F, new CubeDeformation(0.01F)).mirror(false) - .texOffs(40, 116).mirror().addBox(-3.0F, 7.0F, -3.0F, 6.0F, 6.0F, 6.0F, new CubeDeformation(0.25F)).mirror(false), PartPose.offset(0.0F, 0.0F, 0.0F)); - - PartDefinition left_arm = root.getChild("left_arm"); - PartDefinition left_shoulder = left_arm.addOrReplaceChild("left_shoulder", CubeListBuilder.create().texOffs(8, 33).addBox(-0.5F, -2.5F, -2.5F, 5.0F, 6.0F, 5.0F, new CubeDeformation(0.01F)) - .texOffs(28, 33).addBox(-0.5F, -2.5F, -2.5F, 5.0F, 6.0F, 5.0F, new CubeDeformation(0.26F)) - .texOffs(0, 44).addBox(-0.5F, 5.5F, -2.5F, 5.0F, 5.0F, 5.0F, new CubeDeformation(0.01F)) - .texOffs(20, 44).addBox(-0.5F, 5.5F, -2.5F, 5.0F, 5.0F, 5.0F, new CubeDeformation(0.26F)) - .texOffs(40, 46).addBox(3.5F, 4.5F, -1.5F, 2.0F, 5.0F, 3.0F, new CubeDeformation(0.0F)) - .texOffs(50, 46).addBox(3.5F, 4.5F, -1.5F, 2.0F, 5.0F, 3.0F, new CubeDeformation(0.25F)), PartPose.offset(-1, 0, 0.0F)); - - PartDefinition head = root.getChild("head"); - PartDefinition helmet = head.addOrReplaceChild("helmet", CubeListBuilder.create().texOffs(0, 0).addBox(-4.5F, -8.5F, -4.5F, 9.0F, 9.0F, 9.0F, new CubeDeformation(0.0F)) - .texOffs(36, 0).addBox(-4.5F, -8.5F, -4.5F, 9.0F, 9.0F, 9.0F, new CubeDeformation(0.25F)), PartPose.offset(0.0F, 0.0F, 0.0F)); - PartDefinition left_hood_bit = head.addOrReplaceChild("left_hood_bit", CubeListBuilder.create().texOffs(53, 59).mirror().addBox(-2.0F, -5.0F, -4.0F, 2.0F, 5.0F, 7.0F, new CubeDeformation(0.25F)).mirror(false) - .texOffs(53, 47).mirror().addBox(-2.0F, -5.0F, -4.0F, 2.0F, 5.0F, 7.0F, new CubeDeformation(0.0F)).mirror(false), PartPose.offsetAndRotation(-4.5F, 0.5F, 0.5F, 0.0F, 0.0F, 0.3927F)); - PartDefinition back_hood_bit = head.addOrReplaceChild("back_hood_bit", CubeListBuilder.create().texOffs(48, 33).addBox(-3.5F, 0.0F, 0.0F, 7.0F, 5.0F, 5.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(0.0F, -8.5F, 4.5F, -0.7854F, 0.0F, 0.0F)); - PartDefinition right_hood_bit = head.addOrReplaceChild("right_hood_bit", CubeListBuilder.create().texOffs(53, 59).addBox(0.0F, -5.0F, -4.0F, 2.0F, 5.0F, 7.0F, new CubeDeformation(0.25F)) - .texOffs(53, 47).addBox(0.0F, -5.0F, -4.0F, 2.0F, 5.0F, 7.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(4.5F, 0.5F, 0.5F, 0.0F, 0.0F, -0.3927F)); - - PartDefinition cape_top = cape.addOrReplaceChild("cape_top", CubeListBuilder.create().texOffs(0, 54).addBox(-6.5213F, -0.1479F, -1.0812F, 11.0F, 8.0F, 1.0F, new CubeDeformation(0.0F)) - .texOffs(24, 54).addBox(-6.5213F, -0.1479F, -1.0812F, 11.0F, 8.0F, 1.0F, new CubeDeformation(0.25F)), PartPose.offsetAndRotation(1.0F, -0.5F, 3.5F, 0.0839F, -0.02F, 0.0126F)); - - PartDefinition cape_middle = cape_top.addOrReplaceChild("cape_middle", CubeListBuilder.create().texOffs(24, 62).addBox(-6.5213F, -0.2878F, -1.0526F, 11.0F, 7.0F, 1.0F, new CubeDeformation(0.25F)) - .texOffs(0, 62).addBox(-6.5213F, -0.2878F, -1.0526F, 11.0F, 7.0F, 1.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(0.0F, 8.0F, 0.0F, 0.1309F, 0.0F, 0.0F)); - - PartDefinition cape_bottom = cape_middle.addOrReplaceChild("cape_bottom", CubeListBuilder.create().texOffs(24, 77).addBox(-6.5213F, -0.9301F, 2.1414F, 3.0F, 4.0F, 1.0F, new CubeDeformation(0.0F)) - .texOffs(0, 77).addBox(-3.5213F, -0.9301F, 2.1414F, 5.0F, 6.0F, 1.0F, new CubeDeformation(0.0F)) - .texOffs(24, 77).mirror().addBox(1.4787F, -0.9301F, 2.1414F, 3.0F, 4.0F, 1.0F, new CubeDeformation(0.0F)).mirror(false) - .texOffs(32, 77).mirror().addBox(1.4787F, -0.9301F, 2.1414F, 3.0F, 4.0F, 1.0F, new CubeDeformation(0.25F)).mirror(false) - .texOffs(12, 77).addBox(-3.5213F, -0.9301F, 2.1414F, 5.0F, 6.0F, 1.0F, new CubeDeformation(0.25F)) - .texOffs(32, 77).addBox(-6.5213F, -0.9301F, 2.1414F, 3.0F, 4.0F, 1.0F, new CubeDeformation(0.25F)), PartPose.offsetAndRotation(0.0F, 8.0F, -3.0F, 0.1745F, 0.0F, 0.0F)); - - PartDefinition hood = lowered_hood.addOrReplaceChild("hood", CubeListBuilder.create(), PartPose.offset(0.0F, 0.0F, 0.0F)); - PartDefinition overhang = hood.addOrReplaceChild("overhang", CubeListBuilder.create().texOffs(26, 70).addBox(-4.98F, -0.5028F, -2.1358F, 8.0F, 2.0F, 5.0F, new CubeDeformation(0.25F)) - .texOffs(0, 70).addBox(-4.98F, -0.5028F, -2.1358F, 8.0F, 2.0F, 5.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(1.0F, -0.5F, 3.5F, -0.6109F, 0.0F, 0.0F)); - - return LayerDefinition.create(mesh, 128, 128); - } + public static ModelLayerLocation LAYER = new ModelLayerLocation(MalumMod.malumPath("soul_hunter_armor"), "main"); + + public ModelPart cape; + public ModelPart lowered_hood; + + public SoulHunterArmorModel(ModelPart root) { + super(root); + this.cape = root.getChild("cape"); + this.lowered_hood = root.getChild("lowered_hood"); + } + + @Override + protected Iterable bodyParts() { + if (this.slot == EquipmentSlot.CHEST) { + return ImmutableList.of(this.body, this.leftArm, this.rightArm, this.cape, this.lowered_hood); + } else if (this.slot == EquipmentSlot.LEGS) { + return ImmutableList.of(this.leftLegging, this.rightLegging, this.leggings); + } else { + return this.slot == EquipmentSlot.FEET ? ImmutableList.of(this.leftFoot, this.rightFoot) : ImmutableList.of(); + } + } + + @Override + public void copyFromDefault(HumanoidModel model) { + super.copyFromDefault(model); + cape.copyFrom(model.body); + lowered_hood.copyFrom(model.body); + } + + @Override + public void setupAnim(LivingEntity pEntity, float pLimbSwing, float pLimbSwingAmount, float pAgeInTicks, float pNetHeadYaw, float pHeadPitch) { + float pPartialTicks = Minecraft.getInstance().getDeltaFrameTime(); + + lowered_hood.visible = pEntity.getItemBySlot(EquipmentSlot.HEAD).isEmpty(); + if (pEntity instanceof AbstractClientPlayer clientPlayer) { + double d0 = Mth.lerp(pPartialTicks, clientPlayer.xCloakO, clientPlayer.xCloak) - Mth.lerp(pPartialTicks, pEntity.xo, pEntity.getX()); + double d1 = Mth.lerp(pPartialTicks, clientPlayer.yCloakO, clientPlayer.yCloak) - Mth.lerp(pPartialTicks, pEntity.yo, pEntity.getY()); + double d2 = Mth.lerp(pPartialTicks, clientPlayer.zCloakO, clientPlayer.zCloak) - Mth.lerp(pPartialTicks, pEntity.zo, pEntity.getZ()); + float f = pEntity.yBodyRotO + (pEntity.yBodyRot - pEntity.yBodyRotO); + double d3 = Mth.sin(f * ((float) Math.PI / 180F)); + double d4 = (-Mth.cos(f * ((float) Math.PI / 180F))); + float f1 = (float) d1 * 10.0F; + f1 = Mth.clamp(f1, -6.0F, 16.0F); + float f2 = (float) (d0 * d3 + d2 * d4) * 65.0F; + f2 = Mth.clamp(f2, 0.0F, 75.0F); + float f3 = (float) (d0 * d4 - d2 * d3) * 100.0F; + f3 = Mth.clamp(f3, -20.0F, 20.0F); + if (f2 < 0.0F) { + f2 = 0.0F; + } + float f4 = Mth.lerp(pPartialTicks, clientPlayer.oBob, clientPlayer.bob); + f1 += Mth.sin(Mth.lerp(pPartialTicks, pEntity.walkDistO, pEntity.walkDist) * 6.0F) * 32.0F * f4; + if (pEntity.isCrouching()) { + f1 += 25.0F; + } + float x = (float) Math.toRadians(6.0F + f2 / 2.0F + f1); + float y = (float) Math.toRadians(f3 / 2.0F); + float z = (float) Math.toRadians(f3 / 2.0F); + cape.xRot = x; + cape.yRot = y; + cape.zRot = z; + lowered_hood.xRot = x / 3f; + lowered_hood.yRot = y / 3f; + lowered_hood.zRot = z / 3f; + } else { + cape.xRot = 0; + cape.yRot = 0; + cape.zRot = 0; + lowered_hood.xRot = 0; + lowered_hood.yRot = 0; + lowered_hood.zRot = 0; + } + super.setupAnim(pEntity, pLimbSwing, pLimbSwingAmount, pAgeInTicks, pNetHeadYaw, pHeadPitch); + } + + public static LayerDefinition createBodyLayer() { + MeshDefinition mesh = HumanoidModel.createMesh(new CubeDeformation(0), 0); + PartDefinition root = createHumanoidAlias(mesh); + PartDefinition cape = root.addOrReplaceChild("cape", new CubeListBuilder(), PartPose.ZERO); + PartDefinition lowered_hood = root.addOrReplaceChild("lowered_hood", new CubeListBuilder(), PartPose.ZERO); + + PartDefinition body = root.getChild("body"); + PartDefinition torso = body.addOrReplaceChild("torso", CubeListBuilder.create().texOffs(0, 18).addBox(-4.5F, -0.5F, -2.5F, 9.0F, 10.0F, 5.0F, new CubeDeformation(0.0F)) + .texOffs(28, 18).addBox(-4.5F, -0.5F, -2.5F, 9.0F, 10.0F, 5.0F, new CubeDeformation(0.25F)), PartPose.offset(0.0F, 0.0F, 0.0F)); + PartDefinition left_stripe = torso.addOrReplaceChild("left_stripe", CubeListBuilder.create().texOffs(0, 33).addBox(-1.9074F, 0.0F, -0.6014F, 3.0F, 10.0F, 1.0F, new CubeDeformation(0.01F)), PartPose.offsetAndRotation(-2.5F, -0.5F, -2.5F, -0.0892F, 0.3487F, -0.0061F)); + PartDefinition right_stripe = torso.addOrReplaceChild("right_stripe", CubeListBuilder.create().texOffs(0, 33).mirror().addBox(-1.0926F, 0.0F, -0.6014F, 3.0F, 10.0F, 1.0F, new CubeDeformation(0.01F)).mirror(false), PartPose.offsetAndRotation(2.5F, -0.5F, -2.5F, -0.0892F, -0.3487F, 0.0061F)); + + PartDefinition leggings = root.getChild("leggings"); + PartDefinition codpiece = leggings.addOrReplaceChild("codpiece", CubeListBuilder.create().texOffs(0, 84).addBox(-5.0F, -14.5F, -3.5F, 10.0F, 3.0F, 7.0F, new CubeDeformation(0.01F)) + .texOffs(34, 84).addBox(-5.0F, -14.5F, -3.5F, 10.0F, 3.0F, 7.0F, new CubeDeformation(0.26F)), PartPose.offset(0.0F, 24.0F, 0.0F)); + + PartDefinition right_legging = root.getChild("right_legging"); + PartDefinition right_leg = right_legging.addOrReplaceChild("right_leg", CubeListBuilder.create().texOffs(39, 103).addBox(-2.5F, -0.5F, -2.5F, 5.0F, 8.0F, 5.0F, new CubeDeformation(0.01F)), PartPose.offset(0, 0, 0.0F)); + PartDefinition right_leg_robe = right_legging.addOrReplaceChild("right_leg_robe", CubeListBuilder.create().texOffs(0, 118).addBox(-1.0F, 3.0F, -5.0F, 1.0F, 3.0F, 7.0F, new CubeDeformation(0.25F)) + .texOffs(0, 108).addBox(-1.0F, 3.0F, -5.0F, 1.0F, 3.0F, 7.0F, new CubeDeformation(0.0F)) + .texOffs(22, 94).addBox(0.0F, -1.0F, -5.0F, 4.0F, 7.0F, 7.0F, new CubeDeformation(0.25F)) + .texOffs(0, 94).addBox(0.0F, -1.0F, -5.0F, 4.0F, 7.0F, 7.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(-3.0F, -0.5F, 1.5F, 0.0F, 0.0F, 0.1745F)); + + PartDefinition right_foot = root.getChild("right_foot"); + PartDefinition right_boot = right_foot.addOrReplaceChild("right_boot", CubeListBuilder.create().texOffs(16, 116).addBox(-3.0F, 7.0F, -3.0F, 6.0F, 6.0F, 6.0F, new CubeDeformation(0.0F)) + .texOffs(40, 116).addBox(-3.0F, 7.0F, -3.0F, 6.0F, 6.0F, 6.0F, new CubeDeformation(0.25F)), PartPose.offset(0.0F, 0.0F, 0.0F)); + + PartDefinition right_arm = root.getChild("right_arm"); + PartDefinition right_shoulder = right_arm.addOrReplaceChild("right_shoulder", CubeListBuilder.create().texOffs(0, 44).mirror().addBox(-4.5F, 5.5F, -2.5F, 5.0F, 5.0F, 5.0F, new CubeDeformation(0.01F)).mirror(false) + .texOffs(20, 44).mirror().addBox(-4.5F, 5.5F, -2.5F, 5.0F, 5.0F, 5.0F, new CubeDeformation(0.26F)).mirror(false) + .texOffs(40, 46).mirror().addBox(-5.5F, 4.5F, -1.5F, 2.0F, 5.0F, 3.0F, new CubeDeformation(0.0F)).mirror(false) + .texOffs(50, 46).mirror().addBox(-5.5F, 4.5F, -1.5F, 2.0F, 5.0F, 3.0F, new CubeDeformation(0.25F)).mirror(false) + .texOffs(8, 33).mirror().addBox(-4.5F, -2.5F, -2.5F, 5.0F, 6.0F, 5.0F, new CubeDeformation(0.01F)).mirror(false) + .texOffs(28, 33).mirror().addBox(-4.5F, -2.5F, -2.5F, 5.0F, 6.0F, 5.0F, new CubeDeformation(0.26F)).mirror(false), PartPose.offset(1, 0, 0.0F)); + + PartDefinition left_legging = root.getChild("left_legging"); + PartDefinition left_leg = left_legging.addOrReplaceChild("left_leg", CubeListBuilder.create().texOffs(39, 103).mirror().addBox(-2.5F, -0.5F, -2.5F, 5.0F, 8.0F, 5.0F, new CubeDeformation(0.0F)).mirror(false), PartPose.offset(0, 0, 0.0F)); + PartDefinition left_leg_robe = left_legging.addOrReplaceChild("left_leg_robe", CubeListBuilder.create().texOffs(0, 118).mirror().addBox(0.0F, 3.0F, -5.0F, 1.0F, 3.0F, 7.0F, new CubeDeformation(0.25F)).mirror(false) + .texOffs(0, 108).mirror().addBox(0.0F, 3.0F, -5.0F, 1.0F, 3.0F, 7.0F, new CubeDeformation(0.0F)).mirror(false) + .texOffs(22, 94).mirror().addBox(-4.0F, -1.0F, -5.0F, 4.0F, 7.0F, 7.0F, new CubeDeformation(0.25F)).mirror(false) + .texOffs(0, 94).mirror().addBox(-4.0F, -1.0F, -5.0F, 4.0F, 7.0F, 7.0F, new CubeDeformation(0.0F)).mirror(false), PartPose.offsetAndRotation(3.0F, -0.5F, 1.5F, 0.0F, 0.0F, -0.1745F)); + + PartDefinition left_foot = root.getChild("left_foot"); + PartDefinition left_boot = left_foot.addOrReplaceChild("left_boot", CubeListBuilder.create().texOffs(16, 116).mirror().addBox(-3.0F, 7.0F, -3.0F, 6.0F, 6.0F, 6.0F, new CubeDeformation(0.01F)).mirror(false) + .texOffs(40, 116).mirror().addBox(-3.0F, 7.0F, -3.0F, 6.0F, 6.0F, 6.0F, new CubeDeformation(0.25F)).mirror(false), PartPose.offset(0.0F, 0.0F, 0.0F)); + + PartDefinition left_arm = root.getChild("left_arm"); + PartDefinition left_shoulder = left_arm.addOrReplaceChild("left_shoulder", CubeListBuilder.create().texOffs(8, 33).addBox(-0.5F, -2.5F, -2.5F, 5.0F, 6.0F, 5.0F, new CubeDeformation(0.01F)) + .texOffs(28, 33).addBox(-0.5F, -2.5F, -2.5F, 5.0F, 6.0F, 5.0F, new CubeDeformation(0.26F)) + .texOffs(0, 44).addBox(-0.5F, 5.5F, -2.5F, 5.0F, 5.0F, 5.0F, new CubeDeformation(0.01F)) + .texOffs(20, 44).addBox(-0.5F, 5.5F, -2.5F, 5.0F, 5.0F, 5.0F, new CubeDeformation(0.26F)) + .texOffs(40, 46).addBox(3.5F, 4.5F, -1.5F, 2.0F, 5.0F, 3.0F, new CubeDeformation(0.0F)) + .texOffs(50, 46).addBox(3.5F, 4.5F, -1.5F, 2.0F, 5.0F, 3.0F, new CubeDeformation(0.25F)), PartPose.offset(-1, 0, 0.0F)); + + PartDefinition head = root.getChild("head"); + PartDefinition helmet = head.addOrReplaceChild("helmet", CubeListBuilder.create().texOffs(0, 0).addBox(-4.5F, -8.5F, -4.5F, 9.0F, 9.0F, 9.0F, new CubeDeformation(0.0F)) + .texOffs(36, 0).addBox(-4.5F, -8.5F, -4.5F, 9.0F, 9.0F, 9.0F, new CubeDeformation(0.25F)), PartPose.offset(0.0F, 0.0F, 0.0F)); + PartDefinition left_hood_bit = head.addOrReplaceChild("left_hood_bit", CubeListBuilder.create().texOffs(53, 59).mirror().addBox(-2.0F, -5.0F, -4.0F, 2.0F, 5.0F, 7.0F, new CubeDeformation(0.25F)).mirror(false) + .texOffs(53, 47).mirror().addBox(-2.0F, -5.0F, -4.0F, 2.0F, 5.0F, 7.0F, new CubeDeformation(0.0F)).mirror(false), PartPose.offsetAndRotation(-4.5F, 0.5F, 0.5F, 0.0F, 0.0F, 0.3927F)); + PartDefinition back_hood_bit = head.addOrReplaceChild("back_hood_bit", CubeListBuilder.create().texOffs(48, 33).addBox(-3.5F, 0.0F, 0.0F, 7.0F, 5.0F, 5.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(0.0F, -8.5F, 4.5F, -0.7854F, 0.0F, 0.0F)); + PartDefinition right_hood_bit = head.addOrReplaceChild("right_hood_bit", CubeListBuilder.create().texOffs(53, 59).addBox(0.0F, -5.0F, -4.0F, 2.0F, 5.0F, 7.0F, new CubeDeformation(0.25F)) + .texOffs(53, 47).addBox(0.0F, -5.0F, -4.0F, 2.0F, 5.0F, 7.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(4.5F, 0.5F, 0.5F, 0.0F, 0.0F, -0.3927F)); + + PartDefinition cape_top = cape.addOrReplaceChild("cape_top", CubeListBuilder.create().texOffs(0, 54).addBox(-6.5213F, -0.1479F, -1.0812F, 11.0F, 8.0F, 1.0F, new CubeDeformation(0.0F)) + .texOffs(24, 54).addBox(-6.5213F, -0.1479F, -1.0812F, 11.0F, 8.0F, 1.0F, new CubeDeformation(0.25F)), PartPose.offsetAndRotation(1.0F, -0.5F, 3.5F, 0.0839F, -0.02F, 0.0126F)); + + PartDefinition cape_middle = cape_top.addOrReplaceChild("cape_middle", CubeListBuilder.create().texOffs(24, 62).addBox(-6.5213F, -0.2878F, -1.0526F, 11.0F, 7.0F, 1.0F, new CubeDeformation(0.25F)) + .texOffs(0, 62).addBox(-6.5213F, -0.2878F, -1.0526F, 11.0F, 7.0F, 1.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(0.0F, 8.0F, 0.0F, 0.1309F, 0.0F, 0.0F)); + + PartDefinition cape_bottom = cape_middle.addOrReplaceChild("cape_bottom", CubeListBuilder.create().texOffs(24, 77).addBox(-6.5213F, -0.9301F, 2.1414F, 3.0F, 4.0F, 1.0F, new CubeDeformation(0.0F)) + .texOffs(0, 77).addBox(-3.5213F, -0.9301F, 2.1414F, 5.0F, 6.0F, 1.0F, new CubeDeformation(0.0F)) + .texOffs(24, 77).mirror().addBox(1.4787F, -0.9301F, 2.1414F, 3.0F, 4.0F, 1.0F, new CubeDeformation(0.0F)).mirror(false) + .texOffs(32, 77).mirror().addBox(1.4787F, -0.9301F, 2.1414F, 3.0F, 4.0F, 1.0F, new CubeDeformation(0.25F)).mirror(false) + .texOffs(12, 77).addBox(-3.5213F, -0.9301F, 2.1414F, 5.0F, 6.0F, 1.0F, new CubeDeformation(0.25F)) + .texOffs(32, 77).addBox(-6.5213F, -0.9301F, 2.1414F, 3.0F, 4.0F, 1.0F, new CubeDeformation(0.25F)), PartPose.offsetAndRotation(0.0F, 8.0F, -3.0F, 0.1745F, 0.0F, 0.0F)); + + PartDefinition hood = lowered_hood.addOrReplaceChild("hood", CubeListBuilder.create(), PartPose.offset(0.0F, 0.0F, 0.0F)); + PartDefinition overhang = hood.addOrReplaceChild("overhang", CubeListBuilder.create().texOffs(26, 70).addBox(-4.98F, -0.5028F, -2.1358F, 8.0F, 2.0F, 5.0F, new CubeDeformation(0.25F)) + .texOffs(0, 70).addBox(-4.98F, -0.5028F, -2.1358F, 8.0F, 2.0F, 5.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(1.0F, -0.5F, 3.5F, -0.6109F, 0.0F, 0.0F)); + + return LayerDefinition.create(mesh, 128, 128); + } } \ No newline at end of file diff --git a/src/main/java/com/sammy/malum/client/model/SoulStainedSteelArmorModel.java b/src/main/java/com/sammy/malum/client/model/SoulStainedSteelArmorModel.java index 720c1962f..9f4159be5 100644 --- a/src/main/java/com/sammy/malum/client/model/SoulStainedSteelArmorModel.java +++ b/src/main/java/com/sammy/malum/client/model/SoulStainedSteelArmorModel.java @@ -13,91 +13,91 @@ import team.lodestar.lodestone.systems.model.LodestoneArmorModel; public class SoulStainedSteelArmorModel extends LodestoneArmorModel { - public static ModelLayerLocation LAYER = new ModelLayerLocation(MalumMod.malumPath("soul_stained_steel_armor"), "main"); + public static ModelLayerLocation LAYER = new ModelLayerLocation(MalumMod.malumPath("soul_stained_steel_armor"), "main"); - public SoulStainedSteelArmorModel(ModelPart root) { - super(root); - } + public SoulStainedSteelArmorModel(ModelPart root) { + super(root); + } - public static LayerDefinition createBodyLayer() { - MeshDefinition mesh = HumanoidModel.createMesh(new CubeDeformation(0), 0); - PartDefinition root = createHumanoidAlias(mesh); + public static LayerDefinition createBodyLayer() { + MeshDefinition mesh = HumanoidModel.createMesh(new CubeDeformation(0), 0); + PartDefinition root = createHumanoidAlias(mesh); - PartDefinition body = root.getChild("body"); - PartDefinition torso = body.addOrReplaceChild("torso", CubeListBuilder.create().texOffs(0, 39).addBox(-5.0F, 1.0F, -3.0F, 10.0F, 6.0F, 6.0F, new CubeDeformation(0.0F)) - .texOffs(32, 39).addBox(-5.0F, 1.0F, -3.0F, 10.0F, 6.0F, 6.0F, new CubeDeformation(0.25F)) - .texOffs(0, 51).addBox(-4.5F, 3.5F, -2.5F, 9.0F, 7.0F, 5.0F, new CubeDeformation(0.0F)) - .texOffs(28, 51).addBox(-4.5F, 3.5F, -2.5F, 9.0F, 7.0F, 5.0F, new CubeDeformation(0.35F)) - .texOffs(0, 63).mirror().addBox(-5.0F, -1.0F, -3.0F, 3.0F, 2.0F, 6.0F, new CubeDeformation(0.0F)).mirror(false) - .texOffs(36, 31).addBox(2.0F, -1.0F, -3.0F, 3.0F, 2.0F, 6.0F, new CubeDeformation(0.0F)) - .texOffs(54, 31).mirror().addBox(-5.0F, -1.0F, -3.0F, 3.0F, 2.0F, 6.0F, new CubeDeformation(0.25F)).mirror(false) - .texOffs(54, 31).addBox(2.0F, -1.0F, -3.0F, 3.0F, 2.0F, 6.0F, new CubeDeformation(0.25F)) - .texOffs(11, 25).addBox(2.0F, -1.0F, 3.0F, 3.0F, 5.0F, 2.0F, new CubeDeformation(0.0F)) - .texOffs(11, 25).mirror().addBox(-5.0F, -1.0F, 3.0F, 3.0F, 5.0F, 2.0F, new CubeDeformation(0.0F)).mirror(false) - .texOffs(29, 25).addBox(2.0F, -1.0F, 3.0F, 3.0F, 5.0F, 2.0F, new CubeDeformation(0.25F)) - .texOffs(29, 25).mirror().addBox(-5.0F, -1.0F, 3.0F, 3.0F, 5.0F, 2.0F, new CubeDeformation(0.25F)).mirror(false), PartPose.offset(0.0F, 0.0F, 0.0F)); + PartDefinition body = root.getChild("body"); + PartDefinition torso = body.addOrReplaceChild("torso", CubeListBuilder.create().texOffs(0, 39).addBox(-5.0F, 1.0F, -3.0F, 10.0F, 6.0F, 6.0F, new CubeDeformation(0.0F)) + .texOffs(32, 39).addBox(-5.0F, 1.0F, -3.0F, 10.0F, 6.0F, 6.0F, new CubeDeformation(0.25F)) + .texOffs(0, 51).addBox(-4.5F, 3.5F, -2.5F, 9.0F, 7.0F, 5.0F, new CubeDeformation(0.0F)) + .texOffs(28, 51).addBox(-4.5F, 3.5F, -2.5F, 9.0F, 7.0F, 5.0F, new CubeDeformation(0.35F)) + .texOffs(0, 63).mirror().addBox(-5.0F, -1.0F, -3.0F, 3.0F, 2.0F, 6.0F, new CubeDeformation(0.0F)).mirror(false) + .texOffs(36, 31).addBox(2.0F, -1.0F, -3.0F, 3.0F, 2.0F, 6.0F, new CubeDeformation(0.0F)) + .texOffs(54, 31).mirror().addBox(-5.0F, -1.0F, -3.0F, 3.0F, 2.0F, 6.0F, new CubeDeformation(0.25F)).mirror(false) + .texOffs(54, 31).addBox(2.0F, -1.0F, -3.0F, 3.0F, 2.0F, 6.0F, new CubeDeformation(0.25F)) + .texOffs(11, 25).addBox(2.0F, -1.0F, 3.0F, 3.0F, 5.0F, 2.0F, new CubeDeformation(0.0F)) + .texOffs(11, 25).mirror().addBox(-5.0F, -1.0F, 3.0F, 3.0F, 5.0F, 2.0F, new CubeDeformation(0.0F)).mirror(false) + .texOffs(29, 25).addBox(2.0F, -1.0F, 3.0F, 3.0F, 5.0F, 2.0F, new CubeDeformation(0.25F)) + .texOffs(29, 25).mirror().addBox(-5.0F, -1.0F, 3.0F, 3.0F, 5.0F, 2.0F, new CubeDeformation(0.25F)).mirror(false), PartPose.offset(0.0F, 0.0F, 0.0F)); - PartDefinition leggings = root.getChild("leggings"); - PartDefinition codpiece = leggings.addOrReplaceChild("codpiece", CubeListBuilder.create().texOffs(0, 63).addBox(-4.0F, -14.5F, -3.0F, 8.0F, 2.0F, 6.0F, new CubeDeformation(0.01F)) - .texOffs(28, 63).addBox(-4.0F, -14.5F, -3.0F, 8.0F, 2.0F, 6.0F, new CubeDeformation(0.26F)), PartPose.offset(0.0F, 24.0F, 0.0F)); + PartDefinition leggings = root.getChild("leggings"); + PartDefinition codpiece = leggings.addOrReplaceChild("codpiece", CubeListBuilder.create().texOffs(0, 63).addBox(-4.0F, -14.5F, -3.0F, 8.0F, 2.0F, 6.0F, new CubeDeformation(0.01F)) + .texOffs(28, 63).addBox(-4.0F, -14.5F, -3.0F, 8.0F, 2.0F, 6.0F, new CubeDeformation(0.26F)), PartPose.offset(0.0F, 24.0F, 0.0F)); - PartDefinition right_legging = root.getChild("right_legging"); - PartDefinition right_leg = right_legging.addOrReplaceChild("right_leg", CubeListBuilder.create().texOffs(0, 105).addBox(-2.5F, -0.5F, -2.5F, 5.0F, 7.0F, 5.0F, new CubeDeformation(0.0F)), PartPose.offset(0, 0, 0.0F)); - PartDefinition right_thigh_guard = right_leg.addOrReplaceChild("right_thigh_guard", CubeListBuilder.create().texOffs(0, 117).addBox(-3.0F, -1.0003F, -3.0F, 3.0F, 5.0F, 6.0F, new CubeDeformation(0.0F)) - .texOffs(18, 117).addBox(-3.0F, -1.0003F, -3.0F, 3.0F, 5.0F, 6.0F, new CubeDeformation(0.25F)), PartPose.offsetAndRotation(0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.1745F)); + PartDefinition right_legging = root.getChild("right_legging"); + PartDefinition right_leg = right_legging.addOrReplaceChild("right_leg", CubeListBuilder.create().texOffs(0, 105).addBox(-2.5F, -0.5F, -2.5F, 5.0F, 7.0F, 5.0F, new CubeDeformation(0.0F)), PartPose.offset(0, 0, 0.0F)); + PartDefinition right_thigh_guard = right_leg.addOrReplaceChild("right_thigh_guard", CubeListBuilder.create().texOffs(0, 117).addBox(-3.0F, -1.0003F, -3.0F, 3.0F, 5.0F, 6.0F, new CubeDeformation(0.0F)) + .texOffs(18, 117).addBox(-3.0F, -1.0003F, -3.0F, 3.0F, 5.0F, 6.0F, new CubeDeformation(0.25F)), PartPose.offsetAndRotation(0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.1745F)); - PartDefinition right_foot = root.getChild("right_foot"); - PartDefinition right_boot = right_foot.addOrReplaceChild("right_boot", CubeListBuilder.create().texOffs(36, 115).mirror().addBox(-3.0F, 6.0F, -3.0F, 6.0F, 7.0F, 6.0F, new CubeDeformation(0.0F)).mirror(false) - .texOffs(60, 115).mirror().addBox(-3.0F, 6.0F, -3.0F, 6.0F, 7.0F, 6.0F, new CubeDeformation(0.25F)).mirror(false), PartPose.offset(0.0F, 0.0F, 0.0F)); - PartDefinition right_boot_wing = right_boot.addOrReplaceChild("right_boot_wing", CubeListBuilder.create().texOffs(84, 117).mirror().addBox(-4.0F, 4.3639F, -8.364F, 1.0F, 4.0F, 7.0F, new CubeDeformation(0.0F)).mirror(false) - .texOffs(100, 117).mirror().addBox(-4.0F, 4.3639F, -8.364F, 1.0F, 4.0F, 7.0F, new CubeDeformation(0.25F)).mirror(false), PartPose.offsetAndRotation(0.0F, 0.0F, 0.0F, 0.7854F, 0.0F, 0.0F)); + PartDefinition right_foot = root.getChild("right_foot"); + PartDefinition right_boot = right_foot.addOrReplaceChild("right_boot", CubeListBuilder.create().texOffs(36, 115).mirror().addBox(-3.0F, 6.0F, -3.0F, 6.0F, 7.0F, 6.0F, new CubeDeformation(0.0F)).mirror(false) + .texOffs(60, 115).mirror().addBox(-3.0F, 6.0F, -3.0F, 6.0F, 7.0F, 6.0F, new CubeDeformation(0.25F)).mirror(false), PartPose.offset(0.0F, 0.0F, 0.0F)); + PartDefinition right_boot_wing = right_boot.addOrReplaceChild("right_boot_wing", CubeListBuilder.create().texOffs(84, 117).mirror().addBox(-4.0F, 4.3639F, -8.364F, 1.0F, 4.0F, 7.0F, new CubeDeformation(0.0F)).mirror(false) + .texOffs(100, 117).mirror().addBox(-4.0F, 4.3639F, -8.364F, 1.0F, 4.0F, 7.0F, new CubeDeformation(0.25F)).mirror(false), PartPose.offsetAndRotation(0.0F, 0.0F, 0.0F, 0.7854F, 0.0F, 0.0F)); - PartDefinition right_arm = root.getChild("right_arm"); - PartDefinition right_shoulder = right_arm.addOrReplaceChild("right_shoulder", CubeListBuilder.create().texOffs(0, 71).mirror().addBox(-6.0F, -4.0F, -3.0F, 4.0F, 6.0F, 6.0F, new CubeDeformation(0.01F)).mirror(false) - .texOffs(20, 71).mirror().addBox(-6.0F, -4.0F, -3.0F, 4.0F, 6.0F, 6.0F, new CubeDeformation(0.26F)).mirror(false) - .texOffs(0, 83).mirror().addBox(-5.5F, 5.0F, -3.0F, 5.0F, 6.0F, 6.0F, new CubeDeformation(0.02F)).mirror(false) - .texOffs(22, 83).mirror().addBox(-5.5F, 5.0F, -3.0F, 5.0F, 6.0F, 6.0F, new CubeDeformation(0.27F)).mirror(false) - .texOffs(0, 95).mirror().addBox(-6.5F, 4.0F, -2.5F, 4.0F, 5.0F, 5.0F, new CubeDeformation(0.01F)).mirror(false) - .texOffs(18, 95).mirror().addBox(-6.5F, 4.0F, -2.5F, 4.0F, 5.0F, 5.0F, new CubeDeformation(0.26F)).mirror(false), PartPose.offset(2, 0, 0.0F)); + PartDefinition right_arm = root.getChild("right_arm"); + PartDefinition right_shoulder = right_arm.addOrReplaceChild("right_shoulder", CubeListBuilder.create().texOffs(0, 71).mirror().addBox(-6.0F, -4.0F, -3.0F, 4.0F, 6.0F, 6.0F, new CubeDeformation(0.01F)).mirror(false) + .texOffs(20, 71).mirror().addBox(-6.0F, -4.0F, -3.0F, 4.0F, 6.0F, 6.0F, new CubeDeformation(0.26F)).mirror(false) + .texOffs(0, 83).mirror().addBox(-5.5F, 5.0F, -3.0F, 5.0F, 6.0F, 6.0F, new CubeDeformation(0.02F)).mirror(false) + .texOffs(22, 83).mirror().addBox(-5.5F, 5.0F, -3.0F, 5.0F, 6.0F, 6.0F, new CubeDeformation(0.27F)).mirror(false) + .texOffs(0, 95).mirror().addBox(-6.5F, 4.0F, -2.5F, 4.0F, 5.0F, 5.0F, new CubeDeformation(0.01F)).mirror(false) + .texOffs(18, 95).mirror().addBox(-6.5F, 4.0F, -2.5F, 4.0F, 5.0F, 5.0F, new CubeDeformation(0.26F)).mirror(false), PartPose.offset(2, 0, 0.0F)); - PartDefinition left_legging = root.getChild("left_legging"); - PartDefinition left_leg = left_legging.addOrReplaceChild("left_leg", CubeListBuilder.create().texOffs(0, 105).mirror().addBox(-2.5F, -0.5F, -2.5F, 5.0F, 7.0F, 5.0F, new CubeDeformation(0.0F)).mirror(false), PartPose.offset(0, 0, 0.0F)); - PartDefinition left_thigh_guard = left_leg.addOrReplaceChild("left_thigh_guard", CubeListBuilder.create().texOffs(0, 117).mirror().addBox(0.0F, -0.9997F, -3.0F, 3.0F, 5.0F, 6.0F, new CubeDeformation(0.0F)).mirror(false) - .texOffs(18, 117).mirror().addBox(0.0F, -0.9997F, -3.0F, 3.0F, 5.0F, 6.0F, new CubeDeformation(0.25F)).mirror(false), PartPose.offsetAndRotation(0.0F, 0.0F, 0.0F, 0.0F, 0.0F, -0.1745F)); + PartDefinition left_legging = root.getChild("left_legging"); + PartDefinition left_leg = left_legging.addOrReplaceChild("left_leg", CubeListBuilder.create().texOffs(0, 105).mirror().addBox(-2.5F, -0.5F, -2.5F, 5.0F, 7.0F, 5.0F, new CubeDeformation(0.0F)).mirror(false), PartPose.offset(0, 0, 0.0F)); + PartDefinition left_thigh_guard = left_leg.addOrReplaceChild("left_thigh_guard", CubeListBuilder.create().texOffs(0, 117).mirror().addBox(0.0F, -0.9997F, -3.0F, 3.0F, 5.0F, 6.0F, new CubeDeformation(0.0F)).mirror(false) + .texOffs(18, 117).mirror().addBox(0.0F, -0.9997F, -3.0F, 3.0F, 5.0F, 6.0F, new CubeDeformation(0.25F)).mirror(false), PartPose.offsetAndRotation(0.0F, 0.0F, 0.0F, 0.0F, 0.0F, -0.1745F)); - PartDefinition left_foot = root.getChild("left_foot"); - PartDefinition left_boot = left_foot.addOrReplaceChild("left_boot", CubeListBuilder.create().texOffs(36, 115).addBox(-3.0F, 6.0F, -3.0F, 6.0F, 7.0F, 6.0F, new CubeDeformation(0.01F)) - .texOffs(60, 115).addBox(-3.0F, 6.0F, -3.0F, 6.0F, 7.0F, 6.0F, new CubeDeformation(0.26F)), PartPose.offset(0.0F, 0.0F, 0.0F)); - PartDefinition left_boot_wing = left_boot.addOrReplaceChild("left_boot_wing", CubeListBuilder.create().texOffs(84, 117).addBox(3.0F, 4.3639F, -8.364F, 1.0F, 4.0F, 7.0F, new CubeDeformation(0.0F)) - .texOffs(100, 117).addBox(3.0F, 4.3639F, -8.364F, 1.0F, 4.0F, 7.0F, new CubeDeformation(0.25F)), PartPose.offsetAndRotation(0.0F, 0.0F, 0.0F, 0.7854F, 0.0F, 0.0F)); + PartDefinition left_foot = root.getChild("left_foot"); + PartDefinition left_boot = left_foot.addOrReplaceChild("left_boot", CubeListBuilder.create().texOffs(36, 115).addBox(-3.0F, 6.0F, -3.0F, 6.0F, 7.0F, 6.0F, new CubeDeformation(0.01F)) + .texOffs(60, 115).addBox(-3.0F, 6.0F, -3.0F, 6.0F, 7.0F, 6.0F, new CubeDeformation(0.26F)), PartPose.offset(0.0F, 0.0F, 0.0F)); + PartDefinition left_boot_wing = left_boot.addOrReplaceChild("left_boot_wing", CubeListBuilder.create().texOffs(84, 117).addBox(3.0F, 4.3639F, -8.364F, 1.0F, 4.0F, 7.0F, new CubeDeformation(0.0F)) + .texOffs(100, 117).addBox(3.0F, 4.3639F, -8.364F, 1.0F, 4.0F, 7.0F, new CubeDeformation(0.25F)), PartPose.offsetAndRotation(0.0F, 0.0F, 0.0F, 0.7854F, 0.0F, 0.0F)); - PartDefinition left_arm = root.getChild("left_arm"); - PartDefinition left_shoulder = left_arm.addOrReplaceChild("left_shoulder", CubeListBuilder.create().texOffs(0, 71).addBox(2.0F, -4.0F, -3.0F, 4.0F, 6.0F, 6.0F, new CubeDeformation(0.01F)) - .texOffs(20, 71).addBox(2.0F, -4.0F, -3.0F, 4.0F, 6.0F, 6.0F, new CubeDeformation(0.26F)) - .texOffs(0, 83).addBox(0.5F, 5.0F, -3.0F, 5.0F, 6.0F, 6.0F, new CubeDeformation(0.02F)) - .texOffs(22, 83).addBox(0.5F, 5.0F, -3.0F, 5.0F, 6.0F, 6.0F, new CubeDeformation(0.27F)) - .texOffs(0, 95).addBox(2.5F, 4.0F, -2.5F, 4.0F, 5.0F, 5.0F, new CubeDeformation(0.01F)) - .texOffs(18, 95).addBox(2.5F, 4.0F, -2.5F, 4.0F, 5.0F, 5.0F, new CubeDeformation(0.26F)), PartPose.offset(-2, 0, 0.0F)); + PartDefinition left_arm = root.getChild("left_arm"); + PartDefinition left_shoulder = left_arm.addOrReplaceChild("left_shoulder", CubeListBuilder.create().texOffs(0, 71).addBox(2.0F, -4.0F, -3.0F, 4.0F, 6.0F, 6.0F, new CubeDeformation(0.01F)) + .texOffs(20, 71).addBox(2.0F, -4.0F, -3.0F, 4.0F, 6.0F, 6.0F, new CubeDeformation(0.26F)) + .texOffs(0, 83).addBox(0.5F, 5.0F, -3.0F, 5.0F, 6.0F, 6.0F, new CubeDeformation(0.02F)) + .texOffs(22, 83).addBox(0.5F, 5.0F, -3.0F, 5.0F, 6.0F, 6.0F, new CubeDeformation(0.27F)) + .texOffs(0, 95).addBox(2.5F, 4.0F, -2.5F, 4.0F, 5.0F, 5.0F, new CubeDeformation(0.01F)) + .texOffs(18, 95).addBox(2.5F, 4.0F, -2.5F, 4.0F, 5.0F, 5.0F, new CubeDeformation(0.26F)), PartPose.offset(-2, 0, 0.0F)); - PartDefinition head = root.getChild("head"); - PartDefinition helmet = head.addOrReplaceChild("helmet", CubeListBuilder.create().texOffs(0, 0).addBox(-4.5F, -9.0F, -5.0F, 3.0F, 4.0F, 6.0F, new CubeDeformation(0.0F)) - .texOffs(0, 0).mirror().addBox(1.5F, -9.0F, -5.0F, 3.0F, 4.0F, 6.0F, new CubeDeformation(0.0F)).mirror(false) - .texOffs(30, 0).addBox(-4.5F, -9.0F, -5.0F, 3.0F, 4.0F, 6.0F, new CubeDeformation(0.25F)) - .texOffs(30, 0).mirror().addBox(1.5F, -9.0F, -5.0F, 3.0F, 4.0F, 6.0F, new CubeDeformation(0.25F)).mirror(false) - .texOffs(0, 10).addBox(-1.5F, -10.0F, -6.0F, 3.0F, 6.0F, 9.0F, new CubeDeformation(0.0F)) - .texOffs(24, 10).addBox(-1.5F, -10.0F, -6.0F, 3.0F, 6.0F, 9.0F, new CubeDeformation(0.25F)) - .texOffs(18, 0).addBox(-5.0F, -5.0F, -5.0F, 2.0F, 6.0F, 4.0F, new CubeDeformation(0.0F)) - .texOffs(0, 25).mirror().addBox(-5.0F, -10.0F, -1.0F, 2.0F, 7.0F, 7.0F, new CubeDeformation(0.0F)).mirror(false) - .texOffs(0, 25).addBox(3.0F, -10.0F, -1.0F, 2.0F, 7.0F, 7.0F, new CubeDeformation(0.0F)) - .texOffs(18, 25).mirror().addBox(-5.0F, -10.0F, -1.0F, 2.0F, 7.0F, 7.0F, new CubeDeformation(0.25F)).mirror(false) - .texOffs(18, 25).addBox(3.0F, -10.0F, -1.0F, 2.0F, 7.0F, 7.0F, new CubeDeformation(0.25F)) - .texOffs(15, 13).addBox(3.0F, -10.0F, 6.0F, 2.0F, 4.0F, 2.0F, new CubeDeformation(0.0F)) - .texOffs(15, 13).mirror().addBox(-5.0F, -10.0F, 6.0F, 2.0F, 4.0F, 2.0F, new CubeDeformation(0.0F)).mirror(false) - .texOffs(23, 13).addBox(3.0F, -10.0F, 6.0F, 2.0F, 4.0F, 2.0F, new CubeDeformation(0.25F)) - .texOffs(23, 13).mirror().addBox(-5.0F, -10.0F, 6.0F, 2.0F, 4.0F, 2.0F, new CubeDeformation(0.25F)).mirror(false) - .texOffs(18, 0).mirror().addBox(3.0F, -5.0F, -5.0F, 2.0F, 6.0F, 4.0F, new CubeDeformation(0.0F)).mirror(false) - .texOffs(48, 0).addBox(-5.0F, -5.0F, -5.0F, 2.0F, 6.0F, 4.0F, new CubeDeformation(0.25F)) - .texOffs(48, 0).mirror().addBox(3.0F, -5.0F, -5.0F, 2.0F, 6.0F, 4.0F, new CubeDeformation(0.25F)).mirror(false), PartPose.offset(0.0F, 0.0F, 0.0F)); - return LayerDefinition.create(mesh, 128, 128); - } + PartDefinition head = root.getChild("head"); + PartDefinition helmet = head.addOrReplaceChild("helmet", CubeListBuilder.create().texOffs(0, 0).addBox(-4.5F, -9.0F, -5.0F, 3.0F, 4.0F, 6.0F, new CubeDeformation(0.0F)) + .texOffs(0, 0).mirror().addBox(1.5F, -9.0F, -5.0F, 3.0F, 4.0F, 6.0F, new CubeDeformation(0.0F)).mirror(false) + .texOffs(30, 0).addBox(-4.5F, -9.0F, -5.0F, 3.0F, 4.0F, 6.0F, new CubeDeformation(0.25F)) + .texOffs(30, 0).mirror().addBox(1.5F, -9.0F, -5.0F, 3.0F, 4.0F, 6.0F, new CubeDeformation(0.25F)).mirror(false) + .texOffs(0, 10).addBox(-1.5F, -10.0F, -6.0F, 3.0F, 6.0F, 9.0F, new CubeDeformation(0.0F)) + .texOffs(24, 10).addBox(-1.5F, -10.0F, -6.0F, 3.0F, 6.0F, 9.0F, new CubeDeformation(0.25F)) + .texOffs(18, 0).addBox(-5.0F, -5.0F, -5.0F, 2.0F, 6.0F, 4.0F, new CubeDeformation(0.0F)) + .texOffs(0, 25).mirror().addBox(-5.0F, -10.0F, -1.0F, 2.0F, 7.0F, 7.0F, new CubeDeformation(0.0F)).mirror(false) + .texOffs(0, 25).addBox(3.0F, -10.0F, -1.0F, 2.0F, 7.0F, 7.0F, new CubeDeformation(0.0F)) + .texOffs(18, 25).mirror().addBox(-5.0F, -10.0F, -1.0F, 2.0F, 7.0F, 7.0F, new CubeDeformation(0.25F)).mirror(false) + .texOffs(18, 25).addBox(3.0F, -10.0F, -1.0F, 2.0F, 7.0F, 7.0F, new CubeDeformation(0.25F)) + .texOffs(15, 13).addBox(3.0F, -10.0F, 6.0F, 2.0F, 4.0F, 2.0F, new CubeDeformation(0.0F)) + .texOffs(15, 13).mirror().addBox(-5.0F, -10.0F, 6.0F, 2.0F, 4.0F, 2.0F, new CubeDeformation(0.0F)).mirror(false) + .texOffs(23, 13).addBox(3.0F, -10.0F, 6.0F, 2.0F, 4.0F, 2.0F, new CubeDeformation(0.25F)) + .texOffs(23, 13).mirror().addBox(-5.0F, -10.0F, 6.0F, 2.0F, 4.0F, 2.0F, new CubeDeformation(0.25F)).mirror(false) + .texOffs(18, 0).mirror().addBox(3.0F, -5.0F, -5.0F, 2.0F, 6.0F, 4.0F, new CubeDeformation(0.0F)).mirror(false) + .texOffs(48, 0).addBox(-5.0F, -5.0F, -5.0F, 2.0F, 6.0F, 4.0F, new CubeDeformation(0.25F)) + .texOffs(48, 0).mirror().addBox(3.0F, -5.0F, -5.0F, 2.0F, 6.0F, 4.0F, new CubeDeformation(0.25F)).mirror(false), PartPose.offset(0.0F, 0.0F, 0.0F)); + return LayerDefinition.create(mesh, 128, 128); + } } \ No newline at end of file diff --git a/src/main/java/com/sammy/malum/client/model/TailModel.java b/src/main/java/com/sammy/malum/client/model/TailModel.java index ef370db12..11dd52fb8 100644 --- a/src/main/java/com/sammy/malum/client/model/TailModel.java +++ b/src/main/java/com/sammy/malum/client/model/TailModel.java @@ -12,40 +12,40 @@ public class TailModel extends EntityModel { - public static ModelLayerLocation LAYER = new ModelLayerLocation(MalumMod.malumPath("tail"), "main"); - private final ModelPart tail; + public static ModelLayerLocation LAYER = new ModelLayerLocation(MalumMod.malumPath("tail"), "main"); + private final ModelPart tail; - public TailModel(ModelPart root) { - this.tail = root.getChild("tail"); - } + public TailModel(ModelPart root) { + this.tail = root.getChild("tail"); + } - public static LayerDefinition createBodyLayer() { - MeshDefinition meshdefinition = new MeshDefinition(); - PartDefinition partdefinition = meshdefinition.getRoot(); + public static LayerDefinition createBodyLayer() { + MeshDefinition meshdefinition = new MeshDefinition(); + PartDefinition partdefinition = meshdefinition.getRoot(); - PartDefinition tail = partdefinition.addOrReplaceChild("tail", CubeListBuilder.create().texOffs(0, 13).addBox(-2.0F, -3.5F, -3.0F, 4.0F, 4.0F, 3.0F, new CubeDeformation(0.0F)) - .texOffs(14, 13).addBox(-2.0F, -3.5F, -3.0F, 4.0F, 4.0F, 3.0F, new CubeDeformation(0.4F)), PartPose.offsetAndRotation(0.0F, 12.0F, 2.75F, -0.7854F, 0.0F, 0.0F)); + PartDefinition tail = partdefinition.addOrReplaceChild("tail", CubeListBuilder.create().texOffs(0, 13).addBox(-2.0F, -3.5F, -3.0F, 4.0F, 4.0F, 3.0F, new CubeDeformation(0.0F)) + .texOffs(14, 13).addBox(-2.0F, -3.5F, -3.0F, 4.0F, 4.0F, 3.0F, new CubeDeformation(0.4F)), PartPose.offsetAndRotation(0.0F, 12.0F, 2.75F, -0.7854F, 0.0F, 0.0F)); - PartDefinition tail2 = tail.addOrReplaceChild("tail2", CubeListBuilder.create().texOffs(0, 0).addBox(-3.0F, -7.5F, -2.5F, 6.0F, 8.0F, 5.0F, new CubeDeformation(0.0F)) - .texOffs(22, 0).addBox(-3.0F, -7.5F, -2.5F, 6.0F, 8.0F, 5.0F, new CubeDeformation(0.4F)), PartPose.offsetAndRotation(0.0F, -4.0F, -1.5F, 0.2182F, 0.0F, 0.0F)); + PartDefinition tail2 = tail.addOrReplaceChild("tail2", CubeListBuilder.create().texOffs(0, 0).addBox(-3.0F, -7.5F, -2.5F, 6.0F, 8.0F, 5.0F, new CubeDeformation(0.0F)) + .texOffs(22, 0).addBox(-3.0F, -7.5F, -2.5F, 6.0F, 8.0F, 5.0F, new CubeDeformation(0.4F)), PartPose.offsetAndRotation(0.0F, -4.0F, -1.5F, 0.2182F, 0.0F, 0.0F)); - PartDefinition tailtip = tail2.addOrReplaceChild("tailtip", CubeListBuilder.create().texOffs(0, 20).addBox(-2.5F, -2.0F, -2.0F, 5.0F, 3.0F, 4.0F, new CubeDeformation(0.0F)) - .texOffs(18, 20).addBox(-2.5F, -2.0F, -2.0F, 5.0F, 3.0F, 4.0F, new CubeDeformation(0.25F)), PartPose.offsetAndRotation(0.0F, -7.5F, 0.0F, -0.3491F, 0.0F, 0.0F)); + PartDefinition tailtip = tail2.addOrReplaceChild("tailtip", CubeListBuilder.create().texOffs(0, 20).addBox(-2.5F, -2.0F, -2.0F, 5.0F, 3.0F, 4.0F, new CubeDeformation(0.0F)) + .texOffs(18, 20).addBox(-2.5F, -2.0F, -2.0F, 5.0F, 3.0F, 4.0F, new CubeDeformation(0.25F)), PartPose.offsetAndRotation(0.0F, -7.5F, 0.0F, -0.3491F, 0.0F, 0.0F)); - PartDefinition tailtip1 = tailtip.addOrReplaceChild("tailtip1", CubeListBuilder.create().texOffs(0, 28).addBox(-0.3856F, -6.5303F, -2.561F, 0.0F, 6.0F, 5.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(0.0F, -0.5F, 0.0F, -0.1298F, -0.7769F, 0.1841F)); + PartDefinition tailtip1 = tailtip.addOrReplaceChild("tailtip1", CubeListBuilder.create().texOffs(0, 28).addBox(-0.3856F, -6.5303F, -2.561F, 0.0F, 6.0F, 5.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(0.0F, -0.5F, 0.0F, -0.1298F, -0.7769F, 0.1841F)); - PartDefinition tailtip2 = tailtip.addOrReplaceChild("tailtip2", CubeListBuilder.create().texOffs(0, 22).addBox(0.3856F, -6.0303F, -2.561F, 0.0F, 6.0F, 5.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(0.0F, -0.5F, 0.0F, -0.1298F, 0.7769F, -0.1841F)); + PartDefinition tailtip2 = tailtip.addOrReplaceChild("tailtip2", CubeListBuilder.create().texOffs(0, 22).addBox(0.3856F, -6.0303F, -2.561F, 0.0F, 6.0F, 5.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(0.0F, -0.5F, 0.0F, -0.1298F, 0.7769F, -0.1841F)); - return LayerDefinition.create(meshdefinition, 64, 64); - } + return LayerDefinition.create(meshdefinition, 64, 64); + } - @Override - public void setupAnim(Player entity, float limbSwing, float limbSwingAmount, float ageInTicks, float netHeadYaw, float headPitch) { + @Override + public void setupAnim(Player entity, float limbSwing, float limbSwingAmount, float ageInTicks, float netHeadYaw, float headPitch) { - } + } - @Override - public void renderToBuffer(PoseStack poseStack, VertexConsumer buffer, int packedLight, int packedOverlay, float red, float green, float blue, float alpha) { - tail.render(poseStack, buffer, packedLight, packedOverlay); - } + @Override + public void renderToBuffer(PoseStack poseStack, VertexConsumer buffer, int packedLight, int packedOverlay, float red, float green, float blue, float alpha) { + tail.render(poseStack, buffer, packedLight, packedOverlay); + } } \ No newline at end of file diff --git a/src/main/java/com/sammy/malum/client/model/TopHatModel.java b/src/main/java/com/sammy/malum/client/model/TopHatModel.java index be161fb35..d78c3cd27 100644 --- a/src/main/java/com/sammy/malum/client/model/TopHatModel.java +++ b/src/main/java/com/sammy/malum/client/model/TopHatModel.java @@ -1,39 +1,42 @@ package com.sammy.malum.client.model; -import com.mojang.blaze3d.vertex.*; -import com.sammy.malum.*; -import net.minecraft.client.model.*; -import net.minecraft.client.model.geom.*; +import com.mojang.blaze3d.vertex.PoseStack; +import com.mojang.blaze3d.vertex.VertexConsumer; +import com.sammy.malum.MalumMod; +import net.minecraft.client.model.EntityModel; +import net.minecraft.client.model.geom.ModelLayerLocation; +import net.minecraft.client.model.geom.ModelPart; +import net.minecraft.client.model.geom.PartPose; import net.minecraft.client.model.geom.builders.*; -import net.minecraft.world.entity.player.*; +import net.minecraft.world.entity.player.Player; public class TopHatModel extends EntityModel { - public static ModelLayerLocation LAYER = new ModelLayerLocation(MalumMod.malumPath("top_hat"), "main"); - public final ModelPart topHat; + public static ModelLayerLocation LAYER = new ModelLayerLocation(MalumMod.malumPath("top_hat"), "main"); + public final ModelPart topHat; - public TopHatModel(ModelPart root) { - this.topHat = root.getChild("topHat"); - } + public TopHatModel(ModelPart root) { + this.topHat = root.getChild("topHat"); + } - public static LayerDefinition createBodyLayer() { - MeshDefinition meshdefinition = new MeshDefinition(); - PartDefinition partdefinition = meshdefinition.getRoot(); + public static LayerDefinition createBodyLayer() { + MeshDefinition meshdefinition = new MeshDefinition(); + PartDefinition partdefinition = meshdefinition.getRoot(); - PartDefinition topHat = partdefinition.addOrReplaceChild("topHat", CubeListBuilder.create().texOffs(36, 0).addBox(-6.5F, -9.0F, -6.5F, 13.0F, 2.0F, 13.0F, new CubeDeformation(0.0F)) - .texOffs(36, 15).addBox(-6.5F, -9.0F, -6.5F, 13.0F, 2.0F, 13.0F, new CubeDeformation(0.35F)) - .texOffs(0, 0).addBox(-4.5F, -20.0F, -4.5F, 9.0F, 11.0F, 9.0F, new CubeDeformation(0.0F)) - .texOffs(0, 20).addBox(-4.5F, -20.0F, -4.5F, 9.0F, 11.0F, 9.0F, new CubeDeformation(0.35F)), PartPose.offset(0.0F, 1.0F, 0.0F)); - return LayerDefinition.create(meshdefinition, 96, 64); - } + PartDefinition topHat = partdefinition.addOrReplaceChild("topHat", CubeListBuilder.create().texOffs(36, 0).addBox(-6.5F, -9.0F, -6.5F, 13.0F, 2.0F, 13.0F, new CubeDeformation(0.0F)) + .texOffs(36, 15).addBox(-6.5F, -9.0F, -6.5F, 13.0F, 2.0F, 13.0F, new CubeDeformation(0.35F)) + .texOffs(0, 0).addBox(-4.5F, -20.0F, -4.5F, 9.0F, 11.0F, 9.0F, new CubeDeformation(0.0F)) + .texOffs(0, 20).addBox(-4.5F, -20.0F, -4.5F, 9.0F, 11.0F, 9.0F, new CubeDeformation(0.35F)), PartPose.offset(0.0F, 1.0F, 0.0F)); + return LayerDefinition.create(meshdefinition, 96, 64); + } - @Override - public void setupAnim(Player entity, float limbSwing, float limbSwingAmount, float ageInTicks, float netHeadYaw, float headPitch) { + @Override + public void setupAnim(Player entity, float limbSwing, float limbSwingAmount, float ageInTicks, float netHeadYaw, float headPitch) { - } + } - @Override - public void renderToBuffer(PoseStack poseStack, VertexConsumer vertexConsumer, int packedLight, int packedOverlay, float red, float green, float blue, float alpha) { - topHat.render(poseStack, vertexConsumer, packedLight, packedOverlay, red, green, blue, alpha); - } + @Override + public void renderToBuffer(PoseStack poseStack, VertexConsumer vertexConsumer, int packedLight, int packedOverlay, float red, float green, float blue, float alpha) { + topHat.render(poseStack, vertexConsumer, packedLight, packedOverlay, red, green, blue, alpha); + } } \ No newline at end of file diff --git a/src/main/java/com/sammy/malum/client/model/cosmetic/GenericArmorModel.java b/src/main/java/com/sammy/malum/client/model/cosmetic/GenericArmorModel.java index f243261ed..15874c3c3 100644 --- a/src/main/java/com/sammy/malum/client/model/cosmetic/GenericArmorModel.java +++ b/src/main/java/com/sammy/malum/client/model/cosmetic/GenericArmorModel.java @@ -12,40 +12,40 @@ import team.lodestar.lodestone.systems.model.LodestoneArmorModel; public class GenericArmorModel extends LodestoneArmorModel { - public static final ModelLayerLocation LAYER = new ModelLayerLocation(MalumMod.malumPath("generic_armor_model"), "main"); + public static final ModelLayerLocation LAYER = new ModelLayerLocation(MalumMod.malumPath("generic_armor_model"), "main"); - public GenericArmorModel(ModelPart root) { - super(root); - } + public GenericArmorModel(ModelPart root) { + super(root); + } - public static LayerDefinition createBodyLayer() { - MeshDefinition mesh = HumanoidModel.createMesh(new CubeDeformation(0), 0); - PartDefinition root = createHumanoidAlias(mesh); + public static LayerDefinition createBodyLayer() { + MeshDefinition mesh = HumanoidModel.createMesh(new CubeDeformation(0), 0); + PartDefinition root = createHumanoidAlias(mesh); - PartDefinition head = root.getChild("head"); - PartDefinition helmet = head.addOrReplaceChild("helmet", CubeListBuilder.create().texOffs(0, 0).addBox(-4.0F, -8.0F, -4.0F, 8.0F, 8.0F, 8.0F, new CubeDeformation(0.525F)) - .texOffs(32, 0).addBox(-4.0F, -8.0F, -4.0F, 8.0F, 8.0F, 8.0F, new CubeDeformation(1.0F)), PartPose.offset(0.0F, 0.0F, 0.0F)); + PartDefinition head = root.getChild("head"); + PartDefinition helmet = head.addOrReplaceChild("helmet", CubeListBuilder.create().texOffs(0, 0).addBox(-4.0F, -8.0F, -4.0F, 8.0F, 8.0F, 8.0F, new CubeDeformation(0.525F)) + .texOffs(32, 0).addBox(-4.0F, -8.0F, -4.0F, 8.0F, 8.0F, 8.0F, new CubeDeformation(1.0F)), PartPose.offset(0.0F, 0.0F, 0.0F)); - PartDefinition body = root.getChild("body"); - PartDefinition torso = body.addOrReplaceChild("torso", CubeListBuilder.create().texOffs(16, 16).addBox(-4.0F, 0.0F, -2.0F, 8.0F, 12.0F, 4.0F, new CubeDeformation(0.525F)) - .texOffs(16, 32).addBox(-4.0F, 0.0F, -2.0F, 8.0F, 12.0F, 4.0F, new CubeDeformation(0.75F)), PartPose.offset(0.0F, 0.0F, 0.0F)); + PartDefinition body = root.getChild("body"); + PartDefinition torso = body.addOrReplaceChild("torso", CubeListBuilder.create().texOffs(16, 16).addBox(-4.0F, 0.0F, -2.0F, 8.0F, 12.0F, 4.0F, new CubeDeformation(0.525F)) + .texOffs(16, 32).addBox(-4.0F, 0.0F, -2.0F, 8.0F, 12.0F, 4.0F, new CubeDeformation(0.75F)), PartPose.offset(0.0F, 0.0F, 0.0F)); - PartDefinition right_arm = root.getChild("right_arm"); - PartDefinition right_shoulder = right_arm.addOrReplaceChild("right_shoulder", CubeListBuilder.create().texOffs(40, 16).addBox(-3.0F, -2.0F, -2.0F, 4.0F, 12.0F, 4.0F, new CubeDeformation(0.525F)) - .texOffs(40, 32).addBox(-3.0F, -2.0F, -2.0F, 4.0F, 12.0F, 4.0F, new CubeDeformation(0.75F)), PartPose.offset(0, 0, 0.0F)); + PartDefinition right_arm = root.getChild("right_arm"); + PartDefinition right_shoulder = right_arm.addOrReplaceChild("right_shoulder", CubeListBuilder.create().texOffs(40, 16).addBox(-3.0F, -2.0F, -2.0F, 4.0F, 12.0F, 4.0F, new CubeDeformation(0.525F)) + .texOffs(40, 32).addBox(-3.0F, -2.0F, -2.0F, 4.0F, 12.0F, 4.0F, new CubeDeformation(0.75F)), PartPose.offset(0, 0, 0.0F)); - PartDefinition left_arm = root.getChild("left_arm"); - PartDefinition left_shoulder = left_arm.addOrReplaceChild("left_shoulder", CubeListBuilder.create().texOffs(32, 48).addBox(-1.0F, -2.0F, -2.0F, 4.0F, 12.0F, 4.0F, new CubeDeformation(0.525F)) - .texOffs(48, 48).addBox(-1.0F, -2.0F, -2.0F, 4.0F, 12.0F, 4.0F, new CubeDeformation(0.75F)), PartPose.offset(0, 0, 0.0F)); + PartDefinition left_arm = root.getChild("left_arm"); + PartDefinition left_shoulder = left_arm.addOrReplaceChild("left_shoulder", CubeListBuilder.create().texOffs(32, 48).addBox(-1.0F, -2.0F, -2.0F, 4.0F, 12.0F, 4.0F, new CubeDeformation(0.525F)) + .texOffs(48, 48).addBox(-1.0F, -2.0F, -2.0F, 4.0F, 12.0F, 4.0F, new CubeDeformation(0.75F)), PartPose.offset(0, 0, 0.0F)); - PartDefinition right_legging = root.getChild("right_legging"); - PartDefinition right_leg = right_legging.addOrReplaceChild("right_leg", CubeListBuilder.create().texOffs(0, 16).addBox(-2.0F, 0.0F, -2.0F, 4.0F, 12.0F, 4.0F, new CubeDeformation(0.525F)) - .texOffs(0, 32).addBox(-2.0F, 0.0F, -2.0F, 4.0F, 12.0F, 4.0F, new CubeDeformation(0.75F)), PartPose.offset(0, 0, 0.0F)); + PartDefinition right_legging = root.getChild("right_legging"); + PartDefinition right_leg = right_legging.addOrReplaceChild("right_leg", CubeListBuilder.create().texOffs(0, 16).addBox(-2.0F, 0.0F, -2.0F, 4.0F, 12.0F, 4.0F, new CubeDeformation(0.525F)) + .texOffs(0, 32).addBox(-2.0F, 0.0F, -2.0F, 4.0F, 12.0F, 4.0F, new CubeDeformation(0.75F)), PartPose.offset(0, 0, 0.0F)); - PartDefinition left_legging = root.getChild("left_legging"); - PartDefinition left_leg = left_legging.addOrReplaceChild("left_leg", CubeListBuilder.create().texOffs(16, 48).addBox(-2.0F, 0.0F, -2.0F, 4.0F, 12.0F, 4.0F, new CubeDeformation(0.525F)) - .texOffs(0, 48).addBox(-2.0F, 0.0F, -2.0F, 4.0F, 12.0F, 4.0F, new CubeDeformation(0.75F)), PartPose.offset(0, 0, 0.0F)); + PartDefinition left_legging = root.getChild("left_legging"); + PartDefinition left_leg = left_legging.addOrReplaceChild("left_leg", CubeListBuilder.create().texOffs(16, 48).addBox(-2.0F, 0.0F, -2.0F, 4.0F, 12.0F, 4.0F, new CubeDeformation(0.525F)) + .texOffs(0, 48).addBox(-2.0F, 0.0F, -2.0F, 4.0F, 12.0F, 4.0F, new CubeDeformation(0.75F)), PartPose.offset(0, 0, 0.0F)); - return LayerDefinition.create(mesh, 64, 64); - } + return LayerDefinition.create(mesh, 64, 64); + } } \ No newline at end of file diff --git a/src/main/java/com/sammy/malum/client/model/cosmetic/GenericSlimArmorModel.java b/src/main/java/com/sammy/malum/client/model/cosmetic/GenericSlimArmorModel.java index 71b619403..ad979e175 100644 --- a/src/main/java/com/sammy/malum/client/model/cosmetic/GenericSlimArmorModel.java +++ b/src/main/java/com/sammy/malum/client/model/cosmetic/GenericSlimArmorModel.java @@ -12,40 +12,40 @@ import team.lodestar.lodestone.systems.model.LodestoneArmorModel; public class GenericSlimArmorModel extends LodestoneArmorModel { - public static final ModelLayerLocation LAYER = new ModelLayerLocation(MalumMod.malumPath("generic_slim_armor_model"), "main"); + public static final ModelLayerLocation LAYER = new ModelLayerLocation(MalumMod.malumPath("generic_slim_armor_model"), "main"); - public GenericSlimArmorModel(ModelPart root) { - super(root); - } + public GenericSlimArmorModel(ModelPart root) { + super(root); + } - public static LayerDefinition createBodyLayer() { - MeshDefinition mesh = HumanoidModel.createMesh(new CubeDeformation(0), 0); - PartDefinition root = createHumanoidAlias(mesh); + public static LayerDefinition createBodyLayer() { + MeshDefinition mesh = HumanoidModel.createMesh(new CubeDeformation(0), 0); + PartDefinition root = createHumanoidAlias(mesh); - PartDefinition head = root.getChild("head"); - PartDefinition helmet = head.addOrReplaceChild("helmet", CubeListBuilder.create().texOffs(0, 0).addBox(-4.0F, -8.0F, -4.0F, 8.0F, 8.0F, 8.0F, new CubeDeformation(0.525F)) - .texOffs(32, 0).addBox(-4.0F, -8.0F, -4.0F, 8.0F, 8.0F, 8.0F, new CubeDeformation(1.0F)), PartPose.offset(0.0F, 0.0F, 0.0F)); + PartDefinition head = root.getChild("head"); + PartDefinition helmet = head.addOrReplaceChild("helmet", CubeListBuilder.create().texOffs(0, 0).addBox(-4.0F, -8.0F, -4.0F, 8.0F, 8.0F, 8.0F, new CubeDeformation(0.525F)) + .texOffs(32, 0).addBox(-4.0F, -8.0F, -4.0F, 8.0F, 8.0F, 8.0F, new CubeDeformation(1.0F)), PartPose.offset(0.0F, 0.0F, 0.0F)); - PartDefinition body = root.getChild("body"); - PartDefinition torso = body.addOrReplaceChild("torso", CubeListBuilder.create().texOffs(16, 16).addBox(-4.0F, 0.0F, -2.0F, 8.0F, 12.0F, 4.0F, new CubeDeformation(0.525F)) - .texOffs(16, 32).addBox(-4.0F, 0.0F, -2.0F, 8.0F, 12.0F, 4.0F, new CubeDeformation(0.75F)), PartPose.offset(0.0F, 0.0F, 0.0F)); + PartDefinition body = root.getChild("body"); + PartDefinition torso = body.addOrReplaceChild("torso", CubeListBuilder.create().texOffs(16, 16).addBox(-4.0F, 0.0F, -2.0F, 8.0F, 12.0F, 4.0F, new CubeDeformation(0.525F)) + .texOffs(16, 32).addBox(-4.0F, 0.0F, -2.0F, 8.0F, 12.0F, 4.0F, new CubeDeformation(0.75F)), PartPose.offset(0.0F, 0.0F, 0.0F)); - PartDefinition right_arm = root.getChild("right_arm"); - PartDefinition right_shoulder = right_arm.addOrReplaceChild("right_shoulder", CubeListBuilder.create().texOffs(40, 16).addBox(-3.0F, -2.0F, -2.0F, 3.0F, 12.0F, 4.0F, new CubeDeformation(0.525F)) - .texOffs(40, 32).addBox(-3.0F, -2.0F, -2.0F, 3.0F, 12.0F, 4.0F, new CubeDeformation(0.75F)), PartPose.offset(0, 0, 0.0F)); + PartDefinition right_arm = root.getChild("right_arm"); + PartDefinition right_shoulder = right_arm.addOrReplaceChild("right_shoulder", CubeListBuilder.create().texOffs(40, 16).addBox(-3.0F, -2.0F, -2.0F, 3.0F, 12.0F, 4.0F, new CubeDeformation(0.525F)) + .texOffs(40, 32).addBox(-3.0F, -2.0F, -2.0F, 3.0F, 12.0F, 4.0F, new CubeDeformation(0.75F)), PartPose.offset(0, 0, 0.0F)); - PartDefinition left_arm = root.getChild("left_arm"); - PartDefinition left_shoulder = left_arm.addOrReplaceChild("left_shoulder", CubeListBuilder.create().texOffs(32, 48).addBox(-1.0F, -2.0F, -2.0F, 3.0F, 12.0F, 4.0F, new CubeDeformation(0.525F)) - .texOffs(48, 48).addBox(-1.0F, -2.0F, -2.0F, 3.0F, 12.0F, 4.0F, new CubeDeformation(0.75F)), PartPose.offset(0, 0, 0.0F)); + PartDefinition left_arm = root.getChild("left_arm"); + PartDefinition left_shoulder = left_arm.addOrReplaceChild("left_shoulder", CubeListBuilder.create().texOffs(32, 48).addBox(-1.0F, -2.0F, -2.0F, 3.0F, 12.0F, 4.0F, new CubeDeformation(0.525F)) + .texOffs(48, 48).addBox(-1.0F, -2.0F, -2.0F, 3.0F, 12.0F, 4.0F, new CubeDeformation(0.75F)), PartPose.offset(0, 0, 0.0F)); - PartDefinition right_legging = root.getChild("right_legging"); - PartDefinition right_leg = right_legging.addOrReplaceChild("right_leg", CubeListBuilder.create().texOffs(0, 16).addBox(-2.0F, 0.0F, -2.0F, 4.0F, 12.0F, 4.0F, new CubeDeformation(0.525F)) - .texOffs(0, 32).addBox(-2.0F, 0.0F, -2.0F, 4.0F, 12.0F, 4.0F, new CubeDeformation(0.75F)), PartPose.offset(0, 0, 0.0F)); + PartDefinition right_legging = root.getChild("right_legging"); + PartDefinition right_leg = right_legging.addOrReplaceChild("right_leg", CubeListBuilder.create().texOffs(0, 16).addBox(-2.0F, 0.0F, -2.0F, 4.0F, 12.0F, 4.0F, new CubeDeformation(0.525F)) + .texOffs(0, 32).addBox(-2.0F, 0.0F, -2.0F, 4.0F, 12.0F, 4.0F, new CubeDeformation(0.75F)), PartPose.offset(0, 0, 0.0F)); - PartDefinition left_legging = root.getChild("left_legging"); - PartDefinition left_leg = left_legging.addOrReplaceChild("left_leg", CubeListBuilder.create().texOffs(16, 48).addBox(-2.0F, 0.0F, -2.0F, 4.0F, 12.0F, 4.0F, new CubeDeformation(0.525F)) - .texOffs(0, 48).addBox(-2.0F, 0.0F, -2.0F, 4.0F, 12.0F, 4.0F, new CubeDeformation(0.75F)), PartPose.offset(0, 0, 0.0F)); + PartDefinition left_legging = root.getChild("left_legging"); + PartDefinition left_leg = left_legging.addOrReplaceChild("left_leg", CubeListBuilder.create().texOffs(16, 48).addBox(-2.0F, 0.0F, -2.0F, 4.0F, 12.0F, 4.0F, new CubeDeformation(0.525F)) + .texOffs(0, 48).addBox(-2.0F, 0.0F, -2.0F, 4.0F, 12.0F, 4.0F, new CubeDeformation(0.75F)), PartPose.offset(0, 0, 0.0F)); - return LayerDefinition.create(mesh, 64, 64); - } + return LayerDefinition.create(mesh, 64, 64); + } } \ No newline at end of file diff --git a/src/main/java/com/sammy/malum/client/model/cosmetic/ScarfModel.java b/src/main/java/com/sammy/malum/client/model/cosmetic/ScarfModel.java index 16aa678d2..f8ebb2b10 100644 --- a/src/main/java/com/sammy/malum/client/model/cosmetic/ScarfModel.java +++ b/src/main/java/com/sammy/malum/client/model/cosmetic/ScarfModel.java @@ -13,39 +13,39 @@ public class ScarfModel extends EntityModel { - public static ModelLayerLocation LAYER = new ModelLayerLocation(MalumMod.malumPath("scarf"), "main"); - public final ModelPart headScarf; - public final ModelPart torsoScarf; + public static ModelLayerLocation LAYER = new ModelLayerLocation(MalumMod.malumPath("scarf"), "main"); + public final ModelPart headScarf; + public final ModelPart torsoScarf; - public ScarfModel(ModelPart root) { - this.headScarf = root.getChild("head_scarf"); - this.torsoScarf = root.getChild("torso_scarf"); - } + public ScarfModel(ModelPart root) { + this.headScarf = root.getChild("head_scarf"); + this.torsoScarf = root.getChild("torso_scarf"); + } - public static LayerDefinition createBodyLayer() { - MeshDefinition mesh = HumanoidModel.createMesh(new CubeDeformation(0), 0); - PartDefinition partdefinition = mesh.getRoot(); + public static LayerDefinition createBodyLayer() { + MeshDefinition mesh = HumanoidModel.createMesh(new CubeDeformation(0), 0); + PartDefinition partdefinition = mesh.getRoot(); - PartDefinition headScarf = partdefinition.addOrReplaceChild("head_scarf", CubeListBuilder.create().texOffs(0, 14).addBox(-4.5F, -2.25F, -4.5F, 9.0F, 3.0F, 9.0F, new CubeDeformation(0.0F)), PartPose.offset(0.0F, 0.0F, 0.0F)); + PartDefinition headScarf = partdefinition.addOrReplaceChild("head_scarf", CubeListBuilder.create().texOffs(0, 14).addBox(-4.5F, -2.25F, -4.5F, 9.0F, 3.0F, 9.0F, new CubeDeformation(0.0F)), PartPose.offset(0.0F, 0.0F, 0.0F)); - PartDefinition torsoScarf = partdefinition.addOrReplaceChild("torso_scarf", CubeListBuilder.create().texOffs(0, 0).addBox(-5.5F, -1.0F, -2.5F, 11.0F, 9.0F, 5.0F, new CubeDeformation(0.0F)), PartPose.offset(0.0F, 0.0F, 0.0F)); + PartDefinition torsoScarf = partdefinition.addOrReplaceChild("torso_scarf", CubeListBuilder.create().texOffs(0, 0).addBox(-5.5F, -1.0F, -2.5F, 11.0F, 9.0F, 5.0F, new CubeDeformation(0.0F)), PartPose.offset(0.0F, 0.0F, 0.0F)); - return LayerDefinition.create(mesh, 64, 32); - } + return LayerDefinition.create(mesh, 64, 32); + } - public void copyFromDefault(HumanoidModel model) { - torsoScarf.copyFrom(model.body); - headScarf.copyFrom(model.head); - } + public void copyFromDefault(HumanoidModel model) { + torsoScarf.copyFrom(model.body); + headScarf.copyFrom(model.head); + } - @Override - public void setupAnim(Player pEntity, float pLimbSwing, float pLimbSwingAmount, float pAgeInTicks, float pNetHeadYaw, float pHeadPitch) { + @Override + public void setupAnim(Player pEntity, float pLimbSwing, float pLimbSwingAmount, float pAgeInTicks, float pNetHeadYaw, float pHeadPitch) { - } + } - @Override - public void renderToBuffer(PoseStack poseStack, VertexConsumer buffer, int packedLight, int packedOverlay, float red, float green, float blue, float alpha) { - headScarf.render(poseStack, buffer, packedLight, packedOverlay); - torsoScarf.render(poseStack, buffer, packedLight, packedOverlay); - } + @Override + public void renderToBuffer(PoseStack poseStack, VertexConsumer buffer, int packedLight, int packedOverlay, float red, float green, float blue, float alpha) { + headScarf.render(poseStack, buffer, packedLight, packedOverlay); + torsoScarf.render(poseStack, buffer, packedLight, packedOverlay); + } } \ No newline at end of file diff --git a/src/main/java/com/sammy/malum/client/model/cosmetic/ancient/AncientSoulHunterArmorModel.java b/src/main/java/com/sammy/malum/client/model/cosmetic/ancient/AncientSoulHunterArmorModel.java index f07d12630..bbe5acd18 100644 --- a/src/main/java/com/sammy/malum/client/model/cosmetic/ancient/AncientSoulHunterArmorModel.java +++ b/src/main/java/com/sammy/malum/client/model/cosmetic/ancient/AncientSoulHunterArmorModel.java @@ -13,41 +13,41 @@ import team.lodestar.lodestone.systems.model.LodestoneArmorModel; public class AncientSoulHunterArmorModel extends LodestoneArmorModel { - public static ModelLayerLocation LAYER = new ModelLayerLocation(MalumMod.malumPath("ancient_soul_hunter_armor"), "main"); + public static ModelLayerLocation LAYER = new ModelLayerLocation(MalumMod.malumPath("ancient_soul_hunter_armor"), "main"); - public AncientSoulHunterArmorModel(ModelPart root) { - super(root); - } + public AncientSoulHunterArmorModel(ModelPart root) { + super(root); + } - public static LayerDefinition createBodyLayer() { - MeshDefinition mesh = HumanoidModel.createMesh(new CubeDeformation(0), 0); - PartDefinition root = createHumanoidAlias(mesh); + public static LayerDefinition createBodyLayer() { + MeshDefinition mesh = HumanoidModel.createMesh(new CubeDeformation(0), 0); + PartDefinition root = createHumanoidAlias(mesh); - PartDefinition body = root.getChild("body"); - PartDefinition torso = body.addOrReplaceChild("torso", CubeListBuilder.create().texOffs(40, 16).addBox(-4.0F, 0.0F, -2.0F, 8.0F, 13.0F, 4.0F, new CubeDeformation(0.95F)).texOffs(16, 16).addBox(-4.0F, 0.0F, -2.0F, 8.0F, 13.0F, 4.0F, new CubeDeformation(0.75F)), PartPose.offset(0.0F, 0.0F, 0.0F)); + PartDefinition body = root.getChild("body"); + PartDefinition torso = body.addOrReplaceChild("torso", CubeListBuilder.create().texOffs(40, 16).addBox(-4.0F, 0.0F, -2.0F, 8.0F, 13.0F, 4.0F, new CubeDeformation(0.95F)).texOffs(16, 16).addBox(-4.0F, 0.0F, -2.0F, 8.0F, 13.0F, 4.0F, new CubeDeformation(0.75F)), PartPose.offset(0.0F, 0.0F, 0.0F)); - PartDefinition leggings = root.getChild("leggings"); - PartDefinition codpiece = leggings.addOrReplaceChild("codpiece", CubeListBuilder.create().texOffs(16, 33).addBox(-4.0F, 9.0F, -2.0F, 8.0F, 3.0F, 4.0F, new CubeDeformation(0.5F)), PartPose.offset(0.0F, 0.0F, 0.0F)); + PartDefinition leggings = root.getChild("leggings"); + PartDefinition codpiece = leggings.addOrReplaceChild("codpiece", CubeListBuilder.create().texOffs(16, 33).addBox(-4.0F, 9.0F, -2.0F, 8.0F, 3.0F, 4.0F, new CubeDeformation(0.5F)), PartPose.offset(0.0F, 0.0F, 0.0F)); - PartDefinition right_legging = root.getChild("right_legging"); - PartDefinition right_leg = right_legging.addOrReplaceChild("right_leg", CubeListBuilder.create().texOffs(0, 42).addBox(-2.0F, 0.0F, -2.0F, 4.0F, 9.0F, 4.0F, new CubeDeformation(0.45F)), PartPose.offset(0, 0, 0.0F)); - PartDefinition right_foot = root.getChild("right_foot"); - PartDefinition right_boot = right_foot.addOrReplaceChild("right_boot", CubeListBuilder.create().texOffs(0, 55).addBox(-2.0F, 8.0F, -2.0F, 4.0F, 4.0F, 4.0F, new CubeDeformation(0.9F)), PartPose.offset(0.0F, 0.0F, 0.0F)); + PartDefinition right_legging = root.getChild("right_legging"); + PartDefinition right_leg = right_legging.addOrReplaceChild("right_leg", CubeListBuilder.create().texOffs(0, 42).addBox(-2.0F, 0.0F, -2.0F, 4.0F, 9.0F, 4.0F, new CubeDeformation(0.45F)), PartPose.offset(0, 0, 0.0F)); + PartDefinition right_foot = root.getChild("right_foot"); + PartDefinition right_boot = right_foot.addOrReplaceChild("right_boot", CubeListBuilder.create().texOffs(0, 55).addBox(-2.0F, 8.0F, -2.0F, 4.0F, 4.0F, 4.0F, new CubeDeformation(0.9F)), PartPose.offset(0.0F, 0.0F, 0.0F)); - PartDefinition right_arm = root.getChild("right_arm"); - PartDefinition right_shoulder = right_arm.addOrReplaceChild("right_shoulder", CubeListBuilder.create().texOffs(0, 29).mirror().addBox(-3.0F, -2.0F, -2.0F, 4.0F, 9.0F, 4.0F, new CubeDeformation(0.5F)).mirror(false).texOffs(0, 16).mirror().addBox(-3.0F, -2.0F, -2.0F, 4.0F, 9.0F, 4.0F, new CubeDeformation(0.7F)).mirror(false), PartPose.offset(0, 0, 0.0F)); + PartDefinition right_arm = root.getChild("right_arm"); + PartDefinition right_shoulder = right_arm.addOrReplaceChild("right_shoulder", CubeListBuilder.create().texOffs(0, 29).mirror().addBox(-3.0F, -2.0F, -2.0F, 4.0F, 9.0F, 4.0F, new CubeDeformation(0.5F)).mirror(false).texOffs(0, 16).mirror().addBox(-3.0F, -2.0F, -2.0F, 4.0F, 9.0F, 4.0F, new CubeDeformation(0.7F)).mirror(false), PartPose.offset(0, 0, 0.0F)); - PartDefinition left_legging = root.getChild("left_legging"); - PartDefinition left_leg = left_legging.addOrReplaceChild("left_leg", CubeListBuilder.create().texOffs(0, 42).mirror().addBox(-2.0F, 0.0F, -2.0F, 4.0F, 9.0F, 4.0F, new CubeDeformation(0.45F)).mirror(false), PartPose.offset(0, 0, 0)); - PartDefinition left_foot = root.getChild("left_foot"); - PartDefinition left_boot = left_foot.addOrReplaceChild("left_boot", CubeListBuilder.create().texOffs(0, 55).mirror().addBox(-2.0F, 8.0F, -2.0F, 4.0F, 4.0F, 4.0F, new CubeDeformation(0.9001F)).mirror(false), PartPose.offset(0.0F, 0.0F, 0.0F)); + PartDefinition left_legging = root.getChild("left_legging"); + PartDefinition left_leg = left_legging.addOrReplaceChild("left_leg", CubeListBuilder.create().texOffs(0, 42).mirror().addBox(-2.0F, 0.0F, -2.0F, 4.0F, 9.0F, 4.0F, new CubeDeformation(0.45F)).mirror(false), PartPose.offset(0, 0, 0)); + PartDefinition left_foot = root.getChild("left_foot"); + PartDefinition left_boot = left_foot.addOrReplaceChild("left_boot", CubeListBuilder.create().texOffs(0, 55).mirror().addBox(-2.0F, 8.0F, -2.0F, 4.0F, 4.0F, 4.0F, new CubeDeformation(0.9001F)).mirror(false), PartPose.offset(0.0F, 0.0F, 0.0F)); - PartDefinition left_arm = root.getChild("left_arm"); - PartDefinition left_shoulder = left_arm.addOrReplaceChild("left_shoulder", CubeListBuilder.create().texOffs(0, 29).addBox(-1.0F, -2.0F, -2.0F, 4.0F, 9.0F, 4.0F, new CubeDeformation(0.5F)).texOffs(0, 16).addBox(-1.0F, -2.0F, -2.0F, 4.0F, 9.0F, 4.0F, new CubeDeformation(0.7F)), PartPose.offset(0, 0, 0.0F)); + PartDefinition left_arm = root.getChild("left_arm"); + PartDefinition left_shoulder = left_arm.addOrReplaceChild("left_shoulder", CubeListBuilder.create().texOffs(0, 29).addBox(-1.0F, -2.0F, -2.0F, 4.0F, 9.0F, 4.0F, new CubeDeformation(0.5F)).texOffs(0, 16).addBox(-1.0F, -2.0F, -2.0F, 4.0F, 9.0F, 4.0F, new CubeDeformation(0.7F)), PartPose.offset(0, 0, 0.0F)); - PartDefinition head = root.getChild("head"); - PartDefinition helmet = head.addOrReplaceChild("helmet", CubeListBuilder.create().texOffs(0, 0).addBox(-4.0F, -8.0F, -4.0F, 8.0F, 8.0F, 8.0F, new CubeDeformation(0.5F)).texOffs(32, 0).addBox(-4.0F, -8.0F, -4.0F, 8.0F, 8.0F, 8.0F, new CubeDeformation(0.7F)), PartPose.offset(0.0F, 0.0F, 0.0F)); + PartDefinition head = root.getChild("head"); + PartDefinition helmet = head.addOrReplaceChild("helmet", CubeListBuilder.create().texOffs(0, 0).addBox(-4.0F, -8.0F, -4.0F, 8.0F, 8.0F, 8.0F, new CubeDeformation(0.5F)).texOffs(32, 0).addBox(-4.0F, -8.0F, -4.0F, 8.0F, 8.0F, 8.0F, new CubeDeformation(0.7F)), PartPose.offset(0.0F, 0.0F, 0.0F)); - return LayerDefinition.create(mesh, 64, 64); - } + return LayerDefinition.create(mesh, 64, 64); + } } \ No newline at end of file diff --git a/src/main/java/com/sammy/malum/client/model/cosmetic/ancient/AncientSoulStainedSteelArmorModel.java b/src/main/java/com/sammy/malum/client/model/cosmetic/ancient/AncientSoulStainedSteelArmorModel.java index 0f8f73d9e..08a24e9bb 100644 --- a/src/main/java/com/sammy/malum/client/model/cosmetic/ancient/AncientSoulStainedSteelArmorModel.java +++ b/src/main/java/com/sammy/malum/client/model/cosmetic/ancient/AncientSoulStainedSteelArmorModel.java @@ -13,41 +13,41 @@ import team.lodestar.lodestone.systems.model.LodestoneArmorModel; public class AncientSoulStainedSteelArmorModel extends LodestoneArmorModel { - public static ModelLayerLocation LAYER = new ModelLayerLocation(MalumMod.malumPath("ancient_soul_stained_steel_armor"), "main"); + public static ModelLayerLocation LAYER = new ModelLayerLocation(MalumMod.malumPath("ancient_soul_stained_steel_armor"), "main"); - public AncientSoulStainedSteelArmorModel(ModelPart root) { - super(root); - } + public AncientSoulStainedSteelArmorModel(ModelPart root) { + super(root); + } - public static LayerDefinition createBodyLayer() { - MeshDefinition mesh = HumanoidModel.createMesh(new CubeDeformation(0), 0); - PartDefinition root = createHumanoidAlias(mesh); + public static LayerDefinition createBodyLayer() { + MeshDefinition mesh = HumanoidModel.createMesh(new CubeDeformation(0), 0); + PartDefinition root = createHumanoidAlias(mesh); - PartDefinition body = root.getChild("body"); - PartDefinition torso = body.addOrReplaceChild("torso", CubeListBuilder.create().texOffs(24, 17).addBox(-4.0F, 0.0F, -2.0F, 8.0F, 12.0F, 4.0F, new CubeDeformation(1.1F)).texOffs(0, 17).addBox(-4.0F, 0.0F, -2.0F, 8.0F, 12.0F, 4.0F, new CubeDeformation(0.6F)), PartPose.offset(0.0F, 0.0F, 0.0F)); + PartDefinition body = root.getChild("body"); + PartDefinition torso = body.addOrReplaceChild("torso", CubeListBuilder.create().texOffs(24, 17).addBox(-4.0F, 0.0F, -2.0F, 8.0F, 12.0F, 4.0F, new CubeDeformation(1.1F)).texOffs(0, 17).addBox(-4.0F, 0.0F, -2.0F, 8.0F, 12.0F, 4.0F, new CubeDeformation(0.6F)), PartPose.offset(0.0F, 0.0F, 0.0F)); - PartDefinition leggings = root.getChild("leggings"); - PartDefinition codpiece = leggings.addOrReplaceChild("codpiece", CubeListBuilder.create().texOffs(16, 33).addBox(-4.0F, 9.0F, -2.0F, 8.0F, 3.0F, 4.0F, new CubeDeformation(0.501F)), PartPose.offset(0.0F, 0.0F, 0.0F)); + PartDefinition leggings = root.getChild("leggings"); + PartDefinition codpiece = leggings.addOrReplaceChild("codpiece", CubeListBuilder.create().texOffs(16, 33).addBox(-4.0F, 9.0F, -2.0F, 8.0F, 3.0F, 4.0F, new CubeDeformation(0.501F)), PartPose.offset(0.0F, 0.0F, 0.0F)); - PartDefinition right_legging = root.getChild("right_legging"); - PartDefinition right_leg = right_legging.addOrReplaceChild("right_leg", CubeListBuilder.create().texOffs(0, 33).addBox(-2.0F, 0.0F, -2.0F, 4.0F, 8.0F, 4.0F, new CubeDeformation(0.5F)).texOffs(0, 45).addBox(-2.0F, 0.0F, -2.0F, 4.0F, 8.0F, 4.0F, new CubeDeformation(0.85F)), PartPose.offset(-0, 0, 0.0F)); - PartDefinition right_foot = root.getChild("right_foot"); - PartDefinition right_boot = right_foot.addOrReplaceChild("right_boot", CubeListBuilder.create().texOffs(16, 40).addBox(-2.0F, 9.0F, -2.0F, 4.0F, 3.0F, 4.0F, new CubeDeformation(0.5F)).texOffs(32, 40).addBox(-2.0F, 9.0F, -2.0F, 4.0F, 3.0F, 4.0F, new CubeDeformation(0.75F)), PartPose.offset(0.0F, 0.0F, 0.0F)); + PartDefinition right_legging = root.getChild("right_legging"); + PartDefinition right_leg = right_legging.addOrReplaceChild("right_leg", CubeListBuilder.create().texOffs(0, 33).addBox(-2.0F, 0.0F, -2.0F, 4.0F, 8.0F, 4.0F, new CubeDeformation(0.5F)).texOffs(0, 45).addBox(-2.0F, 0.0F, -2.0F, 4.0F, 8.0F, 4.0F, new CubeDeformation(0.85F)), PartPose.offset(-0, 0, 0.0F)); + PartDefinition right_foot = root.getChild("right_foot"); + PartDefinition right_boot = right_foot.addOrReplaceChild("right_boot", CubeListBuilder.create().texOffs(16, 40).addBox(-2.0F, 9.0F, -2.0F, 4.0F, 3.0F, 4.0F, new CubeDeformation(0.5F)).texOffs(32, 40).addBox(-2.0F, 9.0F, -2.0F, 4.0F, 3.0F, 4.0F, new CubeDeformation(0.75F)), PartPose.offset(0.0F, 0.0F, 0.0F)); - PartDefinition right_arm = root.getChild("right_arm"); - PartDefinition right_shoulder = right_arm.addOrReplaceChild("right_shoulder", CubeListBuilder.create().texOffs(48, 17).mirror().addBox(-3.0F, -2.0F, -2.0F, 4.0F, 9.0F, 4.0F, new CubeDeformation(0.5F)).mirror(false).texOffs(48, 30).mirror().addBox(-3.25F, -2.0F, -2.0F, 4.0F, 9.0F, 4.0F, new CubeDeformation(0.75F)).mirror(false), PartPose.offset(0, 0, 0.0F)); + PartDefinition right_arm = root.getChild("right_arm"); + PartDefinition right_shoulder = right_arm.addOrReplaceChild("right_shoulder", CubeListBuilder.create().texOffs(48, 17).mirror().addBox(-3.0F, -2.0F, -2.0F, 4.0F, 9.0F, 4.0F, new CubeDeformation(0.5F)).mirror(false).texOffs(48, 30).mirror().addBox(-3.25F, -2.0F, -2.0F, 4.0F, 9.0F, 4.0F, new CubeDeformation(0.75F)).mirror(false), PartPose.offset(0, 0, 0.0F)); - PartDefinition left_legging = root.getChild("left_legging"); - PartDefinition left_leg = left_legging.addOrReplaceChild("left_leg", CubeListBuilder.create().texOffs(0, 33).mirror().addBox(-2.0F, 0.0F, -2.0F, 4.0F, 8.0F, 4.0F, new CubeDeformation(0.5001F)).mirror(false).texOffs(0, 45).mirror().addBox(-2.0F, 0.0F, -2.0F, 4.0F, 8.0F, 4.0F, new CubeDeformation(0.8501F)).mirror(false), PartPose.offset(0, 0, 0.0F)); - PartDefinition left_foot = root.getChild("left_foot"); - PartDefinition left_boot = left_foot.addOrReplaceChild("left_boot", CubeListBuilder.create().texOffs(16, 40).mirror().addBox(-2.0F, 9.0F, -2.0F, 4.0F, 3.0F, 4.0F, new CubeDeformation(0.5001F)).mirror(false).texOffs(32, 40).mirror().addBox(-2.0F, 9.0F, -2.0F, 4.0F, 3.0F, 4.0F, new CubeDeformation(0.7501F)).mirror(false), PartPose.offset(0.0F, 0.0F, 0.0F)); + PartDefinition left_legging = root.getChild("left_legging"); + PartDefinition left_leg = left_legging.addOrReplaceChild("left_leg", CubeListBuilder.create().texOffs(0, 33).mirror().addBox(-2.0F, 0.0F, -2.0F, 4.0F, 8.0F, 4.0F, new CubeDeformation(0.5001F)).mirror(false).texOffs(0, 45).mirror().addBox(-2.0F, 0.0F, -2.0F, 4.0F, 8.0F, 4.0F, new CubeDeformation(0.8501F)).mirror(false), PartPose.offset(0, 0, 0.0F)); + PartDefinition left_foot = root.getChild("left_foot"); + PartDefinition left_boot = left_foot.addOrReplaceChild("left_boot", CubeListBuilder.create().texOffs(16, 40).mirror().addBox(-2.0F, 9.0F, -2.0F, 4.0F, 3.0F, 4.0F, new CubeDeformation(0.5001F)).mirror(false).texOffs(32, 40).mirror().addBox(-2.0F, 9.0F, -2.0F, 4.0F, 3.0F, 4.0F, new CubeDeformation(0.7501F)).mirror(false), PartPose.offset(0.0F, 0.0F, 0.0F)); - PartDefinition left_arm = root.getChild("left_arm"); - PartDefinition left_shoulder = left_arm.addOrReplaceChild("left_shoulder", CubeListBuilder.create().texOffs(48, 30).addBox(-0.75F, -2.0F, -2.0F, 4.0F, 9.0F, 4.0F, new CubeDeformation(0.75F)).texOffs(48, 17).addBox(-1.0F, -2.0F, -2.0F, 4.0F, 9.0F, 4.0F, new CubeDeformation(0.5F)), PartPose.offset(0, 0, 0.0F)); + PartDefinition left_arm = root.getChild("left_arm"); + PartDefinition left_shoulder = left_arm.addOrReplaceChild("left_shoulder", CubeListBuilder.create().texOffs(48, 30).addBox(-0.75F, -2.0F, -2.0F, 4.0F, 9.0F, 4.0F, new CubeDeformation(0.75F)).texOffs(48, 17).addBox(-1.0F, -2.0F, -2.0F, 4.0F, 9.0F, 4.0F, new CubeDeformation(0.5F)), PartPose.offset(0, 0, 0.0F)); - PartDefinition head = root.getChild("head"); - PartDefinition helmet = head.addOrReplaceChild("helmet", CubeListBuilder.create().texOffs(0, 0).addBox(-4.0F, -9.0F, -4.0F, 8.0F, 9.0F, 8.0F, new CubeDeformation(0.5F)).texOffs(32, 0).addBox(-4.0F, -9.0F, -4.0F, 8.0F, 9.0F, 8.0F, new CubeDeformation(0.75F)), PartPose.offset(0.0F, 1.0F, 0.0F)); + PartDefinition head = root.getChild("head"); + PartDefinition helmet = head.addOrReplaceChild("helmet", CubeListBuilder.create().texOffs(0, 0).addBox(-4.0F, -9.0F, -4.0F, 8.0F, 9.0F, 8.0F, new CubeDeformation(0.5F)).texOffs(32, 0).addBox(-4.0F, -9.0F, -4.0F, 8.0F, 9.0F, 8.0F, new CubeDeformation(0.75F)), PartPose.offset(0.0F, 1.0F, 0.0F)); - return LayerDefinition.create(mesh, 64, 64); - } + return LayerDefinition.create(mesh, 64, 64); + } } \ No newline at end of file diff --git a/src/main/java/com/sammy/malum/client/model/cosmetic/pride/PridewearArmorModel.java b/src/main/java/com/sammy/malum/client/model/cosmetic/pride/PridewearArmorModel.java index 3eedca30d..8eb7c3c98 100644 --- a/src/main/java/com/sammy/malum/client/model/cosmetic/pride/PridewearArmorModel.java +++ b/src/main/java/com/sammy/malum/client/model/cosmetic/pride/PridewearArmorModel.java @@ -13,54 +13,54 @@ import team.lodestar.lodestone.systems.model.LodestoneArmorModel; public class PridewearArmorModel extends LodestoneArmorModel { - public static ModelLayerLocation LAYER = new ModelLayerLocation(MalumMod.malumPath("pridewear"), "main"); + public static ModelLayerLocation LAYER = new ModelLayerLocation(MalumMod.malumPath("pridewear"), "main"); - public PridewearArmorModel(ModelPart root) { - super(root); - } + public PridewearArmorModel(ModelPart root) { + super(root); + } - public static LayerDefinition createBodyLayer() { - MeshDefinition mesh = HumanoidModel.createMesh(new CubeDeformation(0), 0); - PartDefinition root = createHumanoidAlias(mesh); + public static LayerDefinition createBodyLayer() { + MeshDefinition mesh = HumanoidModel.createMesh(new CubeDeformation(0), 0); + PartDefinition root = createHumanoidAlias(mesh); - PartDefinition body = root.getChild("body"); - PartDefinition torso = body.addOrReplaceChild("torso", CubeListBuilder.create().texOffs(16, 0).addBox(-4.0F, 0.0F, -2.0F, 8.0F, 12.0F, 4.0F, new CubeDeformation(0.525F)) - .texOffs(16, 16).addBox(-4.0F, 0.0F, -2.0F, 8.0F, 12.0F, 4.0F, new CubeDeformation(0.75F)), PartPose.offset(0.0F, 0.0F, 0.0F)); + PartDefinition body = root.getChild("body"); + PartDefinition torso = body.addOrReplaceChild("torso", CubeListBuilder.create().texOffs(16, 0).addBox(-4.0F, 0.0F, -2.0F, 8.0F, 12.0F, 4.0F, new CubeDeformation(0.525F)) + .texOffs(16, 16).addBox(-4.0F, 0.0F, -2.0F, 8.0F, 12.0F, 4.0F, new CubeDeformation(0.75F)), PartPose.offset(0.0F, 0.0F, 0.0F)); - PartDefinition leggings = root.getChild("leggings"); - PartDefinition codpiece = leggings.addOrReplaceChild("codpiece", CubeListBuilder.create().texOffs(0, 56).addBox(-5.0F, -14.0F, -3.0F, 10.0F, 2.0F, 6.0F, new CubeDeformation(0.0F)), PartPose.offset(0.0F, 24f, 0.0F)); + PartDefinition leggings = root.getChild("leggings"); + PartDefinition codpiece = leggings.addOrReplaceChild("codpiece", CubeListBuilder.create().texOffs(0, 56).addBox(-5.0F, -14.0F, -3.0F, 10.0F, 2.0F, 6.0F, new CubeDeformation(0.0F)), PartPose.offset(0.0F, 24f, 0.0F)); - PartDefinition right_legging = root.getChild("right_legging"); - PartDefinition right_leg = right_legging.addOrReplaceChild("right_leg", CubeListBuilder.create().texOffs(0, 48).addBox(-1.9F, 0.0F, -2.0F, 4.0F, 2.0F, 4.0F, new CubeDeformation(0.625F)) - .texOffs(16, 48).addBox(-1.9F, 0.0F, -2.0F, 4.0F, 2.0F, 4.0F, new CubeDeformation(0.85F)), PartPose.offset(0, 0, 0.0F)); - PartDefinition right_foot = root.getChild("right_foot"); - PartDefinition right_boot = right_foot.addOrReplaceChild("right_boot", CubeListBuilder.create().texOffs(0, 4).addBox(-1.9F, 4.0F, -2.0F, 4.0F, 8.0F, 4.0F, new CubeDeformation(0.625F)) - .texOffs(0, 20).addBox(-1.9F, 4.0F, -2.0F, 4.0F, 8.0F, 4.0F, new CubeDeformation(0.85F)), PartPose.offset(0.0F, 0.0F, 0.0F)); + PartDefinition right_legging = root.getChild("right_legging"); + PartDefinition right_leg = right_legging.addOrReplaceChild("right_leg", CubeListBuilder.create().texOffs(0, 48).addBox(-1.9F, 0.0F, -2.0F, 4.0F, 2.0F, 4.0F, new CubeDeformation(0.625F)) + .texOffs(16, 48).addBox(-1.9F, 0.0F, -2.0F, 4.0F, 2.0F, 4.0F, new CubeDeformation(0.85F)), PartPose.offset(0, 0, 0.0F)); + PartDefinition right_foot = root.getChild("right_foot"); + PartDefinition right_boot = right_foot.addOrReplaceChild("right_boot", CubeListBuilder.create().texOffs(0, 4).addBox(-1.9F, 4.0F, -2.0F, 4.0F, 8.0F, 4.0F, new CubeDeformation(0.625F)) + .texOffs(0, 20).addBox(-1.9F, 4.0F, -2.0F, 4.0F, 8.0F, 4.0F, new CubeDeformation(0.85F)), PartPose.offset(0.0F, 0.0F, 0.0F)); - PartDefinition right_arm = root.getChild("right_arm"); - PartDefinition right_shoulder = right_arm.addOrReplaceChild("right_shoulder", CubeListBuilder.create().texOffs(40, 0).addBox(-5.0F, -2.0F, -2.0F, 4.0F, 12.0F, 4.0F, new CubeDeformation(0.525F)) - .texOffs(40, 16).addBox(-5.0F, -2.0F, -2.0F, 4.0F, 12.0F, 4.0F, new CubeDeformation(0.75F)), PartPose.offset(2, 0, 0.0F)); + PartDefinition right_arm = root.getChild("right_arm"); + PartDefinition right_shoulder = right_arm.addOrReplaceChild("right_shoulder", CubeListBuilder.create().texOffs(40, 0).addBox(-5.0F, -2.0F, -2.0F, 4.0F, 12.0F, 4.0F, new CubeDeformation(0.525F)) + .texOffs(40, 16).addBox(-5.0F, -2.0F, -2.0F, 4.0F, 12.0F, 4.0F, new CubeDeformation(0.75F)), PartPose.offset(2, 0, 0.0F)); - PartDefinition left_legging = root.getChild("left_legging"); - PartDefinition left_leg = left_legging.addOrReplaceChild("left_leg", CubeListBuilder.create().texOffs(32, 48).addBox(-2.1F, 0.0F, -2.0F, 4.0F, 2.0F, 4.0F, new CubeDeformation(0.625F)) - .texOffs(48, 48).addBox(-2.1F, 0.0F, -2.0F, 4.0F, 2.0F, 4.0F, new CubeDeformation(0.85F)), PartPose.offset(0, 0, 0.0F)); - PartDefinition left_foot = root.getChild("left_foot"); - PartDefinition left_boot = left_foot.addOrReplaceChild("left_boot", CubeListBuilder.create().texOffs(16, 36).addBox(-2.1F, 4.0F, -2.0F, 4.0F, 8.0F, 4.0F, new CubeDeformation(0.625F)) - .texOffs(0, 36).addBox(-2.1F, 4.0F, -2.0F, 4.0F, 8.0F, 4.0F, new CubeDeformation(0.85F)), PartPose.offset(0.0F, 0.0F, 0.0F)); + PartDefinition left_legging = root.getChild("left_legging"); + PartDefinition left_leg = left_legging.addOrReplaceChild("left_leg", CubeListBuilder.create().texOffs(32, 48).addBox(-2.1F, 0.0F, -2.0F, 4.0F, 2.0F, 4.0F, new CubeDeformation(0.625F)) + .texOffs(48, 48).addBox(-2.1F, 0.0F, -2.0F, 4.0F, 2.0F, 4.0F, new CubeDeformation(0.85F)), PartPose.offset(0, 0, 0.0F)); + PartDefinition left_foot = root.getChild("left_foot"); + PartDefinition left_boot = left_foot.addOrReplaceChild("left_boot", CubeListBuilder.create().texOffs(16, 36).addBox(-2.1F, 4.0F, -2.0F, 4.0F, 8.0F, 4.0F, new CubeDeformation(0.625F)) + .texOffs(0, 36).addBox(-2.1F, 4.0F, -2.0F, 4.0F, 8.0F, 4.0F, new CubeDeformation(0.85F)), PartPose.offset(0.0F, 0.0F, 0.0F)); - PartDefinition left_arm = root.getChild("left_arm"); - PartDefinition left_shoulder = left_arm.addOrReplaceChild("left_shoulder", CubeListBuilder.create().texOffs(32, 32).addBox(1.0F, -2.0F, -2.0F, 4.0F, 12.0F, 4.0F, new CubeDeformation(0.525F)) - .texOffs(48, 32).addBox(1.0F, -2.0F, -2.0F, 4.0F, 12.0F, 4.0F, new CubeDeformation(0.75F)), PartPose.offset(-2, 0, 0.0F)); + PartDefinition left_arm = root.getChild("left_arm"); + PartDefinition left_shoulder = left_arm.addOrReplaceChild("left_shoulder", CubeListBuilder.create().texOffs(32, 32).addBox(1.0F, -2.0F, -2.0F, 4.0F, 12.0F, 4.0F, new CubeDeformation(0.525F)) + .texOffs(48, 32).addBox(1.0F, -2.0F, -2.0F, 4.0F, 12.0F, 4.0F, new CubeDeformation(0.75F)), PartPose.offset(-2, 0, 0.0F)); - PartDefinition head = root.getChild("head"); - PartDefinition beanie = head.addOrReplaceChild("beanie", CubeListBuilder.create().texOffs(100, 60).addBox(-1.5F, -33.3512F, -8.053F, 3.0F, 2.0F, 2.0F, new CubeDeformation(0.2F)) - .texOffs(64, 53).addBox(-4.6F, -32.4238F, -15.2587F, 9.0F, 3.0F, 8.0F, new CubeDeformation(0.0F)) - .texOffs(64, 53).addBox(-4.6F, -32.4238F, -15.2587F, 9.0F, 3.0F, 8.0F, new CubeDeformation(0.2F)) - .texOffs(64, 35).addBox(-5.0F, -29.3512F, -16.303F, 10.0F, 3.0F, 10.0F, new CubeDeformation(0.2F)) - .texOffs(100, 28).addBox(-1.5F, -33.3512F, -8.053F, 3.0F, 2.0F, 2.0F, new CubeDeformation(0.0F)) - .texOffs(64, 21).addBox(-4.6F, -32.4238F, -15.2587F, 9.0F, 3.0F, 8.0F, new CubeDeformation(0.0F)) - .texOffs(64, 3).addBox(-5.0F, -29.3512F, -16.303F, 10.0F, 3.0F, 10.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(0.0F, 24f, 0.0F, -0.3927F, 0.0F, 0.0F)); + PartDefinition head = root.getChild("head"); + PartDefinition beanie = head.addOrReplaceChild("beanie", CubeListBuilder.create().texOffs(100, 60).addBox(-1.5F, -33.3512F, -8.053F, 3.0F, 2.0F, 2.0F, new CubeDeformation(0.2F)) + .texOffs(64, 53).addBox(-4.6F, -32.4238F, -15.2587F, 9.0F, 3.0F, 8.0F, new CubeDeformation(0.0F)) + .texOffs(64, 53).addBox(-4.6F, -32.4238F, -15.2587F, 9.0F, 3.0F, 8.0F, new CubeDeformation(0.2F)) + .texOffs(64, 35).addBox(-5.0F, -29.3512F, -16.303F, 10.0F, 3.0F, 10.0F, new CubeDeformation(0.2F)) + .texOffs(100, 28).addBox(-1.5F, -33.3512F, -8.053F, 3.0F, 2.0F, 2.0F, new CubeDeformation(0.0F)) + .texOffs(64, 21).addBox(-4.6F, -32.4238F, -15.2587F, 9.0F, 3.0F, 8.0F, new CubeDeformation(0.0F)) + .texOffs(64, 3).addBox(-5.0F, -29.3512F, -16.303F, 10.0F, 3.0F, 10.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(0.0F, 24f, 0.0F, -0.3927F, 0.0F, 0.0F)); - return LayerDefinition.create(mesh, 128, 64); - } + return LayerDefinition.create(mesh, 128, 64); + } } \ No newline at end of file diff --git a/src/main/java/com/sammy/malum/client/model/cosmetic/pride/SlimPridewearArmorModel.java b/src/main/java/com/sammy/malum/client/model/cosmetic/pride/SlimPridewearArmorModel.java index 4cf649f6c..b7a417010 100644 --- a/src/main/java/com/sammy/malum/client/model/cosmetic/pride/SlimPridewearArmorModel.java +++ b/src/main/java/com/sammy/malum/client/model/cosmetic/pride/SlimPridewearArmorModel.java @@ -13,54 +13,54 @@ import team.lodestar.lodestone.systems.model.LodestoneArmorModel; public class SlimPridewearArmorModel extends LodestoneArmorModel { - public static ModelLayerLocation LAYER = new ModelLayerLocation(MalumMod.malumPath("slim_pridewear"), "main"); + public static ModelLayerLocation LAYER = new ModelLayerLocation(MalumMod.malumPath("slim_pridewear"), "main"); - public SlimPridewearArmorModel(ModelPart root) { - super(root); - } + public SlimPridewearArmorModel(ModelPart root) { + super(root); + } - public static LayerDefinition createBodyLayer() { - MeshDefinition mesh = HumanoidModel.createMesh(new CubeDeformation(0), 0); - PartDefinition root = createHumanoidAlias(mesh); + public static LayerDefinition createBodyLayer() { + MeshDefinition mesh = HumanoidModel.createMesh(new CubeDeformation(0), 0); + PartDefinition root = createHumanoidAlias(mesh); - PartDefinition body = root.getChild("body"); - PartDefinition torso = body.addOrReplaceChild("torso", CubeListBuilder.create().texOffs(16, 0).addBox(-4.0F, 0.0F, -2.0F, 8.0F, 12.0F, 4.0F, new CubeDeformation(0.525F)) - .texOffs(16, 16).addBox(-4.0F, 0.0F, -2.0F, 8.0F, 12.0F, 4.0F, new CubeDeformation(0.75F)), PartPose.offset(0.0F, 0.0F, 0.0F)); + PartDefinition body = root.getChild("body"); + PartDefinition torso = body.addOrReplaceChild("torso", CubeListBuilder.create().texOffs(16, 0).addBox(-4.0F, 0.0F, -2.0F, 8.0F, 12.0F, 4.0F, new CubeDeformation(0.525F)) + .texOffs(16, 16).addBox(-4.0F, 0.0F, -2.0F, 8.0F, 12.0F, 4.0F, new CubeDeformation(0.75F)), PartPose.offset(0.0F, 0.0F, 0.0F)); - PartDefinition leggings = root.getChild("leggings"); - PartDefinition codpiece = leggings.addOrReplaceChild("codpiece", CubeListBuilder.create().texOffs(0, 56).addBox(-5.0F, -14.0F, -3.0F, 10.0F, 2.0F, 6.0F, new CubeDeformation(0.0F)), PartPose.offset(0.0F, 24f, 0.0F)); + PartDefinition leggings = root.getChild("leggings"); + PartDefinition codpiece = leggings.addOrReplaceChild("codpiece", CubeListBuilder.create().texOffs(0, 56).addBox(-5.0F, -14.0F, -3.0F, 10.0F, 2.0F, 6.0F, new CubeDeformation(0.0F)), PartPose.offset(0.0F, 24f, 0.0F)); - PartDefinition right_legging = root.getChild("right_legging"); - PartDefinition right_leg = right_legging.addOrReplaceChild("right_leg", CubeListBuilder.create().texOffs(0, 48).addBox(-1.9F, 0.0F, -2.0F, 4.0F, 2.0F, 4.0F, new CubeDeformation(0.625F)) - .texOffs(16, 48).addBox(-1.9F, 0.0F, -2.0F, 4.0F, 2.0F, 4.0F, new CubeDeformation(0.85F)), PartPose.offset(0, 0, 0.0F)); - PartDefinition right_foot = root.getChild("right_foot"); - PartDefinition right_boot = right_foot.addOrReplaceChild("right_boot", CubeListBuilder.create().texOffs(0, 4).addBox(-1.9F, 4.0F, -2.0F, 4.0F, 8.0F, 4.0F, new CubeDeformation(0.625F)) - .texOffs(0, 20).addBox(-1.9F, 4.0F, -2.0F, 4.0F, 8.0F, 4.0F, new CubeDeformation(0.85F)), PartPose.offset(0.0F, 0.0F, 0.0F)); + PartDefinition right_legging = root.getChild("right_legging"); + PartDefinition right_leg = right_legging.addOrReplaceChild("right_leg", CubeListBuilder.create().texOffs(0, 48).addBox(-1.9F, 0.0F, -2.0F, 4.0F, 2.0F, 4.0F, new CubeDeformation(0.625F)) + .texOffs(16, 48).addBox(-1.9F, 0.0F, -2.0F, 4.0F, 2.0F, 4.0F, new CubeDeformation(0.85F)), PartPose.offset(0, 0, 0.0F)); + PartDefinition right_foot = root.getChild("right_foot"); + PartDefinition right_boot = right_foot.addOrReplaceChild("right_boot", CubeListBuilder.create().texOffs(0, 4).addBox(-1.9F, 4.0F, -2.0F, 4.0F, 8.0F, 4.0F, new CubeDeformation(0.625F)) + .texOffs(0, 20).addBox(-1.9F, 4.0F, -2.0F, 4.0F, 8.0F, 4.0F, new CubeDeformation(0.85F)), PartPose.offset(0.0F, 0.0F, 0.0F)); - PartDefinition right_arm = root.getChild("right_arm"); - PartDefinition right_shoulder = right_arm.addOrReplaceChild("right_shoulder", CubeListBuilder.create().texOffs(40, 0).addBox(-4.0F, -2.0F, -2.0F, 3.0F, 12.0F, 4.0F, new CubeDeformation(0.525F)) - .texOffs(40, 16).addBox(-4.0F, -2.0F, -2.0F, 3.0F, 12.0F, 4.0F, new CubeDeformation(0.75F)), PartPose.offset(2, 0, 0.0F)); + PartDefinition right_arm = root.getChild("right_arm"); + PartDefinition right_shoulder = right_arm.addOrReplaceChild("right_shoulder", CubeListBuilder.create().texOffs(40, 0).addBox(-4.0F, -2.0F, -2.0F, 3.0F, 12.0F, 4.0F, new CubeDeformation(0.525F)) + .texOffs(40, 16).addBox(-4.0F, -2.0F, -2.0F, 3.0F, 12.0F, 4.0F, new CubeDeformation(0.75F)), PartPose.offset(2, 0, 0.0F)); - PartDefinition left_legging = root.getChild("left_legging"); - PartDefinition left_leg = left_legging.addOrReplaceChild("left_leg", CubeListBuilder.create().texOffs(32, 48).addBox(-2.1F, 0.0F, -2.0F, 4.0F, 2.0F, 4.0F, new CubeDeformation(0.625F)) - .texOffs(48, 48).addBox(-2.1F, 0.0F, -2.0F, 4.0F, 2.0F, 4.0F, new CubeDeformation(0.85F)), PartPose.offset(0, 0, 0.0F)); - PartDefinition left_foot = root.getChild("left_foot"); - PartDefinition left_boot = left_foot.addOrReplaceChild("left_boot", CubeListBuilder.create().texOffs(16, 36).addBox(-2.1F, 4.0F, -2.0F, 4.0F, 8.0F, 4.0F, new CubeDeformation(0.625F)) - .texOffs(0, 36).addBox(-2.1F, 4.0F, -2.0F, 4.0F, 8.0F, 4.0F, new CubeDeformation(0.85F)), PartPose.offset(0.0F, 0.0F, 0.0F)); + PartDefinition left_legging = root.getChild("left_legging"); + PartDefinition left_leg = left_legging.addOrReplaceChild("left_leg", CubeListBuilder.create().texOffs(32, 48).addBox(-2.1F, 0.0F, -2.0F, 4.0F, 2.0F, 4.0F, new CubeDeformation(0.625F)) + .texOffs(48, 48).addBox(-2.1F, 0.0F, -2.0F, 4.0F, 2.0F, 4.0F, new CubeDeformation(0.85F)), PartPose.offset(0, 0, 0.0F)); + PartDefinition left_foot = root.getChild("left_foot"); + PartDefinition left_boot = left_foot.addOrReplaceChild("left_boot", CubeListBuilder.create().texOffs(16, 36).addBox(-2.1F, 4.0F, -2.0F, 4.0F, 8.0F, 4.0F, new CubeDeformation(0.625F)) + .texOffs(0, 36).addBox(-2.1F, 4.0F, -2.0F, 4.0F, 8.0F, 4.0F, new CubeDeformation(0.85F)), PartPose.offset(0.0F, 0.0F, 0.0F)); - PartDefinition left_arm = root.getChild("left_arm"); - PartDefinition left_shoulder = left_arm.addOrReplaceChild("left_shoulder", CubeListBuilder.create().texOffs(32, 32).addBox(1.0F, -2.0F, -2.0F, 3.0F, 12.0F, 4.0F, new CubeDeformation(0.525F)) - .texOffs(48, 32).addBox(1.0F, -2.0F, -2.0F, 3.0F, 12.0F, 4.0F, new CubeDeformation(0.75F)), PartPose.offset(-2.0F, 0, 0.0F)); + PartDefinition left_arm = root.getChild("left_arm"); + PartDefinition left_shoulder = left_arm.addOrReplaceChild("left_shoulder", CubeListBuilder.create().texOffs(32, 32).addBox(1.0F, -2.0F, -2.0F, 3.0F, 12.0F, 4.0F, new CubeDeformation(0.525F)) + .texOffs(48, 32).addBox(1.0F, -2.0F, -2.0F, 3.0F, 12.0F, 4.0F, new CubeDeformation(0.75F)), PartPose.offset(-2.0F, 0, 0.0F)); - PartDefinition head = root.getChild("head"); - PartDefinition beanie = head.addOrReplaceChild("beanie", CubeListBuilder.create().texOffs(100, 60).addBox(-1.5F, -33.3512F, -8.053F, 3.0F, 2.0F, 2.0F, new CubeDeformation(0.2F)) - .texOffs(64, 53).addBox(-4.6F, -32.4238F, -15.2587F, 9.0F, 3.0F, 8.0F, new CubeDeformation(0.0F)) - .texOffs(64, 53).addBox(-4.6F, -32.4238F, -15.2587F, 9.0F, 3.0F, 8.0F, new CubeDeformation(0.2F)) - .texOffs(64, 35).addBox(-5.0F, -29.3512F, -16.303F, 10.0F, 3.0F, 10.0F, new CubeDeformation(0.2F)) - .texOffs(100, 28).addBox(-1.5F, -33.3512F, -8.053F, 3.0F, 2.0F, 2.0F, new CubeDeformation(0.0F)) - .texOffs(64, 21).addBox(-4.6F, -32.4238F, -15.2587F, 9.0F, 3.0F, 8.0F, new CubeDeformation(0.0F)) - .texOffs(64, 3).addBox(-5.0F, -29.3512F, -16.303F, 10.0F, 3.0F, 10.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(0.0F, 24f, 0.0F, -0.3927F, 0.0F, 0.0F)); + PartDefinition head = root.getChild("head"); + PartDefinition beanie = head.addOrReplaceChild("beanie", CubeListBuilder.create().texOffs(100, 60).addBox(-1.5F, -33.3512F, -8.053F, 3.0F, 2.0F, 2.0F, new CubeDeformation(0.2F)) + .texOffs(64, 53).addBox(-4.6F, -32.4238F, -15.2587F, 9.0F, 3.0F, 8.0F, new CubeDeformation(0.0F)) + .texOffs(64, 53).addBox(-4.6F, -32.4238F, -15.2587F, 9.0F, 3.0F, 8.0F, new CubeDeformation(0.2F)) + .texOffs(64, 35).addBox(-5.0F, -29.3512F, -16.303F, 10.0F, 3.0F, 10.0F, new CubeDeformation(0.2F)) + .texOffs(100, 28).addBox(-1.5F, -33.3512F, -8.053F, 3.0F, 2.0F, 2.0F, new CubeDeformation(0.0F)) + .texOffs(64, 21).addBox(-4.6F, -32.4238F, -15.2587F, 9.0F, 3.0F, 8.0F, new CubeDeformation(0.0F)) + .texOffs(64, 3).addBox(-5.0F, -29.3512F, -16.303F, 10.0F, 3.0F, 10.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(0.0F, 24f, 0.0F, -0.3927F, 0.0F, 0.0F)); - return LayerDefinition.create(mesh, 128, 64); - } + return LayerDefinition.create(mesh, 128, 64); + } } \ No newline at end of file diff --git a/src/main/java/com/sammy/malum/client/model/cosmetic/risky/CommandoArmorModel.java b/src/main/java/com/sammy/malum/client/model/cosmetic/risky/CommandoArmorModel.java index c070fa5c5..a83fec9ee 100644 --- a/src/main/java/com/sammy/malum/client/model/cosmetic/risky/CommandoArmorModel.java +++ b/src/main/java/com/sammy/malum/client/model/cosmetic/risky/CommandoArmorModel.java @@ -13,54 +13,54 @@ import team.lodestar.lodestone.systems.model.LodestoneArmorModel; public class CommandoArmorModel extends LodestoneArmorModel { - public static ModelLayerLocation LAYER = new ModelLayerLocation(MalumMod.malumPath("commando_armor"), "main"); + public static ModelLayerLocation LAYER = new ModelLayerLocation(MalumMod.malumPath("commando_armor"), "main"); - public CommandoArmorModel(ModelPart root) { - super(root); - } + public CommandoArmorModel(ModelPart root) { + super(root); + } - public static LayerDefinition createBodyLayer() { - MeshDefinition mesh = HumanoidModel.createMesh(new CubeDeformation(0), 0); - PartDefinition root = createHumanoidAlias(mesh); - - PartDefinition body = root.getChild("body"); - PartDefinition torso = body.addOrReplaceChild("torso", CubeListBuilder.create().texOffs(0, 18).addBox(-4.5F, -0.5F, -2.5F, 9.0F, 11.0F, 5.0F, new CubeDeformation(0.0F)) - .texOffs(28, 18).addBox(-4.5F, -0.5F, -2.5F, 9.0F, 11.0F, 5.0F, new CubeDeformation(0.25F)), PartPose.offset(0.0F, 0.0F, 0.0F)); + public static LayerDefinition createBodyLayer() { + MeshDefinition mesh = HumanoidModel.createMesh(new CubeDeformation(0), 0); + PartDefinition root = createHumanoidAlias(mesh); - PartDefinition leggings = root.getChild("leggings"); - PartDefinition codpiece = leggings.addOrReplaceChild("codpiece", CubeListBuilder.create().texOffs(0, 55).addBox(-4.5F, -13.5F, -2.5F, 9.0F, 3.0F, 5.0F, new CubeDeformation(0.015F)) - .texOffs(28, 55).addBox(-4.5F, -13.5F, -2.5F, 9.0F, 3.0F, 5.0F, new CubeDeformation(0.3F)), PartPose.offset(0.0F, 24.0F, 0.0F)); + PartDefinition body = root.getChild("body"); + PartDefinition torso = body.addOrReplaceChild("torso", CubeListBuilder.create().texOffs(0, 18).addBox(-4.5F, -0.5F, -2.5F, 9.0F, 11.0F, 5.0F, new CubeDeformation(0.0F)) + .texOffs(28, 18).addBox(-4.5F, -0.5F, -2.5F, 9.0F, 11.0F, 5.0F, new CubeDeformation(0.25F)), PartPose.offset(0.0F, 0.0F, 0.0F)); - PartDefinition right_legging = root.getChild("right_legging"); - PartDefinition right_leg = right_legging.addOrReplaceChild("right_leg", CubeListBuilder.create().texOffs(0, 64).mirror().addBox(-2.5F, -0.5F, -2.5F, 5.0F, 8.0F, 5.0F, new CubeDeformation(0.01F)).mirror(false) - .texOffs(20, 64).mirror().addBox(-2.5F, -0.5F, -2.5F, 5.0F, 8.0F, 5.0F, new CubeDeformation(0.26F)).mirror(false), PartPose.offset(0, 0, 0.0F)); - PartDefinition right_foot = root.getChild("right_foot"); - PartDefinition right_boot = right_foot.addOrReplaceChild("right_boot", CubeListBuilder.create().texOffs(0, 77).addBox(-3.0F, 7.0F, -3.0F, 6.0F, 6.0F, 6.0F, new CubeDeformation(0.0F)) - .texOffs(24, 77).addBox(-3.0F, 7.0F, -3.0F, 6.0F, 6.0F, 6.0F, new CubeDeformation(0.25F)), PartPose.offset(0.0F, 0.0F, 0.0F)); + PartDefinition leggings = root.getChild("leggings"); + PartDefinition codpiece = leggings.addOrReplaceChild("codpiece", CubeListBuilder.create().texOffs(0, 55).addBox(-4.5F, -13.5F, -2.5F, 9.0F, 3.0F, 5.0F, new CubeDeformation(0.015F)) + .texOffs(28, 55).addBox(-4.5F, -13.5F, -2.5F, 9.0F, 3.0F, 5.0F, new CubeDeformation(0.3F)), PartPose.offset(0.0F, 24.0F, 0.0F)); - PartDefinition right_arm = root.getChild("right_arm"); - PartDefinition right_shoulder = right_arm.addOrReplaceChild("right_shoulder", CubeListBuilder.create().texOffs(0, 45).mirror().addBox(-4.5F, 5.5F, -2.5F, 5.0F, 5.0F, 5.0F, new CubeDeformation(0.02F)).mirror(false) - .texOffs(20, 45).mirror().addBox(-4.5F, 5.5F, -2.5F, 5.0F, 5.0F, 5.0F, new CubeDeformation(0.26F)).mirror(false) - .texOffs(8, 34).addBox(-4.5F, -2.5F, -2.5F, 5.0F, 6.0F, 5.0F, new CubeDeformation(0.01F)) - .texOffs(28, 34).addBox(-4.5F, -2.5F, -2.5F, 5.0F, 6.0F, 5.0F, new CubeDeformation(0.26F)), PartPose.offset(1, 0, 0.0F)); + PartDefinition right_legging = root.getChild("right_legging"); + PartDefinition right_leg = right_legging.addOrReplaceChild("right_leg", CubeListBuilder.create().texOffs(0, 64).mirror().addBox(-2.5F, -0.5F, -2.5F, 5.0F, 8.0F, 5.0F, new CubeDeformation(0.01F)).mirror(false) + .texOffs(20, 64).mirror().addBox(-2.5F, -0.5F, -2.5F, 5.0F, 8.0F, 5.0F, new CubeDeformation(0.26F)).mirror(false), PartPose.offset(0, 0, 0.0F)); + PartDefinition right_foot = root.getChild("right_foot"); + PartDefinition right_boot = right_foot.addOrReplaceChild("right_boot", CubeListBuilder.create().texOffs(0, 77).addBox(-3.0F, 7.0F, -3.0F, 6.0F, 6.0F, 6.0F, new CubeDeformation(0.0F)) + .texOffs(24, 77).addBox(-3.0F, 7.0F, -3.0F, 6.0F, 6.0F, 6.0F, new CubeDeformation(0.25F)), PartPose.offset(0.0F, 0.0F, 0.0F)); - PartDefinition left_legging = root.getChild("left_legging"); - PartDefinition left_leg = left_legging.addOrReplaceChild("left_leg", CubeListBuilder.create().texOffs(0, 64).addBox(-2.5F, -0.5F, -2.5F, 5.0F, 8.0F, 5.0F, new CubeDeformation(0.0F)) - .texOffs(20, 64).addBox(-2.5F, -0.5F, -2.5F, 5.0F, 8.0F, 5.0F, new CubeDeformation(0.25F)), PartPose.offset(0, 0, 0)); - PartDefinition left_foot = root.getChild("left_foot"); - PartDefinition left_boot = left_foot.addOrReplaceChild("left_boot", CubeListBuilder.create().texOffs(0, 77).mirror().addBox(-3.0F, 7.0F, -3.0F, 6.0F, 6.0F, 6.0F, new CubeDeformation(0.01F)).mirror(false) - .texOffs(24, 77).mirror().addBox(-3.0F, 7.0F, -3.0F, 6.0F, 6.0F, 6.0F, new CubeDeformation(0.25F)).mirror(false), PartPose.offset(0.0F, 0.0F, 0.0F)); + PartDefinition right_arm = root.getChild("right_arm"); + PartDefinition right_shoulder = right_arm.addOrReplaceChild("right_shoulder", CubeListBuilder.create().texOffs(0, 45).mirror().addBox(-4.5F, 5.5F, -2.5F, 5.0F, 5.0F, 5.0F, new CubeDeformation(0.02F)).mirror(false) + .texOffs(20, 45).mirror().addBox(-4.5F, 5.5F, -2.5F, 5.0F, 5.0F, 5.0F, new CubeDeformation(0.26F)).mirror(false) + .texOffs(8, 34).addBox(-4.5F, -2.5F, -2.5F, 5.0F, 6.0F, 5.0F, new CubeDeformation(0.01F)) + .texOffs(28, 34).addBox(-4.5F, -2.5F, -2.5F, 5.0F, 6.0F, 5.0F, new CubeDeformation(0.26F)), PartPose.offset(1, 0, 0.0F)); - PartDefinition left_arm = root.getChild("left_arm"); - PartDefinition left_shoulder = left_arm.addOrReplaceChild("left_shoulder", CubeListBuilder.create().texOffs(8, 34).mirror().addBox(-0.5F, -2.5F, -2.5F, 5.0F, 6.0F, 5.0F, new CubeDeformation(0.01F)).mirror(false) - .texOffs(28, 34).mirror().addBox(-0.5F, -2.5F, -2.5F, 5.0F, 6.0F, 5.0F, new CubeDeformation(0.26F)).mirror(false) - .texOffs(0, 45).addBox(-0.5F, 5.5F, -2.5F, 5.0F, 5.0F, 5.0F, new CubeDeformation(0.02F)) - .texOffs(20, 45).addBox(-0.5F, 5.5F, -2.5F, 5.0F, 5.0F, 5.0F, new CubeDeformation(0.26F)), PartPose.offset(-1, 0, 0.0F)); + PartDefinition left_legging = root.getChild("left_legging"); + PartDefinition left_leg = left_legging.addOrReplaceChild("left_leg", CubeListBuilder.create().texOffs(0, 64).addBox(-2.5F, -0.5F, -2.5F, 5.0F, 8.0F, 5.0F, new CubeDeformation(0.0F)) + .texOffs(20, 64).addBox(-2.5F, -0.5F, -2.5F, 5.0F, 8.0F, 5.0F, new CubeDeformation(0.25F)), PartPose.offset(0, 0, 0)); + PartDefinition left_foot = root.getChild("left_foot"); + PartDefinition left_boot = left_foot.addOrReplaceChild("left_boot", CubeListBuilder.create().texOffs(0, 77).mirror().addBox(-3.0F, 7.0F, -3.0F, 6.0F, 6.0F, 6.0F, new CubeDeformation(0.01F)).mirror(false) + .texOffs(24, 77).mirror().addBox(-3.0F, 7.0F, -3.0F, 6.0F, 6.0F, 6.0F, new CubeDeformation(0.25F)).mirror(false), PartPose.offset(0.0F, 0.0F, 0.0F)); - PartDefinition head = root.getChild("head"); - PartDefinition helmet = head.addOrReplaceChild("helmet", CubeListBuilder.create().texOffs(0, 0).addBox(-4.5F, -8.5F, -5.0F, 9.0F, 9.0F, 9.0F, new CubeDeformation(0.1F)) - .texOffs(36, 0).addBox(-4.5F, -8.5F, -5.0F, 9.0F, 9.0F, 9.0F, new CubeDeformation(0.35F)), PartPose.offset(0.0F, 0.0F, 0)); + PartDefinition left_arm = root.getChild("left_arm"); + PartDefinition left_shoulder = left_arm.addOrReplaceChild("left_shoulder", CubeListBuilder.create().texOffs(8, 34).mirror().addBox(-0.5F, -2.5F, -2.5F, 5.0F, 6.0F, 5.0F, new CubeDeformation(0.01F)).mirror(false) + .texOffs(28, 34).mirror().addBox(-0.5F, -2.5F, -2.5F, 5.0F, 6.0F, 5.0F, new CubeDeformation(0.26F)).mirror(false) + .texOffs(0, 45).addBox(-0.5F, 5.5F, -2.5F, 5.0F, 5.0F, 5.0F, new CubeDeformation(0.02F)) + .texOffs(20, 45).addBox(-0.5F, 5.5F, -2.5F, 5.0F, 5.0F, 5.0F, new CubeDeformation(0.26F)), PartPose.offset(-1, 0, 0.0F)); - return LayerDefinition.create(mesh, 128, 128); - } + PartDefinition head = root.getChild("head"); + PartDefinition helmet = head.addOrReplaceChild("helmet", CubeListBuilder.create().texOffs(0, 0).addBox(-4.5F, -8.5F, -5.0F, 9.0F, 9.0F, 9.0F, new CubeDeformation(0.1F)) + .texOffs(36, 0).addBox(-4.5F, -8.5F, -5.0F, 9.0F, 9.0F, 9.0F, new CubeDeformation(0.35F)), PartPose.offset(0.0F, 0.0F, 0)); + + return LayerDefinition.create(mesh, 128, 128); + } } \ No newline at end of file diff --git a/src/main/java/com/sammy/malum/client/model/cosmetic/risky/ExecutionerArmorModel.java b/src/main/java/com/sammy/malum/client/model/cosmetic/risky/ExecutionerArmorModel.java index c3ca33008..59ef8b8eb 100644 --- a/src/main/java/com/sammy/malum/client/model/cosmetic/risky/ExecutionerArmorModel.java +++ b/src/main/java/com/sammy/malum/client/model/cosmetic/risky/ExecutionerArmorModel.java @@ -13,64 +13,63 @@ import team.lodestar.lodestone.systems.model.LodestoneArmorModel; public class ExecutionerArmorModel extends LodestoneArmorModel { - public static ModelLayerLocation LAYER = new ModelLayerLocation(MalumMod.malumPath("executioner_armor"), "main"); + public static ModelLayerLocation LAYER = new ModelLayerLocation(MalumMod.malumPath("executioner_armor"), "main"); - public ExecutionerArmorModel(ModelPart root) { - super(root); - } + public ExecutionerArmorModel(ModelPart root) { + super(root); + } - public static LayerDefinition createBodyLayer() { - MeshDefinition mesh = HumanoidModel.createMesh(new CubeDeformation(0), 0); - PartDefinition root = createHumanoidAlias(mesh); + public static LayerDefinition createBodyLayer() { + MeshDefinition mesh = HumanoidModel.createMesh(new CubeDeformation(0), 0); + PartDefinition root = createHumanoidAlias(mesh); - PartDefinition body = root.getChild("body"); - PartDefinition torso = body.addOrReplaceChild("torso", CubeListBuilder.create().texOffs(0, 18).addBox(-4.5F, -0.5F, -2.5F, 9.0F, 11.0F, 5.0F, new CubeDeformation(0.0F)) - .texOffs(28, 18).addBox(-4.5F, -0.5F, -2.5F, 9.0F, 11.0F, 5.0F, new CubeDeformation(0.35F)), PartPose.offset(0.0F, 0.0F, 0.0F)); + PartDefinition body = root.getChild("body"); + PartDefinition torso = body.addOrReplaceChild("torso", CubeListBuilder.create().texOffs(0, 18).addBox(-4.5F, -0.5F, -2.5F, 9.0F, 11.0F, 5.0F, new CubeDeformation(0.0F)) + .texOffs(28, 18).addBox(-4.5F, -0.5F, -2.5F, 9.0F, 11.0F, 5.0F, new CubeDeformation(0.35F)), PartPose.offset(0.0F, 0.0F, 0.0F)); - PartDefinition leggings = root.getChild("leggings"); - PartDefinition codpiece = leggings.addOrReplaceChild("codpiece", CubeListBuilder.create().texOffs(0, 84).addBox(-5.0F, -14.5F, -3.5F, 10.0F, 3.0F, 7.0F, new CubeDeformation(0.01F)) - .texOffs(34, 84).addBox(-5.0F, -14.5F, -3.5F, 10.0F, 3.0F, 7.0F, new CubeDeformation(0.26F)), PartPose.offset(0.0F, 24.0F, 0.0F)); + PartDefinition leggings = root.getChild("leggings"); + PartDefinition codpiece = leggings.addOrReplaceChild("codpiece", CubeListBuilder.create().texOffs(0, 84).addBox(-5.0F, -14.5F, -3.5F, 10.0F, 3.0F, 7.0F, new CubeDeformation(0.01F)) + .texOffs(34, 84).addBox(-5.0F, -14.5F, -3.5F, 10.0F, 3.0F, 7.0F, new CubeDeformation(0.26F)), PartPose.offset(0.0F, 24.0F, 0.0F)); - PartDefinition right_legging = root.getChild("right_legging"); - PartDefinition right_leg = right_legging.addOrReplaceChild("right_leg", CubeListBuilder.create().texOffs(0, 59).mirror().addBox(-2.5F, -0.5F, -2.5F, 5.0F, 8.0F, 5.0F, new CubeDeformation(0.01F)).mirror(false) - .texOffs(20, 59).mirror().addBox(-2.5F, -0.5F, -2.5F, 5.0F, 8.0F, 5.0F, new CubeDeformation(0.26F)).mirror(false), PartPose.offset(0, 0, 0.0F)); - PartDefinition right_foot = root.getChild("right_foot"); - PartDefinition right_boot = right_foot.addOrReplaceChild("right_boot", CubeListBuilder.create().texOffs(0, 72).addBox(-3.0F, 7.0F, -3.0F, 6.0F, 6.0F, 6.0F, new CubeDeformation(0.0F)) - .texOffs(24, 72).addBox(-3.0F, 7.0F, -3.0F, 6.0F, 6.0F, 6.0F, new CubeDeformation(0.25F)), PartPose.offset(0.0F, 0.0F, 0.0F)); - PartDefinition right_robe = right_legging.addOrReplaceChild("right_robe", CubeListBuilder.create().texOffs(0, 118).addBox(-1.0F, 3.0F, -5.0F, 1.0F, 3.0F, 7.0F, new CubeDeformation(0.25F)) - .texOffs(0, 108).addBox(-1.0F, 3.0F, -5.0F, 1.0F, 3.0F, 7.0F, new CubeDeformation(0.0F)) - .texOffs(0, 94).addBox(0.0F, -1.0F, -5.0F, 4.0F, 7.0F, 7.0F, new CubeDeformation(0.0F)) - .texOffs(22, 94).addBox(0.0F, -1.0F, -5.0F, 4.0F, 7.0F, 7.0F, new CubeDeformation(0.25F)), PartPose.offsetAndRotation(-3.0F, -0.5F, 1.5F, 0.0F, 0.0F, 0.1745F)); + PartDefinition right_legging = root.getChild("right_legging"); + PartDefinition right_leg = right_legging.addOrReplaceChild("right_leg", CubeListBuilder.create().texOffs(0, 59).mirror().addBox(-2.5F, -0.5F, -2.5F, 5.0F, 8.0F, 5.0F, new CubeDeformation(0.01F)).mirror(false) + .texOffs(20, 59).mirror().addBox(-2.5F, -0.5F, -2.5F, 5.0F, 8.0F, 5.0F, new CubeDeformation(0.26F)).mirror(false), PartPose.offset(0, 0, 0.0F)); + PartDefinition right_foot = root.getChild("right_foot"); + PartDefinition right_boot = right_foot.addOrReplaceChild("right_boot", CubeListBuilder.create().texOffs(0, 72).addBox(-3.0F, 7.0F, -3.0F, 6.0F, 6.0F, 6.0F, new CubeDeformation(0.0F)) + .texOffs(24, 72).addBox(-3.0F, 7.0F, -3.0F, 6.0F, 6.0F, 6.0F, new CubeDeformation(0.25F)), PartPose.offset(0.0F, 0.0F, 0.0F)); + PartDefinition right_robe = right_legging.addOrReplaceChild("right_robe", CubeListBuilder.create().texOffs(0, 118).addBox(-1.0F, 3.0F, -5.0F, 1.0F, 3.0F, 7.0F, new CubeDeformation(0.25F)) + .texOffs(0, 108).addBox(-1.0F, 3.0F, -5.0F, 1.0F, 3.0F, 7.0F, new CubeDeformation(0.0F)) + .texOffs(0, 94).addBox(0.0F, -1.0F, -5.0F, 4.0F, 7.0F, 7.0F, new CubeDeformation(0.0F)) + .texOffs(22, 94).addBox(0.0F, -1.0F, -5.0F, 4.0F, 7.0F, 7.0F, new CubeDeformation(0.25F)), PartPose.offsetAndRotation(-3.0F, -0.5F, 1.5F, 0.0F, 0.0F, 0.1745F)); - PartDefinition right_arm = root.getChild("right_arm"); - PartDefinition right_shoulder = right_arm.addOrReplaceChild("right_shoulder", CubeListBuilder.create().texOffs(0, 49).mirror().addBox(-4.5F, 5.5F, -2.5F, 5.0F, 5.0F, 5.0F, new CubeDeformation(0.02F)).mirror(false) - .texOffs(20, 49).mirror().addBox(-4.5F, 5.5F, -2.5F, 5.0F, 5.0F, 5.0F, new CubeDeformation(0.26F)).mirror(false) - .texOffs(8, 34).addBox(-4.5F, -2.5F, -2.5F, 5.0F, 6.0F, 5.0F, new CubeDeformation(0.01F)) - .texOffs(28, 34).addBox(-4.5F, -2.5F, -2.5F, 5.0F, 6.0F, 5.0F, new CubeDeformation(0.26F)), PartPose.offset(1, 0, 0.0F)); + PartDefinition right_arm = root.getChild("right_arm"); + PartDefinition right_shoulder = right_arm.addOrReplaceChild("right_shoulder", CubeListBuilder.create().texOffs(0, 49).mirror().addBox(-4.5F, 5.5F, -2.5F, 5.0F, 5.0F, 5.0F, new CubeDeformation(0.02F)).mirror(false) + .texOffs(20, 49).mirror().addBox(-4.5F, 5.5F, -2.5F, 5.0F, 5.0F, 5.0F, new CubeDeformation(0.26F)).mirror(false) + .texOffs(8, 34).addBox(-4.5F, -2.5F, -2.5F, 5.0F, 6.0F, 5.0F, new CubeDeformation(0.01F)) + .texOffs(28, 34).addBox(-4.5F, -2.5F, -2.5F, 5.0F, 6.0F, 5.0F, new CubeDeformation(0.26F)), PartPose.offset(1, 0, 0.0F)); - PartDefinition left_legging = root.getChild("left_legging"); - PartDefinition left_leg = left_legging.addOrReplaceChild("left_leg", CubeListBuilder.create().texOffs(0, 59).addBox(-2.5F, -0.5F, -2.5F, 5.0F, 8.0F, 5.0F, new CubeDeformation(0.0F)) - .texOffs(20, 59).addBox(-2.5F, -0.5F, -2.5F, 5.0F, 8.0F, 5.0F, new CubeDeformation(0.25F)), PartPose.offset(0, 0, 0.0F)); - PartDefinition left_foot = root.getChild("left_foot"); - PartDefinition left_boot = left_foot.addOrReplaceChild("left_boot", CubeListBuilder.create().texOffs(0, 72).mirror().addBox(-3.0F, 7.0F, -3.0F, 6.0F, 6.0F, 6.0F, new CubeDeformation(0.01F)).mirror(false) - .texOffs(24, 72).mirror().addBox(-3.0F, 7.0F, -3.0F, 6.0F, 6.0F, 6.0F, new CubeDeformation(0.25F)).mirror(false), PartPose.offset(0.0F, 0.0F, 0.0F)); - PartDefinition left_robe = left_legging.addOrReplaceChild("left_robe", CubeListBuilder.create().texOffs(0, 118).mirror().addBox(0.0F, 3.0F, -5.0F, 1.0F, 3.0F, 7.0F, new CubeDeformation(0.25F)).mirror(false) - .texOffs(0, 108).mirror().addBox(0.0F, 3.0F, -5.0F, 1.0F, 3.0F, 7.0F, new CubeDeformation(0.0F)).mirror(false) - .texOffs(22, 94).mirror().addBox(-4.0F, -1.0F, -5.0F, 4.0F, 7.0F, 7.0F, new CubeDeformation(0.25F)).mirror(false) - .texOffs(0, 94).mirror().addBox(-4.0F, -1.0F, -5.0F, 4.0F, 7.0F, 7.0F, new CubeDeformation(0.0F)).mirror(false), PartPose.offsetAndRotation(3.0F, -0.5F, 1.5F, 0.0F, 0.0F, -0.1745F)); + PartDefinition left_legging = root.getChild("left_legging"); + PartDefinition left_leg = left_legging.addOrReplaceChild("left_leg", CubeListBuilder.create().texOffs(0, 59).addBox(-2.5F, -0.5F, -2.5F, 5.0F, 8.0F, 5.0F, new CubeDeformation(0.0F)) + .texOffs(20, 59).addBox(-2.5F, -0.5F, -2.5F, 5.0F, 8.0F, 5.0F, new CubeDeformation(0.25F)), PartPose.offset(0, 0, 0.0F)); + PartDefinition left_foot = root.getChild("left_foot"); + PartDefinition left_boot = left_foot.addOrReplaceChild("left_boot", CubeListBuilder.create().texOffs(0, 72).mirror().addBox(-3.0F, 7.0F, -3.0F, 6.0F, 6.0F, 6.0F, new CubeDeformation(0.01F)).mirror(false) + .texOffs(24, 72).mirror().addBox(-3.0F, 7.0F, -3.0F, 6.0F, 6.0F, 6.0F, new CubeDeformation(0.25F)).mirror(false), PartPose.offset(0.0F, 0.0F, 0.0F)); + PartDefinition left_robe = left_legging.addOrReplaceChild("left_robe", CubeListBuilder.create().texOffs(0, 118).mirror().addBox(0.0F, 3.0F, -5.0F, 1.0F, 3.0F, 7.0F, new CubeDeformation(0.25F)).mirror(false) + .texOffs(0, 108).mirror().addBox(0.0F, 3.0F, -5.0F, 1.0F, 3.0F, 7.0F, new CubeDeformation(0.0F)).mirror(false) + .texOffs(22, 94).mirror().addBox(-4.0F, -1.0F, -5.0F, 4.0F, 7.0F, 7.0F, new CubeDeformation(0.25F)).mirror(false) + .texOffs(0, 94).mirror().addBox(-4.0F, -1.0F, -5.0F, 4.0F, 7.0F, 7.0F, new CubeDeformation(0.0F)).mirror(false), PartPose.offsetAndRotation(3.0F, -0.5F, 1.5F, 0.0F, 0.0F, -0.1745F)); + PartDefinition left_arm = root.getChild("left_arm"); + PartDefinition left_shoulder = left_arm.addOrReplaceChild("left_shoulder", CubeListBuilder.create().texOffs(8, 34).mirror().addBox(-0.5F, -2.5F, -2.5F, 5.0F, 6.0F, 5.0F, new CubeDeformation(0.01F)).mirror(false) + .texOffs(28, 34).mirror().addBox(-0.5F, -2.5F, -2.5F, 5.0F, 6.0F, 5.0F, new CubeDeformation(0.26F)).mirror(false) + .texOffs(0, 49).addBox(-0.5F, 5.5F, -2.5F, 5.0F, 5.0F, 5.0F, new CubeDeformation(0.02F)) + .texOffs(20, 49).addBox(-0.5F, 5.5F, -2.5F, 5.0F, 5.0F, 5.0F, new CubeDeformation(0.26F)), PartPose.offset(-1, 0, 0.0F)); - PartDefinition left_arm = root.getChild("left_arm"); - PartDefinition left_shoulder = left_arm.addOrReplaceChild("left_shoulder", CubeListBuilder.create().texOffs(8, 34).mirror().addBox(-0.5F, -2.5F, -2.5F, 5.0F, 6.0F, 5.0F, new CubeDeformation(0.01F)).mirror(false) - .texOffs(28, 34).mirror().addBox(-0.5F, -2.5F, -2.5F, 5.0F, 6.0F, 5.0F, new CubeDeformation(0.26F)).mirror(false) - .texOffs(0, 49).addBox(-0.5F, 5.5F, -2.5F, 5.0F, 5.0F, 5.0F, new CubeDeformation(0.02F)) - .texOffs(20, 49).addBox(-0.5F, 5.5F, -2.5F, 5.0F, 5.0F, 5.0F, new CubeDeformation(0.26F)), PartPose.offset(-1, 0, 0.0F)); + PartDefinition head = root.getChild("head"); + PartDefinition helmet = head.addOrReplaceChild("helmet", CubeListBuilder.create().texOffs(0, 0).addBox(-4.5F, -8.5F, -5.0F, 9.0F, 9.0F, 9.0F, new CubeDeformation(0.0F)) + .texOffs(36, 0).addBox(-4.5F, -8.5F, -5.0F, 9.0F, 9.0F, 9.0F, new CubeDeformation(0.35F)), PartPose.offset(0.0F, 0.0F, 0.5F)); - PartDefinition head = root.getChild("head"); - PartDefinition helmet = head.addOrReplaceChild("helmet", CubeListBuilder.create().texOffs(0, 0).addBox(-4.5F, -8.5F, -5.0F, 9.0F, 9.0F, 9.0F, new CubeDeformation(0.0F)) - .texOffs(36, 0).addBox(-4.5F, -8.5F, -5.0F, 9.0F, 9.0F, 9.0F, new CubeDeformation(0.35F)), PartPose.offset(0.0F, 0.0F, 0.5F)); - - return LayerDefinition.create(mesh, 128, 128); - } + return LayerDefinition.create(mesh, 128, 128); + } } \ No newline at end of file diff --git a/src/main/java/com/sammy/malum/client/model/cosmetic/ultrakill/UltrakillMachineArmorModel.java b/src/main/java/com/sammy/malum/client/model/cosmetic/ultrakill/UltrakillMachineArmorModel.java index 4e4589dc7..b276ba909 100644 --- a/src/main/java/com/sammy/malum/client/model/cosmetic/ultrakill/UltrakillMachineArmorModel.java +++ b/src/main/java/com/sammy/malum/client/model/cosmetic/ultrakill/UltrakillMachineArmorModel.java @@ -18,132 +18,132 @@ import team.lodestar.lodestone.systems.model.LodestoneArmorModel; public class UltrakillMachineArmorModel extends LodestoneArmorModel { - public static ModelLayerLocation LAYER = new ModelLayerLocation(MalumMod.malumPath("ultrakill_machine"), "main"); - - public ModelPart wings; - public ModelPart wingsFullBright; - public ModelPart helmetFullBright; - - public UltrakillMachineArmorModel(ModelPart root) { - super(root); - this.wings = root.getChild("wings"); - this.wingsFullBright = root.getChild("wings_full_bright"); - this.helmetFullBright = root.getChild("helmet_full_bright"); - } - - @Override - public void renderToBuffer(PoseStack pPoseStack, VertexConsumer pBuffer, int pPackedLight, int pPackedOverlay, float pRed, float pGreen, float pBlue, float pAlpha) { - super.renderToBuffer(pPoseStack, pBuffer, pPackedLight, pPackedOverlay, pRed, pGreen, pBlue, pAlpha); - if (!this.young) { - if (slot == EquipmentSlot.CHEST) { - wingsFullBright.render(pPoseStack, pBuffer, RenderHelper.FULL_BRIGHT, pPackedOverlay, pRed, pGreen, pBlue, pAlpha); - } - if (slot == EquipmentSlot.HEAD) { - helmetFullBright.render(pPoseStack, pBuffer, RenderHelper.FULL_BRIGHT, pPackedOverlay, pRed, pGreen, pBlue, pAlpha); - } - } - } - - @Override - protected Iterable bodyParts() { - if (this.slot == EquipmentSlot.CHEST) { - return ImmutableList.of(this.body, this.leftArm, this.rightArm, this.wings); - } else if (this.slot == EquipmentSlot.LEGS) { - return ImmutableList.of(this.leftLegging, this.rightLegging, this.leggings); - } else { - return this.slot == EquipmentSlot.FEET ? ImmutableList.of(this.leftFoot, this.rightFoot) : ImmutableList.of(); - } - } - - @Override - public void copyFromDefault(HumanoidModel model) { - super.copyFromDefault(model); - wings.copyFrom(model.body); - wingsFullBright.copyFrom(model.body); - helmetFullBright.copyFrom(model.head); - } - - public static LayerDefinition createBodyLayer() { - MeshDefinition mesh = HumanoidModel.createMesh(new CubeDeformation(0), 0); - PartDefinition root = createHumanoidAlias(mesh); - PartDefinition wings = root.addOrReplaceChild("wings", new CubeListBuilder(), PartPose.ZERO); - PartDefinition wingsFullBright = root.addOrReplaceChild("wings_full_bright", new CubeListBuilder(), PartPose.ZERO); - PartDefinition helmetFullBright = root.addOrReplaceChild("helmet_full_bright", new CubeListBuilder(), PartPose.ZERO); - - PartDefinition body = root.getChild("body"); - PartDefinition torso = body.addOrReplaceChild("torso", CubeListBuilder.create().texOffs(24, 16).addBox(-4.0F, 0.0F, -2.0F, 8.0F, 12.0F, 4.0F, new CubeDeformation(0.95F)) - .texOffs(0, 16).addBox(-4.0F, 0.0F, -2.0F, 8.0F, 12.0F, 4.0F, new CubeDeformation(0.75F)), PartPose.offset(0.0F, 0.0F, 0.0F)); - - PartDefinition right_legging = root.getChild("right_legging"); - PartDefinition right_leg = right_legging.addOrReplaceChild("right_leg", CubeListBuilder.create().texOffs(0, 48).mirror().addBox(-2.0F, 0.0F, -2.0F, 4.0F, 8.0F, 4.0F, new CubeDeformation(0.45F)).mirror(false), PartPose.offset(0, 0, 0)); - - PartDefinition right_foot = root.getChild("right_foot"); - PartDefinition right_boot = right_foot.addOrReplaceChild("right_boot", CubeListBuilder.create().texOffs(32, 44).addBox(-3.0F, 7.0F, -3.0F, 6.0F, 6.0F, 6.0F, new CubeDeformation(0.25F)) - .texOffs(32, 32).addBox(-3.0F, 7.0F, -3.0F, 6.0F, 6.0F, 6.0F, new CubeDeformation(0.0F)), PartPose.offset(0.0F, 0.0F, 0.0F)); - - PartDefinition right_arm = root.getChild("right_arm"); - PartDefinition right_shoulder = right_arm.addOrReplaceChild("right_shoulder", CubeListBuilder.create().texOffs(0, 32).addBox(-3.0F, -2.0F, -2.0F, 4.0F, 12.0F, 4.0F, new CubeDeformation(0.5F)) - .texOffs(16, 32).addBox(-3.0F, -2.0F, -2.0F, 4.0F, 12.0F, 4.0F, new CubeDeformation(0.7F)), PartPose.offset(0, 0, 0.0F)); - - PartDefinition left_legging = root.getChild("left_legging"); - PartDefinition left_leg = left_legging.addOrReplaceChild("left_leg", CubeListBuilder.create().texOffs(0, 48).addBox(-2.0F, 0.0F, -2.0F, 4.0F, 8.0F, 4.0F, new CubeDeformation(0.45F)), PartPose.offset(0, 0, 0.0F)); - - PartDefinition left_foot = root.getChild("left_foot"); - PartDefinition left_boot = left_foot.addOrReplaceChild("left_boot", CubeListBuilder.create().texOffs(32, 44).mirror().addBox(-3.0F, 7.0F, -3.0F, 6.0F, 6.0F, 6.0F, new CubeDeformation(0.26F)).mirror(false) - .texOffs(32, 32).mirror().addBox(-3.0F, 7.0F, -3.0F, 6.0F, 6.0F, 6.0F, new CubeDeformation(0.01F)).mirror(false), PartPose.offset(0, 0.0F, 0.0F)); - - PartDefinition left_arm = root.getChild("left_arm"); - PartDefinition left_shoulder = left_arm.addOrReplaceChild("left_shoulder", CubeListBuilder.create().texOffs(0, 32).mirror().addBox(-1.0F, -2.0F, -2.0F, 4.0F, 12.0F, 4.0F, new CubeDeformation(0.5F)).mirror(false) - .texOffs(16, 32).mirror().addBox(-1.0F, -2.0F, -2.0F, 4.0F, 12.0F, 4.0F, new CubeDeformation(0.7F)).mirror(false), PartPose.offset(0, 0, 0.0F)); - - PartDefinition head = root.getChild("head"); - PartDefinition helmet = head.addOrReplaceChild("helmet", CubeListBuilder.create().texOffs(0, 0).addBox(-4.0F, -8.0F, -4.0F, 8.0F, 8.0F, 8.0F, new CubeDeformation(0.5F)) - .texOffs(32, 0).addBox(-4.0F, -8.0F, -4.0F, 8.0F, 8.0F, 8.0F, new CubeDeformation(0.95F)), PartPose.offset(0.0F, 0.0F, 0.0F)); - - PartDefinition helmet_full_bright = helmetFullBright.addOrReplaceChild("helmet_full_bright", CubeListBuilder.create().texOffs(10, 10).addBox(-2.0F, -6.0F, -4.25F, 4.0F, 4.0F, 0.0F, new CubeDeformation(0.251F)), PartPose.offset(0.0F, 0.0F, 0.0F)); - - PartDefinition l1 = wings.addOrReplaceChild("l1", CubeListBuilder.create().texOffs(16, 48).addBox(3.0F, -1.0F, -1.0F, 3.0F, 2.0F, 1.0F, new CubeDeformation(0.0F)) - .texOffs(24, 48).mirror().addBox(3.0F, -1.0F, -1.0F, 3.0F, 2.0F, 1.0F, new CubeDeformation(0.25F)).mirror(false) - .texOffs(16, 51).addBox(6.0F, -4.0F, -1.0F, 3.0F, 5.0F, 1.0F, new CubeDeformation(0.0F)) - .texOffs(24, 51).addBox(6.0F, -4.25F, -1.0F, 3.0F, 5.0F, 1.0F, new CubeDeformation(0.25F)), PartPose.offsetAndRotation(0.0F, 5F, 5, 0.0F, -0.1745F, -0.6981F)); - - PartDefinition l2 = wings.addOrReplaceChild("l2", CubeListBuilder.create().texOffs(16, 48).addBox(3.0F, -1.0F, -1.0F, 3.0F, 2.0F, 1.0F, new CubeDeformation(0.0F)) - .texOffs(24, 48).mirror().addBox(3.0F, -1.0F, -1.0F, 3.0F, 2.0F, 1.0F, new CubeDeformation(0.25F)).mirror(false) - .texOffs(16, 51).addBox(6.0F, -4.0F, -1.0F, 3.0F, 5.0F, 1.0F, new CubeDeformation(0.0F)) - .texOffs(24, 51).addBox(6.0F, -4.25F, -1.0F, 3.0F, 5.0F, 1.0F, new CubeDeformation(0.25F)), PartPose.offsetAndRotation(0.0F, 5F, 5, 0.0F, -0.1309F, 0.0F)); - - PartDefinition l3 = wings.addOrReplaceChild("l3", CubeListBuilder.create().texOffs(16, 48).addBox(3.0F, -1.0F, -1.0F, 3.0F, 2.0F, 1.0F, new CubeDeformation(0.0F)) - .texOffs(24, 48).mirror().addBox(3.0F, -1.0F, -1.0F, 3.0F, 2.0F, 1.0F, new CubeDeformation(0.25F)).mirror(false) - .texOffs(16, 51).addBox(6.0F, -4.0F, -1.0F, 3.0F, 5.0F, 1.0F, new CubeDeformation(0.0F)) - .texOffs(24, 51).addBox(6.0F, -4.25F, -1.0F, 3.0F, 5.0F, 1.0F, new CubeDeformation(0.25F)), PartPose.offsetAndRotation(0.0F, 5F, 5, 0.0F, -0.0873F, 0.6981F)); - - PartDefinition r1 = wings.addOrReplaceChild("r1", CubeListBuilder.create().texOffs(16, 48).mirror().addBox(-6.0F, -1.0F, -1.0F, 3.0F, 2.0F, 1.0F, new CubeDeformation(0.0F)).mirror(false) - .texOffs(24, 48).addBox(-6.0F, -1.0F, -1.0F, 3.0F, 2.0F, 1.0F, new CubeDeformation(0.25F)) - .texOffs(16, 51).mirror().addBox(-9.0F, -4.0F, -1.0F, 3.0F, 5.0F, 1.0F, new CubeDeformation(0.0F)).mirror(false) - .texOffs(24, 51).mirror().addBox(-9.0F, -4.25F, -1.0F, 3.0F, 5.0F, 1.0F, new CubeDeformation(0.25F)).mirror(false), PartPose.offsetAndRotation(0.0F, 5F, 5, 0.0F, 0.1745F, 0.6981F)); - - PartDefinition r2 = wings.addOrReplaceChild("r2", CubeListBuilder.create().texOffs(16, 48).mirror().addBox(-6.0F, -1.0F, -1.0F, 3.0F, 2.0F, 1.0F, new CubeDeformation(0.0F)).mirror(false) - .texOffs(24, 48).addBox(-6.0F, -1.0F, -1.0F, 3.0F, 2.0F, 1.0F, new CubeDeformation(0.25F)) - .texOffs(16, 51).mirror().addBox(-9.0F, -4.0F, -1.0F, 3.0F, 5.0F, 1.0F, new CubeDeformation(0.0F)).mirror(false) - .texOffs(24, 51).mirror().addBox(-9.0F, -4.25F, -1.0F, 3.0F, 5.0F, 1.0F, new CubeDeformation(0.25F)).mirror(false), PartPose.offsetAndRotation(0.0F, 5F, 5, 0.0F, 0.1309F, 0.0F)); - - PartDefinition r3 = wings.addOrReplaceChild("r3", CubeListBuilder.create().texOffs(16, 48).mirror().addBox(-6.0F, -1.0F, -1.0F, 3.0F, 2.0F, 1.0F, new CubeDeformation(0.0F)).mirror(false) - .texOffs(24, 48).addBox(-6.0F, -1.0F, -1.0F, 3.0F, 2.0F, 1.0F, new CubeDeformation(0.25F)) - .texOffs(16, 51).mirror().addBox(-9.0F, -4.0F, -1.0F, 3.0F, 5.0F, 1.0F, new CubeDeformation(0.0F)).mirror(false) - .texOffs(24, 51).mirror().addBox(-9.0F, -4.25F, -1.0F, 3.0F, 5.0F, 1.0F, new CubeDeformation(0.25F)).mirror(false), PartPose.offsetAndRotation(0.0F, 5F, 5, 0.0F, 0.0873F, -0.6981F)); - - PartDefinition l4 = wingsFullBright.addOrReplaceChild("l4", CubeListBuilder.create().texOffs(16, 57).mirror().addBox(6.0F, -3.5F, -0.5F, 12.0F, 4.0F, 0.0F, new CubeDeformation(0.0F)).mirror(false), PartPose.offsetAndRotation(0.0F, 5, 5, 0.0F, -0.1745F, -0.6981F)); - - PartDefinition l5 = wingsFullBright.addOrReplaceChild("l5", CubeListBuilder.create().texOffs(16, 57).mirror().addBox(7.0F, -3.5F, -0.5F, 12.0F, 4.0F, 0.0F, new CubeDeformation(0.0F)).mirror(false), PartPose.offsetAndRotation(0.0F, 5, 5, 0.0F, -0.1309F, 0.0F)); - - PartDefinition l6 = wingsFullBright.addOrReplaceChild("l6", CubeListBuilder.create().texOffs(16, 57).mirror().addBox(6.0F, -3.5F, -0.5F, 12.0F, 4.0F, 0.0F, new CubeDeformation(0.0F)).mirror(false), PartPose.offsetAndRotation(0.0F, 5, 5, 0.0F, -0.0873F, 0.6981F)); - - PartDefinition r4 = wingsFullBright.addOrReplaceChild("r4", CubeListBuilder.create().texOffs(16, 57).addBox(-19.0F, -3.5F, -0.5F, 12.0F, 4.0F, 0.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(0.0F, 5, 5, 0.0F, 0.1745F, 0.6981F)); - - PartDefinition r5 = wingsFullBright.addOrReplaceChild("r5", CubeListBuilder.create().texOffs(16, 57).addBox(-19.0F, -3.5F, -0.5F, 12.0F, 4.0F, 0.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(0.0F, 5, 5, 0.0F, 0.1309F, 0.0F)); - - PartDefinition r6 = wingsFullBright.addOrReplaceChild("r6", CubeListBuilder.create().texOffs(16, 57).addBox(-19.0F, -3.5F, -0.5F, 12.0F, 4.0F, 0.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(0.0F, 5, 5, 0.0F, 0.0873F, -0.6981F)); + public static ModelLayerLocation LAYER = new ModelLayerLocation(MalumMod.malumPath("ultrakill_machine"), "main"); + + public ModelPart wings; + public ModelPart wingsFullBright; + public ModelPart helmetFullBright; + + public UltrakillMachineArmorModel(ModelPart root) { + super(root); + this.wings = root.getChild("wings"); + this.wingsFullBright = root.getChild("wings_full_bright"); + this.helmetFullBright = root.getChild("helmet_full_bright"); + } + + @Override + public void renderToBuffer(PoseStack pPoseStack, VertexConsumer pBuffer, int pPackedLight, int pPackedOverlay, float pRed, float pGreen, float pBlue, float pAlpha) { + super.renderToBuffer(pPoseStack, pBuffer, pPackedLight, pPackedOverlay, pRed, pGreen, pBlue, pAlpha); + if (!this.young) { + if (slot == EquipmentSlot.CHEST) { + wingsFullBright.render(pPoseStack, pBuffer, RenderHelper.FULL_BRIGHT, pPackedOverlay, pRed, pGreen, pBlue, pAlpha); + } + if (slot == EquipmentSlot.HEAD) { + helmetFullBright.render(pPoseStack, pBuffer, RenderHelper.FULL_BRIGHT, pPackedOverlay, pRed, pGreen, pBlue, pAlpha); + } + } + } + + @Override + protected Iterable bodyParts() { + if (this.slot == EquipmentSlot.CHEST) { + return ImmutableList.of(this.body, this.leftArm, this.rightArm, this.wings); + } else if (this.slot == EquipmentSlot.LEGS) { + return ImmutableList.of(this.leftLegging, this.rightLegging, this.leggings); + } else { + return this.slot == EquipmentSlot.FEET ? ImmutableList.of(this.leftFoot, this.rightFoot) : ImmutableList.of(); + } + } + + @Override + public void copyFromDefault(HumanoidModel model) { + super.copyFromDefault(model); + wings.copyFrom(model.body); + wingsFullBright.copyFrom(model.body); + helmetFullBright.copyFrom(model.head); + } + + public static LayerDefinition createBodyLayer() { + MeshDefinition mesh = HumanoidModel.createMesh(new CubeDeformation(0), 0); + PartDefinition root = createHumanoidAlias(mesh); + PartDefinition wings = root.addOrReplaceChild("wings", new CubeListBuilder(), PartPose.ZERO); + PartDefinition wingsFullBright = root.addOrReplaceChild("wings_full_bright", new CubeListBuilder(), PartPose.ZERO); + PartDefinition helmetFullBright = root.addOrReplaceChild("helmet_full_bright", new CubeListBuilder(), PartPose.ZERO); + + PartDefinition body = root.getChild("body"); + PartDefinition torso = body.addOrReplaceChild("torso", CubeListBuilder.create().texOffs(24, 16).addBox(-4.0F, 0.0F, -2.0F, 8.0F, 12.0F, 4.0F, new CubeDeformation(0.95F)) + .texOffs(0, 16).addBox(-4.0F, 0.0F, -2.0F, 8.0F, 12.0F, 4.0F, new CubeDeformation(0.75F)), PartPose.offset(0.0F, 0.0F, 0.0F)); + + PartDefinition right_legging = root.getChild("right_legging"); + PartDefinition right_leg = right_legging.addOrReplaceChild("right_leg", CubeListBuilder.create().texOffs(0, 48).mirror().addBox(-2.0F, 0.0F, -2.0F, 4.0F, 8.0F, 4.0F, new CubeDeformation(0.45F)).mirror(false), PartPose.offset(0, 0, 0)); + + PartDefinition right_foot = root.getChild("right_foot"); + PartDefinition right_boot = right_foot.addOrReplaceChild("right_boot", CubeListBuilder.create().texOffs(32, 44).addBox(-3.0F, 7.0F, -3.0F, 6.0F, 6.0F, 6.0F, new CubeDeformation(0.25F)) + .texOffs(32, 32).addBox(-3.0F, 7.0F, -3.0F, 6.0F, 6.0F, 6.0F, new CubeDeformation(0.0F)), PartPose.offset(0.0F, 0.0F, 0.0F)); + + PartDefinition right_arm = root.getChild("right_arm"); + PartDefinition right_shoulder = right_arm.addOrReplaceChild("right_shoulder", CubeListBuilder.create().texOffs(0, 32).addBox(-3.0F, -2.0F, -2.0F, 4.0F, 12.0F, 4.0F, new CubeDeformation(0.5F)) + .texOffs(16, 32).addBox(-3.0F, -2.0F, -2.0F, 4.0F, 12.0F, 4.0F, new CubeDeformation(0.7F)), PartPose.offset(0, 0, 0.0F)); + + PartDefinition left_legging = root.getChild("left_legging"); + PartDefinition left_leg = left_legging.addOrReplaceChild("left_leg", CubeListBuilder.create().texOffs(0, 48).addBox(-2.0F, 0.0F, -2.0F, 4.0F, 8.0F, 4.0F, new CubeDeformation(0.45F)), PartPose.offset(0, 0, 0.0F)); + + PartDefinition left_foot = root.getChild("left_foot"); + PartDefinition left_boot = left_foot.addOrReplaceChild("left_boot", CubeListBuilder.create().texOffs(32, 44).mirror().addBox(-3.0F, 7.0F, -3.0F, 6.0F, 6.0F, 6.0F, new CubeDeformation(0.26F)).mirror(false) + .texOffs(32, 32).mirror().addBox(-3.0F, 7.0F, -3.0F, 6.0F, 6.0F, 6.0F, new CubeDeformation(0.01F)).mirror(false), PartPose.offset(0, 0.0F, 0.0F)); + + PartDefinition left_arm = root.getChild("left_arm"); + PartDefinition left_shoulder = left_arm.addOrReplaceChild("left_shoulder", CubeListBuilder.create().texOffs(0, 32).mirror().addBox(-1.0F, -2.0F, -2.0F, 4.0F, 12.0F, 4.0F, new CubeDeformation(0.5F)).mirror(false) + .texOffs(16, 32).mirror().addBox(-1.0F, -2.0F, -2.0F, 4.0F, 12.0F, 4.0F, new CubeDeformation(0.7F)).mirror(false), PartPose.offset(0, 0, 0.0F)); + + PartDefinition head = root.getChild("head"); + PartDefinition helmet = head.addOrReplaceChild("helmet", CubeListBuilder.create().texOffs(0, 0).addBox(-4.0F, -8.0F, -4.0F, 8.0F, 8.0F, 8.0F, new CubeDeformation(0.5F)) + .texOffs(32, 0).addBox(-4.0F, -8.0F, -4.0F, 8.0F, 8.0F, 8.0F, new CubeDeformation(0.95F)), PartPose.offset(0.0F, 0.0F, 0.0F)); + + PartDefinition helmet_full_bright = helmetFullBright.addOrReplaceChild("helmet_full_bright", CubeListBuilder.create().texOffs(10, 10).addBox(-2.0F, -6.0F, -4.25F, 4.0F, 4.0F, 0.0F, new CubeDeformation(0.251F)), PartPose.offset(0.0F, 0.0F, 0.0F)); + + PartDefinition l1 = wings.addOrReplaceChild("l1", CubeListBuilder.create().texOffs(16, 48).addBox(3.0F, -1.0F, -1.0F, 3.0F, 2.0F, 1.0F, new CubeDeformation(0.0F)) + .texOffs(24, 48).mirror().addBox(3.0F, -1.0F, -1.0F, 3.0F, 2.0F, 1.0F, new CubeDeformation(0.25F)).mirror(false) + .texOffs(16, 51).addBox(6.0F, -4.0F, -1.0F, 3.0F, 5.0F, 1.0F, new CubeDeformation(0.0F)) + .texOffs(24, 51).addBox(6.0F, -4.25F, -1.0F, 3.0F, 5.0F, 1.0F, new CubeDeformation(0.25F)), PartPose.offsetAndRotation(0.0F, 5F, 5, 0.0F, -0.1745F, -0.6981F)); + + PartDefinition l2 = wings.addOrReplaceChild("l2", CubeListBuilder.create().texOffs(16, 48).addBox(3.0F, -1.0F, -1.0F, 3.0F, 2.0F, 1.0F, new CubeDeformation(0.0F)) + .texOffs(24, 48).mirror().addBox(3.0F, -1.0F, -1.0F, 3.0F, 2.0F, 1.0F, new CubeDeformation(0.25F)).mirror(false) + .texOffs(16, 51).addBox(6.0F, -4.0F, -1.0F, 3.0F, 5.0F, 1.0F, new CubeDeformation(0.0F)) + .texOffs(24, 51).addBox(6.0F, -4.25F, -1.0F, 3.0F, 5.0F, 1.0F, new CubeDeformation(0.25F)), PartPose.offsetAndRotation(0.0F, 5F, 5, 0.0F, -0.1309F, 0.0F)); + + PartDefinition l3 = wings.addOrReplaceChild("l3", CubeListBuilder.create().texOffs(16, 48).addBox(3.0F, -1.0F, -1.0F, 3.0F, 2.0F, 1.0F, new CubeDeformation(0.0F)) + .texOffs(24, 48).mirror().addBox(3.0F, -1.0F, -1.0F, 3.0F, 2.0F, 1.0F, new CubeDeformation(0.25F)).mirror(false) + .texOffs(16, 51).addBox(6.0F, -4.0F, -1.0F, 3.0F, 5.0F, 1.0F, new CubeDeformation(0.0F)) + .texOffs(24, 51).addBox(6.0F, -4.25F, -1.0F, 3.0F, 5.0F, 1.0F, new CubeDeformation(0.25F)), PartPose.offsetAndRotation(0.0F, 5F, 5, 0.0F, -0.0873F, 0.6981F)); + + PartDefinition r1 = wings.addOrReplaceChild("r1", CubeListBuilder.create().texOffs(16, 48).mirror().addBox(-6.0F, -1.0F, -1.0F, 3.0F, 2.0F, 1.0F, new CubeDeformation(0.0F)).mirror(false) + .texOffs(24, 48).addBox(-6.0F, -1.0F, -1.0F, 3.0F, 2.0F, 1.0F, new CubeDeformation(0.25F)) + .texOffs(16, 51).mirror().addBox(-9.0F, -4.0F, -1.0F, 3.0F, 5.0F, 1.0F, new CubeDeformation(0.0F)).mirror(false) + .texOffs(24, 51).mirror().addBox(-9.0F, -4.25F, -1.0F, 3.0F, 5.0F, 1.0F, new CubeDeformation(0.25F)).mirror(false), PartPose.offsetAndRotation(0.0F, 5F, 5, 0.0F, 0.1745F, 0.6981F)); + + PartDefinition r2 = wings.addOrReplaceChild("r2", CubeListBuilder.create().texOffs(16, 48).mirror().addBox(-6.0F, -1.0F, -1.0F, 3.0F, 2.0F, 1.0F, new CubeDeformation(0.0F)).mirror(false) + .texOffs(24, 48).addBox(-6.0F, -1.0F, -1.0F, 3.0F, 2.0F, 1.0F, new CubeDeformation(0.25F)) + .texOffs(16, 51).mirror().addBox(-9.0F, -4.0F, -1.0F, 3.0F, 5.0F, 1.0F, new CubeDeformation(0.0F)).mirror(false) + .texOffs(24, 51).mirror().addBox(-9.0F, -4.25F, -1.0F, 3.0F, 5.0F, 1.0F, new CubeDeformation(0.25F)).mirror(false), PartPose.offsetAndRotation(0.0F, 5F, 5, 0.0F, 0.1309F, 0.0F)); + + PartDefinition r3 = wings.addOrReplaceChild("r3", CubeListBuilder.create().texOffs(16, 48).mirror().addBox(-6.0F, -1.0F, -1.0F, 3.0F, 2.0F, 1.0F, new CubeDeformation(0.0F)).mirror(false) + .texOffs(24, 48).addBox(-6.0F, -1.0F, -1.0F, 3.0F, 2.0F, 1.0F, new CubeDeformation(0.25F)) + .texOffs(16, 51).mirror().addBox(-9.0F, -4.0F, -1.0F, 3.0F, 5.0F, 1.0F, new CubeDeformation(0.0F)).mirror(false) + .texOffs(24, 51).mirror().addBox(-9.0F, -4.25F, -1.0F, 3.0F, 5.0F, 1.0F, new CubeDeformation(0.25F)).mirror(false), PartPose.offsetAndRotation(0.0F, 5F, 5, 0.0F, 0.0873F, -0.6981F)); + + PartDefinition l4 = wingsFullBright.addOrReplaceChild("l4", CubeListBuilder.create().texOffs(16, 57).mirror().addBox(6.0F, -3.5F, -0.5F, 12.0F, 4.0F, 0.0F, new CubeDeformation(0.0F)).mirror(false), PartPose.offsetAndRotation(0.0F, 5, 5, 0.0F, -0.1745F, -0.6981F)); + + PartDefinition l5 = wingsFullBright.addOrReplaceChild("l5", CubeListBuilder.create().texOffs(16, 57).mirror().addBox(7.0F, -3.5F, -0.5F, 12.0F, 4.0F, 0.0F, new CubeDeformation(0.0F)).mirror(false), PartPose.offsetAndRotation(0.0F, 5, 5, 0.0F, -0.1309F, 0.0F)); + + PartDefinition l6 = wingsFullBright.addOrReplaceChild("l6", CubeListBuilder.create().texOffs(16, 57).mirror().addBox(6.0F, -3.5F, -0.5F, 12.0F, 4.0F, 0.0F, new CubeDeformation(0.0F)).mirror(false), PartPose.offsetAndRotation(0.0F, 5, 5, 0.0F, -0.0873F, 0.6981F)); + + PartDefinition r4 = wingsFullBright.addOrReplaceChild("r4", CubeListBuilder.create().texOffs(16, 57).addBox(-19.0F, -3.5F, -0.5F, 12.0F, 4.0F, 0.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(0.0F, 5, 5, 0.0F, 0.1745F, 0.6981F)); + + PartDefinition r5 = wingsFullBright.addOrReplaceChild("r5", CubeListBuilder.create().texOffs(16, 57).addBox(-19.0F, -3.5F, -0.5F, 12.0F, 4.0F, 0.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(0.0F, 5, 5, 0.0F, 0.1309F, 0.0F)); + + PartDefinition r6 = wingsFullBright.addOrReplaceChild("r6", CubeListBuilder.create().texOffs(16, 57).addBox(-19.0F, -3.5F, -0.5F, 12.0F, 4.0F, 0.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(0.0F, 5, 5, 0.0F, 0.0873F, -0.6981F)); - return LayerDefinition.create(mesh, 64, 64); - } + return LayerDefinition.create(mesh, 64, 64); + } } \ No newline at end of file diff --git a/src/main/java/com/sammy/malum/client/particles/spiritflame/SpiritFlameParticle.java b/src/main/java/com/sammy/malum/client/particles/spiritflame/SpiritFlameParticle.java index 6dfe10f91..452203d8b 100644 --- a/src/main/java/com/sammy/malum/client/particles/spiritflame/SpiritFlameParticle.java +++ b/src/main/java/com/sammy/malum/client/particles/spiritflame/SpiritFlameParticle.java @@ -2,7 +2,7 @@ import net.minecraft.client.multiplayer.ClientLevel; import net.minecraft.client.particle.ParticleEngine; -import team.lodestar.lodestone.systems.particle.options.*; +import team.lodestar.lodestone.systems.particle.options.WorldParticleOptions; import team.lodestar.lodestone.systems.particle.world.FrameSetParticle; public class SpiritFlameParticle extends FrameSetParticle { diff --git a/src/main/java/com/sammy/malum/client/particles/spiritflame/SpiritFlameParticleType.java b/src/main/java/com/sammy/malum/client/particles/spiritflame/SpiritFlameParticleType.java index 1ee942f30..91f2b699e 100644 --- a/src/main/java/com/sammy/malum/client/particles/spiritflame/SpiritFlameParticleType.java +++ b/src/main/java/com/sammy/malum/client/particles/spiritflame/SpiritFlameParticleType.java @@ -7,7 +7,7 @@ import net.minecraft.client.particle.ParticleProvider; import net.minecraft.client.particle.SpriteSet; import net.minecraft.core.particles.ParticleType; -import team.lodestar.lodestone.systems.particle.options.*; +import team.lodestar.lodestone.systems.particle.options.WorldParticleOptions; import javax.annotation.Nullable; diff --git a/src/main/java/com/sammy/malum/client/renderer/block/MalumItemHolderRenderer.java b/src/main/java/com/sammy/malum/client/renderer/block/MalumItemHolderRenderer.java index ee3042f1a..31764cc85 100644 --- a/src/main/java/com/sammy/malum/client/renderer/block/MalumItemHolderRenderer.java +++ b/src/main/java/com/sammy/malum/client/renderer/block/MalumItemHolderRenderer.java @@ -2,17 +2,16 @@ import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.math.Axis; -import com.sammy.malum.common.block.storage.*; +import com.sammy.malum.common.block.storage.MalumItemHolderBlockEntity; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.MultiBufferSource; -import net.minecraft.client.renderer.block.model.ItemTransforms; import net.minecraft.client.renderer.blockentity.BlockEntityRenderer; import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider; import net.minecraft.client.renderer.entity.ItemRenderer; import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.Level; -import net.minecraft.world.phys.*; +import net.minecraft.world.phys.Vec3; import static net.minecraft.client.renderer.texture.OverlayTexture.NO_OVERLAY; diff --git a/src/main/java/com/sammy/malum/client/renderer/block/MoteOfManaRenderer.java b/src/main/java/com/sammy/malum/client/renderer/block/MoteOfManaRenderer.java index 36f7813b5..fed79881d 100644 --- a/src/main/java/com/sammy/malum/client/renderer/block/MoteOfManaRenderer.java +++ b/src/main/java/com/sammy/malum/client/renderer/block/MoteOfManaRenderer.java @@ -1,22 +1,25 @@ package com.sammy.malum.client.renderer.block; -import com.mojang.blaze3d.vertex.*; -import com.mojang.math.*; -import com.sammy.malum.*; -import com.sammy.malum.common.block.mana_mote.*; -import com.sammy.malum.core.systems.spirit.*; -import net.minecraft.client.*; -import net.minecraft.client.renderer.*; -import net.minecraft.client.renderer.blockentity.*; -import net.minecraft.resources.*; -import net.minecraft.util.*; +import com.mojang.blaze3d.vertex.PoseStack; +import com.mojang.blaze3d.vertex.VertexConsumer; +import com.sammy.malum.MalumMod; +import com.sammy.malum.common.block.mana_mote.MoteOfManaBlockEntity; +import com.sammy.malum.common.block.mana_mote.SpiritMoteBlock; +import com.sammy.malum.core.systems.spirit.MalumSpiritType; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.MultiBufferSource; +import net.minecraft.client.renderer.blockentity.BlockEntityRenderer; +import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.util.Mth; import org.joml.Vector3f; -import team.lodestar.lodestone.handlers.*; -import team.lodestar.lodestone.setup.*; -import team.lodestar.lodestone.systems.rendering.*; +import team.lodestar.lodestone.handlers.RenderHandler; +import team.lodestar.lodestone.setup.LodestoneRenderTypeRegistry; +import team.lodestar.lodestone.systems.rendering.VFXBuilders; import java.awt.*; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; public class MoteOfManaRenderer implements BlockEntityRenderer { @@ -43,8 +46,8 @@ public void renderQuad(MoteOfManaBlockEntity blockEntityIn, PoseStack poseStack) offsetMap.add(new Vector3f[]{bottomVertices[i], bottomVertices[(i + 1) % 4], topVertices[(i + 1) % 4], topVertices[(i) % 4]}); } poseStack.pushPose(); - poseStack.translate(0.5f,0.5f,0.5f); - MalumSpiritType spiritType = ((SpiritMoteBlock)blockEntityIn.getBlockState().getBlock()).spiritType; + poseStack.translate(0.5f, 0.5f, 0.5f); + MalumSpiritType spiritType = ((SpiritMoteBlock) blockEntityIn.getBlockState().getBlock()).spiritType; drawWobblyCube(poseStack, spiritType.getPrimaryColor(), 1f, 0.86f, offsetMap, bottomVertices, topVertices); drawWobblyCube(poseStack, spiritType.getSecondaryColor(), -0.92f, 0.6f, offsetMap, bottomVertices, topVertices); drawWobblyCube(poseStack, spiritType.getPrimaryColor(), 1.12f, 0.5f, offsetMap, bottomVertices, topVertices); @@ -53,7 +56,7 @@ public void renderQuad(MoteOfManaBlockEntity blockEntityIn, PoseStack poseStack) public static void drawWobblyCube(PoseStack poseStack, Color color, float scale, float alpha, Collection offsetMap, Vector3f[] bottomVertices, Vector3f[] topVertices) { poseStack.pushPose(); - poseStack.scale(scale,scale,scale); + poseStack.scale(scale, scale, scale); poseStack.translate(-0.5f, -0.5f, -0.5f); for (Vector3f[] offsets : offsetMap) { drawSide(poseStack, color, alpha, offsets); diff --git a/src/main/java/com/sammy/malum/client/renderer/block/SoulVialRenderer.java b/src/main/java/com/sammy/malum/client/renderer/block/SoulVialRenderer.java index 947da9d5d..ed44ef378 100644 --- a/src/main/java/com/sammy/malum/client/renderer/block/SoulVialRenderer.java +++ b/src/main/java/com/sammy/malum/client/renderer/block/SoulVialRenderer.java @@ -18,7 +18,7 @@ public void render(SoulVialBlockEntity blockEntityIn, float partialTicks, PoseSt double y = 0.5f + Math.sin(((blockEntityIn.getLevel().getGameTime() % 360) + partialTicks) / 20f) * 0.08f; poseStack.translate(0.5f, y, 0.5f); poseStack.scale(0.75f, 0.75f, 0.75f); - // SoulEntityRenderer.renderSoul(poseStack, blockEntityIn.data.primaryType.getColor().darker()); + // SoulEntityRenderer.renderSoul(poseStack, blockEntityIn.data.primaryType.getColor().darker()); poseStack.popPose(); } } diff --git a/src/main/java/com/sammy/malum/client/renderer/block/SpiritAltarRenderer.java b/src/main/java/com/sammy/malum/client/renderer/block/SpiritAltarRenderer.java index ded09045e..88b0e43a2 100644 --- a/src/main/java/com/sammy/malum/client/renderer/block/SpiritAltarRenderer.java +++ b/src/main/java/com/sammy/malum/client/renderer/block/SpiritAltarRenderer.java @@ -2,13 +2,11 @@ import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.math.Axis; -import com.sammy.malum.client.renderer.entity.*; +import com.sammy.malum.client.renderer.entity.FloatingItemEntityRenderer; import com.sammy.malum.common.block.curiosities.spirit_altar.SpiritAltarBlockEntity; -import com.sammy.malum.common.item.spirit.*; -import com.sammy.malum.registry.common.*; +import com.sammy.malum.common.item.spirit.SpiritShardItem; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.MultiBufferSource; -import net.minecraft.client.renderer.block.model.ItemTransforms; import net.minecraft.client.renderer.blockentity.BlockEntityRenderer; import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider; import net.minecraft.client.renderer.entity.ItemRenderer; diff --git a/src/main/java/com/sammy/malum/client/renderer/block/SpiritCatalyzerRenderer.java b/src/main/java/com/sammy/malum/client/renderer/block/SpiritCatalyzerRenderer.java index fe06d74eb..b98aad174 100644 --- a/src/main/java/com/sammy/malum/client/renderer/block/SpiritCatalyzerRenderer.java +++ b/src/main/java/com/sammy/malum/client/renderer/block/SpiritCatalyzerRenderer.java @@ -2,11 +2,9 @@ import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.math.Axis; -import com.mojang.math.Vector3f; import com.sammy.malum.common.block.curiosities.spirit_crucible.SpiritCatalyzerCoreBlockEntity; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.MultiBufferSource; -import net.minecraft.client.renderer.block.model.ItemTransforms; import net.minecraft.client.renderer.blockentity.BlockEntityRenderer; import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider; import net.minecraft.client.renderer.entity.ItemRenderer; diff --git a/src/main/java/com/sammy/malum/client/renderer/block/SpiritCrucibleRenderer.java b/src/main/java/com/sammy/malum/client/renderer/block/SpiritCrucibleRenderer.java index dc21bde41..1bfbeba7f 100644 --- a/src/main/java/com/sammy/malum/client/renderer/block/SpiritCrucibleRenderer.java +++ b/src/main/java/com/sammy/malum/client/renderer/block/SpiritCrucibleRenderer.java @@ -5,7 +5,6 @@ import com.sammy.malum.common.block.curiosities.spirit_crucible.SpiritCrucibleCoreBlockEntity; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.MultiBufferSource; -import net.minecraft.client.renderer.block.model.ItemTransforms; import net.minecraft.client.renderer.blockentity.BlockEntityRenderer; import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider; import net.minecraft.client.renderer.entity.ItemRenderer; diff --git a/src/main/java/com/sammy/malum/client/renderer/block/SpiritJarRenderer.java b/src/main/java/com/sammy/malum/client/renderer/block/SpiritJarRenderer.java index bc9b2d7fc..0f28a3df1 100644 --- a/src/main/java/com/sammy/malum/client/renderer/block/SpiritJarRenderer.java +++ b/src/main/java/com/sammy/malum/client/renderer/block/SpiritJarRenderer.java @@ -2,13 +2,11 @@ import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.math.Axis; -import com.mojang.math.Vector3f; -import com.sammy.malum.client.renderer.entity.*; +import com.sammy.malum.client.renderer.entity.FloatingItemEntityRenderer; import com.sammy.malum.common.block.storage.jar.SpiritJarBlockEntity; -import com.sammy.malum.core.systems.spirit.*; +import com.sammy.malum.core.systems.spirit.MalumSpiritType; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.MultiBufferSource; -import net.minecraft.client.renderer.block.model.ItemTransforms; import net.minecraft.client.renderer.blockentity.BlockEntityRenderer; import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider; import net.minecraft.client.renderer.entity.ItemRenderer; @@ -29,7 +27,7 @@ public void render(SpiritJarBlockEntity blockEntityIn, float partialTicks, PoseS if (blockEntityIn.type != null) { final MalumSpiritType type = blockEntityIn.type; double time = ((level.getGameTime() + partialTicks) * 0.05f) % 6.2831f; - double y = 0.5f + (float)Math.sin(time) * 0.2f; + double y = 0.5f + (float) Math.sin(time) * 0.2f; poseStack.pushPose(); poseStack.translate(0.5f, y, 0.5f); FloatingItemEntityRenderer.renderSpiritGlimmer(poseStack, type, partialTicks); diff --git a/src/main/java/com/sammy/malum/client/renderer/block/TotemPoleRenderer.java b/src/main/java/com/sammy/malum/client/renderer/block/TotemPoleRenderer.java index 7fd11d7d5..638100c5c 100644 --- a/src/main/java/com/sammy/malum/client/renderer/block/TotemPoleRenderer.java +++ b/src/main/java/com/sammy/malum/client/renderer/block/TotemPoleRenderer.java @@ -4,16 +4,11 @@ import com.mojang.blaze3d.vertex.VertexConsumer; import com.mojang.math.Axis; import com.sammy.malum.common.block.curiosities.totem.TotemPoleBlockEntity; -import com.sammy.malum.core.systems.spirit.MalumSpiritType; -import com.sammy.malum.registry.common.SpiritTypeRegistry; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.blockentity.BlockEntityRenderer; import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider; -import net.minecraft.client.renderer.texture.TextureAtlas; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.client.resources.model.Material; import net.minecraft.core.Direction; -import net.minecraft.resources.*; +import net.minecraft.resources.ResourceLocation; import net.minecraft.world.level.block.state.properties.BlockStateProperties; import org.joml.Vector3f; import team.lodestar.lodestone.handlers.RenderHandler; @@ -21,8 +16,6 @@ import team.lodestar.lodestone.systems.rendering.VFXBuilders; import java.awt.*; -import java.util.HashMap; -import java.util.Map; public class TotemPoleRenderer implements BlockEntityRenderer { @@ -36,7 +29,7 @@ public void render(TotemPoleBlockEntity blockEntityIn, float partialTicks, PoseS if (blockEntityIn.type == null) { return; } - renderQuad(blockEntityIn.type.getTotemGlowTexture(), blockEntityIn.type.getPrimaryColor(), blockEntityIn.currentColor/20f, direction, poseStack); + renderQuad(blockEntityIn.type.getTotemGlowTexture(), blockEntityIn.type.getPrimaryColor(), blockEntityIn.currentColor / 20f, direction, poseStack); } public void renderQuad(ResourceLocation resourceLocation, Color color, float alpha, Direction direction, PoseStack poseStack) { diff --git a/src/main/java/com/sammy/malum/client/renderer/curio/TokenOfGratitudeRenderer.java b/src/main/java/com/sammy/malum/client/renderer/curio/TokenOfGratitudeRenderer.java index 532c7d24b..1db3c8f88 100644 --- a/src/main/java/com/sammy/malum/client/renderer/curio/TokenOfGratitudeRenderer.java +++ b/src/main/java/com/sammy/malum/client/renderer/curio/TokenOfGratitudeRenderer.java @@ -3,7 +3,6 @@ import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; import com.mojang.math.Axis; -import com.mojang.math.Vector3f; import com.sammy.malum.MalumMod; import com.sammy.malum.common.item.cosmetic.curios.CurioTokenOfGratitude; import com.sammy.malum.registry.client.ModelRegistry; @@ -124,7 +123,7 @@ public static void renderScarf(AbstractClientPlayer playerEntity, ResourceLocati ModelRegistry.SCARF.copyFromDefault(humanoidModel); } } - ModelRegistry.SCARF.setupAnim(playerEntity, playerEntity.animationPosition, playerEntity.animationSpeed, playerEntity.tickCount + pticks, netHeadYaw, netHeadPitch); + ModelRegistry.SCARF.setupAnim(playerEntity, playerEntity.walkAnimation.position(), playerEntity.walkAnimation.speed(), playerEntity.tickCount + pticks, netHeadYaw, netHeadPitch); ModelRegistry.SCARF.renderToBuffer(poseStack, vertexconsumer, light, OverlayTexture.NO_OVERLAY, 1, 1, 1, 1); } } \ No newline at end of file diff --git a/src/main/java/com/sammy/malum/client/renderer/curio/TopHatCurioRenderer.java b/src/main/java/com/sammy/malum/client/renderer/curio/TopHatCurioRenderer.java index 7747497cf..b49027926 100644 --- a/src/main/java/com/sammy/malum/client/renderer/curio/TopHatCurioRenderer.java +++ b/src/main/java/com/sammy/malum/client/renderer/curio/TopHatCurioRenderer.java @@ -1,18 +1,19 @@ package com.sammy.malum.client.renderer.curio; -import com.mojang.blaze3d.vertex.*; -import com.sammy.malum.*; -import com.sammy.malum.registry.client.*; -import net.minecraft.client.model.*; -import net.minecraft.client.renderer.*; -import net.minecraft.client.renderer.entity.*; -import net.minecraft.client.renderer.texture.*; -import net.minecraft.resources.*; -import net.minecraft.world.entity.*; -import net.minecraft.world.item.*; -import team.lodestar.lodestone.setup.*; -import top.theillusivec4.curios.api.*; -import top.theillusivec4.curios.api.client.*; +import com.mojang.blaze3d.vertex.PoseStack; +import com.mojang.blaze3d.vertex.VertexConsumer; +import com.sammy.malum.MalumMod; +import com.sammy.malum.registry.client.ModelRegistry; +import net.minecraft.client.model.EntityModel; +import net.minecraft.client.renderer.MultiBufferSource; +import net.minecraft.client.renderer.RenderType; +import net.minecraft.client.renderer.entity.RenderLayerParent; +import net.minecraft.client.renderer.texture.OverlayTexture; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.item.ItemStack; +import top.theillusivec4.curios.api.SlotContext; +import top.theillusivec4.curios.api.client.ICurioRenderer; public class TopHatCurioRenderer implements ICurioRenderer { diff --git a/src/main/java/com/sammy/malum/client/renderer/entity/EthericNitrateEntityRenderer.java b/src/main/java/com/sammy/malum/client/renderer/entity/EthericNitrateEntityRenderer.java index 3c73cf0b5..b5c40259a 100644 --- a/src/main/java/com/sammy/malum/client/renderer/entity/EthericNitrateEntityRenderer.java +++ b/src/main/java/com/sammy/malum/client/renderer/entity/EthericNitrateEntityRenderer.java @@ -1,27 +1,16 @@ package com.sammy.malum.client.renderer.entity; -import com.mojang.blaze3d.vertex.*; -import com.mojang.math.*; -import com.sammy.malum.common.entity.nitrate.*; -import net.minecraft.client.renderer.*; -import net.minecraft.client.renderer.entity.*; -import net.minecraft.client.renderer.texture.*; -import net.minecraft.resources.*; -import net.minecraft.util.*; -import net.minecraft.world.phys.*; -import team.lodestar.lodestone.helpers.*; -import team.lodestar.lodestone.setup.*; -import team.lodestar.lodestone.systems.easing.*; -import team.lodestar.lodestone.systems.rendering.*; +import com.mojang.blaze3d.vertex.PoseStack; +import com.sammy.malum.common.entity.nitrate.EthericNitrateEntity; +import net.minecraft.client.renderer.MultiBufferSource; +import net.minecraft.client.renderer.RenderType; +import net.minecraft.client.renderer.entity.EntityRenderer; +import net.minecraft.client.renderer.entity.EntityRendererProvider; +import net.minecraft.client.renderer.texture.TextureAtlas; +import net.minecraft.resources.ResourceLocation; +import team.lodestar.lodestone.setup.LodestoneRenderTypeRegistry; -import java.awt.*; -import java.util.List; -import java.util.*; -import java.util.stream.*; - -import static com.sammy.malum.MalumMod.*; -import static com.sammy.malum.client.renderer.entity.FloatingItemEntityRenderer.*; -import static team.lodestar.lodestone.handlers.RenderHandler.*; +import static com.sammy.malum.MalumMod.malumPath; public class EthericNitrateEntityRenderer extends EntityRenderer { diff --git a/src/main/java/com/sammy/malum/client/renderer/entity/FloatingItemEntityRenderer.java b/src/main/java/com/sammy/malum/client/renderer/entity/FloatingItemEntityRenderer.java index 285888547..301c8ad04 100644 --- a/src/main/java/com/sammy/malum/client/renderer/entity/FloatingItemEntityRenderer.java +++ b/src/main/java/com/sammy/malum/client/renderer/entity/FloatingItemEntityRenderer.java @@ -1,32 +1,38 @@ package com.sammy.malum.client.renderer.entity; -import com.mojang.blaze3d.vertex.*; -import com.mojang.math.*; -import com.sammy.malum.common.entity.*; -import com.sammy.malum.core.systems.spirit.*; -import net.minecraft.client.*; -import net.minecraft.client.renderer.*; -import net.minecraft.client.renderer.block.model.*; -import net.minecraft.client.renderer.entity.*; -import net.minecraft.client.renderer.texture.*; -import net.minecraft.client.resources.model.*; -import net.minecraft.resources.*; -import net.minecraft.util.*; -import net.minecraft.world.item.*; -import net.minecraft.world.level.*; -import net.minecraft.world.phys.*; -import team.lodestar.lodestone.helpers.*; -import team.lodestar.lodestone.setup.*; -import team.lodestar.lodestone.systems.easing.*; -import team.lodestar.lodestone.systems.rendering.*; -import team.lodestar.lodestone.systems.rendering.trail.*; +import com.mojang.blaze3d.vertex.PoseStack; +import com.mojang.blaze3d.vertex.VertexConsumer; +import com.mojang.math.Axis; +import com.sammy.malum.common.entity.FloatingItemEntity; +import com.sammy.malum.core.systems.spirit.MalumSpiritType; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.MultiBufferSource; +import net.minecraft.client.renderer.RenderType; +import net.minecraft.client.renderer.entity.EntityRenderer; +import net.minecraft.client.renderer.entity.EntityRendererProvider; +import net.minecraft.client.renderer.entity.ItemRenderer; +import net.minecraft.client.renderer.texture.OverlayTexture; +import net.minecraft.client.renderer.texture.TextureAtlas; +import net.minecraft.client.resources.model.BakedModel; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.util.Mth; +import net.minecraft.world.item.ItemDisplayContext; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.level.Level; +import net.minecraft.world.phys.Vec3; +import team.lodestar.lodestone.helpers.ColorHelper; +import team.lodestar.lodestone.helpers.EasingHelper; +import team.lodestar.lodestone.setup.LodestoneRenderTypeRegistry; +import team.lodestar.lodestone.systems.easing.Easing; +import team.lodestar.lodestone.systems.rendering.VFXBuilders; +import team.lodestar.lodestone.systems.rendering.trail.TrailPoint; import java.awt.*; import java.util.List; -import static com.sammy.malum.MalumMod.*; -import static team.lodestar.lodestone.LodestoneLib.*; -import static team.lodestar.lodestone.handlers.RenderHandler.*; +import static com.sammy.malum.MalumMod.malumPath; +import static team.lodestar.lodestone.LodestoneLib.lodestonePath; +import static team.lodestar.lodestone.handlers.RenderHandler.DELAYED_RENDER; public class FloatingItemEntityRenderer extends EntityRenderer { public final ItemRenderer itemRenderer; @@ -40,6 +46,7 @@ public FloatingItemEntityRenderer(EntityRendererProvider.Context context) { private static final ResourceLocation LIGHT_TRAIL = malumPath("textures/vfx/concentrated_trail.png"); private static final RenderType TRAIL_TYPE = LodestoneRenderTypeRegistry.ADDITIVE_TEXTURE_TRIANGLE.apply(LIGHT_TRAIL); + @Override public void render(FloatingItemEntity entity, float entityYaw, float partialTicks, PoseStack poseStack, MultiBufferSource bufferIn, int packedLightIn) { List trailPoints = entity.trailPointBuilder.getTrailPoints(partialTicks); @@ -48,7 +55,7 @@ public void render(FloatingItemEntity entity, float entityYaw, float partialTick float x = (float) Mth.lerp(partialTicks, entity.xOld, entity.getX()); float y = (float) Mth.lerp(partialTicks, entity.yOld, entity.getY()); float z = (float) Mth.lerp(partialTicks, entity.zOld, entity.getZ()); - trailPoints.add(new TrailPoint(new Vec3(x, y + entity.getYOffset(partialTicks) + 0.25F, z).add(entity.getDeltaMovement().scale(1+partialTicks)))); + trailPoints.add(new TrailPoint(new Vec3(x, y + entity.getYOffset(partialTicks) + 0.25F, z).add(entity.getDeltaMovement().scale(1 + partialTicks)))); poseStack.translate(-x, -y, -z); VFXBuilders.WorldVFXBuilder builder = VFXBuilders.createWorld().setPosColorTexLightmapDefaultFormat(); VertexConsumer lightBuffer = DELAYED_RENDER.getBuffer(TRAIL_TYPE); @@ -105,15 +112,15 @@ public static void renderSpiritGlimmer(PoseStack poseStack, MalumSpiritType spir VFXBuilders.WorldVFXBuilder builder = VFXBuilders.createWorld().setPosColorTexLightmapDefaultFormat().setColor(spiritType.getPrimaryColor()); float gameTime = level.getGameTime() + partialTicks; float sine = (float) Math.abs(((Math.sin((gameTime / 80f) % 360)) * 0.075f)); - float bounce = EasingHelper.weightedEasingLerp(Easing.BOUNCE_IN_OUT, (gameTime % 20)/20f, 0.025f, 0.05f, 0.025f); + float bounce = EasingHelper.weightedEasingLerp(Easing.BOUNCE_IN_OUT, (gameTime % 20) / 20f, 0.025f, 0.05f, 0.025f); float scale = 0.12f + sine + bounce; poseStack.pushPose(); poseStack.mulPose(Minecraft.getInstance().getEntityRenderDispatcher().cameraOrientation()); poseStack.mulPose(Axis.YP.rotationDegrees(180f)); - builder.setAlpha(0.6f).renderQuad(star, poseStack, scale*1.2f); - builder.setAlpha(0.8f).renderQuad(bloom, poseStack, scale*0.8f); - builder.setAlpha(0.2f).setColor(spiritType.getSecondaryColor()).renderQuad(bloom, poseStack, scale*1.2f); + builder.setAlpha(0.6f).renderQuad(star, poseStack, scale * 1.2f); + builder.setAlpha(0.8f).renderQuad(bloom, poseStack, scale * 0.8f); + builder.setAlpha(0.2f).setColor(spiritType.getSecondaryColor()).renderQuad(bloom, poseStack, scale * 1.2f); poseStack.popPose(); } diff --git a/src/main/java/com/sammy/malum/client/renderer/entity/NightTerrorEntityRenderer.java b/src/main/java/com/sammy/malum/client/renderer/entity/NightTerrorEntityRenderer.java index 6ebeea851..aef8fbee5 100644 --- a/src/main/java/com/sammy/malum/client/renderer/entity/NightTerrorEntityRenderer.java +++ b/src/main/java/com/sammy/malum/client/renderer/entity/NightTerrorEntityRenderer.java @@ -1,27 +1,16 @@ package com.sammy.malum.client.renderer.entity; -import com.mojang.blaze3d.vertex.*; -import com.mojang.math.*; -import com.sammy.malum.common.entity.night_terror.*; -import net.minecraft.client.renderer.*; -import net.minecraft.client.renderer.entity.*; -import net.minecraft.client.renderer.texture.*; -import net.minecraft.resources.*; -import net.minecraft.util.*; -import net.minecraft.world.phys.*; -import team.lodestar.lodestone.helpers.*; -import team.lodestar.lodestone.setup.*; -import team.lodestar.lodestone.systems.easing.*; -import team.lodestar.lodestone.systems.rendering.*; +import com.mojang.blaze3d.vertex.PoseStack; +import com.sammy.malum.common.entity.night_terror.NightTerrorSeekerEntity; +import net.minecraft.client.renderer.MultiBufferSource; +import net.minecraft.client.renderer.RenderType; +import net.minecraft.client.renderer.entity.EntityRenderer; +import net.minecraft.client.renderer.entity.EntityRendererProvider; +import net.minecraft.client.renderer.texture.TextureAtlas; +import net.minecraft.resources.ResourceLocation; +import team.lodestar.lodestone.setup.LodestoneRenderTypeRegistry; -import java.awt.*; -import java.util.List; -import java.util.*; -import java.util.stream.*; - -import static com.sammy.malum.MalumMod.*; -import static com.sammy.malum.client.renderer.entity.FloatingItemEntityRenderer.*; -import static team.lodestar.lodestone.handlers.RenderHandler.*; +import static com.sammy.malum.MalumMod.malumPath; public class NightTerrorEntityRenderer extends EntityRenderer { diff --git a/src/main/java/com/sammy/malum/client/renderer/entity/ScytheBoomerangEntityRenderer.java b/src/main/java/com/sammy/malum/client/renderer/entity/ScytheBoomerangEntityRenderer.java index 6f6980714..d79109bca 100644 --- a/src/main/java/com/sammy/malum/client/renderer/entity/ScytheBoomerangEntityRenderer.java +++ b/src/main/java/com/sammy/malum/client/renderer/entity/ScytheBoomerangEntityRenderer.java @@ -2,11 +2,9 @@ import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.math.Axis; -import com.mojang.math.Vector3f; import com.sammy.malum.common.entity.boomerang.ScytheBoomerangEntity; import com.sammy.malum.common.item.curiosities.weapons.MalumScytheItem; import net.minecraft.client.renderer.MultiBufferSource; -import net.minecraft.client.renderer.block.model.ItemTransforms; import net.minecraft.client.renderer.entity.EntityRenderer; import net.minecraft.client.renderer.entity.EntityRendererProvider; import net.minecraft.client.renderer.entity.ItemRenderer; diff --git a/src/main/java/com/sammy/malum/client/renderer/entity/VividNitrateEntityRenderer.java b/src/main/java/com/sammy/malum/client/renderer/entity/VividNitrateEntityRenderer.java index d7e9b9ee5..6cbe3758b 100644 --- a/src/main/java/com/sammy/malum/client/renderer/entity/VividNitrateEntityRenderer.java +++ b/src/main/java/com/sammy/malum/client/renderer/entity/VividNitrateEntityRenderer.java @@ -1,25 +1,16 @@ package com.sammy.malum.client.renderer.entity; -import com.mojang.blaze3d.vertex.*; -import com.mojang.math.*; -import com.sammy.malum.common.entity.nitrate.*; -import net.minecraft.client.renderer.*; -import net.minecraft.client.renderer.entity.*; -import net.minecraft.client.renderer.texture.*; -import net.minecraft.resources.*; -import net.minecraft.util.*; -import net.minecraft.world.phys.*; -import team.lodestar.lodestone.helpers.*; -import team.lodestar.lodestone.setup.*; -import team.lodestar.lodestone.systems.rendering.*; +import com.mojang.blaze3d.vertex.PoseStack; +import com.sammy.malum.common.entity.nitrate.VividNitrateEntity; +import net.minecraft.client.renderer.MultiBufferSource; +import net.minecraft.client.renderer.RenderType; +import net.minecraft.client.renderer.entity.EntityRenderer; +import net.minecraft.client.renderer.entity.EntityRendererProvider; +import net.minecraft.client.renderer.texture.TextureAtlas; +import net.minecraft.resources.ResourceLocation; +import team.lodestar.lodestone.setup.LodestoneRenderTypeRegistry; -import java.util.*; -import java.util.stream.*; - -import static com.sammy.malum.MalumMod.*; -import static com.sammy.malum.client.renderer.entity.FloatingItemEntityRenderer.*; -import static com.sammy.malum.common.entity.nitrate.VividNitrateEntity.*; -import static team.lodestar.lodestone.handlers.RenderHandler.*; +import static com.sammy.malum.MalumMod.malumPath; public class VividNitrateEntityRenderer extends EntityRenderer { diff --git a/src/main/java/com/sammy/malum/client/renderer/item/SpiritJarItemRenderer.java b/src/main/java/com/sammy/malum/client/renderer/item/SpiritJarItemRenderer.java index acea57288..7de8daf8b 100644 --- a/src/main/java/com/sammy/malum/client/renderer/item/SpiritJarItemRenderer.java +++ b/src/main/java/com/sammy/malum/client/renderer/item/SpiritJarItemRenderer.java @@ -4,12 +4,11 @@ import com.sammy.malum.common.block.storage.jar.SpiritJarBlockEntity; import com.sammy.malum.common.item.spirit.SpiritJarItem; import com.sammy.malum.core.helper.SpiritHelper; -import com.sammy.malum.registry.common.block.BlockRegistry; import com.sammy.malum.core.systems.spirit.MalumSpiritType; +import com.sammy.malum.registry.common.block.BlockRegistry; import net.minecraft.client.model.geom.EntityModelSet; import net.minecraft.client.renderer.BlockEntityWithoutLevelRenderer; import net.minecraft.client.renderer.MultiBufferSource; -import net.minecraft.client.renderer.block.model.ItemTransforms; import net.minecraft.client.renderer.blockentity.BlockEntityRenderDispatcher; import net.minecraft.core.BlockPos; import net.minecraft.world.item.ItemDisplayContext; diff --git a/src/main/java/com/sammy/malum/client/screen/codex/AbstractMalumScreen.java b/src/main/java/com/sammy/malum/client/screen/codex/AbstractMalumScreen.java index f568344f1..e274db65e 100644 --- a/src/main/java/com/sammy/malum/client/screen/codex/AbstractMalumScreen.java +++ b/src/main/java/com/sammy/malum/client/screen/codex/AbstractMalumScreen.java @@ -1,12 +1,13 @@ package com.sammy.malum.client.screen.codex; -import net.minecraft.client.*; -import net.minecraft.client.gui.screens.*; -import net.minecraft.network.chat.*; -import net.minecraft.sounds.*; -import net.minecraft.world.entity.player.*; - -import java.util.function.*; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.screens.Screen; +import net.minecraft.network.chat.Component; +import net.minecraft.sounds.SoundEvent; +import net.minecraft.sounds.SoundSource; +import net.minecraft.world.entity.player.Player; + +import java.util.function.Supplier; public abstract class AbstractMalumScreen extends Screen { diff --git a/src/main/java/com/sammy/malum/client/screen/codex/AbstractProgressionCodexScreen.java b/src/main/java/com/sammy/malum/client/screen/codex/AbstractProgressionCodexScreen.java index 59c74b942..3784bb20a 100644 --- a/src/main/java/com/sammy/malum/client/screen/codex/AbstractProgressionCodexScreen.java +++ b/src/main/java/com/sammy/malum/client/screen/codex/AbstractProgressionCodexScreen.java @@ -1,16 +1,14 @@ package com.sammy.malum.client.screen.codex; -import com.mojang.blaze3d.vertex.*; -import com.sammy.malum.client.screen.codex.objects.*; -import net.minecraft.client.*; +import com.sammy.malum.client.screen.codex.objects.BookObject; +import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiGraphics; -import net.minecraft.network.chat.*; -import net.minecraft.resources.*; -import org.lwjgl.opengl.*; +import net.minecraft.network.chat.Component; +import org.lwjgl.opengl.GL11; -import java.util.*; - -import static com.sammy.malum.client.screen.codex.ArcanaCodexHelper.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; public abstract class AbstractProgressionCodexScreen extends AbstractMalumScreen { diff --git a/src/main/java/com/sammy/malum/client/screen/codex/ArcanaCodexHelper.java b/src/main/java/com/sammy/malum/client/screen/codex/ArcanaCodexHelper.java index 256c2483d..64a5a7476 100644 --- a/src/main/java/com/sammy/malum/client/screen/codex/ArcanaCodexHelper.java +++ b/src/main/java/com/sammy/malum/client/screen/codex/ArcanaCodexHelper.java @@ -1,34 +1,32 @@ package com.sammy.malum.client.screen.codex; -import com.mojang.blaze3d.systems.*; -import com.mojang.blaze3d.vertex.*; -import com.mojang.math.*; -import com.sammy.malum.core.systems.rites.*; -import com.sammy.malum.core.systems.spirit.*; -import net.minecraft.*; -import net.minecraft.client.*; +import com.mojang.blaze3d.systems.RenderSystem; +import com.mojang.blaze3d.vertex.PoseStack; +import com.sammy.malum.core.systems.rites.MalumRiteType; +import com.sammy.malum.core.systems.spirit.MalumSpiritType; +import net.minecraft.ChatFormatting; +import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Font; import net.minecraft.client.gui.GuiGraphics; -import net.minecraft.client.renderer.*; -import net.minecraft.network.chat.*; +import net.minecraft.client.gui.screens.Screen; +import net.minecraft.client.renderer.ShaderInstance; import net.minecraft.network.chat.Component; -import net.minecraft.resources.*; -import net.minecraft.util.*; -import net.minecraft.world.item.*; -import net.minecraft.world.item.crafting.*; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.util.Mth; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.crafting.Ingredient; import org.joml.Vector4f; -import org.lwjgl.opengl.*; -import team.lodestar.lodestone.setup.*; -import team.lodestar.lodestone.systems.easing.*; -import team.lodestar.lodestone.systems.recipe.*; -import team.lodestar.lodestone.systems.rendering.*; -import team.lodestar.lodestone.systems.rendering.shader.*; - -import java.awt.*; -import java.util.*; +import org.lwjgl.opengl.GL11; +import team.lodestar.lodestone.setup.LodestoneShaderRegistry; +import team.lodestar.lodestone.systems.easing.Easing; +import team.lodestar.lodestone.systems.recipe.IRecipeComponent; +import team.lodestar.lodestone.systems.rendering.VFXBuilders; +import team.lodestar.lodestone.systems.rendering.shader.ExtendedShaderInstance; + +import java.util.ArrayList; import java.util.List; -import java.util.function.*; -import java.util.stream.*; +import java.util.function.Supplier; +import java.util.stream.Collectors; import static com.sammy.malum.config.ClientConfig.BOOK_THEME; import static net.minecraft.util.FastColor.ARGB32.color; @@ -48,6 +46,7 @@ public static void renderRiteIcon(MalumRiteType rite, PoseStack stack, boolean c public static void renderRiteIcon(ResourceLocation texture, MalumSpiritType spiritType, PoseStack stack, boolean corrupted, float glowAlpha, int x, int y) { renderRiteIcon(texture, spiritType, stack, corrupted, glowAlpha, x, y, 0); } + public static void renderRiteIcon(ResourceLocation texture, MalumSpiritType spiritType, PoseStack stack, boolean corrupted, float glowAlpha, int x, int y, int z) { ExtendedShaderInstance shaderInstance = (ExtendedShaderInstance) LodestoneShaderRegistry.DISTORTED_TEXTURE.getInstance().get(); shaderInstance.safeGetUniform("YFrequency").set(corrupted ? 5f : 11f); @@ -131,6 +130,7 @@ public static void renderTexture(ResourceLocation texture, PoseStack poseStack, public static void renderTransparentTexture(ResourceLocation texture, PoseStack poseStack, int x, int y, float u, float v, int width, int height, int textureWidth, int textureHeight) { renderTransparentTexture(texture, poseStack, VFX_BUILDER, x, y, u, v, width, height, textureWidth, textureHeight); } + public static void renderTransparentTexture(ResourceLocation texture, PoseStack poseStack, VFXBuilders.ScreenVFXBuilder builder, int x, int y, float u, float v, int width, int height, int textureWidth, int textureHeight) { RenderSystem.enableBlend(); RenderSystem.enableDepthTest(); @@ -159,7 +159,7 @@ public static void renderComponent(AbstractMalumScreen screen, GuiGraphics guiGr guiGraphics.renderItem(stack, posX, posY); guiGraphics.renderItemDecorations(Minecraft.getInstance().font, stack, posX, posY, null); if (screen.isHovering(mouseX, mouseY, posX, posY, 16, 16)) { - guiGraphics.renderComponentTooltip(Minecraft.getInstance().font, screen.getTooltipFromItem(Minecraft.getInstance(), stack), mouseX, mouseY); + guiGraphics.renderComponentTooltip(Minecraft.getInstance().font, Screen.getTooltipFromItem(Minecraft.getInstance(), stack), mouseX, mouseY); } } @@ -177,7 +177,7 @@ public static void renderItem(AbstractMalumScreen screen, GuiGraphics guiGraphic guiGraphics.renderItem(stack, posX, posY); guiGraphics.renderItemDecorations(Minecraft.getInstance().font, stack, posX, posY, null); if (screen.isHovering(mouseX, mouseY, posX, posY, 16, 16)) { - guiGraphics.renderComponentTooltip(Minecraft.getInstance().font, screen.getTooltipFromItem(Minecraft.getInstance(), stack), mouseX, mouseY); + guiGraphics.renderComponentTooltip(Minecraft.getInstance().font, Screen.getTooltipFromItem(Minecraft.getInstance(), stack), mouseX, mouseY); } } @@ -185,7 +185,7 @@ public static void renderItem(AbstractMalumScreen screen, GuiGraphics guiGraphic guiGraphics.renderItem(stack, posX, posY); guiGraphics.renderItemDecorations(Minecraft.getInstance().font, stack, posX, posY, null); if (screen.isHovering(mouseX, mouseY, posX, posY, 16, 16)) { - guiGraphics.renderComponentTooltip(Minecraft.getInstance().font, screen.getTooltipFromItem(Minecraft.getInstance(), stack), mouseX, mouseY); + guiGraphics.renderComponentTooltip(Minecraft.getInstance().font, Screen.getTooltipFromItem(Minecraft.getInstance(), stack), mouseX, mouseY); } } @@ -384,12 +384,12 @@ private static void renderRawText(GuiGraphics guiGraphics, String text, int x, i int g = (int) Mth.lerp(glow, 44, 39); int b = (int) Mth.lerp(glow, 191, 228); - guiGraphics.drawString(font, text, x - 1, y, color(96, 255, 210, 243)); - guiGraphics.drawString(font, text, x + 1, y, color(128, 240, 131, 232)); - guiGraphics.drawString(font, text, x, y - 1, color(128, 255, 183, 236)); - guiGraphics.drawString(font, text, x, y + 1, color(96, 236, 110, 226)); + guiGraphics.drawString(font, text, x - 0.5f, y, color(96, 255, 210, 243), false); + guiGraphics.drawString(font, text, x + 0.5f, y, color(128, 240, 131, 232), false); + guiGraphics.drawString(font, text, x, y - 0.5f, color(128, 255, 183, 236), false); + guiGraphics.drawString(font, text, x, y + 0.5f, color(96, 236, 110, 226), false); - guiGraphics.drawString(font, text, x, y, color(255, r, g, b)); + guiGraphics.drawString(font, text, x, y, color(255, r, g, b), false); } public static float getTextGlow(float offset) { diff --git a/src/main/java/com/sammy/malum/client/screen/codex/ArcanaProgressionScreen.java b/src/main/java/com/sammy/malum/client/screen/codex/ArcanaProgressionScreen.java index 4255a8619..ac4417ed0 100644 --- a/src/main/java/com/sammy/malum/client/screen/codex/ArcanaProgressionScreen.java +++ b/src/main/java/com/sammy/malum/client/screen/codex/ArcanaProgressionScreen.java @@ -1,25 +1,31 @@ package com.sammy.malum.client.screen.codex; -import com.mojang.blaze3d.vertex.*; +import com.mojang.blaze3d.vertex.PoseStack; import com.sammy.malum.client.screen.codex.objects.*; import com.sammy.malum.client.screen.codex.pages.*; -import com.sammy.malum.common.events.*; -import com.sammy.malum.registry.common.*; -import com.sammy.malum.registry.common.item.*; -import net.minecraft.client.*; +import com.sammy.malum.common.events.SetupMalumCodexEntriesEvent; +import com.sammy.malum.registry.common.SoundRegistry; +import com.sammy.malum.registry.common.SpiritRiteRegistry; +import com.sammy.malum.registry.common.item.ItemRegistry; +import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiGraphics; -import net.minecraft.resources.*; -import net.minecraft.sounds.*; -import net.minecraft.world.item.*; -import net.minecraftforge.common.*; -import org.lwjgl.opengl.*; -import team.lodestar.lodestone.handlers.screenparticle.*; - -import java.util.*; -import java.util.function.*; - -import static com.sammy.malum.MalumMod.*; -import static com.sammy.malum.client.screen.codex.ArcanaCodexHelper.*; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.sounds.SoundEvent; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.Items; +import net.minecraftforge.common.MinecraftForge; +import org.lwjgl.opengl.GL11; +import team.lodestar.lodestone.handlers.screenparticle.ScreenParticleHandler; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import java.util.function.Supplier; + +import static com.sammy.malum.MalumMod.malumPath; +import static com.sammy.malum.client.screen.codex.ArcanaCodexHelper.renderTexture; +import static com.sammy.malum.client.screen.codex.ArcanaCodexHelper.renderTransparentTexture; import static com.sammy.malum.registry.common.item.ItemRegistry.*; import static net.minecraft.world.item.Items.*; import static org.lwjgl.opengl.GL11C.GL_SCISSOR_TEST; diff --git a/src/main/java/com/sammy/malum/client/screen/codex/EntryScreen.java b/src/main/java/com/sammy/malum/client/screen/codex/EntryScreen.java index 4ab1f24c3..445a4326e 100644 --- a/src/main/java/com/sammy/malum/client/screen/codex/EntryScreen.java +++ b/src/main/java/com/sammy/malum/client/screen/codex/EntryScreen.java @@ -1,20 +1,20 @@ package com.sammy.malum.client.screen.codex; -import com.mojang.blaze3d.vertex.*; -import com.sammy.malum.*; -import com.sammy.malum.client.screen.codex.objects.*; -import com.sammy.malum.client.screen.codex.pages.*; -import com.sammy.malum.config.*; -import com.sammy.malum.registry.common.*; -import net.minecraft.client.*; +import com.mojang.blaze3d.vertex.PoseStack; +import com.sammy.malum.MalumMod; +import com.sammy.malum.client.screen.codex.objects.EntryObject; +import com.sammy.malum.client.screen.codex.pages.BookPage; +import com.sammy.malum.config.ClientConfig; +import com.sammy.malum.registry.common.SoundRegistry; +import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiGraphics; -import net.minecraft.network.chat.*; -import net.minecraft.resources.*; -import net.minecraft.sounds.*; +import net.minecraft.network.chat.Component; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.sounds.SoundEvent; -import java.util.function.*; +import java.util.function.Supplier; -import static com.sammy.malum.client.screen.codex.ArcanaCodexHelper.*; +import static com.sammy.malum.client.screen.codex.ArcanaCodexHelper.renderTexture; public class EntryScreen extends AbstractMalumScreen { @@ -157,6 +157,6 @@ public static void openScreen(EntryObject entryObject) { } public float getSweetenerPitch() { - return 1 + (float)grouping / openObject.entry.pages.size(); + return 1 + (float) grouping / openObject.entry.pages.size(); } } \ No newline at end of file diff --git a/src/main/java/com/sammy/malum/client/screen/codex/VoidProgressionScreen.java b/src/main/java/com/sammy/malum/client/screen/codex/VoidProgressionScreen.java index 11b36ee9d..1c3e30a90 100644 --- a/src/main/java/com/sammy/malum/client/screen/codex/VoidProgressionScreen.java +++ b/src/main/java/com/sammy/malum/client/screen/codex/VoidProgressionScreen.java @@ -1,28 +1,27 @@ package com.sammy.malum.client.screen.codex; -import com.mojang.blaze3d.vertex.*; -import com.sammy.malum.client.screen.codex.objects.*; -import com.sammy.malum.client.screen.codex.pages.*; -import com.sammy.malum.common.events.*; -import com.sammy.malum.registry.common.*; -import com.sammy.malum.registry.common.item.*; -import net.minecraft.client.*; +import com.mojang.blaze3d.vertex.PoseStack; +import com.sammy.malum.common.events.SetupMalumCodexEntriesEvent; +import com.sammy.malum.registry.common.SoundRegistry; +import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiGraphics; -import net.minecraft.resources.*; -import net.minecraft.sounds.*; -import net.minecraft.world.item.*; -import net.minecraftforge.common.*; -import org.lwjgl.opengl.*; -import team.lodestar.lodestone.handlers.screenparticle.*; - -import java.util.*; -import java.util.function.*; - -import static com.sammy.malum.MalumMod.*; -import static com.sammy.malum.client.screen.codex.ArcanaCodexHelper.*; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.sounds.SoundEvent; +import net.minecraftforge.common.MinecraftForge; +import org.lwjgl.opengl.GL11; +import team.lodestar.lodestone.handlers.screenparticle.ScreenParticleHandler; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import java.util.function.Supplier; + +import static com.sammy.malum.MalumMod.malumPath; +import static com.sammy.malum.client.screen.codex.ArcanaCodexHelper.renderTexture; +import static com.sammy.malum.client.screen.codex.ArcanaCodexHelper.renderTransparentTexture; import static com.sammy.malum.registry.common.item.ItemRegistry.*; -import static net.minecraft.world.item.Items.*; -import static org.lwjgl.opengl.GL11C.*; +import static net.minecraft.world.item.Items.BARRIER; +import static org.lwjgl.opengl.GL11C.GL_SCISSOR_TEST; public class VoidProgressionScreen extends AbstractProgressionCodexScreen { @@ -65,7 +64,7 @@ public void renderBackground(PoseStack poseStack, float xModifier, float yModifi int insideLeft = getInsideLeft(); int insideTop = getInsideTop(); float uOffset = (bookInsideWidth / 4f - xOffset * xModifier); - float vOffset = (backgroundImageHeight/10.75f - yOffset * yModifier); + float vOffset = (backgroundImageHeight / 10.75f - yOffset * yModifier); if (uOffset <= 0) { uOffset = 0; } diff --git a/src/main/java/com/sammy/malum/client/screen/codex/objects/BookObject.java b/src/main/java/com/sammy/malum/client/screen/codex/objects/BookObject.java index 4d3bfc324..c11d38255 100644 --- a/src/main/java/com/sammy/malum/client/screen/codex/objects/BookObject.java +++ b/src/main/java/com/sammy/malum/client/screen/codex/objects/BookObject.java @@ -1,7 +1,6 @@ package com.sammy.malum.client.screen.codex.objects; -import com.mojang.blaze3d.vertex.PoseStack; -import com.sammy.malum.client.screen.codex.*; +import com.sammy.malum.client.screen.codex.AbstractProgressionCodexScreen; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiGraphics; diff --git a/src/main/java/com/sammy/malum/client/screen/codex/objects/EntryObject.java b/src/main/java/com/sammy/malum/client/screen/codex/objects/EntryObject.java index e96e5d72c..c552b6614 100644 --- a/src/main/java/com/sammy/malum/client/screen/codex/objects/EntryObject.java +++ b/src/main/java/com/sammy/malum/client/screen/codex/objects/EntryObject.java @@ -1,7 +1,8 @@ package com.sammy.malum.client.screen.codex.objects; -import com.mojang.blaze3d.vertex.PoseStack; -import com.sammy.malum.client.screen.codex.*; +import com.sammy.malum.client.screen.codex.AbstractProgressionCodexScreen; +import com.sammy.malum.client.screen.codex.BookEntry; +import com.sammy.malum.client.screen.codex.EntryScreen; import net.minecraft.ChatFormatting; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiGraphics; @@ -9,8 +10,10 @@ import java.util.Arrays; -import static com.sammy.malum.client.screen.codex.ArcanaCodexHelper.*; -import static com.sammy.malum.client.screen.codex.ArcanaProgressionScreen.*; +import static com.sammy.malum.client.screen.codex.ArcanaCodexHelper.renderTexture; +import static com.sammy.malum.client.screen.codex.ArcanaCodexHelper.renderTransparentTexture; +import static com.sammy.malum.client.screen.codex.ArcanaProgressionScreen.FADE_TEXTURE; +import static com.sammy.malum.client.screen.codex.ArcanaProgressionScreen.FRAME_TEXTURE; public class EntryObject extends BookObject { public final BookEntry entry; @@ -44,7 +47,7 @@ public void lateRender(Minecraft minecraft, GuiGraphics guiGraphics, float xOffs mouseX, mouseY ); - // screen.renderComponentTooltip(guiGraphics, Arrays.asList(Component.translatable(entry.translationKey()), Component.translatable(entry.descriptionTranslationKey()).withStyle(ChatFormatting.GRAY)), mouseX, mouseY, minecraft.font); + // screen.renderComponentTooltip(guiGraphics, Arrays.asList(Component.translatable(entry.translationKey()), Component.translatable(entry.descriptionTranslationKey()).withStyle(ChatFormatting.GRAY)), mouseX, mouseY, minecraft.font); } } diff --git a/src/main/java/com/sammy/malum/client/screen/codex/objects/IconObject.java b/src/main/java/com/sammy/malum/client/screen/codex/objects/IconObject.java index 09578e7ea..3e664838b 100644 --- a/src/main/java/com/sammy/malum/client/screen/codex/objects/IconObject.java +++ b/src/main/java/com/sammy/malum/client/screen/codex/objects/IconObject.java @@ -1,17 +1,20 @@ package com.sammy.malum.client.screen.codex.objects; -import com.mojang.blaze3d.vertex.*; -import com.sammy.malum.client.screen.codex.*; -import net.minecraft.client.*; -import net.minecraft.client.gui.Gui; +import com.mojang.blaze3d.vertex.PoseStack; +import com.sammy.malum.client.screen.codex.AbstractProgressionCodexScreen; +import com.sammy.malum.client.screen.codex.BookEntry; +import com.sammy.malum.client.screen.codex.EntryScreen; +import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiGraphics; -import net.minecraft.resources.*; +import net.minecraft.resources.ResourceLocation; import static com.sammy.malum.client.screen.codex.ArcanaCodexHelper.*; -import static com.sammy.malum.client.screen.codex.ArcanaProgressionScreen.*; +import static com.sammy.malum.client.screen.codex.ArcanaProgressionScreen.FADE_TEXTURE; +import static com.sammy.malum.client.screen.codex.ArcanaProgressionScreen.FRAME_TEXTURE; public class IconObject extends EntryObject { public final ResourceLocation textureLocation; + public IconObject(AbstractProgressionCodexScreen screen, BookEntry entry, ResourceLocation textureLocation, int posX, int posY) { super(screen, entry.setDark(), posX, posY); this.textureLocation = textureLocation; @@ -27,7 +30,7 @@ public void render(Minecraft minecraft, GuiGraphics guiGraphics, float xOffset, int posX = offsetPosX(xOffset); int posY = offsetPosY(yOffset); PoseStack poseStack = guiGraphics.pose(); - renderTransparentTexture(FADE_TEXTURE, poseStack, posX-13, posY-13, 1, 252, 58, 58, 512, 512); + renderTransparentTexture(FADE_TEXTURE, poseStack, posX - 13, posY - 13, 1, 252, 58, 58, 512, 512); renderTexture(FRAME_TEXTURE, poseStack, posX, posY, 67, getFrameTextureV(), width, height, 512, 512); renderTexture(FRAME_TEXTURE, poseStack, posX, posY, 166, getBackgroundTextureV(), width, height, 512, 512); renderWavyIcon(textureLocation, poseStack, posX + 8, posY + 8); diff --git a/src/main/java/com/sammy/malum/client/screen/codex/objects/ImportantEntryObject.java b/src/main/java/com/sammy/malum/client/screen/codex/objects/ImportantEntryObject.java index 5340dc4c9..83e0ceb34 100644 --- a/src/main/java/com/sammy/malum/client/screen/codex/objects/ImportantEntryObject.java +++ b/src/main/java/com/sammy/malum/client/screen/codex/objects/ImportantEntryObject.java @@ -1,12 +1,14 @@ package com.sammy.malum.client.screen.codex.objects; -import com.mojang.blaze3d.vertex.PoseStack; -import com.sammy.malum.client.screen.codex.*; +import com.sammy.malum.client.screen.codex.AbstractProgressionCodexScreen; +import com.sammy.malum.client.screen.codex.BookEntry; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiGraphics; -import static com.sammy.malum.client.screen.codex.ArcanaCodexHelper.*; -import static com.sammy.malum.client.screen.codex.ArcanaProgressionScreen.*; +import static com.sammy.malum.client.screen.codex.ArcanaCodexHelper.renderTexture; +import static com.sammy.malum.client.screen.codex.ArcanaCodexHelper.renderTransparentTexture; +import static com.sammy.malum.client.screen.codex.ArcanaProgressionScreen.FADE_TEXTURE; +import static com.sammy.malum.client.screen.codex.ArcanaProgressionScreen.FRAME_TEXTURE; public class ImportantEntryObject extends EntryObject { @@ -18,7 +20,7 @@ public ImportantEntryObject(AbstractProgressionCodexScreen screen, BookEntry ent public void render(Minecraft minecraft, GuiGraphics guiGraphics, float xOffset, float yOffset, int mouseX, int mouseY, float partialTicks) { int posX = offsetPosX(xOffset); int posY = offsetPosY(yOffset); - renderTransparentTexture(FADE_TEXTURE, guiGraphics.pose(), posX-13, posY-13, 1, 252, 58, 58, 512, 512); + renderTransparentTexture(FADE_TEXTURE, guiGraphics.pose(), posX - 13, posY - 13, 1, 252, 58, 58, 512, 512); renderTexture(FRAME_TEXTURE, guiGraphics.pose(), posX, posY, 34, getFrameTextureV(), width, height, 512, 512); renderTexture(FRAME_TEXTURE, guiGraphics.pose(), posX, posY, 133, getBackgroundTextureV(), width, height, 512, 512); guiGraphics.renderItem(entry.iconStack, posX + 8, posY + 8); diff --git a/src/main/java/com/sammy/malum/client/screen/codex/objects/MinorEntryObject.java b/src/main/java/com/sammy/malum/client/screen/codex/objects/MinorEntryObject.java index 4978026dc..c23427de6 100644 --- a/src/main/java/com/sammy/malum/client/screen/codex/objects/MinorEntryObject.java +++ b/src/main/java/com/sammy/malum/client/screen/codex/objects/MinorEntryObject.java @@ -1,12 +1,14 @@ package com.sammy.malum.client.screen.codex.objects; -import com.mojang.blaze3d.vertex.PoseStack; -import com.sammy.malum.client.screen.codex.*; +import com.sammy.malum.client.screen.codex.AbstractProgressionCodexScreen; +import com.sammy.malum.client.screen.codex.BookEntry; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiGraphics; -import static com.sammy.malum.client.screen.codex.ArcanaCodexHelper.*; -import static com.sammy.malum.client.screen.codex.ArcanaProgressionScreen.*; +import static com.sammy.malum.client.screen.codex.ArcanaCodexHelper.renderTexture; +import static com.sammy.malum.client.screen.codex.ArcanaCodexHelper.renderTransparentTexture; +import static com.sammy.malum.client.screen.codex.ArcanaProgressionScreen.FADE_TEXTURE; +import static com.sammy.malum.client.screen.codex.ArcanaProgressionScreen.FRAME_TEXTURE; public class MinorEntryObject extends EntryObject { @@ -18,7 +20,7 @@ public MinorEntryObject(AbstractProgressionCodexScreen screen, BookEntry entry, public void render(Minecraft minecraft, GuiGraphics guiGraphics, float xOffset, float yOffset, int mouseX, int mouseY, float partialTicks) { int posX = offsetPosX(xOffset); int posY = offsetPosY(yOffset); - renderTransparentTexture(FADE_TEXTURE, guiGraphics.pose(), posX-13, posY-13, 1, 252, 58, 58, 512, 512); + renderTransparentTexture(FADE_TEXTURE, guiGraphics.pose(), posX - 13, posY - 13, 1, 252, 58, 58, 512, 512); renderTexture(FRAME_TEXTURE, guiGraphics.pose(), posX, posY, 67, getFrameTextureV(), width, height, 512, 512); renderTexture(FRAME_TEXTURE, guiGraphics.pose(), posX, posY, 166, getBackgroundTextureV(), width, height, 512, 512); guiGraphics.renderItem(entry.iconStack, posX + 8, posY + 8); diff --git a/src/main/java/com/sammy/malum/client/screen/codex/objects/RiteEntryObject.java b/src/main/java/com/sammy/malum/client/screen/codex/objects/RiteEntryObject.java index 0ba08b0fc..93ad9d479 100644 --- a/src/main/java/com/sammy/malum/client/screen/codex/objects/RiteEntryObject.java +++ b/src/main/java/com/sammy/malum/client/screen/codex/objects/RiteEntryObject.java @@ -1,7 +1,8 @@ package com.sammy.malum.client.screen.codex.objects; -import com.mojang.blaze3d.vertex.PoseStack; -import com.sammy.malum.client.screen.codex.*; +import com.sammy.malum.client.screen.codex.AbstractProgressionCodexScreen; +import com.sammy.malum.client.screen.codex.BookEntry; +import com.sammy.malum.client.screen.codex.EntryScreen; import com.sammy.malum.client.screen.codex.pages.SpiritRiteTextPage; import com.sammy.malum.core.systems.rites.MalumRiteType; import net.minecraft.client.Minecraft; @@ -10,10 +11,12 @@ import java.util.Optional; import static com.sammy.malum.client.screen.codex.ArcanaCodexHelper.*; -import static com.sammy.malum.client.screen.codex.ArcanaProgressionScreen.*; +import static com.sammy.malum.client.screen.codex.ArcanaProgressionScreen.FADE_TEXTURE; +import static com.sammy.malum.client.screen.codex.ArcanaProgressionScreen.FRAME_TEXTURE; public class RiteEntryObject extends EntryObject { public final MalumRiteType riteType; + public RiteEntryObject(AbstractProgressionCodexScreen screen, BookEntry entry, int posX, int posY) { super(screen, entry.setDark(), posX, posY); Optional page = entry.pages.stream().filter(p -> p instanceof SpiritRiteTextPage).map(p -> ((SpiritRiteTextPage) p)).findAny(); diff --git a/src/main/java/com/sammy/malum/client/screen/codex/objects/VanishingEntryObject.java b/src/main/java/com/sammy/malum/client/screen/codex/objects/VanishingEntryObject.java index eb77c7ef7..cfd5bad8c 100644 --- a/src/main/java/com/sammy/malum/client/screen/codex/objects/VanishingEntryObject.java +++ b/src/main/java/com/sammy/malum/client/screen/codex/objects/VanishingEntryObject.java @@ -1,6 +1,7 @@ package com.sammy.malum.client.screen.codex.objects; -import com.sammy.malum.client.screen.codex.*; +import com.sammy.malum.client.screen.codex.AbstractProgressionCodexScreen; +import com.sammy.malum.client.screen.codex.BookEntry; import com.sammy.malum.registry.common.SoundRegistry; import net.minecraft.client.Minecraft; import net.minecraft.sounds.SoundSource; diff --git a/src/main/java/com/sammy/malum/client/screen/codex/pages/BookPage.java b/src/main/java/com/sammy/malum/client/screen/codex/pages/BookPage.java index bc7f0349d..0cb3115ba 100644 --- a/src/main/java/com/sammy/malum/client/screen/codex/pages/BookPage.java +++ b/src/main/java/com/sammy/malum/client/screen/codex/pages/BookPage.java @@ -1,13 +1,14 @@ package com.sammy.malum.client.screen.codex.pages; -import com.mojang.blaze3d.vertex.*; -import com.sammy.malum.client.screen.codex.*; -import net.minecraft.client.*; +import com.mojang.blaze3d.vertex.PoseStack; +import com.sammy.malum.client.screen.codex.BookEntry; +import com.sammy.malum.client.screen.codex.EntryScreen; +import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiGraphics; -import net.minecraft.resources.*; +import net.minecraft.resources.ResourceLocation; -import static com.sammy.malum.client.screen.codex.ArcanaCodexHelper.*; -import static com.sammy.malum.client.screen.codex.EntryScreen.*; +import static com.sammy.malum.client.screen.codex.ArcanaCodexHelper.renderTexture; +import static com.sammy.malum.client.screen.codex.EntryScreen.entryScreen; public class BookPage { public final ResourceLocation background; diff --git a/src/main/java/com/sammy/malum/client/screen/codex/pages/CraftingBookPage.java b/src/main/java/com/sammy/malum/client/screen/codex/pages/CraftingBookPage.java index 6eef711a0..418c968ed 100644 --- a/src/main/java/com/sammy/malum/client/screen/codex/pages/CraftingBookPage.java +++ b/src/main/java/com/sammy/malum/client/screen/codex/pages/CraftingBookPage.java @@ -1,9 +1,8 @@ package com.sammy.malum.client.screen.codex.pages; -import com.mojang.blaze3d.vertex.*; -import com.sammy.malum.*; -import com.sammy.malum.client.screen.codex.*; -import net.minecraft.client.*; +import com.sammy.malum.MalumMod; +import com.sammy.malum.client.screen.codex.EntryScreen; +import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.world.item.*; diff --git a/src/main/java/com/sammy/malum/client/screen/codex/pages/HeadlineTextItemPage.java b/src/main/java/com/sammy/malum/client/screen/codex/pages/HeadlineTextItemPage.java index e3c4d6c6c..e26223e00 100644 --- a/src/main/java/com/sammy/malum/client/screen/codex/pages/HeadlineTextItemPage.java +++ b/src/main/java/com/sammy/malum/client/screen/codex/pages/HeadlineTextItemPage.java @@ -1,12 +1,12 @@ package com.sammy.malum.client.screen.codex.pages; -import com.mojang.blaze3d.vertex.*; -import com.sammy.malum.*; -import com.sammy.malum.client.screen.codex.*; -import net.minecraft.client.*; +import com.sammy.malum.MalumMod; +import com.sammy.malum.client.screen.codex.EntryScreen; +import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiGraphics; -import net.minecraft.network.chat.*; -import net.minecraft.world.item.*; +import net.minecraft.network.chat.Component; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; import static com.sammy.malum.client.screen.codex.ArcanaCodexHelper.*; diff --git a/src/main/java/com/sammy/malum/client/screen/codex/pages/HeadlineTextPage.java b/src/main/java/com/sammy/malum/client/screen/codex/pages/HeadlineTextPage.java index f9bfb37c0..158251f67 100644 --- a/src/main/java/com/sammy/malum/client/screen/codex/pages/HeadlineTextPage.java +++ b/src/main/java/com/sammy/malum/client/screen/codex/pages/HeadlineTextPage.java @@ -1,13 +1,13 @@ package com.sammy.malum.client.screen.codex.pages; -import com.mojang.blaze3d.vertex.*; -import com.sammy.malum.*; -import com.sammy.malum.client.screen.codex.*; -import net.minecraft.client.*; +import com.sammy.malum.MalumMod; +import com.sammy.malum.client.screen.codex.EntryScreen; +import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiGraphics; -import net.minecraft.network.chat.*; +import net.minecraft.network.chat.Component; -import static com.sammy.malum.client.screen.codex.ArcanaCodexHelper.*; +import static com.sammy.malum.client.screen.codex.ArcanaCodexHelper.renderText; +import static com.sammy.malum.client.screen.codex.ArcanaCodexHelper.renderWrappingText; public class HeadlineTextPage extends BookPage { private final String headlineTranslationKey; diff --git a/src/main/java/com/sammy/malum/client/screen/codex/pages/SmeltingBookPage.java b/src/main/java/com/sammy/malum/client/screen/codex/pages/SmeltingBookPage.java index 16dcb445e..2faefb868 100644 --- a/src/main/java/com/sammy/malum/client/screen/codex/pages/SmeltingBookPage.java +++ b/src/main/java/com/sammy/malum/client/screen/codex/pages/SmeltingBookPage.java @@ -1,16 +1,16 @@ package com.sammy.malum.client.screen.codex.pages; -import com.mojang.blaze3d.vertex.*; -import com.sammy.malum.*; -import com.sammy.malum.client.screen.codex.*; -import net.minecraft.client.*; -import net.minecraft.client.gui.Gui; +import com.sammy.malum.MalumMod; +import com.sammy.malum.client.screen.codex.EntryScreen; +import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiGraphics; -import net.minecraft.world.*; -import net.minecraft.world.item.*; -import net.minecraft.world.item.crafting.*; +import net.minecraft.world.SimpleContainer; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.crafting.RecipeType; +import net.minecraft.world.item.crafting.SmeltingRecipe; -import java.util.*; +import java.util.Optional; import static com.sammy.malum.client.screen.codex.ArcanaCodexHelper.renderItem; diff --git a/src/main/java/com/sammy/malum/client/screen/codex/pages/SpiritCruciblePage.java b/src/main/java/com/sammy/malum/client/screen/codex/pages/SpiritCruciblePage.java index 0067bca2f..642705c43 100644 --- a/src/main/java/com/sammy/malum/client/screen/codex/pages/SpiritCruciblePage.java +++ b/src/main/java/com/sammy/malum/client/screen/codex/pages/SpiritCruciblePage.java @@ -1,16 +1,16 @@ package com.sammy.malum.client.screen.codex.pages; -import com.mojang.blaze3d.vertex.*; -import com.sammy.malum.*; -import com.sammy.malum.client.screen.codex.*; -import com.sammy.malum.common.recipe.*; -import net.minecraft.client.*; +import com.sammy.malum.MalumMod; +import com.sammy.malum.client.screen.codex.EntryScreen; +import com.sammy.malum.common.recipe.SpiritFocusingRecipe; +import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiGraphics; -import net.minecraft.world.item.*; +import net.minecraft.world.item.Item; -import java.util.function.*; +import java.util.function.Predicate; -import static com.sammy.malum.client.screen.codex.ArcanaCodexHelper.*; +import static com.sammy.malum.client.screen.codex.ArcanaCodexHelper.renderComponents; +import static com.sammy.malum.client.screen.codex.ArcanaCodexHelper.renderItem; @SuppressWarnings("all") public class SpiritCruciblePage extends BookPage { diff --git a/src/main/java/com/sammy/malum/client/screen/codex/pages/SpiritInfusionPage.java b/src/main/java/com/sammy/malum/client/screen/codex/pages/SpiritInfusionPage.java index 58d3ce7d8..93217a92f 100644 --- a/src/main/java/com/sammy/malum/client/screen/codex/pages/SpiritInfusionPage.java +++ b/src/main/java/com/sammy/malum/client/screen/codex/pages/SpiritInfusionPage.java @@ -1,15 +1,14 @@ package com.sammy.malum.client.screen.codex.pages; -import com.mojang.blaze3d.vertex.*; -import com.sammy.malum.*; -import com.sammy.malum.client.screen.codex.*; -import com.sammy.malum.common.recipe.*; -import net.minecraft.client.*; +import com.sammy.malum.MalumMod; +import com.sammy.malum.client.screen.codex.EntryScreen; +import com.sammy.malum.common.recipe.SpiritInfusionRecipe; +import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiGraphics; -import net.minecraft.world.item.*; -import net.minecraftforge.data.loading.*; +import net.minecraft.world.item.Item; +import net.minecraftforge.data.loading.DatagenModLoader; -import java.util.function.*; +import java.util.function.Predicate; import static com.sammy.malum.client.screen.codex.ArcanaCodexHelper.*; diff --git a/src/main/java/com/sammy/malum/client/screen/codex/pages/SpiritRepairPage.java b/src/main/java/com/sammy/malum/client/screen/codex/pages/SpiritRepairPage.java index 7319b803c..523989cbb 100644 --- a/src/main/java/com/sammy/malum/client/screen/codex/pages/SpiritRepairPage.java +++ b/src/main/java/com/sammy/malum/client/screen/codex/pages/SpiritRepairPage.java @@ -1,15 +1,14 @@ package com.sammy.malum.client.screen.codex.pages; -import com.mojang.blaze3d.vertex.*; -import com.sammy.malum.*; -import com.sammy.malum.client.screen.codex.*; -import com.sammy.malum.common.recipe.*; -import net.minecraft.client.*; +import com.sammy.malum.MalumMod; +import com.sammy.malum.client.screen.codex.EntryScreen; +import com.sammy.malum.common.recipe.SpiritRepairRecipe; +import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiGraphics; -import net.minecraft.world.item.*; +import net.minecraft.world.item.Item; -import java.util.function.*; -import java.util.stream.*; +import java.util.function.Predicate; +import java.util.stream.Collectors; import static com.sammy.malum.client.screen.codex.ArcanaCodexHelper.*; diff --git a/src/main/java/com/sammy/malum/client/screen/codex/pages/SpiritRiteRecipePage.java b/src/main/java/com/sammy/malum/client/screen/codex/pages/SpiritRiteRecipePage.java index 6f6758de4..3e7693534 100644 --- a/src/main/java/com/sammy/malum/client/screen/codex/pages/SpiritRiteRecipePage.java +++ b/src/main/java/com/sammy/malum/client/screen/codex/pages/SpiritRiteRecipePage.java @@ -1,28 +1,27 @@ package com.sammy.malum.client.screen.codex.pages; -import com.mojang.blaze3d.vertex.*; -import com.sammy.malum.*; -import com.sammy.malum.client.screen.codex.*; -import com.sammy.malum.core.systems.rites.*; -import com.sammy.malum.core.systems.spirit.*; -import net.minecraft.client.*; -import net.minecraft.client.gui.Gui; +import com.mojang.blaze3d.vertex.PoseStack; +import com.sammy.malum.MalumMod; +import com.sammy.malum.client.screen.codex.EntryScreen; +import com.sammy.malum.core.systems.rites.MalumRiteType; +import com.sammy.malum.core.systems.spirit.MalumSpiritType; +import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiGraphics; -import net.minecraft.resources.*; -import net.minecraft.world.item.*; -import team.lodestar.lodestone.handlers.screenparticle.*; -import team.lodestar.lodestone.helpers.*; -import team.lodestar.lodestone.setup.*; -import team.lodestar.lodestone.systems.easing.*; -import team.lodestar.lodestone.systems.particle.builder.*; -import team.lodestar.lodestone.systems.particle.data.*; -import team.lodestar.lodestone.systems.particle.data.color.*; -import team.lodestar.lodestone.systems.particle.data.spin.*; -import team.lodestar.lodestone.systems.particle.screen.*; +import net.minecraft.client.gui.screens.Screen; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.item.ItemStack; +import team.lodestar.lodestone.handlers.screenparticle.ScreenParticleHandler; +import team.lodestar.lodestone.helpers.RandomHelper; +import team.lodestar.lodestone.setup.LodestoneScreenParticleRegistry; +import team.lodestar.lodestone.systems.easing.Easing; +import team.lodestar.lodestone.systems.particle.builder.ScreenParticleBuilder; +import team.lodestar.lodestone.systems.particle.data.GenericParticleData; +import team.lodestar.lodestone.systems.particle.data.spin.SpinParticleData; +import team.lodestar.lodestone.systems.particle.screen.ScreenParticleHolder; -import java.util.*; +import java.util.List; -import static com.sammy.malum.client.screen.codex.ArcanaCodexHelper.*; +import static com.sammy.malum.client.screen.codex.ArcanaCodexHelper.renderRiteIcon; import static net.minecraft.util.Mth.nextFloat; public class SpiritRiteRecipePage extends BookPage { @@ -68,7 +67,7 @@ public void renderRite(GuiGraphics guiGraphics, EntryScreen screen, int left, in ItemStack stack = spirits.get(i).spiritShard.get().getDefaultInstance(); renderRiteIcon(spiritTexture, spiritType, poseStack, parentEntry.isSoulwood, 0.25f, left, y); if (screen.isHovering(mouseX, mouseY, left, y, 16, 16)) { - guiGraphics.renderComponentTooltip(Minecraft.getInstance().font, screen.getTooltipFromItem(Minecraft.getInstance(), stack), mouseX, mouseY); + guiGraphics.renderComponentTooltip(Minecraft.getInstance().font, Screen.getTooltipFromItem(Minecraft.getInstance(), stack), mouseX, mouseY); } if (ScreenParticleHandler.canSpawnParticles) { final int x = left + 8; @@ -83,8 +82,8 @@ public void renderRite(GuiGraphics guiGraphics, EntryScreen screen, int left, in .setColorData(spiritType.createMainColorData().setCoefficient(0.25f).build()) .setLifetime(lifetime) .setMotion(0, yMotion) - .spawn(x -xOffset, y) - .spawn(x+xOffset, y); + .spawn(x - xOffset, y) + .spawn(x + xOffset, y); } } } diff --git a/src/main/java/com/sammy/malum/client/screen/codex/pages/SpiritRiteTextPage.java b/src/main/java/com/sammy/malum/client/screen/codex/pages/SpiritRiteTextPage.java index fc008a170..bfd3b7781 100644 --- a/src/main/java/com/sammy/malum/client/screen/codex/pages/SpiritRiteTextPage.java +++ b/src/main/java/com/sammy/malum/client/screen/codex/pages/SpiritRiteTextPage.java @@ -1,12 +1,11 @@ package com.sammy.malum.client.screen.codex.pages; -import com.mojang.blaze3d.vertex.*; -import com.sammy.malum.*; -import com.sammy.malum.client.screen.codex.*; -import com.sammy.malum.core.systems.rites.*; -import net.minecraft.client.*; +import com.sammy.malum.MalumMod; +import com.sammy.malum.client.screen.codex.EntryScreen; +import com.sammy.malum.core.systems.rites.MalumRiteType; +import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiGraphics; -import net.minecraft.network.chat.*; +import net.minecraft.network.chat.Component; import static com.sammy.malum.client.screen.codex.ArcanaCodexHelper.*; diff --git a/src/main/java/com/sammy/malum/client/screen/codex/pages/SpiritTransmutationPage.java b/src/main/java/com/sammy/malum/client/screen/codex/pages/SpiritTransmutationPage.java index e77a0c471..4ffad564f 100644 --- a/src/main/java/com/sammy/malum/client/screen/codex/pages/SpiritTransmutationPage.java +++ b/src/main/java/com/sammy/malum/client/screen/codex/pages/SpiritTransmutationPage.java @@ -1,21 +1,21 @@ package com.sammy.malum.client.screen.codex.pages; -import com.mojang.blaze3d.vertex.*; -import com.sammy.malum.*; -import com.sammy.malum.client.screen.codex.*; -import com.sammy.malum.common.recipe.*; -import com.sammy.malum.registry.common.item.*; -import net.minecraft.client.*; -import net.minecraft.client.gui.Gui; +import com.sammy.malum.MalumMod; +import com.sammy.malum.client.screen.codex.EntryScreen; +import com.sammy.malum.common.recipe.SpiritTransmutationRecipe; +import com.sammy.malum.registry.common.item.ItemRegistry; +import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiGraphics; -import net.minecraft.network.chat.*; -import net.minecraft.world.item.*; -import net.minecraft.world.item.crafting.*; -import net.minecraftforge.data.loading.*; -import team.lodestar.lodestone.helpers.*; -import team.lodestar.lodestone.systems.recipe.*; +import net.minecraft.network.chat.Component; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.crafting.Ingredient; +import net.minecraftforge.data.loading.DatagenModLoader; +import team.lodestar.lodestone.helpers.DataHelper; +import team.lodestar.lodestone.systems.recipe.WrappedIngredient; -import java.util.*; +import java.util.ArrayList; +import java.util.List; import static com.sammy.malum.client.screen.codex.ArcanaCodexHelper.*; diff --git a/src/main/java/com/sammy/malum/client/screen/codex/pages/TextPage.java b/src/main/java/com/sammy/malum/client/screen/codex/pages/TextPage.java index e0d08eb06..3981d014d 100644 --- a/src/main/java/com/sammy/malum/client/screen/codex/pages/TextPage.java +++ b/src/main/java/com/sammy/malum/client/screen/codex/pages/TextPage.java @@ -1,12 +1,11 @@ package com.sammy.malum.client.screen.codex.pages; -import com.mojang.blaze3d.vertex.*; -import com.sammy.malum.*; -import com.sammy.malum.client.screen.codex.*; -import net.minecraft.client.*; +import com.sammy.malum.MalumMod; +import com.sammy.malum.client.screen.codex.EntryScreen; +import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiGraphics; -import static com.sammy.malum.client.screen.codex.ArcanaCodexHelper.*; +import static com.sammy.malum.client.screen.codex.ArcanaCodexHelper.renderWrappingText; public class TextPage extends BookPage { public final String translationKey; diff --git a/src/main/java/com/sammy/malum/client/screen/container/SpiritPouchContainerScreen.java b/src/main/java/com/sammy/malum/client/screen/container/SpiritPouchContainerScreen.java index 3a480ea68..b0557eeee 100644 --- a/src/main/java/com/sammy/malum/client/screen/container/SpiritPouchContainerScreen.java +++ b/src/main/java/com/sammy/malum/client/screen/container/SpiritPouchContainerScreen.java @@ -1,7 +1,6 @@ package com.sammy.malum.client.screen.container; import com.mojang.blaze3d.systems.RenderSystem; -import com.mojang.blaze3d.vertex.PoseStack; import com.sammy.malum.MalumMod; import com.sammy.malum.common.container.SpiritPouchContainer; import net.minecraft.client.gui.GuiGraphics; diff --git a/src/main/java/com/sammy/malum/client/screen/container/WeaversWorkbenchContainerScreen.java b/src/main/java/com/sammy/malum/client/screen/container/WeaversWorkbenchContainerScreen.java index 689cfea53..e276fda61 100644 --- a/src/main/java/com/sammy/malum/client/screen/container/WeaversWorkbenchContainerScreen.java +++ b/src/main/java/com/sammy/malum/client/screen/container/WeaversWorkbenchContainerScreen.java @@ -1,33 +1,36 @@ package com.sammy.malum.client.screen.container; -import com.mojang.blaze3d.platform.*; -import com.mojang.blaze3d.systems.*; -import com.mojang.blaze3d.vertex.*; -import com.mojang.math.*; -import com.sammy.malum.*; -import com.sammy.malum.common.container.*; -import net.minecraft.client.*; -import net.minecraft.client.gui.Gui; +import com.mojang.blaze3d.platform.Lighting; +import com.mojang.blaze3d.systems.RenderSystem; +import com.mojang.blaze3d.vertex.PoseStack; +import com.sammy.malum.MalumMod; +import com.sammy.malum.common.container.WeaversWorkbenchContainer; +import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiGraphics; -import net.minecraft.client.gui.screens.Screen; -import net.minecraft.client.gui.screens.inventory.*; -import net.minecraft.client.renderer.*; -import net.minecraft.client.renderer.entity.*; -import net.minecraft.network.chat.*; -import net.minecraft.resources.*; -import net.minecraft.world.entity.*; -import net.minecraft.world.entity.decoration.*; -import net.minecraft.world.entity.player.*; -import net.minecraft.world.item.*; +import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen; +import net.minecraft.client.gui.screens.inventory.InventoryScreen; +import net.minecraft.client.gui.screens.inventory.SmithingScreen; +import net.minecraft.client.renderer.GameRenderer; +import net.minecraft.client.renderer.MultiBufferSource; +import net.minecraft.client.renderer.entity.EntityRenderDispatcher; +import net.minecraft.network.chat.Component; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.entity.EquipmentSlot; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.entity.decoration.ArmorStand; +import net.minecraft.world.entity.player.Inventory; +import net.minecraft.world.item.ArmorItem; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; import org.joml.Matrix4f; -import org.joml.Matrix4fc; import org.joml.Quaternionf; -import javax.annotation.*; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; public class WeaversWorkbenchContainerScreen extends AbstractContainerScreen { - public static final Quaternionf ROTATION = new Quaternionf(0.43633232F, 0.0F, 3.1415927F, 0); + public static final Quaternionf ROTATION = (new Quaternionf()).rotationXYZ(0.43633232F, 0.0F, (float)Math.PI); private static final ResourceLocation TEXTURE = MalumMod.malumPath("textures/gui/weavers_workbench.png"); private final WeaversWorkbenchContainer weaversWorkbenchContainer; @@ -44,12 +47,14 @@ public WeaversWorkbenchContainerScreen(WeaversWorkbenchContainer pMenu, Inventor this.imageHeight = 166; setupArmorStand(); } + @Override public void render(@Nonnull GuiGraphics poseStack, int mouseX, int mouseY, float partialTicks) { this.renderBackground(poseStack); super.render(poseStack, mouseX, mouseY, partialTicks); this.renderTooltip(poseStack, mouseX, mouseY); } + @Override protected void renderBg(GuiGraphics pGuiGraphics, float pPartialTick, int pMouseX, int pMouseY) { RenderSystem.setShader(GameRenderer::getPositionTexShader); @@ -64,7 +69,8 @@ protected void renderBg(GuiGraphics pGuiGraphics, float pPartialTick, int pMouse } cachedOutput = output; - drawEntity(pGuiGraphics.pose(), this.leftPos + 141, this.topPos + 65, 25, ROTATION, null, this.armorStand); + InventoryScreen.renderEntityInInventory(pGuiGraphics, this.leftPos + 141, this.topPos + 65, 25, ROTATION, null, this.armorStand); + //drawEntity(pGuiGraphics.pose(), this.leftPos + 141, this.topPos + 65, 25, ROTATION, null, this.armorStand); } protected void setupArmorStand() { @@ -95,34 +101,5 @@ private void dressUpStand(ItemStack stack) { } } } - - public static void drawEntity(PoseStack matrices, int x, int y, int size, Quaternionf matrixMultiplier, @Nullable Quaternionf rotation, LivingEntity entity) { - PoseStack matrixStack = RenderSystem.getModelViewStack(); - matrixStack.pushPose(); - matrixStack.translate(0.0, 0.0, 1000.0); - RenderSystem.applyModelViewMatrix(); - matrices.pushPose(); - matrices.translate(x, y, -950.0); - matrices.mulPoseMatrix((new Matrix4f()).scaling((float)size, (float)size, (float)(-size))); - matrices.mulPose(matrixMultiplier); - Lighting.setupForEntityInInventory(); - EntityRenderDispatcher entityRenderDispatcher = Minecraft.getInstance().getEntityRenderDispatcher(); - if (rotation != null) { - rotation.conjugate(); - entityRenderDispatcher.overrideCameraOrientation(rotation); - } - - entityRenderDispatcher.setRenderShadow(false); - MultiBufferSource.BufferSource immediate = Minecraft.getInstance().renderBuffers().bufferSource(); - RenderSystem.runAsFancy(() -> { - entityRenderDispatcher.render(entity, 0.0, 0.0, 0.0, 0.0F, 1.0F, matrices, immediate, 15728880); - }); - immediate.endBatch(); - entityRenderDispatcher.setRenderShadow(true); - matrices.popPose(); - Lighting.setupForFlatItems(); - matrixStack.popPose(); - RenderSystem.applyModelViewMatrix(); - } } diff --git a/src/main/java/com/sammy/malum/common/block/blight/BlightedSoilBlock.java b/src/main/java/com/sammy/malum/common/block/blight/BlightedSoilBlock.java index c7b60bfe7..3310cfb9f 100644 --- a/src/main/java/com/sammy/malum/common/block/blight/BlightedSoilBlock.java +++ b/src/main/java/com/sammy/malum/common/block/blight/BlightedSoilBlock.java @@ -1,24 +1,30 @@ package com.sammy.malum.common.block.blight; -import com.sammy.malum.common.item.spirit.*; -import com.sammy.malum.common.worldevent.*; -import com.sammy.malum.common.worldgen.*; -import com.sammy.malum.registry.common.*; -import net.minecraft.core.*; -import net.minecraft.server.level.*; -import net.minecraft.sounds.*; +import com.sammy.malum.common.item.spirit.SpiritShardItem; +import com.sammy.malum.common.worldevent.ActiveBlightEvent; +import com.sammy.malum.common.worldgen.SoulwoodTreeFeature; +import com.sammy.malum.registry.common.SoundRegistry; +import net.minecraft.core.BlockPos; +import net.minecraft.server.level.ServerLevel; +import net.minecraft.sounds.SoundEvents; +import net.minecraft.sounds.SoundSource; import net.minecraft.util.RandomSource; -import net.minecraft.world.*; -import net.minecraft.world.entity.player.*; -import net.minecraft.world.item.*; -import net.minecraft.world.level.*; -import net.minecraft.world.level.block.*; -import net.minecraft.world.level.block.state.*; -import net.minecraft.world.phys.*; -import net.minecraft.world.phys.shapes.*; -import team.lodestar.lodestone.systems.worldgen.*; - -import java.util.*; +import net.minecraft.world.InteractionHand; +import net.minecraft.world.InteractionResult; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.level.BlockGetter; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.LevelReader; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.BonemealableBlock; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.phys.BlockHitResult; +import net.minecraft.world.phys.shapes.CollisionContext; +import net.minecraft.world.phys.shapes.Shapes; +import net.minecraft.world.phys.shapes.VoxelShape; +import team.lodestar.lodestone.systems.worldgen.LodestoneBlockFiller; public class BlightedSoilBlock extends Block implements BonemealableBlock { protected static final VoxelShape SHAPE = Block.box(0.0D, 0.0D, 0.0D, 16.0D, 14.0D, 16.0D); diff --git a/src/main/java/com/sammy/malum/common/block/blight/BlightedSoulwoodBlock.java b/src/main/java/com/sammy/malum/common/block/blight/BlightedSoulwoodBlock.java index a1edde8aa..b9d81bb86 100644 --- a/src/main/java/com/sammy/malum/common/block/blight/BlightedSoulwoodBlock.java +++ b/src/main/java/com/sammy/malum/common/block/blight/BlightedSoulwoodBlock.java @@ -20,7 +20,7 @@ public BlightedSoulwoodBlock(Properties p_49795_) { public BlockState getToolModifiedState(BlockState state, UseOnContext context, ToolAction toolAction, boolean simulate) { if (toolAction.equals(ToolActions.AXE_STRIP)) { if (!simulate) { - context.getLevel().playSound(null, context.getClickedPos(), SoundRegistry.MAJOR_BLIGHT_MOTIF.get(), SoundSource.BLOCKS,1, 1); + context.getLevel().playSound(null, context.getClickedPos(), SoundRegistry.MAJOR_BLIGHT_MOTIF.get(), SoundSource.BLOCKS, 1, 1); } return BlockRegistry.SOULWOOD_LOG.get().defaultBlockState(); } diff --git a/src/main/java/com/sammy/malum/common/block/curiosities/obelisk/ObeliskComponentBlock.java b/src/main/java/com/sammy/malum/common/block/curiosities/obelisk/ObeliskComponentBlock.java index 2e20b45a5..5337c7b49 100644 --- a/src/main/java/com/sammy/malum/common/block/curiosities/obelisk/ObeliskComponentBlock.java +++ b/src/main/java/com/sammy/malum/common/block/curiosities/obelisk/ObeliskComponentBlock.java @@ -18,6 +18,7 @@ public class ObeliskComponentBlock extends MultiblockComponentBlock { public static final VoxelShape SHAPE = makeShape(); private final Supplier cloneStack; + public ObeliskComponentBlock(Properties properties, Supplier cloneStack) { super(properties); this.cloneStack = cloneStack; @@ -33,7 +34,7 @@ public ItemStack getCloneItemStack(BlockState state, HitResult target, BlockGett return cloneStack.get().getDefaultInstance(); } - public static VoxelShape makeShape(){ + public static VoxelShape makeShape() { VoxelShape shape = Shapes.empty(); shape = Shapes.join(shape, Shapes.box(0.1875, 0, 0.1875, 0.8125, 0.5625, 0.8125), BooleanOp.OR); diff --git a/src/main/java/com/sammy/malum/common/block/curiosities/obelisk/RunewoodObeliskBlockEntity.java b/src/main/java/com/sammy/malum/common/block/curiosities/obelisk/RunewoodObeliskBlockEntity.java index e82762a49..3fa8a9cef 100644 --- a/src/main/java/com/sammy/malum/common/block/curiosities/obelisk/RunewoodObeliskBlockEntity.java +++ b/src/main/java/com/sammy/malum/common/block/curiosities/obelisk/RunewoodObeliskBlockEntity.java @@ -1,23 +1,17 @@ package com.sammy.malum.common.block.curiosities.obelisk; -import com.sammy.malum.common.block.curiosities.spirit_altar.*; -import com.sammy.malum.core.systems.spirit.*; -import com.sammy.malum.registry.common.block.*; -import com.sammy.malum.visual_effects.*; -import net.minecraft.core.*; -import net.minecraft.world.level.block.state.*; -import net.minecraft.world.phys.*; -import team.lodestar.lodestone.helpers.*; -import team.lodestar.lodestone.setup.*; -import team.lodestar.lodestone.systems.easing.*; -import team.lodestar.lodestone.systems.multiblock.*; -import team.lodestar.lodestone.systems.particle.builder.*; -import team.lodestar.lodestone.systems.particle.data.*; -import team.lodestar.lodestone.systems.particle.data.color.*; -import team.lodestar.lodestone.systems.particle.data.spin.*; - -import java.awt.*; -import java.util.function.*; +import com.sammy.malum.common.block.curiosities.spirit_altar.IAltarAccelerator; +import com.sammy.malum.common.block.curiosities.spirit_altar.SpiritAltarBlockEntity; +import com.sammy.malum.core.systems.spirit.MalumSpiritType; +import com.sammy.malum.registry.common.block.BlockEntityRegistry; +import com.sammy.malum.registry.common.block.BlockRegistry; +import com.sammy.malum.visual_effects.SpiritAltarParticleEffects; +import net.minecraft.core.BlockPos; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.phys.Vec3; +import team.lodestar.lodestone.systems.multiblock.MultiBlockStructure; + +import java.util.function.Supplier; public class RunewoodObeliskBlockEntity extends ObeliskCoreBlockEntity implements IAltarAccelerator { private static final Vec3 OBELISK_PARTICLE_OFFSET = new Vec3(0.5f, 2f, 0.5f); @@ -43,6 +37,7 @@ public float getAcceleration() { public void addParticles(SpiritAltarBlockEntity blockEntity, MalumSpiritType activeSpiritType) { SpiritAltarParticleEffects.runewoodObeliskParticles(this, blockEntity, activeSpiritType); } + public Vec3 getParticleOffset() { return OBELISK_PARTICLE_OFFSET; } diff --git a/src/main/java/com/sammy/malum/common/block/curiosities/spirit_altar/IAltarAccelerator.java b/src/main/java/com/sammy/malum/common/block/curiosities/spirit_altar/IAltarAccelerator.java index df2eb1d0d..f26730e7e 100644 --- a/src/main/java/com/sammy/malum/common/block/curiosities/spirit_altar/IAltarAccelerator.java +++ b/src/main/java/com/sammy/malum/common/block/curiosities/spirit_altar/IAltarAccelerator.java @@ -1,6 +1,6 @@ package com.sammy.malum.common.block.curiosities.spirit_altar; -import com.sammy.malum.core.systems.spirit.*; +import com.sammy.malum.core.systems.spirit.MalumSpiritType; public interface IAltarAccelerator { diff --git a/src/main/java/com/sammy/malum/common/block/curiosities/spirit_altar/SpiritAltarBlock.java b/src/main/java/com/sammy/malum/common/block/curiosities/spirit_altar/SpiritAltarBlock.java index 49d7f4ba5..0f8ed9603 100644 --- a/src/main/java/com/sammy/malum/common/block/curiosities/spirit_altar/SpiritAltarBlock.java +++ b/src/main/java/com/sammy/malum/common/block/curiosities/spirit_altar/SpiritAltarBlock.java @@ -14,12 +14,11 @@ import net.minecraftforge.items.wrapper.EmptyHandler; import team.lodestar.lodestone.systems.block.WaterLoggedEntityBlock; -public class SpiritAltarBlock extends WaterLoggedEntityBlock -{ +public class SpiritAltarBlock extends WaterLoggedEntityBlock { public static final VoxelShape SHAPE = makeShape(); public static final VoxelShape RENDER_SHAPE = makeRenderShape(); - public SpiritAltarBlock(Properties properties) - { + + public SpiritAltarBlock(Properties properties) { super(properties); } @@ -52,7 +51,7 @@ public boolean hasAnalogOutputSignal(BlockState pState) { return true; } - public static VoxelShape makeShape(){ + public static VoxelShape makeShape() { VoxelShape shape = Shapes.empty(); shape = Shapes.join(shape, Shapes.box(0.0625, 0, 0.0625, 0.9375, 0.25, 0.9375), BooleanOp.OR); shape = Shapes.join(shape, Shapes.box(0.1875, 0.25, 0.1875, 0.8125, 0.625, 0.8125), BooleanOp.OR); @@ -69,7 +68,7 @@ public static VoxelShape makeShape(){ return shape; } - public static VoxelShape makeRenderShape(){ + public static VoxelShape makeRenderShape() { VoxelShape shape = Shapes.empty(); shape = Shapes.join(shape, Shapes.box(0.0625, 0, 0.0625, 0.9375, 0.25, 0.9375), BooleanOp.OR); shape = Shapes.join(shape, Shapes.box(0.1875, 0.25, 0.1875, 0.8125, 0.625, 0.8125), BooleanOp.OR); diff --git a/src/main/java/com/sammy/malum/common/block/curiosities/spirit_altar/SpiritAltarBlockEntity.java b/src/main/java/com/sammy/malum/common/block/curiosities/spirit_altar/SpiritAltarBlockEntity.java index fef66e389..4edeb7b9b 100644 --- a/src/main/java/com/sammy/malum/common/block/curiosities/spirit_altar/SpiritAltarBlockEntity.java +++ b/src/main/java/com/sammy/malum/common/block/curiosities/spirit_altar/SpiritAltarBlockEntity.java @@ -1,39 +1,46 @@ package com.sammy.malum.common.block.curiosities.spirit_altar; -import com.sammy.malum.common.block.storage.*; -import com.sammy.malum.common.item.spirit.*; -import com.sammy.malum.common.recipe.*; - -import com.sammy.malum.core.systems.recipe.*; -import com.sammy.malum.registry.common.*; -import com.sammy.malum.registry.common.block.*; -import com.sammy.malum.visual_effects.*; -import com.sammy.malum.visual_effects.networked.altar.*; -import com.sammy.malum.visual_effects.networked.data.*; -import net.minecraft.core.*; -import net.minecraft.nbt.*; -import net.minecraft.sounds.*; -import net.minecraft.util.*; -import net.minecraft.world.*; -import net.minecraft.world.entity.item.*; -import net.minecraft.world.entity.player.*; -import net.minecraft.world.item.*; -import net.minecraft.world.level.block.entity.*; -import net.minecraft.world.level.block.state.*; -import net.minecraft.world.phys.*; -import net.minecraftforge.common.capabilities.*; -import net.minecraftforge.common.util.*; -import net.minecraftforge.items.*; -import net.minecraftforge.items.wrapper.*; -import org.jetbrains.annotations.*; -import team.lodestar.lodestone.helpers.*; -import team.lodestar.lodestone.systems.blockentity.*; -import team.lodestar.lodestone.systems.easing.*; -import team.lodestar.lodestone.systems.recipe.*; +import com.sammy.malum.common.block.storage.IMalumSpecialItemAccessPoint; +import com.sammy.malum.common.item.spirit.SpiritShardItem; +import com.sammy.malum.common.recipe.SpiritInfusionRecipe; +import com.sammy.malum.core.systems.recipe.SpiritWithCount; +import com.sammy.malum.registry.common.ParticleEffectTypeRegistry; +import com.sammy.malum.registry.common.SoundRegistry; +import com.sammy.malum.registry.common.SpiritTypeRegistry; +import com.sammy.malum.registry.common.block.BlockEntityRegistry; +import com.sammy.malum.visual_effects.SpiritAltarParticleEffects; +import com.sammy.malum.visual_effects.networked.altar.SpiritAltarEatItemParticleEffect; +import com.sammy.malum.visual_effects.networked.data.ColorEffectData; +import com.sammy.malum.visual_effects.networked.data.PositionEffectData; +import net.minecraft.core.BlockPos; +import net.minecraft.core.Direction; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.sounds.SoundSource; +import net.minecraft.util.Mth; +import net.minecraft.world.InteractionHand; +import net.minecraft.world.InteractionResult; +import net.minecraft.world.entity.item.ItemEntity; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.level.block.entity.BlockEntity; +import net.minecraft.world.level.block.entity.BlockEntityType; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.phys.Vec3; +import net.minecraftforge.common.capabilities.Capability; +import net.minecraftforge.common.capabilities.ForgeCapabilities; +import net.minecraftforge.common.util.LazyOptional; +import net.minecraftforge.items.IItemHandler; +import net.minecraftforge.items.wrapper.CombinedInvWrapper; +import org.jetbrains.annotations.NotNull; +import team.lodestar.lodestone.helpers.BlockHelper; +import team.lodestar.lodestone.helpers.DataHelper; +import team.lodestar.lodestone.systems.blockentity.LodestoneBlockEntity; +import team.lodestar.lodestone.systems.blockentity.LodestoneBlockEntityInventory; +import team.lodestar.lodestone.systems.easing.Easing; +import team.lodestar.lodestone.systems.recipe.IngredientWithCount; +import javax.annotation.Nonnull; import javax.annotation.Nullable; -import javax.annotation.*; -import java.util.List; import java.util.*; public class SpiritAltarBlockEntity extends LodestoneBlockEntity { @@ -147,7 +154,7 @@ public void load(CompoundTag compound) { int amount = compound.getInt("acceleratorAmount"); for (int i = 0; i < amount; i++) { BlockPos pos = BlockHelper.loadBlockPos(compound, "" + i); - if (level != null && level().getBlockEntity(pos) instanceof IAltarAccelerator accelerator) { + if (level != null && level.getBlockEntity(pos) instanceof IAltarAccelerator accelerator) { acceleratorPositions.add(pos); accelerators.add(accelerator); } @@ -229,7 +236,7 @@ public void tick() { isCrafting = false; progress = 0; if (spiritYLevel > 0) { - this.spiritYLevel = Math.max(spiritYLevel-0.8f, 0); + this.spiritYLevel = Math.max(spiritYLevel - 0.8f, 0); } } if (level.isClientSide) { @@ -263,7 +270,7 @@ public boolean consume() { requestedItem = recipe.extraItems.get(extras); matches = requestedItem.matches(providedStack); if (matches) { - level().playSound(null, provider.getAccessPointBlockPos(), SoundRegistry.ALTAR_CONSUME.get(), SoundSource.BLOCKS, 1, 0.9f + level().random.nextFloat() * 0.2f); + level.playSound(null, provider.getAccessPointBlockPos(), SoundRegistry.ALTAR_CONSUME.get(), SoundSource.BLOCKS, 1, 0.9f + level.random.nextFloat() * 0.2f); ParticleEffectTypeRegistry.SPIRIT_ALTAR_EATS_ITEM.createPositionedEffect(level, new PositionEffectData(worldPosition), ColorEffectData.fromRecipe(recipe.spirits), SpiritAltarEatItemParticleEffect.createData(provider.getAccessPointBlockPos(), providedStack)); extrasInventory.insertItem(level, providedStack.split(requestedItem.count)); inventoryForAltar.updateData(); @@ -298,8 +305,8 @@ public void craft() { ParticleEffectTypeRegistry.SPIRIT_ALTAR_CRAFTS.createPositionedEffect(level, new PositionEffectData(worldPosition), ColorEffectData.fromRecipe(recipe.spirits)); progress *= 0.75f; extrasInventory.clear(); - level().playSound(null, worldPosition, SoundRegistry.ALTAR_CRAFT.get(), SoundSource.BLOCKS, 1, 0.9f + level().random.nextFloat() * 0.2f); - level().addFreshEntity(new ItemEntity(level, itemPos.x, itemPos.y, itemPos.z, outputStack)); + level.playSound(null, worldPosition, SoundRegistry.ALTAR_CRAFT.get(), SoundSource.BLOCKS, 1, 0.9f + level.random.nextFloat() * 0.2f); + level.addFreshEntity(new ItemEntity(level, itemPos.x, itemPos.y, itemPos.z, outputStack)); init(); recalibrateAccelerators(); BlockHelper.updateAndNotifyState(level, worldPosition); @@ -335,7 +342,7 @@ public float getSpinUp(Easing easing) { public Vec3 getItemPos() { final BlockPos blockPos = getBlockPos(); final Vec3 offset = getCentralItemOffset(); - return new Vec3(blockPos.getX()+offset.x, blockPos.getY()+offset.y, blockPos.getZ()+offset.z); + return new Vec3(blockPos.getX() + offset.x, blockPos.getY() + offset.y, blockPos.getZ() + offset.z); } public Vec3 getCentralItemOffset() { diff --git a/src/main/java/com/sammy/malum/common/block/curiosities/spirit_crucible/IAccelerationTarget.java b/src/main/java/com/sammy/malum/common/block/curiosities/spirit_crucible/IAccelerationTarget.java index ba73498c3..7ae87a71b 100644 --- a/src/main/java/com/sammy/malum/common/block/curiosities/spirit_crucible/IAccelerationTarget.java +++ b/src/main/java/com/sammy/malum/common/block/curiosities/spirit_crucible/IAccelerationTarget.java @@ -64,7 +64,7 @@ default void loadAcceleratorData(Level level, CompoundTag compound) { int amount = acceleratorTag.getInt("amount"); for (int i = 0; i < amount; i++) { BlockPos pos = BlockHelper.loadBlockPos(acceleratorTag, "accelerator_" + i + "_"); - if (level != null && level().getBlockEntity(pos) instanceof ICrucibleAccelerator accelerator) { + if (level != null && level.getBlockEntity(pos) instanceof ICrucibleAccelerator accelerator) { getAccelerators().add(accelerator); } else if (level != null) { continue; diff --git a/src/main/java/com/sammy/malum/common/block/curiosities/spirit_crucible/ICrucibleAccelerator.java b/src/main/java/com/sammy/malum/common/block/curiosities/spirit_crucible/ICrucibleAccelerator.java index 796fbeddb..b797b4494 100644 --- a/src/main/java/com/sammy/malum/common/block/curiosities/spirit_crucible/ICrucibleAccelerator.java +++ b/src/main/java/com/sammy/malum/common/block/curiosities/spirit_crucible/ICrucibleAccelerator.java @@ -11,9 +11,11 @@ public interface ICrucibleAccelerator { default boolean canStartAccelerating() { return true; } + default boolean canAccelerate() { return true; } + IAccelerationTarget getTarget(); void setTarget(IAccelerationTarget target); diff --git a/src/main/java/com/sammy/malum/common/block/curiosities/spirit_crucible/SpiritCatalyzerComponentBlock.java b/src/main/java/com/sammy/malum/common/block/curiosities/spirit_crucible/SpiritCatalyzerComponentBlock.java index 12885598f..7f86d8bbe 100644 --- a/src/main/java/com/sammy/malum/common/block/curiosities/spirit_crucible/SpiritCatalyzerComponentBlock.java +++ b/src/main/java/com/sammy/malum/common/block/curiosities/spirit_crucible/SpiritCatalyzerComponentBlock.java @@ -55,6 +55,7 @@ public VoxelShape getShape(BlockState pState, BlockGetter pLevel, BlockPos pPos, protected void createBlockStateDefinition(StateDefinition.Builder builder) { builder.add(HORIZONTAL_FACING); } + @Override public ItemStack getCloneItemStack(BlockState state, HitResult target, BlockGetter world, BlockPos pos, Player player) { return cloneStack.get().getDefaultInstance(); @@ -86,7 +87,8 @@ public static VoxelShape makeNorthSouthShape() { return shape; } - public static VoxelShape makeWestEastShape(){ + + public static VoxelShape makeWestEastShape() { VoxelShape shape = Shapes.empty(); shape = Shapes.join(shape, Shapes.box(0.3125, 0, 0.75, 0.6875, 0.3125, 0.9375), BooleanOp.OR); shape = Shapes.join(shape, Shapes.box(0.1875, 0, 0.25, 0.3125, 0.4375, 0.75), BooleanOp.OR); diff --git a/src/main/java/com/sammy/malum/common/block/curiosities/spirit_crucible/SpiritCatalyzerCoreBlockEntity.java b/src/main/java/com/sammy/malum/common/block/curiosities/spirit_crucible/SpiritCatalyzerCoreBlockEntity.java index 7f0013804..086006406 100644 --- a/src/main/java/com/sammy/malum/common/block/curiosities/spirit_crucible/SpiritCatalyzerCoreBlockEntity.java +++ b/src/main/java/com/sammy/malum/common/block/curiosities/spirit_crucible/SpiritCatalyzerCoreBlockEntity.java @@ -16,17 +16,17 @@ import net.minecraft.world.phys.Vec3; import net.minecraftforge.common.ForgeHooks; import net.minecraftforge.common.capabilities.Capability; -import net.minecraftforge.common.util.LazyOptional; import net.minecraftforge.common.capabilities.ForgeCapabilities; +import net.minecraftforge.common.util.LazyOptional; import team.lodestar.lodestone.helpers.BlockHelper; import team.lodestar.lodestone.setup.LodestoneParticleRegistry; import team.lodestar.lodestone.systems.blockentity.LodestoneBlockEntityInventory; import team.lodestar.lodestone.systems.multiblock.HorizontalDirectionStructure; import team.lodestar.lodestone.systems.multiblock.MultiBlockCoreEntity; import team.lodestar.lodestone.systems.multiblock.MultiBlockStructure; -import team.lodestar.lodestone.systems.particle.builder.*; -import team.lodestar.lodestone.systems.particle.data.color.ColorParticleData; +import team.lodestar.lodestone.systems.particle.builder.WorldParticleBuilder; import team.lodestar.lodestone.systems.particle.data.GenericParticleData; +import team.lodestar.lodestone.systems.particle.data.color.ColorParticleData; import team.lodestar.lodestone.systems.particle.data.spin.SpinParticleData; import javax.annotation.Nonnull; @@ -131,15 +131,15 @@ public void updateBurnTicks() { public void addParticles(Color color, Color endColor, float alpha, BlockPos targetPos, Vec3 targetItemPos) { if (burnTicks > 0) { Vec3 startPos = getItemPos(this); - float random = level().random.nextFloat() * 0.04f; + float random = level.random.nextFloat() * 0.04f; Vec3 velocity = startPos.subtract(targetItemPos.add(random, random, random)).normalize().scale(-0.08f); WorldParticleBuilder.create(LodestoneParticleRegistry.WISP_PARTICLE) .setTransparencyData(GenericParticleData.create(alpha * 5f, 0f).setCoefficient(0.5f).build()) - .setScaleData(GenericParticleData.create(0.15f + level().random.nextFloat() * 0.15f, 0).build()) - .setSpinData(SpinParticleData.create(0.1f + level().random.nextFloat() * 0.05f).setSpinOffset((0.075f * level().getGameTime() % 6.28f)).build()) + .setScaleData(GenericParticleData.create(0.15f + level.random.nextFloat() * 0.15f, 0).build()) + .setSpinData(SpinParticleData.create(0.1f + level.random.nextFloat() * 0.05f).setSpinOffset((0.075f * level.getGameTime() % 6.28f)).build()) .setColorData(ColorParticleData.create(color.brighter(), endColor).setCoefficient(0.75f).build()) - .setLifetime((int) (10 + level().random.nextInt(8) + Math.sin((0.2 * level().getGameTime()) % 6.28f))) + .setLifetime((int) (10 + level.random.nextInt(8) + Math.sin((0.2 * level.getGameTime()) % 6.28f))) .setRandomOffset(0.05) .setMotion(velocity.x, velocity.y, velocity.z) .enableNoClip() @@ -147,21 +147,21 @@ public void addParticles(Color color, Color endColor, float alpha, BlockPos targ WorldParticleBuilder.create(LodestoneParticleRegistry.WISP_PARTICLE) .setTransparencyData(GenericParticleData.create(alpha * 3, 0f).build()) - .setScaleData(GenericParticleData.create(0.2f + level().random.nextFloat() * 0.15f, 0).build()) + .setScaleData(GenericParticleData.create(0.2f + level.random.nextFloat() * 0.15f, 0).build()) .setColorData(ColorParticleData.create(color, endColor).build()) .setLifetime(15) .setRandomOffset(0.05) - .setSpinData(SpinParticleData.create(0).setSpinOffset((0.15f * level().getGameTime()) % 6.28f).build()) + .setSpinData(SpinParticleData.create(0).setSpinOffset((0.15f * level.getGameTime()) % 6.28f).build()) .enableNoClip() .repeat(level, startPos.x, startPos.y, startPos.z, 1); WorldParticleBuilder.create(LodestoneParticleRegistry.STAR_PARTICLE) .setTransparencyData(GenericParticleData.create(alpha * 3, 0f).build()) - .setScaleData(GenericParticleData.create(0.45f + level().random.nextFloat() * 0.15f, 0).build()) + .setScaleData(GenericParticleData.create(0.45f + level.random.nextFloat() * 0.15f, 0).build()) .setColorData(ColorParticleData.create(color, endColor).build()) .setLifetime(15) .setRandomOffset(0.05) - .setSpinData(SpinParticleData.create(0).setSpinOffset((0.075f * level().getGameTime()) % 6.28f).build()) + .setSpinData(SpinParticleData.create(0).setSpinOffset((0.075f * level.getGameTime()) % 6.28f).build()) .enableNoClip() .repeat(level, startPos.x, startPos.y, startPos.z, 1); } diff --git a/src/main/java/com/sammy/malum/common/block/curiosities/spirit_crucible/SpiritCrucibleComponentBlock.java b/src/main/java/com/sammy/malum/common/block/curiosities/spirit_crucible/SpiritCrucibleComponentBlock.java index 3ae435d7a..26c4fae7b 100644 --- a/src/main/java/com/sammy/malum/common/block/curiosities/spirit_crucible/SpiritCrucibleComponentBlock.java +++ b/src/main/java/com/sammy/malum/common/block/curiosities/spirit_crucible/SpiritCrucibleComponentBlock.java @@ -22,6 +22,7 @@ public class SpiritCrucibleComponentBlock extends MultiblockComponentBlock { public static final VoxelShape SHAPE = makeShape(); public static final VoxelShape RENDER_SHAPE = makeRenderShape(); + public SpiritCrucibleComponentBlock(Properties properties) { super(properties); } diff --git a/src/main/java/com/sammy/malum/common/block/curiosities/spirit_crucible/SpiritCrucibleCoreBlock.java b/src/main/java/com/sammy/malum/common/block/curiosities/spirit_crucible/SpiritCrucibleCoreBlock.java index de0728e0b..aa0773c4d 100644 --- a/src/main/java/com/sammy/malum/common/block/curiosities/spirit_crucible/SpiritCrucibleCoreBlock.java +++ b/src/main/java/com/sammy/malum/common/block/curiosities/spirit_crucible/SpiritCrucibleCoreBlock.java @@ -16,6 +16,7 @@ public class SpiritCrucibleCoreBlock extends WaterLoggedEntityBlock { public static final VoxelShape SHAPE = makeShape(); + public SpiritCrucibleCoreBlock(Properties properties) { super(properties); } @@ -39,7 +40,7 @@ public boolean hasAnalogOutputSignal(BlockState pState) { return true; } - public static VoxelShape makeShape(){ + public static VoxelShape makeShape() { VoxelShape shape = Shapes.empty(); shape = Shapes.join(shape, Shapes.box(0.125, 0.75, 0.125, 0.875, 1, 0.875), BooleanOp.OR); shape = Shapes.join(shape, Shapes.box(0, 0, 0, 1, 0.75, 1), BooleanOp.OR); diff --git a/src/main/java/com/sammy/malum/common/block/curiosities/spirit_crucible/SpiritCrucibleCoreBlockEntity.java b/src/main/java/com/sammy/malum/common/block/curiosities/spirit_crucible/SpiritCrucibleCoreBlockEntity.java index 36e4bccdc..858946667 100644 --- a/src/main/java/com/sammy/malum/common/block/curiosities/spirit_crucible/SpiritCrucibleCoreBlockEntity.java +++ b/src/main/java/com/sammy/malum/common/block/curiosities/spirit_crucible/SpiritCrucibleCoreBlockEntity.java @@ -1,6 +1,5 @@ package com.sammy.malum.common.block.curiosities.spirit_crucible; -import com.sammy.malum.visual_effects.SpiritLightSpecs; import com.sammy.malum.common.block.curiosities.tablet.ITabletTracker; import com.sammy.malum.common.block.curiosities.tablet.TwistedTabletBlockEntity; import com.sammy.malum.common.item.impetus.ImpetusItem; @@ -13,6 +12,7 @@ import com.sammy.malum.registry.common.SoundRegistry; import com.sammy.malum.registry.common.block.BlockEntityRegistry; import com.sammy.malum.registry.common.block.BlockRegistry; +import com.sammy.malum.visual_effects.SpiritLightSpecs; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.nbt.CompoundTag; @@ -28,8 +28,8 @@ import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.phys.Vec3; import net.minecraftforge.common.capabilities.Capability; -import net.minecraftforge.common.util.LazyOptional; import net.minecraftforge.common.capabilities.ForgeCapabilities; +import net.minecraftforge.common.util.LazyOptional; import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.wrapper.CombinedInvWrapper; import net.minecraftforge.network.PacketDistributor; @@ -42,9 +42,9 @@ import team.lodestar.lodestone.systems.multiblock.MultiBlockCoreEntity; import team.lodestar.lodestone.systems.multiblock.MultiBlockStructure; import team.lodestar.lodestone.systems.particle.SimpleParticleOptions; -import team.lodestar.lodestone.systems.particle.builder.*; -import team.lodestar.lodestone.systems.particle.data.color.ColorParticleData; +import team.lodestar.lodestone.systems.particle.builder.WorldParticleBuilder; import team.lodestar.lodestone.systems.particle.data.GenericParticleData; +import team.lodestar.lodestone.systems.particle.data.color.ColorParticleData; import team.lodestar.lodestone.systems.particle.data.spin.SpinParticleData; import javax.annotation.Nonnull; @@ -269,8 +269,8 @@ public void tick() { if (queuedCracks > 0) { crackTimer++; if (crackTimer % 7 == 0) { - float pitch = 0.95f + (crackTimer - 8) * 0.015f + level().random.nextFloat() * 0.05f; - level().playSound(null, worldPosition, SoundRegistry.IMPETUS_CRACK.get(), SoundSource.BLOCKS, 0.7f, pitch); + float pitch = 0.95f + (crackTimer - 8) * 0.015f + level.random.nextFloat() * 0.05f; + level.playSound(null, worldPosition, SoundRegistry.IMPETUS_CRACK.get(), SoundSource.BLOCKS, 0.7f, pitch); queuedCracks--; if (queuedCracks == 0) { crackTimer = 0; @@ -347,9 +347,9 @@ public void repair() { inventory.setStackInSlot(0, result); if (repairRecipe.repairMaterial.getItem() instanceof SpiritShardItem spiritShardItem) { - MALUM_CHANNEL.send(PacketDistributor.TRACKING_CHUNK.with(() -> level().getChunkAt(worldPosition)), new AltarConsumeParticlePacket(repairMaterial, List.of(spiritShardItem.type.identifier), providedItemPos.x, providedItemPos.y, providedItemPos.z, itemPos.x, itemPos.y, itemPos.z)); + MALUM_CHANNEL.send(PacketDistributor.TRACKING_CHUNK.with(() -> level.getChunkAt(worldPosition)), new AltarConsumeParticlePacket(repairMaterial, List.of(spiritShardItem.type.identifier), providedItemPos.x, providedItemPos.y, providedItemPos.z, itemPos.x, itemPos.y, itemPos.z)); } else { - MALUM_CHANNEL.send(PacketDistributor.TRACKING_CHUNK.with(() -> level().getChunkAt(worldPosition)), new AltarConsumeParticlePacket(repairMaterial, repairRecipe.spirits.stream().map(s -> s.type.identifier).collect(Collectors.toList()), providedItemPos.x, providedItemPos.y, providedItemPos.z, itemPos.x, itemPos.y, itemPos.z)); + MALUM_CHANNEL.send(PacketDistributor.TRACKING_CHUNK.with(() -> level.getChunkAt(worldPosition)), new AltarConsumeParticlePacket(repairMaterial, repairRecipe.spirits.stream().map(s -> s.type.identifier).collect(Collectors.toList()), providedItemPos.x, providedItemPos.y, providedItemPos.z, itemPos.x, itemPos.y, itemPos.z)); } repairMaterial.shrink(repairRecipe.repairMaterial.getCount()); @@ -367,9 +367,9 @@ public void repair() { spiritInventory.updateData(); if (!repairRecipe.spirits.isEmpty()) { - MALUM_CHANNEL.send(PacketDistributor.TRACKING_CHUNK.with(() -> level().getChunkAt(worldPosition)), new AltarCraftParticlePacket(repairRecipe.spirits.stream().map(s -> s.type.identifier).collect(Collectors.toList()), itemPos)); + MALUM_CHANNEL.send(PacketDistributor.TRACKING_CHUNK.with(() -> level.getChunkAt(worldPosition)), new AltarCraftParticlePacket(repairRecipe.spirits.stream().map(s -> s.type.identifier).collect(Collectors.toList()), itemPos)); } else if (repairRecipe.repairMaterial.getItem() instanceof SpiritShardItem spiritShardItem) { - MALUM_CHANNEL.send(PacketDistributor.TRACKING_CHUNK.with(() -> level().getChunkAt(worldPosition)), new AltarCraftParticlePacket(List.of(spiritShardItem.type.identifier), itemPos)); + MALUM_CHANNEL.send(PacketDistributor.TRACKING_CHUNK.with(() -> level.getChunkAt(worldPosition)), new AltarCraftParticlePacket(List.of(spiritShardItem.type.identifier), itemPos)); } repairRecipe = SpiritRepairRecipe.getRecipe(level, damagedItem, repairMaterial, spiritInventory.nonEmptyItemStacks); fetchTablets(level, worldPosition.above()); @@ -393,7 +393,7 @@ public void craft() { } } queuedCracks = durabilityCost; - boolean success = stack.hurt(durabilityCost, level().random, null); + boolean success = stack.hurt(durabilityCost, level.random, null); if (success && stack.getItem() instanceof ImpetusItem impetusItem) { inventory.setStackInSlot(0, impetusItem.getCrackedVariant().getDefaultInstance()); } @@ -408,14 +408,14 @@ public void craft() { } } spiritInventory.updateData(); - level().addFreshEntity(new ItemEntity(level, itemPos.x, itemPos.y, itemPos.z, outputStack)); - MALUM_CHANNEL.send(PacketDistributor.TRACKING_CHUNK.with(() -> level().getChunkAt(worldPosition)), new AltarCraftParticlePacket(focusingRecipe.spirits.stream().map(s -> s.type.identifier).collect(Collectors.toList()), itemPos)); + level.addFreshEntity(new ItemEntity(level, itemPos.x, itemPos.y, itemPos.z, outputStack)); + MALUM_CHANNEL.send(PacketDistributor.TRACKING_CHUNK.with(() -> level.getChunkAt(worldPosition)), new AltarCraftParticlePacket(focusingRecipe.spirits.stream().map(s -> s.type.identifier).collect(Collectors.toList()), itemPos)); focusingRecipe = SpiritFocusingRecipe.getRecipe(level, stack, spiritInventory.nonEmptyItemStacks); finishRecipe(); } public void finishRecipe() { - level().playSound(null, worldPosition, SoundRegistry.CRUCIBLE_CRAFT.get(), SoundSource.BLOCKS, 1, 0.75f + level().random.nextFloat() * 0.5f); + level.playSound(null, worldPosition, SoundRegistry.CRUCIBLE_CRAFT.get(), SoundSource.BLOCKS, 1, 0.75f + level.random.nextFloat() * 0.5f); progress = 0; recalibrateAccelerators(level, worldPosition); BlockHelper.updateAndNotifyState(level, worldPosition); @@ -461,7 +461,7 @@ public void passiveParticles() { double x = getBlockPos().getX() + offset.x(); double y = getBlockPos().getY() + offset.y(); double z = getBlockPos().getZ() + offset.z(); - SpiritLightSpecs.spiritLightSpecs(level, new Vec3(x,y,z), spiritSplinterItem.type); + SpiritLightSpecs.spiritLightSpecs(level, new Vec3(x, y, z), spiritSplinterItem.type); } } } @@ -493,8 +493,8 @@ public void passiveParticles() { WorldParticleBuilder.create(LodestoneParticleRegistry.STAR_PARTICLE) .setTransparencyData(GenericParticleData.create(0.24f / colors.size(), 0f).build()) - .setScaleData(GenericParticleData.create(0.45f + level().random.nextFloat() * 0.15f, 0).build()) - .setSpinData(SpinParticleData.create(0).setSpinOffset((0.075f * level().getGameTime()) % 6.28f).build()) + .setScaleData(GenericParticleData.create(0.45f + level.random.nextFloat() * 0.15f, 0).build()) + .setSpinData(SpinParticleData.create(0).setSpinOffset((0.075f * level.getGameTime()) % 6.28f).build()) .setColorData(ColorParticleData.create(color, endColor).build()) .setLifetime(15) .setRandomOffset(0.05) @@ -503,9 +503,9 @@ public void passiveParticles() { WorldParticleBuilder.create(LodestoneParticleRegistry.WISP_PARTICLE) .setTransparencyData(GenericParticleData.create(0.4f / colors.size(), 0f).setCoefficient(0.5f).build()) - .setScaleData(GenericParticleData.create(0.2f + level().random.nextFloat() * 0.15f, 0).build()) - .setLifetime((int) (10 + level().random.nextInt(8) + Math.sin((0.5 * level().getGameTime()) % 6.28f))) - .setSpinData(SpinParticleData.create(0.1f + level().random.nextFloat() * 0.05f).setSpinOffset((0.075f * level().getGameTime() % 6.28f)).build()) + .setScaleData(GenericParticleData.create(0.2f + level.random.nextFloat() * 0.15f, 0).build()) + .setLifetime((int) (10 + level.random.nextInt(8) + Math.sin((0.5 * level.getGameTime()) % 6.28f))) + .setSpinData(SpinParticleData.create(0.1f + level.random.nextFloat() * 0.05f).setSpinOffset((0.075f * level.getGameTime() % 6.28f)).build()) .setColorData(ColorParticleData.create(color.brighter(), endColor).setCoefficient(0.75f).build()) .setRandomOffset(0.05) .setMotion(velocity.x, velocity.y, velocity.z) @@ -555,8 +555,8 @@ public void focusingParticles(Vec3 itemPos) { WorldParticleBuilder.create(LodestoneParticleRegistry.WISP_PARTICLE) .setTransparencyData(GenericParticleData.create(0.12f / spiritInventory.nonEmptyItemAmount, 0f).build()) - .setSpinData(SpinParticleData.create(0).setSpinOffset((0.075f * level().getGameTime() % 6.28f)).build()) - .setScaleData(GenericParticleData.create(0.2f + level().random.nextFloat() * 0.1f, 0).build()) + .setSpinData(SpinParticleData.create(0).setSpinOffset((0.075f * level.getGameTime() % 6.28f)).build()) + .setScaleData(GenericParticleData.create(0.2f + level.random.nextFloat() * 0.1f, 0).build()) .setColorData(ColorParticleData.create(color, endColor).build()) .setLifetime(25) .setRandomOffset(0.05) @@ -571,7 +571,7 @@ public void focusingParticles(Vec3 itemPos) { public void starParticles(Vec3 itemPos, Color color, Color endColor) { WorldParticleBuilder.create(LodestoneParticleRegistry.STAR_PARTICLE) .setTransparencyData(GenericParticleData.create(0.07f / spiritInventory.nonEmptyItemAmount, 0.16f / spiritInventory.nonEmptyItemAmount, 0f).setEasing(Easing.SINE_IN, Easing.SINE_OUT).build()) - .setScaleData(GenericParticleData.create(0.2f, 0.45f + level().random.nextFloat() * 0.1f, 0).setEasing(Easing.QUINTIC_IN, Easing.CUBIC_IN_OUT).build()) + .setScaleData(GenericParticleData.create(0.2f, 0.45f + level.random.nextFloat() * 0.1f, 0).setEasing(Easing.QUINTIC_IN, Easing.CUBIC_IN_OUT).build()) .setSpinData(SpinParticleData.create(0, 0.2f, 0).setEasing(Easing.CUBIC_IN, Easing.EXPO_IN).build()) .setColorData(ColorParticleData.create(color, endColor).setEasing(Easing.BOUNCE_IN_OUT).setCoefficient(0.5f).build()) .setLifetime(25) diff --git a/src/main/java/com/sammy/malum/common/block/curiosities/tablet/ITabletTracker.java b/src/main/java/com/sammy/malum/common/block/curiosities/tablet/ITabletTracker.java index 2ad260854..c752fb65c 100644 --- a/src/main/java/com/sammy/malum/common/block/curiosities/tablet/ITabletTracker.java +++ b/src/main/java/com/sammy/malum/common/block/curiosities/tablet/ITabletTracker.java @@ -68,7 +68,7 @@ default void loadTwistedTabletData(Level level, CompoundTag compound) { int amount = twistedTabletTag.getInt("amount"); for (int i = 0; i < amount; i++) { BlockPos pos = BlockHelper.loadBlockPos(twistedTabletTag, "tablet_" + i); - if (level != null && level().getBlockEntity(pos) instanceof TwistedTabletBlockEntity tabletBlockEntity) { + if (level != null && level.getBlockEntity(pos) instanceof TwistedTabletBlockEntity tabletBlockEntity) { getTabletPositions().add(pos); getTablets().add(tabletBlockEntity); } diff --git a/src/main/java/com/sammy/malum/common/block/curiosities/tablet/TwistedTabletBlockEntity.java b/src/main/java/com/sammy/malum/common/block/curiosities/tablet/TwistedTabletBlockEntity.java index d88af5200..2bf155cad 100644 --- a/src/main/java/com/sammy/malum/common/block/curiosities/tablet/TwistedTabletBlockEntity.java +++ b/src/main/java/com/sammy/malum/common/block/curiosities/tablet/TwistedTabletBlockEntity.java @@ -1,7 +1,7 @@ package com.sammy.malum.common.block.curiosities.tablet; import com.sammy.malum.common.block.storage.stand.ItemStandBlockEntity; -import com.sammy.malum.common.item.spirit.*; +import com.sammy.malum.common.item.spirit.SpiritShardItem; import com.sammy.malum.registry.common.block.BlockEntityRegistry; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; @@ -17,9 +17,9 @@ public TwistedTabletBlockEntity(BlockPos pos, BlockState state) { @Override public Vec3 getItemOffset(float partialTicks) { Direction direction = getBlockState().getValue(BlockStateProperties.FACING); - float gameTime = level().getGameTime() + partialTicks; + float gameTime = level.getGameTime() + partialTicks; float xOffset = direction.getStepX() * 0.25f; - float yOffset = direction.getStepY() * 0.4f + (inventory.getStackInSlot(0).getItem() instanceof SpiritShardItem ? (float)Math.sin((gameTime % 360) / 20f) * 0.05f : 0); + float yOffset = direction.getStepY() * 0.4f + (inventory.getStackInSlot(0).getItem() instanceof SpiritShardItem ? (float) Math.sin((gameTime % 360) / 20f) * 0.05f : 0); float zOffset = direction.getStepY() * 0.25f; return new Vec3(0.5f - xOffset, 0.5f - yOffset, 0.5f - zOffset); } diff --git a/src/main/java/com/sammy/malum/common/block/curiosities/totem/TotemBaseBlock.java b/src/main/java/com/sammy/malum/common/block/curiosities/totem/TotemBaseBlock.java index a98c4af52..9e6cbd22f 100644 --- a/src/main/java/com/sammy/malum/common/block/curiosities/totem/TotemBaseBlock.java +++ b/src/main/java/com/sammy/malum/common/block/curiosities/totem/TotemBaseBlock.java @@ -6,11 +6,10 @@ import net.minecraft.world.level.block.state.BlockState; import team.lodestar.lodestone.systems.block.LodestoneEntityBlock; -public class TotemBaseBlock extends LodestoneEntityBlock -{ +public class TotemBaseBlock extends LodestoneEntityBlock { public final boolean corrupted; - public TotemBaseBlock(Properties properties, boolean corrupted) - { + + public TotemBaseBlock(Properties properties, boolean corrupted) { super(properties); this.corrupted = corrupted; } diff --git a/src/main/java/com/sammy/malum/common/block/curiosities/totem/TotemBaseBlockEntity.java b/src/main/java/com/sammy/malum/common/block/curiosities/totem/TotemBaseBlockEntity.java index 51d965655..910e0ff55 100644 --- a/src/main/java/com/sammy/malum/common/block/curiosities/totem/TotemBaseBlockEntity.java +++ b/src/main/java/com/sammy/malum/common/block/curiosities/totem/TotemBaseBlockEntity.java @@ -3,11 +3,11 @@ import com.sammy.malum.common.block.storage.stand.ItemStandBlockEntity; import com.sammy.malum.common.packets.particle.curiosities.rite.SpiritRiteActivationEffectPacket; import com.sammy.malum.core.helper.SpiritHelper; +import com.sammy.malum.core.systems.rites.MalumRiteType; +import com.sammy.malum.core.systems.spirit.MalumSpiritType; import com.sammy.malum.registry.common.SoundRegistry; import com.sammy.malum.registry.common.SpiritRiteRegistry; import com.sammy.malum.registry.common.block.BlockEntityRegistry; -import com.sammy.malum.core.systems.rites.MalumRiteType; -import com.sammy.malum.core.systems.spirit.MalumSpiritType; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.nbt.CompoundTag; @@ -47,6 +47,7 @@ public TotemBaseBlockEntity(BlockEntityType type super(type, pos, state); this.corrupted = ((TotemBaseBlock) state.getBlock()).corrupted; } + public TotemBaseBlockEntity(BlockPos pos, BlockState state) { this(BlockEntityRegistry.TOTEM_BASE.get(), pos, state); } @@ -100,8 +101,8 @@ public void onBreak(@Nullable Player player) { } }); if (height > 1) { - level().playSound(null, worldPosition, SoundRegistry.TOTEM_CHARGE.get(), SoundSource.BLOCKS, 1, 0.5f); - MALUM_CHANNEL.send(PacketDistributor.TRACKING_CHUNK.with(() -> level().getChunkAt(worldPosition)), new SpiritRiteActivationEffectPacket(spirits.stream().map(s -> s.identifier).toList(), worldPosition.above())); + level.playSound(null, worldPosition, SoundRegistry.TOTEM_CHARGE.get(), SoundSource.BLOCKS, 1, 0.5f); + MALUM_CHANNEL.send(PacketDistributor.TRACKING_CHUNK.with(() -> level.getChunkAt(worldPosition)), new SpiritRiteActivationEffectPacket(spirits.stream().map(s -> s.identifier).toList(), worldPosition.above())); } } } @@ -181,10 +182,12 @@ public void load(CompoundTag compound) { progress = compound.getInt("progress"); super.load(compound); } + public void addFilter(ItemStandBlockEntity itemStand) { filters.add(itemStand.getBlockPos()); cachedFilterInstances.add(itemStand); } + public void addPole(TotemPoleBlockEntity pole) { Direction direction = pole.getBlockState().getValue(HORIZONTAL_FACING); if (poles.isEmpty()) { @@ -202,8 +205,8 @@ public void addPole(TotemPoleBlockEntity pole) { } public void completeRite(MalumRiteType rite) { - level().playSound(null, worldPosition, SoundRegistry.TOTEM_ACTIVATED.get(), SoundSource.BLOCKS, 1, 0.75f + height * 0.1f); - MALUM_CHANNEL.send(PacketDistributor.TRACKING_CHUNK.with(() -> level().getChunkAt(worldPosition)), new SpiritRiteActivationEffectPacket(spirits.stream().map(s -> s.identifier).collect(Collectors.toCollection(ArrayList::new)), worldPosition.above())); + level.playSound(null, worldPosition, SoundRegistry.TOTEM_ACTIVATED.get(), SoundSource.BLOCKS, 1, 0.75f + height * 0.1f); + MALUM_CHANNEL.send(PacketDistributor.TRACKING_CHUNK.with(() -> level.getChunkAt(worldPosition)), new SpiritRiteActivationEffectPacket(spirits.stream().map(s -> s.identifier).collect(Collectors.toCollection(ArrayList::new)), worldPosition.above())); poles.forEach(p -> { if (level.getBlockEntity(p) instanceof TotemPoleBlockEntity pole) { pole.riteComplete(); @@ -227,6 +230,7 @@ public void disableOtherRites() { }); } + public void tryDisableRite(TotemBaseBlockEntity target) { int range = rite.getRiteRadius(corrupted); @@ -243,8 +247,8 @@ public void startRite() { public void endRite() { if (height > 1) { - level().playSound(null, worldPosition, SoundRegistry.TOTEM_CANCELLED.get(), SoundSource.BLOCKS, 1, 1); - MALUM_CHANNEL.send(PacketDistributor.TRACKING_CHUNK.with(() -> level().getChunkAt(worldPosition)), new SpiritRiteActivationEffectPacket(spirits.stream().map(s -> s.identifier).collect(Collectors.toCollection(ArrayList::new)), worldPosition.above())); + level.playSound(null, worldPosition, SoundRegistry.TOTEM_CANCELLED.get(), SoundSource.BLOCKS, 1, 1); + MALUM_CHANNEL.send(PacketDistributor.TRACKING_CHUNK.with(() -> level.getChunkAt(worldPosition)), new SpiritRiteActivationEffectPacket(spirits.stream().map(s -> s.identifier).collect(Collectors.toCollection(ArrayList::new)), worldPosition.above())); } resetRite(); } diff --git a/src/main/java/com/sammy/malum/common/block/curiosities/totem/TotemPoleBlockEntity.java b/src/main/java/com/sammy/malum/common/block/curiosities/totem/TotemPoleBlockEntity.java index 73a5a7533..571ccb412 100644 --- a/src/main/java/com/sammy/malum/common/block/curiosities/totem/TotemPoleBlockEntity.java +++ b/src/main/java/com/sammy/malum/common/block/curiosities/totem/TotemPoleBlockEntity.java @@ -31,9 +31,9 @@ import team.lodestar.lodestone.systems.blockentity.LodestoneBlockEntity; import team.lodestar.lodestone.systems.easing.Easing; import team.lodestar.lodestone.systems.particle.SimpleParticleOptions; -import team.lodestar.lodestone.systems.particle.builder.*; -import team.lodestar.lodestone.systems.particle.data.color.ColorParticleData; +import team.lodestar.lodestone.systems.particle.builder.WorldParticleBuilder; import team.lodestar.lodestone.systems.particle.data.GenericParticleData; +import team.lodestar.lodestone.systems.particle.data.color.ColorParticleData; import team.lodestar.lodestone.systems.particle.data.spin.SpinParticleData; import javax.annotation.Nullable; @@ -77,11 +77,11 @@ public InteractionResult onUse(Player player, InteractionHand hand) { } haunted = true; desiredColor = 20; - MALUM_CHANNEL.send(PacketDistributor.TRACKING_CHUNK.with(() -> level().getChunkAt(worldPosition)), new TotemPoleActivationEffectPacket(type.getPrimaryColor(), worldPosition)); - level().playSound(null, worldPosition, SoundRegistry.TOTEM_ENGRAVE.get(), SoundSource.BLOCKS, 1, Mth.nextFloat(level.random, 0.9f, 1.1f)); - level().playSound(null, worldPosition, SoundEvents.AXE_STRIP, SoundSource.BLOCKS, 1, 1); + MALUM_CHANNEL.send(PacketDistributor.TRACKING_CHUNK.with(() -> level.getChunkAt(worldPosition)), new TotemPoleActivationEffectPacket(type.getPrimaryColor(), worldPosition)); + level.playSound(null, worldPosition, SoundRegistry.TOTEM_ENGRAVE.get(), SoundSource.BLOCKS, 1, Mth.nextFloat(level.random, 0.9f, 1.1f)); + level.playSound(null, worldPosition, SoundEvents.AXE_STRIP, SoundSource.BLOCKS, 1, 1); if (corrupted) { - level().playSound(null, worldPosition, SoundRegistry.MAJOR_BLIGHT_MOTIF.get(), SoundSource.BLOCKS, 1, 1); + level.playSound(null, worldPosition, SoundRegistry.MAJOR_BLIGHT_MOTIF.get(), SoundSource.BLOCKS, 1, 1); } BlockHelper.updateState(level, worldPosition); return InteractionResult.SUCCESS; @@ -93,10 +93,10 @@ public InteractionResult onUse(Player player, InteractionHand hand) { } desiredColor = 0; haunted = false; - MALUM_CHANNEL.send(PacketDistributor.TRACKING_CHUNK.with(() -> level().getChunkAt(worldPosition)), new TotemPoleActivationEffectPacket(type.getPrimaryColor(), worldPosition)); - level().playSound(null, worldPosition, SoundEvents.AXE_STRIP, SoundSource.BLOCKS, 1, 1); + MALUM_CHANNEL.send(PacketDistributor.TRACKING_CHUNK.with(() -> level.getChunkAt(worldPosition)), new TotemPoleActivationEffectPacket(type.getPrimaryColor(), worldPosition)); + level.playSound(null, worldPosition, SoundEvents.AXE_STRIP, SoundSource.BLOCKS, 1, 1); if (corrupted) { - level().playSound(null, worldPosition, SoundRegistry.MAJOR_BLIGHT_MOTIF.get(), SoundSource.BLOCKS, 1, 1); + level.playSound(null, worldPosition, SoundRegistry.MAJOR_BLIGHT_MOTIF.get(), SoundSource.BLOCKS, 1, 1); } BlockHelper.updateState(level, worldPosition); return InteractionResult.SUCCESS; @@ -105,11 +105,11 @@ public InteractionResult onUse(Player player, InteractionHand hand) { if (level.isClientSide) { return InteractionResult.SUCCESS; } - level().setBlockAndUpdate(worldPosition, logBlock.defaultBlockState()); - MALUM_CHANNEL.send(PacketDistributor.TRACKING_CHUNK.with(() -> level().getChunkAt(worldPosition)), new TotemPoleActivationEffectPacket(type.getPrimaryColor(), worldPosition)); - level().playSound(null, worldPosition, SoundEvents.AXE_STRIP, SoundSource.BLOCKS, 1, 1); + level.setBlockAndUpdate(worldPosition, logBlock.defaultBlockState()); + MALUM_CHANNEL.send(PacketDistributor.TRACKING_CHUNK.with(() -> level.getChunkAt(worldPosition)), new TotemPoleActivationEffectPacket(type.getPrimaryColor(), worldPosition)); + level.playSound(null, worldPosition, SoundEvents.AXE_STRIP, SoundSource.BLOCKS, 1, 1); if (corrupted) { - level().playSound(null, worldPosition, SoundRegistry.MAJOR_BLIGHT_MOTIF.get(), SoundSource.BLOCKS, 1, 1); + level.playSound(null, worldPosition, SoundRegistry.MAJOR_BLIGHT_MOTIF.get(), SoundSource.BLOCKS, 1, 1); } onBreak(null); return InteractionResult.SUCCESS; @@ -178,7 +178,7 @@ public void tick() { public Set getFilters() { Set standBlockEntities = Sets.newHashSet(); for (Direction value : Direction.values()) { - BlockEntity blockEntity = level().getBlockEntity(worldPosition.relative(value)); + BlockEntity blockEntity = level.getBlockEntity(worldPosition.relative(value)); if (blockEntity instanceof ItemStandBlockEntity standBlockEntity) { standBlockEntities.add(standBlockEntity); } @@ -187,17 +187,17 @@ public Set getFilters() { } public void create(MalumSpiritType type) { - level().playSound(null, worldPosition, SoundRegistry.TOTEM_ENGRAVE.get(), SoundSource.BLOCKS, 1, Mth.nextFloat(level.random, 0.9f, 1.1f)); - level().playSound(null, worldPosition, SoundEvents.AXE_STRIP, SoundSource.BLOCKS, 1, Mth.nextFloat(level.random, 0.9f, 1.1f)); - MALUM_CHANNEL.send(PacketDistributor.TRACKING_CHUNK.with(() -> level().getChunkAt(worldPosition)), new TotemPoleActivationEffectPacket(type.getPrimaryColor(), worldPosition)); + level.playSound(null, worldPosition, SoundRegistry.TOTEM_ENGRAVE.get(), SoundSource.BLOCKS, 1, Mth.nextFloat(level.random, 0.9f, 1.1f)); + level.playSound(null, worldPosition, SoundEvents.AXE_STRIP, SoundSource.BLOCKS, 1, Mth.nextFloat(level.random, 0.9f, 1.1f)); + MALUM_CHANNEL.send(PacketDistributor.TRACKING_CHUNK.with(() -> level.getChunkAt(worldPosition)), new TotemPoleActivationEffectPacket(type.getPrimaryColor(), worldPosition)); this.type = type; this.currentColor = 10; BlockHelper.updateState(level, worldPosition); } public void riteStarting(TotemBaseBlockEntity totemBase, int height) { - level().playSound(null, worldPosition, SoundRegistry.TOTEM_CHARGE.get(), SoundSource.BLOCKS, 1, 0.9f + 0.2f * height); - MALUM_CHANNEL.send(PacketDistributor.TRACKING_CHUNK.with(() -> level().getChunkAt(worldPosition)), new TotemPoleActivationEffectPacket(type.getPrimaryColor(), worldPosition)); + level.playSound(null, worldPosition, SoundRegistry.TOTEM_CHARGE.get(), SoundSource.BLOCKS, 1, 0.9f + 0.2f * height); + MALUM_CHANNEL.send(PacketDistributor.TRACKING_CHUNK.with(() -> level.getChunkAt(worldPosition)), new TotemPoleActivationEffectPacket(type.getPrimaryColor(), worldPosition)); this.desiredColor = 10; this.baseLevel = worldPosition.getY() - height; this.totemBase = totemBase; @@ -235,8 +235,8 @@ public void filterParticles(ItemStandBlockEntity itemStandBlockEntity) { Vec3 itemPos = itemStandBlockEntity.getItemPos(); WorldParticleBuilder.create(LodestoneParticleRegistry.STAR_PARTICLE) .setTransparencyData(GenericParticleData.create(0.04f, 0.1f, 0f).build()) - .setScaleData(GenericParticleData.create(0.5f, 1f + level().random.nextFloat() * 0.1f, 0).setEasing(Easing.QUINTIC_IN, Easing.CUBIC_IN_OUT).build()) - .setSpinData(SpinParticleData.create(0, 0.2f, 0).setSpinOffset((level.getGameTime()*0.02f)%360).setEasing(Easing.CUBIC_IN, Easing.EXPO_IN).build()) + .setScaleData(GenericParticleData.create(0.5f, 1f + level.random.nextFloat() * 0.1f, 0).setEasing(Easing.QUINTIC_IN, Easing.CUBIC_IN_OUT).build()) + .setSpinData(SpinParticleData.create(0, 0.2f, 0).setSpinOffset((level.getGameTime() * 0.02f) % 360).setEasing(Easing.CUBIC_IN, Easing.EXPO_IN).build()) .setColorData(ColorParticleData.create(type.getPrimaryColor(), type.getSecondaryColor()).setEasing(Easing.BOUNCE_IN_OUT).setCoefficient(0.5f).build()) .setLifetime(25) .setRandomOffset(0.1) @@ -248,6 +248,7 @@ public void filterParticles(ItemStandBlockEntity itemStandBlockEntity) { } } } + public void passiveParticles() { if (level.getGameTime() % 6L == 0) { Color color = type.getPrimaryColor(); diff --git a/src/main/java/com/sammy/malum/common/block/curiosities/weavers_workbench/WeaversWorkbenchBlockEntity.java b/src/main/java/com/sammy/malum/common/block/curiosities/weavers_workbench/WeaversWorkbenchBlockEntity.java index 3d273e71e..b1d9b11ce 100644 --- a/src/main/java/com/sammy/malum/common/block/curiosities/weavers_workbench/WeaversWorkbenchBlockEntity.java +++ b/src/main/java/com/sammy/malum/common/block/curiosities/weavers_workbench/WeaversWorkbenchBlockEntity.java @@ -1,36 +1,43 @@ package com.sammy.malum.common.block.curiosities.weavers_workbench; -import com.sammy.malum.common.container.*; -import com.sammy.malum.common.packets.particle.curiosities.blight.*; -import com.sammy.malum.registry.common.*; -import com.sammy.malum.registry.common.block.*; -import net.minecraft.core.*; -import net.minecraft.nbt.*; -import net.minecraft.server.level.*; -import net.minecraft.sounds.*; -import net.minecraft.world.*; -import net.minecraft.world.entity.player.*; -import net.minecraft.world.item.*; -import net.minecraft.world.level.block.state.*; -import net.minecraft.world.phys.*; -import net.minecraftforge.common.capabilities.*; -import net.minecraftforge.common.util.*; -import net.minecraftforge.items.*; -import net.minecraftforge.network.*; -import org.jetbrains.annotations.*; -import team.lodestar.lodestone.helpers.*; -import team.lodestar.lodestone.systems.blockentity.*; +import com.sammy.malum.common.container.WeaversWorkbenchContainer; +import com.sammy.malum.common.packets.particle.curiosities.blight.BlightTransformItemParticlePacket; +import com.sammy.malum.registry.common.SoundRegistry; +import com.sammy.malum.registry.common.block.BlockEntityRegistry; +import net.minecraft.core.BlockPos; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.sounds.SoundSource; +import net.minecraft.world.InteractionHand; +import net.minecraft.world.InteractionResult; +import net.minecraft.world.MenuProvider; +import net.minecraft.world.SimpleMenuProvider; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.phys.Vec3; +import net.minecraftforge.common.capabilities.Capability; +import net.minecraftforge.common.capabilities.ForgeCapabilities; +import net.minecraftforge.common.util.LazyOptional; +import net.minecraftforge.items.IItemHandler; +import net.minecraftforge.network.NetworkHooks; +import net.minecraftforge.network.PacketDistributor; +import org.jetbrains.annotations.NotNull; +import team.lodestar.lodestone.helpers.BlockHelper; +import team.lodestar.lodestone.systems.blockentity.LodestoneBlockEntity; -import java.util.*; +import java.util.List; -import static com.sammy.malum.common.item.cosmetic.skins.ArmorSkin.*; -import static com.sammy.malum.registry.common.PacketRegistry.*; -import static com.sammy.malum.registry.common.SpiritTypeRegistry.*; +import static com.sammy.malum.common.item.cosmetic.skins.ArmorSkin.MALUM_SKIN_TAG; +import static com.sammy.malum.common.item.cosmetic.skins.ArmorSkin.getApplicableItemSkinTag; +import static com.sammy.malum.registry.common.PacketRegistry.MALUM_CHANNEL; +import static com.sammy.malum.registry.common.SpiritTypeRegistry.ARCANE_SPIRIT; public class WeaversWorkbenchBlockEntity extends LodestoneBlockEntity { - public final WeaversWorkbenchItemHandler itemHandler = new WeaversWorkbenchItemHandler(2, 1,this); + public final WeaversWorkbenchItemHandler itemHandler = new WeaversWorkbenchItemHandler(2, 1, this); private final LazyOptional handler = LazyOptional.of(() -> itemHandler); + public WeaversWorkbenchBlockEntity(BlockPos pos, BlockState state) { super(BlockEntityRegistry.WEAVERS_WORKBENCH.get(), pos, state); } @@ -47,7 +54,7 @@ public InteractionResult onUse(Player player, InteractionHand hand) { @NotNull @Override public LazyOptional getCapability(@NotNull Capability cap) { - if(cap == ForgeCapabilities.ITEM_HANDLER){ + if (cap == ForgeCapabilities.ITEM_HANDLER) { return handler.cast(); } return super.getCapability(cap); @@ -56,8 +63,8 @@ public LazyOptional getCapability(@NotNull Capability cap) { public void onCraft() { if (!level.isClientSide) { Vec3 itemPos = getItemPos(); - MALUM_CHANNEL.send(PacketDistributor.TRACKING_CHUNK.with(() -> level().getChunkAt(getBlockPos())), new BlightTransformItemParticlePacket(List.of(ARCANE_SPIRIT.identifier), itemPos)); - level().playSound(null, getBlockPos(), SoundRegistry.ALTERATION_PLINTH_ALTERS.get(), SoundSource.BLOCKS, 1, 0.9f + level().random.nextFloat() * 0.25f); + MALUM_CHANNEL.send(PacketDistributor.TRACKING_CHUNK.with(() -> level.getChunkAt(getBlockPos())), new BlightTransformItemParticlePacket(List.of(ARCANE_SPIRIT.identifier), itemPos)); + level.playSound(null, getBlockPos(), SoundRegistry.ALTERATION_PLINTH_ALTERS.get(), SoundSource.BLOCKS, 1, 0.9f + level.random.nextFloat() * 0.25f); } itemHandler.getStackInSlot(0).shrink(1); itemHandler.getStackInSlot(1).shrink(1); diff --git a/src/main/java/com/sammy/malum/common/block/curiosities/weavers_workbench/WeaversWorkbenchItemHandler.java b/src/main/java/com/sammy/malum/common/block/curiosities/weavers_workbench/WeaversWorkbenchItemHandler.java index 8d6e9b8b2..97c49a586 100644 --- a/src/main/java/com/sammy/malum/common/block/curiosities/weavers_workbench/WeaversWorkbenchItemHandler.java +++ b/src/main/java/com/sammy/malum/common/block/curiosities/weavers_workbench/WeaversWorkbenchItemHandler.java @@ -1,8 +1,8 @@ package com.sammy.malum.common.block.curiosities.weavers_workbench; -import net.minecraft.world.item.*; -import net.minecraftforge.items.*; -import org.jetbrains.annotations.*; +import net.minecraft.world.item.ItemStack; +import net.minecraftforge.items.ItemStackHandler; +import org.jetbrains.annotations.NotNull; public class WeaversWorkbenchItemHandler extends ItemStackHandler { @@ -12,7 +12,7 @@ public class WeaversWorkbenchItemHandler extends ItemStackHandler { public WeaversWorkbenchItemHandler(int size, int outputs, WeaversWorkbenchBlockEntity blockEntity) { super(size + outputs); - this.entity = blockEntity; + this.entity = blockEntity; this.outputs = outputs; } diff --git a/src/main/java/com/sammy/malum/common/block/curiosities/weeping_well/PrimordialSoupBlock.java b/src/main/java/com/sammy/malum/common/block/curiosities/weeping_well/PrimordialSoupBlock.java index d27a6ccc7..9678da4ed 100644 --- a/src/main/java/com/sammy/malum/common/block/curiosities/weeping_well/PrimordialSoupBlock.java +++ b/src/main/java/com/sammy/malum/common/block/curiosities/weeping_well/PrimordialSoupBlock.java @@ -20,49 +20,49 @@ public class PrimordialSoupBlock extends Block { - public static final BooleanProperty TOP = BooleanProperty.create("top"); - protected static final VoxelShape TOP_SHAPE = Block.box(0.0D, 0.0D, 0.0D, 16.0D, 12.0D, 16.0D); + public static final BooleanProperty TOP = BooleanProperty.create("top"); + protected static final VoxelShape TOP_SHAPE = Block.box(0.0D, 0.0D, 0.0D, 16.0D, 12.0D, 16.0D); - public PrimordialSoupBlock(BlockBehaviour.Properties pProperties) { - super(pProperties); - this.registerDefaultState(this.stateDefinition.any().setValue(TOP, true)); - } + public PrimordialSoupBlock(BlockBehaviour.Properties pProperties) { + super(pProperties); + this.registerDefaultState(this.stateDefinition.any().setValue(TOP, true)); + } - public boolean skipRendering(BlockState pState, BlockState pAdjacentBlockState, Direction pDirection) { - return (pAdjacentBlockState.getBlock() instanceof VoidConduitBlock || pAdjacentBlockState.is(this)) || super.skipRendering(pState, pAdjacentBlockState, pDirection); - } + public boolean skipRendering(BlockState pState, BlockState pAdjacentBlockState, Direction pDirection) { + return (pAdjacentBlockState.getBlock() instanceof VoidConduitBlock || pAdjacentBlockState.is(this)) || super.skipRendering(pState, pAdjacentBlockState, pDirection); + } - public VoxelShape getOcclusionShape(BlockState pState, BlockGetter pLevel, BlockPos pPos) { - return Shapes.empty(); - } + public VoxelShape getOcclusionShape(BlockState pState, BlockGetter pLevel, BlockPos pPos) { + return Shapes.empty(); + } - @Override - protected void createBlockStateDefinition(StateDefinition.Builder builder) { - builder.add(TOP); - } + @Override + protected void createBlockStateDefinition(StateDefinition.Builder builder) { + builder.add(TOP); + } - @Override - public BlockState updateShape(BlockState pState, Direction pDirection, BlockState pNeighborState, LevelAccessor pLevel, BlockPos pCurrentPos, BlockPos pNeighborPos) { - return super.updateShape(pState, pDirection, pNeighborState, pLevel, pCurrentPos, pNeighborPos).setValue(TOP, !(pLevel.getBlockState(pCurrentPos.above()).getBlock() instanceof PrimordialSoupBlock)); - } + @Override + public BlockState updateShape(BlockState pState, Direction pDirection, BlockState pNeighborState, LevelAccessor pLevel, BlockPos pCurrentPos, BlockPos pNeighborPos) { + return super.updateShape(pState, pDirection, pNeighborState, pLevel, pCurrentPos, pNeighborPos).setValue(TOP, !(pLevel.getBlockState(pCurrentPos.above()).getBlock() instanceof PrimordialSoupBlock)); + } - @Override - public VoxelShape getShape(BlockState pState, BlockGetter pLevel, BlockPos pPos, CollisionContext pContext) { - if (pState.getValue(TOP)) { - return TOP_SHAPE; - } - return super.getShape(pState, pLevel, pPos, pContext); - } + @Override + public VoxelShape getShape(BlockState pState, BlockGetter pLevel, BlockPos pPos, CollisionContext pContext) { + if (pState.getValue(TOP)) { + return TOP_SHAPE; + } + return super.getShape(pState, pLevel, pPos, pContext); + } - @Override - public VoxelShape getCollisionShape(BlockState pState, BlockGetter pLevel, BlockPos pPos, CollisionContext pContext) { - return Shapes.empty(); - } + @Override + public VoxelShape getCollisionShape(BlockState pState, BlockGetter pLevel, BlockPos pPos, CollisionContext pContext) { + return Shapes.empty(); + } - @Override - public void entityInside(BlockState pState, Level pLevel, BlockPos pPos, Entity pEntity) { - if (pEntity instanceof LivingEntity livingEntity) { - TouchOfDarknessHandler.handlePrimordialSoupContact(pState, livingEntity); - } - } + @Override + public void entityInside(BlockState pState, Level pLevel, BlockPos pPos, Entity pEntity) { + if (pEntity instanceof LivingEntity livingEntity) { + TouchOfDarknessHandler.handlePrimordialSoupContact(pState, livingEntity); + } + } } \ No newline at end of file diff --git a/src/main/java/com/sammy/malum/common/block/curiosities/weeping_well/VoidConduitBlockEntity.java b/src/main/java/com/sammy/malum/common/block/curiosities/weeping_well/VoidConduitBlockEntity.java index a63deeae8..882faa528 100644 --- a/src/main/java/com/sammy/malum/common/block/curiosities/weeping_well/VoidConduitBlockEntity.java +++ b/src/main/java/com/sammy/malum/common/block/curiosities/weeping_well/VoidConduitBlockEntity.java @@ -1,38 +1,40 @@ package com.sammy.malum.common.block.curiosities.weeping_well; -import com.sammy.malum.common.recipe.*; -import com.sammy.malum.registry.common.*; -import com.sammy.malum.registry.common.block.*; -import com.sammy.malum.registry.common.item.*; -import com.sammy.malum.visual_effects.networked.data.*; -import net.minecraft.core.*; -import net.minecraft.nbt.*; -import net.minecraft.server.level.*; -import net.minecraft.sounds.*; -import net.minecraft.util.*; -import net.minecraft.world.entity.item.*; -import net.minecraft.world.item.*; -import net.minecraft.world.level.*; -import net.minecraft.world.level.block.*; -import net.minecraft.world.level.block.state.*; -import net.minecraft.world.phys.*; -import net.minecraft.world.phys.shapes.*; -import team.lodestar.lodestone.helpers.*; -import team.lodestar.lodestone.setup.*; -import team.lodestar.lodestone.systems.blockentity.*; -import team.lodestar.lodestone.systems.easing.*; -import team.lodestar.lodestone.systems.particle.*; -import team.lodestar.lodestone.systems.particle.builder.*; -import team.lodestar.lodestone.systems.particle.data.*; -import team.lodestar.lodestone.systems.particle.data.color.*; -import team.lodestar.lodestone.systems.particle.data.spin.*; -import team.lodestar.lodestone.systems.particle.render_types.*; -import team.lodestar.lodestone.systems.particle.world.*; +import com.sammy.malum.common.recipe.FavorOfTheVoidRecipe; +import com.sammy.malum.registry.common.ParticleEffectTypeRegistry; +import com.sammy.malum.registry.common.SoundRegistry; +import com.sammy.malum.registry.common.block.BlockEntityRegistry; +import com.sammy.malum.registry.common.item.ItemRegistry; +import com.sammy.malum.visual_effects.networked.data.PositionEffectData; +import net.minecraft.core.BlockPos; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.server.level.ServerLevel; +import net.minecraft.sounds.SoundEvents; +import net.minecraft.sounds.SoundSource; +import net.minecraft.util.Mth; +import net.minecraft.world.entity.item.ItemEntity; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.phys.AABB; +import net.minecraft.world.phys.shapes.VoxelShape; +import team.lodestar.lodestone.helpers.BlockHelper; +import team.lodestar.lodestone.setup.LodestoneParticleRegistry; +import team.lodestar.lodestone.systems.blockentity.LodestoneBlockEntity; +import team.lodestar.lodestone.systems.easing.Easing; +import team.lodestar.lodestone.systems.particle.SimpleParticleOptions; +import team.lodestar.lodestone.systems.particle.builder.WorldParticleBuilder; +import team.lodestar.lodestone.systems.particle.data.GenericParticleData; +import team.lodestar.lodestone.systems.particle.data.color.ColorParticleData; +import team.lodestar.lodestone.systems.particle.data.spin.SpinParticleData; +import team.lodestar.lodestone.systems.particle.render_types.LodestoneWorldParticleRenderType; import java.awt.*; +import java.util.ArrayList; +import java.util.Comparator; import java.util.List; -import java.util.*; -import java.util.stream.*; +import java.util.stream.Collectors; public class VoidConduitBlockEntity extends LodestoneBlockEntity { @@ -41,6 +43,7 @@ public class VoidConduitBlockEntity extends LodestoneBlockEntity { public int streak; protected static final VoxelShape WELL_SHAPE = Block.box(-16.0D, 11.0D, -16.0D, 32.0D, 13.0D, 32.0D); + public VoidConduitBlockEntity(BlockPos pos, BlockState state) { super(BlockEntityRegistry.VOID_CONDUIT.get(), pos, state); } @@ -53,7 +56,7 @@ protected void saveAdditional(CompoundTag compound) { CompoundTag itemTag = new CompoundTag(); ItemStack stack = eatenItems.get(i); stack.save(itemTag); - compound.put("item_"+i, itemTag); + compound.put("item_" + i, itemTag); } } compound.putInt("progress", progress); @@ -65,7 +68,7 @@ protected void saveAdditional(CompoundTag compound) { public void load(CompoundTag compound) { eatenItems.clear(); for (int i = 0; i < compound.getInt("itemCount"); i++) { - CompoundTag itemTag = compound.getCompound("item_"+i); + CompoundTag itemTag = compound.getCompound("item_" + i); eatenItems.add(ItemStack.of(itemTag)); } progress = compound.getInt("progress"); @@ -78,21 +81,21 @@ public void tick() { super.tick(); if (level instanceof ServerLevel serverLevel) { if (serverLevel.getGameTime() % 100L == 0) { - level().playSound(null, worldPosition, SoundRegistry.UNCANNY_VALLEY.get(), SoundSource.HOSTILE, 1f, Mth.nextFloat(level.getRandom(), 0.55f, 1.75f)); + level.playSound(null, worldPosition, SoundRegistry.UNCANNY_VALLEY.get(), SoundSource.HOSTILE, 1f, Mth.nextFloat(level.getRandom(), 0.55f, 1.75f)); } if (serverLevel.getGameTime() % 20L == 0) { - level().playSound(null, worldPosition, SoundRegistry.VOID_HEARTBEAT.get(), SoundSource.HOSTILE, 1.5f, Mth.nextFloat(level.getRandom(), 0.95f, 1.15f)); + level.playSound(null, worldPosition, SoundRegistry.VOID_HEARTBEAT.get(), SoundSource.HOSTILE, 1.5f, Mth.nextFloat(level.getRandom(), 0.95f, 1.15f)); } if (serverLevel.getGameTime() % 40L == 0) { List items = serverLevel.getEntitiesOfClass( - ItemEntity.class, - new AABB(worldPosition.offset(1, -3, 1), worldPosition.offset(-1, -1, -1)).inflate(1)) + ItemEntity.class, + new AABB(worldPosition.offset(1, -3, 1), worldPosition.offset(-1, -1, -1)).inflate(1)) .stream().sorted(Comparator.comparingInt(itemEntity -> itemEntity.age)).collect(Collectors.toList()); for (ItemEntity entity : items) { ItemStack item = entity.getItem(); if (item.getItem().equals(ItemRegistry.BLIGHTED_GUNK.get())) { - progress+=20; + progress += 20; } eatenItems.add(item); entity.discard(); @@ -103,14 +106,13 @@ public void tick() { progress++; if (progress >= 80) { int resultingProgress = 65; - ItemStack stack = eatenItems.get(eatenItems.size()-1); + ItemStack stack = eatenItems.get(eatenItems.size() - 1); if (stack.getItem().equals(ItemRegistry.BLIGHTED_GUNK.get())) { - resultingProgress = 72+streak/4; + resultingProgress = 72 + streak / 4; streak++; - level().playSound(null, worldPosition, SoundRegistry.HUNGRY_BELT_FEEDS.get(), SoundSource.PLAYERS, 0.7f, 0.6f + level().random.nextFloat() * 0.3f+streak*0.05f); - level().playSound(null, worldPosition, SoundEvents.GENERIC_EAT, SoundSource.PLAYERS, 0.7f, 0.6f + level().random.nextFloat() * 0.2f+streak*0.05f); - } - else { + level.playSound(null, worldPosition, SoundRegistry.HUNGRY_BELT_FEEDS.get(), SoundSource.PLAYERS, 0.7f, 0.6f + level.random.nextFloat() * 0.3f + streak * 0.05f); + level.playSound(null, worldPosition, SoundEvents.GENERIC_EAT, SoundSource.PLAYERS, 0.7f, 0.6f + level.random.nextFloat() * 0.2f + streak * 0.05f); + } else { FavorOfTheVoidRecipe recipe = FavorOfTheVoidRecipe.getRecipe(level, stack); float pitch = Mth.nextFloat(level.getRandom(), 0.85f, 1.35f) + streak * 0.1f; if (recipe != null) { @@ -122,36 +124,35 @@ public void tick() { outputStack.setTag(recipe.output.getTag()); ItemEntity entity = new ItemEntity(level, worldPosition.getX() + 0.5f, worldPosition.getY() + 0.5f, worldPosition.getZ() + 0.5f, outputStack); entity.setDeltaMovement(0, 0.65f, 0.15f); - level().addFreshEntity(entity); + level.addFreshEntity(entity); amount -= count; } - level().playSound(null, worldPosition, SoundRegistry.VOID_TRANSMUTATION.get(), SoundSource.HOSTILE, 2f, pitch); + level.playSound(null, worldPosition, SoundRegistry.VOID_TRANSMUTATION.get(), SoundSource.HOSTILE, 2f, pitch); } else { ItemEntity entity = new ItemEntity(level, worldPosition.getX() + 0.5f, worldPosition.getY() + 0.5f, worldPosition.getZ() + 0.5f, stack); entity.setDeltaMovement(0, 0.65f, 0.15f); - level().addFreshEntity(entity); - level().playSound(null, worldPosition, SoundRegistry.VOID_REJECTION.get(), SoundSource.HOSTILE, 2f, pitch); + level.addFreshEntity(entity); + level.playSound(null, worldPosition, SoundRegistry.VOID_REJECTION.get(), SoundSource.HOSTILE, 2f, pitch); } } progress = resultingProgress; - ParticleEffectTypeRegistry.WEEPING_WELL_REACTS.createPositionedEffect(level, new PositionEffectData(worldPosition.getX()+0.5f, worldPosition.getY()+0.75f, worldPosition.getZ()+0.5f)); - eatenItems.remove(eatenItems.size()-1); + ParticleEffectTypeRegistry.WEEPING_WELL_REACTS.createPositionedEffect(level, new PositionEffectData(worldPosition.getX() + 0.5f, worldPosition.getY() + 0.75f, worldPosition.getZ() + 0.5f)); + eatenItems.remove(eatenItems.size() - 1); BlockHelper.updateAndNotifyState(level, worldPosition); } if (eatenItems.isEmpty()) { progress = 0; } - } - else if (streak != 0) { + } else if (streak != 0) { streak = 0; } - } - else { + } else { if (level.getGameTime() % 6L == 0) { ClientOnly.spawnParticles(level, worldPosition); } } } + public static class ClientOnly { public static void spawnParticles(Level level, BlockPos blockPos) { float multiplier = Mth.nextFloat(level.random, 0.4f, 1f); @@ -163,7 +164,7 @@ public static void spawnParticles(Level level, BlockPos blockPos) { .setSpinData(SpinParticleData.create(0.1f, 0.4f, 0).setEasing(Easing.SINE_IN, Easing.SINE_OUT).build()) .setScaleData(GenericParticleData.create(0f, 0.9f, 0.5f).setEasing(Easing.SINE_IN, Easing.SINE_OUT).build()) .setColorData(ColorParticleData.create(color, endColor).setCoefficient(0.5f).build()) - .addMotion(0, level().random.nextFloat() * 0.01f, 0) + .addMotion(0, level.random.nextFloat() * 0.01f, 0) .setRandomOffset(3f, 0.02f) .enableNoClip() .setDiscardFunction(SimpleParticleOptions.ParticleDiscardFunctionType.ENDING_CURVE_INVISIBLE) diff --git a/src/main/java/com/sammy/malum/common/block/ether/EtherBlockEntity.java b/src/main/java/com/sammy/malum/common/block/ether/EtherBlockEntity.java index 35ac752cc..d990a9949 100644 --- a/src/main/java/com/sammy/malum/common/block/ether/EtherBlockEntity.java +++ b/src/main/java/com/sammy/malum/common/block/ether/EtherBlockEntity.java @@ -11,7 +11,8 @@ import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.BlockGetter; -import net.minecraft.world.level.block.*; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.WallTorchBlock; import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.phys.HitResult; @@ -21,9 +22,9 @@ import team.lodestar.lodestone.systems.blockentity.LodestoneBlockEntity; import team.lodestar.lodestone.systems.easing.Easing; import team.lodestar.lodestone.systems.particle.SimpleParticleOptions; -import team.lodestar.lodestone.systems.particle.builder.*; -import team.lodestar.lodestone.systems.particle.data.color.ColorParticleData; +import team.lodestar.lodestone.systems.particle.builder.WorldParticleBuilder; import team.lodestar.lodestone.systems.particle.data.GenericParticleData; +import team.lodestar.lodestone.systems.particle.data.color.ColorParticleData; import team.lodestar.lodestone.systems.particle.data.spin.SpinParticleData; import java.awt.*; @@ -112,9 +113,9 @@ public void tick() { double x = worldPosition.getX() + 0.5; double y = worldPosition.getY() + 0.6; double z = worldPosition.getZ() + 0.5; - int lifeTime = 14 + level().random.nextInt(4); - float scale = 0.17f + level().random.nextFloat() * 0.03f; - float velocity = 0.04f + level().random.nextFloat() * 0.02f; + int lifeTime = 14 + level.random.nextInt(4); + float scale = 0.17f + level.random.nextFloat() * 0.03f; + float velocity = 0.04f + level.random.nextFloat() * 0.02f; if (block instanceof EtherWallTorchBlock) { Direction direction = getBlockState().getValue(WallTorchBlock.FACING); @@ -160,7 +161,7 @@ public void tick() { .setRandomOffset(0.15f, 0.2f) .addMotion(0, 0.0035f, 0) .setRandomMotion(0.001f, 0.005f) - .addActor(p -> p.setParticleMotion(p.getParticleSpeed().scale(0.985f-level.random.nextFloat() * 0.04f))) + .addActor(p -> p.setParticleMotion(p.getParticleSpeed().scale(0.985f - level.random.nextFloat() * 0.04f))) .enableNoClip() .setDiscardFunction(SimpleParticleOptions.ParticleDiscardFunctionType.ENDING_CURVE_INVISIBLE) .spawn(level, x, y, z); @@ -173,7 +174,7 @@ public void tick() { .setRandomOffset(0.1f, 0.225f) .addMotion(0, velocity / 2f, 0) .setRandomMotion(0, 0.015f) - .addActor(p -> p.setParticleMotion(p.getParticleSpeed().scale(0.97f-level.random.nextFloat() * 0.025f))) + .addActor(p -> p.setParticleMotion(p.getParticleSpeed().scale(0.97f - level.random.nextFloat() * 0.025f))) .enableNoClip() .setDiscardFunction(SimpleParticleOptions.ParticleDiscardFunctionType.ENDING_CURVE_INVISIBLE) .spawn(level, x, y, z); diff --git a/src/main/java/com/sammy/malum/common/block/ether/EtherBrazierBlock.java b/src/main/java/com/sammy/malum/common/block/ether/EtherBrazierBlock.java index 3d5b42d3a..d4ff3e9f6 100644 --- a/src/main/java/com/sammy/malum/common/block/ether/EtherBrazierBlock.java +++ b/src/main/java/com/sammy/malum/common/block/ether/EtherBrazierBlock.java @@ -19,24 +19,22 @@ import javax.annotation.Nullable; -public class EtherBrazierBlock extends EtherBlock -{ +public class EtherBrazierBlock extends EtherBlock { public static final VoxelShape SHAPE = Block.box(4, 0, 4, 12, 8, 12); public static final BooleanProperty ROTATED = BooleanProperty.create("rotated"); public static final BooleanProperty HANGING = BlockStateProperties.HANGING; - public EtherBrazierBlock(Properties properties) - { + public EtherBrazierBlock(Properties properties) { super(properties); this.registerDefaultState(this.stateDefinition.any().setValue(HANGING, false).setValue(WATERLOGGED, false).setValue(ROTATED, false)); - + } @Override public VoxelShape getShape(BlockState state, BlockGetter level, BlockPos pos, CollisionContext context) { return SHAPE; } - + @Nullable public BlockState getStateForPlacement(BlockPlaceContext context) { FluidState fluidstate = context.getLevel().getFluidState(context.getClickedPos()); @@ -54,8 +52,7 @@ public BlockState getStateForPlacement(BlockPlaceContext context) { } @Override - protected void createBlockStateDefinition(StateDefinition.Builder builder) - { + protected void createBlockStateDefinition(StateDefinition.Builder builder) { builder.add(HANGING, WATERLOGGED, ROTATED); } @@ -65,14 +62,12 @@ public boolean canSurvive(BlockState state, LevelReader level, BlockPos pos) { return Block.canSupportCenter(level, pos.relative(direction), direction.getOpposite()); } - protected static Direction getBlockConnected(BlockState state) - { + protected static Direction getBlockConnected(BlockState state) { return state.getValue(HANGING) ? Direction.DOWN : Direction.UP; } - + @Override - public PushReaction getPistonPushReaction(BlockState state) - { + public PushReaction getPistonPushReaction(BlockState state) { return PushReaction.DESTROY; } diff --git a/src/main/java/com/sammy/malum/common/block/ether/EtherWallTorchBlock.java b/src/main/java/com/sammy/malum/common/block/ether/EtherWallTorchBlock.java index 57057de24..c071cca73 100644 --- a/src/main/java/com/sammy/malum/common/block/ether/EtherWallTorchBlock.java +++ b/src/main/java/com/sammy/malum/common/block/ether/EtherWallTorchBlock.java @@ -56,7 +56,7 @@ public static VoxelShape getShapeForState(BlockState state) { public boolean canSurvive(BlockState state, LevelReader level, BlockPos pos) { Direction direction = state.getValue(HORIZONTAL_FACING); BlockPos blockpos = pos.relative(direction.getOpposite()); - BlockState blockstate = level().getBlockState(blockpos); + BlockState blockstate = level.getBlockState(blockpos); return blockstate.isFaceSturdy(level, blockpos, direction); } diff --git a/src/main/java/com/sammy/malum/common/block/mana_mote/MoteOfManaBlockEntity.java b/src/main/java/com/sammy/malum/common/block/mana_mote/MoteOfManaBlockEntity.java index 66e592e37..44cfc6aa6 100644 --- a/src/main/java/com/sammy/malum/common/block/mana_mote/MoteOfManaBlockEntity.java +++ b/src/main/java/com/sammy/malum/common/block/mana_mote/MoteOfManaBlockEntity.java @@ -1,9 +1,9 @@ package com.sammy.malum.common.block.mana_mote; -import com.sammy.malum.registry.common.block.*; -import net.minecraft.core.*; -import net.minecraft.world.level.block.state.*; -import team.lodestar.lodestone.systems.blockentity.*; +import com.sammy.malum.registry.common.block.BlockEntityRegistry; +import net.minecraft.core.BlockPos; +import net.minecraft.world.level.block.state.BlockState; +import team.lodestar.lodestone.systems.blockentity.LodestoneBlockEntity; public class MoteOfManaBlockEntity extends LodestoneBlockEntity { public MoteOfManaBlockEntity(BlockPos pos, BlockState state) { diff --git a/src/main/java/com/sammy/malum/common/block/mana_mote/SoulstoneBlock.java b/src/main/java/com/sammy/malum/common/block/mana_mote/SoulstoneBlock.java index d8bc545b5..05fb079b2 100644 --- a/src/main/java/com/sammy/malum/common/block/mana_mote/SoulstoneBlock.java +++ b/src/main/java/com/sammy/malum/common/block/mana_mote/SoulstoneBlock.java @@ -1,20 +1,23 @@ package com.sammy.malum.common.block.mana_mote; -import com.sammy.malum.common.item.spirit.*; - -import com.sammy.malum.core.systems.spirit.*; -import com.sammy.malum.registry.common.*; -import com.sammy.malum.visual_effects.networked.data.*; -import net.minecraft.core.*; -import net.minecraft.sounds.*; -import net.minecraft.util.*; -import net.minecraft.world.*; -import net.minecraft.world.entity.player.*; -import net.minecraft.world.item.*; -import net.minecraft.world.level.*; -import net.minecraft.world.level.block.*; -import net.minecraft.world.level.block.state.*; -import net.minecraft.world.phys.*; +import com.sammy.malum.common.item.spirit.SpiritShardItem; +import com.sammy.malum.core.systems.spirit.MalumSpiritType; +import com.sammy.malum.registry.common.ParticleEffectTypeRegistry; +import com.sammy.malum.registry.common.SoundRegistry; +import com.sammy.malum.visual_effects.networked.data.ColorEffectData; +import com.sammy.malum.visual_effects.networked.data.PositionEffectData; +import net.minecraft.core.BlockPos; +import net.minecraft.sounds.SoundSource; +import net.minecraft.util.Mth; +import net.minecraft.world.InteractionHand; +import net.minecraft.world.InteractionResult; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.SoundType; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.phys.BlockHitResult; public class SoulstoneBlock extends Block { public SoulstoneBlock(Properties pProperties) { diff --git a/src/main/java/com/sammy/malum/common/block/mana_mote/SpiritMoteBlock.java b/src/main/java/com/sammy/malum/common/block/mana_mote/SpiritMoteBlock.java index 93bd3136c..dc9013461 100644 --- a/src/main/java/com/sammy/malum/common/block/mana_mote/SpiritMoteBlock.java +++ b/src/main/java/com/sammy/malum/common/block/mana_mote/SpiritMoteBlock.java @@ -1,18 +1,19 @@ package com.sammy.malum.common.block.mana_mote; -import com.sammy.malum.core.systems.spirit.*; -import net.minecraft.core.*; -import net.minecraft.world.entity.player.*; -import net.minecraft.world.level.*; -import net.minecraft.world.level.block.entity.*; -import net.minecraft.world.level.block.state.*; -import team.lodestar.lodestone.systems.block.*; +import com.sammy.malum.core.systems.spirit.MalumSpiritType; +import net.minecraft.core.BlockPos; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.entity.BlockEntityType; +import net.minecraft.world.level.block.state.BlockState; +import team.lodestar.lodestone.systems.block.LodestoneEntityBlock; -import java.util.function.*; +import java.util.function.Supplier; public class SpiritMoteBlock extends LodestoneEntityBlock { public final MalumSpiritType spiritType; + public SpiritMoteBlock(Properties properties, MalumSpiritType spiritType) { super(properties.lightLevel(b -> 6)); this.spiritType = spiritType; @@ -25,6 +26,6 @@ protected void spawnDestroyParticles(Level pLevel, Player pPlayer, BlockPos pPos @Override public SpiritMoteBlock setBlockEntity(Supplier> type) { - return (SpiritMoteBlock)super.setBlockEntity(type); + return (SpiritMoteBlock) super.setBlockEntity(type); } } diff --git a/src/main/java/com/sammy/malum/common/block/nature/MalumLeavesBlock.java b/src/main/java/com/sammy/malum/common/block/nature/MalumLeavesBlock.java index 1c2d835aa..3bda57a1d 100644 --- a/src/main/java/com/sammy/malum/common/block/nature/MalumLeavesBlock.java +++ b/src/main/java/com/sammy/malum/common/block/nature/MalumLeavesBlock.java @@ -34,7 +34,7 @@ public MalumLeavesBlock(Properties properties, Color maxColor, Color minColor) { @Override protected void createBlockStateDefinition(StateDefinition.Builder builder) { - builder.add(DISTANCE, PERSISTENT, COLOR); + builder.add(DISTANCE, PERSISTENT, COLOR, WATERLOGGED); } public BlockState getStateForPlacement(BlockPlaceContext context) { @@ -44,7 +44,7 @@ public BlockState getStateForPlacement(BlockPlaceContext context) { @Override public InteractionResult use(BlockState state, Level level, BlockPos pos, Player player, InteractionHand handIn, BlockHitResult hit) { if (player.getItemInHand(handIn).getItem().equals(ItemRegistry.INFERNAL_SPIRIT.get())) { - level().setBlockAndUpdate(pos, state.setValue(COLOR, (state.getValue(COLOR) + 1) % 5)); + level.setBlockAndUpdate(pos, state.setValue(COLOR, (state.getValue(COLOR) + 1) % 5)); player.swing(handIn); player.playSound(SoundEvents.BLAZE_SHOOT, 1F, 1.5f + RANDOM.nextFloat() * 0.5f); return InteractionResult.SUCCESS; diff --git a/src/main/java/com/sammy/malum/common/block/nature/MalumLogBLock.java b/src/main/java/com/sammy/malum/common/block/nature/MalumLogBLock.java index 54affc170..c75ed960e 100644 --- a/src/main/java/com/sammy/malum/common/block/nature/MalumLogBLock.java +++ b/src/main/java/com/sammy/malum/common/block/nature/MalumLogBLock.java @@ -43,14 +43,14 @@ public InteractionResult use(BlockState state, Level level, BlockPos pos, Player } public boolean createTotemPole(Level level, BlockPos pos, Player player, InteractionHand handIn, BlockHitResult hit, ItemStack stack, SpiritShardItem spirit) { - level().setBlockAndUpdate(pos, spirit.type.getTotemPoleBlockState(isCorrupt, hit)); + level.setBlockAndUpdate(pos, spirit.type.getTotemPoleBlockState(isCorrupt, hit)); if (level.getBlockEntity(pos) instanceof TotemPoleBlockEntity blockEntity) { blockEntity.create(spirit.type); } if (!player.isCreative()) { stack.shrink(1); } - level().levelEvent(2001, pos, Block.getId(level.getBlockState(pos))); + level.levelEvent(2001, pos, Block.getId(level.getBlockState(pos))); player.swing(handIn, true); return true; } diff --git a/src/main/java/com/sammy/malum/common/block/nature/MalumSaplingBlock.java b/src/main/java/com/sammy/malum/common/block/nature/MalumSaplingBlock.java index 203b6c59d..f374b1ef0 100644 --- a/src/main/java/com/sammy/malum/common/block/nature/MalumSaplingBlock.java +++ b/src/main/java/com/sammy/malum/common/block/nature/MalumSaplingBlock.java @@ -1,21 +1,23 @@ package com.sammy.malum.common.block.nature; import com.sammy.malum.registry.common.block.BlockTagRegistry; +import com.sammy.malum.registry.common.worldgen.ConfiguredFeatureRegistry; import com.sammy.malum.registry.common.worldgen.FeatureRegistry; import net.minecraft.core.BlockPos; import net.minecraft.core.Holder; +import net.minecraft.core.registries.Registries; import net.minecraft.server.level.ServerLevel; import net.minecraft.util.RandomSource; import net.minecraft.world.level.LevelReader; import net.minecraft.world.level.block.SaplingBlock; import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.level.levelgen.feature.ConfiguredFeature; import net.minecraft.world.level.levelgen.feature.Feature; import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration; import net.minecraftforge.event.ForgeEventFactory; import net.minecraftforge.eventbus.api.Event; import net.minecraftforge.registries.RegistryObject; -import java.util.Random; import java.util.function.Supplier; public class MalumSaplingBlock extends SaplingBlock { @@ -39,9 +41,10 @@ public void advanceTree(ServerLevel level, BlockPos pos, BlockState state, Rando if (state.getValue(STAGE) == 0) { level.setBlock(pos, state.cycle(STAGE), 4); } else { - if (!ForgeEventFactory.blockGrowFeature(level, rand, pos, Holder.direct(FeatureRegistry.ConfiguredFeatures.RUNEWOOD_TREE_FEATURE.get())).getResult().equals(Event.Result.DENY)) { - return; - } + // Holder> holder = level.registryAccess().registryOrThrow(Registries.CONFIGURED_FEATURE).getHolder(ConfiguredFeatureRegistry.RUNEWOOD_TREE_CONFIGURED_FEATURE).orElse(null); + // if (!ForgeEventFactory.blockGrowFeature(level, rand, pos, holder).getResult().equals(Event.Result.DENY)) { + // return; + // }TODO tree.get().place(NoneFeatureConfiguration.INSTANCE, level, level.getChunkSource().getGenerator(), rand, pos); } } diff --git a/src/main/java/com/sammy/malum/common/block/nature/SapFilledLogBlock.java b/src/main/java/com/sammy/malum/common/block/nature/SapFilledLogBlock.java index aa4da0607..da4364aa0 100644 --- a/src/main/java/com/sammy/malum/common/block/nature/SapFilledLogBlock.java +++ b/src/main/java/com/sammy/malum/common/block/nature/SapFilledLogBlock.java @@ -18,9 +18,9 @@ import net.minecraftforge.items.ItemHandlerHelper; import team.lodestar.lodestone.helpers.BlockHelper; import team.lodestar.lodestone.setup.LodestoneParticleRegistry; -import team.lodestar.lodestone.systems.particle.builder.*; -import team.lodestar.lodestone.systems.particle.data.color.ColorParticleData; +import team.lodestar.lodestone.systems.particle.builder.WorldParticleBuilder; import team.lodestar.lodestone.systems.particle.data.GenericParticleData; +import team.lodestar.lodestone.systems.particle.data.color.ColorParticleData; import team.lodestar.lodestone.systems.particle.data.spin.SpinParticleData; import java.awt.*; @@ -52,7 +52,7 @@ public InteractionResult use(BlockState state, Level level, BlockPos pos, Player } public void collectSap(Level level, BlockPos pos, Player player) { - level().playSound(player, player.getX(), player.getY(), player.getZ(), SoundEvents.BOTTLE_FILL, SoundSource.NEUTRAL, 1.0F, 1.0F); + level.playSound(player, player.getX(), player.getY(), player.getZ(), SoundEvents.BOTTLE_FILL, SoundSource.NEUTRAL, 1.0F, 1.0F); ItemHandlerHelper.giveItemToPlayer(player, new ItemStack(sap.get())); if (level.random.nextBoolean()) { BlockHelper.setBlockStateWithExistingProperties(level, pos, drained.get().defaultBlockState(), 3); diff --git a/src/main/java/com/sammy/malum/common/block/nature/soulwood/SapFilledSoulwoodLogBlock.java b/src/main/java/com/sammy/malum/common/block/nature/soulwood/SapFilledSoulwoodLogBlock.java index 24bfbf126..23165ae49 100644 --- a/src/main/java/com/sammy/malum/common/block/nature/soulwood/SapFilledSoulwoodLogBlock.java +++ b/src/main/java/com/sammy/malum/common/block/nature/soulwood/SapFilledSoulwoodLogBlock.java @@ -19,7 +19,7 @@ public SapFilledSoulwoodLogBlock(Properties properties, Supplier drained, @Override public void collectSap(Level level, BlockPos pos, Player player) { - level().playSound(null, pos, SoundRegistry.MAJOR_BLIGHT_MOTIF.get(), SoundSource.BLOCKS, 1, 1); + level.playSound(null, pos, SoundRegistry.MAJOR_BLIGHT_MOTIF.get(), SoundSource.BLOCKS, 1, 1); super.collectSap(level, pos, player); } } diff --git a/src/main/java/com/sammy/malum/common/block/nature/soulwood/SoulwoodGrowthBlock.java b/src/main/java/com/sammy/malum/common/block/nature/soulwood/SoulwoodGrowthBlock.java index a43863164..989e7415a 100644 --- a/src/main/java/com/sammy/malum/common/block/nature/soulwood/SoulwoodGrowthBlock.java +++ b/src/main/java/com/sammy/malum/common/block/nature/soulwood/SoulwoodGrowthBlock.java @@ -20,9 +20,6 @@ import net.minecraft.world.phys.BlockHitResult; import net.minecraftforge.registries.RegistryObject; -import java.util.Random; -import java.util.random.RandomGenerator; - import static com.sammy.malum.registry.common.block.BlockTagRegistry.BLIGHTED_BLOCKS; public class SoulwoodGrowthBlock extends MalumSaplingBlock { diff --git a/src/main/java/com/sammy/malum/common/block/nature/soulwood/SoulwoodLogBlock.java b/src/main/java/com/sammy/malum/common/block/nature/soulwood/SoulwoodLogBlock.java index 7d5e3a305..212a8c49b 100644 --- a/src/main/java/com/sammy/malum/common/block/nature/soulwood/SoulwoodLogBlock.java +++ b/src/main/java/com/sammy/malum/common/block/nature/soulwood/SoulwoodLogBlock.java @@ -40,7 +40,7 @@ public BlockState getToolModifiedState(BlockState state, UseOnContext context, T public boolean createTotemPole(Level level, BlockPos pos, Player player, InteractionHand handIn, BlockHitResult hit, ItemStack stack, SpiritShardItem spirit) { boolean success = super.createTotemPole(level, pos, player, handIn, hit, stack, spirit); if (success) { - level().playSound(null, pos, SoundRegistry.MAJOR_BLIGHT_MOTIF.get(), SoundSource.BLOCKS, 1, 1); + level.playSound(null, pos, SoundRegistry.MAJOR_BLIGHT_MOTIF.get(), SoundSource.BLOCKS, 1, 1); } return success; } diff --git a/src/main/java/com/sammy/malum/common/block/storage/IMalumSpecialItemAccessPoint.java b/src/main/java/com/sammy/malum/common/block/storage/IMalumSpecialItemAccessPoint.java index 1647d21da..d41be7809 100644 --- a/src/main/java/com/sammy/malum/common/block/storage/IMalumSpecialItemAccessPoint.java +++ b/src/main/java/com/sammy/malum/common/block/storage/IMalumSpecialItemAccessPoint.java @@ -4,13 +4,16 @@ import net.minecraft.world.phys.Vec3; import team.lodestar.lodestone.systems.blockentity.LodestoneBlockEntityInventory; -public interface IMalumSpecialItemAccessPoint -{ +public interface IMalumSpecialItemAccessPoint { LodestoneBlockEntityInventory getSuppliedInventory(); + default Vec3 getItemPos() { return getItemPos(0); } + Vec3 getItemPos(float partialTicks); + Vec3 getItemOffset(float partialTicks); + BlockPos getAccessPointBlockPos(); } diff --git a/src/main/java/com/sammy/malum/common/block/storage/MalumItemHolderBlockEntity.java b/src/main/java/com/sammy/malum/common/block/storage/MalumItemHolderBlockEntity.java index 26b594ee4..ce868544d 100644 --- a/src/main/java/com/sammy/malum/common/block/storage/MalumItemHolderBlockEntity.java +++ b/src/main/java/com/sammy/malum/common/block/storage/MalumItemHolderBlockEntity.java @@ -1,12 +1,12 @@ package com.sammy.malum.common.block.storage; -import com.sammy.malum.common.item.spirit.*; -import com.sammy.malum.core.systems.spirit.*; -import com.sammy.malum.visual_effects.*; -import net.minecraft.core.*; -import net.minecraft.world.level.block.entity.*; -import net.minecraft.world.level.block.state.*; -import net.minecraft.world.phys.*; +import com.sammy.malum.common.item.spirit.SpiritShardItem; +import com.sammy.malum.core.systems.spirit.MalumSpiritType; +import com.sammy.malum.visual_effects.SpiritLightSpecs; +import net.minecraft.core.BlockPos; +import net.minecraft.world.level.block.entity.BlockEntityType; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.phys.Vec3; import team.lodestar.lodestone.helpers.BlockHelper; import team.lodestar.lodestone.systems.blockentity.ItemHolderBlockEntity; import team.lodestar.lodestone.systems.blockentity.LodestoneBlockEntityInventory; @@ -33,7 +33,7 @@ public LodestoneBlockEntityInventory getSuppliedInventory() { public Vec3 getItemPos(float partialTicks) { final BlockPos blockPos = getBlockPos(); final Vec3 offset = getItemOffset(partialTicks); - return new Vec3(blockPos.getX()+offset.x, blockPos.getY()+offset.y, blockPos.getZ()+offset.z); + return new Vec3(blockPos.getX() + offset.x, blockPos.getY() + offset.y, blockPos.getZ() + offset.z); } @Override diff --git a/src/main/java/com/sammy/malum/common/block/storage/jar/SpiritJarBlockEntity.java b/src/main/java/com/sammy/malum/common/block/storage/jar/SpiritJarBlockEntity.java index ba1527df2..12c728521 100644 --- a/src/main/java/com/sammy/malum/common/block/storage/jar/SpiritJarBlockEntity.java +++ b/src/main/java/com/sammy/malum/common/block/storage/jar/SpiritJarBlockEntity.java @@ -1,11 +1,11 @@ package com.sammy.malum.common.block.storage.jar; -import com.sammy.malum.visual_effects.SpiritLightSpecs; -import com.sammy.malum.common.item.spirit.SpiritShardItem; import com.sammy.malum.common.item.curiosities.SpiritPouchItem; +import com.sammy.malum.common.item.spirit.SpiritShardItem; import com.sammy.malum.core.helper.SpiritHelper; import com.sammy.malum.core.systems.spirit.MalumSpiritType; import com.sammy.malum.registry.common.block.BlockEntityRegistry; +import com.sammy.malum.visual_effects.SpiritLightSpecs; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.nbt.CompoundTag; @@ -17,21 +17,21 @@ import net.minecraft.world.level.Level; import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.phys.*; +import net.minecraft.world.phys.Vec3; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.common.capabilities.Capability; -import net.minecraftforge.common.util.LazyOptional; import net.minecraftforge.common.capabilities.ForgeCapabilities; +import net.minecraftforge.common.util.LazyOptional; import net.minecraftforge.items.IItemHandler; import org.jetbrains.annotations.NotNull; import team.lodestar.lodestone.helpers.BlockHelper; import team.lodestar.lodestone.setup.LodestoneParticleRegistry; import team.lodestar.lodestone.systems.blockentity.LodestoneBlockEntity; import team.lodestar.lodestone.systems.container.ItemInventory; -import team.lodestar.lodestone.systems.particle.builder.*; -import team.lodestar.lodestone.systems.particle.data.color.ColorParticleData; +import team.lodestar.lodestone.systems.particle.builder.WorldParticleBuilder; import team.lodestar.lodestone.systems.particle.data.GenericParticleData; +import team.lodestar.lodestone.systems.particle.data.color.ColorParticleData; import team.lodestar.lodestone.systems.particle.data.spin.SpinParticleData; import javax.annotation.Nonnull; @@ -240,7 +240,7 @@ public void tick() { if (type != null) { double time = (level.getGameTime() * 0.05f) % 6.2831f; double x = getBlockPos().getX() + 0.5f; - double y = getBlockPos().getY() + 0.5f + (float)Math.sin(time) * 0.2f; + double y = getBlockPos().getY() + 0.5f + (float) Math.sin(time) * 0.2f; double z = getBlockPos().getZ() + 0.5f; SpiritLightSpecs.rotatingLightSpecs(level, new Vec3(x, y, z), type, 0.4f, 3); } diff --git a/src/main/java/com/sammy/malum/common/block/storage/pedestal/ItemPedestalBlockEntity.java b/src/main/java/com/sammy/malum/common/block/storage/pedestal/ItemPedestalBlockEntity.java index b8d9ea8ac..eed46c705 100644 --- a/src/main/java/com/sammy/malum/common/block/storage/pedestal/ItemPedestalBlockEntity.java +++ b/src/main/java/com/sammy/malum/common/block/storage/pedestal/ItemPedestalBlockEntity.java @@ -1,12 +1,12 @@ package com.sammy.malum.common.block.storage.pedestal; -import com.sammy.malum.common.block.storage.*; -import com.sammy.malum.common.item.spirit.*; -import com.sammy.malum.registry.common.block.*; -import net.minecraft.core.*; -import net.minecraft.world.level.block.entity.*; -import net.minecraft.world.level.block.state.*; -import net.minecraft.world.phys.*; +import com.sammy.malum.common.block.storage.MalumItemHolderBlockEntity; +import com.sammy.malum.common.item.spirit.SpiritShardItem; +import com.sammy.malum.registry.common.block.BlockEntityRegistry; +import net.minecraft.core.BlockPos; +import net.minecraft.world.level.block.entity.BlockEntityType; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.phys.Vec3; public class ItemPedestalBlockEntity extends MalumItemHolderBlockEntity { @@ -23,8 +23,8 @@ public ItemPedestalBlockEntity(BlockPos pos, BlockState state) { @Override public Vec3 getItemOffset(float partialTicks) { if (inventory.getStackInSlot(0).getItem() instanceof SpiritShardItem) { - float gameTime = level().getGameTime() + partialTicks; - return PEDESTAL_ITEM_OFFSET.add(0, (float)Math.sin((gameTime % 360) / 20f) * 0.05f, 0); + float gameTime = level.getGameTime() + partialTicks; + return PEDESTAL_ITEM_OFFSET.add(0, (float) Math.sin((gameTime % 360) / 20f) * 0.05f, 0); } return PEDESTAL_ITEM_OFFSET; } diff --git a/src/main/java/com/sammy/malum/common/block/storage/pedestal/WoodItemPedestalBlock.java b/src/main/java/com/sammy/malum/common/block/storage/pedestal/WoodItemPedestalBlock.java index bf6978287..e725bf8e8 100644 --- a/src/main/java/com/sammy/malum/common/block/storage/pedestal/WoodItemPedestalBlock.java +++ b/src/main/java/com/sammy/malum/common/block/storage/pedestal/WoodItemPedestalBlock.java @@ -11,16 +11,14 @@ import java.util.stream.Stream; -public class WoodItemPedestalBlock extends ItemPedestalBlock -{ +public class WoodItemPedestalBlock extends ItemPedestalBlock { public static final VoxelShape SHAPE = Stream.of( Block.box(4, 0, 4, 12, 3, 12), Block.box(5, 3, 5, 11, 11, 11), Block.box(4, 11, 4, 12, 13, 12) ).reduce((v1, v2) -> Shapes.join(v1, v2, BooleanOp.OR)).get(); - public WoodItemPedestalBlock(Properties properties) - { + public WoodItemPedestalBlock(Properties properties) { super(properties); } diff --git a/src/main/java/com/sammy/malum/common/block/storage/stand/ItemStandBlockEntity.java b/src/main/java/com/sammy/malum/common/block/storage/stand/ItemStandBlockEntity.java index b7d797a18..cebd11713 100644 --- a/src/main/java/com/sammy/malum/common/block/storage/stand/ItemStandBlockEntity.java +++ b/src/main/java/com/sammy/malum/common/block/storage/stand/ItemStandBlockEntity.java @@ -1,17 +1,19 @@ package com.sammy.malum.common.block.storage.stand; -import com.sammy.malum.common.block.curiosities.totem.*; -import com.sammy.malum.common.block.storage.*; -import com.sammy.malum.common.item.spirit.*; -import com.sammy.malum.registry.common.block.*; -import net.minecraft.core.*; -import net.minecraft.world.entity.*; -import net.minecraft.world.item.*; -import net.minecraft.world.level.block.entity.*; -import net.minecraft.world.level.block.state.*; -import net.minecraft.world.level.block.state.properties.*; -import net.minecraft.world.phys.*; -import team.lodestar.lodestone.helpers.*; +import com.sammy.malum.common.block.curiosities.totem.TotemBaseBlockEntity; +import com.sammy.malum.common.block.curiosities.totem.TotemPoleBlockEntity; +import com.sammy.malum.common.block.storage.MalumItemHolderBlockEntity; +import com.sammy.malum.common.item.spirit.SpiritShardItem; +import com.sammy.malum.registry.common.block.BlockEntityRegistry; +import net.minecraft.core.BlockPos; +import net.minecraft.core.Direction; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.level.block.entity.BlockEntityType; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.level.block.state.properties.BlockStateProperties; +import net.minecraft.world.phys.Vec3; +import team.lodestar.lodestone.helpers.BlockHelper; public class ItemStandBlockEntity extends MalumItemHolderBlockEntity { @@ -27,9 +29,9 @@ public ItemStandBlockEntity(BlockPos pos, BlockState state) { @Override public Vec3 getItemOffset(float partialTicks) { Direction direction = getBlockState().getValue(BlockStateProperties.FACING); - float gameTime = level().getGameTime() + partialTicks; + float gameTime = level.getGameTime() + partialTicks; float xOffset = direction.getStepX() * 0.25f; - float yOffset = direction.getStepY() * 0.1f + (inventory.getStackInSlot(0).getItem() instanceof SpiritShardItem ? (float)Math.sin((gameTime % 360) / 20f) * 0.05f : 0); + float yOffset = direction.getStepY() * 0.1f + (inventory.getStackInSlot(0).getItem() instanceof SpiritShardItem ? (float) Math.sin((gameTime % 360) / 20f) * 0.05f : 0); float zOffset = direction.getStepZ() * 0.25f; return new Vec3(0.5f - xOffset, 0.5f - yOffset, 0.5f - zOffset); } diff --git a/src/main/java/com/sammy/malum/common/block/storage/vial/SoulVialBlock.java b/src/main/java/com/sammy/malum/common/block/storage/vial/SoulVialBlock.java index 0944b6624..b6327f275 100644 --- a/src/main/java/com/sammy/malum/common/block/storage/vial/SoulVialBlock.java +++ b/src/main/java/com/sammy/malum/common/block/storage/vial/SoulVialBlock.java @@ -11,11 +11,10 @@ import net.minecraft.world.phys.shapes.VoxelShape; import team.lodestar.lodestone.systems.block.WaterLoggedEntityBlock; -public class SoulVialBlock extends WaterLoggedEntityBlock -{ +public class SoulVialBlock extends WaterLoggedEntityBlock { public static final VoxelShape SHAPE = makeShape(); - public SoulVialBlock(Properties properties) - { + + public SoulVialBlock(Properties properties) { super(properties); } @@ -38,7 +37,7 @@ public int getAnalogOutputSignal(BlockState pState, Level pLevel, BlockPos pPos) return 0; } - public static VoxelShape makeShape(){ + public static VoxelShape makeShape() { VoxelShape shape = Shapes.empty(); shape = Shapes.join(shape, Shapes.box(0.21875, 0.03125, 0.21875, 0.78125, 0.78125, 0.78125), BooleanOp.OR); shape = Shapes.join(shape, Shapes.box(0.28125, 0.84375, 0.28125, 0.71875, 0.96875, 0.71875), BooleanOp.OR); diff --git a/src/main/java/com/sammy/malum/common/block/the_device/TheDevice.java b/src/main/java/com/sammy/malum/common/block/the_device/TheDevice.java index 1442c3c5b..0cee8d783 100644 --- a/src/main/java/com/sammy/malum/common/block/the_device/TheDevice.java +++ b/src/main/java/com/sammy/malum/common/block/the_device/TheDevice.java @@ -57,8 +57,8 @@ public void neighborChanged(BlockState pState, Level pLevel, BlockPos pPos, Bloc public void playSound(Level level, BlockPos pos) { if (level instanceof ServerLevel serverLevel) { - LodestonePacketRegistry.LODESTONE_CHANNEL.send(PacketDistributor.TRACKING_CHUNK.with(() -> serverLevel.getChunkAt(pos)), new PositionedScreenshakePacket(40, BlockHelper.fromBlockPos(pos),4f,10f, Easing.EXPO_OUT).setIntensity(4f, 0)); + LodestonePacketRegistry.LODESTONE_CHANNEL.send(PacketDistributor.TRACKING_CHUNK.with(() -> serverLevel.getChunkAt(pos)), new PositionedScreenshakePacket(40, BlockHelper.fromBlockPos(pos), 4f, 10f, Easing.EXPO_OUT).setIntensity(4f, 0)); } - level().playSound(null, pos, SoundRegistry.THE_DEEP_BECKONS.get(), SoundSource.BLOCKS, 1, 1); + level.playSound(null, pos, SoundRegistry.THE_DEEP_BECKONS.get(), SoundSource.BLOCKS, 1, 1); } } diff --git a/src/main/java/com/sammy/malum/common/block/the_device/TheVessel.java b/src/main/java/com/sammy/malum/common/block/the_device/TheVessel.java index 55093b899..5d02be85e 100644 --- a/src/main/java/com/sammy/malum/common/block/the_device/TheVessel.java +++ b/src/main/java/com/sammy/malum/common/block/the_device/TheVessel.java @@ -1,9 +1,9 @@ package com.sammy.malum.common.block.the_device; -import com.sammy.malum.registry.common.*; -import net.minecraft.core.*; -import net.minecraft.sounds.*; -import net.minecraft.world.level.*; +import com.sammy.malum.registry.common.SoundRegistry; +import net.minecraft.core.BlockPos; +import net.minecraft.sounds.SoundSource; +import net.minecraft.world.level.Level; public class TheVessel extends TheDevice { public TheVessel(Properties p_49795_) { @@ -11,6 +11,6 @@ public TheVessel(Properties p_49795_) { } public void playSound(Level level, BlockPos pos) { - level().playSound(null, pos, SoundRegistry.THE_HEAVENS_SIGN.get(), SoundSource.BLOCKS, 1, 1); + level.playSound(null, pos, SoundRegistry.THE_HEAVENS_SIGN.get(), SoundSource.BLOCKS, 1, 1); } } diff --git a/src/main/java/com/sammy/malum/common/capability/MalumPlayerDataCapability.java b/src/main/java/com/sammy/malum/common/capability/MalumPlayerDataCapability.java index 550334353..443f6042a 100644 --- a/src/main/java/com/sammy/malum/common/capability/MalumPlayerDataCapability.java +++ b/src/main/java/com/sammy/malum/common/capability/MalumPlayerDataCapability.java @@ -17,7 +17,6 @@ import net.minecraftforge.common.util.LazyOptional; import net.minecraftforge.event.AttachCapabilitiesEvent; import net.minecraftforge.event.entity.EntityJoinLevelEvent; -import net.minecraftforge.event.entity.EntityJoinWorldEvent; import net.minecraftforge.event.entity.player.PlayerEvent; import net.minecraftforge.network.PacketDistributor; import team.lodestar.lodestone.systems.capability.LodestoneCapability; diff --git a/src/main/java/com/sammy/malum/common/container/SpiritPouchContainer.java b/src/main/java/com/sammy/malum/common/container/SpiritPouchContainer.java index efbe781ac..d5e1d7f1d 100644 --- a/src/main/java/com/sammy/malum/common/container/SpiritPouchContainer.java +++ b/src/main/java/com/sammy/malum/common/container/SpiritPouchContainer.java @@ -1,7 +1,7 @@ package com.sammy.malum.common.container; -import com.sammy.malum.common.item.spirit.SpiritShardItem; import com.sammy.malum.common.item.curiosities.SpiritPouchItem; +import com.sammy.malum.common.item.spirit.SpiritShardItem; import com.sammy.malum.registry.common.ContainerRegistry; import net.minecraft.sounds.SoundEvents; import net.minecraft.sounds.SoundSource; diff --git a/src/main/java/com/sammy/malum/common/container/WeaversWorkbenchContainer.java b/src/main/java/com/sammy/malum/common/container/WeaversWorkbenchContainer.java index 541535e11..0a5dd22fa 100644 --- a/src/main/java/com/sammy/malum/common/container/WeaversWorkbenchContainer.java +++ b/src/main/java/com/sammy/malum/common/container/WeaversWorkbenchContainer.java @@ -1,19 +1,22 @@ package com.sammy.malum.common.container; -import com.sammy.malum.common.block.curiosities.weavers_workbench.*; -import com.sammy.malum.common.item.cosmetic.weaves.*; -import com.sammy.malum.registry.common.*; -import net.minecraft.network.*; -import net.minecraft.network.chat.*; -import net.minecraft.world.entity.player.*; -import net.minecraft.world.inventory.*; -import net.minecraft.world.item.*; -import net.minecraft.world.level.block.entity.*; -import net.minecraftforge.items.*; -import team.lodestar.lodestone.systems.item.*; +import com.sammy.malum.common.block.curiosities.weavers_workbench.WeaversWorkbenchBlockEntity; +import com.sammy.malum.common.block.curiosities.weavers_workbench.WeaversWorkbenchItemHandler; +import com.sammy.malum.common.item.cosmetic.weaves.AbstractWeaveItem; +import com.sammy.malum.registry.common.ContainerRegistry; +import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.network.chat.Component; +import net.minecraft.world.entity.player.Inventory; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.inventory.AbstractContainerMenu; +import net.minecraft.world.inventory.Slot; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.level.block.entity.BlockEntity; +import net.minecraftforge.items.SlotItemHandler; +import team.lodestar.lodestone.systems.item.LodestoneArmorItem; -import javax.annotation.*; -import java.util.*; +import javax.annotation.Nonnull; +import java.util.Objects; public class WeaversWorkbenchContainer extends AbstractContainerMenu { @@ -24,6 +27,7 @@ public class WeaversWorkbenchContainer extends AbstractContainerMenu { public WeaversWorkbenchContainer(int windowId, Inventory playerInv, FriendlyByteBuf data) { this(windowId, playerInv, getTileEntity(playerInv, data)); } + public WeaversWorkbenchContainer(int windowId, Inventory playerInv, WeaversWorkbenchBlockEntity blockEntity) { super(ContainerRegistry.WEAVERS_WORKBENCH.get(), windowId); this.itemHandler = blockEntity.itemHandler; diff --git a/src/main/java/com/sammy/malum/common/effect/AqueousAura.java b/src/main/java/com/sammy/malum/common/effect/AqueousAura.java index 2565abe8f..d71c84eae 100644 --- a/src/main/java/com/sammy/malum/common/effect/AqueousAura.java +++ b/src/main/java/com/sammy/malum/common/effect/AqueousAura.java @@ -1,7 +1,7 @@ package com.sammy.malum.common.effect; -import com.sammy.malum.registry.common.SpiritTypeRegistry; import com.sammy.malum.registry.common.MobEffectRegistry; +import com.sammy.malum.registry.common.SpiritTypeRegistry; import net.minecraft.world.effect.MobEffect; import net.minecraft.world.effect.MobEffectCategory; import net.minecraft.world.effect.MobEffectInstance; diff --git a/src/main/java/com/sammy/malum/common/effect/CorruptedAerialAura.java b/src/main/java/com/sammy/malum/common/effect/CorruptedAerialAura.java index daff952a5..73496b707 100644 --- a/src/main/java/com/sammy/malum/common/effect/CorruptedAerialAura.java +++ b/src/main/java/com/sammy/malum/common/effect/CorruptedAerialAura.java @@ -1,7 +1,7 @@ package com.sammy.malum.common.effect; -import com.sammy.malum.registry.common.SpiritTypeRegistry; import com.sammy.malum.registry.common.MobEffectRegistry; +import com.sammy.malum.registry.common.SpiritTypeRegistry; import net.minecraft.world.effect.MobEffect; import net.minecraft.world.effect.MobEffectCategory; import net.minecraft.world.effect.MobEffectInstance; diff --git a/src/main/java/com/sammy/malum/common/effect/CorruptedInfernalAura.java b/src/main/java/com/sammy/malum/common/effect/CorruptedInfernalAura.java index ef2f8e4c4..587797be2 100644 --- a/src/main/java/com/sammy/malum/common/effect/CorruptedInfernalAura.java +++ b/src/main/java/com/sammy/malum/common/effect/CorruptedInfernalAura.java @@ -14,7 +14,7 @@ public CorruptedInfernalAura() { @Override public void applyEffectTick(LivingEntity entityLivingBaseIn, int amplifier) { if (entityLivingBaseIn.getHealth() < entityLivingBaseIn.getMaxHealth()) { - entityLivingBaseIn.heal(amplifier+1); + entityLivingBaseIn.heal(amplifier + 1); } } diff --git a/src/main/java/com/sammy/malum/common/effect/GluttonyEffect.java b/src/main/java/com/sammy/malum/common/effect/GluttonyEffect.java index 7fbe0e2f4..bc6e4da9d 100644 --- a/src/main/java/com/sammy/malum/common/effect/GluttonyEffect.java +++ b/src/main/java/com/sammy/malum/common/effect/GluttonyEffect.java @@ -1,7 +1,7 @@ package com.sammy.malum.common.effect; -import com.sammy.malum.registry.common.SoundRegistry; import com.sammy.malum.registry.common.MobEffectRegistry; +import com.sammy.malum.registry.common.SoundRegistry; import net.minecraft.sounds.SoundSource; import net.minecraft.world.effect.MobEffect; import net.minecraft.world.effect.MobEffectCategory; @@ -11,7 +11,7 @@ import net.minecraft.world.entity.ai.attributes.AttributeModifier; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; -import net.minecraft.world.level.Level; +import net.minecraft.world.level.Level; import net.minecraftforge.event.entity.living.LivingEntityUseItemEvent; import net.minecraftforge.event.entity.living.MobEffectEvent; import net.minecraftforge.eventbus.api.Event; diff --git a/src/main/java/com/sammy/malum/common/effect/InfernalAura.java b/src/main/java/com/sammy/malum/common/effect/InfernalAura.java index f0683a53e..46945fc86 100644 --- a/src/main/java/com/sammy/malum/common/effect/InfernalAura.java +++ b/src/main/java/com/sammy/malum/common/effect/InfernalAura.java @@ -1,7 +1,7 @@ package com.sammy.malum.common.effect; -import com.sammy.malum.registry.common.SpiritTypeRegistry; import com.sammy.malum.registry.common.MobEffectRegistry; +import com.sammy.malum.registry.common.SpiritTypeRegistry; import net.minecraft.world.effect.MobEffect; import net.minecraft.world.effect.MobEffectCategory; import net.minecraft.world.entity.LivingEntity; @@ -24,7 +24,7 @@ public void applyEffectTick(LivingEntity entityLivingBaseIn, int amplifier) { public static void increaseDigSpeed(PlayerEvent.BreakSpeed event) { Player player = event.getEntity(); if (player.hasEffect(MobEffectRegistry.MINERS_RAGE.get())) { - event.setNewSpeed(event.getOriginalSpeed() * (1 + 0.2f *player.getEffect(MobEffectRegistry.MINERS_RAGE.get()).getAmplifier())); + event.setNewSpeed(event.getOriginalSpeed() * (1 + 0.2f * player.getEffect(MobEffectRegistry.MINERS_RAGE.get()).getAmplifier())); } } } \ No newline at end of file diff --git a/src/main/java/com/sammy/malum/common/effect/WickedIntentEffect.java b/src/main/java/com/sammy/malum/common/effect/WickedIntentEffect.java index beb6d890a..89bc3bc6a 100644 --- a/src/main/java/com/sammy/malum/common/effect/WickedIntentEffect.java +++ b/src/main/java/com/sammy/malum/common/effect/WickedIntentEffect.java @@ -1,15 +1,20 @@ package com.sammy.malum.common.effect; -import com.sammy.malum.common.item.curiosities.weapons.*; -import com.sammy.malum.registry.common.*; -import net.minecraft.sounds.*; -import net.minecraft.world.damagesource.*; -import net.minecraft.world.effect.*; -import net.minecraft.world.entity.*; -import net.minecraft.world.entity.ai.attributes.*; -import net.minecraft.world.level.*; -import net.minecraftforge.event.entity.living.*; -import team.lodestar.lodestone.helpers.*; +import com.sammy.malum.common.item.curiosities.weapons.MalumScytheItem; +import com.sammy.malum.registry.common.AttributeRegistry; +import com.sammy.malum.registry.common.MobEffectRegistry; +import com.sammy.malum.registry.common.SoundRegistry; +import net.minecraft.sounds.SoundSource; +import net.minecraft.world.damagesource.DamageSource; +import net.minecraft.world.damagesource.DamageTypes; +import net.minecraft.world.effect.MobEffect; +import net.minecraft.world.effect.MobEffectCategory; +import net.minecraft.world.effect.MobEffectInstance; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.entity.ai.attributes.AttributeModifier; +import net.minecraft.world.level.Level; +import net.minecraftforge.event.entity.living.LivingDamageEvent; +import team.lodestar.lodestone.helpers.ColorHelper; public class WickedIntentEffect extends MobEffect { public WickedIntentEffect() { diff --git a/src/main/java/com/sammy/malum/common/enchantment/HauntedEnchantment.java b/src/main/java/com/sammy/malum/common/enchantment/HauntedEnchantment.java index b6a4f7fc2..9e66a07f9 100644 --- a/src/main/java/com/sammy/malum/common/enchantment/HauntedEnchantment.java +++ b/src/main/java/com/sammy/malum/common/enchantment/HauntedEnchantment.java @@ -17,7 +17,7 @@ public void doPostAttack(LivingEntity user, Entity target, int level) { if (target instanceof LivingEntity entity) { if (entity.isAlive()) { entity.invulnerableTime = 0; - entity.hurt(DamageSourceRegistry.causeVoodooDamage(user), level + 1); + entity.hurt(DamageSourceRegistry.create(user.level(), DamageSourceRegistry.VOODOO, user), level + 1); } } super.doPostAttack(user, target, level); diff --git a/src/main/java/com/sammy/malum/common/enchantment/ReboundEnchantment.java b/src/main/java/com/sammy/malum/common/enchantment/ReboundEnchantment.java index 337127954..278338d03 100644 --- a/src/main/java/com/sammy/malum/common/enchantment/ReboundEnchantment.java +++ b/src/main/java/com/sammy/malum/common/enchantment/ReboundEnchantment.java @@ -42,7 +42,7 @@ public static void onRightClickItem(PlayerInteractEvent.RightClickItem event) { entity.setItem(stack); entity.shootFromRotation(player, player.getXRot(), player.getYRot(), 0.0F, (float) (1.5F + player.getAttributeValue(AttributeRegistry.SCYTHE_PROFICIENCY.get()) * 0.125f), 0F); - level().addFreshEntity(entity); + level.addFreshEntity(entity); } player.awardStat(Stats.ITEM_USED.get(stack.getItem())); } diff --git a/src/main/java/com/sammy/malum/common/entity/FloatingEntity.java b/src/main/java/com/sammy/malum/common/entity/FloatingEntity.java index cecea64ad..7db59edd8 100644 --- a/src/main/java/com/sammy/malum/common/entity/FloatingEntity.java +++ b/src/main/java/com/sammy/malum/common/entity/FloatingEntity.java @@ -1,6 +1,6 @@ package com.sammy.malum.common.entity; -import com.sammy.malum.core.systems.spirit.*; +import com.sammy.malum.core.systems.spirit.MalumSpiritType; import com.sammy.malum.registry.common.SpiritTypeRegistry; import net.minecraft.core.BlockPos; import net.minecraft.nbt.CompoundTag; @@ -24,7 +24,7 @@ import net.minecraft.world.phys.Vec3; import net.minecraftforge.network.NetworkHooks; import team.lodestar.lodestone.systems.easing.Easing; -import team.lodestar.lodestone.systems.rendering.trail.*; +import team.lodestar.lodestone.systems.rendering.trail.TrailPointBuilder; public abstract class FloatingEntity extends Entity { @@ -96,7 +96,7 @@ public void tick() { } public void trackPastPositions() { - trailPointBuilder.addTrailPoint(position().add(0, getYOffset(0)+0.25f, 0f)); + trailPointBuilder.addTrailPoint(position().add(0, getYOffset(0) + 0.25f, 0f)); trailPointBuilder.tickTrailPoints(); } @@ -150,7 +150,7 @@ public float getYOffset(float partialTicks) { } public float getRotation(float partialTicks) { - return ((float) age + partialTicks) / 20.0F + getHoverStart(partialTicks)/2f; + return ((float) age + partialTicks) / 20.0F + getHoverStart(partialTicks) / 2f; } public float getHoverStart(float partialTicks) { diff --git a/src/main/java/com/sammy/malum/common/entity/FloatingItemEntity.java b/src/main/java/com/sammy/malum/common/entity/FloatingItemEntity.java index 7b5a1206e..224811bba 100644 --- a/src/main/java/com/sammy/malum/common/entity/FloatingItemEntity.java +++ b/src/main/java/com/sammy/malum/common/entity/FloatingItemEntity.java @@ -1,6 +1,6 @@ package com.sammy.malum.common.entity; -import com.sammy.malum.common.item.spirit.*; +import com.sammy.malum.common.item.spirit.SpiritShardItem; import com.sammy.malum.registry.common.item.ItemRegistry; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.syncher.EntityDataAccessor; diff --git a/src/main/java/com/sammy/malum/common/entity/boomerang/ScytheBoomerangEntity.java b/src/main/java/com/sammy/malum/common/entity/boomerang/ScytheBoomerangEntity.java index 7e304cd87..f7d364755 100644 --- a/src/main/java/com/sammy/malum/common/entity/boomerang/ScytheBoomerangEntity.java +++ b/src/main/java/com/sammy/malum/common/entity/boomerang/ScytheBoomerangEntity.java @@ -1,29 +1,37 @@ package com.sammy.malum.common.entity.boomerang; -import com.sammy.malum.common.item.curiosities.weapons.*; -import com.sammy.malum.registry.common.*; -import com.sammy.malum.registry.common.entity.*; -import com.sammy.malum.registry.common.item.*; -import net.minecraft.core.particles.*; -import net.minecraft.nbt.*; -import net.minecraft.network.protocol.*; +import com.sammy.malum.common.item.curiosities.weapons.MalumScytheItem; +import com.sammy.malum.registry.common.DamageSourceRegistry; +import com.sammy.malum.registry.common.SoundRegistry; +import com.sammy.malum.registry.common.entity.EntityRegistry; +import com.sammy.malum.registry.common.item.EnchantmentRegistry; +import com.sammy.malum.registry.common.item.ItemRegistry; +import net.minecraft.core.particles.ParticleTypes; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.network.protocol.Packet; import net.minecraft.network.protocol.game.ClientGamePacketListener; -import net.minecraft.sounds.*; -import net.minecraft.util.*; -import net.minecraft.world.damagesource.*; -import net.minecraft.world.entity.*; -import net.minecraft.world.entity.item.*; -import net.minecraft.world.entity.player.*; -import net.minecraft.world.entity.projectile.*; -import net.minecraft.world.item.*; -import net.minecraft.world.item.enchantment.*; -import net.minecraft.world.level.*; -import net.minecraft.world.phys.*; -import net.minecraftforge.items.*; -import net.minecraftforge.network.*; -import team.lodestar.lodestone.helpers.*; - -import java.util.*; +import net.minecraft.sounds.SoundEvents; +import net.minecraft.sounds.SoundSource; +import net.minecraft.util.Mth; +import net.minecraft.world.damagesource.DamageSource; +import net.minecraft.world.entity.Entity; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.entity.item.ItemEntity; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.entity.projectile.ThrowableItemProjectile; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.enchantment.EnchantmentHelper; +import net.minecraft.world.item.enchantment.Enchantments; +import net.minecraft.world.level.Level; +import net.minecraft.world.phys.BlockHitResult; +import net.minecraft.world.phys.EntityHitResult; +import net.minecraft.world.phys.Vec3; +import net.minecraftforge.items.ItemHandlerHelper; +import net.minecraftforge.network.NetworkHooks; +import team.lodestar.lodestone.helpers.ItemHelper; + +import java.util.Random; public class ScytheBoomerangEntity extends ThrowableItemProjectile { @@ -118,7 +126,7 @@ protected void onHitEntity(EntityHitResult result) { if (magicDamage > 0) { if (livingentity.isAlive()) { livingentity.invulnerableTime = 0; - livingentity.hurt(DamageSourceRegistry.causeVoodooDamage(scytheOwner), magicDamage); + livingentity.hurt(DamageSourceRegistry.create(level(), DamageSourceRegistry.VOODOO, scytheOwner), magicDamage); } } diff --git a/src/main/java/com/sammy/malum/common/entity/night_terror/NightTerrorSeekerEntity.java b/src/main/java/com/sammy/malum/common/entity/night_terror/NightTerrorSeekerEntity.java index 903c589a9..85b04a62b 100644 --- a/src/main/java/com/sammy/malum/common/entity/night_terror/NightTerrorSeekerEntity.java +++ b/src/main/java/com/sammy/malum/common/entity/night_terror/NightTerrorSeekerEntity.java @@ -1,31 +1,36 @@ package com.sammy.malum.common.entity.night_terror; -import com.sammy.malum.registry.common.*; -import com.sammy.malum.registry.common.entity.*; -import net.minecraft.nbt.*; -import net.minecraft.network.protocol.*; +import com.sammy.malum.registry.common.DamageSourceRegistry; +import com.sammy.malum.registry.common.SoundRegistry; +import com.sammy.malum.registry.common.entity.EntityRegistry; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.network.protocol.Packet; import net.minecraft.network.protocol.game.ClientGamePacketListener; -import net.minecraft.util.*; -import net.minecraft.world.damagesource.*; -import net.minecraft.world.entity.*; -import net.minecraft.world.entity.projectile.*; -import net.minecraft.world.level.*; -import net.minecraft.world.phys.*; -import net.minecraftforge.network.*; -import team.lodestar.lodestone.helpers.*; -import team.lodestar.lodestone.setup.*; -import team.lodestar.lodestone.systems.easing.*; -import team.lodestar.lodestone.systems.particle.builder.*; -import team.lodestar.lodestone.systems.particle.data.*; -import team.lodestar.lodestone.systems.particle.data.color.*; -import team.lodestar.lodestone.systems.particle.data.spin.*; -import team.lodestar.lodestone.systems.particle.render_types.*; +import net.minecraft.util.Mth; +import net.minecraft.world.damagesource.DamageSource; +import net.minecraft.world.entity.Entity; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.entity.projectile.ThrowableProjectile; +import net.minecraft.world.level.Level; +import net.minecraft.world.phys.BlockHitResult; +import net.minecraft.world.phys.EntityHitResult; +import net.minecraft.world.phys.Vec3; +import net.minecraftforge.network.NetworkHooks; +import team.lodestar.lodestone.helpers.EntityHelper; +import team.lodestar.lodestone.setup.LodestoneParticleRegistry; +import team.lodestar.lodestone.systems.easing.Easing; +import team.lodestar.lodestone.systems.particle.builder.WorldParticleBuilder; +import team.lodestar.lodestone.systems.particle.data.GenericParticleData; +import team.lodestar.lodestone.systems.particle.data.color.ColorParticleData; +import team.lodestar.lodestone.systems.particle.data.color.ColorParticleDataBuilder; +import team.lodestar.lodestone.systems.particle.data.spin.SpinParticleData; +import team.lodestar.lodestone.systems.particle.render_types.LodestoneWorldParticleRenderType; import java.awt.*; +import java.util.ArrayList; import java.util.List; -import java.util.*; -import static net.minecraft.util.Mth.*; +import static net.minecraft.util.Mth.nextFloat; public class NightTerrorSeekerEntity extends ThrowableProjectile { @@ -105,15 +110,16 @@ protected void onHitEntity(EntityHitResult result) { if (level().isClientSide) { return; } - DamageSource source = DamageSourceRegistry.causeVoodooDamage(scytheOwner); + DamageSource source = DamageSourceRegistry.create(level(), DamageSourceRegistry.VOODOO, scytheOwner); target.hurt(source, magicDamage); if (age < fadeoutStart) { fadeoutStart += 4; } - target.level().playSound(null, target.getX(), target.getY(), target.getZ(), SoundRegistry.SCYTHE_CUT.get(), target.getSoundSource(), 1.0F, 0.9f + target.level.random.nextFloat() * 0.2f); + target.level().playSound(null, target.getX(), target.getY(), target.getZ(), SoundRegistry.SCYTHE_CUT.get(), target.getSoundSource(), 1.0F, 0.9f + target.level().random.nextFloat() * 0.2f); } super.onHitEntity(result); } + @Override public void tick() { super.tick(); diff --git a/src/main/java/com/sammy/malum/common/entity/nitrate/AbstractNitrateEntity.java b/src/main/java/com/sammy/malum/common/entity/nitrate/AbstractNitrateEntity.java index 2c73b1c09..50fc306e5 100644 --- a/src/main/java/com/sammy/malum/common/entity/nitrate/AbstractNitrateEntity.java +++ b/src/main/java/com/sammy/malum/common/entity/nitrate/AbstractNitrateEntity.java @@ -1,16 +1,18 @@ package com.sammy.malum.common.entity.nitrate; -import net.minecraft.nbt.*; -import net.minecraft.util.*; -import net.minecraft.world.entity.*; -import net.minecraft.world.entity.projectile.*; -import net.minecraft.world.level.*; -import net.minecraft.world.phys.*; -import team.lodestar.lodestone.helpers.*; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.util.Mth; +import net.minecraft.world.entity.EntityType; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.entity.projectile.ThrowableProjectile; +import net.minecraft.world.level.Explosion; +import net.minecraft.world.level.Level; +import net.minecraft.world.phys.HitResult; +import team.lodestar.lodestone.helpers.EntityHelper; import java.awt.*; +import java.util.ArrayList; import java.util.List; -import java.util.*; public abstract class AbstractNitrateEntity extends ThrowableProjectile { public static final Color SECOND_SMOKE_COLOR = new Color(45, 45, 45); @@ -97,7 +99,7 @@ public void removeOldPositions(List pastPositions) { List toRemove = new ArrayList<>(); for (int i = 0; i < amount; i++) { EntityHelper.PastPosition excess = pastPositions.get(i); - if (excess.time > Math.min(age*0.8f, 25)) { + if (excess.time > Math.min(age * 0.8f, 25)) { toRemove.add(excess); } } diff --git a/src/main/java/com/sammy/malum/common/entity/nitrate/EthericNitrateEntity.java b/src/main/java/com/sammy/malum/common/entity/nitrate/EthericNitrateEntity.java index d0c4234af..a8180f589 100644 --- a/src/main/java/com/sammy/malum/common/entity/nitrate/EthericNitrateEntity.java +++ b/src/main/java/com/sammy/malum/common/entity/nitrate/EthericNitrateEntity.java @@ -1,29 +1,26 @@ package com.sammy.malum.common.entity.nitrate; -import com.sammy.malum.common.packets.particle.curiosities.nitrate.*; -import com.sammy.malum.registry.common.entity.*; -import com.sammy.malum.visual_effects.*; -import net.minecraft.server.level.*; -import net.minecraft.util.*; -import net.minecraft.world.entity.*; -import net.minecraft.world.level.*; -import net.minecraft.world.phys.*; -import net.minecraftforge.network.*; -import team.lodestar.lodestone.setup.*; -import team.lodestar.lodestone.systems.easing.*; -import team.lodestar.lodestone.systems.particle.*; -import team.lodestar.lodestone.systems.particle.builder.*; -import team.lodestar.lodestone.systems.particle.data.*; -import team.lodestar.lodestone.systems.particle.data.color.*; -import team.lodestar.lodestone.systems.particle.data.spin.*; -import team.lodestar.lodestone.systems.particle.render_types.*; -import team.lodestar.lodestone.systems.particle.world.*; +import com.sammy.malum.common.packets.particle.curiosities.nitrate.EthericNitrateParticlePacket; +import com.sammy.malum.registry.common.entity.EntityRegistry; +import net.minecraft.server.level.ServerLevel; +import net.minecraft.util.Mth; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.level.Level; +import net.minecraft.world.phys.Vec3; +import net.minecraftforge.network.PacketDistributor; +import team.lodestar.lodestone.setup.LodestoneParticleRegistry; +import team.lodestar.lodestone.systems.easing.Easing; +import team.lodestar.lodestone.systems.particle.builder.WorldParticleBuilder; +import team.lodestar.lodestone.systems.particle.data.GenericParticleData; +import team.lodestar.lodestone.systems.particle.data.color.ColorParticleData; +import team.lodestar.lodestone.systems.particle.data.color.ColorParticleDataBuilder; +import team.lodestar.lodestone.systems.particle.data.spin.SpinParticleData; +import team.lodestar.lodestone.systems.particle.render_types.LodestoneWorldParticleRenderType; import java.awt.*; -import java.util.*; -import static com.sammy.malum.registry.common.PacketRegistry.*; -import static net.minecraft.util.Mth.*; +import static com.sammy.malum.registry.common.PacketRegistry.MALUM_CHANNEL; +import static net.minecraft.util.Mth.nextFloat; public class EthericNitrateEntity extends AbstractNitrateEntity { @@ -44,7 +41,7 @@ public EthericNitrateEntity(LivingEntity owner, Level level) { @Override public void onExplode() { - if (level instanceof ServerLevel) { + if (level() instanceof ServerLevel) { MALUM_CHANNEL.send(PacketDistributor.TRACKING_CHUNK.with(() -> level().getChunkAt(blockPosition())), new EthericNitrateParticlePacket(getX(), getY(), getZ())); } } diff --git a/src/main/java/com/sammy/malum/common/entity/nitrate/VividNitrateEntity.java b/src/main/java/com/sammy/malum/common/entity/nitrate/VividNitrateEntity.java index 0257a32d2..b541510be 100644 --- a/src/main/java/com/sammy/malum/common/entity/nitrate/VividNitrateEntity.java +++ b/src/main/java/com/sammy/malum/common/entity/nitrate/VividNitrateEntity.java @@ -1,32 +1,30 @@ package com.sammy.malum.common.entity.nitrate; -import com.sammy.malum.common.packets.particle.curiosities.nitrate.*; -import com.sammy.malum.registry.common.entity.*; -import com.sammy.malum.visual_effects.*; -import net.minecraft.server.level.*; -import net.minecraft.util.*; -import net.minecraft.world.entity.*; -import net.minecraft.world.level.*; -import net.minecraft.world.phys.*; -import net.minecraftforge.network.*; -import team.lodestar.lodestone.helpers.*; -import team.lodestar.lodestone.setup.*; -import team.lodestar.lodestone.systems.easing.*; -import team.lodestar.lodestone.systems.particle.*; -import team.lodestar.lodestone.systems.particle.builder.*; -import team.lodestar.lodestone.systems.particle.data.*; -import team.lodestar.lodestone.systems.particle.data.color.*; -import team.lodestar.lodestone.systems.particle.data.spin.*; -import team.lodestar.lodestone.systems.particle.render_types.*; -import team.lodestar.lodestone.systems.particle.world.*; +import com.sammy.malum.common.packets.particle.curiosities.nitrate.VividNitrateBounceParticlePacket; +import com.sammy.malum.registry.common.entity.EntityRegistry; +import net.minecraft.server.level.ServerLevel; +import net.minecraft.util.Mth; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.level.Level; +import net.minecraft.world.phys.Vec3; +import net.minecraftforge.network.PacketDistributor; +import team.lodestar.lodestone.helpers.ColorHelper; +import team.lodestar.lodestone.setup.LodestoneParticleRegistry; +import team.lodestar.lodestone.systems.easing.Easing; +import team.lodestar.lodestone.systems.particle.builder.WorldParticleBuilder; +import team.lodestar.lodestone.systems.particle.data.GenericParticleData; +import team.lodestar.lodestone.systems.particle.data.color.ColorParticleData; +import team.lodestar.lodestone.systems.particle.data.color.ColorParticleDataBuilder; +import team.lodestar.lodestone.systems.particle.data.spin.SpinParticleData; +import team.lodestar.lodestone.systems.particle.render_types.LodestoneWorldParticleRenderType; import java.awt.*; +import java.util.ArrayList; import java.util.List; -import java.util.*; -import java.util.function.*; +import java.util.function.Function; -import static com.sammy.malum.registry.common.PacketRegistry.*; -import static net.minecraft.util.Mth.*; +import static com.sammy.malum.registry.common.PacketRegistry.MALUM_CHANNEL; +import static net.minecraft.util.Mth.nextFloat; public class VividNitrateEntity extends AbstractNitrateEntity { diff --git a/src/main/java/com/sammy/malum/common/entity/spirit/SpiritItemEntity.java b/src/main/java/com/sammy/malum/common/entity/spirit/SpiritItemEntity.java index 549ddf9b7..9bb1f8aef 100644 --- a/src/main/java/com/sammy/malum/common/entity/spirit/SpiritItemEntity.java +++ b/src/main/java/com/sammy/malum/common/entity/spirit/SpiritItemEntity.java @@ -1,25 +1,23 @@ package com.sammy.malum.common.entity.spirit; -import com.sammy.malum.common.entity.*; -import com.sammy.malum.common.item.spirit.*; -import com.sammy.malum.core.handlers.*; -import com.sammy.malum.registry.common.*; -import com.sammy.malum.registry.common.entity.*; -import com.sammy.malum.visual_effects.*; -import net.minecraft.nbt.*; -import net.minecraft.server.level.*; -import net.minecraft.sounds.*; -import net.minecraft.util.*; -import net.minecraft.world.entity.*; -import net.minecraft.world.entity.player.*; -import net.minecraft.world.item.*; -import net.minecraft.world.level.*; -import net.minecraft.world.phys.*; -import team.lodestar.lodestone.helpers.*; -import team.lodestar.lodestone.systems.particle.builder.*; +import com.sammy.malum.common.entity.FloatingItemEntity; +import com.sammy.malum.common.item.spirit.SpiritShardItem; +import com.sammy.malum.core.handlers.SpiritHarvestHandler; +import com.sammy.malum.registry.common.SoundRegistry; +import com.sammy.malum.registry.common.entity.EntityRegistry; +import com.sammy.malum.visual_effects.SpiritLightSpecs; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.server.level.ServerLevel; +import net.minecraft.sounds.SoundSource; +import net.minecraft.util.Mth; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.level.Level; +import net.minecraft.world.phys.Vec3; +import team.lodestar.lodestone.helpers.ItemHelper; -import java.util.*; -import java.util.function.*; +import java.util.UUID; public class SpiritItemEntity extends FloatingItemEntity { public UUID ownerUUID; @@ -93,7 +91,7 @@ public void move() { } Vec3 desiredLocation = owner.position().add(0, owner.getBbHeight() / 3, 0); float distance = (float) distanceToSqr(desiredLocation); - float velocity = windUp < 0.25f ? 0 : Math.min(windUp-0.25f, 0.8f)*5f; + float velocity = windUp < 0.25f ? 0 : Math.min(windUp - 0.25f, 0.8f) * 5f; moveTime++; Vec3 desiredMotion = desiredLocation.subtract(position()).normalize().multiply(velocity, velocity, velocity); float easing = 0.01f; @@ -107,8 +105,7 @@ public void move() { ItemStack stack = getItem(); if (stack.getItem() instanceof SpiritShardItem) { SpiritHarvestHandler.pickupSpirit(owner, stack); - } - else { + } else { ItemHelper.giveItemToEntity(owner, stack); } if (random.nextFloat() < 0.6f) { diff --git a/src/main/java/com/sammy/malum/common/item/EncyclopediaArcanaItem.java b/src/main/java/com/sammy/malum/common/item/EncyclopediaArcanaItem.java index 6fb22729b..80893e739 100644 --- a/src/main/java/com/sammy/malum/common/item/EncyclopediaArcanaItem.java +++ b/src/main/java/com/sammy/malum/common/item/EncyclopediaArcanaItem.java @@ -1,7 +1,8 @@ package com.sammy.malum.common.item; -import com.sammy.malum.client.screen.codex.*; -import com.sammy.malum.core.handlers.*; +import com.sammy.malum.client.screen.codex.ArcanaProgressionScreen; +import com.sammy.malum.client.screen.codex.VoidProgressionScreen; +import com.sammy.malum.core.handlers.TouchOfDarknessHandler; import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionResultHolder; import net.minecraft.world.entity.player.Player; @@ -20,8 +21,7 @@ public InteractionResultHolder use(Level level, Player player, Intera if (level.isClientSide) { if (isNearWeepingWell) { VoidProgressionScreen.openCodexViaItem(); - } - else { + } else { ArcanaProgressionScreen.openCodexViaItem(); } player.swing(hand); diff --git a/src/main/java/com/sammy/malum/common/item/cosmetic/curios/CurioTokenOfGratitude.java b/src/main/java/com/sammy/malum/common/item/cosmetic/curios/CurioTokenOfGratitude.java index e2331fce4..9bf71c77a 100644 --- a/src/main/java/com/sammy/malum/common/item/cosmetic/curios/CurioTokenOfGratitude.java +++ b/src/main/java/com/sammy/malum/common/item/cosmetic/curios/CurioTokenOfGratitude.java @@ -1,22 +1,26 @@ package com.sammy.malum.common.item.cosmetic.curios; -import com.sammy.malum.common.item.curiosities.curios.*; -import com.sammy.malum.registry.common.item.*; -import net.minecraft.sounds.*; -import net.minecraft.world.damagesource.*; -import net.minecraft.world.entity.player.*; -import net.minecraft.world.item.*; -import net.minecraftforge.event.entity.*; -import net.minecraftforge.items.*; -import org.jetbrains.annotations.*; -import team.lodestar.lodestone.helpers.*; -import team.lodestar.lodestone.systems.item.*; -import top.theillusivec4.curios.api.*; -import top.theillusivec4.curios.api.type.capability.*; +import com.sammy.malum.common.item.curiosities.curios.MalumCurioItem; +import com.sammy.malum.registry.common.item.ItemRegistry; +import net.minecraft.sounds.SoundEvent; +import net.minecraft.sounds.SoundEvents; +import net.minecraft.sounds.SoundSource; +import net.minecraft.world.damagesource.DamageSource; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.ItemStack; +import net.minecraftforge.event.entity.EntityJoinLevelEvent; +import net.minecraftforge.items.ItemHandlerHelper; +import org.jetbrains.annotations.NotNull; +import team.lodestar.lodestone.helpers.CurioHelper; +import team.lodestar.lodestone.systems.item.IEventResponderItem; +import top.theillusivec4.curios.api.SlotContext; +import top.theillusivec4.curios.api.type.capability.ICurio; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; -import static top.theillusivec4.curios.api.type.capability.ICurio.DropRule.*; +import static top.theillusivec4.curios.api.type.capability.ICurio.DropRule.ALWAYS_KEEP; public class CurioTokenOfGratitude extends MalumCurioItem implements IEventResponderItem { public static final List GRADITUDE_CERTIFIED = new ArrayList<>(); @@ -50,9 +54,9 @@ public void curioTick(SlotContext slotContext, ItemStack stack) { if (slotContext.entity() instanceof Player player) { if (player.getUUID().equals(SAMMY) || player.getUUID().equals(LOFI) || player.getUUID().equals(CREECHURE)) { int interval = player.isCrouching() ? 10 : 4000; - if (player.getLevel().getGameTime() % interval == 0) { + if (player.level().getGameTime() % interval == 0) { SoundEvent soundEvent = player.getRandom().nextInt(8) == 0 ? SoundEvents.CAT_PURREOW : SoundEvents.CAT_PURR; - player.level.playSound(player, player.blockPosition(), soundEvent, SoundSource.PLAYERS, 1, 1); + player.level().playSound(player, player.blockPosition(), soundEvent, SoundSource.PLAYERS, 1, 1); } } } diff --git a/src/main/java/com/sammy/malum/common/item/cosmetic/curios/CurioTopHat.java b/src/main/java/com/sammy/malum/common/item/cosmetic/curios/CurioTopHat.java index e93917d2d..4c1855d64 100644 --- a/src/main/java/com/sammy/malum/common/item/cosmetic/curios/CurioTopHat.java +++ b/src/main/java/com/sammy/malum/common/item/cosmetic/curios/CurioTopHat.java @@ -1,7 +1,7 @@ package com.sammy.malum.common.item.cosmetic.curios; -import com.sammy.malum.common.item.curiosities.curios.*; -import team.lodestar.lodestone.systems.item.*; +import com.sammy.malum.common.item.curiosities.curios.MalumCurioItem; +import team.lodestar.lodestone.systems.item.IEventResponderItem; public class CurioTopHat extends MalumCurioItem implements IEventResponderItem { diff --git a/src/main/java/com/sammy/malum/common/item/cosmetic/skins/ArmorSkin.java b/src/main/java/com/sammy/malum/common/item/cosmetic/skins/ArmorSkin.java index 8fa2fb375..e60ee4cec 100644 --- a/src/main/java/com/sammy/malum/common/item/cosmetic/skins/ArmorSkin.java +++ b/src/main/java/com/sammy/malum/common/item/cosmetic/skins/ArmorSkin.java @@ -1,12 +1,14 @@ package com.sammy.malum.common.item.cosmetic.skins; -import com.sammy.malum.client.cosmetic.*; -import com.sammy.malum.registry.common.item.*; -import net.minecraft.world.item.*; -import net.minecraftforge.api.distmarker.*; -import team.lodestar.lodestone.systems.item.*; +import com.sammy.malum.client.cosmetic.ArmorSkinRenderingData; +import com.sammy.malum.registry.common.item.ArmorSkinRegistry; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; +import team.lodestar.lodestone.systems.item.LodestoneArmorItem; -import java.util.*; +import java.util.Map; public abstract class ArmorSkin { public static final String MALUM_SKIN_TAG = "malum:item_skin"; diff --git a/src/main/java/com/sammy/malum/common/item/cosmetic/skins/PrideArmorSkin.java b/src/main/java/com/sammy/malum/common/item/cosmetic/skins/PrideArmorSkin.java index 162a711db..f4143d75a 100644 --- a/src/main/java/com/sammy/malum/common/item/cosmetic/skins/PrideArmorSkin.java +++ b/src/main/java/com/sammy/malum/common/item/cosmetic/skins/PrideArmorSkin.java @@ -1,9 +1,11 @@ package com.sammy.malum.common.item.cosmetic.skins; -import com.sammy.malum.client.cosmetic.*; -import net.minecraft.world.item.*; -import net.minecraftforge.api.distmarker.*; -import team.lodestar.lodestone.systems.item.*; +import com.sammy.malum.client.cosmetic.ArmorSkinRenderingData; +import com.sammy.malum.client.cosmetic.PrideArmorSkinRenderingData; +import net.minecraft.world.item.Item; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; +import team.lodestar.lodestone.systems.item.LodestoneArmorItem; public class PrideArmorSkin extends ArmorSkin { public PrideArmorSkin(String id, Class validArmorClass, Item weaveItem) { diff --git a/src/main/java/com/sammy/malum/common/item/cosmetic/skins/UltrakillArmorSkin.java b/src/main/java/com/sammy/malum/common/item/cosmetic/skins/UltrakillArmorSkin.java index 6c6ede8b3..cdf7da5dc 100644 --- a/src/main/java/com/sammy/malum/common/item/cosmetic/skins/UltrakillArmorSkin.java +++ b/src/main/java/com/sammy/malum/common/item/cosmetic/skins/UltrakillArmorSkin.java @@ -1,10 +1,12 @@ package com.sammy.malum.common.item.cosmetic.skins; -import com.sammy.malum.client.cosmetic.*; -import com.sammy.malum.registry.client.*; -import net.minecraft.world.item.*; -import net.minecraftforge.api.distmarker.*; -import team.lodestar.lodestone.systems.item.*; +import com.sammy.malum.client.cosmetic.ArmorSkinRenderingData; +import com.sammy.malum.client.cosmetic.SimpleArmorSkinRenderingData; +import com.sammy.malum.registry.client.ModelRegistry; +import net.minecraft.world.item.Item; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; +import team.lodestar.lodestone.systems.item.LodestoneArmorItem; import static com.sammy.malum.MalumMod.malumPath; diff --git a/src/main/java/com/sammy/malum/common/item/cosmetic/skins/ancient/AncientClothArmorSkin.java b/src/main/java/com/sammy/malum/common/item/cosmetic/skins/ancient/AncientClothArmorSkin.java index 14f7ff976..666b99abb 100644 --- a/src/main/java/com/sammy/malum/common/item/cosmetic/skins/ancient/AncientClothArmorSkin.java +++ b/src/main/java/com/sammy/malum/common/item/cosmetic/skins/ancient/AncientClothArmorSkin.java @@ -1,13 +1,15 @@ package com.sammy.malum.common.item.cosmetic.skins.ancient; -import com.sammy.malum.client.cosmetic.*; -import com.sammy.malum.common.item.cosmetic.skins.*; -import com.sammy.malum.common.item.curiosities.armor.*; -import com.sammy.malum.registry.client.*; -import net.minecraft.world.item.*; -import net.minecraftforge.api.distmarker.*; +import com.sammy.malum.client.cosmetic.ArmorSkinRenderingData; +import com.sammy.malum.client.cosmetic.SimpleArmorSkinRenderingData; +import com.sammy.malum.common.item.cosmetic.skins.ArmorSkin; +import com.sammy.malum.common.item.curiosities.armor.SoulHunterArmorItem; +import com.sammy.malum.registry.client.ModelRegistry; +import net.minecraft.world.item.Item; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; -import static com.sammy.malum.MalumMod.*; +import static com.sammy.malum.MalumMod.malumPath; public class AncientClothArmorSkin extends ArmorSkin { public AncientClothArmorSkin(String id, Item weaveItem) { diff --git a/src/main/java/com/sammy/malum/common/item/cosmetic/skins/ancient/AncientMetalArmorSkin.java b/src/main/java/com/sammy/malum/common/item/cosmetic/skins/ancient/AncientMetalArmorSkin.java index 794bee425..ed5fd9189 100644 --- a/src/main/java/com/sammy/malum/common/item/cosmetic/skins/ancient/AncientMetalArmorSkin.java +++ b/src/main/java/com/sammy/malum/common/item/cosmetic/skins/ancient/AncientMetalArmorSkin.java @@ -1,13 +1,15 @@ package com.sammy.malum.common.item.cosmetic.skins.ancient; -import com.sammy.malum.client.cosmetic.*; -import com.sammy.malum.common.item.cosmetic.skins.*; -import com.sammy.malum.common.item.curiosities.armor.*; -import com.sammy.malum.registry.client.*; -import net.minecraft.world.item.*; -import net.minecraftforge.api.distmarker.*; +import com.sammy.malum.client.cosmetic.ArmorSkinRenderingData; +import com.sammy.malum.client.cosmetic.SimpleArmorSkinRenderingData; +import com.sammy.malum.common.item.cosmetic.skins.ArmorSkin; +import com.sammy.malum.common.item.curiosities.armor.SoulStainedSteelArmorItem; +import com.sammy.malum.registry.client.ModelRegistry; +import net.minecraft.world.item.Item; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; -import static com.sammy.malum.MalumMod.*; +import static com.sammy.malum.MalumMod.malumPath; public class AncientMetalArmorSkin extends ArmorSkin { public AncientMetalArmorSkin(String id, Item weaveItem) { diff --git a/src/main/java/com/sammy/malum/common/item/cosmetic/skins/risk_of_rain/CommandoArmorSkin.java b/src/main/java/com/sammy/malum/common/item/cosmetic/skins/risk_of_rain/CommandoArmorSkin.java index 6c60acd9b..67ddee91d 100644 --- a/src/main/java/com/sammy/malum/common/item/cosmetic/skins/risk_of_rain/CommandoArmorSkin.java +++ b/src/main/java/com/sammy/malum/common/item/cosmetic/skins/risk_of_rain/CommandoArmorSkin.java @@ -1,13 +1,15 @@ package com.sammy.malum.common.item.cosmetic.skins.risk_of_rain; -import com.sammy.malum.client.cosmetic.*; -import com.sammy.malum.common.item.cosmetic.skins.*; -import com.sammy.malum.registry.client.*; -import net.minecraft.world.item.*; -import net.minecraftforge.api.distmarker.*; -import team.lodestar.lodestone.systems.item.*; +import com.sammy.malum.client.cosmetic.ArmorSkinRenderingData; +import com.sammy.malum.client.cosmetic.SimpleArmorSkinRenderingData; +import com.sammy.malum.common.item.cosmetic.skins.ArmorSkin; +import com.sammy.malum.registry.client.ModelRegistry; +import net.minecraft.world.item.Item; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; +import team.lodestar.lodestone.systems.item.LodestoneArmorItem; -import static com.sammy.malum.MalumMod.*; +import static com.sammy.malum.MalumMod.malumPath; public class CommandoArmorSkin extends ArmorSkin { public CommandoArmorSkin(String id, Class validArmorClass, Item weaveItem) { diff --git a/src/main/java/com/sammy/malum/common/item/cosmetic/skins/risk_of_rain/ExecutionerArmorSkin.java b/src/main/java/com/sammy/malum/common/item/cosmetic/skins/risk_of_rain/ExecutionerArmorSkin.java index f06028ff6..e68a4c720 100644 --- a/src/main/java/com/sammy/malum/common/item/cosmetic/skins/risk_of_rain/ExecutionerArmorSkin.java +++ b/src/main/java/com/sammy/malum/common/item/cosmetic/skins/risk_of_rain/ExecutionerArmorSkin.java @@ -1,13 +1,15 @@ package com.sammy.malum.common.item.cosmetic.skins.risk_of_rain; -import com.sammy.malum.client.cosmetic.*; -import com.sammy.malum.common.item.cosmetic.skins.*; -import com.sammy.malum.registry.client.*; -import net.minecraft.world.item.*; -import net.minecraftforge.api.distmarker.*; -import team.lodestar.lodestone.systems.item.*; +import com.sammy.malum.client.cosmetic.ArmorSkinRenderingData; +import com.sammy.malum.client.cosmetic.SimpleArmorSkinRenderingData; +import com.sammy.malum.common.item.cosmetic.skins.ArmorSkin; +import com.sammy.malum.registry.client.ModelRegistry; +import net.minecraft.world.item.Item; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; +import team.lodestar.lodestone.systems.item.LodestoneArmorItem; -import static com.sammy.malum.MalumMod.*; +import static com.sammy.malum.MalumMod.malumPath; public class ExecutionerArmorSkin extends ArmorSkin { public ExecutionerArmorSkin(String id, Class validArmorClass, Item weaveItem) { diff --git a/src/main/java/com/sammy/malum/common/item/curiosities/SoulStaveItem.java b/src/main/java/com/sammy/malum/common/item/curiosities/SoulStaveItem.java index 5e11fd26c..ab265fe83 100644 --- a/src/main/java/com/sammy/malum/common/item/curiosities/SoulStaveItem.java +++ b/src/main/java/com/sammy/malum/common/item/curiosities/SoulStaveItem.java @@ -6,7 +6,6 @@ import net.minecraft.ChatFormatting; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.chat.Component; -import net.minecraft.network.chat.TranslatableComponent; import net.minecraft.server.level.ServerLevel; import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionResultHolder; diff --git a/src/main/java/com/sammy/malum/common/item/curiosities/SpiritPouchItem.java b/src/main/java/com/sammy/malum/common/item/curiosities/SpiritPouchItem.java index e28032ead..6b728e14e 100644 --- a/src/main/java/com/sammy/malum/common/item/curiosities/SpiritPouchItem.java +++ b/src/main/java/com/sammy/malum/common/item/curiosities/SpiritPouchItem.java @@ -1,7 +1,7 @@ package com.sammy.malum.common.item.curiosities; import com.sammy.malum.common.container.SpiritPouchContainer; -import com.sammy.malum.common.item.spirit.*; +import com.sammy.malum.common.item.spirit.SpiritShardItem; import net.minecraft.core.Direction; import net.minecraft.nbt.CompoundTag; import net.minecraft.server.level.ServerPlayer; @@ -21,9 +21,9 @@ import net.minecraft.world.item.ItemUtils; import net.minecraft.world.level.Level; import net.minecraftforge.common.capabilities.Capability; +import net.minecraftforge.common.capabilities.ForgeCapabilities; import net.minecraftforge.common.capabilities.ICapabilityProvider; import net.minecraftforge.common.util.LazyOptional; -import net.minecraftforge.common.capabilities.ForgeCapabilities; import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.wrapper.InvWrapper; import net.minecraftforge.network.NetworkHooks; diff --git a/src/main/java/com/sammy/malum/common/item/curiosities/armor/MalumArmorItem.java b/src/main/java/com/sammy/malum/common/item/curiosities/armor/MalumArmorItem.java index f16e0def0..550b140f1 100644 --- a/src/main/java/com/sammy/malum/common/item/curiosities/armor/MalumArmorItem.java +++ b/src/main/java/com/sammy/malum/common/item/curiosities/armor/MalumArmorItem.java @@ -1,10 +1,14 @@ package com.sammy.malum.common.item.curiosities.armor; -import com.sammy.malum.client.cosmetic.*; -import com.sammy.malum.common.item.cosmetic.skins.*; -import net.minecraft.world.entity.*; -import net.minecraft.world.item.*; -import team.lodestar.lodestone.systems.item.*; +import com.sammy.malum.client.cosmetic.ArmorSkinRenderingData; +import com.sammy.malum.common.item.cosmetic.skins.ArmorSkin; +import net.minecraft.world.entity.Entity; +import net.minecraft.world.entity.EquipmentSlot; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.item.ArmorItem; +import net.minecraft.world.item.ArmorMaterial; +import net.minecraft.world.item.ItemStack; +import team.lodestar.lodestone.systems.item.LodestoneArmorItem; public class MalumArmorItem extends LodestoneArmorItem { public MalumArmorItem(ArmorMaterial materialIn, ArmorItem.Type slot, Properties builder) { diff --git a/src/main/java/com/sammy/malum/common/item/curiosities/armor/SoulHunterArmorItem.java b/src/main/java/com/sammy/malum/common/item/curiosities/armor/SoulHunterArmorItem.java index 6b84b03cf..cceb96b06 100644 --- a/src/main/java/com/sammy/malum/common/item/curiosities/armor/SoulHunterArmorItem.java +++ b/src/main/java/com/sammy/malum/common/item/curiosities/armor/SoulHunterArmorItem.java @@ -1,26 +1,28 @@ package com.sammy.malum.common.item.curiosities.armor; -import com.google.common.collect.*; -import com.sammy.malum.client.cosmetic.*; -import com.sammy.malum.common.item.cosmetic.skins.*; -import com.sammy.malum.registry.client.*; -import net.minecraft.client.*; -import net.minecraft.client.model.*; -import net.minecraft.util.*; -import net.minecraft.world.entity.*; -import net.minecraft.world.entity.ai.attributes.*; -import net.minecraft.world.item.*; -import net.minecraftforge.api.distmarker.*; -import net.minecraftforge.client.*; +import com.google.common.collect.ImmutableMultimap; +import com.sammy.malum.client.cosmetic.ArmorSkinRenderingData; +import com.sammy.malum.common.item.cosmetic.skins.ArmorSkin; +import com.sammy.malum.registry.client.ModelRegistry; +import net.minecraft.client.Minecraft; +import net.minecraft.client.model.HumanoidModel; +import net.minecraft.util.Mth; +import net.minecraft.world.entity.EquipmentSlot; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.entity.ai.attributes.Attribute; +import net.minecraft.world.entity.ai.attributes.AttributeModifier; +import net.minecraft.world.item.ArmorItem; +import net.minecraft.world.item.ItemStack; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.client.extensions.common.IClientItemExtensions; import team.lodestar.lodestone.registry.common.LodestoneAttributeRegistry; -import team.lodestar.lodestone.setup.*; -import team.lodestar.lodestone.systems.model.*; +import team.lodestar.lodestone.systems.model.LodestoneArmorModel; -import java.util.*; -import java.util.function.*; +import java.util.UUID; +import java.util.function.Consumer; -import static com.sammy.malum.registry.common.item.ArmorTiers.ArmorTierEnum.*; +import static com.sammy.malum.registry.common.item.ArmorTiers.ArmorTierEnum.SPIRIT_HUNTER; public class SoulHunterArmorItem extends MalumArmorItem { public SoulHunterArmorItem(ArmorItem.Type slot, Properties builder) { @@ -28,9 +30,10 @@ public SoulHunterArmorItem(ArmorItem.Type slot, Properties builder) { } @Override - public ImmutableMultimap.Builder createExtraAttributes(EquipmentSlot slot) { + public ImmutableMultimap.Builder createExtraAttributes(ArmorItem.Type slot) { + ImmutableMultimap.Builder builder = new ImmutableMultimap.Builder<>(); - UUID uuid = ARMOR_MODIFIER_UUID_PER_TYPE[slot.getIndex()]; + UUID uuid = ARMOR_MODIFIER_UUID_PER_TYPE.get(slot); builder.put(LodestoneAttributeRegistry.MAGIC_PROFICIENCY.get(), new AttributeModifier(uuid, "Magic Proficiency", 2f, AttributeModifier.Operation.ADDITION)); return builder; } @@ -62,7 +65,13 @@ public LodestoneArmorModel getHumanoidArmorModel(LivingEntity entity, ItemStack } model.slot = armorSlot; model.copyFromDefault(_default); - model.setupAnim(entity, entity.animationPosition, entity.animationSpeed, entity.tickCount + pticks, netHeadYaw, netHeadPitch); + + //pLimbSwing, pLimbSwingAmount + /* + f8 = pEntity.walkAnimation.speed(pPartialTicks); + f5 = pEntity.walkAnimation.position(pPartialTicks); + */ + model.setupAnim(entity, entity.walkAnimation.position(), entity.walkAnimation.speed(), entity.tickCount + pticks, netHeadYaw, netHeadPitch); return model; } }); diff --git a/src/main/java/com/sammy/malum/common/item/curiosities/armor/SoulStainedSteelArmorItem.java b/src/main/java/com/sammy/malum/common/item/curiosities/armor/SoulStainedSteelArmorItem.java index 5dcc8f3c0..9764b0fd8 100644 --- a/src/main/java/com/sammy/malum/common/item/curiosities/armor/SoulStainedSteelArmorItem.java +++ b/src/main/java/com/sammy/malum/common/item/curiosities/armor/SoulStainedSteelArmorItem.java @@ -1,25 +1,28 @@ package com.sammy.malum.common.item.curiosities.armor; -import com.google.common.collect.*; -import com.sammy.malum.client.cosmetic.*; -import com.sammy.malum.common.item.cosmetic.skins.*; -import com.sammy.malum.registry.client.*; -import com.sammy.malum.registry.common.*; -import net.minecraft.client.*; -import net.minecraft.client.model.*; -import net.minecraft.util.*; -import net.minecraft.world.entity.*; -import net.minecraft.world.entity.ai.attributes.*; -import net.minecraft.world.item.*; -import net.minecraftforge.api.distmarker.*; -import net.minecraftforge.client.*; +import com.google.common.collect.ImmutableMultimap; +import com.sammy.malum.client.cosmetic.ArmorSkinRenderingData; +import com.sammy.malum.common.item.cosmetic.skins.ArmorSkin; +import com.sammy.malum.registry.client.ModelRegistry; +import com.sammy.malum.registry.common.AttributeRegistry; +import net.minecraft.client.Minecraft; +import net.minecraft.client.model.HumanoidModel; +import net.minecraft.util.Mth; +import net.minecraft.world.entity.EquipmentSlot; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.entity.ai.attributes.Attribute; +import net.minecraft.world.entity.ai.attributes.AttributeModifier; +import net.minecraft.world.item.ArmorItem; +import net.minecraft.world.item.ItemStack; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.client.extensions.common.IClientItemExtensions; -import team.lodestar.lodestone.systems.model.*; +import team.lodestar.lodestone.systems.model.LodestoneArmorModel; -import java.util.*; -import java.util.function.*; +import java.util.UUID; +import java.util.function.Consumer; -import static com.sammy.malum.registry.common.item.ArmorTiers.ArmorTierEnum.*; +import static com.sammy.malum.registry.common.item.ArmorTiers.ArmorTierEnum.SOUL_STAINED_STEEL; public class SoulStainedSteelArmorItem extends MalumArmorItem { public SoulStainedSteelArmorItem(ArmorItem.Type slot, Properties builder) { @@ -27,9 +30,9 @@ public SoulStainedSteelArmorItem(ArmorItem.Type slot, Properties builder) { } @Override - public ImmutableMultimap.Builder createExtraAttributes(EquipmentSlot slot) { + public ImmutableMultimap.Builder createExtraAttributes(ArmorItem.Type slot) { ImmutableMultimap.Builder builder = new ImmutableMultimap.Builder<>(); - UUID uuid = ARMOR_MODIFIER_UUID_PER_SLOT[slot.getIndex()]; + UUID uuid = ARMOR_MODIFIER_UUID_PER_TYPE.get(slot); builder.put(AttributeRegistry.SOUL_WARD_CAP.get(), new AttributeModifier(uuid, "Soul Ward Cap", 3f, AttributeModifier.Operation.ADDITION)); return builder; } @@ -61,7 +64,7 @@ public LodestoneArmorModel getHumanoidArmorModel(LivingEntity entity, ItemStack } model.slot = armorSlot; model.copyFromDefault(_default); - model.setupAnim(entity, entity.animationPosition, entity.animationSpeed, entity.tickCount + pticks, netHeadYaw, netHeadPitch); + model.setupAnim(entity, entity.walkAnimation.position(), entity.walkAnimation.speed(), entity.tickCount + pticks, netHeadYaw, netHeadPitch); return model; } }); diff --git a/src/main/java/com/sammy/malum/common/item/curiosities/curios/CurioGildedBelt.java b/src/main/java/com/sammy/malum/common/item/curiosities/curios/CurioGildedBelt.java index 965cad424..b3810c035 100644 --- a/src/main/java/com/sammy/malum/common/item/curiosities/curios/CurioGildedBelt.java +++ b/src/main/java/com/sammy/malum/common/item/curiosities/curios/CurioGildedBelt.java @@ -1,14 +1,11 @@ package com.sammy.malum.common.item.curiosities.curios; -import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; import net.minecraft.world.entity.ai.attributes.Attribute; import net.minecraft.world.entity.ai.attributes.AttributeModifier; import net.minecraft.world.entity.ai.attributes.Attributes; import net.minecraft.world.item.ItemStack; -import top.theillusivec4.curios.api.*; - -import java.util.UUID; +import top.theillusivec4.curios.api.SlotContext; public class CurioGildedBelt extends MalumCurioItem { diff --git a/src/main/java/com/sammy/malum/common/item/curiosities/curios/CurioGildedRing.java b/src/main/java/com/sammy/malum/common/item/curiosities/curios/CurioGildedRing.java index 963eb0381..4fcea5359 100644 --- a/src/main/java/com/sammy/malum/common/item/curiosities/curios/CurioGildedRing.java +++ b/src/main/java/com/sammy/malum/common/item/curiosities/curios/CurioGildedRing.java @@ -1,14 +1,11 @@ package com.sammy.malum.common.item.curiosities.curios; -import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; import net.minecraft.world.entity.ai.attributes.Attribute; import net.minecraft.world.entity.ai.attributes.AttributeModifier; import net.minecraft.world.entity.ai.attributes.Attributes; import net.minecraft.world.item.ItemStack; -import top.theillusivec4.curios.api.*; - -import java.util.UUID; +import top.theillusivec4.curios.api.SlotContext; public class CurioGildedRing extends MalumCurioItem { public CurioGildedRing(Properties builder) { diff --git a/src/main/java/com/sammy/malum/common/item/curiosities/curios/CurioOrnateNecklace.java b/src/main/java/com/sammy/malum/common/item/curiosities/curios/CurioOrnateNecklace.java index ae37f579e..f70530781 100644 --- a/src/main/java/com/sammy/malum/common/item/curiosities/curios/CurioOrnateNecklace.java +++ b/src/main/java/com/sammy/malum/common/item/curiosities/curios/CurioOrnateNecklace.java @@ -1,14 +1,11 @@ package com.sammy.malum.common.item.curiosities.curios; -import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; import net.minecraft.world.entity.ai.attributes.Attribute; import net.minecraft.world.entity.ai.attributes.AttributeModifier; import net.minecraft.world.entity.ai.attributes.Attributes; import net.minecraft.world.item.ItemStack; -import top.theillusivec4.curios.api.*; - -import java.util.UUID; +import top.theillusivec4.curios.api.SlotContext; public class CurioOrnateNecklace extends MalumCurioItem { public CurioOrnateNecklace(Properties builder) { diff --git a/src/main/java/com/sammy/malum/common/item/curiosities/curios/CurioOrnateRing.java b/src/main/java/com/sammy/malum/common/item/curiosities/curios/CurioOrnateRing.java index 9345a0dd9..b65ca53b3 100644 --- a/src/main/java/com/sammy/malum/common/item/curiosities/curios/CurioOrnateRing.java +++ b/src/main/java/com/sammy/malum/common/item/curiosities/curios/CurioOrnateRing.java @@ -1,14 +1,11 @@ package com.sammy.malum.common.item.curiosities.curios; -import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; import net.minecraft.world.entity.ai.attributes.Attribute; import net.minecraft.world.entity.ai.attributes.AttributeModifier; import net.minecraft.world.entity.ai.attributes.Attributes; import net.minecraft.world.item.ItemStack; -import top.theillusivec4.curios.api.*; - -import java.util.UUID; +import top.theillusivec4.curios.api.SlotContext; public class CurioOrnateRing extends MalumCurioItem { public CurioOrnateRing(Properties builder) { diff --git a/src/main/java/com/sammy/malum/common/item/curiosities/curios/MalumCurioItem.java b/src/main/java/com/sammy/malum/common/item/curiosities/curios/MalumCurioItem.java index aa437d6e6..cea200798 100644 --- a/src/main/java/com/sammy/malum/common/item/curiosities/curios/MalumCurioItem.java +++ b/src/main/java/com/sammy/malum/common/item/curiosities/curios/MalumCurioItem.java @@ -1,22 +1,26 @@ package com.sammy.malum.common.item.curiosities.curios; -import com.google.common.collect.*; +import com.google.common.collect.HashMultimap; +import com.google.common.collect.Multimap; import com.sammy.malum.registry.common.SoundRegistry; -import net.minecraft.*; -import net.minecraft.sounds.*; +import net.minecraft.Util; +import net.minecraft.sounds.SoundEvent; +import net.minecraft.sounds.SoundSource; import net.minecraft.world.entity.LivingEntity; -import net.minecraft.world.entity.ai.attributes.*; +import net.minecraft.world.entity.ai.attributes.Attribute; +import net.minecraft.world.entity.ai.attributes.AttributeModifier; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.enchantment.Enchantment; import net.minecraft.world.item.enchantment.EnchantmentHelper; import net.minecraft.world.item.enchantment.Enchantments; -import top.theillusivec4.curios.api.*; +import top.theillusivec4.curios.api.SlotContext; import top.theillusivec4.curios.api.type.capability.ICurioItem; import java.util.Map; import java.util.UUID; -import java.util.function.*; +import java.util.function.Function; +import java.util.function.Supplier; public class MalumCurioItem extends Item implements ICurioItem { @@ -54,8 +58,8 @@ public final Multimap getAttributeModifiers(SlotCo } @Override - public void playRightClickEquipSound(LivingEntity livingEntity, ItemStack stack) { - livingEntity.level().playSound(null, livingEntity.blockPosition(), type.sound.get(), SoundSource.PLAYERS, 1.0f, 1.0f); + public void onEquipFromUse(SlotContext slotContext, ItemStack stack) { + slotContext.entity().level().playSound(null, slotContext.entity().blockPosition(), type.sound.get(), SoundSource.PLAYERS, 1.0f, 1.0f); } @Override @@ -68,7 +72,7 @@ public boolean isBookEnchantable(ItemStack stack, ItemStack book) { } @Override - public boolean canRightClickEquip(ItemStack stack) { + public boolean canEquipFromUse(SlotContext slotContext, ItemStack stack) { return true; } diff --git a/src/main/java/com/sammy/malum/common/item/curiosities/curios/alchemical/CurioAlchemicalRing.java b/src/main/java/com/sammy/malum/common/item/curiosities/curios/alchemical/CurioAlchemicalRing.java index 26a0f3836..f2a46962e 100644 --- a/src/main/java/com/sammy/malum/common/item/curiosities/curios/alchemical/CurioAlchemicalRing.java +++ b/src/main/java/com/sammy/malum/common/item/curiosities/curios/alchemical/CurioAlchemicalRing.java @@ -1,25 +1,23 @@ package com.sammy.malum.common.item.curiosities.curios.alchemical; -import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; -import com.sammy.malum.common.item.curiosities.curios.*; -import com.sammy.malum.registry.common.item.ItemRegistry; -import com.sammy.malum.registry.common.MobEffectRegistry; +import com.sammy.malum.common.item.curiosities.curios.MalumCurioItem; import com.sammy.malum.core.systems.item.IMalumEventResponderItem; +import com.sammy.malum.registry.common.MobEffectRegistry; +import com.sammy.malum.registry.common.item.ItemRegistry; import net.minecraft.world.effect.MobEffect; import net.minecraft.world.effect.MobEffectCategory; import net.minecraft.world.effect.MobEffectInstance; import net.minecraft.world.entity.LivingEntity; -import net.minecraft.world.entity.ai.attributes.*; +import net.minecraft.world.entity.ai.attributes.Attribute; +import net.minecraft.world.entity.ai.attributes.AttributeModifier; import net.minecraft.world.item.ItemStack; import net.minecraftforge.event.entity.living.MobEffectEvent; import net.minecraftforge.registries.ForgeRegistries; import team.lodestar.lodestone.helpers.CurioHelper; import team.lodestar.lodestone.helpers.EntityHelper; import team.lodestar.lodestone.registry.common.LodestoneAttributeRegistry; -import top.theillusivec4.curios.api.*; - -import java.util.UUID; +import top.theillusivec4.curios.api.SlotContext; public class CurioAlchemicalRing extends MalumCurioItem implements IMalumEventResponderItem { @@ -40,10 +38,9 @@ public static void onPotionApplied(MobEffectEvent.Added event) { MobEffect type = effect.getEffect(); float multiplier = MobEffectRegistry.ALCHEMICAL_PROFICIENCY_MAP.getOrDefault(ForgeRegistries.MOB_EFFECTS.getKey(type), 1f); if (type.isBeneficial()) { - EntityHelper.extendEffect(effect, entity, (int) (effect.getDuration()*0.25f*multiplier)); - } - else if (type.getCategory().equals(MobEffectCategory.HARMFUL)) { - EntityHelper.shortenEffect(effect, entity, (int) (effect.getDuration()*0.33f*multiplier)); + EntityHelper.extendEffect(effect, entity, (int) (effect.getDuration() * 0.25f * multiplier)); + } else if (type.getCategory().equals(MobEffectCategory.HARMFUL)) { + EntityHelper.shortenEffect(effect, entity, (int) (effect.getDuration() * 0.33f * multiplier)); } } } @@ -53,12 +50,11 @@ public void pickupSpirit(LivingEntity collector, ItemStack stack, double arcaneR collector.getActiveEffectsMap().forEach((e, i) -> { float multiplier = MobEffectRegistry.ALCHEMICAL_PROFICIENCY_MAP.getOrDefault(ForgeRegistries.MOB_EFFECTS.getKey(e), 1f); if (e.isBeneficial()) { - int base = 40 +(int)(arcaneResonance*20); - EntityHelper.extendEffect(i, collector, (int) (base*multiplier), 1200); - } - else if (e.getCategory().equals(MobEffectCategory.HARMFUL)) { - int base = 60 +(int)(arcaneResonance*30); - EntityHelper.shortenEffect(i, collector, (int) (base*multiplier)); + int base = 40 + (int) (arcaneResonance * 20); + EntityHelper.extendEffect(i, collector, (int) (base * multiplier), 1200); + } else if (e.getCategory().equals(MobEffectCategory.HARMFUL)) { + int base = 60 + (int) (arcaneResonance * 30); + EntityHelper.shortenEffect(i, collector, (int) (base * multiplier)); } }); } diff --git a/src/main/java/com/sammy/malum/common/item/curiosities/curios/alchemical/CurioCurativeRing.java b/src/main/java/com/sammy/malum/common/item/curiosities/curios/alchemical/CurioCurativeRing.java index 95a1d3c6d..b8bcbce47 100644 --- a/src/main/java/com/sammy/malum/common/item/curiosities/curios/alchemical/CurioCurativeRing.java +++ b/src/main/java/com/sammy/malum/common/item/curiosities/curios/alchemical/CurioCurativeRing.java @@ -1,18 +1,14 @@ package com.sammy.malum.common.item.curiosities.curios.alchemical; -import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; -import com.sammy.malum.common.item.curiosities.curios.*; +import com.sammy.malum.common.item.curiosities.curios.MalumCurioItem; import com.sammy.malum.core.systems.item.IMalumEventResponderItem; -import com.sammy.malum.registry.common.*; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.ai.attributes.Attribute; import net.minecraft.world.entity.ai.attributes.AttributeModifier; import net.minecraft.world.entity.ai.attributes.Attributes; import net.minecraft.world.item.ItemStack; -import top.theillusivec4.curios.api.*; - -import java.util.UUID; +import top.theillusivec4.curios.api.SlotContext; public class CurioCurativeRing extends MalumCurioItem implements IMalumEventResponderItem { public CurioCurativeRing(Properties builder) { @@ -21,8 +17,9 @@ public CurioCurativeRing(Properties builder) { @Override public void pickupSpirit(LivingEntity collector, ItemStack stack, double arcaneResonance) { - collector.heal(collector.getMaxHealth() * 0.1f+(float)(arcaneResonance*0.05f)); + collector.heal(collector.getMaxHealth() * 0.1f + (float) (arcaneResonance * 0.05f)); } + @Override public void addAttributeModifiers(Multimap map, SlotContext slotContext, ItemStack stack) { addAttributeModifier(map, Attributes.MAX_HEALTH, uuid -> new AttributeModifier(uuid, diff --git a/src/main/java/com/sammy/malum/common/item/curiosities/curios/alchemical/CurioRingOfProwess.java b/src/main/java/com/sammy/malum/common/item/curiosities/curios/alchemical/CurioRingOfProwess.java index 2cad62b65..fdc14788e 100644 --- a/src/main/java/com/sammy/malum/common/item/curiosities/curios/alchemical/CurioRingOfProwess.java +++ b/src/main/java/com/sammy/malum/common/item/curiosities/curios/alchemical/CurioRingOfProwess.java @@ -1,6 +1,6 @@ package com.sammy.malum.common.item.curiosities.curios.alchemical; -import com.sammy.malum.common.item.curiosities.curios.*; +import com.sammy.malum.common.item.curiosities.curios.MalumCurioItem; import com.sammy.malum.core.systems.item.IMalumEventResponderItem; import net.minecraft.world.entity.ExperienceOrb; import net.minecraft.world.entity.LivingEntity; @@ -16,7 +16,7 @@ public CurioRingOfProwess(Properties builder) { public void pickupSpirit(LivingEntity collector, ItemStack stack, double arcaneResonance) { Level level = collector.level(); int floored = (int) Math.floor(arcaneResonance); - int i = 1 + level.random.nextInt(1+floored) + level.random.nextInt(2+floored); + int i = 1 + level.random.nextInt(1 + floored) + level.random.nextInt(2 + floored); while (i > 0) { int j = ExperienceOrb.getExperienceValue(i); diff --git a/src/main/java/com/sammy/malum/common/item/curiosities/curios/misc/CurioHarmonyNecklace.java b/src/main/java/com/sammy/malum/common/item/curiosities/curios/misc/CurioHarmonyNecklace.java index d059afc82..3299b1ff2 100644 --- a/src/main/java/com/sammy/malum/common/item/curiosities/curios/misc/CurioHarmonyNecklace.java +++ b/src/main/java/com/sammy/malum/common/item/curiosities/curios/misc/CurioHarmonyNecklace.java @@ -1,10 +1,10 @@ package com.sammy.malum.common.item.curiosities.curios.misc; -import com.sammy.malum.common.item.curiosities.curios.*; +import com.sammy.malum.common.item.curiosities.curios.MalumCurioItem; import com.sammy.malum.core.helper.SpiritHelper; +import com.sammy.malum.core.systems.spirit.MalumEntitySpiritData; import com.sammy.malum.registry.common.SpiritTypeRegistry; import com.sammy.malum.registry.common.item.ItemRegistry; -import com.sammy.malum.core.systems.spirit.MalumEntitySpiritData; import net.minecraft.world.effect.MobEffects; import net.minecraft.world.entity.LivingEntity; import net.minecraftforge.event.entity.living.LivingEvent; @@ -20,7 +20,7 @@ public static void preventDetection(LivingEvent.LivingVisibilityEvent event) { LivingEntity target = event.getEntity(); if (CurioHelper.hasCurioEquipped(target, ItemRegistry.NECKLACE_OF_BLISSFUL_HARMONY.get())) { MalumEntitySpiritData data = SpiritHelper.getEntitySpiritData(watcher); - float visibilityModifier = data == null ? 0.5f : 0.5f / (1+data.dataEntries.stream().map(s -> s.type.equals(SpiritTypeRegistry.WICKED_SPIRIT) ? 1 : 0).count()); + float visibilityModifier = data == null ? 0.5f : 0.5f / (1 + data.dataEntries.stream().map(s -> s.type.equals(SpiritTypeRegistry.WICKED_SPIRIT) ? 1 : 0).count()); if (target.hasEffect(MobEffects.INVISIBILITY)) { visibilityModifier *= 0.5f; } diff --git a/src/main/java/com/sammy/malum/common/item/curiosities/curios/misc/CurioNarrowNecklace.java b/src/main/java/com/sammy/malum/common/item/curiosities/curios/misc/CurioNarrowNecklace.java index 1df7e956b..7ff74b35c 100644 --- a/src/main/java/com/sammy/malum/common/item/curiosities/curios/misc/CurioNarrowNecklace.java +++ b/src/main/java/com/sammy/malum/common/item/curiosities/curios/misc/CurioNarrowNecklace.java @@ -1,14 +1,12 @@ package com.sammy.malum.common.item.curiosities.curios.misc; -import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; -import com.sammy.malum.common.item.curiosities.curios.*; +import com.sammy.malum.common.item.curiosities.curios.MalumCurioItem; import com.sammy.malum.registry.common.AttributeRegistry; -import net.minecraft.world.entity.ai.attributes.*; +import net.minecraft.world.entity.ai.attributes.Attribute; +import net.minecraft.world.entity.ai.attributes.AttributeModifier; import net.minecraft.world.item.ItemStack; -import top.theillusivec4.curios.api.*; - -import java.util.UUID; +import top.theillusivec4.curios.api.SlotContext; public class CurioNarrowNecklace extends MalumCurioItem { public CurioNarrowNecklace(Properties builder) { diff --git a/src/main/java/com/sammy/malum/common/item/curiosities/curios/misc/CurioWaterNecklace.java b/src/main/java/com/sammy/malum/common/item/curiosities/curios/misc/CurioWaterNecklace.java index 385971902..83edda30c 100644 --- a/src/main/java/com/sammy/malum/common/item/curiosities/curios/misc/CurioWaterNecklace.java +++ b/src/main/java/com/sammy/malum/common/item/curiosities/curios/misc/CurioWaterNecklace.java @@ -1,19 +1,18 @@ package com.sammy.malum.common.item.curiosities.curios.misc; -import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; -import com.sammy.malum.common.item.curiosities.curios.*; +import com.sammy.malum.common.item.curiosities.curios.MalumCurioItem; import com.sammy.malum.core.systems.item.IMalumEventResponderItem; import net.minecraft.world.effect.MobEffects; import net.minecraft.world.entity.LivingEntity; -import net.minecraft.world.entity.ai.attributes.*; +import net.minecraft.world.entity.ai.attributes.Attribute; +import net.minecraft.world.entity.ai.attributes.AttributeInstance; +import net.minecraft.world.entity.ai.attributes.AttributeModifier; import net.minecraft.world.item.ItemStack; import net.minecraftforge.common.ForgeMod; import net.minecraftforge.event.entity.living.LivingHurtEvent; import top.theillusivec4.curios.api.SlotContext; -import java.util.UUID; - public class CurioWaterNecklace extends MalumCurioItem implements IMalumEventResponderItem { public CurioWaterNecklace(Properties builder) { super(builder, MalumTrinketType.GILDED); @@ -38,13 +37,20 @@ public double getAmount() { } @Override - public void curioTick(String identifier, int index, LivingEntity livingEntity, ItemStack stack) { + public void curioTick(SlotContext slotContext, ItemStack stack) { + LivingEntity livingEntity = slotContext.entity(); if (livingEntity.level().getGameTime() % 40L == 0 && livingEntity.isSwimming()) { AttributeInstance attribute = livingEntity.getAttribute(ForgeMod.SWIM_SPEED.get()); if (attribute != null) { attribute.setDirty(); } } + + if (livingEntity.level().getGameTime() % 20L == 0) { + if (livingEntity.hasEffect(MobEffects.CONDUIT_POWER)) { + livingEntity.heal(2); + } + } } @Override @@ -53,14 +59,4 @@ public void takeDamageEvent(LivingHurtEvent event, LivingEntity attacker, Living event.setAmount(event.getAmount() * 0.5f); } } - - @Override - public void curioTick(SlotContext slotContext, ItemStack stack) { - LivingEntity entity = slotContext.entity(); - if (entity.level.getGameTime() % 20L == 0) { - if (entity.hasEffect(MobEffects.CONDUIT_POWER)) { - entity.heal(2); - } - } - } } \ No newline at end of file diff --git a/src/main/java/com/sammy/malum/common/item/curiosities/curios/prospector/CurioDemolitionistRing.java b/src/main/java/com/sammy/malum/common/item/curiosities/curios/prospector/CurioDemolitionistRing.java index e6f9f76d0..611dde477 100644 --- a/src/main/java/com/sammy/malum/common/item/curiosities/curios/prospector/CurioDemolitionistRing.java +++ b/src/main/java/com/sammy/malum/common/item/curiosities/curios/prospector/CurioDemolitionistRing.java @@ -1,6 +1,6 @@ package com.sammy.malum.common.item.curiosities.curios.prospector; -import com.sammy.malum.common.item.curiosities.curios.*; +import com.sammy.malum.common.item.curiosities.curios.MalumCurioItem; import com.sammy.malum.registry.common.item.ItemRegistry; import net.minecraft.world.entity.LivingEntity; import team.lodestar.lodestone.helpers.CurioHelper; diff --git a/src/main/java/com/sammy/malum/common/item/curiosities/curios/prospector/CurioHoarderRing.java b/src/main/java/com/sammy/malum/common/item/curiosities/curios/prospector/CurioHoarderRing.java index 7b3aa748c..a68a3eca6 100644 --- a/src/main/java/com/sammy/malum/common/item/curiosities/curios/prospector/CurioHoarderRing.java +++ b/src/main/java/com/sammy/malum/common/item/curiosities/curios/prospector/CurioHoarderRing.java @@ -1,6 +1,6 @@ package com.sammy.malum.common.item.curiosities.curios.prospector; -import com.sammy.malum.common.item.curiosities.curios.*; +import com.sammy.malum.common.item.curiosities.curios.MalumCurioItem; import com.sammy.malum.registry.common.item.ItemRegistry; import net.minecraft.core.BlockPos; import net.minecraft.world.InteractionHand; diff --git a/src/main/java/com/sammy/malum/common/item/curiosities/curios/prospector/CurioProspectorBelt.java b/src/main/java/com/sammy/malum/common/item/curiosities/curios/prospector/CurioProspectorBelt.java index e0a7c4d19..13b4788ca 100644 --- a/src/main/java/com/sammy/malum/common/item/curiosities/curios/prospector/CurioProspectorBelt.java +++ b/src/main/java/com/sammy/malum/common/item/curiosities/curios/prospector/CurioProspectorBelt.java @@ -1,6 +1,6 @@ package com.sammy.malum.common.item.curiosities.curios.prospector; -import com.sammy.malum.common.item.curiosities.curios.*; +import com.sammy.malum.common.item.curiosities.curios.MalumCurioItem; import com.sammy.malum.registry.common.item.ItemRegistry; import com.sammy.malum.registry.common.item.ItemTagRegistry; import net.minecraft.world.entity.Entity; @@ -9,7 +9,6 @@ import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; import net.minecraft.world.item.enchantment.Enchantments; -import net.minecraft.world.level.storage.loot.LootContext; import net.minecraft.world.level.storage.loot.LootParams; import net.minecraft.world.level.storage.loot.parameters.LootContextParams; import net.minecraftforge.event.level.ExplosionEvent; @@ -32,7 +31,7 @@ public static void processExplosion(ExplosionEvent.Detonate event) { public static LootParams.Builder applyFortune(Entity source, LootParams.Builder builder) { if (source instanceof LivingEntity livingEntity) { if (CurioHelper.hasCurioEquipped(livingEntity, ItemRegistry.BELT_OF_THE_PROSPECTOR.get())) { - int fortuneBonus = 3 + CuriosApi.getCuriosHelper().getCuriosHandler(livingEntity).map(h -> h.getFortuneLevel(null)).orElse(0); + int fortuneBonus = 3 + CuriosApi.getCuriosInventory(livingEntity).map(h -> h.getFortuneLevel(null)).orElse(0); ItemStack diamondPickaxe = new ItemStack(Items.DIAMOND_PICKAXE); diamondPickaxe.enchant(Enchantments.BLOCK_FORTUNE, fortuneBonus); return builder.withParameter(LootContextParams.TOOL, diamondPickaxe); diff --git a/src/main/java/com/sammy/malum/common/item/curiosities/curios/rotten/CurioStarvedBelt.java b/src/main/java/com/sammy/malum/common/item/curiosities/curios/rotten/CurioStarvedBelt.java index 92f35da21..d4fcce690 100644 --- a/src/main/java/com/sammy/malum/common/item/curiosities/curios/rotten/CurioStarvedBelt.java +++ b/src/main/java/com/sammy/malum/common/item/curiosities/curios/rotten/CurioStarvedBelt.java @@ -1,15 +1,10 @@ package com.sammy.malum.common.item.curiosities.curios.rotten; -import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; -import com.sammy.malum.common.item.curiosities.curios.*; -import com.sammy.malum.registry.common.SoundRegistry; -import com.sammy.malum.registry.common.MobEffectRegistry; +import com.sammy.malum.common.item.curiosities.curios.MalumCurioItem; import com.sammy.malum.core.systems.item.IMalumEventResponderItem; -import net.minecraft.*; -import net.minecraft.network.chat.*; -import net.minecraft.network.chat.Component; -import net.minecraft.network.chat.TextComponent; +import com.sammy.malum.registry.common.MobEffectRegistry; +import com.sammy.malum.registry.common.SoundRegistry; import net.minecraft.sounds.SoundEvents; import net.minecraft.sounds.SoundSource; import net.minecraft.world.effect.MobEffect; @@ -18,15 +13,10 @@ import net.minecraft.world.entity.ai.attributes.Attribute; import net.minecraft.world.entity.ai.attributes.AttributeModifier; import net.minecraft.world.entity.ai.attributes.Attributes; -import net.minecraft.world.item.*; +import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.Level; -import org.jetbrains.annotations.*; -import team.lodestar.lodestone.helpers.*; -import top.theillusivec4.curios.api.*; - -import java.awt.*; -import java.util.*; -import java.util.List; +import team.lodestar.lodestone.helpers.EntityHelper; +import top.theillusivec4.curios.api.SlotContext; public class CurioStarvedBelt extends MalumCurioItem implements IMalumEventResponderItem { @@ -45,9 +35,9 @@ public void pickupSpirit(LivingEntity collector, ItemStack stack, double arcaneR MobEffect gluttony = MobEffectRegistry.GLUTTONY.get(); MobEffectInstance effect = collector.getEffect(gluttony); if (effect == null) { - collector.addEffect(new MobEffectInstance(gluttony, 100+(int)(arcaneResonance*100), 0, true, true, true)); + collector.addEffect(new MobEffectInstance(gluttony, 100 + (int) (arcaneResonance * 100), 0, true, true, true)); } else { - EntityHelper.extendEffect(effect, collector, 50, 200+(int)(arcaneResonance*200)); + EntityHelper.extendEffect(effect, collector, 50, 200 + (int) (arcaneResonance * 200)); EntityHelper.amplifyEffect(effect, collector, 1, 9); } Level level = collector.level(); diff --git a/src/main/java/com/sammy/malum/common/item/curiosities/curios/rotten/CurioVoraciousRing.java b/src/main/java/com/sammy/malum/common/item/curiosities/curios/rotten/CurioVoraciousRing.java index d48e587cb..dac13fa22 100644 --- a/src/main/java/com/sammy/malum/common/item/curiosities/curios/rotten/CurioVoraciousRing.java +++ b/src/main/java/com/sammy/malum/common/item/curiosities/curios/rotten/CurioVoraciousRing.java @@ -1,9 +1,8 @@ package com.sammy.malum.common.item.curiosities.curios.rotten; -import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; -import com.sammy.malum.common.item.curiosities.curios.*; -import com.sammy.malum.registry.common.*; +import com.sammy.malum.common.item.curiosities.curios.MalumCurioItem; +import com.sammy.malum.registry.common.MobEffectRegistry; import com.sammy.malum.registry.common.item.ItemRegistry; import net.minecraft.world.effect.MobEffectInstance; import net.minecraft.world.effect.MobEffects; @@ -15,9 +14,7 @@ import net.minecraftforge.event.entity.living.LivingEntityUseItemEvent; import team.lodestar.lodestone.helpers.CurioHelper; import team.lodestar.lodestone.helpers.EntityHelper; -import top.theillusivec4.curios.api.*; - -import java.util.UUID; +import top.theillusivec4.curios.api.SlotContext; import static com.sammy.malum.registry.common.item.ItemTagRegistry.GROSS_FOODS; @@ -50,7 +47,7 @@ public static void finishEating(LivingEntityUseItemEvent.Finish event) { if (stack.is(GROSS_FOODS)) { MobEffectInstance gluttony = player.getEffect(MobEffectRegistry.GLUTTONY.get()); if (gluttony != null) { - player.getFoodData().eat(1, 0.25f*(gluttony.amplifier+1)); + player.getFoodData().eat(1, 0.25f * (gluttony.amplifier + 1)); } player.getFoodData().eat(1, 1f); MobEffectInstance hunger = player.getEffect(MobEffects.HUNGER); diff --git a/src/main/java/com/sammy/malum/common/item/curiosities/curios/soulward/CurioMagebaneBelt.java b/src/main/java/com/sammy/malum/common/item/curiosities/curios/soulward/CurioMagebaneBelt.java index 2a333685a..88f12cc8c 100644 --- a/src/main/java/com/sammy/malum/common/item/curiosities/curios/soulward/CurioMagebaneBelt.java +++ b/src/main/java/com/sammy/malum/common/item/curiosities/curios/soulward/CurioMagebaneBelt.java @@ -1,23 +1,19 @@ package com.sammy.malum.common.item.curiosities.curios.soulward; -import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; import com.sammy.malum.common.capability.MalumPlayerDataCapability; -import com.sammy.malum.common.item.curiosities.curios.*; +import com.sammy.malum.common.item.curiosities.curios.MalumCurioItem; import com.sammy.malum.core.handlers.SoulWardHandler; -import com.sammy.malum.registry.common.AttributeRegistry; import com.sammy.malum.core.systems.item.IMalumEventResponderItem; +import com.sammy.malum.registry.common.AttributeRegistry; import net.minecraft.world.damagesource.DamageSource; import net.minecraft.world.damagesource.DamageTypes; -import net.minecraft.world.damagesource.EntityDamageSource; import net.minecraft.world.entity.ai.attributes.Attribute; import net.minecraft.world.entity.ai.attributes.AttributeModifier; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; import net.minecraftforge.event.entity.living.LivingHurtEvent; -import top.theillusivec4.curios.api.*; - -import java.util.UUID; +import top.theillusivec4.curios.api.SlotContext; public class CurioMagebaneBelt extends MalumCurioItem implements IMalumEventResponderItem { diff --git a/src/main/java/com/sammy/malum/common/item/curiosities/curios/spirit/CurioArcaneSpoilRing.java b/src/main/java/com/sammy/malum/common/item/curiosities/curios/spirit/CurioArcaneSpoilRing.java index 047cbfbf8..abbad5d29 100644 --- a/src/main/java/com/sammy/malum/common/item/curiosities/curios/spirit/CurioArcaneSpoilRing.java +++ b/src/main/java/com/sammy/malum/common/item/curiosities/curios/spirit/CurioArcaneSpoilRing.java @@ -1,14 +1,12 @@ package com.sammy.malum.common.item.curiosities.curios.spirit; -import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; -import com.sammy.malum.common.item.curiosities.curios.*; +import com.sammy.malum.common.item.curiosities.curios.MalumCurioItem; import com.sammy.malum.registry.common.AttributeRegistry; -import net.minecraft.world.entity.ai.attributes.*; +import net.minecraft.world.entity.ai.attributes.Attribute; +import net.minecraft.world.entity.ai.attributes.AttributeModifier; import net.minecraft.world.item.ItemStack; -import top.theillusivec4.curios.api.*; - -import java.util.UUID; +import top.theillusivec4.curios.api.SlotContext; public class CurioArcaneSpoilRing extends MalumCurioItem { diff --git a/src/main/java/com/sammy/malum/common/item/curiosities/curios/spirit/CurioMirrorNecklace.java b/src/main/java/com/sammy/malum/common/item/curiosities/curios/spirit/CurioMirrorNecklace.java index 7ac85ca07..9ff685ef4 100644 --- a/src/main/java/com/sammy/malum/common/item/curiosities/curios/spirit/CurioMirrorNecklace.java +++ b/src/main/java/com/sammy/malum/common/item/curiosities/curios/spirit/CurioMirrorNecklace.java @@ -1,16 +1,14 @@ package com.sammy.malum.common.item.curiosities.curios.spirit; -import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; -import com.sammy.malum.common.item.curiosities.curios.*; -import com.sammy.malum.registry.common.AttributeRegistry; +import com.sammy.malum.common.item.curiosities.curios.MalumCurioItem; import com.sammy.malum.core.systems.item.IMalumEventResponderItem; -import net.minecraft.world.entity.ai.attributes.*; +import com.sammy.malum.registry.common.AttributeRegistry; +import net.minecraft.world.entity.ai.attributes.Attribute; +import net.minecraft.world.entity.ai.attributes.AttributeModifier; import net.minecraft.world.item.ItemStack; import team.lodestar.lodestone.registry.common.LodestoneAttributeRegistry; -import top.theillusivec4.curios.api.*; - -import java.util.UUID; +import top.theillusivec4.curios.api.SlotContext; public class CurioMirrorNecklace extends MalumCurioItem implements IMalumEventResponderItem { public CurioMirrorNecklace(Properties builder) { diff --git a/src/main/java/com/sammy/malum/common/item/curiosities/curios/weeping/CurioGrowingFleshRing.java b/src/main/java/com/sammy/malum/common/item/curiosities/curios/weeping/CurioGrowingFleshRing.java index 2bb13247e..4baaf6cd8 100644 --- a/src/main/java/com/sammy/malum/common/item/curiosities/curios/weeping/CurioGrowingFleshRing.java +++ b/src/main/java/com/sammy/malum/common/item/curiosities/curios/weeping/CurioGrowingFleshRing.java @@ -1,7 +1,7 @@ package com.sammy.malum.common.item.curiosities.curios.weeping; -import com.sammy.malum.common.item.curiosities.curios.*; -import com.sammy.malum.core.systems.item.*; +import com.sammy.malum.common.item.curiosities.curios.MalumCurioItem; +import com.sammy.malum.core.systems.item.IVoidItem; public class CurioGrowingFleshRing extends MalumCurioItem implements IVoidItem { public CurioGrowingFleshRing(Properties builder) { diff --git a/src/main/java/com/sammy/malum/common/item/curiosities/curios/weeping/CurioGruesomeSatiationRing.java b/src/main/java/com/sammy/malum/common/item/curiosities/curios/weeping/CurioGruesomeSatiationRing.java index d99297bae..0cca05c2d 100644 --- a/src/main/java/com/sammy/malum/common/item/curiosities/curios/weeping/CurioGruesomeSatiationRing.java +++ b/src/main/java/com/sammy/malum/common/item/curiosities/curios/weeping/CurioGruesomeSatiationRing.java @@ -1,7 +1,7 @@ package com.sammy.malum.common.item.curiosities.curios.weeping; -import com.sammy.malum.common.item.curiosities.curios.*; -import com.sammy.malum.core.systems.item.*; +import com.sammy.malum.common.item.curiosities.curios.MalumCurioItem; +import com.sammy.malum.core.systems.item.IVoidItem; public class CurioGruesomeSatiationRing extends MalumCurioItem implements IVoidItem { public CurioGruesomeSatiationRing(Properties builder) { diff --git a/src/main/java/com/sammy/malum/common/item/curiosities/curios/weeping/CurioHiddenBladeNecklace.java b/src/main/java/com/sammy/malum/common/item/curiosities/curios/weeping/CurioHiddenBladeNecklace.java index 09d638fc4..f2c981e9f 100644 --- a/src/main/java/com/sammy/malum/common/item/curiosities/curios/weeping/CurioHiddenBladeNecklace.java +++ b/src/main/java/com/sammy/malum/common/item/curiosities/curios/weeping/CurioHiddenBladeNecklace.java @@ -1,12 +1,14 @@ package com.sammy.malum.common.item.curiosities.curios.weeping; -import com.sammy.malum.common.item.curiosities.curios.*; -import com.sammy.malum.core.systems.item.*; -import com.sammy.malum.registry.common.*; -import net.minecraft.world.effect.*; -import net.minecraft.world.entity.*; -import net.minecraft.world.item.*; -import net.minecraftforge.event.entity.living.*; +import com.sammy.malum.common.item.curiosities.curios.MalumCurioItem; +import com.sammy.malum.core.systems.item.IMalumEventResponderItem; +import com.sammy.malum.core.systems.item.IVoidItem; +import com.sammy.malum.registry.common.MobEffectRegistry; +import net.minecraft.world.effect.MobEffect; +import net.minecraft.world.effect.MobEffectInstance; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.item.ItemStack; +import net.minecraftforge.event.entity.living.LivingHurtEvent; public class CurioHiddenBladeNecklace extends MalumCurioItem implements IMalumEventResponderItem, IVoidItem { public CurioHiddenBladeNecklace(Properties builder) { diff --git a/src/main/java/com/sammy/malum/common/item/curiosities/curios/weeping/CurioWatcherNecklace.java b/src/main/java/com/sammy/malum/common/item/curiosities/curios/weeping/CurioWatcherNecklace.java index 9710ed202..eb1aa1215 100644 --- a/src/main/java/com/sammy/malum/common/item/curiosities/curios/weeping/CurioWatcherNecklace.java +++ b/src/main/java/com/sammy/malum/common/item/curiosities/curios/weeping/CurioWatcherNecklace.java @@ -1,7 +1,7 @@ package com.sammy.malum.common.item.curiosities.curios.weeping; -import com.sammy.malum.common.item.curiosities.curios.*; -import com.sammy.malum.core.systems.item.*; +import com.sammy.malum.common.item.curiosities.curios.MalumCurioItem; +import com.sammy.malum.core.systems.item.IVoidItem; public class CurioWatcherNecklace extends MalumCurioItem implements IVoidItem { public CurioWatcherNecklace(Properties builder) { diff --git a/src/main/java/com/sammy/malum/common/item/curiosities/nitrate/EthericNitrateItem.java b/src/main/java/com/sammy/malum/common/item/curiosities/nitrate/EthericNitrateItem.java index dbe90dbf9..9951c39ab 100644 --- a/src/main/java/com/sammy/malum/common/item/curiosities/nitrate/EthericNitrateItem.java +++ b/src/main/java/com/sammy/malum/common/item/curiosities/nitrate/EthericNitrateItem.java @@ -6,16 +6,14 @@ import team.lodestar.lodestone.helpers.ColorHelper; import team.lodestar.lodestone.setup.LodestoneScreenParticleRegistry; import team.lodestar.lodestone.systems.easing.Easing; -import team.lodestar.lodestone.systems.particle.builder.*; -import team.lodestar.lodestone.systems.particle.data.color.ColorParticleData; +import team.lodestar.lodestone.systems.particle.builder.ScreenParticleBuilder; import team.lodestar.lodestone.systems.particle.data.GenericParticleData; -import team.lodestar.lodestone.systems.particle.data.spin.*; -import team.lodestar.lodestone.systems.particle.screen.*; -import team.lodestar.lodestone.systems.particle.screen.base.ScreenParticle; +import team.lodestar.lodestone.systems.particle.data.color.ColorParticleData; +import team.lodestar.lodestone.systems.particle.data.spin.SpinParticleData; +import team.lodestar.lodestone.systems.particle.data.spin.SpinParticleDataBuilder; +import team.lodestar.lodestone.systems.particle.screen.ScreenParticleHolder; import java.awt.*; -import java.util.ArrayList; -import java.util.HashMap; public class EthericNitrateItem extends AbstractNitrateItem { diff --git a/src/main/java/com/sammy/malum/common/item/curiosities/nitrate/VividNitrateItem.java b/src/main/java/com/sammy/malum/common/item/curiosities/nitrate/VividNitrateItem.java index 4488a1db2..23ec6b42e 100644 --- a/src/main/java/com/sammy/malum/common/item/curiosities/nitrate/VividNitrateItem.java +++ b/src/main/java/com/sammy/malum/common/item/curiosities/nitrate/VividNitrateItem.java @@ -5,16 +5,14 @@ import net.minecraft.world.level.Level; import team.lodestar.lodestone.setup.LodestoneScreenParticleRegistry; import team.lodestar.lodestone.systems.easing.Easing; -import team.lodestar.lodestone.systems.particle.builder.*; -import team.lodestar.lodestone.systems.particle.data.color.ColorParticleData; +import team.lodestar.lodestone.systems.particle.builder.ScreenParticleBuilder; import team.lodestar.lodestone.systems.particle.data.GenericParticleData; -import team.lodestar.lodestone.systems.particle.data.spin.*; -import team.lodestar.lodestone.systems.particle.screen.*; -import team.lodestar.lodestone.systems.particle.screen.base.ScreenParticle; +import team.lodestar.lodestone.systems.particle.data.color.ColorParticleData; +import team.lodestar.lodestone.systems.particle.data.spin.SpinParticleData; +import team.lodestar.lodestone.systems.particle.data.spin.SpinParticleDataBuilder; +import team.lodestar.lodestone.systems.particle.screen.ScreenParticleHolder; import java.awt.*; -import java.util.ArrayList; -import java.util.HashMap; import static com.sammy.malum.common.entity.nitrate.VividNitrateEntity.COLOR_FUNCTION; @@ -46,6 +44,6 @@ public void spawnLateParticles(ScreenParticleHolder target, Level level, float p .setScaleData(GenericParticleData.create((float) (1.4f - Math.sin(gameTime * 0.075f) * 0.125f), 0).build()) .setColorData(ColorParticleData.create(secondColor, firstColor).build()) .setSpinData(spinParticleData.setSpinOffset(0.785f - 0.01f * gameTime % 6.28f).build()) - .spawnOnStack( -1, +4); + .spawnOnStack(-1, +4); } } \ No newline at end of file diff --git a/src/main/java/com/sammy/malum/common/item/curiosities/weapons/MagicScytheItem.java b/src/main/java/com/sammy/malum/common/item/curiosities/weapons/MagicScytheItem.java index 6241493ea..961008320 100644 --- a/src/main/java/com/sammy/malum/common/item/curiosities/weapons/MagicScytheItem.java +++ b/src/main/java/com/sammy/malum/common/item/curiosities/weapons/MagicScytheItem.java @@ -9,6 +9,7 @@ public class MagicScytheItem extends MalumScytheItem { public final float magicDamage; + public MagicScytheItem(Tier tier, float attackDamageIn, float attackSpeedIn, float magicDamage, Properties builderIn) { super(tier, attackDamageIn, attackSpeedIn, builderIn); this.magicDamage = magicDamage; diff --git a/src/main/java/com/sammy/malum/common/item/curiosities/weapons/MalumScytheItem.java b/src/main/java/com/sammy/malum/common/item/curiosities/weapons/MalumScytheItem.java index 32dbc84e7..93ecef33b 100644 --- a/src/main/java/com/sammy/malum/common/item/curiosities/weapons/MalumScytheItem.java +++ b/src/main/java/com/sammy/malum/common/item/curiosities/weapons/MalumScytheItem.java @@ -1,17 +1,18 @@ package com.sammy.malum.common.item.curiosities.weapons; import com.sammy.malum.common.entity.boomerang.ScytheBoomerangEntity; +import com.sammy.malum.core.systems.item.IMalumEventResponderItem; import com.sammy.malum.registry.client.ParticleRegistry; import com.sammy.malum.registry.common.DamageSourceRegistry; import com.sammy.malum.registry.common.SoundRegistry; import com.sammy.malum.registry.common.item.ItemRegistry; -import com.sammy.malum.core.systems.item.IMalumEventResponderItem; import net.minecraft.core.particles.SimpleParticleType; import net.minecraft.server.level.ServerLevel; import net.minecraft.sounds.SoundEvent; import net.minecraft.sounds.SoundEvents; import net.minecraft.util.Mth; import net.minecraft.world.damagesource.DamageSource; +import net.minecraft.world.damagesource.DamageTypes; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; @@ -44,7 +45,7 @@ public void hurtEvent(LivingHurtEvent event, LivingEntity attacker, LivingEntity attacker.level().playSound(null, target.getX(), target.getY(), target.getZ(), sound, attacker.getSoundSource(), 1, 1); } - if (!canSweep || event.getSource().isMagic() || event.getSource().getMsgId().equals(DamageSourceRegistry.SCYTHE_SWEEP_IDENTIFIER)) { + if (!canSweep || event.getSource().is(DamageTypes.MAGIC) || event.getSource().getMsgId().equals(DamageSourceRegistry.SCYTHE_SWEEP_IDENTIFIER)) { return; } int level = EnchantmentHelper.getEnchantmentLevel(Enchantments.SWEEPING_EDGE, attacker); @@ -52,7 +53,7 @@ public void hurtEvent(LivingHurtEvent event, LivingEntity attacker, LivingEntity target.level().getEntities(attacker, target.getBoundingBox().inflate(1 + level * 0.25f)).forEach(e -> { if (e instanceof LivingEntity livingEntity) { if (livingEntity.isAlive()) { - livingEntity.hurt((DamageSourceRegistry.causeScytheSweepDamage(attacker)), damage); + livingEntity.hurt((DamageSourceRegistry.create(attacker.level(), DamageSourceRegistry.SCYTHE_SWEEP, attacker)), damage); livingEntity.knockback(0.4F, Mth.sin(attacker.getYRot() * ((float) Math.PI / 180F)), (-Mth.cos(attacker.getYRot() * ((float) Math.PI / 180F)))); } } diff --git a/src/main/java/com/sammy/malum/common/item/curiosities/weapons/unique/MephiticEdgeScytheItem.java b/src/main/java/com/sammy/malum/common/item/curiosities/weapons/unique/MephiticEdgeScytheItem.java index c44dc85b2..8cca041b6 100644 --- a/src/main/java/com/sammy/malum/common/item/curiosities/weapons/unique/MephiticEdgeScytheItem.java +++ b/src/main/java/com/sammy/malum/common/item/curiosities/weapons/unique/MephiticEdgeScytheItem.java @@ -1,7 +1,7 @@ package com.sammy.malum.common.item.curiosities.weapons.unique; -import com.sammy.malum.common.item.curiosities.weapons.*; -import net.minecraft.world.item.*; +import com.sammy.malum.common.item.curiosities.weapons.MagicScytheItem; +import net.minecraft.world.item.Tier; public class MephiticEdgeScytheItem extends MagicScytheItem { public MephiticEdgeScytheItem(Tier tier, float attackDamageIn, float attackSpeedIn, float magicDamage, Properties builderIn) { diff --git a/src/main/java/com/sammy/malum/common/item/curiosities/weapons/unique/TyrvingItem.java b/src/main/java/com/sammy/malum/common/item/curiosities/weapons/unique/TyrvingItem.java index 03d2dfc4d..45adaa9da 100644 --- a/src/main/java/com/sammy/malum/common/item/curiosities/weapons/unique/TyrvingItem.java +++ b/src/main/java/com/sammy/malum/common/item/curiosities/weapons/unique/TyrvingItem.java @@ -2,10 +2,10 @@ import com.sammy.malum.common.packets.particle.curiosities.rite.generic.MajorEntityEffectParticlePacket; import com.sammy.malum.core.helper.SpiritHelper; +import com.sammy.malum.core.systems.item.IMalumEventResponderItem; import com.sammy.malum.registry.common.DamageSourceRegistry; import com.sammy.malum.registry.common.SoundRegistry; import com.sammy.malum.registry.common.SpiritTypeRegistry; -import com.sammy.malum.core.systems.item.IMalumEventResponderItem; import net.minecraft.server.level.ServerLevel; import net.minecraft.sounds.SoundSource; import net.minecraft.world.damagesource.DamageTypes; @@ -33,7 +33,7 @@ public void hurtEvent(LivingHurtEvent event, LivingEntity attacker, LivingEntity if (attacker.level() instanceof ServerLevel) { float spiritCount = SpiritHelper.getEntitySpiritCount(target) * 2f; if (target instanceof Player) { - spiritCount = 4 * Math.max(1, (1 + target.getArmorValue() / 12f) * (1 + (1 - 1 / (float)target.getArmorValue())) / 12f); + spiritCount = 4 * Math.max(1, (1 + target.getArmorValue() / 12f) * (1 + (1 - 1 / (float) target.getArmorValue())) / 12f); } if (target.isAlive()) { diff --git a/src/main/java/com/sammy/malum/common/item/ether/EtherBrazierItem.java b/src/main/java/com/sammy/malum/common/item/ether/EtherBrazierItem.java index 17acd4eca..8f5c6a024 100644 --- a/src/main/java/com/sammy/malum/common/item/ether/EtherBrazierItem.java +++ b/src/main/java/com/sammy/malum/common/item/ether/EtherBrazierItem.java @@ -5,16 +5,14 @@ import net.minecraft.world.level.block.Block; import team.lodestar.lodestone.setup.LodestoneScreenParticleRegistry; import team.lodestar.lodestone.systems.easing.Easing; -import team.lodestar.lodestone.systems.particle.builder.*; -import team.lodestar.lodestone.systems.particle.data.color.ColorParticleData; +import team.lodestar.lodestone.systems.particle.builder.ScreenParticleBuilder; import team.lodestar.lodestone.systems.particle.data.GenericParticleData; -import team.lodestar.lodestone.systems.particle.data.spin.*; -import team.lodestar.lodestone.systems.particle.screen.*; -import team.lodestar.lodestone.systems.particle.screen.base.ScreenParticle; +import team.lodestar.lodestone.systems.particle.data.color.ColorParticleData; +import team.lodestar.lodestone.systems.particle.data.spin.SpinParticleData; +import team.lodestar.lodestone.systems.particle.data.spin.SpinParticleDataBuilder; +import team.lodestar.lodestone.systems.particle.screen.ScreenParticleHolder; import java.awt.*; -import java.util.ArrayList; -import java.util.HashMap; public class EtherBrazierItem extends AbstractEtherItem { public EtherBrazierItem(Block blockIn, Properties builder, boolean iridescent) { @@ -30,7 +28,7 @@ public void spawnLateParticles(ScreenParticleHolder target, Level level, float p float alphaMultiplier = etherItem.iridescent ? 0.75f : 0.5f; SpinParticleDataBuilder spinDataBuilder = SpinParticleData.create(0, 1).setSpinOffset(0.025f * time % 6.28f).setEasing(Easing.EXPO_IN_OUT); ScreenParticleBuilder.create(LodestoneScreenParticleRegistry.STAR, target) - .setTransparencyData(GenericParticleData.create(0.1f*alphaMultiplier, 0f).setEasing(Easing.QUINTIC_IN).build()) + .setTransparencyData(GenericParticleData.create(0.1f * alphaMultiplier, 0f).setEasing(Easing.QUINTIC_IN).build()) .setScaleData(GenericParticleData.create((float) (1.3f + Math.sin(time * 0.1f) * 0.125f), 0).build()) .setColorData(ColorParticleData.create(firstColor, secondColor).setCoefficient(1.25f).build()) .setLifetime(6) @@ -39,7 +37,7 @@ public void spawnLateParticles(ScreenParticleHolder target, Level level, float p .spawnOnStack(-0.5f, -2) .setScaleData(GenericParticleData.create((float) (1.2f - Math.sin(time * 0.075f) * 0.125f), 0).build()) .setColorData(ColorParticleData.create(secondColor, firstColor).build()) - .setSpinData(spinDataBuilder.setSpinOffset(0.785f-0.01f * time % 6.28f).build()) + .setSpinData(spinDataBuilder.setSpinOffset(0.785f - 0.01f * time % 6.28f).build()) .spawnOnStack(-0.5f, -2); } } \ No newline at end of file diff --git a/src/main/java/com/sammy/malum/common/item/ether/EtherItem.java b/src/main/java/com/sammy/malum/common/item/ether/EtherItem.java index 43301e416..bcf69c0b1 100644 --- a/src/main/java/com/sammy/malum/common/item/ether/EtherItem.java +++ b/src/main/java/com/sammy/malum/common/item/ether/EtherItem.java @@ -5,16 +5,14 @@ import net.minecraft.world.level.block.Block; import team.lodestar.lodestone.setup.LodestoneScreenParticleRegistry; import team.lodestar.lodestone.systems.easing.Easing; -import team.lodestar.lodestone.systems.particle.builder.*; -import team.lodestar.lodestone.systems.particle.data.color.ColorParticleData; +import team.lodestar.lodestone.systems.particle.builder.ScreenParticleBuilder; import team.lodestar.lodestone.systems.particle.data.GenericParticleData; -import team.lodestar.lodestone.systems.particle.data.spin.*; -import team.lodestar.lodestone.systems.particle.screen.*; -import team.lodestar.lodestone.systems.particle.screen.base.ScreenParticle; +import team.lodestar.lodestone.systems.particle.data.color.ColorParticleData; +import team.lodestar.lodestone.systems.particle.data.spin.SpinParticleData; +import team.lodestar.lodestone.systems.particle.data.spin.SpinParticleDataBuilder; +import team.lodestar.lodestone.systems.particle.screen.ScreenParticleHolder; import java.awt.*; -import java.util.ArrayList; -import java.util.HashMap; public class EtherItem extends AbstractEtherItem { public EtherItem(Block blockIn, Properties builder, boolean iridescent) { @@ -32,7 +30,7 @@ public void spawnLateParticles(ScreenParticleHolder target, Level level, float p final int xOffset = etherItem.iridescent ? -1 : 0; final SpinParticleDataBuilder spinDataBuilder = SpinParticleData.create(0, 1).setSpinOffset(0.025f * time % 6.28f).setEasing(Easing.EXPO_IN_OUT); ScreenParticleBuilder.create(LodestoneScreenParticleRegistry.STAR, target) - .setTransparencyData(GenericParticleData.create(0.09f*alphaMultiplier, 0f).setEasing(Easing.QUINTIC_IN).build()) + .setTransparencyData(GenericParticleData.create(0.09f * alphaMultiplier, 0f).setEasing(Easing.QUINTIC_IN).build()) .setScaleData(GenericParticleData.create((float) (1.5f + Math.sin(time * 0.1f) * 0.125f), 0).build()) .setColorData(ColorParticleData.create(firstColor, secondColor).setCoefficient(1.25f).build()) .setLifetime(6) @@ -41,7 +39,7 @@ public void spawnLateParticles(ScreenParticleHolder target, Level level, float p .spawnOnStack(xOffset, yOffset) .setScaleData(GenericParticleData.create((float) (1.4f - Math.sin(time * 0.075f) * 0.125f), 0).build()) .setColorData(ColorParticleData.create(secondColor, firstColor).build()) - .setSpinData(spinDataBuilder.setSpinOffset(0.785f-0.01f * time % 6.28f).build()) + .setSpinData(spinDataBuilder.setSpinOffset(0.785f - 0.01f * time % 6.28f).build()) .spawnOnStack(xOffset, yOffset); } } \ No newline at end of file diff --git a/src/main/java/com/sammy/malum/common/item/ether/EtherTorchItem.java b/src/main/java/com/sammy/malum/common/item/ether/EtherTorchItem.java index a72d5a861..8b9dfd802 100644 --- a/src/main/java/com/sammy/malum/common/item/ether/EtherTorchItem.java +++ b/src/main/java/com/sammy/malum/common/item/ether/EtherTorchItem.java @@ -11,17 +11,15 @@ import net.minecraft.world.phys.shapes.CollisionContext; import team.lodestar.lodestone.setup.LodestoneScreenParticleRegistry; import team.lodestar.lodestone.systems.easing.Easing; -import team.lodestar.lodestone.systems.particle.builder.*; -import team.lodestar.lodestone.systems.particle.data.color.ColorParticleData; +import team.lodestar.lodestone.systems.particle.builder.ScreenParticleBuilder; import team.lodestar.lodestone.systems.particle.data.GenericParticleData; -import team.lodestar.lodestone.systems.particle.data.spin.*; -import team.lodestar.lodestone.systems.particle.screen.*; -import team.lodestar.lodestone.systems.particle.screen.base.ScreenParticle; +import team.lodestar.lodestone.systems.particle.data.color.ColorParticleData; +import team.lodestar.lodestone.systems.particle.data.spin.SpinParticleData; +import team.lodestar.lodestone.systems.particle.data.spin.SpinParticleDataBuilder; +import team.lodestar.lodestone.systems.particle.screen.ScreenParticleHolder; import javax.annotation.Nullable; import java.awt.*; -import java.util.ArrayList; -import java.util.HashMap; import java.util.Map; public class EtherTorchItem extends AbstractEtherItem { diff --git a/src/main/java/com/sammy/malum/common/item/impetus/CrackedImpetusItem.java b/src/main/java/com/sammy/malum/common/item/impetus/CrackedImpetusItem.java index 97aa8eb0b..434d81e5e 100644 --- a/src/main/java/com/sammy/malum/common/item/impetus/CrackedImpetusItem.java +++ b/src/main/java/com/sammy/malum/common/item/impetus/CrackedImpetusItem.java @@ -5,6 +5,7 @@ public class CrackedImpetusItem extends Item implements SpiritRepairRecipe.IRepairOutputOverride { public ImpetusItem impetus; + public CrackedImpetusItem(Properties pProperties) { super(pProperties); } diff --git a/src/main/java/com/sammy/malum/common/item/spirit/FusedConsciousnessItem.java b/src/main/java/com/sammy/malum/common/item/spirit/FusedConsciousnessItem.java index 6905c350f..f39fedfe9 100644 --- a/src/main/java/com/sammy/malum/common/item/spirit/FusedConsciousnessItem.java +++ b/src/main/java/com/sammy/malum/common/item/spirit/FusedConsciousnessItem.java @@ -1,8 +1,7 @@ package com.sammy.malum.common.item.spirit; -import com.sammy.malum.common.item.curiosities.curios.*; -import com.sammy.malum.core.systems.item.*; -import net.minecraft.world.item.*; +import com.sammy.malum.core.systems.item.IVoidItem; +import net.minecraft.world.item.SimpleFoiledItem; public class FusedConsciousnessItem extends SimpleFoiledItem implements IVoidItem { public FusedConsciousnessItem(Properties builder) { diff --git a/src/main/java/com/sammy/malum/common/item/spirit/SoulVialItem.java b/src/main/java/com/sammy/malum/common/item/spirit/SoulVialItem.java index eb75f792d..2302a75b4 100644 --- a/src/main/java/com/sammy/malum/common/item/spirit/SoulVialItem.java +++ b/src/main/java/com/sammy/malum/common/item/spirit/SoulVialItem.java @@ -1,6 +1,6 @@ package com.sammy.malum.common.item.spirit; -import com.sammy.malum.common.item.curiosities.*; +import com.sammy.malum.common.item.curiosities.SoulStaveItem; import com.sammy.malum.core.systems.item.ISoulContainerItem; import com.sammy.malum.core.systems.spirit.MalumEntitySpiritData; import net.minecraft.ChatFormatting; diff --git a/src/main/java/com/sammy/malum/common/item/spirit/SpiritJarItem.java b/src/main/java/com/sammy/malum/common/item/spirit/SpiritJarItem.java index 4a21db9e7..5479a825d 100644 --- a/src/main/java/com/sammy/malum/common/item/spirit/SpiritJarItem.java +++ b/src/main/java/com/sammy/malum/common/item/spirit/SpiritJarItem.java @@ -56,6 +56,7 @@ public void appendHoverText(ItemStack pStack, @Nullable Level pLevel, List consumer) { consumer.accept(new IClientItemExtensions() { static final NonNullLazy renderer = NonNullLazy.of(() -> new SpiritJarItemRenderer(Minecraft.getInstance().getBlockEntityRenderDispatcher(), Minecraft.getInstance().getEntityModels())); + @Override public BlockEntityWithoutLevelRenderer getCustomRenderer() { return renderer.get(); diff --git a/src/main/java/com/sammy/malum/common/item/spirit/SpiritShardItem.java b/src/main/java/com/sammy/malum/common/item/spirit/SpiritShardItem.java index ea29edebd..90b87ef4f 100644 --- a/src/main/java/com/sammy/malum/common/item/spirit/SpiritShardItem.java +++ b/src/main/java/com/sammy/malum/common/item/spirit/SpiritShardItem.java @@ -1,7 +1,7 @@ package com.sammy.malum.common.item.spirit; import com.sammy.malum.core.systems.spirit.MalumSpiritType; -import com.sammy.malum.visual_effects.*; +import com.sammy.malum.visual_effects.ScreenParticleEffects; import net.minecraft.network.chat.Component; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; @@ -9,9 +9,8 @@ import net.minecraft.world.level.Level; import org.jetbrains.annotations.Nullable; import team.lodestar.lodestone.handlers.screenparticle.ParticleEmitterHandler.ItemParticleSupplier; -import team.lodestar.lodestone.systems.particle.screen.*; +import team.lodestar.lodestone.systems.particle.screen.ScreenParticleHolder; -import java.awt.*; import java.util.List; public class SpiritShardItem extends Item implements ItemParticleSupplier { diff --git a/src/main/java/com/sammy/malum/common/item/spirit/TunedOpticItem.java b/src/main/java/com/sammy/malum/common/item/spirit/TunedOpticItem.java index 1e0bef7ce..fe74c63d5 100644 --- a/src/main/java/com/sammy/malum/common/item/spirit/TunedOpticItem.java +++ b/src/main/java/com/sammy/malum/common/item/spirit/TunedOpticItem.java @@ -1,15 +1,17 @@ package com.sammy.malum.common.item.spirit; -import com.sammy.malum.core.systems.spirit.*; -import com.sammy.malum.visual_effects.*; -import net.minecraft.network.chat.*; -import net.minecraft.world.item.*; -import net.minecraft.world.level.*; -import org.jetbrains.annotations.*; -import team.lodestar.lodestone.handlers.screenparticle.ParticleEmitterHandler.*; -import team.lodestar.lodestone.systems.particle.screen.*; +import com.sammy.malum.core.systems.spirit.MalumSpiritType; +import com.sammy.malum.visual_effects.ScreenParticleEffects; +import net.minecraft.network.chat.Component; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.TooltipFlag; +import net.minecraft.world.level.Level; +import org.jetbrains.annotations.Nullable; +import team.lodestar.lodestone.handlers.screenparticle.ParticleEmitterHandler.ItemParticleSupplier; +import team.lodestar.lodestone.systems.particle.screen.ScreenParticleHolder; -import java.util.*; +import java.util.List; public class TunedOpticItem extends Item implements ItemParticleSupplier { public final MalumSpiritType type; diff --git a/src/main/java/com/sammy/malum/common/packets/ParticleEffectPacket.java b/src/main/java/com/sammy/malum/common/packets/ParticleEffectPacket.java index d0ca73161..1fa635b48 100644 --- a/src/main/java/com/sammy/malum/common/packets/ParticleEffectPacket.java +++ b/src/main/java/com/sammy/malum/common/packets/ParticleEffectPacket.java @@ -1,19 +1,21 @@ package com.sammy.malum.common.packets; -import com.sammy.malum.registry.common.*; -import com.sammy.malum.visual_effects.networked.*; -import com.sammy.malum.visual_effects.networked.data.*; -import net.minecraft.client.*; -import net.minecraft.client.multiplayer.*; -import net.minecraft.nbt.*; -import net.minecraft.network.*; -import net.minecraftforge.api.distmarker.*; -import net.minecraftforge.network.*; -import net.minecraftforge.network.simple.*; -import team.lodestar.lodestone.systems.network.*; +import com.sammy.malum.registry.common.ParticleEffectTypeRegistry; +import com.sammy.malum.visual_effects.networked.ParticleEffectType; +import com.sammy.malum.visual_effects.networked.data.ColorEffectData; +import com.sammy.malum.visual_effects.networked.data.NBTEffectData; +import com.sammy.malum.visual_effects.networked.data.PositionEffectData; +import net.minecraft.client.Minecraft; +import net.minecraft.client.multiplayer.ClientLevel; +import net.minecraft.network.FriendlyByteBuf; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; +import net.minecraftforge.network.NetworkEvent; +import net.minecraftforge.network.simple.SimpleChannel; +import team.lodestar.lodestone.systems.network.LodestoneClientPacket; -import javax.annotation.*; -import java.util.function.*; +import javax.annotation.Nullable; +import java.util.function.Supplier; public class ParticleEffectPacket extends LodestoneClientPacket { diff --git a/src/main/java/com/sammy/malum/common/packets/VoidRejectionPacket.java b/src/main/java/com/sammy/malum/common/packets/VoidRejectionPacket.java index 46af16eec..2ae9f44dd 100644 --- a/src/main/java/com/sammy/malum/common/packets/VoidRejectionPacket.java +++ b/src/main/java/com/sammy/malum/common/packets/VoidRejectionPacket.java @@ -2,7 +2,6 @@ import com.sammy.malum.common.capability.MalumLivingEntityDataCapability; import net.minecraft.client.Minecraft; -import net.minecraft.nbt.CompoundTag; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.LivingEntity; diff --git a/src/main/java/com/sammy/malum/common/packets/particle/ItemAbsorbParticleEffectPacket.java b/src/main/java/com/sammy/malum/common/packets/particle/ItemAbsorbParticleEffectPacket.java index 90b443910..cac8e9616 100644 --- a/src/main/java/com/sammy/malum/common/packets/particle/ItemAbsorbParticleEffectPacket.java +++ b/src/main/java/com/sammy/malum/common/packets/particle/ItemAbsorbParticleEffectPacket.java @@ -1,10 +1,11 @@ package com.sammy.malum.common.packets.particle; -import com.sammy.malum.common.packets.particle.base.spirit.*; -import net.minecraft.network.*; -import net.minecraft.world.item.*; +import com.sammy.malum.common.packets.particle.base.spirit.SpiritBasedParticleEffectPacket; +import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.world.item.ItemStack; -import java.util.*; +import java.util.ArrayList; +import java.util.List; public abstract class ItemAbsorbParticleEffectPacket extends SpiritBasedParticleEffectPacket { protected final ItemStack stack; diff --git a/src/main/java/com/sammy/malum/common/packets/particle/SuccessfulSoulHarvestParticlePacket.java b/src/main/java/com/sammy/malum/common/packets/particle/SuccessfulSoulHarvestParticlePacket.java index 0adaaef38..c39a076d9 100644 --- a/src/main/java/com/sammy/malum/common/packets/particle/SuccessfulSoulHarvestParticlePacket.java +++ b/src/main/java/com/sammy/malum/common/packets/particle/SuccessfulSoulHarvestParticlePacket.java @@ -1,21 +1,21 @@ package com.sammy.malum.common.packets.particle; -import com.sammy.malum.common.packets.particle.base.*; -import net.minecraft.client.*; -import net.minecraft.network.*; -import net.minecraft.world.level.*; -import net.minecraftforge.api.distmarker.*; -import net.minecraftforge.network.*; -import net.minecraftforge.network.simple.*; -import team.lodestar.lodestone.setup.*; -import team.lodestar.lodestone.systems.particle.*; -import team.lodestar.lodestone.systems.particle.builder.*; -import team.lodestar.lodestone.systems.particle.data.*; -import team.lodestar.lodestone.systems.particle.data.color.*; -import team.lodestar.lodestone.systems.particle.data.spin.*; +import com.sammy.malum.common.packets.particle.base.PositionBasedParticleEffectPacket; +import net.minecraft.client.Minecraft; +import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.world.level.Level; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; +import net.minecraftforge.network.NetworkEvent; +import net.minecraftforge.network.simple.SimpleChannel; +import team.lodestar.lodestone.setup.LodestoneParticleRegistry; +import team.lodestar.lodestone.systems.particle.builder.WorldParticleBuilder; +import team.lodestar.lodestone.systems.particle.data.GenericParticleData; +import team.lodestar.lodestone.systems.particle.data.color.ColorParticleData; +import team.lodestar.lodestone.systems.particle.data.spin.SpinParticleData; import java.awt.*; -import java.util.function.*; +import java.util.function.Supplier; public class SuccessfulSoulHarvestParticlePacket extends PositionBasedParticleEffectPacket { private final Color color; diff --git a/src/main/java/com/sammy/malum/common/packets/particle/base/BlockBasedParticleEffectPacket.java b/src/main/java/com/sammy/malum/common/packets/particle/base/BlockBasedParticleEffectPacket.java index 6de7eae68..31b4f5209 100644 --- a/src/main/java/com/sammy/malum/common/packets/particle/base/BlockBasedParticleEffectPacket.java +++ b/src/main/java/com/sammy/malum/common/packets/particle/base/BlockBasedParticleEffectPacket.java @@ -1,8 +1,8 @@ package com.sammy.malum.common.packets.particle.base; -import net.minecraft.core.*; -import net.minecraft.network.*; -import team.lodestar.lodestone.systems.network.*; +import net.minecraft.core.BlockPos; +import net.minecraft.network.FriendlyByteBuf; +import team.lodestar.lodestone.systems.network.LodestoneClientPacket; public abstract class BlockBasedParticleEffectPacket extends LodestoneClientPacket { protected final BlockPos pos; diff --git a/src/main/java/com/sammy/malum/common/packets/particle/base/PositionBasedParticleEffectPacket.java b/src/main/java/com/sammy/malum/common/packets/particle/base/PositionBasedParticleEffectPacket.java index 452767d82..96b34482c 100644 --- a/src/main/java/com/sammy/malum/common/packets/particle/base/PositionBasedParticleEffectPacket.java +++ b/src/main/java/com/sammy/malum/common/packets/particle/base/PositionBasedParticleEffectPacket.java @@ -1,7 +1,7 @@ package com.sammy.malum.common.packets.particle.base; -import net.minecraft.network.*; -import team.lodestar.lodestone.systems.network.*; +import net.minecraft.network.FriendlyByteBuf; +import team.lodestar.lodestone.systems.network.LodestoneClientPacket; public abstract class PositionBasedParticleEffectPacket extends LodestoneClientPacket { protected final double posX; diff --git a/src/main/java/com/sammy/malum/common/packets/particle/base/color/ColorBasedBlockParticleEffectPacket.java b/src/main/java/com/sammy/malum/common/packets/particle/base/color/ColorBasedBlockParticleEffectPacket.java index c59927313..d782748e5 100644 --- a/src/main/java/com/sammy/malum/common/packets/particle/base/color/ColorBasedBlockParticleEffectPacket.java +++ b/src/main/java/com/sammy/malum/common/packets/particle/base/color/ColorBasedBlockParticleEffectPacket.java @@ -1,8 +1,8 @@ package com.sammy.malum.common.packets.particle.base.color; -import com.sammy.malum.common.packets.particle.base.*; -import net.minecraft.core.*; -import net.minecraft.network.*; +import com.sammy.malum.common.packets.particle.base.BlockBasedParticleEffectPacket; +import net.minecraft.core.BlockPos; +import net.minecraft.network.FriendlyByteBuf; import java.awt.*; diff --git a/src/main/java/com/sammy/malum/common/packets/particle/base/color/ColorBasedParticleEffectPacket.java b/src/main/java/com/sammy/malum/common/packets/particle/base/color/ColorBasedParticleEffectPacket.java index 58afadf00..f099a75d5 100644 --- a/src/main/java/com/sammy/malum/common/packets/particle/base/color/ColorBasedParticleEffectPacket.java +++ b/src/main/java/com/sammy/malum/common/packets/particle/base/color/ColorBasedParticleEffectPacket.java @@ -1,7 +1,7 @@ package com.sammy.malum.common.packets.particle.base.color; -import com.sammy.malum.common.packets.particle.base.*; -import net.minecraft.network.*; +import com.sammy.malum.common.packets.particle.base.PositionBasedParticleEffectPacket; +import net.minecraft.network.FriendlyByteBuf; import java.awt.*; diff --git a/src/main/java/com/sammy/malum/common/packets/particle/base/spirit/SpiritBasedBlockParticleEffectPacket.java b/src/main/java/com/sammy/malum/common/packets/particle/base/spirit/SpiritBasedBlockParticleEffectPacket.java index 8a4163d4f..a073b4494 100644 --- a/src/main/java/com/sammy/malum/common/packets/particle/base/spirit/SpiritBasedBlockParticleEffectPacket.java +++ b/src/main/java/com/sammy/malum/common/packets/particle/base/spirit/SpiritBasedBlockParticleEffectPacket.java @@ -1,15 +1,17 @@ package com.sammy.malum.common.packets.particle.base.spirit; -import com.sammy.malum.common.packets.particle.base.*; -import com.sammy.malum.core.helper.*; -import com.sammy.malum.core.systems.spirit.*; -import net.minecraft.core.*; -import net.minecraft.network.*; -import net.minecraftforge.api.distmarker.*; -import net.minecraftforge.network.*; - -import java.util.*; -import java.util.function.*; +import com.sammy.malum.common.packets.particle.base.BlockBasedParticleEffectPacket; +import com.sammy.malum.core.helper.SpiritHelper; +import com.sammy.malum.core.systems.spirit.MalumSpiritType; +import net.minecraft.core.BlockPos; +import net.minecraft.network.FriendlyByteBuf; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; +import net.minecraftforge.network.NetworkEvent; + +import java.util.ArrayList; +import java.util.List; +import java.util.function.Supplier; public abstract class SpiritBasedBlockParticleEffectPacket extends BlockBasedParticleEffectPacket { protected final List spirits; @@ -46,7 +48,7 @@ public static T decode(PacketPr double posX = buf.readInt(); double posY = buf.readInt(); double posZ = buf.readInt(); - return provider.getPacket(spirits, new BlockPos((int)posX, (int)posY, (int)posZ)); + return provider.getPacket(spirits, new BlockPos((int) posX, (int) posY, (int) posZ)); } public interface PacketProvider { diff --git a/src/main/java/com/sammy/malum/common/packets/particle/base/spirit/SpiritBasedParticleEffectPacket.java b/src/main/java/com/sammy/malum/common/packets/particle/base/spirit/SpiritBasedParticleEffectPacket.java index 15c851382..a235f0e71 100644 --- a/src/main/java/com/sammy/malum/common/packets/particle/base/spirit/SpiritBasedParticleEffectPacket.java +++ b/src/main/java/com/sammy/malum/common/packets/particle/base/spirit/SpiritBasedParticleEffectPacket.java @@ -1,14 +1,16 @@ package com.sammy.malum.common.packets.particle.base.spirit; -import com.sammy.malum.common.packets.particle.base.*; -import com.sammy.malum.core.helper.*; -import com.sammy.malum.core.systems.spirit.*; -import net.minecraft.network.*; -import net.minecraftforge.api.distmarker.*; -import net.minecraftforge.network.*; - -import java.util.*; -import java.util.function.*; +import com.sammy.malum.common.packets.particle.base.PositionBasedParticleEffectPacket; +import com.sammy.malum.core.helper.SpiritHelper; +import com.sammy.malum.core.systems.spirit.MalumSpiritType; +import net.minecraft.network.FriendlyByteBuf; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; +import net.minecraftforge.network.NetworkEvent; + +import java.util.ArrayList; +import java.util.List; +import java.util.function.Supplier; public abstract class SpiritBasedParticleEffectPacket extends PositionBasedParticleEffectPacket { protected final List spirits; diff --git a/src/main/java/com/sammy/malum/common/packets/particle/curiosities/altar/AltarConsumeParticlePacket.java b/src/main/java/com/sammy/malum/common/packets/particle/curiosities/altar/AltarConsumeParticlePacket.java index 709695e4f..5d60c9cd5 100644 --- a/src/main/java/com/sammy/malum/common/packets/particle/curiosities/altar/AltarConsumeParticlePacket.java +++ b/src/main/java/com/sammy/malum/common/packets/particle/curiosities/altar/AltarConsumeParticlePacket.java @@ -1,24 +1,24 @@ package com.sammy.malum.common.packets.particle.curiosities.altar; -import com.sammy.malum.common.packets.particle.*; -import com.sammy.malum.core.systems.spirit.*; -import net.minecraft.client.*; -import net.minecraft.network.*; -import net.minecraft.world.item.*; -import net.minecraft.world.level.*; -import net.minecraft.world.phys.*; -import net.minecraftforge.api.distmarker.*; -import net.minecraftforge.network.*; -import net.minecraftforge.network.simple.*; -import team.lodestar.lodestone.setup.*; -import team.lodestar.lodestone.systems.particle.*; -import team.lodestar.lodestone.systems.particle.builder.*; -import team.lodestar.lodestone.systems.particle.data.*; -import team.lodestar.lodestone.systems.particle.data.color.*; +import com.sammy.malum.common.packets.particle.ItemAbsorbParticleEffectPacket; +import com.sammy.malum.core.systems.spirit.MalumSpiritType; +import net.minecraft.client.Minecraft; +import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.level.Level; +import net.minecraft.world.phys.Vec3; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; +import net.minecraftforge.network.NetworkEvent; +import net.minecraftforge.network.simple.SimpleChannel; +import team.lodestar.lodestone.setup.LodestoneParticleRegistry; +import team.lodestar.lodestone.systems.particle.builder.WorldParticleBuilder; +import team.lodestar.lodestone.systems.particle.data.GenericParticleData; +import team.lodestar.lodestone.systems.particle.data.color.ColorParticleData; import java.awt.*; import java.util.List; -import java.util.function.*; +import java.util.function.Supplier; public class AltarConsumeParticlePacket extends ItemAbsorbParticleEffectPacket { diff --git a/src/main/java/com/sammy/malum/common/packets/particle/curiosities/altar/AltarCraftParticlePacket.java b/src/main/java/com/sammy/malum/common/packets/particle/curiosities/altar/AltarCraftParticlePacket.java index 1f4aad493..1601d99a3 100644 --- a/src/main/java/com/sammy/malum/common/packets/particle/curiosities/altar/AltarCraftParticlePacket.java +++ b/src/main/java/com/sammy/malum/common/packets/particle/curiosities/altar/AltarCraftParticlePacket.java @@ -1,23 +1,23 @@ package com.sammy.malum.common.packets.particle.curiosities.altar; -import com.sammy.malum.common.packets.particle.base.spirit.*; -import com.sammy.malum.core.systems.spirit.*; -import net.minecraft.client.*; -import net.minecraft.network.*; -import net.minecraft.world.level.*; -import net.minecraft.world.phys.*; -import net.minecraftforge.api.distmarker.*; -import net.minecraftforge.network.*; -import net.minecraftforge.network.simple.*; -import team.lodestar.lodestone.setup.*; -import team.lodestar.lodestone.systems.particle.*; -import team.lodestar.lodestone.systems.particle.builder.*; -import team.lodestar.lodestone.systems.particle.data.*; -import team.lodestar.lodestone.systems.particle.data.color.*; +import com.sammy.malum.common.packets.particle.base.spirit.SpiritBasedParticleEffectPacket; +import com.sammy.malum.core.systems.spirit.MalumSpiritType; +import net.minecraft.client.Minecraft; +import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.world.level.Level; +import net.minecraft.world.phys.Vec3; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; +import net.minecraftforge.network.NetworkEvent; +import net.minecraftforge.network.simple.SimpleChannel; +import team.lodestar.lodestone.setup.LodestoneParticleRegistry; +import team.lodestar.lodestone.systems.particle.builder.WorldParticleBuilder; +import team.lodestar.lodestone.systems.particle.data.GenericParticleData; +import team.lodestar.lodestone.systems.particle.data.color.ColorParticleData; import java.awt.*; import java.util.List; -import java.util.function.*; +import java.util.function.Supplier; public class AltarCraftParticlePacket extends SpiritBasedParticleEffectPacket { diff --git a/src/main/java/com/sammy/malum/common/packets/particle/curiosities/blight/BlightMistParticlePacket.java b/src/main/java/com/sammy/malum/common/packets/particle/curiosities/blight/BlightMistParticlePacket.java index 7b44478d8..65a4d5cf5 100644 --- a/src/main/java/com/sammy/malum/common/packets/particle/curiosities/blight/BlightMistParticlePacket.java +++ b/src/main/java/com/sammy/malum/common/packets/particle/curiosities/blight/BlightMistParticlePacket.java @@ -1,26 +1,26 @@ package com.sammy.malum.common.packets.particle.curiosities.blight; -import com.sammy.malum.common.packets.particle.base.*; -import net.minecraft.client.*; -import net.minecraft.core.*; -import net.minecraft.network.*; -import net.minecraft.util.*; -import net.minecraft.world.level.*; -import net.minecraftforge.api.distmarker.*; -import net.minecraftforge.network.*; -import net.minecraftforge.network.simple.*; -import team.lodestar.lodestone.setup.*; -import team.lodestar.lodestone.systems.easing.*; -import team.lodestar.lodestone.systems.particle.*; -import team.lodestar.lodestone.systems.particle.builder.*; -import team.lodestar.lodestone.systems.particle.data.*; -import team.lodestar.lodestone.systems.particle.data.color.*; -import team.lodestar.lodestone.systems.particle.data.spin.*; -import team.lodestar.lodestone.systems.particle.render_types.*; -import team.lodestar.lodestone.systems.particle.world.*; +import com.sammy.malum.common.packets.particle.base.BlockBasedParticleEffectPacket; +import net.minecraft.client.Minecraft; +import net.minecraft.core.BlockPos; +import net.minecraft.core.Direction; +import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.util.Mth; +import net.minecraft.world.level.Level; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; +import net.minecraftforge.network.NetworkEvent; +import net.minecraftforge.network.simple.SimpleChannel; +import team.lodestar.lodestone.setup.LodestoneParticleRegistry; +import team.lodestar.lodestone.systems.easing.Easing; +import team.lodestar.lodestone.systems.particle.builder.WorldParticleBuilder; +import team.lodestar.lodestone.systems.particle.data.GenericParticleData; +import team.lodestar.lodestone.systems.particle.data.color.ColorParticleData; +import team.lodestar.lodestone.systems.particle.data.spin.SpinParticleData; +import team.lodestar.lodestone.systems.particle.render_types.LodestoneWorldParticleRenderType; import java.awt.*; -import java.util.function.*; +import java.util.function.Supplier; public class BlightMistParticlePacket extends BlockBasedParticleEffectPacket { public BlightMistParticlePacket(BlockPos pos) { @@ -34,13 +34,13 @@ public void execute(Supplier context) { for (int i = 0; i < 3; i++) { float multiplier = Mth.nextFloat(level.random, 0.4f, 1f); float timeMultiplier = Mth.nextFloat(level.random, 0.9f, 1.4f); - Color color = new Color((int)(31*multiplier), (int)(19*multiplier), (int)(31*multiplier)); + Color color = new Color((int) (31 * multiplier), (int) (19 * multiplier), (int) (31 * multiplier)); boolean spinDirection = level.random.nextBoolean(); WorldParticleBuilder.create(LodestoneParticleRegistry.WISP_PARTICLE) .setTransparencyData(GenericParticleData.create(0.15f, 1f, 0).build()) - .setSpinData(SpinParticleData.create(0.2f*(spinDirection ? 1 : -1)).build()) + .setSpinData(SpinParticleData.create(0.2f * (spinDirection ? 1 : -1)).build()) .setScaleData(GenericParticleData.create(0.15f, 0.2f, 0).setEasing(Easing.QUINTIC_OUT, Easing.SINE_IN).build()) - .setLifetime((int) (45*timeMultiplier)) + .setLifetime((int) (45 * timeMultiplier)) .setColorData(ColorParticleData.create(color, color).build()) .enableNoClip() .setRandomOffset(0.1f, 0f) @@ -50,8 +50,8 @@ public void execute(Supplier context) { WorldParticleBuilder.create(LodestoneParticleRegistry.SMOKE_PARTICLE) .setTransparencyData(GenericParticleData.create(0.25f, 0.55f, 0).build()) - .setLifetime((int) (50*timeMultiplier)) - .setSpinData(SpinParticleData.create(0.1f*(spinDirection ? 1 : -1)).build()) + .setLifetime((int) (50 * timeMultiplier)) + .setSpinData(SpinParticleData.create(0.1f * (spinDirection ? 1 : -1)).build()) .setScaleData(GenericParticleData.create(0.35f, 0.4f, 0).setEasing(Easing.QUINTIC_OUT, Easing.SINE_IN).build()) .setColorData(ColorParticleData.create(color, color).build()) .setRandomOffset(0.2f, 0) @@ -60,13 +60,13 @@ public void execute(Supplier context) { .setRenderType(LodestoneWorldParticleRenderType.LUMITRANSPARENT) .repeatSurroundBlock(level, pos, 2, Direction.UP); - color = new Color((int)(80*multiplier), (int)(40*multiplier), (int)(80*multiplier)); + color = new Color((int) (80 * multiplier), (int) (40 * multiplier), (int) (80 * multiplier)); WorldParticleBuilder.create(LodestoneParticleRegistry.SMOKE_PARTICLE) .setTransparencyData(GenericParticleData.create(0.02f, 0.15f, 0).build()) - .setSpinData(SpinParticleData.create(0.1f*(spinDirection ? 1 : -1)).build()) + .setSpinData(SpinParticleData.create(0.1f * (spinDirection ? 1 : -1)).build()) .setScaleData(GenericParticleData.create(0.35f, 0.4f, 0).setEasing(Easing.QUINTIC_OUT, Easing.SINE_IN).build()) .setColorData(ColorParticleData.create(color, color).build()) - .setLifetime((int) (50*timeMultiplier)) + .setLifetime((int) (50 * timeMultiplier)) .setRandomOffset(0.2f, 0) .enableNoClip() .setRandomMotion(0.01f, 0.005f) diff --git a/src/main/java/com/sammy/malum/common/packets/particle/curiosities/blight/BlightTransformItemParticlePacket.java b/src/main/java/com/sammy/malum/common/packets/particle/curiosities/blight/BlightTransformItemParticlePacket.java index bccfd83d8..07099a103 100644 --- a/src/main/java/com/sammy/malum/common/packets/particle/curiosities/blight/BlightTransformItemParticlePacket.java +++ b/src/main/java/com/sammy/malum/common/packets/particle/curiosities/blight/BlightTransformItemParticlePacket.java @@ -1,30 +1,29 @@ package com.sammy.malum.common.packets.particle.curiosities.blight; -import com.sammy.malum.common.packets.particle.base.spirit.*; -import com.sammy.malum.core.systems.spirit.*; -import net.minecraft.client.*; -import net.minecraft.network.*; -import net.minecraft.util.*; -import net.minecraft.world.level.*; -import net.minecraft.world.phys.*; -import net.minecraftforge.api.distmarker.*; -import net.minecraftforge.network.*; -import net.minecraftforge.network.simple.*; -import team.lodestar.lodestone.helpers.*; -import team.lodestar.lodestone.setup.*; -import team.lodestar.lodestone.systems.easing.*; -import team.lodestar.lodestone.systems.particle.*; -import team.lodestar.lodestone.systems.particle.builder.*; -import team.lodestar.lodestone.systems.particle.data.*; -import team.lodestar.lodestone.systems.particle.data.color.*; -import team.lodestar.lodestone.systems.particle.data.spin.*; -import team.lodestar.lodestone.systems.particle.render_types.*; -import team.lodestar.lodestone.systems.particle.world.*; +import com.sammy.malum.common.packets.particle.base.spirit.SpiritBasedParticleEffectPacket; +import com.sammy.malum.core.systems.spirit.MalumSpiritType; +import net.minecraft.client.Minecraft; +import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.util.Mth; +import net.minecraft.world.level.Level; +import net.minecraft.world.phys.Vec3; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; +import net.minecraftforge.network.NetworkEvent; +import net.minecraftforge.network.simple.SimpleChannel; +import team.lodestar.lodestone.helpers.ColorHelper; +import team.lodestar.lodestone.setup.LodestoneParticleRegistry; +import team.lodestar.lodestone.systems.easing.Easing; +import team.lodestar.lodestone.systems.particle.SimpleParticleOptions; +import team.lodestar.lodestone.systems.particle.builder.WorldParticleBuilder; +import team.lodestar.lodestone.systems.particle.data.GenericParticleData; +import team.lodestar.lodestone.systems.particle.data.color.ColorParticleData; +import team.lodestar.lodestone.systems.particle.data.spin.SpinParticleData; +import team.lodestar.lodestone.systems.particle.render_types.LodestoneWorldParticleRenderType; import java.awt.*; import java.util.List; -import java.util.*; -import java.util.function.*; +import java.util.function.Supplier; public class BlightTransformItemParticlePacket extends SpiritBasedParticleEffectPacket { @@ -45,12 +44,12 @@ public void execute(Supplier context) { for (int i = 0; i < 3; i++) { float multiplier = Mth.nextFloat(rand, 0.4f, 1f); float timeMultiplier = Mth.nextFloat(rand, 0.9f, 1.4f); - Color color = new Color((int)(31*multiplier), (int)(19*multiplier), (int)(31*multiplier)); + Color color = new Color((int) (31 * multiplier), (int) (19 * multiplier), (int) (31 * multiplier)); boolean spinDirection = rand.nextBoolean(); WorldParticleBuilder.create(LodestoneParticleRegistry.WISP_PARTICLE) .setTransparencyData(GenericParticleData.create(0.4f, 1f, 0).build()) - .setLifetime((int) (45*timeMultiplier)) - .setSpinData(SpinParticleData.create(0.2f*(spinDirection ? 1 : -1)).build()) + .setLifetime((int) (45 * timeMultiplier)) + .setSpinData(SpinParticleData.create(0.2f * (spinDirection ? 1 : -1)).build()) .setScaleData(GenericParticleData.create(0.15f, 0.2f, 0).setEasing(Easing.QUINTIC_OUT, Easing.SINE_IN).build()) .setColorData(ColorParticleData.create(color, color).build()) .enableNoClip() @@ -62,8 +61,8 @@ public void execute(Supplier context) { WorldParticleBuilder.create(LodestoneParticleRegistry.SMOKE_PARTICLE) .setTransparencyData(GenericParticleData.create(0.35f, 0.55f, 0).build()) - .setLifetime((int) (50*timeMultiplier)) - .setSpinData(SpinParticleData.create(0.1f*(spinDirection ? 1 : -1)).build()) + .setLifetime((int) (50 * timeMultiplier)) + .setSpinData(SpinParticleData.create(0.1f * (spinDirection ? 1 : -1)).build()) .setScaleData(GenericParticleData.create(0.35f, 0.4f, 0).setEasing(Easing.QUINTIC_OUT, Easing.SINE_IN).build()) .setColorData(ColorParticleData.create(color, color).build()) .setRandomOffset(0.2f, 0) @@ -73,11 +72,11 @@ public void execute(Supplier context) { .setRenderType(LodestoneWorldParticleRenderType.LUMITRANSPARENT) .repeat(level, posX, posY, posZ, 3); - color = new Color((int)(80*multiplier), (int)(40*multiplier), (int)(80*multiplier)); + color = new Color((int) (80 * multiplier), (int) (40 * multiplier), (int) (80 * multiplier)); WorldParticleBuilder.create(LodestoneParticleRegistry.SMOKE_PARTICLE) .setTransparencyData(GenericParticleData.create(0.1f, 0.15f, 0).build()) - .setLifetime((int) (50*timeMultiplier)) - .setSpinData(SpinParticleData.create(0.1f*(spinDirection ? 1 : -1)).build()) + .setLifetime((int) (50 * timeMultiplier)) + .setSpinData(SpinParticleData.create(0.1f * (spinDirection ? 1 : -1)).build()) .setScaleData(GenericParticleData.create(0.35f, 0.4f, 0).setEasing(Easing.QUINTIC_OUT, Easing.SINE_IN).build()) .setColorData(ColorParticleData.create(color, color).build()) .setRandomOffset(0.2f, 0) diff --git a/src/main/java/com/sammy/malum/common/packets/particle/curiosities/nitrate/EthericNitrateParticlePacket.java b/src/main/java/com/sammy/malum/common/packets/particle/curiosities/nitrate/EthericNitrateParticlePacket.java index 24efb6154..7d97ced2b 100644 --- a/src/main/java/com/sammy/malum/common/packets/particle/curiosities/nitrate/EthericNitrateParticlePacket.java +++ b/src/main/java/com/sammy/malum/common/packets/particle/curiosities/nitrate/EthericNitrateParticlePacket.java @@ -1,23 +1,23 @@ package com.sammy.malum.common.packets.particle.curiosities.nitrate; -import com.sammy.malum.common.entity.nitrate.*; -import com.sammy.malum.common.packets.particle.base.*; -import net.minecraft.client.*; -import net.minecraft.network.*; -import net.minecraft.world.level.*; -import net.minecraftforge.api.distmarker.*; -import net.minecraftforge.network.*; -import net.minecraftforge.network.simple.*; -import team.lodestar.lodestone.setup.*; -import team.lodestar.lodestone.systems.easing.*; -import team.lodestar.lodestone.systems.particle.*; -import team.lodestar.lodestone.systems.particle.builder.*; -import team.lodestar.lodestone.systems.particle.data.*; -import team.lodestar.lodestone.systems.particle.data.color.*; -import team.lodestar.lodestone.systems.particle.data.spin.*; +import com.sammy.malum.common.entity.nitrate.EthericNitrateEntity; +import com.sammy.malum.common.packets.particle.base.PositionBasedParticleEffectPacket; +import net.minecraft.client.Minecraft; +import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.world.level.Level; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; +import net.minecraftforge.network.NetworkEvent; +import net.minecraftforge.network.simple.SimpleChannel; +import team.lodestar.lodestone.setup.LodestoneParticleRegistry; +import team.lodestar.lodestone.systems.easing.Easing; +import team.lodestar.lodestone.systems.particle.SimpleParticleOptions; +import team.lodestar.lodestone.systems.particle.builder.WorldParticleBuilder; +import team.lodestar.lodestone.systems.particle.data.GenericParticleData; +import team.lodestar.lodestone.systems.particle.data.color.ColorParticleData; +import team.lodestar.lodestone.systems.particle.data.spin.SpinParticleData; -import java.util.*; -import java.util.function.*; +import java.util.function.Supplier; public class EthericNitrateParticlePacket extends PositionBasedParticleEffectPacket { @@ -40,7 +40,7 @@ public void execute(Supplier context) { for (int i = 0; i < 3; i++) { int spinDirection = (rand.nextBoolean() ? 1 : -1); int spinOffset = rand.nextInt(360); - float motionMultiplier = (float) (1+Math.pow(rand.nextFloat(), 2)); + float motionMultiplier = (float) (1 + Math.pow(rand.nextFloat(), 2)); WorldParticleBuilder.create(LodestoneParticleRegistry.TWINKLE_PARTICLE) .setTransparencyData(GenericParticleData.create(0.2f, 0.8f, 0).build()) .setLifetime(20) @@ -52,19 +52,19 @@ public void execute(Supplier context) { .setGravityStrength(1.1f) .addMotion(0, 0.3f + rand.nextFloat() * 0.15f * motionMultiplier, 0) .disableNoClip() - .setRandomMotion(0.2f*motionMultiplier, 0.25f*motionMultiplier) + .setRandomMotion(0.2f * motionMultiplier, 0.25f * motionMultiplier) .setDiscardFunction(SimpleParticleOptions.ParticleDiscardFunctionType.ENDING_CURVE_INVISIBLE) .repeat(level, posX, posY, posZ, 4); } int spinOffset = rand.nextInt(360); for (int i = 0; i < 3; i++) { int spinDirection = (rand.nextBoolean() ? 1 : -1); - float scaleMultiplier = (float) (1+Math.pow(rand.nextFloat(), 2)*0.5f); + float scaleMultiplier = (float) (1 + Math.pow(rand.nextFloat(), 2) * 0.5f); WorldParticleBuilder.create(LodestoneParticleRegistry.SPARKLE_PARTICLE) .setTransparencyData(GenericParticleData.create(0.35f, 0.07f, 0).setEasing(Easing.SINE_IN, Easing.CIRC_IN).build()) .setLifetime(9) .setSpinData(SpinParticleData.create((0.125f + rand.nextFloat() * 0.075f) * spinDirection).setSpinOffset(spinOffset).build()) - .setScaleData(GenericParticleData.create(0.8f*scaleMultiplier, 0.5f, 0).setEasing(Easing.EXPO_OUT, Easing.SINE_IN).build()) + .setScaleData(GenericParticleData.create(0.8f * scaleMultiplier, 0.5f, 0).setEasing(Easing.EXPO_OUT, Easing.SINE_IN).build()) .setColorData(ColorParticleData.create(EthericNitrateEntity.FIRST_COLOR.brighter(), EthericNitrateEntity.SECOND_COLOR.darker()).build()) .setRandomOffset(0.6f) .enableNoClip() diff --git a/src/main/java/com/sammy/malum/common/packets/particle/curiosities/nitrate/VividNitrateBounceParticlePacket.java b/src/main/java/com/sammy/malum/common/packets/particle/curiosities/nitrate/VividNitrateBounceParticlePacket.java index 535efe246..459d11b58 100644 --- a/src/main/java/com/sammy/malum/common/packets/particle/curiosities/nitrate/VividNitrateBounceParticlePacket.java +++ b/src/main/java/com/sammy/malum/common/packets/particle/curiosities/nitrate/VividNitrateBounceParticlePacket.java @@ -12,13 +12,12 @@ import team.lodestar.lodestone.setup.LodestoneParticleRegistry; import team.lodestar.lodestone.systems.easing.Easing; import team.lodestar.lodestone.systems.particle.SimpleParticleOptions; -import team.lodestar.lodestone.systems.particle.builder.*; -import team.lodestar.lodestone.systems.particle.data.color.ColorParticleData; +import team.lodestar.lodestone.systems.particle.builder.WorldParticleBuilder; import team.lodestar.lodestone.systems.particle.data.GenericParticleData; +import team.lodestar.lodestone.systems.particle.data.color.ColorParticleData; import team.lodestar.lodestone.systems.particle.data.spin.SpinParticleData; import java.awt.*; -import java.util.Random; import java.util.function.Supplier; public class VividNitrateBounceParticlePacket extends ColorBasedParticleEffectPacket { @@ -35,7 +34,7 @@ public void execute(Supplier context) { for (int i = 0; i < 4; i++) { int spinDirection = (rand.nextBoolean() ? 1 : -1); int spinOffset = rand.nextInt(360); - float motionMultiplier = (float) (1+Math.pow(rand.nextFloat(), 2)); + float motionMultiplier = (float) (1 + Math.pow(rand.nextFloat(), 2)); WorldParticleBuilder.create(LodestoneParticleRegistry.TWINKLE_PARTICLE) .setTransparencyData(GenericParticleData.create(0.2f, 0.8f, 0).build()) .setSpinData(SpinParticleData.create(0.9f * spinDirection, 0).setSpinOffset(spinOffset).setCoefficient(1.25f).setEasing(Easing.CUBIC_IN).build()) @@ -47,19 +46,19 @@ public void execute(Supplier context) { .setGravityStrength(1.1f) .addMotion(0, 0.3f + rand.nextFloat() * 0.15f * motionMultiplier, 0) .disableNoClip() - .setRandomMotion(0.2f*motionMultiplier, 0.25f*motionMultiplier) + .setRandomMotion(0.2f * motionMultiplier, 0.25f * motionMultiplier) .setDiscardFunction(SimpleParticleOptions.ParticleDiscardFunctionType.ENDING_CURVE_INVISIBLE) .repeat(level, posX, posY, posZ, 4); } int spinOffset = rand.nextInt(360); for (int i = 0; i < 4; i++) { int spinDirection = (rand.nextBoolean() ? 1 : -1); - float scaleMultiplier = (float) (1+Math.pow(rand.nextFloat(), 2)); + float scaleMultiplier = (float) (1 + Math.pow(rand.nextFloat(), 2)); WorldParticleBuilder.create(LodestoneParticleRegistry.SPARKLE_PARTICLE) .setTransparencyData(GenericParticleData.create(0.4f, 0.08f, 0).setEasing(Easing.SINE_IN, Easing.CIRC_IN_OUT).build()) .setLifetime(15) .setSpinData(SpinParticleData.create((0.125f + rand.nextFloat() * 0.075f) * spinDirection).setSpinOffset(spinOffset).build()) - .setScaleData(GenericParticleData.create(1.4f*scaleMultiplier, 0.6f, 0).setEasing(Easing.EXPO_OUT, Easing.SINE_IN).build()) + .setScaleData(GenericParticleData.create(1.4f * scaleMultiplier, 0.6f, 0).setEasing(Easing.EXPO_OUT, Easing.SINE_IN).build()) .setColorData(ColorParticleData.create(color.brighter(), color.darker()).build()) .setRandomOffset(0.6f) .enableNoClip() diff --git a/src/main/java/com/sammy/malum/common/packets/particle/curiosities/rite/AerialBlockFallRiteEffectPacket.java b/src/main/java/com/sammy/malum/common/packets/particle/curiosities/rite/AerialBlockFallRiteEffectPacket.java index 0583b8ec2..f8f900204 100644 --- a/src/main/java/com/sammy/malum/common/packets/particle/curiosities/rite/AerialBlockFallRiteEffectPacket.java +++ b/src/main/java/com/sammy/malum/common/packets/particle/curiosities/rite/AerialBlockFallRiteEffectPacket.java @@ -1,25 +1,24 @@ package com.sammy.malum.common.packets.particle.curiosities.rite; -import com.sammy.malum.common.packets.particle.base.color.*; -import net.minecraft.client.*; -import net.minecraft.core.*; -import net.minecraft.network.*; -import net.minecraft.world.level.*; -import net.minecraftforge.api.distmarker.*; -import net.minecraftforge.network.*; -import net.minecraftforge.network.simple.*; -import team.lodestar.lodestone.helpers.*; -import team.lodestar.lodestone.setup.*; -import team.lodestar.lodestone.systems.easing.*; -import team.lodestar.lodestone.systems.particle.*; -import team.lodestar.lodestone.systems.particle.builder.*; -import team.lodestar.lodestone.systems.particle.data.*; -import team.lodestar.lodestone.systems.particle.data.color.*; -import team.lodestar.lodestone.systems.particle.data.spin.*; +import com.sammy.malum.common.packets.particle.base.color.ColorBasedBlockParticleEffectPacket; +import net.minecraft.client.Minecraft; +import net.minecraft.core.BlockPos; +import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.world.level.Level; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; +import net.minecraftforge.network.NetworkEvent; +import net.minecraftforge.network.simple.SimpleChannel; +import team.lodestar.lodestone.helpers.ColorHelper; +import team.lodestar.lodestone.setup.LodestoneParticleRegistry; +import team.lodestar.lodestone.systems.easing.Easing; +import team.lodestar.lodestone.systems.particle.builder.WorldParticleBuilder; +import team.lodestar.lodestone.systems.particle.data.GenericParticleData; +import team.lodestar.lodestone.systems.particle.data.color.ColorParticleData; +import team.lodestar.lodestone.systems.particle.data.spin.SpinParticleData; import java.awt.*; -import java.util.*; -import java.util.function.*; +import java.util.function.Supplier; public class AerialBlockFallRiteEffectPacket extends ColorBasedBlockParticleEffectPacket { public AerialBlockFallRiteEffectPacket(Color color, BlockPos pos) { diff --git a/src/main/java/com/sammy/malum/common/packets/particle/curiosities/rite/InfernalAccelerationRiteEffectPacket.java b/src/main/java/com/sammy/malum/common/packets/particle/curiosities/rite/InfernalAccelerationRiteEffectPacket.java index 57ac1eded..9df3e7094 100644 --- a/src/main/java/com/sammy/malum/common/packets/particle/curiosities/rite/InfernalAccelerationRiteEffectPacket.java +++ b/src/main/java/com/sammy/malum/common/packets/particle/curiosities/rite/InfernalAccelerationRiteEffectPacket.java @@ -1,26 +1,26 @@ package com.sammy.malum.common.packets.particle.curiosities.rite; -import com.sammy.malum.common.packets.particle.base.spirit.*; -import com.sammy.malum.core.systems.spirit.*; -import net.minecraft.client.*; -import net.minecraft.core.*; -import net.minecraft.network.*; -import net.minecraft.world.level.*; -import net.minecraftforge.api.distmarker.*; -import net.minecraftforge.network.*; -import net.minecraftforge.network.simple.*; -import team.lodestar.lodestone.setup.*; -import team.lodestar.lodestone.systems.easing.*; -import team.lodestar.lodestone.systems.particle.*; -import team.lodestar.lodestone.systems.particle.builder.*; -import team.lodestar.lodestone.systems.particle.data.*; -import team.lodestar.lodestone.systems.particle.data.color.*; -import team.lodestar.lodestone.systems.particle.data.spin.*; +import com.sammy.malum.common.packets.particle.base.spirit.SpiritBasedBlockParticleEffectPacket; +import com.sammy.malum.core.systems.spirit.MalumSpiritType; +import net.minecraft.client.Minecraft; +import net.minecraft.core.BlockPos; +import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.world.level.Level; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; +import net.minecraftforge.network.NetworkEvent; +import net.minecraftforge.network.simple.SimpleChannel; +import team.lodestar.lodestone.setup.LodestoneParticleRegistry; +import team.lodestar.lodestone.systems.easing.Easing; +import team.lodestar.lodestone.systems.particle.SimpleParticleOptions; +import team.lodestar.lodestone.systems.particle.builder.WorldParticleBuilder; +import team.lodestar.lodestone.systems.particle.data.GenericParticleData; +import team.lodestar.lodestone.systems.particle.data.color.ColorParticleData; +import team.lodestar.lodestone.systems.particle.data.spin.SpinParticleData; import java.awt.*; import java.util.List; -import java.util.*; -import java.util.function.*; +import java.util.function.Supplier; public class InfernalAccelerationRiteEffectPacket extends SpiritBasedBlockParticleEffectPacket { diff --git a/src/main/java/com/sammy/malum/common/packets/particle/curiosities/rite/InfernalExtinguishRiteEffectPacket.java b/src/main/java/com/sammy/malum/common/packets/particle/curiosities/rite/InfernalExtinguishRiteEffectPacket.java index 60e82df62..fc0c7fc26 100644 --- a/src/main/java/com/sammy/malum/common/packets/particle/curiosities/rite/InfernalExtinguishRiteEffectPacket.java +++ b/src/main/java/com/sammy/malum/common/packets/particle/curiosities/rite/InfernalExtinguishRiteEffectPacket.java @@ -1,21 +1,20 @@ package com.sammy.malum.common.packets.particle.curiosities.rite; -import com.sammy.malum.common.packets.particle.curiosities.rite.generic.*; -import net.minecraft.client.*; -import net.minecraft.core.*; -import net.minecraft.core.particles.*; -import net.minecraft.network.*; -import net.minecraft.world.level.*; -import net.minecraftforge.api.distmarker.*; -import net.minecraftforge.network.*; -import net.minecraftforge.network.simple.*; +import com.sammy.malum.common.packets.particle.curiosities.rite.generic.BlockSparkleParticlePacket; +import net.minecraft.client.Minecraft; +import net.minecraft.core.BlockPos; +import net.minecraft.core.particles.ParticleTypes; +import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.world.level.Level; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; +import net.minecraftforge.network.NetworkEvent; +import net.minecraftforge.network.simple.SimpleChannel; import java.awt.*; -import java.util.*; -import java.util.function.*; +import java.util.function.Supplier; -public class InfernalExtinguishRiteEffectPacket extends BlockSparkleParticlePacket -{ +public class InfernalExtinguishRiteEffectPacket extends BlockSparkleParticlePacket { public InfernalExtinguishRiteEffectPacket(Color color, BlockPos pos) { super(color, pos); } @@ -26,7 +25,7 @@ public void execute(Supplier context) { Level level = Minecraft.getInstance().level; var rand = level.random; - for(int i = 0; i < 8; ++i) { + for (int i = 0; i < 8; ++i) { double d0 = pos.getX() + rand.nextFloat(); double d1 = pos.getY() + rand.nextFloat(); double d2 = pos.getZ() + rand.nextFloat(); diff --git a/src/main/java/com/sammy/malum/common/packets/particle/curiosities/rite/SacredMistRiteEffectPacket.java b/src/main/java/com/sammy/malum/common/packets/particle/curiosities/rite/SacredMistRiteEffectPacket.java index 9ff457080..244d3fa71 100644 --- a/src/main/java/com/sammy/malum/common/packets/particle/curiosities/rite/SacredMistRiteEffectPacket.java +++ b/src/main/java/com/sammy/malum/common/packets/particle/curiosities/rite/SacredMistRiteEffectPacket.java @@ -1,25 +1,26 @@ package com.sammy.malum.common.packets.particle.curiosities.rite; -import com.sammy.malum.common.packets.particle.base.spirit.*; -import com.sammy.malum.core.systems.spirit.*; -import net.minecraft.client.*; -import net.minecraft.core.*; -import net.minecraft.network.*; -import net.minecraft.world.level.*; -import net.minecraftforge.api.distmarker.*; -import net.minecraftforge.network.*; -import net.minecraftforge.network.simple.*; -import team.lodestar.lodestone.setup.*; -import team.lodestar.lodestone.systems.easing.*; -import team.lodestar.lodestone.systems.particle.*; -import team.lodestar.lodestone.systems.particle.builder.*; -import team.lodestar.lodestone.systems.particle.data.*; -import team.lodestar.lodestone.systems.particle.data.color.*; -import team.lodestar.lodestone.systems.particle.data.spin.*; +import com.sammy.malum.common.packets.particle.base.spirit.SpiritBasedBlockParticleEffectPacket; +import com.sammy.malum.core.systems.spirit.MalumSpiritType; +import net.minecraft.client.Minecraft; +import net.minecraft.core.BlockPos; +import net.minecraft.core.Direction; +import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.world.level.Level; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; +import net.minecraftforge.network.NetworkEvent; +import net.minecraftforge.network.simple.SimpleChannel; +import team.lodestar.lodestone.setup.LodestoneParticleRegistry; +import team.lodestar.lodestone.systems.easing.Easing; +import team.lodestar.lodestone.systems.particle.builder.WorldParticleBuilder; +import team.lodestar.lodestone.systems.particle.data.GenericParticleData; +import team.lodestar.lodestone.systems.particle.data.color.ColorParticleData; +import team.lodestar.lodestone.systems.particle.data.spin.SpinParticleData; import java.awt.*; import java.util.List; -import java.util.function.*; +import java.util.function.Supplier; public class SacredMistRiteEffectPacket extends SpiritBasedBlockParticleEffectPacket { public SacredMistRiteEffectPacket(List spirits, BlockPos pos) { diff --git a/src/main/java/com/sammy/malum/common/packets/particle/curiosities/rite/SpiritRiteActivationEffectPacket.java b/src/main/java/com/sammy/malum/common/packets/particle/curiosities/rite/SpiritRiteActivationEffectPacket.java index 3330bd644..d6f57b335 100644 --- a/src/main/java/com/sammy/malum/common/packets/particle/curiosities/rite/SpiritRiteActivationEffectPacket.java +++ b/src/main/java/com/sammy/malum/common/packets/particle/curiosities/rite/SpiritRiteActivationEffectPacket.java @@ -1,29 +1,31 @@ package com.sammy.malum.common.packets.particle.curiosities.rite; -import com.sammy.malum.common.packets.particle.base.spirit.*; -import com.sammy.malum.core.systems.spirit.*; -import net.minecraft.client.*; -import net.minecraft.core.*; -import net.minecraft.network.*; -import net.minecraft.world.level.*; -import net.minecraftforge.api.distmarker.*; -import net.minecraftforge.network.*; -import net.minecraftforge.network.simple.*; -import team.lodestar.lodestone.setup.*; -import team.lodestar.lodestone.systems.easing.*; -import team.lodestar.lodestone.systems.particle.*; -import team.lodestar.lodestone.systems.particle.builder.*; -import team.lodestar.lodestone.systems.particle.data.*; -import team.lodestar.lodestone.systems.particle.data.color.*; -import team.lodestar.lodestone.systems.particle.data.spin.*; +import com.sammy.malum.common.packets.particle.base.spirit.SpiritBasedBlockParticleEffectPacket; +import com.sammy.malum.core.systems.spirit.MalumSpiritType; +import net.minecraft.client.Minecraft; +import net.minecraft.core.BlockPos; +import net.minecraft.core.Direction; +import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.world.level.Level; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; +import net.minecraftforge.network.NetworkEvent; +import net.minecraftforge.network.simple.SimpleChannel; +import team.lodestar.lodestone.setup.LodestoneParticleRegistry; +import team.lodestar.lodestone.systems.easing.Easing; +import team.lodestar.lodestone.systems.particle.builder.WorldParticleBuilder; +import team.lodestar.lodestone.systems.particle.data.GenericParticleData; +import team.lodestar.lodestone.systems.particle.data.color.ColorParticleData; +import team.lodestar.lodestone.systems.particle.data.spin.SpinParticleData; import java.awt.*; import java.util.List; -import java.util.function.*; +import java.util.function.Supplier; public class SpiritRiteActivationEffectPacket extends SpiritBasedBlockParticleEffectPacket { private int height = 0; + public SpiritRiteActivationEffectPacket(List spirits, BlockPos pos) { super(spirits, pos); } diff --git a/src/main/java/com/sammy/malum/common/packets/particle/curiosities/rite/generic/BlockSparkleParticlePacket.java b/src/main/java/com/sammy/malum/common/packets/particle/curiosities/rite/generic/BlockSparkleParticlePacket.java index 0b6728031..f084c9a6f 100644 --- a/src/main/java/com/sammy/malum/common/packets/particle/curiosities/rite/generic/BlockSparkleParticlePacket.java +++ b/src/main/java/com/sammy/malum/common/packets/particle/curiosities/rite/generic/BlockSparkleParticlePacket.java @@ -1,25 +1,25 @@ package com.sammy.malum.common.packets.particle.curiosities.rite.generic; -import com.sammy.malum.common.packets.particle.base.color.*; -import net.minecraft.client.*; -import net.minecraft.core.*; -import net.minecraft.network.*; -import net.minecraft.world.level.*; -import net.minecraftforge.api.distmarker.*; -import net.minecraftforge.network.*; -import net.minecraftforge.network.simple.*; -import team.lodestar.lodestone.helpers.*; -import team.lodestar.lodestone.setup.*; -import team.lodestar.lodestone.systems.easing.*; -import team.lodestar.lodestone.systems.particle.*; -import team.lodestar.lodestone.systems.particle.builder.*; -import team.lodestar.lodestone.systems.particle.data.*; -import team.lodestar.lodestone.systems.particle.data.color.*; -import team.lodestar.lodestone.systems.particle.data.spin.*; +import com.sammy.malum.common.packets.particle.base.color.ColorBasedBlockParticleEffectPacket; +import net.minecraft.client.Minecraft; +import net.minecraft.core.BlockPos; +import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.world.level.Level; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; +import net.minecraftforge.network.NetworkEvent; +import net.minecraftforge.network.simple.SimpleChannel; +import team.lodestar.lodestone.helpers.ColorHelper; +import team.lodestar.lodestone.setup.LodestoneParticleRegistry; +import team.lodestar.lodestone.systems.easing.Easing; +import team.lodestar.lodestone.systems.particle.SimpleParticleOptions; +import team.lodestar.lodestone.systems.particle.builder.WorldParticleBuilder; +import team.lodestar.lodestone.systems.particle.data.GenericParticleData; +import team.lodestar.lodestone.systems.particle.data.color.ColorParticleData; +import team.lodestar.lodestone.systems.particle.data.spin.SpinParticleData; import java.awt.*; -import java.util.*; -import java.util.function.*; +import java.util.function.Supplier; public class BlockSparkleParticlePacket extends ColorBasedBlockParticleEffectPacket { diff --git a/src/main/java/com/sammy/malum/common/packets/particle/curiosities/rite/generic/MajorEntityEffectParticlePacket.java b/src/main/java/com/sammy/malum/common/packets/particle/curiosities/rite/generic/MajorEntityEffectParticlePacket.java index c3110fd92..d9662b254 100644 --- a/src/main/java/com/sammy/malum/common/packets/particle/curiosities/rite/generic/MajorEntityEffectParticlePacket.java +++ b/src/main/java/com/sammy/malum/common/packets/particle/curiosities/rite/generic/MajorEntityEffectParticlePacket.java @@ -11,13 +11,12 @@ import team.lodestar.lodestone.helpers.ColorHelper; import team.lodestar.lodestone.setup.LodestoneParticleRegistry; import team.lodestar.lodestone.systems.easing.Easing; -import team.lodestar.lodestone.systems.particle.builder.*; -import team.lodestar.lodestone.systems.particle.data.color.ColorParticleData; +import team.lodestar.lodestone.systems.particle.builder.WorldParticleBuilder; import team.lodestar.lodestone.systems.particle.data.GenericParticleData; +import team.lodestar.lodestone.systems.particle.data.color.ColorParticleData; import team.lodestar.lodestone.systems.particle.data.spin.SpinParticleData; import java.awt.*; -import java.util.Random; import java.util.function.Supplier; public class MajorEntityEffectParticlePacket extends ColorBasedParticleEffectPacket { diff --git a/src/main/java/com/sammy/malum/common/packets/particle/curiosities/rite/generic/TotemPoleActivationEffectPacket.java b/src/main/java/com/sammy/malum/common/packets/particle/curiosities/rite/generic/TotemPoleActivationEffectPacket.java index d7e105e9c..9c48aff66 100644 --- a/src/main/java/com/sammy/malum/common/packets/particle/curiosities/rite/generic/TotemPoleActivationEffectPacket.java +++ b/src/main/java/com/sammy/malum/common/packets/particle/curiosities/rite/generic/TotemPoleActivationEffectPacket.java @@ -1,23 +1,25 @@ package com.sammy.malum.common.packets.particle.curiosities.rite.generic; -import com.sammy.malum.common.packets.particle.base.color.*; -import net.minecraft.client.*; -import net.minecraft.core.*; -import net.minecraft.network.*; -import net.minecraft.world.level.*; -import net.minecraftforge.api.distmarker.*; -import net.minecraftforge.network.*; -import net.minecraftforge.network.simple.*; -import team.lodestar.lodestone.setup.*; -import team.lodestar.lodestone.systems.easing.*; -import team.lodestar.lodestone.systems.particle.*; -import team.lodestar.lodestone.systems.particle.builder.*; -import team.lodestar.lodestone.systems.particle.data.*; -import team.lodestar.lodestone.systems.particle.data.color.*; -import team.lodestar.lodestone.systems.particle.data.spin.*; +import com.sammy.malum.common.packets.particle.base.color.ColorBasedBlockParticleEffectPacket; +import net.minecraft.client.Minecraft; +import net.minecraft.core.BlockPos; +import net.minecraft.core.Direction; +import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.world.level.Level; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; +import net.minecraftforge.network.NetworkEvent; +import net.minecraftforge.network.simple.SimpleChannel; +import team.lodestar.lodestone.setup.LodestoneParticleRegistry; +import team.lodestar.lodestone.systems.easing.Easing; +import team.lodestar.lodestone.systems.particle.SimpleParticleOptions; +import team.lodestar.lodestone.systems.particle.builder.WorldParticleBuilder; +import team.lodestar.lodestone.systems.particle.data.GenericParticleData; +import team.lodestar.lodestone.systems.particle.data.color.ColorParticleData; +import team.lodestar.lodestone.systems.particle.data.spin.SpinParticleData; import java.awt.*; -import java.util.function.*; +import java.util.function.Supplier; public class TotemPoleActivationEffectPacket extends ColorBasedBlockParticleEffectPacket { diff --git a/src/main/java/com/sammy/malum/common/recipe/FavorOfTheVoidRecipe.java b/src/main/java/com/sammy/malum/common/recipe/FavorOfTheVoidRecipe.java index 94b6eb948..7c46e03d1 100644 --- a/src/main/java/com/sammy/malum/common/recipe/FavorOfTheVoidRecipe.java +++ b/src/main/java/com/sammy/malum/common/recipe/FavorOfTheVoidRecipe.java @@ -1,21 +1,19 @@ package com.sammy.malum.common.recipe; -import com.google.gson.JsonArray; import com.google.gson.JsonObject; -import com.sammy.malum.core.systems.recipe.SpiritWithCount; import com.sammy.malum.registry.common.recipe.RecipeSerializerRegistry; import com.sammy.malum.registry.common.recipe.RecipeTypeRegistry; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.crafting.*; +import net.minecraft.world.item.crafting.Ingredient; +import net.minecraft.world.item.crafting.RecipeSerializer; +import net.minecraft.world.item.crafting.RecipeType; import net.minecraft.world.level.Level; import net.minecraftforge.common.crafting.CraftingHelper; import team.lodestar.lodestone.systems.recipe.ILodestoneRecipe; -import team.lodestar.lodestone.systems.recipe.IngredientWithCount; import javax.annotation.Nullable; -import java.util.ArrayList; import java.util.List; import java.util.function.Predicate; diff --git a/src/main/java/com/sammy/malum/common/recipe/SpiritFocusingRecipe.java b/src/main/java/com/sammy/malum/common/recipe/SpiritFocusingRecipe.java index 4360beebf..ad6a50a67 100644 --- a/src/main/java/com/sammy/malum/common/recipe/SpiritFocusingRecipe.java +++ b/src/main/java/com/sammy/malum/common/recipe/SpiritFocusingRecipe.java @@ -2,9 +2,9 @@ import com.google.gson.JsonArray; import com.google.gson.JsonObject; +import com.sammy.malum.core.systems.recipe.SpiritWithCount; import com.sammy.malum.registry.common.recipe.RecipeSerializerRegistry; import com.sammy.malum.registry.common.recipe.RecipeTypeRegistry; -import com.sammy.malum.core.systems.recipe.SpiritWithCount; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.ItemStack; @@ -13,7 +13,6 @@ import net.minecraft.world.item.crafting.RecipeType; import net.minecraft.world.level.Level; import net.minecraftforge.common.crafting.CraftingHelper; -import net.minecraftforge.registries.ForgeRegistryEntry; import team.lodestar.lodestone.systems.recipe.ILodestoneRecipe; import javax.annotation.Nullable; diff --git a/src/main/java/com/sammy/malum/common/recipe/SpiritInfusionRecipe.java b/src/main/java/com/sammy/malum/common/recipe/SpiritInfusionRecipe.java index ec1259e47..327e2201a 100644 --- a/src/main/java/com/sammy/malum/common/recipe/SpiritInfusionRecipe.java +++ b/src/main/java/com/sammy/malum/common/recipe/SpiritInfusionRecipe.java @@ -2,9 +2,9 @@ import com.google.gson.JsonArray; import com.google.gson.JsonObject; +import com.sammy.malum.core.systems.recipe.SpiritWithCount; import com.sammy.malum.registry.common.recipe.RecipeSerializerRegistry; import com.sammy.malum.registry.common.recipe.RecipeTypeRegistry; -import com.sammy.malum.core.systems.recipe.SpiritWithCount; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.ItemStack; diff --git a/src/main/java/com/sammy/malum/common/recipe/SpiritRepairRecipe.java b/src/main/java/com/sammy/malum/common/recipe/SpiritRepairRecipe.java index 54f1990be..ef7b32c4d 100644 --- a/src/main/java/com/sammy/malum/common/recipe/SpiritRepairRecipe.java +++ b/src/main/java/com/sammy/malum/common/recipe/SpiritRepairRecipe.java @@ -3,9 +3,9 @@ import com.google.gson.JsonArray; import com.google.gson.JsonElement; import com.google.gson.JsonObject; +import com.sammy.malum.core.systems.recipe.SpiritWithCount; import com.sammy.malum.registry.common.recipe.RecipeSerializerRegistry; import com.sammy.malum.registry.common.recipe.RecipeTypeRegistry; -import com.sammy.malum.core.systems.recipe.SpiritWithCount; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.Item; diff --git a/src/main/java/com/sammy/malum/common/recipe/vanilla/INodeSmeltingRecipe.java b/src/main/java/com/sammy/malum/common/recipe/vanilla/INodeSmeltingRecipe.java index 6f3f1cc36..96b1bb039 100644 --- a/src/main/java/com/sammy/malum/common/recipe/vanilla/INodeSmeltingRecipe.java +++ b/src/main/java/com/sammy/malum/common/recipe/vanilla/INodeSmeltingRecipe.java @@ -3,5 +3,5 @@ import team.lodestar.lodestone.systems.recipe.IngredientWithCount; public interface INodeSmeltingRecipe { - public IngredientWithCount getOutput(); + IngredientWithCount getOutput(); } diff --git a/src/main/java/com/sammy/malum/common/recipe/vanilla/MetalNodeBlastingRecipe.java b/src/main/java/com/sammy/malum/common/recipe/vanilla/MetalNodeBlastingRecipe.java index f141a44cb..11f1cfa89 100644 --- a/src/main/java/com/sammy/malum/common/recipe/vanilla/MetalNodeBlastingRecipe.java +++ b/src/main/java/com/sammy/malum/common/recipe/vanilla/MetalNodeBlastingRecipe.java @@ -2,7 +2,6 @@ import com.sammy.malum.registry.common.recipe.RecipeSerializerRegistry; import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.Container; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.crafting.BlastingRecipe; import net.minecraft.world.item.crafting.CookingBookCategory; diff --git a/src/main/java/com/sammy/malum/common/recipe/vanilla/MetalNodeSmeltingRecipe.java b/src/main/java/com/sammy/malum/common/recipe/vanilla/MetalNodeSmeltingRecipe.java index 9a183af48..8aa21a0d2 100644 --- a/src/main/java/com/sammy/malum/common/recipe/vanilla/MetalNodeSmeltingRecipe.java +++ b/src/main/java/com/sammy/malum/common/recipe/vanilla/MetalNodeSmeltingRecipe.java @@ -2,7 +2,6 @@ import com.sammy.malum.registry.common.recipe.RecipeSerializerRegistry; import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.Container; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.crafting.CookingBookCategory; import net.minecraft.world.item.crafting.Ingredient; @@ -21,8 +20,7 @@ public MetalNodeSmeltingRecipe(ResourceLocation pId, String pGroup, Ingredient p } @Override - public boolean isSpecial() - { + public boolean isSpecial() { return false; } diff --git a/src/main/java/com/sammy/malum/common/recipe/vanilla/NodeCookingSerializer.java b/src/main/java/com/sammy/malum/common/recipe/vanilla/NodeCookingSerializer.java index 9568db245..25658a68d 100644 --- a/src/main/java/com/sammy/malum/common/recipe/vanilla/NodeCookingSerializer.java +++ b/src/main/java/com/sammy/malum/common/recipe/vanilla/NodeCookingSerializer.java @@ -11,43 +11,43 @@ import team.lodestar.lodestone.systems.recipe.IngredientWithCount; public class NodeCookingSerializer implements RecipeSerializer { - public final int defaultCookingTime; - public final NodeBaker factory; - - public NodeCookingSerializer(NodeBaker pFactory, int pDefaultCookingTime) { - this.defaultCookingTime = pDefaultCookingTime; - this.factory = pFactory; - } - - public T fromJson(ResourceLocation pRecipeId, JsonObject pJson) { - String s = GsonHelper.getAsString(pJson, "group", ""); - JsonElement jsonelement = (GsonHelper.isArrayNode(pJson, "ingredient") ? GsonHelper.getAsJsonArray(pJson, "ingredient") : GsonHelper.getAsJsonObject(pJson, "ingredient")); - Ingredient ingredient = Ingredient.fromJson(jsonelement); - IngredientWithCount result = IngredientWithCount.deserialize(pJson.getAsJsonObject("result")); - - float f = GsonHelper.getAsFloat(pJson, "experience", 0.0F); - int i = GsonHelper.getAsInt(pJson, "cookingtime", this.defaultCookingTime); - return this.factory.create(pRecipeId, s, ingredient, result, f, i); - } - - public T fromNetwork(ResourceLocation pRecipeId, FriendlyByteBuf pBuffer) { - String s = pBuffer.readUtf(); - Ingredient ingredient = Ingredient.fromNetwork(pBuffer); - IngredientWithCount result = IngredientWithCount.read(pBuffer); - float f = pBuffer.readFloat(); - int i = pBuffer.readVarInt(); - return this.factory.create(pRecipeId, s, ingredient, result, f, i); - } - - public void toNetwork(FriendlyByteBuf pBuffer, T pRecipe) { - pBuffer.writeUtf(pRecipe.getGroup()); - pRecipe.getIngredients().get(0).toNetwork(pBuffer); - ((INodeSmeltingRecipe)pRecipe).getOutput().write(pBuffer); - pBuffer.writeFloat(pRecipe.getExperience()); - pBuffer.writeVarInt(pRecipe.getCookingTime()); - } - - public interface NodeBaker { - T create(ResourceLocation pId, String pGroup, Ingredient pIngredient, IngredientWithCount pResult, float pExperience, int pCookingTime); - } + public final int defaultCookingTime; + public final NodeBaker factory; + + public NodeCookingSerializer(NodeBaker pFactory, int pDefaultCookingTime) { + this.defaultCookingTime = pDefaultCookingTime; + this.factory = pFactory; + } + + public T fromJson(ResourceLocation pRecipeId, JsonObject pJson) { + String s = GsonHelper.getAsString(pJson, "group", ""); + JsonElement jsonelement = (GsonHelper.isArrayNode(pJson, "ingredient") ? GsonHelper.getAsJsonArray(pJson, "ingredient") : GsonHelper.getAsJsonObject(pJson, "ingredient")); + Ingredient ingredient = Ingredient.fromJson(jsonelement); + IngredientWithCount result = IngredientWithCount.deserialize(pJson.getAsJsonObject("result")); + + float f = GsonHelper.getAsFloat(pJson, "experience", 0.0F); + int i = GsonHelper.getAsInt(pJson, "cookingtime", this.defaultCookingTime); + return this.factory.create(pRecipeId, s, ingredient, result, f, i); + } + + public T fromNetwork(ResourceLocation pRecipeId, FriendlyByteBuf pBuffer) { + String s = pBuffer.readUtf(); + Ingredient ingredient = Ingredient.fromNetwork(pBuffer); + IngredientWithCount result = IngredientWithCount.read(pBuffer); + float f = pBuffer.readFloat(); + int i = pBuffer.readVarInt(); + return this.factory.create(pRecipeId, s, ingredient, result, f, i); + } + + public void toNetwork(FriendlyByteBuf pBuffer, T pRecipe) { + pBuffer.writeUtf(pRecipe.getGroup()); + pRecipe.getIngredients().get(0).toNetwork(pBuffer); + ((INodeSmeltingRecipe) pRecipe).getOutput().write(pBuffer); + pBuffer.writeFloat(pRecipe.getExperience()); + pBuffer.writeVarInt(pRecipe.getCookingTime()); + } + + public interface NodeBaker { + T create(ResourceLocation pId, String pGroup, Ingredient pIngredient, IngredientWithCount pResult, float pExperience, int pCookingTime); + } } \ No newline at end of file diff --git a/src/main/java/com/sammy/malum/common/sound/BlightedSoundType.java b/src/main/java/com/sammy/malum/common/sound/BlightedSoundType.java index 19c7cca6b..318bf5593 100644 --- a/src/main/java/com/sammy/malum/common/sound/BlightedSoundType.java +++ b/src/main/java/com/sammy/malum/common/sound/BlightedSoundType.java @@ -28,7 +28,7 @@ public void onPlayBreakSound(Level level, BlockPos pos) { @Override public void onPlayStepSound(Level level, BlockPos pos, BlockState state, SoundSource category) { - level.playSound(null, pos.getX(), pos.getY(), pos.getZ(), SoundRegistry.MINOR_BLIGHT_MOTIF.get(), category, getVolume() * 0.15F, getPitch()* 1.6F); + level.playSound(null, pos.getX(), pos.getY(), pos.getZ(), SoundRegistry.MINOR_BLIGHT_MOTIF.get(), category, getVolume() * 0.15F, getPitch() * 1.6F); } @Override @@ -39,7 +39,7 @@ public void onPlayPlaceSound(Level level, BlockPos pos, Player player) { @Override @OnlyIn(value = Dist.CLIENT) public void onPlayHitSound(BlockPos pos) { - Minecraft.getInstance().getSoundManager().play(new SimpleSoundInstance(SoundRegistry.MINOR_BLIGHT_MOTIF.get(), SoundSource.BLOCKS, (getVolume() + 1.0F) / 8.0F, getPitch() * 2F, MalumMod.RANDOM,pos)); + Minecraft.getInstance().getSoundManager().play(new SimpleSoundInstance(SoundRegistry.MINOR_BLIGHT_MOTIF.get(), SoundSource.BLOCKS, (getVolume() + 1.0F) / 8.0F, getPitch() * 2F, MalumMod.RANDOM, pos)); } @Override diff --git a/src/main/java/com/sammy/malum/common/sound/QuartzClusterSoundType.java b/src/main/java/com/sammy/malum/common/sound/QuartzClusterSoundType.java index 4c2bae404..2f064ec17 100644 --- a/src/main/java/com/sammy/malum/common/sound/QuartzClusterSoundType.java +++ b/src/main/java/com/sammy/malum/common/sound/QuartzClusterSoundType.java @@ -28,7 +28,7 @@ public void onPlayBreakSound(Level level, BlockPos pos) { @Override public void onPlayStepSound(Level level, BlockPos pos, BlockState state, SoundSource category) { - level.playSound(null, pos.getX(), pos.getY(), pos.getZ(), SoundEvents.AMETHYST_CLUSTER_STEP, category, getVolume() * 0.65F, getPitch()* 1.3F); + level.playSound(null, pos.getX(), pos.getY(), pos.getZ(), SoundEvents.AMETHYST_CLUSTER_STEP, category, getVolume() * 0.65F, getPitch() * 1.3F); } @Override diff --git a/src/main/java/com/sammy/malum/common/spiritrite/AerialRiteType.java b/src/main/java/com/sammy/malum/common/spiritrite/AerialRiteType.java index d588d8767..90ab1fb4d 100644 --- a/src/main/java/com/sammy/malum/common/spiritrite/AerialRiteType.java +++ b/src/main/java/com/sammy/malum/common/spiritrite/AerialRiteType.java @@ -1,9 +1,9 @@ package com.sammy.malum.common.spiritrite; -import com.sammy.malum.registry.common.MobEffectRegistry; import com.sammy.malum.core.systems.rites.AuraRiteEffect; import com.sammy.malum.core.systems.rites.MalumRiteEffect; import com.sammy.malum.core.systems.rites.MalumRiteType; +import com.sammy.malum.registry.common.MobEffectRegistry; import net.minecraft.world.entity.LivingEntity; import static com.sammy.malum.registry.common.SpiritTypeRegistry.AERIAL_SPIRIT; diff --git a/src/main/java/com/sammy/malum/common/spiritrite/AqueousRiteType.java b/src/main/java/com/sammy/malum/common/spiritrite/AqueousRiteType.java index 54d82a94a..c2e28106c 100644 --- a/src/main/java/com/sammy/malum/common/spiritrite/AqueousRiteType.java +++ b/src/main/java/com/sammy/malum/common/spiritrite/AqueousRiteType.java @@ -1,9 +1,9 @@ package com.sammy.malum.common.spiritrite; -import com.sammy.malum.registry.common.MobEffectRegistry; import com.sammy.malum.core.systems.rites.AuraRiteEffect; import com.sammy.malum.core.systems.rites.MalumRiteEffect; import com.sammy.malum.core.systems.rites.MalumRiteType; +import com.sammy.malum.registry.common.MobEffectRegistry; import net.minecraft.world.entity.LivingEntity; import static com.sammy.malum.registry.common.SpiritTypeRegistry.AQUEOUS_SPIRIT; diff --git a/src/main/java/com/sammy/malum/common/spiritrite/ArcaneRiteType.java b/src/main/java/com/sammy/malum/common/spiritrite/ArcaneRiteType.java index 2901823b9..cdcc5564a 100644 --- a/src/main/java/com/sammy/malum/common/spiritrite/ArcaneRiteType.java +++ b/src/main/java/com/sammy/malum/common/spiritrite/ArcaneRiteType.java @@ -1,11 +1,11 @@ package com.sammy.malum.common.spiritrite; import com.sammy.malum.common.block.blight.BlightedSoilBlock; -import com.sammy.malum.common.block.storage.IMalumSpecialItemAccessPoint; import com.sammy.malum.common.block.curiosities.totem.TotemBaseBlockEntity; -import com.sammy.malum.common.packets.particle.curiosities.rite.generic.BlockSparkleParticlePacket; +import com.sammy.malum.common.block.storage.IMalumSpecialItemAccessPoint; import com.sammy.malum.common.packets.particle.curiosities.blight.BlightMistParticlePacket; import com.sammy.malum.common.packets.particle.curiosities.blight.BlightTransformItemParticlePacket; +import com.sammy.malum.common.packets.particle.curiosities.rite.generic.BlockSparkleParticlePacket; import com.sammy.malum.common.recipe.SpiritTransmutationRecipe; import com.sammy.malum.common.worldevent.TotemCreatedBlightEvent; import com.sammy.malum.core.systems.rites.MalumRiteEffect; @@ -28,8 +28,8 @@ import java.util.List; import java.util.Set; -import static com.sammy.malum.registry.common.SpiritTypeRegistry.ARCANE_SPIRIT; import static com.sammy.malum.registry.common.PacketRegistry.MALUM_CHANNEL; +import static com.sammy.malum.registry.common.SpiritTypeRegistry.ARCANE_SPIRIT; public class ArcaneRiteType extends MalumRiteType { public ArcaneRiteType() { @@ -58,7 +58,7 @@ public MalumRiteEffect getCorruptedEffect() { @Override public int getRiteEffectRadius() { - return (BASE_RADIUS * 2)+1; + return (BASE_RADIUS * 2) + 1; } @Override diff --git a/src/main/java/com/sammy/malum/common/spiritrite/EarthenRiteType.java b/src/main/java/com/sammy/malum/common/spiritrite/EarthenRiteType.java index d9fe8bbc0..d5f937e75 100644 --- a/src/main/java/com/sammy/malum/common/spiritrite/EarthenRiteType.java +++ b/src/main/java/com/sammy/malum/common/spiritrite/EarthenRiteType.java @@ -1,9 +1,9 @@ package com.sammy.malum.common.spiritrite; -import com.sammy.malum.registry.common.MobEffectRegistry; import com.sammy.malum.core.systems.rites.AuraRiteEffect; import com.sammy.malum.core.systems.rites.MalumRiteEffect; import com.sammy.malum.core.systems.rites.MalumRiteType; +import com.sammy.malum.registry.common.MobEffectRegistry; import net.minecraft.world.entity.LivingEntity; import static com.sammy.malum.registry.common.SpiritTypeRegistry.ARCANE_SPIRIT; diff --git a/src/main/java/com/sammy/malum/common/spiritrite/InfernalRiteType.java b/src/main/java/com/sammy/malum/common/spiritrite/InfernalRiteType.java index 75ae3846b..e4553f952 100644 --- a/src/main/java/com/sammy/malum/common/spiritrite/InfernalRiteType.java +++ b/src/main/java/com/sammy/malum/common/spiritrite/InfernalRiteType.java @@ -1,14 +1,14 @@ package com.sammy.malum.common.spiritrite; import com.sammy.malum.common.block.curiosities.totem.TotemBaseBlockEntity; -import com.sammy.malum.common.packets.particle.curiosities.rite.generic.BlockSparkleParticlePacket; import com.sammy.malum.common.packets.particle.curiosities.rite.InfernalExtinguishRiteEffectPacket; +import com.sammy.malum.common.packets.particle.curiosities.rite.generic.BlockSparkleParticlePacket; import com.sammy.malum.common.packets.particle.curiosities.rite.generic.MajorEntityEffectParticlePacket; -import com.sammy.malum.registry.common.block.BlockTagRegistry; -import com.sammy.malum.registry.common.MobEffectRegistry; import com.sammy.malum.core.systems.rites.AuraRiteEffect; import com.sammy.malum.core.systems.rites.MalumRiteEffect; import com.sammy.malum.core.systems.rites.MalumRiteType; +import com.sammy.malum.registry.common.MobEffectRegistry; +import com.sammy.malum.registry.common.block.BlockTagRegistry; import net.minecraft.sounds.SoundEvents; import net.minecraft.sounds.SoundSource; import net.minecraft.world.effect.MobEffectInstance; @@ -19,9 +19,9 @@ import net.minecraft.world.level.block.state.BlockState; import net.minecraftforge.network.PacketDistributor; +import static com.sammy.malum.registry.common.PacketRegistry.MALUM_CHANNEL; import static com.sammy.malum.registry.common.SpiritTypeRegistry.ARCANE_SPIRIT; import static com.sammy.malum.registry.common.SpiritTypeRegistry.INFERNAL_SPIRIT; -import static com.sammy.malum.registry.common.PacketRegistry.MALUM_CHANNEL; public class InfernalRiteType extends MalumRiteType { public InfernalRiteType() { diff --git a/src/main/java/com/sammy/malum/common/spiritrite/SacredRiteType.java b/src/main/java/com/sammy/malum/common/spiritrite/SacredRiteType.java index 0761ef030..2f3635f2e 100644 --- a/src/main/java/com/sammy/malum/common/spiritrite/SacredRiteType.java +++ b/src/main/java/com/sammy/malum/common/spiritrite/SacredRiteType.java @@ -1,21 +1,28 @@ package com.sammy.malum.common.spiritrite; -import com.sammy.malum.common.block.curiosities.totem.*; -import com.sammy.malum.core.systems.rites.*; -import com.sammy.malum.registry.common.*; -import com.sammy.malum.visual_effects.networked.data.*; -import net.minecraft.*; -import net.minecraft.core.*; -import net.minecraft.world.entity.*; -import net.minecraft.world.entity.ai.goal.*; -import net.minecraft.world.entity.animal.*; -import net.minecraft.world.entity.monster.*; -import net.minecraft.world.level.block.*; +import com.sammy.malum.common.block.curiosities.totem.TotemBaseBlockEntity; +import com.sammy.malum.core.systems.rites.EntityAffectingRiteEffect; +import com.sammy.malum.core.systems.rites.MalumRiteEffect; +import com.sammy.malum.core.systems.rites.MalumRiteType; +import com.sammy.malum.registry.common.ParticleEffectTypeRegistry; +import com.sammy.malum.visual_effects.networked.data.ColorEffectData; +import net.minecraft.Util; +import net.minecraft.core.BlockPos; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.entity.ai.goal.EatBlockGoal; +import net.minecraft.world.entity.animal.Animal; +import net.minecraft.world.entity.animal.Bee; +import net.minecraft.world.entity.animal.Chicken; +import net.minecraft.world.entity.animal.Sheep; +import net.minecraft.world.entity.monster.Monster; +import net.minecraft.world.level.block.Blocks; -import java.util.*; +import java.util.HashMap; +import java.util.Map; -import static com.sammy.malum.registry.common.SpiritTypeRegistry.*; -import static net.minecraft.world.entity.ai.goal.EatBlockGoal.*; +import static com.sammy.malum.registry.common.SpiritTypeRegistry.ARCANE_SPIRIT; +import static com.sammy.malum.registry.common.SpiritTypeRegistry.SACRED_SPIRIT; +import static net.minecraft.world.entity.ai.goal.EatBlockGoal.IS_TALL_GRASS; public class SacredRiteType extends MalumRiteType { diff --git a/src/main/java/com/sammy/malum/common/spiritrite/WickedRiteType.java b/src/main/java/com/sammy/malum/common/spiritrite/WickedRiteType.java index 7d2745f65..4171e6ace 100644 --- a/src/main/java/com/sammy/malum/common/spiritrite/WickedRiteType.java +++ b/src/main/java/com/sammy/malum/common/spiritrite/WickedRiteType.java @@ -1,30 +1,35 @@ package com.sammy.malum.common.spiritrite; -import com.sammy.malum.common.block.curiosities.totem.*; +import com.sammy.malum.common.block.curiosities.totem.TotemBaseBlockEntity; +import com.sammy.malum.core.systems.rites.EntityAffectingRiteEffect; +import com.sammy.malum.core.systems.rites.MalumRiteEffect; +import com.sammy.malum.core.systems.rites.MalumRiteType; +import com.sammy.malum.registry.common.DamageSourceRegistry; +import com.sammy.malum.registry.common.ParticleEffectTypeRegistry; +import com.sammy.malum.visual_effects.networked.data.ColorEffectData; +import net.minecraft.world.effect.MobEffectInstance; +import net.minecraft.world.effect.MobEffects; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.entity.monster.Monster; +import net.minecraft.world.entity.player.Player; -import com.sammy.malum.core.systems.rites.*; -import com.sammy.malum.registry.common.*; -import com.sammy.malum.visual_effects.networked.data.*; -import net.minecraft.world.effect.*; -import net.minecraft.world.entity.*; -import net.minecraft.world.entity.monster.*; -import net.minecraft.world.entity.player.*; - -import static com.sammy.malum.registry.common.SpiritTypeRegistry.*; +import static com.sammy.malum.registry.common.SpiritTypeRegistry.ARCANE_SPIRIT; +import static com.sammy.malum.registry.common.SpiritTypeRegistry.WICKED_SPIRIT; public class WickedRiteType extends MalumRiteType { public WickedRiteType() { super("wicked_rite", ARCANE_SPIRIT, WICKED_SPIRIT, WICKED_SPIRIT); } + @Override public MalumRiteEffect getNaturalRiteEffect() { return new EntityAffectingRiteEffect() { @Override public void riteEffect(TotemBaseBlockEntity totemBase) { getNearbyEntities(totemBase, LivingEntity.class, e -> !(e instanceof Player)).forEach(e -> { - if (e.getHealth() > 2.5f && !e.isInvulnerableTo(DamageSourceRegistry.VOODOO)) { + if (e.getHealth() > 2.5f && !e.isInvulnerableTo(DamageSourceRegistry.create(e.level(), DamageSourceRegistry.VOODOO))) { ParticleEffectTypeRegistry.HEXING_SMOKE.createEntityEffect(e, new ColorEffectData(WICKED_SPIRIT.getPrimaryColor())); - e.hurt(DamageSourceRegistry.VOODOO, 2); + e.hurt(DamageSourceRegistry.create(e.level(), DamageSourceRegistry.VOODOO), 2); } }); } diff --git a/src/main/java/com/sammy/malum/common/spiritrite/greater/EldritchAerialRiteType.java b/src/main/java/com/sammy/malum/common/spiritrite/greater/EldritchAerialRiteType.java index 4b9ba38a2..c3332dcb2 100644 --- a/src/main/java/com/sammy/malum/common/spiritrite/greater/EldritchAerialRiteType.java +++ b/src/main/java/com/sammy/malum/common/spiritrite/greater/EldritchAerialRiteType.java @@ -1,29 +1,38 @@ package com.sammy.malum.common.spiritrite.greater; -import com.sammy.malum.common.block.curiosities.totem.*; -import com.sammy.malum.common.packets.particle.curiosities.rite.*; +import com.sammy.malum.common.block.curiosities.totem.TotemBaseBlockEntity; +import com.sammy.malum.common.packets.particle.curiosities.rite.AerialBlockFallRiteEffectPacket; +import com.sammy.malum.core.systems.rites.BlockAffectingRiteEffect; +import com.sammy.malum.core.systems.rites.EntityAffectingRiteEffect; +import com.sammy.malum.core.systems.rites.MalumRiteEffect; +import com.sammy.malum.core.systems.rites.MalumRiteType; +import com.sammy.malum.registry.common.ParticleEffectTypeRegistry; +import com.sammy.malum.registry.common.SoundRegistry; +import com.sammy.malum.registry.common.block.BlockTagRegistry; +import com.sammy.malum.visual_effects.networked.data.ColorEffectData; +import net.minecraft.core.BlockPos; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.server.level.ServerLevel; +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.sounds.SoundSource; +import net.minecraft.stats.ServerStatsCounter; +import net.minecraft.stats.Stat; +import net.minecraft.stats.Stats; +import net.minecraft.tags.BlockTags; +import net.minecraft.world.entity.item.FallingBlockEntity; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.Items; +import net.minecraft.world.item.enchantment.Enchantments; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.FallingBlock; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraftforge.network.PacketDistributor; -import com.sammy.malum.core.systems.rites.*; -import com.sammy.malum.registry.common.*; -import com.sammy.malum.registry.common.block.*; -import com.sammy.malum.visual_effects.networked.data.*; -import net.minecraft.core.*; -import net.minecraft.resources.*; -import net.minecraft.server.level.*; -import net.minecraft.sounds.*; -import net.minecraft.stats.*; -import net.minecraft.tags.*; -import net.minecraft.world.entity.item.*; -import net.minecraft.world.item.*; -import net.minecraft.world.item.enchantment.*; -import net.minecraft.world.level.*; -import net.minecraft.world.level.block.*; -import net.minecraft.world.level.block.state.*; -import net.minecraftforge.network.*; +import java.util.List; -import java.util.*; - -import static com.sammy.malum.registry.common.PacketRegistry.*; +import static com.sammy.malum.registry.common.PacketRegistry.MALUM_CHANNEL; import static com.sammy.malum.registry.common.SpiritTypeRegistry.*; public class EldritchAerialRiteType extends MalumRiteType { @@ -64,7 +73,7 @@ public void riteEffect(TotemBaseBlockEntity totemBase) { ServerStatsCounter stats = p.getStats(); Stat sleepStat = Stats.CUSTOM.get(Stats.TIME_SINCE_REST); int value = stats.getValue(sleepStat); - stats.setValue(p, sleepStat, Math.max(0, value-500)); + stats.setValue(p, sleepStat, Math.max(0, value - 500)); ParticleEffectTypeRegistry.HEXING_SMOKE.createEntityEffect(p, new ColorEffectData(AERIAL_SPIRIT)); }); } diff --git a/src/main/java/com/sammy/malum/common/spiritrite/greater/EldritchAqueousRiteType.java b/src/main/java/com/sammy/malum/common/spiritrite/greater/EldritchAqueousRiteType.java index 261a525d9..0d7692261 100644 --- a/src/main/java/com/sammy/malum/common/spiritrite/greater/EldritchAqueousRiteType.java +++ b/src/main/java/com/sammy/malum/common/spiritrite/greater/EldritchAqueousRiteType.java @@ -1,18 +1,23 @@ package com.sammy.malum.common.spiritrite.greater; -import com.sammy.malum.common.block.curiosities.totem.*; +import com.sammy.malum.common.block.curiosities.totem.TotemBaseBlockEntity; +import com.sammy.malum.core.systems.rites.BlockAffectingRiteEffect; +import com.sammy.malum.core.systems.rites.EntityAffectingRiteEffect; +import com.sammy.malum.core.systems.rites.MalumRiteEffect; +import com.sammy.malum.core.systems.rites.MalumRiteType; +import com.sammy.malum.registry.common.ParticleEffectTypeRegistry; +import com.sammy.malum.visual_effects.networked.data.ColorEffectData; +import com.sammy.malum.visual_effects.networked.data.PositionEffectData; +import net.minecraft.core.BlockPos; +import net.minecraft.server.level.ServerLevel; +import net.minecraft.world.entity.monster.Drowned; +import net.minecraft.world.entity.monster.Zombie; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.PointedDripstoneBlock; +import net.minecraft.world.level.block.state.BlockState; -import com.sammy.malum.core.systems.rites.*; -import com.sammy.malum.registry.common.*; -import com.sammy.malum.visual_effects.networked.data.*; -import net.minecraft.core.*; -import net.minecraft.server.level.*; -import net.minecraft.world.entity.monster.*; -import net.minecraft.world.level.*; -import net.minecraft.world.level.block.*; -import net.minecraft.world.level.block.state.*; - -import java.util.*; +import java.util.Set; import static com.sammy.malum.registry.common.SpiritTypeRegistry.*; @@ -28,7 +33,7 @@ public MalumRiteEffect getNaturalRiteEffect() { @Override public void riteEffect(TotemBaseBlockEntity totemBase) { Level level = totemBase.getLevel(); - getNearbyBlocks(totemBase, PointedDripstoneBlock.class, getRiteEffectRadius()*4).forEach(p -> { + getNearbyBlocks(totemBase, PointedDripstoneBlock.class, getRiteEffectRadius() * 4).forEach(p -> { if (level.random.nextFloat() < 0.1f) { for (int i = 0; i < 4 + level.random.nextInt(2); i++) { level.getBlockState(p).randomTick((ServerLevel) level, p, level.random); diff --git a/src/main/java/com/sammy/malum/common/spiritrite/greater/EldritchEarthenRiteType.java b/src/main/java/com/sammy/malum/common/spiritrite/greater/EldritchEarthenRiteType.java index 7b10adec9..60a0674cd 100644 --- a/src/main/java/com/sammy/malum/common/spiritrite/greater/EldritchEarthenRiteType.java +++ b/src/main/java/com/sammy/malum/common/spiritrite/greater/EldritchEarthenRiteType.java @@ -17,8 +17,8 @@ import java.util.Set; -import static com.sammy.malum.registry.common.SpiritTypeRegistry.*; import static com.sammy.malum.registry.common.PacketRegistry.MALUM_CHANNEL; +import static com.sammy.malum.registry.common.SpiritTypeRegistry.*; public class EldritchEarthenRiteType extends MalumRiteType { public EldritchEarthenRiteType() { @@ -38,7 +38,7 @@ public void riteEffect(TotemBaseBlockEntity totemBase) { if (canBreak) { level.destroyBlock(p, true); if (state.getBlock() instanceof InfestedBlock infestedBlock && level instanceof ServerLevel serverLevel) { - infestedBlock.spawnAfterBreak(state, serverLevel, p, ItemStack.EMPTY); + infestedBlock.spawnAfterBreak(state, serverLevel, p, ItemStack.EMPTY, true); } MALUM_CHANNEL.send(PacketDistributor.TRACKING_CHUNK.with(() -> level.getChunkAt(p)), new BlockSparkleParticlePacket(EARTHEN_SPIRIT.getPrimaryColor(), p)); } diff --git a/src/main/java/com/sammy/malum/common/spiritrite/greater/EldritchInfernalRiteType.java b/src/main/java/com/sammy/malum/common/spiritrite/greater/EldritchInfernalRiteType.java index 66ec28ec6..bef345801 100644 --- a/src/main/java/com/sammy/malum/common/spiritrite/greater/EldritchInfernalRiteType.java +++ b/src/main/java/com/sammy/malum/common/spiritrite/greater/EldritchInfernalRiteType.java @@ -1,21 +1,26 @@ package com.sammy.malum.common.spiritrite.greater; -import com.sammy.malum.common.block.curiosities.totem.*; -import com.sammy.malum.common.packets.particle.curiosities.rite.generic.*; -import com.sammy.malum.core.systems.rites.*; -import net.minecraft.core.*; -import net.minecraft.world.*; -import net.minecraft.world.item.*; -import net.minecraft.world.item.crafting.*; -import net.minecraft.world.level.*; -import net.minecraft.world.level.block.*; -import net.minecraft.world.level.block.entity.*; -import net.minecraft.world.level.block.state.*; -import net.minecraftforge.network.*; +import com.sammy.malum.common.block.curiosities.totem.TotemBaseBlockEntity; +import com.sammy.malum.common.packets.particle.curiosities.rite.generic.BlockSparkleParticlePacket; +import com.sammy.malum.core.systems.rites.BlockAffectingRiteEffect; +import com.sammy.malum.core.systems.rites.MalumRiteEffect; +import com.sammy.malum.core.systems.rites.MalumRiteType; +import net.minecraft.core.BlockPos; +import net.minecraft.world.SimpleContainer; +import net.minecraft.world.item.BlockItem; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.crafting.RecipeType; +import net.minecraft.world.item.crafting.SmeltingRecipe; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.AbstractFurnaceBlock; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.entity.AbstractFurnaceBlockEntity; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraftforge.network.PacketDistributor; -import java.util.*; +import java.util.Optional; -import static com.sammy.malum.registry.common.PacketRegistry.*; +import static com.sammy.malum.registry.common.PacketRegistry.MALUM_CHANNEL; import static com.sammy.malum.registry.common.SpiritTypeRegistry.*; public class EldritchInfernalRiteType extends MalumRiteType { @@ -58,8 +63,8 @@ public void riteEffect(TotemBaseBlockEntity totemBase) { getNearbyBlocks(totemBase, AbstractFurnaceBlock.class).map(b -> level.getBlockEntity(b)).filter(e -> e instanceof AbstractFurnaceBlockEntity).map(e -> (AbstractFurnaceBlockEntity) e).forEach(f -> { if (f.isLit()) { BlockPos blockPos = f.getBlockPos(); - // MALUM_CHANNEL.send(PacketDistributor.TRACKING_CHUNK.with(() -> level().getChunkAt(blockPos)), new InfernalAccelerationRiteEffectPacket(INFERNAL_SPIRIT.getPrimaryColor(), blockPos)); - f.cookingProgress = Math.min(f.cookingProgress + 5, f.cookingTotalTime-1); + // MALUM_CHANNEL.send(PacketDistributor.TRACKING_CHUNK.with(() -> level().getChunkAt(blockPos)), new InfernalAccelerationRiteEffectPacket(INFERNAL_SPIRIT.getPrimaryColor(), blockPos)); + f.cookingProgress = Math.min(f.cookingProgress + 5, f.cookingTotalTime - 1); } }); } @@ -71,7 +76,7 @@ public int getRiteEffectTickRate() { @Override public int getRiteEffectRadius() { - return BASE_RADIUS*2; + return BASE_RADIUS * 2; } }; } diff --git a/src/main/java/com/sammy/malum/common/spiritrite/greater/EldritchSacredRiteType.java b/src/main/java/com/sammy/malum/common/spiritrite/greater/EldritchSacredRiteType.java index ab14016c6..9c0294009 100644 --- a/src/main/java/com/sammy/malum/common/spiritrite/greater/EldritchSacredRiteType.java +++ b/src/main/java/com/sammy/malum/common/spiritrite/greater/EldritchSacredRiteType.java @@ -1,20 +1,23 @@ package com.sammy.malum.common.spiritrite.greater; -import com.sammy.malum.common.block.curiosities.totem.*; -import com.sammy.malum.common.packets.particle.curiosities.rite.generic.*; -import com.sammy.malum.core.systems.rites.*; -import net.minecraft.core.*; -import net.minecraft.server.level.*; -import net.minecraft.world.entity.animal.*; -import net.minecraft.world.level.*; -import net.minecraft.world.level.block.*; -import net.minecraft.world.level.block.state.*; -import net.minecraftforge.network.*; +import com.sammy.malum.common.block.curiosities.totem.TotemBaseBlockEntity; +import com.sammy.malum.common.packets.particle.curiosities.rite.generic.MajorEntityEffectParticlePacket; +import com.sammy.malum.core.systems.rites.BlockAffectingRiteEffect; +import com.sammy.malum.core.systems.rites.EntityAffectingRiteEffect; +import com.sammy.malum.core.systems.rites.MalumRiteEffect; +import com.sammy.malum.core.systems.rites.MalumRiteType; +import net.minecraft.core.BlockPos; +import net.minecraft.server.level.ServerLevel; +import net.minecraft.world.entity.animal.Animal; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.BonemealableBlock; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraftforge.network.PacketDistributor; -import java.util.*; -import java.util.stream.*; +import java.util.List; +import java.util.stream.Collectors; -import static com.sammy.malum.registry.common.PacketRegistry.*; +import static com.sammy.malum.registry.common.PacketRegistry.MALUM_CHANNEL; import static com.sammy.malum.registry.common.SpiritTypeRegistry.*; public class EldritchSacredRiteType extends MalumRiteType { @@ -47,7 +50,7 @@ public void riteEffect(TotemBaseBlockEntity totemBase) { state.randomTick((ServerLevel) level, p, level.random); } BlockPos particlePos = state.canOcclude() ? p : p.below(); - // MALUM_CHANNEL.send(PacketDistributor.TRACKING_CHUNK.with(() -> level().getChunkAt(pos)), new SacredMistRiteEffectPacket(SACRED_SPIRIT, particlePos)); + // MALUM_CHANNEL.send(PacketDistributor.TRACKING_CHUNK.with(() -> level().getChunkAt(pos)), new SacredMistRiteEffectPacket(SACRED_SPIRIT, particlePos)); } }); } diff --git a/src/main/java/com/sammy/malum/common/spiritrite/greater/EldritchWickedRiteType.java b/src/main/java/com/sammy/malum/common/spiritrite/greater/EldritchWickedRiteType.java index d9b454799..fd2b97a63 100644 --- a/src/main/java/com/sammy/malum/common/spiritrite/greater/EldritchWickedRiteType.java +++ b/src/main/java/com/sammy/malum/common/spiritrite/greater/EldritchWickedRiteType.java @@ -28,9 +28,9 @@ public MalumRiteEffect getNaturalRiteEffect() { @Override public void riteEffect(TotemBaseBlockEntity totemBase) { getNearbyEntities(totemBase, LivingEntity.class, e -> !(e instanceof Player)).forEach(e -> { - if (e.getHealth() <= 2.5f && !e.isInvulnerableTo(DamageSourceRegistry.VOODOO)) { - MALUM_CHANNEL.send(PacketDistributor.TRACKING_ENTITY.with(() -> e), new MajorEntityEffectParticlePacket(getEffectSpirit().getPrimaryColor(), e.getX(), e.getY()+ e.getBbHeight() / 2f, e.getZ())); - e.hurt(DamageSourceRegistry.VOODOO, 10f); + if (e.getHealth() <= 2.5f && !e.isInvulnerableTo(DamageSourceRegistry.create(e.level(), DamageSourceRegistry.VOODOO))) { + MALUM_CHANNEL.send(PacketDistributor.TRACKING_ENTITY.with(() -> e), new MajorEntityEffectParticlePacket(getEffectSpirit().getPrimaryColor(), e.getX(), e.getY() + e.getBbHeight() / 2f, e.getZ())); + e.hurt(DamageSourceRegistry.create(e.level(), DamageSourceRegistry.VOODOO), 10f); } }); } @@ -42,14 +42,14 @@ public MalumRiteEffect getCorruptedEffect() { return new EntityAffectingRiteEffect() { @Override public void riteEffect(TotemBaseBlockEntity totemBase) { - final List nearbyEntities = getNearbyEntities(totemBase, Animal.class, e -> e.getAge() > 0 && !e.isInvulnerableTo(DamageSourceRegistry.VOODOO)).collect(Collectors.toList()); + final List nearbyEntities = getNearbyEntities(totemBase, Animal.class, e -> e.getAge() > 0 && !e.isInvulnerableTo(DamageSourceRegistry.create(e.level(), DamageSourceRegistry.VOODOO))).collect(Collectors.toList()); if (nearbyEntities.size() < 30) { return; } int maxKills = nearbyEntities.size() - 30; nearbyEntities.removeIf(Animal::isInLove); for (Animal entity : nearbyEntities) { - entity.hurt(DamageSourceRegistry.VOODOO, entity.getMaxHealth()); + entity.hurt(DamageSourceRegistry.create(entity.level(), DamageSourceRegistry.VOODOO), entity.getMaxHealth()); MALUM_CHANNEL.send(PacketDistributor.TRACKING_ENTITY.with(() -> entity), new MajorEntityEffectParticlePacket(WICKED_SPIRIT.getPrimaryColor(), entity.getX(), entity.getY() + entity.getBbHeight() / 2f, entity.getZ())); if (maxKills-- <= 0) { return; diff --git a/src/main/java/com/sammy/malum/common/worldevent/ActiveBlightEvent.java b/src/main/java/com/sammy/malum/common/worldevent/ActiveBlightEvent.java index 8b4adfe65..0498c8ec2 100644 --- a/src/main/java/com/sammy/malum/common/worldevent/ActiveBlightEvent.java +++ b/src/main/java/com/sammy/malum/common/worldevent/ActiveBlightEvent.java @@ -1,17 +1,19 @@ package com.sammy.malum.common.worldevent; -import com.sammy.malum.common.block.blight.*; -import com.sammy.malum.common.worldgen.*; -import com.sammy.malum.registry.common.*; -import com.sammy.malum.visual_effects.networked.data.*; -import net.minecraft.core.*; -import net.minecraft.server.level.*; -import net.minecraft.sounds.*; -import net.minecraft.world.level.*; -import team.lodestar.lodestone.systems.worldevent.*; -import team.lodestar.lodestone.systems.worldgen.*; +import com.sammy.malum.common.block.blight.BlightedSoilBlock; +import com.sammy.malum.common.worldgen.SoulwoodTreeFeature; +import com.sammy.malum.registry.common.ParticleEffectTypeRegistry; +import com.sammy.malum.registry.common.SoundRegistry; +import com.sammy.malum.registry.common.WorldEventTypes; +import com.sammy.malum.visual_effects.networked.data.PositionEffectData; +import net.minecraft.core.BlockPos; +import net.minecraft.server.level.ServerLevel; +import net.minecraft.sounds.SoundSource; +import net.minecraft.world.level.Level; +import team.lodestar.lodestone.systems.worldevent.WorldEventInstance; +import team.lodestar.lodestone.systems.worldgen.LodestoneBlockFiller; -import java.util.*; +import java.util.Map; public class ActiveBlightEvent extends WorldEventInstance { public int blightTimer, intensity, rate, times; @@ -44,7 +46,7 @@ public void tick(Level level) { blightTimer = rate; times--; createBlight((ServerLevel) level); - intensity+=2; + intensity += 2; } else { blightTimer--; } diff --git a/src/main/java/com/sammy/malum/common/worldevent/TotemCreatedBlightEvent.java b/src/main/java/com/sammy/malum/common/worldevent/TotemCreatedBlightEvent.java index 95737d192..9d32d4e85 100644 --- a/src/main/java/com/sammy/malum/common/worldevent/TotemCreatedBlightEvent.java +++ b/src/main/java/com/sammy/malum/common/worldevent/TotemCreatedBlightEvent.java @@ -2,8 +2,8 @@ import com.sammy.malum.common.block.curiosities.totem.TotemBaseBlockEntity; import com.sammy.malum.common.block.curiosities.totem.TotemPoleBlockEntity; -import com.sammy.malum.registry.common.SoundRegistry; import com.sammy.malum.core.systems.spirit.MalumSpiritType; +import com.sammy.malum.registry.common.SoundRegistry; import net.minecraft.core.BlockPos; import net.minecraft.sounds.SoundSource; import net.minecraft.world.level.Level; diff --git a/src/main/java/com/sammy/malum/common/worldgen/RareEarthsGeode.java b/src/main/java/com/sammy/malum/common/worldgen/RareEarthsGeode.java index 3d13cc2b1..9446e41bb 100644 --- a/src/main/java/com/sammy/malum/common/worldgen/RareEarthsGeode.java +++ b/src/main/java/com/sammy/malum/common/worldgen/RareEarthsGeode.java @@ -23,11 +23,11 @@ import java.util.ArrayList; import java.util.List; -import java.util.Random; import java.util.function.Predicate; public class RareEarthsGeode extends Feature { private static final Direction[] DIRECTIONS = Direction.values(); + public RareEarthsGeode(Codec config) { super(config); } @@ -45,7 +45,7 @@ public boolean place(FeaturePlaceContext context) { WorldgenRandom worldgenrandom = new WorldgenRandom(new LegacyRandomSource(worldgenlevel.getSeed())); NormalNoise normalnoise = NormalNoise.create(worldgenrandom, -4, 1.0D); List list1 = Lists.newLinkedList(); - double d0 = (double)k / (double)geodeconfiguration.outerWallDistance.getMaxValue(); + double d0 = (double) k / (double) geodeconfiguration.outerWallDistance.getMaxValue(); GeodeLayerSettings geodelayersettings = geodeconfiguration.geodeLayerSettings; GeodeBlockSettings geodeblocksettings = geodeconfiguration.geodeBlockSettings; GeodeCrackSettings geodecracksettings = geodeconfiguration.geodeCrackSettings; @@ -54,10 +54,10 @@ public boolean place(FeaturePlaceContext context) { double d3 = 1.0D / Math.sqrt(geodelayersettings.middleLayer + d0); double d4 = 1.0D / Math.sqrt(geodelayersettings.outerLayer + d0); double d5 = 1.0D / Math.sqrt(geodecracksettings.baseCrackSize + random.nextDouble() / 2.0D + (k > 3 ? d0 : 0.0D)); - boolean flag = (double)random.nextFloat() < geodecracksettings.generateCrackChance; + boolean flag = (double) random.nextFloat() < geodecracksettings.generateCrackChance; int l = 0; - for(int i1 = 0; i1 < k; ++i1) { + for (int i1 = 0; i1 < k; ++i1) { int j1 = geodeconfiguration.outerWallDistance.sample(random); int k1 = geodeconfiguration.outerWallDistance.sample(random); int l1 = geodeconfiguration.outerWallDistance.sample(random); @@ -99,24 +99,24 @@ public boolean place(FeaturePlaceContext context) { List potentialRareEarthPositions = new ArrayList<>(); Predicate predicate = isReplaceable(geodeconfiguration.geodeBlockSettings.cannotReplace); - for(BlockPos blockpos3 : BlockPos.betweenClosed(blockpos.offset(i, i, i), blockpos.offset(j, j, j))) { + for (BlockPos blockpos3 : BlockPos.betweenClosed(blockpos.offset(i, i, i), blockpos.offset(j, j, j))) { double d8 = normalnoise.getValue(blockpos3.getX(), blockpos3.getY(), blockpos3.getZ()) * geodeconfiguration.noiseMultiplier; double d6 = 0.0D; double d7 = 0.0D; - for(Pair pair : list) { - d6 += Mth.fastInvSqrt(blockpos3.distSqr(pair.getFirst()) + (double)pair.getSecond().intValue()) + d8; + for (Pair pair : list) { + d6 += Mth.fastInvSqrt(blockpos3.distSqr(pair.getFirst()) + (double) pair.getSecond().intValue()) + d8; } - for(BlockPos blockpos6 : list1) { - d7 += Mth.fastInvSqrt(blockpos3.distSqr(blockpos6) + (double)geodecracksettings.crackPointOffset) + d8; + for (BlockPos blockpos6 : list1) { + d7 += Mth.fastInvSqrt(blockpos3.distSqr(blockpos6) + (double) geodecracksettings.crackPointOffset) + d8; } if (!(d6 < d4)) { if (flag && d7 >= d5 && d6 < d1) { this.safeSetBlock(worldgenlevel, blockpos3, Blocks.AIR.defaultBlockState(), predicate); - for(Direction direction1 : DIRECTIONS) { + for (Direction direction1 : DIRECTIONS) { BlockPos blockpos2 = blockpos3.relative(direction1); FluidState fluidstate = worldgenlevel.getFluidState(blockpos2); if (!fluidstate.isEmpty()) { @@ -130,7 +130,7 @@ public boolean place(FeaturePlaceContext context) { potentialRareEarthPositions.add(new BlockPos(blockpos3)); } } else if (d6 >= d2) { - boolean flag1 = (double)random.nextFloat() < geodeconfiguration.useAlternateLayer0Chance; + boolean flag1 = (double) random.nextFloat() < geodeconfiguration.useAlternateLayer0Chance; if (flag1) { this.safeSetBlock(worldgenlevel, blockpos3, geodeblocksettings.alternateInnerLayerProvider.getState(random, blockpos3), predicate); } else { @@ -140,7 +140,7 @@ public boolean place(FeaturePlaceContext context) { if (predicate.test(state)) { potentialRareEarthPositions.add(new BlockPos(blockpos3)); } - if ((!geodeconfiguration.placementsRequireLayer0Alternate || flag1) && (double)random.nextFloat() < geodeconfiguration.usePotentialPlacementsChance) { + if ((!geodeconfiguration.placementsRequireLayer0Alternate || flag1) && (double) random.nextFloat() < geodeconfiguration.usePotentialPlacementsChance) { list2.add(blockpos3.immutable()); } } else if (d6 >= d3) { @@ -152,10 +152,10 @@ public boolean place(FeaturePlaceContext context) { } List list3 = geodeblocksettings.innerPlacements; - for(BlockPos blockpos4 : list2) { + for (BlockPos blockpos4 : list2) { BlockState blockstate1 = Util.getRandom(list3, random); - for(Direction direction : DIRECTIONS) { + for (Direction direction : DIRECTIONS) { if (blockstate1.hasProperty(BlockStateProperties.FACING)) { blockstate1 = blockstate1.setValue(BlockStateProperties.FACING, direction); } diff --git a/src/main/java/com/sammy/malum/common/worldgen/RunewoodTreeFeature.java b/src/main/java/com/sammy/malum/common/worldgen/RunewoodTreeFeature.java index 082b6bd6d..adb623927 100644 --- a/src/main/java/com/sammy/malum/common/worldgen/RunewoodTreeFeature.java +++ b/src/main/java/com/sammy/malum/common/worldgen/RunewoodTreeFeature.java @@ -20,7 +20,10 @@ import team.lodestar.lodestone.systems.worldgen.LodestoneBlockFiller; import team.lodestar.lodestone.systems.worldgen.LodestoneBlockFiller.BlockStateEntry; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Set; public class RunewoodTreeFeature extends Feature { public RunewoodTreeFeature() { diff --git a/src/main/java/com/sammy/malum/common/worldgen/SoulwoodTreeFeature.java b/src/main/java/com/sammy/malum/common/worldgen/SoulwoodTreeFeature.java index 9dfd9fe22..e920a2a71 100644 --- a/src/main/java/com/sammy/malum/common/worldgen/SoulwoodTreeFeature.java +++ b/src/main/java/com/sammy/malum/common/worldgen/SoulwoodTreeFeature.java @@ -25,7 +25,10 @@ import team.lodestar.lodestone.systems.worldgen.LodestoneBlockFiller; import team.lodestar.lodestone.systems.worldgen.LodestoneBlockFiller.BlockStateEntry; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; import static com.sammy.malum.common.worldgen.RunewoodTreeFeature.canPlace; import static com.sammy.malum.common.worldgen.RunewoodTreeFeature.updateLeaves; @@ -246,7 +249,7 @@ public static Map generateBlight(ServerLevelAccessor level, Lod } public static void generateBlight(ServerLevelAccessor level, LodestoneBlockFiller filler, Map noiseValues, BlockPos pos, int radius) { - generateBlight(level, filler, pos, radius*2, radius, noiseValues); + generateBlight(level, filler, pos, radius * 2, radius, noiseValues); filler.fill(level); } diff --git a/src/main/java/com/sammy/malum/common/worldgen/WeepingWellFeature.java b/src/main/java/com/sammy/malum/common/worldgen/WeepingWellFeature.java index e58a80f19..a1617f66e 100644 --- a/src/main/java/com/sammy/malum/common/worldgen/WeepingWellFeature.java +++ b/src/main/java/com/sammy/malum/common/worldgen/WeepingWellFeature.java @@ -19,8 +19,6 @@ import team.lodestar.lodestone.systems.worldgen.LodestoneBlockFiller; import team.lodestar.lodestone.systems.worldgen.LodestoneBlockFiller.BlockStateEntry; -import java.util.Random; - public class WeepingWellFeature extends Feature { public WeepingWellFeature() { super(NoneFeatureConfiguration.CODEC); @@ -59,13 +57,12 @@ public boolean place(FeaturePlaceContext context) { for (int x = -2; x <= 2; x++) { for (int y = -5; y <= 4; y++) { for (int z = -2; z <= 2; z++) { - mutableBlockPos.set(pos.getX()+x, pos.getY()+y, pos.getZ()+z); + mutableBlockPos.set(pos.getX() + x, pos.getY() + y, pos.getZ() + z); if (y <= 0) { if (level.isEmptyBlock(mutableBlockPos) || !level.isFluidAtPosition(mutableBlockPos, FluidState::isEmpty)) { failedSolidChecks++; } - } - else { + } else { if (!canPlace(level, mutableBlockPos)) { failedNonSolidChecks++; } @@ -147,7 +144,7 @@ public boolean place(FeaturePlaceContext context) { filler.getEntries().put(columnPosition.immutable(), new BlockStateEntry(state)); if (j < wallHeight) { BlockState wallState = BlockRegistry.TAINTED_ROCK_BRICKS_WALL.get().defaultBlockState(); - final WallSide wallSide = j == wallHeight-1 ? WallSide.LOW : WallSide.TALL; + final WallSide wallSide = j == wallHeight - 1 ? WallSide.LOW : WallSide.TALL; switch (columnDirection) { case SOUTH -> wallState = wallState.setValue(WallBlock.SOUTH_WALL, wallSide); case NORTH -> wallState = wallState.setValue(WallBlock.NORTH_WALL, wallSide); diff --git a/src/main/java/com/sammy/malum/common/worldgen/WeepingWellStructure.java b/src/main/java/com/sammy/malum/common/worldgen/WeepingWellStructure.java new file mode 100644 index 000000000..19b8c40f5 --- /dev/null +++ b/src/main/java/com/sammy/malum/common/worldgen/WeepingWellStructure.java @@ -0,0 +1,109 @@ +package com.sammy.malum.common.worldgen; + +import com.mojang.serialization.Codec; +import com.mojang.serialization.codecs.RecordCodecBuilder; +import com.sammy.malum.registry.common.worldgen.StructureRegistry; +import net.minecraft.core.BlockPos; +import net.minecraft.core.Holder; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.level.NoiseColumn; +import net.minecraft.world.level.levelgen.structure.Structure; +import net.minecraft.world.level.levelgen.structure.StructureType; +import net.minecraft.world.level.levelgen.structure.pools.JigsawPlacement; +import net.minecraft.world.level.levelgen.structure.pools.StructureTemplatePool; +import org.intellij.lang.annotations.Identifier; + +import java.util.ArrayList; +import java.util.List; +import java.util.Optional; + +public class WeepingWellStructure extends Structure { + public static final Codec CODEC = RecordCodecBuilder.mapCodec(instance -> + instance.group(WeepingWellStructure.settingsCodec(instance), + StructureTemplatePool.CODEC.fieldOf("start_pool").forGetter(structure -> structure.startPool), + ResourceLocation.CODEC.optionalFieldOf("start_jigsaw_name").forGetter(structure -> structure.startJigsawName), + Codec.INT.fieldOf("size").forGetter(provider -> provider.size), + Codec.INT.fieldOf("min_y").forGetter(provider -> provider.min), + Codec.INT.fieldOf("max_y").forGetter(provider -> provider.max), + Codec.INT.fieldOf("offset_in_ground").forGetter(provider -> provider.offsetInGround), + Codec.intRange(1, 128).fieldOf("max_distance_from_center").forGetter(structure -> structure.maxDistanceFromCenter) + ).apply(instance, WeepingWellStructure::new)).codec(); + + private final Holder startPool; + private final Optional startJigsawName; + private final int size; + private final int min; + private final int max; + private final int offsetInGround; + private final int maxDistanceFromCenter; + + public WeepingWellStructure(Structure.StructureSettings config, Holder startPool, Optional startJigsawName, int size, int min, int max, int offsetInGround, int maxDistanceFromCenter) { + super(config); + this.startPool = startPool; + this.startJigsawName = startJigsawName; + this.size = size; + this.min = min; + this.max = max; + this.offsetInGround = offsetInGround; + this.maxDistanceFromCenter = maxDistanceFromCenter; + } + + @Override + protected Optional findGenerationPoint(GenerationContext pContext) { + BlockPos blockPos = new BlockPos(pContext.chunkPos().getMinBlockX(), 0, pContext.chunkPos().getMinBlockZ()); + BlockPos validPos = new BlockPos(blockPos.getX(), getValidY(pContext.chunkGenerator().getBaseColumn(blockPos.getX(), blockPos.getZ(), pContext.heightAccessor(), pContext.randomState())), blockPos.getZ()); + if (validPos.getY() != min - 1 && isSufficientlyFlat(pContext, validPos, 3)) { + return JigsawPlacement.addPieces(pContext, this.startPool, this.startJigsawName, this.size, validPos.below(-offsetInGround), false, Optional.empty(), this.maxDistanceFromCenter); + } + return Optional.empty(); + } + + public boolean isSufficientlyFlat(GenerationContext context, BlockPos origin, int check) { + List blockPosList = new ArrayList<>(); + for(int x = -check; x < check; x++){ + for(int z = -check; z < check; z++){ + blockPosList.add(origin.offset(x, 0, z)); + } + } + int count = 0; + for(BlockPos pos : blockPosList){ + NoiseColumn blockView = context.chunkGenerator().getBaseColumn(pos.getX(), pos.getZ(), context.heightAccessor(), context.randomState()); + if(blockView.getBlock(pos.getY()).isAir() && !blockView.getBlock(pos.below().getY()).isAir()){ + count++; + } + } + return count >= check * check * 2; + } + + public int getValidY(NoiseColumn sample){ + int maxLength = 0; + int currentLength = 0; + int maxIndex = min - 1; + for (int i = min; i < max; i += size) { + if (sample.getBlock(i).isAir()) { + // check if there are at least size more true values + int j = i + 1; + while (j < max && sample.getBlock(j).isAir()) { + j++; + } + int sequenceLength = j - i; + if (sequenceLength >= size) { + currentLength += sequenceLength; + if (currentLength > maxLength) { + maxLength = currentLength; + maxIndex = i; + } + i = j - 1; // skip the sequence we just found + } + } else { + currentLength = 0; + } + } + return maxIndex; + } + + @Override + public StructureType type() { + return StructureRegistry.WEEPING_WELL.get(); + } +} diff --git a/src/main/java/com/sammy/malum/compability/create/CreateCompat.java b/src/main/java/com/sammy/malum/compability/create/CreateCompat.java index f029730eb..ac7c5a7f9 100644 --- a/src/main/java/com/sammy/malum/compability/create/CreateCompat.java +++ b/src/main/java/com/sammy/malum/compability/create/CreateCompat.java @@ -25,7 +25,7 @@ public static void convertCaramelToMagicDamage(LivingHurtEvent event) { if (event.getSource().getDirectEntity() instanceof PotatoProjectileEntity potatoProjectile) { LivingEntity target = event.getEntity(); ItemStack item = potatoProjectile.getItem(); - DamageSource damageSource = event.getSource().getEntity() instanceof Player player ? DamageSourceRegistry.causeVoodooDamage(player) : DamageSourceRegistry.VOODOO; + DamageSource damageSource = event.getSource().getEntity() instanceof Player player ? DamageSourceRegistry.create(player.level(), DamageSourceRegistry.VOODOO, player) : DamageSourceRegistry.create(target.level(), DamageSourceRegistry.VOODOO); if (item.getItem().equals(UNHOLY_CARAMEL.get()) || item.getItem().equals(HOLY_CARAMEL.get())) { event.setCanceled(true); target.invulnerableTime = 0; diff --git a/src/main/java/com/sammy/malum/compability/jei/JEIHandler.java b/src/main/java/com/sammy/malum/compability/jei/JEIHandler.java index 737aeee09..02d86d9ad 100644 --- a/src/main/java/com/sammy/malum/compability/jei/JEIHandler.java +++ b/src/main/java/com/sammy/malum/compability/jei/JEIHandler.java @@ -9,9 +9,9 @@ import com.sammy.malum.compability.farmersdelight.FarmersDelightCompat; import com.sammy.malum.compability.jei.categories.*; import com.sammy.malum.compability.jei.recipes.SpiritTransmutationWrapper; +import com.sammy.malum.core.systems.rites.MalumRiteType; import com.sammy.malum.registry.common.SpiritRiteRegistry; import com.sammy.malum.registry.common.item.ItemRegistry; -import com.sammy.malum.core.systems.rites.MalumRiteType; import mezz.jei.api.IModPlugin; import mezz.jei.api.JeiPlugin; import mezz.jei.api.constants.RecipeTypes; @@ -69,10 +69,10 @@ public void registerCategories(IRecipeCategoryRegistration registry) { IGuiHelper guiHelper = registry.getJeiHelpers().getGuiHelper(); registry.addRecipeCategories(new SpiritInfusionRecipeCategory(guiHelper), - new SpiritTransmutationRecipeCategory(guiHelper), - new SpiritFocusingRecipeCategory(guiHelper), - new SpiritRiteRecipeCategory(guiHelper), - new SpiritRepairRecipeCategory(guiHelper)); + new SpiritTransmutationRecipeCategory(guiHelper), + new SpiritFocusingRecipeCategory(guiHelper), + new SpiritRiteRecipeCategory(guiHelper), + new SpiritRepairRecipeCategory(guiHelper)); } @Override @@ -93,12 +93,12 @@ public void registerRecipes(@Nonnull IRecipeRegistration registry) { } registry.addRecipes(TRANSMUTATION, groups.values().stream() - .map(SpiritTransmutationWrapper::new) - .collect(Collectors.toList())); + .map(SpiritTransmutationWrapper::new) + .collect(Collectors.toList())); registry.addRecipes(TRANSMUTATION, leftovers.stream() - .map(List::of) - .map(SpiritTransmutationWrapper::new) - .collect(Collectors.toList())); + .map(List::of) + .map(SpiritTransmutationWrapper::new) + .collect(Collectors.toList())); registry.addRecipes(FOCUSING, SpiritFocusingRecipe.getRecipes(level)); registry.addRecipes(RITES, SpiritRiteRegistry.RITES); @@ -123,9 +123,9 @@ public void onRuntimeAvailable(IJeiRuntime jeiRuntime) { IRecipeManager recipeRegistry = jeiRuntime.getRecipeManager(); IFocusFactory focusFactory = jeiRuntime.getJeiHelpers().getFocusFactory(); recipeRegistry.hideRecipes(RecipeTypes.CRAFTING, recipeRegistry - .createRecipeLookup(RecipeTypes.CRAFTING) - .limitFocus(List.of(focusFactory.createFocus(RecipeIngredientRole.OUTPUT, VanillaTypes.ITEM_STACK, new ItemStack(ItemRegistry.THE_DEVICE.get())))) - .get().toList()); + .createRecipeLookup(RecipeTypes.CRAFTING) + .limitFocus(List.of(focusFactory.createFocus(RecipeIngredientRole.OUTPUT, VanillaTypes.ITEM_STACK, new ItemStack(ItemRegistry.THE_DEVICE.get())))) + .get().toList()); } @Nonnull diff --git a/src/main/java/com/sammy/malum/compability/jei/categories/SpiritFocusingRecipeCategory.java b/src/main/java/com/sammy/malum/compability/jei/categories/SpiritFocusingRecipeCategory.java index 640d4dcde..75f36b93a 100644 --- a/src/main/java/com/sammy/malum/compability/jei/categories/SpiritFocusingRecipeCategory.java +++ b/src/main/java/com/sammy/malum/compability/jei/categories/SpiritFocusingRecipeCategory.java @@ -1,8 +1,7 @@ package com.sammy.malum.compability.jei.categories; -import com.mojang.blaze3d.vertex.PoseStack; import com.sammy.malum.MalumMod; -import com.sammy.malum.client.screen.codex.*; +import com.sammy.malum.client.screen.codex.ArcanaCodexHelper; import com.sammy.malum.common.recipe.SpiritFocusingRecipe; import com.sammy.malum.compability.jei.JEIHandler; import com.sammy.malum.registry.common.item.ItemRegistry; @@ -72,8 +71,8 @@ public void setRecipe(IRecipeLayoutBuilder builder, SpiritFocusingRecipe recipe, JEIHandler.addItemsToJei(builder, RecipeIngredientRole.INPUT, 62, 13, false, recipe.spirits); builder.addSlot(RecipeIngredientRole.INPUT, 63, 57) - .addIngredients(recipe.input); + .addIngredients(recipe.input); builder.addSlot(RecipeIngredientRole.OUTPUT, 63, 124) - .addItemStack(recipe.output); + .addItemStack(recipe.output); } } diff --git a/src/main/java/com/sammy/malum/compability/jei/categories/SpiritInfusionRecipeCategory.java b/src/main/java/com/sammy/malum/compability/jei/categories/SpiritInfusionRecipeCategory.java index c88f67177..f152f8d7f 100644 --- a/src/main/java/com/sammy/malum/compability/jei/categories/SpiritInfusionRecipeCategory.java +++ b/src/main/java/com/sammy/malum/compability/jei/categories/SpiritInfusionRecipeCategory.java @@ -1,8 +1,7 @@ package com.sammy.malum.compability.jei.categories; -import com.mojang.blaze3d.vertex.PoseStack; import com.sammy.malum.MalumMod; -import com.sammy.malum.client.screen.codex.*; +import com.sammy.malum.client.screen.codex.ArcanaCodexHelper; import com.sammy.malum.common.recipe.SpiritInfusionRecipe; import com.sammy.malum.compability.jei.JEIHandler; import com.sammy.malum.registry.common.item.ItemRegistry; @@ -75,9 +74,9 @@ public void setRecipe(IRecipeLayoutBuilder builder, SpiritInfusionRecipe recipe, JEIHandler.addItemsToJei(builder, RecipeIngredientRole.INPUT, 104, 49, true, recipe.extraItems); builder.addSlot(RecipeIngredientRole.INPUT, 63, 57) - .addItemStacks(recipe.input.getStacks()); + .addItemStacks(recipe.input.getStacks()); builder.addSlot(RecipeIngredientRole.OUTPUT, 63, 124) - .addItemStack(recipe.output); + .addItemStack(recipe.output); } } diff --git a/src/main/java/com/sammy/malum/compability/jei/categories/SpiritRepairRecipeCategory.java b/src/main/java/com/sammy/malum/compability/jei/categories/SpiritRepairRecipeCategory.java index 480d51896..3d0b80abd 100644 --- a/src/main/java/com/sammy/malum/compability/jei/categories/SpiritRepairRecipeCategory.java +++ b/src/main/java/com/sammy/malum/compability/jei/categories/SpiritRepairRecipeCategory.java @@ -1,8 +1,7 @@ package com.sammy.malum.compability.jei.categories; -import com.mojang.blaze3d.vertex.PoseStack; import com.sammy.malum.MalumMod; -import com.sammy.malum.client.screen.codex.*; +import com.sammy.malum.client.screen.codex.ArcanaCodexHelper; import com.sammy.malum.common.recipe.SpiritRepairRecipe; import com.sammy.malum.compability.jei.JEIHandler; import com.sammy.malum.registry.common.item.ItemRegistry; @@ -16,7 +15,6 @@ import mezz.jei.api.recipe.RecipeIngredientRole; import mezz.jei.api.recipe.RecipeType; import mezz.jei.api.recipe.category.IRecipeCategory; -import net.minecraft.client.gui.Gui; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; @@ -79,20 +77,20 @@ public void setRecipe(IRecipeLayoutBuilder builder, SpiritRepairRecipe recipe, I List repairIngredient = recipe.repairMaterial.getStacks(); List damaged = repaired.stream() - .map(ItemStack::copy) - .peek(s -> s.setDamageValue((int) (s.getMaxDamage() * recipe.durabilityPercentage))) - .collect(Collectors.toCollection(ArrayList::new)); + .map(ItemStack::copy) + .peek(s -> s.setDamageValue((int) (s.getMaxDamage() * recipe.durabilityPercentage))) + .collect(Collectors.toCollection(ArrayList::new)); JEIHandler.addItemsToJei(builder, RecipeIngredientRole.INPUT, 62, 13, false, recipe.spirits); IRecipeSlotBuilder input = builder.addSlot(RecipeIngredientRole.INPUT, 82, 57) - .addItemStacks(damaged); + .addItemStacks(damaged); builder.addSlot(RecipeIngredientRole.INPUT, 44, 57) - .addItemStacks(repairIngredient); + .addItemStacks(repairIngredient); IRecipeSlotBuilder output = builder.addSlot(RecipeIngredientRole.OUTPUT, 63, 124) - .addItemStacks(repaired.stream().map(SpiritRepairRecipe::getRepairRecipeOutput).collect(Collectors.toList())); + .addItemStacks(repaired.stream().map(SpiritRepairRecipe::getRepairRecipeOutput).collect(Collectors.toList())); builder.createFocusLink(input, output); } diff --git a/src/main/java/com/sammy/malum/compability/jei/categories/SpiritRiteRecipeCategory.java b/src/main/java/com/sammy/malum/compability/jei/categories/SpiritRiteRecipeCategory.java index d7055fa84..57bf5e8e0 100644 --- a/src/main/java/com/sammy/malum/compability/jei/categories/SpiritRiteRecipeCategory.java +++ b/src/main/java/com/sammy/malum/compability/jei/categories/SpiritRiteRecipeCategory.java @@ -1,11 +1,10 @@ package com.sammy.malum.compability.jei.categories; -import com.mojang.blaze3d.vertex.PoseStack; import com.sammy.malum.MalumMod; -import com.sammy.malum.client.screen.codex.*; +import com.sammy.malum.client.screen.codex.ArcanaCodexHelper; import com.sammy.malum.compability.jei.JEIHandler; -import com.sammy.malum.registry.common.item.ItemRegistry; import com.sammy.malum.core.systems.rites.MalumRiteType; +import com.sammy.malum.registry.common.item.ItemRegistry; import mezz.jei.api.constants.VanillaTypes; import mezz.jei.api.gui.builder.IRecipeLayoutBuilder; import mezz.jei.api.gui.drawable.IDrawable; @@ -54,7 +53,6 @@ public RecipeType getRecipeType() { } - @Override public Component getTitle() { return Component.translatable("malum.jei." + UID.getPath()); @@ -76,7 +74,7 @@ public IDrawable getIcon() { public void setRecipe(IRecipeLayoutBuilder builder, MalumRiteType rite, IFocusGroup focuses) { for (int i = 0; i < rite.spirits.size(); i++) { builder.addSlot(RecipeIngredientRole.CATALYST, 63, 121 - 20 * i) - .addItemStack(rite.spirits.get(i).spiritShard.get().getDefaultInstance()); + .addItemStack(rite.spirits.get(i).spiritShard.get().getDefaultInstance()); } } } diff --git a/src/main/java/com/sammy/malum/compability/jei/categories/SpiritTransmutationRecipeCategory.java b/src/main/java/com/sammy/malum/compability/jei/categories/SpiritTransmutationRecipeCategory.java index e7ed56aea..30bc02da4 100644 --- a/src/main/java/com/sammy/malum/compability/jei/categories/SpiritTransmutationRecipeCategory.java +++ b/src/main/java/com/sammy/malum/compability/jei/categories/SpiritTransmutationRecipeCategory.java @@ -1,6 +1,5 @@ package com.sammy.malum.compability.jei.categories; -import com.mojang.blaze3d.vertex.PoseStack; import com.sammy.malum.MalumMod; import com.sammy.malum.compability.jei.JEIHandler; import com.sammy.malum.compability.jei.recipes.SpiritTransmutationWrapper; @@ -78,9 +77,9 @@ public void setRecipe(IRecipeLayoutBuilder builder, SpiritTransmutationWrapper r } var input = builder.addSlot(RecipeIngredientRole.INPUT, 28, 27) - .addItemStacks(inputs); + .addItemStacks(inputs); var output = builder.addSlot(RecipeIngredientRole.OUTPUT, 93, 27) - .addItemStacks(outputs); + .addItemStacks(outputs); builder.createFocusLink(input, output); } } diff --git a/src/main/java/com/sammy/malum/config/ClientConfig.java b/src/main/java/com/sammy/malum/config/ClientConfig.java index 575ce6f04..8244a54e6 100644 --- a/src/main/java/com/sammy/malum/config/ClientConfig.java +++ b/src/main/java/com/sammy/malum/config/ClientConfig.java @@ -1,7 +1,7 @@ package com.sammy.malum.config; -import com.sammy.malum.client.screen.codex.*; +import com.sammy.malum.client.screen.codex.ArcanaCodexHelper; import net.minecraftforge.common.ForgeConfigSpec; import org.apache.commons.lang3.tuple.Pair; import team.lodestar.lodestone.systems.config.LodestoneConfig; @@ -10,16 +10,16 @@ public class ClientConfig extends LodestoneConfig { - public static ConfigValueHolder BOOK_THEME = new ConfigValueHolder<>(MALUM,"client/codex", (builder -> + public static ConfigValueHolder BOOK_THEME = new ConfigValueHolder<>(MALUM, "client/codex", (builder -> builder.comment("What theme should the encyclopedia arcana be in?") .defineEnum("bookTheme", ArcanaCodexHelper.BookTheme.DEFAULT))); - public static ConfigValueHolder SCROLL_DIRECTION = new ConfigValueHolder<>(MALUM,"client/codex", (builder -> + public static ConfigValueHolder SCROLL_DIRECTION = new ConfigValueHolder<>(MALUM, "client/codex", (builder -> builder.comment("Should the scroll direction be reversed in the encyclopedia arcana entry screen? This simply affects how you move through pages in an entry.") .define("scrollDirection", false))); public ClientConfig(ForgeConfigSpec.Builder builder) { - super(MALUM,"client", builder); + super(MALUM, "client", builder); } public static final ClientConfig INSTANCE; diff --git a/src/main/java/com/sammy/malum/config/CommonConfig.java b/src/main/java/com/sammy/malum/config/CommonConfig.java index 3c6b61fbd..78953d356 100644 --- a/src/main/java/com/sammy/malum/config/CommonConfig.java +++ b/src/main/java/com/sammy/malum/config/CommonConfig.java @@ -12,141 +12,144 @@ public class CommonConfig extends LodestoneConfig { //worldgen - public static ConfigValueHolder GENERATE_RUNEWOOD_TREES = new ConfigValueHolder<>(MALUM,"common/worldgen/runewood", (builder -> + + public static ConfigValueHolder GENERATE_RUNEWOOD_TREES = new ConfigValueHolder<>(MALUM, "common/worldgen/runewood", (builder -> builder.comment("Should runewood trees naturally generate?") .define("generateRunewood", true))); - public static ConfigValueHolder COMMON_RUNEWOOD_CHANCE = new ConfigValueHolder<>(MALUM,"common/worldgen/runewood", (builder -> + public static ConfigValueHolder COMMON_RUNEWOOD_CHANCE = new ConfigValueHolder<>(MALUM, "common/worldgen/runewood", (builder -> builder.comment("Chance for runewood trees to generate in open biomes such as plains.") .defineInRange("runewoodCommonChance", 0.02d, 0, 1))); - public static ConfigValueHolder RARE_RUNEWOOD_CHANCE = new ConfigValueHolder<>(MALUM,"common/worldgen/runewood", (builder -> + public static ConfigValueHolder RARE_RUNEWOOD_CHANCE = new ConfigValueHolder<>(MALUM, "common/worldgen/runewood", (builder -> builder.comment("Chance for runewood trees to generate in forest biomes.") .defineInRange("runewoodRareChance", 0.01d, 0, 1))); - public static ConfigValueHolder GENERATE_WEEPING_WELLS = new ConfigValueHolder<>(MALUM,"common/worldgen/weeping_well", (builder -> + public static ConfigValueHolder GENERATE_WEEPING_WELLS = new ConfigValueHolder<>(MALUM, "common/worldgen/weeping_well", (builder -> builder.comment("Should the void be curious?") .define("generateTheUnknown", true))); - public static final ConfigValueHolder> WEEPING_WELL_ALLOWED_DIMENSIONS = new ConfigValueHolder<>(MALUM,"common/worldgen/weeping_well", (builder) -> + public static final ConfigValueHolder> WEEPING_WELL_ALLOWED_DIMENSIONS = new ConfigValueHolder<>(MALUM, "common/worldgen/weeping_well", (builder) -> builder.comment("Which dimensions is the void interested in?") .defineList("markedDimensions", new ArrayList<>(List.of("minecraft:overworld")), s -> s instanceof String)); - public static ConfigValueHolder GENERATE_BLAZE_QUARTZ = new ConfigValueHolder<>(MALUM,"common/worldgen/blazing_quartz", (builder -> + public static ConfigValueHolder GENERATE_BLAZE_QUARTZ = new ConfigValueHolder<>(MALUM, "common/worldgen/blazing_quartz", (builder -> builder.comment("Should blaze quartz ore generate?") .define("generateBlazeQuartz", true))); - public static ConfigValueHolder BLAZE_QUARTZ_SIZE = new ConfigValueHolder<>(MALUM,"common/worldgen/blazing_quartz", (builder -> + public static ConfigValueHolder BLAZE_QUARTZ_SIZE = new ConfigValueHolder<>(MALUM, "common/worldgen/blazing_quartz", (builder -> builder.comment("Size of blaze quartz ore veins.") .define("blazeQuartzSize", 14))); - public static ConfigValueHolder BLAZE_QUARTZ_AMOUNT = new ConfigValueHolder<>(MALUM,"common/worldgen/blazing_quartz", (builder -> + public static ConfigValueHolder BLAZE_QUARTZ_AMOUNT = new ConfigValueHolder<>(MALUM, "common/worldgen/blazing_quartz", (builder -> builder.comment("Amount of blaze quartz ore veins.") .define("blazeQuartzAmount", 16))); - public static ConfigValueHolder GENERATE_BRILLIANT_STONE = new ConfigValueHolder<>(MALUM,"common/worldgen/brilliance", (builder -> + public static ConfigValueHolder GENERATE_BRILLIANT_STONE = new ConfigValueHolder<>(MALUM, "common/worldgen/brilliance", (builder -> builder.comment("Should brilliant stone generate?") .define("generateBrilliantStone", true))); - public static ConfigValueHolder BRILLIANT_STONE_SIZE = new ConfigValueHolder<>(MALUM,"common/worldgen/brilliance", (builder -> + public static ConfigValueHolder BRILLIANT_STONE_SIZE = new ConfigValueHolder<>(MALUM, "common/worldgen/brilliance", (builder -> builder.comment("Size of brilliant stone veins.") .define("brilliantStoneSize", 4))); - public static ConfigValueHolder BRILLIANT_STONE_AMOUNT = new ConfigValueHolder<>(MALUM,"common/worldgen/brilliance", (builder -> + public static ConfigValueHolder BRILLIANT_STONE_AMOUNT = new ConfigValueHolder<>(MALUM, "common/worldgen/brilliance", (builder -> builder.comment("Amount of brilliant stone veins.") .define("brilliantStoneAmount", 3))); - public static ConfigValueHolder BRILLIANT_STONE_MIN_Y = new ConfigValueHolder<>(MALUM,"common/worldgen/brilliance", (builder -> + public static ConfigValueHolder BRILLIANT_STONE_MIN_Y = new ConfigValueHolder<>(MALUM, "common/worldgen/brilliance", (builder -> builder.comment("Minimum height at which brilliant stone can spawn.") .define("brilliantStoneMinY", -64))); - public static ConfigValueHolder BRILLIANT_STONE_MAX_Y = new ConfigValueHolder<>(MALUM,"common/worldgen/brilliance", (builder -> + public static ConfigValueHolder BRILLIANT_STONE_MAX_Y = new ConfigValueHolder<>(MALUM, "common/worldgen/brilliance", (builder -> builder.comment("Maximum height at which brilliant stone can spawn.") .define("brilliantStoneMaxY", 40))); - public static ConfigValueHolder GENERATE_SOULSTONE = new ConfigValueHolder<>(MALUM,"common/worldgen/soulstone", (builder -> + public static ConfigValueHolder GENERATE_SOULSTONE = new ConfigValueHolder<>(MALUM, "common/worldgen/soulstone", (builder -> builder.comment("Should soulstone ore generate underground?") .define("generateSoulstone", true))); - public static ConfigValueHolder SOULSTONE_SIZE = new ConfigValueHolder<>(MALUM,"common/worldgen/soulstone", (builder -> + public static ConfigValueHolder SOULSTONE_SIZE = new ConfigValueHolder<>(MALUM, "common/worldgen/soulstone", (builder -> builder.comment("Size of soulstone ore veins underground.") .define("soulstoneSize", 8))); - public static ConfigValueHolder SOULSTONE_AMOUNT = new ConfigValueHolder<>(MALUM,"common/worldgen/soulstone", (builder -> + public static ConfigValueHolder SOULSTONE_AMOUNT = new ConfigValueHolder<>(MALUM, "common/worldgen/soulstone", (builder -> builder.comment("Amount of soulstone ore veins.") .define("soulstoneAmount", 3))); - public static ConfigValueHolder SOULSTONE_MIN_Y = new ConfigValueHolder<>(MALUM,"common/worldgen/soulstone", (builder -> + public static ConfigValueHolder SOULSTONE_MIN_Y = new ConfigValueHolder<>(MALUM, "common/worldgen/soulstone", (builder -> builder.comment("Minimum height at which soulstone ore can spawn.") .define("soulstoneMinY", -64))); - public static ConfigValueHolder SOULSTONE_MAX_Y = new ConfigValueHolder<>(MALUM,"common/worldgen/soulstone", (builder -> + public static ConfigValueHolder SOULSTONE_MAX_Y = new ConfigValueHolder<>(MALUM, "common/worldgen/soulstone", (builder -> builder.comment("Maximum height at which soulstone ore can spawn.") .define("soulstoneMaxY", 30))); - public static ConfigValueHolder GENERATE_SURFACE_SOULSTONE = new ConfigValueHolder<>(MALUM,"common/worldgen/soulstone", (builder -> + public static ConfigValueHolder GENERATE_SURFACE_SOULSTONE = new ConfigValueHolder<>(MALUM, "common/worldgen/soulstone", (builder -> builder.comment("Should soulstone ore generate on the surface?") .define("generateSurfaceSoulstone", true))); - public static ConfigValueHolder SURFACE_SOULSTONE_SIZE = new ConfigValueHolder<>(MALUM,"common/worldgen/soulstone", (builder -> + public static ConfigValueHolder SURFACE_SOULSTONE_SIZE = new ConfigValueHolder<>(MALUM, "common/worldgen/soulstone", (builder -> builder.comment("Size of soulstone ore veins on the surface.") .define("surfaceSoulstoneSize", 4))); - public static ConfigValueHolder SURFACE_SOULSTONE_AMOUNT = new ConfigValueHolder<>(MALUM,"common/worldgen/soulstone", (builder -> + public static ConfigValueHolder SURFACE_SOULSTONE_AMOUNT = new ConfigValueHolder<>(MALUM, "common/worldgen/soulstone", (builder -> builder.comment("Amount of soulstone ore veins on the surface.") .define("surfaceSoulstoneAmount", 4))); - public static ConfigValueHolder SURFACE_SOULSTONE_MIN_Y = new ConfigValueHolder<>(MALUM,"common/worldgen/soulstone", (builder -> + public static ConfigValueHolder SURFACE_SOULSTONE_MIN_Y = new ConfigValueHolder<>(MALUM, "common/worldgen/soulstone", (builder -> builder.comment("Minimum height at which surface soulstone ore can spawn.") .define("surfaceSoulstoneMinY", 60))); - public static ConfigValueHolder SURFACE_SOULSTONE_MAX_Y = new ConfigValueHolder<>(MALUM,"common/worldgen/soulstone", (builder -> + public static ConfigValueHolder SURFACE_SOULSTONE_MAX_Y = new ConfigValueHolder<>(MALUM, "common/worldgen/soulstone", (builder -> builder.comment("Maximum height at which surface soulstone ore can spawn.") .define("surfaceSoulstoneMaxY", 100))); - public static ConfigValueHolder GENERATE_NATURAL_QUARTZ = new ConfigValueHolder<>(MALUM,"common/worldgen/natural_quartz", (builder -> + public static ConfigValueHolder GENERATE_NATURAL_QUARTZ = new ConfigValueHolder<>(MALUM, "common/worldgen/natural_quartz", (builder -> builder.comment("Should natural quartz ore generate?") .define("generateNaturalQuartz", true))); - public static ConfigValueHolder NATURAL_QUARTZ_SIZE = new ConfigValueHolder<>(MALUM,"common/worldgen/natural_quartz", (builder -> + public static ConfigValueHolder NATURAL_QUARTZ_SIZE = new ConfigValueHolder<>(MALUM, "common/worldgen/natural_quartz", (builder -> builder.comment("Size of natural quartz ore veins.") .define("naturalQuartzSize", 5))); - public static ConfigValueHolder NATURAL_QUARTZ_AMOUNT = new ConfigValueHolder<>(MALUM,"common/worldgen/natural_quartz", (builder -> + public static ConfigValueHolder NATURAL_QUARTZ_AMOUNT = new ConfigValueHolder<>(MALUM, "common/worldgen/natural_quartz", (builder -> builder.comment("Amount of natural quartz ore veins.") .define("naturalQuartzAmount", 2))); - public static ConfigValueHolder NATURAL_QUARTZ_MIN_Y = new ConfigValueHolder<>(MALUM,"common/worldgen/natural_quartz", (builder -> + public static ConfigValueHolder NATURAL_QUARTZ_MIN_Y = new ConfigValueHolder<>(MALUM, "common/worldgen/natural_quartz", (builder -> builder.comment("Minimum height at which natural quartz ore can spawn.") .define("naturalQuartzMinY", -64))); - public static ConfigValueHolder NATURAL_QUARTZ_MAX_Y = new ConfigValueHolder<>(MALUM,"common/worldgen/natural_quartz", (builder -> + public static ConfigValueHolder NATURAL_QUARTZ_MAX_Y = new ConfigValueHolder<>(MALUM, "common/worldgen/natural_quartz", (builder -> builder.comment("Maximum height at which natural quartz ore can spawn.") .define("naturalQuartzMaxY", 10))); - public static ConfigValueHolder GENERATE_QUARTZ_GEODES = new ConfigValueHolder<>(MALUM,"common/worldgen/natural_quartz_geode", (builder -> + public static ConfigValueHolder GENERATE_QUARTZ_GEODES = new ConfigValueHolder<>(MALUM, "common/worldgen/natural_quartz_geode", (builder -> builder.comment("Should quartz geodes generate?") .define("generateQuartzGeodes", true))); - public static final ConfigValueHolder> QUARTZ_GEODE_ALLOWED_DIMENSIONS = new ConfigValueHolder<>(MALUM,"common/worldgen/natural_quartz_geode", (builder) -> - builder.comment("Which dimensions can quartz geodes generate in?") - .defineList("quartzGeodeDimensions", new ArrayList<>(List.of("minecraft:overworld")), s -> s instanceof String)); + public static final ConfigValueHolder> QUARTZ_GEODE_ALLOWED_DIMENSIONS = new ConfigValueHolder<>(MALUM, "common/worldgen/natural_quartz_geode", (builder) -> + builder.comment("Which dimensions can quartz geodes generate in?") + .defineList("quartzGeodeDimensions", new ArrayList<>(List.of("minecraft:overworld")), s -> s instanceof String)); - public static ConfigValueHolder GENERATE_CTHONIC_GOLD = new ConfigValueHolder<>(MALUM,"common/worldgen/cthonic_gold", (builder -> + public static ConfigValueHolder GENERATE_CTHONIC_GOLD = new ConfigValueHolder<>(MALUM, "common/worldgen/cthonic_gold", (builder -> builder.comment("Should cthonic gold generate?") .define("generateCthonicGold", true))); - public static final ConfigValueHolder> CTHONIC_GOLD_ALLOWED_DIMENSIONS = new ConfigValueHolder<>(MALUM,"common/worldgen/cthonic_gold", (builder) -> - builder.comment("Which dimensions can cthonic gold generate in?") - .defineList("cthonicGoldDimensions", new ArrayList<>(List.of("minecraft:overworld")), s -> s instanceof String)); + public static final ConfigValueHolder> CTHONIC_GOLD_ALLOWED_DIMENSIONS = new ConfigValueHolder<>(MALUM, "common/worldgen/cthonic_gold", (builder) -> + builder.comment("Which dimensions can cthonic gold generate in?") + .defineList("cthonicGoldDimensions", new ArrayList<>(List.of("minecraft:overworld")), s -> s instanceof String)); + + - public static ConfigValueHolder ULTIMATE_REBOUND = new ConfigValueHolder<>(MALUM,"common/item/rebound", (builder -> + public static ConfigValueHolder ULTIMATE_REBOUND = new ConfigValueHolder<>(MALUM, "common/item/rebound", (builder -> builder.comment("If set to true, you may put rebound on any weapon in the game.") .define("enableUltimateRebound", false))); - public static ConfigValueHolder AWARD_CODEX_ON_KILL = new ConfigValueHolder<>(MALUM,"common/codex", (builder -> + public static ConfigValueHolder AWARD_CODEX_ON_KILL = new ConfigValueHolder<>(MALUM, "common/codex", (builder -> builder.comment("If set to true, the first undead enemy a player slays will drop the encyclopedia arcana.") .define("enableCodexDrop", true))); - public static ConfigValueHolder NO_FANCY_SPIRITS = new ConfigValueHolder<>(MALUM,"common/spirit", (builder -> - builder.comment("If set to true, any spirits dropped will simply take the form of an item.") - .define("noFancySpirits", false))); + public static ConfigValueHolder NO_FANCY_SPIRITS = new ConfigValueHolder<>(MALUM, "common/spirit", (builder -> + builder.comment("If set to true, any spirits dropped will simply take the form of an item.") + .define("noFancySpirits", false))); - public static ConfigValueHolder SOULLESS_SPAWNERS = new ConfigValueHolder<>(MALUM,"common/spirit/spawner", (builder -> + public static ConfigValueHolder SOULLESS_SPAWNERS = new ConfigValueHolder<>(MALUM, "common/spirit/spawner", (builder -> builder.comment("If set to true, mob spawners will create soulless mobs instead.") .define("lameSpawners", false))); - public static ConfigValueHolder USE_DEFAULT_SPIRIT_VALUES = new ConfigValueHolder<>(MALUM,"common/spirit/defaults", (builder -> - builder.comment("Whether entities without spirit jsons will use the default spirit data for their category.") - .define("defaultSpiritValues", true))); + public static ConfigValueHolder USE_DEFAULT_SPIRIT_VALUES = new ConfigValueHolder<>(MALUM, "common/spirit/defaults", (builder -> + builder.comment("Whether entities without spirit jsons will use the default spirit data for their category.") + .define("defaultSpiritValues", true))); - public static ConfigValueHolder SOUL_WARD_PHYSICAL = new ConfigValueHolder<>(MALUM,"common/spirit/affinity/soul_ward", (builder -> + public static ConfigValueHolder SOUL_WARD_PHYSICAL = new ConfigValueHolder<>(MALUM, "common/spirit/affinity/soul_ward", (builder -> builder.comment("Multiplier for physical damage taken while soul ward is active.") .defineInRange("soulWardPhysical", 0.7f, 0, 1))); - public static ConfigValueHolder SOUL_WARD_MAGIC = new ConfigValueHolder<>(MALUM,"common/spirit/affinity/soul_ward", (builder -> + public static ConfigValueHolder SOUL_WARD_MAGIC = new ConfigValueHolder<>(MALUM, "common/spirit/affinity/soul_ward", (builder -> builder.comment("Multiplier for magic damage taken while soul ward is active.") .defineInRange("soulWardMagic", 0.1f, 0, 1))); - public static ConfigValueHolder SOUL_WARD_RATE = new ConfigValueHolder<>(MALUM,"common/spirit/affinity/soul_ward", (builder -> + public static ConfigValueHolder SOUL_WARD_RATE = new ConfigValueHolder<>(MALUM, "common/spirit/affinity/soul_ward", (builder -> builder.comment("Base time in ticks it takes for one point of soul ward to recover.") .define("soulWardRate", 60))); diff --git a/src/main/java/com/sammy/malum/core/events/ClientSetupEvents.java b/src/main/java/com/sammy/malum/core/events/ClientSetupEvents.java index d23c3aa29..9a1f3d3b5 100644 --- a/src/main/java/com/sammy/malum/core/events/ClientSetupEvents.java +++ b/src/main/java/com/sammy/malum/core/events/ClientSetupEvents.java @@ -12,10 +12,8 @@ import net.minecraftforge.client.event.RegisterGuiOverlaysEvent; import net.minecraftforge.client.event.RegisterParticleProvidersEvent; import net.minecraftforge.client.gui.overlay.VanillaGuiOverlay; -import net.minecraftforge.eventbus.api.EventPriority; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent; import java.util.Map; diff --git a/src/main/java/com/sammy/malum/core/events/RuntimeEvents.java b/src/main/java/com/sammy/malum/core/events/RuntimeEvents.java index 88e7dda2d..1188964c7 100644 --- a/src/main/java/com/sammy/malum/core/events/RuntimeEvents.java +++ b/src/main/java/com/sammy/malum/core/events/RuntimeEvents.java @@ -10,11 +10,11 @@ import com.sammy.malum.common.effect.WickedIntentEffect; import com.sammy.malum.common.enchantment.ReboundEnchantment; import com.sammy.malum.common.entity.nitrate.EthericExplosion; -import com.sammy.malum.common.item.cosmetic.curios.*; -import com.sammy.malum.common.item.curiosities.curios.alchemical.*; -import com.sammy.malum.common.item.curiosities.curios.rotten.*; -import com.sammy.malum.common.item.curiosities.curios.misc.*; -import com.sammy.malum.common.item.curiosities.curios.prospector.*; +import com.sammy.malum.common.item.cosmetic.curios.CurioTokenOfGratitude; +import com.sammy.malum.common.item.curiosities.curios.alchemical.CurioAlchemicalRing; +import com.sammy.malum.common.item.curiosities.curios.misc.CurioHarmonyNecklace; +import com.sammy.malum.common.item.curiosities.curios.prospector.CurioProspectorBelt; +import com.sammy.malum.common.item.curiosities.curios.rotten.CurioVoraciousRing; import com.sammy.malum.compability.create.CreateCompat; import com.sammy.malum.core.handlers.*; import com.sammy.malum.core.listeners.ReapingDataReloadListener; diff --git a/src/main/java/com/sammy/malum/core/events/SetupEvents.java b/src/main/java/com/sammy/malum/core/events/SetupEvents.java index 3bfb2f8bf..437ad8ddd 100644 --- a/src/main/java/com/sammy/malum/core/events/SetupEvents.java +++ b/src/main/java/com/sammy/malum/core/events/SetupEvents.java @@ -3,10 +3,6 @@ import com.sammy.malum.common.capability.MalumItemDataCapability; import com.sammy.malum.common.capability.MalumLivingEntityDataCapability; import com.sammy.malum.common.capability.MalumPlayerDataCapability; -import com.sammy.malum.core.handlers.MissingMappingHandler; -import com.sammy.malum.registry.client.ParticleRegistry; -import net.minecraft.world.item.Item; -import net.minecraft.world.level.block.Block; import net.minecraftforge.common.capabilities.RegisterCapabilitiesEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; @@ -35,5 +31,4 @@ public static void correctMissingBlockMappings(RegistryEvent.MissingMappings event) { diff --git a/src/main/java/com/sammy/malum/core/handlers/SoulDataHandler.java b/src/main/java/com/sammy/malum/core/handlers/SoulDataHandler.java index d66f33462..b88261e30 100644 --- a/src/main/java/com/sammy/malum/core/handlers/SoulDataHandler.java +++ b/src/main/java/com/sammy/malum/core/handlers/SoulDataHandler.java @@ -8,7 +8,6 @@ import net.minecraft.world.damagesource.DamageSource; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.Mob; -import net.minecraft.world.entity.MobSpawnType; import net.minecraft.world.entity.ai.goal.*; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; diff --git a/src/main/java/com/sammy/malum/core/handlers/SoulHarvestHandler.java b/src/main/java/com/sammy/malum/core/handlers/SoulHarvestHandler.java index 8873c4e74..0f37b6b62 100644 --- a/src/main/java/com/sammy/malum/core/handlers/SoulHarvestHandler.java +++ b/src/main/java/com/sammy/malum/core/handlers/SoulHarvestHandler.java @@ -212,7 +212,7 @@ public static void renderSoulHarvestEffects(PoseStack poseStack, LivingEntity ta VFXBuilders.createWorld().setPosColorTexLightmapDefaultFormat() .setColor(color.brighter()) .setAlpha(intensity * 0.6f) - .renderQuad(soulNoise, poseStack, intensity*0.4f); + .renderQuad(soulNoise, poseStack, intensity * 0.4f); poseStack.popPose(); } } diff --git a/src/main/java/com/sammy/malum/core/handlers/SoulWardHandler.java b/src/main/java/com/sammy/malum/core/handlers/SoulWardHandler.java index 72ced0152..62cb0220f 100644 --- a/src/main/java/com/sammy/malum/core/handlers/SoulWardHandler.java +++ b/src/main/java/com/sammy/malum/core/handlers/SoulWardHandler.java @@ -30,12 +30,12 @@ import team.lodestar.lodestone.helpers.ItemHelper; import team.lodestar.lodestone.setup.LodestoneScreenParticleRegistry; import team.lodestar.lodestone.setup.LodestoneShaderRegistry; -import team.lodestar.lodestone.systems.particle.builder.*; -import team.lodestar.lodestone.systems.particle.data.color.ColorParticleData; +import team.lodestar.lodestone.systems.particle.builder.ScreenParticleBuilder; import team.lodestar.lodestone.systems.particle.data.GenericParticleData; +import team.lodestar.lodestone.systems.particle.data.color.ColorParticleData; import team.lodestar.lodestone.systems.particle.data.spin.SpinParticleData; import team.lodestar.lodestone.systems.rendering.VFXBuilders; -import team.lodestar.lodestone.systems.rendering.shader.*; +import team.lodestar.lodestone.systems.rendering.shader.ExtendedShaderInstance; public class SoulWardHandler { @@ -48,6 +48,7 @@ public CompoundTag serializeNBT() { tag.putFloat("soulWardProgress", soulWardProgress); return tag; } + public void deserializeNBT(CompoundTag tag) { soulWard = tag.getFloat("soulWard"); soulWardProgress = tag.getFloat("soulWardProgress"); @@ -206,6 +207,7 @@ public static void renderSoulWard(ForgeGui gui, GuiGraphics guiGraphics, int wid } } } + public static ResourceLocation getSoulWardTexture() { return MalumMod.malumPath("textures/gui/soul_ward/default.png"); } diff --git a/src/main/java/com/sammy/malum/core/handlers/TouchOfDarknessHandler.java b/src/main/java/com/sammy/malum/core/handlers/TouchOfDarknessHandler.java index d4af78edb..77d798a4e 100644 --- a/src/main/java/com/sammy/malum/core/handlers/TouchOfDarknessHandler.java +++ b/src/main/java/com/sammy/malum/core/handlers/TouchOfDarknessHandler.java @@ -1,35 +1,36 @@ package com.sammy.malum.core.handlers; -import com.mojang.blaze3d.systems.*; -import com.mojang.blaze3d.vertex.*; -import com.sammy.malum.common.block.curiosities.spirit_altar.*; -import com.sammy.malum.common.block.curiosities.weeping_well.*; -import com.sammy.malum.common.capability.*; -import com.sammy.malum.common.packets.*; -import com.sammy.malum.registry.client.*; +import com.mojang.blaze3d.systems.RenderSystem; +import com.mojang.blaze3d.vertex.PoseStack; +import com.mojang.blaze3d.vertex.Tesselator; +import com.sammy.malum.common.block.curiosities.weeping_well.PrimordialSoupBlock; +import com.sammy.malum.common.block.curiosities.weeping_well.VoidConduitBlockEntity; +import com.sammy.malum.common.capability.MalumLivingEntityDataCapability; +import com.sammy.malum.common.packets.VoidRejectionPacket; +import com.sammy.malum.registry.client.ShaderRegistry; import com.sammy.malum.registry.common.*; -import net.minecraft.client.*; +import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiGraphics; -import net.minecraft.nbt.*; -import net.minecraft.network.chat.*; -import net.minecraft.sounds.*; -import net.minecraft.util.*; -import net.minecraft.world.damagesource.*; -import net.minecraft.world.effect.*; -import net.minecraft.world.entity.*; -import net.minecraft.world.entity.ai.attributes.*; -import net.minecraft.world.entity.player.*; -import net.minecraft.world.level.block.state.*; -import net.minecraftforge.common.*; -import net.minecraftforge.event.entity.living.*; -import net.minecraftforge.network.*; -import team.lodestar.lodestone.helpers.*; -import team.lodestar.lodestone.systems.easing.*; -import team.lodestar.lodestone.systems.rendering.*; -import team.lodestar.lodestone.systems.rendering.shader.*; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.sounds.SoundSource; +import net.minecraft.util.Mth; +import net.minecraft.world.effect.MobEffectInstance; +import net.minecraft.world.entity.Entity; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.entity.ai.attributes.AttributeInstance; +import net.minecraft.world.entity.ai.attributes.AttributeModifier; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraftforge.common.ForgeMod; +import net.minecraftforge.event.entity.living.LivingEvent; +import net.minecraftforge.network.PacketDistributor; +import team.lodestar.lodestone.helpers.BlockHelper; +import team.lodestar.lodestone.systems.easing.Easing; +import team.lodestar.lodestone.systems.rendering.VFXBuilders; +import team.lodestar.lodestone.systems.rendering.shader.ExtendedShaderInstance; -import java.util.*; -import java.util.function.*; +import java.util.UUID; +import java.util.function.Consumer; public class TouchOfDarknessHandler { @@ -144,8 +145,7 @@ public static void entityTick(LivingEvent.LivingTickEvent event) { gravity.addTransientModifier(getEntityGravityAttributeModifier(livingEntity)); } gravity.setDirty(); - } - else if (hasModifier) { + } else if (hasModifier) { gravity.removeModifier(GRAVITY_MODIFIER_UUID); } } @@ -154,7 +154,7 @@ else if (hasModifier) { handler.timeSpentInGoop++; boolean isPlayer = livingEntity instanceof Player; if (isPlayer && livingEntity.level().getGameTime() % 6L == 0) { - livingEntity.level().playSound(null, livingEntity.blockPosition(), SoundRegistry.SONG_OF_THE_VOID.get(), SoundSource.HOSTILE, 0.5f+handler.timeSpentInGoop*0.02f, 0.5f+handler.timeSpentInGoop*0.03f); + livingEntity.level().playSound(null, livingEntity.blockPosition(), SoundRegistry.SONG_OF_THE_VOID.get(), SoundSource.HOSTILE, 0.5f + handler.timeSpentInGoop * 0.02f, 0.5f + handler.timeSpentInGoop * 0.03f); } if (!isPlayer) { if (livingEntity.getDeltaMovement().y > 0) { diff --git a/src/main/java/com/sammy/malum/core/helper/SpiritHelper.java b/src/main/java/com/sammy/malum/core/helper/SpiritHelper.java index 272fef92a..74de4914b 100644 --- a/src/main/java/com/sammy/malum/core/helper/SpiritHelper.java +++ b/src/main/java/com/sammy/malum/core/helper/SpiritHelper.java @@ -5,13 +5,13 @@ import com.sammy.malum.common.entity.spirit.SpiritItemEntity; import com.sammy.malum.config.CommonConfig; import com.sammy.malum.core.listeners.SpiritDataReloadListener; +import com.sammy.malum.core.systems.recipe.SpiritWithCount; +import com.sammy.malum.core.systems.spirit.MalumEntitySpiritData; +import com.sammy.malum.core.systems.spirit.MalumSpiritType; import com.sammy.malum.registry.common.AttributeRegistry; import com.sammy.malum.registry.common.SoundRegistry; import com.sammy.malum.registry.common.SpiritTypeRegistry; import com.sammy.malum.registry.common.item.EnchantmentRegistry; -import com.sammy.malum.core.systems.recipe.SpiritWithCount; -import com.sammy.malum.core.systems.spirit.MalumEntitySpiritData; -import com.sammy.malum.core.systems.spirit.MalumSpiritType; import net.minecraft.resources.ResourceLocation; import net.minecraft.sounds.SoundSource; import net.minecraft.util.Mth; @@ -21,10 +21,12 @@ import net.minecraft.world.item.enchantment.EnchantmentHelper; import net.minecraft.world.level.Level; import net.minecraft.world.phys.Vec3; +import net.minecraftforge.registries.ForgeRegistries; import team.lodestar.lodestone.helpers.ItemHelper; import javax.annotation.Nullable; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; import java.util.List; import static net.minecraft.util.Mth.nextFloat; @@ -133,7 +135,7 @@ public static MalumSpiritType getSpiritType(String spirit) { } public static MalumEntitySpiritData getEntitySpiritData(LivingEntity entity) { - ResourceLocation key = entity.getType().getRegistryName(); + ResourceLocation key = ForgeRegistries.ENTITY_TYPES.getKey(entity.getType()); if (SpiritDataReloadListener.HAS_NO_DATA.contains(key)) return null; diff --git a/src/main/java/com/sammy/malum/core/listeners/ReapingDataReloadListener.java b/src/main/java/com/sammy/malum/core/listeners/ReapingDataReloadListener.java index a6e95c853..e4a783fb6 100644 --- a/src/main/java/com/sammy/malum/core/listeners/ReapingDataReloadListener.java +++ b/src/main/java/com/sammy/malum/core/listeners/ReapingDataReloadListener.java @@ -3,7 +3,6 @@ import com.google.gson.*; import com.sammy.malum.MalumMod; import com.sammy.malum.core.systems.reaping.MalumReapingDropsData; -import net.minecraft.core.Registry; import net.minecraft.resources.ResourceLocation; import net.minecraft.server.packs.resources.ResourceManager; import net.minecraft.server.packs.resources.SimpleJsonResourceReloadListener; diff --git a/src/main/java/com/sammy/malum/core/listeners/SpiritDataReloadListener.java b/src/main/java/com/sammy/malum/core/listeners/SpiritDataReloadListener.java index eb73a13c8..62caafb9a 100644 --- a/src/main/java/com/sammy/malum/core/listeners/SpiritDataReloadListener.java +++ b/src/main/java/com/sammy/malum/core/listeners/SpiritDataReloadListener.java @@ -3,10 +3,9 @@ import com.google.gson.*; import com.sammy.malum.MalumMod; import com.sammy.malum.core.helper.SpiritHelper; -import com.sammy.malum.registry.common.SpiritTypeRegistry; import com.sammy.malum.core.systems.recipe.SpiritWithCount; import com.sammy.malum.core.systems.spirit.MalumEntitySpiritData; -import net.minecraft.core.Registry; +import com.sammy.malum.registry.common.SpiritTypeRegistry; import net.minecraft.resources.ResourceLocation; import net.minecraft.server.packs.resources.ResourceManager; import net.minecraft.server.packs.resources.SimpleJsonResourceReloadListener; @@ -22,32 +21,32 @@ public class SpiritDataReloadListener extends SimpleJsonResourceReloadListener { public static final Set HAS_NO_DATA = new HashSet<>(); public static final MalumEntitySpiritData DEFAULT_MONSTER_SPIRIT_DATA = MalumEntitySpiritData - .builder(SpiritTypeRegistry.WICKED_SPIRIT) - .build(); + .builder(SpiritTypeRegistry.WICKED_SPIRIT) + .build(); public static final MalumEntitySpiritData DEFAULT_CREATURE_SPIRIT_DATA = MalumEntitySpiritData - .builder(SpiritTypeRegistry.SACRED_SPIRIT) - .build(); + .builder(SpiritTypeRegistry.SACRED_SPIRIT) + .build(); public static final MalumEntitySpiritData DEFAULT_AMBIENT_SPIRIT_DATA = MalumEntitySpiritData - .builder(SpiritTypeRegistry.AERIAL_SPIRIT) - .build(); + .builder(SpiritTypeRegistry.AERIAL_SPIRIT) + .build(); public static final MalumEntitySpiritData DEFAULT_WATER_CREATURE_SPIRIT_DATA = MalumEntitySpiritData - .builder(SpiritTypeRegistry.AQUEOUS_SPIRIT) - .withSpirit(SpiritTypeRegistry.SACRED_SPIRIT) - .build(); + .builder(SpiritTypeRegistry.AQUEOUS_SPIRIT) + .withSpirit(SpiritTypeRegistry.SACRED_SPIRIT) + .build(); public static final MalumEntitySpiritData DEFAULT_WATER_AMBIENT_SPIRIT_DATA = MalumEntitySpiritData - .builder(SpiritTypeRegistry.AQUEOUS_SPIRIT) - .build(); + .builder(SpiritTypeRegistry.AQUEOUS_SPIRIT) + .build(); public static final MalumEntitySpiritData DEFAULT_UNDERGROUND_WATER_CREATURE_SPIRIT_DATA = MalumEntitySpiritData - .builder(SpiritTypeRegistry.AQUEOUS_SPIRIT) - .withSpirit(SpiritTypeRegistry.EARTHEN_SPIRIT) - .build(); + .builder(SpiritTypeRegistry.AQUEOUS_SPIRIT) + .withSpirit(SpiritTypeRegistry.EARTHEN_SPIRIT) + .build(); public static final MalumEntitySpiritData DEFAULT_AXOLOTL_SPIRIT_DATA = MalumEntitySpiritData // They're their own category - .builder(SpiritTypeRegistry.AQUEOUS_SPIRIT, 2) - .withSpirit(SpiritTypeRegistry.SACRED_SPIRIT) - .build(); + .builder(SpiritTypeRegistry.AQUEOUS_SPIRIT, 2) + .withSpirit(SpiritTypeRegistry.SACRED_SPIRIT) + .build(); public static final MalumEntitySpiritData DEFAULT_BOSS_SPIRIT_DATA = MalumEntitySpiritData - .builder(SpiritTypeRegistry.ELDRITCH_SPIRIT, 2) - .build(); + .builder(SpiritTypeRegistry.ELDRITCH_SPIRIT, 2) + .build(); private static final Gson GSON = (new GsonBuilder()).create(); diff --git a/src/main/java/com/sammy/malum/core/systems/item/IVoidItem.java b/src/main/java/com/sammy/malum/core/systems/item/IVoidItem.java index c39324bc2..e43101a47 100644 --- a/src/main/java/com/sammy/malum/core/systems/item/IVoidItem.java +++ b/src/main/java/com/sammy/malum/core/systems/item/IVoidItem.java @@ -1,10 +1,10 @@ package com.sammy.malum.core.systems.item; -import com.sammy.malum.visual_effects.*; -import net.minecraft.world.item.*; -import net.minecraft.world.level.*; -import team.lodestar.lodestone.handlers.screenparticle.*; -import team.lodestar.lodestone.systems.particle.screen.*; +import com.sammy.malum.visual_effects.ScreenParticleEffects; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.level.Level; +import team.lodestar.lodestone.handlers.screenparticle.ParticleEmitterHandler; +import team.lodestar.lodestone.systems.particle.screen.ScreenParticleHolder; public interface IVoidItem extends ParticleEmitterHandler.ItemParticleSupplier { diff --git a/src/main/java/com/sammy/malum/core/systems/recipe/SpiritWithCount.java b/src/main/java/com/sammy/malum/core/systems/recipe/SpiritWithCount.java index 8c92e82b4..abf92dc4c 100644 --- a/src/main/java/com/sammy/malum/core/systems/recipe/SpiritWithCount.java +++ b/src/main/java/com/sammy/malum/core/systems/recipe/SpiritWithCount.java @@ -10,7 +10,6 @@ import net.minecraft.world.item.ItemStack; import team.lodestar.lodestone.systems.recipe.IRecipeComponent; -import java.util.ArrayList; import java.util.List; public class SpiritWithCount implements IRecipeComponent { @@ -18,7 +17,7 @@ public class SpiritWithCount implements IRecipeComponent { public final int count; public SpiritWithCount(ItemStack stack) { - this.type = ((SpiritShardItem)stack.getItem()).type; + this.type = ((SpiritShardItem) stack.getItem()).type; this.count = stack.getCount(); } @@ -44,6 +43,7 @@ public JsonObject serialize() { } return object; } + public Component getComponent() { return type.getSpiritJarCounterComponent(count); } diff --git a/src/main/java/com/sammy/malum/core/systems/rites/AuraRiteEffect.java b/src/main/java/com/sammy/malum/core/systems/rites/AuraRiteEffect.java index e9b04f0ff..58b1dcbaa 100644 --- a/src/main/java/com/sammy/malum/core/systems/rites/AuraRiteEffect.java +++ b/src/main/java/com/sammy/malum/core/systems/rites/AuraRiteEffect.java @@ -29,14 +29,14 @@ public AuraRiteEffect(Class targetClass, Supplier { if (!e.hasEffect(effect.get())) { - MALUM_CHANNEL.send(PacketDistributor.TRACKING_ENTITY_AND_SELF.with(() -> e), new MajorEntityEffectParticlePacket(spirit.getPrimaryColor(), e.getX(), e.getY()+ e.getBbHeight() / 2f, e.getZ())); + MALUM_CHANNEL.send(PacketDistributor.TRACKING_ENTITY_AND_SELF.with(() -> e), new MajorEntityEffectParticlePacket(spirit.getPrimaryColor(), e.getX(), e.getY() + e.getBbHeight() / 2f, e.getZ())); } e.addEffect(new MobEffectInstance(effect.get(), getEffectDuration(), getEffectAmplifier(), true, true)); }); diff --git a/src/main/java/com/sammy/malum/core/systems/rites/BlockAffectingRiteEffect.java b/src/main/java/com/sammy/malum/core/systems/rites/BlockAffectingRiteEffect.java index bee0e19d4..82c84fd58 100644 --- a/src/main/java/com/sammy/malum/core/systems/rites/BlockAffectingRiteEffect.java +++ b/src/main/java/com/sammy/malum/core/systems/rites/BlockAffectingRiteEffect.java @@ -16,6 +16,6 @@ public BlockPos getRiteEffectCenter(TotemBaseBlockEntity totemBase) { @Override public int getRiteEffectTickRate() { - return BASE_TICK_RATE*5; + return BASE_TICK_RATE * 5; } } \ No newline at end of file diff --git a/src/main/java/com/sammy/malum/core/systems/rites/EntityAffectingRiteEffect.java b/src/main/java/com/sammy/malum/core/systems/rites/EntityAffectingRiteEffect.java index 8553b499b..b5f28d1ee 100644 --- a/src/main/java/com/sammy/malum/core/systems/rites/EntityAffectingRiteEffect.java +++ b/src/main/java/com/sammy/malum/core/systems/rites/EntityAffectingRiteEffect.java @@ -8,11 +8,11 @@ public EntityAffectingRiteEffect() { @Override public int getRiteEffectTickRate() { - return BASE_TICK_RATE*2; + return BASE_TICK_RATE * 2; } @Override public int getRiteEffectRadius() { - return BASE_RADIUS*2; + return BASE_RADIUS * 2; } } \ No newline at end of file diff --git a/src/main/java/com/sammy/malum/core/systems/rites/MalumRiteType.java b/src/main/java/com/sammy/malum/core/systems/rites/MalumRiteType.java index 9a51156d6..592833397 100644 --- a/src/main/java/com/sammy/malum/core/systems/rites/MalumRiteType.java +++ b/src/main/java/com/sammy/malum/core/systems/rites/MalumRiteType.java @@ -30,16 +30,16 @@ public MalumRiteType(String identifier, String basicName, String corruptName, Ma public MalumRiteType(String identifier, String basicName, MalumSpiritType... spirits) { this(identifier, - basicName, - ("Twisted " + basicName) - .replaceAll("Twisted Greater", "Warped"), - spirits); + basicName, + ("Twisted " + basicName) + .replaceAll("Twisted Greater", "Warped"), + spirits); } public MalumRiteType(String identifier, MalumSpiritType... spirits) { this(identifier, - DataHelper.toTitleCase(identifier, "_"), - spirits); + DataHelper.toTitleCase(identifier, "_"), + spirits); } public String translationIdentifier(boolean corrupt) { diff --git a/src/main/java/com/sammy/malum/core/systems/spirit/MalumEntitySpiritData.java b/src/main/java/com/sammy/malum/core/systems/spirit/MalumEntitySpiritData.java index 17921eecf..4bfc89149 100644 --- a/src/main/java/com/sammy/malum/core/systems/spirit/MalumEntitySpiritData.java +++ b/src/main/java/com/sammy/malum/core/systems/spirit/MalumEntitySpiritData.java @@ -2,8 +2,8 @@ import com.google.gson.JsonSyntaxException; import com.sammy.malum.core.helper.SpiritHelper; -import com.sammy.malum.registry.common.SpiritTypeRegistry; import com.sammy.malum.core.systems.recipe.SpiritWithCount; +import com.sammy.malum.registry.common.SpiritTypeRegistry; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.Tag; import net.minecraft.network.chat.Component; diff --git a/src/main/java/com/sammy/malum/core/systems/spirit/MalumSpiritType.java b/src/main/java/com/sammy/malum/core/systems/spirit/MalumSpiritType.java index a71a4bfc5..036ae6538 100644 --- a/src/main/java/com/sammy/malum/core/systems/spirit/MalumSpiritType.java +++ b/src/main/java/com/sammy/malum/core/systems/spirit/MalumSpiritType.java @@ -1,25 +1,27 @@ package com.sammy.malum.core.systems.spirit; -import com.sammy.malum.*; -import com.sammy.malum.common.block.mana_mote.*; -import com.sammy.malum.common.item.spirit.*; -import com.sammy.malum.registry.common.*; -import com.sammy.malum.registry.common.block.*; -import net.minecraft.*; +import com.sammy.malum.MalumMod; +import com.sammy.malum.common.block.mana_mote.SpiritMoteBlock; +import com.sammy.malum.common.item.spirit.SpiritShardItem; +import com.sammy.malum.registry.common.SpiritTypeRegistry; +import com.sammy.malum.registry.common.block.BlockRegistry; +import net.minecraft.ChatFormatting; import net.minecraft.network.chat.Component; -import net.minecraft.network.chat.*; -import net.minecraft.resources.*; -import net.minecraft.world.item.*; -import net.minecraft.world.level.block.*; -import net.minecraft.world.level.block.state.*; -import net.minecraft.world.level.block.state.properties.*; -import net.minecraft.world.phys.*; -import team.lodestar.lodestone.helpers.*; -import team.lodestar.lodestone.systems.easing.*; -import team.lodestar.lodestone.systems.particle.data.color.*; +import net.minecraft.network.chat.Style; +import net.minecraft.network.chat.TextColor; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.item.Rarity; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.level.block.state.properties.BlockStateProperties; +import net.minecraft.world.phys.BlockHitResult; +import team.lodestar.lodestone.helpers.ColorHelper; +import team.lodestar.lodestone.systems.easing.Easing; +import team.lodestar.lodestone.systems.particle.data.color.ColorParticleData; +import team.lodestar.lodestone.systems.particle.data.color.ColorParticleDataBuilder; import java.awt.*; -import java.util.function.*; +import java.util.function.Supplier; public class MalumSpiritType { @@ -81,7 +83,7 @@ public ColorParticleDataBuilder createMainColorData() { } public ColorParticleDataBuilder createMainColorData(float coefficientMultiplier) { - return ColorParticleData.create(primaryColor, secondaryColor).setCoefficient(mainColorCoefficient*coefficientMultiplier).setEasing(mainColorEasing); + return ColorParticleData.create(primaryColor, secondaryColor).setCoefficient(mainColorCoefficient * coefficientMultiplier).setEasing(mainColorEasing); } public ColorParticleDataBuilder createBloomColorData() { @@ -89,7 +91,7 @@ public ColorParticleDataBuilder createBloomColorData() { } public ColorParticleDataBuilder createBloomColorData(float coefficientMultiplier) { - return ColorParticleData.create(primaryBloomColor, secondaryBloomColor).setCoefficient(bloomColorCoefficient*coefficientMultiplier).setEasing(bloomColorEasing); + return ColorParticleData.create(primaryBloomColor, secondaryBloomColor).setCoefficient(bloomColorCoefficient * coefficientMultiplier).setEasing(bloomColorEasing); } public Rarity getItemRarity() { diff --git a/src/main/java/com/sammy/malum/core/systems/spirit/SpiritTypeBuilder.java b/src/main/java/com/sammy/malum/core/systems/spirit/SpiritTypeBuilder.java index e6d744459..bc4fa37b6 100644 --- a/src/main/java/com/sammy/malum/core/systems/spirit/SpiritTypeBuilder.java +++ b/src/main/java/com/sammy/malum/core/systems/spirit/SpiritTypeBuilder.java @@ -1,11 +1,12 @@ package com.sammy.malum.core.systems.spirit; -import com.sammy.malum.common.block.mana_mote.*; -import com.sammy.malum.common.item.spirit.*; -import team.lodestar.lodestone.systems.easing.*; +import com.sammy.malum.common.block.mana_mote.SpiritMoteBlock; +import com.sammy.malum.common.item.spirit.SpiritShardItem; +import team.lodestar.lodestone.systems.easing.Easing; import java.awt.*; -import java.util.function.*; +import java.util.function.Function; +import java.util.function.Supplier; public class SpiritTypeBuilder { @@ -31,9 +32,11 @@ public SpiritTypeBuilder(String identifier, Supplier spiritShar this.spiritShard = spiritShard; this.spiritMote = spiritMote; } + public SpiritTypeBuilder setColorData(Color primaryColor, Color secondaryColor, float colorCoefficient) { return setMainColorData(primaryColor, secondaryColor, colorCoefficient).setBloomColorData(primaryColor, secondaryColor, colorCoefficient); } + public SpiritTypeBuilder setColorData(Color primaryColor, Color secondaryColor, float colorCoefficient, Easing easing) { return setMainColorData(primaryColor, secondaryColor, colorCoefficient, easing).setBloomColorData(primaryColor, secondaryColor, colorCoefficient, easing); } diff --git a/src/main/java/com/sammy/malum/core/systems/spirit/SpiritTypeProperty.java b/src/main/java/com/sammy/malum/core/systems/spirit/SpiritTypeProperty.java index 872076a1e..a69a4ad70 100644 --- a/src/main/java/com/sammy/malum/core/systems/spirit/SpiritTypeProperty.java +++ b/src/main/java/com/sammy/malum/core/systems/spirit/SpiritTypeProperty.java @@ -11,52 +11,52 @@ public class SpiritTypeProperty extends Property { - private final ImmutableSet values; - private final Map types = Maps.newHashMap(); - - public SpiritTypeProperty(String name, Collection types) { - super(name, String.class); - this.values = ImmutableSet.copyOf(types.stream().map(s -> s.identifier).collect(Collectors.toList())); - - for (MalumSpiritType type : types) { - if (this.types.containsKey(type.identifier)) { - throw new IllegalArgumentException("Multiple values have the same name '" + type.identifier + "'"); - } - - this.types.put(type.identifier, type); - } - } - - @Override - public Collection getPossibleValues() { - return this.values; - } - - @Override - public Optional getValue(String value) { - return values.stream().filter(v -> v.equals(value)).findAny(); - } - - @Override - public String getName(String value) { - return value; - } - - @Override - public boolean equals(Object pOther) { - if (this == pOther) { - return true; - } else if (pOther instanceof SpiritTypeProperty property && super.equals(pOther)) { - return this.values.equals(property.values) && this.types.equals(property.types); - } else { - return false; - } - } - - @Override - public int generateHashCode() { - int i = super.generateHashCode(); - i = 31 * i + this.values.hashCode(); - return 31 * i + this.types.hashCode(); - } + private final ImmutableSet values; + private final Map types = Maps.newHashMap(); + + public SpiritTypeProperty(String name, Collection types) { + super(name, String.class); + this.values = ImmutableSet.copyOf(types.stream().map(s -> s.identifier).collect(Collectors.toList())); + + for (MalumSpiritType type : types) { + if (this.types.containsKey(type.identifier)) { + throw new IllegalArgumentException("Multiple values have the same name '" + type.identifier + "'"); + } + + this.types.put(type.identifier, type); + } + } + + @Override + public Collection getPossibleValues() { + return this.values; + } + + @Override + public Optional getValue(String value) { + return values.stream().filter(v -> v.equals(value)).findAny(); + } + + @Override + public String getName(String value) { + return value; + } + + @Override + public boolean equals(Object pOther) { + if (this == pOther) { + return true; + } else if (pOther instanceof SpiritTypeProperty property && super.equals(pOther)) { + return this.values.equals(property.values) && this.types.equals(property.types); + } else { + return false; + } + } + + @Override + public int generateHashCode() { + int i = super.generateHashCode(); + i = 31 * i + this.values.hashCode(); + return 31 * i + this.types.hashCode(); + } } \ No newline at end of file diff --git a/src/main/java/com/sammy/malum/data/BiomeModifications.java b/src/main/java/com/sammy/malum/data/BiomeModifications.java new file mode 100644 index 000000000..a4952f94b --- /dev/null +++ b/src/main/java/com/sammy/malum/data/BiomeModifications.java @@ -0,0 +1,62 @@ +package com.sammy.malum.data; + +import com.sammy.malum.MalumMod; +import com.sammy.malum.registry.common.worldgen.BiomeTagRegistry; +import com.sammy.malum.registry.common.worldgen.PlacedFeatureRegistry; +import net.minecraft.core.Holder; +import net.minecraft.core.HolderSet; +import net.minecraft.core.registries.Registries; +import net.minecraft.data.worldgen.BootstapContext; +import net.minecraft.resources.ResourceKey; +import net.minecraft.tags.TagKey; +import net.minecraft.world.level.biome.Biome; +import net.minecraft.world.level.levelgen.GenerationStep; +import net.minecraft.world.level.levelgen.placement.PlacedFeature; +import net.minecraftforge.common.world.BiomeModifier; +import net.minecraftforge.common.world.ForgeBiomeModifiers; +import net.minecraftforge.registries.ForgeRegistries; + +import java.util.ArrayList; +import java.util.List; +import java.util.function.Supplier; + +public class BiomeModifications { + public static void bootstrap(BootstapContext context) { + register(context, "soulstone_ore", () -> + addFeatureModifier(context, + getPlacedHolderSet(context, PlacedFeatureRegistry.ORE_SOULSTONE), + BiomeTagRegistry.HAS_SOULSTONE, GenerationStep.Decoration.UNDERGROUND_ORES)); + + register(context, "brilliant_ore", () -> + addFeatureModifier(context, + getPlacedHolderSet(context, PlacedFeatureRegistry.ORE_BRILLIANT), + BiomeTagRegistry.HAS_BRILLIANT, GenerationStep.Decoration.UNDERGROUND_ORES)); + + register(context, "natural_quartz_ore", () -> + addFeatureModifier(context, + getPlacedHolderSet(context, PlacedFeatureRegistry.ORE_NATURAL_QUARTZ), + BiomeTagRegistry.HAS_SOULSTONE, GenerationStep.Decoration.UNDERGROUND_ORES)); + + register(context, "runwood_tree", () -> + addFeatureModifier(context, + getPlacedHolderSet(context, PlacedFeatureRegistry.RUNEWOOD_TREE), + BiomeTagRegistry.HAS_RUNEWOOD, GenerationStep.Decoration.VEGETAL_DECORATION)); + + } + + public static HolderSet getPlacedHolderSet(BootstapContext context, ResourceKey... placedFeatures) { + List> holders = new ArrayList<>(); + for (ResourceKey feature : placedFeatures) { + holders.add(context.lookup(Registries.PLACED_FEATURE).getOrThrow(feature)); + } + return HolderSet.direct(holders); + } + + private static ForgeBiomeModifiers.AddFeaturesBiomeModifier addFeatureModifier(BootstapContext context, HolderSet placedSet, TagKey biomeTag, GenerationStep.Decoration decoration) { + return new ForgeBiomeModifiers.AddFeaturesBiomeModifier(context.lookup(Registries.BIOME).getOrThrow(biomeTag), placedSet, decoration); + } + + private static void register(BootstapContext context, String name, Supplier modifier) { + context.register(ResourceKey.create(ForgeRegistries.Keys.BIOME_MODIFIERS, MalumMod.malumPath(name)), modifier.get()); + } +} diff --git a/src/main/java/com/sammy/malum/data/DataGenerators.java b/src/main/java/com/sammy/malum/data/DataGenerators.java new file mode 100644 index 000000000..bdfac88ac --- /dev/null +++ b/src/main/java/com/sammy/malum/data/DataGenerators.java @@ -0,0 +1,62 @@ +package com.sammy.malum.data; + +import com.sammy.malum.MalumMod; +import com.sammy.malum.data.block.MalumBlockLootTables; +import com.sammy.malum.data.block.MalumBlockStates; +import com.sammy.malum.data.block.MalumBlockTags; +import com.sammy.malum.data.item.MalumItemModels; +import com.sammy.malum.data.recipe.*; +import net.minecraft.DetectedVersion; +import net.minecraft.core.HolderLookup; +import net.minecraft.data.DataGenerator; +import net.minecraft.data.PackOutput; +import net.minecraft.data.metadata.PackMetadataGenerator; +import net.minecraft.network.chat.Component; +import net.minecraft.server.packs.PackType; +import net.minecraft.server.packs.metadata.pack.PackMetadataSection; +import net.minecraftforge.common.data.DatapackBuiltinEntriesProvider; +import net.minecraftforge.common.data.ExistingFileHelper; +import net.minecraftforge.data.event.GatherDataEvent; +import net.minecraftforge.eventbus.api.SubscribeEvent; +import net.minecraftforge.fml.common.Mod; + +import java.util.Arrays; +import java.util.concurrent.CompletableFuture; +import java.util.function.Function; +import java.util.stream.Collectors; + +@Mod.EventBusSubscriber(modid = MalumMod.MALUM, bus = Mod.EventBusSubscriber.Bus.MOD) +public class DataGenerators { + + @SubscribeEvent + public static void gatherData(GatherDataEvent event) { + DataGenerator generator = event.getGenerator(); + PackOutput output = generator.getPackOutput(); + CompletableFuture provider = event.getLookupProvider(); + ExistingFileHelper helper = event.getExistingFileHelper(); + + + MalumItemModels itemModelsProvider = new MalumItemModels(output, helper); + MalumBlockTags blockTagsProvider = new MalumBlockTags(output, provider, helper); + + generator.addProvider(event.includeClient(), new MalumBlockStates(output, helper, itemModelsProvider)); + generator.addProvider(event.includeClient(), itemModelsProvider); + + + //TODO generator.addProvider(event.includeServer(), blockTagsProvider); + generator.addProvider(event.includeServer(), new MalumBlockLootTables(output)); + //TODO generator.addProvider(event.includeServer(), new MalumItemTags(output, provider, blockTagsProvider.contentsGetter(), helper)); + + generator.addProvider(event.includeServer(), new MalumRecipes(output)); + generator.addProvider(event.includeServer(), new MalumVanillaRecipeReplacements(output)); + generator.addProvider(event.includeServer(), new MalumSpiritInfusionRecipes(output)); + generator.addProvider(event.includeServer(), new MalumSpiritFocusingRecipes(output)); + generator.addProvider(event.includeServer(), new MalumSpiritTransmutationRecipes(output)); + generator.addProvider(event.includeServer(), new MalumVoidFavorRecipes(output)); + + generator.addProvider(event.includeServer(), new MalumBiomeTags(output, provider, helper)); + + generator.addProvider(event.includeServer(), new RegistryDataGenerator(output, provider)); + generator.addProvider(event.includeClient(), new MalumLang(output)); + } +} diff --git a/src/main/java/com/sammy/malum/data/MalumBiomeTags.java b/src/main/java/com/sammy/malum/data/MalumBiomeTags.java new file mode 100644 index 000000000..bd4c321e2 --- /dev/null +++ b/src/main/java/com/sammy/malum/data/MalumBiomeTags.java @@ -0,0 +1,30 @@ +package com.sammy.malum.data; + +import com.sammy.malum.MalumMod; +import com.sammy.malum.registry.common.worldgen.BiomeTagRegistry; +import net.minecraft.core.HolderLookup; +import net.minecraft.core.registries.Registries; +import net.minecraft.data.PackOutput; +import net.minecraft.data.tags.BiomeTagsProvider; +import net.minecraft.tags.BiomeTags; +import net.minecraftforge.common.Tags; +import net.minecraftforge.common.data.ExistingFileHelper; +import org.jetbrains.annotations.Nullable; + +import java.util.concurrent.CompletableFuture; + +public class MalumBiomeTags extends BiomeTagsProvider { + + public MalumBiomeTags(PackOutput pOutput, CompletableFuture pProvider, @Nullable ExistingFileHelper existingFileHelper) { + super(pOutput, pProvider, MalumMod.MALUM, existingFileHelper); + } + + @Override + protected void addTags(HolderLookup.Provider pProvider) { + //super.addTags(pProvider); + tag(BiomeTagRegistry.HAS_SOULSTONE).addTag(BiomeTags.IS_OVERWORLD); + tag(BiomeTagRegistry.HAS_BRILLIANT).addTag(BiomeTags.IS_OVERWORLD); + tag(BiomeTagRegistry.HAS_BLAZING_QUARTZ).addTag(BiomeTags.IS_NETHER); + tag(BiomeTagRegistry.HAS_RUNEWOOD).addTag(BiomeTags.IS_OVERWORLD);//Todo change to Forest and add rare for plains + } +} diff --git a/src/main/java/com/sammy/malum/data/MalumLang.java b/src/main/java/com/sammy/malum/data/MalumLang.java index 78073456a..bc660ba5e 100644 --- a/src/main/java/com/sammy/malum/data/MalumLang.java +++ b/src/main/java/com/sammy/malum/data/MalumLang.java @@ -13,6 +13,7 @@ import com.sammy.malum.registry.common.SpiritTypeRegistry; import com.sammy.malum.registry.common.block.BlockRegistry; import net.minecraft.data.DataGenerator; +import net.minecraft.data.PackOutput; import net.minecraft.sounds.SoundEvent; import net.minecraft.world.effect.MobEffect; import net.minecraft.world.entity.EntityType; @@ -25,6 +26,7 @@ import net.minecraft.world.level.block.WallSignBlock; import net.minecraft.world.level.block.WallTorchBlock; import net.minecraftforge.common.data.LanguageProvider; +import net.minecraftforge.registries.ForgeRegistries; import net.minecraftforge.registries.RegistryObject; import team.lodestar.lodestone.helpers.DataHelper; @@ -43,7 +45,7 @@ import static com.sammy.malum.registry.common.item.ItemRegistry.ITEMS; public class MalumLang extends LanguageProvider { - public MalumLang(DataGenerator gen) { + public MalumLang(PackOutput gen) { super(gen, MalumMod.MALUM, "en_us"); } @@ -99,17 +101,17 @@ protected void addTranslations() { effects.forEach(e -> { String alteredPath = e.getId().getPath().replaceFirst("s_", "'s_"); String name = DataHelper.toTitleCase(alteredPath, "_"); - add("effect.malum." + e.get().getRegistryName().getPath(), name); + add("effect.malum." + ForgeRegistries.MOB_EFFECTS.getKey(e.get()).getPath(), name); }); attributes.forEach(a -> { String name = DataHelper.toTitleCase(a.getId().getPath(), "_"); - add("attribute.name.malum." + a.get().getRegistryName().getPath(), name); + add("attribute.name.malum." + ForgeRegistries.ATTRIBUTES.getKey(a.get()).getPath(), name); }); entities.forEach(e -> { String name = DataHelper.toTitleCase(e.getId().getPath(), "_"); - add("entity.malum." + e.get().getRegistryName().getPath(), name); + add("entity.malum." + ForgeRegistries.ENTITY_TYPES.getKey(e.get()).getPath(), name); }); rites.forEach(r -> { @@ -336,7 +338,7 @@ protected void addTranslations() { addHeadline("spirit_trinkets.guardian_ring", "Ring of the Guardian"); addPages("spirit_trinkets.guardian_ring", "As a first attempt to create a trinket using these as a base, I have designed one that mimics Soulstained Armor's Soul Ward."); - + addEntryHeader("reactive_trinkets", "Reactive Trinkets", "Harnessing the harvest"); addHeadline("reactive_trinkets.ring_of_curative_talent", "Ring of Curative Talent"); addPages("reactive_trinkets.ring_of_curative_talent", diff --git a/src/main/java/com/sammy/malum/data/MalumRecipes.java b/src/main/java/com/sammy/malum/data/MalumRecipes.java index bda85f3ab..e17fe9e8c 100644 --- a/src/main/java/com/sammy/malum/data/MalumRecipes.java +++ b/src/main/java/com/sammy/malum/data/MalumRecipes.java @@ -1,35 +1,44 @@ package com.sammy.malum.data; -import com.sammy.malum.*; -import com.sammy.malum.common.item.impetus.*; -import com.sammy.malum.data.recipe.builder.vanilla.*; -import com.sammy.malum.registry.common.item.*; +import com.sammy.malum.MalumMod; +import com.sammy.malum.common.item.impetus.ImpetusItem; +import com.sammy.malum.data.recipe.builder.vanilla.TheDeviceRecipeBuilder; +import com.sammy.malum.registry.common.item.ItemRegistry; +import com.sammy.malum.registry.common.item.ItemTagRegistry; import net.minecraft.advancements.critereon.*; -import net.minecraft.core.*; -import net.minecraft.data.*; -import net.minecraft.data.recipes.*; -import net.minecraft.tags.*; -import net.minecraft.world.item.*; -import net.minecraft.world.item.crafting.*; -import net.minecraft.world.level.*; -import net.minecraft.world.level.block.*; -import net.minecraftforge.common.*; -import net.minecraftforge.common.crafting.*; -import net.minecraftforge.common.crafting.conditions.*; -import net.minecraftforge.registries.*; -import team.lodestar.lodestone.data.builder.*; -import team.lodestar.lodestone.systems.recipe.*; - -import java.util.function.*; - -import static com.sammy.malum.MalumMod.*; -import static com.sammy.malum.data.recipe.builder.vanilla.MetalNodeCookingRecipeBuilder.*; -import static com.sammy.malum.data.recipe.builder.vanilla.StackedMalumCookingRecipeBuilder.*; -import static net.minecraft.data.recipes.ShapedRecipeBuilder.*; -import static net.minecraft.data.recipes.ShapelessRecipeBuilder.*; -import static net.minecraft.data.recipes.SimpleCookingRecipeBuilder.smoking; +import net.minecraft.data.PackOutput; +import net.minecraft.data.recipes.FinishedRecipe; +import net.minecraft.data.recipes.RecipeCategory; +import net.minecraft.data.recipes.RecipeProvider; +import net.minecraft.tags.ItemTags; +import net.minecraft.tags.TagKey; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.Items; +import net.minecraft.world.item.crafting.Ingredient; +import net.minecraft.world.level.ItemLike; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.Blocks; +import net.minecraftforge.common.Tags; +import net.minecraftforge.common.crafting.ConditionalRecipe; +import net.minecraftforge.common.crafting.conditions.IConditionBuilder; +import net.minecraftforge.common.crafting.conditions.TagEmptyCondition; +import net.minecraftforge.registries.ForgeRegistries; +import net.minecraftforge.registries.RegistryObject; +import team.lodestar.lodestone.data.builder.NBTCarryRecipeBuilder; +import team.lodestar.lodestone.systems.recipe.IngredientWithCount; + +import java.util.function.Consumer; +import java.util.function.Supplier; + +import static com.sammy.malum.MalumMod.malumPath; +import static com.sammy.malum.data.recipe.builder.vanilla.MetalNodeCookingRecipeBuilder.blastingWithTag; +import static com.sammy.malum.data.recipe.builder.vanilla.MetalNodeCookingRecipeBuilder.smeltingWithTag; +import static com.sammy.malum.data.recipe.builder.vanilla.StackedMalumCookingRecipeBuilder.blastingWithCount; +import static com.sammy.malum.data.recipe.builder.vanilla.StackedMalumCookingRecipeBuilder.smeltingWithCount; +import static net.minecraft.data.recipes.ShapedRecipeBuilder.shaped; +import static net.minecraft.data.recipes.ShapelessRecipeBuilder.shapeless; import static net.minecraft.data.recipes.SimpleCookingRecipeBuilder.*; -import static net.minecraft.data.recipes.SingleItemRecipeBuilder.*; +import static net.minecraft.data.recipes.SingleItemRecipeBuilder.stonecutting; import static team.lodestar.lodestone.registry.common.tag.LodestoneItemTags.*; public class MalumRecipes extends RecipeProvider implements IConditionBuilder { @@ -38,6 +47,11 @@ public MalumRecipes(PackOutput pOutput) { super(pOutput); } + @Override + public String getName() { + return "Malum Recipe Provider"; + } + @Override protected void buildRecipes(Consumer consumer) { //KEY ITEMS @@ -64,14 +78,14 @@ protected void buildRecipes(Consumer consumer) { shapeless(RecipeCategory.MISC, ItemRegistry.HALLOWED_GOLD_INGOT.get(), 9).requires(ItemRegistry.BLOCK_OF_HALLOWED_GOLD.get()).unlockedBy("has_hallowed_gold", has(ItemRegistry.HALLOWED_GOLD_INGOT.get())).save(consumer, malumPath("hallowed_gold_from_block")); //NODES - smeltingWithCount(Ingredient.of(ItemRegistry.IRON_NODE.get()), Items.IRON_NUGGET, 6, 0.25f, 200).unlockedBy("has_impetus", has(ItemRegistry.IRON_IMPETUS.get())).save(consumer, malumPath("iron_from_node_smelting")); - blastingWithCount(Ingredient.of(ItemRegistry.IRON_NODE.get()), Items.IRON_NUGGET, 6, 0.25f, 100).unlockedBy("has_impetus", has(ItemRegistry.IRON_IMPETUS.get())).save(consumer, malumPath("iron_from_node_blasting")); + smeltingWithCount(Ingredient.of(ItemRegistry.IRON_NODE.get()), RecipeCategory.MISC, Items.IRON_NUGGET, 6, 0.25f, 200).unlockedBy("has_impetus", has(ItemRegistry.IRON_IMPETUS.get())).save(consumer, malumPath("iron_from_node_smelting")); + blastingWithCount(Ingredient.of(ItemRegistry.IRON_NODE.get()), RecipeCategory.MISC,Items.IRON_NUGGET, 6, 0.25f, 100).unlockedBy("has_impetus", has(ItemRegistry.IRON_IMPETUS.get())).save(consumer, malumPath("iron_from_node_blasting")); - smeltingWithCount(Ingredient.of(ItemRegistry.GOLD_NODE.get()), Items.GOLD_NUGGET, 6, 0.25f, 200).unlockedBy("has_impetus", has(ItemRegistry.GOLD_IMPETUS.get())).save(consumer, malumPath("gold_from_node_smelting")); - blastingWithCount(Ingredient.of(ItemRegistry.GOLD_NODE.get()), Items.GOLD_NUGGET, 6, 0.25f, 100).unlockedBy("has_impetus", has(ItemRegistry.GOLD_IMPETUS.get())).save(consumer, malumPath("gold_from_node_blasting")); + smeltingWithCount(Ingredient.of(ItemRegistry.GOLD_NODE.get()), RecipeCategory.MISC,Items.GOLD_NUGGET, 6, 0.25f, 200).unlockedBy("has_impetus", has(ItemRegistry.GOLD_IMPETUS.get())).save(consumer, malumPath("gold_from_node_smelting")); + blastingWithCount(Ingredient.of(ItemRegistry.GOLD_NODE.get()), RecipeCategory.MISC,Items.GOLD_NUGGET, 6, 0.25f, 100).unlockedBy("has_impetus", has(ItemRegistry.GOLD_IMPETUS.get())).save(consumer, malumPath("gold_from_node_blasting")); - smeltingWithCount(Ingredient.of(ItemRegistry.COPPER_NODE.get()), ItemRegistry.COPPER_NUGGET.get(), 6, 0.25f, 200).unlockedBy("has_impetus", has(ItemRegistry.COPPER_IMPETUS.get())).save(consumer, malumPath("copper_from_node_smelting")); - blastingWithCount(Ingredient.of(ItemRegistry.COPPER_NODE.get()), ItemRegistry.COPPER_NUGGET.get(), 6, 0.25f, 100).unlockedBy("has_impetus", has(ItemRegistry.COPPER_IMPETUS.get())).save(consumer, malumPath("copper_from_node_blasting")); + smeltingWithCount(Ingredient.of(ItemRegistry.COPPER_NODE.get()), RecipeCategory.MISC,ItemRegistry.COPPER_NUGGET.get(), 6, 0.25f, 200).unlockedBy("has_impetus", has(ItemRegistry.COPPER_IMPETUS.get())).save(consumer, malumPath("copper_from_node_smelting")); + blastingWithCount(Ingredient.of(ItemRegistry.COPPER_NODE.get()), RecipeCategory.MISC,ItemRegistry.COPPER_NUGGET.get(), 6, 0.25f, 100).unlockedBy("has_impetus", has(ItemRegistry.COPPER_IMPETUS.get())).save(consumer, malumPath("copper_from_node_blasting")); nodeSmelting(consumer, ItemRegistry.LEAD_IMPETUS, ItemRegistry.LEAD_NODE, NUGGETS_LEAD); nodeSmelting(consumer, ItemRegistry.SILVER_IMPETUS, ItemRegistry.SILVER_NODE, NUGGETS_SILVER); @@ -109,31 +123,31 @@ protected void buildRecipes(Consumer consumer) { shapeless(RecipeCategory.MISC, ItemRegistry.COPPER_NUGGET.get(), 9).requires(INGOTS_COPPER).unlockedBy("has_copper", has(INGOTS_COPPER)).save(consumer, malumPath("copper_nugget_from_ingot")); //ORE SMELTING - smelting(Ingredient.of(ItemRegistry.BLAZING_QUARTZ_ORE.get()),RecipeCategory.MISC, ItemRegistry.BLAZING_QUARTZ.get(), 0.25f, 200).unlockedBy("has_blazing_quartz", has(ItemRegistry.BLAZING_QUARTZ.get())).save(consumer, malumPath("blazing_quartz_from_smelting")); + smelting(Ingredient.of(ItemRegistry.BLAZING_QUARTZ_ORE.get()), RecipeCategory.MISC, ItemRegistry.BLAZING_QUARTZ.get(), 0.25f, 200).unlockedBy("has_blazing_quartz", has(ItemRegistry.BLAZING_QUARTZ.get())).save(consumer, malumPath("blazing_quartz_from_smelting")); blasting(Ingredient.of(ItemRegistry.BLAZING_QUARTZ_ORE.get()), RecipeCategory.MISC, ItemRegistry.BLAZING_QUARTZ.get(), 0.25f, 100).unlockedBy("has_blazing_quartz", has(ItemRegistry.BLAZING_QUARTZ.get())).save(consumer, malumPath("blazing_quartz_from_blasting")); smelting(Ingredient.of(ItemRegistry.NATURAL_QUARTZ_ORE.get()), RecipeCategory.MISC, ItemRegistry.NATURAL_QUARTZ.get(), 0.25f, 200).unlockedBy("has_natural_quartz", has(ItemRegistry.NATURAL_QUARTZ.get())).save(consumer, malumPath("natural_quartz_from_smelting")); blasting(Ingredient.of(ItemRegistry.NATURAL_QUARTZ_ORE.get()), RecipeCategory.MISC, ItemRegistry.NATURAL_QUARTZ.get(), 0.25f, 100).unlockedBy("has_natural_quartz", has(ItemRegistry.NATURAL_QUARTZ.get())).save(consumer, malumPath("natural_quartz_from_blasting")); smelting(Ingredient.of(ItemRegistry.DEEPSLATE_QUARTZ_ORE.get()), RecipeCategory.MISC, ItemRegistry.NATURAL_QUARTZ.get(), 0.25f, 200).unlockedBy("has_natural_quartz", has(ItemRegistry.NATURAL_QUARTZ.get())).save(consumer, malumPath("natural_quartz_from_deepslate_smelting")); blasting(Ingredient.of(ItemRegistry.DEEPSLATE_QUARTZ_ORE.get()), RecipeCategory.MISC, ItemRegistry.NATURAL_QUARTZ.get(), 0.25f, 100).unlockedBy("has_natural_quartz", has(ItemRegistry.NATURAL_QUARTZ.get())).save(consumer, malumPath("natural_quartz_from_deepslate_blasting")); - smeltingWithCount(Ingredient.of(ItemRegistry.BRILLIANT_STONE.get()), ItemRegistry.CHUNK_OF_BRILLIANCE.get(), 2, 1, 200).unlockedBy("has_brilliance", has(ItemRegistry.CLUSTER_OF_BRILLIANCE.get())).save(consumer, malumPath("brilliance_from_smelting")); - blastingWithCount(Ingredient.of(ItemRegistry.BRILLIANT_STONE.get()), ItemRegistry.CHUNK_OF_BRILLIANCE.get(), 2, 1, 100).unlockedBy("has_brilliance", has(ItemRegistry.CLUSTER_OF_BRILLIANCE.get())).save(consumer, malumPath("brilliance_from_blasting")); - smeltingWithCount(Ingredient.of(ItemRegistry.BRILLIANT_DEEPSLATE.get()), ItemRegistry.CHUNK_OF_BRILLIANCE.get(), 2, 1, 200).unlockedBy("has_brilliance", has(ItemRegistry.CLUSTER_OF_BRILLIANCE.get())).save(consumer, malumPath("brilliance_from_deepslate_smelting")); - blastingWithCount(Ingredient.of(ItemRegistry.BRILLIANT_DEEPSLATE.get()), ItemRegistry.CHUNK_OF_BRILLIANCE.get(), 2, 1, 100).unlockedBy("has_brilliance", has(ItemRegistry.CLUSTER_OF_BRILLIANCE.get())).save(consumer, malumPath("brilliance_from_deepslate_blasting")); - smeltingWithCount(Ingredient.of(ItemRegistry.SOULSTONE_ORE.get()), ItemRegistry.PROCESSED_SOULSTONE.get(), 2, 0.25f, 200).unlockedBy("has_soulstone", has(ItemRegistry.RAW_SOULSTONE.get())).save(consumer, malumPath("soulstone_from_smelting")); - blastingWithCount(Ingredient.of(ItemRegistry.SOULSTONE_ORE.get()), ItemRegistry.PROCESSED_SOULSTONE.get(), 2, 0.25f, 100).unlockedBy("has_soulstone", has(ItemRegistry.RAW_SOULSTONE.get())).save(consumer, malumPath("soulstone_from_blasting")); - smeltingWithCount(Ingredient.of(ItemRegistry.DEEPSLATE_SOULSTONE_ORE.get()), ItemRegistry.PROCESSED_SOULSTONE.get(), 2, 0.25f, 200).unlockedBy("has_soulstone", has(ItemRegistry.RAW_SOULSTONE.get())).save(consumer, malumPath("soulstone_from_deepslate_smelting")); - blastingWithCount(Ingredient.of(ItemRegistry.DEEPSLATE_SOULSTONE_ORE.get()), ItemRegistry.PROCESSED_SOULSTONE.get(), 2, 0.25f, 100).unlockedBy("has_soulstone", has(ItemRegistry.RAW_SOULSTONE.get())).save(consumer, malumPath("soulstone_from_deepslate_blasting")); + smeltingWithCount(Ingredient.of(ItemRegistry.BRILLIANT_STONE.get()), RecipeCategory.MISC, ItemRegistry.CHUNK_OF_BRILLIANCE.get(), 2, 1, 200).unlockedBy("has_brilliance", has(ItemRegistry.CLUSTER_OF_BRILLIANCE.get())).save(consumer, malumPath("brilliance_from_smelting")); + blastingWithCount(Ingredient.of(ItemRegistry.BRILLIANT_STONE.get()), RecipeCategory.MISC, ItemRegistry.CHUNK_OF_BRILLIANCE.get(), 2, 1, 100).unlockedBy("has_brilliance", has(ItemRegistry.CLUSTER_OF_BRILLIANCE.get())).save(consumer, malumPath("brilliance_from_blasting")); + smeltingWithCount(Ingredient.of(ItemRegistry.BRILLIANT_DEEPSLATE.get()), RecipeCategory.MISC, ItemRegistry.CHUNK_OF_BRILLIANCE.get(), 2, 1, 200).unlockedBy("has_brilliance", has(ItemRegistry.CLUSTER_OF_BRILLIANCE.get())).save(consumer, malumPath("brilliance_from_deepslate_smelting")); + blastingWithCount(Ingredient.of(ItemRegistry.BRILLIANT_DEEPSLATE.get()), RecipeCategory.MISC, ItemRegistry.CHUNK_OF_BRILLIANCE.get(), 2, 1, 100).unlockedBy("has_brilliance", has(ItemRegistry.CLUSTER_OF_BRILLIANCE.get())).save(consumer, malumPath("brilliance_from_deepslate_blasting")); + smeltingWithCount(Ingredient.of(ItemRegistry.SOULSTONE_ORE.get()), RecipeCategory.MISC, ItemRegistry.PROCESSED_SOULSTONE.get(), 2, 0.25f, 200).unlockedBy("has_soulstone", has(ItemRegistry.RAW_SOULSTONE.get())).save(consumer, malumPath("soulstone_from_smelting")); + blastingWithCount(Ingredient.of(ItemRegistry.SOULSTONE_ORE.get()), RecipeCategory.MISC, ItemRegistry.PROCESSED_SOULSTONE.get(), 2, 0.25f, 100).unlockedBy("has_soulstone", has(ItemRegistry.RAW_SOULSTONE.get())).save(consumer, malumPath("soulstone_from_blasting")); + smeltingWithCount(Ingredient.of(ItemRegistry.DEEPSLATE_SOULSTONE_ORE.get()), RecipeCategory.MISC, ItemRegistry.PROCESSED_SOULSTONE.get(), 2, 0.25f, 200).unlockedBy("has_soulstone", has(ItemRegistry.RAW_SOULSTONE.get())).save(consumer, malumPath("soulstone_from_deepslate_smelting")); + blastingWithCount(Ingredient.of(ItemRegistry.DEEPSLATE_SOULSTONE_ORE.get()), RecipeCategory.MISC, ItemRegistry.PROCESSED_SOULSTONE.get(), 2, 0.25f, 100).unlockedBy("has_soulstone", has(ItemRegistry.RAW_SOULSTONE.get())).save(consumer, malumPath("soulstone_from_deepslate_blasting")); smelting(Ingredient.of(ItemRegistry.BLOCK_OF_CTHONIC_GOLD.get()), RecipeCategory.MISC, ItemRegistry.CTHONIC_GOLD.get(), 2.0f, 200).unlockedBy("has_cthonic_gold", has(ItemRegistry.CTHONIC_GOLD.get())).save(consumer, malumPath("cthonic_gold_from_smelting")); blasting(Ingredient.of(ItemRegistry.BLOCK_OF_CTHONIC_GOLD.get()), RecipeCategory.MISC, ItemRegistry.CTHONIC_GOLD.get(), 2.0f, 100).unlockedBy("has_cthonic_gold", has(ItemRegistry.CTHONIC_GOLD.get())).save(consumer, malumPath("cthonic_gold_from_blasting")); - smeltingWithCount(Ingredient.of(ItemRegistry.CLUSTER_OF_BRILLIANCE.get()), ItemRegistry.CHUNK_OF_BRILLIANCE.get(), 2, 1, 200).unlockedBy("has_brilliance", has(ItemRegistry.CLUSTER_OF_BRILLIANCE.get())).save(consumer, malumPath("brilliance_from_raw_smelting")); - blastingWithCount(Ingredient.of(ItemRegistry.CLUSTER_OF_BRILLIANCE.get()), ItemRegistry.CHUNK_OF_BRILLIANCE.get(), 2, 1, 100).unlockedBy("has_brilliance", has(ItemRegistry.CLUSTER_OF_BRILLIANCE.get())).save(consumer, malumPath("brilliance_from_raw_blasting")); - smeltingWithCount(Ingredient.of(ItemRegistry.CRUSHED_BRILLIANCE.get()), ItemRegistry.CHUNK_OF_BRILLIANCE.get(), 2, 1, 200).unlockedBy("has_brilliance", has(ItemRegistry.CLUSTER_OF_BRILLIANCE.get())).save(consumer, malumPath("brilliance_from_crushed_smelting")); - blastingWithCount(Ingredient.of(ItemRegistry.CRUSHED_BRILLIANCE.get()), ItemRegistry.CHUNK_OF_BRILLIANCE.get(), 2, 1, 100).unlockedBy("has_brilliance", has(ItemRegistry.CLUSTER_OF_BRILLIANCE.get())).save(consumer, malumPath("brilliance_from_crushed_blasting")); - smeltingWithCount(Ingredient.of(ItemRegistry.RAW_SOULSTONE.get()), ItemRegistry.PROCESSED_SOULSTONE.get(), 2, 0.25f, 200).unlockedBy("has_soulstone", has(ItemRegistry.RAW_SOULSTONE.get())).save(consumer, malumPath("soulstone_from_raw_smelting")); - blastingWithCount(Ingredient.of(ItemRegistry.RAW_SOULSTONE.get()), ItemRegistry.PROCESSED_SOULSTONE.get(), 2, 0.25f, 100).unlockedBy("has_soulstone", has(ItemRegistry.RAW_SOULSTONE.get())).save(consumer, malumPath("soulstone_from_raw_blasting")); - smeltingWithCount(Ingredient.of(ItemRegistry.CRUSHED_SOULSTONE.get()), ItemRegistry.PROCESSED_SOULSTONE.get(), 2, 0.25f, 200).unlockedBy("has_soulstone", has(ItemRegistry.RAW_SOULSTONE.get())).save(consumer, malumPath("soulstone_from_crushed_smelting")); - blastingWithCount(Ingredient.of(ItemRegistry.CRUSHED_SOULSTONE.get()), ItemRegistry.PROCESSED_SOULSTONE.get(), 2, 0.25f, 100).unlockedBy("has_soulstone", has(ItemRegistry.RAW_SOULSTONE.get())).save(consumer, malumPath("soulstone_from_crushed_blasting")); + smeltingWithCount(Ingredient.of(ItemRegistry.CLUSTER_OF_BRILLIANCE.get()), RecipeCategory.MISC, ItemRegistry.CHUNK_OF_BRILLIANCE.get(), 2, 1, 200).unlockedBy("has_brilliance", has(ItemRegistry.CLUSTER_OF_BRILLIANCE.get())).save(consumer, malumPath("brilliance_from_raw_smelting")); + blastingWithCount(Ingredient.of(ItemRegistry.CLUSTER_OF_BRILLIANCE.get()), RecipeCategory.MISC, ItemRegistry.CHUNK_OF_BRILLIANCE.get(), 2, 1, 100).unlockedBy("has_brilliance", has(ItemRegistry.CLUSTER_OF_BRILLIANCE.get())).save(consumer, malumPath("brilliance_from_raw_blasting")); + smeltingWithCount(Ingredient.of(ItemRegistry.CRUSHED_BRILLIANCE.get()), RecipeCategory.MISC, ItemRegistry.CHUNK_OF_BRILLIANCE.get(), 2, 1, 200).unlockedBy("has_brilliance", has(ItemRegistry.CLUSTER_OF_BRILLIANCE.get())).save(consumer, malumPath("brilliance_from_crushed_smelting")); + blastingWithCount(Ingredient.of(ItemRegistry.CRUSHED_BRILLIANCE.get()), RecipeCategory.MISC, ItemRegistry.CHUNK_OF_BRILLIANCE.get(), 2, 1, 100).unlockedBy("has_brilliance", has(ItemRegistry.CLUSTER_OF_BRILLIANCE.get())).save(consumer, malumPath("brilliance_from_crushed_blasting")); + smeltingWithCount(Ingredient.of(ItemRegistry.RAW_SOULSTONE.get()), RecipeCategory.MISC, ItemRegistry.PROCESSED_SOULSTONE.get(), 2, 0.25f, 200).unlockedBy("has_soulstone", has(ItemRegistry.RAW_SOULSTONE.get())).save(consumer, malumPath("soulstone_from_raw_smelting")); + blastingWithCount(Ingredient.of(ItemRegistry.RAW_SOULSTONE.get()), RecipeCategory.MISC, ItemRegistry.PROCESSED_SOULSTONE.get(), 2, 0.25f, 100).unlockedBy("has_soulstone", has(ItemRegistry.RAW_SOULSTONE.get())).save(consumer, malumPath("soulstone_from_raw_blasting")); + smeltingWithCount(Ingredient.of(ItemRegistry.CRUSHED_SOULSTONE.get()), RecipeCategory.MISC, ItemRegistry.PROCESSED_SOULSTONE.get(), 2, 0.25f, 200).unlockedBy("has_soulstone", has(ItemRegistry.RAW_SOULSTONE.get())).save(consumer, malumPath("soulstone_from_crushed_smelting")); + blastingWithCount(Ingredient.of(ItemRegistry.CRUSHED_SOULSTONE.get()), RecipeCategory.MISC, ItemRegistry.PROCESSED_SOULSTONE.get(), 2, 0.25f, 100).unlockedBy("has_soulstone", has(ItemRegistry.RAW_SOULSTONE.get())).save(consumer, malumPath("soulstone_from_crushed_blasting")); //RAW ORE BLOCKS shaped(RecipeCategory.MISC, ItemRegistry.BLOCK_OF_RAW_SOULSTONE.get()).define('#', ItemRegistry.RAW_SOULSTONE.get()).pattern("###").pattern("###").pattern("###").unlockedBy("has_soulstone", has(ItemRegistry.RAW_SOULSTONE.get())).save(consumer, malumPath("raw_soulstone_block")); @@ -274,31 +288,31 @@ protected void buildRecipes(Consumer consumer) { shaped(RecipeCategory.MISC, ItemRegistry.POLISHED_TAINTED_ROCK.get(), 4).define('#', ItemRegistry.TAINTED_ROCK.get()).pattern("##").pattern("##").unlockedBy("has_tainted_rock", has(ItemRegistry.TAINTED_ROCK.get())).save(consumer); shaped(RecipeCategory.MISC, ItemRegistry.POLISHED_TAINTED_ROCK_SLAB.get(), 6).define('#', ItemRegistry.POLISHED_TAINTED_ROCK.get()).pattern("###").unlockedBy("has_tainted_rock", has(ItemRegistry.TAINTED_ROCK.get())).save(consumer); shaped(RecipeCategory.MISC, ItemRegistry.POLISHED_TAINTED_ROCK_STAIRS.get(), 4).define('#', ItemRegistry.POLISHED_TAINTED_ROCK.get()).pattern("# ").pattern("## ").pattern("###").unlockedBy("has_tainted_rock", has(ItemRegistry.TAINTED_ROCK.get())).save(consumer); - stonecutting(Ingredient.of(ItemRegistry.POLISHED_TAINTED_ROCK.get()),RecipeCategory.MISC, ItemRegistry.POLISHED_TAINTED_ROCK_SLAB.get(), 2).unlockedBy("has_polished_tainted_rock", has(ItemRegistry.POLISHED_TAINTED_ROCK.get())).save(consumer, malumPath("polished_tainted_rock_slab_stonecutting")); - stonecutting(Ingredient.of(ItemRegistry.POLISHED_TAINTED_ROCK.get()),RecipeCategory.MISC, ItemRegistry.POLISHED_TAINTED_ROCK_STAIRS.get()).unlockedBy("has_polished_tainted_rock", has(ItemRegistry.POLISHED_TAINTED_ROCK.get())).save(consumer, malumPath("polished_tainted_rock_stairs_stonecutting")); + stonecutting(Ingredient.of(ItemRegistry.POLISHED_TAINTED_ROCK.get()), RecipeCategory.MISC, ItemRegistry.POLISHED_TAINTED_ROCK_SLAB.get(), 2).unlockedBy("has_polished_tainted_rock", has(ItemRegistry.POLISHED_TAINTED_ROCK.get())).save(consumer, malumPath("polished_tainted_rock_slab_stonecutting")); + stonecutting(Ingredient.of(ItemRegistry.POLISHED_TAINTED_ROCK.get()), RecipeCategory.MISC, ItemRegistry.POLISHED_TAINTED_ROCK_STAIRS.get()).unlockedBy("has_polished_tainted_rock", has(ItemRegistry.POLISHED_TAINTED_ROCK.get())).save(consumer, malumPath("polished_tainted_rock_stairs_stonecutting")); - smelting(Ingredient.of(ItemRegistry.TAINTED_ROCK.get()),RecipeCategory.MISC, ItemRegistry.SMOOTH_TAINTED_ROCK.get(), 0.1f, 200).unlockedBy("has_tainted_rock", has(ItemRegistry.TAINTED_ROCK.get())).save(consumer); + smelting(Ingredient.of(ItemRegistry.TAINTED_ROCK.get()), RecipeCategory.MISC, ItemRegistry.SMOOTH_TAINTED_ROCK.get(), 0.1f, 200).unlockedBy("has_tainted_rock", has(ItemRegistry.TAINTED_ROCK.get())).save(consumer); shaped(RecipeCategory.MISC, ItemRegistry.SMOOTH_TAINTED_ROCK_SLAB.get(), 6).define('#', ItemRegistry.SMOOTH_TAINTED_ROCK.get()).pattern("###").unlockedBy("has_tainted_rock", has(ItemRegistry.TAINTED_ROCK.get())).save(consumer); shaped(RecipeCategory.MISC, ItemRegistry.SMOOTH_TAINTED_ROCK_STAIRS.get(), 4).define('#', ItemRegistry.SMOOTH_TAINTED_ROCK.get()).pattern("# ").pattern("## ").pattern("###").unlockedBy("has_tainted_rock", has(ItemRegistry.TAINTED_ROCK.get())).save(consumer); stonecutting(Ingredient.of(ItemRegistry.SMOOTH_TAINTED_ROCK.get()), RecipeCategory.MISC, ItemRegistry.SMOOTH_TAINTED_ROCK_SLAB.get(), 2).unlockedBy("has_smooth_tainted_rock", has(ItemRegistry.POLISHED_TAINTED_ROCK.get())).save(consumer, malumPath("smooth_tainted_rock_slab_stonecutting")); - stonecutting(Ingredient.of(ItemRegistry.SMOOTH_TAINTED_ROCK.get()),RecipeCategory.MISC, ItemRegistry.SMOOTH_TAINTED_ROCK_STAIRS.get()).unlockedBy("has_smooth_tainted_rock", has(ItemRegistry.POLISHED_TAINTED_ROCK.get())).save(consumer, malumPath("smooth_tainted_rock_stairs_stonecutting")); + stonecutting(Ingredient.of(ItemRegistry.SMOOTH_TAINTED_ROCK.get()), RecipeCategory.MISC, ItemRegistry.SMOOTH_TAINTED_ROCK_STAIRS.get()).unlockedBy("has_smooth_tainted_rock", has(ItemRegistry.POLISHED_TAINTED_ROCK.get())).save(consumer, malumPath("smooth_tainted_rock_stairs_stonecutting")); shaped(RecipeCategory.MISC, ItemRegistry.TAINTED_ROCK_BRICKS.get(), 4).define('#', ItemRegistry.POLISHED_TAINTED_ROCK.get()).pattern("##").pattern("##").unlockedBy("has_tainted_rock", has(ItemRegistry.TAINTED_ROCK.get())).save(consumer); shaped(RecipeCategory.MISC, ItemRegistry.TAINTED_ROCK_BRICKS.get(), 4).define('#', ItemRegistry.SMALL_TAINTED_ROCK_BRICKS.get()).pattern("##").pattern("##").unlockedBy("has_tainted_rock", has(ItemRegistry.TAINTED_ROCK.get())).save(consumer, malumPath("tainted_rock_bricks_from_small_bricks")); shaped(RecipeCategory.MISC, ItemRegistry.TAINTED_ROCK_BRICKS_SLAB.get(), 6).define('#', ItemRegistry.TAINTED_ROCK_BRICKS.get()).pattern("###").unlockedBy("has_tainted_rock", has(ItemRegistry.TAINTED_ROCK.get())).save(consumer); shaped(RecipeCategory.MISC, ItemRegistry.TAINTED_ROCK_BRICKS_STAIRS.get(), 4).define('#', ItemRegistry.TAINTED_ROCK_BRICKS.get()).pattern("# ").pattern("## ").pattern("###").unlockedBy("has_tainted_rock", has(ItemRegistry.TAINTED_ROCK.get())).save(consumer); shaped(RecipeCategory.MISC, ItemRegistry.TAINTED_ROCK_BRICKS_WALL.get(), 6).define('#', ItemRegistry.TAINTED_ROCK_BRICKS.get()).pattern("###").pattern("###").unlockedBy("has_tainted_rock", has(ItemRegistry.TAINTED_ROCK.get())).save(consumer); - stonecutting(Ingredient.of(ItemRegistry.POLISHED_TAINTED_ROCK.get()),RecipeCategory.MISC, ItemRegistry.TAINTED_ROCK_BRICKS.get()).unlockedBy("has_tainted_rock", has(ItemRegistry.TAINTED_ROCK.get())).save(consumer, malumPath("tainted_rock_bricks_stonecutting_from_polished")); - stonecutting(Ingredient.of(ItemRegistry.TAINTED_ROCK_BRICKS.get()),RecipeCategory.MISC, ItemRegistry.TAINTED_ROCK_BRICKS_SLAB.get(), 2).unlockedBy("has_tainted_rock", has(ItemRegistry.TAINTED_ROCK.get())).save(consumer, malumPath("tainted_rock_bricks_slab_stonecutting")); - stonecutting(Ingredient.of(ItemRegistry.TAINTED_ROCK_BRICKS.get()),RecipeCategory.MISC, ItemRegistry.TAINTED_ROCK_BRICKS_STAIRS.get()).unlockedBy("has_tainted_rock", has(ItemRegistry.TAINTED_ROCK.get())).save(consumer, malumPath("tainted_rock_bricks_stairs_stonecutting")); - stonecutting(Ingredient.of(ItemRegistry.TAINTED_ROCK_BRICKS.get()),RecipeCategory.MISC, ItemRegistry.TAINTED_ROCK_BRICKS_WALL.get()).unlockedBy("has_tainted_rock", has(ItemRegistry.TAINTED_ROCK.get())).save(consumer, malumPath("tainted_rock_brick_wall_stonecutting")); + stonecutting(Ingredient.of(ItemRegistry.POLISHED_TAINTED_ROCK.get()), RecipeCategory.MISC, ItemRegistry.TAINTED_ROCK_BRICKS.get()).unlockedBy("has_tainted_rock", has(ItemRegistry.TAINTED_ROCK.get())).save(consumer, malumPath("tainted_rock_bricks_stonecutting_from_polished")); + stonecutting(Ingredient.of(ItemRegistry.TAINTED_ROCK_BRICKS.get()), RecipeCategory.MISC, ItemRegistry.TAINTED_ROCK_BRICKS_SLAB.get(), 2).unlockedBy("has_tainted_rock", has(ItemRegistry.TAINTED_ROCK.get())).save(consumer, malumPath("tainted_rock_bricks_slab_stonecutting")); + stonecutting(Ingredient.of(ItemRegistry.TAINTED_ROCK_BRICKS.get()), RecipeCategory.MISC, ItemRegistry.TAINTED_ROCK_BRICKS_STAIRS.get()).unlockedBy("has_tainted_rock", has(ItemRegistry.TAINTED_ROCK.get())).save(consumer, malumPath("tainted_rock_bricks_stairs_stonecutting")); + stonecutting(Ingredient.of(ItemRegistry.TAINTED_ROCK_BRICKS.get()), RecipeCategory.MISC, ItemRegistry.TAINTED_ROCK_BRICKS_WALL.get()).unlockedBy("has_tainted_rock", has(ItemRegistry.TAINTED_ROCK.get())).save(consumer, malumPath("tainted_rock_brick_wall_stonecutting")); shaped(RecipeCategory.MISC, ItemRegistry.RUNIC_TAINTED_ROCK_BRICKS_WALL.get(), 6).define('#', ItemRegistry.RUNIC_TAINTED_ROCK_BRICKS.get()).pattern("###").pattern("###").unlockedBy("has_tainted_rock", has(ItemRegistry.TAINTED_ROCK.get())).save(consumer); - smelting(Ingredient.of(ItemRegistry.TAINTED_ROCK_BRICKS.get()),RecipeCategory.MISC, ItemRegistry.RUNIC_TAINTED_ROCK_BRICKS.get(), 0.1f, 200).unlockedBy("has_tainted_rock", has(ItemRegistry.TAINTED_ROCK.get())).save(consumer); + smelting(Ingredient.of(ItemRegistry.TAINTED_ROCK_BRICKS.get()), RecipeCategory.MISC, ItemRegistry.RUNIC_TAINTED_ROCK_BRICKS.get(), 0.1f, 200).unlockedBy("has_tainted_rock", has(ItemRegistry.TAINTED_ROCK.get())).save(consumer); shaped(RecipeCategory.MISC, ItemRegistry.RUNIC_TAINTED_ROCK_BRICKS_SLAB.get(), 6).define('#', ItemRegistry.RUNIC_TAINTED_ROCK_BRICKS.get()).pattern("###").unlockedBy("has_cracked_tainted_rock", has(ItemRegistry.TAINTED_ROCK.get())).save(consumer); shaped(RecipeCategory.MISC, ItemRegistry.RUNIC_TAINTED_ROCK_BRICKS_STAIRS.get(), 4).define('#', ItemRegistry.RUNIC_TAINTED_ROCK_BRICKS.get()).pattern("# ").pattern("## ").pattern("###").unlockedBy("has_cracked_tainted_rock", has(ItemRegistry.TAINTED_ROCK.get())).save(consumer); - stonecutting(Ingredient.of(ItemRegistry.RUNIC_TAINTED_ROCK_BRICKS.get()),RecipeCategory.MISC, ItemRegistry.RUNIC_TAINTED_ROCK_BRICKS_SLAB.get(), 2).unlockedBy("has_cracked_tainted_rock_bricks", has(ItemRegistry.RUNIC_TAINTED_ROCK_BRICKS.get())).save(consumer, malumPath("cracked_tainted_rock_bricks_slab_stonecutting")); - stonecutting(Ingredient.of(ItemRegistry.RUNIC_TAINTED_ROCK_BRICKS.get()),RecipeCategory.MISC, ItemRegistry.RUNIC_TAINTED_ROCK_BRICKS_STAIRS.get()).unlockedBy("has_cracked_tainted_rock_bricks", has(ItemRegistry.RUNIC_TAINTED_ROCK_BRICKS.get())).save(consumer, malumPath("cracked_tainted_rock_bricks_stairs_stonecutting")); + stonecutting(Ingredient.of(ItemRegistry.RUNIC_TAINTED_ROCK_BRICKS.get()), RecipeCategory.MISC, ItemRegistry.RUNIC_TAINTED_ROCK_BRICKS_SLAB.get(), 2).unlockedBy("has_cracked_tainted_rock_bricks", has(ItemRegistry.RUNIC_TAINTED_ROCK_BRICKS.get())).save(consumer, malumPath("cracked_tainted_rock_bricks_slab_stonecutting")); + stonecutting(Ingredient.of(ItemRegistry.RUNIC_TAINTED_ROCK_BRICKS.get()), RecipeCategory.MISC, ItemRegistry.RUNIC_TAINTED_ROCK_BRICKS_STAIRS.get()).unlockedBy("has_cracked_tainted_rock_bricks", has(ItemRegistry.RUNIC_TAINTED_ROCK_BRICKS.get())).save(consumer, malumPath("cracked_tainted_rock_bricks_stairs_stonecutting")); shaped(RecipeCategory.MISC, ItemRegistry.TAINTED_ROCK_TILES.get(), 4).define('#', ItemRegistry.TAINTED_ROCK_BRICKS.get()).pattern("##").pattern("##").unlockedBy("has_tainted_rock", has(ItemRegistry.TAINTED_ROCK.get())).save(consumer); shaped(RecipeCategory.MISC, ItemRegistry.TAINTED_ROCK_TILES_SLAB.get(), 6).define('#', ItemRegistry.TAINTED_ROCK_TILES.get()).pattern("###").unlockedBy("has_tainted_rock", has(ItemRegistry.TAINTED_ROCK.get())).save(consumer); @@ -306,19 +320,19 @@ protected void buildRecipes(Consumer consumer) { shaped(RecipeCategory.MISC, ItemRegistry.TAINTED_ROCK_TILES_WALL.get(), 6).define('#', ItemRegistry.TAINTED_ROCK_TILES.get()).pattern("###").pattern("###").unlockedBy("has_tainted_rock", has(ItemRegistry.TAINTED_ROCK.get())).save(consumer); stonecutting(Ingredient.of(ItemRegistry.TAINTED_ROCK.get()), RecipeCategory.MISC, ItemRegistry.TAINTED_ROCK_TILES.get()).unlockedBy("has_tainted_rock", has(ItemRegistry.TAINTED_ROCK.get())).save(consumer, malumPath("tainted_rock_tiles_stonecutting")); stonecutting(Ingredient.of(ItemRegistry.POLISHED_TAINTED_ROCK.get()), RecipeCategory.MISC, ItemRegistry.TAINTED_ROCK_TILES.get()).unlockedBy("has_tainted_rock", has(ItemRegistry.TAINTED_ROCK.get())).save(consumer, malumPath("tainted_rock_tiles_stonecutting_from_polished")); - stonecutting(Ingredient.of(ItemRegistry.TAINTED_ROCK_BRICKS.get()),RecipeCategory.MISC, ItemRegistry.TAINTED_ROCK_TILES.get()).unlockedBy("has_tainted_rock", has(ItemRegistry.TAINTED_ROCK.get())).save(consumer, malumPath("tainted_rock_tiles_stonecutting_from_bricks")); + stonecutting(Ingredient.of(ItemRegistry.TAINTED_ROCK_BRICKS.get()), RecipeCategory.MISC, ItemRegistry.TAINTED_ROCK_TILES.get()).unlockedBy("has_tainted_rock", has(ItemRegistry.TAINTED_ROCK.get())).save(consumer, malumPath("tainted_rock_tiles_stonecutting_from_bricks")); stonecutting(Ingredient.of(ItemRegistry.TAINTED_ROCK_TILES.get()), RecipeCategory.MISC, ItemRegistry.TAINTED_ROCK_TILES_SLAB.get(), 2).unlockedBy("has_tainted_rock", has(ItemRegistry.TAINTED_ROCK.get())).save(consumer, malumPath("tainted_rock_tiles_slab_stonecutting")); - stonecutting(Ingredient.of(ItemRegistry.TAINTED_ROCK_TILES.get()),RecipeCategory.MISC, ItemRegistry.TAINTED_ROCK_TILES_STAIRS.get()).unlockedBy("has_tainted_rock", has(ItemRegistry.TAINTED_ROCK.get())).save(consumer, malumPath("tainted_rock_tiles_stairs_stonecutting")); - stonecutting(Ingredient.of(ItemRegistry.TAINTED_ROCK_TILES.get()),RecipeCategory.MISC, ItemRegistry.TAINTED_ROCK_TILES_WALL.get()).unlockedBy("has_tainted_rock", has(ItemRegistry.TAINTED_ROCK.get())).save(consumer, malumPath("tainted_rock_tiles_wall_stonecutting")); + stonecutting(Ingredient.of(ItemRegistry.TAINTED_ROCK_TILES.get()), RecipeCategory.MISC, ItemRegistry.TAINTED_ROCK_TILES_STAIRS.get()).unlockedBy("has_tainted_rock", has(ItemRegistry.TAINTED_ROCK.get())).save(consumer, malumPath("tainted_rock_tiles_stairs_stonecutting")); + stonecutting(Ingredient.of(ItemRegistry.TAINTED_ROCK_TILES.get()), RecipeCategory.MISC, ItemRegistry.TAINTED_ROCK_TILES_WALL.get()).unlockedBy("has_tainted_rock", has(ItemRegistry.TAINTED_ROCK.get())).save(consumer, malumPath("tainted_rock_tiles_wall_stonecutting")); smelting(Ingredient.of(ItemRegistry.TAINTED_ROCK_TILES.get()), RecipeCategory.MISC, ItemRegistry.RUNIC_TAINTED_ROCK_TILES.get(), 0.1f, 200).unlockedBy("has_tainted_rock", has(ItemRegistry.TAINTED_ROCK.get())).save(consumer); shaped(RecipeCategory.MISC, ItemRegistry.RUNIC_TAINTED_ROCK_TILES_SLAB.get(), 6).define('#', ItemRegistry.RUNIC_TAINTED_ROCK_TILES.get()).pattern("###").unlockedBy("has_cracked_tainted_rock", has(ItemRegistry.TAINTED_ROCK.get())).save(consumer); shaped(RecipeCategory.MISC, ItemRegistry.RUNIC_TAINTED_ROCK_TILES_STAIRS.get(), 4).define('#', ItemRegistry.RUNIC_TAINTED_ROCK_TILES.get()).pattern("# ").pattern("## ").pattern("###").unlockedBy("has_cracked_tainted_rock", has(ItemRegistry.TAINTED_ROCK.get())).save(consumer); shaped(RecipeCategory.MISC, ItemRegistry.RUNIC_TAINTED_ROCK_TILES_WALL.get(), 6).define('#', ItemRegistry.RUNIC_TAINTED_ROCK_TILES.get()).pattern("###").pattern("###").unlockedBy("has_tainted_rock", has(ItemRegistry.TAINTED_ROCK.get())).save(consumer); - stonecutting(Ingredient.of(ItemRegistry.RUNIC_TAINTED_ROCK_BRICKS.get()),RecipeCategory.MISC, ItemRegistry.RUNIC_TAINTED_ROCK_TILES.get()).unlockedBy("has_tainted_rock", has(ItemRegistry.TAINTED_ROCK.get())).save(consumer, malumPath("cracked_tainted_rock_tiles_stonecutting")); - stonecutting(Ingredient.of(ItemRegistry.RUNIC_TAINTED_ROCK_TILES.get()),RecipeCategory.MISC, ItemRegistry.RUNIC_TAINTED_ROCK_TILES_SLAB.get(), 2).unlockedBy("has_cracked_tainted_rock_tiles", has(ItemRegistry.RUNIC_TAINTED_ROCK_TILES.get())).save(consumer, malumPath("cracked_tainted_rock_tiles_slab_stonecutting")); - stonecutting(Ingredient.of(ItemRegistry.RUNIC_TAINTED_ROCK_TILES.get()),RecipeCategory.MISC, ItemRegistry.RUNIC_TAINTED_ROCK_TILES_STAIRS.get()).unlockedBy("has_cracked_tainted_rock_tiles", has(ItemRegistry.RUNIC_TAINTED_ROCK_TILES.get())).save(consumer, malumPath("cracked_tainted_rock_tiles_stairs_stonecutting")); - stonecutting(Ingredient.of(ItemRegistry.RUNIC_TAINTED_ROCK_TILES.get()),RecipeCategory.MISC, ItemRegistry.RUNIC_TAINTED_ROCK_TILES_WALL.get()).unlockedBy("has_tainted_rock", has(ItemRegistry.TAINTED_ROCK.get())).save(consumer, malumPath("cracked_tainted_rock_tiles_wall_stonecutting")); + stonecutting(Ingredient.of(ItemRegistry.RUNIC_TAINTED_ROCK_BRICKS.get()), RecipeCategory.MISC, ItemRegistry.RUNIC_TAINTED_ROCK_TILES.get()).unlockedBy("has_tainted_rock", has(ItemRegistry.TAINTED_ROCK.get())).save(consumer, malumPath("cracked_tainted_rock_tiles_stonecutting")); + stonecutting(Ingredient.of(ItemRegistry.RUNIC_TAINTED_ROCK_TILES.get()), RecipeCategory.MISC, ItemRegistry.RUNIC_TAINTED_ROCK_TILES_SLAB.get(), 2).unlockedBy("has_cracked_tainted_rock_tiles", has(ItemRegistry.RUNIC_TAINTED_ROCK_TILES.get())).save(consumer, malumPath("cracked_tainted_rock_tiles_slab_stonecutting")); + stonecutting(Ingredient.of(ItemRegistry.RUNIC_TAINTED_ROCK_TILES.get()), RecipeCategory.MISC, ItemRegistry.RUNIC_TAINTED_ROCK_TILES_STAIRS.get()).unlockedBy("has_cracked_tainted_rock_tiles", has(ItemRegistry.RUNIC_TAINTED_ROCK_TILES.get())).save(consumer, malumPath("cracked_tainted_rock_tiles_stairs_stonecutting")); + stonecutting(Ingredient.of(ItemRegistry.RUNIC_TAINTED_ROCK_TILES.get()), RecipeCategory.MISC, ItemRegistry.RUNIC_TAINTED_ROCK_TILES_WALL.get()).unlockedBy("has_tainted_rock", has(ItemRegistry.TAINTED_ROCK.get())).save(consumer, malumPath("cracked_tainted_rock_tiles_wall_stonecutting")); shaped(RecipeCategory.MISC, ItemRegistry.SMALL_TAINTED_ROCK_BRICKS.get(), 4).define('#', ItemRegistry.TAINTED_ROCK_TILES.get()).pattern("##").pattern("##").unlockedBy("has_tainted_rock", has(ItemRegistry.TAINTED_ROCK.get())).save(consumer); shaped(RecipeCategory.MISC, ItemRegistry.SMALL_TAINTED_ROCK_BRICKS_SLAB.get(), 6).define('#', ItemRegistry.SMALL_TAINTED_ROCK_BRICKS.get()).pattern("###").unlockedBy("has_tainted_rock", has(ItemRegistry.TAINTED_ROCK.get())).save(consumer); @@ -327,18 +341,18 @@ protected void buildRecipes(Consumer consumer) { stonecutting(Ingredient.of(ItemRegistry.TAINTED_ROCK.get()), RecipeCategory.MISC, ItemRegistry.SMALL_TAINTED_ROCK_BRICKS.get()).unlockedBy("has_tainted_rock", has(ItemRegistry.TAINTED_ROCK.get())).save(consumer, malumPath("small_tainted_rock_bricks_stonecutting")); stonecutting(Ingredient.of(ItemRegistry.TAINTED_ROCK_BRICKS.get()), RecipeCategory.MISC, ItemRegistry.SMALL_TAINTED_ROCK_BRICKS.get()).unlockedBy("has_tainted_rock", has(ItemRegistry.TAINTED_ROCK.get())).save(consumer, malumPath("small_tainted_rock_bricks_stonecutting_alt")); - stonecutting(Ingredient.of(ItemRegistry.SMALL_TAINTED_ROCK_BRICKS.get()),RecipeCategory.MISC, ItemRegistry.SMALL_TAINTED_ROCK_BRICKS_SLAB.get(), 2).unlockedBy("has_tainted_rock", has(ItemRegistry.TAINTED_ROCK.get())).save(consumer, malumPath("small_tainted_rock_bricks_slab_stonecutting")); - stonecutting(Ingredient.of(ItemRegistry.SMALL_TAINTED_ROCK_BRICKS.get()),RecipeCategory.MISC, ItemRegistry.SMALL_TAINTED_ROCK_BRICKS_STAIRS.get()).unlockedBy("has_tainted_rock", has(ItemRegistry.TAINTED_ROCK.get())).save(consumer, malumPath("small_tainted_rock_bricks_stairs_stonecutting")); - stonecutting(Ingredient.of(ItemRegistry.SMALL_TAINTED_ROCK_BRICKS.get()),RecipeCategory.MISC, ItemRegistry.SMALL_TAINTED_ROCK_BRICKS_WALL.get()).unlockedBy("has_tainted_rock", has(ItemRegistry.TAINTED_ROCK.get())).save(consumer, malumPath("small_tainted_rock_bricks_wall_stonecutting")); + stonecutting(Ingredient.of(ItemRegistry.SMALL_TAINTED_ROCK_BRICKS.get()), RecipeCategory.MISC, ItemRegistry.SMALL_TAINTED_ROCK_BRICKS_SLAB.get(), 2).unlockedBy("has_tainted_rock", has(ItemRegistry.TAINTED_ROCK.get())).save(consumer, malumPath("small_tainted_rock_bricks_slab_stonecutting")); + stonecutting(Ingredient.of(ItemRegistry.SMALL_TAINTED_ROCK_BRICKS.get()), RecipeCategory.MISC, ItemRegistry.SMALL_TAINTED_ROCK_BRICKS_STAIRS.get()).unlockedBy("has_tainted_rock", has(ItemRegistry.TAINTED_ROCK.get())).save(consumer, malumPath("small_tainted_rock_bricks_stairs_stonecutting")); + stonecutting(Ingredient.of(ItemRegistry.SMALL_TAINTED_ROCK_BRICKS.get()), RecipeCategory.MISC, ItemRegistry.SMALL_TAINTED_ROCK_BRICKS_WALL.get()).unlockedBy("has_tainted_rock", has(ItemRegistry.TAINTED_ROCK.get())).save(consumer, malumPath("small_tainted_rock_bricks_wall_stonecutting")); - smelting(Ingredient.of(ItemRegistry.SMALL_TAINTED_ROCK_BRICKS.get()),RecipeCategory.MISC, ItemRegistry.RUNIC_SMALL_TAINTED_ROCK_BRICKS.get(), 0.1f, 200).unlockedBy("has_tainted_rock", has(ItemRegistry.TAINTED_ROCK.get())).save(consumer, malumPath("cracked_small_tainted_rock_bricks_smelting")); + smelting(Ingredient.of(ItemRegistry.SMALL_TAINTED_ROCK_BRICKS.get()), RecipeCategory.MISC, ItemRegistry.RUNIC_SMALL_TAINTED_ROCK_BRICKS.get(), 0.1f, 200).unlockedBy("has_tainted_rock", has(ItemRegistry.TAINTED_ROCK.get())).save(consumer, malumPath("cracked_small_tainted_rock_bricks_smelting")); shaped(RecipeCategory.MISC, ItemRegistry.RUNIC_SMALL_TAINTED_ROCK_BRICKS_SLAB.get(), 6).define('#', ItemRegistry.RUNIC_SMALL_TAINTED_ROCK_BRICKS.get()).pattern("###").unlockedBy("has_tainted_rock", has(ItemRegistry.TAINTED_ROCK.get())).save(consumer); shaped(RecipeCategory.MISC, ItemRegistry.RUNIC_SMALL_TAINTED_ROCK_BRICKS_STAIRS.get(), 4).define('#', ItemRegistry.RUNIC_SMALL_TAINTED_ROCK_BRICKS.get()).pattern("# ").pattern("## ").pattern("###").unlockedBy("has_tainted_rock", has(ItemRegistry.TAINTED_ROCK.get())).save(consumer); shaped(RecipeCategory.MISC, ItemRegistry.RUNIC_SMALL_TAINTED_ROCK_BRICKS_WALL.get(), 6).define('#', ItemRegistry.RUNIC_SMALL_TAINTED_ROCK_BRICKS.get()).pattern("###").pattern("###").unlockedBy("has_tainted_rock", has(ItemRegistry.TAINTED_ROCK.get())).save(consumer); - stonecutting(Ingredient.of(ItemRegistry.TAINTED_ROCK_BRICKS.get()),RecipeCategory.MISC, ItemRegistry.RUNIC_SMALL_TAINTED_ROCK_BRICKS.get()).unlockedBy("has_tainted_rock", has(ItemRegistry.TAINTED_ROCK.get())).save(consumer, malumPath("cracked_small_tainted_rock_bricks_stonecutting_alt")); + stonecutting(Ingredient.of(ItemRegistry.TAINTED_ROCK_BRICKS.get()), RecipeCategory.MISC, ItemRegistry.RUNIC_SMALL_TAINTED_ROCK_BRICKS.get()).unlockedBy("has_tainted_rock", has(ItemRegistry.TAINTED_ROCK.get())).save(consumer, malumPath("cracked_small_tainted_rock_bricks_stonecutting_alt")); - stonecutting(Ingredient.of(ItemRegistry.RUNIC_SMALL_TAINTED_ROCK_BRICKS.get()),RecipeCategory.MISC, ItemRegistry.RUNIC_SMALL_TAINTED_ROCK_BRICKS_SLAB.get(), 2).unlockedBy("has_tainted_rock", has(ItemRegistry.TAINTED_ROCK.get())).save(consumer, malumPath("cracked_small_tainted_rock_bricks_slab_stonecutting")); - stonecutting(Ingredient.of(ItemRegistry.RUNIC_SMALL_TAINTED_ROCK_BRICKS.get()),RecipeCategory.MISC, ItemRegistry.RUNIC_SMALL_TAINTED_ROCK_BRICKS_STAIRS.get()).unlockedBy("has_tainted_rock", has(ItemRegistry.TAINTED_ROCK.get())).save(consumer, malumPath("cracked_small_tainted_rock_bricks_stairs_stonecutting")); + stonecutting(Ingredient.of(ItemRegistry.RUNIC_SMALL_TAINTED_ROCK_BRICKS.get()), RecipeCategory.MISC, ItemRegistry.RUNIC_SMALL_TAINTED_ROCK_BRICKS_SLAB.get(), 2).unlockedBy("has_tainted_rock", has(ItemRegistry.TAINTED_ROCK.get())).save(consumer, malumPath("cracked_small_tainted_rock_bricks_slab_stonecutting")); + stonecutting(Ingredient.of(ItemRegistry.RUNIC_SMALL_TAINTED_ROCK_BRICKS.get()), RecipeCategory.MISC, ItemRegistry.RUNIC_SMALL_TAINTED_ROCK_BRICKS_STAIRS.get()).unlockedBy("has_tainted_rock", has(ItemRegistry.TAINTED_ROCK.get())).save(consumer, malumPath("cracked_small_tainted_rock_bricks_stairs_stonecutting")); stonecutting(Ingredient.of(ItemRegistry.RUNIC_SMALL_TAINTED_ROCK_BRICKS.get()), RecipeCategory.MISC, ItemRegistry.RUNIC_SMALL_TAINTED_ROCK_BRICKS_WALL.get()).unlockedBy("has_tainted_rock", has(ItemRegistry.TAINTED_ROCK.get())).save(consumer, malumPath("cracked_small_tainted_rock_bricks_wall_stonecutting")); shaped(RecipeCategory.MISC, ItemRegistry.CHISELED_TAINTED_ROCK.get()).define('#', ItemRegistry.TAINTED_ROCK_SLAB.get()).pattern("#").pattern("#").unlockedBy("has_tainted_rock", has(ItemRegistry.TAINTED_ROCK.get())).save(consumer); @@ -347,16 +361,16 @@ protected void buildRecipes(Consumer consumer) { shapeless(RecipeCategory.MISC, ItemRegistry.TAINTED_ROCK_COLUMN.get()).requires(ItemRegistry.TAINTED_ROCK_COLUMN_CAP.get()).unlockedBy("has_tainted_rock", has(ItemRegistry.TAINTED_ROCK.get())).save(consumer, malumPath("tainted_rock_column_from_cap")); shaped(RecipeCategory.MISC, ItemRegistry.CUT_TAINTED_ROCK.get(), 4).define('#', ItemRegistry.SMOOTH_TAINTED_ROCK.get()).pattern("##").pattern("##").unlockedBy("has_tainted_rock", has(ItemRegistry.TAINTED_ROCK.get())).save(consumer); - stonecutting(Ingredient.of(ItemRegistry.TAINTED_ROCK.get()),RecipeCategory.MISC, ItemRegistry.CUT_TAINTED_ROCK.get()).unlockedBy("has_tainted_rock", has(ItemRegistry.TAINTED_ROCK.get())).save(consumer, malumPath("cut_tainted_rock_stonecutting")); - stonecutting(Ingredient.of(ItemRegistry.TAINTED_ROCK.get()),RecipeCategory.MISC, ItemRegistry.TAINTED_ROCK_COLUMN.get()).unlockedBy("has_tainted_rock", has(ItemRegistry.TAINTED_ROCK.get())).save(consumer, malumPath("tainted_rock_column_stonecutting")); - stonecutting(Ingredient.of(ItemRegistry.TAINTED_ROCK.get()),RecipeCategory.MISC, ItemRegistry.TAINTED_ROCK_COLUMN_CAP.get()).unlockedBy("has_tainted_rock", has(ItemRegistry.TAINTED_ROCK.get())).save(consumer, malumPath("tainted_rock_column_cap_stonecutting")); + stonecutting(Ingredient.of(ItemRegistry.TAINTED_ROCK.get()), RecipeCategory.MISC, ItemRegistry.CUT_TAINTED_ROCK.get()).unlockedBy("has_tainted_rock", has(ItemRegistry.TAINTED_ROCK.get())).save(consumer, malumPath("cut_tainted_rock_stonecutting")); + stonecutting(Ingredient.of(ItemRegistry.TAINTED_ROCK.get()), RecipeCategory.MISC, ItemRegistry.TAINTED_ROCK_COLUMN.get()).unlockedBy("has_tainted_rock", has(ItemRegistry.TAINTED_ROCK.get())).save(consumer, malumPath("tainted_rock_column_stonecutting")); + stonecutting(Ingredient.of(ItemRegistry.TAINTED_ROCK.get()), RecipeCategory.MISC, ItemRegistry.TAINTED_ROCK_COLUMN_CAP.get()).unlockedBy("has_tainted_rock", has(ItemRegistry.TAINTED_ROCK.get())).save(consumer, malumPath("tainted_rock_column_cap_stonecutting")); stonecutting(Ingredient.of(ItemRegistry.TAINTED_ROCK.get()), RecipeCategory.MISC, ItemRegistry.TAINTED_ROCK_BRICKS.get()).unlockedBy("has_tainted_rock", has(ItemRegistry.TAINTED_ROCK.get())).save(consumer, malumPath("tainted_rock_bricks_stonecutting")); - stonecutting(Ingredient.of(ItemRegistry.TAINTED_ROCK.get()),RecipeCategory.MISC, ItemRegistry.SMOOTH_TAINTED_ROCK.get()).unlockedBy("has_tainted_rock", has(ItemRegistry.TAINTED_ROCK.get())).save(consumer, malumPath("smooth_tainted_rock_stonecutting")); + stonecutting(Ingredient.of(ItemRegistry.TAINTED_ROCK.get()), RecipeCategory.MISC, ItemRegistry.SMOOTH_TAINTED_ROCK.get()).unlockedBy("has_tainted_rock", has(ItemRegistry.TAINTED_ROCK.get())).save(consumer, malumPath("smooth_tainted_rock_stonecutting")); stonecutting(Ingredient.of(ItemRegistry.TAINTED_ROCK.get()), RecipeCategory.MISC, ItemRegistry.POLISHED_TAINTED_ROCK.get()).unlockedBy("has_tainted_rock", has(ItemRegistry.TAINTED_ROCK.get())).save(consumer, malumPath("polished_tainted_rock_stonecutting")); - stonecutting(Ingredient.of(ItemRegistry.TAINTED_ROCK.get()),RecipeCategory.MISC, ItemRegistry.CHISELED_TAINTED_ROCK.get()).unlockedBy("has_tainted_rock", has(ItemRegistry.TAINTED_ROCK.get())).save(consumer, malumPath("chiseled_tainted_rock_bricks_stonecutting")); + stonecutting(Ingredient.of(ItemRegistry.TAINTED_ROCK.get()), RecipeCategory.MISC, ItemRegistry.CHISELED_TAINTED_ROCK.get()).unlockedBy("has_tainted_rock", has(ItemRegistry.TAINTED_ROCK.get())).save(consumer, malumPath("chiseled_tainted_rock_bricks_stonecutting")); stonecutting(Ingredient.of(ItemRegistry.TAINTED_ROCK_BRICKS.get()), RecipeCategory.MISC, ItemRegistry.CHISELED_TAINTED_ROCK.get()).unlockedBy("has_tainted_rock", has(ItemRegistry.TAINTED_ROCK.get())).save(consumer, malumPath("chiseled_tainted_rock_bricks_stonecutting_alt")); - stonecutting(Ingredient.of(ItemRegistry.TAINTED_ROCK_BRICKS.get()),RecipeCategory.MISC, ItemRegistry.SMALL_TAINTED_ROCK_BRICKS.get()).unlockedBy("has_tainted_rock", has(ItemRegistry.TAINTED_ROCK.get())).save(consumer, malumPath("small_tainted_rock_bricks_stonecutting_from_bricks")); + stonecutting(Ingredient.of(ItemRegistry.TAINTED_ROCK_BRICKS.get()), RecipeCategory.MISC, ItemRegistry.SMALL_TAINTED_ROCK_BRICKS.get()).unlockedBy("has_tainted_rock", has(ItemRegistry.TAINTED_ROCK.get())).save(consumer, malumPath("small_tainted_rock_bricks_stonecutting_from_bricks")); stonecutting(Ingredient.of(ItemRegistry.TAINTED_ROCK_TILES.get()), RecipeCategory.MISC, ItemRegistry.SMALL_TAINTED_ROCK_BRICKS.get()).unlockedBy("has_tainted_rock", has(ItemRegistry.TAINTED_ROCK.get())).save(consumer, malumPath("small_tainted_rock_bricks_stonecutting_from_tiles")); shaped(RecipeCategory.MISC, ItemRegistry.TAINTED_ROCK_ITEM_STAND.get(), 2).define('X', ItemRegistry.TAINTED_ROCK.get()).define('Y', ItemRegistry.TAINTED_ROCK_SLAB.get()).pattern("YYY").pattern("XXX").unlockedBy("has_tainted_rock", has(ItemRegistry.TAINTED_ROCK.get())).save(consumer); @@ -369,9 +383,9 @@ protected void buildRecipes(Consumer consumer) { shaped(RecipeCategory.MISC, ItemRegistry.TWISTED_ROCK_WALL.get(), 6).define('#', ItemRegistry.TWISTED_ROCK.get()).pattern("###").pattern("###").unlockedBy("has_twisted_rock", has(ItemRegistry.TWISTED_ROCK.get())).save(consumer); shaped(RecipeCategory.MISC, ItemRegistry.TWISTED_ROCK_SLAB.get(), 6).define('#', ItemRegistry.TWISTED_ROCK.get()).pattern("###").unlockedBy("has_twisted_rock", has(ItemRegistry.TWISTED_ROCK.get())).save(consumer); shaped(RecipeCategory.MISC, ItemRegistry.TWISTED_ROCK_STAIRS.get(), 4).define('#', ItemRegistry.TWISTED_ROCK.get()).pattern("# ").pattern("## ").pattern("###").unlockedBy("has_twisted_rock", has(ItemRegistry.TWISTED_ROCK.get())).save(consumer); - stonecutting(Ingredient.of(ItemRegistry.TWISTED_ROCK.get()),RecipeCategory.MISC, ItemRegistry.TWISTED_ROCK_SLAB.get(), 2).unlockedBy("has_twisted_rock", has(ItemRegistry.TWISTED_ROCK.get())).save(consumer, malumPath("twisted_rock_slab_stonecutting")); + stonecutting(Ingredient.of(ItemRegistry.TWISTED_ROCK.get()), RecipeCategory.MISC, ItemRegistry.TWISTED_ROCK_SLAB.get(), 2).unlockedBy("has_twisted_rock", has(ItemRegistry.TWISTED_ROCK.get())).save(consumer, malumPath("twisted_rock_slab_stonecutting")); stonecutting(Ingredient.of(ItemRegistry.TWISTED_ROCK.get()), RecipeCategory.MISC, ItemRegistry.TWISTED_ROCK_STAIRS.get()).unlockedBy("has_twisted_rock", has(ItemRegistry.TWISTED_ROCK.get())).save(consumer, malumPath("twisted_rock_stairs_stonecutting")); - stonecutting(Ingredient.of(ItemRegistry.TWISTED_ROCK.get()),RecipeCategory.MISC, ItemRegistry.TWISTED_ROCK_WALL.get()).unlockedBy("has_twisted_rock", has(ItemRegistry.TWISTED_ROCK.get())).save(consumer, malumPath("twisted_rock_wall_stonecutting")); + stonecutting(Ingredient.of(ItemRegistry.TWISTED_ROCK.get()), RecipeCategory.MISC, ItemRegistry.TWISTED_ROCK_WALL.get()).unlockedBy("has_twisted_rock", has(ItemRegistry.TWISTED_ROCK.get())).save(consumer, malumPath("twisted_rock_wall_stonecutting")); shaped(RecipeCategory.MISC, ItemRegistry.POLISHED_TWISTED_ROCK.get(), 4).define('#', ItemRegistry.TWISTED_ROCK.get()).pattern("##").pattern("##").unlockedBy("has_twisted_rock", has(ItemRegistry.TWISTED_ROCK.get())).save(consumer); shaped(RecipeCategory.MISC, ItemRegistry.POLISHED_TWISTED_ROCK_SLAB.get(), 6).define('#', ItemRegistry.POLISHED_TWISTED_ROCK.get()).pattern("###").unlockedBy("has_twisted_rock", has(ItemRegistry.TWISTED_ROCK.get())).save(consumer); @@ -379,69 +393,69 @@ protected void buildRecipes(Consumer consumer) { stonecutting(Ingredient.of(ItemRegistry.POLISHED_TWISTED_ROCK.get()), RecipeCategory.MISC, ItemRegistry.POLISHED_TWISTED_ROCK_SLAB.get(), 2).unlockedBy("has_polished_twisted_rock", has(ItemRegistry.POLISHED_TWISTED_ROCK.get())).save(consumer, malumPath("polished_twisted_rock_slab_stonecutting")); stonecutting(Ingredient.of(ItemRegistry.POLISHED_TWISTED_ROCK.get()), RecipeCategory.MISC, ItemRegistry.POLISHED_TWISTED_ROCK_STAIRS.get()).unlockedBy("has_polished_twisted_rock", has(ItemRegistry.POLISHED_TWISTED_ROCK.get())).save(consumer, malumPath("polished_twisted_rock_stairs_stonecutting")); - smelting(Ingredient.of(ItemRegistry.TWISTED_ROCK.get()),RecipeCategory.MISC, ItemRegistry.SMOOTH_TWISTED_ROCK.get(), 0.1f, 200).unlockedBy("has_twisted_rock", has(ItemRegistry.TWISTED_ROCK.get())).save(consumer); + smelting(Ingredient.of(ItemRegistry.TWISTED_ROCK.get()), RecipeCategory.MISC, ItemRegistry.SMOOTH_TWISTED_ROCK.get(), 0.1f, 200).unlockedBy("has_twisted_rock", has(ItemRegistry.TWISTED_ROCK.get())).save(consumer); shaped(RecipeCategory.MISC, ItemRegistry.SMOOTH_TWISTED_ROCK_SLAB.get(), 6).define('#', ItemRegistry.SMOOTH_TWISTED_ROCK.get()).pattern("###").unlockedBy("has_twisted_rock", has(ItemRegistry.TWISTED_ROCK.get())).save(consumer); shaped(RecipeCategory.MISC, ItemRegistry.SMOOTH_TWISTED_ROCK_STAIRS.get(), 4).define('#', ItemRegistry.SMOOTH_TWISTED_ROCK.get()).pattern("# ").pattern("## ").pattern("###").unlockedBy("has_twisted_rock", has(ItemRegistry.TWISTED_ROCK.get())).save(consumer); - stonecutting(Ingredient.of(ItemRegistry.SMOOTH_TWISTED_ROCK.get()),RecipeCategory.MISC, ItemRegistry.SMOOTH_TWISTED_ROCK_SLAB.get(), 2).unlockedBy("has_smooth_twisted_rock", has(ItemRegistry.POLISHED_TWISTED_ROCK.get())).save(consumer, malumPath("smooth_twisted_rock_slab_stonecutting")); - stonecutting(Ingredient.of(ItemRegistry.SMOOTH_TWISTED_ROCK.get()),RecipeCategory.MISC, ItemRegistry.SMOOTH_TWISTED_ROCK_STAIRS.get()).unlockedBy("has_smooth_twisted_rock", has(ItemRegistry.POLISHED_TWISTED_ROCK.get())).save(consumer, malumPath("smooth_twisted_rock_stairs_stonecutting")); + stonecutting(Ingredient.of(ItemRegistry.SMOOTH_TWISTED_ROCK.get()), RecipeCategory.MISC, ItemRegistry.SMOOTH_TWISTED_ROCK_SLAB.get(), 2).unlockedBy("has_smooth_twisted_rock", has(ItemRegistry.POLISHED_TWISTED_ROCK.get())).save(consumer, malumPath("smooth_twisted_rock_slab_stonecutting")); + stonecutting(Ingredient.of(ItemRegistry.SMOOTH_TWISTED_ROCK.get()), RecipeCategory.MISC, ItemRegistry.SMOOTH_TWISTED_ROCK_STAIRS.get()).unlockedBy("has_smooth_twisted_rock", has(ItemRegistry.POLISHED_TWISTED_ROCK.get())).save(consumer, malumPath("smooth_twisted_rock_stairs_stonecutting")); shaped(RecipeCategory.MISC, ItemRegistry.TWISTED_ROCK_BRICKS.get(), 4).define('#', ItemRegistry.POLISHED_TWISTED_ROCK.get()).pattern("##").pattern("##").unlockedBy("has_twisted_rock", has(ItemRegistry.TWISTED_ROCK.get())).save(consumer); shaped(RecipeCategory.MISC, ItemRegistry.TWISTED_ROCK_BRICKS.get(), 4).define('#', ItemRegistry.SMALL_TWISTED_ROCK_BRICKS.get()).pattern("##").pattern("##").unlockedBy("has_twisted_rock", has(ItemRegistry.TWISTED_ROCK.get())).save(consumer, malumPath("twisted_rock_bricks_from_small_bricks")); shaped(RecipeCategory.MISC, ItemRegistry.TWISTED_ROCK_BRICKS_SLAB.get(), 6).define('#', ItemRegistry.TWISTED_ROCK_BRICKS.get()).pattern("###").unlockedBy("has_twisted_rock", has(ItemRegistry.TWISTED_ROCK.get())).save(consumer); shaped(RecipeCategory.MISC, ItemRegistry.TWISTED_ROCK_BRICKS_STAIRS.get(), 4).define('#', ItemRegistry.TWISTED_ROCK_BRICKS.get()).pattern("# ").pattern("## ").pattern("###").unlockedBy("has_twisted_rock", has(ItemRegistry.TWISTED_ROCK.get())).save(consumer); shaped(RecipeCategory.MISC, ItemRegistry.TWISTED_ROCK_BRICKS_WALL.get(), 6).define('#', ItemRegistry.TWISTED_ROCK_BRICKS.get()).pattern("###").pattern("###").unlockedBy("has_twisted_rock", has(ItemRegistry.TWISTED_ROCK.get())).save(consumer); - stonecutting(Ingredient.of(ItemRegistry.POLISHED_TWISTED_ROCK.get()),RecipeCategory.MISC, ItemRegistry.TWISTED_ROCK_BRICKS.get()).unlockedBy("has_twisted_rock", has(ItemRegistry.TWISTED_ROCK.get())).save(consumer, malumPath("twisted_rock_bricks_stonecutting_from_polished")); - stonecutting(Ingredient.of(ItemRegistry.TWISTED_ROCK_BRICKS.get()),RecipeCategory.MISC, ItemRegistry.TWISTED_ROCK_BRICKS_SLAB.get(), 2).unlockedBy("has_twisted_rock", has(ItemRegistry.TWISTED_ROCK.get())).save(consumer, malumPath("twisted_rock_bricks_slab_stonecutting")); - stonecutting(Ingredient.of(ItemRegistry.TWISTED_ROCK_BRICKS.get()),RecipeCategory.MISC, ItemRegistry.TWISTED_ROCK_BRICKS_STAIRS.get()).unlockedBy("has_twisted_rock", has(ItemRegistry.TWISTED_ROCK.get())).save(consumer, malumPath("twisted_rock_bricks_stairs_stonecutting")); - stonecutting(Ingredient.of(ItemRegistry.TWISTED_ROCK_BRICKS.get()),RecipeCategory.MISC, ItemRegistry.TWISTED_ROCK_BRICKS_WALL.get()).unlockedBy("has_twisted_rock", has(ItemRegistry.TWISTED_ROCK.get())).save(consumer, malumPath("twisted_rock_brick_wall_stonecutting")); + stonecutting(Ingredient.of(ItemRegistry.POLISHED_TWISTED_ROCK.get()), RecipeCategory.MISC, ItemRegistry.TWISTED_ROCK_BRICKS.get()).unlockedBy("has_twisted_rock", has(ItemRegistry.TWISTED_ROCK.get())).save(consumer, malumPath("twisted_rock_bricks_stonecutting_from_polished")); + stonecutting(Ingredient.of(ItemRegistry.TWISTED_ROCK_BRICKS.get()), RecipeCategory.MISC, ItemRegistry.TWISTED_ROCK_BRICKS_SLAB.get(), 2).unlockedBy("has_twisted_rock", has(ItemRegistry.TWISTED_ROCK.get())).save(consumer, malumPath("twisted_rock_bricks_slab_stonecutting")); + stonecutting(Ingredient.of(ItemRegistry.TWISTED_ROCK_BRICKS.get()), RecipeCategory.MISC, ItemRegistry.TWISTED_ROCK_BRICKS_STAIRS.get()).unlockedBy("has_twisted_rock", has(ItemRegistry.TWISTED_ROCK.get())).save(consumer, malumPath("twisted_rock_bricks_stairs_stonecutting")); + stonecutting(Ingredient.of(ItemRegistry.TWISTED_ROCK_BRICKS.get()), RecipeCategory.MISC, ItemRegistry.TWISTED_ROCK_BRICKS_WALL.get()).unlockedBy("has_twisted_rock", has(ItemRegistry.TWISTED_ROCK.get())).save(consumer, malumPath("twisted_rock_brick_wall_stonecutting")); shaped(RecipeCategory.MISC, ItemRegistry.RUNIC_TWISTED_ROCK_BRICKS_WALL.get(), 6).define('#', ItemRegistry.RUNIC_TWISTED_ROCK_BRICKS.get()).pattern("###").pattern("###").unlockedBy("has_twisted_rock", has(ItemRegistry.TWISTED_ROCK.get())).save(consumer); - smelting(Ingredient.of(ItemRegistry.TWISTED_ROCK_BRICKS.get()),RecipeCategory.MISC, ItemRegistry.RUNIC_TWISTED_ROCK_BRICKS.get(), 0.1f, 200).unlockedBy("has_twisted_rock", has(ItemRegistry.TWISTED_ROCK.get())).save(consumer); + smelting(Ingredient.of(ItemRegistry.TWISTED_ROCK_BRICKS.get()), RecipeCategory.MISC, ItemRegistry.RUNIC_TWISTED_ROCK_BRICKS.get(), 0.1f, 200).unlockedBy("has_twisted_rock", has(ItemRegistry.TWISTED_ROCK.get())).save(consumer); shaped(RecipeCategory.MISC, ItemRegistry.RUNIC_TWISTED_ROCK_BRICKS_SLAB.get(), 6).define('#', ItemRegistry.RUNIC_TWISTED_ROCK_BRICKS.get()).pattern("###").unlockedBy("has_cracked_twisted_rock", has(ItemRegistry.TWISTED_ROCK.get())).save(consumer); shaped(RecipeCategory.MISC, ItemRegistry.RUNIC_TWISTED_ROCK_BRICKS_STAIRS.get(), 4).define('#', ItemRegistry.RUNIC_TWISTED_ROCK_BRICKS.get()).pattern("# ").pattern("## ").pattern("###").unlockedBy("has_cracked_twisted_rock", has(ItemRegistry.TWISTED_ROCK.get())).save(consumer); - stonecutting(Ingredient.of(ItemRegistry.RUNIC_TWISTED_ROCK_BRICKS.get()),RecipeCategory.MISC, ItemRegistry.RUNIC_TWISTED_ROCK_BRICKS_SLAB.get(), 2).unlockedBy("has_cracked_twisted_rock_bricks", has(ItemRegistry.RUNIC_TWISTED_ROCK_BRICKS.get())).save(consumer, malumPath("cracked_twisted_rock_bricks_slab_stonecutting")); - stonecutting(Ingredient.of(ItemRegistry.RUNIC_TWISTED_ROCK_BRICKS.get()),RecipeCategory.MISC, ItemRegistry.RUNIC_TWISTED_ROCK_BRICKS_STAIRS.get()).unlockedBy("has_cracked_twisted_rock_bricks", has(ItemRegistry.RUNIC_TWISTED_ROCK_BRICKS.get())).save(consumer, malumPath("cracked_twisted_rock_bricks_stairs_stonecutting")); + stonecutting(Ingredient.of(ItemRegistry.RUNIC_TWISTED_ROCK_BRICKS.get()), RecipeCategory.MISC, ItemRegistry.RUNIC_TWISTED_ROCK_BRICKS_SLAB.get(), 2).unlockedBy("has_cracked_twisted_rock_bricks", has(ItemRegistry.RUNIC_TWISTED_ROCK_BRICKS.get())).save(consumer, malumPath("cracked_twisted_rock_bricks_slab_stonecutting")); + stonecutting(Ingredient.of(ItemRegistry.RUNIC_TWISTED_ROCK_BRICKS.get()), RecipeCategory.MISC, ItemRegistry.RUNIC_TWISTED_ROCK_BRICKS_STAIRS.get()).unlockedBy("has_cracked_twisted_rock_bricks", has(ItemRegistry.RUNIC_TWISTED_ROCK_BRICKS.get())).save(consumer, malumPath("cracked_twisted_rock_bricks_stairs_stonecutting")); shaped(RecipeCategory.MISC, ItemRegistry.TWISTED_ROCK_TILES.get(), 4).define('#', ItemRegistry.TWISTED_ROCK_BRICKS.get()).pattern("##").pattern("##").unlockedBy("has_twisted_rock", has(ItemRegistry.TWISTED_ROCK.get())).save(consumer); shaped(RecipeCategory.MISC, ItemRegistry.TWISTED_ROCK_TILES_SLAB.get(), 6).define('#', ItemRegistry.TWISTED_ROCK_TILES.get()).pattern("###").unlockedBy("has_twisted_rock", has(ItemRegistry.TWISTED_ROCK.get())).save(consumer); shaped(RecipeCategory.MISC, ItemRegistry.TWISTED_ROCK_TILES_STAIRS.get(), 4).define('#', ItemRegistry.TWISTED_ROCK_TILES.get()).pattern("# ").pattern("## ").pattern("###").unlockedBy("has_twisted_rock", has(ItemRegistry.TWISTED_ROCK.get())).save(consumer); shaped(RecipeCategory.MISC, ItemRegistry.TWISTED_ROCK_TILES_WALL.get(), 6).define('#', ItemRegistry.TWISTED_ROCK_TILES.get()).pattern("###").pattern("###").unlockedBy("has_twisted_rock", has(ItemRegistry.TWISTED_ROCK.get())).save(consumer); - stonecutting(Ingredient.of(ItemRegistry.TWISTED_ROCK.get()),RecipeCategory.MISC, ItemRegistry.TWISTED_ROCK_TILES.get()).unlockedBy("has_twisted_rock", has(ItemRegistry.TWISTED_ROCK.get())).save(consumer, malumPath("twisted_rock_tiles_stonecutting")); - stonecutting(Ingredient.of(ItemRegistry.POLISHED_TWISTED_ROCK.get()),RecipeCategory.MISC, ItemRegistry.TWISTED_ROCK_TILES.get()).unlockedBy("has_twisted_rock", has(ItemRegistry.TWISTED_ROCK.get())).save(consumer, malumPath("twisted_rock_tiles_stonecutting_from_polished")); - stonecutting(Ingredient.of(ItemRegistry.TWISTED_ROCK_BRICKS.get()),RecipeCategory.MISC, ItemRegistry.TWISTED_ROCK_TILES.get()).unlockedBy("has_twisted_rock", has(ItemRegistry.TWISTED_ROCK.get())).save(consumer, malumPath("twisted_rock_tiles_stonecutting_from_bricks")); + stonecutting(Ingredient.of(ItemRegistry.TWISTED_ROCK.get()), RecipeCategory.MISC, ItemRegistry.TWISTED_ROCK_TILES.get()).unlockedBy("has_twisted_rock", has(ItemRegistry.TWISTED_ROCK.get())).save(consumer, malumPath("twisted_rock_tiles_stonecutting")); + stonecutting(Ingredient.of(ItemRegistry.POLISHED_TWISTED_ROCK.get()), RecipeCategory.MISC, ItemRegistry.TWISTED_ROCK_TILES.get()).unlockedBy("has_twisted_rock", has(ItemRegistry.TWISTED_ROCK.get())).save(consumer, malumPath("twisted_rock_tiles_stonecutting_from_polished")); + stonecutting(Ingredient.of(ItemRegistry.TWISTED_ROCK_BRICKS.get()), RecipeCategory.MISC, ItemRegistry.TWISTED_ROCK_TILES.get()).unlockedBy("has_twisted_rock", has(ItemRegistry.TWISTED_ROCK.get())).save(consumer, malumPath("twisted_rock_tiles_stonecutting_from_bricks")); stonecutting(Ingredient.of(ItemRegistry.TWISTED_ROCK_TILES.get()), RecipeCategory.MISC, ItemRegistry.TWISTED_ROCK_TILES_SLAB.get(), 2).unlockedBy("has_twisted_rock", has(ItemRegistry.TWISTED_ROCK.get())).save(consumer, malumPath("twisted_rock_tiles_slab_stonecutting")); - stonecutting(Ingredient.of(ItemRegistry.TWISTED_ROCK_TILES.get()),RecipeCategory.MISC, ItemRegistry.TWISTED_ROCK_TILES_STAIRS.get()).unlockedBy("has_twisted_rock", has(ItemRegistry.TWISTED_ROCK.get())).save(consumer, malumPath("twisted_rock_tiles_stairs_stonecutting")); - stonecutting(Ingredient.of(ItemRegistry.TWISTED_ROCK_TILES.get()),RecipeCategory.MISC, ItemRegistry.TWISTED_ROCK_TILES_WALL.get()).unlockedBy("has_twisted_rock", has(ItemRegistry.TWISTED_ROCK.get())).save(consumer, malumPath("twisted_rock_tiles_wall_stonecutting")); + stonecutting(Ingredient.of(ItemRegistry.TWISTED_ROCK_TILES.get()), RecipeCategory.MISC, ItemRegistry.TWISTED_ROCK_TILES_STAIRS.get()).unlockedBy("has_twisted_rock", has(ItemRegistry.TWISTED_ROCK.get())).save(consumer, malumPath("twisted_rock_tiles_stairs_stonecutting")); + stonecutting(Ingredient.of(ItemRegistry.TWISTED_ROCK_TILES.get()), RecipeCategory.MISC, ItemRegistry.TWISTED_ROCK_TILES_WALL.get()).unlockedBy("has_twisted_rock", has(ItemRegistry.TWISTED_ROCK.get())).save(consumer, malumPath("twisted_rock_tiles_wall_stonecutting")); smelting(Ingredient.of(ItemRegistry.TWISTED_ROCK_TILES.get()), RecipeCategory.MISC, ItemRegistry.RUNIC_TWISTED_ROCK_TILES.get(), 0.1f, 200).unlockedBy("has_twisted_rock", has(ItemRegistry.TWISTED_ROCK.get())).save(consumer); shaped(RecipeCategory.MISC, ItemRegistry.RUNIC_TWISTED_ROCK_TILES_SLAB.get(), 6).define('#', ItemRegistry.RUNIC_TWISTED_ROCK_TILES.get()).pattern("###").unlockedBy("has_cracked_twisted_rock", has(ItemRegistry.TWISTED_ROCK.get())).save(consumer); shaped(RecipeCategory.MISC, ItemRegistry.RUNIC_TWISTED_ROCK_TILES_STAIRS.get(), 4).define('#', ItemRegistry.RUNIC_TWISTED_ROCK_TILES.get()).pattern("# ").pattern("## ").pattern("###").unlockedBy("has_cracked_twisted_rock", has(ItemRegistry.TWISTED_ROCK.get())).save(consumer); shaped(RecipeCategory.MISC, ItemRegistry.RUNIC_TWISTED_ROCK_TILES_WALL.get(), 6).define('#', ItemRegistry.RUNIC_TWISTED_ROCK_TILES.get()).pattern("###").pattern("###").unlockedBy("has_twisted_rock", has(ItemRegistry.TWISTED_ROCK.get())).save(consumer); - stonecutting(Ingredient.of(ItemRegistry.RUNIC_TWISTED_ROCK_BRICKS.get()),RecipeCategory.MISC, ItemRegistry.RUNIC_TWISTED_ROCK_TILES.get()).unlockedBy("has_twisted_rock", has(ItemRegistry.TWISTED_ROCK.get())).save(consumer, malumPath("cracked_twisted_rock_tiles_stonecutting")); - stonecutting(Ingredient.of(ItemRegistry.RUNIC_TWISTED_ROCK_TILES.get()),RecipeCategory.MISC, ItemRegistry.RUNIC_TWISTED_ROCK_TILES_SLAB.get(), 2).unlockedBy("has_cracked_twisted_rock_tiles", has(ItemRegistry.RUNIC_TWISTED_ROCK_TILES.get())).save(consumer, malumPath("cracked_twisted_rock_tiles_slab_stonecutting")); - stonecutting(Ingredient.of(ItemRegistry.RUNIC_TWISTED_ROCK_TILES.get()),RecipeCategory.MISC, ItemRegistry.RUNIC_TWISTED_ROCK_TILES_STAIRS.get()).unlockedBy("has_cracked_twisted_rock_tiles", has(ItemRegistry.RUNIC_TWISTED_ROCK_TILES.get())).save(consumer, malumPath("cracked_twisted_rock_tiles_stairs_stonecutting")); - stonecutting(Ingredient.of(ItemRegistry.RUNIC_TWISTED_ROCK_TILES.get()),RecipeCategory.MISC, ItemRegistry.RUNIC_TWISTED_ROCK_TILES_WALL.get()).unlockedBy("has_twisted_rock", has(ItemRegistry.TWISTED_ROCK.get())).save(consumer, malumPath("cracked_twisted_rock_tiles_wall_stonecutting")); + stonecutting(Ingredient.of(ItemRegistry.RUNIC_TWISTED_ROCK_BRICKS.get()), RecipeCategory.MISC, ItemRegistry.RUNIC_TWISTED_ROCK_TILES.get()).unlockedBy("has_twisted_rock", has(ItemRegistry.TWISTED_ROCK.get())).save(consumer, malumPath("cracked_twisted_rock_tiles_stonecutting")); + stonecutting(Ingredient.of(ItemRegistry.RUNIC_TWISTED_ROCK_TILES.get()), RecipeCategory.MISC, ItemRegistry.RUNIC_TWISTED_ROCK_TILES_SLAB.get(), 2).unlockedBy("has_cracked_twisted_rock_tiles", has(ItemRegistry.RUNIC_TWISTED_ROCK_TILES.get())).save(consumer, malumPath("cracked_twisted_rock_tiles_slab_stonecutting")); + stonecutting(Ingredient.of(ItemRegistry.RUNIC_TWISTED_ROCK_TILES.get()), RecipeCategory.MISC, ItemRegistry.RUNIC_TWISTED_ROCK_TILES_STAIRS.get()).unlockedBy("has_cracked_twisted_rock_tiles", has(ItemRegistry.RUNIC_TWISTED_ROCK_TILES.get())).save(consumer, malumPath("cracked_twisted_rock_tiles_stairs_stonecutting")); + stonecutting(Ingredient.of(ItemRegistry.RUNIC_TWISTED_ROCK_TILES.get()), RecipeCategory.MISC, ItemRegistry.RUNIC_TWISTED_ROCK_TILES_WALL.get()).unlockedBy("has_twisted_rock", has(ItemRegistry.TWISTED_ROCK.get())).save(consumer, malumPath("cracked_twisted_rock_tiles_wall_stonecutting")); shaped(RecipeCategory.MISC, ItemRegistry.SMALL_TWISTED_ROCK_BRICKS.get(), 4).define('#', ItemRegistry.TWISTED_ROCK_TILES.get()).pattern("##").pattern("##").unlockedBy("has_twisted_rock", has(ItemRegistry.TWISTED_ROCK.get())).save(consumer); shaped(RecipeCategory.MISC, ItemRegistry.SMALL_TWISTED_ROCK_BRICKS_SLAB.get(), 6).define('#', ItemRegistry.SMALL_TWISTED_ROCK_BRICKS.get()).pattern("###").unlockedBy("has_twisted_rock", has(ItemRegistry.TWISTED_ROCK.get())).save(consumer); shaped(RecipeCategory.MISC, ItemRegistry.SMALL_TWISTED_ROCK_BRICKS_STAIRS.get(), 4).define('#', ItemRegistry.SMALL_TWISTED_ROCK_BRICKS.get()).pattern("# ").pattern("## ").pattern("###").unlockedBy("has_twisted_rock", has(ItemRegistry.TWISTED_ROCK.get())).save(consumer); shaped(RecipeCategory.MISC, ItemRegistry.SMALL_TWISTED_ROCK_BRICKS_WALL.get(), 6).define('#', ItemRegistry.SMALL_TWISTED_ROCK_BRICKS.get()).pattern("###").pattern("###").unlockedBy("has_twisted_rock", has(ItemRegistry.TWISTED_ROCK.get())).save(consumer); - stonecutting(Ingredient.of(ItemRegistry.TWISTED_ROCK.get()),RecipeCategory.MISC, ItemRegistry.SMALL_TWISTED_ROCK_BRICKS.get()).unlockedBy("has_twisted_rock", has(ItemRegistry.TWISTED_ROCK.get())).save(consumer, malumPath("small_twisted_rock_bricks_stonecutting")); - stonecutting(Ingredient.of(ItemRegistry.TWISTED_ROCK_BRICKS.get()),RecipeCategory.MISC, ItemRegistry.SMALL_TWISTED_ROCK_BRICKS.get()).unlockedBy("has_twisted_rock", has(ItemRegistry.TWISTED_ROCK.get())).save(consumer, malumPath("small_twisted_rock_bricks_stonecutting_alt")); + stonecutting(Ingredient.of(ItemRegistry.TWISTED_ROCK.get()), RecipeCategory.MISC, ItemRegistry.SMALL_TWISTED_ROCK_BRICKS.get()).unlockedBy("has_twisted_rock", has(ItemRegistry.TWISTED_ROCK.get())).save(consumer, malumPath("small_twisted_rock_bricks_stonecutting")); + stonecutting(Ingredient.of(ItemRegistry.TWISTED_ROCK_BRICKS.get()), RecipeCategory.MISC, ItemRegistry.SMALL_TWISTED_ROCK_BRICKS.get()).unlockedBy("has_twisted_rock", has(ItemRegistry.TWISTED_ROCK.get())).save(consumer, malumPath("small_twisted_rock_bricks_stonecutting_alt")); - stonecutting(Ingredient.of(ItemRegistry.SMALL_TWISTED_ROCK_BRICKS.get()),RecipeCategory.MISC, ItemRegistry.SMALL_TWISTED_ROCK_BRICKS_SLAB.get(), 2).unlockedBy("has_twisted_rock", has(ItemRegistry.TWISTED_ROCK.get())).save(consumer, malumPath("small_twisted_rock_bricks_slab_stonecutting")); + stonecutting(Ingredient.of(ItemRegistry.SMALL_TWISTED_ROCK_BRICKS.get()), RecipeCategory.MISC, ItemRegistry.SMALL_TWISTED_ROCK_BRICKS_SLAB.get(), 2).unlockedBy("has_twisted_rock", has(ItemRegistry.TWISTED_ROCK.get())).save(consumer, malumPath("small_twisted_rock_bricks_slab_stonecutting")); stonecutting(Ingredient.of(ItemRegistry.SMALL_TWISTED_ROCK_BRICKS.get()), RecipeCategory.MISC, ItemRegistry.SMALL_TWISTED_ROCK_BRICKS_STAIRS.get()).unlockedBy("has_twisted_rock", has(ItemRegistry.TWISTED_ROCK.get())).save(consumer, malumPath("small_twisted_rock_bricks_stairs_stonecutting")); - stonecutting(Ingredient.of(ItemRegistry.SMALL_TWISTED_ROCK_BRICKS.get()),RecipeCategory.MISC, ItemRegistry.SMALL_TWISTED_ROCK_BRICKS_WALL.get()).unlockedBy("has_twisted_rock", has(ItemRegistry.TWISTED_ROCK.get())).save(consumer, malumPath("small_twisted_rock_bricks_wall_stonecutting")); + stonecutting(Ingredient.of(ItemRegistry.SMALL_TWISTED_ROCK_BRICKS.get()), RecipeCategory.MISC, ItemRegistry.SMALL_TWISTED_ROCK_BRICKS_WALL.get()).unlockedBy("has_twisted_rock", has(ItemRegistry.TWISTED_ROCK.get())).save(consumer, malumPath("small_twisted_rock_bricks_wall_stonecutting")); - smelting(Ingredient.of(ItemRegistry.SMALL_TWISTED_ROCK_BRICKS.get()),RecipeCategory.MISC, ItemRegistry.RUNIC_SMALL_TWISTED_ROCK_BRICKS.get(), 0.1f, 200).unlockedBy("has_twisted_rock", has(ItemRegistry.TWISTED_ROCK.get())).save(consumer, malumPath("cracked_small_twisted_rock_bricks_smelting")); + smelting(Ingredient.of(ItemRegistry.SMALL_TWISTED_ROCK_BRICKS.get()), RecipeCategory.MISC, ItemRegistry.RUNIC_SMALL_TWISTED_ROCK_BRICKS.get(), 0.1f, 200).unlockedBy("has_twisted_rock", has(ItemRegistry.TWISTED_ROCK.get())).save(consumer, malumPath("cracked_small_twisted_rock_bricks_smelting")); shaped(RecipeCategory.MISC, ItemRegistry.RUNIC_SMALL_TWISTED_ROCK_BRICKS_SLAB.get(), 6).define('#', ItemRegistry.RUNIC_SMALL_TWISTED_ROCK_BRICKS.get()).pattern("###").unlockedBy("has_twisted_rock", has(ItemRegistry.TWISTED_ROCK.get())).save(consumer); shaped(RecipeCategory.MISC, ItemRegistry.RUNIC_SMALL_TWISTED_ROCK_BRICKS_STAIRS.get(), 4).define('#', ItemRegistry.RUNIC_SMALL_TWISTED_ROCK_BRICKS.get()).pattern("# ").pattern("## ").pattern("###").unlockedBy("has_twisted_rock", has(ItemRegistry.TWISTED_ROCK.get())).save(consumer); shaped(RecipeCategory.MISC, ItemRegistry.RUNIC_SMALL_TWISTED_ROCK_BRICKS_WALL.get(), 6).define('#', ItemRegistry.RUNIC_SMALL_TWISTED_ROCK_BRICKS.get()).pattern("###").pattern("###").unlockedBy("has_twisted_rock", has(ItemRegistry.TWISTED_ROCK.get())).save(consumer); stonecutting(Ingredient.of(ItemRegistry.TWISTED_ROCK_BRICKS.get()), RecipeCategory.MISC, ItemRegistry.RUNIC_SMALL_TWISTED_ROCK_BRICKS.get()).unlockedBy("has_twisted_rock", has(ItemRegistry.TWISTED_ROCK.get())).save(consumer, malumPath("cracked_small_twisted_rock_bricks_stonecutting_alt")); - stonecutting(Ingredient.of(ItemRegistry.RUNIC_SMALL_TWISTED_ROCK_BRICKS.get()),RecipeCategory.MISC, ItemRegistry.RUNIC_SMALL_TWISTED_ROCK_BRICKS_SLAB.get(), 2).unlockedBy("has_twisted_rock", has(ItemRegistry.TWISTED_ROCK.get())).save(consumer, malumPath("cracked_small_twisted_rock_bricks_slab_stonecutting")); - stonecutting(Ingredient.of(ItemRegistry.RUNIC_SMALL_TWISTED_ROCK_BRICKS.get()),RecipeCategory.MISC, ItemRegistry.RUNIC_SMALL_TWISTED_ROCK_BRICKS_STAIRS.get()).unlockedBy("has_twisted_rock", has(ItemRegistry.TWISTED_ROCK.get())).save(consumer, malumPath("cracked_small_twisted_rock_bricks_stairs_stonecutting")); - stonecutting(Ingredient.of(ItemRegistry.RUNIC_SMALL_TWISTED_ROCK_BRICKS.get()),RecipeCategory.MISC, ItemRegistry.RUNIC_SMALL_TWISTED_ROCK_BRICKS_WALL.get()).unlockedBy("has_twisted_rock", has(ItemRegistry.TWISTED_ROCK.get())).save(consumer, malumPath("cracked_small_twisted_rock_bricks_wall_stonecutting")); + stonecutting(Ingredient.of(ItemRegistry.RUNIC_SMALL_TWISTED_ROCK_BRICKS.get()), RecipeCategory.MISC, ItemRegistry.RUNIC_SMALL_TWISTED_ROCK_BRICKS_SLAB.get(), 2).unlockedBy("has_twisted_rock", has(ItemRegistry.TWISTED_ROCK.get())).save(consumer, malumPath("cracked_small_twisted_rock_bricks_slab_stonecutting")); + stonecutting(Ingredient.of(ItemRegistry.RUNIC_SMALL_TWISTED_ROCK_BRICKS.get()), RecipeCategory.MISC, ItemRegistry.RUNIC_SMALL_TWISTED_ROCK_BRICKS_STAIRS.get()).unlockedBy("has_twisted_rock", has(ItemRegistry.TWISTED_ROCK.get())).save(consumer, malumPath("cracked_small_twisted_rock_bricks_stairs_stonecutting")); + stonecutting(Ingredient.of(ItemRegistry.RUNIC_SMALL_TWISTED_ROCK_BRICKS.get()), RecipeCategory.MISC, ItemRegistry.RUNIC_SMALL_TWISTED_ROCK_BRICKS_WALL.get()).unlockedBy("has_twisted_rock", has(ItemRegistry.TWISTED_ROCK.get())).save(consumer, malumPath("cracked_small_twisted_rock_bricks_wall_stonecutting")); shaped(RecipeCategory.MISC, ItemRegistry.CHISELED_TWISTED_ROCK.get()).define('#', ItemRegistry.TWISTED_ROCK_SLAB.get()).pattern("#").pattern("#").unlockedBy("has_twisted_rock", has(ItemRegistry.TWISTED_ROCK.get())).save(consumer); shaped(RecipeCategory.MISC, ItemRegistry.TWISTED_ROCK_COLUMN.get(), 2).define('#', ItemRegistry.TWISTED_ROCK_BRICKS.get()).pattern("#").pattern("#").unlockedBy("has_twisted_rock", has(ItemRegistry.TWISTED_ROCK.get())).save(consumer); @@ -449,17 +463,17 @@ protected void buildRecipes(Consumer consumer) { shapeless(RecipeCategory.MISC, ItemRegistry.TWISTED_ROCK_COLUMN.get()).requires(ItemRegistry.TWISTED_ROCK_COLUMN_CAP.get()).unlockedBy("has_twisted_rock", has(ItemRegistry.TWISTED_ROCK.get())).save(consumer, malumPath("twisted_rock_column_from_cap")); shaped(RecipeCategory.MISC, ItemRegistry.CUT_TWISTED_ROCK.get(), 4).define('#', ItemRegistry.SMOOTH_TWISTED_ROCK.get()).pattern("##").pattern("##").unlockedBy("has_twisted_rock", has(ItemRegistry.TWISTED_ROCK.get())).save(consumer); - stonecutting(Ingredient.of(ItemRegistry.TWISTED_ROCK.get()),RecipeCategory.MISC, ItemRegistry.CUT_TWISTED_ROCK.get()).unlockedBy("has_twisted_rock", has(ItemRegistry.TWISTED_ROCK.get())).save(consumer, malumPath("cut_twisted_rock_stonecutting")); - stonecutting(Ingredient.of(ItemRegistry.TWISTED_ROCK.get()),RecipeCategory.MISC, ItemRegistry.TWISTED_ROCK_COLUMN.get()).unlockedBy("has_twisted_rock", has(ItemRegistry.TWISTED_ROCK.get())).save(consumer, malumPath("twisted_rock_column_stonecutting")); - stonecutting(Ingredient.of(ItemRegistry.TWISTED_ROCK.get()),RecipeCategory.MISC, ItemRegistry.TWISTED_ROCK_COLUMN_CAP.get()).unlockedBy("has_twisted_rock", has(ItemRegistry.TWISTED_ROCK.get())).save(consumer, malumPath("twisted_rock_column_cap_stonecutting")); - stonecutting(Ingredient.of(ItemRegistry.TWISTED_ROCK.get()),RecipeCategory.MISC, ItemRegistry.TWISTED_ROCK_BRICKS.get()).unlockedBy("has_twisted_rock", has(ItemRegistry.TWISTED_ROCK.get())).save(consumer, malumPath("twisted_rock_bricks_stonecutting")); - stonecutting(Ingredient.of(ItemRegistry.TWISTED_ROCK.get()),RecipeCategory.MISC, ItemRegistry.SMOOTH_TWISTED_ROCK.get()).unlockedBy("has_twisted_rock", has(ItemRegistry.TWISTED_ROCK.get())).save(consumer, malumPath("smooth_twisted_rock_stonecutting")); - stonecutting(Ingredient.of(ItemRegistry.TWISTED_ROCK.get()),RecipeCategory.MISC, ItemRegistry.POLISHED_TWISTED_ROCK.get()).unlockedBy("has_twisted_rock", has(ItemRegistry.TWISTED_ROCK.get())).save(consumer, malumPath("polished_twisted_rock_stonecutting")); + stonecutting(Ingredient.of(ItemRegistry.TWISTED_ROCK.get()), RecipeCategory.MISC, ItemRegistry.CUT_TWISTED_ROCK.get()).unlockedBy("has_twisted_rock", has(ItemRegistry.TWISTED_ROCK.get())).save(consumer, malumPath("cut_twisted_rock_stonecutting")); + stonecutting(Ingredient.of(ItemRegistry.TWISTED_ROCK.get()), RecipeCategory.MISC, ItemRegistry.TWISTED_ROCK_COLUMN.get()).unlockedBy("has_twisted_rock", has(ItemRegistry.TWISTED_ROCK.get())).save(consumer, malumPath("twisted_rock_column_stonecutting")); + stonecutting(Ingredient.of(ItemRegistry.TWISTED_ROCK.get()), RecipeCategory.MISC, ItemRegistry.TWISTED_ROCK_COLUMN_CAP.get()).unlockedBy("has_twisted_rock", has(ItemRegistry.TWISTED_ROCK.get())).save(consumer, malumPath("twisted_rock_column_cap_stonecutting")); + stonecutting(Ingredient.of(ItemRegistry.TWISTED_ROCK.get()), RecipeCategory.MISC, ItemRegistry.TWISTED_ROCK_BRICKS.get()).unlockedBy("has_twisted_rock", has(ItemRegistry.TWISTED_ROCK.get())).save(consumer, malumPath("twisted_rock_bricks_stonecutting")); + stonecutting(Ingredient.of(ItemRegistry.TWISTED_ROCK.get()), RecipeCategory.MISC, ItemRegistry.SMOOTH_TWISTED_ROCK.get()).unlockedBy("has_twisted_rock", has(ItemRegistry.TWISTED_ROCK.get())).save(consumer, malumPath("smooth_twisted_rock_stonecutting")); + stonecutting(Ingredient.of(ItemRegistry.TWISTED_ROCK.get()), RecipeCategory.MISC, ItemRegistry.POLISHED_TWISTED_ROCK.get()).unlockedBy("has_twisted_rock", has(ItemRegistry.TWISTED_ROCK.get())).save(consumer, malumPath("polished_twisted_rock_stonecutting")); stonecutting(Ingredient.of(ItemRegistry.TWISTED_ROCK.get()), RecipeCategory.MISC, ItemRegistry.CHISELED_TWISTED_ROCK.get()).unlockedBy("has_twisted_rock", has(ItemRegistry.TWISTED_ROCK.get())).save(consumer, malumPath("chiseled_twisted_rock_bricks_stonecutting")); - stonecutting(Ingredient.of(ItemRegistry.TWISTED_ROCK_BRICKS.get()),RecipeCategory.MISC, ItemRegistry.CHISELED_TWISTED_ROCK.get()).unlockedBy("has_twisted_rock", has(ItemRegistry.TWISTED_ROCK.get())).save(consumer, malumPath("chiseled_twisted_rock_bricks_stonecutting_alt")); + stonecutting(Ingredient.of(ItemRegistry.TWISTED_ROCK_BRICKS.get()), RecipeCategory.MISC, ItemRegistry.CHISELED_TWISTED_ROCK.get()).unlockedBy("has_twisted_rock", has(ItemRegistry.TWISTED_ROCK.get())).save(consumer, malumPath("chiseled_twisted_rock_bricks_stonecutting_alt")); stonecutting(Ingredient.of(ItemRegistry.TWISTED_ROCK_BRICKS.get()), RecipeCategory.MISC, ItemRegistry.SMALL_TWISTED_ROCK_BRICKS.get()).unlockedBy("has_twisted_rock", has(ItemRegistry.TWISTED_ROCK.get())).save(consumer, malumPath("small_twisted_rock_bricks_stonecutting_from_bricks")); - stonecutting(Ingredient.of(ItemRegistry.TWISTED_ROCK_TILES.get()),RecipeCategory.MISC, ItemRegistry.SMALL_TWISTED_ROCK_BRICKS.get()).unlockedBy("has_twisted_rock", has(ItemRegistry.TWISTED_ROCK.get())).save(consumer, malumPath("small_twisted_rock_bricks_stonecutting_from_tiles")); + stonecutting(Ingredient.of(ItemRegistry.TWISTED_ROCK_TILES.get()), RecipeCategory.MISC, ItemRegistry.SMALL_TWISTED_ROCK_BRICKS.get()).unlockedBy("has_twisted_rock", has(ItemRegistry.TWISTED_ROCK.get())).save(consumer, malumPath("small_twisted_rock_bricks_stonecutting_from_tiles")); shaped(RecipeCategory.MISC, ItemRegistry.TWISTED_ROCK_ITEM_STAND.get(), 2).define('X', ItemRegistry.TWISTED_ROCK.get()).define('Y', ItemRegistry.TWISTED_ROCK_SLAB.get()).pattern("YYY").pattern("XXX").unlockedBy("has_twisted_rock", has(ItemRegistry.TWISTED_ROCK.get())).save(consumer); shaped(RecipeCategory.MISC, ItemRegistry.TWISTED_ROCK_ITEM_PEDESTAL.get()).define('X', ItemRegistry.TWISTED_ROCK.get()).define('Y', ItemRegistry.TWISTED_ROCK_SLAB.get()).pattern("YYY").pattern(" X ").pattern("YYY").unlockedBy("has_twisted_rock", has(ItemRegistry.TWISTED_ROCK.get())).save(consumer); @@ -583,7 +597,6 @@ private static void shapedSign(Consumer recipeConsumer, ItemLike } - protected static EnterBlockTrigger.TriggerInstance insideOf(Block pBlock) { return new EnterBlockTrigger.TriggerInstance(ContextAwarePredicate.ANY, pBlock, StatePropertiesPredicate.ANY); } diff --git a/src/main/java/com/sammy/malum/data/RegistryDataGenerator.java b/src/main/java/com/sammy/malum/data/RegistryDataGenerator.java new file mode 100644 index 000000000..d20c03302 --- /dev/null +++ b/src/main/java/com/sammy/malum/data/RegistryDataGenerator.java @@ -0,0 +1,41 @@ +package com.sammy.malum.data; + +import com.sammy.malum.MalumMod; +import com.sammy.malum.registry.common.worldgen.BiomeTagRegistry; +import com.sammy.malum.registry.common.worldgen.ConfiguredFeatureRegistry; +import com.sammy.malum.registry.common.worldgen.PlacedFeatureRegistry; +import com.sammy.malum.registry.common.worldgen.StructureRegistry; +import net.minecraft.core.Holder; +import net.minecraft.core.HolderLookup; +import net.minecraft.core.HolderSet; +import net.minecraft.core.RegistrySetBuilder; +import net.minecraft.core.registries.Registries; +import net.minecraft.data.PackOutput; +import net.minecraft.data.worldgen.BootstapContext; +import net.minecraft.resources.ResourceKey; +import net.minecraft.tags.TagKey; +import net.minecraft.world.level.biome.Biome; +import net.minecraft.world.level.levelgen.GenerationStep; +import net.minecraft.world.level.levelgen.placement.PlacedFeature; +import net.minecraftforge.common.data.DatapackBuiltinEntriesProvider; +import net.minecraftforge.common.world.BiomeModifier; +import net.minecraftforge.common.world.ForgeBiomeModifiers; +import net.minecraftforge.registries.ForgeRegistries; + +import java.util.ArrayList; +import java.util.List; +import java.util.Set; +import java.util.concurrent.CompletableFuture; +import java.util.function.Supplier; + +public class RegistryDataGenerator extends DatapackBuiltinEntriesProvider { + + private static final RegistrySetBuilder BUILDER = new RegistrySetBuilder() + .add(Registries.CONFIGURED_FEATURE, ConfiguredFeatureRegistry::bootstrap) + .add(Registries.PLACED_FEATURE, PlacedFeatureRegistry::bootstrap) + .add(ForgeRegistries.Keys.BIOME_MODIFIERS, BiomeModifications::bootstrap); + + public RegistryDataGenerator(PackOutput output, CompletableFuture registries) { + super(output, registries, BUILDER, Set.of("minecraft", MalumMod.MALUM)); + } +} diff --git a/src/main/java/com/sammy/malum/data/block/MalumBlockLootTables.java b/src/main/java/com/sammy/malum/data/block/MalumBlockLootTables.java index 63096aa30..4df5a1b1b 100644 --- a/src/main/java/com/sammy/malum/data/block/MalumBlockLootTables.java +++ b/src/main/java/com/sammy/malum/data/block/MalumBlockLootTables.java @@ -2,16 +2,16 @@ import com.google.common.collect.ImmutableSet; import com.mojang.datafixers.util.Pair; +import com.sammy.malum.MalumMod; import com.sammy.malum.common.block.ether.EtherBlock; -import com.sammy.malum.common.block.storage.vial.SoulVialBlock; import com.sammy.malum.common.block.storage.jar.SpiritJarBlock; +import com.sammy.malum.common.block.storage.vial.SoulVialBlock; import com.sammy.malum.registry.common.block.BlockRegistry; import com.sammy.malum.registry.common.item.ItemRegistry; import net.minecraft.advancements.critereon.EnchantmentPredicate; import net.minecraft.advancements.critereon.ItemPredicate; import net.minecraft.advancements.critereon.MinMaxBounds; import net.minecraft.advancements.critereon.StatePropertiesPredicate; -import net.minecraft.core.Registry; import net.minecraft.data.PackOutput; import net.minecraft.data.loot.BlockLootSubProvider; import net.minecraft.data.loot.LootTableProvider; @@ -28,7 +28,6 @@ import net.minecraft.world.level.block.state.properties.SlabType; import net.minecraft.world.level.storage.loot.LootPool; import net.minecraft.world.level.storage.loot.LootTable; -import net.minecraft.world.level.storage.loot.ValidationContext; import net.minecraft.world.level.storage.loot.entries.LootItem; import net.minecraft.world.level.storage.loot.entries.LootPoolEntryContainer; import net.minecraft.world.level.storage.loot.functions.*; @@ -48,6 +47,7 @@ import java.util.function.Consumer; import java.util.function.Function; import java.util.function.Supplier; +import java.util.stream.Collectors; import java.util.stream.Stream; import static com.sammy.malum.registry.common.block.BlockRegistry.BLOCKS; @@ -72,20 +72,26 @@ public MalumBlockLootTables(PackOutput pOutput) { new SubProviderEntry(BlocksLoot::new, LootContextParamSets.BLOCK)) ); } + public static class BlocksLoot extends BlockLootSubProvider { protected BlocksLoot() { super(Set.of(), FeatureFlags.REGISTRY.allFlags()); } + @Override + protected Iterable getKnownBlocks() { + return BlockRegistry.BLOCKS.getEntries().stream().map(Supplier::get).collect(Collectors.toList()); + } + @Override protected void generate() { Set> blocks = new HashSet<>(BLOCKS.getEntries()); takeAll(blocks, b -> b.get().properties instanceof LodestoneBlockProperties && ((LodestoneBlockProperties) b.get().properties).getDatagenData().hasInheritedLootTable); - add(take(blocks, BlockRegistry.RUNEWOOD_LEAVES).get(), (b)->createLeavesDrops(b, BlockRegistry.RUNEWOOD_SAPLING.get(), MAGIC_SAPLING_DROP_CHANCE)); - add(take(blocks, BlockRegistry.SOULWOOD_LEAVES).get(), (b)->createLeavesDrops(b, BlockRegistry.SOULWOOD_GROWTH.get(), MAGIC_SAPLING_DROP_CHANCE)); + add(take(blocks, BlockRegistry.RUNEWOOD_LEAVES).get(), (b) -> createLeavesDrops(b, BlockRegistry.RUNEWOOD_SAPLING.get(), MAGIC_SAPLING_DROP_CHANCE)); + add(take(blocks, BlockRegistry.SOULWOOD_LEAVES).get(), (b) -> createLeavesDrops(b, BlockRegistry.SOULWOOD_GROWTH.get(), MAGIC_SAPLING_DROP_CHANCE)); add(take(blocks, BlockRegistry.BLIGHTED_SOULWOOD).get(), createSingleItemTableWithSilkTouch(BlockRegistry.BLIGHTED_SOULWOOD.get(), ItemRegistry.SOULWOOD_LOG.get())); add(take(blocks, BlockRegistry.BLIGHTED_SOIL).get(), createBlightedDrop(BlockRegistry.BLIGHTED_SOIL.get(), 4)); @@ -121,11 +127,11 @@ protected void generate() { protected static > T applyExplosionDecay(ItemLike p_124132_, FunctionUserBuilder p_124133_) { - return (T)(!EXPLOSION_RESISTANT.contains(p_124132_.asItem()) ? p_124133_.apply(ApplyExplosionDecay.explosionDecay()) : p_124133_.unwrap()); + return !EXPLOSION_RESISTANT.contains(p_124132_.asItem()) ? p_124133_.apply(ApplyExplosionDecay.explosionDecay()) : p_124133_.unwrap(); } protected static > T applyExplosionCondition(ItemLike p_124135_, ConditionUserBuilder p_124136_) { - return (T)(!EXPLOSION_RESISTANT.contains(p_124135_.asItem()) ? p_124136_.when(ExplosionCondition.survivesExplosion()) : p_124136_.unwrap()); + return !EXPLOSION_RESISTANT.contains(p_124135_.asItem()) ? p_124136_.when(ExplosionCondition.survivesExplosion()) : p_124136_.unwrap(); } protected static LootTable.Builder createBlightedDrop(Block block, int gunkAmount) { @@ -226,7 +232,7 @@ protected Iterable getKnownBlocks() { public void dropPottedContents(Block p_124253_) { this.add(p_124253_, (p_176061_) -> { - return createPotFlowerItemTable(((FlowerPotBlock)p_176061_).getContent()); + return createPotFlowerItemTable(((FlowerPotBlock) p_176061_).getContent()); }); } @@ -255,6 +261,6 @@ protected void add(Block block, LootTable.Builder builder) { } protected void add(ResourceLocation path, LootTable.Builder lootTable) { - tables.add(Pair.of(() -> (lootBuilder) -> lootBuilder.accept(path, lootTable), LootContextParamSets.BLOCK)); + tables.add(Pair.of(() -> (lootBuilder) -> lootBuilder.accept(path, lootTable), LootContextParamSets.BLOCK)); } } \ No newline at end of file diff --git a/src/main/java/com/sammy/malum/data/block/MalumBlockStateSmithTypes.java b/src/main/java/com/sammy/malum/data/block/MalumBlockStateSmithTypes.java index 970395fb6..e73dd11d2 100644 --- a/src/main/java/com/sammy/malum/data/block/MalumBlockStateSmithTypes.java +++ b/src/main/java/com/sammy/malum/data/block/MalumBlockStateSmithTypes.java @@ -1,21 +1,22 @@ package com.sammy.malum.data.block; -import com.sammy.malum.common.block.curiosities.totem.*; -import com.sammy.malum.common.block.curiosities.weeping_well.*; -import com.sammy.malum.common.block.ether.*; -import com.sammy.malum.core.systems.spirit.*; -import com.sammy.malum.data.item.*; -import com.sammy.malum.registry.common.*; -import net.minecraft.resources.*; -import net.minecraft.world.level.block.*; -import net.minecraft.world.level.block.state.properties.*; -import net.minecraftforge.client.model.generators.*; -import team.lodestar.lodestone.systems.datagen.*; -import team.lodestar.lodestone.systems.datagen.statesmith.*; +import com.sammy.malum.common.block.curiosities.totem.TotemPoleBlock; +import com.sammy.malum.common.block.curiosities.weeping_well.PrimordialSoupBlock; +import com.sammy.malum.common.block.ether.EtherBrazierBlock; +import com.sammy.malum.core.systems.spirit.MalumSpiritType; +import com.sammy.malum.data.item.MalumItemModelSmithTypes; +import com.sammy.malum.registry.common.SpiritTypeRegistry; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.state.properties.BlockStateProperties; +import net.minecraftforge.client.model.generators.ConfiguredModel; +import net.minecraftforge.client.model.generators.ModelFile; +import team.lodestar.lodestone.systems.datagen.ItemModelSmithTypes; +import team.lodestar.lodestone.systems.datagen.statesmith.BlockStateSmith; -import java.util.function.*; +import java.util.function.Function; -import static com.sammy.malum.MalumMod.*; +import static com.sammy.malum.MalumMod.malumPath; public class MalumBlockStateSmithTypes { diff --git a/src/main/java/com/sammy/malum/data/block/MalumBlockStates.java b/src/main/java/com/sammy/malum/data/block/MalumBlockStates.java index 0ba907612..af9b286d5 100644 --- a/src/main/java/com/sammy/malum/data/block/MalumBlockStates.java +++ b/src/main/java/com/sammy/malum/data/block/MalumBlockStates.java @@ -1,22 +1,26 @@ package com.sammy.malum.data.block; -import com.sammy.malum.*; -import com.sammy.malum.data.item.*; -import net.minecraft.data.*; -import net.minecraft.resources.*; -import net.minecraft.server.packs.repository.Pack; -import net.minecraft.world.level.block.*; -import net.minecraftforge.client.model.generators.*; -import net.minecraftforge.common.data.*; -import team.lodestar.lodestone.systems.datagen.*; -import team.lodestar.lodestone.systems.datagen.providers.*; -import team.lodestar.lodestone.systems.datagen.statesmith.*; - -import javax.annotation.*; -import java.util.*; -import java.util.function.*; - -import static com.sammy.malum.MalumMod.*; +import com.sammy.malum.MalumMod; +import com.sammy.malum.data.item.MalumItemModelSmithTypes; +import net.minecraft.data.PackOutput; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.level.block.Block; +import net.minecraftforge.client.model.generators.ConfiguredModel; +import net.minecraftforge.client.model.generators.ModelFile; +import net.minecraftforge.common.data.ExistingFileHelper; +import team.lodestar.lodestone.systems.datagen.BlockStateSmithTypes; +import team.lodestar.lodestone.systems.datagen.ItemModelSmithTypes; +import team.lodestar.lodestone.systems.datagen.providers.LodestoneBlockStateProvider; +import team.lodestar.lodestone.systems.datagen.providers.LodestoneItemModelProvider; +import team.lodestar.lodestone.systems.datagen.statesmith.AbstractBlockStateSmith; + +import javax.annotation.Nonnull; +import java.util.HashSet; +import java.util.Set; +import java.util.function.Supplier; + +import static com.sammy.malum.MalumMod.MALUM; +import static com.sammy.malum.MalumMod.malumPath; import static com.sammy.malum.registry.common.block.BlockRegistry.*; public class MalumBlockStates extends LodestoneBlockStateProvider { @@ -268,7 +272,7 @@ public ModelFile layeredBlockModel(Block block) { String name = getBlockName(block); ResourceLocation parent = malumPath("block/templates/template_glowing_block"); ResourceLocation texture = getBlockTexture(name); - ResourceLocation glowingTexture = getBlockTexture(name+"_glow"); + ResourceLocation glowingTexture = getBlockTexture(name + "_glow"); return models().withExistingParent(name, parent).texture("all", texture).texture("glow", glowingTexture).texture("particle", texture); } @@ -284,6 +288,7 @@ public ModelFile etherTorchModel(Block block) { public ModelFile wallEtherTorchModel(Block block) { return models().getExistingFile(malumPath("block/ether_torch_wall")); } + public ModelFile totemBaseModel(Block block) { String name = getBlockName(block); String woodName = name.substring(0, 8); diff --git a/src/main/java/com/sammy/malum/data/block/MalumBlockTags.java b/src/main/java/com/sammy/malum/data/block/MalumBlockTags.java index d0147290d..b2140217b 100644 --- a/src/main/java/com/sammy/malum/data/block/MalumBlockTags.java +++ b/src/main/java/com/sammy/malum/data/block/MalumBlockTags.java @@ -1,22 +1,22 @@ package com.sammy.malum.data.block; -import com.sammy.malum.*; -import com.sammy.malum.registry.common.block.*; +import com.sammy.malum.MalumMod; +import com.sammy.malum.registry.common.block.BlockTagRegistry; import net.minecraft.core.HolderLookup; -import net.minecraft.data.*; -import net.minecraft.world.level.block.*; -import net.minecraftforge.common.data.*; -import net.minecraftforge.registries.*; +import net.minecraft.data.PackOutput; +import net.minecraft.world.level.block.Block; +import net.minecraftforge.common.data.ExistingFileHelper; +import net.minecraftforge.registries.RegistryObject; import org.jetbrains.annotations.Nullable; -import team.lodestar.lodestone.systems.datagen.providers.*; +import team.lodestar.lodestone.systems.datagen.providers.LodestoneBlockTagsProvider; -import javax.annotation.*; +import javax.annotation.Nonnull; import java.util.*; import java.util.concurrent.CompletableFuture; -import java.util.function.*; -import java.util.stream.*; +import java.util.function.Predicate; +import java.util.stream.Collectors; -import static com.sammy.malum.registry.common.block.BlockRegistry.*; +import static com.sammy.malum.registry.common.block.BlockRegistry.BLOCKS; public class MalumBlockTags extends LodestoneBlockTagsProvider { @@ -25,9 +25,14 @@ public MalumBlockTags(PackOutput output, CompletableFuture> blocks = new HashSet<>(BLOCKS.getEntries()); tag(BlockTagRegistry.RITE_IMMUNE).addTags(BlockTagRegistry.TAINTED_ROCK, BlockTagRegistry.TWISTED_ROCK); @@ -38,16 +43,6 @@ protected void addTags() { addTagsFromBlockProperties(blocks.stream().map(RegistryObject::get).collect(Collectors.toList())); } - @Override - public String getName() { - return "Malum Block Tags"; - } - - @Override - protected void addTags(HolderLookup.Provider pProvider) { - addTags(); - } - @Nonnull private Block[] getModBlocks(Predicate predicate) { List ret = new ArrayList<>(Collections.emptyList()); diff --git a/src/main/java/com/sammy/malum/data/item/MalumItemModelSmithTypes.java b/src/main/java/com/sammy/malum/data/item/MalumItemModelSmithTypes.java index b31a3804c..0f798fca0 100644 --- a/src/main/java/com/sammy/malum/data/item/MalumItemModelSmithTypes.java +++ b/src/main/java/com/sammy/malum/data/item/MalumItemModelSmithTypes.java @@ -1,15 +1,20 @@ package com.sammy.malum.data.item; -import com.sammy.malum.common.item.cosmetic.skins.*; -import com.sammy.malum.registry.common.item.*; -import net.minecraft.resources.*; -import team.lodestar.lodestone.helpers.*; -import team.lodestar.lodestone.systems.datagen.itemsmith.*; -import team.lodestar.lodestone.systems.item.*; +import com.sammy.malum.common.item.cosmetic.skins.ArmorSkin; +import com.sammy.malum.registry.common.item.ArmorSkinRegistry; +import net.minecraft.resources.ResourceLocation; +import net.minecraftforge.registries.ForgeRegistries; +import team.lodestar.lodestone.helpers.DataHelper; +import team.lodestar.lodestone.systems.datagen.itemsmith.ItemModelSmith; +import team.lodestar.lodestone.systems.item.LodestoneArmorItem; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Map; -import static team.lodestar.lodestone.systems.datagen.ItemModelSmithTypes.*; +import static team.lodestar.lodestone.systems.datagen.ItemModelSmithTypes.GENERATED; +import static team.lodestar.lodestone.systems.datagen.ItemModelSmithTypes.HANDHELD; public class MalumItemModelSmithTypes { @@ -31,33 +36,33 @@ public class MalumItemModelSmithTypes { public static ItemModelSmith GENERATED_OVERLAY_ITEM = new ItemModelSmith((item, provider) -> { String name = provider.getItemName(item); - provider.withExistingParent(name, GENERATED).texture("layer0", provider.modLoc("item/"+name)).texture("layer1", provider.modLoc("item/"+name+"_overlay")); + provider.withExistingParent(name, GENERATED).texture("layer0", provider.modLoc("item/" + name)).texture("layer1", provider.modLoc("item/" + name + "_overlay")); }); public static ItemModelSmith HANDHELD_OVERLAY_ITEM = new ItemModelSmith((item, provider) -> { String name = provider.getItemName(item); - provider.withExistingParent(name, HANDHELD).texture("layer0", provider.modLoc("item/"+name)).texture("layer1", provider.modLoc("item/"+name+"_overlay")); + provider.withExistingParent(name, HANDHELD).texture("layer0", provider.modLoc("item/" + name)).texture("layer1", provider.modLoc("item/" + name + "_overlay")); }); public static ItemModelSmith ETHER_BRAZIER_ITEM = new ItemModelSmith((item, provider) -> { String name = provider.getItemName(item); String rockType = name.split("_")[0]; String brazierName = rockType + "_ether_brazier"; - String overlayName = name.replace(rockType+"_", ""); - provider.withExistingParent(name, GENERATED).texture("layer0", provider.modLoc("item/"+brazierName)).texture("layer1", provider.modLoc("item/"+overlayName+"_overlay")); + String overlayName = name.replace(rockType + "_", ""); + provider.withExistingParent(name, GENERATED).texture("layer0", provider.modLoc("item/" + brazierName)).texture("layer1", provider.modLoc("item/" + overlayName + "_overlay")); }); public static ItemModelSmith IRIDESCENT_ETHER_BRAZIER_ITEM = new ItemModelSmith((item, provider) -> { String name = provider.getItemName(item); String rockType = name.split("_")[0]; String brazierName = rockType + "_ether_brazier"; - String overlayName = name.replace(rockType+"_", ""); - provider.withExistingParent(name, GENERATED).texture("layer0", provider.modLoc("item/"+brazierName)).texture("layer1", provider.modLoc("item/"+overlayName)).texture("layer2", provider.modLoc("item/"+overlayName+"_overlay")); + String overlayName = name.replace(rockType + "_", ""); + provider.withExistingParent(name, GENERATED).texture("layer0", provider.modLoc("item/" + brazierName)).texture("layer1", provider.modLoc("item/" + overlayName)).texture("layer2", provider.modLoc("item/" + overlayName + "_overlay")); }); public static ItemModelSmith IRIDESCENT_ETHER_TORCH_ITEM = new ItemModelSmith((item, provider) -> { String name = provider.getItemName(item); - provider.withExistingParent(name, HANDHELD).texture("layer0", provider.modLoc("item/ether_torch")).texture("layer1", provider.modLoc("item/"+name)).texture("layer2", provider.modLoc("item/"+name+"_overlay")); + provider.withExistingParent(name, HANDHELD).texture("layer0", provider.modLoc("item/ether_torch")).texture("layer1", provider.modLoc("item/" + name)).texture("layer2", provider.modLoc("item/" + name + "_overlay")); }); @@ -73,7 +78,7 @@ public class MalumItemModelSmithTypes { } String itemSuffix = datagenData.getSuffix((LodestoneArmorItem) item); ResourceLocation itemTexturePath = new ResourceLocation(datagenData.itemTexturePrefix + itemSuffix); - provider.getBuilder(item.getRegistryName().getPath()).override() + provider.getBuilder(ForgeRegistries.ITEMS.getKey(item).getPath()).override() .predicate(new ResourceLocation(ArmorSkin.MALUM_SKIN_TAG), value) .model(provider.withExistingParent(entry.getKey() + "_" + itemSuffix, GENERATED).texture("layer0", itemTexturePath)) .end(); diff --git a/src/main/java/com/sammy/malum/data/item/MalumItemModels.java b/src/main/java/com/sammy/malum/data/item/MalumItemModels.java index ebc495c37..3df413e0b 100644 --- a/src/main/java/com/sammy/malum/data/item/MalumItemModels.java +++ b/src/main/java/com/sammy/malum/data/item/MalumItemModels.java @@ -1,28 +1,31 @@ package com.sammy.malum.data.item; -import com.sammy.malum.*; -import com.sammy.malum.common.item.cosmetic.weaves.*; -import com.sammy.malum.common.item.curiosities.weapons.*; -import com.sammy.malum.common.item.ether.*; -import com.sammy.malum.common.item.impetus.*; -import com.sammy.malum.common.item.spirit.*; -import com.sammy.malum.registry.common.item.*; -import net.minecraft.core.*; -import net.minecraft.data.*; -import net.minecraft.world.item.*; -import net.minecraftforge.common.data.*; -import net.minecraftforge.registries.*; -import team.lodestar.lodestone.systems.datagen.*; -import team.lodestar.lodestone.systems.datagen.itemsmith.*; -import team.lodestar.lodestone.systems.datagen.providers.*; -import team.lodestar.lodestone.systems.item.*; - -import java.util.*; -import java.util.function.*; - -import static com.sammy.malum.MalumMod.*; +import com.sammy.malum.MalumMod; +import com.sammy.malum.common.item.cosmetic.weaves.AbstractWeaveItem; +import com.sammy.malum.common.item.cosmetic.weaves.PrideweaveItem; +import com.sammy.malum.common.item.curiosities.weapons.MalumScytheItem; +import com.sammy.malum.common.item.impetus.CrackedImpetusItem; +import com.sammy.malum.common.item.impetus.ImpetusItem; +import com.sammy.malum.common.item.impetus.NodeItem; +import com.sammy.malum.common.item.spirit.SpiritShardItem; +import com.sammy.malum.common.item.spirit.TunedOpticItem; +import com.sammy.malum.registry.common.item.ArmorSkinRegistry; +import net.minecraft.data.PackOutput; +import net.minecraft.world.item.BlockItem; +import net.minecraft.world.item.DiggerItem; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.SwordItem; +import net.minecraftforge.common.data.ExistingFileHelper; +import team.lodestar.lodestone.systems.datagen.ItemModelSmithTypes; +import team.lodestar.lodestone.systems.datagen.itemsmith.AbstractItemModelSmith; +import team.lodestar.lodestone.systems.datagen.providers.LodestoneItemModelProvider; +import team.lodestar.lodestone.systems.item.ModCombatItem; + +import java.util.HashSet; +import java.util.Set; +import java.util.function.Supplier; + import static com.sammy.malum.registry.common.item.ItemRegistry.*; -import static team.lodestar.lodestone.systems.datagen.ItemModelSmithTypes.*; public class MalumItemModels extends LodestoneItemModelProvider { public MalumItemModels(PackOutput output, ExistingFileHelper existingFileHelper) { diff --git a/src/main/java/com/sammy/malum/data/item/MalumItemTags.java b/src/main/java/com/sammy/malum/data/item/MalumItemTags.java index a9a65cbb2..452b12377 100644 --- a/src/main/java/com/sammy/malum/data/item/MalumItemTags.java +++ b/src/main/java/com/sammy/malum/data/item/MalumItemTags.java @@ -5,7 +5,6 @@ import com.sammy.malum.registry.common.block.BlockTagRegistry; import com.sammy.malum.registry.common.item.ItemTagRegistry; import net.minecraft.core.HolderLookup; -import net.minecraft.data.DataGenerator; import net.minecraft.data.PackOutput; import net.minecraft.data.tags.ItemTagsProvider; import net.minecraft.resources.ResourceLocation; @@ -38,10 +37,6 @@ public String getName() { @Override protected void addTags(HolderLookup.Provider pProvider) { - addTags(); - } - - protected void addTags() { tag(Tags.Items.GEMS).add(PROCESSED_SOULSTONE.get(), BLAZING_QUARTZ.get()); this.copy(BlockTags.WOOL, net.minecraft.tags.ItemTags.WOOL); diff --git a/src/main/java/com/sammy/malum/data/recipe/MalumSpiritFocusingRecipes.java b/src/main/java/com/sammy/malum/data/recipe/MalumSpiritFocusingRecipes.java index f0908e110..0f1c33b10 100644 --- a/src/main/java/com/sammy/malum/data/recipe/MalumSpiritFocusingRecipes.java +++ b/src/main/java/com/sammy/malum/data/recipe/MalumSpiritFocusingRecipes.java @@ -5,7 +5,6 @@ import com.sammy.malum.data.recipe.builder.SpiritFocusingRecipeBuilder; import com.sammy.malum.data.recipe.builder.SpiritRepairRecipeBuilder; import com.sammy.malum.registry.common.item.ItemRegistry; -import net.minecraft.data.DataGenerator; import net.minecraft.data.PackOutput; import net.minecraft.data.recipes.FinishedRecipe; import net.minecraft.data.recipes.RecipeProvider; @@ -31,6 +30,11 @@ public MalumSpiritFocusingRecipes(PackOutput generatorIn) { super(generatorIn); } + @Override + public String getName() { + return "Malum Spirit Crucible Recipe Provider"; + } + @Override protected void buildRecipes(Consumer consumer) { int metalDuration = 900; diff --git a/src/main/java/com/sammy/malum/data/recipe/MalumSpiritInfusionRecipes.java b/src/main/java/com/sammy/malum/data/recipe/MalumSpiritInfusionRecipes.java index d6d9837a8..688db1798 100644 --- a/src/main/java/com/sammy/malum/data/recipe/MalumSpiritInfusionRecipes.java +++ b/src/main/java/com/sammy/malum/data/recipe/MalumSpiritInfusionRecipes.java @@ -1,20 +1,24 @@ package com.sammy.malum.data.recipe; -import com.sammy.malum.*; -import com.sammy.malum.common.item.impetus.*; -import com.sammy.malum.data.recipe.builder.*; -import com.sammy.malum.registry.common.item.*; -import net.minecraft.data.*; -import net.minecraft.data.recipes.*; -import net.minecraft.tags.*; -import net.minecraft.world.item.*; -import net.minecraft.world.item.crafting.*; -import net.minecraftforge.common.*; -import net.minecraftforge.common.crafting.*; -import net.minecraftforge.common.crafting.conditions.*; -import net.minecraftforge.registries.*; - -import java.util.function.*; +import com.sammy.malum.MalumMod; +import com.sammy.malum.common.item.impetus.ImpetusItem; +import com.sammy.malum.data.recipe.builder.SpiritInfusionRecipeBuilder; +import com.sammy.malum.registry.common.item.ItemRegistry; +import net.minecraft.data.PackOutput; +import net.minecraft.data.recipes.FinishedRecipe; +import net.minecraft.data.recipes.RecipeProvider; +import net.minecraft.tags.ItemTags; +import net.minecraft.tags.TagKey; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.Items; +import net.minecraft.world.item.crafting.Ingredient; +import net.minecraftforge.common.Tags; +import net.minecraftforge.common.crafting.ConditionalRecipe; +import net.minecraftforge.common.crafting.conditions.IConditionBuilder; +import net.minecraftforge.common.crafting.conditions.TagEmptyCondition; +import net.minecraftforge.registries.RegistryObject; + +import java.util.function.Consumer; import static com.sammy.malum.registry.common.SpiritTypeRegistry.*; import static team.lodestar.lodestone.registry.common.tag.LodestoneItemTags.*; @@ -24,7 +28,10 @@ public MalumSpiritInfusionRecipes(PackOutput generatorIn) { super(generatorIn); } - + @Override + public String getName() { + return "Malum Spirit Infusion Recipe Provider"; + } @Override protected void buildRecipes(Consumer consumer) { diff --git a/src/main/java/com/sammy/malum/data/recipe/MalumSpiritTransmutationRecipes.java b/src/main/java/com/sammy/malum/data/recipe/MalumSpiritTransmutationRecipes.java index 956f25e3a..e2d1fc9bb 100644 --- a/src/main/java/com/sammy/malum/data/recipe/MalumSpiritTransmutationRecipes.java +++ b/src/main/java/com/sammy/malum/data/recipe/MalumSpiritTransmutationRecipes.java @@ -2,7 +2,6 @@ import com.mojang.datafixers.util.Pair; import com.sammy.malum.data.recipe.builder.SpiritTransmutationRecipeBuilder; -import net.minecraft.data.DataGenerator; import net.minecraft.data.PackOutput; import net.minecraft.data.recipes.FinishedRecipe; import net.minecraft.data.recipes.RecipeProvider; @@ -20,113 +19,118 @@ public MalumSpiritTransmutationRecipes(PackOutput generatorIn) { super(generatorIn); } + @Override + public String getName() { + return "Malum Block Transmutation Recipe Provider"; + } + private static final List, RegistryObject>> SOULWOOD_TRANSMUTATIONS = List.of( - new Pair<>(RUNEWOOD_SAPLING, SOULWOOD_GROWTH), - new Pair<>(RUNEWOOD_LEAVES, SOULWOOD_LEAVES), - new Pair<>(STRIPPED_RUNEWOOD_LOG, STRIPPED_SOULWOOD_LOG), - new Pair<>(RUNEWOOD_LOG, SOULWOOD_LOG), - new Pair<>(STRIPPED_RUNEWOOD, STRIPPED_SOULWOOD), - new Pair<>(RUNEWOOD, SOULWOOD), - new Pair<>(REVEALED_RUNEWOOD_LOG, REVEALED_SOULWOOD_LOG), - new Pair<>(EXPOSED_RUNEWOOD_LOG, EXPOSED_SOULWOOD_LOG), - new Pair<>(RUNEWOOD_PLANKS, SOULWOOD_PLANKS), - new Pair<>(RUNEWOOD_PLANKS_SLAB, SOULWOOD_PLANKS_SLAB), - new Pair<>(RUNEWOOD_PLANKS_STAIRS, SOULWOOD_PLANKS_STAIRS), - new Pair<>(VERTICAL_RUNEWOOD_PLANKS, VERTICAL_SOULWOOD_PLANKS), - new Pair<>(VERTICAL_RUNEWOOD_PLANKS_SLAB, VERTICAL_SOULWOOD_PLANKS_SLAB), - new Pair<>(VERTICAL_RUNEWOOD_PLANKS_STAIRS, VERTICAL_SOULWOOD_PLANKS_STAIRS), - new Pair<>(RUNEWOOD_PANEL, SOULWOOD_PANEL), - new Pair<>(RUNEWOOD_PANEL_SLAB, SOULWOOD_PANEL_SLAB), - new Pair<>(RUNEWOOD_PANEL_STAIRS, SOULWOOD_PANEL_STAIRS), - new Pair<>(RUNEWOOD_TILES, SOULWOOD_TILES), - new Pair<>(RUNEWOOD_TILES_SLAB, SOULWOOD_TILES_SLAB), - new Pair<>(RUNEWOOD_TILES_STAIRS, SOULWOOD_TILES_STAIRS), - new Pair<>(CUT_RUNEWOOD_PLANKS, CUT_SOULWOOD_PLANKS), - new Pair<>(RUNEWOOD_BEAM, SOULWOOD_BEAM), - new Pair<>(RUNEWOOD_DOOR, SOULWOOD_DOOR), - new Pair<>(RUNEWOOD_TRAPDOOR, SOULWOOD_TRAPDOOR), - new Pair<>(SOLID_RUNEWOOD_TRAPDOOR, SOLID_SOULWOOD_TRAPDOOR), - new Pair<>(RUNEWOOD_BUTTON, SOULWOOD_BUTTON), - new Pair<>(RUNEWOOD_PRESSURE_PLATE, SOULWOOD_PRESSURE_PLATE), - new Pair<>(RUNEWOOD_FENCE, SOULWOOD_FENCE), - new Pair<>(RUNEWOOD_FENCE_GATE, SOULWOOD_FENCE_GATE), - new Pair<>(RUNEWOOD_ITEM_STAND, SOULWOOD_ITEM_STAND), - new Pair<>(RUNEWOOD_ITEM_PEDESTAL, SOULWOOD_ITEM_PEDESTAL), - new Pair<>(RUNEWOOD_SIGN, SOULWOOD_SIGN) // Wall sign already handled by this. Is it??? Wire? Huh ? How + new Pair<>(RUNEWOOD_SAPLING, SOULWOOD_GROWTH), + new Pair<>(RUNEWOOD_LEAVES, SOULWOOD_LEAVES), + new Pair<>(STRIPPED_RUNEWOOD_LOG, STRIPPED_SOULWOOD_LOG), + new Pair<>(RUNEWOOD_LOG, SOULWOOD_LOG), + new Pair<>(STRIPPED_RUNEWOOD, STRIPPED_SOULWOOD), + new Pair<>(RUNEWOOD, SOULWOOD), + new Pair<>(REVEALED_RUNEWOOD_LOG, REVEALED_SOULWOOD_LOG), + new Pair<>(EXPOSED_RUNEWOOD_LOG, EXPOSED_SOULWOOD_LOG), + new Pair<>(RUNEWOOD_PLANKS, SOULWOOD_PLANKS), + new Pair<>(RUNEWOOD_PLANKS_SLAB, SOULWOOD_PLANKS_SLAB), + new Pair<>(RUNEWOOD_PLANKS_STAIRS, SOULWOOD_PLANKS_STAIRS), + new Pair<>(VERTICAL_RUNEWOOD_PLANKS, VERTICAL_SOULWOOD_PLANKS), + new Pair<>(VERTICAL_RUNEWOOD_PLANKS_SLAB, VERTICAL_SOULWOOD_PLANKS_SLAB), + new Pair<>(VERTICAL_RUNEWOOD_PLANKS_STAIRS, VERTICAL_SOULWOOD_PLANKS_STAIRS), + new Pair<>(RUNEWOOD_PANEL, SOULWOOD_PANEL), + new Pair<>(RUNEWOOD_PANEL_SLAB, SOULWOOD_PANEL_SLAB), + new Pair<>(RUNEWOOD_PANEL_STAIRS, SOULWOOD_PANEL_STAIRS), + new Pair<>(RUNEWOOD_TILES, SOULWOOD_TILES), + new Pair<>(RUNEWOOD_TILES_SLAB, SOULWOOD_TILES_SLAB), + new Pair<>(RUNEWOOD_TILES_STAIRS, SOULWOOD_TILES_STAIRS), + new Pair<>(CUT_RUNEWOOD_PLANKS, CUT_SOULWOOD_PLANKS), + new Pair<>(RUNEWOOD_BEAM, SOULWOOD_BEAM), + new Pair<>(RUNEWOOD_DOOR, SOULWOOD_DOOR), + new Pair<>(RUNEWOOD_TRAPDOOR, SOULWOOD_TRAPDOOR), + new Pair<>(SOLID_RUNEWOOD_TRAPDOOR, SOLID_SOULWOOD_TRAPDOOR), + new Pair<>(RUNEWOOD_BUTTON, SOULWOOD_BUTTON), + new Pair<>(RUNEWOOD_PRESSURE_PLATE, SOULWOOD_PRESSURE_PLATE), + new Pair<>(RUNEWOOD_FENCE, SOULWOOD_FENCE), + new Pair<>(RUNEWOOD_FENCE_GATE, SOULWOOD_FENCE_GATE), + new Pair<>(RUNEWOOD_ITEM_STAND, SOULWOOD_ITEM_STAND), + new Pair<>(RUNEWOOD_ITEM_PEDESTAL, SOULWOOD_ITEM_PEDESTAL), + new Pair<>(RUNEWOOD_SIGN, SOULWOOD_SIGN) // Wall sign already handled by this. Is it??? Wire? Huh ? How ); @Override protected void buildRecipes(Consumer consumer) { for (var transmutation : SOULWOOD_TRANSMUTATIONS) { new SpiritTransmutationRecipeBuilder(transmutation.getFirst(), transmutation.getSecond()) - .group("soulwood") - .build(consumer, "soulwood/" + transmutation.getSecond().getId().getPath().replace("soulwood_", "").replace("_soulwood", "")); + .group("soulwood") + .build(consumer, "soulwood/" + transmutation.getSecond().getId().getPath().replace("soulwood_", "").replace("_soulwood", "")); } new SpiritTransmutationRecipeBuilder(Blocks.STONE, Blocks.COBBLESTONE) - .build(consumer); + .build(consumer); new SpiritTransmutationRecipeBuilder(Blocks.COBBLESTONE, Blocks.GRAVEL) - .build(consumer); + .build(consumer); new SpiritTransmutationRecipeBuilder(Blocks.GRAVEL, Blocks.SAND) - .build(consumer); + .build(consumer); new SpiritTransmutationRecipeBuilder(Blocks.SAND, BLIGHTED_SOIL.get()) - .build(consumer); + .build(consumer); new SpiritTransmutationRecipeBuilder(Blocks.ANDESITE, Blocks.TUFF) - .build(consumer); + .build(consumer); new SpiritTransmutationRecipeBuilder(Blocks.TUFF, Blocks.STONE) - .build(consumer, "tuff_block_to_stone"); + .build(consumer, "tuff_block_to_stone"); new SpiritTransmutationRecipeBuilder(Blocks.GRANITE, Blocks.DRIPSTONE_BLOCK) - .build(consumer); + .build(consumer); new SpiritTransmutationRecipeBuilder(Blocks.DRIPSTONE_BLOCK, Blocks.STONE) - .build(consumer, "dripstone_block_to_stone"); + .build(consumer, "dripstone_block_to_stone"); new SpiritTransmutationRecipeBuilder(Blocks.DIORITE, Blocks.CALCITE) - .build(consumer); + .build(consumer); new SpiritTransmutationRecipeBuilder(Blocks.CALCITE, Blocks.STONE) - .build(consumer, "calcite_to_stone"); + .build(consumer, "calcite_to_stone"); new SpiritTransmutationRecipeBuilder(Blocks.DEEPSLATE, Blocks.COBBLED_DEEPSLATE) - .build(consumer); + .build(consumer); new SpiritTransmutationRecipeBuilder(Blocks.COBBLED_DEEPSLATE, Blocks.BASALT) - .build(consumer); + .build(consumer); new SpiritTransmutationRecipeBuilder(Blocks.BASALT, Blocks.NETHERRACK) - .build(consumer); + .build(consumer); new SpiritTransmutationRecipeBuilder(Blocks.NETHERRACK, Blocks.SOUL_SAND) - .build(consumer); + .build(consumer); new SpiritTransmutationRecipeBuilder(Blocks.SOUL_SAND, Blocks.RED_SAND) - .build(consumer); + .build(consumer); new SpiritTransmutationRecipeBuilder(Blocks.RED_SAND, BLIGHTED_SOIL.get()) - .build(consumer, "red_sand_to_blighted_soil"); + .build(consumer, "red_sand_to_blighted_soil"); new SpiritTransmutationRecipeBuilder(Blocks.SMOOTH_BASALT, Blocks.CLAY) - .build(consumer); + .build(consumer); new SpiritTransmutationRecipeBuilder(Blocks.CLAY, Blocks.PRISMARINE) - .build(consumer); + .build(consumer); new SpiritTransmutationRecipeBuilder(Blocks.PRISMARINE, Blocks.SEA_LANTERN) - .build(consumer); + .build(consumer); new SpiritTransmutationRecipeBuilder(Blocks.SEA_LANTERN, Blocks.SNOW_BLOCK) - .build(consumer); + .build(consumer); new SpiritTransmutationRecipeBuilder(Blocks.SNOW_BLOCK, Blocks.ICE) - .build(consumer); + .build(consumer); new SpiritTransmutationRecipeBuilder(Blocks.ICE, BLIGHTED_SOIL.get()) - .build(consumer, "ice_to_blighted_soil"); + .build(consumer, "ice_to_blighted_soil"); } } diff --git a/src/main/java/com/sammy/malum/data/recipe/MalumVanillaRecipeReplacements.java b/src/main/java/com/sammy/malum/data/recipe/MalumVanillaRecipeReplacements.java index 7c37ebdb1..3e0351071 100644 --- a/src/main/java/com/sammy/malum/data/recipe/MalumVanillaRecipeReplacements.java +++ b/src/main/java/com/sammy/malum/data/recipe/MalumVanillaRecipeReplacements.java @@ -1,9 +1,5 @@ package com.sammy.malum.data.recipe; -import com.google.gson.JsonObject; -import net.minecraft.data.CachedOutput; -import net.minecraft.data.DataGenerator; -import net.minecraft.data.HashCache; import net.minecraft.data.PackOutput; import net.minecraft.data.recipes.FinishedRecipe; import net.minecraft.data.recipes.RecipeProvider; @@ -11,21 +7,18 @@ import net.minecraft.data.recipes.ShapelessRecipeBuilder; import net.minecraft.resources.ResourceLocation; import net.minecraft.tags.TagKey; -import net.minecraft.world.flag.FeatureFlagSet; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; import net.minecraft.world.item.crafting.Ingredient; import net.minecraft.world.level.ItemLike; import net.minecraftforge.common.Tags; -import org.jetbrains.annotations.Nullable; import java.lang.reflect.Field; -import java.nio.file.Path; import java.util.*; -import java.util.concurrent.CompletableFuture; import java.util.function.Consumer; + public class MalumVanillaRecipeReplacements extends RecipeProvider { private final Map> replacements = new HashMap<>(); @@ -35,6 +28,12 @@ public MalumVanillaRecipeReplacements(PackOutput pOutput) { super(pOutput); } + + @Override + public String getName() { + return "Malum Void Favor Recipe Provider"; + } + @Override protected void buildRecipes(Consumer pWriter) { replace(Items.QUARTZ, Tags.Items.GEMS_QUARTZ); @@ -62,20 +61,18 @@ private void replace(ItemLike item, TagKey tag) { private FinishedRecipe enhance(FinishedRecipe vanilla) { if (vanilla instanceof ShapelessRecipeBuilder.Result) - return enhance((ShapelessRecipeBuilder.Result)vanilla); + return enhance((ShapelessRecipeBuilder.Result) vanilla); if (vanilla instanceof ShapedRecipeBuilder.Result) - return enhance((ShapedRecipeBuilder.Result)vanilla); + return enhance((ShapedRecipeBuilder.Result) vanilla); return null; } private FinishedRecipe enhance(ShapelessRecipeBuilder.Result vanilla) { List ingredients = getField(ShapelessRecipeBuilder.Result.class, vanilla, 4); boolean modified = false; - for (int x = 0; x < ingredients.size(); x++) - { + for (int x = 0; x < ingredients.size(); x++) { Ingredient ing = enhance(vanilla.getId(), ingredients.get(x)); - if (ing != null) - { + if (ing != null) { ingredients.set(x, ing); modified = true; } @@ -86,11 +83,9 @@ private FinishedRecipe enhance(ShapelessRecipeBuilder.Result vanilla) { private FinishedRecipe enhance(ShapedRecipeBuilder.Result vanilla) { Map ingredients = getField(ShapedRecipeBuilder.Result.class, vanilla, 5); boolean modified = false; - for (Character x : ingredients.keySet()) - { + for (Character x : ingredients.keySet()) { Ingredient ing = enhance(vanilla.getId(), ingredients.get(x)); - if (ing != null) - { + if (ing != null) { ingredients.put(x, ing); modified = true; } @@ -105,21 +100,16 @@ private Ingredient enhance(ResourceLocation name, Ingredient vanilla) { boolean modified = false; List items = new ArrayList<>(); Ingredient.Value[] vanillaItems = getField(Ingredient.class, vanilla, 2); //This will probably crash between versions, if null fix index - for (Ingredient.Value entry : vanillaItems) - { - if (entry instanceof Ingredient.ItemValue) - { + for (Ingredient.Value entry : vanillaItems) { + if (entry instanceof Ingredient.ItemValue) { ItemStack stack = entry.getItems().stream().findFirst().orElse(ItemStack.EMPTY); TagKey replacement = replacements.get(stack.getItem()); - if (replacement != null) - { + if (replacement != null) { items.add(new Ingredient.TagValue(replacement)); modified = true; - } - else + } else items.add(entry); - } - else + } else items.add(entry); } return modified ? Ingredient.fromValues(items.stream()) : null; @@ -129,12 +119,9 @@ private Ingredient enhance(ResourceLocation name, Ingredient vanilla) { private R getField(Class clz, T inst, int index) { Field fld = clz.getDeclaredFields()[index]; fld.setAccessible(true); - try - { - return (R)fld.get(inst); - } - catch (IllegalArgumentException | IllegalAccessException e) - { + try { + return (R) fld.get(inst); + } catch (IllegalArgumentException | IllegalAccessException e) { throw new RuntimeException(e); } } diff --git a/src/main/java/com/sammy/malum/data/recipe/MalumVoidFavorRecipes.java b/src/main/java/com/sammy/malum/data/recipe/MalumVoidFavorRecipes.java index b90b1fe42..a55da9baf 100644 --- a/src/main/java/com/sammy/malum/data/recipe/MalumVoidFavorRecipes.java +++ b/src/main/java/com/sammy/malum/data/recipe/MalumVoidFavorRecipes.java @@ -1,14 +1,15 @@ package com.sammy.malum.data.recipe; -import com.sammy.malum.data.recipe.builder.*; -import com.sammy.malum.registry.common.item.*; -import net.minecraft.data.*; -import net.minecraft.data.recipes.*; -import net.minecraft.world.item.*; -import net.minecraft.world.item.crafting.*; -import net.minecraftforge.common.*; +import com.sammy.malum.data.recipe.builder.VoidFavorRecipeBuilder; +import com.sammy.malum.registry.common.item.ItemRegistry; +import net.minecraft.data.PackOutput; +import net.minecraft.data.recipes.FinishedRecipe; +import net.minecraft.data.recipes.RecipeProvider; +import net.minecraft.world.item.Items; +import net.minecraft.world.item.crafting.Ingredient; +import net.minecraftforge.common.Tags; -import java.util.function.*; +import java.util.function.Consumer; public class MalumVoidFavorRecipes extends RecipeProvider { public MalumVoidFavorRecipes(PackOutput generatorIn) { diff --git a/src/main/java/com/sammy/malum/data/recipe/builder/SpiritFocusingRecipeBuilder.java b/src/main/java/com/sammy/malum/data/recipe/builder/SpiritFocusingRecipeBuilder.java index ec5edc314..a2a7984ca 100644 --- a/src/main/java/com/sammy/malum/data/recipe/builder/SpiritFocusingRecipeBuilder.java +++ b/src/main/java/com/sammy/malum/data/recipe/builder/SpiritFocusingRecipeBuilder.java @@ -5,15 +5,16 @@ import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.sammy.malum.MalumMod; -import com.sammy.malum.registry.common.recipe.RecipeSerializerRegistry; import com.sammy.malum.core.systems.recipe.SpiritWithCount; import com.sammy.malum.core.systems.spirit.MalumSpiritType; +import com.sammy.malum.registry.common.recipe.RecipeSerializerRegistry; import net.minecraft.data.recipes.FinishedRecipe; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.crafting.Ingredient; import net.minecraft.world.item.crafting.RecipeSerializer; import net.minecraft.world.level.ItemLike; +import net.minecraftforge.registries.ForgeRegistries; import javax.annotation.Nullable; import java.util.List; @@ -47,7 +48,7 @@ public void build(Consumer consumerIn, String recipeName) { } public void build(Consumer consumerIn) { - build(consumerIn, output.getItem().getRegistryName().getPath()); + build(consumerIn, ForgeRegistries.ITEMS.getKey(output.getItem()).getPath()); } public void build(Consumer consumerIn, ResourceLocation id) { diff --git a/src/main/java/com/sammy/malum/data/recipe/builder/SpiritInfusionRecipeBuilder.java b/src/main/java/com/sammy/malum/data/recipe/builder/SpiritInfusionRecipeBuilder.java index c177176d3..283c78392 100644 --- a/src/main/java/com/sammy/malum/data/recipe/builder/SpiritInfusionRecipeBuilder.java +++ b/src/main/java/com/sammy/malum/data/recipe/builder/SpiritInfusionRecipeBuilder.java @@ -5,9 +5,9 @@ import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.sammy.malum.MalumMod; -import com.sammy.malum.registry.common.recipe.RecipeSerializerRegistry; import com.sammy.malum.core.systems.recipe.SpiritWithCount; import com.sammy.malum.core.systems.spirit.MalumSpiritType; +import com.sammy.malum.registry.common.recipe.RecipeSerializerRegistry; import net.minecraft.data.recipes.FinishedRecipe; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.Item; @@ -15,6 +15,7 @@ import net.minecraft.world.item.crafting.Ingredient; import net.minecraft.world.item.crafting.RecipeSerializer; import net.minecraft.world.level.ItemLike; +import net.minecraftforge.registries.ForgeRegistries; import team.lodestar.lodestone.systems.recipe.IngredientWithCount; import javax.annotation.Nullable; @@ -66,7 +67,7 @@ public void build(Consumer consumerIn, String recipeName) { } public void build(Consumer consumerIn) { - build(consumerIn, output.getItem().getRegistryName().getPath()); + build(consumerIn, ForgeRegistries.ITEMS.getKey(output.getItem()).getPath()); } public void build(Consumer consumerIn, ResourceLocation id) { diff --git a/src/main/java/com/sammy/malum/data/recipe/builder/SpiritRepairRecipeBuilder.java b/src/main/java/com/sammy/malum/data/recipe/builder/SpiritRepairRecipeBuilder.java index dbc535509..2ddd2b5f0 100644 --- a/src/main/java/com/sammy/malum/data/recipe/builder/SpiritRepairRecipeBuilder.java +++ b/src/main/java/com/sammy/malum/data/recipe/builder/SpiritRepairRecipeBuilder.java @@ -3,14 +3,15 @@ import com.google.gson.JsonArray; import com.google.gson.JsonObject; import com.sammy.malum.MalumMod; -import com.sammy.malum.registry.common.recipe.RecipeSerializerRegistry; import com.sammy.malum.core.systems.recipe.SpiritWithCount; import com.sammy.malum.core.systems.spirit.MalumSpiritType; +import com.sammy.malum.registry.common.recipe.RecipeSerializerRegistry; import net.minecraft.data.recipes.FinishedRecipe; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.Item; import net.minecraft.world.item.crafting.Ingredient; import net.minecraft.world.item.crafting.RecipeSerializer; +import net.minecraftforge.registries.ForgeRegistries; import team.lodestar.lodestone.systems.recipe.IngredientWithCount; import javax.annotation.Nullable; @@ -33,10 +34,12 @@ public SpiritRepairRecipeBuilder(String itemIdRegex, String modIdRegex, float du this.durabilityPercentage = durabilityPercentage; this.repairMaterial = repairMaterial; } + public SpiritRepairRecipeBuilder(String itemIdRegex, float durabilityPercentage, Ingredient repairMaterial, int repairMaterialCount) { this(itemIdRegex, "", durabilityPercentage, new IngredientWithCount(repairMaterial, repairMaterialCount)); } + public SpiritRepairRecipeBuilder(float durabilityPercentage, Ingredient repairMaterial, int repairMaterialCount) { this("", "", durabilityPercentage, new IngredientWithCount(repairMaterial, repairMaterialCount)); } @@ -60,7 +63,7 @@ public void build(Consumer consumerIn, ResourceLocation id) { } public void build(Consumer consumerIn) { - build(consumerIn, inputs.get(0).getRegistryName().getPath()); + build(consumerIn, ForgeRegistries.ITEMS.getKey(inputs.get(0)).getPath()); } public class Result implements FinishedRecipe { @@ -74,7 +77,7 @@ public Result(ResourceLocation id) { public void serializeRecipeData(JsonObject json) { JsonArray inputsJson = new JsonArray(); for (Item item : inputs) { - inputsJson.add(item.getRegistryName().toString()); + inputsJson.add(ForgeRegistries.ITEMS.getKey(item).toString()); } JsonArray spiritsJson = new JsonArray(); for (SpiritWithCount spirit : spirits) { diff --git a/src/main/java/com/sammy/malum/data/recipe/builder/VoidFavorRecipeBuilder.java b/src/main/java/com/sammy/malum/data/recipe/builder/VoidFavorRecipeBuilder.java index 1b0283701..a664ea52b 100644 --- a/src/main/java/com/sammy/malum/data/recipe/builder/VoidFavorRecipeBuilder.java +++ b/src/main/java/com/sammy/malum/data/recipe/builder/VoidFavorRecipeBuilder.java @@ -10,7 +10,7 @@ import net.minecraft.world.item.crafting.Ingredient; import net.minecraft.world.item.crafting.RecipeSerializer; import net.minecraft.world.level.ItemLike; -import team.lodestar.lodestone.systems.recipe.IngredientWithCount; +import net.minecraftforge.registries.ForgeRegistries; import javax.annotation.Nullable; import java.util.function.Consumer; @@ -42,7 +42,7 @@ public void build(Consumer consumerIn, String recipeName) { } public void build(Consumer consumerIn) { - build(consumerIn, output.getItem().getRegistryName().getPath()); + build(consumerIn, ForgeRegistries.ITEMS.getKey(output.getItem()).getPath()); } public void build(Consumer consumerIn, ResourceLocation id) { diff --git a/src/main/java/com/sammy/malum/data/recipe/builder/vanilla/MetalNodeCookingRecipeBuilder.java b/src/main/java/com/sammy/malum/data/recipe/builder/vanilla/MetalNodeCookingRecipeBuilder.java index 2d9fded27..baccfd676 100644 --- a/src/main/java/com/sammy/malum/data/recipe/builder/vanilla/MetalNodeCookingRecipeBuilder.java +++ b/src/main/java/com/sammy/malum/data/recipe/builder/vanilla/MetalNodeCookingRecipeBuilder.java @@ -9,108 +9,109 @@ import net.minecraft.world.item.crafting.AbstractCookingRecipe; import net.minecraft.world.item.crafting.Ingredient; import net.minecraft.world.item.crafting.RecipeSerializer; +import net.minecraftforge.registries.ForgeRegistries; import team.lodestar.lodestone.systems.recipe.IngredientWithCount; import javax.annotation.Nullable; import java.util.function.Consumer; public class MetalNodeCookingRecipeBuilder { - private final IngredientWithCount result; - private final Ingredient ingredient; - private final float experience; - private final int cookingTime; - private final Advancement.Builder advancement = Advancement.Builder.advancement(); - @Nullable - private String group; - private final RecipeSerializer serializer; - - private MetalNodeCookingRecipeBuilder(IngredientWithCount result, Ingredient pIngredient, float pExperience, int pCookingTime, RecipeSerializer pSerializer) { - this.result = result; - this.ingredient = pIngredient; - this.experience = pExperience; - this.cookingTime = pCookingTime; - this.serializer = pSerializer; - } - - public static MetalNodeCookingRecipeBuilder cookingWithCount(IngredientWithCount result, Ingredient pIngredient, float pExperience, int pCookingTime, RecipeSerializer pSerializer) { - return new MetalNodeCookingRecipeBuilder(result, pIngredient, pExperience, pCookingTime, pSerializer); - } - - public static MetalNodeCookingRecipeBuilder blastingWithTag(IngredientWithCount result, Ingredient pIngredient, float pExperience, int pCookingTime) { - return cookingWithCount(result, pIngredient, pExperience, pCookingTime, RecipeSerializerRegistry.METAL_NODE_BLASTING_SERIALIZER.get()); - } - - public static MetalNodeCookingRecipeBuilder smeltingWithTag(IngredientWithCount result, Ingredient pIngredient, float pExperience, int pCookingTime) { - return cookingWithCount(result, pIngredient, pExperience, pCookingTime, RecipeSerializerRegistry.METAL_NODE_SMELTING_SERIALIZER.get()); - } - - public MetalNodeCookingRecipeBuilder group(@Nullable String pGroupName) { - this.group = pGroupName; - return this; - } - - - public void build(Consumer consumerIn, String recipeName) { - build(consumerIn, MalumMod.malumPath("node_processing/" + recipeName)); - } - - public void build(Consumer consumerIn) { - build(consumerIn, result.getStack().getItem().getRegistryName().getPath()); - } - - public void build(Consumer consumerIn, ResourceLocation id) { - consumerIn.accept(new MetalNodeCookingRecipeBuilder.Result(id, this.group == null ? "" : this.group, this.ingredient, this.result, this.experience, this.cookingTime, this.advancement, new ResourceLocation(id.getNamespace(), "recipes/metal_node_smelting/" + id.getPath()), this.serializer)); - } - - public static class Result implements FinishedRecipe { - private final ResourceLocation id; - private final String group; - private final Ingredient ingredient; - private final IngredientWithCount result; - private final float experience; - private final int cookingTime; - private final Advancement.Builder advancement; - private final ResourceLocation advancementId; - private final RecipeSerializer serializer; - - public Result(ResourceLocation pId, String pGroup, Ingredient pIngredient, IngredientWithCount result, float pExperience, int pCookingTime, Advancement.Builder pAdvancement, ResourceLocation pAdvancementId, RecipeSerializer pSerializer) { - this.id = pId; - this.group = pGroup; - this.ingredient = pIngredient; - this.result = result; - this.experience = pExperience; - this.cookingTime = pCookingTime; - this.advancement = pAdvancement; - this.advancementId = pAdvancementId; - this.serializer = pSerializer; - } - - public void serializeRecipeData(JsonObject pJson) { - if (!this.group.isEmpty()) { - pJson.addProperty("group", this.group); - } - pJson.add("ingredient", this.ingredient.toJson()); - pJson.add("result", result.serialize()); - pJson.addProperty("experience", this.experience); - pJson.addProperty("cookingtime", this.cookingTime); - } - - public RecipeSerializer getType() { - return this.serializer; - } - - public ResourceLocation getId() { - return this.id; - } - - @Nullable - public JsonObject serializeAdvancement() { - return this.advancement.serializeToJson(); - } - - @Nullable - public ResourceLocation getAdvancementId() { - return this.advancementId; - } - } + private final IngredientWithCount result; + private final Ingredient ingredient; + private final float experience; + private final int cookingTime; + private final Advancement.Builder advancement = Advancement.Builder.advancement(); + @Nullable + private String group; + private final RecipeSerializer serializer; + + private MetalNodeCookingRecipeBuilder(IngredientWithCount result, Ingredient pIngredient, float pExperience, int pCookingTime, RecipeSerializer pSerializer) { + this.result = result; + this.ingredient = pIngredient; + this.experience = pExperience; + this.cookingTime = pCookingTime; + this.serializer = pSerializer; + } + + public static MetalNodeCookingRecipeBuilder cookingWithCount(IngredientWithCount result, Ingredient pIngredient, float pExperience, int pCookingTime, RecipeSerializer pSerializer) { + return new MetalNodeCookingRecipeBuilder(result, pIngredient, pExperience, pCookingTime, pSerializer); + } + + public static MetalNodeCookingRecipeBuilder blastingWithTag(IngredientWithCount result, Ingredient pIngredient, float pExperience, int pCookingTime) { + return cookingWithCount(result, pIngredient, pExperience, pCookingTime, RecipeSerializerRegistry.METAL_NODE_BLASTING_SERIALIZER.get()); + } + + public static MetalNodeCookingRecipeBuilder smeltingWithTag(IngredientWithCount result, Ingredient pIngredient, float pExperience, int pCookingTime) { + return cookingWithCount(result, pIngredient, pExperience, pCookingTime, RecipeSerializerRegistry.METAL_NODE_SMELTING_SERIALIZER.get()); + } + + public MetalNodeCookingRecipeBuilder group(@Nullable String pGroupName) { + this.group = pGroupName; + return this; + } + + + public void build(Consumer consumerIn, String recipeName) { + build(consumerIn, MalumMod.malumPath("node_processing/" + recipeName)); + } + + public void build(Consumer consumerIn) { + build(consumerIn, ForgeRegistries.ITEMS.getKey(result.getStack().getItem()).getPath()); + } + + public void build(Consumer consumerIn, ResourceLocation id) { + consumerIn.accept(new MetalNodeCookingRecipeBuilder.Result(id, this.group == null ? "" : this.group, this.ingredient, this.result, this.experience, this.cookingTime, this.advancement, new ResourceLocation(id.getNamespace(), "recipes/metal_node_smelting/" + id.getPath()), this.serializer)); + } + + public static class Result implements FinishedRecipe { + private final ResourceLocation id; + private final String group; + private final Ingredient ingredient; + private final IngredientWithCount result; + private final float experience; + private final int cookingTime; + private final Advancement.Builder advancement; + private final ResourceLocation advancementId; + private final RecipeSerializer serializer; + + public Result(ResourceLocation pId, String pGroup, Ingredient pIngredient, IngredientWithCount result, float pExperience, int pCookingTime, Advancement.Builder pAdvancement, ResourceLocation pAdvancementId, RecipeSerializer pSerializer) { + this.id = pId; + this.group = pGroup; + this.ingredient = pIngredient; + this.result = result; + this.experience = pExperience; + this.cookingTime = pCookingTime; + this.advancement = pAdvancement; + this.advancementId = pAdvancementId; + this.serializer = pSerializer; + } + + public void serializeRecipeData(JsonObject pJson) { + if (!this.group.isEmpty()) { + pJson.addProperty("group", this.group); + } + pJson.add("ingredient", this.ingredient.toJson()); + pJson.add("result", result.serialize()); + pJson.addProperty("experience", this.experience); + pJson.addProperty("cookingtime", this.cookingTime); + } + + public RecipeSerializer getType() { + return this.serializer; + } + + public ResourceLocation getId() { + return this.id; + } + + @Nullable + public JsonObject serializeAdvancement() { + return this.advancement.serializeToJson(); + } + + @Nullable + public ResourceLocation getAdvancementId() { + return this.advancementId; + } + } } \ No newline at end of file diff --git a/src/main/java/com/sammy/malum/data/recipe/builder/vanilla/StackedMalumCookingRecipeBuilder.java b/src/main/java/com/sammy/malum/data/recipe/builder/vanilla/StackedMalumCookingRecipeBuilder.java index 05118bd7f..4d14f703a 100644 --- a/src/main/java/com/sammy/malum/data/recipe/builder/vanilla/StackedMalumCookingRecipeBuilder.java +++ b/src/main/java/com/sammy/malum/data/recipe/builder/vanilla/StackedMalumCookingRecipeBuilder.java @@ -9,6 +9,7 @@ import net.minecraft.core.Registry; import net.minecraft.data.recipes.FinishedRecipe; import net.minecraft.data.recipes.RecipeBuilder; +import net.minecraft.data.recipes.RecipeCategory; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.Item; import net.minecraft.world.item.crafting.AbstractCookingRecipe; @@ -16,130 +17,133 @@ import net.minecraft.world.item.crafting.RecipeSerializer; import net.minecraft.world.item.crafting.SimpleCookingSerializer; import net.minecraft.world.level.ItemLike; +import net.minecraftforge.registries.ForgeRegistries; import javax.annotation.Nullable; import java.util.function.Consumer; public class StackedMalumCookingRecipeBuilder implements RecipeBuilder { - private final Item result; - private final int resultCount; - private final Ingredient ingredient; - private final float experience; - private final int cookingTime; - private final Advancement.Builder advancement = Advancement.Builder.advancement(); - @Nullable - private String group; - private final SimpleCookingSerializer serializer; - - private StackedMalumCookingRecipeBuilder(ItemLike pResult, int resultCount, Ingredient pIngredient, float pExperience, int pCookingTime, SimpleCookingSerializer pSerializer) { - this.result = pResult.asItem(); - this.resultCount = resultCount; - this.ingredient = pIngredient; - this.experience = pExperience; - this.cookingTime = pCookingTime; - this.serializer = pSerializer; - } - - public static StackedMalumCookingRecipeBuilder cookingWithCount(Ingredient pIngredient, ItemLike pResult, int resultCount, float pExperience, int pCookingTime, SimpleCookingSerializer pSerializer) { - return new StackedMalumCookingRecipeBuilder(pResult, resultCount, pIngredient, pExperience, pCookingTime, pSerializer); - } - - public static StackedMalumCookingRecipeBuilder campfireCookingWithCount(Ingredient pIngredient, ItemLike pResult, int resultCount, float pExperience, int pCookingTime) { - return cookingWithCount(pIngredient, pResult, resultCount, pExperience, pCookingTime, RecipeSerializer.CAMPFIRE_COOKING_RECIPE); - } - - public static StackedMalumCookingRecipeBuilder blastingWithCount(Ingredient pIngredient, ItemLike pResult, int resultCount, float pExperience, int pCookingTime) { - return cookingWithCount(pIngredient, pResult, resultCount, pExperience, pCookingTime, RecipeSerializer.BLASTING_RECIPE); - } - - public static StackedMalumCookingRecipeBuilder smeltingWithCount(Ingredient pIngredient, ItemLike pResult, int resultCount, float pExperience, int pCookingTime) { - return cookingWithCount(pIngredient, pResult, resultCount, pExperience, pCookingTime, RecipeSerializer.SMELTING_RECIPE); - } - - public static StackedMalumCookingRecipeBuilder smoking(Ingredient pIngredient, ItemLike pResult, int resultCount, float pExperience, int pCookingTime) { - return cookingWithCount(pIngredient, pResult, resultCount, pExperience, pCookingTime, RecipeSerializer.SMOKING_RECIPE); - } - - public StackedMalumCookingRecipeBuilder unlockedBy(String pCriterionName, CriterionTriggerInstance pCriterionTrigger) { - this.advancement.addCriterion(pCriterionName, pCriterionTrigger); - return this; - } - - public StackedMalumCookingRecipeBuilder group(@Nullable String pGroupName) { - this.group = pGroupName; - return this; - } - - public Item getResult() { - return this.result; - } - - public void save(Consumer pFinishedRecipeConsumer, ResourceLocation pRecipeId) { - this.ensureValid(pRecipeId); - this.advancement.parent(new ResourceLocation("recipes/root")).addCriterion("has_the_recipe", RecipeUnlockedTrigger.unlocked(pRecipeId)).rewards(AdvancementRewards.Builder.recipe(pRecipeId)).requirements(RequirementsStrategy.OR); - pFinishedRecipeConsumer.accept(new StackedMalumCookingRecipeBuilder.Result(pRecipeId, this.group == null ? "" : this.group, this.ingredient, this.result, this.resultCount, this.experience, this.cookingTime, this.advancement, new ResourceLocation(pRecipeId.getNamespace(), "recipes/" + this.result.getItemCategory().getRecipeFolderName() + "/" + pRecipeId.getPath()), this.serializer)); - } - - private void ensureValid(ResourceLocation pId) { - if (this.advancement.getCriteria().isEmpty()) { - throw new IllegalStateException("No way of obtaining recipe " + pId); - } - } - - public static class Result implements FinishedRecipe { - private final ResourceLocation id; - private final String group; - private final Ingredient ingredient; - private final Item result; - private final int resultCount; - private final float experience; - private final int cookingTime; - private final Advancement.Builder advancement; - private final ResourceLocation advancementId; - private final RecipeSerializer serializer; - - public Result(ResourceLocation pId, String pGroup, Ingredient pIngredient, Item pResult, int resultCount, float pExperience, int pCookingTime, Advancement.Builder pAdvancement, ResourceLocation pAdvancementId, RecipeSerializer pSerializer) { - this.id = pId; - this.group = pGroup; - this.ingredient = pIngredient; - this.result = pResult; - this.resultCount = resultCount; - this.experience = pExperience; - this.cookingTime = pCookingTime; - this.advancement = pAdvancement; - this.advancementId = pAdvancementId; - this.serializer = pSerializer; - } - - public void serializeRecipeData(JsonObject pJson) { - if (!this.group.isEmpty()) { - pJson.addProperty("group", this.group); - } - pJson.add("ingredient", this.ingredient.toJson()); - JsonObject object = new JsonObject(); - object.addProperty("item", Registry.ITEM.getKey(this.result).toString()); - object.addProperty("count", this.resultCount); - pJson.add("result", object); - pJson.addProperty("experience", this.experience); - pJson.addProperty("cookingtime", this.cookingTime); - } - - public RecipeSerializer getType() { - return this.serializer; - } - - public ResourceLocation getId() { - return this.id; - } - - @Nullable - public JsonObject serializeAdvancement() { - return this.advancement.serializeToJson(); - } - - @Nullable - public ResourceLocation getAdvancementId() { - return this.advancementId; - } - } + private final RecipeCategory category; + private final Item result; + private final int resultCount; + private final Ingredient ingredient; + private final float experience; + private final int cookingTime; + private final Advancement.Builder advancement = Advancement.Builder.advancement(); + @Nullable + private String group; + private final RecipeSerializer serializer; + + private StackedMalumCookingRecipeBuilder(RecipeCategory pCategory, ItemLike pResult, int resultCount, Ingredient pIngredient, float pExperience, int pCookingTime, RecipeSerializer pSerializer) { + this.category = pCategory; + this.result = pResult.asItem(); + this.resultCount = resultCount; + this.ingredient = pIngredient; + this.experience = pExperience; + this.cookingTime = pCookingTime; + this.serializer = pSerializer; + } + + public static StackedMalumCookingRecipeBuilder cookingWithCount(Ingredient pIngredient, RecipeCategory pCategory, ItemLike pResult, int resultCount, float pExperience, int pCookingTime, RecipeSerializer pSerializer) { + return new StackedMalumCookingRecipeBuilder(pCategory, pResult, resultCount, pIngredient, pExperience, pCookingTime, pSerializer); + } + + public static StackedMalumCookingRecipeBuilder campfireCookingWithCount(Ingredient pIngredient, RecipeCategory pCategory, ItemLike pResult, int resultCount, float pExperience, int pCookingTime) { + return cookingWithCount(pIngredient, pCategory, pResult, resultCount, pExperience, pCookingTime, RecipeSerializer.CAMPFIRE_COOKING_RECIPE); + } + + public static StackedMalumCookingRecipeBuilder blastingWithCount(Ingredient pIngredient, RecipeCategory pCategory, ItemLike pResult, int resultCount, float pExperience, int pCookingTime) { + return cookingWithCount(pIngredient, pCategory, pResult, resultCount, pExperience, pCookingTime, RecipeSerializer.BLASTING_RECIPE); + } + + public static StackedMalumCookingRecipeBuilder smeltingWithCount(Ingredient pIngredient, RecipeCategory pCategory, ItemLike pResult, int resultCount, float pExperience, int pCookingTime) { + return cookingWithCount(pIngredient, pCategory, pResult, resultCount, pExperience, pCookingTime, RecipeSerializer.SMELTING_RECIPE); + } + + public static StackedMalumCookingRecipeBuilder smoking(Ingredient pIngredient, RecipeCategory pCategory, ItemLike pResult, int resultCount, float pExperience, int pCookingTime) { + return cookingWithCount(pIngredient, pCategory, pResult, resultCount, pExperience, pCookingTime, RecipeSerializer.SMOKING_RECIPE); + } + + public StackedMalumCookingRecipeBuilder unlockedBy(String pCriterionName, CriterionTriggerInstance pCriterionTrigger) { + this.advancement.addCriterion(pCriterionName, pCriterionTrigger); + return this; + } + + public StackedMalumCookingRecipeBuilder group(@Nullable String pGroupName) { + this.group = pGroupName; + return this; + } + + public Item getResult() { + return this.result; + } + + public void save(Consumer pFinishedRecipeConsumer, ResourceLocation pRecipeId) { + this.ensureValid(pRecipeId); + this.advancement.parent(new ResourceLocation("recipes/root")).addCriterion("has_the_recipe", RecipeUnlockedTrigger.unlocked(pRecipeId)).rewards(AdvancementRewards.Builder.recipe(pRecipeId)).requirements(RequirementsStrategy.OR); + pFinishedRecipeConsumer.accept(new StackedMalumCookingRecipeBuilder.Result(pRecipeId, this.group == null ? "" : this.group, this.ingredient, this.result, this.resultCount, this.experience, this.cookingTime, this.advancement, new ResourceLocation(pRecipeId.getNamespace(), "recipes/" + this.category.getFolderName() + "/" + pRecipeId.getPath()), this.serializer)); + } + + private void ensureValid(ResourceLocation pId) { + if (this.advancement.getCriteria().isEmpty()) { + throw new IllegalStateException("No way of obtaining recipe " + pId); + } + } + + public static class Result implements FinishedRecipe { + private final ResourceLocation id; + private final String group; + private final Ingredient ingredient; + private final Item result; + private final int resultCount; + private final float experience; + private final int cookingTime; + private final Advancement.Builder advancement; + private final ResourceLocation advancementId; + private final RecipeSerializer serializer; + + public Result(ResourceLocation pId, String pGroup, Ingredient pIngredient, Item pResult, int resultCount, float pExperience, int pCookingTime, Advancement.Builder pAdvancement, ResourceLocation pAdvancementId, RecipeSerializer pSerializer) { + this.id = pId; + this.group = pGroup; + this.ingredient = pIngredient; + this.result = pResult; + this.resultCount = resultCount; + this.experience = pExperience; + this.cookingTime = pCookingTime; + this.advancement = pAdvancement; + this.advancementId = pAdvancementId; + this.serializer = pSerializer; + } + + public void serializeRecipeData(JsonObject pJson) { + if (!this.group.isEmpty()) { + pJson.addProperty("group", this.group); + } + pJson.add("ingredient", this.ingredient.toJson()); + JsonObject object = new JsonObject(); + object.addProperty("item", ForgeRegistries.ITEMS.getKey(this.result).toString()); + object.addProperty("count", this.resultCount); + pJson.add("result", object); + pJson.addProperty("experience", this.experience); + pJson.addProperty("cookingtime", this.cookingTime); + } + + public RecipeSerializer getType() { + return this.serializer; + } + + public ResourceLocation getId() { + return this.id; + } + + @Nullable + public JsonObject serializeAdvancement() { + return this.advancement.serializeToJson(); + } + + @Nullable + public ResourceLocation getAdvancementId() { + return this.advancementId; + } + } } \ No newline at end of file diff --git a/src/main/java/com/sammy/malum/data/recipe/builder/vanilla/TheDeviceRecipeBuilder.java b/src/main/java/com/sammy/malum/data/recipe/builder/vanilla/TheDeviceRecipeBuilder.java index 77e4e8026..f02388352 100644 --- a/src/main/java/com/sammy/malum/data/recipe/builder/vanilla/TheDeviceRecipeBuilder.java +++ b/src/main/java/com/sammy/malum/data/recipe/builder/vanilla/TheDeviceRecipeBuilder.java @@ -14,6 +14,7 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.tags.TagKey; import net.minecraft.world.item.Item; +import net.minecraft.world.item.crafting.CraftingBookCategory; import net.minecraft.world.item.crafting.Ingredient; import net.minecraft.world.level.ItemLike; @@ -90,7 +91,7 @@ public Item getResult() { public void save(Consumer pFinishedRecipeConsumer, ResourceLocation pRecipeId) { this.ensureValid(pRecipeId); this.advancement.parent(new ResourceLocation("recipes/root")).addCriterion("has_the_recipe", RecipeUnlockedTrigger.unlocked(pRecipeId)).rewards(AdvancementRewards.Builder.recipe(pRecipeId)).requirements(RequirementsStrategy.OR); - pFinishedRecipeConsumer.accept(new ShapedRecipeBuilder.Result(pRecipeId, this.result, this.count, this.group == null ? "" : this.group, this.rows, this.key, this.advancement, new ResourceLocation(pRecipeId.getNamespace(), "recipes/the_device/" + pRecipeId.getPath()))); + pFinishedRecipeConsumer.accept(new ShapedRecipeBuilder.Result(pRecipeId, this.result, this.count, this.group == null ? "" : this.group, CraftingBookCategory.MISC, this.rows, this.key, this.advancement, new ResourceLocation(pRecipeId.getNamespace(), "recipes/the_device/" + pRecipeId.getPath()), false)); } private void ensureValid(ResourceLocation pId) { diff --git a/src/main/java/com/sammy/malum/mixin/ExplosionMixin.java b/src/main/java/com/sammy/malum/mixin/ExplosionMixin.java index 22888a15d..e62574a1b 100644 --- a/src/main/java/com/sammy/malum/mixin/ExplosionMixin.java +++ b/src/main/java/com/sammy/malum/mixin/ExplosionMixin.java @@ -11,7 +11,6 @@ import net.minecraft.world.level.Explosion; import net.minecraft.world.level.ExplosionDamageCalculator; import net.minecraft.world.level.Level; -import net.minecraft.world.level.storage.loot.LootContext; import net.minecraft.world.level.storage.loot.LootParams; import org.spongepowered.asm.mixin.*; import org.spongepowered.asm.mixin.injection.At; @@ -29,28 +28,27 @@ public abstract class ExplosionMixin { @Unique ItemStack malum$droppedItem; - @Shadow - @Nullable - public abstract LivingEntity getSourceMob(); @Mutable @Shadow @Final private float radius; + @Shadow @Nullable public abstract LivingEntity getIndirectSourceEntity(); + @ModifyArg(method = "finalizeExplosion", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/block/state/BlockState;getDrops(Lnet/minecraft/world/level/storage/loot/LootParams$Builder;)Ljava/util/List;")) private LootParams.Builder malum$getBlockDrops(LootParams.Builder builder) { - return CurioProspectorBelt.applyFortune(getSourceMob(), builder); + return CurioProspectorBelt.applyFortune(getIndirectSourceEntity(), builder); } @Inject(method = "(Lnet/minecraft/world/level/Level;Lnet/minecraft/world/entity/Entity;Lnet/minecraft/world/damagesource/DamageSource;Lnet/minecraft/world/level/ExplosionDamageCalculator;DDDFZLnet/minecraft/world/level/Explosion$BlockInteraction;)V", at = @At(value = "RETURN")) private void malum$modifyExplosionStats(Level pLevel, Entity pSource, DamageSource pDamageSource, ExplosionDamageCalculator pDamageCalculator, double pToBlowX, double pToBlowY, double pToBlowZ, float pRadius, boolean pFire, Explosion.BlockInteraction pBlockInteraction, CallbackInfo ci) { - radius = CurioDemolitionistRing.increaseExplosionRadius(getSourceMob(), radius); + radius = CurioDemolitionistRing.increaseExplosionRadius(getIndirectSourceEntity(), radius); } @Inject(method = "finalizeExplosion", at = @At(value = "HEAD")) private void malum$finalizeExplosion(boolean pSpawnParticles, CallbackInfo ci) { - malum$hasHoarderRing = CurioHoarderRing.hasHoarderRing(getSourceMob()); + malum$hasHoarderRing = CurioHoarderRing.hasHoarderRing(getIndirectSourceEntity()); } @ModifyArg(method = "finalizeExplosion", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/block/Block;popResource(Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/item/ItemStack;)V"), index = 2) @@ -60,6 +58,6 @@ public abstract class ExplosionMixin { @ModifyArg(method = "finalizeExplosion", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/block/Block;popResource(Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/item/ItemStack;)V"), index = 1) private BlockPos malum$popResource(BlockPos value) { - return CurioHoarderRing.getExplosionPos(malum$hasHoarderRing, value, getSourceMob(), malum$droppedItem); + return CurioHoarderRing.getExplosionPos(malum$hasHoarderRing, value, getIndirectSourceEntity(), malum$droppedItem); } } \ No newline at end of file diff --git a/src/main/java/com/sammy/malum/mixin/FishingHookEntityMixin.java b/src/main/java/com/sammy/malum/mixin/FishingHookEntityMixin.java index 51949d8c3..209c55a31 100644 --- a/src/main/java/com/sammy/malum/mixin/FishingHookEntityMixin.java +++ b/src/main/java/com/sammy/malum/mixin/FishingHookEntityMixin.java @@ -33,7 +33,7 @@ private Player malumFishingStatChangesPlayerGrabberMixin(Player player) { private void malumModifyFishingLuckStatsMixin(Player p_37106_, Level p_37107_, int p_37108_, int p_37109_, CallbackInfo ci) { if (malum$player.hasEffect(MobEffectRegistry.ANGLERS_LURE.get())) { float bonus = (malum$player.getEffect(MobEffectRegistry.ANGLERS_LURE.get()).getAmplifier() / 2f); - luck += bonus*2f; + luck += bonus * 2f; lureSpeed += bonus + 0.5f; } } diff --git a/src/main/java/com/sammy/malum/mixin/ItemStackMixin.java b/src/main/java/com/sammy/malum/mixin/ItemStackMixin.java index 68e1ded4b..d067ef6cf 100644 --- a/src/main/java/com/sammy/malum/mixin/ItemStackMixin.java +++ b/src/main/java/com/sammy/malum/mixin/ItemStackMixin.java @@ -38,27 +38,32 @@ public abstract class ItemStackMixin { Attribute key = entry.getKey(); AttributeModifier modifier = entry.getValue(); double amount = modifier.getAmount(); - if (modifier.getId().equals(LodestoneAttributeRegistry.UUIDS.get(LodestoneAttributeRegistry.MAGIC_DAMAGE))) { - int enchantmentLevel = EnchantmentHelper.getItemEnchantmentLevel(EnchantmentRegistry.HAUNTED.get(), (ItemStack) (Object) this); - if (enchantmentLevel > 0) { - amount += enchantmentLevel; - } - copied.put(key, new AttributeModifier( - modifier.getId(), modifier.getName(), amount, modifier.getOperation() - )); - } else if (modifier.getId().equals(BASE_ATTACK_DAMAGE_UUID) && getItem() instanceof MalumScytheItem) { - AttributeInstance instance = player.getAttribute(AttributeRegistry.SCYTHE_PROFICIENCY.get()); - if (instance != null && instance.getValue() > 0) { - amount += instance.getValue() * 0.5f; - } + if (modifier.getId() != null) { + if (modifier.getId().equals(LodestoneAttributeRegistry.UUIDS.get(LodestoneAttributeRegistry.MAGIC_DAMAGE))) { + int enchantmentLevel = EnchantmentHelper.getItemEnchantmentLevel(EnchantmentRegistry.HAUNTED.get(), (ItemStack) (Object) this); + if (enchantmentLevel > 0) { + amount += enchantmentLevel; + } + + copied.put(key, new AttributeModifier( + modifier.getId(), modifier.getName(), amount, modifier.getOperation() + )); + } else if (modifier.getId().equals(BASE_ATTACK_DAMAGE_UUID) && getItem() instanceof MalumScytheItem) { + AttributeInstance instance = player.getAttribute(AttributeRegistry.SCYTHE_PROFICIENCY.get()); + if (instance != null && instance.getValue() > 0) { + amount += instance.getValue() * 0.5f; + } - copied.put(key, new AttributeModifier( - modifier.getId(), modifier.getName(), amount, modifier.getOperation() - )); - } else { - copied.put(key, modifier); + copied.put(key, new AttributeModifier( + modifier.getId(), modifier.getName(), amount, modifier.getOperation() + )); + } else { + copied.put(key, modifier); + } } + + } return copied; diff --git a/src/main/java/com/sammy/malum/registry/client/ModelRegistry.java b/src/main/java/com/sammy/malum/registry/client/ModelRegistry.java index 2df3169a7..60b21850b 100644 --- a/src/main/java/com/sammy/malum/registry/client/ModelRegistry.java +++ b/src/main/java/com/sammy/malum/registry/client/ModelRegistry.java @@ -2,7 +2,9 @@ import com.sammy.malum.MalumMod; import com.sammy.malum.client.model.*; -import com.sammy.malum.client.model.cosmetic.*; +import com.sammy.malum.client.model.cosmetic.GenericArmorModel; +import com.sammy.malum.client.model.cosmetic.GenericSlimArmorModel; +import com.sammy.malum.client.model.cosmetic.ScarfModel; import com.sammy.malum.client.model.cosmetic.ancient.AncientSoulHunterArmorModel; import com.sammy.malum.client.model.cosmetic.ancient.AncientSoulStainedSteelArmorModel; import com.sammy.malum.client.model.cosmetic.pride.PridewearArmorModel; diff --git a/src/main/java/com/sammy/malum/registry/client/ParticleRegistry.java b/src/main/java/com/sammy/malum/registry/client/ParticleRegistry.java index 10b30e8a2..255e2ab07 100644 --- a/src/main/java/com/sammy/malum/registry/client/ParticleRegistry.java +++ b/src/main/java/com/sammy/malum/registry/client/ParticleRegistry.java @@ -10,8 +10,8 @@ import net.minecraftforge.registries.DeferredRegister; import net.minecraftforge.registries.ForgeRegistries; import net.minecraftforge.registries.RegistryObject; -import team.lodestar.lodestone.setup.*; -import team.lodestar.lodestone.systems.particle.type.*; +import team.lodestar.lodestone.systems.particle.type.LodestoneParticleType; +import team.lodestar.lodestone.systems.particle.type.LodestoneSparkParticleType; @SuppressWarnings("unused") public class ParticleRegistry { diff --git a/src/main/java/com/sammy/malum/registry/common/AttributeRegistry.java b/src/main/java/com/sammy/malum/registry/common/AttributeRegistry.java index 9f8f101cc..148c5106f 100644 --- a/src/main/java/com/sammy/malum/registry/common/AttributeRegistry.java +++ b/src/main/java/com/sammy/malum/registry/common/AttributeRegistry.java @@ -23,7 +23,7 @@ public class AttributeRegistry { public static final RegistryObject SOUL_WARD_RECOVERY_SPEED = registerAttribute(ATTRIBUTES, MALUM, "soul_ward_recovery_speed", (id) -> new RangedAttribute(id, 0D, 0.0D, 2048.0D).setSyncable(true)); public static final RegistryObject SOUL_WARD_CAP = registerAttribute(ATTRIBUTES, MALUM, "soul_ward_capacity", (id) -> new RangedAttribute(id, 0D, 0.0D, 2048.0D).setSyncable(true)); - + @SubscribeEvent public static void modifyEntityAttributes(EntityAttributeModificationEvent event) { event.getTypes().forEach(e -> { diff --git a/src/main/java/com/sammy/malum/registry/common/ContainerRegistry.java b/src/main/java/com/sammy/malum/registry/common/ContainerRegistry.java index b3d2192fc..d9858bb70 100644 --- a/src/main/java/com/sammy/malum/registry/common/ContainerRegistry.java +++ b/src/main/java/com/sammy/malum/registry/common/ContainerRegistry.java @@ -21,7 +21,7 @@ import static com.sammy.malum.MalumMod.MALUM; -@Mod.EventBusSubscriber(modid= MalumMod.MALUM, value= Dist.CLIENT, bus= Mod.EventBusSubscriber.Bus.MOD) +@Mod.EventBusSubscriber(modid = MalumMod.MALUM, value = Dist.CLIENT, bus = Mod.EventBusSubscriber.Bus.MOD) public class ContainerRegistry { public static final DeferredRegister> CONTAINERS = DeferredRegister.create(ForgeRegistries.MENU_TYPES, MALUM); diff --git a/src/main/java/com/sammy/malum/registry/common/PacketRegistry.java b/src/main/java/com/sammy/malum/registry/common/PacketRegistry.java index c931b63dc..75ca6da87 100644 --- a/src/main/java/com/sammy/malum/registry/common/PacketRegistry.java +++ b/src/main/java/com/sammy/malum/registry/common/PacketRegistry.java @@ -1,18 +1,26 @@ package com.sammy.malum.registry.common; -import com.sammy.malum.*; -import com.sammy.malum.common.packets.*; -import com.sammy.malum.common.packets.particle.*; -import com.sammy.malum.common.packets.particle.curiosities.altar.*; -import com.sammy.malum.common.packets.particle.curiosities.blight.*; -import com.sammy.malum.common.packets.particle.curiosities.nitrate.*; +import com.sammy.malum.MalumMod; +import com.sammy.malum.common.packets.ParticleEffectPacket; +import com.sammy.malum.common.packets.SyncLivingCapabilityDataPacket; +import com.sammy.malum.common.packets.SyncMalumPlayerCapabilityDataPacket; +import com.sammy.malum.common.packets.VoidRejectionPacket; +import com.sammy.malum.common.packets.particle.SuccessfulSoulHarvestParticlePacket; +import com.sammy.malum.common.packets.particle.curiosities.altar.AltarConsumeParticlePacket; +import com.sammy.malum.common.packets.particle.curiosities.altar.AltarCraftParticlePacket; +import com.sammy.malum.common.packets.particle.curiosities.blight.BlightMistParticlePacket; +import com.sammy.malum.common.packets.particle.curiosities.blight.BlightTransformItemParticlePacket; +import com.sammy.malum.common.packets.particle.curiosities.nitrate.EthericNitrateParticlePacket; +import com.sammy.malum.common.packets.particle.curiosities.nitrate.VividNitrateBounceParticlePacket; import com.sammy.malum.common.packets.particle.curiosities.rite.*; -import com.sammy.malum.common.packets.particle.curiosities.rite.generic.*; -import net.minecraftforge.eventbus.api.*; -import net.minecraftforge.fml.common.*; -import net.minecraftforge.fml.event.lifecycle.*; -import net.minecraftforge.network.*; -import net.minecraftforge.network.simple.*; +import com.sammy.malum.common.packets.particle.curiosities.rite.generic.BlockSparkleParticlePacket; +import com.sammy.malum.common.packets.particle.curiosities.rite.generic.MajorEntityEffectParticlePacket; +import com.sammy.malum.common.packets.particle.curiosities.rite.generic.TotemPoleActivationEffectPacket; +import net.minecraftforge.eventbus.api.SubscribeEvent; +import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent; +import net.minecraftforge.network.NetworkRegistry; +import net.minecraftforge.network.simple.SimpleChannel; @SuppressWarnings("unused") @Mod.EventBusSubscriber(modid = MalumMod.MALUM, bus = Mod.EventBusSubscriber.Bus.MOD) diff --git a/src/main/java/com/sammy/malum/registry/common/ParticleEffectTypeRegistry.java b/src/main/java/com/sammy/malum/registry/common/ParticleEffectTypeRegistry.java index b909b2784..9d741e07e 100644 --- a/src/main/java/com/sammy/malum/registry/common/ParticleEffectTypeRegistry.java +++ b/src/main/java/com/sammy/malum/registry/common/ParticleEffectTypeRegistry.java @@ -1,12 +1,17 @@ package com.sammy.malum.registry.common; -import com.sammy.malum.visual_effects.networked.*; -import com.sammy.malum.visual_effects.networked.altar.*; -import com.sammy.malum.visual_effects.networked.blight.*; -import com.sammy.malum.visual_effects.networked.generic.*; -import com.sammy.malum.visual_effects.networked.weeping_well.*; - -import java.util.*; +import com.sammy.malum.visual_effects.networked.ParticleEffectType; +import com.sammy.malum.visual_effects.networked.SpiritMoteCreationParticleEffect; +import com.sammy.malum.visual_effects.networked.altar.SpiritAltarCraftParticleEffect; +import com.sammy.malum.visual_effects.networked.altar.SpiritAltarEatItemParticleEffect; +import com.sammy.malum.visual_effects.networked.blight.BlightingMistParticleEffect; +import com.sammy.malum.visual_effects.networked.generic.DrippingSmokeParticleEffect; +import com.sammy.malum.visual_effects.networked.generic.HexingSmokeParticleEffect; +import com.sammy.malum.visual_effects.networked.generic.RisingSparklesParticleEffect; +import com.sammy.malum.visual_effects.networked.weeping_well.WeepingWellReactionParticleEffect; + +import java.util.LinkedHashMap; +import java.util.Map; public class ParticleEffectTypeRegistry { diff --git a/src/main/java/com/sammy/malum/registry/common/SoundRegistry.java b/src/main/java/com/sammy/malum/registry/common/SoundRegistry.java index cab7c79e5..ebaf135a5 100644 --- a/src/main/java/com/sammy/malum/registry/common/SoundRegistry.java +++ b/src/main/java/com/sammy/malum/registry/common/SoundRegistry.java @@ -42,7 +42,6 @@ public class SoundRegistry { public static final RegistryObject VOID_TRINKET_EQUIP = register(SoundEvent.createVariableRangeEvent(MalumMod.malumPath("void_trinket_equipped"))); - public static final RegistryObject ARCANE_WHISPERS = register(SoundEvent.createVariableRangeEvent(MalumMod.malumPath("arcane_whispers"))); public static final RegistryObject SPIRIT_PICKUP = register(SoundEvent.createVariableRangeEvent(MalumMod.malumPath("spirit_picked_up"))); public static final RegistryObject SOUL_SHATTER = register(SoundEvent.createVariableRangeEvent(MalumMod.malumPath("a_soul_shatters"))); @@ -156,9 +155,9 @@ public class SoundRegistry { public static final SoundType SOULSTONE = new ForgeSoundType(1.0F, 1.0F, SOULSTONE_BREAK, SOULSTONE_STEP, SOULSTONE_PLACE, SOULSTONE_HIT, () -> SoundEvents.STONE_FALL); public static final SoundType DEEPSLATE_SOULSTONE = new ForgeSoundType(1.0F, 1.0F, DEEPSLATE_SOULSTONE_BREAK, DEEPSLATE_SOULSTONE_STEP, DEEPSLATE_SOULSTONE_PLACE, DEEPSLATE_SOULSTONE_HIT, () -> SoundEvents.DEEPSLATE_FALL); public static final SoundType BLAZING_QUARTZ_ORE = new ForgeSoundType(1.0F, 1.0F, BLAZING_QUARTZ_ORE_BREAK, () -> SoundEvents.NETHER_ORE_STEP, BLAZING_QUARTZ_ORE_PLACE, () -> SoundEvents.NETHER_ORE_HIT, () -> SoundEvents.NETHER_GOLD_ORE_FALL); - public static final SoundType NATURAL_QUARTZ = new QuartzSoundType(1.0F, 0.9f, ()->SoundEvents.STONE_BREAK, ()->SoundEvents.STONE_STEP, ()->SoundEvents.STONE_PLACE, ()->SoundEvents.STONE_HIT, ()->SoundEvents.STONE_FALL); - public static final SoundType DEEPSLATE_QUARTZ = new QuartzSoundType(1.0F, 0.9f, ()->SoundEvents.DEEPSLATE_BREAK, ()->SoundEvents.DEEPSLATE_STEP, ()->SoundEvents.DEEPSLATE_PLACE, ()->SoundEvents.DEEPSLATE_HIT, ()->SoundEvents.DEEPSLATE_FALL); - public static final SoundType CTHONIC_GOLD = new RareEarthSoundType(1.0F, 1.15f, SOULSTONE_BREAK, SOULSTONE_STEP, SOULSTONE_PLACE, DEEPSLATE_SOULSTONE_HIT, ()->SoundEvents.DEEPSLATE_FALL); + public static final SoundType NATURAL_QUARTZ = new QuartzSoundType(1.0F, 0.9f, () -> SoundEvents.STONE_BREAK, () -> SoundEvents.STONE_STEP, () -> SoundEvents.STONE_PLACE, () -> SoundEvents.STONE_HIT, () -> SoundEvents.STONE_FALL); + public static final SoundType DEEPSLATE_QUARTZ = new QuartzSoundType(1.0F, 0.9f, () -> SoundEvents.DEEPSLATE_BREAK, () -> SoundEvents.DEEPSLATE_STEP, () -> SoundEvents.DEEPSLATE_PLACE, () -> SoundEvents.DEEPSLATE_HIT, () -> SoundEvents.DEEPSLATE_FALL); + public static final SoundType CTHONIC_GOLD = new RareEarthSoundType(1.0F, 1.15f, SOULSTONE_BREAK, SOULSTONE_STEP, SOULSTONE_PLACE, DEEPSLATE_SOULSTONE_HIT, () -> SoundEvents.DEEPSLATE_FALL); public static final SoundType BRILLIANCE_BLOCK = new ForgeSoundType(1.0F, 1.4f, BRILLIANCE_BLOCK_BREAK, BRILLIANCE_BLOCK_STEP, BRILLIANCE_BLOCK_PLACE, BRILLIANCE_BLOCK_HIT, () -> SoundEvents.NETHER_GOLD_ORE_FALL); public static final SoundType BLAZING_QUARTZ_BLOCK = new ForgeSoundType(1.0F, 1.25f, BLAZING_QUARTZ_BLOCK_BREAK, BLAZING_QUARTZ_BLOCK_STEP, BLAZING_QUARTZ_BLOCK_PLACE, BLAZING_QUARTZ_BLOCK_HIT, () -> SoundEvents.NETHER_GOLD_ORE_FALL); @@ -172,8 +171,8 @@ public class SoundRegistry { public static final SoundType RUNEWOOD_LEAVES = new ForgeSoundType(1.0F, 1.1F, RUNEWOOD_LEAVES_BREAK, RUNEWOOD_LEAVES_STEP, RUNEWOOD_LEAVES_PLACE, RUNEWOOD_LEAVES_HIT, () -> SoundEvents.AZALEA_LEAVES_FALL); - public static final SoundType BLIGHTED_FOLIAGE = new BlightedSoundType(1.0F, 1.0F, ()->SoundEvents.NETHER_WART_BREAK, ()->SoundEvents.STONE_STEP, ()->SoundEvents.NETHER_WART_PLANTED, ()->SoundEvents.STONE_HIT, ()->SoundEvents.STONE_FALL); - public static final SoundType BLIGHTED_EARTH = new BlightedSoundType(1.0F, 1.0F, ()->SoundEvents.NYLIUM_BREAK, ()->SoundEvents.NYLIUM_STEP, ()->SoundEvents.NYLIUM_PLACE, ()->SoundEvents.NYLIUM_HIT, ()->SoundEvents.NYLIUM_FALL); + public static final SoundType BLIGHTED_FOLIAGE = new BlightedSoundType(1.0F, 1.0F, () -> SoundEvents.NETHER_WART_BREAK, () -> SoundEvents.STONE_STEP, () -> SoundEvents.NETHER_WART_PLANTED, () -> SoundEvents.STONE_HIT, () -> SoundEvents.STONE_FALL); + public static final SoundType BLIGHTED_EARTH = new BlightedSoundType(1.0F, 1.0F, () -> SoundEvents.NYLIUM_BREAK, () -> SoundEvents.NYLIUM_STEP, () -> SoundEvents.NYLIUM_PLACE, () -> SoundEvents.NYLIUM_HIT, () -> SoundEvents.NYLIUM_FALL); public static final SoundType SOULWOOD = new BlightedSoundType(1.0F, 1.0F, () -> SoundEvents.WOOD_BREAK, () -> SoundEvents.WOOD_STEP, () -> SoundEvents.WOOD_PLACE, () -> SoundEvents.WOOD_HIT, () -> SoundEvents.WOOD_FALL); public static final SoundType SOULWOOD_LEAVES = new BlightedSoundType(1.0F, 0.9F, SOULWOOD_LEAVES_BREAK, SOULWOOD_LEAVES_STEP, SOULWOOD_LEAVES_PLACE, SOULWOOD_LEAVES_HIT, () -> SoundEvents.AZALEA_LEAVES_FALL); diff --git a/src/main/java/com/sammy/malum/registry/common/SpiritTypeRegistry.java b/src/main/java/com/sammy/malum/registry/common/SpiritTypeRegistry.java index bc165d517..d1c9eace8 100644 --- a/src/main/java/com/sammy/malum/registry/common/SpiritTypeRegistry.java +++ b/src/main/java/com/sammy/malum/registry/common/SpiritTypeRegistry.java @@ -1,23 +1,22 @@ package com.sammy.malum.registry.common; -import com.sammy.malum.*; -import com.sammy.malum.core.systems.spirit.*; -import com.sammy.malum.registry.common.block.*; -import com.sammy.malum.registry.common.item.*; -import net.minecraft.client.renderer.texture.*; -import net.minecraftforge.api.distmarker.*; -import net.minecraftforge.client.event.*; -import net.minecraftforge.eventbus.api.*; -import net.minecraftforge.fml.common.*; -import team.lodestar.lodestone.helpers.*; -import team.lodestar.lodestone.systems.easing.*; +import com.sammy.malum.MalumMod; +import com.sammy.malum.core.systems.spirit.MalumSpiritType; +import com.sammy.malum.core.systems.spirit.SpiritTypeProperty; +import com.sammy.malum.registry.common.block.BlockRegistry; +import com.sammy.malum.registry.common.item.ItemRegistry; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.fml.common.Mod; +import team.lodestar.lodestone.helpers.ColorHelper; +import team.lodestar.lodestone.systems.easing.Easing; import java.awt.*; +import java.util.LinkedHashMap; import java.util.List; -import java.util.*; +import java.util.Map; @SuppressWarnings("unchecked") -@Mod.EventBusSubscriber(modid= MalumMod.MALUM, value= Dist.CLIENT, bus= Mod.EventBusSubscriber.Bus.MOD) +@Mod.EventBusSubscriber(modid = MalumMod.MALUM, value = Dist.CLIENT, bus = Mod.EventBusSubscriber.Bus.MOD) public class SpiritTypeRegistry { public static Map SPIRITS = new LinkedHashMap<>(); diff --git a/src/main/java/com/sammy/malum/registry/common/block/BlockEntityRegistry.java b/src/main/java/com/sammy/malum/registry/common/block/BlockEntityRegistry.java index 792e65983..9fb787ba2 100644 --- a/src/main/java/com/sammy/malum/registry/common/block/BlockEntityRegistry.java +++ b/src/main/java/com/sammy/malum/registry/common/block/BlockEntityRegistry.java @@ -2,27 +2,28 @@ import com.sammy.malum.MalumMod; import com.sammy.malum.client.renderer.block.*; -import com.sammy.malum.common.block.ether.EtherBlock; -import com.sammy.malum.common.block.mana_mote.*; -import com.sammy.malum.common.block.storage.pedestal.ItemPedestalBlock; -import com.sammy.malum.common.block.storage.stand.ItemStandBlock; -import com.sammy.malum.common.block.curiosities.totem.TotemBaseBlock; -import com.sammy.malum.common.block.curiosities.totem.TotemPoleBlock; -import com.sammy.malum.common.block.ether.EtherBlockEntity; -import com.sammy.malum.common.block.curiosities.weeping_well.VoidConduitBlockEntity; -import com.sammy.malum.common.block.curiosities.weavers_workbench.WeaversWorkbenchBlockEntity; -import com.sammy.malum.common.block.curiosities.spirit_crucible.SpiritCatalyzerCoreBlockEntity; -import com.sammy.malum.common.block.curiosities.spirit_crucible.SpiritCrucibleCoreBlockEntity; import com.sammy.malum.common.block.curiosities.obelisk.BrilliantObeliskBlockEntity; import com.sammy.malum.common.block.curiosities.obelisk.RunewoodObeliskBlockEntity; import com.sammy.malum.common.block.curiosities.spirit_altar.SpiritAltarBlockEntity; -import com.sammy.malum.common.block.storage.pedestal.ItemPedestalBlockEntity; -import com.sammy.malum.common.block.storage.stand.ItemStandBlockEntity; -import com.sammy.malum.common.block.storage.vial.SoulVialBlockEntity; -import com.sammy.malum.common.block.storage.jar.SpiritJarBlockEntity; +import com.sammy.malum.common.block.curiosities.spirit_crucible.SpiritCatalyzerCoreBlockEntity; +import com.sammy.malum.common.block.curiosities.spirit_crucible.SpiritCrucibleCoreBlockEntity; import com.sammy.malum.common.block.curiosities.tablet.TwistedTabletBlockEntity; +import com.sammy.malum.common.block.curiosities.totem.TotemBaseBlock; import com.sammy.malum.common.block.curiosities.totem.TotemBaseBlockEntity; +import com.sammy.malum.common.block.curiosities.totem.TotemPoleBlock; import com.sammy.malum.common.block.curiosities.totem.TotemPoleBlockEntity; +import com.sammy.malum.common.block.curiosities.weavers_workbench.WeaversWorkbenchBlockEntity; +import com.sammy.malum.common.block.curiosities.weeping_well.VoidConduitBlockEntity; +import com.sammy.malum.common.block.ether.EtherBlock; +import com.sammy.malum.common.block.ether.EtherBlockEntity; +import com.sammy.malum.common.block.mana_mote.MoteOfManaBlockEntity; +import com.sammy.malum.common.block.mana_mote.SpiritMoteBlock; +import com.sammy.malum.common.block.storage.jar.SpiritJarBlockEntity; +import com.sammy.malum.common.block.storage.pedestal.ItemPedestalBlock; +import com.sammy.malum.common.block.storage.pedestal.ItemPedestalBlockEntity; +import com.sammy.malum.common.block.storage.stand.ItemStandBlock; +import com.sammy.malum.common.block.storage.stand.ItemStandBlockEntity; +import com.sammy.malum.common.block.storage.vial.SoulVialBlockEntity; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraftforge.api.distmarker.Dist; @@ -70,7 +71,7 @@ public static Block[] getBlocks(Class... blockClasses) { Collection> blocks = BlockRegistry.BLOCKS.getEntries(); List matchingBlocks = new ArrayList<>(); for (RegistryObject registryObject : blocks) { - if (Arrays.stream(blockClasses).anyMatch(b -> b.isInstance(registryObject.get()))) { + if (registryObject.isPresent() && Arrays.stream(blockClasses).anyMatch(b -> b.isInstance(registryObject.get()))) { matchingBlocks.add(registryObject.get()); } } diff --git a/src/main/java/com/sammy/malum/registry/common/block/BlockRegistry.java b/src/main/java/com/sammy/malum/registry/common/block/BlockRegistry.java index 712e73b7e..b6876006d 100644 --- a/src/main/java/com/sammy/malum/registry/common/block/BlockRegistry.java +++ b/src/main/java/com/sammy/malum/registry/common/block/BlockRegistry.java @@ -1,49 +1,74 @@ package com.sammy.malum.registry.common.block; -import com.sammy.malum.*; -import com.sammy.malum.common.block.blight.*; -import com.sammy.malum.common.block.curiosities.obelisk.*; -import com.sammy.malum.common.block.curiosities.spirit_altar.*; -import com.sammy.malum.common.block.curiosities.spirit_crucible.*; -import com.sammy.malum.common.block.curiosities.tablet.*; -import com.sammy.malum.common.block.curiosities.totem.*; -import com.sammy.malum.common.block.curiosities.weavers_workbench.*; -import com.sammy.malum.common.block.curiosities.weeping_well.*; +import com.sammy.malum.MalumMod; +import com.sammy.malum.common.block.blight.BlightedGrassBlock; +import com.sammy.malum.common.block.blight.BlightedSoilBlock; +import com.sammy.malum.common.block.blight.BlightedSoulwoodBlock; +import com.sammy.malum.common.block.curiosities.obelisk.BrillianceObeliskCoreBlock; +import com.sammy.malum.common.block.curiosities.obelisk.ObeliskComponentBlock; +import com.sammy.malum.common.block.curiosities.obelisk.RunewoodObeliskCoreBlock; +import com.sammy.malum.common.block.curiosities.spirit_altar.SpiritAltarBlock; +import com.sammy.malum.common.block.curiosities.spirit_crucible.SpiritCatalyzerComponentBlock; +import com.sammy.malum.common.block.curiosities.spirit_crucible.SpiritCatalyzerCoreBlock; +import com.sammy.malum.common.block.curiosities.spirit_crucible.SpiritCrucibleComponentBlock; +import com.sammy.malum.common.block.curiosities.spirit_crucible.SpiritCrucibleCoreBlock; +import com.sammy.malum.common.block.curiosities.tablet.TwistedTabletBlock; +import com.sammy.malum.common.block.curiosities.totem.TotemBaseBlock; +import com.sammy.malum.common.block.curiosities.totem.TotemPoleBlock; +import com.sammy.malum.common.block.curiosities.weavers_workbench.WeaversWorkbenchBlock; +import com.sammy.malum.common.block.curiosities.weeping_well.PrimordialSoupBlock; +import com.sammy.malum.common.block.curiosities.weeping_well.VoidConduitBlock; +import com.sammy.malum.common.block.curiosities.weeping_well.WeepingWellBlock; import com.sammy.malum.common.block.ether.*; -import com.sammy.malum.common.block.mana_mote.*; -import com.sammy.malum.common.block.nature.*; -import com.sammy.malum.common.block.nature.soulwood.*; -import com.sammy.malum.common.block.storage.jar.*; -import com.sammy.malum.common.block.storage.pedestal.*; -import com.sammy.malum.common.block.storage.stand.*; -import com.sammy.malum.common.block.storage.vial.*; -import com.sammy.malum.common.block.the_device.*; -import com.sammy.malum.registry.common.*; -import com.sammy.malum.registry.common.item.*; -import com.sammy.malum.registry.common.worldgen.*; -import net.minecraft.client.color.block.*; -import net.minecraft.util.*; -import net.minecraft.util.valueproviders.*; +import com.sammy.malum.common.block.mana_mote.SoulstoneBlock; +import com.sammy.malum.common.block.mana_mote.SpiritMoteBlock; +import com.sammy.malum.common.block.nature.MalumLeavesBlock; +import com.sammy.malum.common.block.nature.MalumLogBLock; +import com.sammy.malum.common.block.nature.MalumSaplingBlock; +import com.sammy.malum.common.block.nature.SapFilledLogBlock; +import com.sammy.malum.common.block.nature.soulwood.SapFilledSoulwoodLogBlock; +import com.sammy.malum.common.block.nature.soulwood.SoulwoodBlock; +import com.sammy.malum.common.block.nature.soulwood.SoulwoodGrowthBlock; +import com.sammy.malum.common.block.nature.soulwood.SoulwoodLogBlock; +import com.sammy.malum.common.block.storage.jar.SpiritJarBlock; +import com.sammy.malum.common.block.storage.pedestal.ItemPedestalBlock; +import com.sammy.malum.common.block.storage.pedestal.WoodItemPedestalBlock; +import com.sammy.malum.common.block.storage.stand.ItemStandBlock; +import com.sammy.malum.common.block.storage.vial.SoulVialBlock; +import com.sammy.malum.common.block.the_device.TheDevice; +import com.sammy.malum.common.block.the_device.TheVessel; +import com.sammy.malum.registry.common.SpiritTypeRegistry; +import com.sammy.malum.registry.common.item.ItemRegistry; +import com.sammy.malum.registry.common.worldgen.FeatureRegistry; +import net.minecraft.client.color.block.BlockColors; +import net.minecraft.util.Mth; +import net.minecraft.util.valueproviders.UniformInt; import net.minecraft.world.level.block.*; -import net.minecraft.world.level.block.entity.*; -import net.minecraft.world.level.material.*; -import net.minecraftforge.api.distmarker.*; -import net.minecraftforge.client.event.*; -import net.minecraftforge.eventbus.api.*; -import net.minecraftforge.fml.common.*; -import net.minecraftforge.registries.*; -import team.lodestar.lodestone.systems.block.*; -import team.lodestar.lodestone.systems.block.sign.*; +import net.minecraft.world.level.block.entity.BlockEntity; +import net.minecraft.world.level.block.state.properties.BlockSetType; +import net.minecraft.world.level.block.state.properties.WoodType; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.client.event.RegisterColorHandlersEvent; +import net.minecraftforge.eventbus.api.SubscribeEvent; +import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.registries.DeferredRegister; +import net.minecraftforge.registries.ForgeRegistries; +import net.minecraftforge.registries.RegistryObject; +import team.lodestar.lodestone.systems.block.LodestoneBlockProperties; +import team.lodestar.lodestone.systems.block.LodestoneDirectionalBlock; +import team.lodestar.lodestone.systems.block.LodestoneLogBlock; +import team.lodestar.lodestone.systems.block.sign.LodestoneStandingSignBlock; +import team.lodestar.lodestone.systems.block.sign.LodestoneWallSignBlock; import java.awt.*; -import static com.sammy.malum.MalumMod.*; +import static com.sammy.malum.MalumMod.MALUM; import static com.sammy.malum.registry.common.block.BlockTagRegistry.*; -import static net.minecraft.tags.BlockTags.FENCES; -import static net.minecraft.tags.BlockTags.FENCE_GATES; import static net.minecraft.tags.BlockTags.*; -import static net.minecraft.world.level.block.PressurePlateBlock.Sensitivity.*; -import static net.minecraftforge.common.Tags.Blocks.*; +import static net.minecraft.world.level.block.PressurePlateBlock.Sensitivity.EVERYTHING; +import static net.minecraft.world.level.block.PressurePlateBlock.Sensitivity.MOBS; +import static net.minecraftforge.common.Tags.Blocks.FENCE_GATES_WOODEN; +import static net.minecraftforge.common.Tags.Blocks.STORAGE_BLOCKS; public class BlockRegistry { @@ -122,8 +147,8 @@ public class BlockRegistry { public static final RegistryObject RUNIC_TAINTED_ROCK_TILES_STAIRS = BLOCKS.register("runic_tainted_rock_tiles_stairs", () -> new StairBlock(() -> TAINTED_ROCK.get().defaultBlockState(), MalumBlockProperties.TAINTED_ROCK().addTags(STAIRS))); public static final RegistryObject RUNIC_SMALL_TAINTED_ROCK_BRICKS_STAIRS = BLOCKS.register("runic_small_tainted_rock_bricks_stairs", () -> new StairBlock(() -> TAINTED_ROCK.get().defaultBlockState(), MalumBlockProperties.TAINTED_ROCK().addTags(STAIRS))); - public static final RegistryObject TAINTED_ROCK_BUTTON = BLOCKS.register("tainted_rock_button", () -> new StoneButtonBlock(MalumBlockProperties.TAINTED_ROCK().addTag(BUTTONS))); - public static final RegistryObject TAINTED_ROCK_PRESSURE_PLATE = BLOCKS.register("tainted_rock_pressure_plate", () -> new PressurePlateBlock(MOBS, MalumBlockProperties.TAINTED_ROCK().addTag(PRESSURE_PLATES))); + public static final RegistryObject TAINTED_ROCK_BUTTON = BLOCKS.register("tainted_rock_button", () -> new ButtonBlock(MalumBlockProperties.TAINTED_ROCK().addTag(BUTTONS), BlockSetType.STONE, 20, false)); + public static final RegistryObject TAINTED_ROCK_PRESSURE_PLATE = BLOCKS.register("tainted_rock_pressure_plate", () -> new PressurePlateBlock(MOBS, MalumBlockProperties.TAINTED_ROCK().addTag(PRESSURE_PLATES), BlockSetType.STONE)); public static final RegistryObject TAINTED_ROCK_WALL = BLOCKS.register("tainted_rock_wall", () -> new WallBlock(MalumBlockProperties.TAINTED_ROCK().addTag(WALLS))); public static final RegistryObject TAINTED_ROCK_BRICKS_WALL = BLOCKS.register("tainted_rock_bricks_wall", () -> new WallBlock(MalumBlockProperties.TAINTED_ROCK().addTag(WALLS))); @@ -174,8 +199,8 @@ public class BlockRegistry { public static final RegistryObject RUNIC_TWISTED_ROCK_TILES_STAIRS = BLOCKS.register("runic_twisted_rock_tiles_stairs", () -> new StairBlock(() -> TWISTED_ROCK.get().defaultBlockState(), MalumBlockProperties.TWISTED_ROCK().addTags(STAIRS))); public static final RegistryObject RUNIC_SMALL_TWISTED_ROCK_BRICKS_STAIRS = BLOCKS.register("runic_small_twisted_rock_bricks_stairs", () -> new StairBlock(() -> TWISTED_ROCK.get().defaultBlockState(), MalumBlockProperties.TWISTED_ROCK().addTags(STAIRS))); - public static final RegistryObject TWISTED_ROCK_BUTTON = BLOCKS.register("twisted_rock_button", () -> new StoneButtonBlock(MalumBlockProperties.TWISTED_ROCK().addTag(BUTTONS))); - public static final RegistryObject TWISTED_ROCK_PRESSURE_PLATE = BLOCKS.register("twisted_rock_pressure_plate", () -> new PressurePlateBlock(MOBS, MalumBlockProperties.TWISTED_ROCK().addTag(PRESSURE_PLATES))); + public static final RegistryObject TWISTED_ROCK_BUTTON = BLOCKS.register("twisted_rock_button", () -> new ButtonBlock(MalumBlockProperties.TWISTED_ROCK().addTag(BUTTONS), BlockSetType.STONE, 20, false)); + public static final RegistryObject TWISTED_ROCK_PRESSURE_PLATE = BLOCKS.register("twisted_rock_pressure_plate", () -> new PressurePlateBlock(MOBS, MalumBlockProperties.TWISTED_ROCK().addTag(PRESSURE_PLATES), BlockSetType.STONE)); public static final RegistryObject TWISTED_ROCK_WALL = BLOCKS.register("twisted_rock_wall", () -> new WallBlock(MalumBlockProperties.TWISTED_ROCK().addTag(WALLS))); public static final RegistryObject TWISTED_ROCK_BRICKS_WALL = BLOCKS.register("twisted_rock_bricks_wall", () -> new WallBlock(MalumBlockProperties.TWISTED_ROCK().addTag(WALLS))); @@ -220,15 +245,15 @@ public class BlockRegistry { public static final RegistryObject CUT_RUNEWOOD_PLANKS = BLOCKS.register("cut_runewood_planks", () -> new Block(MalumBlockProperties.RUNEWOOD().addTags(PLANKS))); public static final RegistryObject RUNEWOOD_BEAM = BLOCKS.register("runewood_beam", () -> new RotatedPillarBlock(MalumBlockProperties.RUNEWOOD())); - public static final RegistryObject RUNEWOOD_DOOR = BLOCKS.register("runewood_door", () -> new DoorBlock(MalumBlockProperties.RUNEWOOD().addTags(DOORS, WOODEN_DOORS).setCutoutRenderType().noOcclusion())); - public static final RegistryObject RUNEWOOD_TRAPDOOR = BLOCKS.register("runewood_trapdoor", () -> new TrapDoorBlock(MalumBlockProperties.RUNEWOOD().addTags(TRAPDOORS, WOODEN_TRAPDOORS).setCutoutRenderType().noOcclusion())); - public static final RegistryObject SOLID_RUNEWOOD_TRAPDOOR = BLOCKS.register("solid_runewood_trapdoor", () -> new TrapDoorBlock(MalumBlockProperties.RUNEWOOD().addTags(TRAPDOORS, WOODEN_TRAPDOORS).noOcclusion())); + public static final RegistryObject RUNEWOOD_DOOR = BLOCKS.register("runewood_door", () -> new DoorBlock(MalumBlockProperties.RUNEWOOD().addTags(DOORS, WOODEN_DOORS).setCutoutRenderType().noOcclusion(), MalumBlockSetTypes.RUNEWOOD)); + public static final RegistryObject RUNEWOOD_TRAPDOOR = BLOCKS.register("runewood_trapdoor", () -> new TrapDoorBlock(MalumBlockProperties.RUNEWOOD().addTags(TRAPDOORS, WOODEN_TRAPDOORS).setCutoutRenderType().noOcclusion(), MalumBlockSetTypes.RUNEWOOD)); + public static final RegistryObject SOLID_RUNEWOOD_TRAPDOOR = BLOCKS.register("solid_runewood_trapdoor", () -> new TrapDoorBlock(MalumBlockProperties.RUNEWOOD().addTags(TRAPDOORS, WOODEN_TRAPDOORS).noOcclusion(), MalumBlockSetTypes.RUNEWOOD)); - public static final RegistryObject RUNEWOOD_BUTTON = BLOCKS.register("runewood_planks_button", () -> new WoodButtonBlock(MalumBlockProperties.RUNEWOOD().addTags(BUTTONS, WOODEN_BUTTONS).addTags(BUTTONS, WOODEN_BUTTONS))); - public static final RegistryObject RUNEWOOD_PRESSURE_PLATE = BLOCKS.register("runewood_planks_pressure_plate", () -> new PressurePlateBlock(EVERYTHING, MalumBlockProperties.RUNEWOOD().addTags(PRESSURE_PLATES, WOODEN_PRESSURE_PLATES))); + public static final RegistryObject RUNEWOOD_BUTTON = BLOCKS.register("runewood_planks_button", () -> new ButtonBlock(MalumBlockProperties.RUNEWOOD().addTags(BUTTONS, WOODEN_BUTTONS).addTags(BUTTONS, WOODEN_BUTTONS), MalumBlockSetTypes.RUNEWOOD, 20, true)); + public static final RegistryObject RUNEWOOD_PRESSURE_PLATE = BLOCKS.register("runewood_planks_pressure_plate", () -> new PressurePlateBlock(EVERYTHING, MalumBlockProperties.RUNEWOOD().addTags(PRESSURE_PLATES, WOODEN_PRESSURE_PLATES), MalumBlockSetTypes.RUNEWOOD)); public static final RegistryObject RUNEWOOD_FENCE = BLOCKS.register("runewood_planks_fence", () -> new FenceBlock(MalumBlockProperties.RUNEWOOD().addTags(FENCES, WOODEN_FENCES))); - public static final RegistryObject RUNEWOOD_FENCE_GATE = BLOCKS.register("runewood_planks_fence_gate", () -> new FenceGateBlock(MalumBlockProperties.RUNEWOOD().addTags(FENCE_GATES, FENCE_GATES_WOODEN))); + public static final RegistryObject RUNEWOOD_FENCE_GATE = BLOCKS.register("runewood_planks_fence_gate", () -> new FenceGateBlock(MalumBlockProperties.RUNEWOOD().addTags(FENCE_GATES, FENCE_GATES_WOODEN), WoodTypeRegistry.RUNEWOOD)); public static final RegistryObject RUNEWOOD_ITEM_STAND = BLOCKS.register("runewood_item_stand", () -> new ItemStandBlock<>(MalumBlockProperties.RUNEWOOD().noOcclusion()).setBlockEntity(BlockEntityRegistry.ITEM_STAND)); public static final RegistryObject RUNEWOOD_ITEM_PEDESTAL = BLOCKS.register("runewood_item_pedestal", () -> new WoodItemPedestalBlock<>(MalumBlockProperties.RUNEWOOD().noOcclusion()).setBlockEntity(BlockEntityRegistry.ITEM_PEDESTAL)); @@ -268,15 +293,15 @@ public class BlockRegistry { public static final RegistryObject CUT_SOULWOOD_PLANKS = BLOCKS.register("cut_soulwood_planks", () -> new Block(MalumBlockProperties.SOULWOOD().addTags(PLANKS))); public static final RegistryObject SOULWOOD_BEAM = BLOCKS.register("soulwood_beam", () -> new RotatedPillarBlock(MalumBlockProperties.SOULWOOD())); - public static final RegistryObject SOULWOOD_DOOR = BLOCKS.register("soulwood_door", () -> new DoorBlock(MalumBlockProperties.SOULWOOD().addTags(DOORS, WOODEN_DOORS).setCutoutRenderType().noOcclusion())); - public static final RegistryObject SOULWOOD_TRAPDOOR = BLOCKS.register("soulwood_trapdoor", () -> new TrapDoorBlock(MalumBlockProperties.SOULWOOD().addTags(TRAPDOORS, WOODEN_TRAPDOORS).setCutoutRenderType().noOcclusion())); - public static final RegistryObject SOLID_SOULWOOD_TRAPDOOR = BLOCKS.register("solid_soulwood_trapdoor", () -> new TrapDoorBlock(MalumBlockProperties.SOULWOOD().addTags(TRAPDOORS, WOODEN_TRAPDOORS).noOcclusion())); + public static final RegistryObject SOULWOOD_DOOR = BLOCKS.register("soulwood_door", () -> new DoorBlock(MalumBlockProperties.SOULWOOD().addTags(DOORS, WOODEN_DOORS).setCutoutRenderType().noOcclusion(), MalumBlockSetTypes.SOULWOOD)); + public static final RegistryObject SOULWOOD_TRAPDOOR = BLOCKS.register("soulwood_trapdoor", () -> new TrapDoorBlock(MalumBlockProperties.SOULWOOD().addTags(TRAPDOORS, WOODEN_TRAPDOORS).setCutoutRenderType().noOcclusion(), MalumBlockSetTypes.SOULWOOD)); + public static final RegistryObject SOLID_SOULWOOD_TRAPDOOR = BLOCKS.register("solid_soulwood_trapdoor", () -> new TrapDoorBlock(MalumBlockProperties.SOULWOOD().addTags(TRAPDOORS, WOODEN_TRAPDOORS).noOcclusion(), MalumBlockSetTypes.SOULWOOD)); - public static final RegistryObject SOULWOOD_BUTTON = BLOCKS.register("soulwood_planks_button", () -> new WoodButtonBlock(MalumBlockProperties.SOULWOOD().addTags(BUTTONS, WOODEN_BUTTONS))); - public static final RegistryObject SOULWOOD_PRESSURE_PLATE = BLOCKS.register("soulwood_planks_pressure_plate", () -> new PressurePlateBlock(EVERYTHING, MalumBlockProperties.SOULWOOD().addTags(PRESSURE_PLATES, WOODEN_PRESSURE_PLATES))); + public static final RegistryObject SOULWOOD_BUTTON = BLOCKS.register("soulwood_planks_button", () -> new ButtonBlock(MalumBlockProperties.SOULWOOD().addTags(BUTTONS, WOODEN_BUTTONS), MalumBlockSetTypes.SOULWOOD, 20, true)); + public static final RegistryObject SOULWOOD_PRESSURE_PLATE = BLOCKS.register("soulwood_planks_pressure_plate", () -> new PressurePlateBlock(EVERYTHING, MalumBlockProperties.SOULWOOD().addTags(PRESSURE_PLATES, WOODEN_PRESSURE_PLATES), MalumBlockSetTypes.SOULWOOD)); public static final RegistryObject SOULWOOD_FENCE = BLOCKS.register("soulwood_planks_fence", () -> new FenceBlock(MalumBlockProperties.SOULWOOD().addTags(FENCES, WOODEN_FENCES))); - public static final RegistryObject SOULWOOD_FENCE_GATE = BLOCKS.register("soulwood_planks_fence_gate", () -> new FenceGateBlock(MalumBlockProperties.SOULWOOD().addTags(FENCE_GATES, FENCE_GATES_WOODEN))); + public static final RegistryObject SOULWOOD_FENCE_GATE = BLOCKS.register("soulwood_planks_fence_gate", () -> new FenceGateBlock(MalumBlockProperties.SOULWOOD().addTags(FENCE_GATES, FENCE_GATES_WOODEN), WoodTypeRegistry.SOULWOOD)); public static final RegistryObject SOULWOOD_ITEM_STAND = BLOCKS.register("soulwood_item_stand", () -> new ItemStandBlock<>(MalumBlockProperties.SOULWOOD().noOcclusion()).setBlockEntity(BlockEntityRegistry.ITEM_STAND)); public static final RegistryObject SOULWOOD_ITEM_PEDESTAL = BLOCKS.register("soulwood_item_pedestal", () -> new WoodItemPedestalBlock<>(MalumBlockProperties.SOULWOOD().noOcclusion()).setBlockEntity(BlockEntityRegistry.ITEM_PEDESTAL)); @@ -320,28 +345,28 @@ public class BlockRegistry { public static final RegistryObject BLOCK_OF_ARCANE_CHARCOAL = BLOCKS.register("block_of_arcane_charcoal", () -> new Block(MalumBlockProperties.ARCANE_CHARCOAL_BLOCK())); - public static final RegistryObject BLAZING_QUARTZ_ORE = BLOCKS.register("blazing_quartz_ore", () -> new OreBlock(MalumBlockProperties.BLAZING_QUARTZ_ORE().setCutoutRenderType().lightLevel((b) -> 6), UniformInt.of(4, 7))); + public static final RegistryObject BLAZING_QUARTZ_ORE = BLOCKS.register("blazing_quartz_ore", () -> new DropExperienceBlock(MalumBlockProperties.BLAZING_QUARTZ_ORE().setCutoutRenderType().lightLevel((b) -> 6), UniformInt.of(4, 7))); public static final RegistryObject BLOCK_OF_BLAZING_QUARTZ = BLOCKS.register("block_of_blazing_quartz", () -> new Block(MalumBlockProperties.BLAZING_QUARTZ_BLOCK().lightLevel((b) -> 14))); - public static final RegistryObject NATURAL_QUARTZ_ORE = BLOCKS.register("natural_quartz_ore", () -> new OreBlock(MalumBlockProperties.NATURAL_QUARTZ_ORE(false).setCutoutRenderType(), UniformInt.of(1, 4))); - public static final RegistryObject DEEPSLATE_QUARTZ_ORE = BLOCKS.register("deepslate_quartz_ore", () -> new OreBlock(MalumBlockProperties.NATURAL_QUARTZ_ORE(true).setCutoutRenderType(), UniformInt.of(2, 5))); + public static final RegistryObject NATURAL_QUARTZ_ORE = BLOCKS.register("natural_quartz_ore", () -> new DropExperienceBlock(MalumBlockProperties.NATURAL_QUARTZ_ORE(false).setCutoutRenderType(), UniformInt.of(1, 4))); + public static final RegistryObject DEEPSLATE_QUARTZ_ORE = BLOCKS.register("deepslate_quartz_ore", () -> new DropExperienceBlock(MalumBlockProperties.NATURAL_QUARTZ_ORE(true).setCutoutRenderType(), UniformInt.of(2, 5))); public static final RegistryObject NATURAL_QUARTZ_CLUSTER = BLOCKS.register("natural_quartz_cluster", () -> new AmethystClusterBlock(6, 3, MalumBlockProperties.NATURAL_QUARTZ_CLUSTER().setCutoutRenderType())); - public static final RegistryObject BLOCK_OF_CTHONIC_GOLD = BLOCKS.register("block_of_cthonic_gold", () -> new OreBlock(MalumBlockProperties.CTHONIC_GOLD_ORE(), UniformInt.of(10, 100))); + public static final RegistryObject BLOCK_OF_CTHONIC_GOLD = BLOCKS.register("block_of_cthonic_gold", () -> new DropExperienceBlock(MalumBlockProperties.CTHONIC_GOLD_ORE(), UniformInt.of(10, 100))); - public static final RegistryObject BRILLIANT_STONE = BLOCKS.register("brilliant_stone", () -> new OreBlock(MalumBlockProperties.BRILLIANCE_ORE(false).setCutoutRenderType(), UniformInt.of(14, 18))); - public static final RegistryObject BRILLIANT_DEEPSLATE = BLOCKS.register("brilliant_deepslate", () -> new OreBlock(MalumBlockProperties.BRILLIANCE_ORE(true).setCutoutRenderType(), UniformInt.of(16, 26))); + public static final RegistryObject BRILLIANT_STONE = BLOCKS.register("brilliant_stone", () -> new DropExperienceBlock(MalumBlockProperties.BRILLIANCE_ORE(false).setCutoutRenderType(), UniformInt.of(14, 18))); + public static final RegistryObject BRILLIANT_DEEPSLATE = BLOCKS.register("brilliant_deepslate", () -> new DropExperienceBlock(MalumBlockProperties.BRILLIANCE_ORE(true).setCutoutRenderType(), UniformInt.of(16, 26))); public static final RegistryObject BLOCK_OF_BRILLIANCE = BLOCKS.register("block_of_brilliance", () -> new Block(MalumBlockProperties.BRILLIANCE_BLOCK())); - public static final RegistryObject SOULSTONE_ORE = BLOCKS.register("soulstone_ore", () -> new OreBlock(MalumBlockProperties.SOULSTONE_ORE(false))); - public static final RegistryObject DEEPSLATE_SOULSTONE_ORE = BLOCKS.register("deepslate_soulstone_ore", () -> new OreBlock(MalumBlockProperties.SOULSTONE_ORE(true))); + public static final RegistryObject SOULSTONE_ORE = BLOCKS.register("soulstone_ore", () -> new DropExperienceBlock(MalumBlockProperties.SOULSTONE_ORE(false))); + public static final RegistryObject DEEPSLATE_SOULSTONE_ORE = BLOCKS.register("deepslate_soulstone_ore", () -> new DropExperienceBlock(MalumBlockProperties.SOULSTONE_ORE(true))); public static final RegistryObject BLOCK_OF_RAW_SOULSTONE = BLOCKS.register("block_of_raw_soulstone", () -> new Block(MalumBlockProperties.SOULSTONE_BLOCK())); public static final RegistryObject BLOCK_OF_SOULSTONE = BLOCKS.register("block_of_soulstone", () -> new SoulstoneBlock(MalumBlockProperties.SOULSTONE_BLOCK())); public static final RegistryObject BLOCK_OF_HALLOWED_GOLD = BLOCKS.register("block_of_hallowed_gold", () -> new Block(MalumBlockProperties.HALLOWED_GOLD())); public static final RegistryObject BLOCK_OF_SOUL_STAINED_STEEL = BLOCKS.register("block_of_soul_stained_steel", () -> new Block(MalumBlockProperties.SOUL_STAINED_STEEL_BLOCK())); - public static final RegistryObject BLOCK_OF_ROTTING_ESSENCE = BLOCKS.register("block_of_rotting_essence", () -> new Block(new LodestoneBlockProperties(Material.STONE, MaterialColor.COLOR_RED).needsPickaxe().addTags(STORAGE_BLOCKS).strength(1F, 6.0F).sound(SoundType.CORAL_BLOCK))); + public static final RegistryObject BLOCK_OF_ROTTING_ESSENCE = BLOCKS.register("block_of_rotting_essence", () -> new Block(new LodestoneBlockProperties().needsPickaxe().addTags(STORAGE_BLOCKS).strength(1F, 6.0F).sound(SoundType.CORAL_BLOCK))); public static final RegistryObject BLOCK_OF_GRIM_TALC = BLOCKS.register("block_of_grim_talc", () -> new Block(LodestoneBlockProperties.copy(Blocks.BONE_BLOCK).needsPickaxe().addTags(STORAGE_BLOCKS))); public static final RegistryObject BLOCK_OF_ALCHEMICAL_CALX = BLOCKS.register("block_of_alchemical_calx", () -> new Block(LodestoneBlockProperties.copy(Blocks.CALCITE).needsPickaxe().addTags(STORAGE_BLOCKS))); public static final RegistryObject BLOCK_OF_ASTRAL_WEAVE = BLOCKS.register("block_of_astral_weave", () -> new Block(LodestoneBlockProperties.copy(Blocks.LIGHT_BLUE_WOOL).needsPickaxe().needsHoe().addTags(STORAGE_BLOCKS))); @@ -357,7 +382,7 @@ public class BlockRegistry { public static class ClientOnly { @SubscribeEvent - public static void setBlockColors(ColorHandlerEvent.Block event) { + public static void setBlockColors(RegisterColorHandlersEvent.Block event) { BlockColors blockColors = event.getBlockColors(); blockColors.register((s, l, p, c) -> { BlockEntity blockEntity = l.getBlockEntity(p); diff --git a/src/main/java/com/sammy/malum/registry/common/block/BlockTagRegistry.java b/src/main/java/com/sammy/malum/registry/common/block/BlockTagRegistry.java index 255d9d3fa..4d03fc7be 100644 --- a/src/main/java/com/sammy/malum/registry/common/block/BlockTagRegistry.java +++ b/src/main/java/com/sammy/malum/registry/common/block/BlockTagRegistry.java @@ -1,8 +1,6 @@ package com.sammy.malum.registry.common.block; import com.sammy.malum.MalumMod; -import net.minecraft.core.Registry; -import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.resources.ResourceLocation; import net.minecraft.tags.BlockTags; import net.minecraft.tags.TagKey; diff --git a/src/main/java/com/sammy/malum/registry/common/block/MalumBlockSetTypes.java b/src/main/java/com/sammy/malum/registry/common/block/MalumBlockSetTypes.java new file mode 100644 index 000000000..19bbdb3ac --- /dev/null +++ b/src/main/java/com/sammy/malum/registry/common/block/MalumBlockSetTypes.java @@ -0,0 +1,13 @@ +package com.sammy.malum.registry.common.block; + +import net.minecraft.sounds.SoundEvents; +import net.minecraft.world.level.block.SoundType; +import net.minecraft.world.level.block.state.properties.BlockSetType; + +public class MalumBlockSetTypes { + public static final BlockSetType RUNEWOOD = BlockSetType.register(new BlockSetType("runewood")); + public static final BlockSetType SOULWOOD = BlockSetType.register(new BlockSetType("soulwood")); + public static final BlockSetType TAINTED_ROCK = BlockSetType.register(new BlockSetType("tainted_rock", true, SoundType.STONE, SoundEvents.IRON_DOOR_CLOSE, SoundEvents.IRON_DOOR_OPEN, SoundEvents.IRON_TRAPDOOR_CLOSE, SoundEvents.IRON_TRAPDOOR_OPEN, SoundEvents.STONE_PRESSURE_PLATE_CLICK_OFF, SoundEvents.STONE_PRESSURE_PLATE_CLICK_ON, SoundEvents.STONE_BUTTON_CLICK_OFF, SoundEvents.STONE_BUTTON_CLICK_ON)); + public static final BlockSetType TWISTED_ROCK = BlockSetType.register(new BlockSetType("twisted_rock", true, SoundType.STONE, SoundEvents.IRON_DOOR_CLOSE, SoundEvents.IRON_DOOR_OPEN, SoundEvents.IRON_TRAPDOOR_CLOSE, SoundEvents.IRON_TRAPDOOR_OPEN, SoundEvents.STONE_PRESSURE_PLATE_CLICK_OFF, SoundEvents.STONE_PRESSURE_PLATE_CLICK_ON, SoundEvents.STONE_BUTTON_CLICK_OFF, SoundEvents.STONE_BUTTON_CLICK_ON)); + +} diff --git a/src/main/java/com/sammy/malum/registry/common/block/WoodTypeRegistry.java b/src/main/java/com/sammy/malum/registry/common/block/WoodTypeRegistry.java index 39a8e867b..9e4fa5093 100644 --- a/src/main/java/com/sammy/malum/registry/common/block/WoodTypeRegistry.java +++ b/src/main/java/com/sammy/malum/registry/common/block/WoodTypeRegistry.java @@ -1,27 +1,20 @@ package com.sammy.malum.registry.common.block; -import com.sammy.malum.MalumMod; +import net.minecraft.world.level.block.state.properties.BlockSetType; import net.minecraft.world.level.block.state.properties.WoodType; -import net.minecraftforge.fml.common.Mod; import java.util.ArrayList; import java.util.List; //@Mod.EventBusSubscriber(modid= MalumMod.MALUM, bus= Mod.EventBusSubscriber.Bus.MOD) public class WoodTypeRegistry { - //public static List WOOD_TYPES = new ArrayList<>(); + public static List WOOD_TYPES = new ArrayList<>(); //public static final WoodType RUNEWOOD = WoodType.register(new MalumWoodType("runewood")); //public static final WoodType SOULWOOD = WoodType.register(new MalumWoodType("soulwood")); public static final WoodType RUNEWOOD = WoodType.register(new WoodType("runewood", MalumBlockSetTypes.RUNEWOOD)); public static final WoodType SOULWOOD = WoodType.register(new WoodType("soulwood", MalumBlockSetTypes.SOULWOOD)); - /* - static class MalumWoodType extends WoodType { - public MalumWoodType(String nameIn) { - super("malum:" + nameIn); - WOOD_TYPES.add(this); - } - } - */ + + } diff --git a/src/main/java/com/sammy/malum/registry/common/entity/EntityRegistry.java b/src/main/java/com/sammy/malum/registry/common/entity/EntityRegistry.java index ab5d7254d..8bd086af1 100644 --- a/src/main/java/com/sammy/malum/registry/common/entity/EntityRegistry.java +++ b/src/main/java/com/sammy/malum/registry/common/entity/EntityRegistry.java @@ -1,59 +1,62 @@ package com.sammy.malum.registry.common.entity; -import com.sammy.malum.*; +import com.sammy.malum.MalumMod; import com.sammy.malum.client.renderer.entity.*; -import com.sammy.malum.common.entity.boomerang.*; -import com.sammy.malum.common.entity.night_terror.*; -import com.sammy.malum.common.entity.nitrate.*; -import com.sammy.malum.common.entity.spirit.*; -import com.sammy.malum.registry.common.item.*; -import net.minecraft.client.renderer.entity.*; -import net.minecraft.world.entity.*; -import net.minecraftforge.api.distmarker.*; -import net.minecraftforge.client.event.*; -import net.minecraftforge.eventbus.api.*; -import net.minecraftforge.fml.common.*; -import net.minecraftforge.registries.*; -import team.lodestar.lodestone.systems.entity.*; +import com.sammy.malum.common.entity.boomerang.ScytheBoomerangEntity; +import com.sammy.malum.common.entity.night_terror.NightTerrorSeekerEntity; +import com.sammy.malum.common.entity.nitrate.EthericNitrateEntity; +import com.sammy.malum.common.entity.nitrate.VividNitrateEntity; +import com.sammy.malum.common.entity.spirit.SpiritItemEntity; +import com.sammy.malum.registry.common.item.ItemRegistry; +import net.minecraft.client.renderer.entity.EntityRenderers; +import net.minecraft.world.entity.EntityType; +import net.minecraft.world.entity.MobCategory; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.client.event.EntityRenderersEvent; +import net.minecraftforge.eventbus.api.SubscribeEvent; +import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.registries.DeferredRegister; +import net.minecraftforge.registries.ForgeRegistries; +import net.minecraftforge.registries.RegistryObject; +import team.lodestar.lodestone.systems.entity.LodestoneBoatEntity; -public class EntityRegistry -{ +public class EntityRegistry { public static final DeferredRegister> ENTITY_TYPES = DeferredRegister.create(ForgeRegistries.ENTITY_TYPES, MalumMod.MALUM); public static final RegistryObject> RUNEWOOD_BOAT = ENTITY_TYPES.register("runewood_boat", - () -> EntityType.Builder.of((t, w)->new LodestoneBoatEntity(t, w, ItemRegistry.RUNEWOOD_BOAT, ItemRegistry.RUNEWOOD_PLANKS), MobCategory.MISC).sized(1.375F, 0.5625F).clientTrackingRange(10) + () -> EntityType.Builder.of((t, w) -> new LodestoneBoatEntity(t, w, ItemRegistry.RUNEWOOD_BOAT, ItemRegistry.RUNEWOOD_PLANKS), MobCategory.MISC).sized(1.375F, 0.5625F).clientTrackingRange(10) .build(MalumMod.malumPath("runewood_boat").toString())); public static final RegistryObject> SOULWOOD_BOAT = ENTITY_TYPES.register("soulwood_boat", - () -> EntityType.Builder.of((t, w)->new LodestoneBoatEntity(t, w, ItemRegistry.SOULWOOD_BOAT, ItemRegistry.SOULWOOD_PLANKS), MobCategory.MISC).sized(1.375F, 0.5625F).clientTrackingRange(10) + () -> EntityType.Builder.of((t, w) -> new LodestoneBoatEntity(t, w, ItemRegistry.SOULWOOD_BOAT, ItemRegistry.SOULWOOD_PLANKS), MobCategory.MISC).sized(1.375F, 0.5625F).clientTrackingRange(10) .build(MalumMod.malumPath("soulwood_boat").toString())); public static final RegistryObject> NATURAL_SPIRIT = ENTITY_TYPES.register("natural_spirit", - () -> EntityType.Builder.of((e, w)->new SpiritItemEntity(w), MobCategory.MISC).sized(0.5F, 0.75F).clientTrackingRange(10) + () -> EntityType.Builder.of((e, w) -> new SpiritItemEntity(w), MobCategory.MISC).sized(0.5F, 0.75F).clientTrackingRange(10) .build(MalumMod.malumPath("natural_spirit").toString())); public static final RegistryObject> ETHERIC_NITRATE = ENTITY_TYPES.register("etheric_nitrate", - () -> EntityType.Builder.of((e, w)->new EthericNitrateEntity(w), MobCategory.MISC).sized(0.5F, 0.5F).clientTrackingRange(20) + () -> EntityType.Builder.of((e, w) -> new EthericNitrateEntity(w), MobCategory.MISC).sized(0.5F, 0.5F).clientTrackingRange(20) .build(MalumMod.malumPath("etheric_nitrate").toString())); public static final RegistryObject> VIVID_NITRATE = ENTITY_TYPES.register("vivid_nitrate", - () -> EntityType.Builder.of((e, w)->new VividNitrateEntity(w), MobCategory.MISC).sized(0.5F, 0.5F).clientTrackingRange(20) + () -> EntityType.Builder.of((e, w) -> new VividNitrateEntity(w), MobCategory.MISC).sized(0.5F, 0.5F).clientTrackingRange(20) .build(MalumMod.malumPath("vivid_nitrate").toString())); public static final RegistryObject> SCYTHE_BOOMERANG = ENTITY_TYPES.register("scythe_boomerang", - () -> EntityType.Builder.of((e,w)->new ScytheBoomerangEntity(w), MobCategory.MISC).sized(2.5F, 0.75F).clientTrackingRange(10) + () -> EntityType.Builder.of((e, w) -> new ScytheBoomerangEntity(w), MobCategory.MISC).sized(2.5F, 0.75F).clientTrackingRange(10) .build(MalumMod.malumPath("scythe_boomerang").toString())); public static final RegistryObject> NIGHT_TERROR = ENTITY_TYPES.register("night_terror", - () -> EntityType.Builder.of((e,w)->new NightTerrorSeekerEntity(w), MobCategory.MISC).sized(2F, 2F).clientTrackingRange(10) + () -> EntityType.Builder.of((e, w) -> new NightTerrorSeekerEntity(w), MobCategory.MISC).sized(2F, 2F).clientTrackingRange(10) .build(MalumMod.malumPath("night_terror").toString())); - @Mod.EventBusSubscriber(modid= MalumMod.MALUM, value= Dist.CLIENT, bus= Mod.EventBusSubscriber.Bus.MOD) + @Mod.EventBusSubscriber(modid = MalumMod.MALUM, value = Dist.CLIENT, bus = Mod.EventBusSubscriber.Bus.MOD) public static class ClientOnly { @SubscribeEvent public static void bindEntityRenderers(EntityRenderersEvent.RegisterRenderers event) { - EntityRenderers.register(EntityRegistry.RUNEWOOD_BOAT.get(), (manager) -> new MalumBoatRenderer(manager, "runewood")); - EntityRenderers.register(EntityRegistry.SOULWOOD_BOAT.get(), (manager) -> new MalumBoatRenderer(manager, "soulwood")); + EntityRenderers.register(EntityRegistry.RUNEWOOD_BOAT.get(), (manager) -> new MalumBoatRenderer(manager, "runewood", false));//TODO add hasChest true too + EntityRenderers.register(EntityRegistry.SOULWOOD_BOAT.get(), (manager) -> new MalumBoatRenderer(manager, "soulwood", false)); EntityRenderers.register(EntityRegistry.NATURAL_SPIRIT.get(), FloatingItemEntityRenderer::new); EntityRenderers.register(EntityRegistry.SCYTHE_BOOMERANG.get(), ScytheBoomerangEntityRenderer::new); diff --git a/src/main/java/com/sammy/malum/registry/common/item/ArmorSkinRegistry.java b/src/main/java/com/sammy/malum/registry/common/item/ArmorSkinRegistry.java index 6a2ff28f8..58b7be720 100644 --- a/src/main/java/com/sammy/malum/registry/common/item/ArmorSkinRegistry.java +++ b/src/main/java/com/sammy/malum/registry/common/item/ArmorSkinRegistry.java @@ -1,17 +1,24 @@ package com.sammy.malum.registry.common.item; -import com.sammy.malum.*; -import com.sammy.malum.common.item.cosmetic.skins.*; -import com.sammy.malum.common.item.cosmetic.skins.ancient.*; -import com.sammy.malum.common.item.cosmetic.skins.risk_of_rain.*; -import com.sammy.malum.common.item.curiosities.armor.*; -import net.minecraft.world.item.*; -import net.minecraftforge.data.loading.*; -import net.minecraftforge.eventbus.api.*; -import net.minecraftforge.fml.common.*; -import net.minecraftforge.fml.event.lifecycle.*; +import com.sammy.malum.MalumMod; +import com.sammy.malum.common.item.cosmetic.skins.ArmorSkin; +import com.sammy.malum.common.item.cosmetic.skins.PrideArmorSkin; +import com.sammy.malum.common.item.cosmetic.skins.UltrakillArmorSkin; +import com.sammy.malum.common.item.cosmetic.skins.ancient.AncientClothArmorSkin; +import com.sammy.malum.common.item.cosmetic.skins.ancient.AncientMetalArmorSkin; +import com.sammy.malum.common.item.cosmetic.skins.risk_of_rain.CommandoArmorSkin; +import com.sammy.malum.common.item.cosmetic.skins.risk_of_rain.ExecutionerArmorSkin; +import com.sammy.malum.common.item.curiosities.armor.MalumArmorItem; +import net.minecraft.world.item.Item; +import net.minecraftforge.data.loading.DatagenModLoader; +import net.minecraftforge.eventbus.api.SubscribeEvent; +import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent; +import net.minecraftforge.fml.event.lifecycle.InterModEnqueueEvent; -import java.util.*; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.Map; @Mod.EventBusSubscriber(modid = MalumMod.MALUM, bus = Mod.EventBusSubscriber.Bus.MOD) public class ArmorSkinRegistry { diff --git a/src/main/java/com/sammy/malum/registry/common/item/ArmorTiers.java b/src/main/java/com/sammy/malum/registry/common/item/ArmorTiers.java index 96a3f2cc0..0ba8dc9de 100644 --- a/src/main/java/com/sammy/malum/registry/common/item/ArmorTiers.java +++ b/src/main/java/com/sammy/malum/registry/common/item/ArmorTiers.java @@ -2,7 +2,6 @@ import net.minecraft.sounds.SoundEvent; import net.minecraft.sounds.SoundEvents; -import net.minecraft.world.entity.EquipmentSlot; import net.minecraft.world.item.ArmorItem; import net.minecraft.world.item.ArmorMaterial; import net.minecraft.world.item.Item; @@ -11,10 +10,8 @@ import javax.annotation.Nonnull; import java.util.function.Supplier; -public class ArmorTiers -{ - public enum ArmorTierEnum implements ArmorMaterial - { +public class ArmorTiers { + public enum ArmorTierEnum implements ArmorMaterial { SPIRIT_HUNTER("malum:spirit_hunter", 16, new int[]{1, 3, 4, 2}, 15, () -> SoundEvents.ARMOR_EQUIP_LEATHER, ItemRegistry.SPIRIT_FABRIC, 0), SOUL_STAINED_STEEL("malum:soul_stained_steel", 22, new int[]{2, 6, 7, 3}, 11, () -> SoundEvents.ARMOR_EQUIP_IRON, ItemRegistry.SOUL_STAINED_STEEL_INGOT, 2), SOUL_STAINED_STRONGHOLD("malum:soul_stained_stronghold", 36, new int[]{4, 7, 9, 5}, 13, () -> SoundEvents.ARMOR_EQUIP_IRON, ItemRegistry.SOUL_STAINED_STEEL_INGOT, 5); @@ -26,9 +23,8 @@ public enum ArmorTierEnum implements ArmorMaterial private final Supplier repairItem; private final float toughness; private static final int[] MAX_DAMAGE_ARRAY = new int[]{13, 15, 16, 11}; - - ArmorTierEnum(String name, int durabilityMultiplier, int[] damageReduction, int enchantability, Supplier equipSound, Supplier repairItem, float toughness) - { + + ArmorTierEnum(String name, int durabilityMultiplier, int[] damageReduction, int enchantability, Supplier equipSound, Supplier repairItem, float toughness) { this.name = name; this.durabilityMultiplier = durabilityMultiplier; this.damageReduction = damageReduction; @@ -37,59 +33,49 @@ public enum ArmorTierEnum implements ArmorMaterial this.repairItem = repairItem; this.toughness = toughness; } - + @Override - public int getDurabilityForType(ArmorItem.Type slot) - { + public int getDurabilityForType(ArmorItem.Type slot) { return durabilityMultiplier * MAX_DAMAGE_ARRAY[slot.getSlot().getIndex()]; } - + @Override - public int getDefenseForType(ArmorItem.Type slot) - { + public int getDefenseForType(ArmorItem.Type slot) { return damageReduction[slot.getSlot().getIndex()]; } - @Override - public int getEnchantmentValue() - { + public int getEnchantmentValue() { return enchantability; } - + @Nonnull @Override - public SoundEvent getEquipSound() - { + public SoundEvent getEquipSound() { return equipSound.get(); } - + @Nonnull @Override - public Ingredient getRepairIngredient() - { + public Ingredient getRepairIngredient() { return Ingredient.of(repairItem.get()); } - + @Nonnull @Override - public String getName() - { + public String getName() { return name; } - + @Override - public float getToughness() - { + public float getToughness() { return toughness; } - + @Override - public float getKnockbackResistance() - { - if (this.equals(SOUL_STAINED_STRONGHOLD)) - { + public float getKnockbackResistance() { + if (this.equals(SOUL_STAINED_STRONGHOLD)) { return 0.1f; } return 0; diff --git a/src/main/java/com/sammy/malum/registry/common/item/CurioRegistry.java b/src/main/java/com/sammy/malum/registry/common/item/CurioRegistry.java index 75507f290..217d7fe09 100644 --- a/src/main/java/com/sammy/malum/registry/common/item/CurioRegistry.java +++ b/src/main/java/com/sammy/malum/registry/common/item/CurioRegistry.java @@ -1,7 +1,8 @@ package com.sammy.malum.registry.common.item; import com.sammy.malum.MalumMod; -import com.sammy.malum.client.renderer.curio.*; +import com.sammy.malum.client.renderer.curio.TokenOfGratitudeRenderer; +import com.sammy.malum.client.renderer.curio.TopHatCurioRenderer; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.InterModComms; @@ -11,23 +12,20 @@ import top.theillusivec4.curios.api.SlotTypeMessage; import top.theillusivec4.curios.api.client.CuriosRendererRegistry; -@Mod.EventBusSubscriber(modid= MalumMod.MALUM, bus= Mod.EventBusSubscriber.Bus.MOD) -public class CurioRegistry -{ +@Mod.EventBusSubscriber(modid = MalumMod.MALUM, bus = Mod.EventBusSubscriber.Bus.MOD) +public class CurioRegistry { @SubscribeEvent - public static void registerCurios(InterModEnqueueEvent event) - { + public static void registerCurios(InterModEnqueueEvent event) { InterModComms.sendTo("curios", SlotTypeMessage.REGISTER_TYPE, () -> new SlotTypeMessage.Builder("necklace").size(1).cosmetic().build()); InterModComms.sendTo("curios", SlotTypeMessage.REGISTER_TYPE, () -> new SlotTypeMessage.Builder("ring").size(2).cosmetic().build()); InterModComms.sendTo("curios", SlotTypeMessage.REGISTER_TYPE, () -> new SlotTypeMessage.Builder("belt").size(1).cosmetic().build()); InterModComms.sendTo("curios", SlotTypeMessage.REGISTER_TYPE, () -> new SlotTypeMessage.Builder("charm").size(1).cosmetic().build()); } - @Mod.EventBusSubscriber(modid= MalumMod.MALUM, value = Dist.CLIENT, bus= Mod.EventBusSubscriber.Bus.MOD) - public static class ClientOnly - { + + @Mod.EventBusSubscriber(modid = MalumMod.MALUM, value = Dist.CLIENT, bus = Mod.EventBusSubscriber.Bus.MOD) + public static class ClientOnly { @SubscribeEvent - public static void registerCurioRenderers(FMLClientSetupEvent event) - { + public static void registerCurioRenderers(FMLClientSetupEvent event) { CuriosRendererRegistry.register(ItemRegistry.TOKEN_OF_GRATITUDE.get(), TokenOfGratitudeRenderer::new); CuriosRendererRegistry.register(ItemRegistry.TOPHAT.get(), TopHatCurioRenderer::new); } diff --git a/src/main/java/com/sammy/malum/registry/common/item/EnchantmentRegistry.java b/src/main/java/com/sammy/malum/registry/common/item/EnchantmentRegistry.java index 09ffba8f9..361452276 100644 --- a/src/main/java/com/sammy/malum/registry/common/item/EnchantmentRegistry.java +++ b/src/main/java/com/sammy/malum/registry/common/item/EnchantmentRegistry.java @@ -12,8 +12,7 @@ import net.minecraftforge.registries.ForgeRegistries; import net.minecraftforge.registries.RegistryObject; -public class EnchantmentRegistry -{ +public class EnchantmentRegistry { public static final DeferredRegister ENCHANTMENTS = DeferredRegister.create(ForgeRegistries.ENCHANTMENTS, MalumMod.MALUM); public static final EnchantmentCategory SOUL_HUNTER_WEAPON = EnchantmentCategory.create(MalumMod.MALUM + ":soul_hunter_only", i -> i.getDefaultInstance().is(ItemTagRegistry.SOUL_HUNTER_WEAPON)); @@ -23,5 +22,5 @@ public class EnchantmentRegistry public static final RegistryObject REBOUND = ENCHANTMENTS.register("rebound", ReboundEnchantment::new); public static final RegistryObject HAUNTED = ENCHANTMENTS.register("haunted", HauntedEnchantment::new); public static final RegistryObject SPIRIT_PLUNDER = ENCHANTMENTS.register("spirit_plunder", SpiritPlunderEnchantment::new); - + } diff --git a/src/main/java/com/sammy/malum/registry/common/item/ItemRegistry.java b/src/main/java/com/sammy/malum/registry/common/item/ItemRegistry.java index 16fa1f986..232127344 100644 --- a/src/main/java/com/sammy/malum/registry/common/item/ItemRegistry.java +++ b/src/main/java/com/sammy/malum/registry/common/item/ItemRegistry.java @@ -1,61 +1,104 @@ package com.sammy.malum.registry.common.item; -import com.sammy.malum.*; -import com.sammy.malum.common.block.curiosities.obelisk.*; -import com.sammy.malum.common.block.curiosities.spirit_crucible.*; -import com.sammy.malum.common.block.nature.*; -import com.sammy.malum.common.item.*; -import com.sammy.malum.common.item.cosmetic.curios.*; -import com.sammy.malum.common.item.cosmetic.skins.*; -import com.sammy.malum.common.item.cosmetic.weaves.*; -import com.sammy.malum.common.item.curiosities.*; -import com.sammy.malum.common.item.curiosities.armor.*; -import com.sammy.malum.common.item.curiosities.curios.*; -import com.sammy.malum.common.item.curiosities.curios.alchemical.*; -import com.sammy.malum.common.item.curiosities.curios.rotten.*; -import com.sammy.malum.common.item.curiosities.curios.misc.*; -import com.sammy.malum.common.item.curiosities.curios.prospector.*; -import com.sammy.malum.common.item.curiosities.curios.soulward.*; -import com.sammy.malum.common.item.curiosities.curios.spirit.*; -import com.sammy.malum.common.item.curiosities.curios.weeping.*; -import com.sammy.malum.common.item.curiosities.nitrate.*; -import com.sammy.malum.common.item.curiosities.weapons.*; -import com.sammy.malum.common.item.curiosities.weapons.unique.*; -import com.sammy.malum.common.item.ether.*; -import com.sammy.malum.common.item.food.*; -import com.sammy.malum.common.item.impetus.*; +import com.sammy.malum.MalumMod; +import com.sammy.malum.common.block.curiosities.obelisk.BrilliantObeliskBlockEntity; +import com.sammy.malum.common.block.curiosities.obelisk.RunewoodObeliskBlockEntity; +import com.sammy.malum.common.block.curiosities.spirit_crucible.SpiritCatalyzerCoreBlockEntity; +import com.sammy.malum.common.block.curiosities.spirit_crucible.SpiritCrucibleCoreBlockEntity; +import com.sammy.malum.common.block.nature.MalumLeavesBlock; +import com.sammy.malum.common.item.BrillianceChunkItem; +import com.sammy.malum.common.item.EncyclopediaArcanaItem; +import com.sammy.malum.common.item.cosmetic.curios.CurioTokenOfGratitude; +import com.sammy.malum.common.item.cosmetic.curios.CurioTopHat; +import com.sammy.malum.common.item.cosmetic.skins.ArmorSkin; +import com.sammy.malum.common.item.cosmetic.weaves.GenericWeaveItem; +import com.sammy.malum.common.item.cosmetic.weaves.PrideweaveItem; +import com.sammy.malum.common.item.curiosities.SoulStaveItem; +import com.sammy.malum.common.item.curiosities.SpiritPouchItem; +import com.sammy.malum.common.item.curiosities.armor.SoulHunterArmorItem; +import com.sammy.malum.common.item.curiosities.armor.SoulStainedSteelArmorItem; +import com.sammy.malum.common.item.curiosities.curios.CurioGildedBelt; +import com.sammy.malum.common.item.curiosities.curios.CurioGildedRing; +import com.sammy.malum.common.item.curiosities.curios.CurioOrnateNecklace; +import com.sammy.malum.common.item.curiosities.curios.CurioOrnateRing; +import com.sammy.malum.common.item.curiosities.curios.alchemical.CurioAlchemicalRing; +import com.sammy.malum.common.item.curiosities.curios.alchemical.CurioCurativeRing; +import com.sammy.malum.common.item.curiosities.curios.alchemical.CurioRingOfProwess; +import com.sammy.malum.common.item.curiosities.curios.misc.CurioHarmonyNecklace; +import com.sammy.malum.common.item.curiosities.curios.misc.CurioNarrowNecklace; +import com.sammy.malum.common.item.curiosities.curios.misc.CurioWaterNecklace; +import com.sammy.malum.common.item.curiosities.curios.prospector.CurioDemolitionistRing; +import com.sammy.malum.common.item.curiosities.curios.prospector.CurioHoarderRing; +import com.sammy.malum.common.item.curiosities.curios.prospector.CurioProspectorBelt; +import com.sammy.malum.common.item.curiosities.curios.rotten.CurioStarvedBelt; +import com.sammy.malum.common.item.curiosities.curios.rotten.CurioVoraciousRing; +import com.sammy.malum.common.item.curiosities.curios.soulward.CurioMagebaneBelt; +import com.sammy.malum.common.item.curiosities.curios.spirit.CurioArcaneSpoilRing; +import com.sammy.malum.common.item.curiosities.curios.spirit.CurioMirrorNecklace; +import com.sammy.malum.common.item.curiosities.curios.weeping.CurioGrowingFleshRing; +import com.sammy.malum.common.item.curiosities.curios.weeping.CurioGruesomeSatiationRing; +import com.sammy.malum.common.item.curiosities.curios.weeping.CurioHiddenBladeNecklace; +import com.sammy.malum.common.item.curiosities.curios.weeping.CurioWatcherNecklace; +import com.sammy.malum.common.item.curiosities.nitrate.EthericNitrateItem; +import com.sammy.malum.common.item.curiosities.nitrate.VividNitrateItem; +import com.sammy.malum.common.item.curiosities.weapons.MagicScytheItem; +import com.sammy.malum.common.item.curiosities.weapons.MalumScytheItem; +import com.sammy.malum.common.item.curiosities.weapons.unique.MephiticEdgeScytheItem; +import com.sammy.malum.common.item.curiosities.weapons.unique.TyrvingItem; +import com.sammy.malum.common.item.ether.AbstractEtherItem; +import com.sammy.malum.common.item.ether.EtherBrazierItem; +import com.sammy.malum.common.item.ether.EtherItem; +import com.sammy.malum.common.item.ether.EtherTorchItem; +import com.sammy.malum.common.item.food.HolyCaramelItem; +import com.sammy.malum.common.item.food.HolySyrupItem; +import com.sammy.malum.common.item.food.UnholySyrupItem; +import com.sammy.malum.common.item.impetus.CrackedImpetusItem; +import com.sammy.malum.common.item.impetus.ImpetusItem; +import com.sammy.malum.common.item.impetus.NodeItem; import com.sammy.malum.common.item.spirit.*; -import com.sammy.malum.compability.farmersdelight.*; -import com.sammy.malum.registry.common.*; -import com.sammy.malum.registry.common.block.*; -import com.sammy.malum.registry.common.entity.*; -import com.sammy.malum.registry.common.item.tabs.*; -import net.minecraft.client.color.item.*; -import net.minecraft.client.renderer.item.*; -import net.minecraft.nbt.*; -import net.minecraft.resources.*; -import net.minecraft.world.effect.*; -import net.minecraft.world.entity.*; -import net.minecraft.world.food.*; +import com.sammy.malum.compability.farmersdelight.FarmersDelightCompat; +import com.sammy.malum.registry.common.SpiritTypeRegistry; +import com.sammy.malum.registry.common.block.BlockRegistry; +import com.sammy.malum.registry.common.entity.EntityRegistry; +import net.minecraft.client.color.item.ItemColors; +import net.minecraft.client.renderer.item.ItemProperties; +import net.minecraft.client.renderer.item.ItemPropertyFunction; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.effect.MobEffectInstance; +import net.minecraft.world.effect.MobEffects; +import net.minecraft.world.food.FoodProperties; import net.minecraft.world.item.*; -import net.minecraft.world.level.block.*; -import net.minecraftforge.api.distmarker.*; -import net.minecraftforge.client.event.*; -import net.minecraftforge.eventbus.api.*; -import net.minecraftforge.fml.common.*; -import net.minecraftforge.fml.event.lifecycle.*; -import net.minecraftforge.registries.*; -import team.lodestar.lodestone.helpers.*; -import team.lodestar.lodestone.systems.item.*; +import net.minecraft.world.level.block.ComposterBlock; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.client.event.RegisterColorHandlersEvent; +import net.minecraftforge.eventbus.api.EventPriority; +import net.minecraftforge.eventbus.api.SubscribeEvent; +import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent; +import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent; +import net.minecraftforge.registries.DeferredRegister; +import net.minecraftforge.registries.ForgeRegistries; +import net.minecraftforge.registries.RegistryObject; +import team.lodestar.lodestone.helpers.ColorHelper; +import team.lodestar.lodestone.helpers.DataHelper; +import team.lodestar.lodestone.systems.item.LodestoneArmorItem; +import team.lodestar.lodestone.systems.item.LodestoneBoatItem; +import team.lodestar.lodestone.systems.item.LodestoneFuelBlockItem; +import team.lodestar.lodestone.systems.item.LodestoneFuelItem; import team.lodestar.lodestone.systems.item.tools.magic.*; -import team.lodestar.lodestone.systems.multiblock.*; - -import java.util.*; -import java.util.stream.*; - -import static com.sammy.malum.MalumMod.*; -import static com.sammy.malum.registry.common.item.ItemTiers.ItemTierEnum.*; -import static net.minecraft.world.item.Items.*; +import team.lodestar.lodestone.systems.multiblock.MultiBlockItem; + +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Set; +import java.util.stream.Collectors; + +import static com.sammy.malum.MalumMod.MALUM; +import static com.sammy.malum.registry.common.item.ItemTiers.ItemTierEnum.SOUL_STAINED_STEEL; +import static com.sammy.malum.registry.common.item.ItemTiers.ItemTierEnum.VOID; +import static net.minecraft.world.item.Items.GLASS_BOTTLE; import static net.minecraft.world.item.Rarity.UNCOMMON; @SuppressWarnings("unused") diff --git a/src/main/java/com/sammy/malum/registry/common/item/ItemTagRegistry.java b/src/main/java/com/sammy/malum/registry/common/item/ItemTagRegistry.java index cbdad8770..d3bfc1366 100644 --- a/src/main/java/com/sammy/malum/registry/common/item/ItemTagRegistry.java +++ b/src/main/java/com/sammy/malum/registry/common/item/ItemTagRegistry.java @@ -1,7 +1,6 @@ package com.sammy.malum.registry.common.item; import com.sammy.malum.MalumMod; -import net.minecraft.core.Registry; import net.minecraft.resources.ResourceLocation; import net.minecraft.tags.ItemTags; import net.minecraft.tags.TagKey; diff --git a/src/main/java/com/sammy/malum/registry/common/item/ItemTiers.java b/src/main/java/com/sammy/malum/registry/common/item/ItemTiers.java index cbef01c00..5d782f5a2 100644 --- a/src/main/java/com/sammy/malum/registry/common/item/ItemTiers.java +++ b/src/main/java/com/sammy/malum/registry/common/item/ItemTiers.java @@ -6,10 +6,8 @@ import java.util.function.Supplier; -public class ItemTiers -{ - public enum ItemTierEnum implements Tier - { +public class ItemTiers { + public enum ItemTierEnum implements Tier { SOUL_STAINED_STEEL(1250, 7.5f, 2.5f, 3, 16, ItemRegistry.SOUL_STAINED_STEEL_INGOT), TYRVING(850, 8f, 1f, 3, 12, ItemRegistry.TWISTED_ROCK), VOID(1750, 8f, 6f, 4, 14, ItemRegistry.TWISTED_ROCK); //TODO: NOT TWISTED ROCK !!! @@ -19,9 +17,8 @@ public enum ItemTierEnum implements Tier private final int harvestLevel; private final int enchantability; private final Supplier repairItem; - - ItemTierEnum(int maxUses, float efficiency, float attackDamage, int harvestLevel, int enchantability, Supplier repairItem) - { + + ItemTierEnum(int maxUses, float efficiency, float attackDamage, int harvestLevel, int enchantability, Supplier repairItem) { this.maxUses = maxUses; this.efficiency = efficiency; this.attackDamage = attackDamage; @@ -29,40 +26,34 @@ public enum ItemTierEnum implements Tier this.enchantability = enchantability; this.repairItem = repairItem; } - + @Override - public int getUses() - { + public int getUses() { return maxUses; } - + @Override - public float getSpeed() - { + public float getSpeed() { return efficiency; } - + @Override - public float getAttackDamageBonus() - { + public float getAttackDamageBonus() { return attackDamage; } - + @Override - public int getLevel() - { + public int getLevel() { return harvestLevel; } - + @Override - public int getEnchantmentValue() - { + public int getEnchantmentValue() { return enchantability; } - + @Override - public Ingredient getRepairIngredient() - { + public Ingredient getRepairIngredient() { return Ingredient.of(repairItem.get()); } } diff --git a/src/main/java/com/sammy/malum/registry/common/item/tabs/CreativeTabRegistry.java b/src/main/java/com/sammy/malum/registry/common/item/tabs/CreativeTabRegistry.java index aecf41ee0..cd2bc14c2 100644 --- a/src/main/java/com/sammy/malum/registry/common/item/tabs/CreativeTabRegistry.java +++ b/src/main/java/com/sammy/malum/registry/common/item/tabs/CreativeTabRegistry.java @@ -1,132 +1,63 @@ package com.sammy.malum.registry.common.item.tabs; import com.sammy.malum.MalumMod; -import com.sammy.malum.common.item.BrillianceChunkItem; -import com.sammy.malum.common.item.cosmetic.curios.CurioTokenOfGratitude; -import com.sammy.malum.common.item.cosmetic.curios.CurioTopHat; -import com.sammy.malum.common.item.cosmetic.weaves.GenericWeaveItem; -import com.sammy.malum.common.item.cosmetic.weaves.PrideweaveItem; -import com.sammy.malum.common.item.curiosities.SoulStaveItem; -import com.sammy.malum.common.item.curiosities.SpiritPouchItem; -import com.sammy.malum.common.item.curiosities.armor.SoulHunterArmorItem; -import com.sammy.malum.common.item.curiosities.armor.SoulStainedSteelArmorItem; -import com.sammy.malum.common.item.curiosities.curios.CurioGildedBelt; -import com.sammy.malum.common.item.curiosities.curios.CurioGildedRing; -import com.sammy.malum.common.item.curiosities.curios.CurioOrnateNecklace; -import com.sammy.malum.common.item.curiosities.curios.CurioOrnateRing; -import com.sammy.malum.common.item.curiosities.curios.alchemical.CurioAlchemicalRing; -import com.sammy.malum.common.item.curiosities.curios.alchemical.CurioCurativeRing; -import com.sammy.malum.common.item.curiosities.curios.alchemical.CurioRingOfProwess; -import com.sammy.malum.common.item.curiosities.curios.misc.CurioHarmonyNecklace; -import com.sammy.malum.common.item.curiosities.curios.misc.CurioNarrowNecklace; -import com.sammy.malum.common.item.curiosities.curios.misc.CurioWaterNecklace; -import com.sammy.malum.common.item.curiosities.curios.prospector.CurioDemolitionistRing; -import com.sammy.malum.common.item.curiosities.curios.prospector.CurioHoarderRing; -import com.sammy.malum.common.item.curiosities.curios.prospector.CurioProspectorBelt; -import com.sammy.malum.common.item.curiosities.curios.rotten.CurioStarvedBelt; -import com.sammy.malum.common.item.curiosities.curios.rotten.CurioVoraciousRing; -import com.sammy.malum.common.item.curiosities.curios.soulward.CurioMagebaneBelt; -import com.sammy.malum.common.item.curiosities.curios.spirit.CurioArcaneSpoilRing; -import com.sammy.malum.common.item.curiosities.curios.spirit.CurioMirrorNecklace; -import com.sammy.malum.common.item.curiosities.curios.weeping.CurioGrowingFleshRing; -import com.sammy.malum.common.item.curiosities.curios.weeping.CurioGruesomeSatiationRing; -import com.sammy.malum.common.item.curiosities.curios.weeping.CurioHiddenBladeNecklace; -import com.sammy.malum.common.item.curiosities.curios.weeping.CurioWatcherNecklace; -import com.sammy.malum.common.item.curiosities.nitrate.EthericNitrateItem; -import com.sammy.malum.common.item.curiosities.nitrate.VividNitrateItem; -import com.sammy.malum.common.item.curiosities.weapons.MagicScytheItem; -import com.sammy.malum.common.item.curiosities.weapons.MalumScytheItem; -import com.sammy.malum.common.item.curiosities.weapons.unique.MephiticEdgeScytheItem; -import com.sammy.malum.common.item.curiosities.weapons.unique.TyrvingItem; -import com.sammy.malum.common.item.ether.EtherBrazierItem; -import com.sammy.malum.common.item.ether.EtherItem; -import com.sammy.malum.common.item.ether.EtherTorchItem; -import com.sammy.malum.common.item.food.HolyCaramelItem; -import com.sammy.malum.common.item.food.HolySyrupItem; -import com.sammy.malum.common.item.impetus.CrackedImpetusItem; -import com.sammy.malum.common.item.impetus.ImpetusItem; -import com.sammy.malum.common.item.impetus.NodeItem; -import com.sammy.malum.common.item.spirit.FusedConsciousnessItem; -import com.sammy.malum.common.item.spirit.SpiritShardItem; -import com.sammy.malum.compability.farmersdelight.FarmersDelightCompat; -import com.sammy.malum.registry.common.SpiritTypeRegistry; -import com.sammy.malum.registry.common.block.BlockRegistry; -import com.sammy.malum.registry.common.entity.EntityRegistry; -import com.sammy.malum.registry.common.item.*; +import com.sammy.malum.registry.common.item.ItemRegistry; import net.minecraft.core.registries.Registries; import net.minecraft.network.chat.Component; -import net.minecraft.world.effect.MobEffectInstance; -import net.minecraft.world.effect.MobEffects; -import net.minecraft.world.food.FoodProperties; -import net.minecraft.world.item.*; +import net.minecraft.world.item.CreativeModeTab; import net.minecraftforge.event.BuildCreativeModeTabContentsEvent; import net.minecraftforge.registries.DeferredRegister; import net.minecraftforge.registries.RegistryObject; -import team.lodestar.lodestone.systems.item.LodestoneBoatItem; -import team.lodestar.lodestone.systems.item.LodestoneFuelBlockItem; -import team.lodestar.lodestone.systems.item.LodestoneFuelItem; -import team.lodestar.lodestone.systems.item.tools.magic.*; import static com.sammy.malum.registry.common.item.ItemRegistry.*; -import static com.sammy.malum.registry.common.item.ItemTiers.ItemTierEnum.SOUL_STAINED_STEEL; -import static com.sammy.malum.registry.common.item.ItemTiers.ItemTierEnum.VOID; -import static net.minecraft.world.item.Items.GLASS_BOTTLE; -import static net.minecraft.world.item.Rarity.UNCOMMON; public class CreativeTabRegistry { public static final DeferredRegister CREATIVE_MODE_TABS = DeferredRegister.create(Registries.CREATIVE_MODE_TAB, MalumMod.MALUM); - public static final RegistryObject CONTENT = CREATIVE_MODE_TABS.register(MalumMod.MALUM, + public static final RegistryObject CONTENT = CREATIVE_MODE_TABS.register(MalumMod.MALUM + ".content", () -> CreativeModeTab.builder() - .title(Component.translatable("itemGroup." + MalumMod.MALUM + ".basis_of_magic")) + .title(Component.translatable("itemGroup." + MalumMod.MALUM + "_basis_of_magic")) .icon(() -> ItemRegistry.SPIRIT_ALTAR.get().getDefaultInstance()) .displayItems((parameters, output) -> output.accept(ItemRegistry.SPIRIT_ALTAR.get())).build() ); - public static final RegistryObject BUILDING = CREATIVE_MODE_TABS.register(MalumMod.MALUM, + public static final RegistryObject BUILDING = CREATIVE_MODE_TABS.register(MalumMod.MALUM + ".building", () -> CreativeModeTab.builder() - .title(Component.translatable("itemGroup." + MalumMod.MALUM + ".arcane_construct")) + .title(Component.translatable("itemGroup." + MalumMod.MALUM + "_arcane_construct")) .icon(() -> ItemRegistry.TAINTED_ROCK.get().getDefaultInstance()) .displayItems((parameters, output) -> output.accept(ItemRegistry.TAINTED_ROCK.get())).build() ); - public static final RegistryObject NATURE = CREATIVE_MODE_TABS.register(MalumMod.MALUM, + public static final RegistryObject NATURE = CREATIVE_MODE_TABS.register(MalumMod.MALUM + ".nature", () -> CreativeModeTab.builder() - .title(Component.translatable("itemGroup." + MalumMod.MALUM + ".natural_wonders")) + .title(Component.translatable("itemGroup." + MalumMod.MALUM + "_natural_wonders")) .icon(() -> ItemRegistry.RUNEWOOD_SAPLING.get().getDefaultInstance()) .displayItems((parameters, output) -> output.accept(ItemRegistry.RUNEWOOD_SAPLING.get())).build() ); - public static final RegistryObject METALLURGY = CREATIVE_MODE_TABS.register(MalumMod.MALUM, + public static final RegistryObject METALLURGY = CREATIVE_MODE_TABS.register(MalumMod.MALUM + ".metallurgy", () -> CreativeModeTab.builder() - .title(Component.translatable("itemGroup." + MalumMod.MALUM + ".metallurgic_magics")) + .title(Component.translatable("itemGroup." + MalumMod.MALUM + "_metallurgic_magics")) .icon(() -> ItemRegistry.ALCHEMICAL_IMPETUS.get().getDefaultInstance()) .displayItems((parameters, output) -> output.accept(ItemRegistry.ALCHEMICAL_IMPETUS.get())).build() ); - public static final RegistryObject VOID = CREATIVE_MODE_TABS.register(MalumMod.MALUM, + public static final RegistryObject VOID = CREATIVE_MODE_TABS.register(MalumMod.MALUM + ".void", () -> CreativeModeTab.builder() - .title(Component.translatable("itemGroup." + MalumMod.MALUM + ".void_chronicles")) + .title(Component.translatable("itemGroup." + MalumMod.MALUM + "_void_chronicles")) .icon(() -> ItemRegistry.STRANGE_NUCLEUS.get().getDefaultInstance()) .displayItems((parameters, output) -> output.accept(ItemRegistry.STRANGE_NUCLEUS.get())).build() ); - public static final RegistryObject COSMETIC = CREATIVE_MODE_TABS.register(MalumMod.MALUM, + public static final RegistryObject COSMETIC = CREATIVE_MODE_TABS.register(MalumMod.MALUM + ".cosmetic", () -> CreativeModeTab.builder() - .title(Component.translatable("itemGroup." + MalumMod.MALUM + ".cosmetics")) + .title(Component.translatable("itemGroup." + MalumMod.MALUM + "_cosmetics")) .icon(() -> ItemRegistry.WEAVERS_WORKBENCH.get().getDefaultInstance()) .displayItems((parameters, output) -> output.accept(ItemRegistry.WEAVERS_WORKBENCH.get())).build() ); - //public static final MalumTab CONTENT = new MalumTab("basis_of_magic", ItemRegistry.SPIRIT_ALTAR); - //public static final MalumTab BUILDING = new MalumTab("arcane_construct", ItemRegistry.TAINTED_ROCK); - //public static final MalumTab NATURE = new MalumTab("natural_wonders", ItemRegistry.RUNEWOOD_SAPLING); - //public static final MalumTab METALLURGY = new MalumTab("metallurgic_magics", ItemRegistry.ALCHEMICAL_IMPETUS); - //public static final MalumTab VOID = new MalumTab("void_chronicles", ItemRegistry.STRANGE_NUCLEUS); - //public static final MalumTab COSMETIC = new MalumTab("cosmetics", ItemRegistry.WEAVERS_WORKBENCH); - - public static void populateItemGroups(BuildCreativeModeTabContentsEvent event){ + public static void populateItemGroups(BuildCreativeModeTabContentsEvent event) { if (event.getTabKey() == CONTENT.getKey()) { event.accept(SACRED_SPIRIT); event.accept(WICKED_SPIRIT); @@ -164,7 +95,7 @@ public static void populateItemGroups(BuildCreativeModeTabContentsEvent event){ event.accept(BLOCK_OF_RAW_SOULSTONE); event.accept(PROCESSED_SOULSTONE); event.accept(BLOCK_OF_SOULSTONE); - + event.accept(ETHER); event.accept(ETHER_TORCH); event.accept(TAINTED_ETHER_BRAZIER); @@ -265,9 +196,9 @@ public static void populateItemGroups(BuildCreativeModeTabContentsEvent event){ event.accept(TWISTED_ROCK_TILES_SLAB); event.accept(SMALL_TWISTED_ROCK_BRICKS_SLAB); event.accept(RUNIC_TWISTED_ROCK_BRICKS_SLAB); - event.accept(RUNIC_TWISTED_ROCK_TILES_SLAB ); + event.accept(RUNIC_TWISTED_ROCK_TILES_SLAB); event.accept(RUNIC_SMALL_TWISTED_ROCK_BRICKS_SLAB); - + event.accept(TWISTED_ROCK_STAIRS); event.accept(SMOOTH_TWISTED_ROCK_STAIRS); event.accept(POLISHED_TWISTED_ROCK_STAIRS); @@ -277,18 +208,18 @@ public static void populateItemGroups(BuildCreativeModeTabContentsEvent event){ event.accept(RUNIC_TWISTED_ROCK_BRICKS_STAIRS); event.accept(RUNIC_TWISTED_ROCK_TILES_STAIRS); event.accept(RUNIC_SMALL_TWISTED_ROCK_BRICKS_STAIRS); - + event.accept(TWISTED_ROCK_ITEM_STAND); event.accept(TWISTED_ROCK_ITEM_PEDESTAL); //endregion twisted rock } - - if(event.getTabKey() == NATURE.getKey()) { + + if (event.getTabKey() == NATURE.getKey()) { //region runewood event.accept(HOLY_SAP); event.accept(HOLY_SAPBALL); event.accept(HOLY_SYRUP); - + event.accept(RUNEWOOD_LEAVES); event.accept(RUNEWOOD_SAPLING); @@ -346,7 +277,7 @@ public static void populateItemGroups(BuildCreativeModeTabContentsEvent event){ //endregion } - if (event.getTabKey() == METALLURGY.getKey()) {//TODO separate NODE and IMPEDUS + if (event.getTabKey() == METALLURGY.getKey()) { event.accept(CRACKED_IRON_IMPETUS); event.accept(IRON_IMPETUS); event.accept(IRON_NODE); @@ -355,7 +286,7 @@ public static void populateItemGroups(BuildCreativeModeTabContentsEvent event){ event.accept(COPPER_NODE); event.accept(CRACKED_GOLD_IMPETUS); event.accept(GOLD_IMPETUS); - event.accept(GOLD_NODE ); + event.accept(GOLD_NODE); event.accept(CRACKED_LEAD_IMPETUS); event.accept(LEAD_IMPETUS); event.accept(LEAD_NODE); @@ -384,8 +315,9 @@ public static void populateItemGroups(BuildCreativeModeTabContentsEvent event){ event.accept(CRACKED_ALCHEMICAL_IMPETUS); event.accept(ALCHEMICAL_IMPETUS); } - + if (event.getTabKey() == CONTENT.getKey()) { + event.accept(ENCYCLOPEDIA_ARCANA); event.accept(SPIRIT_POUCH); event.accept(CRUDE_SCYTHE); event.accept(SOUL_STAINED_STEEL_SCYTHE); @@ -395,7 +327,7 @@ public static void populateItemGroups(BuildCreativeModeTabContentsEvent event){ event.accept(SOUL_STAINED_STEEL_AXE); event.accept(SOUL_STAINED_STEEL_SHOVEL); event.accept(SOUL_STAINED_STEEL_HOE); - + event.accept(SOUL_STAINED_STEEL_HELMET); event.accept(SOUL_STAINED_STEEL_CHESTPLATE); @@ -413,28 +345,28 @@ public static void populateItemGroups(BuildCreativeModeTabContentsEvent event){ event.accept(VIVID_NITRATE); event.accept(GILDED_RING); - event.accept(GILDED_BELT ); - event.accept(ORNATE_RING ); + event.accept(GILDED_BELT); + event.accept(ORNATE_RING); event.accept(ORNATE_NECKLACE); - event.accept(RING_OF_ESOTERIC_SPOILS ); + event.accept(RING_OF_ESOTERIC_SPOILS); event.accept(RING_OF_CURATIVE_TALENT); - event.accept(RING_OF_ARCANE_PROWESS ); - event.accept(RING_OF_ALCHEMICAL_MASTERY ); + event.accept(RING_OF_ARCANE_PROWESS); + event.accept(RING_OF_ALCHEMICAL_MASTERY); event.accept(RING_OF_DESPERATE_VORACITY); - event.accept(RING_OF_THE_HOARDER ); - event.accept(RING_OF_THE_DEMOLITIONIST ); + event.accept(RING_OF_THE_HOARDER); + event.accept(RING_OF_THE_DEMOLITIONIST); event.accept(NECKLACE_OF_THE_MYSTIC_MIRROR); event.accept(NECKLACE_OF_TIDAL_AFFINITY); - event.accept(NECKLACE_OF_THE_NARROW_EDGE ); + event.accept(NECKLACE_OF_THE_NARROW_EDGE); event.accept(NECKLACE_OF_BLISSFUL_HARMONY); event.accept(BELT_OF_THE_STARVED); - event.accept(BELT_OF_THE_PROSPECTOR ); - event.accept(BELT_OF_THE_MAGEBANE ); + event.accept(BELT_OF_THE_PROSPECTOR); + event.accept(BELT_OF_THE_MAGEBANE); } - + if (event.getTabKey() == COSMETIC.getKey()) { //region cosmetics event.accept(ESOTERIC_SPOOL); @@ -465,25 +397,25 @@ public static void populateItemGroups(BuildCreativeModeTabContentsEvent event){ event.accept(TOPHAT); } - + if (event.getTabKey() == VOID.getKey()) { event.accept(VOID_SALTS); event.accept(NULL_SLATE); event.accept(STRANGE_NUCLEUS); - event.accept(CRYSTALLIZED_NIHILITY ); + event.accept(CRYSTALLIZED_NIHILITY); event.accept(ANOMALOUS_SNARE); event.accept(FUSED_CONSCIOUSNESS); } - + if (event.getTabKey() == VOID.getKey()) { - event.accept(RING_OF_GROWING_FLESH ); + event.accept(RING_OF_GROWING_FLESH); event.accept(RING_OF_GRUESOME_SATIATION); event.accept(NECKLACE_OF_THE_HIDDEN_BLADE); event.accept(NECKLACE_OF_THE_WATCHER); } - + if (false) { event.accept(MEPHITIC_EDGE); event.accept(SOUL_STAINED_STEEL_KNIFE); diff --git a/src/main/java/com/sammy/malum/registry/common/recipe/RecipeSerializerRegistry.java b/src/main/java/com/sammy/malum/registry/common/recipe/RecipeSerializerRegistry.java index 4d53b7aef..7bddf99b8 100644 --- a/src/main/java/com/sammy/malum/registry/common/recipe/RecipeSerializerRegistry.java +++ b/src/main/java/com/sammy/malum/registry/common/recipe/RecipeSerializerRegistry.java @@ -5,11 +5,7 @@ import com.sammy.malum.common.recipe.vanilla.MetalNodeBlastingRecipe; import com.sammy.malum.common.recipe.vanilla.MetalNodeSmeltingRecipe; import com.sammy.malum.common.recipe.vanilla.NodeCookingSerializer; -import net.minecraft.core.Registry; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.item.crafting.Recipe; import net.minecraft.world.item.crafting.RecipeSerializer; -import net.minecraft.world.item.crafting.RecipeType; import net.minecraftforge.registries.DeferredRegister; import net.minecraftforge.registries.ForgeRegistries; import net.minecraftforge.registries.RegistryObject; @@ -18,8 +14,8 @@ public class RecipeSerializerRegistry { public static final DeferredRegister> RECIPE_SERIALIZERS = DeferredRegister.create(ForgeRegistries.RECIPE_SERIALIZERS, MalumMod.MALUM); - public static final RegistryObject> METAL_NODE_BLASTING_SERIALIZER = RECIPE_SERIALIZERS.register(MetalNodeBlastingRecipe.NAME, ()->new NodeCookingSerializer<>(MetalNodeBlastingRecipe::new, 100)); - public static final RegistryObject> METAL_NODE_SMELTING_SERIALIZER = RECIPE_SERIALIZERS.register(MetalNodeSmeltingRecipe.NAME, ()->new NodeCookingSerializer<>(MetalNodeSmeltingRecipe::new, 200)); + public static final RegistryObject> METAL_NODE_BLASTING_SERIALIZER = RECIPE_SERIALIZERS.register(MetalNodeBlastingRecipe.NAME, () -> new NodeCookingSerializer<>(MetalNodeBlastingRecipe::new, 100)); + public static final RegistryObject> METAL_NODE_SMELTING_SERIALIZER = RECIPE_SERIALIZERS.register(MetalNodeSmeltingRecipe.NAME, () -> new NodeCookingSerializer<>(MetalNodeSmeltingRecipe::new, 200)); public static final RegistryObject> INFUSION_RECIPE_SERIALIZER = RECIPE_SERIALIZERS.register(SpiritInfusionRecipe.NAME, SpiritInfusionRecipe.Serializer::new); public static final RegistryObject> VOID_FAVOR_RECIPE_SERIALIZER = RECIPE_SERIALIZERS.register(FavorOfTheVoidRecipe.NAME, FavorOfTheVoidRecipe.Serializer::new); diff --git a/src/main/java/com/sammy/malum/registry/common/recipe/RecipeTypeRegistry.java b/src/main/java/com/sammy/malum/registry/common/recipe/RecipeTypeRegistry.java index e75a93c68..442f4d67c 100644 --- a/src/main/java/com/sammy/malum/registry/common/recipe/RecipeTypeRegistry.java +++ b/src/main/java/com/sammy/malum/registry/common/recipe/RecipeTypeRegistry.java @@ -1,29 +1,28 @@ - package com.sammy.malum.registry.common.recipe; +package com.sammy.malum.registry.common.recipe; import com.sammy.malum.MalumMod; import com.sammy.malum.common.recipe.*; -import net.minecraft.core.Registry; import net.minecraft.world.item.crafting.Recipe; import net.minecraft.world.item.crafting.RecipeType; import net.minecraftforge.registries.DeferredRegister; import net.minecraftforge.registries.ForgeRegistries; import net.minecraftforge.registries.RegistryObject; - public class RecipeTypeRegistry { +public class RecipeTypeRegistry { - public static final DeferredRegister> RECIPE_TYPES = DeferredRegister.create(ForgeRegistries.RECIPE_TYPES.getRegistryKey(), MalumMod.MALUM); + public static final DeferredRegister> RECIPE_TYPES = DeferredRegister.create(ForgeRegistries.RECIPE_TYPES.getRegistryKey(), MalumMod.MALUM); - public static final RegistryObject> VOID_FAVOR = RECIPE_TYPES.register(FavorOfTheVoidRecipe.NAME, () -> registerRecipeType(FavorOfTheVoidRecipe.NAME)); - public static final RegistryObject> SPIRIT_INFUSION = RECIPE_TYPES.register(SpiritInfusionRecipe.NAME, () -> registerRecipeType(SpiritInfusionRecipe.NAME)); - public static final RegistryObject> SPIRIT_FOCUSING = RECIPE_TYPES.register(SpiritFocusingRecipe.NAME, () -> registerRecipeType(SpiritFocusingRecipe.NAME)); - public static final RegistryObject> SPIRIT_TRANSMUTATION = RECIPE_TYPES.register(SpiritTransmutationRecipe.NAME, () -> registerRecipeType(SpiritTransmutationRecipe.NAME)); - public static final RegistryObject> SPIRIT_REPAIR = RECIPE_TYPES.register(SpiritRepairRecipe.NAME, () -> registerRecipeType(SpiritRepairRecipe.NAME)); + public static final RegistryObject> VOID_FAVOR = RECIPE_TYPES.register(FavorOfTheVoidRecipe.NAME, () -> registerRecipeType(FavorOfTheVoidRecipe.NAME)); + public static final RegistryObject> SPIRIT_INFUSION = RECIPE_TYPES.register(SpiritInfusionRecipe.NAME, () -> registerRecipeType(SpiritInfusionRecipe.NAME)); + public static final RegistryObject> SPIRIT_FOCUSING = RECIPE_TYPES.register(SpiritFocusingRecipe.NAME, () -> registerRecipeType(SpiritFocusingRecipe.NAME)); + public static final RegistryObject> SPIRIT_TRANSMUTATION = RECIPE_TYPES.register(SpiritTransmutationRecipe.NAME, () -> registerRecipeType(SpiritTransmutationRecipe.NAME)); + public static final RegistryObject> SPIRIT_REPAIR = RECIPE_TYPES.register(SpiritRepairRecipe.NAME, () -> registerRecipeType(SpiritRepairRecipe.NAME)); - public static > RecipeType registerRecipeType(final String identifier) { - return new RecipeType<>() { - public String toString() { - return MalumMod.MALUM + ":" + identifier; - } - }; - } - } \ No newline at end of file + public static > RecipeType registerRecipeType(final String identifier) { + return new RecipeType<>() { + public String toString() { + return MalumMod.MALUM + ":" + identifier; + } + }; + } +} \ No newline at end of file diff --git a/src/main/java/com/sammy/malum/registry/common/worldgen/BiomeTagRegistry.java b/src/main/java/com/sammy/malum/registry/common/worldgen/BiomeTagRegistry.java new file mode 100644 index 000000000..04f24100d --- /dev/null +++ b/src/main/java/com/sammy/malum/registry/common/worldgen/BiomeTagRegistry.java @@ -0,0 +1,13 @@ +package com.sammy.malum.registry.common.worldgen; + +import com.sammy.malum.MalumMod; +import net.minecraft.core.registries.Registries; +import net.minecraft.tags.TagKey; +import net.minecraft.world.level.biome.Biome; + +public class BiomeTagRegistry { + public static final TagKey HAS_SOULSTONE = TagKey.create(Registries.BIOME, MalumMod.malumPath("has_soulstone")); + public static final TagKey HAS_BRILLIANT = TagKey.create(Registries.BIOME, MalumMod.malumPath("has_brilliant")); + public static final TagKey HAS_BLAZING_QUARTZ = TagKey.create(Registries.BIOME, MalumMod.malumPath("has_blazing_quartz")); + public static final TagKey HAS_RUNEWOOD = TagKey.create(Registries.BIOME, MalumMod.malumPath("has_runewood")); +} diff --git a/src/main/java/com/sammy/malum/registry/common/worldgen/ConfiguredFeatureRegistry.java b/src/main/java/com/sammy/malum/registry/common/worldgen/ConfiguredFeatureRegistry.java new file mode 100644 index 000000000..b6277d74a --- /dev/null +++ b/src/main/java/com/sammy/malum/registry/common/worldgen/ConfiguredFeatureRegistry.java @@ -0,0 +1,65 @@ +package com.sammy.malum.registry.common.worldgen; + +import com.sammy.malum.MalumMod; +import com.sammy.malum.common.worldgen.RunewoodTreeFeature; +import com.sammy.malum.registry.common.block.BlockRegistry; +import net.minecraft.core.Holder; +import net.minecraft.core.HolderGetter; +import net.minecraft.core.registries.Registries; +import net.minecraft.data.worldgen.BootstapContext; +import net.minecraft.data.worldgen.features.FeatureUtils; +import net.minecraft.resources.ResourceKey; +import net.minecraft.tags.BlockTags; +import net.minecraft.world.level.levelgen.feature.ConfiguredFeature; +import net.minecraft.world.level.levelgen.feature.Feature; +import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration; +import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration; +import net.minecraft.world.level.levelgen.feature.configurations.OreConfiguration; +import net.minecraft.world.level.levelgen.feature.configurations.RandomFeatureConfiguration; +import net.minecraft.world.level.levelgen.structure.templatesystem.RuleTest; +import net.minecraft.world.level.levelgen.structure.templatesystem.TagMatchTest; + +import java.util.List; +import java.util.function.Supplier; + + +public class ConfiguredFeatureRegistry { + + public static final ResourceKey> CONFIGURED_SOULSTONE_ORE = ResourceKey.create(Registries.CONFIGURED_FEATURE, MalumMod.malumPath("soulstone_ore")); + public static final ResourceKey> CONFIGURED_BRILLIANT_ORE = ResourceKey.create(Registries.CONFIGURED_FEATURE, MalumMod.malumPath("brilliant_ore")); + public static final ResourceKey> CONFIGURED_NATURAL_QUARTZ_ORE = ResourceKey.create(Registries.CONFIGURED_FEATURE, MalumMod.malumPath("natural_quartz_ore")); + public static final ResourceKey> CONFIGURED_RUNEWOOD_TREE = ResourceKey.create(Registries.CONFIGURED_FEATURE, MalumMod.malumPath("runewood_tree")); + public static final ResourceKey> CONFIGURED_SOULWOOD_TREE = ResourceKey.create(Registries.CONFIGURED_FEATURE, MalumMod.malumPath("soulwood_tree")); + + private static final RuleTest STONE_ORE_REPLACEABLES = new TagMatchTest(BlockTags.STONE_ORE_REPLACEABLES); + private static final RuleTest DEEPSLATE_ORE_REPLACEABLES = new TagMatchTest(BlockTags.DEEPSLATE_ORE_REPLACEABLES); + + public static final List SOULSTONE_TARGET_LIST = List.of( + OreConfiguration.target(STONE_ORE_REPLACEABLES, BlockRegistry.SOULSTONE_ORE.get().defaultBlockState()), + OreConfiguration.target(DEEPSLATE_ORE_REPLACEABLES, BlockRegistry.DEEPSLATE_SOULSTONE_ORE.get().defaultBlockState())); + + public static final List BRILLIANT_TARGET_LIST = List.of( + OreConfiguration.target(STONE_ORE_REPLACEABLES, BlockRegistry.BRILLIANT_STONE.get().defaultBlockState()), + OreConfiguration.target(DEEPSLATE_ORE_REPLACEABLES, BlockRegistry.BRILLIANT_DEEPSLATE.get().defaultBlockState())); + + public static final List NATURAL_QUARTZ_TARGET_LIST = List.of( + OreConfiguration.target(STONE_ORE_REPLACEABLES, BlockRegistry.NATURAL_QUARTZ_ORE.get().defaultBlockState()), + OreConfiguration.target(DEEPSLATE_ORE_REPLACEABLES, BlockRegistry.DEEPSLATE_QUARTZ_ORE.get().defaultBlockState())); + + public static void bootstrap(BootstapContext> context) { + context.register(ConfiguredFeatureRegistry.CONFIGURED_SOULSTONE_ORE, addOreConfig(SOULSTONE_TARGET_LIST, 30)); + context.register(ConfiguredFeatureRegistry.CONFIGURED_BRILLIANT_ORE, addOreConfig(BRILLIANT_TARGET_LIST, 30)); + context.register(ConfiguredFeatureRegistry.CONFIGURED_NATURAL_QUARTZ_ORE, addOreConfig(NATURAL_QUARTZ_TARGET_LIST, 30)); + + context.register(ConfiguredFeatureRegistry.CONFIGURED_RUNEWOOD_TREE, addTreeConfig(FeatureRegistry.RUNEWOOD_TREE.get())); + context.register(ConfiguredFeatureRegistry.CONFIGURED_SOULWOOD_TREE, addTreeConfig(FeatureRegistry.SOULWOOD_TREE.get())); + } + + private static ConfiguredFeature addTreeConfig(Feature feature) { + return new ConfiguredFeature<>(feature, FeatureConfiguration.NONE); + } + + private static ConfiguredFeature addOreConfig(List targetList, int veinSize) { + return new ConfiguredFeature<>(Feature.ORE, new OreConfiguration(targetList, veinSize)); + } +} diff --git a/src/main/java/com/sammy/malum/registry/common/worldgen/FeatureRegistry.java b/src/main/java/com/sammy/malum/registry/common/worldgen/FeatureRegistry.java index 75d09c210..c8bae30c5 100644 --- a/src/main/java/com/sammy/malum/registry/common/worldgen/FeatureRegistry.java +++ b/src/main/java/com/sammy/malum/registry/common/worldgen/FeatureRegistry.java @@ -36,11 +36,8 @@ import java.util.List; import static com.sammy.malum.MalumMod.MALUM; -import static net.minecraft.data.worldgen.features.OreFeatures.DEEPSLATE_ORE_REPLACEABLES; -import static net.minecraft.data.worldgen.features.OreFeatures.STONE_ORE_REPLACEABLES; import static net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration.INSTANCE; -@Mod.EventBusSubscriber(modid= MalumMod.MALUM, bus= Mod.EventBusSubscriber.Bus.MOD) public class FeatureRegistry { public static final DeferredRegister> FEATURE_TYPES = DeferredRegister.create(ForgeRegistries.FEATURES, MALUM); @@ -48,72 +45,5 @@ public class FeatureRegistry { public static final RegistryObject WEEPING_WELL = FEATURE_TYPES.register("weeping_well", WeepingWellFeature::new); public static final RegistryObject RUNEWOOD_TREE = FEATURE_TYPES.register("runewood_tree", RunewoodTreeFeature::new); public static final RegistryObject SOULWOOD_TREE = FEATURE_TYPES.register("soulwood_tree", SoulwoodTreeFeature::new); - public static final RegistryObject CTHONIC_GOLD_GEODE = FEATURE_TYPES.register("cthonic_gold_geode", ()->new RareEarthsGeode(GeodeConfiguration.CODEC)); - - public static final class ConfiguredFeatures { - public static final Holder> RUNEWOOD_TREE_FEATURE = FeatureUtils.register("runewood_tree", FeatureRegistry.RUNEWOOD_TREE.get(), INSTANCE); - - public static final Holder> WEEPING_WELL_FEATURE = FeatureUtils.register("weeping_well", FeatureRegistry.WEEPING_WELL.get(), INSTANCE); - - public static final Holder> BLAZING_QUARTZ_FEATURE = FeatureUtils.register("blazing_quartz", Feature.ORE, - new OreConfiguration(OreFeatures.NETHERRACK, BlockRegistry.BLAZING_QUARTZ_ORE.get().defaultBlockState(), CommonConfig.BLAZE_QUARTZ_SIZE.getConfigValue())); - - public static final List BRILLIANCE_TARGET_LIST = List.of(OreConfiguration.target(STONE_ORE_REPLACEABLES, BlockRegistry.BRILLIANT_STONE.get().defaultBlockState()), OreConfiguration.target(DEEPSLATE_ORE_REPLACEABLES, BlockRegistry.BRILLIANT_DEEPSLATE.get().defaultBlockState())); - public static final Holder> BRILLIANCE_FEATURE = FeatureUtils.register("brilliance", Feature.ORE, - new OreConfiguration(BRILLIANCE_TARGET_LIST, CommonConfig.BRILLIANT_STONE_SIZE.getConfigValue())); - - public static final List SOULSTONE_TARGET_LIST = List.of(OreConfiguration.target(STONE_ORE_REPLACEABLES, BlockRegistry.SOULSTONE_ORE.get().defaultBlockState()), OreConfiguration.target(DEEPSLATE_ORE_REPLACEABLES, BlockRegistry.DEEPSLATE_SOULSTONE_ORE.get().defaultBlockState())); - public static final Holder> SOULSTONE_FEATURE = FeatureUtils.register("soulstone_ore", Feature.ORE, - new OreConfiguration(SOULSTONE_TARGET_LIST, CommonConfig.SOULSTONE_SIZE.getConfigValue())); - - public static final Holder> SURFACE_SOULSTONE_FEATURE = FeatureUtils.register("surface_soulstone_ore", Feature.ORE, - new OreConfiguration(SOULSTONE_TARGET_LIST, CommonConfig.SURFACE_SOULSTONE_SIZE.getConfigValue())); - - - public static final List NATURAL_QUARTZ_TARGET_LIST = List.of(OreConfiguration.target(STONE_ORE_REPLACEABLES, BlockRegistry.NATURAL_QUARTZ_ORE.get().defaultBlockState()), OreConfiguration.target(DEEPSLATE_ORE_REPLACEABLES, BlockRegistry.DEEPSLATE_QUARTZ_ORE.get().defaultBlockState())); - public static final Holder> NATURAL_QUARTZ_FEATURE = FeatureUtils.register("natural_quartz", Feature.ORE, - new OreConfiguration(NATURAL_QUARTZ_TARGET_LIST, CommonConfig.NATURAL_QUARTZ_SIZE.getConfigValue())); - - public static final Holder> QUARTZ_GEODE_FEATURE = FeatureUtils.register("quartz_geode", Feature.GEODE, new GeodeConfiguration(new GeodeBlockSettings(BlockStateProvider.simple(Blocks.AIR), BlockStateProvider.simple(BlockRegistry.NATURAL_QUARTZ_ORE.get()), BlockStateProvider.simple(BlockRegistry.NATURAL_QUARTZ_ORE.get()), BlockStateProvider.simple(Blocks.TUFF), BlockStateProvider.simple(Blocks.SMOOTH_BASALT), List.of(BlockRegistry.NATURAL_QUARTZ_CLUSTER.get().defaultBlockState()), BlockTags.FEATURES_CANNOT_REPLACE, BlockTags.GEODE_INVALID_BLOCKS), new GeodeLayerSettings(1D, 1.2D, 2.2D, 2.8D), new GeodeCrackSettings(1f, 4.0D, 3), 0.85D, 0.2D, true, UniformInt.of(3, 5), UniformInt.of(2, 3), UniformInt.of(0, 1), -16, 16, 0.1D, 1)); - public static final Holder> DEEPSLATE_QUARTZ_GEODE_FEATURE = FeatureUtils.register("deepslate_quartz_geode", Feature.GEODE, new GeodeConfiguration(new GeodeBlockSettings(BlockStateProvider.simple(Blocks.AIR), BlockStateProvider.simple(BlockRegistry.DEEPSLATE_QUARTZ_ORE.get()), BlockStateProvider.simple(BlockRegistry.DEEPSLATE_QUARTZ_ORE.get()), BlockStateProvider.simple(Blocks.CALCITE), BlockStateProvider.simple(Blocks.SMOOTH_BASALT), List.of(BlockRegistry.NATURAL_QUARTZ_CLUSTER.get().defaultBlockState()), BlockTags.FEATURES_CANNOT_REPLACE, BlockTags.GEODE_INVALID_BLOCKS), new GeodeLayerSettings(1D, 1.4D, 2.6D, 4.2D), new GeodeCrackSettings(1f, 4.0D, 3), 0.85D, 0.2D, true, UniformInt.of(3, 5), UniformInt.of(2, 3), UniformInt.of(0, 1), -16, 16, 0.1D, 1)); - - public static final Holder> CTHONIC_GOLD_GEODE_FEATURE = FeatureUtils.register("cthonic_gold_geode", CTHONIC_GOLD_GEODE.get(), new GeodeConfiguration(new GeodeBlockSettings(BlockStateProvider.simple(Blocks.RAW_GOLD_BLOCK), BlockStateProvider.simple(Blocks.DEEPSLATE_GOLD_ORE), BlockStateProvider.simple(Blocks.RAW_GOLD_BLOCK), BlockStateProvider.simple(Blocks.CALCITE), BlockStateProvider.simple(Blocks.SMOOTH_BASALT), List.of(Blocks.DEEPSLATE_GOLD_ORE.defaultBlockState()), BlockTags.FEATURES_CANNOT_REPLACE, BlockTags.GEODE_INVALID_BLOCKS), new GeodeLayerSettings(0.02D, 0.2D, 0.6D, 1.4D), new GeodeCrackSettings(0.6f, 2.0D, 3), 0.85D, 0.2D, true, UniformInt.of(3, 5), UniformInt.of(2, 3), UniformInt.of(0, 1), -16, 16, 0.1D, 1)); - } - - public static final class PlacedFeatures { - public static final Holder RUNEWOOD_TREE = PlacementUtils.register("common_runewood", ConfiguredFeatures.RUNEWOOD_TREE_FEATURE, - InSquarePlacement.spread(), PlacementUtils.HEIGHTMAP, new ChancePlacementFilter(CommonConfig.COMMON_RUNEWOOD_CHANCE.getConfigValue().floatValue()), CountPlacement.of(3)); - public static final Holder RARE_RUNEWOOD_TREE = PlacementUtils.register("rare_runewood", ConfiguredFeatures.RUNEWOOD_TREE_FEATURE, - InSquarePlacement.spread(), PlacementUtils.HEIGHTMAP, new ChancePlacementFilter(CommonConfig.RARE_RUNEWOOD_CHANCE.getConfigValue().floatValue()), CountPlacement.of(3)); - - public static final Holder WEEPING_WELL_FEATURE = PlacementUtils.register("weeping_well", ConfiguredFeatures.WEEPING_WELL_FEATURE, - RarityFilter.onAverageOnceEvery(2), InSquarePlacement.spread(), HeightRangePlacement.of(ConstantHeight.of(VerticalAnchor.absolute(0))), BiomeFilter.biome(), DimensionPlacementFilter.of(DimensionPlacementFilter.fromStrings(CommonConfig.WEEPING_WELL_ALLOWED_DIMENSIONS.getConfigValue()))); - - public static final Holder BLAZING_QUARTZ_FEATURE = PlacementUtils.register("blazing_quartz_ore", ConfiguredFeatures.BLAZING_QUARTZ_FEATURE, - CountPlacement.of(CommonConfig.BLAZE_QUARTZ_AMOUNT.getConfigValue()), InSquarePlacement.spread(), PlacementUtils.RANGE_8_8); - - public static final Holder BRILLIANCE_FEATURE = PlacementUtils.register("brilliant_stone", ConfiguredFeatures.BRILLIANCE_FEATURE, - CountPlacement.of(CommonConfig.BRILLIANT_STONE_AMOUNT.getConfigValue()), InSquarePlacement.spread(), HeightRangePlacement.uniform(VerticalAnchor.absolute(CommonConfig.BRILLIANT_STONE_MIN_Y.getConfigValue()), VerticalAnchor.absolute(CommonConfig.BRILLIANT_STONE_MAX_Y.getConfigValue()))); - - public static final Holder SOULSTONE_FEATURE = PlacementUtils.register("soulstone", ConfiguredFeatures.SOULSTONE_FEATURE, - CountPlacement.of(CommonConfig.SOULSTONE_AMOUNT.getConfigValue()), InSquarePlacement.spread(), HeightRangePlacement.uniform(VerticalAnchor.absolute(CommonConfig.SOULSTONE_MIN_Y.getConfigValue()), VerticalAnchor.absolute(CommonConfig.SOULSTONE_MAX_Y.getConfigValue()))); - - public static final Holder SURFACE_SOULSTONE_FEATURE = PlacementUtils.register("surface_soulstone", ConfiguredFeatures.SURFACE_SOULSTONE_FEATURE, - CountPlacement.of(CommonConfig.SURFACE_SOULSTONE_AMOUNT.getConfigValue()), InSquarePlacement.spread(), HeightRangePlacement.uniform(VerticalAnchor.absolute(CommonConfig.SURFACE_SOULSTONE_MIN_Y.getConfigValue()), VerticalAnchor.absolute(CommonConfig.SURFACE_SOULSTONE_MAX_Y.getConfigValue()))); - - public static final Holder NATURAL_QUARTZ_FEATURE = PlacementUtils.register("natural_quartz", ConfiguredFeatures.NATURAL_QUARTZ_FEATURE, - CountPlacement.of(CommonConfig.NATURAL_QUARTZ_AMOUNT.getConfigValue()), InSquarePlacement.spread(), HeightRangePlacement.uniform(VerticalAnchor.absolute(CommonConfig.NATURAL_QUARTZ_MIN_Y.getConfigValue()), VerticalAnchor.absolute(CommonConfig.NATURAL_QUARTZ_MAX_Y.getConfigValue()))); - - public static final Holder QUARTZ_GEODE_FEATURE = PlacementUtils.register("quartz_geode", ConfiguredFeatures.QUARTZ_GEODE_FEATURE, - RarityFilter.onAverageOnceEvery(48), InSquarePlacement.spread(), HeightRangePlacement.uniform(VerticalAnchor.absolute(0), VerticalAnchor.absolute(48)), BiomeFilter.biome(), DimensionPlacementFilter.of(DimensionPlacementFilter.fromStrings(CommonConfig.QUARTZ_GEODE_ALLOWED_DIMENSIONS.getConfigValue()))); - - public static final Holder DEEPSLATE_QUARTZ_GEODE_FEATURE = PlacementUtils.register("deepslate_quartz_geode", ConfiguredFeatures.DEEPSLATE_QUARTZ_GEODE_FEATURE, - RarityFilter.onAverageOnceEvery(24), InSquarePlacement.spread(), HeightRangePlacement.uniform(VerticalAnchor.aboveBottom(6), VerticalAnchor.absolute(-10)), BiomeFilter.biome(), DimensionPlacementFilter.of(DimensionPlacementFilter.fromStrings(CommonConfig.QUARTZ_GEODE_ALLOWED_DIMENSIONS.getConfigValue()))); - - public static final Holder CTHONIC_GOLD_GEODE_FEATURE = PlacementUtils.register("rare_earth_geode", ConfiguredFeatures.CTHONIC_GOLD_GEODE_FEATURE, - RarityFilter.onAverageOnceEvery(30), InSquarePlacement.spread(), HeightRangePlacement.uniform(VerticalAnchor.aboveBottom(6), VerticalAnchor.aboveBottom(40)), BiomeFilter.biome(), DimensionPlacementFilter.of(DimensionPlacementFilter.fromStrings(CommonConfig.CTHONIC_GOLD_ALLOWED_DIMENSIONS.getConfigValue()))); - - - } } \ No newline at end of file diff --git a/src/main/java/com/sammy/malum/registry/common/worldgen/PlacedFeatureRegistry.java b/src/main/java/com/sammy/malum/registry/common/worldgen/PlacedFeatureRegistry.java new file mode 100644 index 000000000..6db51c88c --- /dev/null +++ b/src/main/java/com/sammy/malum/registry/common/worldgen/PlacedFeatureRegistry.java @@ -0,0 +1,53 @@ +package com.sammy.malum.registry.common.worldgen; + +import com.sammy.malum.MalumMod; +import com.sammy.malum.config.CommonConfig; +import net.minecraft.core.Holder; +import net.minecraft.core.HolderGetter; +import net.minecraft.core.registries.Registries; +import net.minecraft.data.worldgen.BootstapContext; +import net.minecraft.data.worldgen.placement.PlacementUtils; +import net.minecraft.resources.ResourceKey; +import net.minecraft.world.level.levelgen.VerticalAnchor; +import net.minecraft.world.level.levelgen.feature.ConfiguredFeature; +import net.minecraft.world.level.levelgen.placement.*; +import team.lodestar.lodestone.systems.worldgen.ChancePlacementFilter; + +import java.util.List; + +public class PlacedFeatureRegistry { + + public static final ResourceKey ORE_SOULSTONE = ResourceKey.create(Registries.PLACED_FEATURE, MalumMod.malumPath("ore_soulstone")); + + public static final ResourceKey ORE_BRILLIANT = ResourceKey.create(Registries.PLACED_FEATURE, MalumMod.malumPath("ore_brilliant")); + public static final ResourceKey ORE_NATURAL_QUARTZ = ResourceKey.create(Registries.PLACED_FEATURE, MalumMod.malumPath("ore_natural_quartz")); + + public static final ResourceKey RUNEWOOD_TREE = ResourceKey.create(Registries.PLACED_FEATURE, MalumMod.malumPath("runewood_tree")); + + public static void bootstrap(BootstapContext context) {//TODO fix all parameters + HolderGetter> features = context.lookup(Registries.CONFIGURED_FEATURE); + context.register(RUNEWOOD_TREE, addTreeFeature(features.getOrThrow(ConfiguredFeatureRegistry.CONFIGURED_RUNEWOOD_TREE), 3, 0.02f)); + context.register(ORE_SOULSTONE, addOreFeature(features.getOrThrow(ConfiguredFeatureRegistry.CONFIGURED_SOULSTONE_ORE), -16, 112, 16)); + context.register(ORE_BRILLIANT, addOreFeature(features.getOrThrow(ConfiguredFeatureRegistry.CONFIGURED_BRILLIANT_ORE), -16, 112, 16)); + context.register(ORE_NATURAL_QUARTZ, addOreFeature(features.getOrThrow(ConfiguredFeatureRegistry.CONFIGURED_NATURAL_QUARTZ_ORE), -16, 112, 16)); + } + + private static PlacedFeature addOreFeature(Holder> configureFeature, int minHeight, int maxHeight, int count) { + return new PlacedFeature(configureFeature, List.of( + HeightRangePlacement.triangle(VerticalAnchor.absolute(minHeight), VerticalAnchor.absolute(maxHeight)), + CountPlacement.of(count), + InSquarePlacement.spread(), + BiomeFilter.biome()) + ); + } + + private static PlacedFeature addTreeFeature(Holder> configureFeature, int count, float chance) { + return new PlacedFeature(configureFeature, List.of( + PlacementUtils.HEIGHTMAP, + CountPlacement.of(count), + new ChancePlacementFilter(chance), + InSquarePlacement.spread(), + BiomeFilter.biome()) + ); + } +} diff --git a/src/main/java/com/sammy/malum/registry/common/worldgen/StructureRegistry.java b/src/main/java/com/sammy/malum/registry/common/worldgen/StructureRegistry.java new file mode 100644 index 000000000..31a64dff0 --- /dev/null +++ b/src/main/java/com/sammy/malum/registry/common/worldgen/StructureRegistry.java @@ -0,0 +1,15 @@ +package com.sammy.malum.registry.common.worldgen; + +import com.sammy.malum.MalumMod; +import com.sammy.malum.common.worldgen.WeepingWellStructure; +import net.minecraft.core.registries.Registries; +import net.minecraft.world.level.levelgen.structure.StructureType; +import net.minecraftforge.registries.DeferredRegister; +import net.minecraftforge.registries.RegistryObject; + +public class StructureRegistry { + public static final DeferredRegister> STRUCTURES = DeferredRegister.create(Registries.STRUCTURE_TYPE, MalumMod.MALUM); + + public static final RegistryObject> WEEPING_WELL = STRUCTURES.register("weeping_well", () -> () ->(WeepingWellStructure.CODEC)); + +} diff --git a/src/main/java/com/sammy/malum/visual_effects/ItemCrumbleParticleEffects.java b/src/main/java/com/sammy/malum/visual_effects/ItemCrumbleParticleEffects.java index 8571ac301..ebb0222d0 100644 --- a/src/main/java/com/sammy/malum/visual_effects/ItemCrumbleParticleEffects.java +++ b/src/main/java/com/sammy/malum/visual_effects/ItemCrumbleParticleEffects.java @@ -1,24 +1,22 @@ package com.sammy.malum.visual_effects; -import com.sammy.malum.core.systems.spirit.*; -import net.minecraft.client.particle.*; +import com.sammy.malum.core.systems.spirit.MalumSpiritType; +import net.minecraft.client.particle.ParticleRenderType; import net.minecraft.util.RandomSource; -import net.minecraft.world.item.*; -import net.minecraft.world.level.*; -import net.minecraft.world.phys.*; -import team.lodestar.lodestone.helpers.*; -import team.lodestar.lodestone.setup.*; -import team.lodestar.lodestone.systems.easing.*; -import team.lodestar.lodestone.systems.particle.*; -import team.lodestar.lodestone.systems.particle.builder.*; -import team.lodestar.lodestone.systems.particle.data.*; -import team.lodestar.lodestone.systems.particle.data.color.*; -import team.lodestar.lodestone.systems.particle.data.spin.*; -import team.lodestar.lodestone.systems.particle.render_types.*; -import team.lodestar.lodestone.systems.particle.type.*; - -import java.util.*; -import java.util.function.*; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.level.Level; +import net.minecraft.world.phys.Vec3; +import team.lodestar.lodestone.helpers.RandomHelper; +import team.lodestar.lodestone.setup.LodestoneParticleRegistry; +import team.lodestar.lodestone.systems.easing.Easing; +import team.lodestar.lodestone.systems.particle.LodestoneWorldParticleActor; +import team.lodestar.lodestone.systems.particle.SimpleParticleOptions; +import team.lodestar.lodestone.systems.particle.builder.ItemCrumbParticleBuilder; +import team.lodestar.lodestone.systems.particle.builder.WorldParticleBuilder; +import team.lodestar.lodestone.systems.particle.data.GenericParticleData; +import team.lodestar.lodestone.systems.particle.data.spin.SpinParticleData; + +import java.util.function.Consumer; import static net.minecraft.util.Mth.nextFloat; @@ -32,6 +30,7 @@ public static ParticleEffectSpawner spawnItemCrumbs(Le final ItemCrumbParticleBuilder worldParticleBuilder = makeCrumbles(rand, stack, spinData, lifetime, slowDown); return new ParticleEffectSpawner<>(level, pos, worldParticleBuilder); } + public static ParticleEffectSpawner spawnGlowingItemCrumbs(Level level, Vec3 pos, ItemStack stack, MalumSpiritType spiritType) { var rand = level.getRandom(); diff --git a/src/main/java/com/sammy/malum/visual_effects/ParticleEffectSpawner.java b/src/main/java/com/sammy/malum/visual_effects/ParticleEffectSpawner.java index da5fa8c2a..37379b004 100644 --- a/src/main/java/com/sammy/malum/visual_effects/ParticleEffectSpawner.java +++ b/src/main/java/com/sammy/malum/visual_effects/ParticleEffectSpawner.java @@ -1,12 +1,12 @@ package com.sammy.malum.visual_effects; import net.minecraft.world.level.Level; -import net.minecraft.world.phys.*; -import team.lodestar.lodestone.systems.particle.builder.*; +import net.minecraft.world.phys.Vec3; +import team.lodestar.lodestone.systems.particle.builder.AbstractWorldParticleBuilder; +import team.lodestar.lodestone.systems.particle.builder.WorldParticleBuilder; -import javax.annotation.*; -import java.util.function.*; -import java.util.logging.*; +import javax.annotation.Nullable; +import java.util.function.Consumer; public class ParticleEffectSpawner> { diff --git a/src/main/java/com/sammy/malum/visual_effects/ScreenParticleEffects.java b/src/main/java/com/sammy/malum/visual_effects/ScreenParticleEffects.java index 8014b4d42..7e1859df6 100644 --- a/src/main/java/com/sammy/malum/visual_effects/ScreenParticleEffects.java +++ b/src/main/java/com/sammy/malum/visual_effects/ScreenParticleEffects.java @@ -1,24 +1,18 @@ package com.sammy.malum.visual_effects; -import com.sammy.malum.common.item.ether.*; -import net.minecraft.client.*; -import net.minecraft.util.*; -import net.minecraft.world.item.*; +import net.minecraft.client.Minecraft; +import net.minecraft.util.Mth; import net.minecraft.world.level.Level; -import team.lodestar.lodestone.setup.*; -import team.lodestar.lodestone.systems.easing.*; -import team.lodestar.lodestone.systems.particle.*; -import team.lodestar.lodestone.systems.particle.builder.*; -import team.lodestar.lodestone.systems.particle.data.*; -import team.lodestar.lodestone.systems.particle.data.color.*; -import team.lodestar.lodestone.systems.particle.data.spin.*; -import team.lodestar.lodestone.systems.particle.render_types.*; -import team.lodestar.lodestone.systems.particle.screen.*; -import team.lodestar.lodestone.systems.particle.screen.base.*; +import team.lodestar.lodestone.setup.LodestoneScreenParticleRegistry; +import team.lodestar.lodestone.systems.easing.Easing; +import team.lodestar.lodestone.systems.particle.builder.ScreenParticleBuilder; +import team.lodestar.lodestone.systems.particle.data.GenericParticleData; +import team.lodestar.lodestone.systems.particle.data.color.ColorParticleData; +import team.lodestar.lodestone.systems.particle.data.spin.SpinParticleData; +import team.lodestar.lodestone.systems.particle.render_types.LodestoneScreenParticleRenderType; +import team.lodestar.lodestone.systems.particle.screen.ScreenParticleHolder; import java.awt.*; -import java.util.*; -import java.util.logging.*; import static net.minecraft.util.Mth.nextFloat; @@ -53,8 +47,8 @@ public static void spawnSpiritShardScreenParticles(ScreenParticleHolder target, public static void spawnVoidItemScreenParticles(ScreenParticleHolder target, Level level, float intensity, float partialTick) { float colorMultiplier = Mth.nextFloat(level.random, 0.4f, 1.2f); float timeMultiplier = Mth.nextFloat(level.random, 0.9f, 1.4f); - Color color = new Color((int)(31*colorMultiplier), (int)(19*colorMultiplier), (int)(31*colorMultiplier)); - Color endColor = new Color((int)(111*colorMultiplier), (int)(31*colorMultiplier), (int)(121*colorMultiplier)); + Color color = new Color((int) (31 * colorMultiplier), (int) (19 * colorMultiplier), (int) (31 * colorMultiplier)); + Color endColor = new Color((int) (111 * colorMultiplier), (int) (31 * colorMultiplier), (int) (121 * colorMultiplier)); float gameTime = level.getGameTime() + partialTick; var rand = Minecraft.getInstance().level.getRandom(); boolean spinDirection = level.random.nextBoolean(); @@ -64,7 +58,7 @@ public static void spawnVoidItemScreenParticles(ScreenParticleHolder target, Lev .setTransparencyData(GenericParticleData.create(0.1f, 0.5f, 0f).setEasing(Easing.SINE_IN_OUT).build()) .setColorData(ColorParticleData.create(color, endColor).setCoefficient(2f).build()) .setSpinData(spinParticleData) - .setLifetime((int) ((10 + rand.nextInt(10))*timeMultiplier)) + .setLifetime((int) ((10 + rand.nextInt(10)) * timeMultiplier)) .setRandomOffset(0.05f) .setRandomMotion(0.05f, 0.05f) .setRenderType(LodestoneScreenParticleRenderType.LUMITRANSPARENT) @@ -80,7 +74,7 @@ public static void spawnVoidItemScreenParticles(ScreenParticleHolder target, Lev .setRandomMotion(0.4f, 0.4f) .setRenderType(LodestoneScreenParticleRenderType.LUMITRANSPARENT) .spawnOnStack(0, 0) - .setLifetime((int) ((10 + rand.nextInt(2))*timeMultiplier)) + .setLifetime((int) ((10 + rand.nextInt(2)) * timeMultiplier)) .setSpinData(SpinParticleData.create(nextFloat(rand, 0.05f, 0.1f)).build()) .setScaleData(GenericParticleData.create(0.8f + rand.nextFloat() * 0.4f, 0f).build()) .setRandomMotion(0.01f, 0.01f) diff --git a/src/main/java/com/sammy/malum/visual_effects/SparkParticleEffects.java b/src/main/java/com/sammy/malum/visual_effects/SparkParticleEffects.java index c9e0f01b5..56a9441db 100644 --- a/src/main/java/com/sammy/malum/visual_effects/SparkParticleEffects.java +++ b/src/main/java/com/sammy/malum/visual_effects/SparkParticleEffects.java @@ -1,19 +1,19 @@ package com.sammy.malum.visual_effects; -import com.sammy.malum.core.systems.spirit.*; -import com.sammy.malum.registry.client.*; -import net.minecraft.world.level.*; -import net.minecraft.world.phys.*; -import team.lodestar.lodestone.helpers.*; -import team.lodestar.lodestone.systems.easing.*; -import team.lodestar.lodestone.systems.particle.*; -import team.lodestar.lodestone.systems.particle.builder.*; -import team.lodestar.lodestone.systems.particle.data.*; -import team.lodestar.lodestone.systems.particle.data.color.*; -import team.lodestar.lodestone.systems.particle.data.spin.*; +import com.sammy.malum.core.systems.spirit.MalumSpiritType; +import com.sammy.malum.registry.client.ParticleRegistry; +import net.minecraft.world.level.Level; +import net.minecraft.world.phys.Vec3; +import team.lodestar.lodestone.helpers.RandomHelper; +import team.lodestar.lodestone.systems.easing.Easing; +import team.lodestar.lodestone.systems.particle.LodestoneWorldParticleActor; +import team.lodestar.lodestone.systems.particle.builder.SparkParticleBuilder; +import team.lodestar.lodestone.systems.particle.builder.WorldParticleBuilder; +import team.lodestar.lodestone.systems.particle.data.GenericParticleData; +import team.lodestar.lodestone.systems.particle.data.color.ColorParticleData; +import team.lodestar.lodestone.systems.particle.data.spin.SpinParticleData; -import java.util.*; -import java.util.function.*; +import java.util.function.Consumer; import static net.minecraft.util.Mth.nextFloat; diff --git a/src/main/java/com/sammy/malum/visual_effects/SpiritAltarParticleEffects.java b/src/main/java/com/sammy/malum/visual_effects/SpiritAltarParticleEffects.java index ca5e93ef6..68551fd3d 100644 --- a/src/main/java/com/sammy/malum/visual_effects/SpiritAltarParticleEffects.java +++ b/src/main/java/com/sammy/malum/visual_effects/SpiritAltarParticleEffects.java @@ -1,26 +1,28 @@ package com.sammy.malum.visual_effects; -import com.sammy.malum.common.block.curiosities.obelisk.*; -import com.sammy.malum.common.block.curiosities.spirit_altar.*; -import com.sammy.malum.common.block.storage.*; -import com.sammy.malum.common.item.spirit.*; -import com.sammy.malum.common.recipe.*; - -import com.sammy.malum.core.systems.spirit.*; -import com.sammy.malum.visual_effects.networked.data.*; -import net.minecraft.core.*; -import net.minecraft.util.*; -import net.minecraft.world.item.*; +import com.sammy.malum.common.block.curiosities.obelisk.RunewoodObeliskBlockEntity; +import com.sammy.malum.common.block.curiosities.spirit_altar.IAltarAccelerator; +import com.sammy.malum.common.block.curiosities.spirit_altar.SpiritAltarBlockEntity; +import com.sammy.malum.common.block.storage.MalumItemHolderBlockEntity; +import com.sammy.malum.common.item.spirit.SpiritShardItem; +import com.sammy.malum.common.recipe.SpiritInfusionRecipe; +import com.sammy.malum.core.systems.spirit.MalumSpiritType; +import com.sammy.malum.visual_effects.networked.data.ColorEffectData; +import net.minecraft.core.BlockPos; +import net.minecraft.util.Mth; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.Level; -import net.minecraft.world.phys.*; -import team.lodestar.lodestone.helpers.*; -import team.lodestar.lodestone.systems.blockentity.*; -import team.lodestar.lodestone.systems.easing.*; -import team.lodestar.lodestone.systems.particle.*; -import team.lodestar.lodestone.systems.particle.builder.*; +import net.minecraft.world.phys.Vec3; +import team.lodestar.lodestone.helpers.DataHelper; +import team.lodestar.lodestone.helpers.RandomHelper; +import team.lodestar.lodestone.systems.blockentity.LodestoneBlockEntityInventory; +import team.lodestar.lodestone.systems.easing.Easing; +import team.lodestar.lodestone.systems.particle.LodestoneWorldParticleActor; +import team.lodestar.lodestone.systems.particle.builder.SparkParticleBuilder; +import team.lodestar.lodestone.systems.particle.builder.WorldParticleBuilder; -import java.util.*; -import java.util.function.*; +import java.util.function.Consumer; import static com.sammy.malum.visual_effects.SpiritLightSpecs.spiritLightSpecs; @@ -144,6 +146,7 @@ public static void eatItemParticles(SpiritAltarBlockEntity altar, MalumItemHolde crumbles.spawnParticles(); } } + public static void craftItemParticles(SpiritAltarBlockEntity altar, ColorEffectData colorData) { MalumSpiritType activeSpiritType = getCentralSpiritType(altar); if (activeSpiritType == null) { @@ -153,7 +156,7 @@ public static void craftItemParticles(SpiritAltarBlockEntity altar, ColorEffectD long gameTime = level.getGameTime(); var random = level.random; BlockPos altarPos = altar.getBlockPos(); - Vec3 targetPos = altar.getCentralItemOffset().add(altarPos.getX(),altarPos.getY(), altarPos.getZ()); + Vec3 targetPos = altar.getCentralItemOffset().add(altarPos.getX(), altarPos.getY(), altarPos.getZ()); for (int i = 0; i < 2; i++) { MalumSpiritType cyclingSpiritType = colorData.getCyclingColorRecord().spiritType(); @@ -228,6 +231,7 @@ public static void craftItemParticles(SpiritAltarBlockEntity altar, ColorEffectD lightSpecs.spawnParticles(); } } + public static void runewoodObeliskParticles(RunewoodObeliskBlockEntity obelisk, SpiritAltarBlockEntity altar, MalumSpiritType spiritType) { Level level = obelisk.getLevel(); BlockPos obeliskPos = obelisk.getBlockPos(); @@ -237,7 +241,7 @@ public static void runewoodObeliskParticles(RunewoodObeliskBlockEntity obelisk, var random = level.random; long gameTime = level.getGameTime(); BlockPos altarPos = altar.getBlockPos(); - Vec3 targetPos = altar.getCentralItemOffset().add(altarPos.getX(),altarPos.getY(), altarPos.getZ()); + Vec3 targetPos = altar.getCentralItemOffset().add(altarPos.getX(), altarPos.getY(), altarPos.getZ()); Vec3 velocity = targetPos.subtract(startPos).normalize().scale(RandomHelper.randomBetween(random, 0.01f, 0.02f)); double yOffset = Math.sin((gameTime % 360) / 30f) * 0.1f; Vec3 offsetPosition = DataHelper.rotatingRadialOffset(startPos.add(0, yOffset, 0), 0.45f, 0, 1, gameTime, 30); diff --git a/src/main/java/com/sammy/malum/visual_effects/SpiritLightSpecs.java b/src/main/java/com/sammy/malum/visual_effects/SpiritLightSpecs.java index 07548127d..39e967fc2 100644 --- a/src/main/java/com/sammy/malum/visual_effects/SpiritLightSpecs.java +++ b/src/main/java/com/sammy/malum/visual_effects/SpiritLightSpecs.java @@ -1,22 +1,23 @@ package com.sammy.malum.visual_effects; -import com.sammy.malum.core.systems.spirit.*; -import com.sammy.malum.registry.client.*; +import com.sammy.malum.core.systems.spirit.MalumSpiritType; +import com.sammy.malum.registry.client.ParticleRegistry; import net.minecraft.world.level.Level; import net.minecraft.world.phys.Vec3; -import team.lodestar.lodestone.helpers.*; +import team.lodestar.lodestone.helpers.DataHelper; +import team.lodestar.lodestone.helpers.RandomHelper; import team.lodestar.lodestone.setup.LodestoneParticleRegistry; -import team.lodestar.lodestone.systems.easing.*; -import team.lodestar.lodestone.systems.particle.*; -import team.lodestar.lodestone.systems.particle.builder.*; -import team.lodestar.lodestone.systems.particle.data.color.ColorParticleData; +import team.lodestar.lodestone.systems.easing.Easing; +import team.lodestar.lodestone.systems.particle.LodestoneWorldParticleActor; +import team.lodestar.lodestone.systems.particle.builder.WorldParticleBuilder; import team.lodestar.lodestone.systems.particle.data.GenericParticleData; +import team.lodestar.lodestone.systems.particle.data.color.ColorParticleData; import team.lodestar.lodestone.systems.particle.data.spin.SpinParticleData; -import team.lodestar.lodestone.systems.particle.type.*; +import team.lodestar.lodestone.systems.particle.type.LodestoneParticleType; -import java.util.*; import java.util.List; -import java.util.function.*; +import java.util.function.Consumer; +import java.util.function.Supplier; import static net.minecraft.util.Mth.nextFloat; @@ -38,11 +39,14 @@ public static void coolLookingShinyThing(Level level, Vec3 pos, MalumSpiritType } public static void rotatingLightSpecs(Level level, Vec3 pos, MalumSpiritType spiritType, float distance, int rotatingSpecs) { - rotatingLightSpecs(level, pos, spiritType, distance, rotatingSpecs, b -> {}); + rotatingLightSpecs(level, pos, spiritType, distance, rotatingSpecs, b -> { + }); } + public static void rotatingLightSpecs(Level level, Vec3 pos, MalumSpiritType spiritType, float distance, int rotatingSpecs, Consumer sharedModifier) { rotatingLightSpecs(level, pos, spiritType, distance, rotatingSpecs, sharedModifier, sharedModifier); } + public static void rotatingLightSpecs(Level level, Vec3 pos, MalumSpiritType spiritType, float distance, int rotatingSpecs, Consumer lightSpecModifier, Consumer bloomModifier) { long gameTime = level.getGameTime(); if (level.getGameTime() % 2L == 0) { diff --git a/src/main/java/com/sammy/malum/visual_effects/networked/ParticleEffectType.java b/src/main/java/com/sammy/malum/visual_effects/networked/ParticleEffectType.java index 038c2bb1f..6f944c709 100644 --- a/src/main/java/com/sammy/malum/visual_effects/networked/ParticleEffectType.java +++ b/src/main/java/com/sammy/malum/visual_effects/networked/ParticleEffectType.java @@ -1,19 +1,20 @@ package com.sammy.malum.visual_effects.networked; -import com.sammy.malum.common.packets.*; - -import com.sammy.malum.registry.common.*; -import com.sammy.malum.visual_effects.networked.data.*; +import com.sammy.malum.common.packets.ParticleEffectPacket; +import com.sammy.malum.registry.common.ParticleEffectTypeRegistry; +import com.sammy.malum.visual_effects.networked.data.ColorEffectData; +import com.sammy.malum.visual_effects.networked.data.NBTEffectData; +import com.sammy.malum.visual_effects.networked.data.PositionEffectData; import net.minecraft.util.RandomSource; -import net.minecraft.world.entity.*; -import net.minecraft.world.level.*; -import net.minecraftforge.api.distmarker.*; -import net.minecraftforge.network.*; +import net.minecraft.world.entity.Entity; +import net.minecraft.world.level.Level; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; +import net.minecraftforge.network.PacketDistributor; -import java.util.*; -import java.util.function.*; +import java.util.function.Supplier; -import static com.sammy.malum.registry.common.PacketRegistry.*; +import static com.sammy.malum.registry.common.PacketRegistry.MALUM_CHANNEL; public abstract class ParticleEffectType { diff --git a/src/main/java/com/sammy/malum/visual_effects/networked/SpiritMoteCreationParticleEffect.java b/src/main/java/com/sammy/malum/visual_effects/networked/SpiritMoteCreationParticleEffect.java index b5fa29103..1e1cd8975 100644 --- a/src/main/java/com/sammy/malum/visual_effects/networked/SpiritMoteCreationParticleEffect.java +++ b/src/main/java/com/sammy/malum/visual_effects/networked/SpiritMoteCreationParticleEffect.java @@ -1,20 +1,21 @@ package com.sammy.malum.visual_effects.networked; -import com.sammy.malum.visual_effects.networked.data.*; -import net.minecraft.core.*; -import net.minecraft.util.*; -import net.minecraftforge.api.distmarker.*; -import team.lodestar.lodestone.helpers.*; -import team.lodestar.lodestone.setup.*; -import team.lodestar.lodestone.systems.easing.*; -import team.lodestar.lodestone.systems.particle.*; -import team.lodestar.lodestone.systems.particle.builder.*; -import team.lodestar.lodestone.systems.particle.data.*; -import team.lodestar.lodestone.systems.particle.data.color.*; -import team.lodestar.lodestone.systems.particle.data.spin.*; +import com.sammy.malum.visual_effects.networked.data.ColorEffectData; +import net.minecraft.core.BlockPos; +import net.minecraft.util.Mth; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; +import team.lodestar.lodestone.helpers.ColorHelper; +import team.lodestar.lodestone.setup.LodestoneParticleRegistry; +import team.lodestar.lodestone.systems.easing.Easing; +import team.lodestar.lodestone.systems.particle.SimpleParticleOptions; +import team.lodestar.lodestone.systems.particle.builder.WorldParticleBuilder; +import team.lodestar.lodestone.systems.particle.data.GenericParticleData; +import team.lodestar.lodestone.systems.particle.data.color.ColorParticleData; +import team.lodestar.lodestone.systems.particle.data.spin.SpinParticleData; import java.awt.*; -import java.util.function.*; +import java.util.function.Supplier; public class SpiritMoteCreationParticleEffect extends ParticleEffectType { diff --git a/src/main/java/com/sammy/malum/visual_effects/networked/altar/SpiritAltarCraftParticleEffect.java b/src/main/java/com/sammy/malum/visual_effects/networked/altar/SpiritAltarCraftParticleEffect.java index f896c73a4..0b89a7c57 100644 --- a/src/main/java/com/sammy/malum/visual_effects/networked/altar/SpiritAltarCraftParticleEffect.java +++ b/src/main/java/com/sammy/malum/visual_effects/networked/altar/SpiritAltarCraftParticleEffect.java @@ -1,13 +1,12 @@ package com.sammy.malum.visual_effects.networked.altar; -import com.sammy.malum.common.block.curiosities.spirit_altar.*; -import com.sammy.malum.visual_effects.*; -import com.sammy.malum.visual_effects.networked.*; -import com.sammy.malum.visual_effects.networked.data.*; -import net.minecraft.world.level.*; -import net.minecraftforge.api.distmarker.*; +import com.sammy.malum.common.block.curiosities.spirit_altar.SpiritAltarBlockEntity; +import com.sammy.malum.visual_effects.SpiritAltarParticleEffects; +import com.sammy.malum.visual_effects.networked.ParticleEffectType; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; -import java.util.function.*; +import java.util.function.Supplier; public class SpiritAltarCraftParticleEffect extends ParticleEffectType { diff --git a/src/main/java/com/sammy/malum/visual_effects/networked/altar/SpiritAltarEatItemParticleEffect.java b/src/main/java/com/sammy/malum/visual_effects/networked/altar/SpiritAltarEatItemParticleEffect.java index becb70914..f024a627b 100644 --- a/src/main/java/com/sammy/malum/visual_effects/networked/altar/SpiritAltarEatItemParticleEffect.java +++ b/src/main/java/com/sammy/malum/visual_effects/networked/altar/SpiritAltarEatItemParticleEffect.java @@ -1,17 +1,17 @@ package com.sammy.malum.visual_effects.networked.altar; -import com.sammy.malum.common.block.curiosities.spirit_altar.*; -import com.sammy.malum.common.block.storage.*; -import com.sammy.malum.visual_effects.*; -import com.sammy.malum.visual_effects.networked.*; -import com.sammy.malum.visual_effects.networked.data.*; -import net.minecraft.core.*; -import net.minecraft.nbt.*; -import net.minecraft.world.item.*; -import net.minecraftforge.api.distmarker.*; -import team.lodestar.lodestone.helpers.*; +import com.sammy.malum.common.block.curiosities.spirit_altar.SpiritAltarBlockEntity; +import com.sammy.malum.common.block.storage.MalumItemHolderBlockEntity; +import com.sammy.malum.visual_effects.SpiritAltarParticleEffects; +import com.sammy.malum.visual_effects.networked.ParticleEffectType; +import com.sammy.malum.visual_effects.networked.data.NBTEffectData; +import net.minecraft.core.BlockPos; +import net.minecraft.world.item.ItemStack; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; +import team.lodestar.lodestone.helpers.BlockHelper; -import java.util.function.*; +import java.util.function.Supplier; public class SpiritAltarEatItemParticleEffect extends ParticleEffectType { diff --git a/src/main/java/com/sammy/malum/visual_effects/networked/blight/BlightingMistParticleEffect.java b/src/main/java/com/sammy/malum/visual_effects/networked/blight/BlightingMistParticleEffect.java index e6c475818..fec8ea8fe 100644 --- a/src/main/java/com/sammy/malum/visual_effects/networked/blight/BlightingMistParticleEffect.java +++ b/src/main/java/com/sammy/malum/visual_effects/networked/blight/BlightingMistParticleEffect.java @@ -1,19 +1,21 @@ package com.sammy.malum.visual_effects.networked.blight; -import com.sammy.malum.visual_effects.networked.*; -import net.minecraft.core.*; -import net.minecraft.util.*; -import net.minecraftforge.api.distmarker.*; -import team.lodestar.lodestone.setup.*; -import team.lodestar.lodestone.systems.easing.*; -import team.lodestar.lodestone.systems.particle.builder.*; -import team.lodestar.lodestone.systems.particle.data.*; -import team.lodestar.lodestone.systems.particle.data.color.*; -import team.lodestar.lodestone.systems.particle.data.spin.*; -import team.lodestar.lodestone.systems.particle.render_types.*; +import com.sammy.malum.visual_effects.networked.ParticleEffectType; +import net.minecraft.core.BlockPos; +import net.minecraft.core.Direction; +import net.minecraft.util.Mth; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; +import team.lodestar.lodestone.setup.LodestoneParticleRegistry; +import team.lodestar.lodestone.systems.easing.Easing; +import team.lodestar.lodestone.systems.particle.builder.WorldParticleBuilder; +import team.lodestar.lodestone.systems.particle.data.GenericParticleData; +import team.lodestar.lodestone.systems.particle.data.color.ColorParticleData; +import team.lodestar.lodestone.systems.particle.data.spin.SpinParticleData; +import team.lodestar.lodestone.systems.particle.render_types.LodestoneWorldParticleRenderType; import java.awt.*; -import java.util.function.*; +import java.util.function.Supplier; public class BlightingMistParticleEffect extends ParticleEffectType { @@ -29,13 +31,13 @@ public Supplier get() { for (int i = 0; i < 3; i++) { float multiplier = Mth.nextFloat(level.random, 0.4f, 1f); float timeMultiplier = Mth.nextFloat(level.random, 0.9f, 1.4f); - Color color = new Color((int)(31*multiplier), (int)(19*multiplier), (int)(31*multiplier)); + Color color = new Color((int) (31 * multiplier), (int) (19 * multiplier), (int) (31 * multiplier)); boolean spinDirection = level.random.nextBoolean(); WorldParticleBuilder.create(LodestoneParticleRegistry.WISP_PARTICLE) .setTransparencyData(GenericParticleData.create(0.15f, 1f, 0).build()) - .setSpinData(SpinParticleData.create(0.2f*(spinDirection ? 1 : -1)).build()) + .setSpinData(SpinParticleData.create(0.2f * (spinDirection ? 1 : -1)).build()) .setScaleData(GenericParticleData.create(0.15f, 0.2f, 0).setEasing(Easing.QUINTIC_OUT, Easing.SINE_IN).build()) - .setLifetime((int) (45*timeMultiplier)) + .setLifetime((int) (45 * timeMultiplier)) .setColorData(ColorParticleData.create(color, color).build()) .enableNoClip() .setRandomOffset(0.1f, 0f) @@ -45,8 +47,8 @@ public Supplier get() { WorldParticleBuilder.create(LodestoneParticleRegistry.SMOKE_PARTICLE) .setTransparencyData(GenericParticleData.create(0.25f, 0.55f, 0).build()) - .setLifetime((int) (50*timeMultiplier)) - .setSpinData(SpinParticleData.create(0.1f*(spinDirection ? 1 : -1)).build()) + .setLifetime((int) (50 * timeMultiplier)) + .setSpinData(SpinParticleData.create(0.1f * (spinDirection ? 1 : -1)).build()) .setScaleData(GenericParticleData.create(0.35f, 0.4f, 0).setEasing(Easing.QUINTIC_OUT, Easing.SINE_IN).build()) .setColorData(ColorParticleData.create(color, color).build()) .setRandomOffset(0.2f, 0) @@ -55,13 +57,13 @@ public Supplier get() { .setRenderType(LodestoneWorldParticleRenderType.LUMITRANSPARENT) .repeatSurroundBlock(level, pos, 2, Direction.UP); - color = new Color((int)(80*multiplier), (int)(40*multiplier), (int)(80*multiplier)); + color = new Color((int) (80 * multiplier), (int) (40 * multiplier), (int) (80 * multiplier)); WorldParticleBuilder.create(LodestoneParticleRegistry.SMOKE_PARTICLE) .setTransparencyData(GenericParticleData.create(0.02f, 0.15f, 0).build()) - .setSpinData(SpinParticleData.create(0.1f*(spinDirection ? 1 : -1)).build()) + .setSpinData(SpinParticleData.create(0.1f * (spinDirection ? 1 : -1)).build()) .setScaleData(GenericParticleData.create(0.35f, 0.4f, 0).setEasing(Easing.QUINTIC_OUT, Easing.SINE_IN).build()) .setColorData(ColorParticleData.create(color, color).build()) - .setLifetime((int) (50*timeMultiplier)) + .setLifetime((int) (50 * timeMultiplier)) .setRandomOffset(0.2f, 0) .enableNoClip() .setRandomMotion(0.01f, 0.005f) diff --git a/src/main/java/com/sammy/malum/visual_effects/networked/data/ColorEffectData.java b/src/main/java/com/sammy/malum/visual_effects/networked/data/ColorEffectData.java index a25c55f5c..1dc7aeb31 100644 --- a/src/main/java/com/sammy/malum/visual_effects/networked/data/ColorEffectData.java +++ b/src/main/java/com/sammy/malum/visual_effects/networked/data/ColorEffectData.java @@ -1,16 +1,17 @@ package com.sammy.malum.visual_effects.networked.data; -import com.sammy.malum.*; -import com.sammy.malum.core.helper.*; -import com.sammy.malum.core.systems.recipe.*; -import com.sammy.malum.core.systems.spirit.*; -import net.minecraft.network.*; +import com.sammy.malum.MalumMod; +import com.sammy.malum.core.helper.SpiritHelper; +import com.sammy.malum.core.systems.recipe.SpiritWithCount; +import com.sammy.malum.core.systems.spirit.MalumSpiritType; +import net.minecraft.network.FriendlyByteBuf; -import javax.annotation.*; +import javax.annotation.Nullable; import java.awt.*; -import java.util.*; -import java.util.function.*; -import java.util.stream.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.function.Function; +import java.util.stream.Collectors; public class ColorEffectData { @@ -20,9 +21,11 @@ public class ColorEffectData { public static ColorEffectData fromRecipe(Collection malumSpiritTypes) { return fromSpirits(malumSpiritTypes.stream().map(s -> s.type).collect(Collectors.toList()), ColorRecord::new); } + public static ColorEffectData fromSpirits(Collection malumSpiritTypes) { return fromSpirits(malumSpiritTypes, ColorRecord::new); } + public static ColorEffectData fromSpirits(Collection malumSpiritTypes, Function spiritColorMapper) { return new ColorEffectData(malumSpiritTypes.stream().map(spiritColorMapper).collect(Collectors.toList())); } @@ -119,9 +122,11 @@ public record ColorRecord(Color primaryColor, Color secondaryColor, @Nullable Ma public ColorRecord(Color color) { this(color, color); } + public ColorRecord(MalumSpiritType type) { this(type.getPrimaryColor(), type.getSecondaryColor(), type); } + public ColorRecord(Color primaryColor, Color secondaryColor) { this(primaryColor, secondaryColor, null); } diff --git a/src/main/java/com/sammy/malum/visual_effects/networked/data/NBTEffectData.java b/src/main/java/com/sammy/malum/visual_effects/networked/data/NBTEffectData.java index 114e32985..c8e68600e 100644 --- a/src/main/java/com/sammy/malum/visual_effects/networked/data/NBTEffectData.java +++ b/src/main/java/com/sammy/malum/visual_effects/networked/data/NBTEffectData.java @@ -1,7 +1,7 @@ package com.sammy.malum.visual_effects.networked.data; -import net.minecraft.nbt.*; -import net.minecraft.world.item.*; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.world.item.ItemStack; public class NBTEffectData { diff --git a/src/main/java/com/sammy/malum/visual_effects/networked/data/PositionEffectData.java b/src/main/java/com/sammy/malum/visual_effects/networked/data/PositionEffectData.java index d5d7404a8..8a67568d3 100644 --- a/src/main/java/com/sammy/malum/visual_effects/networked/data/PositionEffectData.java +++ b/src/main/java/com/sammy/malum/visual_effects/networked/data/PositionEffectData.java @@ -1,8 +1,8 @@ package com.sammy.malum.visual_effects.networked.data; -import net.minecraft.core.*; -import net.minecraft.network.*; -import net.minecraft.world.entity.*; +import net.minecraft.core.BlockPos; +import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.world.entity.Entity; public class PositionEffectData { @@ -35,6 +35,6 @@ public void encode(FriendlyByteBuf buf) { } public BlockPos getAsBlockPos() { - return new BlockPos((int)posX, (int)posY, (int)posZ); + return new BlockPos((int) posX, (int) posY, (int) posZ); } } \ No newline at end of file diff --git a/src/main/java/com/sammy/malum/visual_effects/networked/generic/DrippingSmokeParticleEffect.java b/src/main/java/com/sammy/malum/visual_effects/networked/generic/DrippingSmokeParticleEffect.java index c2a0114bb..cb78c7950 100644 --- a/src/main/java/com/sammy/malum/visual_effects/networked/generic/DrippingSmokeParticleEffect.java +++ b/src/main/java/com/sammy/malum/visual_effects/networked/generic/DrippingSmokeParticleEffect.java @@ -1,26 +1,30 @@ package com.sammy.malum.visual_effects.networked.generic; -import com.sammy.malum.visual_effects.networked.*; -import com.sammy.malum.visual_effects.networked.data.*; -import net.minecraft.util.*; -import net.minecraft.world.phys.*; -import net.minecraftforge.api.distmarker.*; -import team.lodestar.lodestone.setup.*; -import team.lodestar.lodestone.systems.easing.*; -import team.lodestar.lodestone.systems.particle.*; -import team.lodestar.lodestone.systems.particle.builder.*; -import team.lodestar.lodestone.systems.particle.data.*; -import team.lodestar.lodestone.systems.particle.data.color.*; -import team.lodestar.lodestone.systems.particle.data.spin.*; +import com.sammy.malum.visual_effects.networked.ParticleEffectType; +import com.sammy.malum.visual_effects.networked.data.ColorEffectData; +import net.minecraft.util.Mth; +import net.minecraft.world.phys.Vec3; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; +import team.lodestar.lodestone.setup.LodestoneParticleRegistry; +import team.lodestar.lodestone.systems.easing.Easing; +import team.lodestar.lodestone.systems.particle.LodestoneWorldParticleActor; +import team.lodestar.lodestone.systems.particle.builder.WorldParticleBuilder; +import team.lodestar.lodestone.systems.particle.data.GenericParticleData; +import team.lodestar.lodestone.systems.particle.data.color.ColorParticleData; +import team.lodestar.lodestone.systems.particle.data.spin.SpinParticleData; import java.awt.*; -import java.util.function.*; +import java.util.function.Consumer; +import java.util.function.Function; +import java.util.function.Supplier; public class DrippingSmokeParticleEffect extends ParticleEffectType { //Downwards spiraling mist of particles public final float intensity; + public DrippingSmokeParticleEffect(String id, float intensity) { super(id); this.intensity = intensity; @@ -45,7 +49,7 @@ public Supplier get() { int spinOffset = random.nextInt(360); WorldParticleBuilder.create(LodestoneParticleRegistry.SMOKE_PARTICLE) .setTransparencyData(GenericParticleData.create(0, 0.06f, 0).setCoefficient(1.2f).setEasing(Easing.SINE_IN_OUT, Easing.QUAD_IN).build()) - .setSpinData(SpinParticleData.create(0.05f*spinDirection, 0.2f*spinDirection, 0).setSpinOffset(spinOffset).setEasing(Easing.SINE_IN_OUT, Easing.SINE_IN).build()) + .setSpinData(SpinParticleData.create(0.05f * spinDirection, 0.2f * spinDirection, 0).setSpinOffset(spinOffset).setEasing(Easing.SINE_IN_OUT, Easing.SINE_IN).build()) .setScaleData(GenericParticleData.create(0.8f, 0.4f, 0f).setEasing(Easing.QUARTIC_IN_OUT, Easing.QUAD_IN).build()) .setColorData(ColorParticleData.create(primaryColor, secondaryColor).setEasing(Easing.BOUNCE_IN_OUT).build()) .setLifetime((int) (adjustedLifespan * Mth.nextFloat(random, 1.15f, 1.4f))) @@ -61,7 +65,7 @@ public Supplier get() { int spinOffset = random.nextInt(360); WorldParticleBuilder.create(LodestoneParticleRegistry.WISP_PARTICLE) .setTransparencyData(GenericParticleData.create(0.02f, 0.14f, 0).setEasing(Easing.SINE_IN_OUT, Easing.EXPO_OUT).build()) - .setSpinData(SpinParticleData.create(0.1f*spinDirection, 0.25f*spinDirection, 0).setSpinOffset(spinOffset).setEasing(Easing.SINE_IN_OUT, Easing.SINE_IN).build()) + .setSpinData(SpinParticleData.create(0.1f * spinDirection, 0.25f * spinDirection, 0).setSpinOffset(spinOffset).setEasing(Easing.SINE_IN_OUT, Easing.SINE_IN).build()) .setScaleData(GenericParticleData.create(0.6f, 0.3f, 0f).setEasing(Easing.SINE_IN_OUT, Easing.EXPO_OUT).build()) .setColorData(ColorParticleData.create(primaryColor, secondaryColor).setEasing(Easing.BOUNCE_IN_OUT).build()) .setLifetime((int) (adjustedLifespan * Mth.nextFloat(random, 0.9f, 1.2f))) diff --git a/src/main/java/com/sammy/malum/visual_effects/networked/generic/HexingSmokeParticleEffect.java b/src/main/java/com/sammy/malum/visual_effects/networked/generic/HexingSmokeParticleEffect.java index f44bd240b..0a25ec7cf 100644 --- a/src/main/java/com/sammy/malum/visual_effects/networked/generic/HexingSmokeParticleEffect.java +++ b/src/main/java/com/sammy/malum/visual_effects/networked/generic/HexingSmokeParticleEffect.java @@ -1,20 +1,21 @@ package com.sammy.malum.visual_effects.networked.generic; -import com.sammy.malum.visual_effects.networked.*; -import com.sammy.malum.visual_effects.networked.data.*; -import net.minecraft.util.*; -import net.minecraftforge.api.distmarker.*; -import team.lodestar.lodestone.helpers.*; -import team.lodestar.lodestone.setup.*; -import team.lodestar.lodestone.systems.easing.*; -import team.lodestar.lodestone.systems.particle.builder.*; -import team.lodestar.lodestone.systems.particle.data.*; -import team.lodestar.lodestone.systems.particle.data.color.*; -import team.lodestar.lodestone.systems.particle.data.spin.*; +import com.sammy.malum.visual_effects.networked.ParticleEffectType; +import com.sammy.malum.visual_effects.networked.data.ColorEffectData; +import net.minecraft.util.Mth; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; +import team.lodestar.lodestone.helpers.ColorHelper; +import team.lodestar.lodestone.setup.LodestoneParticleRegistry; +import team.lodestar.lodestone.systems.easing.Easing; +import team.lodestar.lodestone.systems.particle.builder.WorldParticleBuilder; +import team.lodestar.lodestone.systems.particle.data.GenericParticleData; +import team.lodestar.lodestone.systems.particle.data.color.ColorParticleData; +import team.lodestar.lodestone.systems.particle.data.spin.SpinParticleData; import java.awt.*; -import java.util.function.*; +import java.util.function.Supplier; public class HexingSmokeParticleEffect extends ParticleEffectType { @@ -37,7 +38,7 @@ public Supplier get() { double posX = positionData.posX; double posY = positionData.posY; double posZ = positionData.posZ; - int adjustedLifespan = (int) (20 * (intensity)*0.6f); + int adjustedLifespan = (int) (20 * (intensity) * 0.6f); for (int i = 0; i <= 3; i++) { int spinDirection = (random.nextBoolean() ? 1 : -1); WorldParticleBuilder.create(LodestoneParticleRegistry.WISP_PARTICLE) @@ -50,7 +51,7 @@ public Supplier get() { .setRandomOffset(0.2f, 0.2f) .setRandomMotion(0.02f) .addActor(p -> p.setParticleMotion(p.getParticleSpeed().scale(0.95f))) - .repeat(level, posX, posY, posZ, (int) (4*intensity)); + .repeat(level, posX, posY, posZ, (int) (4 * intensity)); } WorldParticleBuilder.create(LodestoneParticleRegistry.WISP_PARTICLE) .setTransparencyData(GenericParticleData.create(0.02f, 0.05f, 0).build()) @@ -62,7 +63,7 @@ public Supplier get() { .setRandomOffset(0.05f, 0.05f) .setRandomMotion(0.05f) .addActor(p -> p.setParticleMotion(p.getParticleSpeed().scale(0.5f))) - .repeat(level, posX, posY, posZ, (int) (6*intensity)); + .repeat(level, posX, posY, posZ, (int) (6 * intensity)); WorldParticleBuilder.create(LodestoneParticleRegistry.SMOKE_PARTICLE) .setTransparencyData(GenericParticleData.create(0, 0.05f, 0).build()) .setSpinData(SpinParticleData.create(0.1f, 0.25f, 0).setEasing(Easing.QUINTIC_OUT, Easing.SINE_IN).build()) @@ -73,7 +74,7 @@ public Supplier get() { .setRandomOffset(0.15f, 0.15f) .setRandomMotion(0.015f, 0.015f) .addActor(p -> p.setParticleMotion(p.getParticleSpeed().scale(0.92f))) - .repeat(level, posX, posY, posZ, (int) (10*intensity)); + .repeat(level, posX, posY, posZ, (int) (10 * intensity)); }; } } \ No newline at end of file diff --git a/src/main/java/com/sammy/malum/visual_effects/networked/generic/RisingSparklesParticleEffect.java b/src/main/java/com/sammy/malum/visual_effects/networked/generic/RisingSparklesParticleEffect.java index 1642c0f43..7ee0bfe06 100644 --- a/src/main/java/com/sammy/malum/visual_effects/networked/generic/RisingSparklesParticleEffect.java +++ b/src/main/java/com/sammy/malum/visual_effects/networked/generic/RisingSparklesParticleEffect.java @@ -1,21 +1,22 @@ package com.sammy.malum.visual_effects.networked.generic; -import com.sammy.malum.visual_effects.networked.*; -import com.sammy.malum.visual_effects.networked.data.*; -import net.minecraft.util.*; -import net.minecraftforge.api.distmarker.*; -import team.lodestar.lodestone.helpers.*; -import team.lodestar.lodestone.setup.*; -import team.lodestar.lodestone.systems.easing.*; -import team.lodestar.lodestone.systems.particle.*; -import team.lodestar.lodestone.systems.particle.builder.*; -import team.lodestar.lodestone.systems.particle.data.*; -import team.lodestar.lodestone.systems.particle.data.color.*; -import team.lodestar.lodestone.systems.particle.data.spin.*; +import com.sammy.malum.visual_effects.networked.ParticleEffectType; +import com.sammy.malum.visual_effects.networked.data.ColorEffectData; +import net.minecraft.util.Mth; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; +import team.lodestar.lodestone.helpers.ColorHelper; +import team.lodestar.lodestone.setup.LodestoneParticleRegistry; +import team.lodestar.lodestone.systems.easing.Easing; +import team.lodestar.lodestone.systems.particle.SimpleParticleOptions; +import team.lodestar.lodestone.systems.particle.builder.WorldParticleBuilder; +import team.lodestar.lodestone.systems.particle.data.GenericParticleData; +import team.lodestar.lodestone.systems.particle.data.color.ColorParticleData; +import team.lodestar.lodestone.systems.particle.data.spin.SpinParticleData; import java.awt.*; -import java.util.function.*; +import java.util.function.Supplier; public class RisingSparklesParticleEffect extends ParticleEffectType { diff --git a/src/main/java/com/sammy/malum/visual_effects/networked/weeping_well/WeepingWellReactionParticleEffect.java b/src/main/java/com/sammy/malum/visual_effects/networked/weeping_well/WeepingWellReactionParticleEffect.java index 3c667d03f..12490f9ae 100644 --- a/src/main/java/com/sammy/malum/visual_effects/networked/weeping_well/WeepingWellReactionParticleEffect.java +++ b/src/main/java/com/sammy/malum/visual_effects/networked/weeping_well/WeepingWellReactionParticleEffect.java @@ -1,20 +1,21 @@ package com.sammy.malum.visual_effects.networked.weeping_well; -import com.sammy.malum.visual_effects.networked.*; -import net.minecraft.util.*; -import net.minecraftforge.api.distmarker.*; -import team.lodestar.lodestone.helpers.*; -import team.lodestar.lodestone.setup.*; -import team.lodestar.lodestone.systems.easing.*; -import team.lodestar.lodestone.systems.particle.*; -import team.lodestar.lodestone.systems.particle.builder.*; -import team.lodestar.lodestone.systems.particle.data.*; -import team.lodestar.lodestone.systems.particle.data.color.*; -import team.lodestar.lodestone.systems.particle.data.spin.*; -import team.lodestar.lodestone.systems.particle.render_types.*; +import com.sammy.malum.visual_effects.networked.ParticleEffectType; +import net.minecraft.util.Mth; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; +import team.lodestar.lodestone.helpers.ColorHelper; +import team.lodestar.lodestone.setup.LodestoneParticleRegistry; +import team.lodestar.lodestone.systems.easing.Easing; +import team.lodestar.lodestone.systems.particle.SimpleParticleOptions; +import team.lodestar.lodestone.systems.particle.builder.WorldParticleBuilder; +import team.lodestar.lodestone.systems.particle.data.GenericParticleData; +import team.lodestar.lodestone.systems.particle.data.color.ColorParticleData; +import team.lodestar.lodestone.systems.particle.data.spin.SpinParticleData; +import team.lodestar.lodestone.systems.particle.render_types.LodestoneWorldParticleRenderType; import java.awt.*; -import java.util.function.*; +import java.util.function.Supplier; public class WeepingWellReactionParticleEffect extends ParticleEffectType { @@ -31,10 +32,10 @@ public Supplier get() { double posZ = positionData.posZ; for (int i = 0; i < 8; i++) { float multiplier = Mth.nextFloat(random, 0.1f, 1.5f); - Color color = new Color((int)(12*multiplier), (int)(4*multiplier), (int)(14*multiplier)); + Color color = new Color((int) (12 * multiplier), (int) (4 * multiplier), (int) (14 * multiplier)); int spinDirection = (random.nextBoolean() ? 1 : -1); int spinOffset = random.nextInt(360); - float motionMultiplier = (float) (1+Math.pow(random.nextFloat()+i*0.2f, 2)); + float motionMultiplier = (float) (1 + Math.pow(random.nextFloat() + i * 0.2f, 2)); float extraMotion = 0.2f * motionMultiplier * ((8 - i) / 8f); WorldParticleBuilder.create(LodestoneParticleRegistry.TWINKLE_PARTICLE) .setTransparencyData(GenericParticleData.create(0.2f, 1f, 0).build()) @@ -55,13 +56,13 @@ public Supplier get() { int spinOffset = random.nextInt(360); for (int i = 0; i < 4; i++) { float multiplier = Mth.nextFloat(random, 0.1f, 1.5f); - Color color = new Color((int)(4*multiplier), (int)(2*multiplier), (int)(4*multiplier)); + Color color = new Color((int) (4 * multiplier), (int) (2 * multiplier), (int) (4 * multiplier)); int spinDirection = (random.nextBoolean() ? 1 : -1); - float scaleMultiplier = (float) (1+Math.pow(random.nextFloat(), 2)); + float scaleMultiplier = (float) (1 + Math.pow(random.nextFloat(), 2)); WorldParticleBuilder.create(LodestoneParticleRegistry.SPARKLE_PARTICLE) .setTransparencyData(GenericParticleData.create(0.7f, 0.5f, 0).setEasing(Easing.SINE_IN, Easing.CIRC_IN).build()) .setSpinData(SpinParticleData.create((0.125f + random.nextFloat() * 0.075f) * spinDirection).setSpinOffset(spinOffset).build()) - .setScaleData(GenericParticleData.create(1.8f*scaleMultiplier, 0.6f, 0).setEasing(Easing.EXPO_OUT, Easing.SINE_IN).build()) + .setScaleData(GenericParticleData.create(1.8f * scaleMultiplier, 0.6f, 0).setEasing(Easing.EXPO_OUT, Easing.SINE_IN).build()) .setColorData(ColorParticleData.create(color.brighter(), color.darker()).build()) .setLifetime(25) .setRandomOffset(0.6f) diff --git a/src/main/resources/META-INF/accesstransformer.cfg b/src/main/resources/META-INF/accesstransformer.cfg index 33d2883d5..9fecf2d20 100644 --- a/src/main/resources/META-INF/accesstransformer.cfg +++ b/src/main/resources/META-INF/accesstransformer.cfg @@ -130,4 +130,6 @@ public net.minecraft.world.entity.decoration.ArmorStand m_31675_(Z)V # setShowAr public net.minecraft.world.item.ArmorItem f_265987_ -public net.minecraft.world.item.ArmorItem f_265987_ # ARMOR_MODIFIER_UUID_PER_TYPE \ No newline at end of file +public net.minecraft.world.item.ArmorItem f_265987_ # ARMOR_MODIFIER_UUID_PER_TYPE + +public-f net.minecraft.data.recipes.RecipeProvider m_6055_()Ljava/lang/String; # getName \ No newline at end of file diff --git a/src/main/resources/assets/malum/models/item/creative_scythe.json b/src/main/resources/assets/malum/models/item/creative_scythe.json index 3092e6690..a2621dc5f 100644 --- a/src/main/resources/assets/malum/models/item/creative_scythe.json +++ b/src/main/resources/assets/malum/models/item/creative_scythe.json @@ -1,6 +1,6 @@ { "parent": "item/handheld", - "loader": "forge:separate-perspective", + "loader": "forge:separate_transforms", "base": { "parent": "malum:item/creative_scythe_handheld" }, diff --git a/src/main/resources/assets/malum/models/item/crude_scythe.json b/src/main/resources/assets/malum/models/item/crude_scythe.json index f2ac259f0..8b37d75dc 100644 --- a/src/main/resources/assets/malum/models/item/crude_scythe.json +++ b/src/main/resources/assets/malum/models/item/crude_scythe.json @@ -1,6 +1,6 @@ { "parent": "item/handheld", - "loader": "forge:separate-perspective", + "loader": "forge:separate_transforms", "base": { "parent": "malum:item/crude_scythe_handheld" }, diff --git a/src/main/resources/assets/malum/models/item/soul_stained_steel_scythe.json b/src/main/resources/assets/malum/models/item/soul_stained_steel_scythe.json index 62bae9bda..99b2be176 100644 --- a/src/main/resources/assets/malum/models/item/soul_stained_steel_scythe.json +++ b/src/main/resources/assets/malum/models/item/soul_stained_steel_scythe.json @@ -1,6 +1,6 @@ { "parent": "item/handheld", - "loader": "forge:separate-perspective", + "loader": "forge:separate_transforms", "base": { "parent": "malum:item/soul_stained_steel_scythe_handheld" }, diff --git a/src/generated/resources/data/minecraft/tags/items/saplings.json b/src/main/resources/data/malum/tags/worldgen/biome/has_structure/weeping_well_biomes.json similarity index 57% rename from src/generated/resources/data/minecraft/tags/items/saplings.json rename to src/main/resources/data/malum/tags/worldgen/biome/has_structure/weeping_well_biomes.json index 16d4a4fb6..ae43694ad 100644 --- a/src/generated/resources/data/minecraft/tags/items/saplings.json +++ b/src/main/resources/data/malum/tags/worldgen/biome/has_structure/weeping_well_biomes.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "malum:runewood_sapling" + "#minecraft:is_overworld" ] } \ No newline at end of file