diff --git a/.gitignore b/.gitignore old mode 100644 new mode 100755 index 20171c7a5..dedf846dd --- a/.gitignore +++ b/.gitignore @@ -12,4 +12,5 @@ run/ *.iml *.ipr *.iws -.idea/ \ No newline at end of file +.idea/ +out/ \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100755 index 000000000..f91afd04d --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,50 @@ +# Refined Storage Changelog + +### 0.5 +**Bugfixes** +- Fixed clicking sound in Grid +- Fixed a bunch of crashes +- Fixed exporter not exporting is some cases +- Fixed importer not importing in some cases +- Fixed controller drawing RF every 20 ticks instead of every tick +- Fixed not being able to shift click from Crafting Grid crafting slots +- Fixed new items inserted after crafting in Grid being laggy +- Fixed flickering of items in Grid +- Fixed getting a stack of unstackable stuff from Grid +- Check if the Constructor can actually place said block in the world + +**Features** +- New textures +- Updated to the latest Forge and JEI +- Renamed Drives to Disk Drives +- Renamed Storage Cells to Storage Disks +- Drives have a better interface and there are now blacklist and whitelist filters for the Storage Disks in it too. +- Destructors have the ability to whitelist and blacklist certain items now +- Shift clicking stuff in the Interface +- Scrollbar in Grid and Crafting Grid +- Made the normal Grid 1 row larger +- Display of connected machines in the Controller GUI +- Deep Storage Unit integration (with this several barrel mods are now supported too!) +- Machines don't need to be connected with cables anymore, they can be next to each other too +- Made the amount text in the Grid for items smaller +- Nice formatting for items >= 1K (pressing shift while hovering over an item will still display the real item count) +- When placing Importer, Exporter or External Storage with SHIFT, it will have the opposite direction. This is for easy placement behind other blocks (furnaces for example) + +### 0.4.1 +**Bugfixes** +- Fix ID duplication issues + +### 0.4 +**Bugfixes** +- Cables now have actual collision +- Fullness percentage in Creative Storage Blocks going under 0% +- The Controller shouldn't display the base usage when not working +- Fix Minecraft reporting that retrieving Grid type fails +- Check isItemValidForSlot on trying to push to inventories + +**Features** +- Relays +- Interfaces + +### 0.3 +- Initial release diff --git a/LICENSE.md b/LICENSE.md old mode 100644 new mode 100755 index e50d002c2..9eb0eb0e1 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,6 +1,6 @@ # The MIT License (MIT) -Copyright © 2015 - 2016 Raoul Van den Berge +Copyright © 2015 - 2016 Refined Storage contributors Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation diff --git a/README.md b/README.md old mode 100644 new mode 100755 index 464292122..cba6a1657 --- a/README.md +++ b/README.md @@ -2,4 +2,10 @@ A Minecraft mod all about storage. -[Check this project out on CurseForge](http://minecraft.curseforge.com/projects/refined-storage). +This project is available on [CurseForge](http://minecraft.curseforge.com/projects/refined-storage). + +## What are you interested in? + +- [How this mod works and how to use it](https://github.com/raoulvdberge/refinedstorage/wiki) +- [Reporting a bug](https://github.com/raoulvdberge/refinedstorage/issues) +- [Sending a feature request](https://github.com/raoulvdberge/refinedstorage/issues) diff --git a/build.gradle b/build.gradle old mode 100644 new mode 100755 index 9e2fcf556..966a9baa9 --- a/build.gradle +++ b/build.gradle @@ -17,9 +17,9 @@ group = "refinedstorage" archivesBaseName = "refinedstorage" minecraft { - version = "1.9-12.16.0.1770-1.9" + version = "1.9-12.16.0.1811-1.9" runDir = "run" - useDepAts = true + useDepAts = true mappings = "snapshot_20160312" } @@ -30,7 +30,7 @@ repositories { } dependencies { - deobfCompile "mezz.jei:jei_1.9:3.0.+" + deobfCompile "mezz.jei:jei_1.9:3.1.+" } processResources { diff --git a/gradlew b/gradlew old mode 100644 new mode 100755 diff --git a/gradlew.bat b/gradlew.bat old mode 100644 new mode 100755 diff --git a/logo.png b/logo.png old mode 100644 new mode 100755 index a023d0cd2..0b3372b62 Binary files a/logo.png and b/logo.png differ diff --git a/screenshots/crafting_grid.png b/screenshots/crafting_grid.png old mode 100644 new mode 100755 diff --git a/screenshots/interface.png b/screenshots/interface.png old mode 100644 new mode 100755 diff --git a/screenshots/overview.png b/screenshots/overview.png old mode 100644 new mode 100755 diff --git a/screenshots/relays.png b/screenshots/relays.png old mode 100644 new mode 100755 diff --git a/screenshots/storage_block.png b/screenshots/storage_block.png old mode 100644 new mode 100755 diff --git a/src/main/java/cofh/api/CoFHAPIProps.java b/src/main/java/cofh/api/CoFHAPIProps.java old mode 100644 new mode 100755 index eb2e05ade..becea23e0 --- 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 old mode 100644 new mode 100755 index dd7dd3e02..d5e34000c --- 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 old mode 100644 new mode 100755 index 29ef0a1ce..b33a9d90a --- 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 old mode 100644 new mode 100755 index 3ef725765..f5d2ebfd9 --- 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 old mode 100644 new mode 100755 index 16b236e7a..1d5dc5576 --- 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 old mode 100644 new mode 100755 index ef0e09d06..784726a04 --- 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 old mode 100644 new mode 100755 index 989e9baa5..c2b654029 --- 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 old mode 100644 new mode 100755 index 414b26566..b69f1df79 --- 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 old mode 100644 new mode 100755 index 0fb36dab6..bdca3f0d5 --- 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 old mode 100644 new mode 100755 index 3ba60a664..d45e9d0f0 --- 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 old mode 100644 new mode 100755 index da8566735..21dca2485 --- 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/cofh/api/package-info.java b/src/main/java/cofh/api/package-info.java old mode 100644 new mode 100755 diff --git a/src/main/java/powercrystals/minefactoryreloaded/api/IDeepStorageUnit.java b/src/main/java/powercrystals/minefactoryreloaded/api/IDeepStorageUnit.java new file mode 100755 index 000000000..0b33ddb38 --- /dev/null +++ b/src/main/java/powercrystals/minefactoryreloaded/api/IDeepStorageUnit.java @@ -0,0 +1,25 @@ +package powercrystals.minefactoryreloaded.api; + +import net.minecraft.item.ItemStack; + +public interface IDeepStorageUnit { + /** + * @return A populated ItemStack with stackSize for the full amount of materials in the DSU. May have a stackSize > getMaxStackSize(). + */ + ItemStack getStoredItemType(); + + /** + * Sets the total amount of the item currently being stored, or zero if it wants to remove all items. + */ + void setStoredItemCount(int amount); + + /** + * Sets the type of the stored item and initializes the number of stored items to amount. Will overwrite any existing stored items. + */ + void setStoredItemType(ItemStack type, int amount); + + /** + * @return The maximum number of items the DSU can hold. + */ + int getMaxStoredCount(); +} \ No newline at end of file diff --git a/src/main/java/refinedstorage/RefinedStorage.java b/src/main/java/refinedstorage/RefinedStorage.java old mode 100644 new mode 100755 index 3b8857308..0a7bc91e2 --- a/src/main/java/refinedstorage/RefinedStorage.java +++ b/src/main/java/refinedstorage/RefinedStorage.java @@ -12,53 +12,46 @@ import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; import net.minecraftforge.fml.common.network.NetworkRegistry; import net.minecraftforge.fml.common.network.simpleimpl.SimpleNetworkWrapper; -import refinedstorage.item.ItemStorageCell; +import refinedstorage.item.ItemStorageDisk; import refinedstorage.proxy.CommonProxy; @Mod(modid = RefinedStorage.ID, version = RefinedStorage.VERSION) -public final class RefinedStorage -{ - public static final String ID = "refinedstorage"; - public static final String VERSION = "0.5"; +public final class RefinedStorage { + public static final String ID = "refinedstorage"; + public static final String VERSION = "0.5"; - public static final SimpleNetworkWrapper NETWORK = NetworkRegistry.INSTANCE.newSimpleChannel(ID); + public static final SimpleNetworkWrapper NETWORK = NetworkRegistry.INSTANCE.newSimpleChannel(ID); - public static final CreativeTabs TAB = new CreativeTabs(ID) - { - @Override - public ItemStack getIconItemStack() - { - return new ItemStack(RefinedStorageItems.STORAGE_CELL, 1, ItemStorageCell.TYPE_1K); - } + public static final CreativeTabs TAB = new CreativeTabs(ID) { + @Override + public ItemStack getIconItemStack() { + return new ItemStack(RefinedStorageItems.STORAGE_DISK, 1, ItemStorageDisk.TYPE_1K); + } - @Override - public Item getTabIconItem() - { - return null; - } - }; + @Override + public Item getTabIconItem() { + return null; + } + }; - @SidedProxy(clientSide = "refinedstorage.proxy.ClientProxy", serverSide = "refinedstorage.proxy.ServerProxy") - public static CommonProxy PROXY; + @SidedProxy(clientSide = "refinedstorage.proxy.ClientProxy", serverSide = "refinedstorage.proxy.ServerProxy") + public static CommonProxy PROXY; - @Instance - public static RefinedStorage INSTANCE; + @Instance + public static RefinedStorage INSTANCE; - @EventHandler - public void preInit(FMLPreInitializationEvent e) - { - PROXY.preInit(e); - } + @EventHandler + public void preInit(FMLPreInitializationEvent e) { + PROXY.preInit(e); + } - @EventHandler - public void init(FMLInitializationEvent e) - { - PROXY.init(e); - } + @EventHandler + public void init(FMLInitializationEvent e) { + PROXY.init(e); + } - @EventHandler - public void postInit(FMLPostInitializationEvent e) - { - PROXY.postInit(e); - } + @EventHandler + public void postInit(FMLPostInitializationEvent e) { + PROXY.postInit(e); + } } diff --git a/src/main/java/refinedstorage/RefinedStorageBlocks.java b/src/main/java/refinedstorage/RefinedStorageBlocks.java old mode 100644 new mode 100755 index 34a084d99..a8b95f579 --- a/src/main/java/refinedstorage/RefinedStorageBlocks.java +++ b/src/main/java/refinedstorage/RefinedStorageBlocks.java @@ -2,22 +2,20 @@ package refinedstorage; import refinedstorage.block.*; -public final class RefinedStorageBlocks -{ - public static final BlockController CONTROLLER = new BlockController(); - public static final BlockCable CABLE = new BlockCable(); - public static final BlockGrid GRID = new BlockGrid(); - public static final BlockDrive DRIVE = new BlockDrive(); - public static final BlockExternalStorage EXTERNAL_STORAGE = new BlockExternalStorage(); - public static final BlockImporter IMPORTER = new BlockImporter(); - public static final BlockExporter EXPORTER = new BlockExporter(); - public static final BlockDetector DETECTOR = new BlockDetector(); - public static final BlockMachineCasing MACHINE_CASING = new BlockMachineCasing(); - public static final BlockSolderer SOLDERER = new BlockSolderer(); - public static final BlockWirelessTransmitter WIRELESS_TRANSMITTER = new BlockWirelessTransmitter(); - public static final BlockDestructor DESTRUCTOR = new BlockDestructor(); - public static final BlockConstructor CONSTRUCTOR = new BlockConstructor(); - public static final BlockStorage STORAGE = new BlockStorage(); - public static final BlockRelay RELAY = new BlockRelay(); - public static final BlockInterface INTERFACE = new BlockInterface(); +public final class RefinedStorageBlocks { + public static final BlockController CONTROLLER = new BlockController(); + public static final BlockCable CABLE = new BlockCable(); + public static final BlockGrid GRID = new BlockGrid(); + public static final BlockDiskDrive DISK_DRIVE = new BlockDiskDrive(); + public static final BlockExternalStorage EXTERNAL_STORAGE = new BlockExternalStorage(); + public static final BlockImporter IMPORTER = new BlockImporter(); + public static final BlockExporter EXPORTER = new BlockExporter(); + public static final BlockDetector DETECTOR = new BlockDetector(); + public static final BlockMachineCasing MACHINE_CASING = new BlockMachineCasing(); + public static final BlockSolderer SOLDERER = new BlockSolderer(); + public static final BlockDestructor DESTRUCTOR = new BlockDestructor(); + public static final BlockConstructor CONSTRUCTOR = new BlockConstructor(); + public static final BlockStorage STORAGE = new BlockStorage(); + public static final BlockRelay RELAY = new BlockRelay(); + public static final BlockInterface INTERFACE = new BlockInterface(); } diff --git a/src/main/java/refinedstorage/RefinedStorageGui.java b/src/main/java/refinedstorage/RefinedStorageGui.java old mode 100644 new mode 100755 index 9c5dce36a..646e4815e --- a/src/main/java/refinedstorage/RefinedStorageGui.java +++ b/src/main/java/refinedstorage/RefinedStorageGui.java @@ -1,18 +1,16 @@ package refinedstorage; -public final class RefinedStorageGui -{ - public static final int CONTROLLER = 0; - public static final int GRID = 1; - public static final int DRIVE = 2; - public static final int IMPORTER = 4; - public static final int EXPORTER = 5; - public static final int DETECTOR = 6; - public static final int SOLDERER = 7; - public static final int WIRELESS_TRANSMITTER = 8; - public static final int DESTRUCTOR = 9; - public static final int CONSTRUCTOR = 10; - public static final int STORAGE = 11; - public static final int RELAY = 12; - public static final int INTERFACE = 13; +public final class RefinedStorageGui { + public static final int CONTROLLER = 0; + public static final int GRID = 1; + public static final int DISK_DRIVE = 2; + public static final int IMPORTER = 4; + public static final int EXPORTER = 5; + public static final int DETECTOR = 6; + public static final int SOLDERER = 7; + public static final int DESTRUCTOR = 9; + public static final int CONSTRUCTOR = 10; + public static final int STORAGE = 11; + public static final int RELAY = 12; + public static final int INTERFACE = 13; } diff --git a/src/main/java/refinedstorage/RefinedStorageItems.java b/src/main/java/refinedstorage/RefinedStorageItems.java old mode 100644 new mode 100755 index 5d0349c10..40f118d5b --- a/src/main/java/refinedstorage/RefinedStorageItems.java +++ b/src/main/java/refinedstorage/RefinedStorageItems.java @@ -2,14 +2,12 @@ package refinedstorage; import refinedstorage.item.*; -public final class RefinedStorageItems -{ - public static final ItemStorageCell STORAGE_CELL = new ItemStorageCell(); - public static final ItemWirelessGrid WIRELESS_GRID = new ItemWirelessGrid(); - public static final ItemWirelessGridPlate WIRELESS_GRID_PLATE = new ItemWirelessGridPlate(); - public static final ItemQuartzEnrichedIron QUARTZ_ENRICHED_IRON = new ItemQuartzEnrichedIron(); - public static final ItemCore CORE = new ItemCore(); - public static final ItemSilicon SILICON = new ItemSilicon(); - public static final ItemProcessor PROCESSOR = new ItemProcessor(); - public static final ItemStoragePart STORAGE_PART = new ItemStoragePart(); +public final class RefinedStorageItems { + public static final ItemStorageDisk STORAGE_DISK = new ItemStorageDisk(); + public static final ItemWirelessGrid WIRELESS_GRID = new ItemWirelessGrid(); + public static final ItemQuartzEnrichedIron QUARTZ_ENRICHED_IRON = new ItemQuartzEnrichedIron(); + public static final ItemCore CORE = new ItemCore(); + public static final ItemSilicon SILICON = new ItemSilicon(); + public static final ItemProcessor PROCESSOR = new ItemProcessor(); + public static final ItemStoragePart STORAGE_PART = new ItemStoragePart(); } diff --git a/src/main/java/refinedstorage/block/BlockBase.java b/src/main/java/refinedstorage/block/BlockBase.java old mode 100644 new mode 100755 index 78ae7db9f..e754db4e7 --- a/src/main/java/refinedstorage/block/BlockBase.java +++ b/src/main/java/refinedstorage/block/BlockBase.java @@ -15,120 +15,113 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import refinedstorage.RefinedStorage; +import refinedstorage.RefinedStorageBlocks; import refinedstorage.tile.TileBase; import refinedstorage.util.InventoryUtils; -public abstract class BlockBase extends Block -{ - public static final PropertyDirection DIRECTION = PropertyDirection.create("direction"); +public abstract class BlockBase extends Block { + public static final PropertyDirection DIRECTION = PropertyDirection.create("direction"); - private String name; + private String name; - public BlockBase(String name) - { - super(Material.rock); + public BlockBase(String name) { + super(Material.rock); - this.name = name; + this.name = name; - setHardness(0.6F); - setCreativeTab(RefinedStorage.TAB); - } + setHardness(0.6F); + setCreativeTab(RefinedStorage.TAB); + } - @Override - public String getUnlocalizedName() - { - return "block." + RefinedStorage.ID + ":" + name; - } + @Override + public String getUnlocalizedName() { + return "block." + RefinedStorage.ID + ":" + name; + } - @Override - protected BlockStateContainer createBlockState() - { - return new BlockStateContainer(this, new IProperty[] - { - DIRECTION, - }); - } + @Override + protected BlockStateContainer createBlockState() { + return new BlockStateContainer(this, new IProperty[] + { + DIRECTION, + }); + } - @Override - public IBlockState getStateFromMeta(int meta) - { - return getDefaultState(); - } + @Override + public IBlockState getStateFromMeta(int meta) { + return getDefaultState(); + } - @Override - public int getMetaFromState(IBlockState state) - { - return 0; - } + @Override + public int getMetaFromState(IBlockState state) { + return 0; + } - @Override - public IBlockState getActualState(IBlockState state, IBlockAccess world, BlockPos pos) - { - TileEntity tile = world.getTileEntity(pos); + @Override + public IBlockState getActualState(IBlockState state, IBlockAccess world, BlockPos pos) { + TileEntity tile = world.getTileEntity(pos); - if (tile instanceof TileBase) - { - return state.withProperty(DIRECTION, ((TileBase) tile).getDirection()); - } + if (tile instanceof TileBase) { + return state.withProperty(DIRECTION, ((TileBase) tile).getDirection()); + } - return state; - } + return state; + } - @Override - public int damageDropped(IBlockState state) - { - return getMetaFromState(state); - } + @Override + public int damageDropped(IBlockState state) { + return getMetaFromState(state); + } - @Override - public boolean rotateBlock(World world, BlockPos pos, EnumFacing axis) - { - TileEntity tile = world.getTileEntity(pos); + @Override + public boolean rotateBlock(World world, BlockPos pos, EnumFacing axis) { + TileEntity tile = world.getTileEntity(pos); - if (tile instanceof TileBase) - { - EnumFacing dir = ((TileBase) tile).getDirection(); + if (tile instanceof TileBase) { + EnumFacing dir = ((TileBase) tile).getDirection(); - int newDir = dir.ordinal() + 1; + int newDir = dir.ordinal() + 1; - if (newDir > EnumFacing.VALUES.length - 1) - { - newDir = 0; - } + if (newDir > EnumFacing.VALUES.length - 1) { + newDir = 0; + } - ((TileBase) tile).setDirection(EnumFacing.getFront(newDir)); + ((TileBase) tile).setDirection(EnumFacing.getFront(newDir)); - world.notifyBlockUpdate(pos, world.getBlockState(pos), world.getBlockState(pos), 2 | 4); + world.notifyBlockUpdate(pos, world.getBlockState(pos), world.getBlockState(pos), 2 | 4); - return true; - } + return true; + } - return false; - } + return false; + } - @Override - public void onBlockPlacedBy(World world, BlockPos pos, IBlockState state, EntityLivingBase player, ItemStack itemStack) - { - super.onBlockPlacedBy(world, pos, state, player, itemStack); + @Override + public void onBlockPlacedBy(World world, BlockPos pos, IBlockState state, EntityLivingBase player, ItemStack itemStack) { + super.onBlockPlacedBy(world, pos, state, player, itemStack); - TileEntity tile = world.getTileEntity(pos); + Block blockPlaced = state.getBlock(); - if (tile instanceof TileBase) - { - ((TileBase) tile).setDirection(BlockPistonBase.getFacingFromEntity(pos, player)); - } - } + TileEntity tile = world.getTileEntity(pos); - @Override - public void breakBlock(World world, BlockPos pos, IBlockState state) - { - TileEntity tile = world.getTileEntity(pos); + if (tile instanceof TileBase) { + EnumFacing facing = BlockPistonBase.getFacingFromEntity(pos, player); - if (tile instanceof TileBase && ((TileBase) tile).getDroppedInventory() != null) - { - InventoryUtils.dropInventory(world, ((TileBase) tile).getDroppedInventory(), pos.getX(), pos.getY(), pos.getZ()); - } + if (player.isSneaking() && (blockPlaced == RefinedStorageBlocks.IMPORTER || blockPlaced == RefinedStorageBlocks.EXPORTER || blockPlaced == RefinedStorageBlocks.EXTERNAL_STORAGE)) { + facing = facing.getOpposite(); + } - super.breakBlock(world, pos, state); - } + ((TileBase) tile).setDirection(facing); + } + } + + @Override + public void breakBlock(World world, BlockPos pos, IBlockState state) { + TileEntity tile = world.getTileEntity(pos); + + if (tile instanceof TileBase && ((TileBase) tile).getDroppedInventory() != null) { + InventoryUtils.dropInventory(world, ((TileBase) tile).getDroppedInventory(), pos.getX(), pos.getY(), pos.getZ()); + } + + super.breakBlock(world, pos, state); + } } diff --git a/src/main/java/refinedstorage/block/BlockCable.java b/src/main/java/refinedstorage/block/BlockCable.java old mode 100644 new mode 100755 index 14429497e..2aa216733 --- a/src/main/java/refinedstorage/block/BlockCable.java +++ b/src/main/java/refinedstorage/block/BlockCable.java @@ -1,5 +1,6 @@ package refinedstorage.block; +import net.minecraft.block.Block; import net.minecraft.block.properties.IProperty; import net.minecraft.block.properties.PropertyBool; import net.minecraft.block.state.BlockStateContainer; @@ -9,84 +10,77 @@ import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import refinedstorage.tile.TileCable; +import refinedstorage.tile.TileController; +import refinedstorage.tile.TileMachine; -public class BlockCable extends BlockBase -{ - public static final PropertyBool NORTH = PropertyBool.create("north"); - public static final PropertyBool EAST = PropertyBool.create("east"); - public static final PropertyBool SOUTH = PropertyBool.create("south"); - public static final PropertyBool WEST = PropertyBool.create("west"); - public static final PropertyBool UP = PropertyBool.create("up"); - public static final PropertyBool DOWN = PropertyBool.create("down"); +public class BlockCable extends BlockBase { + public static final PropertyBool NORTH = PropertyBool.create("north"); + public static final PropertyBool EAST = PropertyBool.create("east"); + public static final PropertyBool SOUTH = PropertyBool.create("south"); + public static final PropertyBool WEST = PropertyBool.create("west"); + public static final PropertyBool UP = PropertyBool.create("up"); + public static final PropertyBool DOWN = PropertyBool.create("down"); - public BlockCable() - { - super("cable"); - } + public BlockCable() { + super("cable"); + } - @Override - protected BlockStateContainer createBlockState() - { - return new BlockStateContainer(this, new IProperty[] - { - DIRECTION, - NORTH, - EAST, - SOUTH, - WEST, - UP, - DOWN, - }); - } + @Override + protected BlockStateContainer createBlockState() { + return new BlockStateContainer(this, new IProperty[] + { + DIRECTION, + NORTH, + EAST, + SOUTH, + WEST, + UP, + DOWN, + }); + } - @Override - public IBlockState getActualState(IBlockState state, IBlockAccess world, BlockPos pos) - { - return super.getActualState(state, world, pos) - .withProperty(NORTH, TileCable.hasConnectionWith(world, pos.north())) - .withProperty(EAST, TileCable.hasConnectionWith(world, pos.east())) - .withProperty(SOUTH, TileCable.hasConnectionWith(world, pos.south())) - .withProperty(WEST, TileCable.hasConnectionWith(world, pos.west())) - .withProperty(UP, TileCable.hasConnectionWith(world, pos.up())) - .withProperty(DOWN, TileCable.hasConnectionWith(world, pos.down())); - } + @Override + public IBlockState getActualState(IBlockState state, IBlockAccess world, BlockPos pos) { + return super.getActualState(state, world, pos) + .withProperty(NORTH, hasConnectionWith(world, pos.north())) + .withProperty(EAST, hasConnectionWith(world, pos.east())) + .withProperty(SOUTH, hasConnectionWith(world, pos.south())) + .withProperty(WEST, hasConnectionWith(world, pos.west())) + .withProperty(UP, hasConnectionWith(world, pos.up())) + .withProperty(DOWN, hasConnectionWith(world, pos.down())); + } - @Override - public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) - { - float pixel = 1F / 16F; + public static boolean hasConnectionWith(IBlockAccess world, BlockPos pos) { + Block block = world.getBlockState(pos).getBlock(); - return new AxisAlignedBB(4 * pixel, 4 * pixel, 4 * pixel, 1 - 4 * pixel, 1 - 4 * pixel, 1 - 4 * pixel); - } + if (block instanceof BlockCable) { + return true; + } - @Override - public AxisAlignedBB getCollisionBoundingBox(IBlockState state, World world, BlockPos pos) - { - return getBoundingBox(state, world, pos); - } + TileEntity tile = world.getTileEntity(pos); - @Override - public boolean hasTileEntity(IBlockState state) - { - return true; - } + return tile instanceof TileMachine || tile instanceof TileController; + } - @Override - public TileEntity createTileEntity(World world, IBlockState state) - { - return new TileCable(); - } + @Override + public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { + float pixel = 1F / 16F; - @Override - public boolean isOpaqueCube(IBlockState state) - { - return false; - } + return new AxisAlignedBB(4 * pixel, 4 * pixel, 4 * pixel, 1 - 4 * pixel, 1 - 4 * pixel, 1 - 4 * pixel); + } - @Override - public boolean isFullCube(IBlockState state) - { - return false; - } + @Override + public AxisAlignedBB getCollisionBoundingBox(IBlockState state, World world, BlockPos pos) { + return getBoundingBox(state, world, pos); + } + + @Override + public boolean isOpaqueCube(IBlockState state) { + return false; + } + + @Override + public boolean isFullCube(IBlockState state) { + return false; + } } diff --git a/src/main/java/refinedstorage/block/BlockConstructor.java b/src/main/java/refinedstorage/block/BlockConstructor.java old mode 100644 new mode 100755 index a5cba3d6a..daf79e373 --- a/src/main/java/refinedstorage/block/BlockConstructor.java +++ b/src/main/java/refinedstorage/block/BlockConstructor.java @@ -6,32 +6,28 @@ 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; import refinedstorage.tile.TileConstructor; -public class BlockConstructor extends BlockMachine -{ - public BlockConstructor() - { - super("constructor"); - } +public class BlockConstructor extends BlockMachine { + public BlockConstructor() { + super("constructor"); + } - @Override - public TileEntity createTileEntity(World world, IBlockState state) - { - return new TileConstructor(); - } + @Override + public TileEntity createTileEntity(World world, IBlockState state) { + return new TileConstructor(); + } - @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) - { - if (!world.isRemote) - { - player.openGui(RefinedStorage.INSTANCE, RefinedStorageGui.CONSTRUCTOR, world, pos.getX(), pos.getY(), pos.getZ()); - } + @Override + 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()); + } - return true; - } + return true; + } } diff --git a/src/main/java/refinedstorage/block/BlockController.java b/src/main/java/refinedstorage/block/BlockController.java old mode 100644 new mode 100755 index b2e43dbdc..d28c88f60 --- a/src/main/java/refinedstorage/block/BlockController.java +++ b/src/main/java/refinedstorage/block/BlockController.java @@ -1,6 +1,5 @@ package refinedstorage.block; -import java.util.List; import net.minecraft.block.properties.IProperty; import net.minecraft.block.properties.PropertyEnum; import net.minecraft.block.properties.PropertyInteger; @@ -20,95 +19,82 @@ import refinedstorage.RefinedStorage; import refinedstorage.RefinedStorageGui; import refinedstorage.tile.TileController; -public class BlockController extends BlockBase -{ - public static final PropertyEnum TYPE = PropertyEnum.create("type", EnumControllerType.class); - public static final PropertyInteger ENERGY = PropertyInteger.create("energy", 0, 8); +import java.util.List; - public BlockController() - { - super("controller"); - } +public class BlockController extends BlockBase { + public static final PropertyEnum TYPE = PropertyEnum.create("type", EnumControllerType.class); + public static final PropertyInteger ENERGY = PropertyInteger.create("energy", 0, 8); - @Override - public void getSubBlocks(Item item, CreativeTabs tab, List subItems) - { - for (int i = 0; i <= 1; i++) - { - subItems.add(new ItemStack(item, 1, i)); - } - } + public BlockController() { + super("controller"); + } - @Override - protected BlockStateContainer createBlockState() - { - return new BlockStateContainer(this, new IProperty[] - { - DIRECTION, - TYPE, - ENERGY - }); - } + @Override + public void getSubBlocks(Item item, CreativeTabs tab, List subItems) { + for (int i = 0; i <= 1; i++) { + subItems.add(new ItemStack(item, 1, i)); + } + } - @Override - public IBlockState getStateFromMeta(int meta) - { - return getDefaultState().withProperty(TYPE, meta == 0 ? EnumControllerType.NORMAL : EnumControllerType.CREATIVE); - } + @Override + protected BlockStateContainer createBlockState() { + return new BlockStateContainer(this, new IProperty[] + { + DIRECTION, + TYPE, + ENERGY + }); + } - @Override - public int getMetaFromState(IBlockState state) - { - return state.getValue(TYPE) == EnumControllerType.NORMAL ? 0 : 1; - } + @Override + public IBlockState getStateFromMeta(int meta) { + return getDefaultState().withProperty(TYPE, meta == 0 ? EnumControllerType.NORMAL : EnumControllerType.CREATIVE); + } - @Override - public IBlockState getActualState(IBlockState state, IBlockAccess world, BlockPos pos) - { - return super.getActualState(state, world, pos) - .withProperty(ENERGY, ((TileController) world.getTileEntity(pos)).getEnergyScaled(8)); - } + @Override + public int getMetaFromState(IBlockState state) { + return state.getValue(TYPE) == EnumControllerType.NORMAL ? 0 : 1; + } - @Override - public boolean hasTileEntity(IBlockState state) - { - return true; - } + @Override + public IBlockState getActualState(IBlockState state, IBlockAccess world, BlockPos pos) { + return super.getActualState(state, world, pos) + .withProperty(ENERGY, ((TileController) world.getTileEntity(pos)).getEnergyScaled(8)); + } - @Override - public TileEntity createTileEntity(World world, IBlockState state) - { - return new TileController(); - } + @Override + public boolean hasTileEntity(IBlockState state) { + return true; + } - @Override - 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.CONTROLLER, world, pos.getX(), pos.getY(), pos.getZ()); - } + @Override + public TileEntity createTileEntity(World world, IBlockState state) { + return new TileController(); + } - return true; - } + @Override + 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.CONTROLLER, world, pos.getX(), pos.getY(), pos.getZ()); + } - @Override - public void breakBlock(World world, BlockPos pos, IBlockState state) - { - ((TileController) world.getTileEntity(pos)).onDestroyed(); + return true; + } - super.breakBlock(world, pos, state); - } + @Override + public void breakBlock(World world, BlockPos pos, IBlockState state) { + ((TileController) world.getTileEntity(pos)).onDestroyed(); - @Override - public boolean hasComparatorInputOverride(IBlockState state) - { - return true; - } + super.breakBlock(world, pos, state); + } - @Override - public int getComparatorInputOverride(IBlockState state, World world, BlockPos pos) - { - return ((TileController) world.getTileEntity(pos)).getEnergyScaled(15); - } + @Override + public boolean hasComparatorInputOverride(IBlockState state) { + return true; + } + + @Override + public int getComparatorInputOverride(IBlockState state, World world, BlockPos pos) { + return ((TileController) world.getTileEntity(pos)).getEnergyScaled(15); + } } diff --git a/src/main/java/refinedstorage/block/BlockDestructor.java b/src/main/java/refinedstorage/block/BlockDestructor.java old mode 100644 new mode 100755 index 1340fec88..9a96777a4 --- a/src/main/java/refinedstorage/block/BlockDestructor.java +++ b/src/main/java/refinedstorage/block/BlockDestructor.java @@ -6,32 +6,28 @@ 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; import refinedstorage.tile.TileDestructor; -public class BlockDestructor extends BlockMachine -{ - public BlockDestructor() - { - super("destructor"); - } +public class BlockDestructor extends BlockMachine { + public BlockDestructor() { + super("destructor"); + } - @Override - public TileEntity createTileEntity(World world, IBlockState state) - { - return new TileDestructor(); - } + @Override + public TileEntity createTileEntity(World world, IBlockState state) { + return new TileDestructor(); + } - @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) - { - if (!world.isRemote) - { - player.openGui(RefinedStorage.INSTANCE, RefinedStorageGui.DESTRUCTOR, world, pos.getX(), pos.getY(), pos.getZ()); - } + @Override + 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()); + } - return true; - } + return true; + } } diff --git a/src/main/java/refinedstorage/block/BlockDetector.java b/src/main/java/refinedstorage/block/BlockDetector.java old mode 100644 new mode 100755 index 56c4b09fe..4cc4c8f8d --- a/src/main/java/refinedstorage/block/BlockDetector.java +++ b/src/main/java/refinedstorage/block/BlockDetector.java @@ -16,72 +16,61 @@ import refinedstorage.RefinedStorage; import refinedstorage.RefinedStorageGui; import refinedstorage.tile.TileDetector; -public class BlockDetector extends BlockMachine -{ - public static final PropertyBool POWERED = PropertyBool.create("powered"); +public class BlockDetector extends BlockMachine { + public static final PropertyBool POWERED = PropertyBool.create("powered"); - public BlockDetector() - { - super("detector"); - } + public BlockDetector() { + super("detector"); + } - @Override - protected BlockStateContainer createBlockState() - { - return new BlockStateContainer(this, new IProperty[] - { - DIRECTION, - CONNECTED, - POWERED - }); - } + @Override + protected BlockStateContainer createBlockState() { + return new BlockStateContainer(this, new IProperty[] + { + DIRECTION, + CONNECTED, + POWERED + }); + } - @Override - public IBlockState getActualState(IBlockState state, IBlockAccess world, BlockPos pos) - { - return super.getActualState(state, world, pos) - .withProperty(POWERED, ((TileDetector) world.getTileEntity(pos)).isPowered()); - } + @Override + public IBlockState getActualState(IBlockState state, IBlockAccess world, BlockPos pos) { + return super.getActualState(state, world, pos) + .withProperty(POWERED, ((TileDetector) world.getTileEntity(pos)).isPowered()); + } - @Override - public TileEntity createTileEntity(World world, IBlockState state) - { - return new TileDetector(); - } + @Override + public TileEntity createTileEntity(World world, IBlockState state) { + return new TileDetector(); + } - @Override - public int getWeakPower(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing side) - { - TileDetector detector = (TileDetector) world.getTileEntity(pos); + @Override + public int getWeakPower(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing side) { + TileDetector detector = (TileDetector) world.getTileEntity(pos); - if (detector.getDirection() == side.getOpposite()) - { - return detector.isPowered() ? 15 : 0; - } + if (detector.getDirection() == side.getOpposite()) { + return detector.isPowered() ? 15 : 0; + } - return 0; - } + return 0; + } - @Override - public int getStrongPower(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing side) - { - return getWeakPower(state, world, pos, side); - } + @Override + public int getStrongPower(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing side) { + return getWeakPower(state, world, pos, side); + } - @Override - public boolean canProvidePower(IBlockState state) - { - return true; - } + @Override + public boolean canProvidePower(IBlockState state) { + return true; + } - @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) - { - if (!world.isRemote) - { - player.openGui(RefinedStorage.INSTANCE, RefinedStorageGui.DETECTOR, world, pos.getX(), pos.getY(), pos.getZ()); - } + @Override + 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()); + } - return true; - } + return true; + } } diff --git a/src/main/java/refinedstorage/block/BlockDiskDrive.java b/src/main/java/refinedstorage/block/BlockDiskDrive.java new file mode 100755 index 000000000..39f435ded --- /dev/null +++ b/src/main/java/refinedstorage/block/BlockDiskDrive.java @@ -0,0 +1,33 @@ +package refinedstorage.block; + +import net.minecraft.block.state.IBlockState; +import net.minecraft.entity.player.EntityPlayer; +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; +import refinedstorage.tile.TileDiskDrive; + +public class BlockDiskDrive extends BlockMachine { + public BlockDiskDrive() { + super("disk_drive"); + } + + @Override + public TileEntity createTileEntity(World world, IBlockState state) { + return new TileDiskDrive(); + } + + @Override + 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()); + } + + return true; + } +} diff --git a/src/main/java/refinedstorage/block/BlockDrive.java b/src/main/java/refinedstorage/block/BlockDrive.java deleted file mode 100644 index 383efe7d2..000000000 --- a/src/main/java/refinedstorage/block/BlockDrive.java +++ /dev/null @@ -1,37 +0,0 @@ -package refinedstorage.block; - -import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumHand; -import net.minecraft.world.World; -import refinedstorage.RefinedStorage; -import refinedstorage.RefinedStorageGui; -import refinedstorage.tile.TileDrive; - -public class BlockDrive extends BlockMachine -{ - public BlockDrive() - { - super("drive"); - } - - @Override - public TileEntity createTileEntity(World world, IBlockState state) - { - return new TileDrive(); - } - - @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) - { - if (!world.isRemote) - { - player.openGui(RefinedStorage.INSTANCE, RefinedStorageGui.DRIVE, world, pos.getX(), pos.getY(), pos.getZ()); - } - - return true; - } -} diff --git a/src/main/java/refinedstorage/block/BlockExporter.java b/src/main/java/refinedstorage/block/BlockExporter.java old mode 100644 new mode 100755 index c99a30ccb..f5a38c7d4 --- a/src/main/java/refinedstorage/block/BlockExporter.java +++ b/src/main/java/refinedstorage/block/BlockExporter.java @@ -6,32 +6,28 @@ 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; import refinedstorage.tile.TileExporter; -public class BlockExporter extends BlockMachine -{ - public BlockExporter() - { - super("exporter"); - } +public class BlockExporter extends BlockMachine { + public BlockExporter() { + super("exporter"); + } - @Override - public TileEntity createTileEntity(World world, IBlockState state) - { - return new TileExporter(); - } + @Override + public TileEntity createTileEntity(World world, IBlockState state) { + return new TileExporter(); + } - @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) - { - if (!world.isRemote) - { - player.openGui(RefinedStorage.INSTANCE, RefinedStorageGui.EXPORTER, world, pos.getX(), pos.getY(), pos.getZ()); - } + @Override + 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()); + } - return true; - } + return true; + } } diff --git a/src/main/java/refinedstorage/block/BlockExternalStorage.java b/src/main/java/refinedstorage/block/BlockExternalStorage.java old mode 100644 new mode 100755 index 470db6b9d..f83d34e42 --- a/src/main/java/refinedstorage/block/BlockExternalStorage.java +++ b/src/main/java/refinedstorage/block/BlockExternalStorage.java @@ -6,32 +6,28 @@ 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; import refinedstorage.tile.TileExternalStorage; -public class BlockExternalStorage extends BlockMachine -{ - public BlockExternalStorage() - { - super("external_storage"); - } +public class BlockExternalStorage extends BlockMachine { + public BlockExternalStorage() { + super("external_storage"); + } - @Override - public TileEntity createTileEntity(World world, IBlockState state) - { - return new TileExternalStorage(); - } + @Override + public TileEntity createTileEntity(World world, IBlockState state) { + return new TileExternalStorage(); + } - @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) - { - if (!world.isRemote) - { - player.openGui(RefinedStorage.INSTANCE, RefinedStorageGui.STORAGE, world, pos.getX(), pos.getY(), pos.getZ()); - } + @Override + 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()); + } - return true; - } + return true; + } } diff --git a/src/main/java/refinedstorage/block/BlockGrid.java b/src/main/java/refinedstorage/block/BlockGrid.java old mode 100644 new mode 100755 index 8f4d12621..1a3980d77 --- a/src/main/java/refinedstorage/block/BlockGrid.java +++ b/src/main/java/refinedstorage/block/BlockGrid.java @@ -1,6 +1,5 @@ package refinedstorage.block; -import java.util.List; import net.minecraft.block.properties.IProperty; import net.minecraft.block.properties.PropertyEnum; import net.minecraft.block.state.BlockStateContainer; @@ -18,61 +17,53 @@ import refinedstorage.RefinedStorage; import refinedstorage.RefinedStorageGui; import refinedstorage.tile.TileGrid; -public class BlockGrid extends BlockMachine -{ - public static final PropertyEnum TYPE = PropertyEnum.create("type", EnumGridType.class); +import java.util.List; - public BlockGrid() - { - super("grid"); - } +public class BlockGrid extends BlockMachine { + public static final PropertyEnum TYPE = PropertyEnum.create("type", EnumGridType.class); - @Override - public TileEntity createTileEntity(World world, IBlockState state) - { - return new TileGrid(); - } + public BlockGrid() { + super("grid"); + } - @Override - public void getSubBlocks(Item item, CreativeTabs tab, List subItems) - { - for (int i = 0; i <= 1; i++) - { - subItems.add(new ItemStack(item, 1, i)); - } - } + @Override + public TileEntity createTileEntity(World world, IBlockState state) { + return new TileGrid(); + } - @Override - protected BlockStateContainer createBlockState() - { - return new BlockStateContainer(this, new IProperty[] - { - DIRECTION, - CONNECTED, - TYPE - }); - } + @Override + public void getSubBlocks(Item item, CreativeTabs tab, List subItems) { + for (int i = 0; i <= 1; i++) { + subItems.add(new ItemStack(item, 1, i)); + } + } - @Override - public IBlockState getStateFromMeta(int meta) - { - return getDefaultState().withProperty(TYPE, meta == 0 ? EnumGridType.NORMAL : EnumGridType.CRAFTING); - } + @Override + protected BlockStateContainer createBlockState() { + return new BlockStateContainer(this, new IProperty[] + { + DIRECTION, + CONNECTED, + TYPE + }); + } - @Override - public int getMetaFromState(IBlockState state) - { - return state.getValue(TYPE) == EnumGridType.NORMAL ? 0 : 1; - } + @Override + public IBlockState getStateFromMeta(int meta) { + return getDefaultState().withProperty(TYPE, meta == 0 ? EnumGridType.NORMAL : EnumGridType.CRAFTING); + } - @Override - 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.GRID, world, pos.getX(), pos.getY(), pos.getZ()); - } + @Override + public int getMetaFromState(IBlockState state) { + return state.getValue(TYPE) == EnumGridType.NORMAL ? 0 : 1; + } - return true; - } + @Override + 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.GRID, world, pos.getX(), pos.getY(), pos.getZ()); + } + + return true; + } } diff --git a/src/main/java/refinedstorage/block/BlockImporter.java b/src/main/java/refinedstorage/block/BlockImporter.java old mode 100644 new mode 100755 index 80bb1732b..1b124a629 --- a/src/main/java/refinedstorage/block/BlockImporter.java +++ b/src/main/java/refinedstorage/block/BlockImporter.java @@ -6,32 +6,28 @@ 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; import refinedstorage.tile.TileImporter; -public class BlockImporter extends BlockMachine -{ - public BlockImporter() - { - super("importer"); - } +public class BlockImporter extends BlockMachine { + public BlockImporter() { + super("importer"); + } - @Override - public TileEntity createTileEntity(World world, IBlockState state) - { - return new TileImporter(); - } + @Override + public TileEntity createTileEntity(World world, IBlockState state) { + return new TileImporter(); + } - @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) - { - if (!world.isRemote) - { - player.openGui(RefinedStorage.INSTANCE, RefinedStorageGui.IMPORTER, world, pos.getX(), pos.getY(), pos.getZ()); - } + @Override + 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()); + } - return true; - } + return true; + } } diff --git a/src/main/java/refinedstorage/block/BlockInterface.java b/src/main/java/refinedstorage/block/BlockInterface.java old mode 100644 new mode 100755 index 54c003f41..cc5bf74ad --- a/src/main/java/refinedstorage/block/BlockInterface.java +++ b/src/main/java/refinedstorage/block/BlockInterface.java @@ -6,32 +6,28 @@ 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; import refinedstorage.tile.TileInterface; -public class BlockInterface extends BlockMachine -{ - public BlockInterface() - { - super("interface"); - } +public class BlockInterface extends BlockMachine { + public BlockInterface() { + super("interface"); + } - @Override - public TileEntity createTileEntity(World world, IBlockState state) - { - return new TileInterface(); - } + @Override + public TileEntity createTileEntity(World world, IBlockState state) { + return new TileInterface(); + } - @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) - { - if (!world.isRemote) - { - player.openGui(RefinedStorage.INSTANCE, RefinedStorageGui.INTERFACE, world, pos.getX(), pos.getY(), pos.getZ()); - } + @Override + 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()); + } - return true; - } + return true; + } } diff --git a/src/main/java/refinedstorage/block/BlockMachine.java b/src/main/java/refinedstorage/block/BlockMachine.java old mode 100644 new mode 100755 index c75a2a9e4..981be3f10 --- a/src/main/java/refinedstorage/block/BlockMachine.java +++ b/src/main/java/refinedstorage/block/BlockMachine.java @@ -8,35 +8,30 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import refinedstorage.tile.TileMachine; -public abstract class BlockMachine extends BlockBase -{ - public static final PropertyBool CONNECTED = PropertyBool.create("connected"); +public abstract class BlockMachine extends BlockBase { + public static final PropertyBool CONNECTED = PropertyBool.create("connected"); - public BlockMachine(String name) - { - super(name); - } + public BlockMachine(String name) { + super(name); + } - @Override - public boolean hasTileEntity(IBlockState state) - { - return true; - } + @Override + public boolean hasTileEntity(IBlockState state) { + return true; + } - @Override - protected BlockStateContainer createBlockState() - { - return new BlockStateContainer(this, new IProperty[] - { - DIRECTION, - CONNECTED - }); - } + @Override + protected BlockStateContainer createBlockState() { + return new BlockStateContainer(this, new IProperty[] + { + DIRECTION, + CONNECTED + }); + } - @Override - public IBlockState getActualState(IBlockState state, IBlockAccess world, BlockPos pos) - { - return super.getActualState(state, world, pos) - .withProperty(CONNECTED, ((TileMachine) world.getTileEntity(pos)).isConnected()); - } + @Override + public IBlockState getActualState(IBlockState state, IBlockAccess world, BlockPos pos) { + return super.getActualState(state, world, pos) + .withProperty(CONNECTED, ((TileMachine) world.getTileEntity(pos)).isConnected()); + } } diff --git a/src/main/java/refinedstorage/block/BlockMachineCasing.java b/src/main/java/refinedstorage/block/BlockMachineCasing.java old mode 100644 new mode 100755 index 9a41b9a93..26f626b40 --- a/src/main/java/refinedstorage/block/BlockMachineCasing.java +++ b/src/main/java/refinedstorage/block/BlockMachineCasing.java @@ -1,9 +1,7 @@ package refinedstorage.block; -public class BlockMachineCasing extends BlockBase -{ - public BlockMachineCasing() - { - super("machine_casing"); - } +public class BlockMachineCasing extends BlockBase { + public BlockMachineCasing() { + super("machine_casing"); + } } diff --git a/src/main/java/refinedstorage/block/BlockRelay.java b/src/main/java/refinedstorage/block/BlockRelay.java old mode 100644 new mode 100755 index 6b2a6f414..186da3ad8 --- a/src/main/java/refinedstorage/block/BlockRelay.java +++ b/src/main/java/refinedstorage/block/BlockRelay.java @@ -12,27 +12,22 @@ import refinedstorage.RefinedStorage; import refinedstorage.RefinedStorageGui; import refinedstorage.tile.TileRelay; -public class BlockRelay extends BlockMachine -{ - public BlockRelay() - { - super("relay"); - } +public class BlockRelay extends BlockMachine { + public BlockRelay() { + super("relay"); + } - @Override - public TileEntity createTileEntity(World world, IBlockState state) - { - return new TileRelay(); - } + @Override + public TileEntity createTileEntity(World world, IBlockState state) { + return new TileRelay(); + } - @Override - 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.RELAY, world, pos.getX(), pos.getY(), pos.getZ()); - } + @Override + 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.RELAY, world, pos.getX(), pos.getY(), pos.getZ()); + } - return true; - } + return true; + } } diff --git a/src/main/java/refinedstorage/block/BlockSolderer.java b/src/main/java/refinedstorage/block/BlockSolderer.java old mode 100644 new mode 100755 index 9a782c960..3fdaee0a4 --- a/src/main/java/refinedstorage/block/BlockSolderer.java +++ b/src/main/java/refinedstorage/block/BlockSolderer.java @@ -6,32 +6,28 @@ 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; import refinedstorage.tile.TileSolderer; -public class BlockSolderer extends BlockMachine -{ - public BlockSolderer() - { - super("solderer"); - } +public class BlockSolderer extends BlockMachine { + public BlockSolderer() { + super("solderer"); + } - @Override - public TileEntity createTileEntity(World world, IBlockState state) - { - return new TileSolderer(); - } + @Override + public TileEntity createTileEntity(World world, IBlockState state) { + return new TileSolderer(); + } - @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) - { - if (!world.isRemote) - { - player.openGui(RefinedStorage.INSTANCE, RefinedStorageGui.SOLDERER, world, pos.getX(), pos.getY(), pos.getZ()); - } + @Override + 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()); + } - return true; - } + return true; + } } diff --git a/src/main/java/refinedstorage/block/BlockStorage.java b/src/main/java/refinedstorage/block/BlockStorage.java old mode 100644 new mode 100755 index 286ad9e35..c986505fe --- a/src/main/java/refinedstorage/block/BlockStorage.java +++ b/src/main/java/refinedstorage/block/BlockStorage.java @@ -1,7 +1,5 @@ package refinedstorage.block; -import java.util.ArrayList; -import java.util.List; import net.minecraft.block.properties.IProperty; import net.minecraft.block.properties.PropertyEnum; import net.minecraft.block.state.BlockStateContainer; @@ -24,111 +22,98 @@ import refinedstorage.RefinedStorageGui; import refinedstorage.item.ItemBlockStorage; import refinedstorage.tile.TileStorage; -public class BlockStorage extends BlockMachine -{ - public static final PropertyEnum TYPE = PropertyEnum.create("type", EnumStorageType.class); +import java.util.ArrayList; +import java.util.List; - public BlockStorage() - { - super("storage"); - } +public class BlockStorage extends BlockMachine { + public static final PropertyEnum TYPE = PropertyEnum.create("type", EnumStorageType.class); - @Override - public void getSubBlocks(Item item, CreativeTabs tab, List subItems) - { - for (int i = 0; i <= 4; i++) - { - subItems.add(ItemBlockStorage.initNBT(new ItemStack(item, 1, i))); - } - } + public BlockStorage() { + super("storage"); + } - @Override - protected BlockStateContainer createBlockState() - { - return new BlockStateContainer(this, new IProperty[] - { - DIRECTION, - CONNECTED, - TYPE - }); - } + @Override + public void getSubBlocks(Item item, CreativeTabs tab, List subItems) { + for (int i = 0; i <= 4; i++) { + subItems.add(ItemBlockStorage.initNBT(new ItemStack(item, 1, i))); + } + } - @Override - public IBlockState getStateFromMeta(int meta) - { - return getDefaultState().withProperty(TYPE, EnumStorageType.getById(meta)); - } + @Override + protected BlockStateContainer createBlockState() { + return new BlockStateContainer(this, new IProperty[] + { + DIRECTION, + CONNECTED, + TYPE + }); + } - @Override - public int getMetaFromState(IBlockState state) - { - return ((EnumStorageType) state.getValue(TYPE)).getId(); - } + @Override + public IBlockState getStateFromMeta(int meta) { + return getDefaultState().withProperty(TYPE, EnumStorageType.getById(meta)); + } - @Override - public TileEntity createTileEntity(World world, IBlockState state) - { - return new TileStorage(); - } + @Override + public int getMetaFromState(IBlockState state) { + return ((EnumStorageType) state.getValue(TYPE)).getId(); + } - @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) - { - if (!world.isRemote) - { - player.openGui(RefinedStorage.INSTANCE, RefinedStorageGui.STORAGE, world, pos.getX(), pos.getY(), pos.getZ()); - } + @Override + public TileEntity createTileEntity(World world, IBlockState state) { + return new TileStorage(); + } - return true; - } + @Override + 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()); + } - @Override - public void onBlockPlacedBy(World world, BlockPos pos, IBlockState state, EntityLivingBase player, ItemStack stack) - { - super.onBlockPlacedBy(world, pos, state, player, stack); + return true; + } - NBTTagCompound tag = stack.getTagCompound(); + @Override + public void onBlockPlacedBy(World world, BlockPos pos, IBlockState state, EntityLivingBase player, ItemStack stack) { + super.onBlockPlacedBy(world, pos, state, player, stack); - if (tag != null && tag.hasKey(TileStorage.NBT_STORAGE)) - { - ((TileStorage) world.getTileEntity(pos)).setStorageTag((NBTTagCompound) tag.getTag(TileStorage.NBT_STORAGE)); - } - } + NBTTagCompound tag = stack.getTagCompound(); - @Override - public List getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) - { - List drops = new ArrayList(); + if (tag != null && tag.hasKey(TileStorage.NBT_STORAGE)) { + ((TileStorage) world.getTileEntity(pos)).setStorageTag((NBTTagCompound) tag.getTag(TileStorage.NBT_STORAGE)); + } + } - ItemStack stack = new ItemStack(RefinedStorageBlocks.STORAGE, 1, RefinedStorageBlocks.STORAGE.getMetaFromState(state)); + @Override + public List getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { + List drops = new ArrayList(); - NBTTagCompound tag = new NBTTagCompound(); + ItemStack stack = new ItemStack(RefinedStorageBlocks.STORAGE, 1, RefinedStorageBlocks.STORAGE.getMetaFromState(state)); - tag.setTag(TileStorage.NBT_STORAGE, ((TileStorage) world.getTileEntity(pos)).getStorageTag()); + NBTTagCompound tag = new NBTTagCompound(); - stack.setTagCompound(tag); + tag.setTag(TileStorage.NBT_STORAGE, ((TileStorage) world.getTileEntity(pos)).getStorageTag()); - drops.add(stack); + stack.setTagCompound(tag); - return drops; - } + drops.add(stack); - @Override - public boolean removedByPlayer(IBlockState state, World world, BlockPos pos, EntityPlayer player, boolean willHarvest) - { - if (willHarvest) - { - return true; - } + return drops; + } - return super.removedByPlayer(state, world, pos, player, willHarvest); - } + @Override + public boolean removedByPlayer(IBlockState state, World world, BlockPos pos, EntityPlayer player, boolean willHarvest) { + if (willHarvest) { + return true; + } - @Override - public void harvestBlock(World world, EntityPlayer player, BlockPos pos, IBlockState state, TileEntity tile, ItemStack stack) - { - super.harvestBlock(world, player, pos, state, tile, stack); + return super.removedByPlayer(state, world, pos, player, willHarvest); + } - world.setBlockToAir(pos); - } + @Override + public void harvestBlock(World world, EntityPlayer player, BlockPos pos, IBlockState state, TileEntity tile, ItemStack stack) { + super.harvestBlock(world, player, pos, state, tile, stack); + + world.setBlockToAir(pos); + } } diff --git a/src/main/java/refinedstorage/block/BlockWirelessTransmitter.java b/src/main/java/refinedstorage/block/BlockWirelessTransmitter.java deleted file mode 100644 index 9438cc94a..000000000 --- a/src/main/java/refinedstorage/block/BlockWirelessTransmitter.java +++ /dev/null @@ -1,62 +0,0 @@ -package refinedstorage.block; - -import net.minecraft.block.properties.IProperty; -import net.minecraft.block.properties.PropertyBool; -import net.minecraft.block.state.BlockStateContainer; -import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.player.EntityPlayer; -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.IBlockAccess; -import net.minecraft.world.World; -import refinedstorage.RefinedStorage; -import refinedstorage.RefinedStorageGui; -import refinedstorage.tile.TileWirelessTransmitter; - -public class BlockWirelessTransmitter extends BlockMachine -{ - public static final PropertyBool WORKING = PropertyBool.create("working"); - - public BlockWirelessTransmitter() - { - super("wireless_transmitter"); - } - - @Override - protected BlockStateContainer createBlockState() - { - return new BlockStateContainer(this, new IProperty[] - { - DIRECTION, - CONNECTED, - WORKING - }); - } - - @Override - public IBlockState getActualState(IBlockState state, IBlockAccess world, BlockPos pos) - { - return super.getActualState(state, world, pos) - .withProperty(WORKING, ((TileWirelessTransmitter) world.getTileEntity(pos)).isWorking()); - } - - @Override - public TileEntity createTileEntity(World world, IBlockState state) - { - return new TileWirelessTransmitter(); - } - - @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) - { - if (!world.isRemote) - { - player.openGui(RefinedStorage.INSTANCE, RefinedStorageGui.WIRELESS_TRANSMITTER, world, pos.getX(), pos.getY(), pos.getZ()); - } - - return true; - } -} diff --git a/src/main/java/refinedstorage/block/EnumControllerType.java b/src/main/java/refinedstorage/block/EnumControllerType.java old mode 100644 new mode 100755 index e64f09d74..7959bfe41 --- a/src/main/java/refinedstorage/block/EnumControllerType.java +++ b/src/main/java/refinedstorage/block/EnumControllerType.java @@ -2,34 +2,29 @@ package refinedstorage.block; import net.minecraft.util.IStringSerializable; -public enum EnumControllerType implements IStringSerializable -{ - NORMAL(0, "normal"), - CREATIVE(1, "creative"); +public enum EnumControllerType implements IStringSerializable { + NORMAL(0, "normal"), + CREATIVE(1, "creative"); - private int id; - private String name; + private int id; + private String name; - EnumControllerType(int id, String name) - { - this.id = id; - this.name = name; - } + EnumControllerType(int id, String name) { + this.id = id; + this.name = name; + } - @Override - public String getName() - { - return name; - } + @Override + public String getName() { + return name; + } - public int getId() - { - return id; - } + public int getId() { + return id; + } - @Override - public String toString() - { - return name; - } + @Override + public String toString() { + return name; + } } diff --git a/src/main/java/refinedstorage/block/EnumGridType.java b/src/main/java/refinedstorage/block/EnumGridType.java old mode 100644 new mode 100755 index 8c0553ebe..e2c6ff308 --- a/src/main/java/refinedstorage/block/EnumGridType.java +++ b/src/main/java/refinedstorage/block/EnumGridType.java @@ -2,35 +2,30 @@ package refinedstorage.block; import net.minecraft.util.IStringSerializable; -public enum EnumGridType implements IStringSerializable -{ - NORMAL(0, "normal"), - CRAFTING(1, "crafting"); +public enum EnumGridType implements IStringSerializable { + NORMAL(0, "normal"), + CRAFTING(1, "crafting"); - private int id; - private String name; + private int id; + private String name; - EnumGridType(int id, String name) - { - this.id = id; - this.name = name; - } + EnumGridType(int id, String name) { + this.id = id; + this.name = name; + } - @Override - public String getName() - { - return name; - } + @Override + public String getName() { + return name; + } - public int getId() - { - return id; - } + public int getId() { + return id; + } - @Override - public String toString() - { - return name; - } + @Override + public String toString() { + return name; + } } diff --git a/src/main/java/refinedstorage/block/EnumStorageType.java b/src/main/java/refinedstorage/block/EnumStorageType.java old mode 100644 new mode 100755 index 0ad8a8708..85fed352a --- a/src/main/java/refinedstorage/block/EnumStorageType.java +++ b/src/main/java/refinedstorage/block/EnumStorageType.java @@ -2,57 +2,48 @@ package refinedstorage.block; import net.minecraft.util.IStringSerializable; -public enum EnumStorageType implements IStringSerializable -{ - TYPE_1K(0, 1000, "1k"), - TYPE_4K(1, 4000, "4k"), - TYPE_16K(2, 16000, "16k"), - TYPE_64K(3, 64000, "64k"), - TYPE_CREATIVE(4, -1, "creative"); +public enum EnumStorageType implements IStringSerializable { + TYPE_1K(0, 1000, "1k"), + TYPE_4K(1, 4000, "4k"), + TYPE_16K(2, 16000, "16k"), + TYPE_64K(3, 64000, "64k"), + TYPE_CREATIVE(4, -1, "creative"); - private int id; - private int capacity; - private String name; + private int id; + private int capacity; + private String name; - EnumStorageType(int id, int capacity, String name) - { - this.id = id; - this.capacity = capacity; - this.name = name; - } + EnumStorageType(int id, int capacity, String name) { + this.id = id; + this.capacity = capacity; + this.name = name; + } - @Override - public String getName() - { - return name; - } + @Override + public String getName() { + return name; + } - public int getId() - { - return id; - } + public int getId() { + return id; + } - public int getCapacity() - { - return capacity; - } + public int getCapacity() { + return capacity; + } - @Override - public String toString() - { - return name; - } + @Override + public String toString() { + return name; + } - public static EnumStorageType getById(int id) - { - for (EnumStorageType type : EnumStorageType.values()) - { - if (type.getId() == id) - { - return type; - } - } + public static EnumStorageType getById(int id) { + for (EnumStorageType type : EnumStorageType.values()) { + if (type.getId() == id) { + return type; + } + } - return null; - } + return null; + } } diff --git a/src/main/java/refinedstorage/container/ContainerBase.java b/src/main/java/refinedstorage/container/ContainerBase.java old mode 100644 new mode 100755 index 85a14dc93..aa0685fbe --- a/src/main/java/refinedstorage/container/ContainerBase.java +++ b/src/main/java/refinedstorage/container/ContainerBase.java @@ -1,7 +1,5 @@ package refinedstorage.container; -import java.util.ArrayList; -import java.util.List; import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.ClickType; @@ -9,143 +7,120 @@ import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import refinedstorage.container.slot.SlotDisabled; +import refinedstorage.container.slot.SlotGridCraftingResult; import refinedstorage.container.slot.SlotSpecimen; -public abstract class ContainerBase extends Container -{ - private EntityPlayer player; +import java.util.ArrayList; +import java.util.List; - private List playerInventorySlots = new ArrayList(); +public abstract class ContainerBase extends Container { + private EntityPlayer player; - public ContainerBase(EntityPlayer player) - { - this.player = player; - } + private List playerInventorySlots = new ArrayList(); - public EntityPlayer getPlayer() - { - return player; - } + public ContainerBase(EntityPlayer player) { + this.player = player; + } - protected void addPlayerInventory(int xInventory, int yInventory) - { - int id = 0; + public EntityPlayer getPlayer() { + return player; + } - for (int i = 0; i < 9; i++) - { - Slot slot = new Slot(player.inventory, id, xInventory + i * 18, yInventory + 4 + (3 * 18)); + protected void addPlayerInventory(int xInventory, int yInventory) { + int id = 0; - playerInventorySlots.add(slot); + for (int i = 0; i < 9; i++) { + Slot slot = new Slot(player.inventory, id, xInventory + i * 18, yInventory + 4 + (3 * 18)); - addSlotToContainer(slot); + playerInventorySlots.add(slot); - id++; - } + addSlotToContainer(slot); - for (int y = 0; y < 3; y++) - { - for (int x = 0; x < 9; x++) - { - Slot slot = new Slot(player.inventory, id, xInventory + x * 18, yInventory + y * 18); + id++; + } - playerInventorySlots.add(slot); + for (int y = 0; y < 3; y++) { + for (int x = 0; x < 9; x++) { + Slot slot = new Slot(player.inventory, id, xInventory + x * 18, yInventory + y * 18); - addSlotToContainer(slot); + playerInventorySlots.add(slot); - id++; - } - } - } + addSlotToContainer(slot); - @Override - public ItemStack func_184996_a(int id, int clickedButton, ClickType clickType, EntityPlayer player) - { - Slot slot = id >= 0 ? getSlot(id) : null; + id++; + } + } + } - if (slot instanceof SlotSpecimen) - { - if (((SlotSpecimen) slot).isSizeAllowed()) - { - if (player.inventory.getItemStack() != null) - { - int amount = player.inventory.getItemStack().stackSize; + @Override + public ItemStack func_184996_a(int id, int clickedButton, ClickType clickType, EntityPlayer player) { + Slot slot = id >= 0 ? getSlot(id) : null; - if (clickedButton == 1) - { - amount = 1; - } + if (slot instanceof SlotSpecimen) { + if (((SlotSpecimen) slot).isSizeAllowed()) { + if (slot.getStack() != null) { + if (GuiScreen.isShiftKeyDown()) { + slot.putStack(null); + } else { + int amount = slot.getStack().stackSize; - ItemStack toPut = player.inventory.getItemStack().copy(); - toPut.stackSize = amount; + if (clickedButton == 0) { + amount--; - slot.putStack(toPut); - } - else if (slot.getStack() != null) - { - if (GuiScreen.isShiftKeyDown()) - { - slot.putStack(null); - } - else - { - int amount = slot.getStack().stackSize; + if (amount < 1) { + amount = 1; + } + } else if (clickedButton == 1) { + amount++; - if (clickedButton == 0) - { - amount++; + if (amount > 64) { + amount = 64; + } + } - if (amount > 64) - { - amount = 64; - } - } - else if (clickedButton == 1) - { - amount--; + slot.getStack().stackSize = amount; + } + } else if (player.inventory.getItemStack() != null) { + int amount = player.inventory.getItemStack().stackSize; - if (amount < 1) - { - amount = 1; - } - } + if (clickedButton == 1) { + amount = 1; + } - slot.getStack().stackSize = amount; - } - } - } - else if (player.inventory.getItemStack() == null) - { - slot.putStack(null); - } - else if (slot.isItemValid(player.inventory.getItemStack())) - { - slot.putStack(player.inventory.getItemStack().copy()); - } + ItemStack toPut = player.inventory.getItemStack().copy(); + toPut.stackSize = amount; - return player.inventory.getItemStack(); - } - else if (slot instanceof SlotDisabled) - { - return null; - } + slot.putStack(toPut); + } + } else if (player.inventory.getItemStack() == null) { + slot.putStack(null); + } else if (slot.isItemValid(player.inventory.getItemStack())) { + slot.putStack(player.inventory.getItemStack().copy()); + } - return super.func_184996_a(id, clickedButton, clickType, player); - } + return player.inventory.getItemStack(); + } else if (slot instanceof SlotGridCraftingResult && slot.getHasStack() && GuiScreen.isShiftKeyDown()) { + ((SlotGridCraftingResult) slot).onShiftClick(player); - @Override - public ItemStack transferStackInSlot(EntityPlayer player, int slotIndex) - { - return null; - } + return null; + } else if (slot instanceof SlotDisabled) { + return null; + } - @Override - public boolean canInteractWith(EntityPlayer player) - { - return true; - } + return super.func_184996_a(id, clickedButton, clickType, player); + } - public List getPlayerInventorySlots() - { - return playerInventorySlots; - } + @Override + public ItemStack transferStackInSlot(EntityPlayer player, int slotIndex) { + return null; + } + + @Override + public boolean canInteractWith(EntityPlayer player) { + return true; + } + + public List getPlayerInventorySlots() { + return playerInventorySlots; + } } diff --git a/src/main/java/refinedstorage/container/ContainerConstructor.java b/src/main/java/refinedstorage/container/ContainerConstructor.java old mode 100644 new mode 100755 index 9e780e64b..bd94f4f61 --- a/src/main/java/refinedstorage/container/ContainerConstructor.java +++ b/src/main/java/refinedstorage/container/ContainerConstructor.java @@ -1,34 +1,16 @@ package refinedstorage.container; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraft.item.ItemBlock; -import net.minecraft.item.ItemStack; -import refinedstorage.container.slot.SlotSpecimen; +import refinedstorage.container.slot.SlotSpecimenItemBlock; import refinedstorage.tile.TileConstructor; -public class ContainerConstructor extends ContainerBase -{ - class SlotConstructor extends SlotSpecimen - { - public SlotConstructor(IInventory inventory, int id, int x, int y) - { - super(inventory, id, x, y, false); - } +public class ContainerConstructor extends ContainerBase { - @Override - public boolean isItemValid(ItemStack stack) - { - return stack.getItem() instanceof ItemBlock; - } - } + public ContainerConstructor(EntityPlayer player, TileConstructor constructor) { + super(player); - public ContainerConstructor(EntityPlayer player, TileConstructor constructor) - { - super(player); + addSlotToContainer(new SlotSpecimenItemBlock(constructor.getInventory(), 0, 80, 20)); - addSlotToContainer(new SlotConstructor(constructor.getInventory(), 0, 80, 20)); - - addPlayerInventory(8, 55); - } + addPlayerInventory(8, 55); + } } diff --git a/src/main/java/refinedstorage/container/ContainerController.java b/src/main/java/refinedstorage/container/ContainerController.java old mode 100644 new mode 100755 index 9cc437a7e..79b385d7b --- a/src/main/java/refinedstorage/container/ContainerController.java +++ b/src/main/java/refinedstorage/container/ContainerController.java @@ -2,12 +2,10 @@ package refinedstorage.container; import net.minecraft.entity.player.EntityPlayer; -public class ContainerController extends ContainerBase -{ - public ContainerController(EntityPlayer player) - { - super(player); +public class ContainerController extends ContainerBase { + public ContainerController(EntityPlayer player) { + super(player); - addPlayerInventory(8, 99); - } + addPlayerInventory(8, 99); + } } diff --git a/src/main/java/refinedstorage/container/ContainerDestructor.java b/src/main/java/refinedstorage/container/ContainerDestructor.java old mode 100644 new mode 100755 index ed279dd82..e97a4af5c --- a/src/main/java/refinedstorage/container/ContainerDestructor.java +++ b/src/main/java/refinedstorage/container/ContainerDestructor.java @@ -1,13 +1,17 @@ package refinedstorage.container; import net.minecraft.entity.player.EntityPlayer; +import refinedstorage.container.slot.SlotSpecimenItemBlock; +import refinedstorage.tile.TileDestructor; -public class ContainerDestructor extends ContainerBase -{ - public ContainerDestructor(EntityPlayer player) - { - super(player); +public class ContainerDestructor extends ContainerBase { + public ContainerDestructor(EntityPlayer player, TileDestructor destructor) { + super(player); - addPlayerInventory(8, 50); - } + for (int i = 0; i < 9; ++i) { + addSlotToContainer(new SlotSpecimenItemBlock(destructor.getInventory(), i, 8 + (18 * i), 20)); + } + + addPlayerInventory(8, 55); + } } diff --git a/src/main/java/refinedstorage/container/ContainerDetector.java b/src/main/java/refinedstorage/container/ContainerDetector.java old mode 100644 new mode 100755 index b89996610..6b0aed992 --- a/src/main/java/refinedstorage/container/ContainerDetector.java +++ b/src/main/java/refinedstorage/container/ContainerDetector.java @@ -4,14 +4,12 @@ import net.minecraft.entity.player.EntityPlayer; import refinedstorage.container.slot.SlotSpecimen; import refinedstorage.tile.TileDetector; -public class ContainerDetector extends ContainerBase -{ - public ContainerDetector(EntityPlayer player, TileDetector detector) - { - super(player); +public class ContainerDetector extends ContainerBase { + public ContainerDetector(EntityPlayer player, TileDetector detector) { + super(player); - addSlotToContainer(new SlotSpecimen(detector.getInventory(), 0, 107, 20, false)); + addSlotToContainer(new SlotSpecimen(detector.getInventory(), 0, 107, 20, false)); - addPlayerInventory(8, 55); - } + addPlayerInventory(8, 55); + } } diff --git a/src/main/java/refinedstorage/container/ContainerDiskDrive.java b/src/main/java/refinedstorage/container/ContainerDiskDrive.java new file mode 100755 index 000000000..0eb2c636f --- /dev/null +++ b/src/main/java/refinedstorage/container/ContainerDiskDrive.java @@ -0,0 +1,52 @@ +package refinedstorage.container; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Slot; +import net.minecraft.item.ItemStack; +import refinedstorage.RefinedStorageItems; +import refinedstorage.container.slot.BasicItemValidator; +import refinedstorage.container.slot.SlotFiltered; +import refinedstorage.tile.TileDiskDrive; + +public class ContainerDiskDrive extends ContainerStorage { + public ContainerDiskDrive(EntityPlayer player, TileDiskDrive drive) { + super(player); + + for (int i = 0; i < 4; ++i) { + addSlotToContainer(new SlotFiltered(drive, i, 98 + (i * 18), 78, new BasicItemValidator(RefinedStorageItems.STORAGE_DISK))); + } + + for (int i = 0; i < 4; ++i) { + addSlotToContainer(new SlotFiltered(drive, 4 + i, 98 + (i * 18), 96, new BasicItemValidator(RefinedStorageItems.STORAGE_DISK))); + } + + addSpecimenAndPlayerInventorySlots(drive.getInventory()); + } + + @Override + public ItemStack transferStackInSlot(EntityPlayer player, int index) { + ItemStack stack = null; + + Slot slot = getSlot(index); + + if (slot != null && slot.getHasStack()) { + stack = slot.getStack().copy(); + + if (index < 8) { + if (!mergeItemStack(stack, 8, inventorySlots.size(), true)) { + return null; + } + } else if (!mergeItemStack(stack, 0, 8, false)) { + return null; + } + + if (stack.stackSize == 0) { + slot.putStack(null); + } else { + slot.onSlotChanged(); + } + } + + return stack; + } +} diff --git a/src/main/java/refinedstorage/container/ContainerDrive.java b/src/main/java/refinedstorage/container/ContainerDrive.java deleted file mode 100644 index f62e8dbcf..000000000 --- a/src/main/java/refinedstorage/container/ContainerDrive.java +++ /dev/null @@ -1,25 +0,0 @@ -package refinedstorage.container; - -import net.minecraft.entity.player.EntityPlayer; -import refinedstorage.RefinedStorageItems; -import refinedstorage.container.slot.BasicItemValidator; -import refinedstorage.container.slot.SlotFiltered; -import refinedstorage.tile.TileDrive; - -public class ContainerDrive extends ContainerStorage -{ - public ContainerDrive(EntityPlayer player, TileDrive drive) - { - super(player, drive.getInventory()); - - for (int i = 0; i < 4; ++i) - { - addSlotToContainer(new SlotFiltered(drive, i, 98 + (i * 18), 78, new BasicItemValidator(RefinedStorageItems.STORAGE_CELL))); - } - - for (int i = 0; i < 4; ++i) - { - addSlotToContainer(new SlotFiltered(drive, 4 + i, 98 + (i * 18), 96, new BasicItemValidator(RefinedStorageItems.STORAGE_CELL))); - } - } -} diff --git a/src/main/java/refinedstorage/container/ContainerExporter.java b/src/main/java/refinedstorage/container/ContainerExporter.java old mode 100644 new mode 100755 index 65132fda8..7135754cf --- a/src/main/java/refinedstorage/container/ContainerExporter.java +++ b/src/main/java/refinedstorage/container/ContainerExporter.java @@ -4,17 +4,14 @@ import net.minecraft.entity.player.EntityPlayer; import refinedstorage.container.slot.SlotSpecimen; import refinedstorage.tile.TileExporter; -public class ContainerExporter extends ContainerBase -{ - public ContainerExporter(EntityPlayer player, TileExporter exporter) - { - super(player); +public class ContainerExporter extends ContainerBase { + public ContainerExporter(EntityPlayer player, TileExporter exporter) { + super(player); - for (int i = 0; i < 9; ++i) - { - addSlotToContainer(new SlotSpecimen(exporter.getInventory(), i, 8 + (18 * i), 20, false)); - } + for (int i = 0; i < 9; ++i) { + addSlotToContainer(new SlotSpecimen(exporter.getInventory(), i, 8 + (18 * i), 20, false)); + } - addPlayerInventory(8, 55); - } + addPlayerInventory(8, 55); + } } diff --git a/src/main/java/refinedstorage/container/ContainerGrid.java b/src/main/java/refinedstorage/container/ContainerGrid.java old mode 100644 new mode 100755 index e31a62fa3..09ea57ede --- a/src/main/java/refinedstorage/container/ContainerGrid.java +++ b/src/main/java/refinedstorage/container/ContainerGrid.java @@ -1,42 +1,76 @@ package refinedstorage.container; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.ICrafting; import net.minecraft.inventory.Slot; +import net.minecraft.item.ItemStack; import refinedstorage.block.EnumGridType; import refinedstorage.container.slot.SlotGridCraftingResult; import refinedstorage.tile.TileGrid; -public class ContainerGrid extends ContainerBase -{ - private TileGrid grid; +import java.util.ArrayList; +import java.util.List; - public ContainerGrid(EntityPlayer player, TileGrid grid) - { - super(player); +public class ContainerGrid extends ContainerBase { + private List craftingSlots = new ArrayList(); - this.grid = grid; + private TileGrid grid; - addPlayerInventory(8, grid.getType() == EnumGridType.CRAFTING ? 174 : 108); + public ContainerGrid(EntityPlayer player, TileGrid grid) { + super(player); - if (grid.getType() == EnumGridType.CRAFTING) - { - int x = 25; - int y = 106; + this.grid = grid; - for (int i = 0; i < 9; ++i) - { - addSlotToContainer(new Slot(grid.getCraftingInventory(), i, x, y)); + addPlayerInventory(8, grid.getType() == EnumGridType.CRAFTING ? 174 : 126); - x += 18; + if (grid.getType() == EnumGridType.CRAFTING) { + int x = 25; + int y = 106; - if ((i + 1) % 3 == 0) - { - y += 18; - x = 25; - } - } + for (int i = 0; i < 9; ++i) { + Slot slot = new Slot(grid.getCraftingInventory(), i, x, y); - addSlotToContainer(new SlotGridCraftingResult(player, grid.getCraftingInventory(), grid.getCraftingResultInventory(), grid, 0, 133 + 4, 120 + 4)); - } - } + craftingSlots.add(slot); + + addSlotToContainer(slot); + + x += 18; + + if ((i + 1) % 3 == 0) { + y += 18; + x = 25; + } + } + + addSlotToContainer(new SlotGridCraftingResult(this, player, grid.getCraftingInventory(), grid.getCraftingResultInventory(), grid, 0, 133 + 4, 120 + 4)); + } + } + + public TileGrid getGrid() { + return grid; + } + + public List getCraftingSlots() { + return craftingSlots; + } + + // I'm overriding detectAndSendChanges() here because the default check + // checks if the item stacks are equal, and if so, then it will only send the new slot contents. + // The thing is though, when the grid replaces the slots with new items from the storage + // system, the item stack replaced WILL be the same and thus changes will not be sent! + // That is why we override here to get rid of the check and ALWAYS send slot changes. + @Override + public void detectAndSendChanges() { + for (int i = 0; i < this.inventorySlots.size(); ++i) { + ItemStack itemstack = ((Slot) this.inventorySlots.get(i)).getStack(); + ItemStack itemstack1 = (ItemStack) this.inventoryItemStacks.get(i); + + itemstack1 = itemstack == null ? null : itemstack.copy(); + this.inventoryItemStacks.set(i, itemstack1); + + for (int j = 0; j < this.crafters.size(); ++j) { + ((ICrafting) this.crafters.get(j)).sendSlotContents(this, i, itemstack1); + } + } + } } diff --git a/src/main/java/refinedstorage/container/ContainerImporter.java b/src/main/java/refinedstorage/container/ContainerImporter.java old mode 100644 new mode 100755 index b5234f525..49737cc92 --- a/src/main/java/refinedstorage/container/ContainerImporter.java +++ b/src/main/java/refinedstorage/container/ContainerImporter.java @@ -4,17 +4,14 @@ import net.minecraft.entity.player.EntityPlayer; import refinedstorage.container.slot.SlotSpecimen; import refinedstorage.tile.TileImporter; -public class ContainerImporter extends ContainerBase -{ - public ContainerImporter(EntityPlayer player, TileImporter importer) - { - super(player); +public class ContainerImporter extends ContainerBase { + public ContainerImporter(EntityPlayer player, TileImporter importer) { + super(player); - for (int i = 0; i < 9; ++i) - { - addSlotToContainer(new SlotSpecimen(importer.getInventory(), i, 8 + (18 * i), 20, false)); - } + for (int i = 0; i < 9; ++i) { + addSlotToContainer(new SlotSpecimen(importer.getInventory(), i, 8 + (18 * i), 20, false)); + } - addPlayerInventory(8, 55); - } + addPlayerInventory(8, 55); + } } diff --git a/src/main/java/refinedstorage/container/ContainerInterface.java b/src/main/java/refinedstorage/container/ContainerInterface.java old mode 100644 new mode 100755 index 1a2403940..6defd3f33 --- a/src/main/java/refinedstorage/container/ContainerInterface.java +++ b/src/main/java/refinedstorage/container/ContainerInterface.java @@ -7,63 +7,49 @@ import refinedstorage.container.slot.SlotOutput; import refinedstorage.container.slot.SlotSpecimen; import refinedstorage.tile.TileInterface; -public class ContainerInterface extends ContainerBase -{ - public ContainerInterface(EntityPlayer player, TileInterface tile) - { - super(player); +public class ContainerInterface extends ContainerBase { + public ContainerInterface(EntityPlayer player, TileInterface tile) { + super(player); - for (int i = 0; i < 9; ++i) - { - addSlotToContainer(new Slot(tile, i, 8 + (18 * i), 20)); - } + for (int i = 0; i < 9; ++i) { + addSlotToContainer(new Slot(tile, i, 8 + (18 * i), 20)); + } - for (int i = 9; i < 18; ++i) - { - addSlotToContainer(new SlotSpecimen(tile, i, 8 + (18 * (i - 9)), 54, true)); - } + for (int i = 9; i < 18; ++i) { + addSlotToContainer(new SlotSpecimen(tile, i, 8 + (18 * (i - 9)), 54, true)); + } - for (int i = 18; i < 27; ++i) - { - addSlotToContainer(new SlotOutput(tile, i, 8 + (18 * (i - 18)), 100)); - } + for (int i = 18; i < 27; ++i) { + addSlotToContainer(new SlotOutput(tile, i, 8 + (18 * (i - 18)), 100)); + } - addPlayerInventory(8, 136); - } + addPlayerInventory(8, 136); + } - @Override - public ItemStack transferStackInSlot(EntityPlayer player, int index) - { - ItemStack stack = null; + @Override + public ItemStack transferStackInSlot(EntityPlayer player, int index) { + ItemStack stack = null; - Slot slot = getSlot(index); + Slot slot = getSlot(index); - if (slot != null && slot.getHasStack()) - { - stack = slot.getStack().copy(); + if (slot != null && slot.getHasStack()) { + stack = slot.getStack().copy(); - if (index < 9) - { - if (!mergeItemStack(stack, 9, inventorySlots.size(), true)) - { - return null; - } - } - else if (!mergeItemStack(stack, 0, 9, false)) - { - return null; - } + if (index < 9) { + if (!mergeItemStack(stack, 9, inventorySlots.size(), true)) { + return null; + } + } else if (!mergeItemStack(stack, 0, 9, false)) { + return null; + } - if (stack.stackSize == 0) - { - slot.putStack(null); - } - else - { - slot.onSlotChanged(); - } - } + if (stack.stackSize == 0) { + slot.putStack(null); + } else { + slot.onSlotChanged(); + } + } - return stack; - } + return stack; + } } diff --git a/src/main/java/refinedstorage/container/ContainerRelay.java b/src/main/java/refinedstorage/container/ContainerRelay.java old mode 100644 new mode 100755 index 1048e51f9..0c8a0a1de --- a/src/main/java/refinedstorage/container/ContainerRelay.java +++ b/src/main/java/refinedstorage/container/ContainerRelay.java @@ -2,12 +2,10 @@ package refinedstorage.container; import net.minecraft.entity.player.EntityPlayer; -public class ContainerRelay extends ContainerBase -{ - public ContainerRelay(EntityPlayer player) - { - super(player); +public class ContainerRelay extends ContainerBase { + public ContainerRelay(EntityPlayer player) { + super(player); - addPlayerInventory(8, 50); - } + addPlayerInventory(8, 50); + } } diff --git a/src/main/java/refinedstorage/container/ContainerSolderer.java b/src/main/java/refinedstorage/container/ContainerSolderer.java old mode 100644 new mode 100755 index 70c5ac1bf..a0077fd64 --- a/src/main/java/refinedstorage/container/ContainerSolderer.java +++ b/src/main/java/refinedstorage/container/ContainerSolderer.java @@ -6,60 +6,48 @@ import net.minecraft.item.ItemStack; import refinedstorage.container.slot.SlotOutput; import refinedstorage.tile.TileSolderer; -public class ContainerSolderer extends ContainerBase -{ - public ContainerSolderer(EntityPlayer player, TileSolderer solderer) - { - super(player); +public class ContainerSolderer extends ContainerBase { + public ContainerSolderer(EntityPlayer player, TileSolderer solderer) { + super(player); - int x = 44; - int y = 20; + int x = 44; + int y = 20; - for (int i = 0; i < 3; ++i) - { - addSlotToContainer(new Slot(solderer, i, x, y)); + for (int i = 0; i < 3; ++i) { + addSlotToContainer(new Slot(solderer, i, x, y)); - y += 18; - } + y += 18; + } - addSlotToContainer(new SlotOutput(solderer, 3, 134, 38)); + addSlotToContainer(new SlotOutput(solderer, 3, 134, 38)); - addPlayerInventory(8, 95); - } + addPlayerInventory(8, 95); + } - @Override - public ItemStack transferStackInSlot(EntityPlayer player, int index) - { - ItemStack stack = null; + @Override + public ItemStack transferStackInSlot(EntityPlayer player, int index) { + ItemStack stack = null; - Slot slot = getSlot(index); + Slot slot = getSlot(index); - if (slot != null && slot.getHasStack()) - { - stack = slot.getStack().copy(); + if (slot != null && slot.getHasStack()) { + stack = slot.getStack().copy(); - if (index < 3) - { - if (!mergeItemStack(stack, 3, inventorySlots.size(), true)) - { - return null; - } - } - else if (!mergeItemStack(stack, 0, 3, false)) - { - return null; - } + if (index < 3) { + if (!mergeItemStack(stack, 3, inventorySlots.size(), true)) { + return null; + } + } else if (!mergeItemStack(stack, 0, 3, false)) { + return null; + } - if (stack.stackSize == 0) - { - slot.putStack(null); - } - else - { - slot.onSlotChanged(); - } - } + if (stack.stackSize == 0) { + slot.putStack(null); + } else { + slot.onSlotChanged(); + } + } - return stack; - } + return stack; + } } diff --git a/src/main/java/refinedstorage/container/ContainerStorage.java b/src/main/java/refinedstorage/container/ContainerStorage.java old mode 100644 new mode 100755 index 7c4fd8974..f8133a7fc --- a/src/main/java/refinedstorage/container/ContainerStorage.java +++ b/src/main/java/refinedstorage/container/ContainerStorage.java @@ -4,17 +4,22 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import refinedstorage.container.slot.SlotSpecimen; -public class ContainerStorage extends ContainerBase -{ - public ContainerStorage(EntityPlayer player, IInventory inventory) - { - super(player); +public class ContainerStorage extends ContainerBase { + public ContainerStorage(EntityPlayer player) { + super(player); + } - for (int i = 0; i < 9; ++i) - { - addSlotToContainer(new SlotSpecimen(inventory, i, 8 + (18 * i), 20, false)); - } + public ContainerStorage(EntityPlayer player, IInventory inventory) { + this(player); - addPlayerInventory(8, 129); - } + addSpecimenAndPlayerInventorySlots(inventory); + } + + protected void addSpecimenAndPlayerInventorySlots(IInventory inventory) { + for (int i = 0; i < 9; ++i) { + addSlotToContainer(new SlotSpecimen(inventory, i, 8 + (18 * i), 20, false)); + } + + addPlayerInventory(8, 129); + } } diff --git a/src/main/java/refinedstorage/container/ContainerWirelessTransmitter.java b/src/main/java/refinedstorage/container/ContainerWirelessTransmitter.java deleted file mode 100644 index 802b37dd4..000000000 --- a/src/main/java/refinedstorage/container/ContainerWirelessTransmitter.java +++ /dev/null @@ -1,61 +0,0 @@ -package refinedstorage.container; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Items; -import net.minecraft.inventory.Slot; -import net.minecraft.item.ItemStack; -import refinedstorage.RefinedStorageItems; -import refinedstorage.container.slot.BasicItemValidator; -import refinedstorage.container.slot.SlotFiltered; -import refinedstorage.container.slot.SlotOutput; -import refinedstorage.tile.TileWirelessTransmitter; - -public class ContainerWirelessTransmitter extends ContainerBase -{ - public ContainerWirelessTransmitter(EntityPlayer player, TileWirelessTransmitter wirelessTransmitter) - { - super(player); - - addSlotToContainer(new SlotFiltered(wirelessTransmitter, 0, 8, 20, new BasicItemValidator(Items.ender_pearl))); - addSlotToContainer(new SlotFiltered(wirelessTransmitter, 1, 101, 20, new BasicItemValidator(RefinedStorageItems.WIRELESS_GRID))); - addSlotToContainer(new SlotOutput(wirelessTransmitter, 2, 152, 20)); - - addPlayerInventory(8, 55); - } - - @Override - public ItemStack transferStackInSlot(EntityPlayer player, int index) - { - ItemStack stack = null; - - Slot slot = getSlot(index); - - if (slot != null && slot.getHasStack()) - { - stack = slot.getStack().copy(); - - if (index < 3) - { - if (!mergeItemStack(stack, 3, inventorySlots.size(), true)) - { - return null; - } - } - else if (!mergeItemStack(stack, 0, 3, false)) - { - return null; - } - - if (stack.stackSize == 0) - { - slot.putStack(null); - } - else - { - slot.onSlotChanged(); - } - } - - return stack; - } -} diff --git a/src/main/java/refinedstorage/container/slot/BasicItemValidator.java b/src/main/java/refinedstorage/container/slot/BasicItemValidator.java old mode 100644 new mode 100755 index 53a1071ac..eb6c5702c --- a/src/main/java/refinedstorage/container/slot/BasicItemValidator.java +++ b/src/main/java/refinedstorage/container/slot/BasicItemValidator.java @@ -3,18 +3,15 @@ package refinedstorage.container.slot; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -public class BasicItemValidator implements IItemValidator -{ - private Item item; +public class BasicItemValidator implements IItemValidator { + private Item item; - public BasicItemValidator(Item item) - { - this.item = item; - } + public BasicItemValidator(Item item) { + this.item = item; + } - @Override - public boolean isValid(ItemStack stack) - { - return item == stack.getItem(); - } + @Override + public boolean isValid(ItemStack stack) { + return item == stack.getItem(); + } } diff --git a/src/main/java/refinedstorage/container/slot/IItemValidator.java b/src/main/java/refinedstorage/container/slot/IItemValidator.java old mode 100644 new mode 100755 index 5a38125f0..39f368278 --- a/src/main/java/refinedstorage/container/slot/IItemValidator.java +++ b/src/main/java/refinedstorage/container/slot/IItemValidator.java @@ -2,7 +2,6 @@ package refinedstorage.container.slot; import net.minecraft.item.ItemStack; -public interface IItemValidator -{ - public boolean isValid(ItemStack stack); +public interface IItemValidator { + boolean isValid(ItemStack stack); } diff --git a/src/main/java/refinedstorage/container/slot/SlotDisabled.java b/src/main/java/refinedstorage/container/slot/SlotDisabled.java old mode 100644 new mode 100755 index 8e6851582..a350b648b --- a/src/main/java/refinedstorage/container/slot/SlotDisabled.java +++ b/src/main/java/refinedstorage/container/slot/SlotDisabled.java @@ -4,16 +4,13 @@ import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -public class SlotDisabled extends Slot -{ - public SlotDisabled(IInventory inventory, int id, int x, int y) - { - super(inventory, id, x, y); - } +public class SlotDisabled extends Slot { + public SlotDisabled(IInventory inventory, int id, int x, int y) { + super(inventory, id, x, y); + } - @Override - public boolean isItemValid(ItemStack stack) - { - return false; - } + @Override + public boolean isItemValid(ItemStack stack) { + return false; + } } diff --git a/src/main/java/refinedstorage/container/slot/SlotFiltered.java b/src/main/java/refinedstorage/container/slot/SlotFiltered.java old mode 100644 new mode 100755 index 2d43a1603..33ba8e404 --- a/src/main/java/refinedstorage/container/slot/SlotFiltered.java +++ b/src/main/java/refinedstorage/container/slot/SlotFiltered.java @@ -4,20 +4,17 @@ import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -public class SlotFiltered extends Slot -{ - private IItemValidator validator; +public class SlotFiltered extends Slot { + private IItemValidator validator; - public SlotFiltered(IInventory inventory, int id, int x, int y, IItemValidator validator) - { - super(inventory, id, x, y); + public SlotFiltered(IInventory inventory, int id, int x, int y, IItemValidator validator) { + super(inventory, id, x, y); - this.validator = validator; - } + this.validator = validator; + } - @Override - public boolean isItemValid(ItemStack item) - { - return validator.isValid(item); - } + @Override + public boolean isItemValid(ItemStack item) { + return validator.isValid(item); + } } diff --git a/src/main/java/refinedstorage/container/slot/SlotGridCraftingResult.java b/src/main/java/refinedstorage/container/slot/SlotGridCraftingResult.java old mode 100644 new mode 100755 index fa110f6b8..3bf56c7b5 --- a/src/main/java/refinedstorage/container/slot/SlotGridCraftingResult.java +++ b/src/main/java/refinedstorage/container/slot/SlotGridCraftingResult.java @@ -5,36 +5,33 @@ import net.minecraft.inventory.IInventory; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.inventory.SlotCrafting; import net.minecraft.item.ItemStack; +import net.minecraftforge.fml.common.FMLCommonHandler; +import refinedstorage.container.ContainerGrid; import refinedstorage.tile.TileGrid; -public class SlotGridCraftingResult extends SlotCrafting -{ - private IInventory craftingMatrix; - private TileGrid grid; +public class SlotGridCraftingResult extends SlotCrafting { + private ContainerGrid container; + private IInventory craftingMatrix; + private TileGrid grid; - public SlotGridCraftingResult(EntityPlayer player, InventoryCrafting craftingMatrix, IInventory craftingResult, TileGrid grid, int id, int x, int y) - { - super(player, craftingMatrix, craftingResult, id, x, y); + public SlotGridCraftingResult(ContainerGrid container, EntityPlayer player, InventoryCrafting craftingMatrix, IInventory craftingResult, TileGrid grid, int id, int x, int y) { + super(player, craftingMatrix, craftingResult, id, x, y); - this.craftingMatrix = craftingMatrix; - this.grid = grid; - } + this.container = container; + this.craftingMatrix = craftingMatrix; + this.grid = grid; + } - @Override - public void onPickupFromSlot(EntityPlayer player, ItemStack stack) - { - ItemStack[] matrixSlots = new ItemStack[craftingMatrix.getSizeInventory()]; + @Override + public void onPickupFromSlot(EntityPlayer player, ItemStack stack) { + FMLCommonHandler.instance().firePlayerCraftingEvent(player, stack, craftingMatrix); - for (int i = 0; i < craftingMatrix.getSizeInventory(); ++i) - { - if (craftingMatrix.getStackInSlot(i) != null) - { - matrixSlots[i] = craftingMatrix.getStackInSlot(i).copy(); - } - } + onCrafting(stack); - super.onPickupFromSlot(player, stack); + grid.onCrafted(container); + } - grid.onCrafted(matrixSlots); - } + public void onShiftClick(EntityPlayer player) { + grid.onCraftedShift(container, player); + } } diff --git a/src/main/java/refinedstorage/container/slot/SlotOutput.java b/src/main/java/refinedstorage/container/slot/SlotOutput.java old mode 100644 new mode 100755 index e3e6c3f45..de622aba5 --- a/src/main/java/refinedstorage/container/slot/SlotOutput.java +++ b/src/main/java/refinedstorage/container/slot/SlotOutput.java @@ -4,16 +4,13 @@ import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -public class SlotOutput extends Slot -{ - public SlotOutput(IInventory inventory, int id, int x, int y) - { - super(inventory, id, x, y); - } +public class SlotOutput extends Slot { + public SlotOutput(IInventory inventory, int id, int x, int y) { + super(inventory, id, x, y); + } - @Override - public boolean isItemValid(ItemStack stack) - { - return false; - } + @Override + public boolean isItemValid(ItemStack stack) { + return false; + } } diff --git a/src/main/java/refinedstorage/container/slot/SlotSpecimen.java b/src/main/java/refinedstorage/container/slot/SlotSpecimen.java old mode 100644 new mode 100755 index 87ab2a6c6..e56a98962 --- a/src/main/java/refinedstorage/container/slot/SlotSpecimen.java +++ b/src/main/java/refinedstorage/container/slot/SlotSpecimen.java @@ -5,42 +5,35 @@ import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -public class SlotSpecimen extends Slot -{ - private boolean sizeAllowed; +public class SlotSpecimen extends Slot { + private boolean sizeAllowed; - public SlotSpecimen(IInventory inventory, int id, int x, int y, boolean allowSize) - { - super(inventory, id, x, y); + public SlotSpecimen(IInventory inventory, int id, int x, int y, boolean allowSize) { + super(inventory, id, x, y); - this.sizeAllowed = allowSize; - } + this.sizeAllowed = allowSize; + } - @Override - public boolean canTakeStack(EntityPlayer player) - { - return false; - } + @Override + public boolean canTakeStack(EntityPlayer player) { + return false; + } - @Override - public boolean isItemValid(ItemStack stack) - { - return true; - } + @Override + public boolean isItemValid(ItemStack stack) { + return true; + } - @Override - public void putStack(ItemStack stack) - { - if (stack != null && !sizeAllowed) - { - stack.stackSize = 1; - } + @Override + public void putStack(ItemStack stack) { + if (stack != null && !sizeAllowed) { + stack.stackSize = 1; + } - super.putStack(stack); - } + super.putStack(stack); + } - public boolean isSizeAllowed() - { - return sizeAllowed; - } + public boolean isSizeAllowed() { + return sizeAllowed; + } } diff --git a/src/main/java/refinedstorage/container/slot/SlotSpecimenItemBlock.java b/src/main/java/refinedstorage/container/slot/SlotSpecimenItemBlock.java new file mode 100755 index 000000000..104875755 --- /dev/null +++ b/src/main/java/refinedstorage/container/slot/SlotSpecimenItemBlock.java @@ -0,0 +1,16 @@ +package refinedstorage.container.slot; + +import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemStack; + +public class SlotSpecimenItemBlock extends SlotSpecimen { + public SlotSpecimenItemBlock(IInventory inventory, int id, int x, int y) { + super(inventory, id, x, y, false); + } + + @Override + public boolean isItemValid(ItemStack stack) { + return stack.getItem() instanceof ItemBlock; + } +} diff --git a/src/main/java/refinedstorage/gui/GuiBase.java b/src/main/java/refinedstorage/gui/GuiBase.java old mode 100644 new mode 100755 index d023ee0cb..98adc423c --- a/src/main/java/refinedstorage/gui/GuiBase.java +++ b/src/main/java/refinedstorage/gui/GuiBase.java @@ -1,12 +1,8 @@ package refinedstorage.gui; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.inventory.Container; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; @@ -15,222 +11,216 @@ import org.lwjgl.opengl.GL11; import refinedstorage.RefinedStorage; import refinedstorage.gui.sidebutton.SideButton; -public abstract class GuiBase extends GuiContainer -{ - public static final int SIDE_BUTTON_WIDTH = 20; - public static final int SIDE_BUTTON_HEIGHT = 20; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; - private List sideButtons = new ArrayList(); +public abstract class GuiBase extends GuiContainer { + public static final int SIDE_BUTTON_WIDTH = 20; + public static final int SIDE_BUTTON_HEIGHT = 20; - private int lastButtonId = 0; - private int lastSideButtonY = 6; + private List sideButtons = new ArrayList(); - protected int width; - protected int height; + private int lastButtonId = 0; + private int lastSideButtonY = 6; - public GuiBase(Container container, int width, int height) - { - super(container); + protected int width; + protected int height; - this.width = width; - this.height = height; - this.xSize = width; - this.ySize = height; - } + public GuiBase(Container container, int width, int height) { + super(container); - @Override - public void initGui() - { - if (sideButtons.size() > 0) - { - xSize -= SIDE_BUTTON_WIDTH; - } + this.width = width; + this.height = height; + this.xSize = width; + this.ySize = height; + } - super.initGui(); + @Override + public void initGui() { + if (sideButtons.size() > 0) { + xSize -= SIDE_BUTTON_WIDTH; + } - sideButtons.clear(); + super.initGui(); - lastButtonId = 0; - lastSideButtonY = 6; + sideButtons.clear(); - init(guiLeft, guiTop); + lastButtonId = 0; + lastSideButtonY = 6; - if (sideButtons.size() > 0) - { - xSize += SIDE_BUTTON_WIDTH; - } - } + init(guiLeft, guiTop); - @Override - public void updateScreen() - { - super.updateScreen(); + if (sideButtons.size() > 0) { + xSize += SIDE_BUTTON_WIDTH; + } + } - update(guiLeft, guiTop); - } + @Override + public void updateScreen() { + super.updateScreen(); - @Override - protected void drawGuiContainerBackgroundLayer(float renderPartialTicks, int mouseX, int mouseY) - { - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + update(guiLeft, guiTop); + } - drawBackground(guiLeft, guiTop, mouseX, mouseY); - } + @Override + protected void drawGuiContainerBackgroundLayer(float renderPartialTicks, int mouseX, int mouseY) { + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - @Override - protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) - { - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + drawBackground(guiLeft, guiTop, mouseX, mouseY); + } - mouseX -= guiLeft; - mouseY -= guiTop; + @Override + protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - for (SideButton sideButton : sideButtons) - { - GL11.glDisable(GL11.GL_LIGHTING); - sideButton.draw(this, sideButton.getX() + 2, sideButton.getY() + 1); - GL11.glEnable(GL11.GL_LIGHTING); + mouseX -= guiLeft; + mouseY -= guiTop; - if (inBounds(sideButton.getX(), sideButton.getY(), SIDE_BUTTON_WIDTH, SIDE_BUTTON_HEIGHT, mouseX, mouseY)) - { - drawTooltip(mouseX, mouseY, sideButton.getTooltip(this)); - } - } + for (SideButton sideButton : sideButtons) { + GL11.glDisable(GL11.GL_LIGHTING); + sideButton.draw(this, sideButton.getX() + 2, sideButton.getY() + 1); + GL11.glEnable(GL11.GL_LIGHTING); - drawForeground(mouseX, mouseY); - } + if (inBounds(sideButton.getX(), sideButton.getY(), SIDE_BUTTON_WIDTH, SIDE_BUTTON_HEIGHT, mouseX, mouseY)) { + drawTooltip(mouseX, mouseY, sideButton.getTooltip(this)); + } + } - @Override - protected void actionPerformed(GuiButton button) throws IOException - { - super.actionPerformed(button); + drawForeground(mouseX, mouseY); + } - for (SideButton sideButton : sideButtons) - { - if (sideButton.getId() == button.id) - { - sideButton.actionPerformed(); - } - } - } + @Override + protected void actionPerformed(GuiButton button) throws IOException { + super.actionPerformed(button); - public GuiButton addButton(int x, int y, int w, int h) - { - return addButton(x, y, w, h, ""); - } + for (SideButton sideButton : sideButtons) { + if (sideButton.getId() == button.id) { + sideButton.actionPerformed(); + } + } + } - public GuiButton addButton(int x, int y, int w, int h, String text) - { - GuiButton button = new GuiButton(lastButtonId++, x, y, w, h, text); + public GuiButton addButton(int x, int y, int w, int h) { + return addButton(x, y, w, h, ""); + } - buttonList.add(button); + public GuiButton addButton(int x, int y, int w, int h, String text) { + GuiButton button = new GuiButton(lastButtonId++, x, y, w, h, text); - return button; - } + buttonList.add(button); - public void addSideButton(SideButton button) - { - button.setX(xSize - 1); - button.setY(lastSideButtonY); - button.setId(addButton(guiLeft + button.getX(), guiTop + button.getY(), SIDE_BUTTON_WIDTH, SIDE_BUTTON_HEIGHT).id); + return button; + } - lastSideButtonY += SIDE_BUTTON_HEIGHT + 4; + public void addSideButton(SideButton button) { + button.setX(xSize - 1); + button.setY(lastSideButtonY); + button.setId(addButton(guiLeft + button.getX(), guiTop + button.getY(), SIDE_BUTTON_WIDTH, SIDE_BUTTON_HEIGHT).id); - sideButtons.add(button); - } + lastSideButtonY += SIDE_BUTTON_HEIGHT + 4; - public boolean inBounds(int x, int y, int w, int h, int ox, int oy) - { - return ox >= x && ox <= x + w && oy >= y && oy <= y + h; - } + sideButtons.add(button); + } - public void bindTexture(String file) - { - bindTexture(RefinedStorage.ID, file); - } + public boolean inBounds(int x, int y, int w, int h, int ox, int oy) { + return ox >= x && ox <= x + w && oy >= y && oy <= y + h; + } - public void bindTexture(String base, String file) - { - mc.getTextureManager().bindTexture(new ResourceLocation(base, "textures/" + file)); - } + public void bindTexture(String file) { + bindTexture(RefinedStorage.ID, file); + } - public void drawItem(int x, int y, ItemStack stack) - { - drawItem(x, y, stack, false, null); - } + public void bindTexture(String base, String file) { + mc.getTextureManager().bindTexture(new ResourceLocation(base, "textures/" + file)); + } - public void drawItem(int x, int y, ItemStack stack, boolean withOverlay) - { - drawItem(x, y, stack, withOverlay, null); - } + public void drawItem(int x, int y, ItemStack stack) { + drawItem(x, y, stack, false); + } - public void drawItem(int x, int y, ItemStack stack, boolean withOverlay, String message) - { - zLevel = 200.0F; - itemRender.zLevel = 200.0F; + public void drawItem(int x, int y, ItemStack stack, boolean withOverlay) { + drawItem(x, y, stack, withOverlay, null); + } - FontRenderer font = null; + public void drawItem(int x, int y, ItemStack stack, boolean withOverlay, String message) { + zLevel = 200.0F; + itemRender.zLevel = 200.0F; - if (stack != null) - { - font = stack.getItem().getFontRenderer(stack); - } + itemRender.renderItemIntoGUI(stack, x, y); - if (font == null) - { - font = fontRendererObj; - } + if (withOverlay) { + drawItemOverlay(stack, message, x, y); + } - itemRender.renderItemIntoGUI(stack, x, y); + zLevel = 0.0F; + itemRender.zLevel = 0.0F; + } - if (withOverlay) - { - itemRender.renderItemOverlayIntoGUI(font, stack, x, y, message); - } + public void drawItemOverlay(ItemStack stack, String text, int x, int y) { + itemRender.renderItemOverlayIntoGUI(fontRendererObj, stack, x, y, ""); - zLevel = 0.0F; - itemRender.zLevel = 0.0F; - } + if (text != null) { + GlStateManager.pushMatrix(); + GlStateManager.translate(x, y, 1); + GL11.glScalef(0.5f, 0.5f, 1); - public void drawString(int x, int y, String message) - { - drawString(x, y, message, 4210752); - } + int stringWidth = fontRendererObj.getStringWidth(text); - public void drawString(int x, int y, String message, int color) - { - GL11.glDisable(GL11.GL_LIGHTING); - fontRendererObj.drawString(message, x, y, color); - GL11.glEnable(GL11.GL_LIGHTING); - } + GlStateManager.disableLighting(); + GlStateManager.disableRescaleNormal(); + GlStateManager.depthMask(false); + GlStateManager.enableBlend(); + GlStateManager.blendFunc(770, 771); + GlStateManager.disableDepth(); - public void drawTooltip(int x, int y, String message) - { - GL11.glDisable(GL11.GL_LIGHTING); - drawHoveringText(Arrays.asList(message.split("\n")), x, y); - GL11.glEnable(GL11.GL_LIGHTING); - } + fontRendererObj.drawStringWithShadow(text, 30 - stringWidth, 22, 16777215); - public void drawTooltip(int x, int y, ItemStack stack) - { - renderToolTip(stack, x, y); - } + GlStateManager.enableDepth(); + GlStateManager.enableTexture2D(); + GlStateManager.depthMask(true); + GlStateManager.enableLighting(); + GlStateManager.disableBlend(); + GlStateManager.popMatrix(); + } + } - public void drawTexture(int x, int y, int textureX, int textureY, int width, int height) - { - drawTexturedModalRect(x, y, textureX, textureY, width, height); - } + public void drawString(int x, int y, String message) { + drawString(x, y, message, 4210752); + } - public String t(String name, Object... format) - { - return I18n.translateToLocalFormatted(name, format); - } + public void drawString(int x, int y, String message, int color) { + GL11.glDisable(GL11.GL_LIGHTING); + fontRendererObj.drawString(message, x, y, color); + GL11.glEnable(GL11.GL_LIGHTING); + } - public abstract void init(int x, int y); + public void drawTooltip(int x, int y, String message) { + GL11.glDisable(GL11.GL_LIGHTING); + drawHoveringText(Arrays.asList(message.split("\n")), x, y); + GL11.glEnable(GL11.GL_LIGHTING); + } - public abstract void update(int x, int y); + public void drawTooltip(int x, int y, ItemStack stack) { + GL11.glDisable(GL11.GL_LIGHTING); + renderToolTip(stack, x, y); + GL11.glEnable(GL11.GL_LIGHTING); + } - public abstract void drawBackground(int x, int y, int mouseX, int mouseY); + public void drawTexture(int x, int y, int textureX, int textureY, int width, int height) { + drawTexturedModalRect(x, y, textureX, textureY, width, height); + } - public abstract void drawForeground(int mouseX, int mouseY); + public String t(String name, Object... format) { + return I18n.translateToLocalFormatted(name, format); + } + + public abstract void init(int x, int y); + + public abstract void update(int x, int y); + + public abstract void drawBackground(int x, int y, int mouseX, int mouseY); + + public abstract void drawForeground(int mouseX, int mouseY); } diff --git a/src/main/java/refinedstorage/gui/GuiConstructor.java b/src/main/java/refinedstorage/gui/GuiConstructor.java old mode 100644 new mode 100755 index d55805eb7..2b53fa43e --- a/src/main/java/refinedstorage/gui/GuiConstructor.java +++ b/src/main/java/refinedstorage/gui/GuiConstructor.java @@ -6,43 +6,37 @@ import refinedstorage.gui.sidebutton.SideButtonRedstoneMode; import refinedstorage.tile.TileConstructor; import refinedstorage.util.InventoryUtils; -public class GuiConstructor extends GuiBase -{ - private TileConstructor constructor; +public class GuiConstructor extends GuiBase { + private TileConstructor constructor; - public GuiConstructor(ContainerConstructor container, TileConstructor constructor) - { - super(container, 176, 137); + public GuiConstructor(ContainerConstructor container, TileConstructor constructor) { + super(container, 176, 137); - this.constructor = constructor; - } + this.constructor = constructor; + } - @Override - public void init(int x, int y) - { - addSideButton(new SideButtonRedstoneMode(constructor)); + @Override + public void init(int x, int y) { + addSideButton(new SideButtonRedstoneMode(constructor)); - addSideButton(new SideButtonCompare(constructor, InventoryUtils.COMPARE_DAMAGE)); - addSideButton(new SideButtonCompare(constructor, InventoryUtils.COMPARE_NBT)); - } + addSideButton(new SideButtonCompare(constructor, InventoryUtils.COMPARE_DAMAGE)); + addSideButton(new SideButtonCompare(constructor, InventoryUtils.COMPARE_NBT)); + } - @Override - public void update(int x, int y) - { - } + @Override + public void update(int x, int y) { + } - @Override - public void drawBackground(int x, int y, int mouseX, int mouseY) - { - bindTexture("gui/constructor.png"); + @Override + public void drawBackground(int x, int y, int mouseX, int mouseY) { + bindTexture("gui/constructor.png"); - drawTexture(x, y, 0, 0, width, height); - } + drawTexture(x, y, 0, 0, width, height); + } - @Override - public void drawForeground(int mouseX, int mouseY) - { - drawString(7, 7, t("gui.refinedstorage:constructor")); - drawString(7, 43, t("container.inventory")); - } + @Override + public void drawForeground(int mouseX, int mouseY) { + drawString(7, 7, t("gui.refinedstorage:constructor")); + drawString(7, 43, t("container.inventory")); + } } diff --git a/src/main/java/refinedstorage/gui/GuiController.java b/src/main/java/refinedstorage/gui/GuiController.java old mode 100644 new mode 100755 index bdb61faa3..f52eafa4d --- a/src/main/java/refinedstorage/gui/GuiController.java +++ b/src/main/java/refinedstorage/gui/GuiController.java @@ -2,119 +2,134 @@ package refinedstorage.gui; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.item.ItemStack; +import net.minecraft.util.text.translation.I18n; import refinedstorage.container.ContainerController; import refinedstorage.gui.sidebutton.SideButtonRedstoneMode; import refinedstorage.tile.TileController; import refinedstorage.tile.TileMachine; -public class GuiController extends GuiBase -{ - private TileController controller; +import java.util.ArrayList; +import java.util.List; - private int barX = 8; - private int barY = 20; - private int barWidth = 16; - private int barHeight = 59; +public class GuiController extends GuiBase { + public static final int VISIBLE_ROWS = 2; - private Scrollbar scrollbar = new Scrollbar(157, 20, 12, 59); + private TileController controller; - public GuiController(ContainerController container, TileController controller) - { - super(container, 176, 181); + private int barX = 8; + private int barY = 20; + private int barWidth = 16; + private int barHeight = 59; - this.controller = controller; - } + private Scrollbar scrollbar = new Scrollbar(157, 20, 12, 59); - @Override - public void init(int x, int y) - { - addSideButton(new SideButtonRedstoneMode(controller)); - } + public GuiController(ContainerController container, TileController controller) { + super(container, 176, 181); - @Override - public void update(int x, int y) - { - scrollbar.setCanScroll(getRows() > getVisibleRows()); - } + this.controller = controller; + } - @Override - public void drawBackground(int x, int y, int mouseX, int mouseY) - { - bindTexture("gui/controller.png"); + @Override + public void init(int x, int y) { + addSideButton(new SideButtonRedstoneMode(controller)); + } - drawTexture(x, y, 0, 0, width, height); + @Override + public void update(int x, int y) { + scrollbar.setCanScroll(getRows() > VISIBLE_ROWS); + } - int barHeightNew = (int) ((float) controller.getEnergyStored(null) / (float) controller.getMaxEnergyStored(null) * (float) barHeight); + @Override + public void drawBackground(int x, int y, int mouseX, int mouseY) { + bindTexture("gui/controller.png"); - drawTexture(x + barX, y + barY + barHeight - barHeightNew, 178, 0 + (barHeight - barHeightNew), barWidth, barHeightNew); + drawTexture(x, y, 0, 0, width, height); - scrollbar.draw(this); - } + int barHeightNew = (int) ((float) controller.getEnergyStored(null) / (float) controller.getMaxEnergyStored(null) * (float) barHeight); - @Override - public void drawForeground(int mouseX, int mouseY) - { - scrollbar.update(this, mouseX, mouseY); + drawTexture(x + barX, y + barY + barHeight - barHeightNew, 178, barHeight - barHeightNew, barWidth, barHeightNew); - drawString(7, 7, t("gui.refinedstorage:controller." + controller.getType().getId())); - drawString(7, 87, t("container.inventory")); + scrollbar.draw(this); + } - int x = 33; - int y = 26; + private int calculateOffsetOnScale(int pos, float scale) { + float multiplier = (pos / scale); + return (int) multiplier; + } - int slot = getOffset() * 2; + @Override + public void drawForeground(int mouseX, int mouseY) { + scrollbar.update(this, mouseX, mouseY); - RenderHelper.enableGUIStandardItemLighting(); + drawString(7, 7, t("gui.refinedstorage:controller." + controller.getType().getId())); + drawString(7, 87, t("container.inventory")); - for (int i = 0; i < 4; ++i) - { - if (slot < controller.getMachines().size()) - { - TileMachine machine = controller.getMachines().get(slot); - IBlockState machineState = machine.getWorld().getBlockState(machine.getPos()); - Block machineBlock = machineState.getBlock(); + int x = 33; + int y = 26; - ItemStack machineStack = new ItemStack(machineBlock, 1, machineBlock.getMetaFromState(machineState)); + int slot = getOffset() * 2; - drawItem(x, y, machineStack); - drawString(x + 21, y + 5, t("misc.refinedstorage:energy_usage_minimal", machine.getEnergyUsage())); - } + RenderHelper.enableGUIStandardItemLighting(); - if (i == 1) - { - x = 33; - y += 30; - } - else - { - x += 60; - } + List machines = new ArrayList(controller.getMachines()); - slot++; - } + TileMachine machineHovering = null; - if (inBounds(barX, barY, barWidth, barHeight, mouseX, mouseY)) - { - drawTooltip(mouseX, mouseY, t("misc.refinedstorage:energy_usage", controller.getEnergyUsage()) + "\n" + t("misc.refinedstorage:energy_stored", controller.getEnergyStored(null), controller.getMaxEnergyStored(null))); - } - } + for (int i = 0; i < 4; ++i) { + if (slot < machines.size()) { + TileMachine machine = machines.get(slot); + IBlockState machineState = machine.getWorld().getBlockState(machine.getPos()); + Block machineBlock = machineState.getBlock(); - public int getOffset() - { - return (int) (scrollbar.getCurrentScroll() / 59f * (float) getRows()); - } + ItemStack machineStack = new ItemStack(machineBlock, 1, machineBlock.getMetaFromState(machineState)); - private int getRows() - { - int max = (int) Math.ceil((float) controller.getMachines().size() / (float) 2); + drawItem(x, y + 5, machineStack); + GlStateManager.pushMatrix(); + float scale = 0.5f; - return max < 0 ? 0 : max; - } + GlStateManager.scale(scale, scale, 1); + drawString(calculateOffsetOnScale(x + 1, scale), calculateOffsetOnScale(y - 3, scale), machineStack.getDisplayName()); + drawString(calculateOffsetOnScale(x + 21, scale), calculateOffsetOnScale(y + 10, scale), t("misc.refinedstorage:energy_usage_minimal", machine.getEnergyUsage())); + GlStateManager.popMatrix(); - private int getVisibleRows() - { - return 2; - } + if (inBounds(x, y, 16, 16, mouseX, mouseY)) { + machineHovering = machine; + } + } + + if (i == 1) { + x = 33; + y += 30; + } else { + x += 60; + } + + slot++; + } + + if (machineHovering != null) { + String message = I18n.translateToLocalFormatted("gui.refinedstorage:controller.machine_position.x", machineHovering.getPos().getX()); + message += "\n" + I18n.translateToLocalFormatted("gui.refinedstorage:controller.machine_position.y", machineHovering.getPos().getY()); + message += "\n" + I18n.translateToLocalFormatted("gui.refinedstorage:controller.machine_position.z", machineHovering.getPos().getZ()); + + drawTooltip(mouseX, mouseY, message); + } + + if (inBounds(barX, barY, barWidth, barHeight, mouseX, mouseY)) { + drawTooltip(mouseX, mouseY, t("misc.refinedstorage:energy_usage", controller.getEnergyUsage()) + "\n" + t("misc.refinedstorage:energy_stored", controller.getEnergyStored(null), controller.getMaxEnergyStored(null))); + } + } + + public int getOffset() { + return (int) (scrollbar.getCurrentScroll() / 59f * (float) getRows()); + } + + private int getRows() { + int max = (int) Math.ceil((float) controller.getMachines().size() / (float) 2); + + return max < 0 ? 0 : max; + } } diff --git a/src/main/java/refinedstorage/gui/GuiDestructor.java b/src/main/java/refinedstorage/gui/GuiDestructor.java old mode 100644 new mode 100755 index 4194a0be0..1e19a2fd8 --- a/src/main/java/refinedstorage/gui/GuiDestructor.java +++ b/src/main/java/refinedstorage/gui/GuiDestructor.java @@ -1,43 +1,45 @@ package refinedstorage.gui; import refinedstorage.container.ContainerDestructor; +import refinedstorage.gui.sidebutton.SideButtonCompare; +import refinedstorage.gui.sidebutton.SideButtonMode; import refinedstorage.gui.sidebutton.SideButtonRedstoneMode; import refinedstorage.tile.TileDestructor; +import refinedstorage.util.InventoryUtils; -public class GuiDestructor extends GuiBase -{ - private TileDestructor destructor; +public class GuiDestructor extends GuiBase { + private TileDestructor destructor; - public GuiDestructor(ContainerDestructor container, TileDestructor destructor) - { - super(container, 176, 131); + public GuiDestructor(ContainerDestructor container, TileDestructor destructor) { + super(container, 176, 137); - this.destructor = destructor; - } + this.destructor = destructor; + } - @Override - public void init(int x, int y) - { - addSideButton(new SideButtonRedstoneMode(destructor)); - } + @Override + public void init(int x, int y) { + addSideButton(new SideButtonRedstoneMode(destructor)); - @Override - public void update(int x, int y) - { - } + addSideButton(new SideButtonMode(destructor)); - @Override - public void drawBackground(int x, int y, int mouseX, int mouseY) - { - bindTexture("gui/destructor.png"); + addSideButton(new SideButtonCompare(destructor, InventoryUtils.COMPARE_DAMAGE)); + addSideButton(new SideButtonCompare(destructor, InventoryUtils.COMPARE_NBT)); + } - drawTexture(x, y, 0, 0, width, height); - } + @Override + public void update(int x, int y) { + } - @Override - public void drawForeground(int mouseX, int mouseY) - { - drawString(7, 7, t("gui.refinedstorage:destructor")); - drawString(7, 39, t("container.inventory")); - } + @Override + public void drawBackground(int x, int y, int mouseX, int mouseY) { + bindTexture("gui/destructor.png"); + + drawTexture(x, y, 0, 0, width, height); + } + + @Override + public void drawForeground(int mouseX, int mouseY) { + drawString(7, 7, t("gui.refinedstorage:destructor")); + drawString(7, 43, t("container.inventory")); + } } diff --git a/src/main/java/refinedstorage/gui/GuiDetector.java b/src/main/java/refinedstorage/gui/GuiDetector.java old mode 100644 new mode 100755 index bd4c5abf4..f788fa343 --- a/src/main/java/refinedstorage/gui/GuiDetector.java +++ b/src/main/java/refinedstorage/gui/GuiDetector.java @@ -1,7 +1,6 @@ package refinedstorage.gui; import com.google.common.primitives.Ints; -import java.io.IOException; import net.minecraft.client.gui.GuiTextField; import refinedstorage.RefinedStorage; import refinedstorage.container.ContainerDetector; @@ -11,73 +10,64 @@ import refinedstorage.network.MessageDetectorAmountUpdate; import refinedstorage.tile.TileDetector; import refinedstorage.util.InventoryUtils; -public class GuiDetector extends GuiBase -{ - private TileDetector detector; +import java.io.IOException; - private GuiTextField amountField; +public class GuiDetector extends GuiBase { + private TileDetector detector; - public GuiDetector(ContainerDetector container, TileDetector detector) - { - super(container, 176, 137); + private GuiTextField amountField; - this.detector = detector; - } + public GuiDetector(ContainerDetector container, TileDetector detector) { + super(container, 176, 137); - @Override - public void init(int x, int y) - { - addSideButton(new SideButtonCompare(detector, InventoryUtils.COMPARE_DAMAGE)); - addSideButton(new SideButtonCompare(detector, InventoryUtils.COMPARE_NBT)); + this.detector = detector; + } - addSideButton(new SideButtonDetectorMode(detector)); + @Override + public void init(int x, int y) { + addSideButton(new SideButtonCompare(detector, InventoryUtils.COMPARE_DAMAGE)); + addSideButton(new SideButtonCompare(detector, InventoryUtils.COMPARE_NBT)); - amountField = new GuiTextField(0, fontRendererObj, x + 62 + 1, y + 23 + 1, 25, fontRendererObj.FONT_HEIGHT); - amountField.setText(String.valueOf(detector.getAmount())); - amountField.setEnableBackgroundDrawing(false); - amountField.setVisible(true); - amountField.setTextColor(16777215); - amountField.setCanLoseFocus(false); - amountField.setFocused(true); - } + addSideButton(new SideButtonDetectorMode(detector)); - @Override - public void update(int x, int y) - { - } + amountField = new GuiTextField(0, fontRendererObj, x + 62 + 1, y + 23 + 1, 25, fontRendererObj.FONT_HEIGHT); + amountField.setText(String.valueOf(detector.getAmount())); + amountField.setEnableBackgroundDrawing(false); + amountField.setVisible(true); + amountField.setTextColor(16777215); + amountField.setCanLoseFocus(false); + amountField.setFocused(true); + } - @Override - public void drawBackground(int x, int y, int mouseX, int mouseY) - { - bindTexture("gui/detector.png"); + @Override + public void update(int x, int y) { + } - drawTexture(x, y, 0, 0, width, height); + @Override + public void drawBackground(int x, int y, int mouseX, int mouseY) { + bindTexture("gui/detector.png"); - amountField.drawTextBox(); - } + drawTexture(x, y, 0, 0, width, height); - @Override - public void drawForeground(int mouseX, int mouseY) - { - drawString(7, 7, t("gui.refinedstorage:detector")); - drawString(7, 43, t("container.inventory")); - } + amountField.drawTextBox(); + } - @Override - protected void keyTyped(char character, int keyCode) throws IOException - { - if (!checkHotbarKeys(keyCode) && amountField.textboxKeyTyped(character, keyCode)) - { - Integer result = Ints.tryParse(amountField.getText()); + @Override + public void drawForeground(int mouseX, int mouseY) { + drawString(7, 7, t("gui.refinedstorage:detector")); + drawString(7, 43, t("container.inventory")); + } - if (result != null) - { - RefinedStorage.NETWORK.sendToServer(new MessageDetectorAmountUpdate(detector, result)); - } - } - else - { - super.keyTyped(character, keyCode); - } - } + @Override + protected void keyTyped(char character, int keyCode) throws IOException { + if (!checkHotbarKeys(keyCode) && amountField.textboxKeyTyped(character, keyCode)) { + Integer result = Ints.tryParse(amountField.getText()); + + if (result != null) { + RefinedStorage.NETWORK.sendToServer(new MessageDetectorAmountUpdate(detector, result)); + } + } else { + super.keyTyped(character, keyCode); + } + } } diff --git a/src/main/java/refinedstorage/gui/GuiExporter.java b/src/main/java/refinedstorage/gui/GuiExporter.java old mode 100644 new mode 100755 index 364121ec9..42287109e --- a/src/main/java/refinedstorage/gui/GuiExporter.java +++ b/src/main/java/refinedstorage/gui/GuiExporter.java @@ -6,43 +6,37 @@ import refinedstorage.gui.sidebutton.SideButtonRedstoneMode; import refinedstorage.tile.TileExporter; import refinedstorage.util.InventoryUtils; -public class GuiExporter extends GuiBase -{ - private TileExporter exporter; +public class GuiExporter extends GuiBase { + private TileExporter exporter; - public GuiExporter(ContainerExporter container, TileExporter exporter) - { - super(container, 176, 137); + public GuiExporter(ContainerExporter container, TileExporter exporter) { + super(container, 176, 137); - this.exporter = exporter; - } + this.exporter = exporter; + } - @Override - public void init(int x, int y) - { - addSideButton(new SideButtonRedstoneMode(exporter)); + @Override + public void init(int x, int y) { + addSideButton(new SideButtonRedstoneMode(exporter)); - addSideButton(new SideButtonCompare(exporter, InventoryUtils.COMPARE_DAMAGE)); - addSideButton(new SideButtonCompare(exporter, InventoryUtils.COMPARE_NBT)); - } + addSideButton(new SideButtonCompare(exporter, InventoryUtils.COMPARE_DAMAGE)); + addSideButton(new SideButtonCompare(exporter, InventoryUtils.COMPARE_NBT)); + } - @Override - public void update(int x, int y) - { - } + @Override + public void update(int x, int y) { + } - @Override - public void drawBackground(int x, int y, int mouseX, int mouseY) - { - bindTexture("gui/exporter.png"); + @Override + public void drawBackground(int x, int y, int mouseX, int mouseY) { + bindTexture("gui/exporter.png"); - drawTexture(x, y, 0, 0, width, height); - } + drawTexture(x, y, 0, 0, width, height); + } - @Override - public void drawForeground(int mouseX, int mouseY) - { - drawString(7, 7, t("gui.refinedstorage:exporter")); - drawString(7, 43, t("container.inventory")); - } + @Override + public void drawForeground(int mouseX, int mouseY) { + drawString(7, 7, t("gui.refinedstorage:exporter")); + drawString(7, 43, t("container.inventory")); + } } diff --git a/src/main/java/refinedstorage/gui/GuiGrid.java b/src/main/java/refinedstorage/gui/GuiGrid.java old mode 100644 new mode 100755 index 27b6b5c09..17ae74a6d --- a/src/main/java/refinedstorage/gui/GuiGrid.java +++ b/src/main/java/refinedstorage/gui/GuiGrid.java @@ -1,10 +1,5 @@ package refinedstorage.gui; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Comparator; -import java.util.Iterator; -import java.util.List; import net.minecraft.client.audio.PositionedSoundRecord; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.gui.GuiTextField; @@ -19,339 +14,285 @@ import refinedstorage.gui.sidebutton.SideButtonGridSortingDirection; import refinedstorage.gui.sidebutton.SideButtonGridSortingType; import refinedstorage.gui.sidebutton.SideButtonRedstoneMode; import refinedstorage.network.MessageGridCraftingClear; +import refinedstorage.network.MessageGridCraftingPush; import refinedstorage.network.MessageStoragePull; import refinedstorage.network.MessageStoragePush; import refinedstorage.storage.StorageItem; import refinedstorage.tile.TileController; import refinedstorage.tile.TileGrid; -public class GuiGrid extends GuiBase -{ - private ContainerGrid container; - private TileGrid grid; +import java.io.IOException; +import java.util.*; - private GuiTextField searchField; +public class GuiGrid extends GuiBase { + private ContainerGrid container; + private TileGrid grid; - private int hoveringSlotId; - private int hoveringId; + private List items = new ArrayList(); - private Scrollbar scrollbar = new Scrollbar(174, 20, 12, 70); + private GuiTextField searchField; - public GuiGrid(ContainerGrid container, TileGrid grid) - { - super(container, 193, grid.getType() == EnumGridType.CRAFTING ? 256 : 190); + private int hoveringSlot; + private int hoveringItemId; - this.container = container; - this.grid = grid; - } + private Scrollbar scrollbar; - @Override - public void init(int x, int y) - { - addSideButton(new SideButtonRedstoneMode(grid)); + public GuiGrid(ContainerGrid container, TileGrid grid) { + super(container, 193, grid.getType() == EnumGridType.CRAFTING ? 256 : 208); - addSideButton(new SideButtonGridSortingDirection(grid)); - addSideButton(new SideButtonGridSortingType(grid)); + this.container = container; + this.grid = grid; + this.scrollbar = new Scrollbar(174, 20, 12, grid.getType() == EnumGridType.CRAFTING ? 70 : 88); + } - searchField = new GuiTextField(0, fontRendererObj, x + 80 + 1, y + 6 + 1, 88 - 6, fontRendererObj.FONT_HEIGHT); - searchField.setEnableBackgroundDrawing(false); - searchField.setVisible(true); - searchField.setTextColor(16777215); - searchField.setCanLoseFocus(false); - searchField.setFocused(true); - } + @Override + public void init(int x, int y) { + addSideButton(new SideButtonRedstoneMode(grid)); - @Override - public void update(int x, int y) - { - scrollbar.setCanScroll(getRows() > getVisibleRows()); - } + addSideButton(new SideButtonGridSortingDirection(grid)); + addSideButton(new SideButtonGridSortingType(grid)); - public int getOffset() - { - return (int) (scrollbar.getCurrentScroll() / 70f * (float) getRows()); - } + searchField = new GuiTextField(0, fontRendererObj, x + 80 + 1, y + 6 + 1, 88 - 6, fontRendererObj.FONT_HEIGHT); + searchField.setEnableBackgroundDrawing(false); + searchField.setVisible(true); + searchField.setTextColor(16777215); + searchField.setCanLoseFocus(false); + searchField.setFocused(true); + } - public int getVisibleRows() - { - return 4; - } + @Override + public void update(int x, int y) { + items.clear(); - public int getRows() - { - if (!grid.isConnected()) - { - return 0; - } + if (grid.isConnected()) { + items.addAll(grid.getController().getItems()); - int max = (int) Math.ceil((float) getItems().size() / (float) 9); + if (!searchField.getText().trim().isEmpty()) { + Iterator t = items.iterator(); - return max < 0 ? 0 : max; - } + while (t.hasNext()) { + StorageItem item = t.next(); - private boolean isHoveringOverValidSlot(List items) - { - return grid.isConnected() && isHoveringOverSlot() && hoveringSlotId < items.size(); - } + if (!item.toItemStack().getDisplayName().toLowerCase().contains(searchField.getText().toLowerCase())) { + t.remove(); + } + } + } - private boolean isHoveringOverSlot() - { - return hoveringSlotId >= 0; - } + Collections.sort(items, new Comparator() { + @Override + public int compare(StorageItem o1, StorageItem o2) { + if (grid.getSortingDirection() == TileGrid.SORTING_DIRECTION_ASCENDING) { + return o2.toItemStack().getDisplayName().compareTo(o1.toItemStack().getDisplayName()); + } else if (grid.getSortingDirection() == TileGrid.SORTING_DIRECTION_DESCENDING) { + return o1.toItemStack().getDisplayName().compareTo(o2.toItemStack().getDisplayName()); + } - public boolean isHoveringOverClear(int mouseX, int mouseY) - { - if (grid.getType() == EnumGridType.CRAFTING) - { - return inBounds(81, 105, 7, 7, mouseX, mouseY); - } + return 0; + } + }); - return false; - } + if (grid.getSortingType() == TileGrid.SORTING_TYPE_QUANTITY) { + Collections.sort(items, new Comparator() { + @Override + public int compare(StorageItem o1, StorageItem o2) { + if (grid.getSortingDirection() == TileGrid.SORTING_DIRECTION_ASCENDING) { + return Integer.valueOf(o2.getQuantity()).compareTo(o1.getQuantity()); + } else if (grid.getSortingDirection() == TileGrid.SORTING_DIRECTION_DESCENDING) { + return Integer.valueOf(o1.getQuantity()).compareTo(o2.getQuantity()); + } - @Override - public void drawBackground(int x, int y, int mouseX, int mouseY) - { - if (grid.getType() == EnumGridType.CRAFTING) - { - bindTexture("gui/crafting_grid.png"); - } - else - { - bindTexture("gui/grid.png"); - } + return 0; + } + }); + } + } - drawTexture(x, y, 0, 0, width, height); + scrollbar.setCanScroll(getRows() > getVisibleRows()); + } - scrollbar.draw(this); + public int getOffset() { + return (int) (scrollbar.getCurrentScroll() / 70f * (float) getRows()); + } - searchField.drawTextBox(); - } + public int getRows() { + int max = (int) Math.ceil((float) items.size() / (float) 9); - @Override - public void drawForeground(int mouseX, int mouseY) - { - scrollbar.update(this, mouseX, mouseY); + return max < 0 ? 0 : max; + } - drawString(7, 7, t("gui.refinedstorage:grid")); + private boolean isHoveringOverItemInSlot() { + return grid.isConnected() && isHoveringOverSlot() && hoveringSlot < items.size(); + } - if (grid.getType() == EnumGridType.CRAFTING) - { - drawString(7, 94, t("container.crafting")); - } + private boolean isHoveringOverSlot() { + return hoveringSlot >= 0; + } - drawString(7, grid.getType() == EnumGridType.CRAFTING ? 163 : 96, t("container.inventory")); + public boolean isHoveringOverClear(int mouseX, int mouseY) { + if (grid.getType() == EnumGridType.CRAFTING) { + return inBounds(81, 105, 7, 7, mouseX, mouseY); + } - int x = 8; - int y = 20; + return false; + } - List items = getItems(); + @Override + public void drawBackground(int x, int y, int mouseX, int mouseY) { + if (grid.getType() == EnumGridType.CRAFTING) { + bindTexture("gui/crafting_grid.png"); + } else { + bindTexture("gui/grid.png"); + } - hoveringSlotId = -1; + drawTexture(x, y, 0, 0, width, height); - int slot = getOffset() * 9; + scrollbar.draw(this); - RenderHelper.enableGUIStandardItemLighting(); + searchField.drawTextBox(); + } - for (int i = 0; i < 9 * getVisibleRows(); ++i) - { - if (slot < items.size()) - { - int qty = items.get(slot).getQuantity(); + @Override + public void drawForeground(int mouseX, int mouseY) { + scrollbar.update(this, mouseX, mouseY); - String text; + drawString(7, 7, t("gui.refinedstorage:grid")); - if (qty >= 1000000) - { - text = String.valueOf((int) Math.floor(qty / 1000000)) + "M"; - } - else if (qty >= 1000) - { - text = String.valueOf((int) Math.floor(qty / 1000)) + "K"; - } - else if (qty == 1) - { - text = null; - } - else - { - text = String.valueOf(qty); - } + if (grid.getType() == EnumGridType.CRAFTING) { + drawString(7, 94, t("container.crafting")); + } - drawItem(x, y, items.get(slot).toItemStack(), true, text); - } + drawString(7, grid.getType() == EnumGridType.CRAFTING ? 163 : 113, t("container.inventory")); - if (inBounds(x, y, 16, 16, mouseX, mouseY) || !grid.isConnected()) - { - hoveringSlotId = slot; + int x = 8; + int y = 20; - if (slot < items.size()) - { - // We need to use the ID, because if we filter, the client-side index will change - // while the serverside's index will still be the same. - hoveringId = items.get(slot).getId(); - } + hoveringSlot = -1; - int color = grid.isConnected() ? -2130706433 : 0xFF5B5B5B; + int slot = getOffset() * 9; - GlStateManager.disableLighting(); - GlStateManager.disableDepth(); - zLevel = 190; - GlStateManager.colorMask(true, true, true, false); - drawGradientRect(x, y, x + 16, y + 16, color, color); - zLevel = 0; - GlStateManager.colorMask(true, true, true, true); - GlStateManager.enableLighting(); - GlStateManager.enableDepth(); - } + RenderHelper.enableGUIStandardItemLighting(); - slot++; + for (int i = 0; i < 9 * getVisibleRows(); ++i) { + if (inBounds(x, y, 16, 16, mouseX, mouseY) || !grid.isConnected()) { + hoveringSlot = slot; - x += 18; + if (slot < items.size()) { + // We need to use the ID, because if we filter, the client-side index will change + // while the server-side's index will still be the same. + hoveringItemId = items.get(slot).getId(); + } + } - if ((i + 1) % 9 == 0) - { - x = 8; - y += 18; - } - } + if (slot < items.size()) { + int qty = items.get(slot).getQuantity(); - if (isHoveringOverValidSlot(items)) - { - drawTooltip(mouseX, mouseY, items.get(hoveringSlotId).toItemStack()); - } + String text; - if (isHoveringOverClear(mouseX, mouseY)) - { - drawTooltip(mouseX, mouseY, t("misc.refinedstorage:clear")); - } - } + if (qty >= 1000000) { + text = String.format("%.1f", (float) qty / 1000000).replace(",", ".").replace(".0", "") + "M"; + } else if (qty >= 1000) { + text = String.format("%.1f", (float) qty / 1000).replace(",", ".").replace(".0", "") + "K"; + } else if (qty == 1) { + text = null; + } else { + text = String.valueOf(qty); + } - public List getItems() - { - List items = new ArrayList(); + if (hoveringSlot == slot && GuiScreen.isShiftKeyDown() && qty > 1) { + text = String.valueOf(qty); + } - if (!grid.isConnected()) - { - return items; - } + drawItem(x, y, items.get(slot).toItemStack(), true, text); + } - items.addAll(grid.getController().getItems()); + if (inBounds(x, y, 16, 16, mouseX, mouseY) || !grid.isConnected()) { + int color = grid.isConnected() ? -2130706433 : 0xFF5B5B5B; - if (!searchField.getText().trim().isEmpty()) - { - Iterator t = items.iterator(); + GlStateManager.disableLighting(); + GlStateManager.disableDepth(); + zLevel = 190; + GlStateManager.colorMask(true, true, true, false); + drawGradientRect(x, y, x + 16, y + 16, color, color); + zLevel = 0; + GlStateManager.colorMask(true, true, true, true); + GlStateManager.enableLighting(); + GlStateManager.enableDepth(); + } - while (t.hasNext()) - { - StorageItem item = t.next(); + slot++; - if (!item.toItemStack().getDisplayName().toLowerCase().contains(searchField.getText().toLowerCase())) - { - t.remove(); - } - } - } + x += 18; - items.sort(new Comparator() - { - @Override - public int compare(StorageItem o1, StorageItem o2) - { - if (grid.getSortingDirection() == TileGrid.SORTING_DIRECTION_ASCENDING) - { - return o2.toItemStack().getDisplayName().compareTo(o1.toItemStack().getDisplayName()); - } - else if (grid.getSortingDirection() == TileGrid.SORTING_DIRECTION_DESCENDING) - { - return o1.toItemStack().getDisplayName().compareTo(o2.toItemStack().getDisplayName()); - } + if ((i + 1) % 9 == 0) { + x = 8; + y += 18; + } + } - return 0; - } - }); + if (isHoveringOverItemInSlot()) { + drawTooltip(mouseX, mouseY, items.get(hoveringSlot).toItemStack()); + } - if (grid.getSortingType() == TileGrid.SORTING_TYPE_QUANTITY) - { - items.sort(new Comparator() - { - @Override - public int compare(StorageItem o1, StorageItem o2) - { - if (grid.getSortingDirection() == TileGrid.SORTING_DIRECTION_ASCENDING) - { - return Integer.valueOf(o2.getQuantity()).compareTo(o1.getQuantity()); - } - else if (grid.getSortingDirection() == TileGrid.SORTING_DIRECTION_DESCENDING) - { - return Integer.valueOf(o1.getQuantity()).compareTo(o2.getQuantity()); - } + if (isHoveringOverClear(mouseX, mouseY)) { + drawTooltip(mouseX, mouseY, t("misc.refinedstorage:clear")); + } + } - return 0; - } - }); - } + @Override + public void mouseClicked(int mouseX, int mouseY, int clickedButton) throws IOException { + super.mouseClicked(mouseX, mouseY, clickedButton); - return items; - } + boolean clickedClear = clickedButton == 0 && isHoveringOverClear(mouseX - guiLeft, mouseY - guiTop); - @Override - public void mouseClicked(int mouseX, int mouseY, int clickedButton) throws IOException - { - super.mouseClicked(mouseX, mouseY, clickedButton); + if (grid.isConnected()) { + TileController controller = grid.getController(); - boolean clickedClear = clickedButton == 0 && isHoveringOverClear(mouseX - guiLeft, mouseY - guiTop); + if (isHoveringOverSlot() && container.getPlayer().inventory.getItemStack() != null && (clickedButton == 0 || clickedButton == 1)) { + RefinedStorage.NETWORK.sendToServer(new MessageStoragePush(controller.getPos().getX(), controller.getPos().getY(), controller.getPos().getZ(), -1, clickedButton == 1)); + } else if (isHoveringOverItemInSlot() && container.getPlayer().inventory.getItemStack() == null) { + boolean half = clickedButton == 1; + boolean shift = GuiScreen.isShiftKeyDown(); + boolean one = clickedButton == 2; - if (grid.isConnected()) - { - TileController controller = grid.getController(); + RefinedStorage.NETWORK.sendToServer(new MessageStoragePull(controller.getPos().getX(), controller.getPos().getY(), controller.getPos().getZ(), hoveringItemId, half, one, shift)); + } else if (clickedClear) { + RefinedStorage.NETWORK.sendToServer(new MessageGridCraftingClear(grid)); + } else { + for (Slot slot : container.getPlayerInventorySlots()) { + if (inBounds(slot.xDisplayPosition, slot.yDisplayPosition, 16, 16, mouseX - guiLeft, mouseY - guiTop)) { + if (GuiScreen.isShiftKeyDown()) { + RefinedStorage.NETWORK.sendToServer(new MessageStoragePush(controller.getPos().getX(), controller.getPos().getY(), controller.getPos().getZ(), slot.slotNumber, clickedButton == 1)); + } + } + } - if (isHoveringOverSlot() && container.getPlayer().inventory.getItemStack() != null) - { - RefinedStorage.NETWORK.sendToServer(new MessageStoragePush(controller.getPos().getX(), controller.getPos().getY(), controller.getPos().getZ(), -1, clickedButton == 1)); - } - else if (isHoveringOverValidSlot(getItems()) && container.getPlayer().inventory.getItemStack() == null) - { - boolean half = clickedButton == 1; - boolean shift = GuiScreen.isShiftKeyDown(); - boolean one = clickedButton == 2; + if (grid.getType() == EnumGridType.CRAFTING) { + for (Slot slot : container.getCraftingSlots()) { + if (inBounds(slot.xDisplayPosition, slot.yDisplayPosition, 16, 16, mouseX - guiLeft, mouseY - guiTop)) { + if (GuiScreen.isShiftKeyDown()) { + RefinedStorage.NETWORK.sendToServer(new MessageGridCraftingPush(grid, slot.getSlotIndex())); + } + } + } + } + } + } - RefinedStorage.NETWORK.sendToServer(new MessageStoragePull(controller.getPos().getX(), controller.getPos().getY(), controller.getPos().getZ(), hoveringId, half, one, shift)); - } - else if (clickedClear) - { - RefinedStorage.NETWORK.sendToServer(new MessageGridCraftingClear(grid)); - } - else - { - for (Slot slot : container.getPlayerInventorySlots()) - { - if (inBounds(slot.xDisplayPosition, slot.yDisplayPosition, 16, 16, mouseX - guiLeft, mouseY - guiTop)) - { - if (GuiScreen.isShiftKeyDown()) - { - RefinedStorage.NETWORK.sendToServer(new MessageStoragePush(controller.getPos().getX(), controller.getPos().getY(), controller.getPos().getZ(), slot.slotNumber, clickedButton == 1)); - } - } - } - } - } + if (clickedClear) { + mc.getSoundHandler().playSound(PositionedSoundRecord.getMasterRecord(SoundEvents.ui_button_click, 1.0F)); + } + } - if (clickedClear) - { - mc.getSoundHandler().playSound(PositionedSoundRecord.getMasterRecord(SoundEvents.ui_button_click, 1.0F)); - } - } + @Override + protected void keyTyped(char character, int keyCode) throws IOException { + if (!checkHotbarKeys(keyCode) && searchField.textboxKeyTyped(character, keyCode)) { + } else { + super.keyTyped(character, keyCode); + } + } - @Override - protected void keyTyped(char character, int keyCode) throws IOException - { - if (!checkHotbarKeys(keyCode) && searchField.textboxKeyTyped(character, keyCode)) - { - } - else - { - super.keyTyped(character, keyCode); - } - } + public int getVisibleRows() { + return grid.getType() == EnumGridType.CRAFTING ? 4 : 5; + } } diff --git a/src/main/java/refinedstorage/gui/GuiHandler.java b/src/main/java/refinedstorage/gui/GuiHandler.java old mode 100644 new mode 100755 index 11b33452a..04f8ccf15 --- a/src/main/java/refinedstorage/gui/GuiHandler.java +++ b/src/main/java/refinedstorage/gui/GuiHandler.java @@ -11,84 +11,74 @@ import refinedstorage.container.*; import refinedstorage.storage.IStorageGui; import refinedstorage.tile.*; -public class GuiHandler implements IGuiHandler -{ - private Container getContainer(int ID, EntityPlayer player, TileEntity tile) - { - switch (ID) - { - case RefinedStorageGui.CONTROLLER: - return new ContainerController(player); - case RefinedStorageGui.GRID: - return new ContainerGrid(player, (TileGrid) tile); - case RefinedStorageGui.DRIVE: - return new ContainerDrive(player, (TileDrive) tile); - case RefinedStorageGui.IMPORTER: - return new ContainerImporter(player, (TileImporter) tile); - case RefinedStorageGui.EXPORTER: - return new ContainerExporter(player, (TileExporter) tile); - case RefinedStorageGui.DETECTOR: - return new ContainerDetector(player, (TileDetector) tile); - case RefinedStorageGui.SOLDERER: - return new ContainerSolderer(player, (TileSolderer) tile); - case RefinedStorageGui.WIRELESS_TRANSMITTER: - return new ContainerWirelessTransmitter(player, (TileWirelessTransmitter) tile); - case RefinedStorageGui.DESTRUCTOR: - return new ContainerDestructor(player); - case RefinedStorageGui.CONSTRUCTOR: - return new ContainerConstructor(player, (TileConstructor) tile); - case RefinedStorageGui.STORAGE: - return new ContainerStorage(player, ((IStorageGui) tile).getInventory()); - case RefinedStorageGui.RELAY: - return new ContainerRelay(player); - case RefinedStorageGui.INTERFACE: - return new ContainerInterface(player, (TileInterface) tile); - default: - return null; - } - } +public class GuiHandler implements IGuiHandler { + private Container getContainer(int ID, EntityPlayer player, TileEntity tile) { + switch (ID) { + case RefinedStorageGui.CONTROLLER: + return new ContainerController(player); + case RefinedStorageGui.GRID: + return new ContainerGrid(player, (TileGrid) tile); + case RefinedStorageGui.DISK_DRIVE: + return new ContainerDiskDrive(player, (TileDiskDrive) tile); + case RefinedStorageGui.IMPORTER: + return new ContainerImporter(player, (TileImporter) tile); + case RefinedStorageGui.EXPORTER: + return new ContainerExporter(player, (TileExporter) tile); + case RefinedStorageGui.DETECTOR: + return new ContainerDetector(player, (TileDetector) tile); + case RefinedStorageGui.SOLDERER: + return new ContainerSolderer(player, (TileSolderer) tile); + case RefinedStorageGui.DESTRUCTOR: + return new ContainerDestructor(player, (TileDestructor) tile); + case RefinedStorageGui.CONSTRUCTOR: + return new ContainerConstructor(player, (TileConstructor) tile); + case RefinedStorageGui.STORAGE: + return new ContainerStorage(player, ((IStorageGui) tile).getInventory()); + case RefinedStorageGui.RELAY: + return new ContainerRelay(player); + case RefinedStorageGui.INTERFACE: + return new ContainerInterface(player, (TileInterface) tile); + default: + return null; + } + } - @Override - public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) - { - return getContainer(ID, player, world.getTileEntity(new BlockPos(x, y, z))); - } + @Override + public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { + return getContainer(ID, player, world.getTileEntity(new BlockPos(x, y, z))); + } - @Override - public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) - { - TileEntity tile = world.getTileEntity(new BlockPos(x, y, z)); + @Override + public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { + TileEntity tile = world.getTileEntity(new BlockPos(x, y, z)); - switch (ID) - { - case RefinedStorageGui.CONTROLLER: - return new GuiController((ContainerController) getContainer(ID, player, tile), (TileController) tile); - case RefinedStorageGui.GRID: - return new GuiGrid((ContainerGrid) getContainer(ID, player, tile), (TileGrid) tile); - case RefinedStorageGui.DRIVE: - return new GuiStorage((ContainerStorage) getContainer(ID, player, tile), (IStorageGui) tile, "gui/drive.png"); - case RefinedStorageGui.IMPORTER: - return new GuiImporter((ContainerImporter) getContainer(ID, player, tile), (TileImporter) tile); - case RefinedStorageGui.EXPORTER: - return new GuiExporter((ContainerExporter) getContainer(ID, player, tile), (TileExporter) tile); - case RefinedStorageGui.DETECTOR: - return new GuiDetector((ContainerDetector) getContainer(ID, player, tile), (TileDetector) tile); - case RefinedStorageGui.SOLDERER: - return new GuiSolderer((ContainerSolderer) getContainer(ID, player, tile), (TileSolderer) tile); - case RefinedStorageGui.WIRELESS_TRANSMITTER: - return new GuiWirelessTransmitter((ContainerWirelessTransmitter) getContainer(ID, player, tile), (TileWirelessTransmitter) tile); - case RefinedStorageGui.DESTRUCTOR: - return new GuiDestructor((ContainerDestructor) getContainer(ID, player, tile), (TileDestructor) tile); - case RefinedStorageGui.CONSTRUCTOR: - return new GuiConstructor((ContainerConstructor) getContainer(ID, player, tile), (TileConstructor) tile); - case RefinedStorageGui.STORAGE: - return new GuiStorage((ContainerStorage) getContainer(ID, player, tile), (IStorageGui) tile); - case RefinedStorageGui.RELAY: - return new GuiRelay((ContainerRelay) getContainer(ID, player, tile), (TileRelay) tile); - case RefinedStorageGui.INTERFACE: - return new GuiInterface((ContainerInterface) getContainer(ID, player, tile), (TileInterface) tile); - default: - return null; - } - } + switch (ID) { + case RefinedStorageGui.CONTROLLER: + return new GuiController((ContainerController) getContainer(ID, player, tile), (TileController) tile); + case RefinedStorageGui.GRID: + return new GuiGrid((ContainerGrid) getContainer(ID, player, tile), (TileGrid) tile); + case RefinedStorageGui.DISK_DRIVE: + return new GuiStorage((ContainerStorage) getContainer(ID, player, tile), (IStorageGui) tile, "gui/disk_drive.png"); + case RefinedStorageGui.IMPORTER: + return new GuiImporter((ContainerImporter) getContainer(ID, player, tile), (TileImporter) tile); + case RefinedStorageGui.EXPORTER: + return new GuiExporter((ContainerExporter) getContainer(ID, player, tile), (TileExporter) tile); + case RefinedStorageGui.DETECTOR: + return new GuiDetector((ContainerDetector) getContainer(ID, player, tile), (TileDetector) tile); + case RefinedStorageGui.SOLDERER: + return new GuiSolderer((ContainerSolderer) getContainer(ID, player, tile), (TileSolderer) tile); + case RefinedStorageGui.DESTRUCTOR: + return new GuiDestructor((ContainerDestructor) getContainer(ID, player, tile), (TileDestructor) tile); + case RefinedStorageGui.CONSTRUCTOR: + return new GuiConstructor((ContainerConstructor) getContainer(ID, player, tile), (TileConstructor) tile); + case RefinedStorageGui.STORAGE: + return new GuiStorage((ContainerStorage) getContainer(ID, player, tile), (IStorageGui) tile); + case RefinedStorageGui.RELAY: + return new GuiRelay((ContainerRelay) getContainer(ID, player, tile), (TileRelay) tile); + case RefinedStorageGui.INTERFACE: + return new GuiInterface((ContainerInterface) getContainer(ID, player, tile), (TileInterface) tile); + default: + return null; + } + } } diff --git a/src/main/java/refinedstorage/gui/GuiImporter.java b/src/main/java/refinedstorage/gui/GuiImporter.java old mode 100644 new mode 100755 index 398cd8757..521168749 --- a/src/main/java/refinedstorage/gui/GuiImporter.java +++ b/src/main/java/refinedstorage/gui/GuiImporter.java @@ -7,45 +7,39 @@ import refinedstorage.gui.sidebutton.SideButtonRedstoneMode; import refinedstorage.tile.TileImporter; import refinedstorage.util.InventoryUtils; -public class GuiImporter extends GuiBase -{ - private TileImporter importer; +public class GuiImporter extends GuiBase { + private TileImporter importer; - public GuiImporter(ContainerImporter container, TileImporter importer) - { - super(container, 176, 137); + public GuiImporter(ContainerImporter container, TileImporter importer) { + super(container, 176, 137); - this.importer = importer; - } + this.importer = importer; + } - @Override - public void init(int x, int y) - { - addSideButton(new SideButtonRedstoneMode(importer)); + @Override + public void init(int x, int y) { + addSideButton(new SideButtonRedstoneMode(importer)); - addSideButton(new SideButtonMode(importer)); + addSideButton(new SideButtonMode(importer)); - addSideButton(new SideButtonCompare(importer, InventoryUtils.COMPARE_DAMAGE)); - addSideButton(new SideButtonCompare(importer, InventoryUtils.COMPARE_NBT)); - } + addSideButton(new SideButtonCompare(importer, InventoryUtils.COMPARE_DAMAGE)); + addSideButton(new SideButtonCompare(importer, InventoryUtils.COMPARE_NBT)); + } - @Override - public void update(int x, int y) - { - } + @Override + public void update(int x, int y) { + } - @Override - public void drawBackground(int x, int y, int mouseX, int mouseY) - { - bindTexture("gui/importer.png"); + @Override + public void drawBackground(int x, int y, int mouseX, int mouseY) { + bindTexture("gui/importer.png"); - drawTexture(x, y, 0, 0, width, height); - } + drawTexture(x, y, 0, 0, width, height); + } - @Override - public void drawForeground(int mouseX, int mouseY) - { - drawString(7, 7, t("gui.refinedstorage:importer")); - drawString(7, 43, t("container.inventory")); - } + @Override + public void drawForeground(int mouseX, int mouseY) { + drawString(7, 7, t("gui.refinedstorage:importer")); + drawString(7, 43, t("container.inventory")); + } } diff --git a/src/main/java/refinedstorage/gui/GuiInterface.java b/src/main/java/refinedstorage/gui/GuiInterface.java old mode 100644 new mode 100755 index d7deb39a1..6242b976d --- a/src/main/java/refinedstorage/gui/GuiInterface.java +++ b/src/main/java/refinedstorage/gui/GuiInterface.java @@ -6,53 +6,38 @@ import refinedstorage.gui.sidebutton.SideButtonRedstoneMode; import refinedstorage.tile.TileInterface; import refinedstorage.util.InventoryUtils; -public class GuiInterface extends GuiBase -{ - private TileInterface tile; +public class GuiInterface extends GuiBase { + private TileInterface tile; - public GuiInterface(ContainerInterface container, TileInterface tile) - { - super(container, 176, 218); + public GuiInterface(ContainerInterface container, TileInterface tile) { + super(container, 176, 218); - this.tile = tile; - } + this.tile = tile; + } - @Override - public void init(int x, int y) - { - addSideButton(new SideButtonRedstoneMode(tile)); + @Override + public void init(int x, int y) { + addSideButton(new SideButtonRedstoneMode(tile)); - addSideButton(new SideButtonCompare(tile, InventoryUtils.COMPARE_DAMAGE)); - addSideButton(new SideButtonCompare(tile, InventoryUtils.COMPARE_NBT)); - } + addSideButton(new SideButtonCompare(tile, InventoryUtils.COMPARE_DAMAGE)); + addSideButton(new SideButtonCompare(tile, InventoryUtils.COMPARE_NBT)); + } - @Override - public void update(int x, int y) - { - } + @Override + public void update(int x, int y) { + } - @Override - public void drawBackground(int x, int y, int mouseX, int mouseY) - { - bindTexture("gui/interface.png"); + @Override + public void drawBackground(int x, int y, int mouseX, int mouseY) { + bindTexture("gui/interface.png"); - drawTexture(x, y, 0, 0, width, height); - } + drawTexture(x, y, 0, 0, width, height); + } - @Override - public void drawForeground(int mouseX, int mouseY) - { - drawString(7, 7, t("gui.refinedstorage:interface.import")); - drawString(7, 42, t("gui.refinedstorage:interface.export")); - drawString(7, 123, t("container.inventory")); - - if (inBounds(162, 42, 7, 7, mouseX, mouseY)) - { - String message = t("gui.refinedstorage:interface.export.explanation.0"); - message += "\n" + t("gui.refinedstorage:interface.export.explanation.1"); - message += "\n" + t("gui.refinedstorage:interface.export.explanation.2"); - - drawTooltip(mouseX, mouseY, message); - } - } + @Override + public void drawForeground(int mouseX, int mouseY) { + drawString(7, 7, t("gui.refinedstorage:interface.import")); + drawString(7, 42, t("gui.refinedstorage:interface.export")); + drawString(7, 123, t("container.inventory")); + } } diff --git a/src/main/java/refinedstorage/gui/GuiRelay.java b/src/main/java/refinedstorage/gui/GuiRelay.java old mode 100644 new mode 100755 index e1cfefd9e..b50810d9b --- a/src/main/java/refinedstorage/gui/GuiRelay.java +++ b/src/main/java/refinedstorage/gui/GuiRelay.java @@ -4,40 +4,34 @@ import refinedstorage.container.ContainerRelay; import refinedstorage.gui.sidebutton.SideButtonRedstoneMode; import refinedstorage.tile.TileRelay; -public class GuiRelay extends GuiBase -{ - private TileRelay relay; +public class GuiRelay extends GuiBase { + private TileRelay relay; - public GuiRelay(ContainerRelay container, TileRelay relay) - { - super(container, 176, 131); + public GuiRelay(ContainerRelay container, TileRelay relay) { + super(container, 176, 131); - this.relay = relay; - } + this.relay = relay; + } - @Override - public void init(int x, int y) - { - addSideButton(new SideButtonRedstoneMode(relay)); - } + @Override + public void init(int x, int y) { + addSideButton(new SideButtonRedstoneMode(relay)); + } - @Override - public void update(int x, int y) - { - } + @Override + public void update(int x, int y) { + } - @Override - public void drawBackground(int x, int y, int mouseX, int mouseY) - { - bindTexture("gui/relay.png"); + @Override + public void drawBackground(int x, int y, int mouseX, int mouseY) { + bindTexture("gui/relay.png"); - drawTexture(x, y, 0, 0, width, height); - } + drawTexture(x, y, 0, 0, width, height); + } - @Override - public void drawForeground(int mouseX, int mouseY) - { - drawString(7, 7, t("gui.refinedstorage:relay")); - drawString(7, 39, t("container.inventory")); - } + @Override + public void drawForeground(int mouseX, int mouseY) { + drawString(7, 7, t("gui.refinedstorage:relay")); + drawString(7, 39, t("container.inventory")); + } } diff --git a/src/main/java/refinedstorage/gui/GuiSolderer.java b/src/main/java/refinedstorage/gui/GuiSolderer.java old mode 100644 new mode 100755 index 01903ac42..3cfb316f9 --- a/src/main/java/refinedstorage/gui/GuiSolderer.java +++ b/src/main/java/refinedstorage/gui/GuiSolderer.java @@ -1,48 +1,41 @@ package refinedstorage.gui; -import net.minecraft.inventory.Container; +import refinedstorage.container.ContainerSolderer; import refinedstorage.gui.sidebutton.SideButtonRedstoneMode; import refinedstorage.tile.TileSolderer; -public class GuiSolderer extends GuiBase -{ - private TileSolderer solderer; +public class GuiSolderer extends GuiBase { + private TileSolderer solderer; - public GuiSolderer(Container container, TileSolderer solderer) - { - super(container, 176, 177); + public GuiSolderer(ContainerSolderer container, TileSolderer solderer) { + super(container, 176, 177); - this.solderer = solderer; - } + this.solderer = solderer; + } - @Override - public void init(int x, int y) - { - addSideButton(new SideButtonRedstoneMode(solderer)); - } + @Override + public void init(int x, int y) { + addSideButton(new SideButtonRedstoneMode(solderer)); + } - @Override - public void update(int x, int y) - { - } + @Override + public void update(int x, int y) { + } - @Override - public void drawBackground(int x, int y, int mouseX, int mouseY) - { - bindTexture("gui/solderer.png"); + @Override + public void drawBackground(int x, int y, int mouseX, int mouseY) { + bindTexture("gui/solderer.png"); - drawTexture(x, y, 0, 0, width, height); + drawTexture(x, y, 0, 0, width, height); - if (solderer.isWorking()) - { - drawTexture(x + 83, y + 40 - 1, 177, 0, solderer.getProgressScaled(22), 15); - } - } + if (solderer.isWorking()) { + drawTexture(x + 83, y + 40 - 1, 177, 0, solderer.getProgressScaled(22), 15); + } + } - @Override - public void drawForeground(int mouseX, int mouseY) - { - drawString(7, 7, t("gui.refinedstorage:solderer")); - drawString(7, 82, t("container.inventory")); - } + @Override + public void drawForeground(int mouseX, int mouseY) { + drawString(7, 7, t("gui.refinedstorage:solderer")); + drawString(7, 82, t("container.inventory")); + } } diff --git a/src/main/java/refinedstorage/gui/GuiStorage.java b/src/main/java/refinedstorage/gui/GuiStorage.java old mode 100644 new mode 100755 index ad60dacb6..e1f1b106b --- a/src/main/java/refinedstorage/gui/GuiStorage.java +++ b/src/main/java/refinedstorage/gui/GuiStorage.java @@ -1,7 +1,6 @@ package refinedstorage.gui; import com.google.common.primitives.Ints; -import java.io.IOException; import net.minecraft.client.gui.GuiTextField; import refinedstorage.container.ContainerStorage; import refinedstorage.gui.sidebutton.SideButtonCompare; @@ -10,114 +9,99 @@ import refinedstorage.gui.sidebutton.SideButtonRedstoneMode; import refinedstorage.storage.IStorageGui; import refinedstorage.util.InventoryUtils; -public class GuiStorage extends GuiBase -{ - private IStorageGui gui; - private String texture; +import java.io.IOException; - private GuiTextField priorityField; +public class GuiStorage extends GuiBase { + private IStorageGui gui; + private String texture; - private int barX = 8; - private int barY = 54; - private int barWidth = 16; - private int barHeight = 58; + private GuiTextField priorityField; - public GuiStorage(ContainerStorage container, IStorageGui gui, String texture) - { - super(container, 176, 211); + private int barX = 8; + private int barY = 54; + private int barWidth = 16; + private int barHeight = 58; - this.gui = gui; - this.texture = texture; - } + public GuiStorage(ContainerStorage container, IStorageGui gui, String texture) { + super(container, 176, 211); - public GuiStorage(ContainerStorage container, IStorageGui gui) - { - this(container, gui, "gui/storage.png"); - } + this.gui = gui; + this.texture = texture; + } - @Override - public void init(int x, int y) - { - if (gui.getRedstoneModeSetting() != null) - { - addSideButton(new SideButtonRedstoneMode(gui.getRedstoneModeSetting())); - } + public GuiStorage(ContainerStorage container, IStorageGui gui) { + this(container, gui, "gui/storage.png"); + } - if (gui.getModeSetting() != null) - { - addSideButton(new SideButtonMode(gui.getModeSetting())); - } + @Override + public void init(int x, int y) { + if (gui.getRedstoneModeSetting() != null) { + addSideButton(new SideButtonRedstoneMode(gui.getRedstoneModeSetting())); + } - if (gui.getCompareSetting() != null) - { - addSideButton(new SideButtonCompare(gui.getCompareSetting(), InventoryUtils.COMPARE_DAMAGE)); - addSideButton(new SideButtonCompare(gui.getCompareSetting(), InventoryUtils.COMPARE_NBT)); - } + if (gui.getModeSetting() != null) { + addSideButton(new SideButtonMode(gui.getModeSetting())); + } - priorityField = new GuiTextField(0, fontRendererObj, x + 98 + 1, y + 54 + 1, 25, fontRendererObj.FONT_HEIGHT); - priorityField.setText(String.valueOf(gui.getPriority())); - priorityField.setEnableBackgroundDrawing(false); - priorityField.setVisible(true); - priorityField.setTextColor(16777215); - priorityField.setCanLoseFocus(false); - priorityField.setFocused(true); - } + if (gui.getCompareSetting() != null) { + addSideButton(new SideButtonCompare(gui.getCompareSetting(), InventoryUtils.COMPARE_DAMAGE)); + addSideButton(new SideButtonCompare(gui.getCompareSetting(), InventoryUtils.COMPARE_NBT)); + } - @Override - public void update(int x, int y) - { - } + priorityField = new GuiTextField(0, fontRendererObj, x + 98 + 1, y + 54 + 1, 25, fontRendererObj.FONT_HEIGHT); + priorityField.setText(String.valueOf(gui.getPriority())); + priorityField.setEnableBackgroundDrawing(false); + priorityField.setVisible(true); + priorityField.setTextColor(16777215); + priorityField.setCanLoseFocus(false); + priorityField.setFocused(true); + } - @Override - public void drawBackground(int x, int y, int mouseX, int mouseY) - { - bindTexture(texture); + @Override + public void update(int x, int y) { + } - drawTexture(x, y, 0, 0, width, height); + @Override + public void drawBackground(int x, int y, int mouseX, int mouseY) { + bindTexture(texture); - int barHeightNew = (int) ((float) gui.getStored() / (float) gui.getCapacity() * (float) barHeight); + drawTexture(x, y, 0, 0, width, height); - drawTexture(x + barX, y + barY + barHeight - barHeightNew, 179, 0 + (barHeight - barHeightNew), barWidth, barHeightNew); + int barHeightNew = (int) ((float) gui.getStored() / (float) gui.getCapacity() * (float) barHeight); - priorityField.drawTextBox(); - } + drawTexture(x + barX, y + barY + barHeight - barHeightNew, 179, barHeight - barHeightNew, barWidth, barHeightNew); - @Override - public void drawForeground(int mouseX, int mouseY) - { - drawString(7, 7, t(gui.getName())); - drawString(7, 42, gui.getCapacity() == -1 ? t("misc.refinedstorage:storage.stored_minimal", gui.getStored()) : t("misc.refinedstorage:storage.stored_capacity_minimal", gui.getStored(), gui.getCapacity())); - drawString(97, 42, t("misc.refinedstorage:priority")); - drawString(7, 117, t("container.inventory")); + priorityField.drawTextBox(); + } - if (inBounds(barX, barY, barWidth, barHeight, mouseX, mouseY)) - { - int full = 0; + @Override + public void drawForeground(int mouseX, int mouseY) { + drawString(7, 7, t(gui.getName())); + drawString(7, 42, gui.getCapacity() == -1 ? t("misc.refinedstorage:storage.stored_minimal", gui.getStored()) : t("misc.refinedstorage:storage.stored_capacity_minimal", gui.getStored(), gui.getCapacity())); + drawString(97, 42, t("misc.refinedstorage:priority")); + drawString(7, 117, t("container.inventory")); - if (gui.getCapacity() >= 0) - { - full = (int) ((float) gui.getStored() / (float) gui.getCapacity() * 100f); - } + if (inBounds(barX, barY, barWidth, barHeight, mouseX, mouseY)) { + int full = 0; - drawTooltip(mouseX, mouseY, t("misc.refinedstorage:storage.full", full)); - } - } + if (gui.getCapacity() >= 0) { + full = (int) ((float) gui.getStored() / (float) gui.getCapacity() * 100f); + } - @Override - protected void keyTyped(char character, int keyCode) throws IOException - { - if (!checkHotbarKeys(keyCode) && priorityField.textboxKeyTyped(character, keyCode)) - { - Integer result = Ints.tryParse(priorityField.getText()); + drawTooltip(mouseX, mouseY, t("misc.refinedstorage:storage.full", full)); + } + } - if (result != null) - { - gui.onPriorityChanged(result); - } - } - else - { - super.keyTyped(character, keyCode); - } - } + @Override + protected void keyTyped(char character, int keyCode) throws IOException { + if (!checkHotbarKeys(keyCode) && priorityField.textboxKeyTyped(character, keyCode)) { + Integer result = Ints.tryParse(priorityField.getText()); + + if (result != null) { + gui.onPriorityChanged(result); + } + } else { + super.keyTyped(character, keyCode); + } + } } diff --git a/src/main/java/refinedstorage/gui/GuiWirelessTransmitter.java b/src/main/java/refinedstorage/gui/GuiWirelessTransmitter.java deleted file mode 100644 index 530cf0681..000000000 --- a/src/main/java/refinedstorage/gui/GuiWirelessTransmitter.java +++ /dev/null @@ -1,57 +0,0 @@ -package refinedstorage.gui; - -import net.minecraft.inventory.Container; -import refinedstorage.gui.sidebutton.SideButtonRedstoneMode; -import refinedstorage.tile.TileWirelessTransmitter; - -public class GuiWirelessTransmitter extends GuiBase -{ - private TileWirelessTransmitter wirelessTransmitter; - - public GuiWirelessTransmitter(Container container, TileWirelessTransmitter wirelessTransmitter) - { - super(container, 176, 137); - - this.wirelessTransmitter = wirelessTransmitter; - } - - @Override - public void init(int x, int y) - { - addSideButton(new SideButtonRedstoneMode(wirelessTransmitter)); - } - - @Override - public void update(int x, int y) - { - } - - @Override - public void drawBackground(int x, int y, int mouseX, int mouseY) - { - bindTexture("gui/wireless_transmitter.png"); - - drawTexture(x, y, 0, 0, width, height); - - if (wirelessTransmitter.isWorking()) - { - int progress = (int) ((float) wirelessTransmitter.getProgress() / (float) TileWirelessTransmitter.TOTAL_PROGRESS * 14f); - - drawTexture(x + 36 - 1, y + 21 - 1 + progress, 178, 0 + progress, 14, 14); - } - } - - @Override - public void drawForeground(int mouseX, int mouseY) - { - drawString(7, 7, t("gui.refinedstorage:wireless_transmitter")); - drawString(7, 43, t("container.inventory")); - - if (inBounds(36, 21, 14, 14, mouseX, mouseY) && wirelessTransmitter.isWorking()) - { - int workRemaining = (int) (((float) (TileWirelessTransmitter.TOTAL_PROGRESS - wirelessTransmitter.getProgress())) / (float) TileWirelessTransmitter.TOTAL_PROGRESS * 100f); - - drawTooltip(mouseX, mouseY, workRemaining + "%"); - } - } -} diff --git a/src/main/java/refinedstorage/gui/Scrollbar.java b/src/main/java/refinedstorage/gui/Scrollbar.java old mode 100644 new mode 100755 index 6a1fe734c..f79aa0dcf --- a/src/main/java/refinedstorage/gui/Scrollbar.java +++ b/src/main/java/refinedstorage/gui/Scrollbar.java @@ -2,110 +2,91 @@ package refinedstorage.gui; import org.lwjgl.input.Mouse; -public class Scrollbar -{ - private boolean canScroll = true; +public class Scrollbar { + private boolean canScroll = true; - private int x; - private int y; - private int scrollbarWidth; - private int scrollbarHeight; + private int x; + private int y; + private int scrollbarWidth; + private int scrollbarHeight; - private float currentScroll; - private boolean wasClicking = false; - private boolean isScrolling = false; + private float currentScroll; + private boolean wasClicking = false; + private boolean isScrolling = false; - public Scrollbar(int x, int y, int scrollbarWidth, int scrollbarHeight) - { - this.x = x; - this.y = y; - this.scrollbarWidth = scrollbarWidth; - this.scrollbarHeight = scrollbarHeight; - } + public Scrollbar(int x, int y, int scrollbarWidth, int scrollbarHeight) { + this.x = x; + this.y = y; + this.scrollbarWidth = scrollbarWidth; + this.scrollbarHeight = scrollbarHeight; + } - public void setCanScroll(boolean canScroll) - { - this.canScroll = canScroll; - } + public void setCanScroll(boolean canScroll) { + this.canScroll = canScroll; + } - public boolean canScroll() - { - return canScroll; - } + public boolean canScroll() { + return canScroll; + } - public float getCurrentScroll() - { - return currentScroll; - } + public float getCurrentScroll() { + return currentScroll; + } - public void setCurrentScroll(float newCurrentScroll) - { - if (newCurrentScroll < 0) - { - newCurrentScroll = 0; - } + public void setCurrentScroll(float newCurrentScroll) { + if (newCurrentScroll < 0) { + newCurrentScroll = 0; + } - int scrollbarItselfHeight = 12; + int scrollbarItselfHeight = 12; - int max = scrollbarHeight - scrollbarItselfHeight - 3; + int max = scrollbarHeight - scrollbarItselfHeight - 3; - if (newCurrentScroll > max) - { - newCurrentScroll = max; - } + if (newCurrentScroll > max) { + newCurrentScroll = max; + } - currentScroll = newCurrentScroll; - } + currentScroll = newCurrentScroll; + } - public void draw(GuiBase gui) - { - gui.bindTexture("icons.png"); - gui.drawTexture(gui.guiLeft + x, gui.guiTop + y + (int) currentScroll, canScroll() ? 232 : 244, 0, 12, 15); - } + public void draw(GuiBase gui) { + gui.bindTexture("icons.png"); + gui.drawTexture(gui.guiLeft + x, gui.guiTop + y + (int) currentScroll, canScroll() ? 232 : 244, 0, 12, 15); + } - public void update(GuiBase gui, int mouseX, int mouseY) - { - if (!canScroll()) - { - isScrolling = false; - wasClicking = false; - currentScroll = 0; - } - else - { - int wheel = Mouse.getDWheel(); + public void update(GuiBase gui, int mouseX, int mouseY) { + if (!canScroll()) { + isScrolling = false; + wasClicking = false; + currentScroll = 0; + } else { + int wheel = Mouse.getDWheel(); - wheel = Math.max(Math.min(-wheel, 1), -1); + wheel = Math.max(Math.min(-wheel, 1), -1); - float delta = 15; + float delta = 15; - if (wheel == -1) - { - setCurrentScroll(currentScroll - delta); - } - else if (wheel == 1) - { - setCurrentScroll(currentScroll + delta); - } + if (wheel == -1) { + setCurrentScroll(currentScroll - delta); + } else if (wheel == 1) { + setCurrentScroll(currentScroll + delta); + } - boolean down = Mouse.isButtonDown(0); + boolean down = Mouse.isButtonDown(0); - if (!wasClicking && down && gui.inBounds(x, y, scrollbarWidth, scrollbarHeight, mouseX, mouseY)) - { - isScrolling = true; - } + if (!wasClicking && down && gui.inBounds(x, y, scrollbarWidth, scrollbarHeight, mouseX, mouseY)) { + isScrolling = true; + } - if (!down) - { - isScrolling = false; - } + if (!down) { + isScrolling = false; + } - wasClicking = down; + wasClicking = down; - if (isScrolling) - { - setCurrentScroll(mouseY - 20); - } - } - } + if (isScrolling) { + setCurrentScroll(mouseY - 20); + } + } + } } diff --git a/src/main/java/refinedstorage/gui/sidebutton/SideButton.java b/src/main/java/refinedstorage/gui/sidebutton/SideButton.java old mode 100644 new mode 100755 index 6a1de411d..ce2e9faf0 --- a/src/main/java/refinedstorage/gui/sidebutton/SideButton.java +++ b/src/main/java/refinedstorage/gui/sidebutton/SideButton.java @@ -2,45 +2,38 @@ package refinedstorage.gui.sidebutton; import refinedstorage.gui.GuiBase; -public abstract class SideButton -{ - private int id; - private int x; - private int y; +public abstract class SideButton { + private int id; + private int x; + private int y; - public int getId() - { - return id; - } + public int getId() { + return id; + } - public void setId(int id) - { - this.id = id; - } + public void setId(int id) { + this.id = id; + } - public int getX() - { - return x; - } + public int getX() { + return x; + } - public void setX(int x) - { - this.x = x; - } + public void setX(int x) { + this.x = x; + } - public int getY() - { - return y; - } + public int getY() { + return y; + } - public void setY(int y) - { - this.y = y; - } + public void setY(int y) { + this.y = y; + } - public abstract String getTooltip(GuiBase gui); + public abstract String getTooltip(GuiBase gui); - public abstract void draw(GuiBase gui, int x, int y); + public abstract void draw(GuiBase gui, int x, int y); - public abstract void actionPerformed(); + public abstract void actionPerformed(); } diff --git a/src/main/java/refinedstorage/gui/sidebutton/SideButtonCompare.java b/src/main/java/refinedstorage/gui/sidebutton/SideButtonCompare.java old mode 100644 new mode 100755 index 9180ad1c3..f2bde9452 --- a/src/main/java/refinedstorage/gui/sidebutton/SideButtonCompare.java +++ b/src/main/java/refinedstorage/gui/sidebutton/SideButtonCompare.java @@ -7,60 +7,49 @@ import refinedstorage.network.MessageCompareUpdate; import refinedstorage.tile.settings.ICompareSetting; import refinedstorage.util.InventoryUtils; -public class SideButtonCompare extends SideButton -{ - private ICompareSetting setting; - private int mask; +public class SideButtonCompare extends SideButton { + private ICompareSetting setting; + private int mask; - public SideButtonCompare(ICompareSetting setting, int mask) - { - this.setting = setting; - this.mask = mask; - } + public SideButtonCompare(ICompareSetting setting, int mask) { + this.setting = setting; + this.mask = mask; + } - @Override - public String getTooltip(GuiBase gui) - { - StringBuilder builder = new StringBuilder(); + @Override + public String getTooltip(GuiBase gui) { + StringBuilder builder = new StringBuilder(); - builder.append(TextFormatting.YELLOW).append(gui.t("sidebutton.refinedstorage:compare." + mask)).append(TextFormatting.RESET).append("\n"); + builder.append(TextFormatting.YELLOW).append(gui.t("sidebutton.refinedstorage:compare." + mask)).append(TextFormatting.RESET).append("\n"); - if ((setting.getCompare() & mask) == mask) - { - builder.append(gui.t("misc.refinedstorage:yes")); - } - else - { - builder.append(gui.t("misc.refinedstorage:no")); - } + if ((setting.getCompare() & mask) == mask) { + builder.append(gui.t("misc.refinedstorage:yes")); + } else { + builder.append(gui.t("misc.refinedstorage:no")); + } - return builder.toString(); - } + return builder.toString(); + } - @Override - public void draw(GuiBase gui, int x, int y) - { - gui.bindTexture("icons.png"); + @Override + public void draw(GuiBase gui, int x, int y) { + gui.bindTexture("icons.png"); - int ty = 0; + int ty = 0; - if (mask == InventoryUtils.COMPARE_DAMAGE) - { - ty = 80; - } - else if (mask == InventoryUtils.COMPARE_NBT) - { - ty = 48; - } + if (mask == InventoryUtils.COMPARE_DAMAGE) { + ty = 80; + } else if (mask == InventoryUtils.COMPARE_NBT) { + ty = 48; + } - int tx = (setting.getCompare() & mask) == mask ? 0 : 16; + int tx = (setting.getCompare() & mask) == mask ? 0 : 16; - gui.drawTexture(x, y + 2, tx, ty, 16, 16); - } + gui.drawTexture(x, y + 2, tx, ty, 16, 16); + } - @Override - public void actionPerformed() - { - RefinedStorage.NETWORK.sendToServer(new MessageCompareUpdate(setting, setting.getCompare() ^ mask)); - } + @Override + public void actionPerformed() { + RefinedStorage.NETWORK.sendToServer(new MessageCompareUpdate(setting, setting.getCompare() ^ mask)); + } } diff --git a/src/main/java/refinedstorage/gui/sidebutton/SideButtonDetectorMode.java b/src/main/java/refinedstorage/gui/sidebutton/SideButtonDetectorMode.java old mode 100644 new mode 100755 index f7da67f5b..43bd88417 --- a/src/main/java/refinedstorage/gui/sidebutton/SideButtonDetectorMode.java +++ b/src/main/java/refinedstorage/gui/sidebutton/SideButtonDetectorMode.java @@ -8,36 +8,30 @@ import refinedstorage.gui.GuiBase; import refinedstorage.network.MessageDetectorModeUpdate; import refinedstorage.tile.TileDetector; -public class SideButtonDetectorMode extends SideButton -{ - private TileDetector detector; +public class SideButtonDetectorMode extends SideButton { + private TileDetector detector; - public SideButtonDetectorMode(TileDetector detector) - { - this.detector = detector; - } + public SideButtonDetectorMode(TileDetector detector) { + this.detector = detector; + } - @Override - public String getTooltip(GuiBase gui) - { - StringBuilder builder = new StringBuilder(); + @Override + public String getTooltip(GuiBase gui) { + StringBuilder builder = new StringBuilder(); - builder.append(TextFormatting.GREEN).append(gui.t("sidebutton.refinedstorage:detector.mode")).append(TextFormatting.RESET).append("\n"); + builder.append(TextFormatting.GREEN).append(gui.t("sidebutton.refinedstorage:detector.mode")).append(TextFormatting.RESET).append("\n"); + builder.append(gui.t("sidebutton.refinedstorage:detector.mode." + detector.getMode())); - builder.append(gui.t("sidebutton.refinedstorage:detector.mode." + detector.getMode())); + return builder.toString(); + } - return builder.toString(); - } + @Override + public void draw(GuiBase gui, int x, int y) { + gui.drawItem(x, y, new ItemStack(Items.redstone, 1)); + } - @Override - public void draw(GuiBase gui, int x, int y) - { - gui.drawItem(x, y, new ItemStack(Items.redstone, 1)); - } - - @Override - public void actionPerformed() - { - RefinedStorage.NETWORK.sendToServer(new MessageDetectorModeUpdate(detector)); - } + @Override + public void actionPerformed() { + RefinedStorage.NETWORK.sendToServer(new MessageDetectorModeUpdate(detector)); + } } diff --git a/src/main/java/refinedstorage/gui/sidebutton/SideButtonGridSortingDirection.java b/src/main/java/refinedstorage/gui/sidebutton/SideButtonGridSortingDirection.java old mode 100644 new mode 100755 index f0f49dc48..b7ccb59c5 --- a/src/main/java/refinedstorage/gui/sidebutton/SideButtonGridSortingDirection.java +++ b/src/main/java/refinedstorage/gui/sidebutton/SideButtonGridSortingDirection.java @@ -6,48 +6,39 @@ import refinedstorage.gui.GuiBase; import refinedstorage.network.MessageGridSortingUpdate; import refinedstorage.tile.TileGrid; -public class SideButtonGridSortingDirection extends SideButton -{ - private TileGrid grid; +public class SideButtonGridSortingDirection extends SideButton { + private TileGrid grid; - public SideButtonGridSortingDirection(TileGrid grid) - { - this.grid = grid; - } + public SideButtonGridSortingDirection(TileGrid grid) { + this.grid = grid; + } - @Override - public String getTooltip(GuiBase gui) - { - StringBuilder builder = new StringBuilder(); + @Override + public String getTooltip(GuiBase gui) { + StringBuilder builder = new StringBuilder(); - builder.append(TextFormatting.YELLOW).append(gui.t("sidebutton.refinedstorage:sorting.direction")).append(TextFormatting.RESET).append("\n"); + builder.append(TextFormatting.YELLOW).append(gui.t("sidebutton.refinedstorage:sorting.direction")).append(TextFormatting.RESET).append("\n"); + builder.append(gui.t("sidebutton.refinedstorage:sorting.direction." + grid.getSortingDirection())); - builder.append(gui.t("sidebutton.refinedstorage:sorting.direction." + grid.getSortingDirection())); + return builder.toString(); + } - return builder.toString(); - } + @Override + public void draw(GuiBase gui, int x, int y) { + gui.bindTexture("icons.png"); + gui.drawTexture(x, y + 2 - 1, grid.getSortingDirection() * 16, 16, 16, 16); + } - @Override - public void draw(GuiBase gui, int x, int y) - { - gui.bindTexture("icons.png"); - gui.drawTexture(x, y + 2 - 1, grid.getSortingDirection() * 16, 16, 16, 16); - } + @Override + public void actionPerformed() { + int dir = grid.getSortingDirection(); - @Override - public void actionPerformed() - { - int dir = grid.getSortingDirection(); + if (dir == TileGrid.SORTING_DIRECTION_ASCENDING) { + dir = TileGrid.SORTING_DIRECTION_DESCENDING; + } else if (dir == TileGrid.SORTING_DIRECTION_DESCENDING) { + dir = TileGrid.SORTING_DIRECTION_ASCENDING; + } - if (dir == TileGrid.SORTING_DIRECTION_ASCENDING) - { - dir = TileGrid.SORTING_DIRECTION_DESCENDING; - } - else if (dir == TileGrid.SORTING_DIRECTION_DESCENDING) - { - dir = TileGrid.SORTING_DIRECTION_ASCENDING; - } - - RefinedStorage.NETWORK.sendToServer(new MessageGridSortingUpdate(grid, dir, grid.getSortingType())); - } + RefinedStorage.NETWORK.sendToServer(new MessageGridSortingUpdate(grid, dir, grid.getSortingType())); + } } diff --git a/src/main/java/refinedstorage/gui/sidebutton/SideButtonGridSortingType.java b/src/main/java/refinedstorage/gui/sidebutton/SideButtonGridSortingType.java old mode 100644 new mode 100755 index 7403bc4a8..e5f04f2ce --- a/src/main/java/refinedstorage/gui/sidebutton/SideButtonGridSortingType.java +++ b/src/main/java/refinedstorage/gui/sidebutton/SideButtonGridSortingType.java @@ -6,48 +6,39 @@ import refinedstorage.gui.GuiBase; import refinedstorage.network.MessageGridSortingUpdate; import refinedstorage.tile.TileGrid; -public class SideButtonGridSortingType extends SideButton -{ - private TileGrid grid; +public class SideButtonGridSortingType extends SideButton { + private TileGrid grid; - public SideButtonGridSortingType(TileGrid grid) - { - this.grid = grid; - } + public SideButtonGridSortingType(TileGrid grid) { + this.grid = grid; + } - @Override - public String getTooltip(GuiBase gui) - { - StringBuilder builder = new StringBuilder(); + @Override + public String getTooltip(GuiBase gui) { + StringBuilder builder = new StringBuilder(); - builder.append(TextFormatting.YELLOW).append(gui.t("sidebutton.refinedstorage:sorting.type")).append(TextFormatting.RESET).append("\n"); + builder.append(TextFormatting.YELLOW).append(gui.t("sidebutton.refinedstorage:sorting.type")).append(TextFormatting.RESET).append("\n"); + builder.append(gui.t("sidebutton.refinedstorage:sorting.type." + grid.getSortingType())); - builder.append(gui.t("sidebutton.refinedstorage:sorting.type." + grid.getSortingType())); + return builder.toString(); + } - return builder.toString(); - } + @Override + public void draw(GuiBase gui, int x, int y) { + gui.bindTexture("icons.png"); + gui.drawTexture(x - 1, y + 2 - 1, grid.getSortingType() * 16, 32, 16, 16); + } - @Override - public void draw(GuiBase gui, int x, int y) - { - gui.bindTexture("icons.png"); - gui.drawTexture(x - 1, y + 2 - 1, grid.getSortingType() * 16, 32, 16, 16); - } + @Override + public void actionPerformed() { + int type = grid.getSortingType(); - @Override - public void actionPerformed() - { - int type = grid.getSortingType(); + if (type == TileGrid.SORTING_TYPE_QUANTITY) { + type = TileGrid.SORTING_TYPE_NAME; + } else if (type == TileGrid.SORTING_TYPE_NAME) { + type = TileGrid.SORTING_TYPE_QUANTITY; + } - if (type == TileGrid.SORTING_TYPE_QUANTITY) - { - type = TileGrid.SORTING_TYPE_NAME; - } - else if (type == TileGrid.SORTING_TYPE_NAME) - { - type = TileGrid.SORTING_TYPE_QUANTITY; - } - - RefinedStorage.NETWORK.sendToServer(new MessageGridSortingUpdate(grid, grid.getSortingDirection(), type)); - } + RefinedStorage.NETWORK.sendToServer(new MessageGridSortingUpdate(grid, grid.getSortingDirection(), type)); + } } diff --git a/src/main/java/refinedstorage/gui/sidebutton/SideButtonMode.java b/src/main/java/refinedstorage/gui/sidebutton/SideButtonMode.java old mode 100644 new mode 100755 index a251b2992..f8b8bc4e4 --- a/src/main/java/refinedstorage/gui/sidebutton/SideButtonMode.java +++ b/src/main/java/refinedstorage/gui/sidebutton/SideButtonMode.java @@ -6,49 +6,40 @@ import refinedstorage.gui.GuiBase; import refinedstorage.network.MessageModeToggle; import refinedstorage.tile.settings.IModeSetting; -public class SideButtonMode extends SideButton -{ - private IModeSetting mode; +public class SideButtonMode extends SideButton { + private IModeSetting mode; - public SideButtonMode(IModeSetting mode) - { - this.mode = mode; - } + public SideButtonMode(IModeSetting mode) { + this.mode = mode; + } - @Override - public String getTooltip(GuiBase gui) - { - StringBuilder builder = new StringBuilder(); + @Override + public String getTooltip(GuiBase gui) { + StringBuilder builder = new StringBuilder(); - builder.append(TextFormatting.GREEN).append(gui.t("sidebutton.refinedstorage:mode")).append(TextFormatting.RESET).append("\n"); + builder.append(TextFormatting.GREEN).append(gui.t("sidebutton.refinedstorage:mode")).append(TextFormatting.RESET).append("\n"); + builder.append(gui.t("sidebutton.refinedstorage:mode." + (mode.isWhitelist() ? "whitelist" : "blacklist"))); - builder.append(gui.t("sidebutton.refinedstorage:mode." + (mode.isWhitelist() ? "whitelist" : "blacklist"))); + return builder.toString(); + } - return builder.toString(); - } + @Override + public void draw(GuiBase gui, int x, int y) { + gui.bindTexture("icons.png"); - @Override - public void draw(GuiBase gui, int x, int y) - { - gui.bindTexture("icons.png"); + int tx = 0; - int tx = 0; + if (mode.isWhitelist()) { + tx = 0; + } else if (mode.isBlacklist()) { + tx = 16; + } - if (mode.isWhitelist()) - { - tx = 0; - } - else if (mode.isBlacklist()) - { - tx = 16; - } + gui.drawTexture(x, y + 1, tx, 64, 16, 16); + } - gui.drawTexture(x, y + 1, tx, 64, 16, 16); - } - - @Override - public void actionPerformed() - { - RefinedStorage.NETWORK.sendToServer(new MessageModeToggle(mode)); - } + @Override + public void actionPerformed() { + RefinedStorage.NETWORK.sendToServer(new MessageModeToggle(mode)); + } } diff --git a/src/main/java/refinedstorage/gui/sidebutton/SideButtonRedstoneMode.java b/src/main/java/refinedstorage/gui/sidebutton/SideButtonRedstoneMode.java old mode 100644 new mode 100755 index 82f92487a..c8878d2be --- a/src/main/java/refinedstorage/gui/sidebutton/SideButtonRedstoneMode.java +++ b/src/main/java/refinedstorage/gui/sidebutton/SideButtonRedstoneMode.java @@ -6,37 +6,31 @@ import refinedstorage.gui.GuiBase; import refinedstorage.network.MessageRedstoneModeUpdate; import refinedstorage.tile.settings.IRedstoneModeSetting; -public class SideButtonRedstoneMode extends SideButton -{ - private IRedstoneModeSetting setting; +public class SideButtonRedstoneMode extends SideButton { + private IRedstoneModeSetting setting; - public SideButtonRedstoneMode(IRedstoneModeSetting setting) - { - this.setting = setting; - } + public SideButtonRedstoneMode(IRedstoneModeSetting setting) { + this.setting = setting; + } - @Override - public String getTooltip(GuiBase gui) - { - StringBuilder builder = new StringBuilder(); + @Override + public String getTooltip(GuiBase gui) { + StringBuilder builder = new StringBuilder(); - builder.append(TextFormatting.RED).append(gui.t("sidebutton.refinedstorage:redstone_mode")).append(TextFormatting.RESET).append("\n"); + builder.append(TextFormatting.RED).append(gui.t("sidebutton.refinedstorage:redstone_mode")).append(TextFormatting.RESET).append("\n"); + builder.append(gui.t("sidebutton.refinedstorage:redstone_mode." + setting.getRedstoneMode().id)); - builder.append(gui.t("sidebutton.refinedstorage:redstone_mode." + setting.getRedstoneMode().id)); + return builder.toString(); + } - return builder.toString(); - } + @Override + public void draw(GuiBase gui, int x, int y) { + gui.bindTexture("icons.png"); + gui.drawTexture(x, y + 1, setting.getRedstoneMode().id * 16, 0, 16, 16); + } - @Override - public void draw(GuiBase gui, int x, int y) - { - gui.bindTexture("icons.png"); - gui.drawTexture(x, y + 1, setting.getRedstoneMode().id * 16, 0, 16, 16); - } - - @Override - public void actionPerformed() - { - RefinedStorage.NETWORK.sendToServer(new MessageRedstoneModeUpdate(setting)); - } + @Override + public void actionPerformed() { + RefinedStorage.NETWORK.sendToServer(new MessageRedstoneModeUpdate(setting)); + } } diff --git a/src/main/java/refinedstorage/inventory/InventorySimple.java b/src/main/java/refinedstorage/inventory/InventorySimple.java old mode 100644 new mode 100755 index 0b76fb949..69aae195d --- a/src/main/java/refinedstorage/inventory/InventorySimple.java +++ b/src/main/java/refinedstorage/inventory/InventorySimple.java @@ -6,162 +6,133 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.text.ITextComponent; -public class InventorySimple implements IInventory -{ - private TileEntity tile; - private ItemStack[] inventory; - private int size; - private String name; +public class InventorySimple implements IInventory { + private TileEntity tile; + private ItemStack[] inventory; + private int size; + private String name; - public InventorySimple(String name, int size) - { - this.name = name; - this.size = size; - this.inventory = new ItemStack[size]; - } + public InventorySimple(String name, int size) { + this.name = name; + this.size = size; + this.inventory = new ItemStack[size]; + } - public InventorySimple(String name, int size, TileEntity tile) - { - this(name, size); + public InventorySimple(String name, int size, TileEntity tile) { + this(name, size); - this.tile = tile; - } + this.tile = tile; + } - @Override - public int getSizeInventory() - { - return size; - } + @Override + public int getSizeInventory() { + return size; + } - @Override - public ItemStack getStackInSlot(int slotIndex) - { - return inventory[slotIndex]; - } + @Override + public ItemStack getStackInSlot(int slotIndex) { + return inventory[slotIndex]; + } - @Override - public ItemStack decrStackSize(int slot, int amount) - { - ItemStack stack = getStackInSlot(slot); + @Override + public ItemStack decrStackSize(int slot, int amount) { + ItemStack stack = getStackInSlot(slot); - if (stack != null) - { - if (stack.stackSize <= amount) - { - setInventorySlotContents(slot, null); - } - else - { - stack = stack.splitStack(amount); + if (stack != null) { + if (stack.stackSize <= amount) { + setInventorySlotContents(slot, null); + } else { + stack = stack.splitStack(amount); - if (stack.stackSize == 0) - { - setInventorySlotContents(slot, null); - } - } - } + if (stack.stackSize == 0) { + setInventorySlotContents(slot, null); + } + } + } - return stack; - } + return stack; + } - @Override - public ItemStack removeStackFromSlot(int slot) - { - ItemStack stack = getStackInSlot(slot); + @Override + public ItemStack removeStackFromSlot(int slot) { + ItemStack stack = getStackInSlot(slot); - if (stack != null) - { - setInventorySlotContents(slot, null); - } + if (stack != null) { + setInventorySlotContents(slot, null); + } - return stack; - } + return stack; + } - @Override - public void setInventorySlotContents(int slot, ItemStack stack) - { - if (stack != null && stack.stackSize > getInventoryStackLimit()) - { - stack.stackSize = getInventoryStackLimit(); - } + @Override + public void setInventorySlotContents(int slot, ItemStack stack) { + if (stack != null && stack.stackSize > getInventoryStackLimit()) { + stack.stackSize = getInventoryStackLimit(); + } - inventory[slot] = stack; - } + inventory[slot] = stack; + } - @Override - public String getName() - { - return this.name; - } + @Override + public String getName() { + return this.name; + } - @Override - public boolean hasCustomName() - { - return true; - } + @Override + public boolean hasCustomName() { + return true; + } - @Override - public int getInventoryStackLimit() - { - return 64; - } + @Override + public int getInventoryStackLimit() { + return 64; + } - @Override - public boolean isUseableByPlayer(EntityPlayer player) - { - return true; - } + @Override + public boolean isUseableByPlayer(EntityPlayer player) { + return true; + } - @Override - public boolean isItemValidForSlot(int slot, ItemStack stack) - { - return true; - } + @Override + public boolean isItemValidForSlot(int slot, ItemStack stack) { + return true; + } - @Override - public void markDirty() - { - if (tile != null) - { - tile.markDirty(); - } - } + @Override + public void markDirty() { + if (tile != null) { + tile.markDirty(); + } + } - @Override - public void openInventory(EntityPlayer playerIn) - { - } + @Override + public void openInventory(EntityPlayer playerIn) { + } - @Override - public void closeInventory(EntityPlayer playerIn) - { - } + @Override + public void closeInventory(EntityPlayer playerIn) { + } - @Override - public int getField(int id) - { - return 0; - } + @Override + public int getField(int id) { + return 0; + } - @Override - public void setField(int id, int value) - { - } + @Override + public void setField(int id, int value) { + } - @Override - public int getFieldCount() - { - return 0; - } + @Override + public int getFieldCount() { + return 0; + } - @Override - public void clear() - { - } + @Override + public void clear() { + } - @Override - public ITextComponent getDisplayName() - { - return null; - } + @Override + public ITextComponent getDisplayName() { + return null; + } } diff --git a/src/main/java/refinedstorage/item/ItemBase.java b/src/main/java/refinedstorage/item/ItemBase.java old mode 100644 new mode 100755 index 48f25c383..1f4beb7b5 --- a/src/main/java/refinedstorage/item/ItemBase.java +++ b/src/main/java/refinedstorage/item/ItemBase.java @@ -4,31 +4,26 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import refinedstorage.RefinedStorage; -public abstract class ItemBase extends Item -{ - private String name; +public abstract class ItemBase extends Item { + private String name; - public ItemBase(String name) - { - this.name = name; + public ItemBase(String name) { + this.name = name; - setCreativeTab(RefinedStorage.TAB); - } + setCreativeTab(RefinedStorage.TAB); + } - @Override - public String getUnlocalizedName() - { - return "item." + RefinedStorage.ID + ":" + name; - } + @Override + public String getUnlocalizedName() { + return "item." + RefinedStorage.ID + ":" + name; + } - @Override - public String getUnlocalizedName(ItemStack stack) - { - if (getHasSubtypes()) - { - return getUnlocalizedName() + "." + stack.getItemDamage(); - } + @Override + public String getUnlocalizedName(ItemStack stack) { + if (getHasSubtypes()) { + return getUnlocalizedName() + "." + stack.getItemDamage(); + } - return getUnlocalizedName(); - } + return getUnlocalizedName(); + } } diff --git a/src/main/java/refinedstorage/item/ItemBlockBase.java b/src/main/java/refinedstorage/item/ItemBlockBase.java old mode 100644 new mode 100755 index 338e83026..b2a21469a --- a/src/main/java/refinedstorage/item/ItemBlockBase.java +++ b/src/main/java/refinedstorage/item/ItemBlockBase.java @@ -4,16 +4,13 @@ import net.minecraft.block.Block; import net.minecraft.item.ItemColored; import net.minecraft.item.ItemStack; -public abstract class ItemBlockBase extends ItemColored -{ - public ItemBlockBase(Block block) - { - super(block, true); - } +public abstract class ItemBlockBase extends ItemColored { + public ItemBlockBase(Block block) { + super(block, true); + } - @Override - public String getUnlocalizedName(ItemStack stack) - { - return getUnlocalizedName() + "." + stack.getItemDamage(); - } + @Override + public String getUnlocalizedName(ItemStack stack) { + return getUnlocalizedName() + "." + stack.getItemDamage(); + } } diff --git a/src/main/java/refinedstorage/item/ItemBlockController.java b/src/main/java/refinedstorage/item/ItemBlockController.java old mode 100644 new mode 100755 index 73d0e4843..bd5c4e62d --- a/src/main/java/refinedstorage/item/ItemBlockController.java +++ b/src/main/java/refinedstorage/item/ItemBlockController.java @@ -2,10 +2,8 @@ package refinedstorage.item; import net.minecraft.block.Block; -public class ItemBlockController extends ItemBlockBase -{ - public ItemBlockController(Block block) - { - super(block); - } +public class ItemBlockController extends ItemBlockBase { + public ItemBlockController(Block block) { + super(block); + } } diff --git a/src/main/java/refinedstorage/item/ItemBlockGrid.java b/src/main/java/refinedstorage/item/ItemBlockGrid.java old mode 100644 new mode 100755 index 3a13a1114..ef8aa2ede --- a/src/main/java/refinedstorage/item/ItemBlockGrid.java +++ b/src/main/java/refinedstorage/item/ItemBlockGrid.java @@ -2,10 +2,8 @@ package refinedstorage.item; import net.minecraft.block.Block; -public class ItemBlockGrid extends ItemBlockBase -{ - public ItemBlockGrid(Block block) - { - super(block); - } +public class ItemBlockGrid extends ItemBlockBase { + public ItemBlockGrid(Block block) { + super(block); + } } diff --git a/src/main/java/refinedstorage/item/ItemBlockStorage.java b/src/main/java/refinedstorage/item/ItemBlockStorage.java old mode 100644 new mode 100755 index 0d4cb264a..6a4b85c8b --- a/src/main/java/refinedstorage/item/ItemBlockStorage.java +++ b/src/main/java/refinedstorage/item/ItemBlockStorage.java @@ -1,6 +1,5 @@ package refinedstorage.item; -import java.util.List; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -11,49 +10,42 @@ import refinedstorage.block.EnumStorageType; import refinedstorage.storage.NBTStorage; import refinedstorage.tile.TileStorage; -public class ItemBlockStorage extends ItemBlockBase -{ - public ItemBlockStorage(Block block) - { - super(block); - } +import java.util.List; - @Override - public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean b) - { - EnumStorageType type = EnumStorageType.getById(stack.getMetadata()); +public class ItemBlockStorage extends ItemBlockBase { + public ItemBlockStorage(Block block) { + super(block); + } - if (type != null && stack.getTagCompound() != null && stack.getTagCompound().hasKey(TileStorage.NBT_STORAGE)) - { - NBTTagCompound tag = stack.getTagCompound().getCompoundTag(TileStorage.NBT_STORAGE); + @Override + public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean b) { + EnumStorageType type = EnumStorageType.getById(stack.getMetadata()); - if (type == EnumStorageType.TYPE_CREATIVE) - { - list.add(String.format(I18n.translateToLocal("misc.refinedstorage:storage.stored"), NBTStorage.getStored(tag))); - } - else - { - list.add(String.format(I18n.translateToLocal("misc.refinedstorage:storage.stored_capacity"), NBTStorage.getStored(tag), type.getCapacity())); - } - } - } + if (type != null && stack.getTagCompound() != null && stack.getTagCompound().hasKey(TileStorage.NBT_STORAGE)) { + NBTTagCompound tag = stack.getTagCompound().getCompoundTag(TileStorage.NBT_STORAGE); - @Override - public void onCreated(ItemStack stack, World world, EntityPlayer player) - { - super.onCreated(stack, world, player); + if (type == EnumStorageType.TYPE_CREATIVE) { + list.add(String.format(I18n.translateToLocal("misc.refinedstorage:storage.stored"), NBTStorage.getStored(tag))); + } else { + list.add(String.format(I18n.translateToLocal("misc.refinedstorage:storage.stored_capacity"), NBTStorage.getStored(tag), type.getCapacity())); + } + } + } - initNBT(stack); - } + @Override + public void onCreated(ItemStack stack, World world, EntityPlayer player) { + super.onCreated(stack, world, player); - public static ItemStack initNBT(ItemStack stack) - { - NBTTagCompound tag = new NBTTagCompound(); + initNBT(stack); + } - tag.setTag(TileStorage.NBT_STORAGE, NBTStorage.getBaseNBT()); + public static ItemStack initNBT(ItemStack stack) { + NBTTagCompound tag = new NBTTagCompound(); - stack.setTagCompound(tag); + tag.setTag(TileStorage.NBT_STORAGE, NBTStorage.getBaseNBT()); - return stack; - } + stack.setTagCompound(tag); + + return stack; + } } diff --git a/src/main/java/refinedstorage/item/ItemCore.java b/src/main/java/refinedstorage/item/ItemCore.java old mode 100644 new mode 100755 index 376400daf..9028b7aee --- a/src/main/java/refinedstorage/item/ItemCore.java +++ b/src/main/java/refinedstorage/item/ItemCore.java @@ -1,29 +1,26 @@ package refinedstorage.item; -import java.util.List; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -public class ItemCore extends ItemBase -{ - public static final int TYPE_CONSTRUCTION = 0; - public static final int TYPE_DESTRUCTION = 1; +import java.util.List; - public ItemCore() - { - super("core"); +public class ItemCore extends ItemBase { + public static final int TYPE_CONSTRUCTION = 0; + public static final int TYPE_DESTRUCTION = 1; - setHasSubtypes(true); - setMaxDamage(0); - } + public ItemCore() { + super("core"); - @Override - public void getSubItems(Item item, CreativeTabs tab, List list) - { - for (int i = 0; i < 2; ++i) - { - list.add(new ItemStack(item, 1, i)); - } - } + setHasSubtypes(true); + setMaxDamage(0); + } + + @Override + public void getSubItems(Item item, CreativeTabs tab, List list) { + for (int i = 0; i < 2; ++i) { + list.add(new ItemStack(item, 1, i)); + } + } } diff --git a/src/main/java/refinedstorage/item/ItemProcessor.java b/src/main/java/refinedstorage/item/ItemProcessor.java old mode 100644 new mode 100755 index fa7c442be..b60613ff1 --- a/src/main/java/refinedstorage/item/ItemProcessor.java +++ b/src/main/java/refinedstorage/item/ItemProcessor.java @@ -1,34 +1,31 @@ package refinedstorage.item; -import java.util.List; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -public class ItemProcessor extends ItemBase -{ - public static final int TYPE_PRINTED_BASIC = 0; - public static final int TYPE_PRINTED_IMPROVED = 1; - public static final int TYPE_PRINTED_ADVANCED = 2; - public static final int TYPE_BASIC = 3; - public static final int TYPE_IMPROVED = 4; - public static final int TYPE_ADVANCED = 5; - public static final int TYPE_PRINTED_SILICON = 6; +import java.util.List; - public ItemProcessor() - { - super("processor"); +public class ItemProcessor extends ItemBase { + public static final int TYPE_PRINTED_BASIC = 0; + public static final int TYPE_PRINTED_IMPROVED = 1; + public static final int TYPE_PRINTED_ADVANCED = 2; + public static final int TYPE_BASIC = 3; + public static final int TYPE_IMPROVED = 4; + public static final int TYPE_ADVANCED = 5; + public static final int TYPE_PRINTED_SILICON = 6; - setHasSubtypes(true); - setMaxDamage(0); - } + public ItemProcessor() { + super("processor"); - @Override - public void getSubItems(Item item, CreativeTabs tab, List list) - { - for (int i = 0; i <= 6; ++i) - { - list.add(new ItemStack(item, 1, i)); - } - } + setHasSubtypes(true); + setMaxDamage(0); + } + + @Override + public void getSubItems(Item item, CreativeTabs tab, List list) { + for (int i = 0; i <= 6; ++i) { + list.add(new ItemStack(item, 1, i)); + } + } } diff --git a/src/main/java/refinedstorage/item/ItemQuartzEnrichedIron.java b/src/main/java/refinedstorage/item/ItemQuartzEnrichedIron.java old mode 100644 new mode 100755 index 1cb33b031..c943fb950 --- a/src/main/java/refinedstorage/item/ItemQuartzEnrichedIron.java +++ b/src/main/java/refinedstorage/item/ItemQuartzEnrichedIron.java @@ -1,9 +1,7 @@ package refinedstorage.item; -public class ItemQuartzEnrichedIron extends ItemBase -{ - public ItemQuartzEnrichedIron() - { - super("quartz_enriched_iron"); - } +public class ItemQuartzEnrichedIron extends ItemBase { + public ItemQuartzEnrichedIron() { + super("quartz_enriched_iron"); + } } diff --git a/src/main/java/refinedstorage/item/ItemSilicon.java b/src/main/java/refinedstorage/item/ItemSilicon.java old mode 100644 new mode 100755 index d6cd6dce3..8217d0b25 --- a/src/main/java/refinedstorage/item/ItemSilicon.java +++ b/src/main/java/refinedstorage/item/ItemSilicon.java @@ -1,9 +1,7 @@ package refinedstorage.item; -public class ItemSilicon extends ItemBase -{ - public ItemSilicon() - { - super("silicon"); - } +public class ItemSilicon extends ItemBase { + public ItemSilicon() { + super("silicon"); + } } diff --git a/src/main/java/refinedstorage/item/ItemStorageCell.java b/src/main/java/refinedstorage/item/ItemStorageCell.java deleted file mode 100644 index 78f809f17..000000000 --- a/src/main/java/refinedstorage/item/ItemStorageCell.java +++ /dev/null @@ -1,59 +0,0 @@ -package refinedstorage.item; - -import java.util.List; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.text.translation.I18n; -import net.minecraft.world.World; -import refinedstorage.storage.CellStorage; -import refinedstorage.storage.NBTStorage; - -public class ItemStorageCell extends ItemBase -{ - public static final int TYPE_1K = 0; - public static final int TYPE_4K = 1; - public static final int TYPE_16K = 2; - public static final int TYPE_64K = 3; - public static final int TYPE_CREATIVE = 4; - - public ItemStorageCell() - { - super("storage_cell"); - - setMaxStackSize(1); - setHasSubtypes(true); - setMaxDamage(0); - } - - @Override - public void getSubItems(Item item, CreativeTabs tab, List list) - { - for (int i = 0; i < 5; ++i) - { - list.add(NBTStorage.initNBT(new ItemStack(item, 1, i))); - } - } - - @Override - public void addInformation(ItemStack cell, EntityPlayer player, List list, boolean b) - { - if (CellStorage.getCapacity(cell) == -1) - { - list.add(String.format(I18n.translateToLocal("misc.refinedstorage:storage.stored"), NBTStorage.getStored(cell.getTagCompound()))); - } - else - { - list.add(String.format(I18n.translateToLocal("misc.refinedstorage:storage.stored_capacity"), NBTStorage.getStored(cell.getTagCompound()), CellStorage.getCapacity(cell))); - } - } - - @Override - public void onCreated(ItemStack stack, World world, EntityPlayer player) - { - super.onCreated(stack, world, player); - - NBTStorage.initNBT(stack); - } -} diff --git a/src/main/java/refinedstorage/item/ItemStorageDisk.java b/src/main/java/refinedstorage/item/ItemStorageDisk.java new file mode 100755 index 000000000..298b5c030 --- /dev/null +++ b/src/main/java/refinedstorage/item/ItemStorageDisk.java @@ -0,0 +1,51 @@ +package refinedstorage.item; + +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.text.translation.I18n; +import net.minecraft.world.World; +import refinedstorage.storage.DiskStorage; +import refinedstorage.storage.NBTStorage; + +import java.util.List; + +public class ItemStorageDisk extends ItemBase { + public static final int TYPE_1K = 0; + public static final int TYPE_4K = 1; + public static final int TYPE_16K = 2; + public static final int TYPE_64K = 3; + public static final int TYPE_CREATIVE = 4; + + public ItemStorageDisk() { + super("storage_disk"); + + setMaxStackSize(1); + setHasSubtypes(true); + setMaxDamage(0); + } + + @Override + public void getSubItems(Item item, CreativeTabs tab, List list) { + for (int i = 0; i < 5; ++i) { + list.add(NBTStorage.initNBT(new ItemStack(item, 1, i))); + } + } + + @Override + public void addInformation(ItemStack disk, EntityPlayer player, List list, boolean b) { + if (DiskStorage.getCapacity(disk) == -1) { + list.add(String.format(I18n.translateToLocal("misc.refinedstorage:storage.stored"), NBTStorage.getStored(disk.getTagCompound()))); + } else { + list.add(String.format(I18n.translateToLocal("misc.refinedstorage:storage.stored_capacity"), NBTStorage.getStored(disk.getTagCompound()), DiskStorage.getCapacity(disk))); + } + } + + @Override + public void onCreated(ItemStack stack, World world, EntityPlayer player) { + super.onCreated(stack, world, player); + + NBTStorage.initNBT(stack); + } +} diff --git a/src/main/java/refinedstorage/item/ItemStoragePart.java b/src/main/java/refinedstorage/item/ItemStoragePart.java old mode 100644 new mode 100755 index 0f282b5c9..509378f43 --- a/src/main/java/refinedstorage/item/ItemStoragePart.java +++ b/src/main/java/refinedstorage/item/ItemStoragePart.java @@ -1,31 +1,28 @@ package refinedstorage.item; -import java.util.List; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -public class ItemStoragePart extends ItemBase -{ - public static final int TYPE_1K = 0; - public static final int TYPE_4K = 1; - public static final int TYPE_16K = 2; - public static final int TYPE_64K = 3; +import java.util.List; - public ItemStoragePart() - { - super("storage_part"); +public class ItemStoragePart extends ItemBase { + public static final int TYPE_1K = 0; + public static final int TYPE_4K = 1; + public static final int TYPE_16K = 2; + public static final int TYPE_64K = 3; - setHasSubtypes(true); - setMaxDamage(0); - } + public ItemStoragePart() { + super("storage_part"); - @Override - public void getSubItems(Item item, CreativeTabs tab, List list) - { - for (int i = 0; i <= 3; ++i) - { - list.add(new ItemStack(item, 1, i)); - } - } + setHasSubtypes(true); + setMaxDamage(0); + } + + @Override + public void getSubItems(Item item, CreativeTabs tab, List list) { + for (int i = 0; i <= 3; ++i) { + list.add(new ItemStack(item, 1, i)); + } + } } diff --git a/src/main/java/refinedstorage/item/ItemWirelessGrid.java b/src/main/java/refinedstorage/item/ItemWirelessGrid.java old mode 100644 new mode 100755 index 19d25cbb4..25debec53 --- a/src/main/java/refinedstorage/item/ItemWirelessGrid.java +++ b/src/main/java/refinedstorage/item/ItemWirelessGrid.java @@ -1,139 +1,108 @@ package refinedstorage.item; -import java.util.List; -import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ActionResult; import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.TextComponentString; import net.minecraft.util.text.translation.I18n; import net.minecraft.world.World; import refinedstorage.RefinedStorage; +import refinedstorage.RefinedStorageBlocks; import refinedstorage.RefinedStorageGui; -import refinedstorage.block.EnumGridType; import refinedstorage.tile.TileGrid; -import refinedstorage.tile.TileWirelessTransmitter; -public class ItemWirelessGrid extends ItemBase -{ - public static final String NBT_WIRELESS_TRANSMITTER_X = "WirelessTransmitterX"; - public static final String NBT_WIRELESS_TRANSMITTER_Y = "WirelessTransmitterY"; - public static final String NBT_WIRELESS_TRANSMITTER_Z = "WirelessTransmitterZ"; +import java.util.List; - public ItemWirelessGrid() - { - super("wireless_grid"); +public class ItemWirelessGrid extends ItemBase { + public static final String NBT_GRID_X = "GridX"; + public static final String NBT_GRID_Y = "GridY"; + public static final String NBT_GRID_Z = "GridZ"; - setMaxStackSize(1); - setHasSubtypes(true); - setMaxDamage(0); - } + public ItemWirelessGrid() { + super("wireless_grid"); - @Override - public void getSubItems(Item item, CreativeTabs tab, List list) - { - list.add(new ItemStack(item, 1, 0)); - list.add(new ItemStack(item, 1, 1)); - } + setMaxStackSize(1); + } - @Override - public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean b) - { - if (isValid(stack)) - { - list.add(I18n.translateToLocalFormatted("misc.refinedstorage:wireless_grid.tooltip", getX(stack), getY(stack), getZ(stack))); - } - } + @Override + public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean b) { + if (isValid(stack)) { + list.add(I18n.translateToLocalFormatted("misc.refinedstorage:wireless_grid.tooltip.0", getX(stack))); + list.add(I18n.translateToLocalFormatted("misc.refinedstorage:wireless_grid.tooltip.1", getY(stack))); + list.add(I18n.translateToLocalFormatted("misc.refinedstorage:wireless_grid.tooltip.2", getZ(stack))); + } + } - @Override - public ActionResult onItemRightClick(ItemStack stack, World world, EntityPlayer player, EnumHand hand) - { - if (!world.isRemote) - { - if (isValid(stack)) - { - if (isInRange(stack, player)) - { - int x = getX(stack); - int y = getY(stack); - int z = getZ(stack); + @Override + public EnumActionResult onItemUse(ItemStack stack, EntityPlayer playerIn, World worldIn, BlockPos pos, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) { + Block block = worldIn.getBlockState(pos).getBlock(); - TileEntity tile = world.getTileEntity(new BlockPos(x, y, z)); + if (block == RefinedStorageBlocks.GRID) { + NBTTagCompound tag = new NBTTagCompound(); - if (tile instanceof TileWirelessTransmitter) - { - TileWirelessTransmitter wirelessTransmitter = (TileWirelessTransmitter) tile; + tag.setInteger(NBT_GRID_X, pos.getX()); + tag.setInteger(NBT_GRID_Y, pos.getY()); + tag.setInteger(NBT_GRID_Z, pos.getZ()); - if (wirelessTransmitter.isWorking()) - { - TileGrid grid = wirelessTransmitter.getGrid(stack.getItemDamage() == 1 ? EnumGridType.CRAFTING : EnumGridType.NORMAL); + stack.setTagCompound(tag); - if (grid == null) - { - player.addChatComponentMessage(new TextComponentString(I18n.translateToLocal("misc.refinedstorage:wireless_grid.no_grid." + stack.getItemDamage()))); - } - else - { - player.openGui(RefinedStorage.INSTANCE, RefinedStorageGui.GRID, world, grid.getPos().getX(), grid.getPos().getY(), grid.getPos().getZ()); + return EnumActionResult.SUCCESS; + } - return new ActionResult(EnumActionResult.SUCCESS, stack); - } - } - else - { - player.addChatComponentMessage(new TextComponentString(I18n.translateToLocal("misc.refinedstorage:wireless_grid.not_working"))); - } - } - else - { - player.addChatComponentMessage(new TextComponentString(I18n.translateToLocal("misc.refinedstorage:wireless_grid.not_found"))); - } - } - else - { - player.addChatComponentMessage(new TextComponentString(I18n.translateToLocal("misc.refinedstorage:wireless_grid.out_of_range"))); - } - } - else - { - player.addChatComponentMessage(new TextComponentString(I18n.translateToLocal("misc.refinedstorage:wireless_grid.not_set." + stack.getItemDamage()))); - } + return EnumActionResult.PASS; + } - return new ActionResult(EnumActionResult.FAIL, stack); - } - else - { - return new ActionResult(EnumActionResult.PASS, stack); - } - } + @Override + public ActionResult onItemRightClick(ItemStack stack, World world, EntityPlayer player, EnumHand hand) { + if (!world.isRemote) { + if (isValid(stack)) { + if (isInRange(stack, player)) { + TileEntity tile = world.getTileEntity(new BlockPos(getX(stack), getY(stack), getZ(stack))); - public static int getX(ItemStack stack) - { - return stack.getTagCompound().getInteger(NBT_WIRELESS_TRANSMITTER_X); - } + if (tile instanceof TileGrid) { + player.openGui(RefinedStorage.INSTANCE, RefinedStorageGui.GRID, world, tile.getPos().getX(), tile.getPos().getY(), tile.getPos().getZ()); - public static int getY(ItemStack stack) - { - return stack.getTagCompound().getInteger(NBT_WIRELESS_TRANSMITTER_Y); - } + return new ActionResult(EnumActionResult.PASS, stack); + } else { + player.addChatComponentMessage(new TextComponentString(I18n.translateToLocal("misc.refinedstorage:wireless_grid.not_found"))); + } + } else { + player.addChatComponentMessage(new TextComponentString(I18n.translateToLocal("misc.refinedstorage:wireless_grid.out_of_range"))); + } + } else { + player.addChatComponentMessage(new TextComponentString(I18n.translateToLocal("misc.refinedstorage:wireless_grid.not_found"))); + } - public static int getZ(ItemStack stack) - { - return stack.getTagCompound().getInteger(NBT_WIRELESS_TRANSMITTER_Z); - } + return new ActionResult(EnumActionResult.FAIL, stack); + } else { + return new ActionResult(EnumActionResult.PASS, stack); + } + } - public static boolean isInRange(ItemStack stack, EntityPlayer player) - { - return (int) Math.sqrt(Math.pow(getX(stack) - player.posX, 2) + Math.pow(getY(stack) - player.posY, 2) + Math.pow(getZ(stack) - player.posZ, 2)) < 64; - } + public static int getX(ItemStack stack) { + return stack.getTagCompound().getInteger(NBT_GRID_X); + } - public static boolean isValid(ItemStack stack) - { - return stack.hasTagCompound() && stack.getTagCompound().hasKey(NBT_WIRELESS_TRANSMITTER_X) && stack.getTagCompound().hasKey(NBT_WIRELESS_TRANSMITTER_Y) && stack.getTagCompound().hasKey(NBT_WIRELESS_TRANSMITTER_Z); - } + public static int getY(ItemStack stack) { + return stack.getTagCompound().getInteger(NBT_GRID_Y); + } + + public static int getZ(ItemStack stack) { + return stack.getTagCompound().getInteger(NBT_GRID_Z); + } + + public static boolean isInRange(ItemStack stack, EntityPlayer player) { + return (int) Math.sqrt(Math.pow(getX(stack) - player.posX, 2) + Math.pow(getY(stack) - player.posY, 2) + Math.pow(getZ(stack) - player.posZ, 2)) < 64; + } + + public static boolean isValid(ItemStack stack) { + return stack.hasTagCompound() && stack.getTagCompound().hasKey(NBT_GRID_X) && stack.getTagCompound().hasKey(NBT_GRID_Y) && stack.getTagCompound().hasKey(NBT_GRID_Z); + } } diff --git a/src/main/java/refinedstorage/item/ItemWirelessGridPlate.java b/src/main/java/refinedstorage/item/ItemWirelessGridPlate.java deleted file mode 100644 index 89187280d..000000000 --- a/src/main/java/refinedstorage/item/ItemWirelessGridPlate.java +++ /dev/null @@ -1,11 +0,0 @@ -package refinedstorage.item; - -public class ItemWirelessGridPlate extends ItemBase -{ - public ItemWirelessGridPlate() - { - super("wireless_grid_plate"); - - setMaxStackSize(1); - } -} diff --git a/src/main/java/refinedstorage/jei/GridRecipeTransferHandler.java b/src/main/java/refinedstorage/jei/GridRecipeTransferHandler.java new file mode 100755 index 000000000..51ba42c3b --- /dev/null +++ b/src/main/java/refinedstorage/jei/GridRecipeTransferHandler.java @@ -0,0 +1,65 @@ +package refinedstorage.jei; + +import mezz.jei.api.gui.IRecipeLayout; +import mezz.jei.api.recipe.transfer.IRecipeTransferError; +import mezz.jei.api.recipe.transfer.IRecipeTransferHandler; +import mezz.jei.gui.ingredients.IGuiIngredient; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; +import net.minecraft.inventory.InventoryCrafting; +import net.minecraft.inventory.Slot; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; +import refinedstorage.RefinedStorage; +import refinedstorage.container.ContainerGrid; +import refinedstorage.network.MessageGridCraftingTransfer; + +import java.util.List; +import java.util.Map; + +// Thanks to https://github.com/zerofall/EZStorage/blob/master/src/main/java/com/zerofall/ezstorage/jei/RecipeTransferHandler.java +public class GridRecipeTransferHandler implements IRecipeTransferHandler { + @Override + public Class getContainerClass() { + return ContainerGrid.class; + } + + @Override + public String getRecipeCategoryUid() { + return "minecraft.crafting"; + } + + @Override + public IRecipeTransferError transferRecipe(Container container, IRecipeLayout recipeLayout, EntityPlayer player, boolean maxTransfer, boolean doTransfer) { + if (doTransfer) { + Map> inputs = recipeLayout.getItemStacks().getGuiIngredients(); + + NBTTagCompound recipe = new NBTTagCompound(); + + for (Slot slot : container.inventorySlots) { + if (slot.inventory instanceof InventoryCrafting) { + IGuiIngredient ingredient = inputs.get(slot.getSlotIndex() + 1); + + if (ingredient != null) { + List possibleItems = ingredient.getAllIngredients(); + + NBTTagList tags = new NBTTagList(); + + for (ItemStack stack : possibleItems) { + NBTTagCompound tag = new NBTTagCompound(); + stack.writeToNBT(tag); + tags.appendTag(tag); + } + + recipe.setTag("#" + slot.getSlotIndex(), tags); + } + } + } + + RefinedStorage.NETWORK.sendToServer(new MessageGridCraftingTransfer(recipe)); + } + + return null; + } +} diff --git a/src/main/java/refinedstorage/jei/PluginRefinedStorage.java b/src/main/java/refinedstorage/jei/PluginRefinedStorage.java old mode 100644 new mode 100755 index 678d28d28..216a3b9ff --- a/src/main/java/refinedstorage/jei/PluginRefinedStorage.java +++ b/src/main/java/refinedstorage/jei/PluginRefinedStorage.java @@ -6,23 +6,22 @@ import mezz.jei.api.JEIPlugin; import net.minecraft.item.Item; import refinedstorage.RefinedStorageBlocks; import refinedstorage.RefinedStorageItems; -import refinedstorage.storage.CellStorage; +import refinedstorage.storage.DiskStorage; import refinedstorage.tile.TileStorage; @JEIPlugin -public class PluginRefinedStorage extends BlankModPlugin -{ - @Override - public void register(IModRegistry registry) - { - // @TODO: JEI transfer handler - registry.addRecipeCategories(new SoldererRecipeCategory(registry.getJeiHelpers().getGuiHelper())); +public class PluginRefinedStorage extends BlankModPlugin { + @Override + public void register(IModRegistry registry) { + registry.getRecipeTransferRegistry().addRecipeTransferHandler(new GridRecipeTransferHandler()); - registry.addRecipeHandlers(new SoldererRecipeHandler()); + registry.addRecipeCategories(new SoldererRecipeCategory(registry.getJeiHelpers().getGuiHelper())); - registry.addRecipes(SoldererRecipeMaker.getRecipes()); + registry.addRecipeHandlers(new SoldererRecipeHandler()); - registry.getJeiHelpers().getNbtIgnoreList().ignoreNbtTagNames(RefinedStorageItems.STORAGE_CELL, CellStorage.NBT_ITEMS, CellStorage.NBT_STORED); - registry.getJeiHelpers().getNbtIgnoreList().ignoreNbtTagNames(Item.getItemFromBlock(RefinedStorageBlocks.STORAGE), TileStorage.NBT_STORAGE); - } + registry.addRecipes(SoldererRecipeMaker.getRecipes()); + + registry.getJeiHelpers().getNbtIgnoreList().ignoreNbtTagNames(RefinedStorageItems.STORAGE_DISK, DiskStorage.NBT_ITEMS, DiskStorage.NBT_STORED); + registry.getJeiHelpers().getNbtIgnoreList().ignoreNbtTagNames(Item.getItemFromBlock(RefinedStorageBlocks.STORAGE), TileStorage.NBT_STORAGE); + } } diff --git a/src/main/java/refinedstorage/jei/SoldererRecipeCategory.java b/src/main/java/refinedstorage/jei/SoldererRecipeCategory.java old mode 100644 new mode 100755 index 16bf847f3..216dfcefd --- a/src/main/java/refinedstorage/jei/SoldererRecipeCategory.java +++ b/src/main/java/refinedstorage/jei/SoldererRecipeCategory.java @@ -11,68 +11,57 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraft.util.text.translation.I18n; -public class SoldererRecipeCategory implements IRecipeCategory -{ - private IDrawable background; +public class SoldererRecipeCategory implements IRecipeCategory { + private IDrawable background; - public SoldererRecipeCategory(IGuiHelper helper) - { - background = helper.createDrawable(new ResourceLocation("refinedstorage", "textures/gui/solderer.png"), 8, 5, 162, 89); - } + public SoldererRecipeCategory(IGuiHelper helper) { + background = helper.createDrawable(new ResourceLocation("refinedstorage", "textures/gui/solderer.png"), 8, 5, 162, 89); + } - @Override - public String getUid() - { - return "refinedstorage.solderer"; - } + @Override + public String getUid() { + return "refinedstorage.solderer"; + } - @Override - public String getTitle() - { - return I18n.translateToLocal("gui.refinedstorage:solderer"); - } + @Override + public String getTitle() { + return I18n.translateToLocal("gui.refinedstorage:solderer"); + } - @Override - public IDrawable getBackground() - { - return background; - } + @Override + public IDrawable getBackground() { + return background; + } - @Override - public void drawExtras(Minecraft minecraft) - { - } + @Override + public void drawExtras(Minecraft minecraft) { + } - @Override - public void drawAnimations(Minecraft minecraft) - { - } + @Override + public void drawAnimations(Minecraft minecraft) { + } - @Override - public void setRecipe(IRecipeLayout recipeLayout, IRecipeWrapper recipeWrapper) - { - IGuiItemStackGroup group = recipeLayout.getItemStacks(); + @Override + public void setRecipe(IRecipeLayout recipeLayout, IRecipeWrapper recipeWrapper) { + IGuiItemStackGroup group = recipeLayout.getItemStacks(); - int x = 44 - 9; - int y = 20 - 6; + int x = 44 - 9; + int y = 20 - 6; - for (int i = 0; i < 3; ++i) - { - group.init(i, true, x, y); + for (int i = 0; i < 3; ++i) { + group.init(i, true, x, y); - y += 18; - } + y += 18; + } - group.init(3, false, 134 - 9, 38 - 6); + group.init(3, false, 134 - 9, 38 - 6); - if (recipeWrapper instanceof SoldererRecipeWrapper) - { - for (int i = 0; i < 3; ++i) - { - group.set(i, (ItemStack) recipeWrapper.getInputs().get(i)); - } + if (recipeWrapper instanceof SoldererRecipeWrapper) { + for (int i = 0; i < 3; ++i) { + group.set(i, (ItemStack) recipeWrapper.getInputs().get(i)); + } - group.set(3, (ItemStack) recipeWrapper.getOutputs().get(0)); - } - } + group.set(3, (ItemStack) recipeWrapper.getOutputs().get(0)); + } + } } diff --git a/src/main/java/refinedstorage/jei/SoldererRecipeHandler.java b/src/main/java/refinedstorage/jei/SoldererRecipeHandler.java old mode 100644 new mode 100755 index 86e95b3e5..8f0c3f52c --- a/src/main/java/refinedstorage/jei/SoldererRecipeHandler.java +++ b/src/main/java/refinedstorage/jei/SoldererRecipeHandler.java @@ -3,29 +3,24 @@ package refinedstorage.jei; import mezz.jei.api.recipe.IRecipeHandler; import mezz.jei.api.recipe.IRecipeWrapper; -public class SoldererRecipeHandler implements IRecipeHandler -{ - @Override - public Class getRecipeClass() - { - return SoldererRecipeWrapper.class; - } +public class SoldererRecipeHandler implements IRecipeHandler { + @Override + public Class getRecipeClass() { + return SoldererRecipeWrapper.class; + } - @Override - public String getRecipeCategoryUid() - { - return "refinedstorage.solderer"; - } + @Override + public String getRecipeCategoryUid() { + return "refinedstorage.solderer"; + } - @Override - public IRecipeWrapper getRecipeWrapper(SoldererRecipeWrapper recipe) - { - return recipe; - } + @Override + public IRecipeWrapper getRecipeWrapper(SoldererRecipeWrapper recipe) { + return recipe; + } - @Override - public boolean isRecipeValid(SoldererRecipeWrapper recipe) - { - return true; - } + @Override + public boolean isRecipeValid(SoldererRecipeWrapper recipe) { + return true; + } } diff --git a/src/main/java/refinedstorage/jei/SoldererRecipeMaker.java b/src/main/java/refinedstorage/jei/SoldererRecipeMaker.java old mode 100644 new mode 100755 index c746339e7..ae2b72694 --- a/src/main/java/refinedstorage/jei/SoldererRecipeMaker.java +++ b/src/main/java/refinedstorage/jei/SoldererRecipeMaker.java @@ -1,30 +1,28 @@ package refinedstorage.jei; -import java.util.ArrayList; -import java.util.List; import net.minecraft.item.ItemStack; import refinedstorage.tile.solderer.ISoldererRecipe; import refinedstorage.tile.solderer.SoldererRegistry; -public class SoldererRecipeMaker -{ - public static List getRecipes() - { - List recipes = new ArrayList(); +import java.util.ArrayList; +import java.util.List; - for (ISoldererRecipe recipe : SoldererRegistry.recipes) - { - List inputs = new ArrayList(); +public class SoldererRecipeMaker { + public static List getRecipes() { + List recipes = new ArrayList(); - inputs.add(recipe.getRow(0)); - inputs.add(recipe.getRow(1)); - inputs.add(recipe.getRow(2)); + for (ISoldererRecipe recipe : SoldererRegistry.recipes) { + List inputs = new ArrayList(); - ItemStack output = recipe.getResult(); + inputs.add(recipe.getRow(0)); + inputs.add(recipe.getRow(1)); + inputs.add(recipe.getRow(2)); - recipes.add(new SoldererRecipeWrapper(inputs, output)); - } + ItemStack output = recipe.getResult(); - return recipes; - } + recipes.add(new SoldererRecipeWrapper(inputs, output)); + } + + return recipes; + } } diff --git a/src/main/java/refinedstorage/jei/SoldererRecipeWrapper.java b/src/main/java/refinedstorage/jei/SoldererRecipeWrapper.java old mode 100644 new mode 100755 index 0f181c48b..3a045d881 --- a/src/main/java/refinedstorage/jei/SoldererRecipeWrapper.java +++ b/src/main/java/refinedstorage/jei/SoldererRecipeWrapper.java @@ -1,79 +1,68 @@ package refinedstorage.jei; import com.google.common.base.Objects; -import java.util.Collections; -import java.util.List; import mezz.jei.plugins.vanilla.VanillaRecipeWrapper; import net.minecraft.item.ItemStack; -public class SoldererRecipeWrapper extends VanillaRecipeWrapper -{ - private int hashCode; - private List inputs; - private ItemStack output; +import java.util.Collections; +import java.util.List; - public SoldererRecipeWrapper(List inputs, ItemStack output) - { - this.inputs = inputs; - this.output = output; +public class SoldererRecipeWrapper extends VanillaRecipeWrapper { + private int hashCode; + private List inputs; + private ItemStack output; - int available = 0; + public SoldererRecipeWrapper(List inputs, ItemStack output) { + this.inputs = inputs; + this.output = output; - for (int i = 0; i < 3; ++i) - { - if (inputs.get(i) != null) - { - available = i; + int available = 0; - break; - } - } + for (int i = 0; i < 3; ++i) { + if (inputs.get(i) != null) { + available = i; - hashCode = Objects.hashCode(inputs.get(available), output); - } + break; + } + } - @Override - public List getInputs() - { - return inputs; - } + hashCode = Objects.hashCode(inputs.get(available), output); + } - @Override - public List getOutputs() - { - return Collections.singletonList(output); - } + @Override + public List getInputs() { + return inputs; + } - @Override - public boolean equals(Object obj) - { - if (!(obj instanceof SoldererRecipeWrapper)) - { - return false; - } + @Override + public List getOutputs() { + return Collections.singletonList(output); + } - SoldererRecipeWrapper other = (SoldererRecipeWrapper) obj; + @Override + public boolean equals(Object obj) { + if (!(obj instanceof SoldererRecipeWrapper)) { + return false; + } - for (int i = 0; i < inputs.size(); i++) - { - if (!ItemStack.areItemStacksEqual(inputs.get(i), other.inputs.get(i))) - { - return false; - } - } + SoldererRecipeWrapper other = (SoldererRecipeWrapper) obj; - return ItemStack.areItemStacksEqual(output, other.output); - } + for (int i = 0; i < inputs.size(); i++) { + if (!ItemStack.areItemStacksEqual(inputs.get(i), other.inputs.get(i))) { + return false; + } + } - @Override - public int hashCode() - { - return hashCode; - } + return ItemStack.areItemStacksEqual(output, other.output); + } - @Override - public String toString() - { - return inputs + " = " + output; - } + @Override + public int hashCode() { + return hashCode; + } + + @Override + public String toString() { + return inputs + " = " + output; + } } diff --git a/src/main/java/refinedstorage/network/MessageCompareUpdate.java b/src/main/java/refinedstorage/network/MessageCompareUpdate.java old mode 100644 new mode 100755 index adbc4bf53..17ec03cc2 --- a/src/main/java/refinedstorage/network/MessageCompareUpdate.java +++ b/src/main/java/refinedstorage/network/MessageCompareUpdate.java @@ -7,51 +7,44 @@ import net.minecraft.util.math.BlockPos; import net.minecraftforge.fml.common.network.simpleimpl.IMessage; import refinedstorage.tile.settings.ICompareSetting; -public class MessageCompareUpdate extends MessageHandlerPlayerToServer implements IMessage -{ - private int x; - private int y; - private int z; - private int compare; +public class MessageCompareUpdate extends MessageHandlerPlayerToServer implements IMessage { + private int x; + private int y; + private int z; + private int compare; - public MessageCompareUpdate() - { - } + public MessageCompareUpdate() { + } - public MessageCompareUpdate(ICompareSetting setting, int compare) - { - this.x = setting.getMachinePos().getX(); - this.y = setting.getMachinePos().getY(); - this.z = setting.getMachinePos().getZ(); - this.compare = compare; - } + public MessageCompareUpdate(ICompareSetting setting, int compare) { + this.x = setting.getMachinePos().getX(); + this.y = setting.getMachinePos().getY(); + this.z = setting.getMachinePos().getZ(); + this.compare = compare; + } - @Override - public void fromBytes(ByteBuf buf) - { - x = buf.readInt(); - y = buf.readInt(); - z = buf.readInt(); - compare = buf.readInt(); - } + @Override + public void fromBytes(ByteBuf buf) { + x = buf.readInt(); + y = buf.readInt(); + z = buf.readInt(); + compare = buf.readInt(); + } - @Override - public void toBytes(ByteBuf buf) - { - buf.writeInt(x); - buf.writeInt(y); - buf.writeInt(z); - buf.writeInt(compare); - } + @Override + public void toBytes(ByteBuf buf) { + buf.writeInt(x); + buf.writeInt(y); + buf.writeInt(z); + buf.writeInt(compare); + } - @Override - public void handle(MessageCompareUpdate message, EntityPlayerMP player) - { - TileEntity tile = player.worldObj.getTileEntity(new BlockPos(message.x, message.y, message.z)); + @Override + public void handle(MessageCompareUpdate message, EntityPlayerMP player) { + TileEntity tile = player.worldObj.getTileEntity(new BlockPos(message.x, message.y, message.z)); - if (tile instanceof ICompareSetting) - { - ((ICompareSetting) tile).setCompare(message.compare); - } - } + if (tile instanceof ICompareSetting) { + ((ICompareSetting) tile).setCompare(message.compare); + } + } } diff --git a/src/main/java/refinedstorage/network/MessageDetectorAmountUpdate.java b/src/main/java/refinedstorage/network/MessageDetectorAmountUpdate.java old mode 100644 new mode 100755 index c097cb0d8..621237916 --- a/src/main/java/refinedstorage/network/MessageDetectorAmountUpdate.java +++ b/src/main/java/refinedstorage/network/MessageDetectorAmountUpdate.java @@ -7,51 +7,44 @@ import net.minecraft.util.math.BlockPos; import net.minecraftforge.fml.common.network.simpleimpl.IMessage; import refinedstorage.tile.TileDetector; -public class MessageDetectorAmountUpdate extends MessageHandlerPlayerToServer implements IMessage -{ - private int x; - private int y; - private int z; - private int amount; +public class MessageDetectorAmountUpdate extends MessageHandlerPlayerToServer implements IMessage { + private int x; + private int y; + private int z; + private int amount; - public MessageDetectorAmountUpdate() - { - } + public MessageDetectorAmountUpdate() { + } - public MessageDetectorAmountUpdate(TileDetector detector, int amount) - { - this.x = detector.getPos().getX(); - this.y = detector.getPos().getY(); - this.z = detector.getPos().getZ(); - this.amount = amount; - } + public MessageDetectorAmountUpdate(TileDetector detector, int amount) { + this.x = detector.getPos().getX(); + this.y = detector.getPos().getY(); + this.z = detector.getPos().getZ(); + this.amount = amount; + } - @Override - public void fromBytes(ByteBuf buf) - { - x = buf.readInt(); - y = buf.readInt(); - z = buf.readInt(); - amount = buf.readInt(); - } + @Override + public void fromBytes(ByteBuf buf) { + x = buf.readInt(); + y = buf.readInt(); + z = buf.readInt(); + amount = buf.readInt(); + } - @Override - public void toBytes(ByteBuf buf) - { - buf.writeInt(x); - buf.writeInt(y); - buf.writeInt(z); - buf.writeInt(amount); - } + @Override + public void toBytes(ByteBuf buf) { + buf.writeInt(x); + buf.writeInt(y); + buf.writeInt(z); + buf.writeInt(amount); + } - @Override - public void handle(MessageDetectorAmountUpdate message, EntityPlayerMP player) - { - TileEntity tile = player.worldObj.getTileEntity(new BlockPos(message.x, message.y, message.z)); + @Override + public void handle(MessageDetectorAmountUpdate message, EntityPlayerMP player) { + TileEntity tile = player.worldObj.getTileEntity(new BlockPos(message.x, message.y, message.z)); - if (tile instanceof TileDetector && message.amount >= 0) - { - ((TileDetector) tile).setAmount(message.amount); - } - } + if (tile instanceof TileDetector && message.amount >= 0) { + ((TileDetector) tile).setAmount(message.amount); + } + } } diff --git a/src/main/java/refinedstorage/network/MessageDetectorModeUpdate.java b/src/main/java/refinedstorage/network/MessageDetectorModeUpdate.java old mode 100644 new mode 100755 index 5c5e2a9b9..4b2905426 --- a/src/main/java/refinedstorage/network/MessageDetectorModeUpdate.java +++ b/src/main/java/refinedstorage/network/MessageDetectorModeUpdate.java @@ -7,60 +7,52 @@ import net.minecraft.util.math.BlockPos; import net.minecraftforge.fml.common.network.simpleimpl.IMessage; import refinedstorage.tile.TileDetector; -public class MessageDetectorModeUpdate extends MessageHandlerPlayerToServer implements IMessage -{ - private int x; - private int y; - private int z; +public class MessageDetectorModeUpdate extends MessageHandlerPlayerToServer implements IMessage { + private int x; + private int y; + private int z; - public MessageDetectorModeUpdate() - { - } + public MessageDetectorModeUpdate() { + } - public MessageDetectorModeUpdate(TileDetector detector) - { - this.x = detector.getPos().getX(); - this.y = detector.getPos().getY(); - this.z = detector.getPos().getZ(); - } + public MessageDetectorModeUpdate(TileDetector detector) { + this.x = detector.getPos().getX(); + this.y = detector.getPos().getY(); + this.z = detector.getPos().getZ(); + } - @Override - public void fromBytes(ByteBuf buf) - { - x = buf.readInt(); - y = buf.readInt(); - z = buf.readInt(); - } + @Override + public void fromBytes(ByteBuf buf) { + x = buf.readInt(); + y = buf.readInt(); + z = buf.readInt(); + } - @Override - public void toBytes(ByteBuf buf) - { - buf.writeInt(x); - buf.writeInt(y); - buf.writeInt(z); - } + @Override + public void toBytes(ByteBuf buf) { + buf.writeInt(x); + buf.writeInt(y); + buf.writeInt(z); + } - @Override - public void handle(MessageDetectorModeUpdate message, EntityPlayerMP player) - { - TileEntity tile = player.worldObj.getTileEntity(new BlockPos(message.x, message.y, message.z)); + @Override + public void handle(MessageDetectorModeUpdate message, EntityPlayerMP player) { + TileEntity tile = player.worldObj.getTileEntity(new BlockPos(message.x, message.y, message.z)); - if (tile instanceof TileDetector) - { - TileDetector detector = (TileDetector) tile; + if (tile instanceof TileDetector) { + TileDetector detector = (TileDetector) tile; - switch (detector.getMode()) - { - case TileDetector.MODE_UNDER: - detector.setMode(TileDetector.MODE_EQUAL); - break; - case TileDetector.MODE_EQUAL: - detector.setMode(TileDetector.MODE_ABOVE); - break; - case TileDetector.MODE_ABOVE: - detector.setMode(TileDetector.MODE_UNDER); - break; - } - } - } + switch (detector.getMode()) { + case TileDetector.MODE_UNDER: + detector.setMode(TileDetector.MODE_EQUAL); + break; + case TileDetector.MODE_EQUAL: + detector.setMode(TileDetector.MODE_ABOVE); + break; + case TileDetector.MODE_ABOVE: + detector.setMode(TileDetector.MODE_UNDER); + break; + } + } + } } diff --git a/src/main/java/refinedstorage/network/MessageGridCraftingClear.java b/src/main/java/refinedstorage/network/MessageGridCraftingClear.java old mode 100644 new mode 100755 index 6b13bac1c..ef3bc8cf3 --- a/src/main/java/refinedstorage/network/MessageGridCraftingClear.java +++ b/src/main/java/refinedstorage/network/MessageGridCraftingClear.java @@ -9,63 +9,52 @@ import net.minecraftforge.fml.common.network.simpleimpl.IMessage; import refinedstorage.block.EnumGridType; import refinedstorage.tile.TileGrid; -public class MessageGridCraftingClear extends MessageHandlerPlayerToServer implements IMessage -{ - private int x; - private int y; - private int z; +public class MessageGridCraftingClear extends MessageHandlerPlayerToServer implements IMessage { + private int x; + private int y; + private int z; - public MessageGridCraftingClear() - { - } + public MessageGridCraftingClear() { + } - public MessageGridCraftingClear(TileGrid grid) - { - this.x = grid.getPos().getX(); - this.y = grid.getPos().getY(); - this.z = grid.getPos().getZ(); - } + public MessageGridCraftingClear(TileGrid grid) { + this.x = grid.getPos().getX(); + this.y = grid.getPos().getY(); + this.z = grid.getPos().getZ(); + } - @Override - public void fromBytes(ByteBuf buf) - { - x = buf.readInt(); - y = buf.readInt(); - z = buf.readInt(); - } + @Override + public void fromBytes(ByteBuf buf) { + x = buf.readInt(); + y = buf.readInt(); + z = buf.readInt(); + } - @Override - public void toBytes(ByteBuf buf) - { - buf.writeInt(x); - buf.writeInt(y); - buf.writeInt(z); - } + @Override + public void toBytes(ByteBuf buf) { + buf.writeInt(x); + buf.writeInt(y); + buf.writeInt(z); + } - @Override - public void handle(MessageGridCraftingClear message, EntityPlayerMP player) - { - TileEntity tile = player.worldObj.getTileEntity(new BlockPos(message.x, message.y, message.z)); + @Override + public void handle(MessageGridCraftingClear message, EntityPlayerMP player) { + TileEntity tile = player.worldObj.getTileEntity(new BlockPos(message.x, message.y, message.z)); - if (tile instanceof TileGrid) - { - TileGrid grid = (TileGrid) tile; + if (tile instanceof TileGrid) { + TileGrid grid = (TileGrid) tile; - if (grid.isConnected() && grid.getType() == EnumGridType.CRAFTING) - { - for (int i = 0; i < grid.getCraftingInventory().getSizeInventory(); ++i) - { - ItemStack slot = grid.getCraftingInventory().getStackInSlot(i); + if (grid.isConnected() && grid.getType() == EnumGridType.CRAFTING) { + for (int i = 0; i < grid.getCraftingInventory().getSizeInventory(); ++i) { + ItemStack slot = grid.getCraftingInventory().getStackInSlot(i); - if (slot != null) - { - if (grid.getController().push(slot)) - { - grid.getCraftingInventory().setInventorySlotContents(i, null); - } - } - } - } - } - } + if (slot != null) { + if (grid.getController().push(slot)) { + grid.getCraftingInventory().setInventorySlotContents(i, null); + } + } + } + } + } + } } diff --git a/src/main/java/refinedstorage/network/MessageGridCraftingPush.java b/src/main/java/refinedstorage/network/MessageGridCraftingPush.java new file mode 100755 index 000000000..6fc60fe59 --- /dev/null +++ b/src/main/java/refinedstorage/network/MessageGridCraftingPush.java @@ -0,0 +1,62 @@ +package refinedstorage.network; + +import io.netty.buffer.ByteBuf; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.math.BlockPos; +import net.minecraftforge.fml.common.network.simpleimpl.IMessage; +import refinedstorage.block.EnumGridType; +import refinedstorage.tile.TileGrid; + +public class MessageGridCraftingPush extends MessageHandlerPlayerToServer implements IMessage { + private int x; + private int y; + private int z; + private int craftingSlot; + + public MessageGridCraftingPush() { + } + + public MessageGridCraftingPush(TileGrid grid, int craftingSlot) { + this.x = grid.getPos().getX(); + this.y = grid.getPos().getY(); + this.z = grid.getPos().getZ(); + this.craftingSlot = craftingSlot; + } + + @Override + public void fromBytes(ByteBuf buf) { + x = buf.readInt(); + y = buf.readInt(); + z = buf.readInt(); + craftingSlot = buf.readInt(); + } + + @Override + public void toBytes(ByteBuf buf) { + buf.writeInt(x); + buf.writeInt(y); + buf.writeInt(z); + buf.writeInt(craftingSlot); + } + + @Override + public void handle(MessageGridCraftingPush message, EntityPlayerMP player) { + TileEntity tile = player.worldObj.getTileEntity(new BlockPos(message.x, message.y, message.z)); + + if (tile instanceof TileGrid) { + TileGrid grid = (TileGrid) tile; + + if (grid.isConnected() && grid.getType() == EnumGridType.CRAFTING && message.craftingSlot < grid.getCraftingInventory().getSizeInventory()) { + ItemStack stack = grid.getCraftingInventory().getStackInSlot(message.craftingSlot); + + if (stack != null) { + if (grid.getController().push(stack)) { + grid.getCraftingInventory().setInventorySlotContents(message.craftingSlot, null); + } + } + } + } + } +} diff --git a/src/main/java/refinedstorage/network/MessageGridCraftingTransfer.java b/src/main/java/refinedstorage/network/MessageGridCraftingTransfer.java new file mode 100755 index 000000000..135d09a6e --- /dev/null +++ b/src/main/java/refinedstorage/network/MessageGridCraftingTransfer.java @@ -0,0 +1,59 @@ +package refinedstorage.network; + +import io.netty.buffer.ByteBuf; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; +import net.minecraftforge.common.util.Constants; +import net.minecraftforge.fml.common.network.ByteBufUtils; +import net.minecraftforge.fml.common.network.simpleimpl.IMessage; +import refinedstorage.block.EnumGridType; +import refinedstorage.container.ContainerGrid; +import refinedstorage.tile.TileGrid; + +public class MessageGridCraftingTransfer extends MessageHandlerPlayerToServer implements IMessage { + private NBTTagCompound recipe; + + public MessageGridCraftingTransfer() { + } + + public MessageGridCraftingTransfer(NBTTagCompound recipe) { + this.recipe = recipe; + } + + @Override + public void fromBytes(ByteBuf buf) { + recipe = ByteBufUtils.readTag(buf); + } + + @Override + public void toBytes(ByteBuf buf) { + ByteBufUtils.writeTag(buf, recipe); + } + + @Override + public void handle(MessageGridCraftingTransfer message, EntityPlayerMP player) { + if (player.openContainer instanceof ContainerGrid) { + TileGrid grid = ((ContainerGrid) player.openContainer).getGrid(); + + if (grid.getType() == EnumGridType.CRAFTING) { + ItemStack[][] actualRecipe = new ItemStack[9][]; + + for (int x = 0; x < actualRecipe.length; x++) { + NBTTagList list = message.recipe.getTagList("#" + x, Constants.NBT.TAG_COMPOUND); + + if (list.tagCount() > 0) { + actualRecipe[x] = new ItemStack[list.tagCount()]; + + for (int y = 0; y < list.tagCount(); y++) { + actualRecipe[x][y] = ItemStack.loadItemStackFromNBT(list.getCompoundTagAt(y)); + } + } + } + + grid.onRecipeTransfer(actualRecipe); + } + } + } +} diff --git a/src/main/java/refinedstorage/network/MessageGridCraftingUpdate.java b/src/main/java/refinedstorage/network/MessageGridCraftingUpdate.java deleted file mode 100644 index 78f1b133e..000000000 --- a/src/main/java/refinedstorage/network/MessageGridCraftingUpdate.java +++ /dev/null @@ -1,85 +0,0 @@ -package refinedstorage.network; - -import io.netty.buffer.ByteBuf; -import net.minecraft.client.Minecraft; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.math.BlockPos; -import net.minecraftforge.fml.common.network.ByteBufUtils; -import net.minecraftforge.fml.common.network.simpleimpl.IMessage; -import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; -import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; -import refinedstorage.tile.TileGrid; - -public class MessageGridCraftingUpdate implements IMessage, IMessageHandler -{ - private int x; - private int y; - private int z; - private ItemStack[] craftingMatrix = new ItemStack[9]; - - public MessageGridCraftingUpdate() - { - } - - public MessageGridCraftingUpdate(TileGrid grid) - { - this.x = grid.getPos().getX(); - this.y = grid.getPos().getY(); - this.z = grid.getPos().getZ(); - - for (int i = 0; i < 9; ++i) - { - craftingMatrix[i] = grid.getCraftingInventory().getStackInSlot(i); - } - } - - @Override - public void fromBytes(ByteBuf buf) - { - x = buf.readInt(); - y = buf.readInt(); - z = buf.readInt(); - - for (int i = 0; i < 9; ++i) - { - craftingMatrix[i] = ByteBufUtils.readItemStack(buf); - } - } - - @Override - public void toBytes(ByteBuf buf) - { - buf.writeInt(x); - buf.writeInt(y); - buf.writeInt(z); - - for (ItemStack stack : craftingMatrix) - { - ByteBufUtils.writeItemStack(buf, stack); - } - } - - @Override - public IMessage onMessage(final MessageGridCraftingUpdate message, MessageContext context) - { - Minecraft.getMinecraft().addScheduledTask(new Runnable() - { - @Override - public void run() - { - TileEntity tile = Minecraft.getMinecraft().theWorld.getTileEntity(new BlockPos(message.x, message.y, message.z)); - - if (tile instanceof TileGrid) - { - for (int i = 0; i < 9; ++i) - { - ((TileGrid) tile).getCraftingInventory().setInventorySlotContents(i, message.craftingMatrix[i]); - } - } - } - }); - - return null; - } -} diff --git a/src/main/java/refinedstorage/network/MessageGridSortingUpdate.java b/src/main/java/refinedstorage/network/MessageGridSortingUpdate.java old mode 100644 new mode 100755 index 1f2ac8f42..11781aec1 --- a/src/main/java/refinedstorage/network/MessageGridSortingUpdate.java +++ b/src/main/java/refinedstorage/network/MessageGridSortingUpdate.java @@ -7,63 +7,54 @@ import net.minecraft.util.math.BlockPos; import net.minecraftforge.fml.common.network.simpleimpl.IMessage; import refinedstorage.tile.TileGrid; -public class MessageGridSortingUpdate extends MessageHandlerPlayerToServer implements IMessage -{ - private int x; - private int y; - private int z; - private int sortingDirection; - private int sortingType; +public class MessageGridSortingUpdate extends MessageHandlerPlayerToServer implements IMessage { + private int x; + private int y; + private int z; + private int sortingDirection; + private int sortingType; - public MessageGridSortingUpdate() - { - } + public MessageGridSortingUpdate() { + } - public MessageGridSortingUpdate(TileGrid grid, int sortingDirection, int sortingType) - { - this.x = grid.getPos().getX(); - this.y = grid.getPos().getY(); - this.z = grid.getPos().getZ(); - this.sortingDirection = sortingDirection; - this.sortingType = sortingType; - } + public MessageGridSortingUpdate(TileGrid grid, int sortingDirection, int sortingType) { + this.x = grid.getPos().getX(); + this.y = grid.getPos().getY(); + this.z = grid.getPos().getZ(); + this.sortingDirection = sortingDirection; + this.sortingType = sortingType; + } - @Override - public void fromBytes(ByteBuf buf) - { - x = buf.readInt(); - y = buf.readInt(); - z = buf.readInt(); - sortingDirection = buf.readInt(); - sortingType = buf.readInt(); - } + @Override + public void fromBytes(ByteBuf buf) { + x = buf.readInt(); + y = buf.readInt(); + z = buf.readInt(); + sortingDirection = buf.readInt(); + sortingType = buf.readInt(); + } - @Override - public void toBytes(ByteBuf buf) - { - buf.writeInt(x); - buf.writeInt(y); - buf.writeInt(z); - buf.writeInt(sortingDirection); - buf.writeInt(sortingType); - } + @Override + public void toBytes(ByteBuf buf) { + buf.writeInt(x); + buf.writeInt(y); + buf.writeInt(z); + buf.writeInt(sortingDirection); + buf.writeInt(sortingType); + } - @Override - public void handle(MessageGridSortingUpdate message, EntityPlayerMP player) - { - TileEntity tile = player.worldObj.getTileEntity(new BlockPos(message.x, message.y, message.z)); + @Override + public void handle(MessageGridSortingUpdate message, EntityPlayerMP player) { + TileEntity tile = player.worldObj.getTileEntity(new BlockPos(message.x, message.y, message.z)); - if (tile instanceof TileGrid) - { - if (message.sortingDirection == TileGrid.SORTING_DIRECTION_ASCENDING || message.sortingDirection == TileGrid.SORTING_DIRECTION_DESCENDING) - { - ((TileGrid) tile).setSortingDirection(message.sortingDirection); - } + if (tile instanceof TileGrid) { + if (message.sortingDirection == TileGrid.SORTING_DIRECTION_ASCENDING || message.sortingDirection == TileGrid.SORTING_DIRECTION_DESCENDING) { + ((TileGrid) tile).setSortingDirection(message.sortingDirection); + } - if (message.sortingType == TileGrid.SORTING_TYPE_QUANTITY || message.sortingType == TileGrid.SORTING_TYPE_NAME) - { - ((TileGrid) tile).setSortingType(message.sortingType); - } - } - } + if (message.sortingType == TileGrid.SORTING_TYPE_QUANTITY || message.sortingType == TileGrid.SORTING_TYPE_NAME) { + ((TileGrid) tile).setSortingType(message.sortingType); + } + } + } } diff --git a/src/main/java/refinedstorage/network/MessageHandlerPlayerToServer.java b/src/main/java/refinedstorage/network/MessageHandlerPlayerToServer.java old mode 100644 new mode 100755 index 2c6c1bc44..d26898d4b --- a/src/main/java/refinedstorage/network/MessageHandlerPlayerToServer.java +++ b/src/main/java/refinedstorage/network/MessageHandlerPlayerToServer.java @@ -5,24 +5,20 @@ import net.minecraftforge.fml.common.network.simpleimpl.IMessage; import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; -public abstract class MessageHandlerPlayerToServer implements IMessageHandler -{ - @Override - public IMessage onMessage(final T message, MessageContext context) - { - final EntityPlayerMP player = context.getServerHandler().playerEntity; +public abstract class MessageHandlerPlayerToServer implements IMessageHandler { + @Override + public IMessage onMessage(final T message, MessageContext context) { + final EntityPlayerMP player = context.getServerHandler().playerEntity; - player.getServerForPlayer().addScheduledTask(new Runnable() - { - @Override - public void run() - { - handle(message, player); - } - }); + player.getServerForPlayer().addScheduledTask(new Runnable() { + @Override + public void run() { + handle(message, player); + } + }); - return null; - } + return null; + } - public abstract void handle(T message, EntityPlayerMP player); + public abstract void handle(T message, EntityPlayerMP player); } diff --git a/src/main/java/refinedstorage/network/MessageModeToggle.java b/src/main/java/refinedstorage/network/MessageModeToggle.java old mode 100644 new mode 100755 index 0085479cf..7c986c15e --- a/src/main/java/refinedstorage/network/MessageModeToggle.java +++ b/src/main/java/refinedstorage/network/MessageModeToggle.java @@ -7,56 +7,46 @@ import net.minecraft.util.math.BlockPos; import net.minecraftforge.fml.common.network.simpleimpl.IMessage; import refinedstorage.tile.settings.IModeSetting; -public class MessageModeToggle extends MessageHandlerPlayerToServer implements IMessage -{ - private int x; - private int y; - private int z; +public class MessageModeToggle extends MessageHandlerPlayerToServer implements IMessage { + private int x; + private int y; + private int z; - public MessageModeToggle() - { - } + public MessageModeToggle() { + } - public MessageModeToggle(IModeSetting mode) - { - this.x = mode.getMachinePos().getX(); - this.y = mode.getMachinePos().getY(); - this.z = mode.getMachinePos().getZ(); - } + public MessageModeToggle(IModeSetting mode) { + this.x = mode.getMachinePos().getX(); + this.y = mode.getMachinePos().getY(); + this.z = mode.getMachinePos().getZ(); + } - @Override - public void fromBytes(ByteBuf buf) - { - x = buf.readInt(); - y = buf.readInt(); - z = buf.readInt(); - } + @Override + public void fromBytes(ByteBuf buf) { + x = buf.readInt(); + y = buf.readInt(); + z = buf.readInt(); + } - @Override - public void toBytes(ByteBuf buf) - { - buf.writeInt(x); - buf.writeInt(y); - buf.writeInt(z); - } + @Override + public void toBytes(ByteBuf buf) { + buf.writeInt(x); + buf.writeInt(y); + buf.writeInt(z); + } - @Override - public void handle(MessageModeToggle message, EntityPlayerMP player) - { - TileEntity tile = player.worldObj.getTileEntity(new BlockPos(message.x, message.y, message.z)); + @Override + public void handle(MessageModeToggle message, EntityPlayerMP player) { + TileEntity tile = player.worldObj.getTileEntity(new BlockPos(message.x, message.y, message.z)); - if (tile instanceof IModeSetting) - { - IModeSetting mode = (IModeSetting) tile; + if (tile instanceof IModeSetting) { + IModeSetting mode = (IModeSetting) tile; - if (mode.isWhitelist()) - { - mode.setToBlacklist(); - } - else if (mode.isBlacklist()) - { - mode.setToWhitelist(); - } - } - } + if (mode.isWhitelist()) { + mode.setToBlacklist(); + } else if (mode.isBlacklist()) { + mode.setToWhitelist(); + } + } + } } diff --git a/src/main/java/refinedstorage/network/MessagePriorityUpdate.java b/src/main/java/refinedstorage/network/MessagePriorityUpdate.java old mode 100644 new mode 100755 index 16a648e51..d3b66c873 --- a/src/main/java/refinedstorage/network/MessagePriorityUpdate.java +++ b/src/main/java/refinedstorage/network/MessagePriorityUpdate.java @@ -5,63 +5,52 @@ import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraftforge.fml.common.network.simpleimpl.IMessage; -import refinedstorage.tile.TileDrive; +import refinedstorage.tile.TileDiskDrive; import refinedstorage.tile.TileExternalStorage; import refinedstorage.tile.TileStorage; -public class MessagePriorityUpdate extends MessageHandlerPlayerToServer implements IMessage -{ - private int x; - private int y; - private int z; - private int priority; +public class MessagePriorityUpdate extends MessageHandlerPlayerToServer implements IMessage { + private int x; + private int y; + private int z; + private int priority; - public MessagePriorityUpdate() - { - } + public MessagePriorityUpdate() { + } - public MessagePriorityUpdate(BlockPos pos, int priority) - { - this.x = pos.getX(); - this.y = pos.getY(); - this.z = pos.getZ(); - this.priority = priority; - } + public MessagePriorityUpdate(BlockPos pos, int priority) { + this.x = pos.getX(); + this.y = pos.getY(); + this.z = pos.getZ(); + this.priority = priority; + } - @Override - public void fromBytes(ByteBuf buf) - { - x = buf.readInt(); - y = buf.readInt(); - z = buf.readInt(); - priority = buf.readInt(); - } + @Override + public void fromBytes(ByteBuf buf) { + x = buf.readInt(); + y = buf.readInt(); + z = buf.readInt(); + priority = buf.readInt(); + } - @Override - public void toBytes(ByteBuf buf) - { - buf.writeInt(x); - buf.writeInt(y); - buf.writeInt(z); - buf.writeInt(priority); - } + @Override + public void toBytes(ByteBuf buf) { + buf.writeInt(x); + buf.writeInt(y); + buf.writeInt(z); + buf.writeInt(priority); + } - @Override - public void handle(MessagePriorityUpdate message, EntityPlayerMP player) - { - TileEntity tile = player.worldObj.getTileEntity(new BlockPos(message.x, message.y, message.z)); + @Override + public void handle(MessagePriorityUpdate message, EntityPlayerMP player) { + TileEntity tile = player.worldObj.getTileEntity(new BlockPos(message.x, message.y, message.z)); - if (tile instanceof TileStorage) - { - ((TileStorage) tile).setPriority(message.priority); - } - else if (tile instanceof TileExternalStorage) - { - ((TileExternalStorage) tile).setPriority(message.priority); - } - else if (tile instanceof TileDrive) - { - ((TileDrive) tile).setPriority(message.priority); - } - } + if (tile instanceof TileStorage) { + ((TileStorage) tile).setPriority(message.priority); + } else if (tile instanceof TileExternalStorage) { + ((TileExternalStorage) tile).setPriority(message.priority); + } else if (tile instanceof TileDiskDrive) { + ((TileDiskDrive) tile).setPriority(message.priority); + } + } } diff --git a/src/main/java/refinedstorage/network/MessageRedstoneModeUpdate.java b/src/main/java/refinedstorage/network/MessageRedstoneModeUpdate.java old mode 100644 new mode 100755 index 9e12224b4..e664977cd --- a/src/main/java/refinedstorage/network/MessageRedstoneModeUpdate.java +++ b/src/main/java/refinedstorage/network/MessageRedstoneModeUpdate.java @@ -7,49 +7,42 @@ import net.minecraft.util.math.BlockPos; import net.minecraftforge.fml.common.network.simpleimpl.IMessage; import refinedstorage.tile.settings.IRedstoneModeSetting; -public class MessageRedstoneModeUpdate extends MessageHandlerPlayerToServer implements IMessage -{ - private int x; - private int y; - private int z; +public class MessageRedstoneModeUpdate extends MessageHandlerPlayerToServer implements IMessage { + private int x; + private int y; + private int z; - public MessageRedstoneModeUpdate() - { - } + public MessageRedstoneModeUpdate() { + } - public MessageRedstoneModeUpdate(IRedstoneModeSetting setting) - { - this.x = setting.getMachinePos().getX(); - this.y = setting.getMachinePos().getY(); - this.z = setting.getMachinePos().getZ(); - } + public MessageRedstoneModeUpdate(IRedstoneModeSetting setting) { + this.x = setting.getMachinePos().getX(); + this.y = setting.getMachinePos().getY(); + this.z = setting.getMachinePos().getZ(); + } - @Override - public void fromBytes(ByteBuf buf) - { - x = buf.readInt(); - y = buf.readInt(); - z = buf.readInt(); - } + @Override + public void fromBytes(ByteBuf buf) { + x = buf.readInt(); + y = buf.readInt(); + z = buf.readInt(); + } - @Override - public void toBytes(ByteBuf buf) - { - buf.writeInt(x); - buf.writeInt(y); - buf.writeInt(z); - } + @Override + public void toBytes(ByteBuf buf) { + buf.writeInt(x); + buf.writeInt(y); + buf.writeInt(z); + } - @Override - public void handle(MessageRedstoneModeUpdate message, EntityPlayerMP player) - { - TileEntity tile = player.worldObj.getTileEntity(new BlockPos(message.x, message.y, message.z)); + @Override + public void handle(MessageRedstoneModeUpdate message, EntityPlayerMP player) { + TileEntity tile = player.worldObj.getTileEntity(new BlockPos(message.x, message.y, message.z)); - if (tile instanceof IRedstoneModeSetting) - { - IRedstoneModeSetting setting = (IRedstoneModeSetting) tile; + if (tile instanceof IRedstoneModeSetting) { + IRedstoneModeSetting setting = (IRedstoneModeSetting) tile; - setting.setRedstoneMode(setting.getRedstoneMode().next()); - } - } + setting.setRedstoneMode(setting.getRedstoneMode().next()); + } + } } diff --git a/src/main/java/refinedstorage/network/MessageStoragePull.java b/src/main/java/refinedstorage/network/MessageStoragePull.java old mode 100644 new mode 100755 index 7dcff78b0..9ed5b2f11 --- a/src/main/java/refinedstorage/network/MessageStoragePull.java +++ b/src/main/java/refinedstorage/network/MessageStoragePull.java @@ -9,106 +9,89 @@ import net.minecraftforge.fml.common.network.simpleimpl.IMessage; import refinedstorage.storage.StorageItem; import refinedstorage.tile.TileController; -public class MessageStoragePull extends MessageHandlerPlayerToServer implements IMessage -{ - private int x; - private int y; - private int z; - private int id; - private boolean half; - private boolean one; - private boolean shift; +public class MessageStoragePull extends MessageHandlerPlayerToServer implements IMessage { + private int x; + private int y; + private int z; + private int id; + private boolean half; + private boolean one; + private boolean shift; - public MessageStoragePull() - { - } + public MessageStoragePull() { + } - public MessageStoragePull(int x, int y, int z, int id, boolean half, boolean one, boolean shift) - { - this.x = x; - this.y = y; - this.z = z; - this.id = id; - this.half = half; - this.one = one; - this.shift = shift; - } + public MessageStoragePull(int x, int y, int z, int id, boolean half, boolean one, boolean shift) { + this.x = x; + this.y = y; + this.z = z; + this.id = id; + this.half = half; + this.one = one; + this.shift = shift; + } - @Override - public void fromBytes(ByteBuf buf) - { - x = buf.readInt(); - y = buf.readInt(); - z = buf.readInt(); - id = buf.readInt(); - half = buf.readBoolean(); - one = buf.readBoolean(); - shift = buf.readBoolean(); - } + @Override + public void fromBytes(ByteBuf buf) { + x = buf.readInt(); + y = buf.readInt(); + z = buf.readInt(); + id = buf.readInt(); + half = buf.readBoolean(); + one = buf.readBoolean(); + shift = buf.readBoolean(); + } - @Override - public void toBytes(ByteBuf buf) - { - buf.writeInt(x); - buf.writeInt(y); - buf.writeInt(z); - buf.writeInt(id); - buf.writeBoolean(half); - buf.writeBoolean(one); - buf.writeBoolean(shift); - } + @Override + public void toBytes(ByteBuf buf) { + buf.writeInt(x); + buf.writeInt(y); + buf.writeInt(z); + buf.writeInt(id); + buf.writeBoolean(half); + buf.writeBoolean(one); + buf.writeBoolean(shift); + } - @Override - public void handle(MessageStoragePull message, EntityPlayerMP player) - { - TileEntity tile = player.worldObj.getTileEntity(new BlockPos(message.x, message.y, message.z)); + @Override + public void handle(MessageStoragePull message, EntityPlayerMP player) { + TileEntity tile = player.worldObj.getTileEntity(new BlockPos(message.x, message.y, message.z)); - if (tile instanceof TileController) - { - TileController controller = (TileController) tile; + if (tile instanceof TileController) { + TileController controller = (TileController) tile; - if (message.id < controller.getItems().size()) - { - StorageItem item = controller.getItems().get(message.id); + if (message.id < controller.getItems().size()) { + StorageItem item = controller.getItems().get(message.id); - int quantity = 64; + int quantity = 64; - if (message.half && item.getQuantity() > 1) - { - quantity = item.getQuantity() / 2; + if (message.half && item.getQuantity() > 1) { + quantity = item.getQuantity() / 2; - if (quantity > 64) - { - quantity = 64; - } - } - else if (message.one) - { - quantity = 1; - } - else if (message.shift && quantity > item.getType().getItemStackLimit(item.toItemStack())) - { - quantity = item.getType().getItemStackLimit(item.toItemStack()); - } + if (quantity > 32) { + quantity = 32; + } + } else if (message.one) { + quantity = 1; + } - ItemStack took = controller.take(item.copy(quantity).toItemStack()); + if (quantity > item.getType().getItemStackLimit(item.toItemStack())) { + quantity = item.getType().getItemStackLimit(item.toItemStack()); + } - if (took != null) - { - if (message.shift) - { - if (!player.inventory.addItemStackToInventory(took.copy())) - { - controller.push(took); - } - } - else - { - player.inventory.setItemStack(took); - player.updateHeldItem(); - } - } - } - } - } + ItemStack took = controller.take(item.copy(quantity).toItemStack()); + + if (took != null) { + if (message.shift) { + if (!player.inventory.addItemStackToInventory(took.copy())) { + controller.push(took); + } + } else { + player.inventory.setItemStack(took); + player.updateHeldItem(); + } + } + } + } + } } diff --git a/src/main/java/refinedstorage/network/MessageStoragePush.java b/src/main/java/refinedstorage/network/MessageStoragePush.java old mode 100644 new mode 100755 index 915d512d2..7cddb9a0b --- a/src/main/java/refinedstorage/network/MessageStoragePush.java +++ b/src/main/java/refinedstorage/network/MessageStoragePush.java @@ -8,102 +8,82 @@ import net.minecraft.util.math.BlockPos; import net.minecraftforge.fml.common.network.simpleimpl.IMessage; import refinedstorage.tile.TileController; -public class MessageStoragePush extends MessageHandlerPlayerToServer implements IMessage -{ - private int x; - private int y; - private int z; - private int slot; - private boolean one; +public class MessageStoragePush extends MessageHandlerPlayerToServer implements IMessage { + private int x; + private int y; + private int z; + private int slot; + private boolean one; - public MessageStoragePush() - { - } + public MessageStoragePush() { + } - public MessageStoragePush(int x, int y, int z, int slot, boolean one) - { - this.x = x; - this.y = y; - this.z = z; - this.slot = slot; - this.one = one; - } + public MessageStoragePush(int x, int y, int z, int slot, boolean one) { + this.x = x; + this.y = y; + this.z = z; + this.slot = slot; + this.one = one; + } - @Override - public void fromBytes(ByteBuf buf) - { - x = buf.readInt(); - y = buf.readInt(); - z = buf.readInt(); - slot = buf.readInt(); - one = buf.readBoolean(); - } + @Override + public void fromBytes(ByteBuf buf) { + x = buf.readInt(); + y = buf.readInt(); + z = buf.readInt(); + slot = buf.readInt(); + one = buf.readBoolean(); + } - @Override - public void toBytes(ByteBuf buf) - { - buf.writeInt(x); - buf.writeInt(y); - buf.writeInt(z); - buf.writeInt(slot); - buf.writeBoolean(one); - } + @Override + public void toBytes(ByteBuf buf) { + buf.writeInt(x); + buf.writeInt(y); + buf.writeInt(z); + buf.writeInt(slot); + buf.writeBoolean(one); + } - @Override - public void handle(MessageStoragePush message, EntityPlayerMP player) - { - TileEntity tile = player.worldObj.getTileEntity(new BlockPos(message.x, message.y, message.z)); + @Override + public void handle(MessageStoragePush message, EntityPlayerMP player) { + TileEntity tile = player.worldObj.getTileEntity(new BlockPos(message.x, message.y, message.z)); - if (tile instanceof TileController) - { - TileController controller = (TileController) tile; + if (tile instanceof TileController) { + TileController controller = (TileController) tile; - ItemStack stack; + ItemStack stack; - if (message.slot == -1) - { - stack = player.inventory.getItemStack().copy(); + if (message.slot == -1) { + stack = player.inventory.getItemStack().copy(); - if (message.one) - { - stack.stackSize = 1; - } - } - else - { - stack = player.inventory.getStackInSlot(message.slot); - } + if (message.one) { + stack.stackSize = 1; + } + } else { + stack = player.inventory.getStackInSlot(message.slot); + } - if (stack != null) - { - boolean success = controller.push(stack); + if (stack != null) { + boolean success = controller.push(stack); - if (success) - { - if (message.slot == -1) - { - if (message.one) - { - player.inventory.getItemStack().stackSize--; + if (success) { + if (message.slot == -1) { + if (message.one) { + player.inventory.getItemStack().stackSize--; - if (player.inventory.getItemStack().stackSize == 0) - { - player.inventory.setItemStack(null); - } - } - else - { - player.inventory.setItemStack(null); - } + if (player.inventory.getItemStack().stackSize == 0) { + player.inventory.setItemStack(null); + } + } else { + player.inventory.setItemStack(null); + } - player.updateHeldItem(); - } - else - { - player.inventory.setInventorySlotContents(message.slot, null); - } - } - } - } - } + player.updateHeldItem(); + } else { + player.inventory.setInventorySlotContents(message.slot, null); + } + } + } + } + } } diff --git a/src/main/java/refinedstorage/network/MessageTileUpdate.java b/src/main/java/refinedstorage/network/MessageTileUpdate.java old mode 100644 new mode 100755 index 10986a3d1..6c9dbfa5a --- a/src/main/java/refinedstorage/network/MessageTileUpdate.java +++ b/src/main/java/refinedstorage/network/MessageTileUpdate.java @@ -9,56 +9,47 @@ import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; import refinedstorage.tile.INetworkTile; -public class MessageTileUpdate implements IMessage, IMessageHandler -{ - private TileEntity tile; - private int x; - private int y; - private int z; +public class MessageTileUpdate implements IMessage, IMessageHandler { + private TileEntity tile; + private int x; + private int y; + private int z; - public MessageTileUpdate() - { - } + public MessageTileUpdate() { + } - public MessageTileUpdate(TileEntity tile) - { - this.tile = tile; - } + public MessageTileUpdate(TileEntity tile) { + this.tile = tile; + } - @Override - public void fromBytes(ByteBuf buf) - { - x = buf.readInt(); - y = buf.readInt(); - z = buf.readInt(); + @Override + public void fromBytes(ByteBuf buf) { + x = buf.readInt(); + y = buf.readInt(); + z = buf.readInt(); - if (Minecraft.getMinecraft().theWorld != null) - { - tile = Minecraft.getMinecraft().theWorld.getTileEntity(new BlockPos(x, y, z)); + if (Minecraft.getMinecraft().theWorld != null) { + tile = Minecraft.getMinecraft().theWorld.getTileEntity(new BlockPos(x, y, z)); - if (tile instanceof INetworkTile) - { - ((INetworkTile) tile).fromBytes(buf); - } - } - } + if (tile instanceof INetworkTile) { + ((INetworkTile) tile).fromBytes(buf); + } + } + } - @Override - public void toBytes(ByteBuf buf) - { - buf.writeInt(tile.getPos().getX()); - buf.writeInt(tile.getPos().getY()); - buf.writeInt(tile.getPos().getZ()); + @Override + public void toBytes(ByteBuf buf) { + buf.writeInt(tile.getPos().getX()); + buf.writeInt(tile.getPos().getY()); + buf.writeInt(tile.getPos().getZ()); - if (tile instanceof INetworkTile) - { - ((INetworkTile) tile).toBytes(buf); - } - } + if (tile instanceof INetworkTile) { + ((INetworkTile) tile).toBytes(buf); + } + } - @Override - public IMessage onMessage(MessageTileUpdate message, MessageContext ctx) - { - return null; - } + @Override + public IMessage onMessage(MessageTileUpdate message, MessageContext ctx) { + return null; + } } diff --git a/src/main/java/refinedstorage/proxy/ClientProxy.java b/src/main/java/refinedstorage/proxy/ClientProxy.java old mode 100644 new mode 100755 index 39eb1f533..1422444f7 --- a/src/main/java/refinedstorage/proxy/ClientProxy.java +++ b/src/main/java/refinedstorage/proxy/ClientProxy.java @@ -11,126 +11,118 @@ import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; import refinedstorage.RefinedStorageBlocks; import refinedstorage.RefinedStorageItems; -import refinedstorage.block.*; +import refinedstorage.block.EnumControllerType; +import refinedstorage.block.EnumGridType; +import refinedstorage.block.EnumStorageType; import refinedstorage.item.*; -public class ClientProxy extends CommonProxy -{ - @Override - public void preInit(FMLPreInitializationEvent e) - { - super.preInit(e); +public class ClientProxy extends CommonProxy { + @Override + public void preInit(FMLPreInitializationEvent e) { + super.preInit(e); - // Item Variants - ModelBakery.registerItemVariants(RefinedStorageItems.STORAGE_CELL, - new ResourceLocation("refinedstorage:1k_storage_cell"), - new ResourceLocation("refinedstorage:4k_storage_cell"), - new ResourceLocation("refinedstorage:16k_storage_cell"), - new ResourceLocation("refinedstorage:64k_storage_cell"), - new ResourceLocation("refinedstorage:creative_storage_cell") - ); + // Item Variants + ModelBakery.registerItemVariants(RefinedStorageItems.STORAGE_DISK, + new ResourceLocation("refinedstorage:1k_storage_disk"), + new ResourceLocation("refinedstorage:4k_storage_disk"), + new ResourceLocation("refinedstorage:16k_storage_disk"), + new ResourceLocation("refinedstorage:64k_storage_disk"), + new ResourceLocation("refinedstorage:creative_storage_disk") + ); - ModelBakery.registerItemVariants(RefinedStorageItems.STORAGE_PART, - new ResourceLocation("refinedstorage:1k_storage_part"), - new ResourceLocation("refinedstorage:4k_storage_part"), - new ResourceLocation("refinedstorage:16k_storage_part"), - new ResourceLocation("refinedstorage:64k_storage_part") - ); + ModelBakery.registerItemVariants(RefinedStorageItems.STORAGE_PART, + new ResourceLocation("refinedstorage:1k_storage_part"), + new ResourceLocation("refinedstorage:4k_storage_part"), + new ResourceLocation("refinedstorage:16k_storage_part"), + new ResourceLocation("refinedstorage:64k_storage_part") + ); - ModelBakery.registerItemVariants(RefinedStorageItems.PROCESSOR, - new ResourceLocation("refinedstorage:basic_printed_processor"), - new ResourceLocation("refinedstorage:improved_printed_processor"), - new ResourceLocation("refinedstorage:advanced_printed_processor"), - new ResourceLocation("refinedstorage:basic_processor"), - new ResourceLocation("refinedstorage:improved_processor"), - new ResourceLocation("refinedstorage:advanced_processor"), - new ResourceLocation("refinedstorage:printed_silicon") - ); + ModelBakery.registerItemVariants(RefinedStorageItems.PROCESSOR, + new ResourceLocation("refinedstorage:basic_printed_processor"), + new ResourceLocation("refinedstorage:improved_printed_processor"), + new ResourceLocation("refinedstorage:advanced_printed_processor"), + new ResourceLocation("refinedstorage:basic_processor"), + new ResourceLocation("refinedstorage:improved_processor"), + new ResourceLocation("refinedstorage:advanced_processor"), + new ResourceLocation("refinedstorage:printed_silicon") + ); - ModelBakery.registerItemVariants(RefinedStorageItems.CORE, - new ResourceLocation("refinedstorage:construction_core"), - new ResourceLocation("refinedstorage:destruction_core") - ); + ModelBakery.registerItemVariants(RefinedStorageItems.CORE, + new ResourceLocation("refinedstorage:construction_core"), + new ResourceLocation("refinedstorage:destruction_core") + ); - ModelBakery.registerItemVariants(RefinedStorageItems.WIRELESS_GRID, - new ResourceLocation("refinedstorage:wireless_grid_connected"), - new ResourceLocation("refinedstorage:wireless_grid_disconnected") - ); + ModelBakery.registerItemVariants(RefinedStorageItems.WIRELESS_GRID, + new ResourceLocation("refinedstorage:wireless_grid_connected"), + new ResourceLocation("refinedstorage:wireless_grid_disconnected") + ); - // Items - ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.STORAGE_CELL, ItemStorageCell.TYPE_1K, new ModelResourceLocation("refinedstorage:1k_storage_cell", "inventory")); - ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.STORAGE_CELL, ItemStorageCell.TYPE_4K, new ModelResourceLocation("refinedstorage:4k_storage_cell", "inventory")); - ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.STORAGE_CELL, ItemStorageCell.TYPE_16K, new ModelResourceLocation("refinedstorage:16k_storage_cell", "inventory")); - ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.STORAGE_CELL, ItemStorageCell.TYPE_64K, new ModelResourceLocation("refinedstorage:64k_storage_cell", "inventory")); - ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.STORAGE_CELL, ItemStorageCell.TYPE_CREATIVE, new ModelResourceLocation("refinedstorage:creative_storage_cell", "inventory")); + // Items + ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.STORAGE_DISK, ItemStorageDisk.TYPE_1K, new ModelResourceLocation("refinedstorage:1k_storage_disk", "inventory")); + ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.STORAGE_DISK, ItemStorageDisk.TYPE_4K, new ModelResourceLocation("refinedstorage:4k_storage_disk", "inventory")); + ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.STORAGE_DISK, ItemStorageDisk.TYPE_16K, new ModelResourceLocation("refinedstorage:16k_storage_disk", "inventory")); + ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.STORAGE_DISK, ItemStorageDisk.TYPE_64K, new ModelResourceLocation("refinedstorage:64k_storage_disk", "inventory")); + ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.STORAGE_DISK, ItemStorageDisk.TYPE_CREATIVE, new ModelResourceLocation("refinedstorage:creative_storage_disk", "inventory")); - ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.STORAGE_PART, ItemStoragePart.TYPE_1K, new ModelResourceLocation("refinedstorage:1k_storage_part", "inventory")); - ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.STORAGE_PART, ItemStoragePart.TYPE_4K, new ModelResourceLocation("refinedstorage:4k_storage_part", "inventory")); - ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.STORAGE_PART, ItemStoragePart.TYPE_16K, new ModelResourceLocation("refinedstorage:16k_storage_part", "inventory")); - ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.STORAGE_PART, ItemStoragePart.TYPE_64K, new ModelResourceLocation("refinedstorage:64k_storage_part", "inventory")); + ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.STORAGE_PART, ItemStoragePart.TYPE_1K, new ModelResourceLocation("refinedstorage:1k_storage_part", "inventory")); + ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.STORAGE_PART, ItemStoragePart.TYPE_4K, new ModelResourceLocation("refinedstorage:4k_storage_part", "inventory")); + ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.STORAGE_PART, ItemStoragePart.TYPE_16K, new ModelResourceLocation("refinedstorage:16k_storage_part", "inventory")); + ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.STORAGE_PART, ItemStoragePart.TYPE_64K, new ModelResourceLocation("refinedstorage:64k_storage_part", "inventory")); - ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.PROCESSOR, ItemProcessor.TYPE_PRINTED_BASIC, new ModelResourceLocation("refinedstorage:basic_printed_processor", "inventory")); - ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.PROCESSOR, ItemProcessor.TYPE_PRINTED_IMPROVED, new ModelResourceLocation("refinedstorage:improved_printed_processor", "inventory")); - ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.PROCESSOR, ItemProcessor.TYPE_PRINTED_ADVANCED, new ModelResourceLocation("refinedstorage:advanced_printed_processor", "inventory")); - ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.PROCESSOR, ItemProcessor.TYPE_BASIC, new ModelResourceLocation("refinedstorage:basic_processor", "inventory")); - ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.PROCESSOR, ItemProcessor.TYPE_IMPROVED, new ModelResourceLocation("refinedstorage:improved_processor", "inventory")); - ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.PROCESSOR, ItemProcessor.TYPE_ADVANCED, new ModelResourceLocation("refinedstorage:advanced_processor", "inventory")); - ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.PROCESSOR, ItemProcessor.TYPE_PRINTED_SILICON, new ModelResourceLocation("refinedstorage:printed_silicon", "inventory")); + ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.PROCESSOR, ItemProcessor.TYPE_PRINTED_BASIC, new ModelResourceLocation("refinedstorage:basic_printed_processor", "inventory")); + ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.PROCESSOR, ItemProcessor.TYPE_PRINTED_IMPROVED, new ModelResourceLocation("refinedstorage:improved_printed_processor", "inventory")); + ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.PROCESSOR, ItemProcessor.TYPE_PRINTED_ADVANCED, new ModelResourceLocation("refinedstorage:advanced_printed_processor", "inventory")); + ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.PROCESSOR, ItemProcessor.TYPE_BASIC, new ModelResourceLocation("refinedstorage:basic_processor", "inventory")); + ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.PROCESSOR, ItemProcessor.TYPE_IMPROVED, new ModelResourceLocation("refinedstorage:improved_processor", "inventory")); + ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.PROCESSOR, ItemProcessor.TYPE_ADVANCED, new ModelResourceLocation("refinedstorage:advanced_processor", "inventory")); + ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.PROCESSOR, ItemProcessor.TYPE_PRINTED_SILICON, new ModelResourceLocation("refinedstorage:printed_silicon", "inventory")); - ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.SILICON, 0, new ModelResourceLocation("refinedstorage:silicon", "inventory")); + ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.SILICON, 0, new ModelResourceLocation("refinedstorage:silicon", "inventory")); - ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.QUARTZ_ENRICHED_IRON, 0, new ModelResourceLocation("refinedstorage:quartz_enriched_iron", "inventory")); + ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.QUARTZ_ENRICHED_IRON, 0, new ModelResourceLocation("refinedstorage:quartz_enriched_iron", "inventory")); - ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.CORE, ItemCore.TYPE_CONSTRUCTION, new ModelResourceLocation("refinedstorage:construction_core", "inventory")); - ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.CORE, ItemCore.TYPE_DESTRUCTION, new ModelResourceLocation("refinedstorage:destruction_core", "inventory")); + ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.CORE, ItemCore.TYPE_CONSTRUCTION, new ModelResourceLocation("refinedstorage:construction_core", "inventory")); + ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.CORE, ItemCore.TYPE_DESTRUCTION, new ModelResourceLocation("refinedstorage:destruction_core", "inventory")); - ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.WIRELESS_GRID_PLATE, 0, new ModelResourceLocation("refinedstorage:wireless_grid_plate", "inventory")); + ModelLoader.setCustomMeshDefinition(RefinedStorageItems.WIRELESS_GRID, new ItemMeshDefinition() { + @Override + public ModelResourceLocation getModelLocation(ItemStack stack) { + if (ItemWirelessGrid.isValid(stack)) { + return new ModelResourceLocation("refinedstorage:wireless_grid_connected", "inventory"); + } else { + return new ModelResourceLocation("refinedstorage:wireless_grid_disconnected", "inventory"); + } + } + }); - ModelLoader.setCustomMeshDefinition(RefinedStorageItems.WIRELESS_GRID, new ItemMeshDefinition() - { - @Override - public ModelResourceLocation getModelLocation(ItemStack stack) - { - if (ItemWirelessGrid.isValid(stack)) - { - return new ModelResourceLocation("refinedstorage:wireless_grid_connected", "inventory"); - } - else - { - return new ModelResourceLocation("refinedstorage:wireless_grid_disconnected", "inventory"); - } - } - }); + // Blocks + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.CABLE), 0, new ModelResourceLocation("refinedstorage:cable", "inventory")); + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.GRID), EnumGridType.NORMAL.getId(), new ModelResourceLocation("refinedstorage:grid", "inventory")); + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.GRID), EnumGridType.CRAFTING.getId(), new ModelResourceLocation("refinedstorage:grid", "inventory")); + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.MACHINE_CASING), 0, new ModelResourceLocation("refinedstorage:machine_casing", "inventory")); + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.EXPORTER), 0, new ModelResourceLocation("refinedstorage:exporter", "inventory")); + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.IMPORTER), 0, new ModelResourceLocation("refinedstorage:importer", "inventory")); + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.EXTERNAL_STORAGE), 0, new ModelResourceLocation("refinedstorage:external_storage", "inventory")); + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.DISK_DRIVE), 0, new ModelResourceLocation("refinedstorage:disk_drive", "inventory")); + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.CONTROLLER), EnumControllerType.NORMAL.getId(), new ModelResourceLocation("refinedstorage:controller", "inventory")); + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.CONTROLLER), EnumControllerType.CREATIVE.getId(), new ModelResourceLocation("refinedstorage:controller", "inventory")); + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.CONSTRUCTOR), 0, new ModelResourceLocation("refinedstorage:constructor", "inventory")); + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.DESTRUCTOR), 0, new ModelResourceLocation("refinedstorage:destructor", "inventory")); + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.SOLDERER), 0, new ModelResourceLocation("refinedstorage:solderer", "inventory")); + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.DETECTOR), 0, new ModelResourceLocation("refinedstorage:detector", "inventory")); + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.RELAY), 0, new ModelResourceLocation("refinedstorage:relay", "inventory")); + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.INTERFACE), 0, new ModelResourceLocation("refinedstorage:interface", "inventory")); - // Blocks - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.CABLE), 0, new ModelResourceLocation("refinedstorage:cable", "inventory")); - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.GRID), EnumGridType.NORMAL.getId(), new ModelResourceLocation("refinedstorage:grid", "inventory")); - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.GRID), EnumGridType.CRAFTING.getId(), new ModelResourceLocation("refinedstorage:grid", "inventory")); - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.MACHINE_CASING), 0, new ModelResourceLocation("refinedstorage:machine_casing", "inventory")); - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.EXPORTER), 0, new ModelResourceLocation("refinedstorage:exporter", "inventory")); - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.IMPORTER), 0, new ModelResourceLocation("refinedstorage:importer", "inventory")); - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.EXTERNAL_STORAGE), 0, new ModelResourceLocation("refinedstorage:external_storage", "inventory")); - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.DRIVE), 0, new ModelResourceLocation("refinedstorage:drive", "inventory")); - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.CONTROLLER), EnumControllerType.NORMAL.getId(), new ModelResourceLocation("refinedstorage:controller", "inventory")); - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.CONTROLLER), EnumControllerType.CREATIVE.getId(), new ModelResourceLocation("refinedstorage:controller", "inventory")); - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.CONSTRUCTOR), 0, new ModelResourceLocation("refinedstorage:constructor", "inventory")); - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.DESTRUCTOR), 0, new ModelResourceLocation("refinedstorage:destructor", "inventory")); - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.SOLDERER), 0, new ModelResourceLocation("refinedstorage:solderer", "inventory")); - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.WIRELESS_TRANSMITTER), 0, new ModelResourceLocation("refinedstorage:wireless_transmitter", "inventory")); - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.DETECTOR), 0, new ModelResourceLocation("refinedstorage:detector", "inventory")); - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.RELAY), 0, new ModelResourceLocation("refinedstorage:relay", "inventory")); - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.INTERFACE), 0, new ModelResourceLocation("refinedstorage:interface", "inventory")); + ModelLoader.setCustomStateMapper(RefinedStorageBlocks.STORAGE, (new StateMap.Builder()) + .ignore(RefinedStorageBlocks.STORAGE.DIRECTION) + .ignore(RefinedStorageBlocks.STORAGE.CONNECTED) + .build() + ); - ModelLoader.setCustomStateMapper(RefinedStorageBlocks.STORAGE, (new StateMap.Builder()) - .ignore(RefinedStorageBlocks.STORAGE.DIRECTION) - .ignore(RefinedStorageBlocks.STORAGE.CONNECTED) - .build() - ); - - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.STORAGE), EnumStorageType.TYPE_1K.getId(), new ModelResourceLocation("refinedstorage:storage", "type=1k")); - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.STORAGE), EnumStorageType.TYPE_4K.getId(), new ModelResourceLocation("refinedstorage:storage", "type=4k")); - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.STORAGE), EnumStorageType.TYPE_16K.getId(), new ModelResourceLocation("refinedstorage:storage", "type=16k")); - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.STORAGE), EnumStorageType.TYPE_64K.getId(), new ModelResourceLocation("refinedstorage:storage", "type=64k")); - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.STORAGE), EnumStorageType.TYPE_CREATIVE.getId(), new ModelResourceLocation("refinedstorage:storage", "type=creative")); - } + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.STORAGE), EnumStorageType.TYPE_1K.getId(), new ModelResourceLocation("refinedstorage:storage", "type=1k")); + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.STORAGE), EnumStorageType.TYPE_4K.getId(), new ModelResourceLocation("refinedstorage:storage", "type=4k")); + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.STORAGE), EnumStorageType.TYPE_16K.getId(), new ModelResourceLocation("refinedstorage:storage", "type=16k")); + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.STORAGE), EnumStorageType.TYPE_64K.getId(), new ModelResourceLocation("refinedstorage:storage", "type=64k")); + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.STORAGE), EnumStorageType.TYPE_CREATIVE.getId(), new ModelResourceLocation("refinedstorage:storage", "type=creative")); + } } diff --git a/src/main/java/refinedstorage/proxy/CommonProxy.java b/src/main/java/refinedstorage/proxy/CommonProxy.java old mode 100644 new mode 100755 index 475d88ad1..45d217346 --- a/src/main/java/refinedstorage/proxy/CommonProxy.java +++ b/src/main/java/refinedstorage/proxy/CommonProxy.java @@ -12,7 +12,9 @@ import net.minecraftforge.fml.relauncher.Side; import refinedstorage.RefinedStorage; import refinedstorage.RefinedStorageBlocks; import refinedstorage.RefinedStorageItems; -import refinedstorage.block.*; +import refinedstorage.block.EnumControllerType; +import refinedstorage.block.EnumGridType; +import refinedstorage.block.EnumStorageType; import refinedstorage.gui.GuiHandler; import refinedstorage.item.*; import refinedstorage.network.*; @@ -20,350 +22,330 @@ import refinedstorage.storage.NBTStorage; import refinedstorage.tile.*; import refinedstorage.tile.solderer.*; -public class CommonProxy -{ - public void preInit(FMLPreInitializationEvent e) - { - RefinedStorage.NETWORK.registerMessage(MessageTileUpdate.class, MessageTileUpdate.class, 0, Side.CLIENT); - RefinedStorage.NETWORK.registerMessage(MessageRedstoneModeUpdate.class, MessageRedstoneModeUpdate.class, 1, Side.SERVER); - RefinedStorage.NETWORK.registerMessage(MessageStoragePush.class, MessageStoragePush.class, 2, Side.SERVER); - RefinedStorage.NETWORK.registerMessage(MessageStoragePull.class, MessageStoragePull.class, 3, Side.SERVER); - RefinedStorage.NETWORK.registerMessage(MessageCompareUpdate.class, MessageCompareUpdate.class, 4, Side.SERVER); - RefinedStorage.NETWORK.registerMessage(MessageModeToggle.class, MessageModeToggle.class, 5, Side.SERVER); - RefinedStorage.NETWORK.registerMessage(MessageDetectorModeUpdate.class, MessageDetectorModeUpdate.class, 6, Side.SERVER); - RefinedStorage.NETWORK.registerMessage(MessageDetectorAmountUpdate.class, MessageDetectorAmountUpdate.class, 7, Side.SERVER); - RefinedStorage.NETWORK.registerMessage(MessageGridCraftingUpdate.class, MessageGridCraftingUpdate.class, 8, Side.CLIENT); - RefinedStorage.NETWORK.registerMessage(MessageGridCraftingClear.class, MessageGridCraftingClear.class, 9, Side.SERVER); - RefinedStorage.NETWORK.registerMessage(MessagePriorityUpdate.class, MessagePriorityUpdate.class, 10, Side.SERVER); - RefinedStorage.NETWORK.registerMessage(MessageGridSortingUpdate.class, MessageGridSortingUpdate.class, 11, Side.SERVER); +import static refinedstorage.RefinedStorage.ID; - NetworkRegistry.INSTANCE.registerGuiHandler(RefinedStorage.INSTANCE, new GuiHandler()); +public class CommonProxy { + public void preInit(FMLPreInitializationEvent e) { + RefinedStorage.NETWORK.registerMessage(MessageTileUpdate.class, MessageTileUpdate.class, 0, Side.CLIENT); + RefinedStorage.NETWORK.registerMessage(MessageRedstoneModeUpdate.class, MessageRedstoneModeUpdate.class, 1, Side.SERVER); + RefinedStorage.NETWORK.registerMessage(MessageStoragePush.class, MessageStoragePush.class, 2, Side.SERVER); + RefinedStorage.NETWORK.registerMessage(MessageStoragePull.class, MessageStoragePull.class, 3, Side.SERVER); + RefinedStorage.NETWORK.registerMessage(MessageCompareUpdate.class, MessageCompareUpdate.class, 4, Side.SERVER); + RefinedStorage.NETWORK.registerMessage(MessageModeToggle.class, MessageModeToggle.class, 5, Side.SERVER); + RefinedStorage.NETWORK.registerMessage(MessageDetectorModeUpdate.class, MessageDetectorModeUpdate.class, 6, Side.SERVER); + RefinedStorage.NETWORK.registerMessage(MessageDetectorAmountUpdate.class, MessageDetectorAmountUpdate.class, 7, Side.SERVER); + RefinedStorage.NETWORK.registerMessage(MessageGridCraftingClear.class, MessageGridCraftingClear.class, 9, Side.SERVER); + RefinedStorage.NETWORK.registerMessage(MessagePriorityUpdate.class, MessagePriorityUpdate.class, 10, Side.SERVER); + RefinedStorage.NETWORK.registerMessage(MessageGridSortingUpdate.class, MessageGridSortingUpdate.class, 11, Side.SERVER); + RefinedStorage.NETWORK.registerMessage(MessageGridCraftingPush.class, MessageGridCraftingPush.class, 12, Side.SERVER); + RefinedStorage.NETWORK.registerMessage(MessageGridCraftingTransfer.class, MessageGridCraftingTransfer.class, 13, Side.SERVER); - GameRegistry.registerTileEntity(TileController.class, "controller"); - GameRegistry.registerTileEntity(TileCable.class, "cable"); - GameRegistry.registerTileEntity(TileGrid.class, "grid"); - GameRegistry.registerTileEntity(TileDrive.class, "drive"); - GameRegistry.registerTileEntity(TileExternalStorage.class, "external_storage"); - GameRegistry.registerTileEntity(TileImporter.class, "importer"); - GameRegistry.registerTileEntity(TileExporter.class, "exporter"); - GameRegistry.registerTileEntity(TileDetector.class, "detector"); - GameRegistry.registerTileEntity(TileSolderer.class, "solderer"); - GameRegistry.registerTileEntity(TileWirelessTransmitter.class, "wireless_transmitter"); - GameRegistry.registerTileEntity(TileDestructor.class, "destructor"); - GameRegistry.registerTileEntity(TileConstructor.class, "constructor"); - GameRegistry.registerTileEntity(TileStorage.class, "storage"); - GameRegistry.registerTileEntity(TileRelay.class, "relay"); - GameRegistry.registerTileEntity(TileInterface.class, "interface"); + NetworkRegistry.INSTANCE.registerGuiHandler(RefinedStorage.INSTANCE, new GuiHandler()); - GameRegistry.registerBlock(RefinedStorageBlocks.CONTROLLER, ItemBlockController.class, "controller"); - GameRegistry.registerBlock(RefinedStorageBlocks.CABLE, "cable"); - GameRegistry.registerBlock(RefinedStorageBlocks.GRID, ItemBlockGrid.class, "grid"); - GameRegistry.registerBlock(RefinedStorageBlocks.DRIVE, "drive"); - GameRegistry.registerBlock(RefinedStorageBlocks.EXTERNAL_STORAGE, "external_storage"); - GameRegistry.registerBlock(RefinedStorageBlocks.IMPORTER, "importer"); - GameRegistry.registerBlock(RefinedStorageBlocks.EXPORTER, "exporter"); - GameRegistry.registerBlock(RefinedStorageBlocks.DETECTOR, "detector"); - GameRegistry.registerBlock(RefinedStorageBlocks.MACHINE_CASING, "machine_casing"); - GameRegistry.registerBlock(RefinedStorageBlocks.SOLDERER, "solderer"); - GameRegistry.registerBlock(RefinedStorageBlocks.WIRELESS_TRANSMITTER, "wireless_transmitter"); - GameRegistry.registerBlock(RefinedStorageBlocks.DESTRUCTOR, "destructor"); - GameRegistry.registerBlock(RefinedStorageBlocks.CONSTRUCTOR, "constructor"); - GameRegistry.registerBlock(RefinedStorageBlocks.STORAGE, ItemBlockStorage.class, "storage"); - GameRegistry.registerBlock(RefinedStorageBlocks.RELAY, "relay"); - GameRegistry.registerBlock(RefinedStorageBlocks.INTERFACE, "interface"); + GameRegistry.registerTileEntity(TileController.class, ID + ":controller"); + GameRegistry.registerTileEntity(TileGrid.class, ID + ":grid"); + GameRegistry.registerTileEntity(TileDiskDrive.class, ID + ":disk_drive"); + GameRegistry.registerTileEntity(TileExternalStorage.class, ID + ":external_storage"); + GameRegistry.registerTileEntity(TileImporter.class, ID + ":importer"); + GameRegistry.registerTileEntity(TileExporter.class, ID + ":exporter"); + GameRegistry.registerTileEntity(TileDetector.class, ID + ":detector"); + GameRegistry.registerTileEntity(TileSolderer.class, ID + ":solderer"); + GameRegistry.registerTileEntity(TileDestructor.class, ID + ":destructor"); + GameRegistry.registerTileEntity(TileConstructor.class, ID + ":constructor"); + GameRegistry.registerTileEntity(TileStorage.class, ID + ":storage"); + GameRegistry.registerTileEntity(TileRelay.class, ID + ":relay"); + GameRegistry.registerTileEntity(TileInterface.class, ID + ":interface"); - GameRegistry.registerItem(RefinedStorageItems.STORAGE_CELL, "storage_cell"); - GameRegistry.registerItem(RefinedStorageItems.WIRELESS_GRID, "wireless_grid"); - GameRegistry.registerItem(RefinedStorageItems.WIRELESS_GRID_PLATE, "wireless_grid_plate"); - GameRegistry.registerItem(RefinedStorageItems.QUARTZ_ENRICHED_IRON, "quartz_enriched_iron"); - GameRegistry.registerItem(RefinedStorageItems.CORE, "core"); - GameRegistry.registerItem(RefinedStorageItems.SILICON, "silicon"); - GameRegistry.registerItem(RefinedStorageItems.PROCESSOR, "processor"); - GameRegistry.registerItem(RefinedStorageItems.STORAGE_PART, "storage_part"); + GameRegistry.registerBlock(RefinedStorageBlocks.CONTROLLER, ItemBlockController.class, ID + ":controller"); + GameRegistry.registerBlock(RefinedStorageBlocks.CABLE, ID + ":cable"); + GameRegistry.registerBlock(RefinedStorageBlocks.GRID, ItemBlockGrid.class, ID + ":grid"); + GameRegistry.registerBlock(RefinedStorageBlocks.DISK_DRIVE, ID + ":disk_drive"); + GameRegistry.registerBlock(RefinedStorageBlocks.EXTERNAL_STORAGE, ID + ":external_storage"); + GameRegistry.registerBlock(RefinedStorageBlocks.IMPORTER, ID + ":importer"); + GameRegistry.registerBlock(RefinedStorageBlocks.EXPORTER, ID + ":exporter"); + GameRegistry.registerBlock(RefinedStorageBlocks.DETECTOR, ID + ":detector"); + GameRegistry.registerBlock(RefinedStorageBlocks.MACHINE_CASING, ID + ":machine_casing"); + GameRegistry.registerBlock(RefinedStorageBlocks.SOLDERER, ID + ":solderer"); + GameRegistry.registerBlock(RefinedStorageBlocks.DESTRUCTOR, ID + ":destructor"); + GameRegistry.registerBlock(RefinedStorageBlocks.CONSTRUCTOR, ID + ":constructor"); + GameRegistry.registerBlock(RefinedStorageBlocks.STORAGE, ItemBlockStorage.class, ID + ":storage"); + GameRegistry.registerBlock(RefinedStorageBlocks.RELAY, ID + ":relay"); + GameRegistry.registerBlock(RefinedStorageBlocks.INTERFACE, ID + ":interface"); - // Processors - SoldererRegistry.addRecipe(new SoldererRecipePrintedProcessor(ItemProcessor.TYPE_PRINTED_BASIC)); - SoldererRegistry.addRecipe(new SoldererRecipePrintedProcessor(ItemProcessor.TYPE_PRINTED_IMPROVED)); - SoldererRegistry.addRecipe(new SoldererRecipePrintedProcessor(ItemProcessor.TYPE_PRINTED_ADVANCED)); - SoldererRegistry.addRecipe(new SoldererRecipePrintedProcessor(ItemProcessor.TYPE_PRINTED_SILICON)); + GameRegistry.registerItem(RefinedStorageItems.STORAGE_DISK, ID + ":storage_disk"); + GameRegistry.registerItem(RefinedStorageItems.WIRELESS_GRID, ID + ":wireless_grid"); + GameRegistry.registerItem(RefinedStorageItems.QUARTZ_ENRICHED_IRON, ID + ":quartz_enriched_iron"); + GameRegistry.registerItem(RefinedStorageItems.CORE, ID + ":core"); + GameRegistry.registerItem(RefinedStorageItems.SILICON, ID + ":silicon"); + GameRegistry.registerItem(RefinedStorageItems.PROCESSOR, ID + ":processor"); + GameRegistry.registerItem(RefinedStorageItems.STORAGE_PART, ID + ":storage_part"); - SoldererRegistry.addRecipe(new SoldererRecipeProcessor(ItemProcessor.TYPE_BASIC)); - SoldererRegistry.addRecipe(new SoldererRecipeProcessor(ItemProcessor.TYPE_IMPROVED)); - SoldererRegistry.addRecipe(new SoldererRecipeProcessor(ItemProcessor.TYPE_ADVANCED)); + // Processors + SoldererRegistry.addRecipe(new SoldererRecipePrintedProcessor(ItemProcessor.TYPE_PRINTED_BASIC)); + SoldererRegistry.addRecipe(new SoldererRecipePrintedProcessor(ItemProcessor.TYPE_PRINTED_IMPROVED)); + SoldererRegistry.addRecipe(new SoldererRecipePrintedProcessor(ItemProcessor.TYPE_PRINTED_ADVANCED)); + SoldererRegistry.addRecipe(new SoldererRecipePrintedProcessor(ItemProcessor.TYPE_PRINTED_SILICON)); - // Silicon - GameRegistry.addSmelting(Items.quartz, new ItemStack(RefinedStorageItems.SILICON), 0.5f); + SoldererRegistry.addRecipe(new SoldererRecipeProcessor(ItemProcessor.TYPE_BASIC)); + SoldererRegistry.addRecipe(new SoldererRecipeProcessor(ItemProcessor.TYPE_IMPROVED)); + SoldererRegistry.addRecipe(new SoldererRecipeProcessor(ItemProcessor.TYPE_ADVANCED)); - // Quartz Enriched Iron - GameRegistry.addRecipe(new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON, 4), - "II", - "IQ", - 'I', new ItemStack(Items.iron_ingot), - 'Q', new ItemStack(Items.quartz) - ); + // Silicon + GameRegistry.addSmelting(Items.quartz, new ItemStack(RefinedStorageItems.SILICON), 0.5f); - // Machine Casing - GameRegistry.addRecipe(new ItemStack(RefinedStorageBlocks.MACHINE_CASING), - "EEE", - "E E", - "EEE", - 'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON) - ); + // Quartz Enriched Iron + GameRegistry.addRecipe(new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON, 4), + "II", + "IQ", + 'I', new ItemStack(Items.iron_ingot), + 'Q', new ItemStack(Items.quartz) + ); - // Construction Core - GameRegistry.addShapelessRecipe(new ItemStack(RefinedStorageItems.CORE, 1, ItemCore.TYPE_CONSTRUCTION), - new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON), - new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_BASIC), - new ItemStack(Items.glowstone_dust) - ); + // Machine Casing + GameRegistry.addRecipe(new ItemStack(RefinedStorageBlocks.MACHINE_CASING), + "EEE", + "E E", + "EEE", + 'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON) + ); - // Destruction Core - GameRegistry.addShapelessRecipe(new ItemStack(RefinedStorageItems.CORE, 1, ItemCore.TYPE_DESTRUCTION), - new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON), - new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_BASIC), - new ItemStack(Items.quartz) - ); + // Construction Core + GameRegistry.addShapelessRecipe(new ItemStack(RefinedStorageItems.CORE, 1, ItemCore.TYPE_CONSTRUCTION), + new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON), + new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_BASIC), + new ItemStack(Items.glowstone_dust) + ); - // Relay - GameRegistry.addShapelessRecipe(new ItemStack(RefinedStorageBlocks.RELAY), - new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_BASIC), - new ItemStack(RefinedStorageBlocks.MACHINE_CASING), - new ItemStack(RefinedStorageBlocks.CABLE) - ); + // Destruction Core + GameRegistry.addShapelessRecipe(new ItemStack(RefinedStorageItems.CORE, 1, ItemCore.TYPE_DESTRUCTION), + new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON), + new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_BASIC), + new ItemStack(Items.quartz) + ); - // Controller - GameRegistry.addRecipe(new ItemStack(RefinedStorageBlocks.CONTROLLER, 1, EnumControllerType.NORMAL.getId()), - "EDE", - "SRS", - "ESE", - 'D', new ItemStack(Items.diamond), - 'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON), - 'R', new ItemStack(Items.redstone), - 'S', new ItemStack(RefinedStorageItems.SILICON) - ); + // Relay + GameRegistry.addShapelessRecipe(new ItemStack(RefinedStorageBlocks.RELAY), + new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_BASIC), + new ItemStack(RefinedStorageBlocks.MACHINE_CASING), + new ItemStack(RefinedStorageBlocks.CABLE) + ); - // Solderer - GameRegistry.addRecipe(new ItemStack(RefinedStorageBlocks.SOLDERER), - "ESE", - "E E", - "ESE", - 'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON), - 'S', new ItemStack(Blocks.sticky_piston) - ); + // Controller + GameRegistry.addRecipe(new ItemStack(RefinedStorageBlocks.CONTROLLER, 1, EnumControllerType.NORMAL.getId()), + "EDE", + "SRS", + "ESE", + 'D', new ItemStack(Items.diamond), + 'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON), + 'R', new ItemStack(Items.redstone), + 'S', new ItemStack(RefinedStorageItems.SILICON) + ); - // Drive - SoldererRegistry.addRecipe(new SoldererRecipeDrive()); + // Solderer + GameRegistry.addRecipe(new ItemStack(RefinedStorageBlocks.SOLDERER), + "ESE", + "E E", + "ESE", + 'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON), + 'S', new ItemStack(Blocks.sticky_piston) + ); - // Cable - GameRegistry.addRecipe(new ItemStack(RefinedStorageBlocks.CABLE, 6), - "EEE", - "GRG", - "EEE", - 'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON), - 'G', new ItemStack(Blocks.glass), - 'R', new ItemStack(Items.redstone) - ); + // Disk Drive + SoldererRegistry.addRecipe(new SoldererRecipeDiskDrive()); - // Grid - GameRegistry.addRecipe(new ItemStack(RefinedStorageBlocks.GRID, 1, EnumGridType.NORMAL.getId()), - "ECE", - "PMP", - "EDE", - 'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON), - 'P', new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_IMPROVED), - 'C', new ItemStack(RefinedStorageItems.CORE, 1, ItemCore.TYPE_CONSTRUCTION), - 'D', new ItemStack(RefinedStorageItems.CORE, 1, ItemCore.TYPE_DESTRUCTION), - 'M', new ItemStack(RefinedStorageBlocks.MACHINE_CASING) - ); + // Cable + GameRegistry.addRecipe(new ItemStack(RefinedStorageBlocks.CABLE, 6), + "EEE", + "GRG", + "EEE", + 'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON), + 'G', new ItemStack(Blocks.glass), + 'R', new ItemStack(Items.redstone) + ); - // Crafting Grid - SoldererRegistry.addRecipe(new SoldererRecipeCraftingGrid()); + // Grid + GameRegistry.addRecipe(new ItemStack(RefinedStorageBlocks.GRID, 1, EnumGridType.NORMAL.getId()), + "ECE", + "PMP", + "EDE", + 'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON), + 'P', new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_IMPROVED), + 'C', new ItemStack(RefinedStorageItems.CORE, 1, ItemCore.TYPE_CONSTRUCTION), + 'D', new ItemStack(RefinedStorageItems.CORE, 1, ItemCore.TYPE_DESTRUCTION), + 'M', new ItemStack(RefinedStorageBlocks.MACHINE_CASING) + ); - // Wireless Transmitter - GameRegistry.addRecipe(new ItemStack(RefinedStorageBlocks.WIRELESS_TRANSMITTER), - "EPE", - "EME", - "EAE", - 'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON), - 'A', new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED), - 'P', new ItemStack(Items.ender_pearl), - 'M', new ItemStack(RefinedStorageBlocks.MACHINE_CASING) - ); + // Crafting Grid + SoldererRegistry.addRecipe(new SoldererRecipeCraftingGrid()); - // Wireless Grid Plate - GameRegistry.addRecipe(new ItemStack(RefinedStorageItems.WIRELESS_GRID_PLATE), - " P ", - "ERE", - "EEE", - 'P', new ItemStack(Items.ender_pearl), - 'R', new ItemStack(Items.redstone), - 'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON) - ); + // Wireless Grid + GameRegistry.addRecipe(new ItemStack(RefinedStorageItems.WIRELESS_GRID), + " P ", + "ERE", + "EEE", + 'P', new ItemStack(Items.ender_pearl), + 'R', new ItemStack(Items.redstone), + 'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON) + ); - // Wireless Grid - SoldererRegistry.addRecipe(new SoldererRecipeWirelessGrid(0)); - SoldererRegistry.addRecipe(new SoldererRecipeWirelessGrid(1)); + // External Storage + GameRegistry.addRecipe(new ItemStack(RefinedStorageBlocks.EXTERNAL_STORAGE), + "CED", + "HMH", + "EPE", + 'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON), + 'H', new ItemStack(Blocks.chest), + 'C', new ItemStack(RefinedStorageItems.CORE, 1, ItemCore.TYPE_CONSTRUCTION), + 'D', new ItemStack(RefinedStorageItems.CORE, 1, ItemCore.TYPE_DESTRUCTION), + 'M', new ItemStack(RefinedStorageBlocks.MACHINE_CASING), + 'P', new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_IMPROVED) + ); - // External Storage - GameRegistry.addRecipe(new ItemStack(RefinedStorageBlocks.EXTERNAL_STORAGE), - "CED", - "HMH", - "EPE", - 'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON), - 'H', new ItemStack(Blocks.chest), - 'C', new ItemStack(RefinedStorageItems.CORE, 1, ItemCore.TYPE_CONSTRUCTION), - 'D', new ItemStack(RefinedStorageItems.CORE, 1, ItemCore.TYPE_DESTRUCTION), - 'M', new ItemStack(RefinedStorageBlocks.MACHINE_CASING), - 'P', new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_IMPROVED) - ); + // Importer + GameRegistry.addShapelessRecipe(new ItemStack(RefinedStorageBlocks.IMPORTER), + new ItemStack(RefinedStorageBlocks.MACHINE_CASING), + new ItemStack(RefinedStorageItems.CORE, 1, ItemCore.TYPE_CONSTRUCTION), + new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_BASIC) + ); - // Importer - GameRegistry.addShapelessRecipe(new ItemStack(RefinedStorageBlocks.IMPORTER), - new ItemStack(RefinedStorageBlocks.MACHINE_CASING), - new ItemStack(RefinedStorageItems.CORE, 1, ItemCore.TYPE_CONSTRUCTION), - new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_BASIC) - ); + // Exporter + GameRegistry.addShapelessRecipe(new ItemStack(RefinedStorageBlocks.EXPORTER), + new ItemStack(RefinedStorageBlocks.MACHINE_CASING), + new ItemStack(RefinedStorageItems.CORE, 1, ItemCore.TYPE_DESTRUCTION), + new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_BASIC) + ); - // Exporter - GameRegistry.addShapelessRecipe(new ItemStack(RefinedStorageBlocks.EXPORTER), - new ItemStack(RefinedStorageBlocks.MACHINE_CASING), - new ItemStack(RefinedStorageItems.CORE, 1, ItemCore.TYPE_DESTRUCTION), - new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_BASIC) - ); + // Destructor + GameRegistry.addShapedRecipe(new ItemStack(RefinedStorageBlocks.DESTRUCTOR), + "EDE", + "RMR", + "EIE", + 'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON), + 'D', new ItemStack(RefinedStorageItems.CORE, 1, ItemCore.TYPE_DESTRUCTION), + 'R', new ItemStack(Items.redstone), + 'M', new ItemStack(RefinedStorageBlocks.MACHINE_CASING), + 'I', new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_IMPROVED) + ); - // Destructor - GameRegistry.addShapedRecipe(new ItemStack(RefinedStorageBlocks.DESTRUCTOR), - "EDE", - "RMR", - "EIE", - 'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON), - 'D', new ItemStack(RefinedStorageItems.CORE, 1, ItemCore.TYPE_DESTRUCTION), - 'R', new ItemStack(Items.redstone), - 'M', new ItemStack(RefinedStorageBlocks.MACHINE_CASING), - 'I', new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_IMPROVED) - ); + // Constructor + GameRegistry.addShapedRecipe(new ItemStack(RefinedStorageBlocks.CONSTRUCTOR), + "ECE", + "RMR", + "EIE", + 'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON), + 'C', new ItemStack(RefinedStorageItems.CORE, 1, ItemCore.TYPE_CONSTRUCTION), + 'R', new ItemStack(Items.redstone), + 'M', new ItemStack(RefinedStorageBlocks.MACHINE_CASING), + 'I', new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_IMPROVED) + ); - // Constructor - GameRegistry.addShapedRecipe(new ItemStack(RefinedStorageBlocks.CONSTRUCTOR), - "ECE", - "RMR", - "EIE", - 'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON), - 'C', new ItemStack(RefinedStorageItems.CORE, 1, ItemCore.TYPE_CONSTRUCTION), - 'R', new ItemStack(Items.redstone), - 'M', new ItemStack(RefinedStorageBlocks.MACHINE_CASING), - 'I', new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_IMPROVED) - ); + // Detector + GameRegistry.addRecipe(new ItemStack(RefinedStorageBlocks.DETECTOR), + "ECE", + "RMR", + "EPE", + 'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON), + 'R', new ItemStack(Items.redstone), + 'C', new ItemStack(Items.comparator), + 'M', new ItemStack(RefinedStorageBlocks.MACHINE_CASING), + 'P', new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_IMPROVED) + ); - // Detector - GameRegistry.addRecipe(new ItemStack(RefinedStorageBlocks.DETECTOR), - "ECE", - "RMR", - "EPE", - 'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON), - 'R', new ItemStack(Items.redstone), - 'C', new ItemStack(Items.comparator), - 'M', new ItemStack(RefinedStorageBlocks.MACHINE_CASING), - 'P', new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_IMPROVED) - ); + // Storage Parts + GameRegistry.addRecipe(new ItemStack(RefinedStorageItems.STORAGE_PART, 1, ItemStoragePart.TYPE_1K), + "EPE", + "SRS", + "ESE", + 'R', new ItemStack(Items.redstone), + 'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON), + 'P', new ItemStack(RefinedStorageItems.SILICON), + 'S', new ItemStack(Blocks.glass) + ); - // Storage Cell Parts - GameRegistry.addRecipe(new ItemStack(RefinedStorageItems.STORAGE_PART, 1, ItemStoragePart.TYPE_1K), - "EPE", - "SRS", - "ESE", - 'R', new ItemStack(Items.redstone), - 'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON), - 'P', new ItemStack(RefinedStorageItems.SILICON), - 'S', new ItemStack(Blocks.glass) - ); + GameRegistry.addRecipe(new ItemStack(RefinedStorageItems.STORAGE_PART, 1, ItemStoragePart.TYPE_4K), + "EPE", + "SRS", + "ESE", + 'R', new ItemStack(Items.redstone), + 'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON), + 'P', new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_BASIC), + 'S', new ItemStack(RefinedStorageItems.STORAGE_PART, 1, ItemStoragePart.TYPE_1K) + ); - GameRegistry.addRecipe(new ItemStack(RefinedStorageItems.STORAGE_PART, 1, ItemStoragePart.TYPE_4K), - "EPE", - "SRS", - "ESE", - 'R', new ItemStack(Items.redstone), - 'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON), - 'P', new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_BASIC), - 'S', new ItemStack(RefinedStorageItems.STORAGE_PART, 1, ItemStoragePart.TYPE_1K) - ); + GameRegistry.addRecipe(new ItemStack(RefinedStorageItems.STORAGE_PART, 1, ItemStoragePart.TYPE_16K), + "EPE", + "SRS", + "ESE", + 'R', new ItemStack(Items.redstone), + 'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON), + 'P', new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_IMPROVED), + 'S', new ItemStack(RefinedStorageItems.STORAGE_PART, 1, ItemStoragePart.TYPE_4K) + ); - GameRegistry.addRecipe(new ItemStack(RefinedStorageItems.STORAGE_PART, 1, ItemStoragePart.TYPE_16K), - "EPE", - "SRS", - "ESE", - 'R', new ItemStack(Items.redstone), - 'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON), - 'P', new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_IMPROVED), - 'S', new ItemStack(RefinedStorageItems.STORAGE_PART, 1, ItemStoragePart.TYPE_4K) - ); + GameRegistry.addRecipe(new ItemStack(RefinedStorageItems.STORAGE_PART, 1, ItemStoragePart.TYPE_64K), + "EPE", + "SRS", + "ESE", + 'R', new ItemStack(Items.redstone), + 'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON), + 'P', new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED), + 'S', new ItemStack(RefinedStorageItems.STORAGE_PART, 1, ItemStoragePart.TYPE_16K) + ); - GameRegistry.addRecipe(new ItemStack(RefinedStorageItems.STORAGE_PART, 1, ItemStoragePart.TYPE_64K), - "EPE", - "SRS", - "ESE", - 'R', new ItemStack(Items.redstone), - 'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON), - 'P', new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED), - 'S', new ItemStack(RefinedStorageItems.STORAGE_PART, 1, ItemStoragePart.TYPE_16K) - ); + // Storage Disks + GameRegistry.addRecipe(NBTStorage.initNBT(new ItemStack(RefinedStorageItems.STORAGE_DISK, 1, ItemStorageDisk.TYPE_1K)), + "GRG", + "RPR", + "EEE", + 'G', new ItemStack(Blocks.glass), + 'R', new ItemStack(Items.redstone), + 'P', new ItemStack(RefinedStorageItems.STORAGE_PART, 1, ItemStoragePart.TYPE_1K), + 'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON) + ); - // Storage Cells - GameRegistry.addRecipe(NBTStorage.initNBT(new ItemStack(RefinedStorageItems.STORAGE_CELL, 1, ItemStorageCell.TYPE_1K)), - "GRG", - "RPR", - "EEE", - 'G', new ItemStack(Blocks.glass), - 'R', new ItemStack(Items.redstone), - 'P', new ItemStack(RefinedStorageItems.STORAGE_PART, 1, ItemStoragePart.TYPE_1K), - 'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON) - ); + GameRegistry.addRecipe(NBTStorage.initNBT(new ItemStack(RefinedStorageItems.STORAGE_DISK, 1, ItemStorageDisk.TYPE_4K)), + "GRG", + "RPR", + "EEE", + 'G', new ItemStack(Blocks.glass), + 'R', new ItemStack(Items.redstone), + 'P', new ItemStack(RefinedStorageItems.STORAGE_PART, 1, ItemStoragePart.TYPE_4K), + 'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON) + ); - GameRegistry.addRecipe(NBTStorage.initNBT(new ItemStack(RefinedStorageItems.STORAGE_CELL, 1, ItemStorageCell.TYPE_4K)), - "GRG", - "RPR", - "EEE", - 'G', new ItemStack(Blocks.glass), - 'R', new ItemStack(Items.redstone), - 'P', new ItemStack(RefinedStorageItems.STORAGE_PART, 1, ItemStoragePart.TYPE_4K), - 'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON) - ); + GameRegistry.addRecipe(NBTStorage.initNBT(new ItemStack(RefinedStorageItems.STORAGE_DISK, 1, ItemStorageDisk.TYPE_16K)), + "GRG", + "RPR", + "EEE", + 'G', new ItemStack(Blocks.glass), + 'R', new ItemStack(Items.redstone), + 'P', new ItemStack(RefinedStorageItems.STORAGE_PART, 1, ItemStoragePart.TYPE_16K), + 'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON) + ); - GameRegistry.addRecipe(NBTStorage.initNBT(new ItemStack(RefinedStorageItems.STORAGE_CELL, 1, ItemStorageCell.TYPE_16K)), - "GRG", - "RPR", - "EEE", - 'G', new ItemStack(Blocks.glass), - 'R', new ItemStack(Items.redstone), - 'P', new ItemStack(RefinedStorageItems.STORAGE_PART, 1, ItemStoragePart.TYPE_16K), - 'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON) - ); + GameRegistry.addRecipe(NBTStorage.initNBT(new ItemStack(RefinedStorageItems.STORAGE_DISK, 1, ItemStorageDisk.TYPE_64K)), + "GRG", + "RPR", + "EEE", + 'G', new ItemStack(Blocks.glass), + 'R', new ItemStack(Items.redstone), + 'P', new ItemStack(RefinedStorageItems.STORAGE_PART, 1, ItemStoragePart.TYPE_64K), + 'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON) + ); - GameRegistry.addRecipe(NBTStorage.initNBT(new ItemStack(RefinedStorageItems.STORAGE_CELL, 1, ItemStorageCell.TYPE_64K)), - "GRG", - "RPR", - "EEE", - 'G', new ItemStack(Blocks.glass), - 'R', new ItemStack(Items.redstone), - 'P', new ItemStack(RefinedStorageItems.STORAGE_PART, 1, ItemStoragePart.TYPE_64K), - 'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON) - ); + // Storage Blocks + SoldererRegistry.addRecipe(new SoldererRecipeStorage(EnumStorageType.TYPE_1K, ItemStoragePart.TYPE_1K)); + SoldererRegistry.addRecipe(new SoldererRecipeStorage(EnumStorageType.TYPE_4K, ItemStoragePart.TYPE_4K)); + SoldererRegistry.addRecipe(new SoldererRecipeStorage(EnumStorageType.TYPE_16K, ItemStoragePart.TYPE_16K)); + SoldererRegistry.addRecipe(new SoldererRecipeStorage(EnumStorageType.TYPE_64K, ItemStoragePart.TYPE_64K)); - // Storage Blocks - SoldererRegistry.addRecipe(new SoldererRecipeStorage(EnumStorageType.TYPE_1K, ItemStoragePart.TYPE_1K)); - SoldererRegistry.addRecipe(new SoldererRecipeStorage(EnumStorageType.TYPE_4K, ItemStoragePart.TYPE_4K)); - SoldererRegistry.addRecipe(new SoldererRecipeStorage(EnumStorageType.TYPE_16K, ItemStoragePart.TYPE_16K)); - SoldererRegistry.addRecipe(new SoldererRecipeStorage(EnumStorageType.TYPE_64K, ItemStoragePart.TYPE_64K)); + // Interface + SoldererRegistry.addRecipe(new SoldererRecipeInterface()); + } - // Interface - SoldererRegistry.addRecipe(new SoldererRecipeInterface()); - } + public void init(FMLInitializationEvent e) { + } - public void init(FMLInitializationEvent e) - { - } - - public void postInit(FMLPostInitializationEvent e) - { - } + public void postInit(FMLPostInitializationEvent e) { + } } diff --git a/src/main/java/refinedstorage/proxy/ServerProxy.java b/src/main/java/refinedstorage/proxy/ServerProxy.java old mode 100644 new mode 100755 index f1494c722..ba894b981 --- a/src/main/java/refinedstorage/proxy/ServerProxy.java +++ b/src/main/java/refinedstorage/proxy/ServerProxy.java @@ -1,5 +1,4 @@ package refinedstorage.proxy; -public class ServerProxy extends CommonProxy -{ +public class ServerProxy extends CommonProxy { } diff --git a/src/main/java/refinedstorage/storage/CellStorage.java b/src/main/java/refinedstorage/storage/CellStorage.java deleted file mode 100644 index 6d8e2d67e..000000000 --- a/src/main/java/refinedstorage/storage/CellStorage.java +++ /dev/null @@ -1,48 +0,0 @@ -package refinedstorage.storage; - -import net.minecraft.item.ItemStack; -import refinedstorage.item.ItemStorageCell; -import refinedstorage.tile.TileDrive; -import refinedstorage.tile.settings.ModeSettingUtils; - -public class CellStorage extends NBTStorage -{ - private TileDrive drive; - - public CellStorage(ItemStack cell, TileDrive drive) - { - super(cell.getTagCompound(), getCapacity(cell), drive.getPriority()); - - this.drive = drive; - } - - @Override - public boolean canPush(ItemStack stack) - { - if (ModeSettingUtils.doesNotViolateMode(drive.getInventory(), drive.getModeSetting(), drive.getCompare(), stack)) - { - return super.canPush(stack); - } - - return false; - } - - public static int getCapacity(ItemStack cell) - { - switch (cell.getItemDamage()) - { - case ItemStorageCell.TYPE_1K: - return 1000; - case ItemStorageCell.TYPE_4K: - return 4000; - case ItemStorageCell.TYPE_16K: - return 16000; - case ItemStorageCell.TYPE_64K: - return 64000; - case ItemStorageCell.TYPE_CREATIVE: - return -1; - } - - return 0; - } -} diff --git a/src/main/java/refinedstorage/storage/DiskStorage.java b/src/main/java/refinedstorage/storage/DiskStorage.java new file mode 100755 index 000000000..6735893f8 --- /dev/null +++ b/src/main/java/refinedstorage/storage/DiskStorage.java @@ -0,0 +1,42 @@ +package refinedstorage.storage; + +import net.minecraft.item.ItemStack; +import refinedstorage.item.ItemStorageDisk; +import refinedstorage.tile.TileDiskDrive; +import refinedstorage.tile.settings.ModeSettingUtils; + +public class DiskStorage extends NBTStorage { + private TileDiskDrive diskDrive; + + public DiskStorage(ItemStack disk, TileDiskDrive diskDrive) { + super(disk.getTagCompound(), getCapacity(disk), diskDrive.getPriority()); + + this.diskDrive = diskDrive; + } + + @Override + public boolean canPush(ItemStack stack) { + if (ModeSettingUtils.doesNotViolateMode(diskDrive.getInventory(), diskDrive.getModeSetting(), diskDrive.getCompare(), stack)) { + return super.canPush(stack); + } + + return false; + } + + public static int getCapacity(ItemStack disk) { + switch (disk.getItemDamage()) { + case ItemStorageDisk.TYPE_1K: + return 1000; + case ItemStorageDisk.TYPE_4K: + return 4000; + case ItemStorageDisk.TYPE_16K: + return 16000; + case ItemStorageDisk.TYPE_64K: + return 64000; + case ItemStorageDisk.TYPE_CREATIVE: + return -1; + } + + return 0; + } +} diff --git a/src/main/java/refinedstorage/storage/IStorage.java b/src/main/java/refinedstorage/storage/IStorage.java old mode 100644 new mode 100755 index 43459e1f0..fbffed542 --- a/src/main/java/refinedstorage/storage/IStorage.java +++ b/src/main/java/refinedstorage/storage/IStorage.java @@ -1,17 +1,17 @@ package refinedstorage.storage; -import java.util.List; import net.minecraft.item.ItemStack; -public interface IStorage -{ - public void addItems(List items); +import java.util.List; - public void push(ItemStack stack); +public interface IStorage { + void addItems(List items); - public ItemStack take(ItemStack stack, int flags); + void push(ItemStack stack); - public boolean canPush(ItemStack stack); + ItemStack take(ItemStack stack, int flags); - public int getPriority(); + boolean canPush(ItemStack stack); + + int getPriority(); } diff --git a/src/main/java/refinedstorage/storage/IStorageGui.java b/src/main/java/refinedstorage/storage/IStorageGui.java old mode 100644 new mode 100755 index dcc4ab86e..3361d1fee --- a/src/main/java/refinedstorage/storage/IStorageGui.java +++ b/src/main/java/refinedstorage/storage/IStorageGui.java @@ -5,23 +5,22 @@ import refinedstorage.tile.settings.ICompareSetting; import refinedstorage.tile.settings.IModeSetting; import refinedstorage.tile.settings.IRedstoneModeSetting; -public interface IStorageGui -{ - public String getName(); +public interface IStorageGui { + String getName(); - public int getPriority(); + int getPriority(); - public void onPriorityChanged(int priority); + void onPriorityChanged(int priority); - public IInventory getInventory(); + IInventory getInventory(); - public IRedstoneModeSetting getRedstoneModeSetting(); + IRedstoneModeSetting getRedstoneModeSetting(); - public ICompareSetting getCompareSetting(); + ICompareSetting getCompareSetting(); - public IModeSetting getModeSetting(); + IModeSetting getModeSetting(); - public int getStored(); + int getStored(); - public int getCapacity(); + int getCapacity(); } diff --git a/src/main/java/refinedstorage/storage/IStorageProvider.java b/src/main/java/refinedstorage/storage/IStorageProvider.java old mode 100644 new mode 100755 index 678d7e823..7c9d8e699 --- a/src/main/java/refinedstorage/storage/IStorageProvider.java +++ b/src/main/java/refinedstorage/storage/IStorageProvider.java @@ -2,7 +2,6 @@ package refinedstorage.storage; import java.util.List; -public interface IStorageProvider -{ - public void addStorages(List storages); +public interface IStorageProvider { + void addStorages(List storages); } diff --git a/src/main/java/refinedstorage/storage/NBTStorage.java b/src/main/java/refinedstorage/storage/NBTStorage.java old mode 100644 new mode 100755 index e3ad6eb28..4ce2260fb --- a/src/main/java/refinedstorage/storage/NBTStorage.java +++ b/src/main/java/refinedstorage/storage/NBTStorage.java @@ -1,159 +1,140 @@ package refinedstorage.storage; -import java.util.List; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; -public class NBTStorage implements IStorage -{ - public static final String NBT_ITEMS = "Items"; - public static final String NBT_STORED = "Stored"; +import java.util.List; - public static final String NBT_ITEM_TYPE = "Type"; - public static final String NBT_ITEM_QUANTITY = "Quantity"; - public static final String NBT_ITEM_DAMAGE = "Damage"; - public static final String NBT_ITEM_NBT = "NBT"; +public class NBTStorage implements IStorage { + public static final String NBT_ITEMS = "Items"; + public static final String NBT_STORED = "Stored"; - private NBTTagCompound nbtTag; - private int capacity; - private int priority; + public static final String NBT_ITEM_TYPE = "Type"; + public static final String NBT_ITEM_QUANTITY = "Quantity"; + public static final String NBT_ITEM_DAMAGE = "Damage"; + public static final String NBT_ITEM_NBT = "NBT"; - public NBTStorage(NBTTagCompound tag, int capacity, int priority) - { - this.nbtTag = tag; - this.capacity = capacity; - this.priority = priority; - } + private NBTTagCompound nbtTag; + private int capacity; + private int priority; - @Override - public void addItems(List items) - { - NBTTagList list = (NBTTagList) nbtTag.getTag(NBT_ITEMS); + public NBTStorage(NBTTagCompound tag, int capacity, int priority) { + this.nbtTag = tag; + this.capacity = capacity; + this.priority = priority; + } - for (int i = 0; i < list.tagCount(); ++i) - { - items.add(createItemFromNBT(list.getCompoundTagAt(i))); - } - } + @Override + public void addItems(List items) { + NBTTagList list = (NBTTagList) nbtTag.getTag(NBT_ITEMS); - @Override - public void push(ItemStack stack) - { - NBTTagList list = (NBTTagList) nbtTag.getTag(NBT_ITEMS); + for (int i = 0; i < list.tagCount(); ++i) { + items.add(createItemFromNBT(list.getCompoundTagAt(i))); + } + } - nbtTag.setInteger(NBT_STORED, getStored(nbtTag) + stack.stackSize); + @Override + public void push(ItemStack stack) { + NBTTagList list = (NBTTagList) nbtTag.getTag(NBT_ITEMS); - for (int i = 0; i < list.tagCount(); ++i) - { - NBTTagCompound tag = list.getCompoundTagAt(i); + nbtTag.setInteger(NBT_STORED, getStored(nbtTag) + stack.stackSize); - StorageItem item = createItemFromNBT(tag); + for (int i = 0; i < list.tagCount(); ++i) { + NBTTagCompound tag = list.getCompoundTagAt(i); - if (item.compareNoQuantity(stack)) - { - tag.setInteger(NBT_ITEM_QUANTITY, item.getQuantity() + stack.stackSize); + StorageItem item = createItemFromNBT(tag); - return; - } - } + if (item.compareNoQuantity(stack)) { + tag.setInteger(NBT_ITEM_QUANTITY, item.getQuantity() + stack.stackSize); - NBTTagCompound tag = new NBTTagCompound(); + return; + } + } - tag.setInteger(NBT_ITEM_TYPE, Item.getIdFromItem(stack.getItem())); - tag.setInteger(NBT_ITEM_QUANTITY, stack.stackSize); - tag.setInteger(NBT_ITEM_DAMAGE, stack.getItemDamage()); + NBTTagCompound tag = new NBTTagCompound(); - if (stack.hasTagCompound()) - { - tag.setTag(NBT_ITEM_NBT, stack.getTagCompound()); - } + tag.setInteger(NBT_ITEM_TYPE, Item.getIdFromItem(stack.getItem())); + tag.setInteger(NBT_ITEM_QUANTITY, stack.stackSize); + tag.setInteger(NBT_ITEM_DAMAGE, stack.getItemDamage()); - list.appendTag(tag); - } + if (stack.hasTagCompound()) { + tag.setTag(NBT_ITEM_NBT, stack.getTagCompound()); + } - @Override - public ItemStack take(ItemStack stack, int flags) - { - int quantity = stack.stackSize; + list.appendTag(tag); + } - NBTTagList list = (NBTTagList) nbtTag.getTag(NBT_ITEMS); + @Override + public ItemStack take(ItemStack stack, int flags) { + int quantity = stack.stackSize; - for (int i = 0; i < list.tagCount(); ++i) - { - NBTTagCompound tag = list.getCompoundTagAt(i); + NBTTagList list = (NBTTagList) nbtTag.getTag(NBT_ITEMS); - StorageItem item = createItemFromNBT(tag); + for (int i = 0; i < list.tagCount(); ++i) { + NBTTagCompound tag = list.getCompoundTagAt(i); - if (item.compare(stack, flags)) - { - if (quantity > item.getQuantity()) - { - quantity = item.getQuantity(); - } + StorageItem item = createItemFromNBT(tag); - tag.setInteger(NBT_ITEM_QUANTITY, item.getQuantity() - quantity); + if (item.compare(stack, flags)) { + if (quantity > item.getQuantity()) { + quantity = item.getQuantity(); + } - if (item.getQuantity() - quantity == 0) - { - list.removeTag(i); - } + tag.setInteger(NBT_ITEM_QUANTITY, item.getQuantity() - quantity); - nbtTag.setInteger(NBT_STORED, getStored(nbtTag) - quantity); + if (item.getQuantity() - quantity == 0) { + list.removeTag(i); + } - ItemStack newItem = item.toItemStack(); + nbtTag.setInteger(NBT_STORED, getStored(nbtTag) - quantity); - newItem.stackSize = quantity; + ItemStack newItem = item.toItemStack(); - return newItem; - } - } + newItem.stackSize = quantity; - return null; - } + return newItem; + } + } - @Override - public boolean canPush(ItemStack stack) - { - if (capacity == -1) - { - return true; - } + return null; + } - return (getStored(nbtTag) + stack.stackSize) <= capacity; - } + @Override + public boolean canPush(ItemStack stack) { + if (capacity == -1) { + return true; + } - @Override - public int getPriority() - { - return priority; - } + return (getStored(nbtTag) + stack.stackSize) <= capacity; + } - private StorageItem createItemFromNBT(NBTTagCompound tag) - { - return new StorageItem(Item.getItemById(tag.getInteger(NBT_ITEM_TYPE)), tag.getInteger(NBT_ITEM_QUANTITY), tag.getInteger(NBT_ITEM_DAMAGE), tag.hasKey(NBT_ITEM_NBT) ? ((NBTTagCompound) tag.getTag(NBT_ITEM_NBT)) : null); - } + @Override + public int getPriority() { + return priority; + } - public static int getStored(NBTTagCompound tag) - { - return tag.getInteger(NBT_STORED); - } + private StorageItem createItemFromNBT(NBTTagCompound tag) { + return new StorageItem(Item.getItemById(tag.getInteger(NBT_ITEM_TYPE)), tag.getInteger(NBT_ITEM_QUANTITY), tag.getInteger(NBT_ITEM_DAMAGE), tag.hasKey(NBT_ITEM_NBT) ? ((NBTTagCompound) tag.getTag(NBT_ITEM_NBT)) : null); + } - public static NBTTagCompound getBaseNBT() - { - NBTTagCompound tag = new NBTTagCompound(); + public static int getStored(NBTTagCompound tag) { + return tag.getInteger(NBT_STORED); + } - tag.setTag(NBT_ITEMS, new NBTTagList()); - tag.setInteger(NBT_STORED, 0); + public static NBTTagCompound getBaseNBT() { + NBTTagCompound tag = new NBTTagCompound(); - return tag; - } + tag.setTag(NBT_ITEMS, new NBTTagList()); + tag.setInteger(NBT_STORED, 0); - public static ItemStack initNBT(ItemStack stack) - { - stack.setTagCompound(NBTStorage.getBaseNBT()); + return tag; + } - return stack; - } + public static ItemStack initNBT(ItemStack stack) { + stack.setTagCompound(NBTStorage.getBaseNBT()); + + return stack; + } } diff --git a/src/main/java/refinedstorage/storage/StorageItem.java b/src/main/java/refinedstorage/storage/StorageItem.java old mode 100644 new mode 100755 index 3f0ff9b73..956773032 --- a/src/main/java/refinedstorage/storage/StorageItem.java +++ b/src/main/java/refinedstorage/storage/StorageItem.java @@ -9,199 +9,161 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import refinedstorage.util.InventoryUtils; -public class StorageItem -{ - private Item type; - private int quantity; - private int damage; - private NBTTagCompound tag; - @SideOnly(Side.CLIENT) - private int id; +public class StorageItem { + private Item type; + private int quantity; + private int damage; + private NBTTagCompound tag; + @SideOnly(Side.CLIENT) + private int id; - public StorageItem(ByteBuf buf) - { - this.id = buf.readInt(); - this.type = Item.getItemById(buf.readInt()); - this.quantity = buf.readInt(); - this.damage = buf.readInt(); - this.tag = buf.readBoolean() ? ByteBufUtils.readTag(buf) : null; - } + public StorageItem(ByteBuf buf) { + this.id = buf.readInt(); + this.type = Item.getItemById(buf.readInt()); + this.quantity = buf.readInt(); + this.damage = buf.readInt(); + this.tag = buf.readBoolean() ? ByteBufUtils.readTag(buf) : null; + } - public StorageItem(Item type, int quantity, int damage, NBTTagCompound tag) - { - this.type = type; - this.quantity = quantity; - this.damage = damage; - this.tag = tag; - } + public StorageItem(Item type, int quantity, int damage, NBTTagCompound tag) { + this.type = type; + this.quantity = quantity; + this.damage = damage; + this.tag = tag; + } - public StorageItem(Item type, int quantity, int damage, NBTTagCompound tag, int id) - { - this(type, quantity, damage, tag); + public StorageItem(Item type, int quantity, int damage, NBTTagCompound tag, int id) { + this(type, quantity, damage, tag); - this.id = id; - } + this.id = id; + } - public StorageItem(ItemStack stack) - { - this(stack.getItem(), stack.stackSize, stack.getItemDamage(), stack.getTagCompound()); - } + public StorageItem(ItemStack stack) { + this(stack.getItem(), stack.stackSize, stack.getItemDamage(), stack.getTagCompound()); + } - public void toBytes(ByteBuf buf, int id) - { - buf.writeInt(id); - buf.writeInt(Item.getIdFromItem(type)); - buf.writeInt(quantity); - buf.writeInt(damage); - buf.writeBoolean(tag != null); + public void toBytes(ByteBuf buf, int id) { + buf.writeInt(id); + buf.writeInt(Item.getIdFromItem(type)); + buf.writeInt(quantity); + buf.writeInt(damage); + buf.writeBoolean(tag != null); - if (tag != null) - { - ByteBufUtils.writeTag(buf, tag); - } - } + if (tag != null) { + ByteBufUtils.writeTag(buf, tag); + } + } - public Item getType() - { - return type; - } + public Item getType() { + return type; + } - public int getQuantity() - { - return quantity; - } + public int getQuantity() { + return quantity; + } - public void setQuantity(int quantity) - { - this.quantity = quantity; - } + public void setQuantity(int quantity) { + this.quantity = quantity; + } - public int getDamage() - { - return damage; - } + public int getDamage() { + return damage; + } - public void setDamage(int damage) - { - this.damage = damage; - } + public void setDamage(int damage) { + this.damage = damage; + } - public NBTTagCompound getTag() - { - return tag; - } + public NBTTagCompound getTag() { + return tag; + } - public void setTag(NBTTagCompound tag) - { - this.tag = tag; - } + public void setTag(NBTTagCompound tag) { + this.tag = tag; + } - @SideOnly(Side.CLIENT) - public int getId() - { - return id; - } + @SideOnly(Side.CLIENT) + public int getId() { + return id; + } - public StorageItem copy() - { - return copy(quantity); - } + public StorageItem copy() { + return copy(quantity); + } - public StorageItem copy(int newQuantity) - { - return new StorageItem(type, newQuantity, damage, tag); - } + public StorageItem copy(int newQuantity) { + return new StorageItem(type, newQuantity, damage, tag); + } - public ItemStack toItemStack() - { - ItemStack stack = new ItemStack(type, quantity, damage); + public ItemStack toItemStack() { + ItemStack stack = new ItemStack(type, quantity, damage); - stack.setTagCompound(tag); + stack.setTagCompound(tag); - return stack; - } + return stack; + } - public boolean compare(StorageItem other, int flags) - { - if ((flags & InventoryUtils.COMPARE_DAMAGE) == InventoryUtils.COMPARE_DAMAGE) - { - if (damage != other.getDamage()) - { - return false; - } - } + public boolean compare(StorageItem other, int flags) { + if ((flags & InventoryUtils.COMPARE_DAMAGE) == InventoryUtils.COMPARE_DAMAGE) { + if (damage != other.getDamage()) { + return false; + } + } - if ((flags & InventoryUtils.COMPARE_NBT) == InventoryUtils.COMPARE_NBT) - { - if ((tag != null && other.getTag() == null) || (tag == null && other.getTag() != null)) - { - return false; - } + if ((flags & InventoryUtils.COMPARE_NBT) == InventoryUtils.COMPARE_NBT) { + if ((tag != null && other.getTag() == null) || (tag == null && other.getTag() != null)) { + return false; + } - if (tag != null && other.getTag() != null) - { - if (!tag.equals(other.getTag())) - { - return false; - } - } - } + if (tag != null && other.getTag() != null) { + if (!tag.equals(other.getTag())) { + return false; + } + } + } - if ((flags & InventoryUtils.COMPARE_QUANTITY) == InventoryUtils.COMPARE_QUANTITY) - { - if (quantity != other.getQuantity()) - { - return false; - } - } + if ((flags & InventoryUtils.COMPARE_QUANTITY) == InventoryUtils.COMPARE_QUANTITY) { + if (quantity != other.getQuantity()) { + return false; + } + } - return type == other.getType(); - } + return type == other.getType(); + } - public boolean compare(ItemStack stack, int flags) - { - if ((flags & InventoryUtils.COMPARE_DAMAGE) == InventoryUtils.COMPARE_DAMAGE) - { - if (damage != stack.getItemDamage()) - { - return false; - } - } + public boolean compare(ItemStack stack, int flags) { + if ((flags & InventoryUtils.COMPARE_DAMAGE) == InventoryUtils.COMPARE_DAMAGE) { + if (damage != stack.getItemDamage()) { + return false; + } + } - if ((flags & InventoryUtils.COMPARE_NBT) == InventoryUtils.COMPARE_NBT) - { - if ((tag != null && stack.getTagCompound() == null) || (tag == null && stack.getTagCompound() != null)) - { - return false; - } + if ((flags & InventoryUtils.COMPARE_NBT) == InventoryUtils.COMPARE_NBT) { + if ((tag != null && stack.getTagCompound() == null) || (tag == null && stack.getTagCompound() != null)) { + return false; + } - if (tag != null && stack.getTagCompound() != null) - { - if (!tag.equals(stack.getTagCompound())) - { - return false; - } - } - } + if (tag != null && stack.getTagCompound() != null) { + if (!tag.equals(stack.getTagCompound())) { + return false; + } + } + } - if ((flags & InventoryUtils.COMPARE_QUANTITY) == InventoryUtils.COMPARE_QUANTITY) - { - if (quantity != stack.stackSize) - { - return false; - } - } + if ((flags & InventoryUtils.COMPARE_QUANTITY) == InventoryUtils.COMPARE_QUANTITY) { + if (quantity != stack.stackSize) { + return false; + } + } - return type == stack.getItem(); - } + return type == stack.getItem(); + } - public boolean compareNoQuantity(StorageItem other) - { - return compare(other, InventoryUtils.COMPARE_NBT | InventoryUtils.COMPARE_DAMAGE); - } + public boolean compareNoQuantity(StorageItem other) { + return compare(other, InventoryUtils.COMPARE_NBT | InventoryUtils.COMPARE_DAMAGE); + } - public boolean compareNoQuantity(ItemStack stack) - { - return compare(stack, InventoryUtils.COMPARE_NBT | InventoryUtils.COMPARE_DAMAGE); - } + public boolean compareNoQuantity(ItemStack stack) { + return compare(stack, InventoryUtils.COMPARE_NBT | InventoryUtils.COMPARE_DAMAGE); + } } diff --git a/src/main/java/refinedstorage/tile/INetworkTile.java b/src/main/java/refinedstorage/tile/INetworkTile.java old mode 100644 new mode 100755 index 6773230c0..0e19c28de --- a/src/main/java/refinedstorage/tile/INetworkTile.java +++ b/src/main/java/refinedstorage/tile/INetworkTile.java @@ -3,11 +3,10 @@ package refinedstorage.tile; import io.netty.buffer.ByteBuf; import net.minecraft.util.math.BlockPos; -public interface INetworkTile -{ - public void fromBytes(ByteBuf buf); +public interface INetworkTile { + void fromBytes(ByteBuf buf); - public void toBytes(ByteBuf buf); + void toBytes(ByteBuf buf); - public BlockPos getTilePos(); + BlockPos getTilePos(); } diff --git a/src/main/java/refinedstorage/tile/MachineSearcher.java b/src/main/java/refinedstorage/tile/MachineSearcher.java new file mode 100755 index 000000000..721c45357 --- /dev/null +++ b/src/main/java/refinedstorage/tile/MachineSearcher.java @@ -0,0 +1,47 @@ +package refinedstorage.tile; + +import net.minecraft.block.Block; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; +import refinedstorage.RefinedStorageBlocks; + +import java.util.List; + +public class MachineSearcher { + public static void search(TileController controller, BlockPos current, List visited, List machines) { + for (BlockPos visit : visited) { + if (visit.equals(current) || controller.getPos().equals(current)) { + return; + } + } + + visited.add(current); + + Block block = controller.getWorld().getBlockState(current).getBlock(); + TileEntity tile = controller.getWorld().getTileEntity(current); + + if (tile instanceof TileController) { + if (!tile.getPos().equals(controller.getPos())) { + controller.getWorld().createExplosion(null, tile.getPos().getX(), tile.getPos().getY(), tile.getPos().getZ(), 4.5f, true); + } + } + + if (tile instanceof TileMachine) { + TileMachine machine = (TileMachine) tile; + + if (machine.getRedstoneMode().isEnabled(controller.getWorld(), tile.getPos())) { + machines.add(machine); + } else if (machine instanceof TileRelay) { + // If the relay is disabled we can't search any further + return; + } + } + + if (tile instanceof TileMachine || block == RefinedStorageBlocks.CABLE) { + for (EnumFacing dir : EnumFacing.VALUES) { + search(controller, current.offset(dir), visited, machines); + } + } + } +} diff --git a/src/main/java/refinedstorage/tile/TileBase.java b/src/main/java/refinedstorage/tile/TileBase.java old mode 100644 new mode 100755 index d55a17a04..e5e153ea5 --- a/src/main/java/refinedstorage/tile/TileBase.java +++ b/src/main/java/refinedstorage/tile/TileBase.java @@ -15,82 +15,70 @@ import net.minecraftforge.fml.common.network.NetworkRegistry.TargetPoint; import refinedstorage.RefinedStorage; import refinedstorage.network.MessageTileUpdate; -public abstract class TileBase extends TileEntity implements ITickable -{ - public static final String NBT_DIRECTION = "Direction"; +public abstract class TileBase extends TileEntity implements ITickable { + public static final String NBT_DIRECTION = "Direction"; - public static final int UPDATE_RANGE = 256; + public static final int UPDATE_RANGE = 256; - private EnumFacing direction = EnumFacing.NORTH; + private EnumFacing direction = EnumFacing.NORTH; - protected int ticks; + protected int ticks; - @Override - public void update() - { - ticks++; + @Override + public void update() { + ticks++; - if (!worldObj.isRemote) - { - if (this instanceof INetworkTile) - { - TargetPoint target = new TargetPoint(worldObj.provider.getDimensionType().getId(), pos.getX(), pos.getY(), pos.getZ(), UPDATE_RANGE); + if (!worldObj.isRemote) { + if (this instanceof INetworkTile) { + TargetPoint target = new TargetPoint(worldObj.provider.getDimensionType().getId(), pos.getX(), pos.getY(), pos.getZ(), UPDATE_RANGE); - RefinedStorage.NETWORK.sendToAllAround(new MessageTileUpdate(this), target); - } - } - } + RefinedStorage.NETWORK.sendToAllAround(new MessageTileUpdate(this), target); + } + } + } - public void setDirection(EnumFacing direction) - { - this.direction = direction; - } + public void setDirection(EnumFacing direction) { + this.direction = direction; + } - public EnumFacing getDirection() - { - return direction; - } + public EnumFacing getDirection() { + return direction; + } - @Override - public void readFromNBT(NBTTagCompound nbt) - { - super.readFromNBT(nbt); + @Override + public void readFromNBT(NBTTagCompound nbt) { + super.readFromNBT(nbt); - direction = EnumFacing.getFront(nbt.getInteger(NBT_DIRECTION)); - } + direction = EnumFacing.getFront(nbt.getInteger(NBT_DIRECTION)); + } - @Override - public void writeToNBT(NBTTagCompound nbt) - { - super.writeToNBT(nbt); + @Override + public void writeToNBT(NBTTagCompound nbt) { + super.writeToNBT(nbt); - nbt.setInteger(NBT_DIRECTION, direction.ordinal()); - } + nbt.setInteger(NBT_DIRECTION, direction.ordinal()); + } - @Override - public Packet getDescriptionPacket() - { - NBTTagCompound nbt = new NBTTagCompound(); + @Override + public Packet getDescriptionPacket() { + NBTTagCompound nbt = new NBTTagCompound(); - nbt.setInteger(NBT_DIRECTION, direction.ordinal()); + nbt.setInteger(NBT_DIRECTION, direction.ordinal()); - return new SPacketUpdateTileEntity(pos, 1, nbt); - } + return new SPacketUpdateTileEntity(pos, 1, nbt); + } - @Override - public void onDataPacket(NetworkManager net, SPacketUpdateTileEntity packet) - { - direction = EnumFacing.getFront(packet.getNbtCompound().getInteger(NBT_DIRECTION)); - } + @Override + public void onDataPacket(NetworkManager net, SPacketUpdateTileEntity packet) { + direction = EnumFacing.getFront(packet.getNbtCompound().getInteger(NBT_DIRECTION)); + } - @Override - public boolean shouldRefresh(World world, BlockPos pos, IBlockState oldState, IBlockState newState) - { - return oldState.getBlock() != newState.getBlock(); - } + @Override + public boolean shouldRefresh(World world, BlockPos pos, IBlockState oldState, IBlockState newState) { + return oldState.getBlock() != newState.getBlock(); + } - public IInventory getDroppedInventory() - { - return null; - } + public IInventory getDroppedInventory() { + return null; + } } diff --git a/src/main/java/refinedstorage/tile/TileCable.java b/src/main/java/refinedstorage/tile/TileCable.java deleted file mode 100644 index 839e1e6a3..000000000 --- a/src/main/java/refinedstorage/tile/TileCable.java +++ /dev/null @@ -1,80 +0,0 @@ -package refinedstorage.tile; - -import java.util.List; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IBlockAccess; - -public class TileCable extends TileBase -{ - public static boolean hasConnectionWith(IBlockAccess world, BlockPos pos) - { - TileEntity tile = world.getTileEntity(pos); - - return tile instanceof TileCable || tile instanceof TileMachine || tile instanceof TileController; - } - - public void addMachines(List visited, List machines, TileController controller) - { - for (BlockPos visitedBlock : visited) - { - if (visitedBlock.equals(pos)) - { - return; - } - } - - visited.add(pos); - - for (EnumFacing dir : EnumFacing.VALUES) - { - BlockPos newPos = pos.offset(dir); - - boolean alreadyVisited = false; - - for (BlockPos visitedBlock : visited) - { - if (visitedBlock.equals(newPos)) - { - alreadyVisited = true; - } - } - - if (alreadyVisited) - { - continue; - } - - TileEntity tile = worldObj.getTileEntity(newPos); - - if (tile instanceof TileMachine && ((TileMachine) tile).getRedstoneMode().isEnabled(worldObj, newPos)) - { - machines.add((TileMachine) tile); - - visited.add(newPos); - - if (tile instanceof TileRelay) - { - for (EnumFacing relayDir : EnumFacing.VALUES) - { - TileEntity nextToRelay = worldObj.getTileEntity(newPos.offset(relayDir)); - - if (nextToRelay instanceof TileCable) - { - ((TileCable) nextToRelay).addMachines(visited, machines, controller); - } - } - } - } - else if (tile instanceof TileCable) - { - ((TileCable) tile).addMachines(visited, machines, controller); - } - else if (tile instanceof TileController && !controller.getPos().equals(newPos)) - { - worldObj.createExplosion(null, pos.getX(), pos.getY(), pos.getZ(), 4.5f, true); - } - } - } -} diff --git a/src/main/java/refinedstorage/tile/TileConstructor.java b/src/main/java/refinedstorage/tile/TileConstructor.java old mode 100644 new mode 100755 index 9ba0590dc..361c7aef2 --- a/src/main/java/refinedstorage/tile/TileConstructor.java +++ b/src/main/java/refinedstorage/tile/TileConstructor.java @@ -1,6 +1,7 @@ package refinedstorage.tile; import io.netty.buffer.ByteBuf; +import net.minecraft.block.Block; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; @@ -10,94 +11,84 @@ import refinedstorage.inventory.InventorySimple; import refinedstorage.tile.settings.ICompareSetting; import refinedstorage.util.InventoryUtils; -public class TileConstructor extends TileMachine implements ICompareSetting -{ - public static final String NBT_COMPARE = "Compare"; +public class TileConstructor extends TileMachine implements ICompareSetting { + public static final int SPEED = 10; - private InventorySimple inventory = new InventorySimple("constructor", 1, this); + public static final String NBT_COMPARE = "Compare"; - private int compare = 0; + private InventorySimple inventory = new InventorySimple("constructor", 1, this); - @Override - public int getEnergyUsage() - { - return 1; - } + private int compare = 0; - @Override - public void updateMachine() - { - if (ticks % 10 == 0) - { - BlockPos front = pos.offset(getDirection()); + @Override + public int getEnergyUsage() { + return 1; + } - if ((worldObj.isAirBlock(front) || worldObj.getBlockState(front).getBlock().getMaterial(worldObj.getBlockState(front)).isLiquid()) && inventory.getStackInSlot(0) != null) - { - ItemStack took = getController().take(inventory.getStackInSlot(0).copy(), compare); + @Override + public void updateMachine() { + if (ticks % SPEED == 0 && inventory.getStackInSlot(0) != null) { + BlockPos front = pos.offset(getDirection()); - if (took != null) - { - worldObj.setBlockState(front, ((ItemBlock) took.getItem()).getBlock().getStateFromMeta(took.getItemDamage()), 1 | 2); - } - } - } - } + Block tryingToPlace = ((ItemBlock) inventory.getStackInSlot(0).getItem()).getBlock(); - @Override - public int getCompare() - { - return compare; - } + if (tryingToPlace.canPlaceBlockAt(worldObj, front)) { + ItemStack took = getController().take(inventory.getStackInSlot(0).copy(), compare); - @Override - public void setCompare(int compare) - { - markDirty(); + if (took != null) { + worldObj.setBlockState(front, tryingToPlace.getStateFromMeta(took.getItemDamage()), 1 | 2); + } + } + } + } - this.compare = compare; - } + @Override + public int getCompare() { + return compare; + } - @Override - public void readFromNBT(NBTTagCompound nbt) - { - super.readFromNBT(nbt); + @Override + public void setCompare(int compare) { + markDirty(); - if (nbt.hasKey(NBT_COMPARE)) - { - compare = nbt.getInteger(NBT_COMPARE); - } + this.compare = compare; + } - InventoryUtils.restoreInventory(inventory, 0, nbt); - } + @Override + public void readFromNBT(NBTTagCompound nbt) { + super.readFromNBT(nbt); - @Override - public void writeToNBT(NBTTagCompound nbt) - { - super.writeToNBT(nbt); + if (nbt.hasKey(NBT_COMPARE)) { + compare = nbt.getInteger(NBT_COMPARE); + } - nbt.setInteger(NBT_COMPARE, compare); + InventoryUtils.restoreInventory(inventory, 0, nbt); + } - InventoryUtils.saveInventory(inventory, 0, nbt); - } + @Override + public void writeToNBT(NBTTagCompound nbt) { + super.writeToNBT(nbt); - @Override - public void fromBytes(ByteBuf buf) - { - super.fromBytes(buf); + nbt.setInteger(NBT_COMPARE, compare); - compare = buf.readInt(); - } + InventoryUtils.saveInventory(inventory, 0, nbt); + } - @Override - public void toBytes(ByteBuf buf) - { - super.toBytes(buf); + @Override + public void fromBytes(ByteBuf buf) { + super.fromBytes(buf); - buf.writeInt(compare); - } + compare = buf.readInt(); + } - public IInventory getInventory() - { - return inventory; - } + @Override + public void toBytes(ByteBuf buf) { + super.toBytes(buf); + + buf.writeInt(compare); + } + + public IInventory getInventory() { + return inventory; + } } diff --git a/src/main/java/refinedstorage/tile/TileController.java b/src/main/java/refinedstorage/tile/TileController.java old mode 100644 new mode 100755 index c7e297c48..a0e081fe1 --- a/src/main/java/refinedstorage/tile/TileController.java +++ b/src/main/java/refinedstorage/tile/TileController.java @@ -3,9 +3,6 @@ package refinedstorage.tile; import cofh.api.energy.EnergyStorage; import cofh.api.energy.IEnergyReceiver; import io.netty.buffer.ByteBuf; -import java.util.ArrayList; -import java.util.Comparator; -import java.util.List; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; @@ -21,437 +18,364 @@ import refinedstorage.tile.settings.IRedstoneModeSetting; import refinedstorage.tile.settings.RedstoneMode; import refinedstorage.util.InventoryUtils; -public class TileController extends TileBase implements IEnergyReceiver, INetworkTile, IRedstoneModeSetting -{ - private List items = new ArrayList(); - private List storages = new ArrayList(); - - private RedstoneMode redstoneMode = RedstoneMode.IGNORE; - - private List machines = new ArrayList(); - - private List visitedCables = new ArrayList(); - - private EnergyStorage energy = new EnergyStorage(32000); - private int energyUsage; - - private boolean destroyed = false; - - @Override - public void update() - { - super.update(); - - if (destroyed) - { - return; - } - - if (!worldObj.isRemote) - { - int lastEnergy = energy.getEnergyStored(); - - if (ticks % 20 == 0) - { - if (!isActive()) - { - disconnectAll(); - } - else - { - visitedCables.clear(); - - List newMachines = new ArrayList(); - - for (EnumFacing dir : EnumFacing.VALUES) - { - TileEntity tile = worldObj.getTileEntity(pos.offset(dir)); - - if (tile instanceof TileCable) - { - ((TileCable) tile).addMachines(visitedCables, newMachines, this); - } - } - - for (TileMachine machine : machines) - { - if (!newMachines.contains(machine)) - { - machine.onDisconnected(); - } - } - - for (TileMachine machine : newMachines) - { - if (!machines.contains(machine)) - { - machine.onConnected(this); - } - } - - machines = newMachines; - - storages.clear(); - - for (TileMachine machine : machines) - { - if (machine instanceof IStorageProvider) - { - ((IStorageProvider) machine).addStorages(storages); - } - } - - storages.sort(new Comparator() - { - @Override - public int compare(IStorage s1, IStorage s2) - { - return (s1.getPriority() > s2.getPriority()) ? -1 : 1; - } - }); - - syncItems(); - } - - energyUsage = 10; - - for (TileMachine machine : machines) - { - energyUsage += machine.getEnergyUsage(); - } - - switch (getType()) - { - case NORMAL: - energy.extractEnergy(energyUsage, false); - break; - case CREATIVE: - energy.setEnergyStored(energy.getMaxEnergyStored()); - break; - } - - if (lastEnergy != energy.getEnergyStored()) - { - worldObj.updateComparatorOutputLevel(pos, RefinedStorageBlocks.CONTROLLER); - } - } - } - } - - public EnumControllerType getType() - { - if (worldObj.getBlockState(pos).getBlock() == RefinedStorageBlocks.CONTROLLER) - { - return (EnumControllerType) worldObj.getBlockState(pos).getValue(BlockController.TYPE); - } - - return EnumControllerType.NORMAL; - } - - public void onDestroyed() - { - disconnectAll(); - - destroyed = true; - } - - private void disconnectAll() - { - for (TileMachine machine : machines) - { - machine.onDisconnected(); - } - - machines.clear(); - } - - public List getMachines() - { - return machines; - } - - public List getItems() - { - return items; - } - - private void syncItems() - { - items.clear(); - - for (IStorage storage : storages) - { - storage.addItems(items); - } - - combineItems(); - } - - private void combineItems() - { - List markedIndexes = new ArrayList(); - - for (int i = 0; i < items.size(); ++i) - { - if (markedIndexes.contains(i)) - { - continue; - } - - StorageItem item = items.get(i); - - for (int j = i + 1; j < items.size(); ++j) - { - if (markedIndexes.contains(j)) - { - continue; - } - - StorageItem other = items.get(j); - - if (item.compareNoQuantity(other)) - { - item.setQuantity(item.getQuantity() + other.getQuantity()); - - markedIndexes.add(j); - } - } - } - - List markedItems = new ArrayList(); - - for (int i : markedIndexes) - { - markedItems.add(items.get(i)); - } - - items.removeAll(markedItems); - } - - public boolean push(ItemStack stack) - { - IStorage foundStorage = null; - - for (IStorage storage : storages) - { - if (storage.canPush(stack)) - { - foundStorage = storage; - - break; - } - } - - if (foundStorage == null) - { - return false; - } - - foundStorage.push(stack); - - syncItems(); - - markDirty(); - - return true; - } - - public ItemStack take(ItemStack stack) - { - markDirty(); - - return take(stack, InventoryUtils.COMPARE_DAMAGE | InventoryUtils.COMPARE_NBT); - } - - public ItemStack take(ItemStack stack, int flags) - { - markDirty(); - - int requested = stack.stackSize; - int receiving = 0; - - ItemStack newStack = null; - - for (IStorage storage : storages) - { - ItemStack took = storage.take(stack, flags); - - if (took != null) - { - if (newStack == null) - { - newStack = took; - } - else - { - newStack.stackSize += took.stackSize; - } - - receiving += took.stackSize; - } - - if (requested == receiving) - { - break; - } - } - - syncItems(); - - return newStack; - } - - @Override - public void readFromNBT(NBTTagCompound nbt) - { - super.readFromNBT(nbt); - - energy.readFromNBT(nbt); - - if (nbt.hasKey(RedstoneMode.NBT)) - { - redstoneMode = RedstoneMode.getById(nbt.getInteger(RedstoneMode.NBT)); - } - } - - @Override - public void writeToNBT(NBTTagCompound nbt) - { - super.writeToNBT(nbt); +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; +import java.util.List; + +public class TileController extends TileBase implements IEnergyReceiver, INetworkTile, IRedstoneModeSetting { + private List items = new ArrayList(); + private List storages = new ArrayList(); - energy.writeToNBT(nbt); - - nbt.setInteger(RedstoneMode.NBT, redstoneMode.id); - } + private RedstoneMode redstoneMode = RedstoneMode.IGNORE; - @Override - public int receiveEnergy(EnumFacing from, int maxReceive, boolean simulate) - { - return energy.receiveEnergy(maxReceive, simulate); - } + private List machines = new ArrayList(); + + private List visited = new ArrayList(); - @Override - public int getEnergyStored(EnumFacing from) - { - return energy.getEnergyStored(); - } + private EnergyStorage energy = new EnergyStorage(32000); + private int energyUsage; - public int getEnergyScaled(int i) - { - return (int) ((float) energy.getEnergyStored() / (float) energy.getMaxEnergyStored() * (float) i); - } + private boolean destroyed = false; + + @Override + public void update() { + super.update(); + + if (!worldObj.isRemote && !destroyed) { + int lastEnergy = energy.getEnergyStored(); - @Override - public int getMaxEnergyStored(EnumFacing from) - { - return energy.getMaxEnergyStored(); - } + if (ticks % 20 == 0) { + if (!isActive()) { + disconnectAll(); + } else { + visited.clear(); - public int getEnergyUsage() - { - return energyUsage; - } - - @Override - public boolean canConnectEnergy(EnumFacing from) - { - return true; - } - - public boolean isActive() - { - return energy.getEnergyStored() >= getEnergyUsage() && redstoneMode.isEnabled(worldObj, pos); - } - - @Override - public RedstoneMode getRedstoneMode() - { - return redstoneMode; - } - - @Override - public void setRedstoneMode(RedstoneMode mode) - { - markDirty(); - - this.redstoneMode = mode; - } - - @Override - public BlockPos getTilePos() - { - return pos; - } - - @Override - public BlockPos getMachinePos() - { - return pos; - } - - @Override - public void fromBytes(ByteBuf buf) - { - int lastEnergy = energy.getEnergyStored(); - - energy.setEnergyStored(buf.readInt()); + List newMachines = new ArrayList(); - if (lastEnergy != energy.getEnergyStored()) - { - worldObj.notifyBlockUpdate(pos, worldObj.getBlockState(pos), worldObj.getBlockState(pos), 2 | 4); - } - - energyUsage = buf.readInt(); - - redstoneMode = RedstoneMode.getById(buf.readInt()); - - items.clear(); - - int size = buf.readInt(); - - for (int i = 0; i < size; ++i) - { - items.add(new StorageItem(buf)); - } - - machines.clear(); - - size = buf.readInt(); - - for (int i = 0; i < size; ++i) - { - TileEntity tile = worldObj.getTileEntity(new BlockPos(buf.readInt(), buf.readInt(), buf.readInt())); - - if (tile instanceof TileMachine) - { - machines.add((TileMachine) tile); - } - } - - } - - @Override - public void toBytes(ByteBuf buf) - { - buf.writeInt(energy.getEnergyStored()); - buf.writeInt(isActive() ? energyUsage : 0); + for (EnumFacing dir : EnumFacing.VALUES) { + MachineSearcher.search(this, pos.offset(dir), visited, newMachines); + } - buf.writeInt(redstoneMode.id); - - buf.writeInt(items.size()); + for (TileMachine machine : machines) { + if (!newMachines.contains(machine)) { + machine.onDisconnected(); + } + } - for (StorageItem item : items) - { - item.toBytes(buf, items.indexOf(item)); - } + for (TileMachine machine : newMachines) { + if (!machines.contains(machine)) { + machine.onConnected(this); + } + } - buf.writeInt(machines.size()); + machines = newMachines; - for (TileMachine machine : machines) - { - buf.writeInt(machine.getPos().getX()); - buf.writeInt(machine.getPos().getY()); - buf.writeInt(machine.getPos().getZ()); - } - } + storages.clear(); + + for (TileMachine machine : machines) { + if (machine instanceof IStorageProvider) { + ((IStorageProvider) machine).addStorages(storages); + } + } + + Collections.sort(storages, new Comparator() { + @Override + public int compare(IStorage s1, IStorage s2) { + return (s1.getPriority() > s2.getPriority()) ? -1 : 1; + } + }); + + syncItems(); + + energyUsage = 10; + + for (TileMachine machine : machines) { + energyUsage += machine.getEnergyUsage(); + } + } + } + + if (isActive()) { + switch (getType()) { + case NORMAL: + energy.extractEnergy(energyUsage, false); + break; + case CREATIVE: + energy.setEnergyStored(energy.getMaxEnergyStored()); + break; + } + } + + if (lastEnergy != energy.getEnergyStored()) { + worldObj.updateComparatorOutputLevel(pos, RefinedStorageBlocks.CONTROLLER); + } + } + } + + public EnumControllerType getType() { + if (worldObj.getBlockState(pos).getBlock() == RefinedStorageBlocks.CONTROLLER) { + return (EnumControllerType) worldObj.getBlockState(pos).getValue(BlockController.TYPE); + } + + return EnumControllerType.NORMAL; + } + + public void onDestroyed() { + disconnectAll(); + + destroyed = true; + } + + private void disconnectAll() { + for (TileMachine machine : machines) { + machine.onDisconnected(); + } + + machines.clear(); + } + + public List getMachines() { + return machines; + } + + public List getItems() { + return items; + } + + private void syncItems() { + items.clear(); + + for (IStorage storage : storages) { + storage.addItems(items); + } + + combineItems(); + } + + private void combineItems() { + List markedIndexes = new ArrayList(); + + for (int i = 0; i < items.size(); ++i) { + if (markedIndexes.contains(i)) { + continue; + } + + StorageItem item = items.get(i); + + for (int j = i + 1; j < items.size(); ++j) { + if (markedIndexes.contains(j)) { + continue; + } + + StorageItem other = items.get(j); + + if (item.compareNoQuantity(other)) { + item.setQuantity(item.getQuantity() + other.getQuantity()); + + markedIndexes.add(j); + } + } + } + + List markedItems = new ArrayList(); + + for (int i : markedIndexes) { + markedItems.add(items.get(i)); + } + + items.removeAll(markedItems); + } + + public boolean push(ItemStack stack) { + IStorage foundStorage = null; + + for (IStorage storage : storages) { + if (storage.canPush(stack)) { + foundStorage = storage; + + break; + } + } + + if (foundStorage == null) { + return false; + } + + foundStorage.push(stack); + + syncItems(); + + markDirty(); + + return true; + } + + public ItemStack take(ItemStack stack) { + markDirty(); + + return take(stack, InventoryUtils.COMPARE_DAMAGE | InventoryUtils.COMPARE_NBT); + } + + public ItemStack take(ItemStack stack, int flags) { + markDirty(); + + int requested = stack.stackSize; + int receiving = 0; + + ItemStack newStack = null; + + for (IStorage storage : storages) { + ItemStack took = storage.take(stack, flags); + + if (took != null) { + if (newStack == null) { + newStack = took; + } else { + newStack.stackSize += took.stackSize; + } + + receiving += took.stackSize; + } + + if (requested == receiving) { + break; + } + } + + syncItems(); + + return newStack; + } + + @Override + public void readFromNBT(NBTTagCompound nbt) { + super.readFromNBT(nbt); + + energy.readFromNBT(nbt); + + if (nbt.hasKey(RedstoneMode.NBT)) { + redstoneMode = RedstoneMode.getById(nbt.getInteger(RedstoneMode.NBT)); + } + } + + @Override + public void writeToNBT(NBTTagCompound nbt) { + super.writeToNBT(nbt); + + energy.writeToNBT(nbt); + + nbt.setInteger(RedstoneMode.NBT, redstoneMode.id); + } + + @Override + public int receiveEnergy(EnumFacing from, int maxReceive, boolean simulate) { + return energy.receiveEnergy(maxReceive, simulate); + } + + @Override + public int getEnergyStored(EnumFacing from) { + return energy.getEnergyStored(); + } + + public int getEnergyScaled(int i) { + return (int) ((float) energy.getEnergyStored() / (float) energy.getMaxEnergyStored() * (float) i); + } + + @Override + public int getMaxEnergyStored(EnumFacing from) { + return energy.getMaxEnergyStored(); + } + + public int getEnergyUsage() { + return energyUsage; + } + + @Override + public boolean canConnectEnergy(EnumFacing from) { + return true; + } + + public boolean isActive() { + return energy.getEnergyStored() >= getEnergyUsage() && redstoneMode.isEnabled(worldObj, pos); + } + + @Override + public RedstoneMode getRedstoneMode() { + return redstoneMode; + } + + @Override + public void setRedstoneMode(RedstoneMode mode) { + markDirty(); + + this.redstoneMode = mode; + } + + @Override + public BlockPos getTilePos() { + return pos; + } + + @Override + public BlockPos getMachinePos() { + return pos; + } + + @Override + public void fromBytes(ByteBuf buf) { + int lastEnergy = energy.getEnergyStored(); + + energy.setEnergyStored(buf.readInt()); + + if (lastEnergy != energy.getEnergyStored()) { + worldObj.notifyBlockUpdate(pos, worldObj.getBlockState(pos), worldObj.getBlockState(pos), 2 | 4); + } + + energyUsage = buf.readInt(); + + redstoneMode = RedstoneMode.getById(buf.readInt()); + + items.clear(); + + int size = buf.readInt(); + + for (int i = 0; i < size; ++i) { + items.add(new StorageItem(buf)); + } + + machines.clear(); + + size = buf.readInt(); + + for (int i = 0; i < size; ++i) { + TileEntity tile = worldObj.getTileEntity(new BlockPos(buf.readInt(), buf.readInt(), buf.readInt())); + + if (tile instanceof TileMachine) { + machines.add((TileMachine) tile); + } + } + } + + @Override + public void toBytes(ByteBuf buf) { + buf.writeInt(energy.getEnergyStored()); + buf.writeInt(isActive() ? energyUsage : 0); + + buf.writeInt(redstoneMode.id); + + buf.writeInt(items.size()); + + for (StorageItem item : items) { + item.toBytes(buf, items.indexOf(item)); + } + + buf.writeInt(machines.size()); + + for (TileMachine machine : machines) { + buf.writeInt(machine.getPos().getX()); + buf.writeInt(machine.getPos().getY()); + buf.writeInt(machine.getPos().getZ()); + } + } } diff --git a/src/main/java/refinedstorage/tile/TileDestructor.java b/src/main/java/refinedstorage/tile/TileDestructor.java old mode 100644 new mode 100755 index a9ec2a100..d8ed2200b --- a/src/main/java/refinedstorage/tile/TileDestructor.java +++ b/src/main/java/refinedstorage/tile/TileDestructor.java @@ -1,44 +1,138 @@ package refinedstorage.tile; -import java.util.List; +import io.netty.buffer.ByteBuf; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; +import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.math.BlockPos; +import refinedstorage.inventory.InventorySimple; +import refinedstorage.tile.settings.ICompareSetting; +import refinedstorage.tile.settings.IModeSetting; +import refinedstorage.tile.settings.ModeSettingUtils; import refinedstorage.util.InventoryUtils; -public class TileDestructor extends TileMachine -{ - @Override - public int getEnergyUsage() - { - return 1; - } +import java.util.List; - @Override - public void updateMachine() - { - if (ticks % 10 == 0) - { - BlockPos front = pos.offset(getDirection()); +public class TileDestructor extends TileMachine implements ICompareSetting, IModeSetting { + public static final String NBT_COMPARE = "Compare"; + public static final String NBT_MODE = "Mode"; - IBlockState frontBlockState = worldObj.getBlockState(front); - Block frontBlock = frontBlockState.getBlock(); + public static final int SPEED = 10; - if (!frontBlock.isAir(frontBlockState, worldObj, front)) - { - List drops = frontBlock.getDrops(worldObj, front, worldObj.getBlockState(front), 0); + private InventorySimple inventory = new InventorySimple("destructor", 9, this); - worldObj.setBlockToAir(front); + private int compare = 0; + private int mode = 0; - for (ItemStack drop : drops) - { - if (!getController().push(drop)) - { - InventoryUtils.dropStack(worldObj, drop, front.getX(), front.getY(), front.getZ()); - } - } - } - } - } + @Override + public int getEnergyUsage() { + return 1; + } + + @Override + public void updateMachine() { + if (ticks % SPEED == 0) { + BlockPos front = pos.offset(getDirection()); + + IBlockState frontBlockState = worldObj.getBlockState(front); + Block frontBlock = frontBlockState.getBlock(); + + if (!frontBlock.isAir(frontBlockState, worldObj, front)) { + if (ModeSettingUtils.doesNotViolateMode(inventory, this, compare, new ItemStack(frontBlock, 1, frontBlock.getMetaFromState(frontBlockState)))) { + List drops = frontBlock.getDrops(worldObj, front, frontBlockState, 0); + + worldObj.setBlockToAir(front); + + for (ItemStack drop : drops) { + if (!getController().push(drop)) { + InventoryUtils.dropStack(worldObj, drop, front.getX(), front.getY(), front.getZ()); + } + } + } + } + } + } + + @Override + public int getCompare() { + return compare; + } + + @Override + public void setCompare(int compare) { + markDirty(); + + this.compare = compare; + } + + @Override + public boolean isWhitelist() { + return mode == 0; + } + + @Override + public boolean isBlacklist() { + return mode == 1; + } + + @Override + public void setToWhitelist() { + markDirty(); + + this.mode = 0; + } + + @Override + public void setToBlacklist() { + markDirty(); + + this.mode = 1; + } + + @Override + public void readFromNBT(NBTTagCompound nbt) { + super.readFromNBT(nbt); + + if (nbt.hasKey(NBT_COMPARE)) { + compare = nbt.getInteger(NBT_COMPARE); + } + + if (nbt.hasKey(NBT_MODE)) { + mode = nbt.getInteger(NBT_MODE); + } + + InventoryUtils.restoreInventory(inventory, 0, nbt); + } + + @Override + public void writeToNBT(NBTTagCompound nbt) { + super.writeToNBT(nbt); + + nbt.setInteger(NBT_COMPARE, compare); + nbt.setInteger(NBT_MODE, mode); + + InventoryUtils.saveInventory(inventory, 0, nbt); + } + + @Override + public void fromBytes(ByteBuf buf) { + super.fromBytes(buf); + + compare = buf.readInt(); + mode = buf.readInt(); + } + + @Override + public void toBytes(ByteBuf buf) { + super.toBytes(buf); + + buf.writeInt(compare); + buf.writeInt(mode); + } + + public IInventory getInventory() { + return inventory; + } } diff --git a/src/main/java/refinedstorage/tile/TileDetector.java b/src/main/java/refinedstorage/tile/TileDetector.java old mode 100644 new mode 100755 index 316563289..c94869f2a --- a/src/main/java/refinedstorage/tile/TileDetector.java +++ b/src/main/java/refinedstorage/tile/TileDetector.java @@ -8,219 +8,186 @@ import refinedstorage.RefinedStorageBlocks; import refinedstorage.inventory.InventorySimple; import refinedstorage.storage.StorageItem; import refinedstorage.tile.settings.ICompareSetting; +import refinedstorage.tile.settings.RedstoneMode; import refinedstorage.util.InventoryUtils; -public class TileDetector extends TileMachine implements ICompareSetting -{ - public static final int MODE_UNDER = 0; - public static final int MODE_EQUAL = 1; - public static final int MODE_ABOVE = 2; +public class TileDetector extends TileMachine implements ICompareSetting { + public static final int MODE_UNDER = 0; + public static final int MODE_EQUAL = 1; + public static final int MODE_ABOVE = 2; - public static final String NBT_COMPARE = "Compare"; - public static final String NBT_MODE = "Mode"; - public static final String NBT_AMOUNT = "Amount"; + public static final String NBT_COMPARE = "Compare"; + public static final String NBT_MODE = "Mode"; + public static final String NBT_AMOUNT = "Amount"; - private InventorySimple inventory = new InventorySimple("detector", 1, this); + private InventorySimple inventory = new InventorySimple("detector", 1, this); - private int compare = 0; - private int mode = MODE_EQUAL; - private int amount = 0; + private int compare = 0; + private int mode = MODE_EQUAL; + private int amount = 0; - private boolean powered = false; + private boolean powered = false; - public TileDetector() - { - this.redstoneControlled = false; - } + @Override + public void onDisconnected() { + super.onDisconnected(); - @Override - public void onDisconnected() - { - super.onDisconnected(); + powered = false; + } - powered = false; - } + @Override + public int getEnergyUsage() { + return 3; + } - @Override - public int getEnergyUsage() - { - return 3; - } + @Override + public void updateMachine() { + if (ticks % 5 == 0) { + ItemStack slot = inventory.getStackInSlot(0); - @Override - public void updateMachine() - { - if (ticks % 5 == 0) - { - ItemStack slot = inventory.getStackInSlot(0); + boolean lastPowered = powered; - boolean lastPowered = powered; + if (slot != null) { + boolean foundAny = false; - if (slot != null) - { - boolean foundAny = false; + for (StorageItem item : getController().getItems()) { + if (item.compare(slot, compare)) { + foundAny = true; - for (StorageItem item : getController().getItems()) - { - if (item.compare(slot, compare)) - { - foundAny = true; + switch (mode) { + case MODE_UNDER: + powered = item.getQuantity() < amount; + break; + case MODE_EQUAL: + powered = item.getQuantity() == amount; + break; + case MODE_ABOVE: + powered = item.getQuantity() > amount; + break; + } - switch (mode) - { - case MODE_UNDER: - powered = item.getQuantity() < amount; - break; - case MODE_EQUAL: - powered = item.getQuantity() == amount; - break; - case MODE_ABOVE: - powered = item.getQuantity() > amount; - break; - } + break; + } + } - break; - } - } + if (!foundAny) { + if (mode == MODE_UNDER && amount != 0) { + powered = true; + } else if (mode == MODE_EQUAL && amount == 0) { + powered = true; + } else { + powered = false; + } + } + } else { + powered = false; + } - if (!foundAny) - { - if (mode == MODE_UNDER && amount != 0) - { - powered = true; - } - else if (mode == MODE_EQUAL && amount == 0) - { - powered = true; - } - else - { - powered = false; - } - } - } - else - { - powered = false; - } + if (powered != lastPowered) { + worldObj.notifyNeighborsOfStateChange(pos, RefinedStorageBlocks.DETECTOR); + } + } + } - if (powered != lastPowered) - { - worldObj.notifyNeighborsOfStateChange(pos, RefinedStorageBlocks.DETECTOR); - } - } - } + public boolean isPowered() { + return powered; + } - public boolean isPowered() - { - return powered; - } + @Override + public int getCompare() { + return compare; + } - @Override - public int getCompare() - { - return compare; - } + @Override + public void setCompare(int compare) { + markDirty(); - @Override - public void setCompare(int compare) - { - markDirty(); + this.compare = compare; + } - this.compare = compare; - } + public int getMode() { + return mode; + } - public int getMode() - { - return mode; - } + public void setMode(int mode) { + markDirty(); - public void setMode(int mode) - { - markDirty(); + this.mode = mode; + } - this.mode = mode; - } + public int getAmount() { + return amount; + } - public int getAmount() - { - return amount; - } + public void setAmount(int amount) { + markDirty(); - public void setAmount(int amount) - { - markDirty(); + this.amount = amount; + } - this.amount = amount; - } + @Override + public void readFromNBT(NBTTagCompound nbt) { + super.readFromNBT(nbt); - @Override - public void readFromNBT(NBTTagCompound nbt) - { - super.readFromNBT(nbt); + if (nbt.hasKey(NBT_COMPARE)) { + compare = nbt.getInteger(NBT_COMPARE); + } - if (nbt.hasKey(NBT_COMPARE)) - { - compare = nbt.getInteger(NBT_COMPARE); - } + if (nbt.hasKey(NBT_MODE)) { + mode = nbt.getInteger(NBT_MODE); + } - if (nbt.hasKey(NBT_MODE)) - { - mode = nbt.getInteger(NBT_MODE); - } + if (nbt.hasKey(NBT_AMOUNT)) { + amount = nbt.getInteger(NBT_AMOUNT); + } - if (nbt.hasKey(NBT_AMOUNT)) - { - amount = nbt.getInteger(NBT_AMOUNT); - } + InventoryUtils.restoreInventory(inventory, 0, nbt); + } - InventoryUtils.restoreInventory(inventory, 0, nbt); - } + @Override + public void writeToNBT(NBTTagCompound nbt) { + super.writeToNBT(nbt); - @Override - public void writeToNBT(NBTTagCompound nbt) - { - super.writeToNBT(nbt); + nbt.setInteger(NBT_COMPARE, compare); + nbt.setInteger(NBT_MODE, mode); + nbt.setInteger(NBT_AMOUNT, amount); - nbt.setInteger(NBT_COMPARE, compare); - nbt.setInteger(NBT_MODE, mode); - nbt.setInteger(NBT_AMOUNT, amount); + InventoryUtils.saveInventory(inventory, 0, nbt); + } - InventoryUtils.saveInventory(inventory, 0, nbt); - } + @Override + public void fromBytes(ByteBuf buf) { + super.fromBytes(buf); - @Override - public void fromBytes(ByteBuf buf) - { - super.fromBytes(buf); + compare = buf.readInt(); + mode = buf.readInt(); + amount = buf.readInt(); - compare = buf.readInt(); - mode = buf.readInt(); - amount = buf.readInt(); + boolean lastPowered = powered; - boolean lastPowered = powered; + powered = buf.readBoolean(); - powered = buf.readBoolean(); + if (powered != lastPowered) { + worldObj.notifyBlockUpdate(pos, worldObj.getBlockState(pos), worldObj.getBlockState(pos), 2 | 4); + } + } - if (powered != lastPowered) - { - worldObj.notifyBlockUpdate(pos, worldObj.getBlockState(pos), worldObj.getBlockState(pos), 2 | 4); - } - } + @Override + public void toBytes(ByteBuf buf) { + super.toBytes(buf); - @Override - public void toBytes(ByteBuf buf) - { - super.toBytes(buf); + buf.writeInt(compare); + buf.writeInt(mode); + buf.writeInt(amount); + buf.writeBoolean(powered); + } - buf.writeInt(compare); - buf.writeInt(mode); - buf.writeInt(amount); - buf.writeBoolean(powered); - } + public IInventory getInventory() { + return inventory; + } - public IInventory getInventory() - { - return inventory; - } + @Override + public void setRedstoneMode(RedstoneMode mode) { + // NO OP + } } diff --git a/src/main/java/refinedstorage/tile/TileDiskDrive.java b/src/main/java/refinedstorage/tile/TileDiskDrive.java new file mode 100755 index 000000000..545220ae2 --- /dev/null +++ b/src/main/java/refinedstorage/tile/TileDiskDrive.java @@ -0,0 +1,305 @@ +package refinedstorage.tile; + +import io.netty.buffer.ByteBuf; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.text.ITextComponent; +import refinedstorage.RefinedStorage; +import refinedstorage.inventory.InventorySimple; +import refinedstorage.network.MessagePriorityUpdate; +import refinedstorage.storage.*; +import refinedstorage.tile.settings.ICompareSetting; +import refinedstorage.tile.settings.IModeSetting; +import refinedstorage.tile.settings.IRedstoneModeSetting; +import refinedstorage.util.InventoryUtils; + +import java.util.List; + +public class TileDiskDrive extends TileMachine implements IStorageProvider, IStorageGui, ICompareSetting, IModeSetting, IInventory { + public static final String NBT_PRIORITY = "Priority"; + public static final String NBT_COMPARE = "Compare"; + public static final String NBT_MODE = "Mode"; + + private InventorySimple inventory = new InventorySimple("disk_drive", 8, this); + private InventorySimple filterInventory = new InventorySimple("filters", 9, this); + + private int priority = 0; + private int compare = 0; + private int mode = 0; + + @Override + public int getEnergyUsage() { + int base = 5; + + for (int i = 0; i < getSizeInventory(); ++i) { + if (getStackInSlot(i) != null) { + base += 2; + } + } + + return base; + } + + @Override + public void updateMachine() { + } + + @Override + public void addStorages(List storages) { + for (int i = 0; i < getSizeInventory(); ++i) { + if (getStackInSlot(i) != null) { + storages.add(new DiskStorage(getStackInSlot(i), this)); + } + } + } + + @Override + public void readFromNBT(NBTTagCompound nbt) { + super.readFromNBT(nbt); + + InventoryUtils.restoreInventory(inventory, 0, nbt); + InventoryUtils.restoreInventory(filterInventory, 1, nbt); + + if (nbt.hasKey(NBT_PRIORITY)) { + priority = nbt.getInteger(NBT_PRIORITY); + } + + if (nbt.hasKey(NBT_COMPARE)) { + compare = nbt.getInteger(NBT_COMPARE); + } + + if (nbt.hasKey(NBT_MODE)) { + mode = nbt.getInteger(NBT_MODE); + } + } + + @Override + public void writeToNBT(NBTTagCompound nbt) { + super.writeToNBT(nbt); + + InventoryUtils.saveInventory(inventory, 0, nbt); + InventoryUtils.saveInventory(filterInventory, 1, nbt); + + nbt.setInteger(NBT_PRIORITY, priority); + nbt.setInteger(NBT_COMPARE, compare); + nbt.setInteger(NBT_MODE, mode); + } + + @Override + public void toBytes(ByteBuf buf) { + super.toBytes(buf); + + buf.writeInt(priority); + buf.writeInt(compare); + buf.writeInt(mode); + } + + @Override + public void fromBytes(ByteBuf buf) { + super.fromBytes(buf); + + priority = buf.readInt(); + compare = buf.readInt(); + mode = buf.readInt(); + } + + @Override + public int getCompare() { + return compare; + } + + @Override + public void setCompare(int compare) { + markDirty(); + + this.compare = compare; + } + + @Override + public boolean isWhitelist() { + return mode == 0; + } + + @Override + public boolean isBlacklist() { + return mode == 1; + } + + @Override + public void setToWhitelist() { + markDirty(); + + this.mode = 0; + } + + @Override + public void setToBlacklist() { + markDirty(); + + this.mode = 1; + } + + @Override + public String getName() { + return "block.refinedstorage:disk_drive.name"; + } + + @Override + public IInventory getInventory() { + return filterInventory; + } + + @Override + public IRedstoneModeSetting getRedstoneModeSetting() { + return this; + } + + @Override + public ICompareSetting getCompareSetting() { + return this; + } + + @Override + public IModeSetting getModeSetting() { + return this; + } + + @Override + public void onPriorityChanged(int priority) { + RefinedStorage.NETWORK.sendToServer(new MessagePriorityUpdate(pos, priority)); + } + + @Override + public int getPriority() { + return priority; + } + + public void setPriority(int priority) { + markDirty(); + + this.priority = priority; + } + + @Override + public int getStored() { + int stored = 0; + + for (int i = 0; i < getSizeInventory(); ++i) { + ItemStack stack = getStackInSlot(i); + + if (stack != null) { + stored += NBTStorage.getStored(stack.getTagCompound()); + } + } + + return stored; + } + + @Override + public int getCapacity() { + int capacity = 0; + + for (int i = 0; i < getSizeInventory(); ++i) { + ItemStack stack = getStackInSlot(i); + + if (stack != null) { + int diskCapacity = DiskStorage.getCapacity(stack); + + if (diskCapacity == -1) { + return -1; + } + + capacity += diskCapacity; + } + } + + return capacity; + } + + @Override + public int getSizeInventory() { + return inventory.getSizeInventory(); + } + + @Override + public ItemStack getStackInSlot(int slot) { + return inventory.getStackInSlot(slot); + } + + @Override + public ItemStack decrStackSize(int slot, int count) { + return inventory.decrStackSize(slot, count); + } + + @Override + public ItemStack removeStackFromSlot(int slot) { + return inventory.removeStackFromSlot(slot); + } + + @Override + public void setInventorySlotContents(int slot, ItemStack stack) { + inventory.setInventorySlotContents(slot, stack); + } + + @Override + public int getInventoryStackLimit() { + return inventory.getInventoryStackLimit(); + } + + @Override + public boolean isUseableByPlayer(EntityPlayer player) { + return inventory.isUseableByPlayer(player); + } + + @Override + public void openInventory(EntityPlayer player) { + inventory.openInventory(player); + } + + @Override + public void closeInventory(EntityPlayer player) { + inventory.closeInventory(player); + } + + @Override + public boolean isItemValidForSlot(int slot, ItemStack stack) { + return inventory.isItemValidForSlot(slot, stack); + } + + @Override + public int getField(int id) { + return inventory.getField(id); + } + + @Override + public void setField(int id, int value) { + inventory.setField(id, value); + } + + @Override + public int getFieldCount() { + return inventory.getFieldCount(); + } + + @Override + public void clear() { + inventory.clear(); + } + + @Override + public boolean hasCustomName() { + return inventory.hasCustomName(); + } + + @Override + public ITextComponent getDisplayName() { + return inventory.getDisplayName(); + } + + @Override + public IInventory getDroppedInventory() { + return inventory; + } +} diff --git a/src/main/java/refinedstorage/tile/TileDrive.java b/src/main/java/refinedstorage/tile/TileDrive.java deleted file mode 100644 index 61d8921b8..000000000 --- a/src/main/java/refinedstorage/tile/TileDrive.java +++ /dev/null @@ -1,361 +0,0 @@ -package refinedstorage.tile; - -import io.netty.buffer.ByteBuf; -import java.util.List; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.text.ITextComponent; -import refinedstorage.RefinedStorage; -import refinedstorage.inventory.InventorySimple; -import refinedstorage.network.MessagePriorityUpdate; -import refinedstorage.storage.CellStorage; -import refinedstorage.storage.IStorage; -import refinedstorage.storage.IStorageGui; -import refinedstorage.storage.IStorageProvider; -import refinedstorage.storage.NBTStorage; -import refinedstorage.tile.settings.ICompareSetting; -import refinedstorage.tile.settings.IModeSetting; -import refinedstorage.tile.settings.IRedstoneModeSetting; -import refinedstorage.util.InventoryUtils; - -public class TileDrive extends TileMachine implements IStorageProvider, IStorageGui, ICompareSetting, IModeSetting, IInventory -{ - public static final String NBT_PRIORITY = "Priority"; - public static final String NBT_COMPARE = "Compare"; - public static final String NBT_MODE = "Mode"; - - private InventorySimple filterInventory = new InventorySimple("filters", 9, this); - private InventorySimple inventory = new InventorySimple("drive", 8, this); - - private int priority = 0; - private int compare = 0; - private int mode = 0; - - @Override - public int getEnergyUsage() - { - int base = 5; - - for (int i = 0; i < getSizeInventory(); ++i) - { - if (getStackInSlot(i) != null) - { - base += 2; - } - } - - return base; - } - - @Override - public void updateMachine() - { - } - - @Override - public void addStorages(List storages) - { - for (int i = 0; i < getSizeInventory(); ++i) - { - if (getStackInSlot(i) != null) - { - storages.add(new CellStorage(getStackInSlot(i), this)); - } - } - } - - @Override - public void readFromNBT(NBTTagCompound nbt) - { - super.readFromNBT(nbt); - - InventoryUtils.restoreInventory(filterInventory, 0, nbt); - InventoryUtils.restoreInventory(inventory, 1, nbt); - - if (nbt.hasKey(NBT_PRIORITY)) - { - priority = nbt.getInteger(NBT_PRIORITY); - } - - if (nbt.hasKey(NBT_COMPARE)) - { - compare = nbt.getInteger(NBT_COMPARE); - } - - if (nbt.hasKey(NBT_MODE)) - { - mode = nbt.getInteger(NBT_MODE); - } - } - - @Override - public void writeToNBT(NBTTagCompound nbt) - { - super.writeToNBT(nbt); - - InventoryUtils.saveInventory(filterInventory, 0, nbt); - InventoryUtils.saveInventory(inventory, 1, nbt); - - nbt.setInteger(NBT_PRIORITY, priority); - nbt.setInteger(NBT_COMPARE, compare); - nbt.setInteger(NBT_MODE, mode); - } - - @Override - public void toBytes(ByteBuf buf) - { - super.toBytes(buf); - - buf.writeInt(priority); - buf.writeInt(compare); - buf.writeInt(mode); - } - - @Override - public void fromBytes(ByteBuf buf) - { - super.fromBytes(buf); - - priority = buf.readInt(); - compare = buf.readInt(); - mode = buf.readInt(); - } - - @Override - public int getCompare() - { - return compare; - } - - @Override - public void setCompare(int compare) - { - markDirty(); - - this.compare = compare; - } - - @Override - public boolean isWhitelist() - { - return mode == 0; - } - - @Override - public boolean isBlacklist() - { - return mode == 1; - } - - @Override - public void setToWhitelist() - { - markDirty(); - - this.mode = 0; - } - - @Override - public void setToBlacklist() - { - markDirty(); - - this.mode = 1; - } - - @Override - public String getName() - { - return "block.refinedstorage:drive.name"; - } - - @Override - public IInventory getInventory() - { - return filterInventory; - } - - @Override - public IRedstoneModeSetting getRedstoneModeSetting() - { - return this; - } - - @Override - public ICompareSetting getCompareSetting() - { - return this; - } - - @Override - public IModeSetting getModeSetting() - { - return this; - } - - @Override - public void onPriorityChanged(int priority) - { - RefinedStorage.NETWORK.sendToServer(new MessagePriorityUpdate(pos, priority)); - } - - @Override - public int getPriority() - { - return priority; - } - - public void setPriority(int priority) - { - markDirty(); - - this.priority = priority; - } - - @Override - public int getStored() - { - int stored = 0; - - for (int i = 0; i < getSizeInventory(); ++i) - { - ItemStack stack = getStackInSlot(i); - - if (stack != null) - { - stored += NBTStorage.getStored(stack.getTagCompound()); - } - } - - return stored; - } - - @Override - public int getCapacity() - { - int capacity = 0; - - for (int i = 0; i < getSizeInventory(); ++i) - { - ItemStack stack = getStackInSlot(i); - - if (stack != null) - { - int cellCapacity = CellStorage.getCapacity(stack); - - if (cellCapacity == -1) - { - return -1; - } - - capacity += cellCapacity; - } - } - - return capacity; - } - - @Override - public int getSizeInventory() - { - return inventory.getSizeInventory(); - } - - @Override - public ItemStack getStackInSlot(int slot) - { - return inventory.getStackInSlot(slot); - } - - @Override - public ItemStack decrStackSize(int slot, int count) - { - return inventory.decrStackSize(slot, count); - } - - @Override - public ItemStack removeStackFromSlot(int slot) - { - return inventory.removeStackFromSlot(slot); - } - - @Override - public void setInventorySlotContents(int slot, ItemStack stack) - { - inventory.setInventorySlotContents(slot, stack); - } - - @Override - public int getInventoryStackLimit() - { - return inventory.getInventoryStackLimit(); - } - - @Override - public boolean isUseableByPlayer(EntityPlayer player) - { - return inventory.isUseableByPlayer(player); - } - - @Override - public void openInventory(EntityPlayer player) - { - inventory.openInventory(player); - } - - @Override - public void closeInventory(EntityPlayer player) - { - inventory.closeInventory(player); - } - - @Override - public boolean isItemValidForSlot(int slot, ItemStack stack) - { - return inventory.isItemValidForSlot(slot, stack); - } - - @Override - public int getField(int id) - { - return inventory.getField(id); - } - - @Override - public void setField(int id, int value) - { - inventory.setField(id, value); - } - - @Override - public int getFieldCount() - { - return inventory.getFieldCount(); - } - - @Override - public void clear() - { - inventory.clear(); - } - - @Override - public boolean hasCustomName() - { - return inventory.hasCustomName(); - } - - @Override - public ITextComponent getDisplayName() - { - return inventory.getDisplayName(); - } - - @Override - public IInventory getDroppedInventory() - { - return inventory; - } -} diff --git a/src/main/java/refinedstorage/tile/TileExporter.java b/src/main/java/refinedstorage/tile/TileExporter.java old mode 100644 new mode 100755 index 11282380a..0d8026fec --- a/src/main/java/refinedstorage/tile/TileExporter.java +++ b/src/main/java/refinedstorage/tile/TileExporter.java @@ -2,146 +2,105 @@ package refinedstorage.tile; import io.netty.buffer.ByteBuf; import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; +import net.minecraft.tileentity.TileEntityHopper; import refinedstorage.inventory.InventorySimple; import refinedstorage.tile.settings.ICompareSetting; import refinedstorage.util.InventoryUtils; -public class TileExporter extends TileMachine implements ICompareSetting -{ - public static final String NBT_COMPARE = "Compare"; +public class TileExporter extends TileMachine implements ICompareSetting { + public static final String NBT_COMPARE = "Compare"; - private InventorySimple inventory = new InventorySimple("exporter", 9, this); + public static final int SPEED = 3; - private int compare = 0; + private InventorySimple inventory = new InventorySimple("exporter", 9, this); - @Override - public int getEnergyUsage() - { - return 2; - } + private int compare = 0; - @Override - public void updateMachine() - { - TileEntity tile = worldObj.getTileEntity(pos.offset(getDirection())); + @Override + public int getEnergyUsage() { + return 2; + } - if (tile instanceof IInventory) - { - IInventory connectedInventory = (IInventory) tile; + @Override + public void updateMachine() { + TileEntity connectedTile = worldObj.getTileEntity(pos.offset(getDirection())); - if (ticks % 5 == 0) - { - for (int i = 0; i < inventory.getSizeInventory(); ++i) - { - ItemStack slot = inventory.getStackInSlot(i); + if (connectedTile instanceof IInventory) { + IInventory connectedInventory = (IInventory) connectedTile; - if (slot != null) - { - ItemStack toTake = slot.copy(); + if (ticks % SPEED == 0) { + for (int i = 0; i < inventory.getSizeInventory(); ++i) { + ItemStack slot = inventory.getStackInSlot(i); - toTake.stackSize = 64; + if (slot != null) { + ItemStack toTake = slot.copy(); + toTake.stackSize = 1; - ItemStack took = getController().take(toTake, compare); + ItemStack took = getController().take(toTake, compare); - if (took != null) - { - if (connectedInventory instanceof ISidedInventory) - { - ISidedInventory sided = (ISidedInventory) connectedInventory; + if (took != null) { + ItemStack remaining = TileEntityHopper.putStackInInventoryAllSlots(connectedInventory, took, getDirection().getOpposite()); - boolean pushedAny = false; + if (remaining != null) { + getController().push(remaining); + } + } + } + } + } + } + } - for (int sidedSlot = 0; sidedSlot < connectedInventory.getSizeInventory(); ++sidedSlot) - { - if (sided.canInsertItem(sidedSlot, took, getDirection().getOpposite()) && InventoryUtils.canPushToInventorySlot(connectedInventory, sidedSlot, took)) - { - InventoryUtils.pushToInventorySlot(connectedInventory, sidedSlot, took); + @Override + public int getCompare() { + return compare; + } - pushedAny = true; + @Override + public void setCompare(int compare) { + markDirty(); - break; - } - } + this.compare = compare; + } - if (!pushedAny) - { - getController().push(took); - } - } - else if (InventoryUtils.canPushToInventory(connectedInventory, took)) - { - InventoryUtils.pushToInventory(connectedInventory, took); - } - else - { - getController().push(took); - } - } - } - } - } - } - } + @Override + public void readFromNBT(NBTTagCompound nbt) { + super.readFromNBT(nbt); - @Override - public int getCompare() - { - return compare; - } + if (nbt.hasKey(NBT_COMPARE)) { + compare = nbt.getInteger(NBT_COMPARE); + } - @Override - public void setCompare(int compare) - { - markDirty(); + InventoryUtils.restoreInventory(inventory, 0, nbt); + } - this.compare = compare; - } + @Override + public void writeToNBT(NBTTagCompound nbt) { + super.writeToNBT(nbt); - @Override - public void readFromNBT(NBTTagCompound nbt) - { - super.readFromNBT(nbt); + nbt.setInteger(NBT_COMPARE, compare); - if (nbt.hasKey(NBT_COMPARE)) - { - compare = nbt.getInteger(NBT_COMPARE); - } + InventoryUtils.saveInventory(inventory, 0, nbt); + } - InventoryUtils.restoreInventory(inventory, 0, nbt); - } + @Override + public void fromBytes(ByteBuf buf) { + super.fromBytes(buf); - @Override - public void writeToNBT(NBTTagCompound nbt) - { - super.writeToNBT(nbt); + compare = buf.readInt(); + } - nbt.setInteger(NBT_COMPARE, compare); + @Override + public void toBytes(ByteBuf buf) { + super.toBytes(buf); - InventoryUtils.saveInventory(inventory, 0, nbt); - } + buf.writeInt(compare); + } - @Override - public void fromBytes(ByteBuf buf) - { - super.fromBytes(buf); - - compare = buf.readInt(); - } - - @Override - public void toBytes(ByteBuf buf) - { - super.toBytes(buf); - - buf.writeInt(compare); - } - - public IInventory getInventory() - { - return inventory; - } + public IInventory getInventory() { + return inventory; + } } diff --git a/src/main/java/refinedstorage/tile/TileExternalStorage.java b/src/main/java/refinedstorage/tile/TileExternalStorage.java old mode 100644 new mode 100755 index 6f3e703bc..5f679363f --- a/src/main/java/refinedstorage/tile/TileExternalStorage.java +++ b/src/main/java/refinedstorage/tile/TileExternalStorage.java @@ -1,13 +1,11 @@ package refinedstorage.tile; import io.netty.buffer.ByteBuf; -import java.util.List; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import powercrystals.minefactoryreloaded.api.IDeepStorageUnit; import refinedstorage.RefinedStorage; import refinedstorage.inventory.InventorySimple; import refinedstorage.network.MessagePriorityUpdate; @@ -21,296 +19,324 @@ import refinedstorage.tile.settings.IRedstoneModeSetting; import refinedstorage.tile.settings.ModeSettingUtils; import refinedstorage.util.InventoryUtils; -public class TileExternalStorage extends TileMachine implements IStorageProvider, IStorage, IStorageGui, ICompareSetting, IModeSetting -{ - public static final String NBT_PRIORITY = "Priority"; - public static final String NBT_COMPARE = "Compare"; - public static final String NBT_MODE = "Mode"; +import java.util.List; - private InventorySimple inventory = new InventorySimple("external_storage", 9, this); +public class TileExternalStorage extends TileMachine implements IStorageProvider, IStorage, IStorageGui, ICompareSetting, IModeSetting { + public static final String NBT_PRIORITY = "Priority"; + public static final String NBT_COMPARE = "Compare"; + public static final String NBT_MODE = "Mode"; - private int priority = 0; - private int compare = 0; - private int mode = 0; + private InventorySimple inventory = new InventorySimple("external_storage", 9, this); - @SideOnly(Side.CLIENT) - private int stored = 0; + private int priority = 0; + private int compare = 0; + private int mode = 0; - @Override - public int getEnergyUsage() - { - return 2; - } + private int stored = 0; - @Override - public void updateMachine() - { - } + @Override + public int getEnergyUsage() { + return 2; + } - @Override - public void addItems(List items) - { - IInventory connectedInventory = getConnectedInventory(); + @Override + public void updateMachine() { + } - if (connectedInventory != null) - { - for (int i = 0; i < connectedInventory.getSizeInventory(); ++i) - { - if (connectedInventory.getStackInSlot(i) != null) - { - items.add(new StorageItem(connectedInventory.getStackInSlot(i))); - } - } - } - } + @Override + public void addItems(List items) { + TileEntity connectedTile = getConnectedTile(); - @Override - public void push(ItemStack stack) - { - IInventory connectedInventory = getConnectedInventory(); + if (connectedTile instanceof IDeepStorageUnit) { + IDeepStorageUnit deep = (IDeepStorageUnit) connectedTile; - if (connectedInventory == null) - { - return; - } + if (deep.getStoredItemType() != null) { + ItemStack stack = deep.getStoredItemType().copy(); - InventoryUtils.pushToInventory(connectedInventory, stack); - } + while (stack.stackSize > 0) { + items.add(new StorageItem(stack.splitStack(Math.min(stack.getMaxStackSize(), stack.stackSize)))); + } + } + } else if (connectedTile instanceof IInventory) { + IInventory inventory = (IInventory) connectedTile; - @Override - public ItemStack take(ItemStack stack, int flags) - { - IInventory connectedInventory = getConnectedInventory(); + for (int i = 0; i < inventory.getSizeInventory(); ++i) { + if (inventory.getStackInSlot(i) != null) { + items.add(new StorageItem(inventory.getStackInSlot(i))); + } + } + } + } - if (connectedInventory == null) - { - return null; - } + @Override + public void push(ItemStack stack) { + TileEntity connectedTile = getConnectedTile(); - int quantity = stack.stackSize; + if (connectedTile instanceof IDeepStorageUnit) { + IDeepStorageUnit deep = (IDeepStorageUnit) connectedTile; - for (int i = 0; i < connectedInventory.getSizeInventory(); ++i) - { - ItemStack slot = connectedInventory.getStackInSlot(i); + if (deep.getStoredItemType() == null) { + deep.setStoredItemType(stack, stack.stackSize); + } else { + deep.setStoredItemCount(deep.getStoredItemType().stackSize + stack.stackSize); + } + } else if (connectedTile instanceof IInventory) { + InventoryUtils.pushToInventory((IInventory) connectedTile, stack); + } + } - if (slot != null && InventoryUtils.compareStack(slot, stack, flags)) - { - if (quantity > slot.stackSize) - { - quantity = slot.stackSize; - } + @Override + public ItemStack take(ItemStack stack, int flags) { + TileEntity connectedTile = getConnectedTile(); - slot.stackSize -= quantity; + int quantity = stack.stackSize; - if (slot.stackSize == 0) - { - connectedInventory.setInventorySlotContents(i, null); - } + if (connectedTile instanceof IDeepStorageUnit) { + IDeepStorageUnit deep = (IDeepStorageUnit) connectedTile; - ItemStack newItem = slot.copy(); + if (deep.getStoredItemType() != null && InventoryUtils.compareStackNoQuantity(deep.getStoredItemType(), stack)) { + if (deep.getStoredItemType().stackSize < quantity) { + quantity = deep.getStoredItemType().stackSize; + } - newItem.stackSize = quantity; + ItemStack took = deep.getStoredItemType().copy(); + took.stackSize = quantity; - return newItem; - } - } + deep.setStoredItemCount(deep.getStoredItemType().stackSize - quantity); - return null; - } + return took; + } + } else if (connectedTile instanceof IInventory) { + IInventory inventory = (IInventory) connectedTile; - @Override - public boolean canPush(ItemStack stack) - { - IInventory connectedInventory = getConnectedInventory(); + for (int i = 0; i < inventory.getSizeInventory(); ++i) { + ItemStack slot = inventory.getStackInSlot(i); - if (connectedInventory == null) - { - return false; - } + if (slot != null && InventoryUtils.compareStack(slot, stack, flags)) { + if (quantity > slot.stackSize) { + quantity = slot.stackSize; + } - return ModeSettingUtils.doesNotViolateMode(inventory, this, compare, stack) && InventoryUtils.canPushToInventory(connectedInventory, stack); - } + slot.stackSize -= quantity; - public IInventory getConnectedInventory() - { - TileEntity tile = worldObj.getTileEntity(pos.offset(getDirection())); + if (slot.stackSize == 0) { + inventory.setInventorySlotContents(i, null); + } - if (tile instanceof IInventory) - { - return (IInventory) tile; - } + ItemStack newItem = slot.copy(); - return null; - } + newItem.stackSize = quantity; - @Override - public void toBytes(ByteBuf buf) - { - super.toBytes(buf); + return newItem; + } + } + } - buf.writeInt(priority); - buf.writeInt(getConnectedInventory() == null ? 0 : InventoryUtils.getInventoryItems(getConnectedInventory())); - buf.writeInt(compare); - buf.writeInt(mode); - } + return null; + } - @Override - public void fromBytes(ByteBuf buf) - { - super.fromBytes(buf); + @Override + public boolean canPush(ItemStack stack) { + if (ModeSettingUtils.doesNotViolateMode(inventory, this, compare, stack)) { + TileEntity connectedTile = getConnectedTile(); - priority = buf.readInt(); - stored = buf.readInt(); - compare = buf.readInt(); - mode = buf.readInt(); - } + if (connectedTile instanceof IDeepStorageUnit) { + IDeepStorageUnit deep = (IDeepStorageUnit) connectedTile; - @Override - public void readFromNBT(NBTTagCompound nbt) - { - super.readFromNBT(nbt); + if (deep.getStoredItemType() != null) { + if (InventoryUtils.compareStackNoQuantity(deep.getStoredItemType(), stack)) { + return (deep.getStoredItemType().stackSize + stack.stackSize) < deep.getMaxStoredCount(); + } - InventoryUtils.restoreInventory(inventory, 0, nbt); + return false; + } else { + return stack.stackSize < deep.getMaxStoredCount(); + } + } else if (connectedTile instanceof IInventory) { + return InventoryUtils.canPushToInventory((IInventory) connectedTile, stack); + } + } - if (nbt.hasKey(NBT_PRIORITY)) - { - priority = nbt.getInteger(NBT_PRIORITY); - } + return false; + } - if (nbt.hasKey(NBT_COMPARE)) - { - compare = nbt.getInteger(NBT_COMPARE); - } + public TileEntity getConnectedTile() { + if (worldObj == null) { + return null; + } - if (nbt.hasKey(NBT_MODE)) - { - mode = nbt.getInteger(NBT_MODE); - } - } + TileEntity tile = worldObj.getTileEntity(pos.offset(getDirection())); - @Override - public void writeToNBT(NBTTagCompound nbt) - { - super.writeToNBT(nbt); + if (tile instanceof IInventory || tile instanceof IDeepStorageUnit) { + return tile; + } - InventoryUtils.saveInventory(inventory, 0, nbt); + return null; + } - nbt.setInteger(NBT_PRIORITY, priority); - nbt.setInteger(NBT_COMPARE, compare); - nbt.setInteger(NBT_MODE, mode); - } + @Override + public void toBytes(ByteBuf buf) { + super.toBytes(buf); - @Override - public int getCompare() - { - return compare; - } + buf.writeInt(priority); - @Override - public void setCompare(int compare) - { - markDirty(); + TileEntity connectedTile = getConnectedTile(); - this.compare = compare; - } + if (connectedTile instanceof IDeepStorageUnit) { + IDeepStorageUnit deep = (IDeepStorageUnit) connectedTile; - @Override - public boolean isWhitelist() - { - return mode == 0; - } + buf.writeInt(deep.getStoredItemType() == null ? 0 : deep.getStoredItemType().stackSize); + } else if (connectedTile instanceof IInventory) { + buf.writeInt(InventoryUtils.getInventoryItems((IInventory) connectedTile)); + } else { + buf.writeInt(0); + } - @Override - public boolean isBlacklist() - { - return mode == 1; - } + buf.writeInt(compare); + buf.writeInt(mode); + } - @Override - public void setToWhitelist() - { - markDirty(); + @Override + public void fromBytes(ByteBuf buf) { + super.fromBytes(buf); - this.mode = 0; - } + priority = buf.readInt(); + stored = buf.readInt(); + compare = buf.readInt(); + mode = buf.readInt(); + } - @Override - public void setToBlacklist() - { - markDirty(); + @Override + public void readFromNBT(NBTTagCompound nbt) { + super.readFromNBT(nbt); - this.mode = 1; - } + InventoryUtils.restoreInventory(inventory, 0, nbt); - @Override - public int getPriority() - { - return priority; - } + if (nbt.hasKey(NBT_PRIORITY)) { + priority = nbt.getInteger(NBT_PRIORITY); + } - public void setPriority(int priority) - { - markDirty(); + if (nbt.hasKey(NBT_COMPARE)) { + compare = nbt.getInteger(NBT_COMPARE); + } - this.priority = priority; - } + if (nbt.hasKey(NBT_MODE)) { + mode = nbt.getInteger(NBT_MODE); + } + } - @Override - public void addStorages(List storages) - { - storages.add(this); - } + @Override + public void writeToNBT(NBTTagCompound nbt) { + super.writeToNBT(nbt); - @Override - public String getName() - { - return "gui.refinedstorage:external_storage"; - } + InventoryUtils.saveInventory(inventory, 0, nbt); - @Override - public IRedstoneModeSetting getRedstoneModeSetting() - { - return this; - } + nbt.setInteger(NBT_PRIORITY, priority); + nbt.setInteger(NBT_COMPARE, compare); + nbt.setInteger(NBT_MODE, mode); + } - @Override - public ICompareSetting getCompareSetting() - { - return this; - } + @Override + public int getCompare() { + return compare; + } - @Override - public IModeSetting getModeSetting() - { - return this; - } + @Override + public void setCompare(int compare) { + markDirty(); - @Override - public int getStored() - { - return stored; - } + this.compare = compare; + } - @Override - public int getCapacity() - { - if (getConnectedInventory() == null) - { - return 0; - } + @Override + public boolean isWhitelist() { + return mode == 0; + } - return getConnectedInventory().getSizeInventory() * 64; - } + @Override + public boolean isBlacklist() { + return mode == 1; + } - @Override - public void onPriorityChanged(int priority) - { - RefinedStorage.NETWORK.sendToServer(new MessagePriorityUpdate(pos, priority)); - } + @Override + public void setToWhitelist() { + markDirty(); - @Override - public IInventory getInventory() - { - return inventory; - } + this.mode = 0; + } + + @Override + public void setToBlacklist() { + markDirty(); + + this.mode = 1; + } + + @Override + public int getPriority() { + return priority; + } + + public void setPriority(int priority) { + markDirty(); + + this.priority = priority; + } + + @Override + public void addStorages(List storages) { + storages.add(this); + } + + @Override + public String getName() { + return "gui.refinedstorage:external_storage"; + } + + @Override + public IRedstoneModeSetting getRedstoneModeSetting() { + return this; + } + + @Override + public ICompareSetting getCompareSetting() { + return this; + } + + @Override + public IModeSetting getModeSetting() { + return this; + } + + @Override + public int getStored() { + return stored; + } + + @Override + public int getCapacity() { + if (getConnectedTile() == null) { + return 0; + } + + TileEntity connectedInventory = getConnectedTile(); + + if (connectedInventory instanceof IDeepStorageUnit) { + return ((IDeepStorageUnit) connectedInventory).getMaxStoredCount(); + } else if (connectedInventory instanceof IInventory) { + return ((IInventory) connectedInventory).getSizeInventory() * 64; + } + + return 0; + } + + @Override + public void onPriorityChanged(int priority) { + RefinedStorage.NETWORK.sendToServer(new MessagePriorityUpdate(pos, priority)); + } + + @Override + public IInventory getInventory() { + return inventory; + } } diff --git a/src/main/java/refinedstorage/tile/TileGrid.java b/src/main/java/refinedstorage/tile/TileGrid.java old mode 100644 new mode 100755 index 7b67098eb..86fc515ef --- a/src/main/java/refinedstorage/tile/TileGrid.java +++ b/src/main/java/refinedstorage/tile/TileGrid.java @@ -8,194 +8,221 @@ import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; import net.minecraft.nbt.NBTTagCompound; -import net.minecraftforge.fml.common.network.NetworkRegistry.TargetPoint; -import refinedstorage.RefinedStorage; import refinedstorage.RefinedStorageBlocks; import refinedstorage.block.BlockGrid; import refinedstorage.block.EnumGridType; +import refinedstorage.container.ContainerGrid; import refinedstorage.inventory.InventorySimple; -import refinedstorage.network.MessageGridCraftingUpdate; -import refinedstorage.storage.StorageItem; import refinedstorage.util.InventoryUtils; -public class TileGrid extends TileMachine -{ - public static final String NBT_SORTING_DIRECTION = "SortingDirection"; - public static final String NBT_SORTING_TYPE = "SortingType"; +import java.util.ArrayList; +import java.util.List; - public static final int SORTING_DIRECTION_ASCENDING = 0; - public static final int SORTING_DIRECTION_DESCENDING = 1; +public class TileGrid extends TileMachine { + public static final String NBT_SORTING_DIRECTION = "SortingDirection"; + public static final String NBT_SORTING_TYPE = "SortingType"; - public static final int SORTING_TYPE_QUANTITY = 0; - public static final int SORTING_TYPE_NAME = 1; + public static final int SORTING_DIRECTION_ASCENDING = 0; + public static final int SORTING_DIRECTION_DESCENDING = 1; - private Container craftingContainer = new Container() - { - @Override - public boolean canInteractWith(EntityPlayer player) - { - return false; - } + public static final int SORTING_TYPE_QUANTITY = 0; + public static final int SORTING_TYPE_NAME = 1; - @Override - public void onCraftMatrixChanged(IInventory inventory) - { - onCraftingMatrixChanged(); - } - }; - private InventoryCrafting craftingInventory = new InventoryCrafting(craftingContainer, 3, 3); - private InventorySimple craftingResultInventory = new InventorySimple("crafting_result", 1); + private Container craftingContainer = new Container() { + @Override + public boolean canInteractWith(EntityPlayer player) { + return false; + } - private int sortingDirection = 0; - private int sortingType = 0; + @Override + public void onCraftMatrixChanged(IInventory inventory) { + onCraftingMatrixChanged(); + } + }; + private InventoryCrafting craftingInventory = new InventoryCrafting(craftingContainer, 3, 3); + private InventorySimple craftingResultInventory = new InventorySimple("crafting_result", 1); - @Override - public int getEnergyUsage() - { - return 4; - } + private int sortingDirection = SORTING_DIRECTION_DESCENDING; + private int sortingType = SORTING_TYPE_NAME; - @Override - public void updateMachine() - { - } + @Override + public int getEnergyUsage() { + return 4; + } - public EnumGridType getType() - { - if (worldObj.getBlockState(pos).getBlock() == RefinedStorageBlocks.GRID) - { - return (EnumGridType) worldObj.getBlockState(pos).getValue(BlockGrid.TYPE); - } + @Override + public void updateMachine() { + } - return EnumGridType.NORMAL; - } + public EnumGridType getType() { + if (worldObj.getBlockState(pos).getBlock() == RefinedStorageBlocks.GRID) { + return (EnumGridType) worldObj.getBlockState(pos).getValue(BlockGrid.TYPE); + } - public InventoryCrafting getCraftingInventory() - { - return craftingInventory; - } + return EnumGridType.NORMAL; + } - public InventorySimple getCraftingResultInventory() - { - return craftingResultInventory; - } + public InventoryCrafting getCraftingInventory() { + return craftingInventory; + } - public void onCraftingMatrixChanged() - { - markDirty(); + public InventorySimple getCraftingResultInventory() { + return craftingResultInventory; + } - craftingResultInventory.setInventorySlotContents(0, CraftingManager.getInstance().findMatchingRecipe(craftingInventory, worldObj)); - } + public void onCraftingMatrixChanged() { + markDirty(); - public void onCrafted(ItemStack[] matrixSlots) - { - if (isConnected() && !worldObj.isRemote) - { - for (int i = 0; i < craftingInventory.getSizeInventory(); ++i) - { - ItemStack slot = craftingInventory.getStackInSlot(i); + craftingResultInventory.setInventorySlotContents(0, CraftingManager.getInstance().findMatchingRecipe(craftingInventory, worldObj)); + } - if (slot == null && matrixSlots[i] != null) - { - for (StorageItem item : getController().getItems()) - { - if (item.compareNoQuantity(matrixSlots[i].copy())) - { - craftingInventory.setInventorySlotContents(i, getController().take(matrixSlots[i].copy())); + public void onCrafted(ContainerGrid container) { + if (!worldObj.isRemote) { + for (int i = 0; i < craftingInventory.getSizeInventory(); ++i) { + ItemStack slot = craftingInventory.getStackInSlot(i); - break; - } - } - } - } + if (slot != null) { + if (slot.stackSize == 1 && isConnected()) { + craftingInventory.setInventorySlotContents(i, getController().take(slot.copy())); + } else { + craftingInventory.decrStackSize(i, 1); + } + } + } - onCraftingMatrixChanged(); + onCraftingMatrixChanged(); - TargetPoint target = new TargetPoint(worldObj.provider.getDimensionType().getId(), pos.getX(), pos.getY(), pos.getZ(), UPDATE_RANGE); + container.detectAndSendChanges(); + } + } - RefinedStorage.NETWORK.sendToAllAround(new MessageGridCraftingUpdate(this), target); - } - } + public void onCraftedShift(ContainerGrid container, EntityPlayer player) { + List craftedItemsList = new ArrayList(); + int craftedItems = 0; + ItemStack crafted = craftingResultInventory.getStackInSlot(0); - public int getSortingDirection() - { - return sortingDirection; - } + while (true) { + onCrafted(container); - public void setSortingDirection(int sortingDirection) - { - markDirty(); + craftedItemsList.add(crafted.copy()); - this.sortingDirection = sortingDirection; - } + craftedItems += crafted.stackSize; - public int getSortingType() - { - return sortingType; - } + if (!InventoryUtils.compareStack(crafted, craftingResultInventory.getStackInSlot(0)) || craftedItems + crafted.stackSize > 64) { + break; + } + } - public void setSortingType(int sortingType) - { - markDirty(); + for (ItemStack craftedItem : craftedItemsList) { + if (!player.inventory.addItemStackToInventory(craftedItem.copy())) { + if (isConnected() && getController().push(craftedItem.copy())) { + // NO OP + } else { + InventoryUtils.dropStack(player.worldObj, craftedItem, player.getPosition().getX(), player.getPosition().getY(), player.getPosition().getZ()); + } + } + } + } - this.sortingType = sortingType; - } + public void onRecipeTransfer(ItemStack[][] recipe) { + if (isConnected()) { + for (int i = 0; i < craftingInventory.getSizeInventory(); ++i) { + ItemStack slot = craftingInventory.getStackInSlot(i); - @Override - public void readFromNBT(NBTTagCompound nbt) - { - super.readFromNBT(nbt); + if (slot != null) { + if (!getController().push(slot)) { + return; + } - InventoryUtils.restoreInventory(craftingInventory, 0, nbt); + craftingInventory.setInventorySlotContents(i, null); + } + } - if (nbt.hasKey(NBT_SORTING_DIRECTION)) - { - sortingDirection = nbt.getInteger(NBT_SORTING_DIRECTION); - } + for (int i = 0; i < craftingInventory.getSizeInventory(); ++i) { + if (recipe[i] != null) { + ItemStack[] possibilities = recipe[i]; - if (nbt.hasKey(NBT_SORTING_TYPE)) - { - sortingType = nbt.getInteger(NBT_SORTING_TYPE); - } - } + for (ItemStack possibility : possibilities) { + ItemStack took = getController().take(possibility); - @Override - public void writeToNBT(NBTTagCompound nbt) - { - super.writeToNBT(nbt); + if (took != null) { + craftingInventory.setInventorySlotContents(i, possibility); - InventoryUtils.saveInventory(craftingInventory, 0, nbt); + break; + } + } + } + } + } + } - nbt.setInteger(NBT_SORTING_DIRECTION, sortingDirection); - nbt.setInteger(NBT_SORTING_TYPE, sortingType); - } + public int getSortingDirection() { + return sortingDirection; + } - @Override - public void toBytes(ByteBuf buf) - { - super.toBytes(buf); + public void setSortingDirection(int sortingDirection) { + markDirty(); - buf.writeInt(sortingDirection); - buf.writeInt(sortingType); - } + this.sortingDirection = sortingDirection; + } - @Override - public void fromBytes(ByteBuf buf) - { - super.fromBytes(buf); + public int getSortingType() { + return sortingType; + } - sortingDirection = buf.readInt(); - sortingType = buf.readInt(); - } + public void setSortingType(int sortingType) { + markDirty(); - @Override - public IInventory getDroppedInventory() - { - if (getType() == EnumGridType.CRAFTING) - { - return craftingInventory; - } + this.sortingType = sortingType; + } - return null; - } + @Override + public void readFromNBT(NBTTagCompound nbt) { + super.readFromNBT(nbt); + + InventoryUtils.restoreInventory(craftingInventory, 0, nbt); + + if (nbt.hasKey(NBT_SORTING_DIRECTION)) { + sortingDirection = nbt.getInteger(NBT_SORTING_DIRECTION); + } + + if (nbt.hasKey(NBT_SORTING_TYPE)) { + sortingType = nbt.getInteger(NBT_SORTING_TYPE); + } + } + + @Override + public void writeToNBT(NBTTagCompound nbt) { + super.writeToNBT(nbt); + + InventoryUtils.saveInventory(craftingInventory, 0, nbt); + + nbt.setInteger(NBT_SORTING_DIRECTION, sortingDirection); + nbt.setInteger(NBT_SORTING_TYPE, sortingType); + } + + @Override + public void toBytes(ByteBuf buf) { + super.toBytes(buf); + + buf.writeInt(sortingDirection); + buf.writeInt(sortingType); + } + + @Override + public void fromBytes(ByteBuf buf) { + super.fromBytes(buf); + + sortingDirection = buf.readInt(); + sortingType = buf.readInt(); + } + + @Override + public IInventory getDroppedInventory() { + if (getType() == EnumGridType.CRAFTING) { + return craftingInventory; + } + + return null; + } } diff --git a/src/main/java/refinedstorage/tile/TileImporter.java b/src/main/java/refinedstorage/tile/TileImporter.java old mode 100644 new mode 100755 index 4f42538b4..e36febd68 --- a/src/main/java/refinedstorage/tile/TileImporter.java +++ b/src/main/java/refinedstorage/tile/TileImporter.java @@ -11,204 +11,194 @@ import refinedstorage.tile.settings.ICompareSetting; import refinedstorage.tile.settings.IModeSetting; import refinedstorage.util.InventoryUtils; -public class TileImporter extends TileMachine implements ICompareSetting, IModeSetting -{ - public static final String NBT_COMPARE = "Compare"; - public static final String NBT_MODE = "Mode"; +public class TileImporter extends TileMachine implements ICompareSetting, IModeSetting { + public static final String NBT_COMPARE = "Compare"; + public static final String NBT_MODE = "Mode"; - private InventorySimple inventory = new InventorySimple("importer", 9, this); + public static final int SPEED = 3; - private int compare = 0; - private int mode = 0; + private InventorySimple inventory = new InventorySimple("importer", 9, this); - private int currentSlot = 0; + private int compare = 0; + private int mode = 0; - @Override - public int getEnergyUsage() - { - return 2; - } + private int currentSlot; - @Override - public void updateMachine() - { - TileEntity tile = worldObj.getTileEntity(pos.offset(getDirection())); + @Override + public int getEnergyUsage() { + return 2; + } - if (tile instanceof IInventory) - { - IInventory connectedInventory = (IInventory) tile; + @Override + public void updateMachine() { + TileEntity connectedTile = worldObj.getTileEntity(pos.offset(getDirection())); - if (ticks % 5 == 0) - { - ItemStack slot = connectedInventory.getStackInSlot(currentSlot); + if (connectedTile instanceof ISidedInventory) { + ISidedInventory sided = (ISidedInventory) connectedTile; - while ((slot = connectedInventory.getStackInSlot(currentSlot)) == null) - { - currentSlot++; + int[] availableSlots = sided.getSlotsForFace(getDirection().getOpposite()); - if (currentSlot > connectedInventory.getSizeInventory() - 1) - { - break; - } - } + if (currentSlot >= availableSlots.length) { + currentSlot = 0; + } - if (slot != null && canImport(slot)) - { - if (connectedInventory instanceof ISidedInventory) - { - ISidedInventory sided = (ISidedInventory) connectedInventory; + if (availableSlots.length > 0) { + int availableSlot = availableSlots[currentSlot]; - if (sided.canExtractItem(currentSlot, slot.copy(), getDirection().getOpposite())) - { - if (getController().push(slot.copy())) - { - connectedInventory.setInventorySlotContents(currentSlot, null); - } - } - } - else if (getController().push(slot.copy())) - { - connectedInventory.setInventorySlotContents(currentSlot, null); - } + ItemStack stack = sided.getStackInSlot(availableSlot); - connectedInventory.markDirty(); - } + if (stack == null) { + currentSlot++; + } else { + if (ticks % SPEED == 0) { + ItemStack toTake = stack.copy(); + toTake.stackSize = 1; - currentSlot++; + if (canImport(toTake) && sided.canExtractItem(availableSlot, toTake, getDirection().getOpposite())) { + if (getController().push(toTake)) { + sided.decrStackSize(availableSlot, 1); + sided.markDirty(); + } + } else { + // If we can't import and/ or extract, move on (otherwise we stay on the same slot forever) + currentSlot++; + } + } + } + } + } else if (connectedTile instanceof IInventory) { + IInventory inventory = (IInventory) connectedTile; - if (currentSlot > connectedInventory.getSizeInventory() - 1) - { - currentSlot = 0; - } - } - } - } + if (currentSlot >= inventory.getSizeInventory()) { + currentSlot = 0; + } - public boolean canImport(ItemStack stack) - { - int slots = 0; + ItemStack stack = inventory.getStackInSlot(currentSlot); - for (int i = 0; i < inventory.getSizeInventory(); ++i) - { - ItemStack slot = inventory.getStackInSlot(i); + if (stack != null) { + if (ticks % SPEED == 0) { + ItemStack toTake = stack.copy(); + toTake.stackSize = 1; - if (slot != null) - { - slots++; + if (canImport(toTake)) { + if (getController().push(toTake)) { + inventory.decrStackSize(currentSlot, 1); + inventory.markDirty(); + } + } + } + } else { + currentSlot++; + } + } else { + currentSlot = 0; + } + } - if (InventoryUtils.compareStack(stack, slot, compare)) - { - if (isWhitelist()) - { - return true; - } - else if (isBlacklist()) - { - return false; - } - } - } - } + public boolean canImport(ItemStack stack) { + int slots = 0; - if (isWhitelist()) - { - return slots == 0; - } + for (int i = 0; i < inventory.getSizeInventory(); ++i) { + ItemStack slot = inventory.getStackInSlot(i); - return true; - } + if (slot != null) { + slots++; - @Override - public int getCompare() - { - return compare; - } + if (InventoryUtils.compareStack(stack, slot, compare)) { + if (isWhitelist()) { + return true; + } else if (isBlacklist()) { + return false; + } + } + } + } - @Override - public void setCompare(int compare) - { - markDirty(); + if (isWhitelist()) { + return slots == 0; + } - this.compare = compare; - } + return true; + } - @Override - public boolean isWhitelist() - { - return mode == 0; - } + @Override + public int getCompare() { + return compare; + } - @Override - public boolean isBlacklist() - { - return mode == 1; - } + @Override + public void setCompare(int compare) { + markDirty(); - @Override - public void setToWhitelist() - { - markDirty(); + this.compare = compare; + } - this.mode = 0; - } + @Override + public boolean isWhitelist() { + return mode == 0; + } - @Override - public void setToBlacklist() - { - markDirty(); + @Override + public boolean isBlacklist() { + return mode == 1; + } - this.mode = 1; - } + @Override + public void setToWhitelist() { + markDirty(); - @Override - public void readFromNBT(NBTTagCompound nbt) - { - super.readFromNBT(nbt); + this.mode = 0; + } - if (nbt.hasKey(NBT_COMPARE)) - { - compare = nbt.getInteger(NBT_COMPARE); - } + @Override + public void setToBlacklist() { + markDirty(); - if (nbt.hasKey(NBT_MODE)) - { - mode = nbt.getInteger(NBT_MODE); - } + this.mode = 1; + } - InventoryUtils.restoreInventory(inventory, 0, nbt); - } + @Override + public void readFromNBT(NBTTagCompound nbt) { + super.readFromNBT(nbt); - @Override - public void writeToNBT(NBTTagCompound nbt) - { - super.writeToNBT(nbt); + if (nbt.hasKey(NBT_COMPARE)) { + compare = nbt.getInteger(NBT_COMPARE); + } - nbt.setInteger(NBT_COMPARE, compare); - nbt.setInteger(NBT_MODE, mode); + if (nbt.hasKey(NBT_MODE)) { + mode = nbt.getInteger(NBT_MODE); + } - InventoryUtils.saveInventory(inventory, 0, nbt); - } + InventoryUtils.restoreInventory(inventory, 0, nbt); + } - @Override - public void fromBytes(ByteBuf buf) - { - super.fromBytes(buf); + @Override + public void writeToNBT(NBTTagCompound nbt) { + super.writeToNBT(nbt); - compare = buf.readInt(); - mode = buf.readInt(); - } + nbt.setInteger(NBT_COMPARE, compare); + nbt.setInteger(NBT_MODE, mode); - @Override - public void toBytes(ByteBuf buf) - { - super.toBytes(buf); + InventoryUtils.saveInventory(inventory, 0, nbt); + } - buf.writeInt(compare); - buf.writeInt(mode); - } + @Override + public void fromBytes(ByteBuf buf) { + super.fromBytes(buf); - public IInventory getInventory() - { - return inventory; - } + compare = buf.readInt(); + mode = buf.readInt(); + } + + @Override + public void toBytes(ByteBuf buf) { + super.toBytes(buf); + + buf.writeInt(compare); + buf.writeInt(mode); + } + + public IInventory getInventory() { + return inventory; + } } diff --git a/src/main/java/refinedstorage/tile/TileInterface.java b/src/main/java/refinedstorage/tile/TileInterface.java old mode 100644 new mode 100755 index bf0158de2..ae6076258 --- a/src/main/java/refinedstorage/tile/TileInterface.java +++ b/src/main/java/refinedstorage/tile/TileInterface.java @@ -12,311 +12,249 @@ import refinedstorage.inventory.InventorySimple; import refinedstorage.tile.settings.ICompareSetting; import refinedstorage.util.InventoryUtils; -public class TileInterface extends TileMachine implements ICompareSetting, ISidedInventory -{ - public static final String NBT_COMPARE = "Compare"; +public class TileInterface extends TileMachine implements ICompareSetting, ISidedInventory { + public static final String NBT_COMPARE = "Compare"; - private InventorySimple inventory = new InventorySimple("interface", 9 * 3); + public static final int SPEED = 3; - private int compare = 0; + public static final int[] FACES = new int[]{ + 0, 1, 2, 3, 4, 5, 6, 7, 8 + }; + public static final int[] FACES_DOWN = new int[]{ + 18, 19, 20, 21, 22, 23, 24, 25, 26 + }; - private int currentSlot = 0; + private InventorySimple inventory = new InventorySimple("interface", 9 * 3, this); - @Override - public int getEnergyUsage() - { - return 4; - } + private int compare = 0; - @Override - public void updateMachine() - { - if (ticks % 5 == 0) - { - ItemStack slot = inventory.getStackInSlot(currentSlot); + private int currentSlot = 0; - while ((slot = inventory.getStackInSlot(currentSlot)) == null) - { - currentSlot++; + @Override + public int getEnergyUsage() { + return 4; + } - if (currentSlot > 8) - { - break; - } - } + @Override + public void updateMachine() { + if (currentSlot > 8) { + currentSlot = 0; + } - if (inventory.getStackInSlot(currentSlot) != null) - { - if (getController().push(slot)) - { - inventory.setInventorySlotContents(currentSlot, null); - } - } + ItemStack slot = getStackInSlot(currentSlot); - currentSlot++; + if (slot == null) { + currentSlot++; + } else { + if (ticks % SPEED == 0) { + ItemStack toPush = slot.copy(); + toPush.stackSize = 1; - if (currentSlot > 8) - { - currentSlot = 0; - } - } + if (getController().push(toPush)) { + decrStackSize(currentSlot, 1); + } + } + } - for (int i = 9; i < 18; ++i) - { - ItemStack wanted = inventory.getStackInSlot(i); - ItemStack got = inventory.getStackInSlot(i + 9); + for (int i = 9; i < 18; ++i) { + ItemStack wanted = inventory.getStackInSlot(i); + ItemStack got = inventory.getStackInSlot(i + 9); - if (wanted != null) - { - boolean ok = false; + if (wanted != null) { + boolean ok = false; - if (got != null) - { - if (!InventoryUtils.compareStack(wanted, got, compare)) - { - if (getController().push(got)) - { - inventory.setInventorySlotContents(i + 9, null); - } - } - else - { - ok = true; - } - } - else - { - ok = true; - } + if (got != null) { + if (!InventoryUtils.compareStack(wanted, got, compare)) { + if (getController().push(got)) { + inventory.setInventorySlotContents(i + 9, null); + } + } else { + ok = true; + } + } else { + ok = true; + } - if (ok) - { - got = inventory.getStackInSlot(i + 9); + if (ok) { + got = inventory.getStackInSlot(i + 9); - int needed = got == null ? wanted.stackSize : wanted.stackSize - got.stackSize; + int needed = got == null ? wanted.stackSize : wanted.stackSize - got.stackSize; - ItemStack goingToTake = wanted.copy(); - goingToTake.stackSize = needed; + ItemStack goingToTake = wanted.copy(); + goingToTake.stackSize = needed; - ItemStack took = getController().take(goingToTake, compare); + ItemStack took = getController().take(goingToTake, compare); - if (took != null) - { - if (got == null) - { - inventory.setInventorySlotContents(i + 9, took); - } - else - { - got.stackSize += took.stackSize; - } - } - } - } - else if (got != null) - { - if (getController().push(got)) - { - inventory.setInventorySlotContents(i + 9, null); - } - } - } - } + if (took != null) { + if (got == null) { + inventory.setInventorySlotContents(i + 9, took); + } else { + got.stackSize += took.stackSize; + } + } + } + } else if (got != null) { + if (getController().push(got)) { + inventory.setInventorySlotContents(i + 9, null); + } + } + } + } - @Override - public void readFromNBT(NBTTagCompound nbt) - { - super.readFromNBT(nbt); + @Override + public void readFromNBT(NBTTagCompound nbt) { + super.readFromNBT(nbt); - InventoryUtils.restoreInventory(this, 0, nbt); + InventoryUtils.restoreInventory(this, 0, nbt); - if (nbt.hasKey(NBT_COMPARE)) - { - compare = nbt.getInteger(NBT_COMPARE); - } - } + if (nbt.hasKey(NBT_COMPARE)) { + compare = nbt.getInteger(NBT_COMPARE); + } + } - @Override - public void writeToNBT(NBTTagCompound nbt) - { - super.writeToNBT(nbt); + @Override + public void writeToNBT(NBTTagCompound nbt) { + super.writeToNBT(nbt); - InventoryUtils.saveInventory(this, 0, nbt); + InventoryUtils.saveInventory(this, 0, nbt); - nbt.setInteger(NBT_COMPARE, compare); - } + nbt.setInteger(NBT_COMPARE, compare); + } - @Override - public void fromBytes(ByteBuf buf) - { - super.fromBytes(buf); + @Override + public void fromBytes(ByteBuf buf) { + super.fromBytes(buf); - compare = buf.readInt(); - } + compare = buf.readInt(); + } - @Override - public void toBytes(ByteBuf buf) - { - super.toBytes(buf); + @Override + public void toBytes(ByteBuf buf) { + super.toBytes(buf); - buf.writeInt(compare); - } + buf.writeInt(compare); + } - @Override - public int getSizeInventory() - { - return inventory.getSizeInventory(); - } + @Override + public int getSizeInventory() { + return inventory.getSizeInventory(); + } - @Override - public ItemStack getStackInSlot(int slot) - { - return inventory.getStackInSlot(slot); - } + @Override + public ItemStack getStackInSlot(int slot) { + return inventory.getStackInSlot(slot); + } - @Override - public ItemStack decrStackSize(int slot, int count) - { - return inventory.decrStackSize(slot, count); - } + @Override + public ItemStack decrStackSize(int slot, int count) { + return inventory.decrStackSize(slot, count); + } - @Override - public ItemStack removeStackFromSlot(int slot) - { - return inventory.removeStackFromSlot(slot); - } + @Override + public ItemStack removeStackFromSlot(int slot) { + return inventory.removeStackFromSlot(slot); + } - @Override - public void setInventorySlotContents(int slot, ItemStack stack) - { - inventory.setInventorySlotContents(slot, stack); - } + @Override + public void setInventorySlotContents(int slot, ItemStack stack) { + inventory.setInventorySlotContents(slot, stack); + } - @Override - public int getInventoryStackLimit() - { - return inventory.getInventoryStackLimit(); - } + @Override + public int getInventoryStackLimit() { + return inventory.getInventoryStackLimit(); + } - @Override - public boolean isUseableByPlayer(EntityPlayer player) - { - return inventory.isUseableByPlayer(player); - } + @Override + public boolean isUseableByPlayer(EntityPlayer player) { + return inventory.isUseableByPlayer(player); + } - @Override - public void openInventory(EntityPlayer player) - { - inventory.openInventory(player); - } + @Override + public void openInventory(EntityPlayer player) { + inventory.openInventory(player); + } - @Override - public void closeInventory(EntityPlayer player) - { - inventory.closeInventory(player); - } + @Override + public void closeInventory(EntityPlayer player) { + inventory.closeInventory(player); + } - @Override - public boolean isItemValidForSlot(int slot, ItemStack stack) - { - return inventory.isItemValidForSlot(slot, stack); - } + @Override + public boolean isItemValidForSlot(int slot, ItemStack stack) { + return inventory.isItemValidForSlot(slot, stack); + } - @Override - public int getField(int id) - { - return inventory.getField(id); - } + @Override + public int getField(int id) { + return inventory.getField(id); + } - @Override - public void setField(int id, int value) - { - inventory.setField(id, value); - } + @Override + public void setField(int id, int value) { + inventory.setField(id, value); + } - @Override - public int getFieldCount() - { - return inventory.getFieldCount(); - } + @Override + public int getFieldCount() { + return inventory.getFieldCount(); + } - @Override - public void clear() - { - inventory.clear(); - } + @Override + public void clear() { + inventory.clear(); + } - @Override - public String getName() - { - return inventory.getName(); - } + @Override + public String getName() { + return inventory.getName(); + } - @Override - public boolean hasCustomName() - { - return inventory.hasCustomName(); - } + @Override + public boolean hasCustomName() { + return inventory.hasCustomName(); + } - @Override - public ITextComponent getDisplayName() - { - return inventory.getDisplayName(); - } + @Override + public ITextComponent getDisplayName() { + return inventory.getDisplayName(); + } - @Override - public IInventory getDroppedInventory() - { - InventorySimple dummy = new InventorySimple("dummy", 9); + @Override + public IInventory getDroppedInventory() { + InventorySimple dummy = new InventorySimple("dummy", 9); - for (int i = 0; i < 9; ++i) - { - dummy.setInventorySlotContents(i, inventory.getStackInSlot(18 + i)); - } + for (int i = 0; i < 9; ++i) { + dummy.setInventorySlotContents(i, inventory.getStackInSlot(18 + i)); + } - return dummy; - } + return dummy; + } - @Override - public int[] getSlotsForFace(EnumFacing side) - { - if (side == EnumFacing.DOWN) - { - return new int[] - { - 18, 19, 20, 21, 22, 23, 24, 25, 26 - }; - } + @Override + public int[] getSlotsForFace(EnumFacing side) { + return side == EnumFacing.DOWN ? FACES_DOWN : FACES; + } - return new int[] - { - 0, 1, 2, 3, 4, 5, 6, 7, 8 - }; - } + @Override + public boolean canInsertItem(int slot, ItemStack stack, EnumFacing side) { + return slot < 9; + } - @Override - public boolean canInsertItem(int slot, ItemStack stack, EnumFacing side) - { - return slot < 9; - } + @Override + public boolean canExtractItem(int slot, ItemStack stack, EnumFacing side) { + return slot >= 18; + } - @Override - public boolean canExtractItem(int slot, ItemStack stack, EnumFacing side) - { - return slot >= 18; - } + @Override + public int getCompare() { + return compare; + } - @Override - public int getCompare() - { - return compare; - } + @Override + public void setCompare(int compare) { + markDirty(); - @Override - public void setCompare(int compare) - { - markDirty(); - - this.compare = compare; - } + this.compare = compare; + } } diff --git a/src/main/java/refinedstorage/tile/TileMachine.java b/src/main/java/refinedstorage/tile/TileMachine.java old mode 100644 new mode 100755 index 2a802f960..3e774cb91 --- a/src/main/java/refinedstorage/tile/TileMachine.java +++ b/src/main/java/refinedstorage/tile/TileMachine.java @@ -8,153 +8,132 @@ import refinedstorage.block.BlockMachine; import refinedstorage.tile.settings.IRedstoneModeSetting; import refinedstorage.tile.settings.RedstoneMode; -public abstract class TileMachine extends TileBase implements INetworkTile, IRedstoneModeSetting -{ - protected boolean connected = false; - protected boolean redstoneControlled = true; +public abstract class TileMachine extends TileBase implements INetworkTile, IRedstoneModeSetting { + protected boolean connected = false; - protected RedstoneMode redstoneMode = RedstoneMode.IGNORE; + protected RedstoneMode redstoneMode = RedstoneMode.IGNORE; - private BlockPos controllerPosition; + private BlockPos controllerPosition; - private Block originalBlock; + private Block originalBlock; - public void onConnected(TileController controller) - { - if (worldObj.getBlockState(pos).getBlock() == originalBlock) - { - markDirty(); + public void onConnected(TileController controller) { + if (worldObj != null && worldObj.getBlockState(pos).getBlock() == originalBlock) { + markDirty(); - connected = true; + connected = true; - worldObj.setBlockState(pos, worldObj.getBlockState(pos).withProperty(BlockMachine.CONNECTED, true)); + worldObj.setBlockState(pos, worldObj.getBlockState(pos).withProperty(BlockMachine.CONNECTED, true)); - controllerPosition = controller.getPos(); - } - } + controllerPosition = controller.getPos(); + } + } - public void onDisconnected() - { - if (worldObj.getBlockState(pos).getBlock() == originalBlock) - { - markDirty(); + public void onDisconnected() { + if (worldObj != null && worldObj.getBlockState(pos).getBlock() == originalBlock) { + markDirty(); - connected = false; + connected = false; - worldObj.setBlockState(pos, worldObj.getBlockState(pos).withProperty(BlockMachine.CONNECTED, false)); - } - } + worldObj.setBlockState(pos, worldObj.getBlockState(pos).withProperty(BlockMachine.CONNECTED, false)); + } + } - @Override - public void update() - { - if (ticks == 0) - { - originalBlock = worldObj.getBlockState(pos).getBlock(); - } + @Override + public void update() { + if (worldObj == null) { + super.update(); + return; + } - super.update(); + if (ticks == 0) { + originalBlock = worldObj.getBlockState(pos).getBlock(); + } - if (!worldObj.isRemote && isConnected()) - { - updateMachine(); - } - } + super.update(); - public boolean isConnected() - { - return connected; - } + if (!worldObj.isRemote && isConnected()) { + updateMachine(); + } + } - @Override - public RedstoneMode getRedstoneMode() - { - return redstoneMode; - } + public boolean isConnected() { + return connected; + } - @Override - public void setRedstoneMode(RedstoneMode mode) - { - if (redstoneControlled) - { - markDirty(); + @Override + public RedstoneMode getRedstoneMode() { + return redstoneMode; + } - this.redstoneMode = mode; - } - } + @Override + public void setRedstoneMode(RedstoneMode mode) { + markDirty(); - @Override - public BlockPos getMachinePos() - { - return pos; - } + this.redstoneMode = mode; + } - @Override - public BlockPos getTilePos() - { - return pos; - } + @Override + public BlockPos getMachinePos() { + return pos; + } - public TileController getController() - { - return (TileController) worldObj.getTileEntity(controllerPosition); - } + @Override + public BlockPos getTilePos() { + return pos; + } - @Override - public void fromBytes(ByteBuf buf) - { - boolean lastConnected = connected; + public TileController getController() { + return (TileController) worldObj.getTileEntity(controllerPosition); + } - connected = buf.readBoolean(); + @Override + public void fromBytes(ByteBuf buf) { + boolean lastConnected = connected; - if (connected) - { - controllerPosition = new BlockPos(buf.readInt(), buf.readInt(), buf.readInt()); - } + connected = buf.readBoolean(); - redstoneMode = RedstoneMode.getById(buf.readInt()); + if (connected) { + controllerPosition = new BlockPos(buf.readInt(), buf.readInt(), buf.readInt()); + } - if (lastConnected != connected) - { - worldObj.notifyBlockUpdate(pos, worldObj.getBlockState(pos), worldObj.getBlockState(pos), 2 | 4); - } - } + redstoneMode = RedstoneMode.getById(buf.readInt()); - @Override - public void toBytes(ByteBuf buf) - { - buf.writeBoolean(connected); + if (lastConnected != connected) { + worldObj.notifyBlockUpdate(pos, worldObj.getBlockState(pos), worldObj.getBlockState(pos), 2 | 4); + } + } - if (connected) - { - buf.writeInt(controllerPosition.getX()); - buf.writeInt(controllerPosition.getY()); - buf.writeInt(controllerPosition.getZ()); - } + @Override + public void toBytes(ByteBuf buf) { + buf.writeBoolean(connected); - buf.writeInt(redstoneMode.id); - } + if (connected) { + buf.writeInt(controllerPosition.getX()); + buf.writeInt(controllerPosition.getY()); + buf.writeInt(controllerPosition.getZ()); + } - @Override - public void readFromNBT(NBTTagCompound nbt) - { - super.readFromNBT(nbt); + buf.writeInt(redstoneMode.id); + } - if (nbt.hasKey(RedstoneMode.NBT)) - { - redstoneMode = RedstoneMode.getById(nbt.getInteger(RedstoneMode.NBT)); - } - } + @Override + public void readFromNBT(NBTTagCompound nbt) { + super.readFromNBT(nbt); - @Override - public void writeToNBT(NBTTagCompound nbt) - { - super.writeToNBT(nbt); + if (nbt.hasKey(RedstoneMode.NBT)) { + redstoneMode = RedstoneMode.getById(nbt.getInteger(RedstoneMode.NBT)); + } + } - nbt.setInteger(RedstoneMode.NBT, redstoneMode.id); - } + @Override + public void writeToNBT(NBTTagCompound nbt) { + super.writeToNBT(nbt); - public abstract int getEnergyUsage(); + nbt.setInteger(RedstoneMode.NBT, redstoneMode.id); + } - public abstract void updateMachine(); + public abstract int getEnergyUsage(); + + public abstract void updateMachine(); } diff --git a/src/main/java/refinedstorage/tile/TileRelay.java b/src/main/java/refinedstorage/tile/TileRelay.java old mode 100644 new mode 100755 index ed183e83d..572fbf713 --- a/src/main/java/refinedstorage/tile/TileRelay.java +++ b/src/main/java/refinedstorage/tile/TileRelay.java @@ -2,21 +2,17 @@ package refinedstorage.tile; import refinedstorage.tile.settings.RedstoneMode; -public class TileRelay extends TileMachine -{ - public TileRelay() - { - this.redstoneMode = RedstoneMode.LOW; - } +public class TileRelay extends TileMachine { + public TileRelay() { + this.redstoneMode = RedstoneMode.LOW; + } - @Override - public int getEnergyUsage() - { - return 1; - } + @Override + public int getEnergyUsage() { + return 1; + } - @Override - public void updateMachine() - { - } + @Override + public void updateMachine() { + } } diff --git a/src/main/java/refinedstorage/tile/TileSolderer.java b/src/main/java/refinedstorage/tile/TileSolderer.java old mode 100644 new mode 100755 index 59110ab69..b1a35c75a --- a/src/main/java/refinedstorage/tile/TileSolderer.java +++ b/src/main/java/refinedstorage/tile/TileSolderer.java @@ -15,288 +15,240 @@ import refinedstorage.tile.solderer.ISoldererRecipe; import refinedstorage.tile.solderer.SoldererRegistry; import refinedstorage.util.InventoryUtils; -public class TileSolderer extends TileMachine implements IInventory, ISidedInventory -{ - public static final String NBT_WORKING = "Working"; - public static final String NBT_PROGRESS = "Progress"; +public class TileSolderer extends TileMachine implements IInventory, ISidedInventory { + public static final String NBT_WORKING = "Working"; + public static final String NBT_PROGRESS = "Progress"; - private InventorySimple inventory = new InventorySimple("solderer", 4); + public static final int[] FACES = new int[]{ + 0, 1, 2 + }; + public static final int[] FACES_DOWN = new int[]{ + 3 + }; - private ISoldererRecipe recipe; + private InventorySimple inventory = new InventorySimple("solderer", 4, this); - private boolean working = false; - private int progress = 0; - @SideOnly(Side.CLIENT) - private int duration; + private ISoldererRecipe recipe; - @Override - public int getEnergyUsage() - { - return 3; - } + private boolean working = false; + private int progress = 0; + @SideOnly(Side.CLIENT) + private int duration; - @Override - public void updateMachine() - { - ISoldererRecipe newRecipe = SoldererRegistry.getRecipe(inventory); + @Override + public int getEnergyUsage() { + return 3; + } - if (newRecipe == null) - { - reset(); - } - else if (newRecipe != recipe && inventory.getStackInSlot(3) == null) - { - recipe = newRecipe; - progress = 0; - working = true; + @Override + public void updateMachine() { + ISoldererRecipe newRecipe = SoldererRegistry.getRecipe(inventory); - markDirty(); - } - else if (working) - { - progress++; + if (newRecipe == null) { + reset(); + } else if (newRecipe != recipe && inventory.getStackInSlot(3) == null) { + recipe = newRecipe; + progress = 0; + working = true; - if (progress == recipe.getDuration()) - { - inventory.setInventorySlotContents(3, recipe.getResult()); + markDirty(); + } else if (working) { + progress++; - for (int i = 0; i < 3; ++i) - { - if (recipe.getRow(i) != null) - { - inventory.decrStackSize(i, recipe.getRow(i).stackSize); - } - } + if (progress == recipe.getDuration()) { + inventory.setInventorySlotContents(3, recipe.getResult()); - reset(); - } - } - } + for (int i = 0; i < 3; ++i) { + if (recipe.getRow(i) != null) { + inventory.decrStackSize(i, recipe.getRow(i).stackSize); + } + } - @Override - public void onDisconnected() - { - super.onDisconnected(); + reset(); + } + } + } - reset(); - } + @Override + public void onDisconnected() { + super.onDisconnected(); - public void reset() - { - progress = 0; - working = false; - recipe = null; + reset(); + } - markDirty(); - } + public void reset() { + progress = 0; + working = false; + recipe = null; - @Override - public void readFromNBT(NBTTagCompound nbt) - { - super.readFromNBT(nbt); + markDirty(); + } - InventoryUtils.restoreInventory(this, 0, nbt); + @Override + public void readFromNBT(NBTTagCompound nbt) { + super.readFromNBT(nbt); - recipe = SoldererRegistry.getRecipe(inventory); + InventoryUtils.restoreInventory(this, 0, nbt); - if (nbt.hasKey(NBT_WORKING)) - { - working = nbt.getBoolean(NBT_WORKING); - } + recipe = SoldererRegistry.getRecipe(inventory); - if (nbt.hasKey(NBT_PROGRESS)) - { - progress = nbt.getInteger(NBT_PROGRESS); - } - } + if (nbt.hasKey(NBT_WORKING)) { + working = nbt.getBoolean(NBT_WORKING); + } - @Override - public void writeToNBT(NBTTagCompound nbt) - { - super.writeToNBT(nbt); + if (nbt.hasKey(NBT_PROGRESS)) { + progress = nbt.getInteger(NBT_PROGRESS); + } + } - InventoryUtils.saveInventory(this, 0, nbt); + @Override + public void writeToNBT(NBTTagCompound nbt) { + super.writeToNBT(nbt); - nbt.setBoolean(NBT_WORKING, working); - nbt.setInteger(NBT_PROGRESS, progress); - } + InventoryUtils.saveInventory(this, 0, nbt); - @Override - public void fromBytes(ByteBuf buf) - { - super.fromBytes(buf); + nbt.setBoolean(NBT_WORKING, working); + nbt.setInteger(NBT_PROGRESS, progress); + } - working = buf.readBoolean(); - progress = buf.readInt(); - duration = buf.readInt(); - } + @Override + public void fromBytes(ByteBuf buf) { + super.fromBytes(buf); - @Override - public void toBytes(ByteBuf buf) - { - super.toBytes(buf); + working = buf.readBoolean(); + progress = buf.readInt(); + duration = buf.readInt(); + } - buf.writeBoolean(working); - buf.writeInt(progress); - buf.writeInt(recipe != null ? recipe.getDuration() : 0); - } + @Override + public void toBytes(ByteBuf buf) { + super.toBytes(buf); - public boolean isWorking() - { - return working; - } + buf.writeBoolean(working); + buf.writeInt(progress); + buf.writeInt(recipe != null ? recipe.getDuration() : 0); + } - public int getProgress() - { - return progress; - } + public boolean isWorking() { + return working; + } - @SideOnly(Side.CLIENT) - public int getProgressScaled(int i) - { - return (int) ((float) progress / (float) duration * (float) i); - } + public int getProgress() { + return progress; + } - @SideOnly(Side.CLIENT) - public int getDuration() - { - return duration; - } + @SideOnly(Side.CLIENT) + public int getProgressScaled(int i) { + return (int) ((float) progress / (float) duration * (float) i); + } - @Override - public IInventory getDroppedInventory() - { - return inventory; - } + @SideOnly(Side.CLIENT) + public int getDuration() { + return duration; + } - @Override - public int getSizeInventory() - { - return inventory.getSizeInventory(); - } + @Override + public IInventory getDroppedInventory() { + return inventory; + } - @Override - public ItemStack getStackInSlot(int slot) - { - return inventory.getStackInSlot(slot); - } + @Override + public int getSizeInventory() { + return inventory.getSizeInventory(); + } - @Override - public ItemStack decrStackSize(int slot, int count) - { - return inventory.decrStackSize(slot, count); - } + @Override + public ItemStack getStackInSlot(int slot) { + return inventory.getStackInSlot(slot); + } - @Override - public ItemStack removeStackFromSlot(int slot) - { - return inventory.removeStackFromSlot(slot); - } + @Override + public ItemStack decrStackSize(int slot, int count) { + return inventory.decrStackSize(slot, count); + } - @Override - public void setInventorySlotContents(int slot, ItemStack stack) - { - inventory.setInventorySlotContents(slot, stack); - } + @Override + public ItemStack removeStackFromSlot(int slot) { + return inventory.removeStackFromSlot(slot); + } - @Override - public int getInventoryStackLimit() - { - return inventory.getInventoryStackLimit(); - } + @Override + public void setInventorySlotContents(int slot, ItemStack stack) { + inventory.setInventorySlotContents(slot, stack); + } - @Override - public boolean isUseableByPlayer(EntityPlayer player) - { - return inventory.isUseableByPlayer(player); - } + @Override + public int getInventoryStackLimit() { + return inventory.getInventoryStackLimit(); + } - @Override - public void openInventory(EntityPlayer player) - { - inventory.openInventory(player); - } + @Override + public boolean isUseableByPlayer(EntityPlayer player) { + return inventory.isUseableByPlayer(player); + } - @Override - public void closeInventory(EntityPlayer player) - { - inventory.closeInventory(player); - } + @Override + public void openInventory(EntityPlayer player) { + inventory.openInventory(player); + } - @Override - public boolean isItemValidForSlot(int slot, ItemStack stack) - { - return inventory.isItemValidForSlot(slot, stack); - } + @Override + public void closeInventory(EntityPlayer player) { + inventory.closeInventory(player); + } - @Override - public int getField(int id) - { - return inventory.getField(id); - } + @Override + public boolean isItemValidForSlot(int slot, ItemStack stack) { + return inventory.isItemValidForSlot(slot, stack); + } - @Override - public void setField(int id, int value) - { - inventory.setField(id, value); - } + @Override + public int getField(int id) { + return inventory.getField(id); + } - @Override - public int getFieldCount() - { - return inventory.getFieldCount(); - } + @Override + public void setField(int id, int value) { + inventory.setField(id, value); + } - @Override - public void clear() - { - inventory.clear(); - } + @Override + public int getFieldCount() { + return inventory.getFieldCount(); + } - @Override - public String getName() - { - return inventory.getName(); - } + @Override + public void clear() { + inventory.clear(); + } - @Override - public boolean hasCustomName() - { - return inventory.hasCustomName(); - } + @Override + public String getName() { + return inventory.getName(); + } - @Override - public ITextComponent getDisplayName() - { - return inventory.getDisplayName(); - } + @Override + public boolean hasCustomName() { + return inventory.hasCustomName(); + } - @Override - public int[] getSlotsForFace(EnumFacing side) - { - if (side != EnumFacing.DOWN) - { - return new int[] - { - 0, 1, 2 - }; - } + @Override + public ITextComponent getDisplayName() { + return inventory.getDisplayName(); + } - return new int[] - { - 3 - }; - } + @Override + public int[] getSlotsForFace(EnumFacing side) { + return side == EnumFacing.DOWN ? FACES_DOWN : FACES; + } - @Override - public boolean canInsertItem(int slot, ItemStack stack, EnumFacing direction) - { - return slot != 3; - } + @Override + public boolean canInsertItem(int slot, ItemStack stack, EnumFacing direction) { + return slot != 3; + } - @Override - public boolean canExtractItem(int slot, ItemStack stack, EnumFacing direction) - { - return slot == 3; - } + @Override + public boolean canExtractItem(int slot, ItemStack stack, EnumFacing direction) { + return slot == 3; + } } diff --git a/src/main/java/refinedstorage/tile/TileStorage.java b/src/main/java/refinedstorage/tile/TileStorage.java old mode 100644 new mode 100755 index 771dc0487..ee20e65f6 --- a/src/main/java/refinedstorage/tile/TileStorage.java +++ b/src/main/java/refinedstorage/tile/TileStorage.java @@ -1,7 +1,6 @@ package refinedstorage.tile; import io.netty.buffer.ByteBuf; -import java.util.List; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -13,284 +12,243 @@ import refinedstorage.block.BlockStorage; import refinedstorage.block.EnumStorageType; import refinedstorage.inventory.InventorySimple; import refinedstorage.network.MessagePriorityUpdate; -import refinedstorage.storage.IStorage; -import refinedstorage.storage.IStorageGui; -import refinedstorage.storage.IStorageProvider; -import refinedstorage.storage.NBTStorage; -import refinedstorage.storage.StorageItem; +import refinedstorage.storage.*; import refinedstorage.tile.settings.ICompareSetting; import refinedstorage.tile.settings.IModeSetting; import refinedstorage.tile.settings.IRedstoneModeSetting; import refinedstorage.tile.settings.ModeSettingUtils; import refinedstorage.util.InventoryUtils; -public class TileStorage extends TileMachine implements IStorageProvider, IStorage, IStorageGui, ICompareSetting, IModeSetting -{ - public static final String NBT_STORAGE = "Storage"; - public static final String NBT_PRIORITY = "Priority"; - public static final String NBT_COMPARE = "Compare"; - public static final String NBT_MODE = "Mode"; +import java.util.List; - private InventorySimple inventory = new InventorySimple("storage", 9, this); +public class TileStorage extends TileMachine implements IStorageProvider, IStorage, IStorageGui, ICompareSetting, IModeSetting { + public static final String NBT_STORAGE = "Storage"; + public static final String NBT_PRIORITY = "Priority"; + public static final String NBT_COMPARE = "Compare"; + public static final String NBT_MODE = "Mode"; - private NBTTagCompound tag = NBTStorage.getBaseNBT(); + private InventorySimple inventory = new InventorySimple("storage", 9, this); - private int priority = 0; - private int compare = 0; - private int mode = 0; + private NBTTagCompound tag = NBTStorage.getBaseNBT(); - @SideOnly(Side.CLIENT) - private int stored; + private int priority = 0; + private int compare = 0; + private int mode = 0; - @Override - public int getEnergyUsage() - { - return 3; - } + @SideOnly(Side.CLIENT) + private int stored; - @Override - public void updateMachine() - { - } + @Override + public int getEnergyUsage() { + return 3; + } - @Override - public void addStorages(List storages) - { - storages.add(this); - } + @Override + public void updateMachine() { + } - @Override - public void readFromNBT(NBTTagCompound nbt) - { - super.readFromNBT(nbt); + @Override + public void addStorages(List storages) { + storages.add(this); + } - InventoryUtils.restoreInventory(inventory, 0, nbt); + @Override + public void readFromNBT(NBTTagCompound nbt) { + super.readFromNBT(nbt); - if (nbt.hasKey(NBT_STORAGE)) - { - tag = nbt.getCompoundTag(NBT_STORAGE); - } + InventoryUtils.restoreInventory(inventory, 0, nbt); - if (nbt.hasKey(NBT_PRIORITY)) - { - priority = nbt.getInteger(NBT_PRIORITY); - } + if (nbt.hasKey(NBT_STORAGE)) { + tag = nbt.getCompoundTag(NBT_STORAGE); + } - if (nbt.hasKey(NBT_COMPARE)) - { - compare = nbt.getInteger(NBT_COMPARE); - } + if (nbt.hasKey(NBT_PRIORITY)) { + priority = nbt.getInteger(NBT_PRIORITY); + } - if (nbt.hasKey(NBT_MODE)) - { - mode = nbt.getInteger(NBT_MODE); - } - } + if (nbt.hasKey(NBT_COMPARE)) { + compare = nbt.getInteger(NBT_COMPARE); + } - @Override - public void writeToNBT(NBTTagCompound nbt) - { - super.writeToNBT(nbt); + if (nbt.hasKey(NBT_MODE)) { + mode = nbt.getInteger(NBT_MODE); + } + } - InventoryUtils.saveInventory(inventory, 0, nbt); + @Override + public void writeToNBT(NBTTagCompound nbt) { + super.writeToNBT(nbt); - nbt.setTag(NBT_STORAGE, tag); - nbt.setInteger(NBT_PRIORITY, priority); - nbt.setInteger(NBT_COMPARE, compare); - nbt.setInteger(NBT_MODE, mode); - } + InventoryUtils.saveInventory(inventory, 0, nbt); - public EnumStorageType getType() - { - if (worldObj.getBlockState(pos).getBlock() == RefinedStorageBlocks.STORAGE) - { - return ((EnumStorageType) worldObj.getBlockState(pos).getValue(BlockStorage.TYPE)); - } + nbt.setTag(NBT_STORAGE, tag); + nbt.setInteger(NBT_PRIORITY, priority); + nbt.setInteger(NBT_COMPARE, compare); + nbt.setInteger(NBT_MODE, mode); + } - return EnumStorageType.TYPE_1K; - } + public EnumStorageType getType() { + if (worldObj.getBlockState(pos).getBlock() == RefinedStorageBlocks.STORAGE) { + return ((EnumStorageType) worldObj.getBlockState(pos).getValue(BlockStorage.TYPE)); + } - @Override - public void toBytes(ByteBuf buf) - { - super.toBytes(buf); + return EnumStorageType.TYPE_1K; + } - buf.writeInt(NBTStorage.getStored(tag)); - buf.writeInt(priority); - buf.writeInt(compare); - buf.writeInt(mode); - } + @Override + public void toBytes(ByteBuf buf) { + super.toBytes(buf); - @Override - public void fromBytes(ByteBuf buf) - { - super.fromBytes(buf); + buf.writeInt(NBTStorage.getStored(tag)); + buf.writeInt(priority); + buf.writeInt(compare); + buf.writeInt(mode); + } - stored = buf.readInt(); - priority = buf.readInt(); - compare = buf.readInt(); - mode = buf.readInt(); - } + @Override + public void fromBytes(ByteBuf buf) { + super.fromBytes(buf); - @Override - public void addItems(List items) - { - getStorage().addItems(items); + stored = buf.readInt(); + priority = buf.readInt(); + compare = buf.readInt(); + mode = buf.readInt(); + } - markDirty(); - } + @Override + public void addItems(List items) { + getStorage().addItems(items); - @Override - public void push(ItemStack stack) - { - getStorage().push(stack); + markDirty(); + } - markDirty(); - } + @Override + public void push(ItemStack stack) { + getStorage().push(stack); - @Override - public ItemStack take(ItemStack stack, int flags) - { - ItemStack result = getStorage().take(stack, flags); + markDirty(); + } - markDirty(); + @Override + public ItemStack take(ItemStack stack, int flags) { + ItemStack result = getStorage().take(stack, flags); - return result; - } + markDirty(); - @Override - public boolean canPush(ItemStack stack) - { - return ModeSettingUtils.doesNotViolateMode(inventory, this, compare, stack) && getStorage().canPush(stack); - } + return result; + } - @Override - public int getCompare() - { - return compare; - } + @Override + public boolean canPush(ItemStack stack) { + return ModeSettingUtils.doesNotViolateMode(inventory, this, compare, stack) && getStorage().canPush(stack); + } - @Override - public void setCompare(int compare) - { - markDirty(); + @Override + public int getCompare() { + return compare; + } - this.compare = compare; - } + @Override + public void setCompare(int compare) { + markDirty(); - @Override - public boolean isWhitelist() - { - return mode == 0; - } + this.compare = compare; + } - @Override - public boolean isBlacklist() - { - return mode == 1; - } + @Override + public boolean isWhitelist() { + return mode == 0; + } - @Override - public void setToWhitelist() - { - markDirty(); + @Override + public boolean isBlacklist() { + return mode == 1; + } - this.mode = 0; - } + @Override + public void setToWhitelist() { + markDirty(); - @Override - public void setToBlacklist() - { - markDirty(); + this.mode = 0; + } - this.mode = 1; - } + @Override + public void setToBlacklist() { + markDirty(); - @Override - public String getName() - { - return "block.refinedstorage:storage." + getType().getId() + ".name"; - } + this.mode = 1; + } - @Override - public IInventory getInventory() - { - return inventory; - } + @Override + public String getName() { + return "block.refinedstorage:storage." + getType().getId() + ".name"; + } - @Override - public IRedstoneModeSetting getRedstoneModeSetting() - { - return this; - } + @Override + public IInventory getInventory() { + return inventory; + } - @Override - public ICompareSetting getCompareSetting() - { - return this; - } + @Override + public IRedstoneModeSetting getRedstoneModeSetting() { + return this; + } - @Override - public IModeSetting getModeSetting() - { - return this; - } + @Override + public ICompareSetting getCompareSetting() { + return this; + } - @Override - public void onPriorityChanged(int priority) - { - RefinedStorage.NETWORK.sendToServer(new MessagePriorityUpdate(pos, priority)); - } + @Override + public IModeSetting getModeSetting() { + return this; + } - public NBTStorage getStorage() - { - return new NBTStorage(tag, getCapacity(), priority); - } + @Override + public void onPriorityChanged(int priority) { + RefinedStorage.NETWORK.sendToServer(new MessagePriorityUpdate(pos, priority)); + } - public NBTTagCompound getStorageTag() - { - return tag; - } + public NBTStorage getStorage() { + return new NBTStorage(tag, getCapacity(), priority); + } - public void setStorageTag(NBTTagCompound tag) - { - markDirty(); + public NBTTagCompound getStorageTag() { + return tag; + } - this.tag = tag; - } + public void setStorageTag(NBTTagCompound tag) { + markDirty(); - @Override - public int getPriority() - { - return priority; - } + this.tag = tag; + } - public void setPriority(int priority) - { - markDirty(); + @Override + public int getPriority() { + return priority; + } - this.priority = priority; - } + public void setPriority(int priority) { + markDirty(); - @Override - public int getStored() - { - return stored; - } + this.priority = priority; + } - public int getStoredScaled(int scale) - { - if (getType() == EnumStorageType.TYPE_CREATIVE) - { - return 0; - } + @Override + public int getStored() { + return stored; + } - return (int) ((float) getStored() / (float) getCapacity() * (float) scale); - } + public int getStoredScaled(int scale) { + if (getType() == EnumStorageType.TYPE_CREATIVE) { + return 0; + } - @Override - public int getCapacity() - { - return getType().getCapacity(); - } + return (int) ((float) getStored() / (float) getCapacity() * (float) scale); + } + + @Override + public int getCapacity() { + return getType().getCapacity(); + } } diff --git a/src/main/java/refinedstorage/tile/TileWirelessTransmitter.java b/src/main/java/refinedstorage/tile/TileWirelessTransmitter.java deleted file mode 100644 index 55e0ced12..000000000 --- a/src/main/java/refinedstorage/tile/TileWirelessTransmitter.java +++ /dev/null @@ -1,277 +0,0 @@ -package refinedstorage.tile; - -import io.netty.buffer.ByteBuf; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.text.ITextComponent; -import refinedstorage.block.EnumGridType; -import refinedstorage.inventory.InventorySimple; -import refinedstorage.item.ItemWirelessGrid; -import refinedstorage.util.InventoryUtils; - -public class TileWirelessTransmitter extends TileMachine implements IInventory -{ - public static final int TOTAL_PROGRESS = 10000; - - public static final String NBT_WORKING = "Working"; - public static final String NBT_PROGRESS = "Progress"; - - private InventorySimple inventory = new InventorySimple("wirelessTransmitter", 3); - - private boolean working = false; - private int progress = 0; - - @Override - public int getEnergyUsage() - { - return 3; - } - - @Override - public void updateMachine() - { - if (working) - { - progress++; - - if (progress == TOTAL_PROGRESS) - { - reset(); - } - } - else if (inventory.getStackInSlot(0) != null) - { - inventory.decrStackSize(0, 1); - - progress = 0; - working = true; - - markDirty(); - } - - if (inventory.getStackInSlot(1) != null) - { - ItemStack slot = inventory.getStackInSlot(1); - - slot.setTagCompound(new NBTTagCompound()); - - slot.getTagCompound().setInteger(ItemWirelessGrid.NBT_WIRELESS_TRANSMITTER_X, pos.getX()); - slot.getTagCompound().setInteger(ItemWirelessGrid.NBT_WIRELESS_TRANSMITTER_Y, pos.getY()); - slot.getTagCompound().setInteger(ItemWirelessGrid.NBT_WIRELESS_TRANSMITTER_Z, pos.getZ()); - - inventory.setInventorySlotContents(2, slot); - inventory.setInventorySlotContents(1, null); - } - } - - public void reset() - { - progress = 0; - working = false; - - markDirty(); - } - - @Override - public void onDisconnected() - { - super.onDisconnected(); - - reset(); - } - - public boolean isWorking() - { - return working; - } - - public int getProgress() - { - return progress; - } - - public TileGrid getGrid(EnumGridType type) - { - for (TileMachine machine : getController().getMachines()) - { - if (worldObj.getTileEntity(machine.getPos()) != null) - { - if (machine instanceof TileGrid) - { - TileGrid grid = (TileGrid) machine; - - if (grid.getType() == type) - { - return grid; - } - } - } - } - - return null; - } - - @Override - public void readFromNBT(NBTTagCompound nbt) - { - super.readFromNBT(nbt); - - InventoryUtils.restoreInventory(this, 0, nbt); - - if (nbt.hasKey(NBT_WORKING)) - { - working = nbt.getBoolean(NBT_WORKING); - } - - if (nbt.hasKey(NBT_PROGRESS)) - { - progress = nbt.getInteger(NBT_PROGRESS); - } - } - - @Override - public void writeToNBT(NBTTagCompound nbt) - { - super.writeToNBT(nbt); - - InventoryUtils.saveInventory(this, 0, nbt); - - nbt.setBoolean(NBT_WORKING, working); - nbt.setInteger(NBT_PROGRESS, progress); - } - - @Override - public void fromBytes(ByteBuf buf) - { - super.fromBytes(buf); - - boolean lastWorking = working; - - working = buf.readBoolean(); - progress = buf.readInt(); - - if (lastWorking != working) - { - worldObj.notifyBlockUpdate(pos, worldObj.getBlockState(pos), worldObj.getBlockState(pos), 2 | 4); - } - } - - @Override - public void toBytes(ByteBuf buf) - { - super.toBytes(buf); - - buf.writeBoolean(working); - buf.writeInt(progress); - } - - @Override - public IInventory getDroppedInventory() - { - return inventory; - } - - @Override - public int getSizeInventory() - { - return inventory.getSizeInventory(); - } - - @Override - public ItemStack getStackInSlot(int slot) - { - return inventory.getStackInSlot(slot); - } - - @Override - public ItemStack decrStackSize(int slot, int count) - { - return inventory.decrStackSize(slot, count); - } - - @Override - public ItemStack removeStackFromSlot(int slot) - { - return inventory.removeStackFromSlot(slot); - } - - @Override - public void setInventorySlotContents(int slot, ItemStack stack) - { - inventory.setInventorySlotContents(slot, stack); - } - - @Override - public int getInventoryStackLimit() - { - return inventory.getInventoryStackLimit(); - } - - @Override - public boolean isUseableByPlayer(EntityPlayer player) - { - return inventory.isUseableByPlayer(player); - } - - @Override - public boolean isItemValidForSlot(int slot, ItemStack stack) - { - return inventory.isItemValidForSlot(slot, stack); - } - - @Override - public void openInventory(EntityPlayer player) - { - inventory.openInventory(player); - } - - @Override - public void closeInventory(EntityPlayer player) - { - inventory.closeInventory(player); - } - - @Override - public int getField(int id) - { - return inventory.getField(id); - } - - @Override - public void setField(int id, int value) - { - inventory.setField(id, value); - } - - @Override - public int getFieldCount() - { - return inventory.getFieldCount(); - } - - @Override - public void clear() - { - inventory.clear(); - } - - @Override - public String getName() - { - return inventory.getName(); - } - - @Override - public boolean hasCustomName() - { - return inventory.hasCustomName(); - } - - @Override - public ITextComponent getDisplayName() - { - return inventory.getDisplayName(); - } -} diff --git a/src/main/java/refinedstorage/tile/settings/ICompareSetting.java b/src/main/java/refinedstorage/tile/settings/ICompareSetting.java old mode 100644 new mode 100755 index 1437d068b..37fb20595 --- a/src/main/java/refinedstorage/tile/settings/ICompareSetting.java +++ b/src/main/java/refinedstorage/tile/settings/ICompareSetting.java @@ -2,11 +2,10 @@ package refinedstorage.tile.settings; import net.minecraft.util.math.BlockPos; -public interface ICompareSetting -{ - public int getCompare(); +public interface ICompareSetting { + int getCompare(); - public void setCompare(int compare); + void setCompare(int compare); - public BlockPos getMachinePos(); + BlockPos getMachinePos(); } diff --git a/src/main/java/refinedstorage/tile/settings/IModeSetting.java b/src/main/java/refinedstorage/tile/settings/IModeSetting.java old mode 100644 new mode 100755 index 75cc34ca3..387e389da --- a/src/main/java/refinedstorage/tile/settings/IModeSetting.java +++ b/src/main/java/refinedstorage/tile/settings/IModeSetting.java @@ -2,15 +2,14 @@ package refinedstorage.tile.settings; import net.minecraft.util.math.BlockPos; -public interface IModeSetting -{ - public boolean isWhitelist(); +public interface IModeSetting { + boolean isWhitelist(); - public boolean isBlacklist(); + boolean isBlacklist(); - public void setToWhitelist(); + void setToWhitelist(); - public void setToBlacklist(); + void setToBlacklist(); - public BlockPos getMachinePos(); + BlockPos getMachinePos(); } diff --git a/src/main/java/refinedstorage/tile/settings/IRedstoneModeSetting.java b/src/main/java/refinedstorage/tile/settings/IRedstoneModeSetting.java old mode 100644 new mode 100755 index b774eada5..379857da5 --- a/src/main/java/refinedstorage/tile/settings/IRedstoneModeSetting.java +++ b/src/main/java/refinedstorage/tile/settings/IRedstoneModeSetting.java @@ -2,11 +2,10 @@ package refinedstorage.tile.settings; import net.minecraft.util.math.BlockPos; -public interface IRedstoneModeSetting -{ - public RedstoneMode getRedstoneMode(); +public interface IRedstoneModeSetting { + RedstoneMode getRedstoneMode(); - public void setRedstoneMode(RedstoneMode mode); + void setRedstoneMode(RedstoneMode mode); - public BlockPos getMachinePos(); + BlockPos getMachinePos(); } diff --git a/src/main/java/refinedstorage/tile/settings/ModeSettingUtils.java b/src/main/java/refinedstorage/tile/settings/ModeSettingUtils.java old mode 100644 new mode 100755 index 49a085915..a1936fcef --- a/src/main/java/refinedstorage/tile/settings/ModeSettingUtils.java +++ b/src/main/java/refinedstorage/tile/settings/ModeSettingUtils.java @@ -4,46 +4,36 @@ import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import refinedstorage.util.InventoryUtils; -public class ModeSettingUtils -{ - public static boolean doesNotViolateMode(IInventory inventory, IModeSetting mode, int compare, ItemStack stack) - { - if (mode.isWhitelist()) - { - int slots = 0; +public class ModeSettingUtils { + public static boolean doesNotViolateMode(IInventory inventory, IModeSetting mode, int compare, ItemStack stack) { + if (mode.isWhitelist()) { + int slots = 0; - for (int i = 0; i < inventory.getSizeInventory(); ++i) - { - ItemStack slot = inventory.getStackInSlot(i); + for (int i = 0; i < inventory.getSizeInventory(); ++i) { + ItemStack slot = inventory.getStackInSlot(i); - if (slot != null) - { - slots++; + if (slot != null) { + slots++; - if (InventoryUtils.compareStack(slot, stack, compare)) - { - return true; - } - } - } + if (InventoryUtils.compareStack(slot, stack, compare)) { + return true; + } + } + } - return slots == 0; - } - else if (mode.isBlacklist()) - { - for (int i = 0; i < inventory.getSizeInventory(); ++i) - { - ItemStack slot = inventory.getStackInSlot(i); + return slots == 0; + } else if (mode.isBlacklist()) { + for (int i = 0; i < inventory.getSizeInventory(); ++i) { + ItemStack slot = inventory.getStackInSlot(i); - if (slot != null && InventoryUtils.compareStack(slot, stack, compare)) - { - return false; - } - } + if (slot != null && InventoryUtils.compareStack(slot, stack, compare)) { + return false; + } + } - return true; - } + return true; + } - return false; - } + return false; + } } diff --git a/src/main/java/refinedstorage/tile/settings/RedstoneMode.java b/src/main/java/refinedstorage/tile/settings/RedstoneMode.java old mode 100644 new mode 100755 index 3d9bf9556..c2fdce468 --- a/src/main/java/refinedstorage/tile/settings/RedstoneMode.java +++ b/src/main/java/refinedstorage/tile/settings/RedstoneMode.java @@ -3,58 +3,49 @@ package refinedstorage.tile.settings; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -public enum RedstoneMode -{ - IGNORE(0), - HIGH(1), - LOW(2); +public enum RedstoneMode { + IGNORE(0), + HIGH(1), + LOW(2); - public static final String NBT = "RedstoneMode"; + public static final String NBT = "RedstoneMode"; - public final int id; + public final int id; - RedstoneMode(int id) - { - this.id = id; - } + RedstoneMode(int id) { + this.id = id; + } - public RedstoneMode next() - { - RedstoneMode next = getById(id + 1); + public RedstoneMode next() { + RedstoneMode next = getById(id + 1); - if (next == null) - { - return getById(0); - } + if (next == null) { + return getById(0); + } - return next; - } + return next; + } - public boolean isEnabled(World world, BlockPos pos) - { - switch (this) - { - case IGNORE: - return true; - case HIGH: - return world.isBlockPowered(pos); - case LOW: - return !world.isBlockPowered(pos); - } + public boolean isEnabled(World world, BlockPos pos) { + switch (this) { + case IGNORE: + return true; + case HIGH: + return world.isBlockPowered(pos); + case LOW: + return !world.isBlockPowered(pos); + } - return false; - } + return false; + } - public static RedstoneMode getById(int id) - { - for (RedstoneMode control : values()) - { - if (control.id == id) - { - return control; - } - } + public static RedstoneMode getById(int id) { + for (RedstoneMode control : values()) { + if (control.id == id) { + return control; + } + } - return null; - } + return null; + } } diff --git a/src/main/java/refinedstorage/tile/solderer/ISoldererRecipe.java b/src/main/java/refinedstorage/tile/solderer/ISoldererRecipe.java old mode 100644 new mode 100755 index 8122c8bd8..badf33df5 --- a/src/main/java/refinedstorage/tile/solderer/ISoldererRecipe.java +++ b/src/main/java/refinedstorage/tile/solderer/ISoldererRecipe.java @@ -2,11 +2,10 @@ package refinedstorage.tile.solderer; import net.minecraft.item.ItemStack; -public interface ISoldererRecipe -{ - public ItemStack getRow(int row); +public interface ISoldererRecipe { + ItemStack getRow(int row); - public ItemStack getResult(); + ItemStack getResult(); - public int getDuration(); + int getDuration(); } diff --git a/src/main/java/refinedstorage/tile/solderer/SoldererRecipeCraftingGrid.java b/src/main/java/refinedstorage/tile/solderer/SoldererRecipeCraftingGrid.java old mode 100644 new mode 100755 index fae2db28e..6c0317604 --- a/src/main/java/refinedstorage/tile/solderer/SoldererRecipeCraftingGrid.java +++ b/src/main/java/refinedstorage/tile/solderer/SoldererRecipeCraftingGrid.java @@ -7,36 +7,27 @@ import refinedstorage.RefinedStorageItems; import refinedstorage.block.EnumGridType; import refinedstorage.item.ItemProcessor; -public class SoldererRecipeCraftingGrid implements ISoldererRecipe -{ - @Override - public ItemStack getRow(int row) - { - if (row == 0) - { - return new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED); - } - else if (row == 1) - { - return new ItemStack(RefinedStorageBlocks.GRID, 1, 0); - } - else if (row == 2) - { - return new ItemStack(Blocks.crafting_table); - } +public class SoldererRecipeCraftingGrid implements ISoldererRecipe { + @Override + public ItemStack getRow(int row) { + if (row == 0) { + return new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED); + } else if (row == 1) { + return new ItemStack(RefinedStorageBlocks.GRID, 1, 0); + } else if (row == 2) { + return new ItemStack(Blocks.crafting_table); + } - return null; - } + return null; + } - @Override - public ItemStack getResult() - { - return new ItemStack(RefinedStorageBlocks.GRID, 1, EnumGridType.CRAFTING.getId()); - } + @Override + public ItemStack getResult() { + return new ItemStack(RefinedStorageBlocks.GRID, 1, EnumGridType.CRAFTING.getId()); + } - @Override - public int getDuration() - { - return 500; - } + @Override + public int getDuration() { + return 500; + } } diff --git a/src/main/java/refinedstorage/tile/solderer/SoldererRecipeDiskDrive.java b/src/main/java/refinedstorage/tile/solderer/SoldererRecipeDiskDrive.java new file mode 100755 index 000000000..15c479fd5 --- /dev/null +++ b/src/main/java/refinedstorage/tile/solderer/SoldererRecipeDiskDrive.java @@ -0,0 +1,32 @@ +package refinedstorage.tile.solderer; + +import net.minecraft.init.Blocks; +import net.minecraft.item.ItemStack; +import refinedstorage.RefinedStorageBlocks; +import refinedstorage.RefinedStorageItems; +import refinedstorage.item.ItemProcessor; + +public class SoldererRecipeDiskDrive implements ISoldererRecipe { + @Override + public ItemStack getRow(int row) { + if (row == 0) { + return new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED); + } else if (row == 1) { + return new ItemStack(RefinedStorageBlocks.MACHINE_CASING); + } else if (row == 2) { + return new ItemStack(Blocks.chest); + } + + return null; + } + + @Override + public ItemStack getResult() { + return new ItemStack(RefinedStorageBlocks.DISK_DRIVE); + } + + @Override + public int getDuration() { + return 500; + } +} diff --git a/src/main/java/refinedstorage/tile/solderer/SoldererRecipeDrive.java b/src/main/java/refinedstorage/tile/solderer/SoldererRecipeDrive.java deleted file mode 100644 index 759119e3c..000000000 --- a/src/main/java/refinedstorage/tile/solderer/SoldererRecipeDrive.java +++ /dev/null @@ -1,41 +0,0 @@ -package refinedstorage.tile.solderer; - -import net.minecraft.init.Blocks; -import net.minecraft.item.ItemStack; -import refinedstorage.RefinedStorageBlocks; -import refinedstorage.RefinedStorageItems; -import refinedstorage.item.ItemProcessor; - -public class SoldererRecipeDrive implements ISoldererRecipe -{ - @Override - public ItemStack getRow(int row) - { - if (row == 0) - { - return new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED); - } - else if (row == 1) - { - return new ItemStack(RefinedStorageBlocks.MACHINE_CASING); - } - else if (row == 2) - { - return new ItemStack(Blocks.chest); - } - - return null; - } - - @Override - public ItemStack getResult() - { - return new ItemStack(RefinedStorageBlocks.DRIVE); - } - - @Override - public int getDuration() - { - return 500; - } -} diff --git a/src/main/java/refinedstorage/tile/solderer/SoldererRecipeInterface.java b/src/main/java/refinedstorage/tile/solderer/SoldererRecipeInterface.java old mode 100644 new mode 100755 index ec0f42bc7..c25cb6282 --- a/src/main/java/refinedstorage/tile/solderer/SoldererRecipeInterface.java +++ b/src/main/java/refinedstorage/tile/solderer/SoldererRecipeInterface.java @@ -5,36 +5,27 @@ import refinedstorage.RefinedStorageBlocks; import refinedstorage.RefinedStorageItems; import refinedstorage.item.ItemProcessor; -public class SoldererRecipeInterface implements ISoldererRecipe -{ - @Override - public ItemStack getRow(int row) - { - if (row == 0) - { - return new ItemStack(RefinedStorageBlocks.IMPORTER); - } - else if (row == 1) - { - return new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_BASIC); - } - else if (row == 2) - { - return new ItemStack(RefinedStorageBlocks.EXPORTER); - } +public class SoldererRecipeInterface implements ISoldererRecipe { + @Override + public ItemStack getRow(int row) { + if (row == 0) { + return new ItemStack(RefinedStorageBlocks.IMPORTER); + } else if (row == 1) { + return new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_BASIC); + } else if (row == 2) { + return new ItemStack(RefinedStorageBlocks.EXPORTER); + } - return null; - } + return null; + } - @Override - public ItemStack getResult() - { - return new ItemStack(RefinedStorageBlocks.INTERFACE); - } + @Override + public ItemStack getResult() { + return new ItemStack(RefinedStorageBlocks.INTERFACE); + } - @Override - public int getDuration() - { - return 200; - } + @Override + public int getDuration() { + return 200; + } } diff --git a/src/main/java/refinedstorage/tile/solderer/SoldererRecipePrintedProcessor.java b/src/main/java/refinedstorage/tile/solderer/SoldererRecipePrintedProcessor.java old mode 100644 new mode 100755 index 165dd6af5..31b4d72e8 --- a/src/main/java/refinedstorage/tile/solderer/SoldererRecipePrintedProcessor.java +++ b/src/main/java/refinedstorage/tile/solderer/SoldererRecipePrintedProcessor.java @@ -5,57 +5,49 @@ import net.minecraft.item.ItemStack; import refinedstorage.RefinedStorageItems; import refinedstorage.item.ItemProcessor; -public class SoldererRecipePrintedProcessor implements ISoldererRecipe -{ - private int type; +public class SoldererRecipePrintedProcessor implements ISoldererRecipe { + private int type; - public SoldererRecipePrintedProcessor(int type) - { - this.type = type; - } + public SoldererRecipePrintedProcessor(int type) { + this.type = type; + } - @Override - public ItemStack getRow(int row) - { - if (row == 1) - { - switch (type) - { - case ItemProcessor.TYPE_PRINTED_BASIC: - return new ItemStack(Items.iron_ingot); - case ItemProcessor.TYPE_PRINTED_IMPROVED: - return new ItemStack(Items.gold_ingot); - case ItemProcessor.TYPE_PRINTED_ADVANCED: - return new ItemStack(Items.diamond); - case ItemProcessor.TYPE_PRINTED_SILICON: - return new ItemStack(RefinedStorageItems.SILICON); - } - } + @Override + public ItemStack getRow(int row) { + if (row == 1) { + switch (type) { + case ItemProcessor.TYPE_PRINTED_BASIC: + return new ItemStack(Items.iron_ingot); + case ItemProcessor.TYPE_PRINTED_IMPROVED: + return new ItemStack(Items.gold_ingot); + case ItemProcessor.TYPE_PRINTED_ADVANCED: + return new ItemStack(Items.diamond); + case ItemProcessor.TYPE_PRINTED_SILICON: + return new ItemStack(RefinedStorageItems.SILICON); + } + } - return null; - } + return null; + } - @Override - public ItemStack getResult() - { - return new ItemStack(RefinedStorageItems.PROCESSOR, 1, type); - } + @Override + public ItemStack getResult() { + return new ItemStack(RefinedStorageItems.PROCESSOR, 1, type); + } - @Override - public int getDuration() - { - switch (type) - { - case ItemProcessor.TYPE_PRINTED_BASIC: - return 100; - case ItemProcessor.TYPE_PRINTED_IMPROVED: - return 150; - case ItemProcessor.TYPE_PRINTED_ADVANCED: - return 200; - case ItemProcessor.TYPE_PRINTED_SILICON: - return 90; - } + @Override + public int getDuration() { + switch (type) { + case ItemProcessor.TYPE_PRINTED_BASIC: + return 100; + case ItemProcessor.TYPE_PRINTED_IMPROVED: + return 150; + case ItemProcessor.TYPE_PRINTED_ADVANCED: + return 200; + case ItemProcessor.TYPE_PRINTED_SILICON: + return 90; + } - return 0; - } + return 0; + } } diff --git a/src/main/java/refinedstorage/tile/solderer/SoldererRecipeProcessor.java b/src/main/java/refinedstorage/tile/solderer/SoldererRecipeProcessor.java old mode 100644 new mode 100755 index 4ec2e21b5..ec4bd99bc --- a/src/main/java/refinedstorage/tile/solderer/SoldererRecipeProcessor.java +++ b/src/main/java/refinedstorage/tile/solderer/SoldererRecipeProcessor.java @@ -5,61 +5,49 @@ import net.minecraft.item.ItemStack; import refinedstorage.RefinedStorageItems; import refinedstorage.item.ItemProcessor; -public class SoldererRecipeProcessor implements ISoldererRecipe -{ - private int type; +public class SoldererRecipeProcessor implements ISoldererRecipe { + private int type; - public SoldererRecipeProcessor(int type) - { - this.type = type; - } + public SoldererRecipeProcessor(int type) { + this.type = type; + } - @Override - public ItemStack getRow(int row) - { - if (row == 0) - { - switch (type) - { - case ItemProcessor.TYPE_BASIC: - return new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_PRINTED_BASIC); - case ItemProcessor.TYPE_IMPROVED: - return new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_PRINTED_IMPROVED); - case ItemProcessor.TYPE_ADVANCED: - return new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_PRINTED_ADVANCED); - } - } - else if (row == 1) - { - return new ItemStack(Items.redstone); - } - else if (row == 2) - { - return new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_PRINTED_SILICON); - } + @Override + public ItemStack getRow(int row) { + if (row == 0) { + switch (type) { + case ItemProcessor.TYPE_BASIC: + return new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_PRINTED_BASIC); + case ItemProcessor.TYPE_IMPROVED: + return new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_PRINTED_IMPROVED); + case ItemProcessor.TYPE_ADVANCED: + return new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_PRINTED_ADVANCED); + } + } else if (row == 1) { + return new ItemStack(Items.redstone); + } else if (row == 2) { + return new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_PRINTED_SILICON); + } - return null; - } + return null; + } - @Override - public ItemStack getResult() - { - return new ItemStack(RefinedStorageItems.PROCESSOR, 1, type); - } + @Override + public ItemStack getResult() { + return new ItemStack(RefinedStorageItems.PROCESSOR, 1, type); + } - @Override - public int getDuration() - { - switch (type) - { - case ItemProcessor.TYPE_BASIC: - return 250; - case ItemProcessor.TYPE_IMPROVED: - return 300; - case ItemProcessor.TYPE_ADVANCED: - return 350; - } + @Override + public int getDuration() { + switch (type) { + case ItemProcessor.TYPE_BASIC: + return 250; + case ItemProcessor.TYPE_IMPROVED: + return 300; + case ItemProcessor.TYPE_ADVANCED: + return 350; + } - return 0; - } + return 0; + } } diff --git a/src/main/java/refinedstorage/tile/solderer/SoldererRecipeStorage.java b/src/main/java/refinedstorage/tile/solderer/SoldererRecipeStorage.java old mode 100644 new mode 100755 index ab8562fdb..4312366c0 --- a/src/main/java/refinedstorage/tile/solderer/SoldererRecipeStorage.java +++ b/src/main/java/refinedstorage/tile/solderer/SoldererRecipeStorage.java @@ -7,45 +7,35 @@ import refinedstorage.block.EnumStorageType; import refinedstorage.item.ItemBlockStorage; import refinedstorage.item.ItemProcessor; -public class SoldererRecipeStorage implements ISoldererRecipe -{ - private EnumStorageType type; - private int storagePart; +public class SoldererRecipeStorage implements ISoldererRecipe { + private EnumStorageType type; + private int storagePart; - public SoldererRecipeStorage(EnumStorageType type, int storagePart) - { - this.type = type; - this.storagePart = storagePart; - } + public SoldererRecipeStorage(EnumStorageType type, int storagePart) { + this.type = type; + this.storagePart = storagePart; + } - @Override - public ItemStack getRow(int row) - { - if (row == 0) - { - return new ItemStack(RefinedStorageItems.STORAGE_PART, 1, storagePart); - } - else if (row == 1) - { - return new ItemStack(RefinedStorageBlocks.MACHINE_CASING); - } - else if (row == 2) - { - return new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED); - } + @Override + public ItemStack getRow(int row) { + if (row == 0) { + return new ItemStack(RefinedStorageItems.STORAGE_PART, 1, storagePart); + } else if (row == 1) { + return new ItemStack(RefinedStorageBlocks.MACHINE_CASING); + } else if (row == 2) { + return new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED); + } - return null; - } + return null; + } - @Override - public ItemStack getResult() - { - return ItemBlockStorage.initNBT(new ItemStack(RefinedStorageBlocks.STORAGE, 1, type.getId())); - } + @Override + public ItemStack getResult() { + return ItemBlockStorage.initNBT(new ItemStack(RefinedStorageBlocks.STORAGE, 1, type.getId())); + } - @Override - public int getDuration() - { - return 200; - } + @Override + public int getDuration() { + return 200; + } } diff --git a/src/main/java/refinedstorage/tile/solderer/SoldererRecipeWirelessGrid.java b/src/main/java/refinedstorage/tile/solderer/SoldererRecipeWirelessGrid.java deleted file mode 100644 index 6ffd916ff..000000000 --- a/src/main/java/refinedstorage/tile/solderer/SoldererRecipeWirelessGrid.java +++ /dev/null @@ -1,47 +0,0 @@ -package refinedstorage.tile.solderer; - -import net.minecraft.item.ItemStack; -import refinedstorage.RefinedStorageBlocks; -import refinedstorage.RefinedStorageItems; -import refinedstorage.item.ItemProcessor; - -public class SoldererRecipeWirelessGrid implements ISoldererRecipe -{ - private int type; - - public SoldererRecipeWirelessGrid(int type) - { - this.type = type; - } - - @Override - public ItemStack getRow(int row) - { - if (row == 0) - { - return new ItemStack(RefinedStorageItems.WIRELESS_GRID_PLATE); - } - else if (row == 1) - { - return new ItemStack(RefinedStorageBlocks.GRID, 1, type); - } - else if (row == 2) - { - return new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED); - } - - return null; - } - - @Override - public ItemStack getResult() - { - return new ItemStack(RefinedStorageItems.WIRELESS_GRID, 1, type); - } - - @Override - public int getDuration() - { - return 1000; - } -} diff --git a/src/main/java/refinedstorage/tile/solderer/SoldererRegistry.java b/src/main/java/refinedstorage/tile/solderer/SoldererRegistry.java old mode 100644 new mode 100755 index 4855174cd..79c2cc4d0 --- a/src/main/java/refinedstorage/tile/solderer/SoldererRegistry.java +++ b/src/main/java/refinedstorage/tile/solderer/SoldererRegistry.java @@ -1,61 +1,50 @@ package refinedstorage.tile.solderer; -import java.util.ArrayList; -import java.util.List; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import refinedstorage.util.InventoryUtils; -public class SoldererRegistry -{ - public static List recipes = new ArrayList(); +import java.util.ArrayList; +import java.util.List; - public static void addRecipe(ISoldererRecipe recipe) - { - recipes.add(recipe); - } +public class SoldererRegistry { + public static List recipes = new ArrayList(); - public static ISoldererRecipe getRecipe(IInventory inventory) - { - for (ISoldererRecipe recipe : recipes) - { - boolean ok = true; + public static void addRecipe(ISoldererRecipe recipe) { + recipes.add(recipe); + } - for (int i = 0; i < 3; ++i) - { - if (!InventoryUtils.compareStackNoQuantity(recipe.getRow(i), inventory.getStackInSlot(i))) - { - ok = false; - } + public static ISoldererRecipe getRecipe(IInventory inventory) { + for (ISoldererRecipe recipe : recipes) { + boolean ok = true; - if (inventory.getStackInSlot(i) != null && recipe.getRow(i) != null) - { - if (inventory.getStackInSlot(i).stackSize < recipe.getRow(i).stackSize) - { - ok = false; - } - } - } + for (int i = 0; i < 3; ++i) { + if (!InventoryUtils.compareStackNoQuantity(recipe.getRow(i), inventory.getStackInSlot(i))) { + ok = false; + } - if (ok) - { - return recipe; - } - } + if (inventory.getStackInSlot(i) != null && recipe.getRow(i) != null) { + if (inventory.getStackInSlot(i).stackSize < recipe.getRow(i).stackSize) { + ok = false; + } + } + } - return null; - } + if (ok) { + return recipe; + } + } - public static ISoldererRecipe getRecipe(ItemStack result) - { - for (ISoldererRecipe recipe : recipes) - { - if (InventoryUtils.compareStack(result, recipe.getResult())) - { - return recipe; - } - } + return null; + } - return null; - } + public static ISoldererRecipe getRecipe(ItemStack result) { + for (ISoldererRecipe recipe : recipes) { + if (InventoryUtils.compareStack(result, recipe.getResult())) { + return recipe; + } + } + + return null; + } } diff --git a/src/main/java/refinedstorage/util/InventoryUtils.java b/src/main/java/refinedstorage/util/InventoryUtils.java old mode 100644 new mode 100755 index f5263cd01..1e62fa23f --- a/src/main/java/refinedstorage/util/InventoryUtils.java +++ b/src/main/java/refinedstorage/util/InventoryUtils.java @@ -8,268 +8,217 @@ import net.minecraft.nbt.NBTTagList; import net.minecraft.world.World; import net.minecraftforge.common.util.Constants; -public class InventoryUtils -{ - public static final String NBT_INVENTORY = "Inventory_%d"; - public static final String NBT_SLOT = "Slot"; +public class InventoryUtils { + public static final String NBT_INVENTORY = "Inventory_%d"; + public static final String NBT_SLOT = "Slot"; - public static final int COMPARE_DAMAGE = 1; - public static final int COMPARE_NBT = 2; - public static final int COMPARE_QUANTITY = 4; + public static final int COMPARE_DAMAGE = 1; + public static final int COMPARE_NBT = 2; + public static final int COMPARE_QUANTITY = 4; - public static void saveInventory(IInventory inventory, int id, NBTTagCompound nbt) - { - NBTTagList tagList = new NBTTagList(); + public static void saveInventory(IInventory inventory, int id, NBTTagCompound nbt) { + NBTTagList tagList = new NBTTagList(); - for (int i = 0; i < inventory.getSizeInventory(); i++) - { - if (inventory.getStackInSlot(i) != null) - { - NBTTagCompound compoundTag = new NBTTagCompound(); + for (int i = 0; i < inventory.getSizeInventory(); i++) { + if (inventory.getStackInSlot(i) != null) { + NBTTagCompound compoundTag = new NBTTagCompound(); - compoundTag.setInteger(NBT_SLOT, i); + compoundTag.setInteger(NBT_SLOT, i); - inventory.getStackInSlot(i).writeToNBT(compoundTag); + inventory.getStackInSlot(i).writeToNBT(compoundTag); - tagList.appendTag(compoundTag); - } - } + tagList.appendTag(compoundTag); + } + } - nbt.setTag(String.format(NBT_INVENTORY, id), tagList); - } + nbt.setTag(String.format(NBT_INVENTORY, id), tagList); + } - public static void restoreInventory(IInventory inventory, int id, NBTTagCompound nbt) - { - String name = String.format(NBT_INVENTORY, id); + public static void restoreInventory(IInventory inventory, int id, NBTTagCompound nbt) { + String name = String.format(NBT_INVENTORY, id); - if (nbt.hasKey(name)) - { - NBTTagList tagList = nbt.getTagList(name, Constants.NBT.TAG_COMPOUND); + if (nbt.hasKey(name)) { + NBTTagList tagList = nbt.getTagList(name, Constants.NBT.TAG_COMPOUND); - for (int i = 0; i < tagList.tagCount(); i++) - { - int slot = tagList.getCompoundTagAt(i).getInteger(NBT_SLOT); + for (int i = 0; i < tagList.tagCount(); i++) { + int slot = tagList.getCompoundTagAt(i).getInteger(NBT_SLOT); - ItemStack stack = ItemStack.loadItemStackFromNBT(tagList.getCompoundTagAt(i)); + ItemStack stack = ItemStack.loadItemStackFromNBT(tagList.getCompoundTagAt(i)); - inventory.setInventorySlotContents(slot, stack); - } - } - } + inventory.setInventorySlotContents(slot, stack); + } + } + } - public static void dropInventory(World world, IInventory inventory, int x, int y, int z) - { - for (int i = 0; i < inventory.getSizeInventory(); ++i) - { - ItemStack stack = inventory.getStackInSlot(i); + public static void dropInventory(World world, IInventory inventory, int x, int y, int z) { + for (int i = 0; i < inventory.getSizeInventory(); ++i) { + ItemStack stack = inventory.getStackInSlot(i); - if (stack != null) - { - dropStack(world, stack, x, y, z); - } - } - } + if (stack != null) { + dropStack(world, stack, x, y, z); + } + } + } - public static void dropStack(World world, ItemStack stack, int x, int y, int z) - { - float xo = world.rand.nextFloat() * 0.8F + 0.1F; - float yo = world.rand.nextFloat() * 0.8F + 0.1F; - float zo = world.rand.nextFloat() * 0.8F + 0.1F; + public static void dropStack(World world, ItemStack stack, int x, int y, int z) { + float xo = world.rand.nextFloat() * 0.8F + 0.1F; + float yo = world.rand.nextFloat() * 0.8F + 0.1F; + float zo = world.rand.nextFloat() * 0.8F + 0.1F; - while (stack.stackSize > 0) - { - int amount = world.rand.nextInt(21) + 10; + while (stack.stackSize > 0) { + int amount = world.rand.nextInt(21) + 10; - if (amount > stack.stackSize) - { - amount = stack.stackSize; - } + if (amount > stack.stackSize) { + amount = stack.stackSize; + } - stack.stackSize -= amount; + stack.stackSize -= amount; - EntityItem entity = new EntityItem(world, (float) x + xo, (float) y + yo, (float) z + zo, new ItemStack(stack.getItem(), amount, stack.getItemDamage())); + EntityItem entity = new EntityItem(world, (float) x + xo, (float) y + yo, (float) z + zo, new ItemStack(stack.getItem(), amount, stack.getItemDamage())); - entity.motionX = (float) world.rand.nextGaussian() * 0.05F; - entity.motionY = (float) world.rand.nextGaussian() * 0.05F + 0.2F; - entity.motionZ = (float) world.rand.nextGaussian() * 0.05F; + entity.motionX = (float) world.rand.nextGaussian() * 0.05F; + entity.motionY = (float) world.rand.nextGaussian() * 0.05F + 0.2F; + entity.motionZ = (float) world.rand.nextGaussian() * 0.05F; - if (stack.hasTagCompound()) - { - entity.getEntityItem().setTagCompound((NBTTagCompound) stack.getTagCompound().copy()); - } + if (stack.hasTagCompound()) { + entity.getEntityItem().setTagCompound((NBTTagCompound) stack.getTagCompound().copy()); + } - world.spawnEntityInWorld(entity); - } - } + world.spawnEntityInWorld(entity); + } + } - public static void pushToInventorySlot(IInventory inventory, int i, ItemStack stack) - { - ItemStack slot = inventory.getStackInSlot(i); + public static void pushToInventorySlot(IInventory inventory, int i, ItemStack stack) { + ItemStack slot = inventory.getStackInSlot(i); - if (slot == null) - { - inventory.setInventorySlotContents(i, stack); - } - else if (compareStackNoQuantity(slot, stack)) - { - slot.stackSize += stack.stackSize; - } - } + if (slot == null) { + inventory.setInventorySlotContents(i, stack); + } else if (compareStackNoQuantity(slot, stack)) { + slot.stackSize += stack.stackSize; + } + } - public static boolean canPushToInventorySlot(IInventory inventory, int i, ItemStack stack) - { - ItemStack slot = inventory.getStackInSlot(i); + public static boolean canPushToInventorySlot(IInventory inventory, int i, ItemStack stack) { + ItemStack slot = inventory.getStackInSlot(i); - if (slot == null) - { - return true; - } + if (slot == null) { + return true; + } - if (!compareStackNoQuantity(slot, stack)) - { - return false; - } + if (!compareStackNoQuantity(slot, stack)) { + return false; + } - return slot.stackSize + stack.stackSize < slot.getMaxStackSize(); - } + return slot.stackSize + stack.stackSize < slot.getMaxStackSize(); + } - public static void pushToInventory(IInventory inventory, ItemStack stack) - { - int toGo = stack.stackSize; + public static void pushToInventory(IInventory inventory, ItemStack stack) { + int toGo = stack.stackSize; - for (int i = 0; i < inventory.getSizeInventory(); ++i) - { - ItemStack slot = inventory.getStackInSlot(i); + for (int i = 0; i < inventory.getSizeInventory(); ++i) { + ItemStack slot = inventory.getStackInSlot(i); - if (slot == null) - { - inventory.setInventorySlotContents(i, stack); + if (slot == null) { + inventory.setInventorySlotContents(i, stack); - return; - } - else if (compareStackNoQuantity(slot, stack)) - { - int toAdd = toGo; + return; + } else if (compareStackNoQuantity(slot, stack)) { + int toAdd = toGo; - if (slot.stackSize + toAdd > slot.getMaxStackSize()) - { - toAdd = slot.getMaxStackSize() - slot.stackSize; - } + if (slot.stackSize + toAdd > slot.getMaxStackSize()) { + toAdd = slot.getMaxStackSize() - slot.stackSize; + } - slot.stackSize += toAdd; + slot.stackSize += toAdd; - toGo -= toAdd; + toGo -= toAdd; - if (toGo == 0) - { - return; - } - } - } - } + if (toGo == 0) { + return; + } + } + } + } - public static boolean canPushToInventory(IInventory inventory, ItemStack stack) - { - int toGo = stack.stackSize; + public static boolean canPushToInventory(IInventory inventory, ItemStack stack) { + int toGo = stack.stackSize; - for (int i = 0; i < inventory.getSizeInventory(); ++i) - { - // @TODO: Test this better - if (!inventory.isItemValidForSlot(i, stack)) - { - continue; - } + for (int i = 0; i < inventory.getSizeInventory(); ++i) { + if (!inventory.isItemValidForSlot(i, stack)) { + continue; + } - ItemStack slot = inventory.getStackInSlot(i); + ItemStack slot = inventory.getStackInSlot(i); - if (slot == null) - { - return true; - } - else if (compareStackNoQuantity(slot, stack)) - { - int toAdd = toGo; + if (slot == null) { + return true; + } else if (compareStackNoQuantity(slot, stack)) { + int toAdd = toGo; - if (slot.stackSize + toAdd > slot.getMaxStackSize()) - { - toAdd = slot.getMaxStackSize() - slot.stackSize; - } + if (slot.stackSize + toAdd > slot.getMaxStackSize()) { + toAdd = slot.getMaxStackSize() - slot.stackSize; + } - toGo -= toAdd; + toGo -= toAdd; - if (toGo == 0) - { - break; - } - } - } + if (toGo == 0) { + break; + } + } + } - return toGo == 0; - } + return toGo == 0; + } - public static int getInventoryItems(IInventory inventory) - { - int size = 0; + public static int getInventoryItems(IInventory inventory) { + int size = 0; - for (int i = 0; i < inventory.getSizeInventory(); ++i) - { - ItemStack slot = inventory.getStackInSlot(i); + for (int i = 0; i < inventory.getSizeInventory(); ++i) { + ItemStack slot = inventory.getStackInSlot(i); - if (slot != null) - { - size += slot.stackSize; - } - } + if (slot != null) { + size += slot.stackSize; + } + } - return size; - } + return size; + } - public static boolean compareStack(ItemStack first, ItemStack second) - { - return compareStack(first, second, COMPARE_NBT | COMPARE_DAMAGE | COMPARE_QUANTITY); - } + public static boolean compareStack(ItemStack first, ItemStack second) { + return compareStack(first, second, COMPARE_NBT | COMPARE_DAMAGE | COMPARE_QUANTITY); + } - public static boolean compareStack(ItemStack first, ItemStack second, int flags) - { - if (first == null && second == null) - { - return true; - } + public static boolean compareStack(ItemStack first, ItemStack second, int flags) { + if (first == null && second == null) { + return true; + } - if ((first == null && second != null) || (first != null && second == null)) - { - return false; - } + if ((first == null && second != null) || (first != null && second == null)) { + return false; + } - if ((flags & COMPARE_DAMAGE) == COMPARE_DAMAGE) - { - if (first.getItemDamage() != second.getItemDamage()) - { - return false; - } - } + if ((flags & COMPARE_DAMAGE) == COMPARE_DAMAGE) { + if (first.getItemDamage() != second.getItemDamage()) { + return false; + } + } - if ((flags & COMPARE_NBT) == COMPARE_NBT) - { - if (first.hasTagCompound() && !first.getTagCompound().equals(second.getTagCompound())) - { - return false; - } - } + if ((flags & COMPARE_NBT) == COMPARE_NBT) { + if (first.hasTagCompound() && !first.getTagCompound().equals(second.getTagCompound())) { + return false; + } + } - if ((flags & COMPARE_QUANTITY) == COMPARE_QUANTITY) - { - if (first.stackSize != second.stackSize) - { - return false; - } - } + if ((flags & COMPARE_QUANTITY) == COMPARE_QUANTITY) { + if (first.stackSize != second.stackSize) { + return false; + } + } - return first.getItem() == second.getItem(); - } + return first.getItem() == second.getItem(); + } - public static boolean compareStackNoQuantity(ItemStack first, ItemStack second) - { - return compareStack(first, second, COMPARE_NBT | COMPARE_DAMAGE); - } + public static boolean compareStackNoQuantity(ItemStack first, ItemStack second) { + return compareStack(first, second, COMPARE_NBT | COMPARE_DAMAGE); + } } diff --git a/src/main/resources/assets/refinedstorage/blockstates/cable.json b/src/main/resources/assets/refinedstorage/blockstates/cable.json old mode 100644 new mode 100755 index da0d91d09..f3261ef4c --- 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 old mode 100644 new mode 100755 index 86a3dc400..0ba47c9b8 --- 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 old mode 100644 new mode 100755 index f148cfbbf..081716e07 --- 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 old mode 100644 new mode 100755 index e947cc052..9fc7adc9c --- 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 old mode 100644 new mode 100755 index d1c62d543..77f3ea633 --- 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 new file mode 100755 index 000000000..fdbb245a2 --- /dev/null +++ b/src/main/resources/assets/refinedstorage/blockstates/disk_drive.json @@ -0,0 +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 + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/blockstates/drive.json b/src/main/resources/assets/refinedstorage/blockstates/drive.json deleted file mode 100644 index 7498bdd96..000000000 --- a/src/main/resources/assets/refinedstorage/blockstates/drive.json +++ /dev/null @@ -1,45 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "orientable", - "textures": { - "side": "refinedstorage:blocks/side", - "top": "refinedstorage:blocks/side", - "front": "refinedstorage:blocks/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 old mode 100644 new mode 100755 index 3e97ab4d9..8fef98a80 --- 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 old mode 100644 new mode 100755 index 6b891d4ee..56d8e97b7 --- 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 old mode 100644 new mode 100755 index 578d68dd0..45b48a2ad --- 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 old mode 100644 new mode 100755 index 88a844591..78a57739e --- 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 old mode 100644 new mode 100755 index 212f79249..7e5023f77 --- 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 old mode 100644 new mode 100755 index 243b9a488..00c5b91bd --- 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 old mode 100644 new mode 100755 index 5aeb8a774..af77013e8 --- 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 old mode 100644 new mode 100755 index d2f88bdf8..f5575de5e --- 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 old mode 100644 new mode 100755 index 3104f7dea..9d6bc5795 --- 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 deleted file mode 100644 index 83c6efba5..000000000 --- a/src/main/resources/assets/refinedstorage/blockstates/wireless_transmitter.json +++ /dev/null @@ -1,56 +0,0 @@ -{ - "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/lang/en_US.lang b/src/main/resources/assets/refinedstorage/lang/en_US.lang old mode 100644 new mode 100755 index 2d4b9a3fd..b50764d79 --- a/src/main/resources/assets/refinedstorage/lang/en_US.lang +++ b/src/main/resources/assets/refinedstorage/lang/en_US.lang @@ -2,22 +2,21 @@ itemGroup.refinedstorage=Refined Storage gui.refinedstorage:controller.0=Controller gui.refinedstorage:controller.1=Creative Controller +gui.refinedstorage:controller.machine_position.x=X: %d +gui.refinedstorage:controller.machine_position.y=Y: %d +gui.refinedstorage:controller.machine_position.z=Z: %d gui.refinedstorage:grid=Grid -gui.refinedstorage:drive=Drive +gui.refinedstorage:disk_drive=Drive gui.refinedstorage:external_storage=External Storage gui.refinedstorage:importer=Importer gui.refinedstorage:exporter=Exporter gui.refinedstorage:detector=Detector gui.refinedstorage:solderer=Solderer -gui.refinedstorage:wireless_transmitter=Wireless Transmitter gui.refinedstorage:destructor=Destructor gui.refinedstorage:constructor=Constructor gui.refinedstorage:relay=Relay gui.refinedstorage:interface.import=Interface Import gui.refinedstorage:interface.export=Interface Export -gui.refinedstorage:interface.export.explanation.0=Top slots: items you want exported -gui.refinedstorage:interface.export.explanation.1=Clear a slot: mouse click + SHIFT -gui.refinedstorage:interface.export.explanation.2=Incr. or decr. a slot: left/ right mouse click misc.refinedstorage:energy_stored=%d / %d RF misc.refinedstorage:energy_usage=Usage: %d RF/t @@ -29,14 +28,11 @@ misc.refinedstorage:storage.stored_minimal=%d misc.refinedstorage:storage.stored_capacity_minimal=%d / %d misc.refinedstorage:storage.full=%d%% full -misc.refinedstorage:wireless_grid.tooltip=Bound to %d, %d, %d. -misc.refinedstorage:wireless_grid.not_working=The Wireless Transmitter is disabled or out of fuel. -misc.refinedstorage:wireless_grid.not_found=The Wireless Transmitter is not found. -misc.refinedstorage:wireless_grid.not_set.0=This Wireless Grid is not bound to a Wireless Transmitter yet. -misc.refinedstorage:wireless_grid.not_set.1=This Wireless Crafting Grid is not bound to a Wireless Transmitter yet. -misc.refinedstorage:wireless_grid.out_of_range=The Wireless Transmitter is out of range. -misc.refinedstorage:wireless_grid.no_grid.0=There is no Grid found in the network. You need to place a Grid before you can use the Wireless Grid! -misc.refinedstorage:wireless_grid.no_grid.1=There is no Crafting Grid found in the network. You need to place a Crafting Grid before you can use the Wireless Crafting Grid! +misc.refinedstorage:wireless_grid.tooltip.0=X: %d +misc.refinedstorage:wireless_grid.tooltip.1=Y: %d +misc.refinedstorage:wireless_grid.tooltip.2=Z: %d +misc.refinedstorage:wireless_grid.out_of_range=Grid out of range. +misc.refinedstorage:wireless_grid.not_found=Grid not found. misc.refinedstorage:yes=Yes misc.refinedstorage:no=No @@ -73,14 +69,13 @@ block.refinedstorage:controller.1.name=Creative Controller block.refinedstorage:cable.name=Cable block.refinedstorage:grid.0.name=Grid block.refinedstorage:grid.1.name=Crafting Grid -block.refinedstorage:drive.name=Drive +block.refinedstorage:disk_drive.name=Disk Drive block.refinedstorage:external_storage.name=External Storage block.refinedstorage:importer.name=Importer block.refinedstorage:exporter.name=Exporter block.refinedstorage:detector.name=Detector block.refinedstorage:machine_casing.name=Machine Casing block.refinedstorage:solderer.name=Solderer -block.refinedstorage:wireless_transmitter.name=Wireless Transmitter block.refinedstorage:destructor.name=Destructor block.refinedstorage:constructor.name=Constructor block.refinedstorage:storage.0.name=1k Storage Block @@ -91,14 +86,12 @@ block.refinedstorage:storage.4.name=Creative Storage Block block.refinedstorage:relay.name=Relay block.refinedstorage:interface.name=Interface -item.refinedstorage:storage_cell.0.name=1k Storage Cell -item.refinedstorage:storage_cell.1.name=4k Storage Cell -item.refinedstorage:storage_cell.2.name=16k Storage Cell -item.refinedstorage:storage_cell.3.name=64k Storage Cell -item.refinedstorage:storage_cell.4.name=Creative Storage Cell -item.refinedstorage:wireless_grid.0.name=Wireless Grid -item.refinedstorage:wireless_grid.1.name=Wireless Crafting Grid -item.refinedstorage:wireless_grid_plate.name=Wireless Grid Plate +item.refinedstorage:storage_disk.0.name=1k Storage Disk +item.refinedstorage:storage_disk.1.name=4k Storage Disk +item.refinedstorage:storage_disk.2.name=16k Storage Disk +item.refinedstorage:storage_disk.3.name=64k Storage Disk +item.refinedstorage:storage_disk.4.name=Creative Storage Disk +item.refinedstorage:wireless_grid.name=Wireless Grid item.refinedstorage:quartz_enriched_iron.name=Quartz Enriched Iron item.refinedstorage:core.0.name=Construction Core item.refinedstorage:core.1.name=Destruction Core diff --git a/src/main/resources/assets/refinedstorage/lang/nl_NL.lang b/src/main/resources/assets/refinedstorage/lang/nl_NL.lang old mode 100644 new mode 100755 index 4cc12c252..b57f86d95 --- a/src/main/resources/assets/refinedstorage/lang/nl_NL.lang +++ b/src/main/resources/assets/refinedstorage/lang/nl_NL.lang @@ -2,22 +2,21 @@ itemGroup.refinedstorage=Refined Storage gui.refinedstorage:controller.0=Controller gui.refinedstorage:controller.1=Creative Controller +gui.refinedstorage:controller.machine_position.x=X: %d +gui.refinedstorage:controller.machine_position.y=Y: %d +gui.refinedstorage:controller.machine_position.z=Z: %d gui.refinedstorage:grid=Rooster -gui.refinedstorage:drive=Schijf +gui.refinedstorage:disk_drive=Schijf gui.refinedstorage:external_storage=Externe Opslag gui.refinedstorage:importer=Importeur gui.refinedstorage:exporter=Exporteur gui.refinedstorage:detector=Detector gui.refinedstorage:solderer=Soldeerder -gui.refinedstorage:wireless_transmitter=Draadloze Zender gui.refinedstorage:destructor=Destructor gui.refinedstorage:constructor=Constructor gui.refinedstorage:relay=Relais gui.refinedstorage:interface.import=Interface Import gui.refinedstorage:interface.export=Interface Export -gui.refinedstorage:interface.export.explanation.0=Bovenste slots: items die je wilt exporten -gui.refinedstorage:interface.export.explanation.1=Slot leegmaken: muisklik + SHIFT -gui.refinedstorage:interface.export.explanation.2=Verhoog of verklein aantal: links/ rechts muisklik misc.refinedstorage:energy_stored=%d / %d RF misc.refinedstorage:energy_usage=Vebruik: %d RF/t @@ -29,14 +28,11 @@ misc.refinedstorage:storage.stored_minimal=%d misc.refinedstorage:storage.stored_capacity_minimal=%d / %d misc.refinedstorage:storage.full=%d%% vol -misc.refinedstorage:wireless_grid.tooltip=Gebonden aan %d, %d, %d. -misc.refinedstorage:wireless_grid.not_working=De Draadloze Zender is uit of zonder brandstof gevallen. -misc.refinedstorage:wireless_grid.not_found=De Draadloze Zender werd niet gevonden. -misc.refinedstorage:wireless_grid.not_set.0=Dit Draadloos Rooster is nog niet gebonden aan een Draadloze Zender. -misc.refinedstorage:wireless_grid.not_set.1=Dit Draadloos Crafting Rooster is nog niet gebonden aan een Draadloze Zender. -misc.refinedstorage:wireless_grid.out_of_range=De Draadloze Zender is buiten bereik. -misc.refinedstorage:wireless_grid.no_grid.0=Er is geen Rooster gevonden in het netwerk. Je moet eerst een Rooster plaatsen voor je het Draadloze Rooster kunt gebruiken. -misc.refinedstorage:wireless_grid.no_grid.1=Er is geen Crafting Rooster gevonden in het netwerk. Je moet eerst een Crafting Rooster plaatsen voor je het Draadloze Crafting Rooster kunt gebruiken. +misc.refinedstorage:wireless_grid.tooltip.0=X: %d +misc.refinedstorage:wireless_grid.tooltip.1=Y: %d +misc.refinedstorage:wireless_grid.tooltip.2=Z: %d +misc.refinedstorage:wireless_grid.out_of_range=Rooster buiten bereik. +misc.refinedstorage:wireless_grid.not_found=Rooster werd niet gevonden. misc.refinedstorage:yes=Ja misc.refinedstorage:no=Nee @@ -73,14 +69,13 @@ block.refinedstorage:controller.1.name=Creative Controller block.refinedstorage:cable.name=Kabel block.refinedstorage:grid.0.name=Rooster block.refinedstorage:grid.1.name=Crafting Rooster -block.refinedstorage:drive.name=Schijf +block.refinedstorage:disk_drive.name=Schijf block.refinedstorage:external_storage.name=Externe Opslag block.refinedstorage:importer.name=Importeur block.refinedstorage:exporter.name=Exporteur block.refinedstorage:detector.name=Detector block.refinedstorage:machine_casing.name=Machine-omhulsel block.refinedstorage:solderer.name=Soldeerder -block.refinedstorage:wireless_transmitter.name=Draadloze Zender block.refinedstorage:destructor.name=Destructor block.refinedstorage:constructor.name=Constructor block.refinedstorage:storage.0.name=1k Opslag Blok @@ -91,14 +86,12 @@ block.refinedstorage:storage.4.name=Creative Opslag Blok block.refinedstorage:relay.name=Relais block.refinedstorage:interface.name=Interface -item.refinedstorage:storage_cell.0.name=1k Opslagcel -item.refinedstorage:storage_cell.1.name=4k Opslagcel -item.refinedstorage:storage_cell.2.name=16k Opslagcel -item.refinedstorage:storage_cell.3.name=64k Opslagcel -item.refinedstorage:storage_cell.4.name=Creative Opslagcel -item.refinedstorage:wireless_grid.0.name=Draadloze Rooster -item.refinedstorage:wireless_grid.1.name=Draadloze Crafting Rooster -item.refinedstorage:wireless_grid_plate.name=Draadloze Rooster Bord +item.refinedstorage:storage_disk.0.name=1k Opslagschijf +item.refinedstorage:storage_disk.1.name=4k Opslagschijf +item.refinedstorage:storage_disk.2.name=16k Opslagschijf +item.refinedstorage:storage_disk.3.name=64k Opslagschijf +item.refinedstorage:storage_disk.4.name=Creative Opslagschijf +item.refinedstorage:wireless_grid.name=Draadloze Rooster item.refinedstorage:quartz_enriched_iron.name=Quartz Verrijkt Iron item.refinedstorage:core.0.name=Constructie Core item.refinedstorage:core.1.name=Destructie Core diff --git a/src/main/resources/assets/refinedstorage/models/block/cable.json b/src/main/resources/assets/refinedstorage/models/block/cable.json old mode 100644 new mode 100755 index 049952da6..3170aa97d --- 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 old mode 100644 new mode 100755 index 7fca82c2c..9f9d5149d --- 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 old mode 100644 new mode 100755 index 29b512eb5..b6751c24f --- 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 old mode 100644 new mode 100755 index 10aad3374..52ab45d9d --- 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 old mode 100644 new mode 100755 index db2875e5e..8ea78cadb --- 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 old mode 100644 new mode 100755 index 9dbd6a5b5..ade8e334a --- 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 old mode 100644 new mode 100755 index ddddd6029..deddf2228 --- 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 old mode 100644 new mode 100755 index 46b37e739..49d4b478c --- 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_cell.json b/src/main/resources/assets/refinedstorage/models/item/16k_storage_cell.json deleted file mode 100644 index e6ec70183..000000000 --- a/src/main/resources/assets/refinedstorage/models/item/16k_storage_cell.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "refinedstorage:items/16k_storage_cell" - } -} 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 new file mode 100755 index 000000000..d3ba63db3 --- /dev/null +++ b/src/main/resources/assets/refinedstorage/models/item/16k_storage_disk.json @@ -0,0 +1,6 @@ +{ + "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 old mode 100644 new mode 100755 index 6e5519a16..e630fcf4c --- 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_cell.json b/src/main/resources/assets/refinedstorage/models/item/1k_storage_cell.json deleted file mode 100644 index 92eb3c266..000000000 --- a/src/main/resources/assets/refinedstorage/models/item/1k_storage_cell.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "refinedstorage:items/1k_storage_cell" - } -} 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 new file mode 100755 index 000000000..4e88445ef --- /dev/null +++ b/src/main/resources/assets/refinedstorage/models/item/1k_storage_disk.json @@ -0,0 +1,6 @@ +{ + "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 old mode 100644 new mode 100755 index 09e84303c..ced967a21 --- 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_cell.json b/src/main/resources/assets/refinedstorage/models/item/4k_storage_cell.json deleted file mode 100644 index 8824a609d..000000000 --- a/src/main/resources/assets/refinedstorage/models/item/4k_storage_cell.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "refinedstorage:items/4k_storage_cell" - } -} 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 new file mode 100755 index 000000000..6989f65dd --- /dev/null +++ b/src/main/resources/assets/refinedstorage/models/item/4k_storage_disk.json @@ -0,0 +1,6 @@ +{ + "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 old mode 100644 new mode 100755 index 9e293d54f..604dfb96e --- 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_cell.json b/src/main/resources/assets/refinedstorage/models/item/64k_storage_cell.json deleted file mode 100644 index 45364a6d2..000000000 --- a/src/main/resources/assets/refinedstorage/models/item/64k_storage_cell.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "refinedstorage:items/64k_storage_cell" - } -} 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 new file mode 100755 index 000000000..08037e6fe --- /dev/null +++ b/src/main/resources/assets/refinedstorage/models/item/64k_storage_disk.json @@ -0,0 +1,6 @@ +{ + "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 old mode 100644 new mode 100755 index 6bca83069..b5814de24 --- 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 old mode 100644 new mode 100755 index c2d3ba27e..075924901 --- 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 old mode 100644 new mode 100755 index 93ce71e7d..43f5a4e2f --- 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 old mode 100644 new mode 100755 index 30cd2ee78..10fa74269 --- 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 old mode 100644 new mode 100755 index 76ca670d3..607a63c96 --- 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/blank_pattern.json b/src/main/resources/assets/refinedstorage/models/item/blank_pattern.json deleted file mode 100644 index fdd3537e0..000000000 --- a/src/main/resources/assets/refinedstorage/models/item/blank_pattern.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "refinedstorage:items/blank_pattern" - } -} diff --git a/src/main/resources/assets/refinedstorage/models/item/construction_core.json b/src/main/resources/assets/refinedstorage/models/item/construction_core.json old mode 100644 new mode 100755 index 8d7d69455..9d82ab680 --- 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_cell.json b/src/main/resources/assets/refinedstorage/models/item/creative_storage_cell.json deleted file mode 100644 index 3088d2636..000000000 --- a/src/main/resources/assets/refinedstorage/models/item/creative_storage_cell.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "refinedstorage:items/creative_storage_cell" - } -} 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 new file mode 100755 index 000000000..4969e9812 --- /dev/null +++ b/src/main/resources/assets/refinedstorage/models/item/creative_storage_disk.json @@ -0,0 +1,6 @@ +{ + "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 old mode 100644 new mode 100755 index c58e13661..da9c5d468 --- 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 old mode 100644 new mode 100755 index 6422d750d..53286c3d8 --- 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 old mode 100644 new mode 100755 index a76b43436..5dedd64a2 --- 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 old mode 100644 new mode 100755 index 69a3b0a89..c957cf777 --- 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 old mode 100644 new mode 100755 index 688321cf7..af0f60dc7 --- 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 old mode 100644 new mode 100755 index 091538c0d..d42af72c2 --- 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 old mode 100644 new mode 100755 index 73cacbc69..13d27aa4d --- 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 old mode 100644 new mode 100755 index 7cc6fc397..bae0192fb --- 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 deleted file mode 100644 index 08fb6203a..000000000 --- a/src/main/resources/assets/refinedstorage/models/item/wireless_grid_plate.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "refinedstorage:items/wireless_grid_plate" - } -} diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/16k_storage_block.png b/src/main/resources/assets/refinedstorage/textures/blocks/16k_storage_block.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/1k_storage_block.png b/src/main/resources/assets/refinedstorage/textures/blocks/1k_storage_block.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/4k_storage_block.png b/src/main/resources/assets/refinedstorage/textures/blocks/4k_storage_block.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/64k_storage_block.png b/src/main/resources/assets/refinedstorage/textures/blocks/64k_storage_block.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/constructor_connected.png b/src/main/resources/assets/refinedstorage/textures/blocks/constructor_connected.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/constructor_disconnected.png b/src/main/resources/assets/refinedstorage/textures/blocks/constructor_disconnected.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/controller_0.png b/src/main/resources/assets/refinedstorage/textures/blocks/controller_0.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/controller_7.png b/src/main/resources/assets/refinedstorage/textures/blocks/controller_7.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/controller_8.png b/src/main/resources/assets/refinedstorage/textures/blocks/controller_8.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/creative_storage_block.png b/src/main/resources/assets/refinedstorage/textures/blocks/creative_storage_block.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/destructor_connected.png b/src/main/resources/assets/refinedstorage/textures/blocks/destructor_connected.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/destructor_disconnected.png b/src/main/resources/assets/refinedstorage/textures/blocks/destructor_disconnected.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/detector_powered.png b/src/main/resources/assets/refinedstorage/textures/blocks/detector_powered.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/detector_unpowered.png b/src/main/resources/assets/refinedstorage/textures/blocks/detector_unpowered.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/drive.png b/src/main/resources/assets/refinedstorage/textures/blocks/disk_drive.png similarity index 100% rename from src/main/resources/assets/refinedstorage/textures/blocks/drive.png rename to src/main/resources/assets/refinedstorage/textures/blocks/disk_drive.png diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/interface.png b/src/main/resources/assets/refinedstorage/textures/blocks/interface.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/relay_connected.png b/src/main/resources/assets/refinedstorage/textures/blocks/relay_connected.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/relay_disconnected.png b/src/main/resources/assets/refinedstorage/textures/blocks/relay_disconnected.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/solderer_connected.png b/src/main/resources/assets/refinedstorage/textures/blocks/solderer_connected.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/solderer_disconnected.png b/src/main/resources/assets/refinedstorage/textures/blocks/solderer_disconnected.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/wireless_transmitter.png b/src/main/resources/assets/refinedstorage/textures/blocks/wireless_transmitter.png deleted file mode 100644 index c2ed3bfd8..000000000 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/wireless_transmitter.png and /dev/null differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/wireless_transmitter_side.png b/src/main/resources/assets/refinedstorage/textures/blocks/wireless_transmitter_side.png deleted file mode 100644 index 54842d1b6..000000000 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/wireless_transmitter_side.png and /dev/null differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/wireless_transmitter_side_working.png b/src/main/resources/assets/refinedstorage/textures/blocks/wireless_transmitter_side_working.png deleted file mode 100644 index c75f63813..000000000 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/wireless_transmitter_side_working.png and /dev/null differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/wireless_transmitter_working.png b/src/main/resources/assets/refinedstorage/textures/blocks/wireless_transmitter_working.png deleted file mode 100644 index ea3fefb05..000000000 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/wireless_transmitter_working.png and /dev/null differ diff --git a/src/main/resources/assets/refinedstorage/textures/gui/constructor.png b/src/main/resources/assets/refinedstorage/textures/gui/constructor.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/textures/gui/controller.png b/src/main/resources/assets/refinedstorage/textures/gui/controller.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/textures/gui/crafting_grid.png b/src/main/resources/assets/refinedstorage/textures/gui/crafting_grid.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/textures/gui/destructor.png b/src/main/resources/assets/refinedstorage/textures/gui/destructor.png old mode 100644 new mode 100755 index c0c97a66e..6de1a9c41 Binary files a/src/main/resources/assets/refinedstorage/textures/gui/destructor.png and b/src/main/resources/assets/refinedstorage/textures/gui/destructor.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/gui/drive.png b/src/main/resources/assets/refinedstorage/textures/gui/disk_drive.png old mode 100644 new mode 100755 similarity index 100% rename from src/main/resources/assets/refinedstorage/textures/gui/drive.png rename to src/main/resources/assets/refinedstorage/textures/gui/disk_drive.png diff --git a/src/main/resources/assets/refinedstorage/textures/gui/grid.png b/src/main/resources/assets/refinedstorage/textures/gui/grid.png index 2d6a3bb86..d2bc104a9 100644 Binary files a/src/main/resources/assets/refinedstorage/textures/gui/grid.png and b/src/main/resources/assets/refinedstorage/textures/gui/grid.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/gui/interface.png b/src/main/resources/assets/refinedstorage/textures/gui/interface.png old mode 100644 new mode 100755 index 052e3350b..04066740e Binary files a/src/main/resources/assets/refinedstorage/textures/gui/interface.png and b/src/main/resources/assets/refinedstorage/textures/gui/interface.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/gui/relay.png b/src/main/resources/assets/refinedstorage/textures/gui/relay.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/textures/gui/solderer.png b/src/main/resources/assets/refinedstorage/textures/gui/solderer.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/textures/gui/storage.png b/src/main/resources/assets/refinedstorage/textures/gui/storage.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/textures/gui/wireless_transmitter.png b/src/main/resources/assets/refinedstorage/textures/gui/wireless_transmitter.png old mode 100644 new mode 100755 index bc0d15b6d..b7acef20a Binary files a/src/main/resources/assets/refinedstorage/textures/gui/wireless_transmitter.png and b/src/main/resources/assets/refinedstorage/textures/gui/wireless_transmitter.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/icons.png b/src/main/resources/assets/refinedstorage/textures/icons.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/textures/items/16k_storage_cell.png b/src/main/resources/assets/refinedstorage/textures/items/16k_storage_disk.png old mode 100644 new mode 100755 similarity index 100% rename from src/main/resources/assets/refinedstorage/textures/items/16k_storage_cell.png rename to src/main/resources/assets/refinedstorage/textures/items/16k_storage_disk.png diff --git a/src/main/resources/assets/refinedstorage/textures/items/16k_storage_part.png b/src/main/resources/assets/refinedstorage/textures/items/16k_storage_part.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/textures/items/1k_storage_cell.png b/src/main/resources/assets/refinedstorage/textures/items/1k_storage_disk.png old mode 100644 new mode 100755 similarity index 100% rename from src/main/resources/assets/refinedstorage/textures/items/1k_storage_cell.png rename to src/main/resources/assets/refinedstorage/textures/items/1k_storage_disk.png diff --git a/src/main/resources/assets/refinedstorage/textures/items/1k_storage_part.png b/src/main/resources/assets/refinedstorage/textures/items/1k_storage_part.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/textures/items/4k_storage_cell.png b/src/main/resources/assets/refinedstorage/textures/items/4k_storage_disk.png old mode 100644 new mode 100755 similarity index 100% rename from src/main/resources/assets/refinedstorage/textures/items/4k_storage_cell.png rename to src/main/resources/assets/refinedstorage/textures/items/4k_storage_disk.png diff --git a/src/main/resources/assets/refinedstorage/textures/items/4k_storage_part.png b/src/main/resources/assets/refinedstorage/textures/items/4k_storage_part.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/textures/items/64k_storage_cell.png b/src/main/resources/assets/refinedstorage/textures/items/64k_storage_disk.png old mode 100644 new mode 100755 similarity index 100% rename from src/main/resources/assets/refinedstorage/textures/items/64k_storage_cell.png rename to src/main/resources/assets/refinedstorage/textures/items/64k_storage_disk.png diff --git a/src/main/resources/assets/refinedstorage/textures/items/64k_storage_part.png b/src/main/resources/assets/refinedstorage/textures/items/64k_storage_part.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/textures/items/advanced_printed_processor.png b/src/main/resources/assets/refinedstorage/textures/items/advanced_printed_processor.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/textures/items/advanced_processor.png b/src/main/resources/assets/refinedstorage/textures/items/advanced_processor.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/textures/items/basic_printed_processor.png b/src/main/resources/assets/refinedstorage/textures/items/basic_printed_processor.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/textures/items/basic_processor.png b/src/main/resources/assets/refinedstorage/textures/items/basic_processor.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/textures/items/blank_pattern.png b/src/main/resources/assets/refinedstorage/textures/items/blank_pattern.png deleted file mode 100644 index 98129707b..000000000 Binary files a/src/main/resources/assets/refinedstorage/textures/items/blank_pattern.png and /dev/null differ diff --git a/src/main/resources/assets/refinedstorage/textures/items/construction_core.png b/src/main/resources/assets/refinedstorage/textures/items/construction_core.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/textures/items/creative_storage_cell.png b/src/main/resources/assets/refinedstorage/textures/items/creative_storage_disk.png old mode 100644 new mode 100755 similarity index 100% rename from src/main/resources/assets/refinedstorage/textures/items/creative_storage_cell.png rename to src/main/resources/assets/refinedstorage/textures/items/creative_storage_disk.png diff --git a/src/main/resources/assets/refinedstorage/textures/items/destruction_core.png b/src/main/resources/assets/refinedstorage/textures/items/destruction_core.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/textures/items/improved_printed_processor.png b/src/main/resources/assets/refinedstorage/textures/items/improved_printed_processor.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/textures/items/improved_processor.png b/src/main/resources/assets/refinedstorage/textures/items/improved_processor.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/textures/items/printed_silicon.png b/src/main/resources/assets/refinedstorage/textures/items/printed_silicon.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/textures/items/quartz_enriched_iron.png b/src/main/resources/assets/refinedstorage/textures/items/quartz_enriched_iron.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/textures/items/silicon.png b/src/main/resources/assets/refinedstorage/textures/items/silicon.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/textures/items/wireless_grid_connected.png b/src/main/resources/assets/refinedstorage/textures/items/wireless_grid_connected.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/textures/items/wireless_grid_disconnected.png b/src/main/resources/assets/refinedstorage/textures/items/wireless_grid_disconnected.png old mode 100644 new mode 100755 index b89d9bbed..9f506593c Binary files a/src/main/resources/assets/refinedstorage/textures/items/wireless_grid_disconnected.png and b/src/main/resources/assets/refinedstorage/textures/items/wireless_grid_disconnected.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/items/wireless_grid_plate.png b/src/main/resources/assets/refinedstorage/textures/items/wireless_grid_plate.png deleted file mode 100644 index 9f506593c..000000000 Binary files a/src/main/resources/assets/refinedstorage/textures/items/wireless_grid_plate.png and /dev/null differ diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info old mode 100644 new mode 100755