From 4d3b7e8249ca05da32b0a3945d8d644c49d67f5e Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Tue, 22 Sep 2020 15:01:16 +0200 Subject: [PATCH] everything but patchouli? --- .gitignore | 1 + build.gradle | 3 +++ .../assets/naturesaura/blockstates/ancient_bark.json | 4 ++-- .../assets/naturesaura/blockstates/ancient_log.json | 4 ++-- .../assets/naturesaura/models/block/ancient_bark.json | 2 +- .../naturesaura/models/block/ancient_bark_horizontal.json | 7 +++++++ .../assets/naturesaura/models/block/ancient_log.json | 2 +- .../naturesaura/models/block/ancient_log_horizontal.json | 7 +++++++ .../assets/naturesaura/models/block/ancient_planks.json | 2 +- .../assets/naturesaura/models/block/ancient_sapling.json | 2 +- .../assets/naturesaura/models/block/ancient_slab.json | 2 +- .../naturesaura/models/block/ancient_slab_double.json | 2 +- .../assets/naturesaura/models/block/ancient_slab_top.json | 2 +- .../assets/naturesaura/models/block/ancient_stairs.json | 2 +- .../naturesaura/models/block/ancient_stairs_inner.json | 2 +- .../naturesaura/models/block/ancient_stairs_outer.json | 2 +- .../assets/naturesaura/models/block/animal_generator.json | 2 +- .../assets/naturesaura/models/block/animal_spawner.json | 2 +- .../assets/naturesaura/models/block/aura_bloom.json | 2 +- .../assets/naturesaura/models/block/aura_cactus.json | 2 +- .../assets/naturesaura/models/block/aura_detector.json | 2 +- .../assets/naturesaura/models/block/auto_crafter.json | 2 +- .../assets/naturesaura/models/block/chorus_generator.json | 2 +- .../naturesaura/models/block/conversion_catalyst.json | 2 +- .../models/block/conversion_catalyst_nether.json | 2 +- .../naturesaura/models/block/crushing_catalyst.json | 2 +- .../models/block/crushing_catalyst_nether.json | 2 +- .../assets/naturesaura/models/block/end_flower.json | 2 +- .../assets/naturesaura/models/block/ender_crate.json | 2 +- .../naturesaura/models/block/firework_generator.json | 2 +- .../assets/naturesaura/models/block/flower_generator.json | 2 +- .../naturesaura/models/block/generator_limit_remover.json | 2 +- .../assets/naturesaura/models/block/gold_brick.json | 2 +- .../naturesaura/models/block/gold_nether_brick.json | 2 +- .../assets/naturesaura/models/block/hopper_upgrade.json | 2 +- .../assets/naturesaura/models/block/infused_brick.json | 2 +- .../naturesaura/models/block/infused_brick_slab.json | 2 +- .../models/block/infused_brick_slab_double.json | 2 +- .../naturesaura/models/block/infused_brick_slab_top.json | 2 +- .../naturesaura/models/block/infused_brick_stairs.json | 2 +- .../models/block/infused_brick_stairs_inner.json | 2 +- .../models/block/infused_brick_stairs_outer.json | 2 +- .../naturesaura/models/block/infused_iron_block.json | 2 +- .../assets/naturesaura/models/block/infused_slab.json | 2 +- .../naturesaura/models/block/infused_slab_double.json | 2 +- .../assets/naturesaura/models/block/infused_slab_top.json | 2 +- .../assets/naturesaura/models/block/infused_stairs.json | 2 +- .../naturesaura/models/block/infused_stairs_inner.json | 2 +- .../naturesaura/models/block/infused_stairs_outer.json | 2 +- .../assets/naturesaura/models/block/infused_stone.json | 2 +- .../assets/naturesaura/models/block/item_distributor.json | 2 +- .../resources/assets/naturesaura/models/block/light.json | 2 +- .../assets/naturesaura/models/block/moss_generator.json | 2 +- .../assets/naturesaura/models/block/nether_grass.json | 4 ++-- .../naturesaura/models/block/nether_wart_mushroom.json | 2 +- .../assets/naturesaura/models/block/oak_generator.json | 2 +- .../assets/naturesaura/models/block/pickup_stopper.json | 2 +- .../resources/assets/naturesaura/models/block/placer.json | 2 +- .../assets/naturesaura/models/block/potion_generator.json | 2 +- .../naturesaura/models/block/potted_aura_bloom.json | 2 +- .../naturesaura/models/block/potted_aura_cactus.json | 2 +- .../naturesaura/models/block/projectile_generator.json | 2 +- .../assets/naturesaura/models/block/rf_converter.json | 2 +- .../assets/naturesaura/models/block/snow_creator.json | 2 +- .../naturesaura/models/block/tainted_gold_block.json | 2 +- .../assets/naturesaura/models/block/time_changer.json | 2 +- .../assets/naturesaura/models/item/ancient_sapling.json | 2 +- .../assets/naturesaura/models/item/ancient_stick.json | 2 +- .../assets/naturesaura/models/item/aura_bloom.json | 2 +- .../assets/naturesaura/models/item/aura_bottle.json | 2 +- .../assets/naturesaura/models/item/aura_cache.json | 2 +- .../assets/naturesaura/models/item/aura_cactus.json | 2 +- .../assets/naturesaura/models/item/aura_trove.json | 2 +- .../assets/naturesaura/models/item/birth_spirit.json | 2 +- .../models/item/bottle_two_the_rebottling.json | 2 +- .../assets/naturesaura/models/item/break_prevention.json | 2 +- .../assets/naturesaura/models/item/calling_spirit.json | 2 +- .../assets/naturesaura/models/item/cave_finder.json | 2 +- .../assets/naturesaura/models/item/clock_hand.json | 2 +- .../assets/naturesaura/models/item/crimson_meal.json | 2 +- .../assets/naturesaura/models/item/death_ring.json | 2 +- .../naturesaura/models/item/dimension_rail_end.json | 2 +- .../naturesaura/models/item/dimension_rail_nether.json | 2 +- .../naturesaura/models/item/dimension_rail_overworld.json | 2 +- .../assets/naturesaura/models/item/effect_powder.json | 2 +- .../assets/naturesaura/models/item/end_city_finder.json | 2 +- .../assets/naturesaura/models/item/end_flower.json | 2 +- .../assets/naturesaura/models/item/ender_access.json | 2 +- .../resources/assets/naturesaura/models/item/eye.json | 2 +- .../assets/naturesaura/models/item/eye_improved.json | 2 +- .../assets/naturesaura/models/item/farming_stencil.json | 2 +- .../assets/naturesaura/models/item/fortress_finder.json | 2 +- .../assets/naturesaura/models/item/gold_fiber.json | 2 +- .../assets/naturesaura/models/item/gold_leaf.json | 2 +- .../assets/naturesaura/models/item/gold_powder.json | 2 +- .../assets/naturesaura/models/item/infused_iron.json | 2 +- .../assets/naturesaura/models/item/infused_iron_axe.json | 2 +- .../naturesaura/models/item/infused_iron_chest.json | 2 +- .../naturesaura/models/item/infused_iron_helmet.json | 2 +- .../assets/naturesaura/models/item/infused_iron_hoe.json | 2 +- .../naturesaura/models/item/infused_iron_pants.json | 2 +- .../naturesaura/models/item/infused_iron_pickaxe.json | 2 +- .../naturesaura/models/item/infused_iron_shoes.json | 2 +- .../naturesaura/models/item/infused_iron_shovel.json | 2 +- .../naturesaura/models/item/infused_iron_sword.json | 2 +- .../assets/naturesaura/models/item/light_staff.json | 2 +- .../assets/naturesaura/models/item/loot_finder.json | 2 +- .../assets/naturesaura/models/item/mover_cart.json | 2 +- .../assets/naturesaura/models/item/multiblock_maker.json | 2 +- .../assets/naturesaura/models/item/range_visualizer.json | 2 +- .../assets/naturesaura/models/item/shockwave_creator.json | 2 +- .../resources/assets/naturesaura/models/item/sky_axe.json | 2 +- .../assets/naturesaura/models/item/sky_chest.json | 2 +- .../assets/naturesaura/models/item/sky_helmet.json | 2 +- .../resources/assets/naturesaura/models/item/sky_hoe.json | 2 +- .../assets/naturesaura/models/item/sky_ingot.json | 2 +- .../assets/naturesaura/models/item/sky_pants.json | 2 +- .../assets/naturesaura/models/item/sky_pickaxe.json | 2 +- .../assets/naturesaura/models/item/sky_shoes.json | 2 +- .../assets/naturesaura/models/item/sky_shovel.json | 2 +- .../assets/naturesaura/models/item/sky_sword.json | 2 +- .../assets/naturesaura/models/item/tainted_gold.json | 2 +- .../assets/naturesaura/models/item/token_anger.json | 2 +- .../assets/naturesaura/models/item/token_euphoria.json | 2 +- .../assets/naturesaura/models/item/token_fear.json | 2 +- .../assets/naturesaura/models/item/token_grief.json | 2 +- .../assets/naturesaura/models/item/token_joy.json | 2 +- .../assets/naturesaura/models/item/token_rage.json | 2 +- .../assets/naturesaura/models/item/token_sorrow.json | 2 +- .../assets/naturesaura/models/item/token_terror.json | 2 +- src/generated/resources/data/curios/tags/items/belt.json | 7 ------- src/generated/resources/data/curios/tags/items/charm.json | 7 ------- .../resources/data/curios/tags/items/necklace.json | 6 ------ src/generated/resources/data/curios/tags/items/ring.json | 6 ------ .../naturesaura/blocks/BlockBlastFurnaceBooster.java | 2 +- .../ellpeck/naturesaura/blocks/BlockItemDistributor.java | 2 +- .../de/ellpeck/naturesaura/blocks/BlockSnowCreator.java | 2 +- .../ellpeck/naturesaura/blocks/tiles/TileEntityImpl.java | 3 ++- .../ellpeck/naturesaura/chunk/effect/OreSpawnEffect.java | 1 - .../naturesaura/compat/patchouli/ProcessorAltar.java | 8 ++++---- .../compat/patchouli/ProcessorAnimalSpawner.java | 6 +++--- .../naturesaura/compat/patchouli/ProcessorOffering.java | 4 ++-- .../naturesaura/compat/patchouli/ProcessorTreeRitual.java | 6 +++--- src/main/resources/META-INF/mods.toml | 1 + 144 files changed, 165 insertions(+), 172 deletions(-) create mode 100644 src/generated/resources/assets/naturesaura/models/block/ancient_bark_horizontal.json create mode 100644 src/generated/resources/assets/naturesaura/models/block/ancient_log_horizontal.json delete mode 100644 src/generated/resources/data/curios/tags/items/belt.json delete mode 100644 src/generated/resources/data/curios/tags/items/charm.json delete mode 100644 src/generated/resources/data/curios/tags/items/necklace.json delete mode 100644 src/generated/resources/data/curios/tags/items/ring.json diff --git a/.gitignore b/.gitignore index 96a7fcf3..d46346a6 100644 --- a/.gitignore +++ b/.gitignore @@ -12,6 +12,7 @@ /classes /bin/ /run/ +/logs *.classpath *.project diff --git a/build.gradle b/build.gradle index 0112871c..add4bab3 100644 --- a/build.gradle +++ b/build.gradle @@ -34,6 +34,7 @@ minecraft { // Recommended logging level for the console property 'forge.logging.console.level', 'info' + property 'mixin.env.disableRefMap', 'true' mods { naturesaura { @@ -50,6 +51,7 @@ minecraft { // Recommended logging level for the console property 'forge.logging.console.level', 'info' + property 'mixin.env.disableRefMap', 'true' mods { naturesaura { @@ -66,6 +68,7 @@ minecraft { // Recommended logging level for the console property 'forge.logging.console.level', 'info' + property 'mixin.env.disableRefMap', 'true' args '--mod', 'naturesaura', '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/'), '--existing', file('src/generated/resources') diff --git a/src/generated/resources/assets/naturesaura/blockstates/ancient_bark.json b/src/generated/resources/assets/naturesaura/blockstates/ancient_bark.json index ad74d19b..744871e6 100644 --- a/src/generated/resources/assets/naturesaura/blockstates/ancient_bark.json +++ b/src/generated/resources/assets/naturesaura/blockstates/ancient_bark.json @@ -1,7 +1,7 @@ { "variants": { "axis=x": { - "model": "naturesaura:block/ancient_bark", + "model": "naturesaura:block/ancient_bark_horizontal", "x": 90, "y": 90 }, @@ -9,7 +9,7 @@ "model": "naturesaura:block/ancient_bark" }, "axis=z": { - "model": "naturesaura:block/ancient_bark", + "model": "naturesaura:block/ancient_bark_horizontal", "x": 90 } } diff --git a/src/generated/resources/assets/naturesaura/blockstates/ancient_log.json b/src/generated/resources/assets/naturesaura/blockstates/ancient_log.json index 0c3eb251..216a8166 100644 --- a/src/generated/resources/assets/naturesaura/blockstates/ancient_log.json +++ b/src/generated/resources/assets/naturesaura/blockstates/ancient_log.json @@ -1,7 +1,7 @@ { "variants": { "axis=x": { - "model": "naturesaura:block/ancient_log", + "model": "naturesaura:block/ancient_log_horizontal", "x": 90, "y": 90 }, @@ -9,7 +9,7 @@ "model": "naturesaura:block/ancient_log" }, "axis=z": { - "model": "naturesaura:block/ancient_log", + "model": "naturesaura:block/ancient_log_horizontal", "x": 90 } } diff --git a/src/generated/resources/assets/naturesaura/models/block/ancient_bark.json b/src/generated/resources/assets/naturesaura/models/block/ancient_bark.json index b3f82b74..c4ffa4c1 100644 --- a/src/generated/resources/assets/naturesaura/models/block/ancient_bark.json +++ b/src/generated/resources/assets/naturesaura/models/block/ancient_bark.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_column", + "parent": "minecraft:block/cube_column", "textures": { "side": "naturesaura:block/ancient_bark", "end": "naturesaura:block/ancient_bark_top" diff --git a/src/generated/resources/assets/naturesaura/models/block/ancient_bark_horizontal.json b/src/generated/resources/assets/naturesaura/models/block/ancient_bark_horizontal.json new file mode 100644 index 00000000..b50b90ff --- /dev/null +++ b/src/generated/resources/assets/naturesaura/models/block/ancient_bark_horizontal.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column_horizontal", + "textures": { + "side": "naturesaura:block/ancient_bark", + "end": "naturesaura:block/ancient_bark_top" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/block/ancient_log.json b/src/generated/resources/assets/naturesaura/models/block/ancient_log.json index 198cf1b4..7282c0b5 100644 --- a/src/generated/resources/assets/naturesaura/models/block/ancient_log.json +++ b/src/generated/resources/assets/naturesaura/models/block/ancient_log.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_column", + "parent": "minecraft:block/cube_column", "textures": { "side": "naturesaura:block/ancient_log", "end": "naturesaura:block/ancient_log_top" diff --git a/src/generated/resources/assets/naturesaura/models/block/ancient_log_horizontal.json b/src/generated/resources/assets/naturesaura/models/block/ancient_log_horizontal.json new file mode 100644 index 00000000..bac07f83 --- /dev/null +++ b/src/generated/resources/assets/naturesaura/models/block/ancient_log_horizontal.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column_horizontal", + "textures": { + "side": "naturesaura:block/ancient_log", + "end": "naturesaura:block/ancient_log_top" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/block/ancient_planks.json b/src/generated/resources/assets/naturesaura/models/block/ancient_planks.json index 5abde497..c886e5b4 100644 --- a/src/generated/resources/assets/naturesaura/models/block/ancient_planks.json +++ b/src/generated/resources/assets/naturesaura/models/block/ancient_planks.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_all", + "parent": "minecraft:block/cube_all", "textures": { "all": "naturesaura:block/ancient_planks" } diff --git a/src/generated/resources/assets/naturesaura/models/block/ancient_sapling.json b/src/generated/resources/assets/naturesaura/models/block/ancient_sapling.json index cac484b0..d648494f 100644 --- a/src/generated/resources/assets/naturesaura/models/block/ancient_sapling.json +++ b/src/generated/resources/assets/naturesaura/models/block/ancient_sapling.json @@ -1,5 +1,5 @@ { - "parent": "block/cross", + "parent": "minecraft:block/cross", "textures": { "cross": "naturesaura:block/ancient_sapling" } diff --git a/src/generated/resources/assets/naturesaura/models/block/ancient_slab.json b/src/generated/resources/assets/naturesaura/models/block/ancient_slab.json index d8f9dff2..c7efbe7e 100644 --- a/src/generated/resources/assets/naturesaura/models/block/ancient_slab.json +++ b/src/generated/resources/assets/naturesaura/models/block/ancient_slab.json @@ -1,5 +1,5 @@ { - "parent": "block/slab", + "parent": "minecraft:block/slab", "textures": { "side": "naturesaura:block/ancient_planks", "bottom": "naturesaura:block/ancient_planks", diff --git a/src/generated/resources/assets/naturesaura/models/block/ancient_slab_double.json b/src/generated/resources/assets/naturesaura/models/block/ancient_slab_double.json index 5abde497..c886e5b4 100644 --- a/src/generated/resources/assets/naturesaura/models/block/ancient_slab_double.json +++ b/src/generated/resources/assets/naturesaura/models/block/ancient_slab_double.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_all", + "parent": "minecraft:block/cube_all", "textures": { "all": "naturesaura:block/ancient_planks" } diff --git a/src/generated/resources/assets/naturesaura/models/block/ancient_slab_top.json b/src/generated/resources/assets/naturesaura/models/block/ancient_slab_top.json index 583e2c23..9c93d741 100644 --- a/src/generated/resources/assets/naturesaura/models/block/ancient_slab_top.json +++ b/src/generated/resources/assets/naturesaura/models/block/ancient_slab_top.json @@ -1,5 +1,5 @@ { - "parent": "block/slab_top", + "parent": "minecraft:block/slab_top", "textures": { "side": "naturesaura:block/ancient_planks", "bottom": "naturesaura:block/ancient_planks", diff --git a/src/generated/resources/assets/naturesaura/models/block/ancient_stairs.json b/src/generated/resources/assets/naturesaura/models/block/ancient_stairs.json index 9fcaf2a9..af5b0037 100644 --- a/src/generated/resources/assets/naturesaura/models/block/ancient_stairs.json +++ b/src/generated/resources/assets/naturesaura/models/block/ancient_stairs.json @@ -1,5 +1,5 @@ { - "parent": "block/stairs", + "parent": "minecraft:block/stairs", "textures": { "side": "naturesaura:block/ancient_planks", "bottom": "naturesaura:block/ancient_planks", diff --git a/src/generated/resources/assets/naturesaura/models/block/ancient_stairs_inner.json b/src/generated/resources/assets/naturesaura/models/block/ancient_stairs_inner.json index 421b34d2..6cb801ef 100644 --- a/src/generated/resources/assets/naturesaura/models/block/ancient_stairs_inner.json +++ b/src/generated/resources/assets/naturesaura/models/block/ancient_stairs_inner.json @@ -1,5 +1,5 @@ { - "parent": "block/inner_stairs", + "parent": "minecraft:block/inner_stairs", "textures": { "side": "naturesaura:block/ancient_planks", "bottom": "naturesaura:block/ancient_planks", diff --git a/src/generated/resources/assets/naturesaura/models/block/ancient_stairs_outer.json b/src/generated/resources/assets/naturesaura/models/block/ancient_stairs_outer.json index ba5bed94..2a899288 100644 --- a/src/generated/resources/assets/naturesaura/models/block/ancient_stairs_outer.json +++ b/src/generated/resources/assets/naturesaura/models/block/ancient_stairs_outer.json @@ -1,5 +1,5 @@ { - "parent": "block/outer_stairs", + "parent": "minecraft:block/outer_stairs", "textures": { "side": "naturesaura:block/ancient_planks", "bottom": "naturesaura:block/ancient_planks", diff --git a/src/generated/resources/assets/naturesaura/models/block/animal_generator.json b/src/generated/resources/assets/naturesaura/models/block/animal_generator.json index 6ff38d80..c70e780e 100644 --- a/src/generated/resources/assets/naturesaura/models/block/animal_generator.json +++ b/src/generated/resources/assets/naturesaura/models/block/animal_generator.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_bottom_top", + "parent": "minecraft:block/cube_bottom_top", "textures": { "side": "naturesaura:block/animal_generator", "bottom": "naturesaura:block/animal_generator_bottom", diff --git a/src/generated/resources/assets/naturesaura/models/block/animal_spawner.json b/src/generated/resources/assets/naturesaura/models/block/animal_spawner.json index 2948956b..57727d48 100644 --- a/src/generated/resources/assets/naturesaura/models/block/animal_spawner.json +++ b/src/generated/resources/assets/naturesaura/models/block/animal_spawner.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_all", + "parent": "minecraft:block/cube_all", "textures": { "all": "naturesaura:block/animal_spawner" } diff --git a/src/generated/resources/assets/naturesaura/models/block/aura_bloom.json b/src/generated/resources/assets/naturesaura/models/block/aura_bloom.json index 0214762c..8e1a6f08 100644 --- a/src/generated/resources/assets/naturesaura/models/block/aura_bloom.json +++ b/src/generated/resources/assets/naturesaura/models/block/aura_bloom.json @@ -1,5 +1,5 @@ { - "parent": "block/cross", + "parent": "minecraft:block/cross", "textures": { "cross": "naturesaura:block/aura_bloom" } diff --git a/src/generated/resources/assets/naturesaura/models/block/aura_cactus.json b/src/generated/resources/assets/naturesaura/models/block/aura_cactus.json index aff259a0..f5288f05 100644 --- a/src/generated/resources/assets/naturesaura/models/block/aura_cactus.json +++ b/src/generated/resources/assets/naturesaura/models/block/aura_cactus.json @@ -1,5 +1,5 @@ { - "parent": "block/cross", + "parent": "minecraft:block/cross", "textures": { "cross": "naturesaura:block/aura_cactus" } diff --git a/src/generated/resources/assets/naturesaura/models/block/aura_detector.json b/src/generated/resources/assets/naturesaura/models/block/aura_detector.json index 4e13b716..de04dd52 100644 --- a/src/generated/resources/assets/naturesaura/models/block/aura_detector.json +++ b/src/generated/resources/assets/naturesaura/models/block/aura_detector.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_all", + "parent": "minecraft:block/cube_all", "textures": { "all": "naturesaura:block/aura_detector" } diff --git a/src/generated/resources/assets/naturesaura/models/block/auto_crafter.json b/src/generated/resources/assets/naturesaura/models/block/auto_crafter.json index 04207933..450f01e3 100644 --- a/src/generated/resources/assets/naturesaura/models/block/auto_crafter.json +++ b/src/generated/resources/assets/naturesaura/models/block/auto_crafter.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_bottom_top", + "parent": "minecraft:block/cube_bottom_top", "textures": { "side": "naturesaura:block/auto_crafter", "bottom": "naturesaura:block/auto_crafter_bottom", diff --git a/src/generated/resources/assets/naturesaura/models/block/chorus_generator.json b/src/generated/resources/assets/naturesaura/models/block/chorus_generator.json index 74ae7f7d..8a3feaf2 100644 --- a/src/generated/resources/assets/naturesaura/models/block/chorus_generator.json +++ b/src/generated/resources/assets/naturesaura/models/block/chorus_generator.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_bottom_top", + "parent": "minecraft:block/cube_bottom_top", "textures": { "side": "naturesaura:block/chorus_generator", "bottom": "naturesaura:block/chorus_generator", diff --git a/src/generated/resources/assets/naturesaura/models/block/conversion_catalyst.json b/src/generated/resources/assets/naturesaura/models/block/conversion_catalyst.json index b01e9209..f3d27a8e 100644 --- a/src/generated/resources/assets/naturesaura/models/block/conversion_catalyst.json +++ b/src/generated/resources/assets/naturesaura/models/block/conversion_catalyst.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_all", + "parent": "minecraft:block/cube_all", "textures": { "all": "naturesaura:block/conversion_catalyst" } diff --git a/src/generated/resources/assets/naturesaura/models/block/conversion_catalyst_nether.json b/src/generated/resources/assets/naturesaura/models/block/conversion_catalyst_nether.json index 7e2060fd..28197deb 100644 --- a/src/generated/resources/assets/naturesaura/models/block/conversion_catalyst_nether.json +++ b/src/generated/resources/assets/naturesaura/models/block/conversion_catalyst_nether.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_all", + "parent": "minecraft:block/cube_all", "textures": { "all": "naturesaura:block/conversion_catalyst_nether" } diff --git a/src/generated/resources/assets/naturesaura/models/block/crushing_catalyst.json b/src/generated/resources/assets/naturesaura/models/block/crushing_catalyst.json index 5fd2b436..84d25202 100644 --- a/src/generated/resources/assets/naturesaura/models/block/crushing_catalyst.json +++ b/src/generated/resources/assets/naturesaura/models/block/crushing_catalyst.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_all", + "parent": "minecraft:block/cube_all", "textures": { "all": "naturesaura:block/crushing_catalyst" } diff --git a/src/generated/resources/assets/naturesaura/models/block/crushing_catalyst_nether.json b/src/generated/resources/assets/naturesaura/models/block/crushing_catalyst_nether.json index dcca3588..7fe756e9 100644 --- a/src/generated/resources/assets/naturesaura/models/block/crushing_catalyst_nether.json +++ b/src/generated/resources/assets/naturesaura/models/block/crushing_catalyst_nether.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_all", + "parent": "minecraft:block/cube_all", "textures": { "all": "naturesaura:block/crushing_catalyst_nether" } diff --git a/src/generated/resources/assets/naturesaura/models/block/end_flower.json b/src/generated/resources/assets/naturesaura/models/block/end_flower.json index a0d686c3..0f3eaca2 100644 --- a/src/generated/resources/assets/naturesaura/models/block/end_flower.json +++ b/src/generated/resources/assets/naturesaura/models/block/end_flower.json @@ -1,5 +1,5 @@ { - "parent": "block/cross", + "parent": "minecraft:block/cross", "textures": { "cross": "naturesaura:block/end_flower" } diff --git a/src/generated/resources/assets/naturesaura/models/block/ender_crate.json b/src/generated/resources/assets/naturesaura/models/block/ender_crate.json index 3ca0a7c8..03ed9a30 100644 --- a/src/generated/resources/assets/naturesaura/models/block/ender_crate.json +++ b/src/generated/resources/assets/naturesaura/models/block/ender_crate.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_bottom_top", + "parent": "minecraft:block/cube_bottom_top", "textures": { "side": "naturesaura:block/ender_crate", "bottom": "naturesaura:block/ender_crate_bottom", diff --git a/src/generated/resources/assets/naturesaura/models/block/firework_generator.json b/src/generated/resources/assets/naturesaura/models/block/firework_generator.json index fccefa7d..e6bb49c5 100644 --- a/src/generated/resources/assets/naturesaura/models/block/firework_generator.json +++ b/src/generated/resources/assets/naturesaura/models/block/firework_generator.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_bottom_top", + "parent": "minecraft:block/cube_bottom_top", "textures": { "side": "naturesaura:block/firework_generator", "bottom": "naturesaura:block/firework_generator_top", diff --git a/src/generated/resources/assets/naturesaura/models/block/flower_generator.json b/src/generated/resources/assets/naturesaura/models/block/flower_generator.json index 664845cd..d1760109 100644 --- a/src/generated/resources/assets/naturesaura/models/block/flower_generator.json +++ b/src/generated/resources/assets/naturesaura/models/block/flower_generator.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_bottom_top", + "parent": "minecraft:block/cube_bottom_top", "textures": { "side": "naturesaura:block/flower_generator", "bottom": "naturesaura:block/flower_generator_top", diff --git a/src/generated/resources/assets/naturesaura/models/block/generator_limit_remover.json b/src/generated/resources/assets/naturesaura/models/block/generator_limit_remover.json index 9b0027e6..fca0f135 100644 --- a/src/generated/resources/assets/naturesaura/models/block/generator_limit_remover.json +++ b/src/generated/resources/assets/naturesaura/models/block/generator_limit_remover.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_bottom_top", + "parent": "minecraft:block/cube_bottom_top", "textures": { "side": "naturesaura:block/generator_limit_remover", "bottom": "naturesaura:block/generator_limit_remover_top", diff --git a/src/generated/resources/assets/naturesaura/models/block/gold_brick.json b/src/generated/resources/assets/naturesaura/models/block/gold_brick.json index 409ea34c..9dcc1c8d 100644 --- a/src/generated/resources/assets/naturesaura/models/block/gold_brick.json +++ b/src/generated/resources/assets/naturesaura/models/block/gold_brick.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_all", + "parent": "minecraft:block/cube_all", "textures": { "all": "naturesaura:block/gold_brick" } diff --git a/src/generated/resources/assets/naturesaura/models/block/gold_nether_brick.json b/src/generated/resources/assets/naturesaura/models/block/gold_nether_brick.json index 46cb5c07..e0f7caaa 100644 --- a/src/generated/resources/assets/naturesaura/models/block/gold_nether_brick.json +++ b/src/generated/resources/assets/naturesaura/models/block/gold_nether_brick.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_all", + "parent": "minecraft:block/cube_all", "textures": { "all": "naturesaura:block/gold_nether_brick" } diff --git a/src/generated/resources/assets/naturesaura/models/block/hopper_upgrade.json b/src/generated/resources/assets/naturesaura/models/block/hopper_upgrade.json index 3094fef0..ed297336 100644 --- a/src/generated/resources/assets/naturesaura/models/block/hopper_upgrade.json +++ b/src/generated/resources/assets/naturesaura/models/block/hopper_upgrade.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_all", + "parent": "minecraft:block/cube_all", "textures": { "all": "naturesaura:block/hopper_upgrade" } diff --git a/src/generated/resources/assets/naturesaura/models/block/infused_brick.json b/src/generated/resources/assets/naturesaura/models/block/infused_brick.json index 05c92596..f19bed01 100644 --- a/src/generated/resources/assets/naturesaura/models/block/infused_brick.json +++ b/src/generated/resources/assets/naturesaura/models/block/infused_brick.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_all", + "parent": "minecraft:block/cube_all", "textures": { "all": "naturesaura:block/infused_brick" } diff --git a/src/generated/resources/assets/naturesaura/models/block/infused_brick_slab.json b/src/generated/resources/assets/naturesaura/models/block/infused_brick_slab.json index c4a605f3..0aafba94 100644 --- a/src/generated/resources/assets/naturesaura/models/block/infused_brick_slab.json +++ b/src/generated/resources/assets/naturesaura/models/block/infused_brick_slab.json @@ -1,5 +1,5 @@ { - "parent": "block/slab", + "parent": "minecraft:block/slab", "textures": { "side": "naturesaura:block/infused_brick", "bottom": "naturesaura:block/infused_brick", diff --git a/src/generated/resources/assets/naturesaura/models/block/infused_brick_slab_double.json b/src/generated/resources/assets/naturesaura/models/block/infused_brick_slab_double.json index 05c92596..f19bed01 100644 --- a/src/generated/resources/assets/naturesaura/models/block/infused_brick_slab_double.json +++ b/src/generated/resources/assets/naturesaura/models/block/infused_brick_slab_double.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_all", + "parent": "minecraft:block/cube_all", "textures": { "all": "naturesaura:block/infused_brick" } diff --git a/src/generated/resources/assets/naturesaura/models/block/infused_brick_slab_top.json b/src/generated/resources/assets/naturesaura/models/block/infused_brick_slab_top.json index 55a6c40d..ca0a0855 100644 --- a/src/generated/resources/assets/naturesaura/models/block/infused_brick_slab_top.json +++ b/src/generated/resources/assets/naturesaura/models/block/infused_brick_slab_top.json @@ -1,5 +1,5 @@ { - "parent": "block/slab_top", + "parent": "minecraft:block/slab_top", "textures": { "side": "naturesaura:block/infused_brick", "bottom": "naturesaura:block/infused_brick", diff --git a/src/generated/resources/assets/naturesaura/models/block/infused_brick_stairs.json b/src/generated/resources/assets/naturesaura/models/block/infused_brick_stairs.json index 1f3d6ec8..7c7cbe7f 100644 --- a/src/generated/resources/assets/naturesaura/models/block/infused_brick_stairs.json +++ b/src/generated/resources/assets/naturesaura/models/block/infused_brick_stairs.json @@ -1,5 +1,5 @@ { - "parent": "block/stairs", + "parent": "minecraft:block/stairs", "textures": { "side": "naturesaura:block/infused_brick", "bottom": "naturesaura:block/infused_brick", diff --git a/src/generated/resources/assets/naturesaura/models/block/infused_brick_stairs_inner.json b/src/generated/resources/assets/naturesaura/models/block/infused_brick_stairs_inner.json index e4d50221..ed5dccec 100644 --- a/src/generated/resources/assets/naturesaura/models/block/infused_brick_stairs_inner.json +++ b/src/generated/resources/assets/naturesaura/models/block/infused_brick_stairs_inner.json @@ -1,5 +1,5 @@ { - "parent": "block/inner_stairs", + "parent": "minecraft:block/inner_stairs", "textures": { "side": "naturesaura:block/infused_brick", "bottom": "naturesaura:block/infused_brick", diff --git a/src/generated/resources/assets/naturesaura/models/block/infused_brick_stairs_outer.json b/src/generated/resources/assets/naturesaura/models/block/infused_brick_stairs_outer.json index e8356ba0..181f580e 100644 --- a/src/generated/resources/assets/naturesaura/models/block/infused_brick_stairs_outer.json +++ b/src/generated/resources/assets/naturesaura/models/block/infused_brick_stairs_outer.json @@ -1,5 +1,5 @@ { - "parent": "block/outer_stairs", + "parent": "minecraft:block/outer_stairs", "textures": { "side": "naturesaura:block/infused_brick", "bottom": "naturesaura:block/infused_brick", diff --git a/src/generated/resources/assets/naturesaura/models/block/infused_iron_block.json b/src/generated/resources/assets/naturesaura/models/block/infused_iron_block.json index bb95949e..0f3b3b1f 100644 --- a/src/generated/resources/assets/naturesaura/models/block/infused_iron_block.json +++ b/src/generated/resources/assets/naturesaura/models/block/infused_iron_block.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_all", + "parent": "minecraft:block/cube_all", "textures": { "all": "naturesaura:block/infused_iron_block" } diff --git a/src/generated/resources/assets/naturesaura/models/block/infused_slab.json b/src/generated/resources/assets/naturesaura/models/block/infused_slab.json index 9807316b..84b42c5a 100644 --- a/src/generated/resources/assets/naturesaura/models/block/infused_slab.json +++ b/src/generated/resources/assets/naturesaura/models/block/infused_slab.json @@ -1,5 +1,5 @@ { - "parent": "block/slab", + "parent": "minecraft:block/slab", "textures": { "side": "naturesaura:block/infused_stone", "bottom": "naturesaura:block/infused_stone", diff --git a/src/generated/resources/assets/naturesaura/models/block/infused_slab_double.json b/src/generated/resources/assets/naturesaura/models/block/infused_slab_double.json index 0a1fe639..63901c32 100644 --- a/src/generated/resources/assets/naturesaura/models/block/infused_slab_double.json +++ b/src/generated/resources/assets/naturesaura/models/block/infused_slab_double.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_all", + "parent": "minecraft:block/cube_all", "textures": { "all": "naturesaura:block/infused_stone" } diff --git a/src/generated/resources/assets/naturesaura/models/block/infused_slab_top.json b/src/generated/resources/assets/naturesaura/models/block/infused_slab_top.json index 561a206d..553986ac 100644 --- a/src/generated/resources/assets/naturesaura/models/block/infused_slab_top.json +++ b/src/generated/resources/assets/naturesaura/models/block/infused_slab_top.json @@ -1,5 +1,5 @@ { - "parent": "block/slab_top", + "parent": "minecraft:block/slab_top", "textures": { "side": "naturesaura:block/infused_stone", "bottom": "naturesaura:block/infused_stone", diff --git a/src/generated/resources/assets/naturesaura/models/block/infused_stairs.json b/src/generated/resources/assets/naturesaura/models/block/infused_stairs.json index 422d1202..d9c199df 100644 --- a/src/generated/resources/assets/naturesaura/models/block/infused_stairs.json +++ b/src/generated/resources/assets/naturesaura/models/block/infused_stairs.json @@ -1,5 +1,5 @@ { - "parent": "block/stairs", + "parent": "minecraft:block/stairs", "textures": { "side": "naturesaura:block/infused_stone", "bottom": "naturesaura:block/infused_stone", diff --git a/src/generated/resources/assets/naturesaura/models/block/infused_stairs_inner.json b/src/generated/resources/assets/naturesaura/models/block/infused_stairs_inner.json index 3585070d..adf23770 100644 --- a/src/generated/resources/assets/naturesaura/models/block/infused_stairs_inner.json +++ b/src/generated/resources/assets/naturesaura/models/block/infused_stairs_inner.json @@ -1,5 +1,5 @@ { - "parent": "block/inner_stairs", + "parent": "minecraft:block/inner_stairs", "textures": { "side": "naturesaura:block/infused_stone", "bottom": "naturesaura:block/infused_stone", diff --git a/src/generated/resources/assets/naturesaura/models/block/infused_stairs_outer.json b/src/generated/resources/assets/naturesaura/models/block/infused_stairs_outer.json index abf7567e..7ba4dfb4 100644 --- a/src/generated/resources/assets/naturesaura/models/block/infused_stairs_outer.json +++ b/src/generated/resources/assets/naturesaura/models/block/infused_stairs_outer.json @@ -1,5 +1,5 @@ { - "parent": "block/outer_stairs", + "parent": "minecraft:block/outer_stairs", "textures": { "side": "naturesaura:block/infused_stone", "bottom": "naturesaura:block/infused_stone", diff --git a/src/generated/resources/assets/naturesaura/models/block/infused_stone.json b/src/generated/resources/assets/naturesaura/models/block/infused_stone.json index 0a1fe639..63901c32 100644 --- a/src/generated/resources/assets/naturesaura/models/block/infused_stone.json +++ b/src/generated/resources/assets/naturesaura/models/block/infused_stone.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_all", + "parent": "minecraft:block/cube_all", "textures": { "all": "naturesaura:block/infused_stone" } diff --git a/src/generated/resources/assets/naturesaura/models/block/item_distributor.json b/src/generated/resources/assets/naturesaura/models/block/item_distributor.json index 239f3257..ea498059 100644 --- a/src/generated/resources/assets/naturesaura/models/block/item_distributor.json +++ b/src/generated/resources/assets/naturesaura/models/block/item_distributor.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_bottom_top", + "parent": "minecraft:block/cube_bottom_top", "textures": { "side": "naturesaura:block/item_distributor", "bottom": "naturesaura:block/item_distributor_bottom", diff --git a/src/generated/resources/assets/naturesaura/models/block/light.json b/src/generated/resources/assets/naturesaura/models/block/light.json index d6918522..dd0cc42a 100644 --- a/src/generated/resources/assets/naturesaura/models/block/light.json +++ b/src/generated/resources/assets/naturesaura/models/block/light.json @@ -1,5 +1,5 @@ { - "parent": "block/air", + "parent": "minecraft:block/air", "textures": { "particle": "naturesaura:block/light" } diff --git a/src/generated/resources/assets/naturesaura/models/block/moss_generator.json b/src/generated/resources/assets/naturesaura/models/block/moss_generator.json index 961677ef..48e45fa8 100644 --- a/src/generated/resources/assets/naturesaura/models/block/moss_generator.json +++ b/src/generated/resources/assets/naturesaura/models/block/moss_generator.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_all", + "parent": "minecraft:block/cube_all", "textures": { "all": "naturesaura:block/moss_generator" } diff --git a/src/generated/resources/assets/naturesaura/models/block/nether_grass.json b/src/generated/resources/assets/naturesaura/models/block/nether_grass.json index 504839d9..284fe7d4 100644 --- a/src/generated/resources/assets/naturesaura/models/block/nether_grass.json +++ b/src/generated/resources/assets/naturesaura/models/block/nether_grass.json @@ -1,8 +1,8 @@ { - "parent": "block/cube_bottom_top", + "parent": "minecraft:block/cube_bottom_top", "textures": { "side": "naturesaura:block/nether_grass", - "bottom": "block/netherrack", + "bottom": "minecraft:block/netherrack", "top": "naturesaura:block/nether_grass_top" } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/block/nether_wart_mushroom.json b/src/generated/resources/assets/naturesaura/models/block/nether_wart_mushroom.json index c660e007..723c06e8 100644 --- a/src/generated/resources/assets/naturesaura/models/block/nether_wart_mushroom.json +++ b/src/generated/resources/assets/naturesaura/models/block/nether_wart_mushroom.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_all", + "parent": "minecraft:block/cube_all", "textures": { "all": "naturesaura:block/nether_wart_mushroom" } diff --git a/src/generated/resources/assets/naturesaura/models/block/oak_generator.json b/src/generated/resources/assets/naturesaura/models/block/oak_generator.json index bba28c74..f88316e8 100644 --- a/src/generated/resources/assets/naturesaura/models/block/oak_generator.json +++ b/src/generated/resources/assets/naturesaura/models/block/oak_generator.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_bottom_top", + "parent": "minecraft:block/cube_bottom_top", "textures": { "side": "naturesaura:block/oak_generator", "bottom": "naturesaura:block/oak_generator_bottom", diff --git a/src/generated/resources/assets/naturesaura/models/block/pickup_stopper.json b/src/generated/resources/assets/naturesaura/models/block/pickup_stopper.json index 971fff9e..7214f0d5 100644 --- a/src/generated/resources/assets/naturesaura/models/block/pickup_stopper.json +++ b/src/generated/resources/assets/naturesaura/models/block/pickup_stopper.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_bottom_top", + "parent": "minecraft:block/cube_bottom_top", "textures": { "side": "naturesaura:block/pickup_stopper", "bottom": "naturesaura:block/pickup_stopper_top", diff --git a/src/generated/resources/assets/naturesaura/models/block/placer.json b/src/generated/resources/assets/naturesaura/models/block/placer.json index 3dec3b35..157bf710 100644 --- a/src/generated/resources/assets/naturesaura/models/block/placer.json +++ b/src/generated/resources/assets/naturesaura/models/block/placer.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_bottom_top", + "parent": "minecraft:block/cube_bottom_top", "textures": { "side": "naturesaura:block/placer", "bottom": "naturesaura:block/placer_top", diff --git a/src/generated/resources/assets/naturesaura/models/block/potion_generator.json b/src/generated/resources/assets/naturesaura/models/block/potion_generator.json index 7dbafcee..620cd373 100644 --- a/src/generated/resources/assets/naturesaura/models/block/potion_generator.json +++ b/src/generated/resources/assets/naturesaura/models/block/potion_generator.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_bottom_top", + "parent": "minecraft:block/cube_bottom_top", "textures": { "side": "naturesaura:block/potion_generator", "bottom": "naturesaura:block/potion_generator_bottom", diff --git a/src/generated/resources/assets/naturesaura/models/block/potted_aura_bloom.json b/src/generated/resources/assets/naturesaura/models/block/potted_aura_bloom.json index f4ead497..6ae76e93 100644 --- a/src/generated/resources/assets/naturesaura/models/block/potted_aura_bloom.json +++ b/src/generated/resources/assets/naturesaura/models/block/potted_aura_bloom.json @@ -1,5 +1,5 @@ { - "parent": "block/flower_pot_cross", + "parent": "minecraft:block/flower_pot_cross", "textures": { "plant": "naturesaura:block/aura_bloom" } diff --git a/src/generated/resources/assets/naturesaura/models/block/potted_aura_cactus.json b/src/generated/resources/assets/naturesaura/models/block/potted_aura_cactus.json index 9d6eabcb..21baf53e 100644 --- a/src/generated/resources/assets/naturesaura/models/block/potted_aura_cactus.json +++ b/src/generated/resources/assets/naturesaura/models/block/potted_aura_cactus.json @@ -1,5 +1,5 @@ { - "parent": "block/flower_pot_cross", + "parent": "minecraft:block/flower_pot_cross", "textures": { "plant": "naturesaura:block/aura_cactus" } diff --git a/src/generated/resources/assets/naturesaura/models/block/projectile_generator.json b/src/generated/resources/assets/naturesaura/models/block/projectile_generator.json index 17af0a9a..9b0653ae 100644 --- a/src/generated/resources/assets/naturesaura/models/block/projectile_generator.json +++ b/src/generated/resources/assets/naturesaura/models/block/projectile_generator.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_bottom_top", + "parent": "minecraft:block/cube_bottom_top", "textures": { "side": "naturesaura:block/projectile_generator", "bottom": "naturesaura:block/projectile_generator_top", diff --git a/src/generated/resources/assets/naturesaura/models/block/rf_converter.json b/src/generated/resources/assets/naturesaura/models/block/rf_converter.json index 3839acdf..e263599d 100644 --- a/src/generated/resources/assets/naturesaura/models/block/rf_converter.json +++ b/src/generated/resources/assets/naturesaura/models/block/rf_converter.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_all", + "parent": "minecraft:block/cube_all", "textures": { "all": "naturesaura:block/rf_converter" } diff --git a/src/generated/resources/assets/naturesaura/models/block/snow_creator.json b/src/generated/resources/assets/naturesaura/models/block/snow_creator.json index 9fc7a394..afbb9964 100644 --- a/src/generated/resources/assets/naturesaura/models/block/snow_creator.json +++ b/src/generated/resources/assets/naturesaura/models/block/snow_creator.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_bottom_top", + "parent": "minecraft:block/cube_bottom_top", "textures": { "side": "naturesaura:block/snow_creator", "bottom": "naturesaura:block/snow_creator_top", diff --git a/src/generated/resources/assets/naturesaura/models/block/tainted_gold_block.json b/src/generated/resources/assets/naturesaura/models/block/tainted_gold_block.json index eab199b4..3c39853b 100644 --- a/src/generated/resources/assets/naturesaura/models/block/tainted_gold_block.json +++ b/src/generated/resources/assets/naturesaura/models/block/tainted_gold_block.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_all", + "parent": "minecraft:block/cube_all", "textures": { "all": "naturesaura:block/tainted_gold_block" } diff --git a/src/generated/resources/assets/naturesaura/models/block/time_changer.json b/src/generated/resources/assets/naturesaura/models/block/time_changer.json index 382e00e5..c0d12ffc 100644 --- a/src/generated/resources/assets/naturesaura/models/block/time_changer.json +++ b/src/generated/resources/assets/naturesaura/models/block/time_changer.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_bottom_top", + "parent": "minecraft:block/cube_bottom_top", "textures": { "side": "naturesaura:block/time_changer", "bottom": "naturesaura:block/time_changer_bottom", diff --git a/src/generated/resources/assets/naturesaura/models/item/ancient_sapling.json b/src/generated/resources/assets/naturesaura/models/item/ancient_sapling.json index fd51bc8c..8eaece4a 100644 --- a/src/generated/resources/assets/naturesaura/models/item/ancient_sapling.json +++ b/src/generated/resources/assets/naturesaura/models/item/ancient_sapling.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "naturesaura:block/ancient_sapling" } diff --git a/src/generated/resources/assets/naturesaura/models/item/ancient_stick.json b/src/generated/resources/assets/naturesaura/models/item/ancient_stick.json index 48ac81f0..0d5a2d77 100644 --- a/src/generated/resources/assets/naturesaura/models/item/ancient_stick.json +++ b/src/generated/resources/assets/naturesaura/models/item/ancient_stick.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "naturesaura:item/ancient_stick" } diff --git a/src/generated/resources/assets/naturesaura/models/item/aura_bloom.json b/src/generated/resources/assets/naturesaura/models/item/aura_bloom.json index eba23390..aecde4dc 100644 --- a/src/generated/resources/assets/naturesaura/models/item/aura_bloom.json +++ b/src/generated/resources/assets/naturesaura/models/item/aura_bloom.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "naturesaura:block/aura_bloom" } diff --git a/src/generated/resources/assets/naturesaura/models/item/aura_bottle.json b/src/generated/resources/assets/naturesaura/models/item/aura_bottle.json index bf92d8ba..1a58836c 100644 --- a/src/generated/resources/assets/naturesaura/models/item/aura_bottle.json +++ b/src/generated/resources/assets/naturesaura/models/item/aura_bottle.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "naturesaura:item/aura_bottle", "layer1": "naturesaura:item/aura_bottle_overlay" diff --git a/src/generated/resources/assets/naturesaura/models/item/aura_cache.json b/src/generated/resources/assets/naturesaura/models/item/aura_cache.json index c31da113..81b4d6e2 100644 --- a/src/generated/resources/assets/naturesaura/models/item/aura_cache.json +++ b/src/generated/resources/assets/naturesaura/models/item/aura_cache.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "naturesaura:item/aura_cache" } diff --git a/src/generated/resources/assets/naturesaura/models/item/aura_cactus.json b/src/generated/resources/assets/naturesaura/models/item/aura_cactus.json index b76a3ac9..e21db5bd 100644 --- a/src/generated/resources/assets/naturesaura/models/item/aura_cactus.json +++ b/src/generated/resources/assets/naturesaura/models/item/aura_cactus.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "naturesaura:block/aura_cactus" } diff --git a/src/generated/resources/assets/naturesaura/models/item/aura_trove.json b/src/generated/resources/assets/naturesaura/models/item/aura_trove.json index 54c429d0..a05a6637 100644 --- a/src/generated/resources/assets/naturesaura/models/item/aura_trove.json +++ b/src/generated/resources/assets/naturesaura/models/item/aura_trove.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "naturesaura:item/aura_trove" } diff --git a/src/generated/resources/assets/naturesaura/models/item/birth_spirit.json b/src/generated/resources/assets/naturesaura/models/item/birth_spirit.json index 890403c5..ac25ab77 100644 --- a/src/generated/resources/assets/naturesaura/models/item/birth_spirit.json +++ b/src/generated/resources/assets/naturesaura/models/item/birth_spirit.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "naturesaura:item/birth_spirit" } diff --git a/src/generated/resources/assets/naturesaura/models/item/bottle_two_the_rebottling.json b/src/generated/resources/assets/naturesaura/models/item/bottle_two_the_rebottling.json index bb5fb982..da5c439f 100644 --- a/src/generated/resources/assets/naturesaura/models/item/bottle_two_the_rebottling.json +++ b/src/generated/resources/assets/naturesaura/models/item/bottle_two_the_rebottling.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "naturesaura:item/bottle_two_the_rebottling" } diff --git a/src/generated/resources/assets/naturesaura/models/item/break_prevention.json b/src/generated/resources/assets/naturesaura/models/item/break_prevention.json index da2e36b1..6403020f 100644 --- a/src/generated/resources/assets/naturesaura/models/item/break_prevention.json +++ b/src/generated/resources/assets/naturesaura/models/item/break_prevention.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "naturesaura:item/break_prevention" } diff --git a/src/generated/resources/assets/naturesaura/models/item/calling_spirit.json b/src/generated/resources/assets/naturesaura/models/item/calling_spirit.json index a5ef1427..68787bab 100644 --- a/src/generated/resources/assets/naturesaura/models/item/calling_spirit.json +++ b/src/generated/resources/assets/naturesaura/models/item/calling_spirit.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "naturesaura:item/calling_spirit" } diff --git a/src/generated/resources/assets/naturesaura/models/item/cave_finder.json b/src/generated/resources/assets/naturesaura/models/item/cave_finder.json index c544dac2..66b70dad 100644 --- a/src/generated/resources/assets/naturesaura/models/item/cave_finder.json +++ b/src/generated/resources/assets/naturesaura/models/item/cave_finder.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "naturesaura:item/cave_finder" } diff --git a/src/generated/resources/assets/naturesaura/models/item/clock_hand.json b/src/generated/resources/assets/naturesaura/models/item/clock_hand.json index ac32e41f..f2124842 100644 --- a/src/generated/resources/assets/naturesaura/models/item/clock_hand.json +++ b/src/generated/resources/assets/naturesaura/models/item/clock_hand.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "naturesaura:item/clock_hand" } diff --git a/src/generated/resources/assets/naturesaura/models/item/crimson_meal.json b/src/generated/resources/assets/naturesaura/models/item/crimson_meal.json index ecb5349d..4b834866 100644 --- a/src/generated/resources/assets/naturesaura/models/item/crimson_meal.json +++ b/src/generated/resources/assets/naturesaura/models/item/crimson_meal.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "naturesaura:item/crimson_meal" } diff --git a/src/generated/resources/assets/naturesaura/models/item/death_ring.json b/src/generated/resources/assets/naturesaura/models/item/death_ring.json index 0600bbd4..edc43816 100644 --- a/src/generated/resources/assets/naturesaura/models/item/death_ring.json +++ b/src/generated/resources/assets/naturesaura/models/item/death_ring.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "naturesaura:item/death_ring" } diff --git a/src/generated/resources/assets/naturesaura/models/item/dimension_rail_end.json b/src/generated/resources/assets/naturesaura/models/item/dimension_rail_end.json index 9f34bc9c..4bf477fb 100644 --- a/src/generated/resources/assets/naturesaura/models/item/dimension_rail_end.json +++ b/src/generated/resources/assets/naturesaura/models/item/dimension_rail_end.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "naturesaura:block/dimension_rail_end" } diff --git a/src/generated/resources/assets/naturesaura/models/item/dimension_rail_nether.json b/src/generated/resources/assets/naturesaura/models/item/dimension_rail_nether.json index b84e06e7..99eb513f 100644 --- a/src/generated/resources/assets/naturesaura/models/item/dimension_rail_nether.json +++ b/src/generated/resources/assets/naturesaura/models/item/dimension_rail_nether.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "naturesaura:block/dimension_rail_nether" } diff --git a/src/generated/resources/assets/naturesaura/models/item/dimension_rail_overworld.json b/src/generated/resources/assets/naturesaura/models/item/dimension_rail_overworld.json index ea00ce07..6910738a 100644 --- a/src/generated/resources/assets/naturesaura/models/item/dimension_rail_overworld.json +++ b/src/generated/resources/assets/naturesaura/models/item/dimension_rail_overworld.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "naturesaura:block/dimension_rail_overworld" } diff --git a/src/generated/resources/assets/naturesaura/models/item/effect_powder.json b/src/generated/resources/assets/naturesaura/models/item/effect_powder.json index ac6bd64f..06e3ec49 100644 --- a/src/generated/resources/assets/naturesaura/models/item/effect_powder.json +++ b/src/generated/resources/assets/naturesaura/models/item/effect_powder.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "naturesaura:item/effect_powder" } diff --git a/src/generated/resources/assets/naturesaura/models/item/end_city_finder.json b/src/generated/resources/assets/naturesaura/models/item/end_city_finder.json index 775acad6..350d14e4 100644 --- a/src/generated/resources/assets/naturesaura/models/item/end_city_finder.json +++ b/src/generated/resources/assets/naturesaura/models/item/end_city_finder.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "naturesaura:item/end_city_finder" } diff --git a/src/generated/resources/assets/naturesaura/models/item/end_flower.json b/src/generated/resources/assets/naturesaura/models/item/end_flower.json index 1d4df3e4..16573d51 100644 --- a/src/generated/resources/assets/naturesaura/models/item/end_flower.json +++ b/src/generated/resources/assets/naturesaura/models/item/end_flower.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "naturesaura:block/end_flower" } diff --git a/src/generated/resources/assets/naturesaura/models/item/ender_access.json b/src/generated/resources/assets/naturesaura/models/item/ender_access.json index a2b2fc15..35c639a2 100644 --- a/src/generated/resources/assets/naturesaura/models/item/ender_access.json +++ b/src/generated/resources/assets/naturesaura/models/item/ender_access.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "naturesaura:item/ender_access" } diff --git a/src/generated/resources/assets/naturesaura/models/item/eye.json b/src/generated/resources/assets/naturesaura/models/item/eye.json index 5aad67af..f871ecfb 100644 --- a/src/generated/resources/assets/naturesaura/models/item/eye.json +++ b/src/generated/resources/assets/naturesaura/models/item/eye.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "naturesaura:item/eye" } diff --git a/src/generated/resources/assets/naturesaura/models/item/eye_improved.json b/src/generated/resources/assets/naturesaura/models/item/eye_improved.json index 359e4354..e242e6c3 100644 --- a/src/generated/resources/assets/naturesaura/models/item/eye_improved.json +++ b/src/generated/resources/assets/naturesaura/models/item/eye_improved.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "naturesaura:item/eye_improved" } diff --git a/src/generated/resources/assets/naturesaura/models/item/farming_stencil.json b/src/generated/resources/assets/naturesaura/models/item/farming_stencil.json index efe289cf..af8df02e 100644 --- a/src/generated/resources/assets/naturesaura/models/item/farming_stencil.json +++ b/src/generated/resources/assets/naturesaura/models/item/farming_stencil.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "naturesaura:item/farming_stencil" } diff --git a/src/generated/resources/assets/naturesaura/models/item/fortress_finder.json b/src/generated/resources/assets/naturesaura/models/item/fortress_finder.json index ac07dcbc..3321a5ea 100644 --- a/src/generated/resources/assets/naturesaura/models/item/fortress_finder.json +++ b/src/generated/resources/assets/naturesaura/models/item/fortress_finder.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "naturesaura:item/fortress_finder" } diff --git a/src/generated/resources/assets/naturesaura/models/item/gold_fiber.json b/src/generated/resources/assets/naturesaura/models/item/gold_fiber.json index d76a2718..dea8eea7 100644 --- a/src/generated/resources/assets/naturesaura/models/item/gold_fiber.json +++ b/src/generated/resources/assets/naturesaura/models/item/gold_fiber.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "naturesaura:item/gold_fiber" } diff --git a/src/generated/resources/assets/naturesaura/models/item/gold_leaf.json b/src/generated/resources/assets/naturesaura/models/item/gold_leaf.json index 3fb2ab7e..b76f1af4 100644 --- a/src/generated/resources/assets/naturesaura/models/item/gold_leaf.json +++ b/src/generated/resources/assets/naturesaura/models/item/gold_leaf.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "naturesaura:item/gold_leaf" } diff --git a/src/generated/resources/assets/naturesaura/models/item/gold_powder.json b/src/generated/resources/assets/naturesaura/models/item/gold_powder.json index 0ec73dfb..c2c192d9 100644 --- a/src/generated/resources/assets/naturesaura/models/item/gold_powder.json +++ b/src/generated/resources/assets/naturesaura/models/item/gold_powder.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "naturesaura:item/gold_powder" } diff --git a/src/generated/resources/assets/naturesaura/models/item/infused_iron.json b/src/generated/resources/assets/naturesaura/models/item/infused_iron.json index ec2188e6..8fc35299 100644 --- a/src/generated/resources/assets/naturesaura/models/item/infused_iron.json +++ b/src/generated/resources/assets/naturesaura/models/item/infused_iron.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "naturesaura:item/infused_iron" } diff --git a/src/generated/resources/assets/naturesaura/models/item/infused_iron_axe.json b/src/generated/resources/assets/naturesaura/models/item/infused_iron_axe.json index c215d92e..6dd33674 100644 --- a/src/generated/resources/assets/naturesaura/models/item/infused_iron_axe.json +++ b/src/generated/resources/assets/naturesaura/models/item/infused_iron_axe.json @@ -1,5 +1,5 @@ { - "parent": "item/handheld", + "parent": "minecraft:item/handheld", "textures": { "layer0": "naturesaura:item/infused_iron_axe" } diff --git a/src/generated/resources/assets/naturesaura/models/item/infused_iron_chest.json b/src/generated/resources/assets/naturesaura/models/item/infused_iron_chest.json index 1e8a620f..5426108b 100644 --- a/src/generated/resources/assets/naturesaura/models/item/infused_iron_chest.json +++ b/src/generated/resources/assets/naturesaura/models/item/infused_iron_chest.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "naturesaura:item/infused_iron_chest" } diff --git a/src/generated/resources/assets/naturesaura/models/item/infused_iron_helmet.json b/src/generated/resources/assets/naturesaura/models/item/infused_iron_helmet.json index 3a3e975a..32f98284 100644 --- a/src/generated/resources/assets/naturesaura/models/item/infused_iron_helmet.json +++ b/src/generated/resources/assets/naturesaura/models/item/infused_iron_helmet.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "naturesaura:item/infused_iron_helmet" } diff --git a/src/generated/resources/assets/naturesaura/models/item/infused_iron_hoe.json b/src/generated/resources/assets/naturesaura/models/item/infused_iron_hoe.json index a68bdeec..4241b391 100644 --- a/src/generated/resources/assets/naturesaura/models/item/infused_iron_hoe.json +++ b/src/generated/resources/assets/naturesaura/models/item/infused_iron_hoe.json @@ -1,5 +1,5 @@ { - "parent": "item/handheld", + "parent": "minecraft:item/handheld", "textures": { "layer0": "naturesaura:item/infused_iron_hoe" } diff --git a/src/generated/resources/assets/naturesaura/models/item/infused_iron_pants.json b/src/generated/resources/assets/naturesaura/models/item/infused_iron_pants.json index 601ef44c..017d290a 100644 --- a/src/generated/resources/assets/naturesaura/models/item/infused_iron_pants.json +++ b/src/generated/resources/assets/naturesaura/models/item/infused_iron_pants.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "naturesaura:item/infused_iron_pants" } diff --git a/src/generated/resources/assets/naturesaura/models/item/infused_iron_pickaxe.json b/src/generated/resources/assets/naturesaura/models/item/infused_iron_pickaxe.json index c3dfcae3..39f208fc 100644 --- a/src/generated/resources/assets/naturesaura/models/item/infused_iron_pickaxe.json +++ b/src/generated/resources/assets/naturesaura/models/item/infused_iron_pickaxe.json @@ -1,5 +1,5 @@ { - "parent": "item/handheld", + "parent": "minecraft:item/handheld", "textures": { "layer0": "naturesaura:item/infused_iron_pickaxe" } diff --git a/src/generated/resources/assets/naturesaura/models/item/infused_iron_shoes.json b/src/generated/resources/assets/naturesaura/models/item/infused_iron_shoes.json index bc634876..e11ed4d9 100644 --- a/src/generated/resources/assets/naturesaura/models/item/infused_iron_shoes.json +++ b/src/generated/resources/assets/naturesaura/models/item/infused_iron_shoes.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "naturesaura:item/infused_iron_shoes" } diff --git a/src/generated/resources/assets/naturesaura/models/item/infused_iron_shovel.json b/src/generated/resources/assets/naturesaura/models/item/infused_iron_shovel.json index 23e1a0bc..c6d9cccc 100644 --- a/src/generated/resources/assets/naturesaura/models/item/infused_iron_shovel.json +++ b/src/generated/resources/assets/naturesaura/models/item/infused_iron_shovel.json @@ -1,5 +1,5 @@ { - "parent": "item/handheld", + "parent": "minecraft:item/handheld", "textures": { "layer0": "naturesaura:item/infused_iron_shovel" } diff --git a/src/generated/resources/assets/naturesaura/models/item/infused_iron_sword.json b/src/generated/resources/assets/naturesaura/models/item/infused_iron_sword.json index 18c6ff84..d9f5848d 100644 --- a/src/generated/resources/assets/naturesaura/models/item/infused_iron_sword.json +++ b/src/generated/resources/assets/naturesaura/models/item/infused_iron_sword.json @@ -1,5 +1,5 @@ { - "parent": "item/handheld", + "parent": "minecraft:item/handheld", "textures": { "layer0": "naturesaura:item/infused_iron_sword" } diff --git a/src/generated/resources/assets/naturesaura/models/item/light_staff.json b/src/generated/resources/assets/naturesaura/models/item/light_staff.json index 6e4a66de..710d5d98 100644 --- a/src/generated/resources/assets/naturesaura/models/item/light_staff.json +++ b/src/generated/resources/assets/naturesaura/models/item/light_staff.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "naturesaura:item/light_staff" } diff --git a/src/generated/resources/assets/naturesaura/models/item/loot_finder.json b/src/generated/resources/assets/naturesaura/models/item/loot_finder.json index aa5c8f88..3c51ebb2 100644 --- a/src/generated/resources/assets/naturesaura/models/item/loot_finder.json +++ b/src/generated/resources/assets/naturesaura/models/item/loot_finder.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "naturesaura:item/loot_finder" } diff --git a/src/generated/resources/assets/naturesaura/models/item/mover_cart.json b/src/generated/resources/assets/naturesaura/models/item/mover_cart.json index 624b935a..ec11c3d9 100644 --- a/src/generated/resources/assets/naturesaura/models/item/mover_cart.json +++ b/src/generated/resources/assets/naturesaura/models/item/mover_cart.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "naturesaura:item/mover_cart" } diff --git a/src/generated/resources/assets/naturesaura/models/item/multiblock_maker.json b/src/generated/resources/assets/naturesaura/models/item/multiblock_maker.json index f55db5a2..d54e9b14 100644 --- a/src/generated/resources/assets/naturesaura/models/item/multiblock_maker.json +++ b/src/generated/resources/assets/naturesaura/models/item/multiblock_maker.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "naturesaura:item/multiblock_maker" } diff --git a/src/generated/resources/assets/naturesaura/models/item/range_visualizer.json b/src/generated/resources/assets/naturesaura/models/item/range_visualizer.json index 4e27338a..6c22d48a 100644 --- a/src/generated/resources/assets/naturesaura/models/item/range_visualizer.json +++ b/src/generated/resources/assets/naturesaura/models/item/range_visualizer.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "naturesaura:item/range_visualizer" } diff --git a/src/generated/resources/assets/naturesaura/models/item/shockwave_creator.json b/src/generated/resources/assets/naturesaura/models/item/shockwave_creator.json index a183b4fd..a98ef4ab 100644 --- a/src/generated/resources/assets/naturesaura/models/item/shockwave_creator.json +++ b/src/generated/resources/assets/naturesaura/models/item/shockwave_creator.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "naturesaura:item/shockwave_creator" } diff --git a/src/generated/resources/assets/naturesaura/models/item/sky_axe.json b/src/generated/resources/assets/naturesaura/models/item/sky_axe.json index 81e2895c..07dd2cb1 100644 --- a/src/generated/resources/assets/naturesaura/models/item/sky_axe.json +++ b/src/generated/resources/assets/naturesaura/models/item/sky_axe.json @@ -1,5 +1,5 @@ { - "parent": "item/handheld", + "parent": "minecraft:item/handheld", "textures": { "layer0": "naturesaura:item/sky_axe" } diff --git a/src/generated/resources/assets/naturesaura/models/item/sky_chest.json b/src/generated/resources/assets/naturesaura/models/item/sky_chest.json index 3d95db6a..2febce8d 100644 --- a/src/generated/resources/assets/naturesaura/models/item/sky_chest.json +++ b/src/generated/resources/assets/naturesaura/models/item/sky_chest.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "naturesaura:item/sky_chest" } diff --git a/src/generated/resources/assets/naturesaura/models/item/sky_helmet.json b/src/generated/resources/assets/naturesaura/models/item/sky_helmet.json index 2d9d7b41..30939507 100644 --- a/src/generated/resources/assets/naturesaura/models/item/sky_helmet.json +++ b/src/generated/resources/assets/naturesaura/models/item/sky_helmet.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "naturesaura:item/sky_helmet" } diff --git a/src/generated/resources/assets/naturesaura/models/item/sky_hoe.json b/src/generated/resources/assets/naturesaura/models/item/sky_hoe.json index e158e7d0..e1b59c10 100644 --- a/src/generated/resources/assets/naturesaura/models/item/sky_hoe.json +++ b/src/generated/resources/assets/naturesaura/models/item/sky_hoe.json @@ -1,5 +1,5 @@ { - "parent": "item/handheld", + "parent": "minecraft:item/handheld", "textures": { "layer0": "naturesaura:item/sky_hoe" } diff --git a/src/generated/resources/assets/naturesaura/models/item/sky_ingot.json b/src/generated/resources/assets/naturesaura/models/item/sky_ingot.json index bfc0d49b..0d14fb28 100644 --- a/src/generated/resources/assets/naturesaura/models/item/sky_ingot.json +++ b/src/generated/resources/assets/naturesaura/models/item/sky_ingot.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "naturesaura:item/sky_ingot" } diff --git a/src/generated/resources/assets/naturesaura/models/item/sky_pants.json b/src/generated/resources/assets/naturesaura/models/item/sky_pants.json index a6887373..7a716ab8 100644 --- a/src/generated/resources/assets/naturesaura/models/item/sky_pants.json +++ b/src/generated/resources/assets/naturesaura/models/item/sky_pants.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "naturesaura:item/sky_pants" } diff --git a/src/generated/resources/assets/naturesaura/models/item/sky_pickaxe.json b/src/generated/resources/assets/naturesaura/models/item/sky_pickaxe.json index 551fceb5..95929a2b 100644 --- a/src/generated/resources/assets/naturesaura/models/item/sky_pickaxe.json +++ b/src/generated/resources/assets/naturesaura/models/item/sky_pickaxe.json @@ -1,5 +1,5 @@ { - "parent": "item/handheld", + "parent": "minecraft:item/handheld", "textures": { "layer0": "naturesaura:item/sky_pickaxe" } diff --git a/src/generated/resources/assets/naturesaura/models/item/sky_shoes.json b/src/generated/resources/assets/naturesaura/models/item/sky_shoes.json index ac5e6d75..e720aafa 100644 --- a/src/generated/resources/assets/naturesaura/models/item/sky_shoes.json +++ b/src/generated/resources/assets/naturesaura/models/item/sky_shoes.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "naturesaura:item/sky_shoes" } diff --git a/src/generated/resources/assets/naturesaura/models/item/sky_shovel.json b/src/generated/resources/assets/naturesaura/models/item/sky_shovel.json index b27e3f68..b6119895 100644 --- a/src/generated/resources/assets/naturesaura/models/item/sky_shovel.json +++ b/src/generated/resources/assets/naturesaura/models/item/sky_shovel.json @@ -1,5 +1,5 @@ { - "parent": "item/handheld", + "parent": "minecraft:item/handheld", "textures": { "layer0": "naturesaura:item/sky_shovel" } diff --git a/src/generated/resources/assets/naturesaura/models/item/sky_sword.json b/src/generated/resources/assets/naturesaura/models/item/sky_sword.json index 75bc8f9f..6b33c553 100644 --- a/src/generated/resources/assets/naturesaura/models/item/sky_sword.json +++ b/src/generated/resources/assets/naturesaura/models/item/sky_sword.json @@ -1,5 +1,5 @@ { - "parent": "item/handheld", + "parent": "minecraft:item/handheld", "textures": { "layer0": "naturesaura:item/sky_sword" } diff --git a/src/generated/resources/assets/naturesaura/models/item/tainted_gold.json b/src/generated/resources/assets/naturesaura/models/item/tainted_gold.json index 506b18d3..d7855c88 100644 --- a/src/generated/resources/assets/naturesaura/models/item/tainted_gold.json +++ b/src/generated/resources/assets/naturesaura/models/item/tainted_gold.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "naturesaura:item/tainted_gold" } diff --git a/src/generated/resources/assets/naturesaura/models/item/token_anger.json b/src/generated/resources/assets/naturesaura/models/item/token_anger.json index 180d4292..7c11d2db 100644 --- a/src/generated/resources/assets/naturesaura/models/item/token_anger.json +++ b/src/generated/resources/assets/naturesaura/models/item/token_anger.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "naturesaura:item/token_anger" } diff --git a/src/generated/resources/assets/naturesaura/models/item/token_euphoria.json b/src/generated/resources/assets/naturesaura/models/item/token_euphoria.json index 90f21a21..ad06abdd 100644 --- a/src/generated/resources/assets/naturesaura/models/item/token_euphoria.json +++ b/src/generated/resources/assets/naturesaura/models/item/token_euphoria.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "naturesaura:item/token_euphoria" } diff --git a/src/generated/resources/assets/naturesaura/models/item/token_fear.json b/src/generated/resources/assets/naturesaura/models/item/token_fear.json index 23ba9e53..285e1949 100644 --- a/src/generated/resources/assets/naturesaura/models/item/token_fear.json +++ b/src/generated/resources/assets/naturesaura/models/item/token_fear.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "naturesaura:item/token_fear" } diff --git a/src/generated/resources/assets/naturesaura/models/item/token_grief.json b/src/generated/resources/assets/naturesaura/models/item/token_grief.json index 65b6a2be..f995fd2d 100644 --- a/src/generated/resources/assets/naturesaura/models/item/token_grief.json +++ b/src/generated/resources/assets/naturesaura/models/item/token_grief.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "naturesaura:item/token_grief" } diff --git a/src/generated/resources/assets/naturesaura/models/item/token_joy.json b/src/generated/resources/assets/naturesaura/models/item/token_joy.json index 09acd779..80e70a68 100644 --- a/src/generated/resources/assets/naturesaura/models/item/token_joy.json +++ b/src/generated/resources/assets/naturesaura/models/item/token_joy.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "naturesaura:item/token_joy" } diff --git a/src/generated/resources/assets/naturesaura/models/item/token_rage.json b/src/generated/resources/assets/naturesaura/models/item/token_rage.json index 5a1d70b9..a4b84f9c 100644 --- a/src/generated/resources/assets/naturesaura/models/item/token_rage.json +++ b/src/generated/resources/assets/naturesaura/models/item/token_rage.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "naturesaura:item/token_rage" } diff --git a/src/generated/resources/assets/naturesaura/models/item/token_sorrow.json b/src/generated/resources/assets/naturesaura/models/item/token_sorrow.json index 85ba8364..c5306e34 100644 --- a/src/generated/resources/assets/naturesaura/models/item/token_sorrow.json +++ b/src/generated/resources/assets/naturesaura/models/item/token_sorrow.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "naturesaura:item/token_sorrow" } diff --git a/src/generated/resources/assets/naturesaura/models/item/token_terror.json b/src/generated/resources/assets/naturesaura/models/item/token_terror.json index ad0f43c4..9c286c13 100644 --- a/src/generated/resources/assets/naturesaura/models/item/token_terror.json +++ b/src/generated/resources/assets/naturesaura/models/item/token_terror.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "naturesaura:item/token_terror" } diff --git a/src/generated/resources/data/curios/tags/items/belt.json b/src/generated/resources/data/curios/tags/items/belt.json deleted file mode 100644 index 9eb1a8aa..00000000 --- a/src/generated/resources/data/curios/tags/items/belt.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "replace": false, - "values": [ - "naturesaura:aura_cache", - "naturesaura:aura_trove" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/curios/tags/items/charm.json b/src/generated/resources/data/curios/tags/items/charm.json deleted file mode 100644 index 72503671..00000000 --- a/src/generated/resources/data/curios/tags/items/charm.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "replace": false, - "values": [ - "naturesaura:eye", - "naturesaura:eye_improved" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/curios/tags/items/necklace.json b/src/generated/resources/data/curios/tags/items/necklace.json deleted file mode 100644 index 200e0031..00000000 --- a/src/generated/resources/data/curios/tags/items/necklace.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "naturesaura:shockwave_creator" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/curios/tags/items/ring.json b/src/generated/resources/data/curios/tags/items/ring.json deleted file mode 100644 index 353316b7..00000000 --- a/src/generated/resources/data/curios/tags/items/ring.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "naturesaura:death_ring" - ] -} \ No newline at end of file diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/BlockBlastFurnaceBooster.java b/src/main/java/de/ellpeck/naturesaura/blocks/BlockBlastFurnaceBooster.java index c2b4270a..4c290806 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/BlockBlastFurnaceBooster.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/BlockBlastFurnaceBooster.java @@ -21,7 +21,7 @@ public class BlockBlastFurnaceBooster extends BlockContainerImpl implements ICus private static final VoxelShape SHAPE = VoxelShapes.create(1 / 16F, 0, 1 / 16F, 15 / 16F, 1, 15 / 16F); public BlockBlastFurnaceBooster() { - super("blast_furnace_booster", TileEntityBlastFurnaceBooster::new, Block.Properties.from(Blocks.BLAST_FURNACE)); + super("blast_furnace_booster", TileEntityBlastFurnaceBooster::new, Block.Properties.from(Blocks.BLAST_FURNACE).setLightLevel(s -> 0)); } @Override diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/BlockItemDistributor.java b/src/main/java/de/ellpeck/naturesaura/blocks/BlockItemDistributor.java index 639d9cfa..8ac100d7 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/BlockItemDistributor.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/BlockItemDistributor.java @@ -16,7 +16,7 @@ import net.minecraft.world.World; public class BlockItemDistributor extends BlockContainerImpl implements ICustomBlockState { public BlockItemDistributor() { - super("item_distributor", TileEntityItemDistributor::new, ModBlocks.prop(Blocks.FURNACE)); + super("item_distributor", TileEntityItemDistributor::new, ModBlocks.prop(Blocks.STONE_BRICKS)); } @Override diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/BlockSnowCreator.java b/src/main/java/de/ellpeck/naturesaura/blocks/BlockSnowCreator.java index a285fcdb..4aaed438 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/BlockSnowCreator.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/BlockSnowCreator.java @@ -14,7 +14,7 @@ import net.minecraftforge.api.distmarker.OnlyIn; public class BlockSnowCreator extends BlockContainerImpl implements IVisualizable, ICustomBlockState { public BlockSnowCreator() { - super("snow_creator", TileEntitySnowCreator::new, ModBlocks.prop(Blocks.FURNACE)); + super("snow_creator", TileEntitySnowCreator::new, ModBlocks.prop(Blocks.STONE_BRICKS)); } @Override diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/TileEntityImpl.java b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/TileEntityImpl.java index 7972c53a..064a3892 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/TileEntityImpl.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/TileEntityImpl.java @@ -53,7 +53,8 @@ public class TileEntityImpl extends TileEntity { public void readNBT(CompoundNBT compound, SaveType type) { if (type != SaveType.BLOCK) { - super.read(this.getBlockState(), compound); + // looks like the block state isn't used in the super + super.read(null, compound); this.redstonePower = compound.getInt("redstone"); } } diff --git a/src/main/java/de/ellpeck/naturesaura/chunk/effect/OreSpawnEffect.java b/src/main/java/de/ellpeck/naturesaura/chunk/effect/OreSpawnEffect.java index 71ca749e..140dbead 100644 --- a/src/main/java/de/ellpeck/naturesaura/chunk/effect/OreSpawnEffect.java +++ b/src/main/java/de/ellpeck/naturesaura/chunk/effect/OreSpawnEffect.java @@ -1,6 +1,5 @@ package de.ellpeck.naturesaura.chunk.effect; -import com.sun.javafx.geom.Vec3d; import de.ellpeck.naturesaura.ModConfig; import de.ellpeck.naturesaura.NaturesAura; import de.ellpeck.naturesaura.api.NaturesAuraAPI; diff --git a/src/main/java/de/ellpeck/naturesaura/compat/patchouli/ProcessorAltar.java b/src/main/java/de/ellpeck/naturesaura/compat/patchouli/ProcessorAltar.java index bca6b898..6741fccb 100644 --- a/src/main/java/de/ellpeck/naturesaura/compat/patchouli/ProcessorAltar.java +++ b/src/main/java/de/ellpeck/naturesaura/compat/patchouli/ProcessorAltar.java @@ -22,7 +22,7 @@ public class ProcessorAltar implements IComponentProcessor { @Override public IVariable process(String key) { if (this.recipe == null) - return IVariable.empty(); + return null; switch (key) { case "input": return IVariable.from(this.recipe.input); @@ -32,16 +32,16 @@ public class ProcessorAltar implements IComponentProcessor { if (this.recipe.catalyst != Ingredient.EMPTY) return IVariable.from(this.recipe.catalyst); else - return IVariable.empty(); + return null; case "type": if (this.recipe.requiredType != null) return IVariable.from(ItemAuraBottle.setType(new ItemStack(ModItems.AURA_BOTTLE), this.recipe.requiredType)); else - return IVariable.empty(); + return null; case "name": return IVariable.wrap(this.recipe.output.getDisplayName().getString()); default: - return IVariable.empty(); + return null; } } diff --git a/src/main/java/de/ellpeck/naturesaura/compat/patchouli/ProcessorAnimalSpawner.java b/src/main/java/de/ellpeck/naturesaura/compat/patchouli/ProcessorAnimalSpawner.java index 11d51f74..5a979ad7 100644 --- a/src/main/java/de/ellpeck/naturesaura/compat/patchouli/ProcessorAnimalSpawner.java +++ b/src/main/java/de/ellpeck/naturesaura/compat/patchouli/ProcessorAnimalSpawner.java @@ -21,13 +21,13 @@ public class ProcessorAnimalSpawner implements IComponentProcessor { @Override public IVariable process(String key) { if (this.recipe == null) - return IVariable.empty(); + return null; if (key.startsWith("input")) { int id = Integer.parseInt(key.substring(5)) - 1; if (this.recipe.ingredients.length > id) return IVariable.from(this.recipe.ingredients[id]); else - return IVariable.empty(); + return null; } else { switch (key) { case "name": @@ -38,7 +38,7 @@ public class ProcessorAnimalSpawner implements IComponentProcessor { ItemStack egg = new ItemStack(SpawnEggItem.getEgg(this.recipe.entity)); return IVariable.from(egg); default: - return IVariable.empty(); + return null; } } } diff --git a/src/main/java/de/ellpeck/naturesaura/compat/patchouli/ProcessorOffering.java b/src/main/java/de/ellpeck/naturesaura/compat/patchouli/ProcessorOffering.java index 7668ffe6..e1f1c00f 100644 --- a/src/main/java/de/ellpeck/naturesaura/compat/patchouli/ProcessorOffering.java +++ b/src/main/java/de/ellpeck/naturesaura/compat/patchouli/ProcessorOffering.java @@ -19,7 +19,7 @@ public class ProcessorOffering implements IComponentProcessor { @Override public IVariable process(String key) { if (this.recipe == null) - return IVariable.empty(); + return null; switch (key) { case "input": return IVariable.from(this.recipe.input); @@ -30,7 +30,7 @@ public class ProcessorOffering implements IComponentProcessor { case "name": return IVariable.wrap(this.recipe.output.getDisplayName().getString()); default: - return IVariable.empty(); + return null; } } } diff --git a/src/main/java/de/ellpeck/naturesaura/compat/patchouli/ProcessorTreeRitual.java b/src/main/java/de/ellpeck/naturesaura/compat/patchouli/ProcessorTreeRitual.java index d1f9d973..90514c56 100644 --- a/src/main/java/de/ellpeck/naturesaura/compat/patchouli/ProcessorTreeRitual.java +++ b/src/main/java/de/ellpeck/naturesaura/compat/patchouli/ProcessorTreeRitual.java @@ -19,13 +19,13 @@ public class ProcessorTreeRitual implements IComponentProcessor { @Override public IVariable process(String key) { if (this.recipe == null) - return IVariable.empty(); + return null; if (key.startsWith("input")) { int id = Integer.parseInt(key.substring(5)) - 1; if (this.recipe.ingredients.length > id) return IVariable.from(this.recipe.ingredients[id]); else - return IVariable.empty(); + return null; } else { switch (key) { case "output": @@ -35,7 +35,7 @@ public class ProcessorTreeRitual implements IComponentProcessor { case "name": return IVariable.wrap(this.recipe.result.getDisplayName().getString()); default: - return IVariable.empty(); + return null; } } } diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index c1b53fa8..16694e1b 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -9,6 +9,7 @@ modLoader="javafml" #mandatory loaderVersion="[28,)" #mandatory (28 is current forge version) # A URL to refer people to when problems occur with this mod issueTrackerURL="https://github.com/Ellpeck/NaturesAura" #optional +license="GPLv3" # A list of mods - how many allowed here is determined by the individual mod loader [[mods]] #mandatory # The modid of the mod