diff --git a/src/main/java/cofh/api/CoFHAPIProps.java b/src/main/java/cofh/api/CoFHAPIProps.java index eb2e05ade..becea23e0 100755 --- a/src/main/java/cofh/api/CoFHAPIProps.java +++ b/src/main/java/cofh/api/CoFHAPIProps.java @@ -2,10 +2,10 @@ package cofh.api; public class CoFHAPIProps { - private CoFHAPIProps() { + private CoFHAPIProps() { - } + } - public static final String VERSION = "1.8.9R1.2.0B1"; + public static final String VERSION = "1.8.9R1.2.0B1"; } diff --git a/src/main/java/cofh/api/energy/EnergyStorage.java b/src/main/java/cofh/api/energy/EnergyStorage.java index dd7dd3e02..d5e34000c 100755 --- a/src/main/java/cofh/api/energy/EnergyStorage.java +++ b/src/main/java/cofh/api/energy/EnergyStorage.java @@ -6,157 +6,156 @@ import net.minecraft.nbt.NBTTagCompound; * Reference implementation of {@link IEnergyStorage}. Use/extend this or implement your own. * * @author King Lemming - * */ public class EnergyStorage implements IEnergyStorage { - protected int energy; - protected int capacity; - protected int maxReceive; - protected int maxExtract; + protected int energy; + protected int capacity; + protected int maxReceive; + protected int maxExtract; - public EnergyStorage(int capacity) { + public EnergyStorage(int capacity) { - this(capacity, capacity, capacity); - } + this(capacity, capacity, capacity); + } - public EnergyStorage(int capacity, int maxTransfer) { + public EnergyStorage(int capacity, int maxTransfer) { - this(capacity, maxTransfer, maxTransfer); - } + this(capacity, maxTransfer, maxTransfer); + } - public EnergyStorage(int capacity, int maxReceive, int maxExtract) { + public EnergyStorage(int capacity, int maxReceive, int maxExtract) { - this.capacity = capacity; - this.maxReceive = maxReceive; - this.maxExtract = maxExtract; - } + this.capacity = capacity; + this.maxReceive = maxReceive; + this.maxExtract = maxExtract; + } - public EnergyStorage readFromNBT(NBTTagCompound nbt) { + public EnergyStorage readFromNBT(NBTTagCompound nbt) { - this.energy = nbt.getInteger("Energy"); + this.energy = nbt.getInteger("Energy"); - if (energy > capacity) { - energy = capacity; - } - return this; - } + if (energy > capacity) { + energy = capacity; + } + return this; + } - public NBTTagCompound writeToNBT(NBTTagCompound nbt) { + public NBTTagCompound writeToNBT(NBTTagCompound nbt) { - if (energy < 0) { - energy = 0; - } - nbt.setInteger("Energy", energy); - return nbt; - } + if (energy < 0) { + energy = 0; + } + nbt.setInteger("Energy", energy); + return nbt; + } - public EnergyStorage setCapacity(int capacity) { + public EnergyStorage setCapacity(int capacity) { - this.capacity = capacity; + this.capacity = capacity; - if (energy > capacity) { - energy = capacity; - } - return this; - } + if (energy > capacity) { + energy = capacity; + } + return this; + } - public EnergyStorage setMaxTransfer(int maxTransfer) { + public EnergyStorage setMaxTransfer(int maxTransfer) { - setMaxReceive(maxTransfer); - setMaxExtract(maxTransfer); - return this; - } + setMaxReceive(maxTransfer); + setMaxExtract(maxTransfer); + return this; + } - public EnergyStorage setMaxReceive(int maxReceive) { + public EnergyStorage setMaxReceive(int maxReceive) { - this.maxReceive = maxReceive; - return this; - } + this.maxReceive = maxReceive; + return this; + } - public EnergyStorage setMaxExtract(int maxExtract) { + public EnergyStorage setMaxExtract(int maxExtract) { - this.maxExtract = maxExtract; - return this; - } + this.maxExtract = maxExtract; + return this; + } - public int getMaxReceive() { + public int getMaxReceive() { - return maxReceive; - } + return maxReceive; + } - public int getMaxExtract() { + public int getMaxExtract() { - return maxExtract; - } + return maxExtract; + } - /** - * This function is included to allow for server to client sync. Do not call this externally to the containing Tile Entity, as not all IEnergyHandlers - * are guaranteed to have it. - * - * @param energy - */ - public void setEnergyStored(int energy) { + /** + * This function is included to allow for server to client sync. Do not call this externally to the containing Tile Entity, as not all IEnergyHandlers + * are guaranteed to have it. + * + * @param energy + */ + public void setEnergyStored(int energy) { - this.energy = energy; + this.energy = energy; - if (this.energy > capacity) { - this.energy = capacity; - } else if (this.energy < 0) { - this.energy = 0; - } - } + if (this.energy > capacity) { + this.energy = capacity; + } else if (this.energy < 0) { + this.energy = 0; + } + } - /** - * This function is included to allow the containing tile to directly and efficiently modify the energy contained in the EnergyStorage. Do not rely on this - * externally, as not all IEnergyHandlers are guaranteed to have it. - * - * @param energy - */ - public void modifyEnergyStored(int energy) { + /** + * This function is included to allow the containing tile to directly and efficiently modify the energy contained in the EnergyStorage. Do not rely on this + * externally, as not all IEnergyHandlers are guaranteed to have it. + * + * @param energy + */ + public void modifyEnergyStored(int energy) { - this.energy += energy; + this.energy += energy; - if (this.energy > capacity) { - this.energy = capacity; - } else if (this.energy < 0) { - this.energy = 0; - } - } + if (this.energy > capacity) { + this.energy = capacity; + } else if (this.energy < 0) { + this.energy = 0; + } + } - /* IEnergyStorage */ - @Override - public int receiveEnergy(int maxReceive, boolean simulate) { + /* IEnergyStorage */ + @Override + public int receiveEnergy(int maxReceive, boolean simulate) { - int energyReceived = Math.min(capacity - energy, Math.min(this.maxReceive, maxReceive)); + int energyReceived = Math.min(capacity - energy, Math.min(this.maxReceive, maxReceive)); - if (!simulate) { - energy += energyReceived; - } - return energyReceived; - } + if (!simulate) { + energy += energyReceived; + } + return energyReceived; + } - @Override - public int extractEnergy(int maxExtract, boolean simulate) { + @Override + public int extractEnergy(int maxExtract, boolean simulate) { - int energyExtracted = Math.min(energy, Math.min(this.maxExtract, maxExtract)); + int energyExtracted = Math.min(energy, Math.min(this.maxExtract, maxExtract)); - if (!simulate) { - energy -= energyExtracted; - } - return energyExtracted; - } + if (!simulate) { + energy -= energyExtracted; + } + return energyExtracted; + } - @Override - public int getEnergyStored() { + @Override + public int getEnergyStored() { - return energy; - } + return energy; + } - @Override - public int getMaxEnergyStored() { + @Override + public int getMaxEnergyStored() { - return capacity; - } + return capacity; + } } diff --git a/src/main/java/cofh/api/energy/IEnergyConnection.java b/src/main/java/cofh/api/energy/IEnergyConnection.java index 29ef0a1ce..b33a9d90a 100755 --- a/src/main/java/cofh/api/energy/IEnergyConnection.java +++ b/src/main/java/cofh/api/energy/IEnergyConnection.java @@ -10,13 +10,12 @@ import net.minecraft.util.EnumFacing; * Note that {@link IEnergyHandler} is an extension of this. * * @author King Lemming - * */ public interface IEnergyConnection { - /** - * Returns TRUE if the TileEntity can connect on a given side. - */ - boolean canConnectEnergy(EnumFacing from); + /** + * Returns TRUE if the TileEntity can connect on a given side. + */ + boolean canConnectEnergy(EnumFacing from); } diff --git a/src/main/java/cofh/api/energy/IEnergyContainerItem.java b/src/main/java/cofh/api/energy/IEnergyContainerItem.java index 3ef725765..f5d2ebfd9 100755 --- a/src/main/java/cofh/api/energy/IEnergyContainerItem.java +++ b/src/main/java/cofh/api/energy/IEnergyContainerItem.java @@ -8,45 +8,38 @@ import net.minecraft.item.ItemStack; * A reference implementation is provided {@link ItemEnergyContainer}. * * @author King Lemming - * */ public interface IEnergyContainerItem { - /** - * Adds energy to a container item. Returns the quantity of energy that was accepted. This should always return 0 if the item cannot be externally charged. - * - * @param container - * ItemStack to be charged. - * @param maxReceive - * Maximum amount of energy to be sent into the item. - * @param simulate - * If TRUE, the charge will only be simulated. - * @return Amount of energy that was (or would have been, if simulated) received by the item. - */ - int receiveEnergy(ItemStack container, int maxReceive, boolean simulate); + /** + * Adds energy to a container item. Returns the quantity of energy that was accepted. This should always return 0 if the item cannot be externally charged. + * + * @param container ItemStack to be charged. + * @param maxReceive Maximum amount of energy to be sent into the item. + * @param simulate If TRUE, the charge will only be simulated. + * @return Amount of energy that was (or would have been, if simulated) received by the item. + */ + int receiveEnergy(ItemStack container, int maxReceive, boolean simulate); - /** - * Removes energy from a container item. Returns the quantity of energy that was removed. This should always return 0 if the item cannot be externally - * discharged. - * - * @param container - * ItemStack to be discharged. - * @param maxExtract - * Maximum amount of energy to be extracted from the item. - * @param simulate - * If TRUE, the discharge will only be simulated. - * @return Amount of energy that was (or would have been, if simulated) extracted from the item. - */ - int extractEnergy(ItemStack container, int maxExtract, boolean simulate); + /** + * Removes energy from a container item. Returns the quantity of energy that was removed. This should always return 0 if the item cannot be externally + * discharged. + * + * @param container ItemStack to be discharged. + * @param maxExtract Maximum amount of energy to be extracted from the item. + * @param simulate If TRUE, the discharge will only be simulated. + * @return Amount of energy that was (or would have been, if simulated) extracted from the item. + */ + int extractEnergy(ItemStack container, int maxExtract, boolean simulate); - /** - * Get the amount of energy currently stored in the container item. - */ - int getEnergyStored(ItemStack container); + /** + * Get the amount of energy currently stored in the container item. + */ + int getEnergyStored(ItemStack container); - /** - * Get the max amount of energy that can be stored in the container item. - */ - int getMaxEnergyStored(ItemStack container); + /** + * Get the max amount of energy that can be stored in the container item. + */ + int getMaxEnergyStored(ItemStack container); } diff --git a/src/main/java/cofh/api/energy/IEnergyHandler.java b/src/main/java/cofh/api/energy/IEnergyHandler.java index 16b236e7a..1d5dc5576 100755 --- a/src/main/java/cofh/api/energy/IEnergyHandler.java +++ b/src/main/java/cofh/api/energy/IEnergyHandler.java @@ -10,18 +10,17 @@ import net.minecraft.util.EnumFacing; * Note that {@link IEnergyReceiver} and {@link IEnergyProvider} are extensions of this. * * @author King Lemming - * */ public interface IEnergyHandler extends IEnergyConnection { - /** - * Returns the amount of energy currently stored. - */ - int getEnergyStored(EnumFacing from); + /** + * Returns the amount of energy currently stored. + */ + int getEnergyStored(EnumFacing from); - /** - * Returns the maximum amount of energy that can be stored. - */ - int getMaxEnergyStored(EnumFacing from); + /** + * Returns the maximum amount of energy that can be stored. + */ + int getMaxEnergyStored(EnumFacing from); } diff --git a/src/main/java/cofh/api/energy/IEnergyProvider.java b/src/main/java/cofh/api/energy/IEnergyProvider.java index ef0e09d06..784726a04 100755 --- a/src/main/java/cofh/api/energy/IEnergyProvider.java +++ b/src/main/java/cofh/api/energy/IEnergyProvider.java @@ -9,21 +9,17 @@ import net.minecraft.util.EnumFacing; * A reference implementation is provided {@link TileEnergyHandler}. * * @author King Lemming - * */ public interface IEnergyProvider extends IEnergyHandler { - /** - * Remove energy from an IEnergyProvider, internal distribution is left entirely to the IEnergyProvider. - * - * @param from - * Orientation the energy is extracted from. - * @param maxExtract - * Maximum amount of energy to extract. - * @param simulate - * If TRUE, the extraction will only be simulated. - * @return Amount of energy that was (or would have been, if simulated) extracted. - */ - int extractEnergy(EnumFacing from, int maxExtract, boolean simulate); + /** + * Remove energy from an IEnergyProvider, internal distribution is left entirely to the IEnergyProvider. + * + * @param from Orientation the energy is extracted from. + * @param maxExtract Maximum amount of energy to extract. + * @param simulate If TRUE, the extraction will only be simulated. + * @return Amount of energy that was (or would have been, if simulated) extracted. + */ + int extractEnergy(EnumFacing from, int maxExtract, boolean simulate); } diff --git a/src/main/java/cofh/api/energy/IEnergyReceiver.java b/src/main/java/cofh/api/energy/IEnergyReceiver.java index 989e9baa5..c2b654029 100755 --- a/src/main/java/cofh/api/energy/IEnergyReceiver.java +++ b/src/main/java/cofh/api/energy/IEnergyReceiver.java @@ -9,21 +9,17 @@ import net.minecraft.util.EnumFacing; * A reference implementation is provided {@link TileEnergyHandler}. * * @author King Lemming - * */ public interface IEnergyReceiver extends IEnergyHandler { - /** - * Add energy to an IEnergyReceiver, internal distribution is left entirely to the IEnergyReceiver. - * - * @param from - * Orientation the energy is received from. - * @param maxReceive - * Maximum amount of energy to receive. - * @param simulate - * If TRUE, the charge will only be simulated. - * @return Amount of energy that was (or would have been, if simulated) received. - */ - int receiveEnergy(EnumFacing from, int maxReceive, boolean simulate); + /** + * Add energy to an IEnergyReceiver, internal distribution is left entirely to the IEnergyReceiver. + * + * @param from Orientation the energy is received from. + * @param maxReceive Maximum amount of energy to receive. + * @param simulate If TRUE, the charge will only be simulated. + * @return Amount of energy that was (or would have been, if simulated) received. + */ + int receiveEnergy(EnumFacing from, int maxReceive, boolean simulate); } diff --git a/src/main/java/cofh/api/energy/IEnergyStorage.java b/src/main/java/cofh/api/energy/IEnergyStorage.java index 414b26566..b69f1df79 100755 --- a/src/main/java/cofh/api/energy/IEnergyStorage.java +++ b/src/main/java/cofh/api/energy/IEnergyStorage.java @@ -7,40 +7,35 @@ package cofh.api.energy; * A reference implementation can be found at {@link EnergyStorage}. * * @author King Lemming - * */ public interface IEnergyStorage { - /** - * Adds energy to the storage. Returns quantity of energy that was accepted. - * - * @param maxReceive - * Maximum amount of energy to be inserted. - * @param simulate - * If TRUE, the insertion will only be simulated. - * @return Amount of energy that was (or would have been, if simulated) accepted by the storage. - */ - int receiveEnergy(int maxReceive, boolean simulate); + /** + * Adds energy to the storage. Returns quantity of energy that was accepted. + * + * @param maxReceive Maximum amount of energy to be inserted. + * @param simulate If TRUE, the insertion will only be simulated. + * @return Amount of energy that was (or would have been, if simulated) accepted by the storage. + */ + int receiveEnergy(int maxReceive, boolean simulate); - /** - * Removes energy from the storage. Returns quantity of energy that was removed. - * - * @param maxExtract - * Maximum amount of energy to be extracted. - * @param simulate - * If TRUE, the extraction will only be simulated. - * @return Amount of energy that was (or would have been, if simulated) extracted from the storage. - */ - int extractEnergy(int maxExtract, boolean simulate); + /** + * Removes energy from the storage. Returns quantity of energy that was removed. + * + * @param maxExtract Maximum amount of energy to be extracted. + * @param simulate If TRUE, the extraction will only be simulated. + * @return Amount of energy that was (or would have been, if simulated) extracted from the storage. + */ + int extractEnergy(int maxExtract, boolean simulate); - /** - * Returns the amount of energy currently stored. - */ - int getEnergyStored(); + /** + * Returns the amount of energy currently stored. + */ + int getEnergyStored(); - /** - * Returns the maximum amount of energy that can be stored. - */ - int getMaxEnergyStored(); + /** + * Returns the maximum amount of energy that can be stored. + */ + int getMaxEnergyStored(); } diff --git a/src/main/java/cofh/api/energy/ItemEnergyContainer.java b/src/main/java/cofh/api/energy/ItemEnergyContainer.java index 0fb36dab6..bdca3f0d5 100755 --- a/src/main/java/cofh/api/energy/ItemEnergyContainer.java +++ b/src/main/java/cofh/api/energy/ItemEnergyContainer.java @@ -8,106 +8,105 @@ import net.minecraft.nbt.NBTTagCompound; * Reference implementation of {@link IEnergyContainerItem}. Use/extend this or implement your own. * * @author King Lemming - * */ public class ItemEnergyContainer extends Item implements IEnergyContainerItem { - protected int capacity; - protected int maxReceive; - protected int maxExtract; + protected int capacity; + protected int maxReceive; + protected int maxExtract; - public ItemEnergyContainer() { + public ItemEnergyContainer() { - } + } - public ItemEnergyContainer(int capacity) { + public ItemEnergyContainer(int capacity) { - this(capacity, capacity, capacity); - } + this(capacity, capacity, capacity); + } - public ItemEnergyContainer(int capacity, int maxTransfer) { + public ItemEnergyContainer(int capacity, int maxTransfer) { - this(capacity, maxTransfer, maxTransfer); - } + this(capacity, maxTransfer, maxTransfer); + } - public ItemEnergyContainer(int capacity, int maxReceive, int maxExtract) { + public ItemEnergyContainer(int capacity, int maxReceive, int maxExtract) { - this.capacity = capacity; - this.maxReceive = maxReceive; - this.maxExtract = maxExtract; - } + this.capacity = capacity; + this.maxReceive = maxReceive; + this.maxExtract = maxExtract; + } - public ItemEnergyContainer setCapacity(int capacity) { + public ItemEnergyContainer setCapacity(int capacity) { - this.capacity = capacity; - return this; - } + this.capacity = capacity; + return this; + } - public ItemEnergyContainer setMaxTransfer(int maxTransfer) { + public ItemEnergyContainer setMaxTransfer(int maxTransfer) { - setMaxReceive(maxTransfer); - setMaxExtract(maxTransfer); - return this; - } + setMaxReceive(maxTransfer); + setMaxExtract(maxTransfer); + return this; + } - public ItemEnergyContainer setMaxReceive(int maxReceive) { + public ItemEnergyContainer setMaxReceive(int maxReceive) { - this.maxReceive = maxReceive; - return this; - } + this.maxReceive = maxReceive; + return this; + } - public ItemEnergyContainer setMaxExtract(int maxExtract) { + public ItemEnergyContainer setMaxExtract(int maxExtract) { - this.maxExtract = maxExtract; - return this; - } + this.maxExtract = maxExtract; + return this; + } - /* IEnergyContainerItem */ - @Override - public int receiveEnergy(ItemStack container, int maxReceive, boolean simulate) { + /* IEnergyContainerItem */ + @Override + public int receiveEnergy(ItemStack container, int maxReceive, boolean simulate) { - if (!container.hasTagCompound()) { - container.setTagCompound(new NBTTagCompound()); - } - int energy = container.getTagCompound().getInteger("Energy"); - int energyReceived = Math.min(capacity - energy, Math.min(this.maxReceive, maxReceive)); + if (!container.hasTagCompound()) { + container.setTagCompound(new NBTTagCompound()); + } + int energy = container.getTagCompound().getInteger("Energy"); + int energyReceived = Math.min(capacity - energy, Math.min(this.maxReceive, maxReceive)); - if (!simulate) { - energy += energyReceived; - container.getTagCompound().setInteger("Energy", energy); - } - return energyReceived; - } + if (!simulate) { + energy += energyReceived; + container.getTagCompound().setInteger("Energy", energy); + } + return energyReceived; + } - @Override - public int extractEnergy(ItemStack container, int maxExtract, boolean simulate) { + @Override + public int extractEnergy(ItemStack container, int maxExtract, boolean simulate) { - if (container.getTagCompound() == null || !container.getTagCompound().hasKey("Energy")) { - return 0; - } - int energy = container.getTagCompound().getInteger("Energy"); - int energyExtracted = Math.min(energy, Math.min(this.maxExtract, maxExtract)); + if (container.getTagCompound() == null || !container.getTagCompound().hasKey("Energy")) { + return 0; + } + int energy = container.getTagCompound().getInteger("Energy"); + int energyExtracted = Math.min(energy, Math.min(this.maxExtract, maxExtract)); - if (!simulate) { - energy -= energyExtracted; - container.getTagCompound().setInteger("Energy", energy); - } - return energyExtracted; - } + if (!simulate) { + energy -= energyExtracted; + container.getTagCompound().setInteger("Energy", energy); + } + return energyExtracted; + } - @Override - public int getEnergyStored(ItemStack container) { + @Override + public int getEnergyStored(ItemStack container) { - if (container.getTagCompound() == null || !container.getTagCompound().hasKey("Energy")) { - return 0; - } - return container.getTagCompound().getInteger("Energy"); - } + if (container.getTagCompound() == null || !container.getTagCompound().hasKey("Energy")) { + return 0; + } + return container.getTagCompound().getInteger("Energy"); + } - @Override - public int getMaxEnergyStored(ItemStack container) { + @Override + public int getMaxEnergyStored(ItemStack container) { - return capacity; - } + return capacity; + } } diff --git a/src/main/java/cofh/api/energy/TileEnergyHandler.java b/src/main/java/cofh/api/energy/TileEnergyHandler.java index 3ba60a664..d45e9d0f0 100755 --- a/src/main/java/cofh/api/energy/TileEnergyHandler.java +++ b/src/main/java/cofh/api/energy/TileEnergyHandler.java @@ -6,62 +6,61 @@ import net.minecraft.util.EnumFacing; /** * Reference implementation of {@link IEnergyReceiver} and {@link IEnergyProvider}. Use/extend this or implement your own. - * + *

* This class is really meant to summarize how each interface is properly used. * * @author King Lemming - * */ public class TileEnergyHandler extends TileEntity implements IEnergyReceiver, IEnergyProvider { - protected EnergyStorage storage = new EnergyStorage(32000); + protected EnergyStorage storage = new EnergyStorage(32000); - @Override - public void readFromNBT(NBTTagCompound nbt) { + @Override + public void readFromNBT(NBTTagCompound nbt) { - super.readFromNBT(nbt); - storage.readFromNBT(nbt); - } + super.readFromNBT(nbt); + storage.readFromNBT(nbt); + } - @Override - public void writeToNBT(NBTTagCompound nbt) { + @Override + public void writeToNBT(NBTTagCompound nbt) { - super.writeToNBT(nbt); - storage.writeToNBT(nbt); - } + super.writeToNBT(nbt); + storage.writeToNBT(nbt); + } - /* IEnergyConnection */ - @Override - public boolean canConnectEnergy(EnumFacing from) { + /* IEnergyConnection */ + @Override + public boolean canConnectEnergy(EnumFacing from) { - return true; - } + return true; + } - /* IEnergyReceiver */ - @Override - public int receiveEnergy(EnumFacing from, int maxReceive, boolean simulate) { + /* IEnergyReceiver */ + @Override + public int receiveEnergy(EnumFacing from, int maxReceive, boolean simulate) { - return storage.receiveEnergy(maxReceive, simulate); - } + return storage.receiveEnergy(maxReceive, simulate); + } - /* IEnergyProvider */ - @Override - public int extractEnergy(EnumFacing from, int maxExtract, boolean simulate) { + /* IEnergyProvider */ + @Override + public int extractEnergy(EnumFacing from, int maxExtract, boolean simulate) { - return storage.extractEnergy(maxExtract, simulate); - } + return storage.extractEnergy(maxExtract, simulate); + } - /* IEnergyHandler */ - @Override - public int getEnergyStored(EnumFacing from) { + /* IEnergyHandler */ + @Override + public int getEnergyStored(EnumFacing from) { - return storage.getEnergyStored(); - } + return storage.getEnergyStored(); + } - @Override - public int getMaxEnergyStored(EnumFacing from) { + @Override + public int getMaxEnergyStored(EnumFacing from) { - return storage.getMaxEnergyStored(); - } + return storage.getMaxEnergyStored(); + } } diff --git a/src/main/java/cofh/api/energy/package-info.java b/src/main/java/cofh/api/energy/package-info.java index da8566735..21dca2485 100755 --- a/src/main/java/cofh/api/energy/package-info.java +++ b/src/main/java/cofh/api/energy/package-info.java @@ -5,6 +5,6 @@ @API(apiVersion = CoFHAPIProps.VERSION, owner = "CoFHAPI", provides = "CoFHAPI|energy") package cofh.api.energy; -import net.minecraftforge.fml.common.API; import cofh.api.CoFHAPIProps; +import net.minecraftforge.fml.common.API; diff --git a/src/main/java/powercrystals/minefactoryreloaded/api/IDeepStorageUnit.java b/src/main/java/powercrystals/minefactoryreloaded/api/IDeepStorageUnit.java index 5d6642d4c..0b33ddb38 100755 --- a/src/main/java/powercrystals/minefactoryreloaded/api/IDeepStorageUnit.java +++ b/src/main/java/powercrystals/minefactoryreloaded/api/IDeepStorageUnit.java @@ -2,8 +2,7 @@ package powercrystals.minefactoryreloaded.api; import net.minecraft.item.ItemStack; -public interface IDeepStorageUnit -{ +public interface IDeepStorageUnit { /** * @return A populated ItemStack with stackSize for the full amount of materials in the DSU. May have a stackSize > getMaxStackSize(). */ diff --git a/src/main/java/refinedstorage/block/BlockConstructor.java b/src/main/java/refinedstorage/block/BlockConstructor.java index daf47921b..daf79e373 100755 --- a/src/main/java/refinedstorage/block/BlockConstructor.java +++ b/src/main/java/refinedstorage/block/BlockConstructor.java @@ -6,6 +6,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import refinedstorage.RefinedStorage; import refinedstorage.RefinedStorageGui; @@ -22,7 +23,7 @@ public class BlockConstructor extends BlockMachine { } @Override - public boolean onBlockActivated(World world, net.minecraft.util.math.BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ) { + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ) { if (!world.isRemote) { player.openGui(RefinedStorage.INSTANCE, RefinedStorageGui.CONSTRUCTOR, world, pos.getX(), pos.getY(), pos.getZ()); } diff --git a/src/main/java/refinedstorage/block/BlockDestructor.java b/src/main/java/refinedstorage/block/BlockDestructor.java index 230ff8258..9a96777a4 100755 --- a/src/main/java/refinedstorage/block/BlockDestructor.java +++ b/src/main/java/refinedstorage/block/BlockDestructor.java @@ -6,6 +6,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import refinedstorage.RefinedStorage; import refinedstorage.RefinedStorageGui; @@ -22,7 +23,7 @@ public class BlockDestructor extends BlockMachine { } @Override - public boolean onBlockActivated(World world, net.minecraft.util.math.BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ) { + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ) { if (!world.isRemote) { player.openGui(RefinedStorage.INSTANCE, RefinedStorageGui.DESTRUCTOR, world, pos.getX(), pos.getY(), pos.getZ()); } diff --git a/src/main/java/refinedstorage/block/BlockDetector.java b/src/main/java/refinedstorage/block/BlockDetector.java index 2b66772f7..4cc4c8f8d 100755 --- a/src/main/java/refinedstorage/block/BlockDetector.java +++ b/src/main/java/refinedstorage/block/BlockDetector.java @@ -66,7 +66,7 @@ public class BlockDetector extends BlockMachine { } @Override - public boolean onBlockActivated(World world, net.minecraft.util.math.BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ) { + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ) { if (!world.isRemote) { player.openGui(RefinedStorage.INSTANCE, RefinedStorageGui.DETECTOR, world, pos.getX(), pos.getY(), pos.getZ()); } diff --git a/src/main/java/refinedstorage/block/BlockDiskDrive.java b/src/main/java/refinedstorage/block/BlockDiskDrive.java index 72b7dca8f..39f435ded 100755 --- a/src/main/java/refinedstorage/block/BlockDiskDrive.java +++ b/src/main/java/refinedstorage/block/BlockDiskDrive.java @@ -6,6 +6,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import refinedstorage.RefinedStorage; import refinedstorage.RefinedStorageGui; @@ -22,7 +23,7 @@ public class BlockDiskDrive extends BlockMachine { } @Override - public boolean onBlockActivated(World world, net.minecraft.util.math.BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ) { + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ) { if (!world.isRemote) { player.openGui(RefinedStorage.INSTANCE, RefinedStorageGui.DISK_DRIVE, world, pos.getX(), pos.getY(), pos.getZ()); } diff --git a/src/main/java/refinedstorage/block/BlockExporter.java b/src/main/java/refinedstorage/block/BlockExporter.java index 49f3ce855..f5a38c7d4 100755 --- a/src/main/java/refinedstorage/block/BlockExporter.java +++ b/src/main/java/refinedstorage/block/BlockExporter.java @@ -6,6 +6,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import refinedstorage.RefinedStorage; import refinedstorage.RefinedStorageGui; @@ -22,7 +23,7 @@ public class BlockExporter extends BlockMachine { } @Override - public boolean onBlockActivated(World world, net.minecraft.util.math.BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ) { + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ) { if (!world.isRemote) { player.openGui(RefinedStorage.INSTANCE, RefinedStorageGui.EXPORTER, world, pos.getX(), pos.getY(), pos.getZ()); } diff --git a/src/main/java/refinedstorage/block/BlockExternalStorage.java b/src/main/java/refinedstorage/block/BlockExternalStorage.java index 0fff22f58..f83d34e42 100755 --- a/src/main/java/refinedstorage/block/BlockExternalStorage.java +++ b/src/main/java/refinedstorage/block/BlockExternalStorage.java @@ -6,6 +6,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import refinedstorage.RefinedStorage; import refinedstorage.RefinedStorageGui; @@ -22,7 +23,7 @@ public class BlockExternalStorage extends BlockMachine { } @Override - public boolean onBlockActivated(World world, net.minecraft.util.math.BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ) { + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ) { if (!world.isRemote) { player.openGui(RefinedStorage.INSTANCE, RefinedStorageGui.STORAGE, world, pos.getX(), pos.getY(), pos.getZ()); } diff --git a/src/main/java/refinedstorage/block/BlockImporter.java b/src/main/java/refinedstorage/block/BlockImporter.java index 013d1a33f..1b124a629 100755 --- a/src/main/java/refinedstorage/block/BlockImporter.java +++ b/src/main/java/refinedstorage/block/BlockImporter.java @@ -6,6 +6,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import refinedstorage.RefinedStorage; import refinedstorage.RefinedStorageGui; @@ -22,7 +23,7 @@ public class BlockImporter extends BlockMachine { } @Override - public boolean onBlockActivated(World world, net.minecraft.util.math.BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ) { + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ) { if (!world.isRemote) { player.openGui(RefinedStorage.INSTANCE, RefinedStorageGui.IMPORTER, world, pos.getX(), pos.getY(), pos.getZ()); } diff --git a/src/main/java/refinedstorage/block/BlockInterface.java b/src/main/java/refinedstorage/block/BlockInterface.java index 01260204d..cc5bf74ad 100755 --- a/src/main/java/refinedstorage/block/BlockInterface.java +++ b/src/main/java/refinedstorage/block/BlockInterface.java @@ -6,6 +6,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import refinedstorage.RefinedStorage; import refinedstorage.RefinedStorageGui; @@ -22,7 +23,7 @@ public class BlockInterface extends BlockMachine { } @Override - public boolean onBlockActivated(World world, net.minecraft.util.math.BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ) { + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ) { if (!world.isRemote) { player.openGui(RefinedStorage.INSTANCE, RefinedStorageGui.INTERFACE, world, pos.getX(), pos.getY(), pos.getZ()); } diff --git a/src/main/java/refinedstorage/block/BlockSolderer.java b/src/main/java/refinedstorage/block/BlockSolderer.java index 997af4011..3fdaee0a4 100755 --- a/src/main/java/refinedstorage/block/BlockSolderer.java +++ b/src/main/java/refinedstorage/block/BlockSolderer.java @@ -6,6 +6,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import refinedstorage.RefinedStorage; import refinedstorage.RefinedStorageGui; @@ -22,7 +23,7 @@ public class BlockSolderer extends BlockMachine { } @Override - public boolean onBlockActivated(World world, net.minecraft.util.math.BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ) { + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ) { if (!world.isRemote) { player.openGui(RefinedStorage.INSTANCE, RefinedStorageGui.SOLDERER, world, pos.getX(), pos.getY(), pos.getZ()); } diff --git a/src/main/java/refinedstorage/block/BlockStorage.java b/src/main/java/refinedstorage/block/BlockStorage.java index f07ec7e23..c986505fe 100755 --- a/src/main/java/refinedstorage/block/BlockStorage.java +++ b/src/main/java/refinedstorage/block/BlockStorage.java @@ -65,7 +65,7 @@ public class BlockStorage extends BlockMachine { } @Override - public boolean onBlockActivated(World world, net.minecraft.util.math.BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ) { + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ) { if (!world.isRemote) { player.openGui(RefinedStorage.INSTANCE, RefinedStorageGui.STORAGE, world, pos.getX(), pos.getY(), pos.getZ()); } diff --git a/src/main/java/refinedstorage/block/BlockWirelessTransmitter.java b/src/main/java/refinedstorage/block/BlockWirelessTransmitter.java index 179d80397..d7e17bd37 100755 --- a/src/main/java/refinedstorage/block/BlockWirelessTransmitter.java +++ b/src/main/java/refinedstorage/block/BlockWirelessTransmitter.java @@ -45,7 +45,7 @@ public class BlockWirelessTransmitter extends BlockMachine { } @Override - public boolean onBlockActivated(World world, net.minecraft.util.math.BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ) { + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ) { if (!world.isRemote) { player.openGui(RefinedStorage.INSTANCE, RefinedStorageGui.WIRELESS_TRANSMITTER, world, pos.getX(), pos.getY(), pos.getZ()); } diff --git a/src/main/java/refinedstorage/gui/GuiSolderer.java b/src/main/java/refinedstorage/gui/GuiSolderer.java index 581597533..3cfb316f9 100755 --- a/src/main/java/refinedstorage/gui/GuiSolderer.java +++ b/src/main/java/refinedstorage/gui/GuiSolderer.java @@ -1,6 +1,5 @@ package refinedstorage.gui; -import net.minecraft.inventory.Container; import refinedstorage.container.ContainerSolderer; import refinedstorage.gui.sidebutton.SideButtonRedstoneMode; import refinedstorage.tile.TileSolderer; diff --git a/src/main/java/refinedstorage/gui/GuiWirelessTransmitter.java b/src/main/java/refinedstorage/gui/GuiWirelessTransmitter.java index 1b1ae37b3..c99927739 100755 --- a/src/main/java/refinedstorage/gui/GuiWirelessTransmitter.java +++ b/src/main/java/refinedstorage/gui/GuiWirelessTransmitter.java @@ -1,6 +1,5 @@ package refinedstorage.gui; -import net.minecraft.inventory.Container; import refinedstorage.container.ContainerWirelessTransmitter; import refinedstorage.gui.sidebutton.SideButtonRedstoneMode; import refinedstorage.tile.TileWirelessTransmitter; diff --git a/src/main/java/refinedstorage/proxy/CommonProxy.java b/src/main/java/refinedstorage/proxy/CommonProxy.java index afaafb19d..c83884244 100755 --- a/src/main/java/refinedstorage/proxy/CommonProxy.java +++ b/src/main/java/refinedstorage/proxy/CommonProxy.java @@ -21,6 +21,7 @@ import refinedstorage.network.*; import refinedstorage.storage.NBTStorage; import refinedstorage.tile.*; import refinedstorage.tile.solderer.*; + import static refinedstorage.RefinedStorage.ID; public class CommonProxy { diff --git a/src/main/resources/assets/refinedstorage/blockstates/cable.json b/src/main/resources/assets/refinedstorage/blockstates/cable.json index da0d91d09..f3261ef4c 100755 --- a/src/main/resources/assets/refinedstorage/blockstates/cable.json +++ b/src/main/resources/assets/refinedstorage/blockstates/cable.json @@ -1,73 +1,75 @@ { - "forge_marker": 1, - "defaults": { - "textures": { - "all": "refinedstorage:blocks/cable", - "particle": "refinedstorage:blocks/cable" - }, - "model": "refinedstorage:cable_core", - "uvlock": true - }, - "variants": { - "inventory": [{ - "model": "refinedstorage:cable", - "transform": "forge:default-block" - }], - "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": { - } - }, - "direction": { - "north": { - }, - "east": { - }, - "south": { - }, - "west": { - }, - "up": { - }, - "down": { - } - } - } + "forge_marker": 1, + "defaults": { + "textures": { + "all": "refinedstorage:blocks/cable", + "particle": "refinedstorage:blocks/cable" + }, + "model": "refinedstorage:cable_core", + "uvlock": true + }, + "variants": { + "inventory": [ + { + "model": "refinedstorage:cable", + "transform": "forge:default-block" + } + ], + "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": { + } + }, + "direction": { + "north": { + }, + "east": { + }, + "south": { + }, + "west": { + }, + "up": { + }, + "down": { + } + } + } } \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/blockstates/constructor.json b/src/main/resources/assets/refinedstorage/blockstates/constructor.json index 86a3dc400..0ba47c9b8 100755 --- a/src/main/resources/assets/refinedstorage/blockstates/constructor.json +++ b/src/main/resources/assets/refinedstorage/blockstates/constructor.json @@ -1,53 +1,53 @@ { - "forge_marker": 1, - "defaults": { - "model": "orientable", - "textures": { - "side": "refinedstorage:blocks/side", - "top": "refinedstorage:blocks/side" - } - }, - "variants": { - "inventory": [ - { - "y": 0, - "transform": "forge:default-block", - "textures": { - "front": "refinedstorage:blocks/constructor_disconnected" - } - } - ], - "connected": { - "true": { - "textures": { - "front": "refinedstorage:blocks/constructor_connected" - } - }, - "false": { - "textures": { - "front": "refinedstorage:blocks/constructor_disconnected" - } - } - }, - "direction": { - "north": { - "y": 0 - }, - "east": { - "y": 90 - }, - "south": { - "y": 180 - }, - "west": { - "y": 270 - }, - "up": { - "x": 270 - }, - "down": { - "x": 90 - } - } - } + "forge_marker": 1, + "defaults": { + "model": "orientable", + "textures": { + "side": "refinedstorage:blocks/side", + "top": "refinedstorage:blocks/side" + } + }, + "variants": { + "inventory": [ + { + "y": 0, + "transform": "forge:default-block", + "textures": { + "front": "refinedstorage:blocks/constructor_disconnected" + } + } + ], + "connected": { + "true": { + "textures": { + "front": "refinedstorage:blocks/constructor_connected" + } + }, + "false": { + "textures": { + "front": "refinedstorage:blocks/constructor_disconnected" + } + } + }, + "direction": { + "north": { + "y": 0 + }, + "east": { + "y": 90 + }, + "south": { + "y": 180 + }, + "west": { + "y": 270 + }, + "up": { + "x": 270 + }, + "down": { + "x": 90 + } + } + } } \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/blockstates/controller.json b/src/main/resources/assets/refinedstorage/blockstates/controller.json index f148cfbbf..081716e07 100755 --- a/src/main/resources/assets/refinedstorage/blockstates/controller.json +++ b/src/main/resources/assets/refinedstorage/blockstates/controller.json @@ -1,92 +1,92 @@ { - "forge_marker": 1, - "defaults": { - "model": "orientable", - "textures": { - "side": "refinedstorage:blocks/side", - "top": "refinedstorage:blocks/side", - "front": "refinedstorage:blocks/controller_0" - } - }, - "variants": { - "inventory": [ - { - "y": 0, - "transform": "forge:default-block" - } - ], - "energy": { - "0": { - "textures": { - "front": "refinedstorage:blocks/controller_0" - } - }, - "1": { - "textures": { - "front": "refinedstorage:blocks/controller_1" - } - }, - "2": { - "textures": { - "front": "refinedstorage:blocks/controller_2" - } - }, - "3": { - "textures": { - "front": "refinedstorage:blocks/controller_3" - } - }, - "4": { - "textures": { - "front": "refinedstorage:blocks/controller_4" - } - }, - "5": { - "textures": { - "front": "refinedstorage:blocks/controller_5" - } - }, - "6": { - "textures": { - "front": "refinedstorage:blocks/controller_6" - } - }, - "7": { - "textures": { - "front": "refinedstorage:blocks/controller_7" - } - }, - "8": { - "textures": { - "front": "refinedstorage:blocks/controller_8" - } - } - }, - "type": { - "normal": { - }, - "creative": { - } - }, - "direction": { - "north": { - "y": 0 - }, - "east": { - "y": 90 - }, - "south": { - "y": 180 - }, - "west": { - "y": 270 - }, - "up": { - "x": 270 - }, - "down": { - "x": 90 - } - } - } + "forge_marker": 1, + "defaults": { + "model": "orientable", + "textures": { + "side": "refinedstorage:blocks/side", + "top": "refinedstorage:blocks/side", + "front": "refinedstorage:blocks/controller_0" + } + }, + "variants": { + "inventory": [ + { + "y": 0, + "transform": "forge:default-block" + } + ], + "energy": { + "0": { + "textures": { + "front": "refinedstorage:blocks/controller_0" + } + }, + "1": { + "textures": { + "front": "refinedstorage:blocks/controller_1" + } + }, + "2": { + "textures": { + "front": "refinedstorage:blocks/controller_2" + } + }, + "3": { + "textures": { + "front": "refinedstorage:blocks/controller_3" + } + }, + "4": { + "textures": { + "front": "refinedstorage:blocks/controller_4" + } + }, + "5": { + "textures": { + "front": "refinedstorage:blocks/controller_5" + } + }, + "6": { + "textures": { + "front": "refinedstorage:blocks/controller_6" + } + }, + "7": { + "textures": { + "front": "refinedstorage:blocks/controller_7" + } + }, + "8": { + "textures": { + "front": "refinedstorage:blocks/controller_8" + } + } + }, + "type": { + "normal": { + }, + "creative": { + } + }, + "direction": { + "north": { + "y": 0 + }, + "east": { + "y": 90 + }, + "south": { + "y": 180 + }, + "west": { + "y": 270 + }, + "up": { + "x": 270 + }, + "down": { + "x": 90 + } + } + } } \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/blockstates/destructor.json b/src/main/resources/assets/refinedstorage/blockstates/destructor.json index e947cc052..9fc7adc9c 100755 --- a/src/main/resources/assets/refinedstorage/blockstates/destructor.json +++ b/src/main/resources/assets/refinedstorage/blockstates/destructor.json @@ -1,53 +1,53 @@ { - "forge_marker": 1, - "defaults": { - "model": "orientable", - "textures": { - "side": "refinedstorage:blocks/side", - "top": "refinedstorage:blocks/side" - } - }, - "variants": { - "inventory": [ - { - "y": 0, - "transform": "forge:default-block", - "textures": { - "front": "refinedstorage:blocks/destructor_disconnected" - } - } - ], - "connected": { - "true": { - "textures": { - "front": "refinedstorage:blocks/destructor_connected" - } - }, - "false": { - "textures": { - "front": "refinedstorage:blocks/destructor_disconnected" - } - } - }, - "direction": { - "north": { - "y": 0 - }, - "east": { - "y": 90 - }, - "south": { - "y": 180 - }, - "west": { - "y": 270 - }, - "up": { - "x": 270 - }, - "down": { - "x": 90 - } - } - } + "forge_marker": 1, + "defaults": { + "model": "orientable", + "textures": { + "side": "refinedstorage:blocks/side", + "top": "refinedstorage:blocks/side" + } + }, + "variants": { + "inventory": [ + { + "y": 0, + "transform": "forge:default-block", + "textures": { + "front": "refinedstorage:blocks/destructor_disconnected" + } + } + ], + "connected": { + "true": { + "textures": { + "front": "refinedstorage:blocks/destructor_connected" + } + }, + "false": { + "textures": { + "front": "refinedstorage:blocks/destructor_disconnected" + } + } + }, + "direction": { + "north": { + "y": 0 + }, + "east": { + "y": 90 + }, + "south": { + "y": 180 + }, + "west": { + "y": 270 + }, + "up": { + "x": 270 + }, + "down": { + "x": 90 + } + } + } } \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/blockstates/detector.json b/src/main/resources/assets/refinedstorage/blockstates/detector.json index d1c62d543..77f3ea633 100755 --- a/src/main/resources/assets/refinedstorage/blockstates/detector.json +++ b/src/main/resources/assets/refinedstorage/blockstates/detector.json @@ -1,54 +1,54 @@ { - "forge_marker": 1, - "defaults": { - "model": "orientable", - "textures": { - "side": "refinedstorage:blocks/side", - "top": "refinedstorage:blocks/side", - "front": "refinedstorage:blocks/detector_unpowered" - } - }, - "variants": { - "inventory": [ - { - "y": 0, - "transform": "forge:default-block" - } - ], - "connected": { - "true": { - }, - "false": { - } - }, - "powered": { - "true": { - "textures": { - "front": "refinedstorage:blocks/detector_powered" - } - }, - "false": { - } - }, - "direction": { - "north": { - "y": 0 - }, - "east": { - "y": 90 - }, - "south": { - "y": 180 - }, - "west": { - "y": 270 - }, - "up": { - "x": 270 - }, - "down": { - "x": 90 - } - } - } + "forge_marker": 1, + "defaults": { + "model": "orientable", + "textures": { + "side": "refinedstorage:blocks/side", + "top": "refinedstorage:blocks/side", + "front": "refinedstorage:blocks/detector_unpowered" + } + }, + "variants": { + "inventory": [ + { + "y": 0, + "transform": "forge:default-block" + } + ], + "connected": { + "true": { + }, + "false": { + } + }, + "powered": { + "true": { + "textures": { + "front": "refinedstorage:blocks/detector_powered" + } + }, + "false": { + } + }, + "direction": { + "north": { + "y": 0 + }, + "east": { + "y": 90 + }, + "south": { + "y": 180 + }, + "west": { + "y": 270 + }, + "up": { + "x": 270 + }, + "down": { + "x": 90 + } + } + } } \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/blockstates/disk_drive.json b/src/main/resources/assets/refinedstorage/blockstates/disk_drive.json index 2c84db2ba..fdbb245a2 100755 --- a/src/main/resources/assets/refinedstorage/blockstates/disk_drive.json +++ b/src/main/resources/assets/refinedstorage/blockstates/disk_drive.json @@ -1,45 +1,45 @@ { - "forge_marker": 1, - "defaults": { - "model": "orientable", - "textures": { - "side": "refinedstorage:blocks/side", - "top": "refinedstorage:blocks/side", - "front": "refinedstorage:blocks/disk_drive" - } - }, - "variants": { - "inventory": [ - { - "transform": "forge:default-block", - "y": 0 - } - ], - "connected": { - "true": { - }, - "false": { - } - }, - "direction": { - "north": { - "y": 0 - }, - "east": { - "y": 90 - }, - "south": { - "y": 180 - }, - "west": { - "y": 270 - }, - "up": { - "x": 270 - }, - "down": { - "x": 90 - } - } - } + "forge_marker": 1, + "defaults": { + "model": "orientable", + "textures": { + "side": "refinedstorage:blocks/side", + "top": "refinedstorage:blocks/side", + "front": "refinedstorage:blocks/disk_drive" + } + }, + "variants": { + "inventory": [ + { + "transform": "forge:default-block", + "y": 0 + } + ], + "connected": { + "true": { + }, + "false": { + } + }, + "direction": { + "north": { + "y": 0 + }, + "east": { + "y": 90 + }, + "south": { + "y": 180 + }, + "west": { + "y": 270 + }, + "up": { + "x": 270 + }, + "down": { + "x": 90 + } + } + } } \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/blockstates/exporter.json b/src/main/resources/assets/refinedstorage/blockstates/exporter.json index 3e97ab4d9..8fef98a80 100755 --- a/src/main/resources/assets/refinedstorage/blockstates/exporter.json +++ b/src/main/resources/assets/refinedstorage/blockstates/exporter.json @@ -1,45 +1,45 @@ { - "forge_marker": 1, - "defaults": { - "model": "orientable", - "textures": { - "side": "refinedstorage:blocks/side", - "top": "refinedstorage:blocks/side", - "front": "refinedstorage:blocks/exporter" - } - }, - "variants": { - "inventory": [ - { - "y": 0, - "transform": "forge:default-block" - } - ], - "connected": { - "true": { - }, - "false": { - } - }, - "direction": { - "north": { - "y": 0 - }, - "east": { - "y": 90 - }, - "south": { - "y": 180 - }, - "west": { - "y": 270 - }, - "up": { - "x": 270 - }, - "down": { - "x": 90 - } - } - } + "forge_marker": 1, + "defaults": { + "model": "orientable", + "textures": { + "side": "refinedstorage:blocks/side", + "top": "refinedstorage:blocks/side", + "front": "refinedstorage:blocks/exporter" + } + }, + "variants": { + "inventory": [ + { + "y": 0, + "transform": "forge:default-block" + } + ], + "connected": { + "true": { + }, + "false": { + } + }, + "direction": { + "north": { + "y": 0 + }, + "east": { + "y": 90 + }, + "south": { + "y": 180 + }, + "west": { + "y": 270 + }, + "up": { + "x": 270 + }, + "down": { + "x": 90 + } + } + } } \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/blockstates/external_storage.json b/src/main/resources/assets/refinedstorage/blockstates/external_storage.json index 6b891d4ee..56d8e97b7 100755 --- a/src/main/resources/assets/refinedstorage/blockstates/external_storage.json +++ b/src/main/resources/assets/refinedstorage/blockstates/external_storage.json @@ -1,45 +1,45 @@ { - "forge_marker": 1, - "defaults": { - "model": "orientable", - "textures": { - "side": "refinedstorage:blocks/side", - "top": "refinedstorage:blocks/side", - "front": "refinedstorage:blocks/external_storage" - } - }, - "variants": { - "inventory": [ - { - "y": 0, - "transform": "forge:default-block" - } - ], - "connected": { - "true": { - }, - "false": { - } - }, - "direction": { - "north": { - "y": 0 - }, - "east": { - "y": 90 - }, - "south": { - "y": 180 - }, - "west": { - "y": 270 - }, - "up": { - "x": 270 - }, - "down": { - "x": 90 - } - } - } + "forge_marker": 1, + "defaults": { + "model": "orientable", + "textures": { + "side": "refinedstorage:blocks/side", + "top": "refinedstorage:blocks/side", + "front": "refinedstorage:blocks/external_storage" + } + }, + "variants": { + "inventory": [ + { + "y": 0, + "transform": "forge:default-block" + } + ], + "connected": { + "true": { + }, + "false": { + } + }, + "direction": { + "north": { + "y": 0 + }, + "east": { + "y": 90 + }, + "south": { + "y": 180 + }, + "west": { + "y": 270 + }, + "up": { + "x": 270 + }, + "down": { + "x": 90 + } + } + } } \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/blockstates/grid.json b/src/main/resources/assets/refinedstorage/blockstates/grid.json index 578d68dd0..45b48a2ad 100755 --- a/src/main/resources/assets/refinedstorage/blockstates/grid.json +++ b/src/main/resources/assets/refinedstorage/blockstates/grid.json @@ -1,59 +1,59 @@ { - "forge_marker": 1, - "defaults": { - "model": "orientable", - "textures": { - "side": "refinedstorage:blocks/side", - "top": "refinedstorage:blocks/side" - } - }, - "variants": { - "inventory": [ - { - "textures": { - "front": "refinedstorage:blocks/grid_disconnected" - }, - "transform": "forge:default-block", - "y": 0 - } - ], - "type": { - "normal": { - }, - "crafting": { - } - }, - "connected": { - "true": { - "textures": { - "front": "refinedstorage:blocks/grid_connected" - } - }, - "false": { - "textures": { - "front": "refinedstorage:blocks/grid_disconnected" - } - } - }, - "direction": { - "north": { - "y": 0 - }, - "east": { - "y": 90 - }, - "south": { - "y": 180 - }, - "west": { - "y": 270 - }, - "up": { - "x": 270 - }, - "down": { - "x": 90 - } - } - } + "forge_marker": 1, + "defaults": { + "model": "orientable", + "textures": { + "side": "refinedstorage:blocks/side", + "top": "refinedstorage:blocks/side" + } + }, + "variants": { + "inventory": [ + { + "textures": { + "front": "refinedstorage:blocks/grid_disconnected" + }, + "transform": "forge:default-block", + "y": 0 + } + ], + "type": { + "normal": { + }, + "crafting": { + } + }, + "connected": { + "true": { + "textures": { + "front": "refinedstorage:blocks/grid_connected" + } + }, + "false": { + "textures": { + "front": "refinedstorage:blocks/grid_disconnected" + } + } + }, + "direction": { + "north": { + "y": 0 + }, + "east": { + "y": 90 + }, + "south": { + "y": 180 + }, + "west": { + "y": 270 + }, + "up": { + "x": 270 + }, + "down": { + "x": 90 + } + } + } } \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/blockstates/importer.json b/src/main/resources/assets/refinedstorage/blockstates/importer.json index 88a844591..78a57739e 100755 --- a/src/main/resources/assets/refinedstorage/blockstates/importer.json +++ b/src/main/resources/assets/refinedstorage/blockstates/importer.json @@ -1,45 +1,45 @@ { - "forge_marker": 1, - "defaults": { - "model": "orientable", - "textures": { - "side": "refinedstorage:blocks/side", - "top": "refinedstorage:blocks/side", - "front": "refinedstorage:blocks/importer" - } - }, - "variants": { - "inventory": [ - { - "y": 0, - "transform": "forge:default-block" - } - ], - "connected": { - "true": { - }, - "false": { - } - }, - "direction": { - "north": { - "y": 0 - }, - "east": { - "y": 90 - }, - "south": { - "y": 180 - }, - "west": { - "y": 270 - }, - "up": { - "x": 270 - }, - "down": { - "x": 90 - } - } - } + "forge_marker": 1, + "defaults": { + "model": "orientable", + "textures": { + "side": "refinedstorage:blocks/side", + "top": "refinedstorage:blocks/side", + "front": "refinedstorage:blocks/importer" + } + }, + "variants": { + "inventory": [ + { + "y": 0, + "transform": "forge:default-block" + } + ], + "connected": { + "true": { + }, + "false": { + } + }, + "direction": { + "north": { + "y": 0 + }, + "east": { + "y": 90 + }, + "south": { + "y": 180 + }, + "west": { + "y": 270 + }, + "up": { + "x": 270 + }, + "down": { + "x": 90 + } + } + } } \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/blockstates/interface.json b/src/main/resources/assets/refinedstorage/blockstates/interface.json index 212f79249..7e5023f77 100755 --- a/src/main/resources/assets/refinedstorage/blockstates/interface.json +++ b/src/main/resources/assets/refinedstorage/blockstates/interface.json @@ -1,36 +1,36 @@ { - "forge_marker": 1, - "defaults": { - "model": "cube_all", - "textures": { - "all": "refinedstorage:blocks/interface" - } - }, - "variants": { - "inventory": [ - { - "transform": "forge:default-block" - } - ], - "direction": { - "north": { - }, - "east": { - }, - "south": { - }, - "west": { - }, - "up": { - }, - "down": { - } - }, - "connected": { - "true": { - }, - "false": { - } - } - } + "forge_marker": 1, + "defaults": { + "model": "cube_all", + "textures": { + "all": "refinedstorage:blocks/interface" + } + }, + "variants": { + "inventory": [ + { + "transform": "forge:default-block" + } + ], + "direction": { + "north": { + }, + "east": { + }, + "south": { + }, + "west": { + }, + "up": { + }, + "down": { + } + }, + "connected": { + "true": { + }, + "false": { + } + } + } } \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/blockstates/machine_casing.json b/src/main/resources/assets/refinedstorage/blockstates/machine_casing.json index 243b9a488..00c5b91bd 100755 --- a/src/main/resources/assets/refinedstorage/blockstates/machine_casing.json +++ b/src/main/resources/assets/refinedstorage/blockstates/machine_casing.json @@ -1,30 +1,30 @@ { - "forge_marker": 1, - "defaults": { - "model": "cube_all", - "textures": { - "all": "refinedstorage:blocks/side" - } - }, - "variants": { - "inventory": [ - { - "transform": "forge:default-block" - } - ], - "direction": { - "north": { - }, - "east": { - }, - "south": { - }, - "west": { - }, - "up": { - }, - "down": { - } - } - } + "forge_marker": 1, + "defaults": { + "model": "cube_all", + "textures": { + "all": "refinedstorage:blocks/side" + } + }, + "variants": { + "inventory": [ + { + "transform": "forge:default-block" + } + ], + "direction": { + "north": { + }, + "east": { + }, + "south": { + }, + "west": { + }, + "up": { + }, + "down": { + } + } + } } \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/blockstates/relay.json b/src/main/resources/assets/refinedstorage/blockstates/relay.json index 5aeb8a774..af77013e8 100755 --- a/src/main/resources/assets/refinedstorage/blockstates/relay.json +++ b/src/main/resources/assets/refinedstorage/blockstates/relay.json @@ -1,39 +1,39 @@ { - "forge_marker": 1, - "defaults": { - "model": "cube_all", - "textures": { - "all": "refinedstorage:blocks/relay_connected" - } - }, - "variants": { - "inventory": [ - { - "transform": "forge:default-block" - } - ], - "direction": { - "north": { - }, - "east": { - }, - "south": { - }, - "west": { - }, - "up": { - }, - "down": { - } - }, - "connected": { - "true": { - }, - "false": { - "textures": { - "all": "refinedstorage:blocks/relay_disconnected" - } - } - } - } + "forge_marker": 1, + "defaults": { + "model": "cube_all", + "textures": { + "all": "refinedstorage:blocks/relay_connected" + } + }, + "variants": { + "inventory": [ + { + "transform": "forge:default-block" + } + ], + "direction": { + "north": { + }, + "east": { + }, + "south": { + }, + "west": { + }, + "up": { + }, + "down": { + } + }, + "connected": { + "true": { + }, + "false": { + "textures": { + "all": "refinedstorage:blocks/relay_disconnected" + } + } + } + } } \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/blockstates/solderer.json b/src/main/resources/assets/refinedstorage/blockstates/solderer.json index d2f88bdf8..f5575de5e 100755 --- a/src/main/resources/assets/refinedstorage/blockstates/solderer.json +++ b/src/main/resources/assets/refinedstorage/blockstates/solderer.json @@ -1,53 +1,53 @@ { - "forge_marker": 1, - "defaults": { - "model": "orientable", - "textures": { - "side": "refinedstorage:blocks/side", - "top": "refinedstorage:blocks/side" - } - }, - "variants": { - "inventory": [ - { - "y": 0, - "textures": { - "front": "refinedstorage:blocks/solderer_disconnected" - }, - "transform": "forge:default-block" - } - ], - "connected": { - "true": { - "textures": { - "front": "refinedstorage:blocks/solderer_connected" - } - }, - "false": { - "textures": { - "front": "refinedstorage:blocks/solderer_disconnected" - } - } - }, - "direction": { - "north": { - "y": 0 - }, - "east": { - "y": 90 - }, - "south": { - "y": 180 - }, - "west": { - "y": 270 - }, - "up": { - "x": 270 - }, - "down": { - "x": 90 - } - } - } + "forge_marker": 1, + "defaults": { + "model": "orientable", + "textures": { + "side": "refinedstorage:blocks/side", + "top": "refinedstorage:blocks/side" + } + }, + "variants": { + "inventory": [ + { + "y": 0, + "textures": { + "front": "refinedstorage:blocks/solderer_disconnected" + }, + "transform": "forge:default-block" + } + ], + "connected": { + "true": { + "textures": { + "front": "refinedstorage:blocks/solderer_connected" + } + }, + "false": { + "textures": { + "front": "refinedstorage:blocks/solderer_disconnected" + } + } + }, + "direction": { + "north": { + "y": 0 + }, + "east": { + "y": 90 + }, + "south": { + "y": 180 + }, + "west": { + "y": 270 + }, + "up": { + "x": 270 + }, + "down": { + "x": 90 + } + } + } } \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/blockstates/storage.json b/src/main/resources/assets/refinedstorage/blockstates/storage.json index 3104f7dea..9d6bc5795 100755 --- a/src/main/resources/assets/refinedstorage/blockstates/storage.json +++ b/src/main/resources/assets/refinedstorage/blockstates/storage.json @@ -1,36 +1,36 @@ { - "forge_marker": 1, - "defaults": { - "model": "cube_all", - "transform": "forge:default-block" - }, - "variants": { - "type": { - "1k": { - "textures": { - "all": "refinedstorage:blocks/1k_storage_block" - } - }, - "4k": { - "textures": { - "all": "refinedstorage:blocks/4k_storage_block" - } - }, - "16k": { - "textures": { - "all": "refinedstorage:blocks/16k_storage_block" - } - }, - "64k": { - "textures": { - "all": "refinedstorage:blocks/64k_storage_block" - } - }, - "creative": { - "textures": { - "all": "refinedstorage:blocks/creative_storage_block" - } - } - } - } + "forge_marker": 1, + "defaults": { + "model": "cube_all", + "transform": "forge:default-block" + }, + "variants": { + "type": { + "1k": { + "textures": { + "all": "refinedstorage:blocks/1k_storage_block" + } + }, + "4k": { + "textures": { + "all": "refinedstorage:blocks/4k_storage_block" + } + }, + "16k": { + "textures": { + "all": "refinedstorage:blocks/16k_storage_block" + } + }, + "64k": { + "textures": { + "all": "refinedstorage:blocks/64k_storage_block" + } + }, + "creative": { + "textures": { + "all": "refinedstorage:blocks/creative_storage_block" + } + } + } + } } \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/blockstates/wireless_transmitter.json b/src/main/resources/assets/refinedstorage/blockstates/wireless_transmitter.json index 83c6efba5..a249b0c7d 100755 --- a/src/main/resources/assets/refinedstorage/blockstates/wireless_transmitter.json +++ b/src/main/resources/assets/refinedstorage/blockstates/wireless_transmitter.json @@ -1,56 +1,56 @@ { - "forge_marker": 1, - "defaults": { - "model": "orientable", - "textures": { - "side": "refinedstorage:blocks/wireless_transmitter_side", - "top": "refinedstorage:blocks/wireless_transmitter_side", - "front": "refinedstorage:blocks/wireless_transmitter" - } - }, - "variants": { - "inventory": [ - { - "y": 0, - "transform": "forge:default-block" - } - ], - "connected": { - "true": { - }, - "false": { - } - }, - "direction": { - "north": { - "y": 0 - }, - "east": { - "y": 90 - }, - "south": { - "y": 180 - }, - "west": { - "y": 270 - }, - "up": { - "x": 270 - }, - "down": { - "x": 90 - } - }, - "working": { - "true": { - "textures": { - "side": "refinedstorage:blocks/wireless_transmitter_side_working", - "top": "refinedstorage:blocks/wireless_transmitter_side_working", - "front": "refinedstorage:blocks/wireless_transmitter_working" - } - }, - "false": { - } - } - } + "forge_marker": 1, + "defaults": { + "model": "orientable", + "textures": { + "side": "refinedstorage:blocks/wireless_transmitter_side", + "top": "refinedstorage:blocks/wireless_transmitter_side", + "front": "refinedstorage:blocks/wireless_transmitter" + } + }, + "variants": { + "inventory": [ + { + "y": 0, + "transform": "forge:default-block" + } + ], + "connected": { + "true": { + }, + "false": { + } + }, + "direction": { + "north": { + "y": 0 + }, + "east": { + "y": 90 + }, + "south": { + "y": 180 + }, + "west": { + "y": 270 + }, + "up": { + "x": 270 + }, + "down": { + "x": 90 + } + }, + "working": { + "true": { + "textures": { + "side": "refinedstorage:blocks/wireless_transmitter_side_working", + "top": "refinedstorage:blocks/wireless_transmitter_side_working", + "front": "refinedstorage:blocks/wireless_transmitter_working" + } + }, + "false": { + } + } + } } \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/models/block/cable.json b/src/main/resources/assets/refinedstorage/models/block/cable.json index 049952da6..3170aa97d 100755 --- a/src/main/resources/assets/refinedstorage/models/block/cable.json +++ b/src/main/resources/assets/refinedstorage/models/block/cable.json @@ -1,98 +1,212 @@ { - "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "elements": [ - { - "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] - } - } - } - ] + "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", + "elements": [ + { + "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/cable_core.json b/src/main/resources/assets/refinedstorage/models/block/cable_core.json index 7fca82c2c..9f9d5149d 100755 --- a/src/main/resources/assets/refinedstorage/models/block/cable_core.json +++ b/src/main/resources/assets/refinedstorage/models/block/cable_core.json @@ -1,36 +1,74 @@ { - "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "elements": [ - { - "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] - } - } - } - ] + "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", + "elements": [ + { + "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 + ] + } + } + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/models/block/cable_down.json b/src/main/resources/assets/refinedstorage/models/block/cable_down.json index 29b512eb5..b6751c24f 100755 --- a/src/main/resources/assets/refinedstorage/models/block/cable_down.json +++ b/src/main/resources/assets/refinedstorage/models/block/cable_down.json @@ -1,36 +1,74 @@ { - "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "elements": [ - { - "name": "Down", - "from": [6.0, 0.0, 6.0], - "to": [10.0, 6.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] - } - } - } - ] + "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", + "elements": [ + { + "name": "Down", + "from": [ + 6.0, + 0.0, + 6.0 + ], + "to": [ + 10.0, + 6.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 + ] + } + } + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/models/block/cable_east.json b/src/main/resources/assets/refinedstorage/models/block/cable_east.json index 10aad3374..52ab45d9d 100755 --- a/src/main/resources/assets/refinedstorage/models/block/cable_east.json +++ b/src/main/resources/assets/refinedstorage/models/block/cable_east.json @@ -1,36 +1,74 @@ { - "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "elements": [ - { - "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] - } - } - } - ] + "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", + "elements": [ + { + "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 + ] + } + } + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/models/block/cable_north.json b/src/main/resources/assets/refinedstorage/models/block/cable_north.json index db2875e5e..8ea78cadb 100755 --- a/src/main/resources/assets/refinedstorage/models/block/cable_north.json +++ b/src/main/resources/assets/refinedstorage/models/block/cable_north.json @@ -1,36 +1,74 @@ { - "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "elements": [ - { - "name": "North", - "from": [6.0, 6.0, 0.0], - "to": [10.0, 10.0, 6.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] - } - } - } - ] + "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", + "elements": [ + { + "name": "North", + "from": [ + 6.0, + 6.0, + 0.0 + ], + "to": [ + 10.0, + 10.0, + 6.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 + ] + } + } + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/models/block/cable_south.json b/src/main/resources/assets/refinedstorage/models/block/cable_south.json index 9dbd6a5b5..ade8e334a 100755 --- a/src/main/resources/assets/refinedstorage/models/block/cable_south.json +++ b/src/main/resources/assets/refinedstorage/models/block/cable_south.json @@ -1,36 +1,74 @@ { - "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "elements": [ - { - "name": "South", - "from": [6.0, 6.0, 10.0], - "to": [10.0, 10.0, 16.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] - } - } - } - ] + "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", + "elements": [ + { + "name": "South", + "from": [ + 6.0, + 6.0, + 10.0 + ], + "to": [ + 10.0, + 10.0, + 16.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 + ] + } + } + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/models/block/cable_up.json b/src/main/resources/assets/refinedstorage/models/block/cable_up.json index ddddd6029..deddf2228 100755 --- a/src/main/resources/assets/refinedstorage/models/block/cable_up.json +++ b/src/main/resources/assets/refinedstorage/models/block/cable_up.json @@ -1,36 +1,74 @@ { - "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "elements": [ - { - "name": "Up", - "from": [6.0, 10.0, 6.0], - "to": [10.0, 16.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] - } - } - } - ] + "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", + "elements": [ + { + "name": "Up", + "from": [ + 6.0, + 10.0, + 6.0 + ], + "to": [ + 10.0, + 16.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 + ] + } + } + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/models/block/cable_west.json b/src/main/resources/assets/refinedstorage/models/block/cable_west.json index 46b37e739..49d4b478c 100755 --- a/src/main/resources/assets/refinedstorage/models/block/cable_west.json +++ b/src/main/resources/assets/refinedstorage/models/block/cable_west.json @@ -1,36 +1,74 @@ { - "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "elements": [ - { - "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] - } - } - } - ] + "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", + "elements": [ + { + "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 + ] + } + } + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/models/item/16k_storage_disk.json b/src/main/resources/assets/refinedstorage/models/item/16k_storage_disk.json index 376f90061..d3ba63db3 100755 --- a/src/main/resources/assets/refinedstorage/models/item/16k_storage_disk.json +++ b/src/main/resources/assets/refinedstorage/models/item/16k_storage_disk.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "refinedstorage:items/16k_storage_disk" - } + "parent": "item/generated", + "textures": { + "layer0": "refinedstorage:items/16k_storage_disk" + } } diff --git a/src/main/resources/assets/refinedstorage/models/item/16k_storage_part.json b/src/main/resources/assets/refinedstorage/models/item/16k_storage_part.json index 6e5519a16..e630fcf4c 100755 --- a/src/main/resources/assets/refinedstorage/models/item/16k_storage_part.json +++ b/src/main/resources/assets/refinedstorage/models/item/16k_storage_part.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "refinedstorage:items/16k_storage_part" - } + "parent": "item/generated", + "textures": { + "layer0": "refinedstorage:items/16k_storage_part" + } } diff --git a/src/main/resources/assets/refinedstorage/models/item/1k_storage_disk.json b/src/main/resources/assets/refinedstorage/models/item/1k_storage_disk.json index c44af3b43..4e88445ef 100755 --- a/src/main/resources/assets/refinedstorage/models/item/1k_storage_disk.json +++ b/src/main/resources/assets/refinedstorage/models/item/1k_storage_disk.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "refinedstorage:items/1k_storage_disk" - } + "parent": "item/generated", + "textures": { + "layer0": "refinedstorage:items/1k_storage_disk" + } } diff --git a/src/main/resources/assets/refinedstorage/models/item/1k_storage_part.json b/src/main/resources/assets/refinedstorage/models/item/1k_storage_part.json index 09e84303c..ced967a21 100755 --- a/src/main/resources/assets/refinedstorage/models/item/1k_storage_part.json +++ b/src/main/resources/assets/refinedstorage/models/item/1k_storage_part.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "refinedstorage:items/1k_storage_part" - } + "parent": "item/generated", + "textures": { + "layer0": "refinedstorage:items/1k_storage_part" + } } diff --git a/src/main/resources/assets/refinedstorage/models/item/4k_storage_disk.json b/src/main/resources/assets/refinedstorage/models/item/4k_storage_disk.json index 860a01e61..6989f65dd 100755 --- a/src/main/resources/assets/refinedstorage/models/item/4k_storage_disk.json +++ b/src/main/resources/assets/refinedstorage/models/item/4k_storage_disk.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "refinedstorage:items/4k_storage_disk" - } + "parent": "item/generated", + "textures": { + "layer0": "refinedstorage:items/4k_storage_disk" + } } diff --git a/src/main/resources/assets/refinedstorage/models/item/4k_storage_part.json b/src/main/resources/assets/refinedstorage/models/item/4k_storage_part.json index 9e293d54f..604dfb96e 100755 --- a/src/main/resources/assets/refinedstorage/models/item/4k_storage_part.json +++ b/src/main/resources/assets/refinedstorage/models/item/4k_storage_part.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "refinedstorage:items/4k_storage_part" - } + "parent": "item/generated", + "textures": { + "layer0": "refinedstorage:items/4k_storage_part" + } } diff --git a/src/main/resources/assets/refinedstorage/models/item/64k_storage_disk.json b/src/main/resources/assets/refinedstorage/models/item/64k_storage_disk.json index e946fe259..08037e6fe 100755 --- a/src/main/resources/assets/refinedstorage/models/item/64k_storage_disk.json +++ b/src/main/resources/assets/refinedstorage/models/item/64k_storage_disk.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "refinedstorage:items/64k_storage_disk" - } + "parent": "item/generated", + "textures": { + "layer0": "refinedstorage:items/64k_storage_disk" + } } diff --git a/src/main/resources/assets/refinedstorage/models/item/64k_storage_part.json b/src/main/resources/assets/refinedstorage/models/item/64k_storage_part.json index 6bca83069..b5814de24 100755 --- a/src/main/resources/assets/refinedstorage/models/item/64k_storage_part.json +++ b/src/main/resources/assets/refinedstorage/models/item/64k_storage_part.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "refinedstorage:items/64k_storage_part" - } + "parent": "item/generated", + "textures": { + "layer0": "refinedstorage:items/64k_storage_part" + } } diff --git a/src/main/resources/assets/refinedstorage/models/item/advanced_printed_processor.json b/src/main/resources/assets/refinedstorage/models/item/advanced_printed_processor.json index c2d3ba27e..075924901 100755 --- a/src/main/resources/assets/refinedstorage/models/item/advanced_printed_processor.json +++ b/src/main/resources/assets/refinedstorage/models/item/advanced_printed_processor.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "refinedstorage:items/advanced_printed_processor" - } + "parent": "item/generated", + "textures": { + "layer0": "refinedstorage:items/advanced_printed_processor" + } } diff --git a/src/main/resources/assets/refinedstorage/models/item/advanced_processor.json b/src/main/resources/assets/refinedstorage/models/item/advanced_processor.json index 93ce71e7d..43f5a4e2f 100755 --- a/src/main/resources/assets/refinedstorage/models/item/advanced_processor.json +++ b/src/main/resources/assets/refinedstorage/models/item/advanced_processor.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "refinedstorage:items/advanced_processor" - } + "parent": "item/generated", + "textures": { + "layer0": "refinedstorage:items/advanced_processor" + } } diff --git a/src/main/resources/assets/refinedstorage/models/item/basic_printed_processor.json b/src/main/resources/assets/refinedstorage/models/item/basic_printed_processor.json index 30cd2ee78..10fa74269 100755 --- a/src/main/resources/assets/refinedstorage/models/item/basic_printed_processor.json +++ b/src/main/resources/assets/refinedstorage/models/item/basic_printed_processor.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "refinedstorage:items/basic_printed_processor" - } + "parent": "item/generated", + "textures": { + "layer0": "refinedstorage:items/basic_printed_processor" + } } diff --git a/src/main/resources/assets/refinedstorage/models/item/basic_processor.json b/src/main/resources/assets/refinedstorage/models/item/basic_processor.json index 76ca670d3..607a63c96 100755 --- a/src/main/resources/assets/refinedstorage/models/item/basic_processor.json +++ b/src/main/resources/assets/refinedstorage/models/item/basic_processor.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "refinedstorage:items/basic_processor" - } + "parent": "item/generated", + "textures": { + "layer0": "refinedstorage:items/basic_processor" + } } diff --git a/src/main/resources/assets/refinedstorage/models/item/construction_core.json b/src/main/resources/assets/refinedstorage/models/item/construction_core.json index 8d7d69455..9d82ab680 100755 --- a/src/main/resources/assets/refinedstorage/models/item/construction_core.json +++ b/src/main/resources/assets/refinedstorage/models/item/construction_core.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "refinedstorage:items/construction_core" - } + "parent": "item/generated", + "textures": { + "layer0": "refinedstorage:items/construction_core" + } } diff --git a/src/main/resources/assets/refinedstorage/models/item/creative_storage_disk.json b/src/main/resources/assets/refinedstorage/models/item/creative_storage_disk.json index bc65d8493..4969e9812 100755 --- a/src/main/resources/assets/refinedstorage/models/item/creative_storage_disk.json +++ b/src/main/resources/assets/refinedstorage/models/item/creative_storage_disk.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "refinedstorage:items/creative_storage_disk" - } + "parent": "item/generated", + "textures": { + "layer0": "refinedstorage:items/creative_storage_disk" + } } diff --git a/src/main/resources/assets/refinedstorage/models/item/destruction_core.json b/src/main/resources/assets/refinedstorage/models/item/destruction_core.json index c58e13661..da9c5d468 100755 --- a/src/main/resources/assets/refinedstorage/models/item/destruction_core.json +++ b/src/main/resources/assets/refinedstorage/models/item/destruction_core.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "refinedstorage:items/destruction_core" - } + "parent": "item/generated", + "textures": { + "layer0": "refinedstorage:items/destruction_core" + } } diff --git a/src/main/resources/assets/refinedstorage/models/item/improved_printed_processor.json b/src/main/resources/assets/refinedstorage/models/item/improved_printed_processor.json index 6422d750d..53286c3d8 100755 --- a/src/main/resources/assets/refinedstorage/models/item/improved_printed_processor.json +++ b/src/main/resources/assets/refinedstorage/models/item/improved_printed_processor.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "refinedstorage:items/improved_printed_processor" - } + "parent": "item/generated", + "textures": { + "layer0": "refinedstorage:items/improved_printed_processor" + } } diff --git a/src/main/resources/assets/refinedstorage/models/item/improved_processor.json b/src/main/resources/assets/refinedstorage/models/item/improved_processor.json index a76b43436..5dedd64a2 100755 --- a/src/main/resources/assets/refinedstorage/models/item/improved_processor.json +++ b/src/main/resources/assets/refinedstorage/models/item/improved_processor.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "refinedstorage:items/improved_processor" - } + "parent": "item/generated", + "textures": { + "layer0": "refinedstorage:items/improved_processor" + } } diff --git a/src/main/resources/assets/refinedstorage/models/item/printed_silicon.json b/src/main/resources/assets/refinedstorage/models/item/printed_silicon.json index 69a3b0a89..c957cf777 100755 --- a/src/main/resources/assets/refinedstorage/models/item/printed_silicon.json +++ b/src/main/resources/assets/refinedstorage/models/item/printed_silicon.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "refinedstorage:items/printed_silicon" - } + "parent": "item/generated", + "textures": { + "layer0": "refinedstorage:items/printed_silicon" + } } diff --git a/src/main/resources/assets/refinedstorage/models/item/quartz_enriched_iron.json b/src/main/resources/assets/refinedstorage/models/item/quartz_enriched_iron.json index 688321cf7..af0f60dc7 100755 --- a/src/main/resources/assets/refinedstorage/models/item/quartz_enriched_iron.json +++ b/src/main/resources/assets/refinedstorage/models/item/quartz_enriched_iron.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "refinedstorage:items/quartz_enriched_iron" - } + "parent": "item/generated", + "textures": { + "layer0": "refinedstorage:items/quartz_enriched_iron" + } } diff --git a/src/main/resources/assets/refinedstorage/models/item/silicon.json b/src/main/resources/assets/refinedstorage/models/item/silicon.json index 091538c0d..d42af72c2 100755 --- a/src/main/resources/assets/refinedstorage/models/item/silicon.json +++ b/src/main/resources/assets/refinedstorage/models/item/silicon.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "refinedstorage:items/silicon" - } + "parent": "item/generated", + "textures": { + "layer0": "refinedstorage:items/silicon" + } } diff --git a/src/main/resources/assets/refinedstorage/models/item/wireless_grid_connected.json b/src/main/resources/assets/refinedstorage/models/item/wireless_grid_connected.json index 73cacbc69..13d27aa4d 100755 --- a/src/main/resources/assets/refinedstorage/models/item/wireless_grid_connected.json +++ b/src/main/resources/assets/refinedstorage/models/item/wireless_grid_connected.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "refinedstorage:items/wireless_grid_connected" - } + "parent": "item/generated", + "textures": { + "layer0": "refinedstorage:items/wireless_grid_connected" + } } diff --git a/src/main/resources/assets/refinedstorage/models/item/wireless_grid_disconnected.json b/src/main/resources/assets/refinedstorage/models/item/wireless_grid_disconnected.json index 7cc6fc397..bae0192fb 100755 --- a/src/main/resources/assets/refinedstorage/models/item/wireless_grid_disconnected.json +++ b/src/main/resources/assets/refinedstorage/models/item/wireless_grid_disconnected.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "refinedstorage:items/wireless_grid_disconnected" - } + "parent": "item/generated", + "textures": { + "layer0": "refinedstorage:items/wireless_grid_disconnected" + } } diff --git a/src/main/resources/assets/refinedstorage/models/item/wireless_grid_plate.json b/src/main/resources/assets/refinedstorage/models/item/wireless_grid_plate.json index 08fb6203a..0bf6eaedc 100755 --- a/src/main/resources/assets/refinedstorage/models/item/wireless_grid_plate.json +++ b/src/main/resources/assets/refinedstorage/models/item/wireless_grid_plate.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "refinedstorage:items/wireless_grid_plate" - } + "parent": "item/generated", + "textures": { + "layer0": "refinedstorage:items/wireless_grid_plate" + } }