everything but patchouli?

This commit is contained in:
Ell 2020-09-22 15:01:16 +02:00
parent be408e2d70
commit 4d3b7e8249
144 changed files with 165 additions and 172 deletions

1
.gitignore vendored
View File

@ -12,6 +12,7 @@
/classes
/bin/
/run/
/logs
*.classpath
*.project

View File

@ -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')

View File

@ -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
}
}

View File

@ -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
}
}

View File

@ -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"

View File

@ -0,0 +1,7 @@
{
"parent": "minecraft:block/cube_column_horizontal",
"textures": {
"side": "naturesaura:block/ancient_bark",
"end": "naturesaura:block/ancient_bark_top"
}
}

View File

@ -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"

View File

@ -0,0 +1,7 @@
{
"parent": "minecraft:block/cube_column_horizontal",
"textures": {
"side": "naturesaura:block/ancient_log",
"end": "naturesaura:block/ancient_log_top"
}
}

View File

@ -1,5 +1,5 @@
{
"parent": "block/cube_all",
"parent": "minecraft:block/cube_all",
"textures": {
"all": "naturesaura:block/ancient_planks"
}

View File

@ -1,5 +1,5 @@
{
"parent": "block/cross",
"parent": "minecraft:block/cross",
"textures": {
"cross": "naturesaura:block/ancient_sapling"
}

View File

@ -1,5 +1,5 @@
{
"parent": "block/slab",
"parent": "minecraft:block/slab",
"textures": {
"side": "naturesaura:block/ancient_planks",
"bottom": "naturesaura:block/ancient_planks",

View File

@ -1,5 +1,5 @@
{
"parent": "block/cube_all",
"parent": "minecraft:block/cube_all",
"textures": {
"all": "naturesaura:block/ancient_planks"
}

View File

@ -1,5 +1,5 @@
{
"parent": "block/slab_top",
"parent": "minecraft:block/slab_top",
"textures": {
"side": "naturesaura:block/ancient_planks",
"bottom": "naturesaura:block/ancient_planks",

View File

@ -1,5 +1,5 @@
{
"parent": "block/stairs",
"parent": "minecraft:block/stairs",
"textures": {
"side": "naturesaura:block/ancient_planks",
"bottom": "naturesaura:block/ancient_planks",

View File

@ -1,5 +1,5 @@
{
"parent": "block/inner_stairs",
"parent": "minecraft:block/inner_stairs",
"textures": {
"side": "naturesaura:block/ancient_planks",
"bottom": "naturesaura:block/ancient_planks",

View File

@ -1,5 +1,5 @@
{
"parent": "block/outer_stairs",
"parent": "minecraft:block/outer_stairs",
"textures": {
"side": "naturesaura:block/ancient_planks",
"bottom": "naturesaura:block/ancient_planks",

View File

@ -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",

View File

@ -1,5 +1,5 @@
{
"parent": "block/cube_all",
"parent": "minecraft:block/cube_all",
"textures": {
"all": "naturesaura:block/animal_spawner"
}

View File

@ -1,5 +1,5 @@
{
"parent": "block/cross",
"parent": "minecraft:block/cross",
"textures": {
"cross": "naturesaura:block/aura_bloom"
}

View File

@ -1,5 +1,5 @@
{
"parent": "block/cross",
"parent": "minecraft:block/cross",
"textures": {
"cross": "naturesaura:block/aura_cactus"
}

View File

@ -1,5 +1,5 @@
{
"parent": "block/cube_all",
"parent": "minecraft:block/cube_all",
"textures": {
"all": "naturesaura:block/aura_detector"
}

View File

@ -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",

View File

@ -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",

View File

@ -1,5 +1,5 @@
{
"parent": "block/cube_all",
"parent": "minecraft:block/cube_all",
"textures": {
"all": "naturesaura:block/conversion_catalyst"
}

View File

@ -1,5 +1,5 @@
{
"parent": "block/cube_all",
"parent": "minecraft:block/cube_all",
"textures": {
"all": "naturesaura:block/conversion_catalyst_nether"
}

View File

@ -1,5 +1,5 @@
{
"parent": "block/cube_all",
"parent": "minecraft:block/cube_all",
"textures": {
"all": "naturesaura:block/crushing_catalyst"
}

View File

@ -1,5 +1,5 @@
{
"parent": "block/cube_all",
"parent": "minecraft:block/cube_all",
"textures": {
"all": "naturesaura:block/crushing_catalyst_nether"
}

View File

@ -1,5 +1,5 @@
{
"parent": "block/cross",
"parent": "minecraft:block/cross",
"textures": {
"cross": "naturesaura:block/end_flower"
}

View File

@ -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",

View File

@ -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",

View File

@ -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",

View File

@ -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",

View File

@ -1,5 +1,5 @@
{
"parent": "block/cube_all",
"parent": "minecraft:block/cube_all",
"textures": {
"all": "naturesaura:block/gold_brick"
}

View File

@ -1,5 +1,5 @@
{
"parent": "block/cube_all",
"parent": "minecraft:block/cube_all",
"textures": {
"all": "naturesaura:block/gold_nether_brick"
}

View File

@ -1,5 +1,5 @@
{
"parent": "block/cube_all",
"parent": "minecraft:block/cube_all",
"textures": {
"all": "naturesaura:block/hopper_upgrade"
}

View File

@ -1,5 +1,5 @@
{
"parent": "block/cube_all",
"parent": "minecraft:block/cube_all",
"textures": {
"all": "naturesaura:block/infused_brick"
}

View File

@ -1,5 +1,5 @@
{
"parent": "block/slab",
"parent": "minecraft:block/slab",
"textures": {
"side": "naturesaura:block/infused_brick",
"bottom": "naturesaura:block/infused_brick",

View File

@ -1,5 +1,5 @@
{
"parent": "block/cube_all",
"parent": "minecraft:block/cube_all",
"textures": {
"all": "naturesaura:block/infused_brick"
}

View File

@ -1,5 +1,5 @@
{
"parent": "block/slab_top",
"parent": "minecraft:block/slab_top",
"textures": {
"side": "naturesaura:block/infused_brick",
"bottom": "naturesaura:block/infused_brick",

View File

@ -1,5 +1,5 @@
{
"parent": "block/stairs",
"parent": "minecraft:block/stairs",
"textures": {
"side": "naturesaura:block/infused_brick",
"bottom": "naturesaura:block/infused_brick",

View File

@ -1,5 +1,5 @@
{
"parent": "block/inner_stairs",
"parent": "minecraft:block/inner_stairs",
"textures": {
"side": "naturesaura:block/infused_brick",
"bottom": "naturesaura:block/infused_brick",

View File

@ -1,5 +1,5 @@
{
"parent": "block/outer_stairs",
"parent": "minecraft:block/outer_stairs",
"textures": {
"side": "naturesaura:block/infused_brick",
"bottom": "naturesaura:block/infused_brick",

View File

@ -1,5 +1,5 @@
{
"parent": "block/cube_all",
"parent": "minecraft:block/cube_all",
"textures": {
"all": "naturesaura:block/infused_iron_block"
}

View File

@ -1,5 +1,5 @@
{
"parent": "block/slab",
"parent": "minecraft:block/slab",
"textures": {
"side": "naturesaura:block/infused_stone",
"bottom": "naturesaura:block/infused_stone",

View File

@ -1,5 +1,5 @@
{
"parent": "block/cube_all",
"parent": "minecraft:block/cube_all",
"textures": {
"all": "naturesaura:block/infused_stone"
}

View File

@ -1,5 +1,5 @@
{
"parent": "block/slab_top",
"parent": "minecraft:block/slab_top",
"textures": {
"side": "naturesaura:block/infused_stone",
"bottom": "naturesaura:block/infused_stone",

View File

@ -1,5 +1,5 @@
{
"parent": "block/stairs",
"parent": "minecraft:block/stairs",
"textures": {
"side": "naturesaura:block/infused_stone",
"bottom": "naturesaura:block/infused_stone",

View File

@ -1,5 +1,5 @@
{
"parent": "block/inner_stairs",
"parent": "minecraft:block/inner_stairs",
"textures": {
"side": "naturesaura:block/infused_stone",
"bottom": "naturesaura:block/infused_stone",

View File

@ -1,5 +1,5 @@
{
"parent": "block/outer_stairs",
"parent": "minecraft:block/outer_stairs",
"textures": {
"side": "naturesaura:block/infused_stone",
"bottom": "naturesaura:block/infused_stone",

View File

@ -1,5 +1,5 @@
{
"parent": "block/cube_all",
"parent": "minecraft:block/cube_all",
"textures": {
"all": "naturesaura:block/infused_stone"
}

View File

@ -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",

View File

@ -1,5 +1,5 @@
{
"parent": "block/air",
"parent": "minecraft:block/air",
"textures": {
"particle": "naturesaura:block/light"
}

View File

@ -1,5 +1,5 @@
{
"parent": "block/cube_all",
"parent": "minecraft:block/cube_all",
"textures": {
"all": "naturesaura:block/moss_generator"
}

View File

@ -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"
}
}

View File

@ -1,5 +1,5 @@
{
"parent": "block/cube_all",
"parent": "minecraft:block/cube_all",
"textures": {
"all": "naturesaura:block/nether_wart_mushroom"
}

View File

@ -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",

View File

@ -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",

View File

@ -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",

View File

@ -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",

View File

@ -1,5 +1,5 @@
{
"parent": "block/flower_pot_cross",
"parent": "minecraft:block/flower_pot_cross",
"textures": {
"plant": "naturesaura:block/aura_bloom"
}

View File

@ -1,5 +1,5 @@
{
"parent": "block/flower_pot_cross",
"parent": "minecraft:block/flower_pot_cross",
"textures": {
"plant": "naturesaura:block/aura_cactus"
}

View File

@ -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",

View File

@ -1,5 +1,5 @@
{
"parent": "block/cube_all",
"parent": "minecraft:block/cube_all",
"textures": {
"all": "naturesaura:block/rf_converter"
}

View File

@ -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",

View File

@ -1,5 +1,5 @@
{
"parent": "block/cube_all",
"parent": "minecraft:block/cube_all",
"textures": {
"all": "naturesaura:block/tainted_gold_block"
}

View File

@ -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",

View File

@ -1,5 +1,5 @@
{
"parent": "item/generated",
"parent": "minecraft:item/generated",
"textures": {
"layer0": "naturesaura:block/ancient_sapling"
}

View File

@ -1,5 +1,5 @@
{
"parent": "item/generated",
"parent": "minecraft:item/generated",
"textures": {
"layer0": "naturesaura:item/ancient_stick"
}

View File

@ -1,5 +1,5 @@
{
"parent": "item/generated",
"parent": "minecraft:item/generated",
"textures": {
"layer0": "naturesaura:block/aura_bloom"
}

View File

@ -1,5 +1,5 @@
{
"parent": "item/generated",
"parent": "minecraft:item/generated",
"textures": {
"layer0": "naturesaura:item/aura_bottle",
"layer1": "naturesaura:item/aura_bottle_overlay"

View File

@ -1,5 +1,5 @@
{
"parent": "item/generated",
"parent": "minecraft:item/generated",
"textures": {
"layer0": "naturesaura:item/aura_cache"
}

View File

@ -1,5 +1,5 @@
{
"parent": "item/generated",
"parent": "minecraft:item/generated",
"textures": {
"layer0": "naturesaura:block/aura_cactus"
}

View File

@ -1,5 +1,5 @@
{
"parent": "item/generated",
"parent": "minecraft:item/generated",
"textures": {
"layer0": "naturesaura:item/aura_trove"
}

View File

@ -1,5 +1,5 @@
{
"parent": "item/generated",
"parent": "minecraft:item/generated",
"textures": {
"layer0": "naturesaura:item/birth_spirit"
}

View File

@ -1,5 +1,5 @@
{
"parent": "item/generated",
"parent": "minecraft:item/generated",
"textures": {
"layer0": "naturesaura:item/bottle_two_the_rebottling"
}

View File

@ -1,5 +1,5 @@
{
"parent": "item/generated",
"parent": "minecraft:item/generated",
"textures": {
"layer0": "naturesaura:item/break_prevention"
}

View File

@ -1,5 +1,5 @@
{
"parent": "item/generated",
"parent": "minecraft:item/generated",
"textures": {
"layer0": "naturesaura:item/calling_spirit"
}

View File

@ -1,5 +1,5 @@
{
"parent": "item/generated",
"parent": "minecraft:item/generated",
"textures": {
"layer0": "naturesaura:item/cave_finder"
}

View File

@ -1,5 +1,5 @@
{
"parent": "item/generated",
"parent": "minecraft:item/generated",
"textures": {
"layer0": "naturesaura:item/clock_hand"
}

View File

@ -1,5 +1,5 @@
{
"parent": "item/generated",
"parent": "minecraft:item/generated",
"textures": {
"layer0": "naturesaura:item/crimson_meal"
}

View File

@ -1,5 +1,5 @@
{
"parent": "item/generated",
"parent": "minecraft:item/generated",
"textures": {
"layer0": "naturesaura:item/death_ring"
}

View File

@ -1,5 +1,5 @@
{
"parent": "item/generated",
"parent": "minecraft:item/generated",
"textures": {
"layer0": "naturesaura:block/dimension_rail_end"
}

View File

@ -1,5 +1,5 @@
{
"parent": "item/generated",
"parent": "minecraft:item/generated",
"textures": {
"layer0": "naturesaura:block/dimension_rail_nether"
}

View File

@ -1,5 +1,5 @@
{
"parent": "item/generated",
"parent": "minecraft:item/generated",
"textures": {
"layer0": "naturesaura:block/dimension_rail_overworld"
}

View File

@ -1,5 +1,5 @@
{
"parent": "item/generated",
"parent": "minecraft:item/generated",
"textures": {
"layer0": "naturesaura:item/effect_powder"
}

View File

@ -1,5 +1,5 @@
{
"parent": "item/generated",
"parent": "minecraft:item/generated",
"textures": {
"layer0": "naturesaura:item/end_city_finder"
}

View File

@ -1,5 +1,5 @@
{
"parent": "item/generated",
"parent": "minecraft:item/generated",
"textures": {
"layer0": "naturesaura:block/end_flower"
}

View File

@ -1,5 +1,5 @@
{
"parent": "item/generated",
"parent": "minecraft:item/generated",
"textures": {
"layer0": "naturesaura:item/ender_access"
}

View File

@ -1,5 +1,5 @@
{
"parent": "item/generated",
"parent": "minecraft:item/generated",
"textures": {
"layer0": "naturesaura:item/eye"
}

View File

@ -1,5 +1,5 @@
{
"parent": "item/generated",
"parent": "minecraft:item/generated",
"textures": {
"layer0": "naturesaura:item/eye_improved"
}

View File

@ -1,5 +1,5 @@
{
"parent": "item/generated",
"parent": "minecraft:item/generated",
"textures": {
"layer0": "naturesaura:item/farming_stencil"
}

View File

@ -1,5 +1,5 @@
{
"parent": "item/generated",
"parent": "minecraft:item/generated",
"textures": {
"layer0": "naturesaura:item/fortress_finder"
}

View File

@ -1,5 +1,5 @@
{
"parent": "item/generated",
"parent": "minecraft:item/generated",
"textures": {
"layer0": "naturesaura:item/gold_fiber"
}

View File

@ -1,5 +1,5 @@
{
"parent": "item/generated",
"parent": "minecraft:item/generated",
"textures": {
"layer0": "naturesaura:item/gold_leaf"
}

View File

@ -1,5 +1,5 @@
{
"parent": "item/generated",
"parent": "minecraft:item/generated",
"textures": {
"layer0": "naturesaura:item/gold_powder"
}

View File

@ -1,5 +1,5 @@
{
"parent": "item/generated",
"parent": "minecraft:item/generated",
"textures": {
"layer0": "naturesaura:item/infused_iron"
}

View File

@ -1,5 +1,5 @@
{
"parent": "item/handheld",
"parent": "minecraft:item/handheld",
"textures": {
"layer0": "naturesaura:item/infused_iron_axe"
}

View File

@ -1,5 +1,5 @@
{
"parent": "item/generated",
"parent": "minecraft:item/generated",
"textures": {
"layer0": "naturesaura:item/infused_iron_chest"
}

View File

@ -1,5 +1,5 @@
{
"parent": "item/generated",
"parent": "minecraft:item/generated",
"textures": {
"layer0": "naturesaura:item/infused_iron_helmet"
}

View File

@ -1,5 +1,5 @@
{
"parent": "item/handheld",
"parent": "minecraft:item/handheld",
"textures": {
"layer0": "naturesaura:item/infused_iron_hoe"
}

Some files were not shown because too many files have changed in this diff Show More