Ellpeck/NaturesAura
1
0
Fork 0
mirror of https://github.com/Ellpeck/NaturesAura.git synced 2024-11-22 19:58:34 +01:00
Code Issues Projects Releases Wiki Activity

some fixes as well as a heap of models

Browse source
This commit is contained in:
Ellpeck 2020-01-22 16:03:39 +01:00
parent e4a20b1268
commit 327b631237
106 changed files with 656 additions and 392 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/main/java/de/ellpeck/naturesaura/Helper.java
View file

@ -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<TileEntity, Boolean> 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<AuraChunk> 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 <T extends IForgeRegistryEntry<T>> void populateObjectHolders(Class clazz, IForgeRegistry<T> registry) {
for (Field entry : clazz.getFields()) {

21
src/main/java/de/ellpeck/naturesaura/proxy/ClientProxy.java
View file

@ -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 <T extends Entity> void registerEntityRenderer(Class<T> entityClass, Supplier<IRenderFactory<T>> 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);
}
}

12
src/main/java/de/ellpeck/naturesaura/proxy/IProxy.java
View file

@ -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);
<T extends Entity> void registerEntityRenderer(Class<T> entityClass, Supplier<IRenderFactory<T>> 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);
}

22
src/main/java/de/ellpeck/naturesaura/proxy/ServerProxy.java
View file

@ -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 <T extends Entity> void registerEntityRenderer(Class<T> entityClass, Supplier<IRenderFactory<T>> 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);
}
}

5
src/main/resources/assets/naturesaura/blockstates/ancient_bark.json
View file

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

18
src/main/resources/assets/naturesaura/blockstates/ancient_leaves.json
View file

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

5
src/main/resources/assets/naturesaura/blockstates/ancient_log.json
View file

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

5
src/main/resources/assets/naturesaura/blockstates/ancient_planks.json
View file

@ -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": [{}]
"": [{}]
}
}

4
src/main/resources/assets/naturesaura/blockstates/ancient_sapling.json
View file

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

10
src/main/resources/assets/naturesaura/blockstates/ancient_slab.json
View file

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

14
src/main/resources/assets/naturesaura/blockstates/ancient_slab_double.json
View file

@ -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": [{}]
}
}

84
src/main/resources/assets/naturesaura/blockstates/ancient_stairs.json
View file

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

5
src/main/resources/assets/naturesaura/blockstates/animal_generator.json
View file

@ -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": [{}]
"": [{}]
}
}

5
src/main/resources/assets/naturesaura/blockstates/animal_spawner.json
View file

@ -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": [{}]
"": [{}]
}
}

5
src/main/resources/assets/naturesaura/blockstates/aura_detector.json
View file

@ -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": [{}]
"": [{}]
}
}

5
src/main/resources/assets/naturesaura/blockstates/auto_crafter.json
View file

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

5
src/main/resources/assets/naturesaura/blockstates/chunk_loader.json
View file

@ -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": [{}]
"": [{}]
}
}

5
src/main/resources/assets/naturesaura/blockstates/conversion_catalyst.json
View file

@ -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": [{}]
"": [{}]
}
}

5
src/main/resources/assets/naturesaura/blockstates/crushing_catalyst.json
View file

@ -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": [{}]
"": [{}]
}
}

5
src/main/resources/assets/naturesaura/blockstates/decayed_leaves.json
View file

@ -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": [{}]
"": [{}]
}
}

4
src/main/resources/assets/naturesaura/blockstates/dimension_rail_end.json
View file

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

4
src/main/resources/assets/naturesaura/blockstates/dimension_rail_nether.json
View file

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

4
src/main/resources/assets/naturesaura/blockstates/dimension_rail_overworld.json
View file

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

4
src/main/resources/assets/naturesaura/blockstates/end_flower.json
View file

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

5
src/main/resources/assets/naturesaura/blockstates/ender_crate.json
View file

@ -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": [{}]
"": [{}]
}
}

5
src/main/resources/assets/naturesaura/blockstates/field_creator.json
View file

@ -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": [{}]
"": [{}]
}
}

5
src/main/resources/assets/naturesaura/blockstates/firework_generator.json
View file

@ -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": [{}]
"": [{}]
}
}

5
src/main/resources/assets/naturesaura/blockstates/flower_generator.json
View file

@ -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": [{}]
"": [{}]
}
}

5
src/main/resources/assets/naturesaura/blockstates/furnace_heater.json
View file

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

5
src/main/resources/assets/naturesaura/blockstates/generator_limit_remover.json
View file

@ -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": [{}]
"": [{}]
}
}

5
src/main/resources/assets/naturesaura/blockstates/gold_brick.json
View file

@ -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": [{}]
"": [{}]
}
}

18
src/main/resources/assets/naturesaura/blockstates/gold_powder.json
View file

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

18
src/main/resources/assets/naturesaura/blockstates/golden_leaves.json
View file

