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

Simplify wireless grid

Browse Source
This commit is contained in:
Raoul Van den Berge
2016-03-28 17:32:24 +02:00
parent 2a7279ae87
commit 1a8be231ed
24 changed files with 54 additions and 590 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/refinedstorage/RefinedStorageBlocks.java
View File

@@ -13,7 +13,6 @@ public final class RefinedStorageBlocks {
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();

1
src/main/java/refinedstorage/RefinedStorageGui.java
View File

@@ -8,7 +8,6 @@ public final class RefinedStorageGui {
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;

1
src/main/java/refinedstorage/RefinedStorageItems.java
View File

@@ -5,7 +5,6 @@ import refinedstorage.item.*;
public final class RefinedStorageItems {
public static final ItemStorageDisk STORAGE_DISK = new ItemStorageDisk();
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();

55
src/main/java/refinedstorage/block/BlockWirelessTransmitter.java
View File

@@ -1,55 +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, 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;
}
}

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

@@ -1,50 +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;
}
}

4
src/main/java/refinedstorage/gui/GuiHandler.java
View File

@@ -28,8 +28,6 @@ public class GuiHandler implements IGuiHandler {
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, (TileDestructor) tile);
case RefinedStorageGui.CONSTRUCTOR:
@@ -69,8 +67,6 @@ public class GuiHandler implements IGuiHandler {
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:

49
src/main/java/refinedstorage/gui/GuiWirelessTransmitter.java
View File

@@ -1,49 +0,0 @@
package refinedstorage.gui;
import refinedstorage.container.ContainerWirelessTransmitter;
import refinedstorage.gui.sidebutton.SideButtonRedstoneMode;
import refinedstorage.tile.TileWirelessTransmitter;
public class GuiWirelessTransmitter extends GuiBase {
private TileWirelessTransmitter wirelessTransmitter;
public GuiWirelessTransmitter(ContainerWirelessTransmitter 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, 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 + "%");
}
}
}

79
src/main/java/refinedstorage/item/ItemWirelessGrid.java
View File

@@ -1,78 +1,75 @@
package refinedstorage.item;
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;
import java.util.List;
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";
public static final String NBT_GRID_X = "GridX";
public static final String NBT_GRID_Y = "GridY";
public static final String NBT_GRID_Z = "GridZ";
public ItemWirelessGrid() {
super("wireless_grid");
setMaxStackSize(1);
setHasSubtypes(true);
setMaxDamage(0);
}
@Override
public void getSubItems(Item item, CreativeTabs tab, List list) {
list.add(new ItemStack(item, 1, 0));
list.add(new ItemStack(item, 1, 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)));
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 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();
if (block == RefinedStorageBlocks.GRID) {
NBTTagCompound tag = new NBTTagCompound();
tag.setInteger(NBT_GRID_X, pos.getX());
tag.setInteger(NBT_GRID_Y, pos.getY());
tag.setInteger(NBT_GRID_Z, pos.getZ());
stack.setTagCompound(tag);
return EnumActionResult.SUCCESS;
}
return EnumActionResult.PASS;
}
@Override
public ActionResult<ItemStack> 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);
TileEntity tile = world.getTileEntity(new BlockPos(getX(stack), getY(stack), getZ(stack)));
TileEntity tile = world.getTileEntity(new BlockPos(x, y, z));
if (tile instanceof TileGrid) {
player.openGui(RefinedStorage.INSTANCE, RefinedStorageGui.GRID, world, tile.getPos().getX(), tile.getPos().getY(), tile.getPos().getZ());
if (tile instanceof TileWirelessTransmitter) {
TileWirelessTransmitter wirelessTransmitter = (TileWirelessTransmitter) tile;
if (wirelessTransmitter.isWorking()) {
TileGrid grid = wirelessTransmitter.getGrid(stack.getItemDamage() == 1 ? EnumGridType.CRAFTING : EnumGridType.NORMAL);
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 new ActionResult(EnumActionResult.SUCCESS, stack);
}
} else {
player.addChatComponentMessage(new TextComponentString(I18n.translateToLocal("misc.refinedstorage:wireless_grid.not_working")));
}
return new ActionResult(EnumActionResult.PASS, stack);
} else {
player.addChatComponentMessage(new TextComponentString(I18n.translateToLocal("misc.refinedstorage:wireless_grid.not_found")));
}
@@ -80,7 +77,7 @@ public class ItemWirelessGrid extends ItemBase {
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())));
player.addChatComponentMessage(new TextComponentString(I18n.translateToLocal("misc.refinedstorage:wireless_grid.not_found")));
}
return new ActionResult(EnumActionResult.FAIL, stack);
@@ -90,15 +87,15 @@ public class ItemWirelessGrid extends ItemBase {
}
public static int getX(ItemStack stack) {
return stack.getTagCompound().getInteger(NBT_WIRELESS_TRANSMITTER_X);
return stack.getTagCompound().getInteger(NBT_GRID_X);
}
public static int getY(ItemStack stack) {
return stack.getTagCompound().getInteger(NBT_WIRELESS_TRANSMITTER_Y);
return stack.getTagCompound().getInteger(NBT_GRID_Y);
}
public static int getZ(ItemStack stack) {
return stack.getTagCompound().getInteger(NBT_WIRELESS_TRANSMITTER_Z);
return stack.getTagCompound().getInteger(NBT_GRID_Z);
}
public static boolean isInRange(ItemStack stack, EntityPlayer player) {
@@ -106,6 +103,6 @@ public class ItemWirelessGrid extends ItemBase {
}
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);
return stack.hasTagCompound() && stack.getTagCompound().hasKey(NBT_GRID_X) && stack.getTagCompound().hasKey(NBT_GRID_Y) && stack.getTagCompound().hasKey(NBT_GRID_Z);
}
}

