diff --git a/CHANGELOG.md b/CHANGELOG.md index 45c7e14a6..5d20981ae 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,10 +2,15 @@ ### 0.8.9 **Bugfixes** -- Several models / texture tweaks - Fixed bug where Grid doesn't handle remainder sometimes - Fixed caching issues with External Storage +**Features** +- Added a model for the Constructor +- Added a model for the Destructor +- Wireless Transmitters next to each other without any cable or without being connected to a machine won't work anymore, they need to be explictly connected to a cable or other machine +- Several models / texture tweaks + ### 0.8.8 **Bugfixes** - Use ore dictionary for recipes with glass diff --git a/src/main/java/refinedstorage/apiimpl/storage/NBTStorage.java b/src/main/java/refinedstorage/apiimpl/storage/NBTStorage.java index 7521f7fe5..e11f2daec 100755 --- a/src/main/java/refinedstorage/apiimpl/storage/NBTStorage.java +++ b/src/main/java/refinedstorage/apiimpl/storage/NBTStorage.java @@ -43,7 +43,7 @@ public abstract class NBTStorage implements IStorage { /** * @param tag The NBT tag we are reading from and writing the amount stored to, has to be initialized with {@link NBTStorage#createNBT()} if it doesn't exist yet * @param capacity The capacity of this storage, -1 for infinite capacity - * @param tile A {@link TileEntity} that the NBT storage is in, will be marked dirty when storage changes + * @param tile A {@link TileEntity} that the NBT storage is in, will be marked dirty when the storage changes */ public NBTStorage(NBTTagCompound tag, int capacity, @Nullable TileEntity tile) { this.tag = tag; diff --git a/src/main/java/refinedstorage/block/BlockConstructor.java b/src/main/java/refinedstorage/block/BlockConstructor.java index d7d2ebd88..d5a879d85 100755 --- a/src/main/java/refinedstorage/block/BlockConstructor.java +++ b/src/main/java/refinedstorage/block/BlockConstructor.java @@ -12,7 +12,7 @@ import refinedstorage.RefinedStorage; import refinedstorage.RefinedStorageGui; import refinedstorage.tile.TileConstructor; -public class BlockConstructor extends BlockNode { +public class BlockConstructor extends BlockCable { public BlockConstructor() { super("constructor"); } diff --git a/src/main/java/refinedstorage/block/BlockDestructor.java b/src/main/java/refinedstorage/block/BlockDestructor.java index 6a2ef7fb2..77f81f85c 100755 --- a/src/main/java/refinedstorage/block/BlockDestructor.java +++ b/src/main/java/refinedstorage/block/BlockDestructor.java @@ -12,7 +12,7 @@ import refinedstorage.RefinedStorage; import refinedstorage.RefinedStorageGui; import refinedstorage.tile.TileDestructor; -public class BlockDestructor extends BlockNode { +public class BlockDestructor extends BlockCable { public BlockDestructor() { super("destructor"); } diff --git a/src/main/java/refinedstorage/tile/TileDiskDrive.java b/src/main/java/refinedstorage/tile/TileDiskDrive.java index cc5972dfb..f5d1b185f 100755 --- a/src/main/java/refinedstorage/tile/TileDiskDrive.java +++ b/src/main/java/refinedstorage/tile/TileDiskDrive.java @@ -6,6 +6,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; import net.minecraftforge.common.capabilities.Capability; +import net.minecraftforge.fml.common.FMLCommonHandler; +import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.ItemHandlerHelper; @@ -56,16 +58,21 @@ public class TileDiskDrive extends TileNode implements IStorageProvider, IStorag protected void onContentsChanged(int slot) { super.onContentsChanged(slot); - ItemStack disk = getStackInSlot(slot); + /** + * Can't use {@link net.minecraft.world.World#isRemote} here because when {@link TileDiskDrive#readFromNBT(NBTTagCompound)} is called there is no world set yet. + */ + if (FMLCommonHandler.instance().getEffectiveSide() == Side.SERVER) { + ItemStack disk = getStackInSlot(slot); - if (disk == null) { - storages[slot] = null; - } else { - storages[slot] = new Storage(disk); - } + if (disk == null) { + storages[slot] = null; + } else { + storages[slot] = new Storage(disk); + } - if (network != null) { - network.getStorage().rebuild(); + if (network != null) { + network.getStorage().rebuild(); + } } } diff --git a/src/main/resources/assets/refinedstorage/blockstates/constructor.json b/src/main/resources/assets/refinedstorage/blockstates/constructor.json index 830825acf..ccfce356d 100755 --- a/src/main/resources/assets/refinedstorage/blockstates/constructor.json +++ b/src/main/resources/assets/refinedstorage/blockstates/constructor.json @@ -1,38 +1,80 @@ { "forge_marker": 1, "defaults": { - "model": "orientable", "textures": { - "side": "refinedstorage:blocks/side", - "top": "refinedstorage:blocks/side", - "front": "refinedstorage:blocks/constructor" - } + "all": "refinedstorage:blocks/cable", + "particle": "refinedstorage:blocks/cable" + }, + "model": "refinedstorage:cable_core", + "uvlock": true }, "variants": { "inventory": [ { - "y": 0, + "model": "refinedstorage:constructor_destructor", "transform": "forge:default-block" } ], "direction": { "north": { - "y": 0 + "submodel": "refinedstorage:constructor_destructor_north" }, "east": { - "y": 90 + "submodel": "refinedstorage:constructor_destructor_east" }, "south": { - "y": 180 + "submodel": "refinedstorage:constructor_destructor_south" }, "west": { - "y": 270 + "submodel": "refinedstorage:constructor_destructor_west" }, "up": { - "x": 270 + "submodel": "refinedstorage:constructor_destructor_up" }, "down": { - "x": 90 + "submodel": "refinedstorage:constructor_destructor_down" + } + }, + "north": { + "true": { + "submodel": "refinedstorage:cable_north" + }, + "false": { + } + }, + "east": { + "true": { + "submodel": "refinedstorage:cable_east" + }, + "false": { + } + }, + "south": { + "true": { + "submodel": "refinedstorage:cable_south" + }, + "false": { + } + }, + "west": { + "true": { + "submodel": "refinedstorage:cable_west" + }, + "false": { + } + }, + "up": { + "true": { + "submodel": "refinedstorage:cable_up" + }, + "false": { + } + }, + "down": { + "true": { + "submodel": "refinedstorage:cable_down" + }, + "false": { } } } diff --git a/src/main/resources/assets/refinedstorage/blockstates/destructor.json b/src/main/resources/assets/refinedstorage/blockstates/destructor.json index c36786296..ccfce356d 100755 --- a/src/main/resources/assets/refinedstorage/blockstates/destructor.json +++ b/src/main/resources/assets/refinedstorage/blockstates/destructor.json @@ -1,38 +1,80 @@ { "forge_marker": 1, "defaults": { - "model": "orientable", "textures": { - "side": "refinedstorage:blocks/side", - "top": "refinedstorage:blocks/side", - "front": "refinedstorage:blocks/destructor" - } + "all": "refinedstorage:blocks/cable", + "particle": "refinedstorage:blocks/cable" + }, + "model": "refinedstorage:cable_core", + "uvlock": true }, "variants": { "inventory": [ { - "y": 0, + "model": "refinedstorage:constructor_destructor", "transform": "forge:default-block" } ], "direction": { "north": { - "y": 0 + "submodel": "refinedstorage:constructor_destructor_north" }, "east": { - "y": 90 + "submodel": "refinedstorage:constructor_destructor_east" }, "south": { - "y": 180 + "submodel": "refinedstorage:constructor_destructor_south" }, "west": { - "y": 270 + "submodel": "refinedstorage:constructor_destructor_west" }, "up": { - "x": 270 + "submodel": "refinedstorage:constructor_destructor_up" }, "down": { - "x": 90 + "submodel": "refinedstorage:constructor_destructor_down" + } + }, + "north": { + "true": { + "submodel": "refinedstorage:cable_north" + }, + "false": { + } + }, + "east": { + "true": { + "submodel": "refinedstorage:cable_east" + }, + "false": { + } + }, + "south": { + "true": { + "submodel": "refinedstorage:cable_south" + }, + "false": { + } + }, + "west": { + "true": { + "submodel": "refinedstorage:cable_west" + }, + "false": { + } + }, + "up": { + "true": { + "submodel": "refinedstorage:cable_up" + }, + "false": { + } + }, + "down": { + "true": { + "submodel": "refinedstorage:cable_down" + }, + "false": { } } } diff --git a/src/main/resources/assets/refinedstorage/models/block/constructor_destructor.json b/src/main/resources/assets/refinedstorage/models/block/constructor_destructor.json new file mode 100755 index 000000000..c41a535fc --- /dev/null +++ b/src/main/resources/assets/refinedstorage/models/block/constructor_destructor.json @@ -0,0 +1,350 @@ +{ + "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", + "elements": [ + { + "name": "Line1", + "from": [ + 7.0, + 7.0, + 2.0 + ], + "to": [ + 9.0, + 9.0, + 6.0 + ], + "faces": { + "north": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 4.0, + 4.0 + ] + }, + "east": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 2.0, + 4.0 + ] + }, + "south": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 4.0, + 4.0 + ] + }, + "west": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 2.0, + 4.0 + ] + }, + "up": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 4.0, + 2.0 + ] + }, + "down": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 4.0, + 2.0 + ] + } + } + }, + { + "name": "Line2", + "from": [ + 0.0, + 0.0, + 0.0 + ], + "to": [ + 16.0, + 16.0, + 2.0 + ], + "faces": { + "north": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 10.0, + 10.0 + ] + }, + "east": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 2.0, + 10.0 + ] + }, + "south": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 10.0, + 10.0 + ] + }, + "west": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 2.0, + 10.0 + ] + }, + "up": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 10.0, + 2.0 + ] + }, + "down": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 10.0, + 2.0 + ] + } + } + }, + { + "name": "Core", + "from": [ + 6.0, + 6.0, + 6.0 + ], + "to": [ + 10.0, + 10.0, + 10.0 + ], + "faces": { + "north": { + "texture": "#all", + "uv": [ + 4.0, + 4.0, + 8.0, + 8.0 + ] + }, + "east": { + "texture": "#all", + "uv": [ + 0.0, + 4.0, + 4.0, + 8.0 + ] + }, + "south": { + "texture": "#all", + "uv": [ + 12.0, + 4.0, + 16.0, + 8.0 + ] + }, + "west": { + "texture": "#all", + "uv": [ + 8.0, + 4.0, + 12.0, + 8.0 + ] + }, + "up": { + "texture": "#all", + "uv": [ + 8.0, + 4.0, + 4.0, + 0.0 + ] + }, + "down": { + "texture": "#all", + "uv": [ + 12.0, + 0.0, + 8.0, + 4.0 + ] + } + } + }, + { + "name": "East", + "from": [ + 10.0, + 6.0, + 6.0 + ], + "to": [ + 16.0, + 10.0, + 10.0 + ], + "faces": { + "north": { + "texture": "#all", + "uv": [ + 4.0, + 4.0, + 8.0, + 8.0 + ] + }, + "east": { + "texture": "#all", + "uv": [ + 0.0, + 4.0, + 4.0, + 8.0 + ] + }, + "south": { + "texture": "#all", + "uv": [ + 12.0, + 4.0, + 16.0, + 8.0 + ] + }, + "west": { + "texture": "#all", + "uv": [ + 8.0, + 4.0, + 12.0, + 8.0 + ] + }, + "up": { + "texture": "#all", + "uv": [ + 8.0, + 4.0, + 4.0, + 0.0 + ] + }, + "down": { + "texture": "#all", + "uv": [ + 12.0, + 0.0, + 8.0, + 4.0 + ] + } + } + }, + { + "name": "West", + "from": [ + 0.0, + 6.0, + 6.0 + ], + "to": [ + 6.0, + 10.0, + 10.0 + ], + "faces": { + "north": { + "texture": "#all", + "uv": [ + 4.0, + 4.0, + 8.0, + 8.0 + ] + }, + "east": { + "texture": "#all", + "uv": [ + 0.0, + 4.0, + 4.0, + 8.0 + ] + }, + "south": { + "texture": "#all", + "uv": [ + 12.0, + 4.0, + 16.0, + 8.0 + ] + }, + "west": { + "texture": "#all", + "uv": [ + 8.0, + 4.0, + 12.0, + 8.0 + ] + }, + "up": { + "texture": "#all", + "uv": [ + 8.0, + 4.0, + 4.0, + 0.0 + ] + }, + "down": { + "texture": "#all", + "uv": [ + 12.0, + 0.0, + 8.0, + 4.0 + ] + } + } + } + ] +} diff --git a/src/main/resources/assets/refinedstorage/models/block/constructor_destructor_down.json b/src/main/resources/assets/refinedstorage/models/block/constructor_destructor_down.json new file mode 100755 index 000000000..41daa4c43 --- /dev/null +++ b/src/main/resources/assets/refinedstorage/models/block/constructor_destructor_down.json @@ -0,0 +1,145 @@ +{ + "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", + "textures": { + }, + "elements": [ + { + "name": "Line1", + "from": [ + 7.0, + 2.0, + 7.0 + ], + "to": [ + 9.0, + 6.0, + 9.0 + ], + "faces": { + "north": { + "texture": "#ine", + "uv": [ + 0.0, + 0.0, + 4.0, + 4.0 + ] + }, + "east": { + "texture": "#ine", + "uv": [ + 0.0, + 0.0, + 2.0, + 4.0 + ] + }, + "south": { + "texture": "#ine", + "uv": [ + 0.0, + 0.0, + 4.0, + 4.0 + ] + }, + "west": { + "texture": "#ine", + "uv": [ + 0.0, + 0.0, + 2.0, + 4.0 + ] + }, + "up": { + "texture": "#ine", + "uv": [ + 0.0, + 0.0, + 4.0, + 2.0 + ] + }, + "down": { + "texture": "#ine", + "uv": [ + 0.0, + 0.0, + 4.0, + 2.0 + ] + } + } + }, + { + "name": "Line2", + "from": [ + 0.0, + 0.0, + 0.0 + ], + "to": [ + 16.0, + 2.0, + 16.0 + ], + "faces": { + "north": { + "texture": "#ine", + "uv": [ + 0.0, + 0.0, + 10.0, + 10.0 + ] + }, + "east": { + "texture": "#ine", + "uv": [ + 0.0, + 0.0, + 2.0, + 10.0 + ] + }, + "south": { + "texture": "#ine", + "uv": [ + 0.0, + 0.0, + 10.0, + 10.0 + ] + }, + "west": { + "texture": "#ine", + "uv": [ + 0.0, + 0.0, + 2.0, + 10.0 + ] + }, + "up": { + "texture": "#ine", + "uv": [ + 0.0, + 0.0, + 10.0, + 2.0 + ] + }, + "down": { + "texture": "#ine", + "uv": [ + 0.0, + 0.0, + 10.0, + 2.0 + ] + } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/models/block/constructor_destructor_east.json b/src/main/resources/assets/refinedstorage/models/block/constructor_destructor_east.json new file mode 100755 index 000000000..c4cdcbdf6 --- /dev/null +++ b/src/main/resources/assets/refinedstorage/models/block/constructor_destructor_east.json @@ -0,0 +1,145 @@ +{ + "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", + "textures": { + }, + "elements": [ + { + "name": "Line1", + "from": [ + 10.0, + 7.0, + 7.0 + ], + "to": [ + 14.0, + 9.0, + 9.0 + ], + "faces": { + "north": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 4.0, + 4.0 + ] + }, + "east": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 2.0, + 4.0 + ] + }, + "south": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 4.0, + 4.0 + ] + }, + "west": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 2.0, + 4.0 + ] + }, + "up": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 4.0, + 2.0 + ] + }, + "down": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 4.0, + 2.0 + ] + } + } + }, + { + "name": "Line2", + "from": [ + 14.0, + 0.0, + 0.0 + ], + "to": [ + 16.0, + 16.0, + 16.0 + ], + "faces": { + "north": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 10.0, + 10.0 + ] + }, + "east": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 2.0, + 10.0 + ] + }, + "south": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 10.0, + 10.0 + ] + }, + "west": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 2.0, + 10.0 + ] + }, + "up": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 10.0, + 2.0 + ] + }, + "down": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 10.0, + 2.0 + ] + } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/models/block/constructor_destructor_north.json b/src/main/resources/assets/refinedstorage/models/block/constructor_destructor_north.json new file mode 100755 index 000000000..a2a496038 --- /dev/null +++ b/src/main/resources/assets/refinedstorage/models/block/constructor_destructor_north.json @@ -0,0 +1,145 @@ +{ + "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", + "textures": { + }, + "elements": [ + { + "name": "Line1", + "from": [ + 7.0, + 7.0, + 2.0 + ], + "to": [ + 9.0, + 9.0, + 6.0 + ], + "faces": { + "north": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 4.0, + 4.0 + ] + }, + "east": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 2.0, + 4.0 + ] + }, + "south": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 4.0, + 4.0 + ] + }, + "west": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 2.0, + 4.0 + ] + }, + "up": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 4.0, + 2.0 + ] + }, + "down": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 4.0, + 2.0 + ] + } + } + }, + { + "name": "Line2", + "from": [ + 0.0, + 0.0, + 0.0 + ], + "to": [ + 16.0, + 16.0, + 2.0 + ], + "faces": { + "north": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 10.0, + 10.0 + ] + }, + "east": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 2.0, + 10.0 + ] + }, + "south": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 10.0, + 10.0 + ] + }, + "west": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 2.0, + 10.0 + ] + }, + "up": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 10.0, + 2.0 + ] + }, + "down": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 10.0, + 2.0 + ] + } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/models/block/constructor_destructor_south.json b/src/main/resources/assets/refinedstorage/models/block/constructor_destructor_south.json new file mode 100755 index 000000000..50a8aecc0 --- /dev/null +++ b/src/main/resources/assets/refinedstorage/models/block/constructor_destructor_south.json @@ -0,0 +1,145 @@ +{ + "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", + "textures": { + }, + "elements": [ + { + "name": "Line1", + "from": [ + 7.0, + 7.0, + 10.0 + ], + "to": [ + 9.0, + 9.0, + 14.0 + ], + "faces": { + "north": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 4.0, + 4.0 + ] + }, + "east": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 2.0, + 4.0 + ] + }, + "south": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 4.0, + 4.0 + ] + }, + "west": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 2.0, + 4.0 + ] + }, + "up": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 4.0, + 2.0 + ] + }, + "down": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 4.0, + 2.0 + ] + } + } + }, + { + "name": "Line2", + "from": [ + 0.0, + 0.0, + 14.0 + ], + "to": [ + 16.0, + 16.0, + 16.0 + ], + "faces": { + "north": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 10.0, + 10.0 + ] + }, + "east": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 2.0, + 10.0 + ] + }, + "south": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 10.0, + 10.0 + ] + }, + "west": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 2.0, + 10.0 + ] + }, + "up": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 10.0, + 2.0 + ] + }, + "down": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 10.0, + 2.0 + ] + } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/models/block/constructor_destructor_up.json b/src/main/resources/assets/refinedstorage/models/block/constructor_destructor_up.json new file mode 100755 index 000000000..d29ae0f4b --- /dev/null +++ b/src/main/resources/assets/refinedstorage/models/block/constructor_destructor_up.json @@ -0,0 +1,145 @@ +{ + "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", + "textures": { + }, + "elements": [ + { + "name": "Line1", + "from": [ + 7.0, + 10.0, + 7.0 + ], + "to": [ + 9.0, + 14.0, + 9.0 + ], + "faces": { + "north": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 4.0, + 4.0 + ] + }, + "east": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 2.0, + 4.0 + ] + }, + "south": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 4.0, + 4.0 + ] + }, + "west": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 2.0, + 4.0 + ] + }, + "up": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 4.0, + 2.0 + ] + }, + "down": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 4.0, + 2.0 + ] + } + } + }, + { + "name": "Line2", + "from": [ + 0.0, + 14.0, + 0.0 + ], + "to": [ + 16.0, + 16.0, + 16.0 + ], + "faces": { + "north": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 10.0, + 10.0 + ] + }, + "east": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 2.0, + 10.0 + ] + }, + "south": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 10.0, + 10.0 + ] + }, + "west": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 2.0, + 10.0 + ] + }, + "up": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 10.0, + 2.0 + ] + }, + "down": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 10.0, + 2.0 + ] + } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/models/block/constructor_destructor_west.json b/src/main/resources/assets/refinedstorage/models/block/constructor_destructor_west.json new file mode 100755 index 000000000..b9aefd922 --- /dev/null +++ b/src/main/resources/assets/refinedstorage/models/block/constructor_destructor_west.json @@ -0,0 +1,145 @@ +{ + "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", + "textures": { + }, + "elements": [ + { + "name": "Line1", + "from": [ + 2.0, + 7.0, + 7.0 + ], + "to": [ + 6.0, + 9.0, + 9.0 + ], + "faces": { + "north": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 4.0, + 4.0 + ] + }, + "east": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 2.0, + 4.0 + ] + }, + "south": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 4.0, + 4.0 + ] + }, + "west": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 2.0, + 4.0 + ] + }, + "up": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 4.0, + 2.0 + ] + }, + "down": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 4.0, + 2.0 + ] + } + } + }, + { + "name": "Line2", + "from": [ + 0.0, + 0.0, + 0.0 + ], + "to": [ + 2.0, + 16.0, + 16.0 + ], + "faces": { + "north": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 10.0, + 10.0 + ] + }, + "east": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 2.0, + 10.0 + ] + }, + "south": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 10.0, + 10.0 + ] + }, + "west": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 2.0, + 10.0 + ] + }, + "up": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 10.0, + 2.0 + ] + }, + "down": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 10.0, + 2.0 + ] + } + } + } + ] +} \ No newline at end of file