@ -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": {},

5
src/main/resources/assets/naturesaura/blockstates/grated_chute.json
View file

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

5
src/main/resources/assets/naturesaura/blockstates/hopper_upgrade.json
View file

@ -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": [{}]
"": [{}]
}
}

5
src/main/resources/assets/naturesaura/blockstates/infused_brick.json
View file

@ -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": [{}]
"": [{}]
}
}

10
src/main/resources/assets/naturesaura/blockstates/infused_brick_slab.json
View file

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

14
src/main/resources/assets/naturesaura/blockstates/infused_brick_slab_double.json
View file

@ -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": [{}]
}
}

84
src/main/resources/assets/naturesaura/blockstates/infused_brick_stairs.json
View file

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

5
src/main/resources/assets/naturesaura/blockstates/infused_iron_block.json
View file

@ -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": [{}]
"": [{}]
}
}

10
src/main/resources/assets/naturesaura/blockstates/infused_slab.json
View file

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

14
src/main/resources/assets/naturesaura/blockstates/infused_slab_double.json
View file

@ -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": [{}]
}
}

86
src/main/resources/assets/naturesaura/blockstates/infused_stairs.json
View file

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

5
src/main/resources/assets/naturesaura/blockstates/infused_stone.json
View file

@ -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": [{}]
"": [{}]
}
}

5
src/main/resources/assets/naturesaura/blockstates/moss_generator.json
View file

@ -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": [{}]
"": [{}]
}
}

5
src/main/resources/assets/naturesaura/blockstates/nature_altar.json
View file

@ -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": [{}]
"": [{}]
}
}

5
src/main/resources/assets/naturesaura/blockstates/oak_generator.json
View file

@ -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": [{}]
"": [{}]
}
}

5
src/main/resources/assets/naturesaura/blockstates/offering_table.json
View file

@ -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": [{}]
"": [{}]
}
}

5
src/main/resources/assets/naturesaura/blockstates/pickup_stopper.json
View file

@ -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": [{}]
"": [{}]
}
}

5
src/main/resources/assets/naturesaura/blockstates/placer.json
View file

@ -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": [{}]
"": [{}]
}
}

5
src/main/resources/assets/naturesaura/blockstates/potion_generator.json
View file

@ -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": [{}]
"": [{}]
}
}

5
src/main/resources/assets/naturesaura/blockstates/powder_placer.json
View file

@ -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": [{}]
"": [{}]
}
}

5
src/main/resources/assets/naturesaura/blockstates/projectile_generator.json
View file

@ -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": [{}]
"": [{}]
}
}

5
src/main/resources/assets/naturesaura/blockstates/rf_converter.json
View file

@ -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": [{}]
"": [{}]
}
}

5
src/main/resources/assets/naturesaura/blockstates/spawn_lamp.json
View file

@ -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": [{}]
"": [{}]
}
}

5
src/main/resources/assets/naturesaura/blockstates/time_changer.json
View file

@ -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": [{}]
"": [{}]
}
}

5
src/main/resources/assets/naturesaura/blockstates/wood_stand.json
View file

@ -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": [{}]
"": [{}]
}
}

7
src/main/resources/assets/naturesaura/models/item/ancient_bark.json Normal file
View file

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

6
src/main/resources/assets/naturesaura/models/item/ancient_leaves.json Normal file
View file

@ -0,0 +1,6 @@
{
"parent": "minecraft:block/leaves",
"textures": {
"all": "naturesaura:blocks/ancient_leaves"
}
}

7
src/main/resources/assets/naturesaura/models/item/ancient_log.json Normal file
View file

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

6
src/main/resources/assets/naturesaura/models/item/ancient_planks.json Normal file
View file

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

6
src/main/resources/assets/naturesaura/models/item/ancient_sapling.json Normal file
View file

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

8
src/main/resources/assets/naturesaura/models/item/ancient_slab.json Normal file
View file

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

8
src/main/resources/assets/naturesaura/models/item/ancient_stairs.json Normal file
View file

@ -0,0 +1,8 @@
{
"parent": "minecraft:block/stairs",
"textures": {
"bottom": "naturesaura:blocks/ancient_planks",
"top": "naturesaura:blocks/ancient_planks",
"side": "naturesaura:blocks/ancient_planks"
}
}

11
src/main/resources/assets/naturesaura/models/item/animal_generator.json Normal file
View file

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

11
src/main/resources/assets/naturesaura/models/item/animal_spawner.json Normal file
View file

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

6
src/main/resources/assets/naturesaura/models/item/aura_detector.json Normal file
View file

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

11
src/main/resources/assets/naturesaura/models/item/auto_crafter.json Normal file
View file

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

6
src/main/resources/assets/naturesaura/models/item/chunk_loader.json Normal file
View file

@ -0,0 +1,6 @@
{
"parent": "naturesaura:block/chunk_loader",
"textures": {
"texture": "naturesaura:blocks/chunk_loader"
}
}