9
src/main/java/refinedstorage/item/ItemWirelessGridPlate.java
View File

@@ -1,9 +0,0 @@
package refinedstorage.item;
public class ItemWirelessGridPlate extends ItemBase {
public ItemWirelessGridPlate() {
super("wireless_grid_plate");
setMaxStackSize(1);
}
}

3
src/main/java/refinedstorage/proxy/ClientProxy.java
View File

@@ -84,8 +84,6 @@ public class ClientProxy extends CommonProxy {
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) {
@@ -111,7 +109,6 @@ public class ClientProxy extends CommonProxy {
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"));

22
src/main/java/refinedstorage/proxy/CommonProxy.java
View File

@@ -50,7 +50,6 @@ public class CommonProxy {
GameRegistry.registerTileEntity(TileExporter.class, ID + ":exporter");
GameRegistry.registerTileEntity(TileDetector.class, ID + ":detector");
GameRegistry.registerTileEntity(TileSolderer.class, ID + ":solderer");
GameRegistry.registerTileEntity(TileWirelessTransmitter.class, ID + ":wireless_transmitter");
GameRegistry.registerTileEntity(TileDestructor.class, ID + ":destructor");
GameRegistry.registerTileEntity(TileConstructor.class, ID + ":constructor");
GameRegistry.registerTileEntity(TileStorage.class, ID + ":storage");
@@ -67,7 +66,6 @@ public class CommonProxy {
GameRegistry.registerBlock(RefinedStorageBlocks.DETECTOR, ID + ":detector");
GameRegistry.registerBlock(RefinedStorageBlocks.MACHINE_CASING, ID + ":machine_casing");
GameRegistry.registerBlock(RefinedStorageBlocks.SOLDERER, ID + ":solderer");
GameRegistry.registerBlock(RefinedStorageBlocks.WIRELESS_TRANSMITTER, ID + ":wireless_transmitter");
GameRegistry.registerBlock(RefinedStorageBlocks.DESTRUCTOR, ID + ":destructor");
GameRegistry.registerBlock(RefinedStorageBlocks.CONSTRUCTOR, ID + ":constructor");
GameRegistry.registerBlock(RefinedStorageBlocks.STORAGE, ItemBlockStorage.class, ID + ":storage");
@@ -76,7 +74,6 @@ public class CommonProxy {
GameRegistry.registerItem(RefinedStorageItems.STORAGE_DISK, ID + ":storage_disk");
GameRegistry.registerItem(RefinedStorageItems.WIRELESS_GRID, ID + ":wireless_grid");
GameRegistry.registerItem(RefinedStorageItems.WIRELESS_GRID_PLATE, ID + ":wireless_grid_plate");
GameRegistry.registerItem(RefinedStorageItems.QUARTZ_ENRICHED_IRON, ID + ":quartz_enriched_iron");
GameRegistry.registerItem(RefinedStorageItems.CORE, ID + ":core");
GameRegistry.registerItem(RefinedStorageItems.SILICON, ID + ":silicon");
@@ -181,19 +178,8 @@ public class CommonProxy {
// Crafting Grid
SoldererRegistry.addRecipe(new SoldererRecipeCraftingGrid());
// 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)
);
// Wireless Grid Plate
GameRegistry.addRecipe(new ItemStack(RefinedStorageItems.WIRELESS_GRID_PLATE),
// Wireless Grid
GameRegistry.addRecipe(new ItemStack(RefinedStorageItems.WIRELESS_GRID),
" P ",
"ERE",
"EEE",
@@ -202,10 +188,6 @@ public class CommonProxy {
'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",

2
src/main/java/refinedstorage/tile/TileExternalStorage.java
View File

@@ -32,7 +32,7 @@ public class TileExternalStorage extends TileMachine implements IStorageProvider
private int compare = 0;
private int mode = 0;
private int stored = 0;
private int stored = 0;
@Override
public int getEnergyUsage() {

2
src/main/java/refinedstorage/tile/TileMachine.java
View File

@@ -46,7 +46,7 @@ public abstract class TileMachine extends TileBase implements INetworkTile, IRed
super.update();
return;
}
if (ticks == 0) {
originalBlock = worldObj.getBlockState(pos).getBlock();
}

235
src/main/java/refinedstorage/tile/TileWirelessTransmitter.java
View File

@@ -1,235 +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, this);
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();
}
}

37
src/main/java/refinedstorage/tile/solderer/SoldererRecipeWirelessGrid.java
View File

@@ -1,37 +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;
}
}

56
src/main/resources/assets/refinedstorage/blockstates/wireless_transmitter.json
View File

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

19
src/main/resources/assets/refinedstorage/lang/en_US.lang
View File

@@ -12,7 +12,6 @@ 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
@@ -32,14 +31,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
@@ -83,7 +79,6 @@ 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
@@ -99,9 +94,7 @@ 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.0.name=Wireless Grid
item.refinedstorage:wireless_grid.1.name=Wireless Crafting Grid
item.refinedstorage:wireless_grid_plate.name=Wireless Grid Plate
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

19
src/main/resources/assets/refinedstorage/lang/nl_NL.lang
View File

@@ -12,7 +12,6 @@ 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
@@ -32,14 +31,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
@@ -83,7 +79,6 @@ 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
@@ -99,9 +94,7 @@ 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.0.name=Draadloze Rooster
item.refinedstorage:wireless_grid.1.name=Draadloze Crafting Rooster
item.refinedstorage:wireless_grid_plate.name=Draadloze Rooster Bord
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

BIN
src/main/resources/assets/refinedstorage/textures/blocks/wireless_transmitter.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 382 B

BIN
src/main/resources/assets/refinedstorage/textures/blocks/wireless_transmitter_side.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 326 B

BIN
src/main/resources/assets/refinedstorage/textures/blocks/wireless_transmitter_side_working.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 324 B

BIN
src/main/resources/assets/refinedstorage/textures/blocks/wireless_transmitter_working.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 380 B

BIN
src/main/resources/assets/refinedstorage/textures/items/wireless_grid_disconnected.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 628 B

After

Width:  |  Height:  |  Size: 615 B

BIN
src/main/resources/assets/refinedstorage/textures/items/wireless_grid_plate.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 615 B