dave/refinedstorage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename class

Browse Source
This commit is contained in:
Raoul Van den Berge
2016-05-05 13:22:52 +02:00
parent 3158346843
commit 31c8e301e6
9 changed files with 17 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/refinedstorage/container/ContainerConstructor.java
View File

@@ -1,12 +1,9 @@
package refinedstorage.container; package refinedstorage.container;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import refinedstorage.RefinedStorageItems;
import refinedstorage.container.slot.IItemValidator;
import refinedstorage.container.slot.SlotFiltered; import refinedstorage.container.slot.SlotFiltered;
import refinedstorage.container.slot.SlotSpecimenItemBlock; import refinedstorage.container.slot.SlotSpecimenItemBlock;
import refinedstorage.container.slot.SlotUpgrade; import refinedstorage.container.slot.UpgradeItemValidator;
import refinedstorage.item.ItemUpgrade; import refinedstorage.item.ItemUpgrade;
import refinedstorage.tile.TileConstructor; import refinedstorage.tile.TileConstructor;
@@ -18,7 +15,7 @@ public class ContainerConstructor extends ContainerBase {
addSlotToContainer(new SlotSpecimenItemBlock(constructor.getInventory(), 0, 80, 20)); addSlotToContainer(new SlotSpecimenItemBlock(constructor.getInventory(), 0, 80, 20));
for (int i = 0; i < 4; ++i) { for (int i = 0; i < 4; ++i) {
addSlotToContainer(new SlotFiltered(constructor.getUpgradesInventory(), i, 187, 6 + (i * 18), new SlotUpgrade(ItemUpgrade.TYPE_SPEED, ItemUpgrade.TYPE_CRAFTING))); addSlotToContainer(new SlotFiltered(constructor.getUpgradesInventory(), i, 187, 6 + (i * 18), new UpgradeItemValidator(ItemUpgrade.TYPE_SPEED, ItemUpgrade.TYPE_CRAFTING)));
} }
addPlayerInventory(8, 55); addPlayerInventory(8, 55);

4
src/main/java/refinedstorage/container/ContainerCrafter.java
View File

@@ -6,7 +6,7 @@ import net.minecraft.item.ItemStack;
import refinedstorage.RefinedStorageItems; import refinedstorage.RefinedStorageItems;
import refinedstorage.container.slot.IItemValidator; import refinedstorage.container.slot.IItemValidator;
import refinedstorage.container.slot.SlotFiltered; import refinedstorage.container.slot.SlotFiltered;
import refinedstorage.container.slot.SlotUpgrade; import refinedstorage.container.slot.UpgradeItemValidator;
import refinedstorage.item.ItemPattern; import refinedstorage.item.ItemPattern;
import refinedstorage.item.ItemUpgrade; import refinedstorage.item.ItemUpgrade;
import refinedstorage.tile.autocrafting.TileCrafter; import refinedstorage.tile.autocrafting.TileCrafter;
@@ -25,7 +25,7 @@ public class ContainerCrafter extends ContainerStorage {
} }
for (int i = 0; i < 4; ++i) { for (int i = 0; i < 4; ++i) {
addSlotToContainer(new SlotFiltered(crafter, 6 + i, 187, 6 + (i * 18), new SlotUpgrade(ItemUpgrade.TYPE_SPEED))); addSlotToContainer(new SlotFiltered(crafter, 6 + i, 187, 6 + (i * 18), new UpgradeItemValidator(ItemUpgrade.TYPE_SPEED)));
} }
addPlayerInventory(8, 144); addPlayerInventory(8, 144);

7
src/main/java/refinedstorage/container/ContainerDestructor.java
View File

@@ -1,12 +1,9 @@
package refinedstorage.container; package refinedstorage.container;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import refinedstorage.RefinedStorageItems;
import refinedstorage.container.slot.IItemValidator;
import refinedstorage.container.slot.SlotFiltered; import refinedstorage.container.slot.SlotFiltered;
import refinedstorage.container.slot.SlotSpecimenItemBlock; import refinedstorage.container.slot.SlotSpecimenItemBlock;
import refinedstorage.container.slot.SlotUpgrade; import refinedstorage.container.slot.UpgradeItemValidator;
import refinedstorage.item.ItemUpgrade; import refinedstorage.item.ItemUpgrade;
import refinedstorage.tile.TileDestructor; import refinedstorage.tile.TileDestructor;
@@ -19,7 +16,7 @@ public class ContainerDestructor extends ContainerBase {
} }
for (int i = 0; i < 4; ++i) { for (int i = 0; i < 4; ++i) {
addSlotToContainer(new SlotFiltered(destructor.getUpgradesInventory(), i, 187, 6 + (i * 18), new SlotUpgrade(ItemUpgrade.TYPE_SPEED))); addSlotToContainer(new SlotFiltered(destructor.getUpgradesInventory(), i, 187, 6 + (i * 18), new UpgradeItemValidator(ItemUpgrade.TYPE_SPEED)));
} }
addPlayerInventory(8, 55); addPlayerInventory(8, 55);

