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

Rename some variables

Browse Source
This commit is contained in:
Raoul Van den Berge
2016-06-20 12:31:46 +02:00
parent 390352a936
commit cb8399ad6b
9 changed files with 53 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/refinedstorage/autocrafting/CraftingTaskScheduler.java
View File

@@ -14,13 +14,13 @@ public class CraftingTaskScheduler {
return scheduledItem == null || !RefinedStorageUtils.compareStack(scheduledItem, item, compare);
}
public void schedule(NetworkMaster master, int compare, ItemStack item) {
CraftingPattern pattern = master.getPatternWithBestScore(item, compare);
public void schedule(NetworkMaster network, int compare, ItemStack item) {
CraftingPattern pattern = network.getPatternWithBestScore(item, compare);
if (pattern != null) {
scheduledItem = item;
master.addCraftingTask(master.createCraftingTask(pattern));
network.addCraftingTask(network.createCraftingTask(pattern));
}
}

18
src/main/java/refinedstorage/autocrafting/task/BasicCraftingTask.java
View File

@@ -50,7 +50,7 @@ public class BasicCraftingTask implements ICraftingTask {
return pattern;
}
public boolean update(NetworkMaster master) {
public boolean update(NetworkMaster network) {
this.updatedOnce = true;
boolean done = true;
@@ -63,17 +63,17 @@ public class BasicCraftingTask implements ICraftingTask {
if (!satisfied[i]) {
done = false;
ItemStack took = master.take(input, 1);
ItemStack took = network.take(input, 1);
if (took != null) {
itemsTook.add(took);
satisfied[i] = true;
} else if (!childTasks[i]) {
CraftingPattern pattern = master.getPatternWithBestScore(input);
CraftingPattern pattern = network.getPatternWithBestScore(input);
if (pattern != null) {
master.addCraftingTask(master.createCraftingTask(pattern));
network.addCraftingTask(network.createCraftingTask(pattern));
childTasks[i] = true;
}
@@ -90,23 +90,23 @@ public class BasicCraftingTask implements ICraftingTask {
// @todo: handle no space
@Override
public void onDone(NetworkMaster master) {
public void onDone(NetworkMaster network) {
for (ItemStack output : pattern.getOutputs()) {
master.push(output, output.stackSize, false);
network.push(output, output.stackSize, false);
}
if (pattern.getByproducts() != null) {
for (ItemStack byproduct : pattern.getByproducts()) {
master.push(byproduct, byproduct.stackSize, false);
network.push(byproduct, byproduct.stackSize, false);
}
}
}
// @todo: handle no space
@Override
public void onCancelled(NetworkMaster master) {
public void onCancelled(NetworkMaster network) {
for (ItemStack took : itemsTook) {
master.push(took, took.stackSize, false);
network.push(took, took.stackSize, false);
}
}

6
src/main/java/refinedstorage/autocrafting/task/ICraftingTask.java
View File

@@ -7,11 +7,11 @@ import refinedstorage.autocrafting.CraftingPattern;
public interface ICraftingTask {
CraftingPattern getPattern();
boolean update(NetworkMaster master);
boolean update(NetworkMaster network);
void onDone(NetworkMaster master);
void onDone(NetworkMaster network);
void onCancelled(NetworkMaster master);
void onCancelled(NetworkMaster network);
void writeToNBT(NBTTagCompound tag);

16
src/main/java/refinedstorage/autocrafting/task/ProcessingCraftingTask.java
View File

@@ -42,17 +42,17 @@ public class ProcessingCraftingTask implements ICraftingTask {
}
@Override
public boolean update(NetworkMaster master) {
public boolean update(NetworkMaster network) {
this.updatedOnce = true;
TileCrafter crafter = pattern.getCrafter(master.getWorld());
TileCrafter crafter = pattern.getCrafter(network.getWorld());
IItemHandler handler = RefinedStorageUtils.getItemHandler(crafter.getFacingTile(), crafter.getDirection().getOpposite());
if (handler != null) {
for (int i = 0; i < inserted.length; ++i) {
if (!inserted[i]) {
ItemStack input = pattern.getInputs()[i];
ItemStack took = master.take(input, 1);
ItemStack took = network.take(input, 1);
if (took != null) {
if (ItemHandlerHelper.insertItem(handler, took, true) == null) {
@@ -60,15 +60,15 @@ public class ProcessingCraftingTask implements ICraftingTask {
inserted[i] = true;
} else {
master.push(took, took.stackSize, false);
network.push(took, took.stackSize, false);
}
} else if (!childTasks[i]) {
CraftingPattern pattern = master.getPatternWithBestScore(input);
CraftingPattern pattern = network.getPatternWithBestScore(input);
if (pattern != null) {
childTasks[i] = true;
master.addCraftingTask(master.createCraftingTask(pattern));
network.addCraftingTask(network.createCraftingTask(pattern));
break;
}
@@ -101,12 +101,12 @@ public class ProcessingCraftingTask implements ICraftingTask {
}
@Override
public void onDone(NetworkMaster master) {
public void onDone(NetworkMaster network) {
// NO OP
}
@Override
public void onCancelled(NetworkMaster master) {
public void onCancelled(NetworkMaster network) {
// NO OP
}

6
src/main/java/refinedstorage/block/BlockController.java
View File

@@ -92,15 +92,15 @@ public class BlockController extends BlockBase {
@Override
public void onBlockPlacedBy(World world, BlockPos pos, IBlockState state, EntityLivingBase player, ItemStack stack) {
if (!world.isRemote) {
NetworkMaster master = new NetworkMaster(pos, world);
NetworkMaster network = new NetworkMaster(pos, world);
NBTTagCompound tag = stack.getTagCompound();
if (tag != null && tag.hasKey(NetworkMaster.NBT_ENERGY)) {
master.getEnergy().receiveEnergy(tag.getInteger(NetworkMaster.NBT_ENERGY), false);
network.getEnergy().receiveEnergy(tag.getInteger(NetworkMaster.NBT_ENERGY), false);
}
NetworkMasterRegistry.add(master, world.provider.getDimension());
NetworkMasterRegistry.add(network, world.provider.getDimension());
}
super.onBlockPlacedBy(world, pos, state, player, stack);

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

@@ -134,10 +134,10 @@ public class ItemWirelessGrid extends ItemEnergyContainer {
@Override
public ActionResult<ItemStack> onItemRightClick(ItemStack stack, World world, EntityPlayer player, EnumHand hand) {
if (!world.isRemote && hasValidNBT(stack) && getDimensionId(stack) == player.dimension) {
NetworkMaster master = NetworkMasterRegistry.get(new BlockPos(getX(stack), getY(stack), getZ(stack)), player.worldObj.provider.getDimension());
NetworkMaster network = NetworkMasterRegistry.get(new BlockPos(getX(stack), getY(stack), getZ(stack)), player.worldObj.provider.getDimension());
if (master != null) {
if (master.getWirelessGridHandler().handleOpen(player, hand)) {
if (network != null) {
if (network.getWirelessGridHandler().handleOpen(player, hand)) {
return new ActionResult(EnumActionResult.SUCCESS, stack);
} else {
player.addChatComponentMessage(new TextComponentTranslation("misc.refinedstorage:wireless_grid.out_of_range"));

4
src/main/java/refinedstorage/jei/GridRecipeTransferHandler.java
View File

@@ -18,7 +18,9 @@ import refinedstorage.network.MessageGridCraftingTransfer;
import java.util.List;
import java.util.Map;
// https://github.com/zerofall/EZStorage/blob/master/src/main/java/com/zerofall/ezstorage/jei/RecipeTransferHandler.java
/**
* @link https://github.com/zerofall/EZStorage/blob/master/src/main/java/com/zerofall/ezstorage/jei/RecipeTransferHandler.java
*/
public class GridRecipeTransferHandler implements IRecipeTransferHandler {
@Override
public Class<? extends Container> getContainerClass() {

38
src/main/java/refinedstorage/tile/controller/StorageHandler.java
View File

@@ -13,10 +13,10 @@ import refinedstorage.network.GridPullFlags;
public class StorageHandler {
public static final int MAX_CRAFTING_PER_REQUEST = 500;
private NetworkMaster master;
private NetworkMaster network;
public StorageHandler(NetworkMaster master) {
this.master = master;
public StorageHandler(NetworkMaster network) {
this.network = network;
}
public void onPull(int id, int flags, EntityPlayerMP player) {
@@ -24,11 +24,11 @@ public class StorageHandler {
return;
}
if (id < 0 || id > master.getItems().size() - 1) {
if (id < 0 || id > network.getItems().size() - 1) {
return;
}
ItemStack stack = master.getItems().get(id);
ItemStack stack = network.getItems().get(id);
int size = 64;
@@ -46,7 +46,7 @@ public class StorageHandler {
size = Math.min(size, stack.getItem().getItemStackLimit(stack));
ItemStack took = master.take(stack, size);
ItemStack took = network.take(stack, size);
if (took != null) {
if (GridPullFlags.isPullingWithShift(flags)) {
@@ -58,7 +58,7 @@ public class StorageHandler {
player.updateHeldItem();
}
master.getWirelessGridHandler().drainEnergy(player, ItemWirelessGrid.USAGE_PULL);
network.getWirelessGridHandler().drainEnergy(player, ItemWirelessGrid.USAGE_PULL);
}
}
@@ -71,8 +71,8 @@ public class StorageHandler {
int size = one ? 1 : stack.stackSize;
if (one) {
if (master.push(stack, size, true) == null) {
master.push(stack, size, false);
if (network.push(stack, size, true) == null) {
network.push(stack, size, false);
stack.stackSize -= size;
@@ -81,21 +81,21 @@ public class StorageHandler {
}
}
} else {
player.inventory.setItemStack(master.push(stack, size, false));
player.inventory.setItemStack(network.push(stack, size, false));
}
player.updateHeldItem();
master.getWirelessGridHandler().drainEnergy(player, ItemWirelessGrid.USAGE_PUSH);
network.getWirelessGridHandler().drainEnergy(player, ItemWirelessGrid.USAGE_PUSH);
}
public void onCraftingRequested(int id, int quantity) {
if (id >= 0 && id < master.getItems().size() && quantity > 0 && quantity <= MAX_CRAFTING_PER_REQUEST) {
ItemStack requested = master.getItems().get(id);
if (id >= 0 && id < network.getItems().size() && quantity > 0 && quantity <= MAX_CRAFTING_PER_REQUEST) {
ItemStack requested = network.getItems().get(id);
int quantityPerRequest = 0;
CraftingPattern pattern = master.getPatternWithBestScore(requested);
CraftingPattern pattern = network.getPatternWithBestScore(requested);
if (pattern != null) {
for (ItemStack output : pattern.getOutputs()) {
@@ -109,7 +109,7 @@ public class StorageHandler {
}
while (quantity > 0) {
master.addCraftingTaskAsLast(master.createCraftingTask(pattern));
network.addCraftingTaskAsLast(network.createCraftingTask(pattern));
quantity -= quantityPerRequest;
}
@@ -118,11 +118,11 @@ public class StorageHandler {
}
public void onCraftingCancelRequested(int id) {
if (id >= 0 && id < master.getCraftingTasks().size()) {
master.cancelCraftingTask(master.getCraftingTasks().get(id));
if (id >= 0 && id < network.getCraftingTasks().size()) {
network.cancelCraftingTask(network.getCraftingTasks().get(id));
} else if (id == -1) {
for (ICraftingTask task : master.getCraftingTasks()) {
master.cancelCraftingTask(task);
for (ICraftingTask task : network.getCraftingTasks()) {
network.cancelCraftingTask(task);
}
}
}

4
src/main/java/refinedstorage/tile/controller/WirelessGridHandler.java
View File

@@ -22,8 +22,8 @@ public class WirelessGridHandler {
private List<WirelessGridConsumer> consumers = new ArrayList<WirelessGridConsumer>();
private List<WirelessGridConsumer> consumersToRemove = new ArrayList<WirelessGridConsumer>();
public WirelessGridHandler(NetworkMaster master) {
this.network = master;
public WirelessGridHandler(NetworkMaster network) {
this.network = network;
}
public void update() {