From 327b631237f14b003a4ff40813253918c45afd5b Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Wed, 22 Jan 2020 16:03:39 +0100 Subject: [PATCH] some fixes as well as a heap of models --- .../java/de/ellpeck/naturesaura/Helper.java | 26 +++--- .../naturesaura/proxy/ClientProxy.java | 21 ----- .../de/ellpeck/naturesaura/proxy/IProxy.java | 12 --- .../naturesaura/proxy/ServerProxy.java | 22 ----- .../naturesaura/blockstates/ancient_bark.json | 5 +- .../blockstates/ancient_leaves.json | 18 ++-- .../naturesaura/blockstates/ancient_log.json | 5 +- .../blockstates/ancient_planks.json | 5 +- .../blockstates/ancient_sapling.json | 4 +- .../naturesaura/blockstates/ancient_slab.json | 10 ++- .../blockstates/ancient_slab_double.json | 14 --- .../blockstates/ancient_stairs.json | 84 +++++++++--------- .../blockstates/animal_generator.json | 5 +- .../blockstates/animal_spawner.json | 5 +- .../blockstates/aura_detector.json | 5 +- .../naturesaura/blockstates/auto_crafter.json | 5 +- .../naturesaura/blockstates/chunk_loader.json | 5 +- .../blockstates/conversion_catalyst.json | 5 +- .../blockstates/crushing_catalyst.json | 5 +- .../blockstates/decayed_leaves.json | 5 +- .../blockstates/dimension_rail_end.json | 4 +- .../blockstates/dimension_rail_nether.json | 4 +- .../blockstates/dimension_rail_overworld.json | 4 +- .../naturesaura/blockstates/end_flower.json | 4 +- .../naturesaura/blockstates/ender_crate.json | 5 +- .../blockstates/field_creator.json | 5 +- .../blockstates/firework_generator.json | 5 +- .../blockstates/flower_generator.json | 5 +- .../blockstates/furnace_heater.json | 5 +- .../blockstates/generator_limit_remover.json | 5 +- .../naturesaura/blockstates/gold_brick.json | 5 +- .../naturesaura/blockstates/gold_powder.json | 18 ++-- .../blockstates/golden_leaves.json | 18 ++-- .../naturesaura/blockstates/grated_chute.json | 5 +- .../blockstates/hopper_upgrade.json | 5 +- .../blockstates/infused_brick.json | 5 +- .../blockstates/infused_brick_slab.json | 10 ++- .../infused_brick_slab_double.json | 14 --- .../blockstates/infused_brick_stairs.json | 84 +++++++++--------- .../blockstates/infused_iron_block.json | 5 +- .../naturesaura/blockstates/infused_slab.json | 10 ++- .../blockstates/infused_slab_double.json | 14 --- .../blockstates/infused_stairs.json | 86 +++++++++---------- .../blockstates/infused_stone.json | 5 +- .../blockstates/moss_generator.json | 5 +- .../naturesaura/blockstates/nature_altar.json | 5 +- .../blockstates/oak_generator.json | 5 +- .../blockstates/offering_table.json | 5 +- .../blockstates/pickup_stopper.json | 5 +- .../naturesaura/blockstates/placer.json | 5 +- .../blockstates/potion_generator.json | 5 +- .../blockstates/powder_placer.json | 5 +- .../blockstates/projectile_generator.json | 5 +- .../naturesaura/blockstates/rf_converter.json | 5 +- .../naturesaura/blockstates/spawn_lamp.json | 5 +- .../naturesaura/blockstates/time_changer.json | 5 +- .../naturesaura/blockstates/wood_stand.json | 5 +- .../naturesaura/models/item/ancient_bark.json | 7 ++ .../models/item/ancient_leaves.json | 6 ++ .../naturesaura/models/item/ancient_log.json | 7 ++ .../models/item/ancient_planks.json | 6 ++ .../models/item/ancient_sapling.json | 6 ++ .../naturesaura/models/item/ancient_slab.json | 8 ++ .../models/item/ancient_stairs.json | 8 ++ .../models/item/animal_generator.json | 11 +++ .../models/item/animal_spawner.json | 11 +++ .../models/item/aura_detector.json | 6 ++ .../naturesaura/models/item/auto_crafter.json | 11 +++ .../naturesaura/models/item/chunk_loader.json | 6 ++ .../models/item/conversion_catalyst.json | 6 ++ .../models/item/crushing_catalyst.json | 6 ++ .../models/item/decayed_leaves.json | 6 ++ .../models/item/dimension_rail_end.json | 6 ++ .../models/item/dimension_rail_nether.json | 6 ++ .../models/item/dimension_rail_overworld.json | 6 ++ .../naturesaura/models/item/end_flower.json | 6 ++ .../naturesaura/models/item/ender_crate.json | 11 +++ .../models/item/field_creator.json | 7 ++ .../models/item/firework_generator.json | 11 +++ .../models/item/flower_generator.json | 11 +++ .../models/item/furnace_heater.json | 6 ++ .../models/item/generator_limit_remover.json | 11 +++ .../naturesaura/models/item/gold_brick.json | 6 ++ .../models/item/golden_leaves.json | 6 ++ .../naturesaura/models/item/grated_chute.json | 9 ++ .../models/item/hopper_upgrade.json | 6 ++ .../models/item/infused_brick.json | 6 ++ .../models/item/infused_brick_slab.json | 8 ++ .../models/item/infused_brick_stairs.json | 8 ++ .../models/item/infused_iron_block.json | 6 ++ .../naturesaura/models/item/infused_slab.json | 8 ++ .../models/item/infused_stairs.json | 8 ++ .../models/item/infused_stone.json | 6 ++ .../models/item/moss_generator.json | 11 +++ .../naturesaura/models/item/nature_altar.json | 7 ++ .../models/item/oak_generator.json | 11 +++ .../models/item/offering_table.json | 8 ++ .../models/item/pickup_stopper.json | 11 +++ .../naturesaura/models/item/placer.json | 11 +++ .../models/item/potion_generator.json | 11 +++ .../models/item/powder_placer.json | 7 ++ .../models/item/projectile_generator.json | 11 +++ .../naturesaura/models/item/rf_converter.json | 6 ++ .../naturesaura/models/item/spawn_lamp.json | 6 ++ .../naturesaura/models/item/time_changer.json | 11 +++ .../naturesaura/models/item/wood_stand.json | 7 ++ 106 files changed, 656 insertions(+), 392 deletions(-) delete mode 100644 src/main/resources/assets/naturesaura/blockstates/ancient_slab_double.json delete mode 100644 src/main/resources/assets/naturesaura/blockstates/infused_brick_slab_double.json delete mode 100644 src/main/resources/assets/naturesaura/blockstates/infused_slab_double.json create mode 100644 src/main/resources/assets/naturesaura/models/item/ancient_bark.json create mode 100644 src/main/resources/assets/naturesaura/models/item/ancient_leaves.json create mode 100644 src/main/resources/assets/naturesaura/models/item/ancient_log.json create mode 100644 src/main/resources/assets/naturesaura/models/item/ancient_planks.json create mode 100644 src/main/resources/assets/naturesaura/models/item/ancient_sapling.json create mode 100644 src/main/resources/assets/naturesaura/models/item/ancient_slab.json create mode 100644 src/main/resources/assets/naturesaura/models/item/ancient_stairs.json create mode 100644 src/main/resources/assets/naturesaura/models/item/animal_generator.json create mode 100644 src/main/resources/assets/naturesaura/models/item/animal_spawner.json create mode 100644 src/main/resources/assets/naturesaura/models/item/aura_detector.json create mode 100644 src/main/resources/assets/naturesaura/models/item/auto_crafter.json create mode 100644 src/main/resources/assets/naturesaura/models/item/chunk_loader.json create mode 100644 src/main/resources/assets/naturesaura/models/item/conversion_catalyst.json create mode 100644 src/main/resources/assets/naturesaura/models/item/crushing_catalyst.json create mode 100644 src/main/resources/assets/naturesaura/models/item/decayed_leaves.json create mode 100644 src/main/resources/assets/naturesaura/models/item/dimension_rail_end.json create mode 100644 src/main/resources/assets/naturesaura/models/item/dimension_rail_nether.json create mode 100644 src/main/resources/assets/naturesaura/models/item/dimension_rail_overworld.json create mode 100644 src/main/resources/assets/naturesaura/models/item/end_flower.json create mode 100644 src/main/resources/assets/naturesaura/models/item/ender_crate.json create mode 100644 src/main/resources/assets/naturesaura/models/item/field_creator.json create mode 100644 src/main/resources/assets/naturesaura/models/item/firework_generator.json create mode 100644 src/main/resources/assets/naturesaura/models/item/flower_generator.json create mode 100644 src/main/resources/assets/naturesaura/models/item/furnace_heater.json create mode 100644 src/main/resources/assets/naturesaura/models/item/generator_limit_remover.json create mode 100644 src/main/resources/assets/naturesaura/models/item/gold_brick.json create mode 100644 src/main/resources/assets/naturesaura/models/item/golden_leaves.json create mode 100644 src/main/resources/assets/naturesaura/models/item/grated_chute.json create mode 100644 src/main/resources/assets/naturesaura/models/item/hopper_upgrade.json create mode 100644 src/main/resources/assets/naturesaura/models/item/infused_brick.json create mode 100644 src/main/resources/assets/naturesaura/models/item/infused_brick_slab.json create mode 100644 src/main/resources/assets/naturesaura/models/item/infused_brick_stairs.json create mode 100644 src/main/resources/assets/naturesaura/models/item/infused_iron_block.json create mode 100644 src/main/resources/assets/naturesaura/models/item/infused_slab.json create mode 100644 src/main/resources/assets/naturesaura/models/item/infused_stairs.json create mode 100644 src/main/resources/assets/naturesaura/models/item/infused_stone.json create mode 100644 src/main/resources/assets/naturesaura/models/item/moss_generator.json create mode 100644 src/main/resources/assets/naturesaura/models/item/nature_altar.json create mode 100644 src/main/resources/assets/naturesaura/models/item/oak_generator.json create mode 100644 src/main/resources/assets/naturesaura/models/item/offering_table.json create mode 100644 src/main/resources/assets/naturesaura/models/item/pickup_stopper.json create mode 100644 src/main/resources/assets/naturesaura/models/item/placer.json create mode 100644 src/main/resources/assets/naturesaura/models/item/potion_generator.json create mode 100644 src/main/resources/assets/naturesaura/models/item/powder_placer.json create mode 100644 src/main/resources/assets/naturesaura/models/item/projectile_generator.json create mode 100644 src/main/resources/assets/naturesaura/models/item/rf_converter.json create mode 100644 src/main/resources/assets/naturesaura/models/item/spawn_lamp.json create mode 100644 src/main/resources/assets/naturesaura/models/item/time_changer.json create mode 100644 src/main/resources/assets/naturesaura/models/item/wood_stand.json diff --git a/src/main/java/de/ellpeck/naturesaura/Helper.java b/src/main/java/de/ellpeck/naturesaura/Helper.java index 7402bffd..558af4a4 100644 --- a/src/main/java/de/ellpeck/naturesaura/Helper.java +++ b/src/main/java/de/ellpeck/naturesaura/Helper.java @@ -26,8 +26,9 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Vec3d; import net.minecraft.world.IWorld; import net.minecraft.world.World; -import net.minecraft.world.chunk.AbstractChunkProvider; import net.minecraft.world.chunk.Chunk; +import net.minecraft.world.chunk.ChunkStatus; +import net.minecraft.world.chunk.IChunk; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.common.capabilities.Capability; @@ -55,8 +56,9 @@ public final class Helper { public static boolean getTileEntitiesInArea(IWorld world, BlockPos pos, int radius, Function consumer) { for (int x = (pos.getX() - radius) >> 4; x <= (pos.getX() + radius) >> 4; x++) { for (int z = (pos.getZ() - radius) >> 4; z <= (pos.getZ() + radius) >> 4; z++) { - if (isChunkLoaded(world, x, z)) { - for (BlockPos tilePos : world.getChunk(x, z).getTileEntitiesPos()) { + Chunk chunk = getOptionalChunk(world, x, z); + if (chunk != null) { + for (BlockPos tilePos : chunk.getTileEntitiesPos()) { if (tilePos.distanceSq(pos) <= radius * radius) if (consumer.apply(world.getTileEntity(tilePos))) return true; @@ -70,8 +72,8 @@ public final class Helper { public static void getAuraChunksInArea(World world, BlockPos pos, int radius, Consumer consumer) { for (int x = (pos.getX() - radius) >> 4; x <= (pos.getX() + radius) >> 4; x++) { for (int z = (pos.getZ() - radius) >> 4; z <= (pos.getZ() + radius) >> 4; z++) { - if (isChunkLoaded(world, x, z)) { - Chunk chunk = world.getChunk(x, z); + Chunk chunk = getOptionalChunk(world, x, z); + if (chunk != null) { AuraChunk auraChunk = (AuraChunk) chunk.getCapability(NaturesAuraAPI.capAuraChunk, null).orElse(null); if (auraChunk != null) consumer.accept(auraChunk); @@ -91,15 +93,9 @@ public final class Helper { return frames; } - // For some reason this method isn't public in World, but I also don't want to have to make a new BlockPos - // or use the messy MutableBlockPos system just to see if a chunk is loaded, so this will have to do I guess - public static boolean isChunkLoaded(IWorld world, int x, int z) { - AbstractChunkProvider provider = world.getChunkProvider(); - if (!world.isRemote()) { - return provider.chunkExists(x, z); - } else { - return !provider.getChunk(x, z, false).isEmpty(); - } + public static Chunk getOptionalChunk(IWorld world, int x, int z) { + IChunk chunk = world.getChunk(x, z, ChunkStatus.EMPTY, false); + return chunk instanceof Chunk ? (Chunk) chunk : null; } public static int blendColors(int c1, int c2, float ratio) { @@ -319,7 +315,7 @@ public final class Helper { public static AxisAlignedBB aabb(Vec3d pos) { return new AxisAlignedBB(pos.x, pos.y, pos.z, pos.x, pos.y, pos.z); } - + // This is how @ObjectHolder _SHOULD_ work... public static > void populateObjectHolders(Class clazz, IForgeRegistry registry) { for (Field entry : clazz.getFields()) { diff --git a/src/main/java/de/ellpeck/naturesaura/proxy/ClientProxy.java b/src/main/java/de/ellpeck/naturesaura/proxy/ClientProxy.java index 0dc9160e..564c4d36 100644 --- a/src/main/java/de/ellpeck/naturesaura/proxy/ClientProxy.java +++ b/src/main/java/de/ellpeck/naturesaura/proxy/ClientProxy.java @@ -14,20 +14,14 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.color.IItemColor; import net.minecraft.client.renderer.color.ItemColors; import net.minecraft.client.renderer.entity.PlayerRenderer; -import net.minecraft.client.renderer.model.ModelResourceLocation; import net.minecraft.client.renderer.tileentity.TileEntityRenderer; -import net.minecraft.entity.Entity; import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; import net.minecraft.util.Tuple; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fml.client.registry.ClientRegistry; -import net.minecraftforge.fml.client.registry.IRenderFactory; -import net.minecraftforge.fml.client.registry.RenderingRegistry; import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent; import java.util.Map; -import java.util.function.Supplier; public class ClientProxy implements IProxy { @@ -50,11 +44,6 @@ public class ClientProxy implements IProxy { } - @Override - public void registerRenderer(ItemStack stack, ModelResourceLocation location) { - //ModelLoader.setCustomModelResourceLocation(stack.getItem(), stack.getItemDamage(), location); - } - @Override public void addColorProvidingItem(IColorProvidingItem item) { ItemColors colors = Minecraft.getInstance().getItemColors(); @@ -80,11 +69,6 @@ public class ClientProxy implements IProxy { ClientRegistry.bindTileEntitySpecialRenderer(tesr.getA(), tesr.getB()); } - @Override - public void registerEntityRenderer(Class entityClass, Supplier> renderFactory) { - RenderingRegistry.registerEntityRenderingHandler(entityClass, renderFactory.get()); - } - @Override public void spawnMagicParticle(double posX, double posY, double posZ, double motionX, double motionY, double motionZ, int color, float scale, int maxAge, float gravity, boolean collision, boolean fade) { ParticleHandler.spawnParticle(() -> new ParticleMagic(Minecraft.getInstance().world, @@ -102,9 +86,4 @@ public class ClientProxy implements IProxy { public void setParticleSpawnRange(int range) { ParticleHandler.range = range; } - - @Override - public void scheduleTask(Runnable runnable) { - Minecraft.getInstance().runAsync(runnable); - } } \ No newline at end of file diff --git a/src/main/java/de/ellpeck/naturesaura/proxy/IProxy.java b/src/main/java/de/ellpeck/naturesaura/proxy/IProxy.java index b4e19450..8ee1ed78 100644 --- a/src/main/java/de/ellpeck/naturesaura/proxy/IProxy.java +++ b/src/main/java/de/ellpeck/naturesaura/proxy/IProxy.java @@ -3,14 +3,8 @@ package de.ellpeck.naturesaura.proxy; import de.ellpeck.naturesaura.reg.IColorProvidingBlock; import de.ellpeck.naturesaura.reg.IColorProvidingItem; import de.ellpeck.naturesaura.reg.ITESRProvider; -import net.minecraft.client.renderer.model.ModelResourceLocation; -import net.minecraft.entity.Entity; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fml.client.registry.IRenderFactory; import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent; -import java.util.function.Supplier; - public interface IProxy { void preInit(FMLCommonSetupEvent event); @@ -18,21 +12,15 @@ public interface IProxy { void postInit(FMLCommonSetupEvent event); - void registerRenderer(ItemStack stack, ModelResourceLocation location); - void addColorProvidingItem(IColorProvidingItem item); void addColorProvidingBlock(IColorProvidingBlock block); void registerTESR(ITESRProvider provider); - void registerEntityRenderer(Class entityClass, Supplier> renderFactory); - void spawnMagicParticle(double posX, double posY, double posZ, double motionX, double motionY, double motionZ, int color, float scale, int maxAge, float gravity, boolean collision, boolean fade); void setParticleDepth(boolean depth); void setParticleSpawnRange(int range); - - void scheduleTask(Runnable runnable); } diff --git a/src/main/java/de/ellpeck/naturesaura/proxy/ServerProxy.java b/src/main/java/de/ellpeck/naturesaura/proxy/ServerProxy.java index 81b8d760..8801043c 100644 --- a/src/main/java/de/ellpeck/naturesaura/proxy/ServerProxy.java +++ b/src/main/java/de/ellpeck/naturesaura/proxy/ServerProxy.java @@ -3,14 +3,7 @@ package de.ellpeck.naturesaura.proxy; import de.ellpeck.naturesaura.reg.IColorProvidingBlock; import de.ellpeck.naturesaura.reg.IColorProvidingItem; import de.ellpeck.naturesaura.reg.ITESRProvider; -import net.minecraft.client.renderer.model.ModelResourceLocation; -import net.minecraft.entity.Entity; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fml.client.registry.IRenderFactory; import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent; -import net.minecraftforge.fml.server.ServerLifecycleHooks; - -import java.util.function.Supplier; public class ServerProxy implements IProxy { @@ -29,11 +22,6 @@ public class ServerProxy implements IProxy { } - @Override - public void registerRenderer(ItemStack stack, ModelResourceLocation location) { - - } - @Override public void addColorProvidingItem(IColorProvidingItem item) { @@ -49,11 +37,6 @@ public class ServerProxy implements IProxy { } - @Override - public void registerEntityRenderer(Class entityClass, Supplier> renderFactory) { - - } - @Override public void spawnMagicParticle(double posX, double posY, double posZ, double motionX, double motionY, double motionZ, int color, float scale, int maxAge, float gravity, boolean collision, boolean fade) { @@ -68,9 +51,4 @@ public class ServerProxy implements IProxy { public void setParticleSpawnRange(int range) { } - - @Override - public void scheduleTask(Runnable runnable) { - ServerLifecycleHooks.getCurrentServer().runAsync(runnable); - } } \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/blockstates/ancient_bark.json b/src/main/resources/assets/naturesaura/blockstates/ancient_bark.json index 08ec3087..7e234eee 100644 --- a/src/main/resources/assets/naturesaura/blockstates/ancient_bark.json +++ b/src/main/resources/assets/naturesaura/blockstates/ancient_bark.json @@ -1,7 +1,7 @@ { "forge_marker": 1, "defaults": { - "model": "minecraft:cube_column", + "model": "minecraft:block/cube_column", "textures": { "end": "naturesaura:blocks/ancient_log", "side": "naturesaura:blocks/ancient_log" @@ -9,8 +9,7 @@ "transform": "forge:default-block" }, "variants": { - "normal": [{}], - "inventory": [{}], + "": [{}], "axis": { "y": {}, "z": { diff --git a/src/main/resources/assets/naturesaura/blockstates/ancient_leaves.json b/src/main/resources/assets/naturesaura/blockstates/ancient_leaves.json index 16d4cca9..7f7fa064 100644 --- a/src/main/resources/assets/naturesaura/blockstates/ancient_leaves.json +++ b/src/main/resources/assets/naturesaura/blockstates/ancient_leaves.json @@ -1,22 +1,26 @@ { "forge_marker": 1, "defaults": { - "model": "minecraft:leaves", + "model": "minecraft:block/leaves", "textures": { "all": "naturesaura:blocks/ancient_leaves" }, "transform": "forge:default-block" }, "variants": { - "normal": [{}], - "inventory": [{}], - "decayable": { + "": [{}], + "persistent": { "true": {}, "false": {} }, - "check_decay": { - "true": {}, - "false": {} + "distance": { + "1": {}, + "2": {}, + "3": {}, + "4": {}, + "5": {}, + "6": {}, + "7": {} } } } \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/blockstates/ancient_log.json b/src/main/resources/assets/naturesaura/blockstates/ancient_log.json index 4269ee94..6033cc3d 100644 --- a/src/main/resources/assets/naturesaura/blockstates/ancient_log.json +++ b/src/main/resources/assets/naturesaura/blockstates/ancient_log.json @@ -1,7 +1,7 @@ { "forge_marker": 1, "defaults": { - "model": "minecraft:cube_column", + "model": "minecraft:block/cube_column", "textures": { "end": "naturesaura:blocks/ancient_log_top", "side": "naturesaura:blocks/ancient_log" @@ -9,8 +9,7 @@ "transform": "forge:default-block" }, "variants": { - "normal": [{}], - "inventory": [{}], + "": [{}], "axis": { "y": {}, "z": { diff --git a/src/main/resources/assets/naturesaura/blockstates/ancient_planks.json b/src/main/resources/assets/naturesaura/blockstates/ancient_planks.json index 5fe35ed4..5e3336de 100644 --- a/src/main/resources/assets/naturesaura/blockstates/ancient_planks.json +++ b/src/main/resources/assets/naturesaura/blockstates/ancient_planks.json @@ -1,14 +1,13 @@ { "forge_marker": 1, "defaults": { - "model": "minecraft:cube_all", + "model": "minecraft:block/cube_all", "textures": { "all": "naturesaura:blocks/ancient_planks" }, "transform": "forge:default-block" }, "variants": { - "normal": [{}], - "inventory": [{}] + "": [{}] } } \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/blockstates/ancient_sapling.json b/src/main/resources/assets/naturesaura/blockstates/ancient_sapling.json index d6035c47..fb16489f 100644 --- a/src/main/resources/assets/naturesaura/blockstates/ancient_sapling.json +++ b/src/main/resources/assets/naturesaura/blockstates/ancient_sapling.json @@ -1,14 +1,14 @@ { "forge_marker": 1, "defaults": { - "model": "minecraft:cross", + "model": "minecraft:block/cross", "textures": { "cross": "naturesaura:blocks/ancient_sapling" }, "transform": "forge:default-block" }, "variants": { - "normal": [{}], + "": [{}], "inventory": [ { "model": "builtin/generated", diff --git a/src/main/resources/assets/naturesaura/blockstates/ancient_slab.json b/src/main/resources/assets/naturesaura/blockstates/ancient_slab.json index 72d0a6c5..f3132c78 100644 --- a/src/main/resources/assets/naturesaura/blockstates/ancient_slab.json +++ b/src/main/resources/assets/naturesaura/blockstates/ancient_slab.json @@ -1,7 +1,7 @@ { "forge_marker": 1, "defaults": { - "model": "minecraft:half_slab", + "model": "minecraft:block/half_slab", "textures": { "bottom": "naturesaura:blocks/ancient_planks", "top": "naturesaura:blocks/ancient_planks", @@ -10,13 +10,15 @@ "transform": "forge:default-block" }, "variants": { - "half=top": [ + "type=top": [ { "x": 180, "uvlock": true } ], - "half=bottom": [{}], - "inventory": [{}] + "type=bottom": [{}], + "type=double": { + "model": "naturesaura:block/ancient_planks" + } } } diff --git a/src/main/resources/assets/naturesaura/blockstates/ancient_slab_double.json b/src/main/resources/assets/naturesaura/blockstates/ancient_slab_double.json deleted file mode 100644 index 5fe35ed4..00000000 --- a/src/main/resources/assets/naturesaura/blockstates/ancient_slab_double.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "minecraft:cube_all", - "textures": { - "all": "naturesaura:blocks/ancient_planks" - }, - "transform": "forge:default-block" - }, - "variants": { - "normal": [{}], - "inventory": [{}] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/blockstates/ancient_stairs.json b/src/main/resources/assets/naturesaura/blockstates/ancient_stairs.json index 9caa20db..ae3d6463 100644 --- a/src/main/resources/assets/naturesaura/blockstates/ancient_stairs.json +++ b/src/main/resources/assets/naturesaura/blockstates/ancient_stairs.json @@ -9,212 +9,212 @@ }, "variants": { "normal": { - "model": "minecraft:stairs" + "model": "minecraft:block/stairs" }, "inventory": { - "model": "minecraft:stairs" + "model": "minecraft:block/stairs" }, "facing=east,half=bottom,shape=straight": { - "model": "minecraft:stairs" + "model": "minecraft:block/stairs" }, "facing=west,half=bottom,shape=straight": { - "model": "minecraft:stairs", + "model": "minecraft:block/stairs", "y": 180, "uvlock": true }, "facing=south,half=bottom,shape=straight": { - "model": "minecraft:stairs", + "model": "minecraft:block/stairs", "y": 90, "uvlock": true }, "facing=north,half=bottom,shape=straight": { - "model": "minecraft:stairs", + "model": "minecraft:block/stairs", "y": 270, "uvlock": true }, "facing=east,half=bottom,shape=outer_right": { - "model": "minecraft:outer_stairs" + "model": "minecraft:block/outer_stairs" }, "facing=west,half=bottom,shape=outer_right": { - "model": "minecraft:outer_stairs", + "model": "minecraft:block/outer_stairs", "y": 180, "uvlock": true }, "facing=south,half=bottom,shape=outer_right": { - "model": "minecraft:outer_stairs", + "model": "minecraft:block/outer_stairs", "y": 90, "uvlock": true }, "facing=north,half=bottom,shape=outer_right": { - "model": "minecraft:outer_stairs", + "model": "minecraft:block/outer_stairs", "y": 270, "uvlock": true }, "facing=east,half=bottom,shape=outer_left": { - "model": "minecraft:outer_stairs", + "model": "minecraft:block/outer_stairs", "y": 270, "uvlock": true }, "facing=west,half=bottom,shape=outer_left": { - "model": "minecraft:outer_stairs", + "model": "minecraft:block/outer_stairs", "y": 90, "uvlock": true }, "facing=south,half=bottom,shape=outer_left": { - "model": "minecraft:outer_stairs" + "model": "minecraft:block/outer_stairs" }, "facing=north,half=bottom,shape=outer_left": { - "model": "minecraft:outer_stairs", + "model": "minecraft:block/outer_stairs", "y": 180, "uvlock": true }, "facing=east,half=bottom,shape=inner_right": { - "model": "minecraft:inner_stairs" + "model": "minecraft:block/inner_stairs" }, "facing=west,half=bottom,shape=inner_right": { - "model": "minecraft:inner_stairs", + "model": "minecraft:block/inner_stairs", "y": 180, "uvlock": true }, "facing=south,half=bottom,shape=inner_right": { - "model": "minecraft:inner_stairs", + "model": "minecraft:block/inner_stairs", "y": 90, "uvlock": true }, "facing=north,half=bottom,shape=inner_right": { - "model": "minecraft:inner_stairs", + "model": "minecraft:block/inner_stairs", "y": 270, "uvlock": true }, "facing=east,half=bottom,shape=inner_left": { - "model": "minecraft:inner_stairs", + "model": "minecraft:block/inner_stairs", "y": 270, "uvlock": true }, "facing=west,half=bottom,shape=inner_left": { - "model": "minecraft:inner_stairs", + "model": "minecraft:block/inner_stairs", "y": 90, "uvlock": true }, "facing=south,half=bottom,shape=inner_left": { - "model": "minecraft:inner_stairs" + "model": "minecraft:block/inner_stairs" }, "facing=north,half=bottom,shape=inner_left": { - "model": "minecraft:inner_stairs", + "model": "minecraft:block/inner_stairs", "y": 180, "uvlock": true }, "facing=east,half=top,shape=straight": { - "model": "minecraft:stairs", + "model": "minecraft:block/stairs", "x": 180, "uvlock": true }, "facing=west,half=top,shape=straight": { - "model": "minecraft:stairs", + "model": "minecraft:block/stairs", "x": 180, "y": 180, "uvlock": true }, "facing=south,half=top,shape=straight": { - "model": "minecraft:stairs", + "model": "minecraft:block/stairs", "x": 180, "y": 90, "uvlock": true }, "facing=north,half=top,shape=straight": { - "model": "minecraft:stairs", + "model": "minecraft:block/stairs", "x": 180, "y": 270, "uvlock": true }, "facing=east,half=top,shape=outer_right": { - "model": "minecraft:outer_stairs", + "model": "minecraft:block/outer_stairs", "x": 180, "y": 90, "uvlock": true }, "facing=west,half=top,shape=outer_right": { - "model": "minecraft:outer_stairs", + "model": "minecraft:block/outer_stairs", "x": 180, "y": 270, "uvlock": true }, "facing=south,half=top,shape=outer_right": { - "model": "minecraft:outer_stairs", + "model": "minecraft:block/outer_stairs", "x": 180, "y": 180, "uvlock": true }, "facing=north,half=top,shape=outer_right": { - "model": "minecraft:outer_stairs", + "model": "minecraft:block/outer_stairs", "x": 180, "uvlock": true }, "facing=east,half=top,shape=outer_left": { - "model": "minecraft:outer_stairs", + "model": "minecraft:block/outer_stairs", "x": 180, "uvlock": true }, "facing=west,half=top,shape=outer_left": { - "model": "minecraft:outer_stairs", + "model": "minecraft:block/outer_stairs", "x": 180, "y": 180, "uvlock": true }, "facing=south,half=top,shape=outer_left": { - "model": "minecraft:outer_stairs", + "model": "minecraft:block/outer_stairs", "x": 180, "y": 90, "uvlock": true }, "facing=north,half=top,shape=outer_left": { - "model": "minecraft:outer_stairs", + "model": "minecraft:block/outer_stairs", "x": 180, "y": 270, "uvlock": true }, "facing=east,half=top,shape=inner_right": { - "model": "minecraft:inner_stairs", + "model": "minecraft:block/inner_stairs", "x": 180, "y": 90, "uvlock": true }, "facing=west,half=top,shape=inner_right": { - "model": "minecraft:inner_stairs", + "model": "minecraft:block/inner_stairs", "x": 180, "y": 270, "uvlock": true }, "facing=south,half=top,shape=inner_right": { - "model": "minecraft:inner_stairs", + "model": "minecraft:block/inner_stairs", "x": 180, "y": 180, "uvlock": true }, "facing=north,half=top,shape=inner_right": { - "model": "minecraft:inner_stairs", + "model": "minecraft:block/inner_stairs", "x": 180, "uvlock": true }, "facing=east,half=top,shape=inner_left": { - "model": "minecraft:inner_stairs", + "model": "minecraft:block/inner_stairs", "x": 180, "uvlock": true }, "facing=west,half=top,shape=inner_left": { - "model": "minecraft:inner_stairs", + "model": "minecraft:block/inner_stairs", "x": 180, "y": 180, "uvlock": true }, "facing=south,half=top,shape=inner_left": { - "model": "minecraft:inner_stairs", + "model": "minecraft:block/inner_stairs", "x": 180, "y": 90, "uvlock": true }, "facing=north,half=top,shape=inner_left": { - "model": "minecraft:inner_stairs", + "model": "minecraft:block/inner_stairs", "x": 180, "y": 270, "uvlock": true diff --git a/src/main/resources/assets/naturesaura/blockstates/animal_generator.json b/src/main/resources/assets/naturesaura/blockstates/animal_generator.json index 17d00d0a..a6685ffb 100644 --- a/src/main/resources/assets/naturesaura/blockstates/animal_generator.json +++ b/src/main/resources/assets/naturesaura/blockstates/animal_generator.json @@ -1,7 +1,7 @@ { "forge_marker": 1, "defaults": { - "model": "minecraft:cube", + "model": "minecraft:block/cube", "textures": { "particle": "naturesaura:blocks/animal_generator", "up": "naturesaura:blocks/animal_generator_top", @@ -14,7 +14,6 @@ "transform": "forge:default-block" }, "variants": { - "normal": [{}], - "inventory": [{}] + "": [{}] } } \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/blockstates/animal_spawner.json b/src/main/resources/assets/naturesaura/blockstates/animal_spawner.json index b7383cee..577bd1df 100644 --- a/src/main/resources/assets/naturesaura/blockstates/animal_spawner.json +++ b/src/main/resources/assets/naturesaura/blockstates/animal_spawner.json @@ -1,7 +1,7 @@ { "forge_marker": 1, "defaults": { - "model": "minecraft:cube", + "model": "minecraft:block/cube", "textures": { "particle": "naturesaura:blocks/animal_spawner", "up": "naturesaura:blocks/animal_spawner_top", @@ -14,7 +14,6 @@ "transform": "forge:default-block" }, "variants": { - "normal": [{}], - "inventory": [{}] + "": [{}] } } \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/blockstates/aura_detector.json b/src/main/resources/assets/naturesaura/blockstates/aura_detector.json index 85469512..32422899 100644 --- a/src/main/resources/assets/naturesaura/blockstates/aura_detector.json +++ b/src/main/resources/assets/naturesaura/blockstates/aura_detector.json @@ -1,14 +1,13 @@ { "forge_marker": 1, "defaults": { - "model": "minecraft:cube_all", + "model": "minecraft:block/cube_all", "textures": { "all": "naturesaura:blocks/aura_detector" }, "transform": "forge:default-block" }, "variants": { - "normal": [{}], - "inventory": [{}] + "": [{}] } } \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/blockstates/auto_crafter.json b/src/main/resources/assets/naturesaura/blockstates/auto_crafter.json index 252b5679..29377dc7 100644 --- a/src/main/resources/assets/naturesaura/blockstates/auto_crafter.json +++ b/src/main/resources/assets/naturesaura/blockstates/auto_crafter.json @@ -1,7 +1,7 @@ { "forge_marker": 1, "defaults": { - "model": "minecraft:cube", + "model": "minecraft:block/cube", "textures": { "particle": "naturesaura:blocks/auto_crafter", "up": "naturesaura:blocks/auto_crafter_top", @@ -14,8 +14,7 @@ "transform": "forge:default-block" }, "variants": { - "normal": [{}], - "inventory": [{}], + "": [{}], "facing": { "north": {}, "south": { diff --git a/src/main/resources/assets/naturesaura/blockstates/chunk_loader.json b/src/main/resources/assets/naturesaura/blockstates/chunk_loader.json index 3c901d00..74b83641 100644 --- a/src/main/resources/assets/naturesaura/blockstates/chunk_loader.json +++ b/src/main/resources/assets/naturesaura/blockstates/chunk_loader.json @@ -1,7 +1,7 @@ { "forge_marker": 1, "defaults": { - "model": "naturesaura:chunk_loader", + "model": "naturesaura:block/chunk_loader", "textures": { "texture": "naturesaura:blocks/chunk_loader", "particle": "#texture" @@ -9,7 +9,6 @@ "transform": "forge:default-block" }, "variants": { - "normal": [{}], - "inventory": [{}] + "": [{}] } } \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/blockstates/conversion_catalyst.json b/src/main/resources/assets/naturesaura/blockstates/conversion_catalyst.json index 871a4975..4b0377e5 100644 --- a/src/main/resources/assets/naturesaura/blockstates/conversion_catalyst.json +++ b/src/main/resources/assets/naturesaura/blockstates/conversion_catalyst.json @@ -1,14 +1,13 @@ { "forge_marker": 1, "defaults": { - "model": "minecraft:cube_all", + "model": "minecraft:block/cube_all", "textures": { "all": "naturesaura:blocks/conversion_catalyst" }, "transform": "forge:default-block" }, "variants": { - "normal": [{}], - "inventory": [{}] + "": [{}] } } \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/blockstates/crushing_catalyst.json b/src/main/resources/assets/naturesaura/blockstates/crushing_catalyst.json index d991d9ad..4eb5eae8 100644 --- a/src/main/resources/assets/naturesaura/blockstates/crushing_catalyst.json +++ b/src/main/resources/assets/naturesaura/blockstates/crushing_catalyst.json @@ -1,14 +1,13 @@ { "forge_marker": 1, "defaults": { - "model": "minecraft:cube_all", + "model": "minecraft:block/cube_all", "textures": { "all": "naturesaura:blocks/crushing_catalyst" }, "transform": "forge:default-block" }, "variants": { - "normal": [{}], - "inventory": [{}] + "": [{}] } } \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/blockstates/decayed_leaves.json b/src/main/resources/assets/naturesaura/blockstates/decayed_leaves.json index 574e89eb..48d59a0f 100644 --- a/src/main/resources/assets/naturesaura/blockstates/decayed_leaves.json +++ b/src/main/resources/assets/naturesaura/blockstates/decayed_leaves.json @@ -1,14 +1,13 @@ { "forge_marker": 1, "defaults": { - "model": "minecraft:leaves", + "model": "minecraft:block/leaves", "textures": { "all": "naturesaura:blocks/decayed_leaves" }, "transform": "forge:default-block" }, "variants": { - "normal": [{}], - "inventory": [{}] + "": [{}] } } \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/blockstates/dimension_rail_end.json b/src/main/resources/assets/naturesaura/blockstates/dimension_rail_end.json index 7ae18e6a..a05555e5 100644 --- a/src/main/resources/assets/naturesaura/blockstates/dimension_rail_end.json +++ b/src/main/resources/assets/naturesaura/blockstates/dimension_rail_end.json @@ -1,14 +1,14 @@ { "forge_marker": 1, "defaults": { - "model": "minecraft:rail_flat", + "model": "minecraft:block/rail_flat", "textures": { "rail": "naturesaura:blocks/dimension_rail_end" }, "transform": "forge:default-block" }, "variants": { - "normal": [{}], + "": [{}], "inventory": [ { "model": "builtin/generated", diff --git a/src/main/resources/assets/naturesaura/blockstates/dimension_rail_nether.json b/src/main/resources/assets/naturesaura/blockstates/dimension_rail_nether.json index dbb89fc9..028a68c2 100644 --- a/src/main/resources/assets/naturesaura/blockstates/dimension_rail_nether.json +++ b/src/main/resources/assets/naturesaura/blockstates/dimension_rail_nether.json @@ -1,14 +1,14 @@ { "forge_marker": 1, "defaults": { - "model": "minecraft:rail_flat", + "model": "minecraft:block/rail_flat", "textures": { "rail": "naturesaura:blocks/dimension_rail_nether" }, "transform": "forge:default-block" }, "variants": { - "normal": [{}], + "": [{}], "inventory": [ { "model": "builtin/generated", diff --git a/src/main/resources/assets/naturesaura/blockstates/dimension_rail_overworld.json b/src/main/resources/assets/naturesaura/blockstates/dimension_rail_overworld.json index 003d2ac3..1a70e2f0 100644 --- a/src/main/resources/assets/naturesaura/blockstates/dimension_rail_overworld.json +++ b/src/main/resources/assets/naturesaura/blockstates/dimension_rail_overworld.json @@ -1,14 +1,14 @@ { "forge_marker": 1, "defaults": { - "model": "minecraft:rail_flat", + "model": "minecraft:block/rail_flat", "textures": { "rail": "naturesaura:blocks/dimension_rail_overworld" }, "transform": "forge:default-block" }, "variants": { - "normal": [{}], + "": [{}], "inventory": [ { "model": "builtin/generated", diff --git a/src/main/resources/assets/naturesaura/blockstates/end_flower.json b/src/main/resources/assets/naturesaura/blockstates/end_flower.json index 37b5fe5e..f9ff9078 100644 --- a/src/main/resources/assets/naturesaura/blockstates/end_flower.json +++ b/src/main/resources/assets/naturesaura/blockstates/end_flower.json @@ -1,14 +1,14 @@ { "forge_marker": 1, "defaults": { - "model": "minecraft:cross", + "model": "minecraft:block/cross", "textures": { "cross": "naturesaura:blocks/end_flower" }, "transform": "forge:default-block" }, "variants": { - "normal": [{}], + "": [{}], "inventory": [ { "model": "builtin/generated", diff --git a/src/main/resources/assets/naturesaura/blockstates/ender_crate.json b/src/main/resources/assets/naturesaura/blockstates/ender_crate.json index b6bdb963..26358bab 100644 --- a/src/main/resources/assets/naturesaura/blockstates/ender_crate.json +++ b/src/main/resources/assets/naturesaura/blockstates/ender_crate.json @@ -1,7 +1,7 @@ { "forge_marker": 1, "defaults": { - "model": "minecraft:cube", + "model": "minecraft:block/cube", "textures": { "particle": "naturesaura:blocks/ender_crate", "up": "naturesaura:blocks/ender_crate_top", @@ -14,7 +14,6 @@ "transform": "forge:default-block" }, "variants": { - "normal": [{}], - "inventory": [{}] + "": [{}] } } \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/blockstates/field_creator.json b/src/main/resources/assets/naturesaura/blockstates/field_creator.json index f7f363eb..6dff9fa3 100644 --- a/src/main/resources/assets/naturesaura/blockstates/field_creator.json +++ b/src/main/resources/assets/naturesaura/blockstates/field_creator.json @@ -1,7 +1,7 @@ { "forge_marker": 1, "defaults": { - "model": "naturesaura:field_creator", + "model": "naturesaura:block/field_creator", "textures": { "texture": "naturesaura:blocks/field_creator", "center": "naturesaura:blocks/field_creator_center", @@ -10,7 +10,6 @@ "transform": "forge:default-block" }, "variants": { - "normal": [{}], - "inventory": [{}] + "": [{}] } } \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/blockstates/firework_generator.json b/src/main/resources/assets/naturesaura/blockstates/firework_generator.json index e0fcb748..f8b27aa2 100644 --- a/src/main/resources/assets/naturesaura/blockstates/firework_generator.json +++ b/src/main/resources/assets/naturesaura/blockstates/firework_generator.json @@ -1,7 +1,7 @@ { "forge_marker": 1, "defaults": { - "model": "minecraft:cube", + "model": "minecraft:block/cube", "textures": { "particle": "naturesaura:blocks/firework_generator", "up": "naturesaura:blocks/firework_generator_top", @@ -14,7 +14,6 @@ "transform": "forge:default-block" }, "variants": { - "normal": [{}], - "inventory": [{}] + "": [{}] } } \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/blockstates/flower_generator.json b/src/main/resources/assets/naturesaura/blockstates/flower_generator.json index 6af981fb..f632710c 100644 --- a/src/main/resources/assets/naturesaura/blockstates/flower_generator.json +++ b/src/main/resources/assets/naturesaura/blockstates/flower_generator.json @@ -1,7 +1,7 @@ { "forge_marker": 1, "defaults": { - "model": "minecraft:cube", + "model": "minecraft:block/cube", "textures": { "particle": "naturesaura:blocks/flower_generator", "up": "naturesaura:blocks/flower_generator_top", @@ -14,7 +14,6 @@ "transform": "forge:default-block" }, "variants": { - "normal": [{}], - "inventory": [{}] + "": [{}] } } \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/blockstates/furnace_heater.json b/src/main/resources/assets/naturesaura/blockstates/furnace_heater.json index 9cac4bd0..b6dd1940 100644 --- a/src/main/resources/assets/naturesaura/blockstates/furnace_heater.json +++ b/src/main/resources/assets/naturesaura/blockstates/furnace_heater.json @@ -1,7 +1,7 @@ { "forge_marker": 1, "defaults": { - "model": "naturesaura:furnace_heater", + "model": "naturesaura:block/furnace_heater", "textures": { "texture": "naturesaura:blocks/furnace_heater", "particle": "#texture" @@ -9,8 +9,7 @@ "transform": "forge:default-block" }, "variants": { - "normal": [{}], - "inventory": [{}], + "": [{}], "facing": { "down": { "x": 180 diff --git a/src/main/resources/assets/naturesaura/blockstates/generator_limit_remover.json b/src/main/resources/assets/naturesaura/blockstates/generator_limit_remover.json index 9bede05a..e765479e 100644 --- a/src/main/resources/assets/naturesaura/blockstates/generator_limit_remover.json +++ b/src/main/resources/assets/naturesaura/blockstates/generator_limit_remover.json @@ -1,7 +1,7 @@ { "forge_marker": 1, "defaults": { - "model": "minecraft:cube", + "model": "minecraft:block/cube", "textures": { "particle": "naturesaura:blocks/generator_limit_remover", "up": "naturesaura:blocks/generator_limit_remover_top", @@ -14,7 +14,6 @@ "transform": "forge:default-block" }, "variants": { - "normal": [{}], - "inventory": [{}] + "": [{}] } } \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/blockstates/gold_brick.json b/src/main/resources/assets/naturesaura/blockstates/gold_brick.json index 65bc854e..b2c4360e 100644 --- a/src/main/resources/assets/naturesaura/blockstates/gold_brick.json +++ b/src/main/resources/assets/naturesaura/blockstates/gold_brick.json @@ -1,14 +1,13 @@ { "forge_marker": 1, "defaults": { - "model": "minecraft:cube_all", + "model": "minecraft:block/cube_all", "textures": { "all": "naturesaura:blocks/gold_brick" }, "transform": "forge:default-block" }, "variants": { - "normal": [{}], - "inventory": [{}] + "": [{}] } } \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/blockstates/gold_powder.json b/src/main/resources/assets/naturesaura/blockstates/gold_powder.json index 77562806..024d0518 100644 --- a/src/main/resources/assets/naturesaura/blockstates/gold_powder.json +++ b/src/main/resources/assets/naturesaura/blockstates/gold_powder.json @@ -28,7 +28,7 @@ ] }, "apply": { - "model": "redstone_dot" + "model": "redstone_dust_dot" } }, { @@ -46,7 +46,7 @@ ] }, "apply": { - "model": "redstone_side0" + "model": "redstone_dust_side0" } }, { @@ -64,7 +64,7 @@ ] }, "apply": { - "model": "redstone_side_alt0" + "model": "redstone_dust_side_alt0" } }, { @@ -82,7 +82,7 @@ ] }, "apply": { - "model": "redstone_side_alt1", + "model": "redstone_dust_side_alt1", "y": 270 } }, @@ -101,7 +101,7 @@ ] }, "apply": { - "model": "redstone_side1", + "model": "redstone_dust_side1", "y": 270 } }, @@ -110,7 +110,7 @@ "north": "up" }, "apply": { - "model": "redstone_up" + "model": "redstone_dust_up" } }, { @@ -118,7 +118,7 @@ "east": "up" }, "apply": { - "model": "redstone_up", + "model": "redstone_dust_up", "y": 90 } }, @@ -127,7 +127,7 @@ "south": "up" }, "apply": { - "model": "redstone_up", + "model": "redstone_dust_up", "y": 180 } }, @@ -136,7 +136,7 @@ "west": "up" }, "apply": { - "model": "redstone_up", + "model": "redstone_dust_up", "y": 270 } } diff --git a/src/main/resources/assets/naturesaura/blockstates/golden_leaves.json b/src/main/resources/assets/naturesaura/blockstates/golden_leaves.json index c397519f..cf3c1948 100644 --- a/src/main/resources/assets/naturesaura/blockstates/golden_leaves.json +++ b/src/main/resources/assets/naturesaura/blockstates/golden_leaves.json @@ -1,22 +1,26 @@ { "forge_marker": 1, "defaults": { - "model": "minecraft:leaves", + "model": "minecraft:block/leaves", "textures": { "all": "minecraft:blocks/leaves_oak" }, "transform": "forge:default-block" }, "variants": { - "normal": [{}], - "inventory": [{}], - "decayable": { + "": [{}], + "persistent": { "true": {}, "false": {} }, - "check_decay": { - "true": {}, - "false": {} + "distance": { + "1": {}, + "2": {}, + "3": {}, + "4": {}, + "5": {}, + "6": {}, + "7": {} }, "stage": { "0": {}, diff --git a/src/main/resources/assets/naturesaura/blockstates/grated_chute.json b/src/main/resources/assets/naturesaura/blockstates/grated_chute.json index 61b04cab..66375297 100644 --- a/src/main/resources/assets/naturesaura/blockstates/grated_chute.json +++ b/src/main/resources/assets/naturesaura/blockstates/grated_chute.json @@ -1,7 +1,7 @@ { "forge_marker": 1, "defaults": { - "model": "naturesaura:grated_chute_down", + "model": "naturesaura:block/grated_chute_down", "textures": { "particle": "naturesaura:blocks/grated_chute_outside", "top": "naturesaura:blocks/grated_chute_top", @@ -11,8 +11,7 @@ "transform": "forge:default-block" }, "variants": { - "normal": [{}], - "inventory": [{}], + "": [{}], "facing=down": { "model": "naturesaura:grated_chute_down" }, diff --git a/src/main/resources/assets/naturesaura/blockstates/hopper_upgrade.json b/src/main/resources/assets/naturesaura/blockstates/hopper_upgrade.json index 20128987..5405eff3 100644 --- a/src/main/resources/assets/naturesaura/blockstates/hopper_upgrade.json +++ b/src/main/resources/assets/naturesaura/blockstates/hopper_upgrade.json @@ -1,14 +1,13 @@ { "forge_marker": 1, "defaults": { - "model": "minecraft:cube_all", + "model": "minecraft:block/cube_all", "textures": { "all": "naturesaura:blocks/hopper_upgrade" }, "transform": "forge:default-block" }, "variants": { - "normal": [{}], - "inventory": [{}] + "": [{}] } } \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/blockstates/infused_brick.json b/src/main/resources/assets/naturesaura/blockstates/infused_brick.json index 34ff2593..0340ddec 100644 --- a/src/main/resources/assets/naturesaura/blockstates/infused_brick.json +++ b/src/main/resources/assets/naturesaura/blockstates/infused_brick.json @@ -1,14 +1,13 @@ { "forge_marker": 1, "defaults": { - "model": "minecraft:cube_all", + "model": "minecraft:block/cube_all", "textures": { "all": "naturesaura:blocks/infused_brick" }, "transform": "forge:default-block" }, "variants": { - "normal": [{}], - "inventory": [{}] + "": [{}] } } \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/blockstates/infused_brick_slab.json b/src/main/resources/assets/naturesaura/blockstates/infused_brick_slab.json index 7ba38b85..9a2295fe 100644 --- a/src/main/resources/assets/naturesaura/blockstates/infused_brick_slab.json +++ b/src/main/resources/assets/naturesaura/blockstates/infused_brick_slab.json @@ -1,7 +1,7 @@ { "forge_marker": 1, "defaults": { - "model": "minecraft:half_slab", + "model": "minecraft:block/half_slab", "textures": { "bottom": "naturesaura:blocks/infused_brick", "top": "naturesaura:blocks/infused_brick", @@ -10,13 +10,15 @@ "transform": "forge:default-block" }, "variants": { - "half=top": [ + "type=top": [ { "x": 180, "uvlock": true } ], - "half=bottom": [{}], - "inventory": [{}] + "type=bottom": [{}], + "type=double": { + "model": "naturesaura:block/infused_brick" + } } } diff --git a/src/main/resources/assets/naturesaura/blockstates/infused_brick_slab_double.json b/src/main/resources/assets/naturesaura/blockstates/infused_brick_slab_double.json deleted file mode 100644 index 34ff2593..00000000 --- a/src/main/resources/assets/naturesaura/blockstates/infused_brick_slab_double.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "minecraft:cube_all", - "textures": { - "all": "naturesaura:blocks/infused_brick" - }, - "transform": "forge:default-block" - }, - "variants": { - "normal": [{}], - "inventory": [{}] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/blockstates/infused_brick_stairs.json b/src/main/resources/assets/naturesaura/blockstates/infused_brick_stairs.json index a1641c36..748ba55c 100644 --- a/src/main/resources/assets/naturesaura/blockstates/infused_brick_stairs.json +++ b/src/main/resources/assets/naturesaura/blockstates/infused_brick_stairs.json @@ -9,212 +9,212 @@ }, "variants": { "normal": { - "model": "minecraft:stairs" + "model": "minecraft:block/stairs" }, "inventory": { - "model": "minecraft:stairs" + "model": "minecraft:block/stairs" }, "facing=east,half=bottom,shape=straight": { - "model": "minecraft:stairs" + "model": "minecraft:block/stairs" }, "facing=west,half=bottom,shape=straight": { - "model": "minecraft:stairs", + "model": "minecraft:block/stairs", "y": 180, "uvlock": true }, "facing=south,half=bottom,shape=straight": { - "model": "minecraft:stairs", + "model": "minecraft:block/stairs", "y": 90, "uvlock": true }, "facing=north,half=bottom,shape=straight": { - "model": "minecraft:stairs", + "model": "minecraft:block/stairs", "y": 270, "uvlock": true }, "facing=east,half=bottom,shape=outer_right": { - "model": "minecraft:outer_stairs" + "model": "minecraft:block/outer_stairs" }, "facing=west,half=bottom,shape=outer_right": { - "model": "minecraft:outer_stairs", + "model": "minecraft:block/outer_stairs", "y": 180, "uvlock": true }, "facing=south,half=bottom,shape=outer_right": { - "model": "minecraft:outer_stairs", + "model": "minecraft:block/outer_stairs", "y": 90, "uvlock": true }, "facing=north,half=bottom,shape=outer_right": { - "model": "minecraft:outer_stairs", + "model": "minecraft:block/outer_stairs", "y": 270, "uvlock": true }, "facing=east,half=bottom,shape=outer_left": { - "model": "minecraft:outer_stairs", + "model": "minecraft:block/outer_stairs", "y": 270, "uvlock": true }, "facing=west,half=bottom,shape=outer_left": { - "model": "minecraft:outer_stairs", + "model": "minecraft:block/outer_stairs", "y": 90, "uvlock": true }, "facing=south,half=bottom,shape=outer_left": { - "model": "minecraft:outer_stairs" + "model": "minecraft:block/outer_stairs" }, "facing=north,half=bottom,shape=outer_left": { - "model": "minecraft:outer_stairs", + "model": "minecraft:block/outer_stairs", "y": 180, "uvlock": true }, "facing=east,half=bottom,shape=inner_right": { - "model": "minecraft:inner_stairs" + "model": "minecraft:block/inner_stairs" }, "facing=west,half=bottom,shape=inner_right": { - "model": "minecraft:inner_stairs", + "model": "minecraft:block/inner_stairs", "y": 180, "uvlock": true }, "facing=south,half=bottom,shape=inner_right": { - "model": "minecraft:inner_stairs", + "model": "minecraft:block/inner_stairs", "y": 90, "uvlock": true }, "facing=north,half=bottom,shape=inner_right": { - "model": "minecraft:inner_stairs", + "model": "minecraft:block/inner_stairs", "y": 270, "uvlock": true }, "facing=east,half=bottom,shape=inner_left": { - "model": "minecraft:inner_stairs", + "model": "minecraft:block/inner_stairs", "y": 270, "uvlock": true }, "facing=west,half=bottom,shape=inner_left": { - "model": "minecraft:inner_stairs", + "model": "minecraft:block/inner_stairs", "y": 90, "uvlock": true }, "facing=south,half=bottom,shape=inner_left": { - "model": "minecraft:inner_stairs" + "model": "minecraft:block/inner_stairs" }, "facing=north,half=bottom,shape=inner_left": { - "model": "minecraft:inner_stairs", + "model": "minecraft:block/inner_stairs", "y": 180, "uvlock": true }, "facing=east,half=top,shape=straight": { - "model": "minecraft:stairs", + "model": "minecraft:block/stairs", "x": 180, "uvlock": true }, "facing=west,half=top,shape=straight": { - "model": "minecraft:stairs", + "model": "minecraft:block/stairs", "x": 180, "y": 180, "uvlock": true }, "facing=south,half=top,shape=straight": { - "model": "minecraft:stairs", + "model": "minecraft:block/stairs", "x": 180, "y": 90, "uvlock": true }, "facing=north,half=top,shape=straight": { - "model": "minecraft:stairs", + "model": "minecraft:block/stairs", "x": 180, "y": 270, "uvlock": true }, "facing=east,half=top,shape=outer_right": { - "model": "minecraft:outer_stairs", + "model": "minecraft:block/outer_stairs", "x": 180, "y": 90, "uvlock": true }, "facing=west,half=top,shape=outer_right": { - "model": "minecraft:outer_stairs", + "model": "minecraft:block/outer_stairs", "x": 180, "y": 270, "uvlock": true }, "facing=south,half=top,shape=outer_right": { - "model": "minecraft:outer_stairs", + "model": "minecraft:block/outer_stairs", "x": 180, "y": 180, "uvlock": true }, "facing=north,half=top,shape=outer_right": { - "model": "minecraft:outer_stairs", + "model": "minecraft:block/outer_stairs", "x": 180, "uvlock": true }, "facing=east,half=top,shape=outer_left": { - "model": "minecraft:outer_stairs", + "model": "minecraft:block/outer_stairs", "x": 180, "uvlock": true }, "facing=west,half=top,shape=outer_left": { - "model": "minecraft:outer_stairs", + "model": "minecraft:block/outer_stairs", "x": 180, "y": 180, "uvlock": true }, "facing=south,half=top,shape=outer_left": { - "model": "minecraft:outer_stairs", + "model": "minecraft:block/outer_stairs", "x": 180, "y": 90, "uvlock": true }, "facing=north,half=top,shape=outer_left": { - "model": "minecraft:outer_stairs", + "model": "minecraft:block/outer_stairs", "x": 180, "y": 270, "uvlock": true }, "facing=east,half=top,shape=inner_right": { - "model": "minecraft:inner_stairs", + "model": "minecraft:block/inner_stairs", "x": 180, "y": 90, "uvlock": true }, "facing=west,half=top,shape=inner_right": { - "model": "minecraft:inner_stairs", + "model": "minecraft:block/inner_stairs", "x": 180, "y": 270, "uvlock": true }, "facing=south,half=top,shape=inner_right": { - "model": "minecraft:inner_stairs", + "model": "minecraft:block/inner_stairs", "x": 180, "y": 180, "uvlock": true }, "facing=north,half=top,shape=inner_right": { - "model": "minecraft:inner_stairs", + "model": "minecraft:block/inner_stairs", "x": 180, "uvlock": true }, "facing=east,half=top,shape=inner_left": { - "model": "minecraft:inner_stairs", + "model": "minecraft:block/inner_stairs", "x": 180, "uvlock": true }, "facing=west,half=top,shape=inner_left": { - "model": "minecraft:inner_stairs", + "model": "minecraft:block/inner_stairs", "x": 180, "y": 180, "uvlock": true }, "facing=south,half=top,shape=inner_left": { - "model": "minecraft:inner_stairs", + "model": "minecraft:block/inner_stairs", "x": 180, "y": 90, "uvlock": true }, "facing=north,half=top,shape=inner_left": { - "model": "minecraft:inner_stairs", + "model": "minecraft:block/inner_stairs", "x": 180, "y": 270, "uvlock": true diff --git a/src/main/resources/assets/naturesaura/blockstates/infused_iron_block.json b/src/main/resources/assets/naturesaura/blockstates/infused_iron_block.json index fabb2d7e..91520af1 100644 --- a/src/main/resources/assets/naturesaura/blockstates/infused_iron_block.json +++ b/src/main/resources/assets/naturesaura/blockstates/infused_iron_block.json @@ -1,14 +1,13 @@ { "forge_marker": 1, "defaults": { - "model": "minecraft:cube_all", + "model": "minecraft:block/cube_all", "textures": { "all": "naturesaura:blocks/infused_iron_block" }, "transform": "forge:default-block" }, "variants": { - "normal": [{}], - "inventory": [{}] + "": [{}] } } \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/blockstates/infused_slab.json b/src/main/resources/assets/naturesaura/blockstates/infused_slab.json index 7ca71aba..82470f1e 100644 --- a/src/main/resources/assets/naturesaura/blockstates/infused_slab.json +++ b/src/main/resources/assets/naturesaura/blockstates/infused_slab.json @@ -1,7 +1,7 @@ { "forge_marker": 1, "defaults": { - "model": "minecraft:half_slab", + "model": "minecraft:block/half_slab", "textures": { "bottom": "naturesaura:blocks/infused_stone", "top": "naturesaura:blocks/infused_stone", @@ -10,13 +10,15 @@ "transform": "forge:default-block" }, "variants": { - "half=top": [ + "type=top": [ { "x": 180, "uvlock": true } ], - "half=bottom": [{}], - "inventory": [{}] + "type=bottom": [{}], + "type=double": { + "model": "naturesaura:block/infused_stone" + } } } diff --git a/src/main/resources/assets/naturesaura/blockstates/infused_slab_double.json b/src/main/resources/assets/naturesaura/blockstates/infused_slab_double.json deleted file mode 100644 index 1b276290..00000000 --- a/src/main/resources/assets/naturesaura/blockstates/infused_slab_double.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "minecraft:cube_all", - "textures": { - "all": "naturesaura:blocks/infused_stone" - }, - "transform": "forge:default-block" - }, - "variants": { - "normal": [{}], - "inventory": [{}] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/blockstates/infused_stairs.json b/src/main/resources/assets/naturesaura/blockstates/infused_stairs.json index c7e25c28..4b35fe2e 100644 --- a/src/main/resources/assets/naturesaura/blockstates/infused_stairs.json +++ b/src/main/resources/assets/naturesaura/blockstates/infused_stairs.json @@ -8,213 +8,213 @@ } }, "variants": { - "normal": { - "model": "minecraft:stairs" + "": { + "model": "minecraft:block/stairs" }, "inventory": { - "model": "minecraft:stairs" + "model": "minecraft:block/stairs" }, "facing=east,half=bottom,shape=straight": { - "model": "minecraft:stairs" + "model": "minecraft:block/stairs" }, "facing=west,half=bottom,shape=straight": { - "model": "minecraft:stairs", + "model": "minecraft:block/stairs", "y": 180, "uvlock": true }, "facing=south,half=bottom,shape=straight": { - "model": "minecraft:stairs", + "model": "minecraft:block/stairs", "y": 90, "uvlock": true }, "facing=north,half=bottom,shape=straight": { - "model": "minecraft:stairs", + "model": "minecraft:block/stairs", "y": 270, "uvlock": true }, "facing=east,half=bottom,shape=outer_right": { - "model": "minecraft:outer_stairs" + "model": "minecraft:block/outer_stairs" }, "facing=west,half=bottom,shape=outer_right": { - "model": "minecraft:outer_stairs", + "model": "minecraft:block/outer_stairs", "y": 180, "uvlock": true }, "facing=south,half=bottom,shape=outer_right": { - "model": "minecraft:outer_stairs", + "model": "minecraft:block/outer_stairs", "y": 90, "uvlock": true }, "facing=north,half=bottom,shape=outer_right": { - "model": "minecraft:outer_stairs", + "model": "minecraft:block/outer_stairs", "y": 270, "uvlock": true }, "facing=east,half=bottom,shape=outer_left": { - "model": "minecraft:outer_stairs", + "model": "minecraft:block/outer_stairs", "y": 270, "uvlock": true }, "facing=west,half=bottom,shape=outer_left": { - "model": "minecraft:outer_stairs", + "model": "minecraft:block/outer_stairs", "y": 90, "uvlock": true }, "facing=south,half=bottom,shape=outer_left": { - "model": "minecraft:outer_stairs" + "model": "minecraft:block/outer_stairs" }, "facing=north,half=bottom,shape=outer_left": { - "model": "minecraft:outer_stairs", + "model": "minecraft:block/outer_stairs", "y": 180, "uvlock": true }, "facing=east,half=bottom,shape=inner_right": { - "model": "minecraft:inner_stairs" + "model": "minecraft:block/inner_stairs" }, "facing=west,half=bottom,shape=inner_right": { - "model": "minecraft:inner_stairs", + "model": "minecraft:block/inner_stairs", "y": 180, "uvlock": true }, "facing=south,half=bottom,shape=inner_right": { - "model": "minecraft:inner_stairs", + "model": "minecraft:block/inner_stairs", "y": 90, "uvlock": true }, "facing=north,half=bottom,shape=inner_right": { - "model": "minecraft:inner_stairs", + "model": "minecraft:block/inner_stairs", "y": 270, "uvlock": true }, "facing=east,half=bottom,shape=inner_left": { - "model": "minecraft:inner_stairs", + "model": "minecraft:block/inner_stairs", "y": 270, "uvlock": true }, "facing=west,half=bottom,shape=inner_left": { - "model": "minecraft:inner_stairs", + "model": "minecraft:block/inner_stairs", "y": 90, "uvlock": true }, "facing=south,half=bottom,shape=inner_left": { - "model": "minecraft:inner_stairs" + "model": "minecraft:block/inner_stairs" }, "facing=north,half=bottom,shape=inner_left": { - "model": "minecraft:inner_stairs", + "model": "minecraft:block/inner_stairs", "y": 180, "uvlock": true }, "facing=east,half=top,shape=straight": { - "model": "minecraft:stairs", + "model": "minecraft:block/stairs", "x": 180, "uvlock": true }, "facing=west,half=top,shape=straight": { - "model": "minecraft:stairs", + "model": "minecraft:block/stairs", "x": 180, "y": 180, "uvlock": true }, "facing=south,half=top,shape=straight": { - "model": "minecraft:stairs", + "model": "minecraft:block/stairs", "x": 180, "y": 90, "uvlock": true }, "facing=north,half=top,shape=straight": { - "model": "minecraft:stairs", + "model": "minecraft:block/stairs", "x": 180, "y": 270, "uvlock": true }, "facing=east,half=top,shape=outer_right": { - "model": "minecraft:outer_stairs", + "model": "minecraft:block/outer_stairs", "x": 180, "y": 90, "uvlock": true }, "facing=west,half=top,shape=outer_right": { - "model": "minecraft:outer_stairs", + "model": "minecraft:block/outer_stairs", "x": 180, "y": 270, "uvlock": true }, "facing=south,half=top,shape=outer_right": { - "model": "minecraft:outer_stairs", + "model": "minecraft:block/outer_stairs", "x": 180, "y": 180, "uvlock": true }, "facing=north,half=top,shape=outer_right": { - "model": "minecraft:outer_stairs", + "model": "minecraft:block/outer_stairs", "x": 180, "uvlock": true }, "facing=east,half=top,shape=outer_left": { - "model": "minecraft:outer_stairs", + "model": "minecraft:block/outer_stairs", "x": 180, "uvlock": true }, "facing=west,half=top,shape=outer_left": { - "model": "minecraft:outer_stairs", + "model": "minecraft:block/outer_stairs", "x": 180, "y": 180, "uvlock": true }, "facing=south,half=top,shape=outer_left": { - "model": "minecraft:outer_stairs", + "model": "minecraft:block/outer_stairs", "x": 180, "y": 90, "uvlock": true }, "facing=north,half=top,shape=outer_left": { - "model": "minecraft:outer_stairs", + "model": "minecraft:block/outer_stairs", "x": 180, "y": 270, "uvlock": true }, "facing=east,half=top,shape=inner_right": { - "model": "minecraft:inner_stairs", + "model": "minecraft:block/inner_stairs", "x": 180, "y": 90, "uvlock": true }, "facing=west,half=top,shape=inner_right": { - "model": "minecraft:inner_stairs", + "model": "minecraft:block/inner_stairs", "x": 180, "y": 270, "uvlock": true }, "facing=south,half=top,shape=inner_right": { - "model": "minecraft:inner_stairs", + "model": "minecraft:block/inner_stairs", "x": 180, "y": 180, "uvlock": true }, "facing=north,half=top,shape=inner_right": { - "model": "minecraft:inner_stairs", + "model": "minecraft:block/inner_stairs", "x": 180, "uvlock": true }, "facing=east,half=top,shape=inner_left": { - "model": "minecraft:inner_stairs", + "model": "minecraft:block/inner_stairs", "x": 180, "uvlock": true }, "facing=west,half=top,shape=inner_left": { - "model": "minecraft:inner_stairs", + "model": "minecraft:block/inner_stairs", "x": 180, "y": 180, "uvlock": true }, "facing=south,half=top,shape=inner_left": { - "model": "minecraft:inner_stairs", + "model": "minecraft:block/inner_stairs", "x": 180, "y": 90, "uvlock": true }, "facing=north,half=top,shape=inner_left": { - "model": "minecraft:inner_stairs", + "model": "minecraft:block/inner_stairs", "x": 180, "y": 270, "uvlock": true diff --git a/src/main/resources/assets/naturesaura/blockstates/infused_stone.json b/src/main/resources/assets/naturesaura/blockstates/infused_stone.json index 1b276290..7525c4e2 100644 --- a/src/main/resources/assets/naturesaura/blockstates/infused_stone.json +++ b/src/main/resources/assets/naturesaura/blockstates/infused_stone.json @@ -1,14 +1,13 @@ { "forge_marker": 1, "defaults": { - "model": "minecraft:cube_all", + "model": "minecraft:block/cube_all", "textures": { "all": "naturesaura:blocks/infused_stone" }, "transform": "forge:default-block" }, "variants": { - "normal": [{}], - "inventory": [{}] + "": [{}] } } \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/blockstates/moss_generator.json b/src/main/resources/assets/naturesaura/blockstates/moss_generator.json index 0236d012..79b21ceb 100644 --- a/src/main/resources/assets/naturesaura/blockstates/moss_generator.json +++ b/src/main/resources/assets/naturesaura/blockstates/moss_generator.json @@ -1,7 +1,7 @@ { "forge_marker": 1, "defaults": { - "model": "minecraft:cube", + "model": "minecraft:block/cube", "textures": { "particle": "naturesaura:blocks/moss_generator", "up": "naturesaura:blocks/moss_generator_top", @@ -14,7 +14,6 @@ "transform": "forge:default-block" }, "variants": { - "normal": [{}], - "inventory": [{}] + "": [{}] } } \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/blockstates/nature_altar.json b/src/main/resources/assets/naturesaura/blockstates/nature_altar.json index 957d665c..e4b218ed 100644 --- a/src/main/resources/assets/naturesaura/blockstates/nature_altar.json +++ b/src/main/resources/assets/naturesaura/blockstates/nature_altar.json @@ -1,7 +1,7 @@ { "forge_marker": 1, "defaults": { - "model": "naturesaura:nature_altar", + "model": "naturesaura:block/nature_altar", "textures": { "texture": "naturesaura:blocks/nature_altar", "top": "naturesaura:blocks/nature_altar_top", @@ -10,7 +10,6 @@ "transform": "forge:default-block" }, "variants": { - "normal": [{}], - "inventory": [{}] + "": [{}] } } \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/blockstates/oak_generator.json b/src/main/resources/assets/naturesaura/blockstates/oak_generator.json index 458ee94b..f1b2ad65 100644 --- a/src/main/resources/assets/naturesaura/blockstates/oak_generator.json +++ b/src/main/resources/assets/naturesaura/blockstates/oak_generator.json @@ -1,7 +1,7 @@ { "forge_marker": 1, "defaults": { - "model": "minecraft:cube", + "model": "minecraft:block/cube", "textures": { "particle": "naturesaura:blocks/oak_generator", "up": "naturesaura:blocks/oak_generator_top", @@ -14,7 +14,6 @@ "transform": "forge:default-block" }, "variants": { - "normal": [{}], - "inventory": [{}] + "": [{}] } } \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/blockstates/offering_table.json b/src/main/resources/assets/naturesaura/blockstates/offering_table.json index 3469aa3e..179fdd09 100644 --- a/src/main/resources/assets/naturesaura/blockstates/offering_table.json +++ b/src/main/resources/assets/naturesaura/blockstates/offering_table.json @@ -1,7 +1,7 @@ { "forge_marker": 1, "defaults": { - "model": "naturesaura:offering_table", + "model": "naturesaura:block/offering_table", "textures": { "0": "naturesaura:blocks/stripped_oak_log", "1": "naturesaura:blocks/stripped_oak_log_top", @@ -11,7 +11,6 @@ "transform": "forge:default-block" }, "variants": { - "normal": [{}], - "inventory": [{}] + "": [{}] } } \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/blockstates/pickup_stopper.json b/src/main/resources/assets/naturesaura/blockstates/pickup_stopper.json index 7df8b6cf..f8fdf504 100644 --- a/src/main/resources/assets/naturesaura/blockstates/pickup_stopper.json +++ b/src/main/resources/assets/naturesaura/blockstates/pickup_stopper.json @@ -1,7 +1,7 @@ { "forge_marker": 1, "defaults": { - "model": "minecraft:cube", + "model": "minecraft:block/cube", "textures": { "particle": "naturesaura:blocks/pickup_stopper", "up": "naturesaura:blocks/pickup_stopper_top", @@ -14,7 +14,6 @@ "transform": "forge:default-block" }, "variants": { - "normal": [{}], - "inventory": [{}] + "": [{}] } } \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/blockstates/placer.json b/src/main/resources/assets/naturesaura/blockstates/placer.json index 3aa44af8..038aceed 100644 --- a/src/main/resources/assets/naturesaura/blockstates/placer.json +++ b/src/main/resources/assets/naturesaura/blockstates/placer.json @@ -1,7 +1,7 @@ { "forge_marker": 1, "defaults": { - "model": "minecraft:cube", + "model": "minecraft:block/cube", "textures": { "particle": "naturesaura:blocks/placer", "up": "naturesaura:blocks/placer_top", @@ -14,7 +14,6 @@ "transform": "forge:default-block" }, "variants": { - "normal": [{}], - "inventory": [{}] + "": [{}] } } \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/blockstates/potion_generator.json b/src/main/resources/assets/naturesaura/blockstates/potion_generator.json index b636eb86..acedf8f9 100644 --- a/src/main/resources/assets/naturesaura/blockstates/potion_generator.json +++ b/src/main/resources/assets/naturesaura/blockstates/potion_generator.json @@ -1,7 +1,7 @@ { "forge_marker": 1, "defaults": { - "model": "minecraft:cube", + "model": "minecraft:block/cube", "textures": { "particle": "naturesaura:blocks/potion_generator", "up": "naturesaura:blocks/potion_generator_top", @@ -14,7 +14,6 @@ "transform": "forge:default-block" }, "variants": { - "normal": [{}], - "inventory": [{}] + "": [{}] } } \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/blockstates/powder_placer.json b/src/main/resources/assets/naturesaura/blockstates/powder_placer.json index cc618bdf..58126593 100644 --- a/src/main/resources/assets/naturesaura/blockstates/powder_placer.json +++ b/src/main/resources/assets/naturesaura/blockstates/powder_placer.json @@ -1,7 +1,7 @@ { "forge_marker": 1, "defaults": { - "model": "naturesaura:powder_placer", + "model": "naturesaura:block/powder_placer", "textures": { "texture": "naturesaura:blocks/powder_placer", "top": "naturesaura:blocks/powder_placer_top", @@ -10,7 +10,6 @@ "transform": "forge:default-block" }, "variants": { - "normal": [{}], - "inventory": [{}] + "": [{}] } } \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/blockstates/projectile_generator.json b/src/main/resources/assets/naturesaura/blockstates/projectile_generator.json index d743cb40..52bef649 100644 --- a/src/main/resources/assets/naturesaura/blockstates/projectile_generator.json +++ b/src/main/resources/assets/naturesaura/blockstates/projectile_generator.json @@ -1,7 +1,7 @@ { "forge_marker": 1, "defaults": { - "model": "minecraft:cube", + "model": "minecraft:block/cube", "textures": { "particle": "naturesaura:blocks/projectile_generator", "up": "naturesaura:blocks/projectile_generator_top", @@ -14,7 +14,6 @@ "transform": "forge:default-block" }, "variants": { - "normal": [{}], - "inventory": [{}] + "": [{}] } } \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/blockstates/rf_converter.json b/src/main/resources/assets/naturesaura/blockstates/rf_converter.json index 9dec64c6..e08c4c53 100644 --- a/src/main/resources/assets/naturesaura/blockstates/rf_converter.json +++ b/src/main/resources/assets/naturesaura/blockstates/rf_converter.json @@ -1,14 +1,13 @@ { "forge_marker": 1, "defaults": { - "model": "minecraft:cube_all", + "model": "minecraft:block/cube_all", "textures": { "all": "naturesaura:blocks/rf_converter" }, "transform": "forge:default-block" }, "variants": { - "normal": [{}], - "inventory": [{}] + "": [{}] } } \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/blockstates/spawn_lamp.json b/src/main/resources/assets/naturesaura/blockstates/spawn_lamp.json index f8c58b40..41652624 100644 --- a/src/main/resources/assets/naturesaura/blockstates/spawn_lamp.json +++ b/src/main/resources/assets/naturesaura/blockstates/spawn_lamp.json @@ -1,7 +1,7 @@ { "forge_marker": 1, "defaults": { - "model": "naturesaura:spawn_lamp", + "model": "naturesaura:block/spawn_lamp", "textures": { "0": "naturesaura:blocks/spawn_lamp", "particle": "#0" @@ -9,7 +9,6 @@ "transform": "forge:default-block" }, "variants": { - "normal": [{}], - "inventory": [{}] + "": [{}] } } \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/blockstates/time_changer.json b/src/main/resources/assets/naturesaura/blockstates/time_changer.json index ea887ca4..f2a6bdc2 100644 --- a/src/main/resources/assets/naturesaura/blockstates/time_changer.json +++ b/src/main/resources/assets/naturesaura/blockstates/time_changer.json @@ -1,7 +1,7 @@ { "forge_marker": 1, "defaults": { - "model": "minecraft:cube", + "model": "minecraft:block/cube", "textures": { "particle": "naturesaura:blocks/time_changer", "up": "naturesaura:blocks/time_changer_top", @@ -14,7 +14,6 @@ "transform": "forge:default-block" }, "variants": { - "normal": [{}], - "inventory": [{}] + "": [{}] } } \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/blockstates/wood_stand.json b/src/main/resources/assets/naturesaura/blockstates/wood_stand.json index 15479107..ddf1c0fb 100644 --- a/src/main/resources/assets/naturesaura/blockstates/wood_stand.json +++ b/src/main/resources/assets/naturesaura/blockstates/wood_stand.json @@ -1,7 +1,7 @@ { "forge_marker": 1, "defaults": { - "model": "naturesaura:wood_stand", + "model": "naturesaura:block/wood_stand", "textures": { "texture": "minecraft:blocks/log_oak", "top": "minecraft:blocks/log_oak_top", @@ -10,7 +10,6 @@ "transform": "forge:default-block" }, "variants": { - "normal": [{}], - "inventory": [{}] + "": [{}] } } \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/models/item/ancient_bark.json b/src/main/resources/assets/naturesaura/models/item/ancient_bark.json new file mode 100644 index 00000000..3a51aa68 --- /dev/null +++ b/src/main/resources/assets/naturesaura/models/item/ancient_bark.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "end": "naturesaura:blocks/ancient_log", + "side": "naturesaura:blocks/ancient_log" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/models/item/ancient_leaves.json b/src/main/resources/assets/naturesaura/models/item/ancient_leaves.json new file mode 100644 index 00000000..90b61d6f --- /dev/null +++ b/src/main/resources/assets/naturesaura/models/item/ancient_leaves.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/leaves", + "textures": { + "all": "naturesaura:blocks/ancient_leaves" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/models/item/ancient_log.json b/src/main/resources/assets/naturesaura/models/item/ancient_log.json new file mode 100644 index 00000000..f6fee4d9 --- /dev/null +++ b/src/main/resources/assets/naturesaura/models/item/ancient_log.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "end": "naturesaura:blocks/ancient_log_top", + "side": "naturesaura:blocks/ancient_log" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/models/item/ancient_planks.json b/src/main/resources/assets/naturesaura/models/item/ancient_planks.json new file mode 100644 index 00000000..f0eadff2 --- /dev/null +++ b/src/main/resources/assets/naturesaura/models/item/ancient_planks.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "naturesaura:blocks/ancient_planks" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/models/item/ancient_sapling.json b/src/main/resources/assets/naturesaura/models/item/ancient_sapling.json new file mode 100644 index 00000000..50863d8d --- /dev/null +++ b/src/main/resources/assets/naturesaura/models/item/ancient_sapling.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "naturesaura:blocks/ancient_sapling" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/models/item/ancient_slab.json b/src/main/resources/assets/naturesaura/models/item/ancient_slab.json new file mode 100644 index 00000000..53c0b17a --- /dev/null +++ b/src/main/resources/assets/naturesaura/models/item/ancient_slab.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/half_slab", + "textures": { + "bottom": "naturesaura:blocks/ancient_planks", + "top": "naturesaura:blocks/ancient_planks", + "side": "naturesaura:blocks/ancient_planks" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/models/item/ancient_stairs.json b/src/main/resources/assets/naturesaura/models/item/ancient_stairs.json new file mode 100644 index 00000000..632343de --- /dev/null +++ b/src/main/resources/assets/naturesaura/models/item/ancient_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/stairs", + "textures": { + "bottom": "naturesaura:blocks/ancient_planks", + "top": "naturesaura:blocks/ancient_planks", + "side": "naturesaura:blocks/ancient_planks" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/models/item/animal_generator.json b/src/main/resources/assets/naturesaura/models/item/animal_generator.json new file mode 100644 index 00000000..f233aafe --- /dev/null +++ b/src/main/resources/assets/naturesaura/models/item/animal_generator.json @@ -0,0 +1,11 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "up": "naturesaura:blocks/animal_generator_top", + "down": "naturesaura:blocks/animal_generator_bottom", + "north": "naturesaura:blocks/animal_generator", + "east": "naturesaura:blocks/animal_generator", + "south": "naturesaura:blocks/animal_generator", + "west": "naturesaura:blocks/animal_generator" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/models/item/animal_spawner.json b/src/main/resources/assets/naturesaura/models/item/animal_spawner.json new file mode 100644 index 00000000..87154f73 --- /dev/null +++ b/src/main/resources/assets/naturesaura/models/item/animal_spawner.json @@ -0,0 +1,11 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "up": "naturesaura:blocks/animal_spawner_top", + "down": "naturesaura:blocks/animal_spawner_bottom", + "north": "naturesaura:blocks/animal_spawner", + "east": "naturesaura:blocks/animal_spawner", + "south": "naturesaura:blocks/animal_spawner", + "west": "naturesaura:blocks/animal_spawner" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/models/item/aura_detector.json b/src/main/resources/assets/naturesaura/models/item/aura_detector.json new file mode 100644 index 00000000..186aee55 --- /dev/null +++ b/src/main/resources/assets/naturesaura/models/item/aura_detector.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "naturesaura:blocks/aura_detector" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/models/item/auto_crafter.json b/src/main/resources/assets/naturesaura/models/item/auto_crafter.json new file mode 100644 index 00000000..96f62671 --- /dev/null +++ b/src/main/resources/assets/naturesaura/models/item/auto_crafter.json @@ -0,0 +1,11 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "up": "naturesaura:blocks/auto_crafter_top", + "north": "naturesaura:blocks/auto_crafter", + "east": "naturesaura:blocks/auto_crafter", + "west": "naturesaura:blocks/auto_crafter", + "down": "naturesaura:blocks/auto_crafter_bottom", + "south": "naturesaura:blocks/auto_crafter" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/models/item/chunk_loader.json b/src/main/resources/assets/naturesaura/models/item/chunk_loader.json new file mode 100644 index 00000000..3b5539e8 --- /dev/null +++ b/src/main/resources/assets/naturesaura/models/item/chunk_loader.json @@ -0,0 +1,6 @@ +{ + "parent": "naturesaura:block/chunk_loader", + "textures": { + "texture": "naturesaura:blocks/chunk_loader" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/models/item/conversion_catalyst.json b/src/main/resources/assets/naturesaura/models/item/conversion_catalyst.json new file mode 100644 index 00000000..5fdd3ba2 --- /dev/null +++ b/src/main/resources/assets/naturesaura/models/item/conversion_catalyst.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "naturesaura:blocks/conversion_catalyst" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/models/item/crushing_catalyst.json b/src/main/resources/assets/naturesaura/models/item/crushing_catalyst.json new file mode 100644 index 00000000..b54683c3 --- /dev/null +++ b/src/main/resources/assets/naturesaura/models/item/crushing_catalyst.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "naturesaura:blocks/crushing_catalyst" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/models/item/decayed_leaves.json b/src/main/resources/assets/naturesaura/models/item/decayed_leaves.json new file mode 100644 index 00000000..a4a000ae --- /dev/null +++ b/src/main/resources/assets/naturesaura/models/item/decayed_leaves.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:model/leaves", + "textures": { + "all": "naturesaura:blocks/decayed_leaves" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/models/item/dimension_rail_end.json b/src/main/resources/assets/naturesaura/models/item/dimension_rail_end.json new file mode 100644 index 00000000..266f8509 --- /dev/null +++ b/src/main/resources/assets/naturesaura/models/item/dimension_rail_end.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "naturesaura:blocks/dimension_rail_end" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/models/item/dimension_rail_nether.json b/src/main/resources/assets/naturesaura/models/item/dimension_rail_nether.json new file mode 100644 index 00000000..db164a09 --- /dev/null +++ b/src/main/resources/assets/naturesaura/models/item/dimension_rail_nether.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "naturesaura:blocks/dimension_rail_nether" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/models/item/dimension_rail_overworld.json b/src/main/resources/assets/naturesaura/models/item/dimension_rail_overworld.json new file mode 100644 index 00000000..925e2df4 --- /dev/null +++ b/src/main/resources/assets/naturesaura/models/item/dimension_rail_overworld.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "naturesaura:blocks/dimension_rail_overworld" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/models/item/end_flower.json b/src/main/resources/assets/naturesaura/models/item/end_flower.json new file mode 100644 index 00000000..540de456 --- /dev/null +++ b/src/main/resources/assets/naturesaura/models/item/end_flower.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "naturesaura:blocks/end_flower" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/models/item/ender_crate.json b/src/main/resources/assets/naturesaura/models/item/ender_crate.json new file mode 100644 index 00000000..1ea1480d --- /dev/null +++ b/src/main/resources/assets/naturesaura/models/item/ender_crate.json @@ -0,0 +1,11 @@ +{ + "parent": "minecraft:blocks/cube", + "textures": { + "up": "naturesaura:blocks/ender_crate_top", + "down": "naturesaura:blocks/ender_crate_bottom", + "north": "naturesaura:blocks/ender_crate", + "east": "naturesaura:blocks/ender_crate", + "south": "naturesaura:blocks/ender_crate", + "west": "naturesaura:blocks/ender_crate" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/models/item/field_creator.json b/src/main/resources/assets/naturesaura/models/item/field_creator.json new file mode 100644 index 00000000..062d9187 --- /dev/null +++ b/src/main/resources/assets/naturesaura/models/item/field_creator.json @@ -0,0 +1,7 @@ +{ + "parent": "naturesaura:block/field_creator", + "textures": { + "texture": "naturesaura:blocks/field_creator", + "center": "naturesaura:blocks/field_creator_center" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/models/item/firework_generator.json b/src/main/resources/assets/naturesaura/models/item/firework_generator.json new file mode 100644 index 00000000..5c8320a5 --- /dev/null +++ b/src/main/resources/assets/naturesaura/models/item/firework_generator.json @@ -0,0 +1,11 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "up": "naturesaura:blocks/firework_generator_top", + "down": "naturesaura:blocks/firework_generator", + "north": "naturesaura:blocks/firework_generator", + "east": "naturesaura:blocks/firework_generator", + "south": "naturesaura:blocks/firework_generator", + "west": "naturesaura:blocks/firework_generator" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/models/item/flower_generator.json b/src/main/resources/assets/naturesaura/models/item/flower_generator.json new file mode 100644 index 00000000..b1cca4fb --- /dev/null +++ b/src/main/resources/assets/naturesaura/models/item/flower_generator.json @@ -0,0 +1,11 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "up": "naturesaura:blocks/flower_generator_top", + "down": "naturesaura:blocks/flower_generator_top", + "north": "naturesaura:blocks/flower_generator", + "east": "naturesaura:blocks/flower_generator", + "south": "naturesaura:blocks/flower_generator", + "west": "naturesaura:blocks/flower_generator" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/models/item/furnace_heater.json b/src/main/resources/assets/naturesaura/models/item/furnace_heater.json new file mode 100644 index 00000000..70516f0d --- /dev/null +++ b/src/main/resources/assets/naturesaura/models/item/furnace_heater.json @@ -0,0 +1,6 @@ +{ + "parent": "naturesaura:block/furnace_heater", + "textures": { + "texture": "naturesaura:blocks/furnace_heater" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/models/item/generator_limit_remover.json b/src/main/resources/assets/naturesaura/models/item/generator_limit_remover.json new file mode 100644 index 00000000..648bb4ee --- /dev/null +++ b/src/main/resources/assets/naturesaura/models/item/generator_limit_remover.json @@ -0,0 +1,11 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "up": "naturesaura:blocks/generator_limit_remover_top", + "down": "naturesaura:blocks/infused_stone", + "north": "naturesaura:blocks/generator_limit_remover", + "east": "naturesaura:blocks/generator_limit_remover", + "south": "naturesaura:blocks/generator_limit_remover", + "west": "naturesaura:blocks/generator_limit_remover" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/models/item/gold_brick.json b/src/main/resources/assets/naturesaura/models/item/gold_brick.json new file mode 100644 index 00000000..191b4b7a --- /dev/null +++ b/src/main/resources/assets/naturesaura/models/item/gold_brick.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "naturesaura:blocks/gold_brick" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/models/item/golden_leaves.json b/src/main/resources/assets/naturesaura/models/item/golden_leaves.json new file mode 100644 index 00000000..6b2dd156 --- /dev/null +++ b/src/main/resources/assets/naturesaura/models/item/golden_leaves.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/leaves", + "textures": { + "all": "minecraft:blocks/leaves_oak" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/models/item/grated_chute.json b/src/main/resources/assets/naturesaura/models/item/grated_chute.json new file mode 100644 index 00000000..d8e9758b --- /dev/null +++ b/src/main/resources/assets/naturesaura/models/item/grated_chute.json @@ -0,0 +1,9 @@ +{ + "parent": "naturesaura:block/grated_chute_down", + "textures": { + "particle": "naturesaura:blocks/grated_chute_outside", + "top": "naturesaura:blocks/grated_chute_top", + "side": "naturesaura:blocks/grated_chute_outside", + "inside": "naturesaura:blocks/grated_chute_inside" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/models/item/hopper_upgrade.json b/src/main/resources/assets/naturesaura/models/item/hopper_upgrade.json new file mode 100644 index 00000000..083efe66 --- /dev/null +++ b/src/main/resources/assets/naturesaura/models/item/hopper_upgrade.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "naturesaura:blocks/hopper_upgrade" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/models/item/infused_brick.json b/src/main/resources/assets/naturesaura/models/item/infused_brick.json new file mode 100644 index 00000000..e0fe835d --- /dev/null +++ b/src/main/resources/assets/naturesaura/models/item/infused_brick.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "naturesaura:blocks/infused_brick" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/models/item/infused_brick_slab.json b/src/main/resources/assets/naturesaura/models/item/infused_brick_slab.json new file mode 100644 index 00000000..47507d06 --- /dev/null +++ b/src/main/resources/assets/naturesaura/models/item/infused_brick_slab.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/half_slab", + "textures": { + "bottom": "naturesaura:blocks/infused_brick", + "top": "naturesaura:blocks/infused_brick", + "side": "naturesaura:blocks/infused_brick" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/models/item/infused_brick_stairs.json b/src/main/resources/assets/naturesaura/models/item/infused_brick_stairs.json new file mode 100644 index 00000000..eb554956 --- /dev/null +++ b/src/main/resources/assets/naturesaura/models/item/infused_brick_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/stairs", + "textures": { + "bottom": "naturesaura:blocks/infused_brick", + "top": "naturesaura:blocks/infused_brick", + "side": "naturesaura:blocks/infused_brick" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/models/item/infused_iron_block.json b/src/main/resources/assets/naturesaura/models/item/infused_iron_block.json new file mode 100644 index 00000000..2071d60c --- /dev/null +++ b/src/main/resources/assets/naturesaura/models/item/infused_iron_block.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "naturesaura:blocks/infused_iron_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/models/item/infused_slab.json b/src/main/resources/assets/naturesaura/models/item/infused_slab.json new file mode 100644 index 00000000..695e7685 --- /dev/null +++ b/src/main/resources/assets/naturesaura/models/item/infused_slab.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/half_slab", + "textures": { + "bottom": "naturesaura:blocks/infused_stone", + "top": "naturesaura:blocks/infused_stone", + "side": "naturesaura:blocks/infused_stone" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/models/item/infused_stairs.json b/src/main/resources/assets/naturesaura/models/item/infused_stairs.json new file mode 100644 index 00000000..2669c7b6 --- /dev/null +++ b/src/main/resources/assets/naturesaura/models/item/infused_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/stairs", + "textures": { + "bottom": "naturesaura:blocks/infused_stone", + "top": "naturesaura:blocks/infused_stone", + "side": "naturesaura:blocks/infused_stone" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/models/item/infused_stone.json b/src/main/resources/assets/naturesaura/models/item/infused_stone.json new file mode 100644 index 00000000..913e5664 --- /dev/null +++ b/src/main/resources/assets/naturesaura/models/item/infused_stone.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "naturesaura:blocks/infused_stone" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/models/item/moss_generator.json b/src/main/resources/assets/naturesaura/models/item/moss_generator.json new file mode 100644 index 00000000..2ab64e86 --- /dev/null +++ b/src/main/resources/assets/naturesaura/models/item/moss_generator.json @@ -0,0 +1,11 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "up": "naturesaura:blocks/moss_generator_top", + "down": "naturesaura:blocks/moss_generator_top", + "north": "naturesaura:blocks/moss_generator", + "east": "naturesaura:blocks/moss_generator", + "south": "naturesaura:blocks/moss_generator", + "west": "naturesaura:blocks/moss_generator" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/models/item/nature_altar.json b/src/main/resources/assets/naturesaura/models/item/nature_altar.json new file mode 100644 index 00000000..180864af --- /dev/null +++ b/src/main/resources/assets/naturesaura/models/item/nature_altar.json @@ -0,0 +1,7 @@ +{ + "parent": "naturesaura:block/nature_altar", + "textures": { + "texture": "naturesaura:blocks/nature_altar", + "top": "naturesaura:blocks/nature_altar_top" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/models/item/oak_generator.json b/src/main/resources/assets/naturesaura/models/item/oak_generator.json new file mode 100644 index 00000000..541c8ef2 --- /dev/null +++ b/src/main/resources/assets/naturesaura/models/item/oak_generator.json @@ -0,0 +1,11 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "up": "naturesaura:blocks/oak_generator_top", + "down": "naturesaura:blocks/oak_generator_bottom", + "north": "naturesaura:blocks/oak_generator", + "east": "naturesaura:blocks/oak_generator", + "south": "naturesaura:blocks/oak_generator", + "west": "naturesaura:blocks/oak_generator" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/models/item/offering_table.json b/src/main/resources/assets/naturesaura/models/item/offering_table.json new file mode 100644 index 00000000..ac389c09 --- /dev/null +++ b/src/main/resources/assets/naturesaura/models/item/offering_table.json @@ -0,0 +1,8 @@ +{ + "parent": "naturesaura:block/offering_table", + "textures": { + "0": "naturesaura:blocks/stripped_oak_log", + "1": "naturesaura:blocks/stripped_oak_log_top", + "2": "naturesaura:blocks/infused_stone" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/models/item/pickup_stopper.json b/src/main/resources/assets/naturesaura/models/item/pickup_stopper.json new file mode 100644 index 00000000..70ba3eeb --- /dev/null +++ b/src/main/resources/assets/naturesaura/models/item/pickup_stopper.json @@ -0,0 +1,11 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "up": "naturesaura:blocks/pickup_stopper_top", + "down": "naturesaura:blocks/pickup_stopper_top", + "north": "naturesaura:blocks/pickup_stopper", + "east": "naturesaura:blocks/pickup_stopper", + "south": "naturesaura:blocks/pickup_stopper", + "west": "naturesaura:blocks/pickup_stopper" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/models/item/placer.json b/src/main/resources/assets/naturesaura/models/item/placer.json new file mode 100644 index 00000000..f4935fa7 --- /dev/null +++ b/src/main/resources/assets/naturesaura/models/item/placer.json @@ -0,0 +1,11 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "up": "naturesaura:blocks/placer_top", + "down": "naturesaura:blocks/placer_top", + "north": "naturesaura:blocks/placer", + "east": "naturesaura:blocks/placer", + "south": "naturesaura:blocks/placer", + "west": "naturesaura:blocks/placer" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/models/item/potion_generator.json b/src/main/resources/assets/naturesaura/models/item/potion_generator.json new file mode 100644 index 00000000..a314ba24 --- /dev/null +++ b/src/main/resources/assets/naturesaura/models/item/potion_generator.json @@ -0,0 +1,11 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "up": "naturesaura:blocks/potion_generator_top", + "down": "naturesaura:blocks/potion_generator_bottom", + "north": "naturesaura:blocks/potion_generator", + "east": "naturesaura:blocks/potion_generator", + "south": "naturesaura:blocks/potion_generator", + "west": "naturesaura:blocks/potion_generator" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/models/item/powder_placer.json b/src/main/resources/assets/naturesaura/models/item/powder_placer.json new file mode 100644 index 00000000..404a8b48 --- /dev/null +++ b/src/main/resources/assets/naturesaura/models/item/powder_placer.json @@ -0,0 +1,7 @@ +{ + "parent": "naturesaura:block/powder_placer", + "textures": { + "texture": "naturesaura:blocks/powder_placer", + "top": "naturesaura:blocks/powder_placer_top" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/models/item/projectile_generator.json b/src/main/resources/assets/naturesaura/models/item/projectile_generator.json new file mode 100644 index 00000000..2abf8bdb --- /dev/null +++ b/src/main/resources/assets/naturesaura/models/item/projectile_generator.json @@ -0,0 +1,11 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "up": "naturesaura:blocks/projectile_generator_top", + "down": "naturesaura:blocks/projectile_generator", + "north": "naturesaura:blocks/projectile_generator", + "east": "naturesaura:blocks/projectile_generator", + "south": "naturesaura:blocks/projectile_generator", + "west": "naturesaura:blocks/projectile_generator" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/models/item/rf_converter.json b/src/main/resources/assets/naturesaura/models/item/rf_converter.json new file mode 100644 index 00000000..502bc94d --- /dev/null +++ b/src/main/resources/assets/naturesaura/models/item/rf_converter.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "naturesaura:blocks/rf_converter" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/models/item/spawn_lamp.json b/src/main/resources/assets/naturesaura/models/item/spawn_lamp.json new file mode 100644 index 00000000..372a5a56 --- /dev/null +++ b/src/main/resources/assets/naturesaura/models/item/spawn_lamp.json @@ -0,0 +1,6 @@ +{ + "parent": "naturesaura:block/spawn_lamp", + "textures": { + "0": "naturesaura:blocks/spawn_lamp" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/models/item/time_changer.json b/src/main/resources/assets/naturesaura/models/item/time_changer.json new file mode 100644 index 00000000..9eeb1540 --- /dev/null +++ b/src/main/resources/assets/naturesaura/models/item/time_changer.json @@ -0,0 +1,11 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "up": "naturesaura:blocks/time_changer_top", + "down": "naturesaura:blocks/time_changer_bottom", + "north": "naturesaura:blocks/time_changer", + "east": "naturesaura:blocks/time_changer", + "south": "naturesaura:blocks/time_changer", + "west": "naturesaura:blocks/time_changer" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/models/item/wood_stand.json b/src/main/resources/assets/naturesaura/models/item/wood_stand.json new file mode 100644 index 00000000..78519723 --- /dev/null +++ b/src/main/resources/assets/naturesaura/models/item/wood_stand.json @@ -0,0 +1,7 @@ +{ + "parent": "naturesaura:block/wood_stand", + "textures": { + "texture": "minecraft:blocks/log_oak", + "top": "minecraft:blocks/log_oak_top" + } +} \ No newline at end of file