7
src/main/java/refinedstorage/container/ContainerExporter.java
View File

@@ -1,12 +1,9 @@
package refinedstorage.container; package refinedstorage.container;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import refinedstorage.RefinedStorageItems;
import refinedstorage.container.slot.IItemValidator;
import refinedstorage.container.slot.SlotFiltered; import refinedstorage.container.slot.SlotFiltered;
import refinedstorage.container.slot.SlotSpecimen; import refinedstorage.container.slot.SlotSpecimen;
import refinedstorage.container.slot.SlotUpgrade; import refinedstorage.container.slot.UpgradeItemValidator;
import refinedstorage.item.ItemUpgrade; import refinedstorage.item.ItemUpgrade;
import refinedstorage.tile.TileExporter; import refinedstorage.tile.TileExporter;
@@ -19,7 +16,7 @@ public class ContainerExporter extends ContainerBase {
} }
for (int i = 0; i < 4; ++i) { for (int i = 0; i < 4; ++i) {
addSlotToContainer(new SlotFiltered(exporter.getUpgradesInventory(), i, 187, 6 + (i * 18), new SlotUpgrade(ItemUpgrade.TYPE_SPEED, ItemUpgrade.TYPE_CRAFTING))); addSlotToContainer(new SlotFiltered(exporter.getUpgradesInventory(), i, 187, 6 + (i * 18), new UpgradeItemValidator(ItemUpgrade.TYPE_SPEED, ItemUpgrade.TYPE_CRAFTING)));
} }
addPlayerInventory(8, 55); addPlayerInventory(8, 55);

7
src/main/java/refinedstorage/container/ContainerImporter.java
View File

@@ -1,12 +1,9 @@
package refinedstorage.container; package refinedstorage.container;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import refinedstorage.RefinedStorageItems;
import refinedstorage.container.slot.IItemValidator;
import refinedstorage.container.slot.SlotFiltered; import refinedstorage.container.slot.SlotFiltered;
import refinedstorage.container.slot.SlotSpecimen; import refinedstorage.container.slot.SlotSpecimen;
import refinedstorage.container.slot.SlotUpgrade; import refinedstorage.container.slot.UpgradeItemValidator;
import refinedstorage.item.ItemUpgrade; import refinedstorage.item.ItemUpgrade;
import refinedstorage.tile.TileImporter; import refinedstorage.tile.TileImporter;
@@ -19,7 +16,7 @@ public class ContainerImporter extends ContainerBase {
} }
for (int i = 0; i < 4; ++i) { for (int i = 0; i < 4; ++i) {
addSlotToContainer(new SlotFiltered(importer.getUpgradesInventory(), i, 187, 6 + (i * 18), new SlotUpgrade(ItemUpgrade.TYPE_SPEED))); addSlotToContainer(new SlotFiltered(importer.getUpgradesInventory(), i, 187, 6 + (i * 18), new UpgradeItemValidator(ItemUpgrade.TYPE_SPEED)));
} }
addPlayerInventory(8, 55); addPlayerInventory(8, 55);

4
src/main/java/refinedstorage/container/ContainerInterface.java
View File

@@ -3,9 +3,7 @@ package refinedstorage.container;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.Slot; import net.minecraft.inventory.Slot;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import refinedstorage.RefinedStorageItems;
import refinedstorage.container.slot.*; import refinedstorage.container.slot.*;
import refinedstorage.item.ItemPattern;
import refinedstorage.item.ItemUpgrade; import refinedstorage.item.ItemUpgrade;
import refinedstorage.tile.TileInterface; import refinedstorage.tile.TileInterface;
@@ -26,7 +24,7 @@ public class ContainerInterface extends ContainerBase {
} }
for (int i = 0; i < 4; ++i) { for (int i = 0; i < 4; ++i) {
addSlotToContainer(new SlotFiltered(tile.getUpgradesInventory(), i, 187, 6 + (i * 18), new SlotUpgrade(ItemUpgrade.TYPE_SPEED, ItemUpgrade.TYPE_CRAFTING))); addSlotToContainer(new SlotFiltered(tile.getUpgradesInventory(), i, 187, 6 + (i * 18), new UpgradeItemValidator(ItemUpgrade.TYPE_SPEED, ItemUpgrade.TYPE_CRAFTING)));
} }
addPlayerInventory(8, 134); addPlayerInventory(8, 134);