6
src/main/resources/assets/naturesaura/models/item/conversion_catalyst.json Normal file
View file

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

6
src/main/resources/assets/naturesaura/models/item/crushing_catalyst.json Normal file
View file

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

6
src/main/resources/assets/naturesaura/models/item/decayed_leaves.json Normal file
View file

@ -0,0 +1,6 @@
{
"parent": "minecraft:model/leaves",
"textures": {
"all": "naturesaura:blocks/decayed_leaves"
}
}

6
src/main/resources/assets/naturesaura/models/item/dimension_rail_end.json Normal file
View file

@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "naturesaura:blocks/dimension_rail_end"
}
}

6
src/main/resources/assets/naturesaura/models/item/dimension_rail_nether.json Normal file
View file

@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "naturesaura:blocks/dimension_rail_nether"
}
}

6
src/main/resources/assets/naturesaura/models/item/dimension_rail_overworld.json Normal file
View file

@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "naturesaura:blocks/dimension_rail_overworld"
}
}

6
src/main/resources/assets/naturesaura/models/item/end_flower.json Normal file
View file

@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "naturesaura:blocks/end_flower"
}
}

11
src/main/resources/assets/naturesaura/models/item/ender_crate.json Normal file
View file

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

7
src/main/resources/assets/naturesaura/models/item/field_creator.json Normal file
View file

@ -0,0 +1,7 @@
{
"parent": "naturesaura:block/field_creator",
"textures": {
"texture": "naturesaura:blocks/field_creator",
"center": "naturesaura:blocks/field_creator_center"
}
}

11
src/main/resources/assets/naturesaura/models/item/firework_generator.json Normal file
View file

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

11
src/main/resources/assets/naturesaura/models/item/flower_generator.json Normal file
View file

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

6
src/main/resources/assets/naturesaura/models/item/furnace_heater.json Normal file
View file

@ -0,0 +1,6 @@
{
"parent": "naturesaura:block/furnace_heater",
"textures": {
"texture": "naturesaura:blocks/furnace_heater"
}
}

11
src/main/resources/assets/naturesaura/models/item/generator_limit_remover.json Normal file
View file

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

6
src/main/resources/assets/naturesaura/models/item/gold_brick.json Normal file
View file

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

6
src/main/resources/assets/naturesaura/models/item/golden_leaves.json Normal file
View file

@ -0,0 +1,6 @@
{
"parent": "minecraft:block/leaves",
"textures": {
"all": "minecraft:blocks/leaves_oak"
}
}

9
src/main/resources/assets/naturesaura/models/item/grated_chute.json Normal file
View file

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

6
src/main/resources/assets/naturesaura/models/item/hopper_upgrade.json Normal file
View file

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

6
src/main/resources/assets/naturesaura/models/item/infused_brick.json Normal file
View file

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

8
src/main/resources/assets/naturesaura/models/item/infused_brick_slab.json Normal file
View file

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

8
src/main/resources/assets/naturesaura/models/item/infused_brick_stairs.json Normal file
View file

@ -0,0 +1,8 @@
{
"parent": "minecraft:block/stairs",
"textures": {
"bottom": "naturesaura:blocks/infused_brick",
"top": "naturesaura:blocks/infused_brick",
"side": "naturesaura:blocks/infused_brick"
}
}

6
src/main/resources/assets/naturesaura/models/item/infused_iron_block.json Normal file
View file

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

8
src/main/resources/assets/naturesaura/models/item/infused_slab.json Normal file
View file

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

8
src/main/resources/assets/naturesaura/models/item/infused_stairs.json Normal file
View file

@ -0,0 +1,8 @@
{
"parent": "minecraft:block/stairs",
"textures": {
"bottom": "naturesaura:blocks/infused_stone",
"top": "naturesaura:blocks/infused_stone",
"side": "naturesaura:blocks/infused_stone"
}
}

6
src/main/resources/assets/naturesaura/models/item/infused_stone.json Normal file
View file

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

11
src/main/resources/assets/naturesaura/models/item/moss_generator.json Normal file
View file

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

7
src/main/resources/assets/naturesaura/models/item/nature_altar.json Normal file
View file

@ -0,0 +1,7 @@
{
"parent": "naturesaura:block/nature_altar",
"textures": {
"texture": "naturesaura:blocks/nature_altar",
"top": "naturesaura:blocks/nature_altar_top"
}
}

11
src/main/resources/assets/naturesaura/models/item/oak_generator.json Normal file
View file

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

8
src/main/resources/assets/naturesaura/models/item/offering_table.json Normal file
View file

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

11
src/main/resources/assets/naturesaura/models/item/pickup_stopper.json Normal file
View file

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

11
src/main/resources/assets/naturesaura/models/item/placer.json Normal file
View file

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

11
src/main/resources/assets/naturesaura/models/item/potion_generator.json Normal file
View file

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

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