7
src/main/java/refinedstorage/container/ContainerSolderer.java
View File

@@ -2,13 +2,10 @@ package refinedstorage.container;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.Slot; import net.minecraft.inventory.Slot;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import refinedstorage.RefinedStorageItems;
import refinedstorage.container.slot.IItemValidator;
import refinedstorage.container.slot.SlotFiltered; import refinedstorage.container.slot.SlotFiltered;
import refinedstorage.container.slot.SlotOutput; import refinedstorage.container.slot.SlotOutput;
import refinedstorage.container.slot.SlotUpgrade; import refinedstorage.container.slot.UpgradeItemValidator;
import refinedstorage.item.ItemUpgrade; import refinedstorage.item.ItemUpgrade;
import refinedstorage.tile.TileSolderer; import refinedstorage.tile.TileSolderer;
@@ -28,7 +25,7 @@ public class ContainerSolderer extends ContainerBase {
addSlotToContainer(new SlotOutput(solderer, 3, 134, 38)); addSlotToContainer(new SlotOutput(solderer, 3, 134, 38));
for (int i = 0; i < 4; ++i) { for (int i = 0; i < 4; ++i) {
addSlotToContainer(new SlotFiltered(solderer.getUpgradesInventory(), i, 187, 6 + (i * 18), new SlotUpgrade(ItemUpgrade.TYPE_SPEED))); addSlotToContainer(new SlotFiltered(solderer.getUpgradesInventory(), i, 187, 6 + (i * 18), new UpgradeItemValidator(ItemUpgrade.TYPE_SPEED)));
} }
addPlayerInventory(8, 95); addPlayerInventory(8, 95);

6
src/main/java/refinedstorage/container/ContainerWirelessTransmitter.java
View File

@@ -3,10 +3,8 @@ package refinedstorage.container;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.Slot; import net.minecraft.inventory.Slot;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import refinedstorage.RefinedStorageItems;
import refinedstorage.container.slot.IItemValidator;
import refinedstorage.container.slot.SlotFiltered; import refinedstorage.container.slot.SlotFiltered;
import refinedstorage.container.slot.SlotUpgrade; import refinedstorage.container.slot.UpgradeItemValidator;
import refinedstorage.item.ItemUpgrade; import refinedstorage.item.ItemUpgrade;
import refinedstorage.tile.TileWirelessTransmitter; import refinedstorage.tile.TileWirelessTransmitter;
@@ -15,7 +13,7 @@ public class ContainerWirelessTransmitter extends ContainerBase {
super(player); super(player);
for (int i = 0; i < 4; ++i) { for (int i = 0; i < 4; ++i) {
addSlotToContainer(new SlotFiltered(wirelessTransmitter, i, 187, 6 + (i * 18), new SlotUpgrade(ItemUpgrade.TYPE_RANGE))); addSlotToContainer(new SlotFiltered(wirelessTransmitter, i, 187, 6 + (i * 18), new UpgradeItemValidator(ItemUpgrade.TYPE_RANGE)));
} }
addPlayerInventory(8, 55); addPlayerInventory(8, 55);

4
src/main/java/refinedstorage/container/slot/SlotUpgrade.java → src/main/java/refinedstorage/container/slot/UpgradeItemValidator.java
View File

@@ -5,10 +5,10 @@ import refinedstorage.RefinedStorageItems;
import java.util.Arrays; import java.util.Arrays;
public class SlotUpgrade implements IItemValidator { public class UpgradeItemValidator implements IItemValidator {
private int[] allowedUpgrades; private int[] allowedUpgrades;
public SlotUpgrade(int... allowedUpgrades) { public UpgradeItemValidator(int... allowedUpgrades) {
this.allowedUpgrades = allowedUpgrades; this.allowedUpgrades = allowedUpgrades;
} }