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

Reformat & remove TODO

Browse Source
This commit is contained in:
raoulvdberge
2017-01-03 11:44:33 +01:00
parent 9964fa319b
commit 57850ce36a
19 changed files with 418 additions and 419 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/INetworkNodeHolder.java
View File

@@ -4,7 +4,6 @@ import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
// @todo: move outta API?
public interface INetworkNodeHolder {
EnumFacing getDirection();

8
src/main/java/com/raoulvdberge/refinedstorage/block/BlockController.java
View File

@@ -44,9 +44,9 @@ public class BlockController extends BlockBase {
@Override
protected BlockStateContainer createBlockState() {
return createBlockStateBuilder()
.add(TYPE)
.add(ENERGY)
.build();
.add(TYPE)
.add(ENERGY)
.build();
}
@Override
@@ -62,7 +62,7 @@ public class BlockController extends BlockBase {
@Override
public IBlockState getActualState(IBlockState state, IBlockAccess world, BlockPos pos) {
return super.getActualState(state, world, pos)
.withProperty(ENERGY, ((TileController) world.getTileEntity(pos)).getEnergyScaledForDisplay());
.withProperty(ENERGY, ((TileController) world.getTileEntity(pos)).getEnergyScaledForDisplay());
}
@Override

6
src/main/java/com/raoulvdberge/refinedstorage/block/BlockDetector.java
View File

@@ -27,14 +27,14 @@ public class BlockDetector extends BlockNode {
@Override
protected BlockStateContainer createBlockState() {
return createBlockStateBuilder()
.add(POWERED)
.build();
.add(POWERED)
.build();
}
@Override
public IBlockState getActualState(IBlockState state, IBlockAccess world, BlockPos pos) {
return super.getActualState(state, world, pos)
.withProperty(POWERED, ((TileDetector) world.getTileEntity(pos)).getNode().isPowered());
.withProperty(POWERED, ((TileDetector) world.getTileEntity(pos)).getNode().isPowered());
}
@Override

4
src/main/java/com/raoulvdberge/refinedstorage/block/BlockFluidStorage.java
View File

@@ -44,8 +44,8 @@ public class BlockFluidStorage extends BlockNode {
@Override
protected BlockStateContainer createBlockState() {
return createBlockStateBuilder()
.add(TYPE)
.build();
.add(TYPE)
.build();
}
@Override

4
src/main/java/com/raoulvdberge/refinedstorage/block/BlockGrid.java
View File

@@ -39,8 +39,8 @@ public class BlockGrid extends BlockNode {
@Override
protected BlockStateContainer createBlockState() {
return createBlockStateBuilder()
.add(TYPE)
.build();
.add(TYPE)
.build();
}
@Override

8
src/main/java/com/raoulvdberge/refinedstorage/block/BlockSolderer.java
View File

@@ -30,15 +30,15 @@ public class BlockSolderer extends BlockNode {
super.addInformation(stack, player, tooltip, advanced);
tooltip.add(I18n.format(
"block.refinedstorage:solderer.tooltip.0",
TextFormatting.WHITE + I18n.format("block.refinedstorage:controller.0.name") + TextFormatting.GRAY
"block.refinedstorage:solderer.tooltip.0",
TextFormatting.WHITE + I18n.format("block.refinedstorage:controller.0.name") + TextFormatting.GRAY
));
tooltip.add(I18n.format("block.refinedstorage:solderer.tooltip.1"));
tooltip.add(I18n.format(
"block.refinedstorage:solderer.tooltip.2",
TextFormatting.WHITE + I18n.format("block.refinedstorage:cable.name") + TextFormatting.GRAY
"block.refinedstorage:solderer.tooltip.2",
TextFormatting.WHITE + I18n.format("block.refinedstorage:cable.name") + TextFormatting.GRAY
));
}

4
src/main/java/com/raoulvdberge/refinedstorage/block/BlockStorage.java
View File

@@ -44,8 +44,8 @@ public class BlockStorage extends BlockNode {
@Override
protected BlockStateContainer createBlockState() {
return createBlockStateBuilder()
.add(TYPE)
.build();
.add(TYPE)
.build();
}
@Override

12
src/main/java/com/raoulvdberge/refinedstorage/block/EnumPlacementType.java
View File

@@ -6,16 +6,16 @@ import net.minecraft.util.math.BlockPos;
public enum EnumPlacementType {
ANY(
EnumFacing.VALUES
EnumFacing.VALUES
),
ANY_FACE_PLAYER(
EnumFacing.VALUES
EnumFacing.VALUES
),
HORIZONTAL(
EnumFacing.NORTH,
EnumFacing.EAST,
EnumFacing.SOUTH,
EnumFacing.WEST
EnumFacing.NORTH,
EnumFacing.EAST,
EnumFacing.SOUTH,
EnumFacing.WEST
);
final EnumFacing[] allowed;

8
src/main/java/com/raoulvdberge/refinedstorage/gui/GuiCraftingMonitor.java
View File

@@ -97,10 +97,10 @@ public class GuiCraftingMonitor extends GuiBase {
drawTexture(x, y, 0, 0, screenWidth, screenHeight);
if (itemSelectedX != -1 &&
itemSelectedY != -1 &&
itemSelected >= 0 &&
itemSelected < getElements().size() &&
getElements().get(itemSelected).canDrawSelection()) {
itemSelectedY != -1 &&
itemSelected >= 0 &&
itemSelected < getElements().size() &&
getElements().get(itemSelected).canDrawSelection()) {
drawTexture(x + itemSelectedX, y + itemSelectedY, 0, 232, ITEM_WIDTH, ITEM_HEIGHT);
}
}

4
src/main/java/com/raoulvdberge/refinedstorage/gui/GuiPriority.java
View File

@@ -65,8 +65,8 @@ public class GuiPriority extends GuiCraftingStart {
@Override
protected int[] getIncrements() {
return new int[]{
1, 5, 10,
-1, -5, -10
1, 5, 10,
-1, -5, -10
};
}

6
src/main/java/com/raoulvdberge/refinedstorage/gui/GuiReaderWriter.java
View File

@@ -75,9 +75,9 @@ public class GuiReaderWriter extends GuiBase {
drawTexture(x, y, 0, 0, screenWidth, screenHeight);
if (itemSelectedX != -1 &&
itemSelectedY != -1 &&
itemSelected >= 0 &&
itemSelected < getChannels().size()) {
itemSelectedY != -1 &&
itemSelected >= 0 &&
itemSelected < getChannels().size()) {
drawTexture(x + itemSelectedX, y + itemSelectedY, 0, 216, ITEM_WIDTH, ITEM_HEIGHT);
}

8
src/main/java/com/raoulvdberge/refinedstorage/gui/GuiStorage.java
View File

@@ -84,8 +84,8 @@ public class GuiStorage extends GuiBase {
public void drawForeground(int mouseX, int mouseY) {
drawString(7, 7, t(gui.getGuiTitle()));
drawString(7, 42, gui.getCapacity() == -1 ?
t("misc.refinedstorage:storage.stored_minimal", RSUtils.formatQuantity(gui.getStored())) :
t("misc.refinedstorage:storage.stored_capacity_minimal", RSUtils.formatQuantity(gui.getStored()), RSUtils.formatQuantity(gui.getCapacity()))
t("misc.refinedstorage:storage.stored_minimal", RSUtils.formatQuantity(gui.getStored())) :
t("misc.refinedstorage:storage.stored_capacity_minimal", RSUtils.formatQuantity(gui.getStored()), RSUtils.formatQuantity(gui.getCapacity()))
);
if (texture.contains("disk_drive")) { // HACK!
@@ -102,8 +102,8 @@ public class GuiStorage extends GuiBase {
}
drawTooltip(mouseX, mouseY, (gui.getCapacity() == -1 ?
t("misc.refinedstorage:storage.stored_minimal", gui.getStored()) :
t("misc.refinedstorage:storage.stored_capacity_minimal", gui.getStored(), gui.getCapacity())
t("misc.refinedstorage:storage.stored_minimal", gui.getStored()) :
t("misc.refinedstorage:storage.stored_capacity_minimal", gui.getStored(), gui.getCapacity())
) + "\n" + t("misc.refinedstorage:storage.full", full));
}
}

10
src/main/java/com/raoulvdberge/refinedstorage/item/ItemNetworkItem.java
View File

@@ -202,10 +202,10 @@ public abstract class ItemNetworkItem extends ItemBase implements INetworkItemPr
public boolean isValid(ItemStack stack) {
return stack.hasTagCompound()
&& stack.getTagCompound().hasKey(NBT_CONTROLLER_X)
&& stack.getTagCompound().hasKey(NBT_CONTROLLER_Y)
&& stack.getTagCompound().hasKey(NBT_CONTROLLER_Z)
&& stack.getTagCompound().hasKey(NBT_DIMENSION_ID);
&& stack.getTagCompound().hasKey(NBT_CONTROLLER_X)
&& stack.getTagCompound().hasKey(NBT_CONTROLLER_Y)
&& stack.getTagCompound().hasKey(NBT_CONTROLLER_Z)
&& stack.getTagCompound().hasKey(NBT_DIMENSION_ID);
}
private class NetworkItemCapabilityProvider implements ICapabilityProvider {
@@ -218,7 +218,7 @@ public abstract class ItemNetworkItem extends ItemBase implements INetworkItemPr
@Override
public boolean hasCapability(Capability<?> capability, @Nullable EnumFacing facing) {
return capability == CapabilityEnergy.ENERGY ||
(IntegrationTesla.isLoaded() && (capability == TeslaCapabilities.CAPABILITY_HOLDER || capability == TeslaCapabilities.CAPABILITY_CONSUMER));
(IntegrationTesla.isLoaded() && (capability == TeslaCapabilities.CAPABILITY_HOLDER || capability == TeslaCapabilities.CAPABILITY_CONSUMER));
}
@Override

8
src/main/java/com/raoulvdberge/refinedstorage/item/ItemWirelessGrid.java
View File

@@ -28,10 +28,10 @@ public class ItemWirelessGrid extends ItemNetworkItem {
@Override
public boolean isValid(ItemStack stack) {
return super.isValid(stack)
&& stack.getTagCompound().hasKey(NetworkNodeGrid.NBT_VIEW_TYPE)
&& stack.getTagCompound().hasKey(NetworkNodeGrid.NBT_SORTING_DIRECTION)
&& stack.getTagCompound().hasKey(NetworkNodeGrid.NBT_SORTING_TYPE)
&& stack.getTagCompound().hasKey(NetworkNodeGrid.NBT_SEARCH_BOX_MODE);
&& stack.getTagCompound().hasKey(NetworkNodeGrid.NBT_VIEW_TYPE)
&& stack.getTagCompound().hasKey(NetworkNodeGrid.NBT_SORTING_DIRECTION)
&& stack.getTagCompound().hasKey(NetworkNodeGrid.NBT_SORTING_TYPE)
&& stack.getTagCompound().hasKey(NetworkNodeGrid.NBT_SEARCH_BOX_MODE);
}
@Override

68
src/main/java/com/raoulvdberge/refinedstorage/proxy/ProxyClient.java
View File

@@ -55,58 +55,58 @@ public class ProxyClient extends ProxyCommon {
// Item Variants
ModelBakery.registerItemVariants(RSItems.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")
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(RSItems.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")
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(RSItems.FLUID_STORAGE_DISK,
new ResourceLocation("refinedstorage:64k_fluid_storage_disk"),
new ResourceLocation("refinedstorage:128k_fluid_storage_disk"),
new ResourceLocation("refinedstorage:256k_fluid_storage_disk"),
new ResourceLocation("refinedstorage:512k_fluid_storage_disk"),
new ResourceLocation("refinedstorage:creative_fluid_storage_disk")
new ResourceLocation("refinedstorage:64k_fluid_storage_disk"),
new ResourceLocation("refinedstorage:128k_fluid_storage_disk"),
new ResourceLocation("refinedstorage:256k_fluid_storage_disk"),
new ResourceLocation("refinedstorage:512k_fluid_storage_disk"),
new ResourceLocation("refinedstorage:creative_fluid_storage_disk")
);
ModelBakery.registerItemVariants(RSItems.FLUID_STORAGE_PART,
new ResourceLocation("refinedstorage:64k_fluid_storage_part"),
new ResourceLocation("refinedstorage:128k_fluid_storage_part"),
new ResourceLocation("refinedstorage:256k_fluid_storage_part"),
new ResourceLocation("refinedstorage:512k_fluid_storage_part")
new ResourceLocation("refinedstorage:64k_fluid_storage_part"),
new ResourceLocation("refinedstorage:128k_fluid_storage_part"),
new ResourceLocation("refinedstorage:256k_fluid_storage_part"),
new ResourceLocation("refinedstorage:512k_fluid_storage_part")
);
ModelBakery.registerItemVariants(RSItems.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")
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(RSItems.CORE,
new ResourceLocation("refinedstorage:construction_core"),
new ResourceLocation("refinedstorage:destruction_core")
new ResourceLocation("refinedstorage:construction_core"),
new ResourceLocation("refinedstorage:destruction_core")
);
ModelBakery.registerItemVariants(RSItems.UPGRADE,
new ResourceLocation("refinedstorage:upgrade"),
new ResourceLocation("refinedstorage:range_upgrade"),
new ResourceLocation("refinedstorage:speed_upgrade"),
new ResourceLocation("refinedstorage:stack_upgrade"),
new ResourceLocation("refinedstorage:interdimensional_upgrade"),
new ResourceLocation("refinedstorage:silk_touch_upgrade"),
new ResourceLocation("refinedstorage:fortune_upgrade")
new ResourceLocation("refinedstorage:upgrade"),
new ResourceLocation("refinedstorage:range_upgrade"),
new ResourceLocation("refinedstorage:speed_upgrade"),
new ResourceLocation("refinedstorage:stack_upgrade"),
new ResourceLocation("refinedstorage:interdimensional_upgrade"),
new ResourceLocation("refinedstorage:silk_touch_upgrade"),
new ResourceLocation("refinedstorage:fortune_upgrade")
);
// Items

624
src/main/java/com/raoulvdberge/refinedstorage/proxy/ProxyCommon.java
View File

@@ -229,338 +229,338 @@ public class ProxyCommon {
// Quartz Enriched Iron
GameRegistry.addRecipe(new ItemStack(RSItems.QUARTZ_ENRICHED_IRON, 4),
"II",
"IQ",
'I', new ItemStack(Items.IRON_INGOT),
'Q', new ItemStack(Items.QUARTZ)
"II",
"IQ",
'I', new ItemStack(Items.IRON_INGOT),
'Q', new ItemStack(Items.QUARTZ)
);
// Machine Casing
GameRegistry.addRecipe(new ItemStack(RSBlocks.MACHINE_CASING),
"EEE",
"E E",
"EEE",
'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON)
"EEE",
"E E",
"EEE",
'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON)
);
// Construction Core
GameRegistry.addShapelessRecipe(new ItemStack(RSItems.CORE, 1, ItemCore.TYPE_CONSTRUCTION),
new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_BASIC),
new ItemStack(Items.GLOWSTONE_DUST)
new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_BASIC),
new ItemStack(Items.GLOWSTONE_DUST)
);
// Destruction Core
GameRegistry.addShapelessRecipe(new ItemStack(RSItems.CORE, 1, ItemCore.TYPE_DESTRUCTION),
new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_BASIC),
new ItemStack(Items.QUARTZ)
new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_BASIC),
new ItemStack(Items.QUARTZ)
);
// Relay
GameRegistry.addShapelessRecipe(new ItemStack(RSBlocks.RELAY),
new ItemStack(RSBlocks.MACHINE_CASING),
new ItemStack(RSBlocks.CABLE),
new ItemStack(Blocks.REDSTONE_TORCH)
new ItemStack(RSBlocks.MACHINE_CASING),
new ItemStack(RSBlocks.CABLE),
new ItemStack(Blocks.REDSTONE_TORCH)
);
// Controller
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(RSBlocks.CONTROLLER, 1, EnumControllerType.NORMAL.getId()),
"EDE",
"SMS",
"ESE",
'D', new ItemStack(Items.DIAMOND),
'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON),
'M', new ItemStack(RSBlocks.MACHINE_CASING),
'S', "itemSilicon"
"EDE",
"SMS",
"ESE",
'D', new ItemStack(Items.DIAMOND),
'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON),
'M', new ItemStack(RSBlocks.MACHINE_CASING),
'S', "itemSilicon"
));
// Solderer
GameRegistry.addRecipe(new ItemStack(RSBlocks.SOLDERER),
"ESE",
"E E",
"ESE",
'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON),
'S', new ItemStack(Blocks.STICKY_PISTON)
"ESE",
"E E",
"ESE",
'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON),
'S', new ItemStack(Blocks.STICKY_PISTON)
);
// Disk Drive
API.instance().getSoldererRegistry().addRecipe(API.instance().getSoldererRegistry().createSimpleRecipe(
new ItemStack(RSBlocks.DISK_DRIVE),
500,
new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED),
new ItemStack(RSBlocks.MACHINE_CASING),
new ItemStack(Blocks.CHEST)
new ItemStack(RSBlocks.DISK_DRIVE),
500,
new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED),
new ItemStack(RSBlocks.MACHINE_CASING),
new ItemStack(Blocks.CHEST)
));
// Cable
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(RSBlocks.CABLE, 12),
"EEE",
"GRG",
"EEE",
'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON),
'G', "blockGlass",
'R', new ItemStack(Items.REDSTONE)
"EEE",
"GRG",
"EEE",
'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON),
'G', "blockGlass",
'R', new ItemStack(Items.REDSTONE)
));
// Wireless Transmitter
GameRegistry.addRecipe(new ItemStack(RSBlocks.WIRELESS_TRANSMITTER),
"EPE",
"EME",
"EAE",
'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON),
'A', new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED),
'P', new ItemStack(Items.ENDER_PEARL),
'M', new ItemStack(RSBlocks.MACHINE_CASING)
"EPE",
"EME",
"EAE",
'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON),
'A', new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED),
'P', new ItemStack(Items.ENDER_PEARL),
'M', new ItemStack(RSBlocks.MACHINE_CASING)
);
// Grid
GameRegistry.addRecipe(new ItemStack(RSBlocks.GRID, 1, EnumGridType.NORMAL.getId()),
"ECE",
"PMP",
"EDE",
'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON),
'P', new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_IMPROVED),
'C', new ItemStack(RSItems.CORE, 1, ItemCore.TYPE_CONSTRUCTION),
'D', new ItemStack(RSItems.CORE, 1, ItemCore.TYPE_DESTRUCTION),
'M', new ItemStack(RSBlocks.MACHINE_CASING)
"ECE",
"PMP",
"EDE",
'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON),
'P', new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_IMPROVED),
'C', new ItemStack(RSItems.CORE, 1, ItemCore.TYPE_CONSTRUCTION),
'D', new ItemStack(RSItems.CORE, 1, ItemCore.TYPE_DESTRUCTION),
'M', new ItemStack(RSBlocks.MACHINE_CASING)
);
// Crafting Grid
API.instance().getSoldererRegistry().addRecipe(API.instance().getSoldererRegistry().createSimpleRecipe(
new ItemStack(RSBlocks.GRID, 1, EnumGridType.CRAFTING.getId()),
500,
new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED),
new ItemStack(RSBlocks.GRID, 1, EnumGridType.NORMAL.getId()),
new ItemStack(Blocks.CRAFTING_TABLE)
new ItemStack(RSBlocks.GRID, 1, EnumGridType.CRAFTING.getId()),
500,
new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED),
new ItemStack(RSBlocks.GRID, 1, EnumGridType.NORMAL.getId()),
new ItemStack(Blocks.CRAFTING_TABLE)
));
// Pattern Grid
API.instance().getSoldererRegistry().addRecipe(API.instance().getSoldererRegistry().createSimpleRecipe(
new ItemStack(RSBlocks.GRID, 1, EnumGridType.PATTERN.getId()),
500,
new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED),
new ItemStack(RSBlocks.GRID, 1, EnumGridType.NORMAL.getId()),
new ItemStack(RSItems.PATTERN)
new ItemStack(RSBlocks.GRID, 1, EnumGridType.PATTERN.getId()),
500,
new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED),
new ItemStack(RSBlocks.GRID, 1, EnumGridType.NORMAL.getId()),
new ItemStack(RSItems.PATTERN)
));
// Fluid Grid
API.instance().getSoldererRegistry().addRecipe(API.instance().getSoldererRegistry().createSimpleRecipe(
new ItemStack(RSBlocks.GRID, 1, EnumGridType.FLUID.getId()),
500,
new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED),
new ItemStack(RSBlocks.GRID, 1, EnumGridType.NORMAL.getId()),
new ItemStack(Items.BUCKET)
new ItemStack(RSBlocks.GRID, 1, EnumGridType.FLUID.getId()),
500,
new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED),
new ItemStack(RSBlocks.GRID, 1, EnumGridType.NORMAL.getId()),
new ItemStack(Items.BUCKET)
));
// Wireless Grid
GameRegistry.addRecipe(new ItemStack(RSItems.WIRELESS_GRID, 1, ItemWirelessGrid.TYPE_NORMAL),
"EPE",
"EGE",
"EAE",
'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON),
'P', new ItemStack(Items.ENDER_PEARL),
'G', new ItemStack(RSBlocks.GRID, 1, EnumGridType.NORMAL.getId()),
'A', new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED)
"EPE",
"EGE",
"EAE",
'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON),
'P', new ItemStack(Items.ENDER_PEARL),
'G', new ItemStack(RSBlocks.GRID, 1, EnumGridType.NORMAL.getId()),
'A', new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED)
);
// Wireless Fluid Grid
GameRegistry.addRecipe(new ItemStack(RSItems.WIRELESS_FLUID_GRID, 1, ItemWirelessFluidGrid.TYPE_NORMAL),
"EPE",
"EGE",
"EAE",
'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON),
'P', new ItemStack(Items.ENDER_PEARL),
'G', new ItemStack(RSBlocks.GRID, 1, EnumGridType.FLUID.getId()),
'A', new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED)
"EPE",
"EGE",
"EAE",
'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON),
'P', new ItemStack(Items.ENDER_PEARL),
'G', new ItemStack(RSBlocks.GRID, 1, EnumGridType.FLUID.getId()),
'A', new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED)
);
// Wireless Crafting Monitor
GameRegistry.addRecipe(new ItemStack(RSItems.WIRELESS_CRAFTING_MONITOR, 1, ItemWirelessCraftingMonitor.TYPE_NORMAL),
"EPE",
"EME",
"EAE",
'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON),
'P', new ItemStack(Items.ENDER_PEARL),
'M', new ItemStack(RSBlocks.CRAFTING_MONITOR),
'A', new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED)
"EPE",
"EME",
"EAE",
'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON),
'P', new ItemStack(Items.ENDER_PEARL),
'M', new ItemStack(RSBlocks.CRAFTING_MONITOR),
'A', new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED)
);
// Crafter
GameRegistry.addRecipe(new ItemStack(RSBlocks.CRAFTER),
"ECE",
"AMA",
"EDE",
'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON),
'A', new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED),
'C', new ItemStack(RSItems.CORE, 1, ItemCore.TYPE_CONSTRUCTION),
'D', new ItemStack(RSItems.CORE, 1, ItemCore.TYPE_DESTRUCTION),
'M', new ItemStack(RSBlocks.MACHINE_CASING)
"ECE",
"AMA",
"EDE",
'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON),
'A', new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED),
'C', new ItemStack(RSItems.CORE, 1, ItemCore.TYPE_CONSTRUCTION),
'D', new ItemStack(RSItems.CORE, 1, ItemCore.TYPE_DESTRUCTION),
'M', new ItemStack(RSBlocks.MACHINE_CASING)
);
// Processing Pattern Encoder
GameRegistry.addRecipe(new ItemStack(RSBlocks.PROCESSING_PATTERN_ENCODER),
"ECE",
"PMP",
"EFE",
'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON),
'M', new ItemStack(RSBlocks.MACHINE_CASING),
'P', new ItemStack(RSItems.PATTERN),
'C', new ItemStack(Blocks.CRAFTING_TABLE),
'F', new ItemStack(Blocks.FURNACE)
"ECE",
"PMP",
"EFE",
'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON),
'M', new ItemStack(RSBlocks.MACHINE_CASING),
'P', new ItemStack(RSItems.PATTERN),
'C', new ItemStack(Blocks.CRAFTING_TABLE),
'F', new ItemStack(Blocks.FURNACE)
);
// External Storage
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(RSBlocks.EXTERNAL_STORAGE),
"CED",
"HMH",
"EPE",
'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON),
'H', "chest",
'C', new ItemStack(RSItems.CORE, 1, ItemCore.TYPE_CONSTRUCTION),
'D', new ItemStack(RSItems.CORE, 1, ItemCore.TYPE_DESTRUCTION),
'M', new ItemStack(RSBlocks.CABLE),
'P', new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_IMPROVED)
"CED",
"HMH",
"EPE",
'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON),
'H', "chest",
'C', new ItemStack(RSItems.CORE, 1, ItemCore.TYPE_CONSTRUCTION),
'D', new ItemStack(RSItems.CORE, 1, ItemCore.TYPE_DESTRUCTION),
'M', new ItemStack(RSBlocks.CABLE),
'P', new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_IMPROVED)
));
// Importer
GameRegistry.addShapelessRecipe(new ItemStack(RSBlocks.IMPORTER),
new ItemStack(RSBlocks.CABLE),
new ItemStack(RSItems.CORE, 1, ItemCore.TYPE_DESTRUCTION),
new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_IMPROVED)
new ItemStack(RSBlocks.CABLE),
new ItemStack(RSItems.CORE, 1, ItemCore.TYPE_DESTRUCTION),
new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_IMPROVED)
);
// Exporter
GameRegistry.addShapelessRecipe(new ItemStack(RSBlocks.EXPORTER),
new ItemStack(RSBlocks.CABLE),
new ItemStack(RSItems.CORE, 1, ItemCore.TYPE_CONSTRUCTION),
new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_IMPROVED)
new ItemStack(RSBlocks.CABLE),
new ItemStack(RSItems.CORE, 1, ItemCore.TYPE_CONSTRUCTION),
new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_IMPROVED)
);
// Destructor
GameRegistry.addShapedRecipe(new ItemStack(RSBlocks.DESTRUCTOR),
"EDE",
"RMR",
"EIE",
'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON),
'D', new ItemStack(RSItems.CORE, 1, ItemCore.TYPE_DESTRUCTION),
'R', new ItemStack(Items.REDSTONE),
'M', new ItemStack(RSBlocks.CABLE),
'I', new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_IMPROVED)
"EDE",
"RMR",
"EIE",
'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON),
'D', new ItemStack(RSItems.CORE, 1, ItemCore.TYPE_DESTRUCTION),
'R', new ItemStack(Items.REDSTONE),
'M', new ItemStack(RSBlocks.CABLE),
'I', new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_IMPROVED)
);
// Constructor
GameRegistry.addShapedRecipe(new ItemStack(RSBlocks.CONSTRUCTOR),
"ECE",
"RMR",
"EIE",
'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON),
'C', new ItemStack(RSItems.CORE, 1, ItemCore.TYPE_CONSTRUCTION),
'R', new ItemStack(Items.REDSTONE),
'M', new ItemStack(RSBlocks.CABLE),
'I', new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_IMPROVED)
"ECE",
"RMR",
"EIE",
'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON),
'C', new ItemStack(RSItems.CORE, 1, ItemCore.TYPE_CONSTRUCTION),
'R', new ItemStack(Items.REDSTONE),
'M', new ItemStack(RSBlocks.CABLE),
'I', new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_IMPROVED)
);
// Detector
GameRegistry.addRecipe(new ItemStack(RSBlocks.DETECTOR),
"ECE",
"RMR",
"EPE",
'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON),
'R', new ItemStack(Items.REDSTONE),
'C', new ItemStack(Items.COMPARATOR),
'M', new ItemStack(RSBlocks.MACHINE_CASING),
'P', new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_IMPROVED)
"ECE",
"RMR",
"EPE",
'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON),
'R', new ItemStack(Items.REDSTONE),
'C', new ItemStack(Items.COMPARATOR),
'M', new ItemStack(RSBlocks.MACHINE_CASING),
'P', new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_IMPROVED)
);
// Storage Parts
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(RSItems.STORAGE_PART, 1, ItemStoragePart.TYPE_1K),
"SES",
"GRG",
"SGS",
'R', new ItemStack(Items.REDSTONE),
'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON),
'S', "itemSilicon",
'G', "blockGlass"
"SES",
"GRG",
"SGS",
'R', new ItemStack(Items.REDSTONE),
'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON),
'S', "itemSilicon",
'G', "blockGlass"
));
GameRegistry.addRecipe(new ItemStack(RSItems.STORAGE_PART, 1, ItemStoragePart.TYPE_4K),
"PEP",
"SRS",
"PSP",
'R', new ItemStack(Items.REDSTONE),
'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON),
'P', new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_BASIC),
'S', new ItemStack(RSItems.STORAGE_PART, 1, ItemStoragePart.TYPE_1K)
"PEP",
"SRS",
"PSP",
'R', new ItemStack(Items.REDSTONE),
'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON),
'P', new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_BASIC),
'S', new ItemStack(RSItems.STORAGE_PART, 1, ItemStoragePart.TYPE_1K)
);
GameRegistry.addRecipe(new ItemStack(RSItems.STORAGE_PART, 1, ItemStoragePart.TYPE_16K),
"PEP",
"SRS",
"PSP",
'R', new ItemStack(Items.REDSTONE),
'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON),
'P', new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_IMPROVED),
'S', new ItemStack(RSItems.STORAGE_PART, 1, ItemStoragePart.TYPE_4K)
"PEP",
"SRS",
"PSP",
'R', new ItemStack(Items.REDSTONE),
'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON),
'P', new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_IMPROVED),
'S', new ItemStack(RSItems.STORAGE_PART, 1, ItemStoragePart.TYPE_4K)
);
GameRegistry.addRecipe(new ItemStack(RSItems.STORAGE_PART, 1, ItemStoragePart.TYPE_64K),
"PEP",
"SRS",
"PSP",
'R', new ItemStack(Items.REDSTONE),
'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON),
'P', new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED),
'S', new ItemStack(RSItems.STORAGE_PART, 1, ItemStoragePart.TYPE_16K)
"PEP",
"SRS",
"PSP",
'R', new ItemStack(Items.REDSTONE),
'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON),
'P', new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED),
'S', new ItemStack(RSItems.STORAGE_PART, 1, ItemStoragePart.TYPE_16K)
);
// Fluid Storage Parts
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(RSItems.FLUID_STORAGE_PART, 1, ItemFluidStoragePart.TYPE_64K),
"SES",
"GRG",
"SGS",
'R', new ItemStack(Items.BUCKET),
'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON),
'S', "itemSilicon",
'G', "blockGlass"
"SES",
"GRG",
"SGS",
'R', new ItemStack(Items.BUCKET),
'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON),
'S', "itemSilicon",
'G', "blockGlass"
));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(RSItems.FLUID_STORAGE_PART, 1, ItemFluidStoragePart.TYPE_128K),
"PEP",
"SRS",
"PSP",
'R', new ItemStack(Items.BUCKET),
'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON),
'P', new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_BASIC),
'S', new ItemStack(RSItems.FLUID_STORAGE_PART, 1, ItemFluidStoragePart.TYPE_64K)
"PEP",
"SRS",
"PSP",
'R', new ItemStack(Items.BUCKET),
'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON),
'P', new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_BASIC),
'S', new ItemStack(RSItems.FLUID_STORAGE_PART, 1, ItemFluidStoragePart.TYPE_64K)
));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(RSItems.FLUID_STORAGE_PART, 1, ItemFluidStoragePart.TYPE_256K),
"PEP",
"SRS",
"PSP",
'R', new ItemStack(Items.BUCKET),
'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON),
'P', new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_IMPROVED),
'S', new ItemStack(RSItems.FLUID_STORAGE_PART, 1, ItemFluidStoragePart.TYPE_128K)
"PEP",
"SRS",
"PSP",
'R', new ItemStack(Items.BUCKET),
'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON),
'P', new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_IMPROVED),
'S', new ItemStack(RSItems.FLUID_STORAGE_PART, 1, ItemFluidStoragePart.TYPE_128K)
));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(RSItems.FLUID_STORAGE_PART, 1, ItemFluidStoragePart.TYPE_512K),
"PEP",
"SRS",
"PSP",
'R', new ItemStack(Items.BUCKET),
'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON),
'P', new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED),
'S', new ItemStack(RSItems.FLUID_STORAGE_PART, 1, ItemFluidStoragePart.TYPE_256K)
"PEP",
"SRS",
"PSP",
'R', new ItemStack(Items.BUCKET),
'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON),
'P', new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED),
'S', new ItemStack(RSItems.FLUID_STORAGE_PART, 1, ItemFluidStoragePart.TYPE_256K)
));
// Storage Housing
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(RSItems.STORAGE_HOUSING),
"GRG",
"R R",
"EEE",
'G', "blockGlass",
'R', new ItemStack(Items.REDSTONE),
'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON)
"GRG",
"R R",
"EEE",
'G', "blockGlass",
'R', new ItemStack(Items.REDSTONE),
'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON)
));
// Storage Disks
@@ -568,18 +568,18 @@ public class ProxyCommon {
ItemStack disk = StorageItemNBT.createStackWithNBT(new ItemStack(RSItems.STORAGE_DISK, 1, type));
GameRegistry.addRecipe(new ShapedOreRecipe(disk,
"GRG",
"RPR",
"EEE",
'G', "blockGlass",
'R', new ItemStack(Items.REDSTONE),
'P', new ItemStack(RSItems.STORAGE_PART, 1, type),
'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON)
"GRG",
"RPR",
"EEE",
'G', "blockGlass",
'R', new ItemStack(Items.REDSTONE),
'P', new ItemStack(RSItems.STORAGE_PART, 1, type),
'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON)
));
GameRegistry.addShapelessRecipe(disk,
new ItemStack(RSItems.STORAGE_HOUSING),
new ItemStack(RSItems.STORAGE_PART, 1, type)
new ItemStack(RSItems.STORAGE_HOUSING),
new ItemStack(RSItems.STORAGE_PART, 1, type)
);
}
@@ -588,39 +588,39 @@ public class ProxyCommon {
ItemStack disk = StorageFluidNBT.createStackWithNBT(new ItemStack(RSItems.FLUID_STORAGE_DISK, 1, type));
GameRegistry.addRecipe(new ShapedOreRecipe(disk,
"GRG",
"RPR",
"EEE",
'G', "blockGlass",
'R', new ItemStack(Items.REDSTONE),
'P', new ItemStack(RSItems.FLUID_STORAGE_PART, 1, type),
'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON)
"GRG",
"RPR",
"EEE",
'G', "blockGlass",
'R', new ItemStack(Items.REDSTONE),
'P', new ItemStack(RSItems.FLUID_STORAGE_PART, 1, type),
'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON)
));
GameRegistry.addShapelessRecipe(disk,
new ItemStack(RSItems.STORAGE_HOUSING),
new ItemStack(RSItems.FLUID_STORAGE_PART, 1, type)
new ItemStack(RSItems.STORAGE_HOUSING),
new ItemStack(RSItems.FLUID_STORAGE_PART, 1, type)
);
}
// Pattern
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(RSItems.PATTERN),
"GRG",
"RGR",
"EEE",
'G', "blockGlass",
'R', new ItemStack(Items.REDSTONE),
'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON)
"GRG",
"RGR",
"EEE",
'G', "blockGlass",
'R', new ItemStack(Items.REDSTONE),
'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON)
));
// Upgrade
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(RSItems.UPGRADE, 1, 0),
"EGE",
"EPE",
"EGE",
'G', "blockGlass",
'P', new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_IMPROVED),
'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON)
"EGE",
"EPE",
"EGE",
'G', "blockGlass",
'P', new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_IMPROVED),
'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON)
));
API.instance().getSoldererRegistry().addRecipe(new SoldererRecipeUpgrade(ItemUpgrade.TYPE_RANGE));
@@ -633,11 +633,11 @@ public class ProxyCommon {
API.instance().getSoldererRegistry().addRecipe(new SoldererRecipeUpgrade(ItemUpgrade.initializeForFortune(3)));
GameRegistry.addShapedRecipe(new ItemStack(RSItems.UPGRADE, 1, ItemUpgrade.TYPE_STACK),
"USU",
"SUS",
"USU",
'U', new ItemStack(Items.SUGAR),
'S', new ItemStack(RSItems.UPGRADE, 1, ItemUpgrade.TYPE_SPEED)
"USU",
"SUS",
"USU",
'U', new ItemStack(Items.SUGAR),
'S', new ItemStack(RSItems.UPGRADE, 1, ItemUpgrade.TYPE_SPEED)
);
// Storage Blocks
@@ -654,117 +654,117 @@ public class ProxyCommon {
// Crafting Monitor
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(RSBlocks.CRAFTING_MONITOR),
"EGE",
"GMG",
"EPE",
'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON),
'M', new ItemStack(RSBlocks.MACHINE_CASING),
'G', "blockGlass",
'P', new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_IMPROVED)
"EGE",
"GMG",
"EPE",
'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON),
'M', new ItemStack(RSBlocks.MACHINE_CASING),
'G', "blockGlass",
'P', new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_IMPROVED)
));
// Interface
API.instance().getSoldererRegistry().addRecipe(API.instance().getSoldererRegistry().createSimpleRecipe(
new ItemStack(RSBlocks.INTERFACE),
200,
new ItemStack(RSBlocks.IMPORTER),
new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_BASIC),
new ItemStack(RSBlocks.EXPORTER)
new ItemStack(RSBlocks.INTERFACE),
200,
new ItemStack(RSBlocks.IMPORTER),
new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_BASIC),
new ItemStack(RSBlocks.EXPORTER)
));
// Fluid Interface
API.instance().getSoldererRegistry().addRecipe(API.instance().getSoldererRegistry().createSimpleRecipe(
new ItemStack(RSBlocks.FLUID_INTERFACE),
200,
new ItemStack(Items.BUCKET),
new ItemStack(RSBlocks.INTERFACE),
new ItemStack(Items.BUCKET)
new ItemStack(RSBlocks.FLUID_INTERFACE),
200,
new ItemStack(Items.BUCKET),
new ItemStack(RSBlocks.INTERFACE),
new ItemStack(Items.BUCKET)
));
// Grid Filter
GameRegistry.addShapedRecipe(new ItemStack(RSItems.GRID_FILTER),
"EPE",
"PHP",
"EPE",
'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON),
'P', new ItemStack(Items.PAPER),
'H', new ItemStack(Blocks.HOPPER)
"EPE",
"PHP",
"EPE",
'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON),
'P', new ItemStack(Items.PAPER),
'H', new ItemStack(Blocks.HOPPER)
);
// Network Card
GameRegistry.addShapedRecipe(new ItemStack(RSItems.NETWORK_CARD),
"EEE",
"PAP",
"EEE",
'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON),
'P', new ItemStack(Items.PAPER),
'A', new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED)
"EEE",
"PAP",
"EEE",
'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON),
'P', new ItemStack(Items.PAPER),
'A', new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED)
);
// Network Transmitter
GameRegistry.addShapedRecipe(new ItemStack(RSBlocks.NETWORK_TRANSMITTER),
"EEE",
"CMD",
"AAA",
'E', new ItemStack(Items.ENDER_PEARL),
'C', new ItemStack(RSItems.CORE, 1, ItemCore.TYPE_CONSTRUCTION),
'M', new ItemStack(RSBlocks.MACHINE_CASING),
'D', new ItemStack(RSItems.CORE, 1, ItemCore.TYPE_DESTRUCTION),
'A', new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED)
"EEE",
"CMD",
"AAA",
'E', new ItemStack(Items.ENDER_PEARL),
'C', new ItemStack(RSItems.CORE, 1, ItemCore.TYPE_CONSTRUCTION),
'M', new ItemStack(RSBlocks.MACHINE_CASING),
'D', new ItemStack(RSItems.CORE, 1, ItemCore.TYPE_DESTRUCTION),
'A', new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED)
);
// Network Receiver
GameRegistry.addShapedRecipe(new ItemStack(RSBlocks.NETWORK_RECEIVER),
"AAA",
"CMD",
"EEE",
'E', new ItemStack(Items.ENDER_PEARL),
'C', new ItemStack(RSItems.CORE, 1, ItemCore.TYPE_CONSTRUCTION),
'M', new ItemStack(RSBlocks.MACHINE_CASING),
'D', new ItemStack(RSItems.CORE, 1, ItemCore.TYPE_DESTRUCTION),
'A', new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED)
"AAA",
"CMD",
"EEE",
'E', new ItemStack(Items.ENDER_PEARL),
'C', new ItemStack(RSItems.CORE, 1, ItemCore.TYPE_CONSTRUCTION),
'M', new ItemStack(RSBlocks.MACHINE_CASING),
'D', new ItemStack(RSItems.CORE, 1, ItemCore.TYPE_DESTRUCTION),
'A', new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED)
);
// Disk Manipulator
GameRegistry.addShapedRecipe(new ItemStack(RSBlocks.DISK_MANIPULATOR),
"ESE",
"CMD",
"ESE",
'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON),
'S', new ItemStack(RSItems.STORAGE_HOUSING),
'C', new ItemStack(RSItems.CORE, 1, ItemCore.TYPE_CONSTRUCTION),
'M', new ItemStack(RSBlocks.MACHINE_CASING),
'D', new ItemStack(RSItems.CORE, 1, ItemCore.TYPE_DESTRUCTION)
"ESE",
"CMD",
"ESE",
'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON),
'S', new ItemStack(RSItems.STORAGE_HOUSING),
'C', new ItemStack(RSItems.CORE, 1, ItemCore.TYPE_CONSTRUCTION),
'M', new ItemStack(RSBlocks.MACHINE_CASING),
'D', new ItemStack(RSItems.CORE, 1, ItemCore.TYPE_DESTRUCTION)
);
// Wrench
GameRegistry.addShapedRecipe(new ItemStack(RSItems.WRENCH),
"EPE",
"EEE",
" E ",
'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON),
'P', new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_BASIC)
"EPE",
"EEE",
" E ",
'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON),
'P', new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_BASIC)
);
// Security Manager
GameRegistry.addShapedRecipe(new ItemStack(RSBlocks.SECURITY_MANAGER),
"ECE",
"CMC",
"ECE",
'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON),
'P', new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED),
'M', new ItemStack(RSBlocks.MACHINE_CASING),
'C', new ItemStack(RSItems.NETWORK_CARD)
"ECE",
"CMC",
"ECE",
'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON),
'P', new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED),
'M', new ItemStack(RSBlocks.MACHINE_CASING),
'C', new ItemStack(RSItems.NETWORK_CARD)
);
// Security Card
GameRegistry.addShapedRecipe(new ItemStack(RSItems.SECURITY_CARD),
"EEE",
"CAC",
"EEE",
'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON),
'C', new ItemStack(RSItems.NETWORK_CARD),
'A', new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED)
"EEE",
"CAC",
"EEE",
'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON),
'C', new ItemStack(RSItems.NETWORK_CARD),
'A', new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED)
);
}

40
src/main/java/com/raoulvdberge/refinedstorage/tile/TileController.java
View File

@@ -109,9 +109,9 @@ public class TileController extends TileBase implements INetworkMaster, IRedston
}
ClientNode clientNode = new ClientNode(
stack,
1,
node.getEnergyUsage()
stack,
1,
node.getEnergyUsage()
);
if (nodes.contains(clientNode)) {
@@ -319,8 +319,8 @@ public class TileController extends TileBase implements INetworkMaster, IRedston
@Override
public void sendItemStorageToClient() {
getWorld().getMinecraftServer().getPlayerList().getPlayers().stream()
.filter(player -> isWatchingGrid(player, EnumGridType.NORMAL, EnumGridType.CRAFTING, EnumGridType.PATTERN))
.forEach(this::sendItemStorageToClient);
.filter(player -> isWatchingGrid(player, EnumGridType.NORMAL, EnumGridType.CRAFTING, EnumGridType.PATTERN))
.forEach(this::sendItemStorageToClient);
}
@Override
@@ -331,15 +331,15 @@ public class TileController extends TileBase implements INetworkMaster, IRedston
@Override
public void sendItemStorageDeltaToClient(ItemStack stack, int delta) {
getWorld().getMinecraftServer().getPlayerList().getPlayers().stream()
.filter(player -> isWatchingGrid(player, EnumGridType.NORMAL, EnumGridType.CRAFTING, EnumGridType.PATTERN))
.forEach(player -> RS.INSTANCE.network.sendTo(new MessageGridItemDelta(this, stack, delta), player));
.filter(player -> isWatchingGrid(player, EnumGridType.NORMAL, EnumGridType.CRAFTING, EnumGridType.PATTERN))
.forEach(player -> RS.INSTANCE.network.sendTo(new MessageGridItemDelta(this, stack, delta), player));
}
@Override
public void sendFluidStorageToClient() {
getWorld().getMinecraftServer().getPlayerList().getPlayers().stream()
.filter(player -> isWatchingGrid(player, EnumGridType.FLUID))
.forEach(this::sendFluidStorageToClient);
.filter(player -> isWatchingGrid(player, EnumGridType.FLUID))
.forEach(this::sendFluidStorageToClient);
}
@Override
@@ -350,8 +350,8 @@ public class TileController extends TileBase implements INetworkMaster, IRedston
@Override
public void sendFluidStorageDeltaToClient(FluidStack stack, int delta) {
getWorld().getMinecraftServer().getPlayerList().getPlayers().stream()
.filter(player -> isWatchingGrid(player, EnumGridType.FLUID))
.forEach(player -> RS.INSTANCE.network.sendTo(new MessageGridFluidDelta(stack, delta), player));
.filter(player -> isWatchingGrid(player, EnumGridType.FLUID))
.forEach(player -> RS.INSTANCE.network.sendTo(new MessageGridFluidDelta(stack, delta), player));
}
private boolean isWatchingGrid(EntityPlayer player, EnumGridType... types) {
@@ -374,8 +374,8 @@ public class TileController extends TileBase implements INetworkMaster, IRedston
@Override
public void sendCraftingMonitorUpdate() {
List<EntityPlayerMP> watchers = getWorld().getMinecraftServer().getPlayerList().getPlayers().stream()
.filter(player -> player.openContainer instanceof ContainerCraftingMonitor && pos.equals(((ContainerCraftingMonitor) player.openContainer).getCraftingMonitor().getNetworkPosition()))
.collect(Collectors.toList());
.filter(player -> player.openContainer instanceof ContainerCraftingMonitor && pos.equals(((ContainerCraftingMonitor) player.openContainer).getCraftingMonitor().getNetworkPosition()))
.collect(Collectors.toList());
if (!watchers.isEmpty()) {
List<ICraftingMonitorElement> elements = craftingManager.getTasks().stream().flatMap(t -> t.getCraftingMonitorElements().stream()).collect(Collectors.toList());
@@ -419,10 +419,10 @@ public class TileController extends TileBase implements INetworkMaster, IRedston
@Override
public void sendReaderWriterChannelUpdate() {
getWorld().getMinecraftServer().getPlayerList().getPlayers().stream()
.filter(player -> player.openContainer instanceof ContainerReaderWriter &&
((ContainerReaderWriter) player.openContainer).getReaderWriter().getNetwork() != null &&
pos.equals(((ContainerReaderWriter) player.openContainer).getReaderWriter().getNetwork().getPosition()))
.forEach(this::sendReaderWriterChannelUpdate);
.filter(player -> player.openContainer instanceof ContainerReaderWriter &&
((ContainerReaderWriter) player.openContainer).getReaderWriter().getNetwork() != null &&
pos.equals(((ContainerReaderWriter) player.openContainer).getReaderWriter().getNetwork().getPosition()))
.forEach(this::sendReaderWriterChannelUpdate);
}
@Override
@@ -783,9 +783,9 @@ public class TileController extends TileBase implements INetworkMaster, IRedston
@Override
public boolean hasCapability(Capability<?> capability, @Nullable EnumFacing facing) {
return capability == CapabilityEnergy.ENERGY
|| (energyTesla != null && (capability == TeslaCapabilities.CAPABILITY_HOLDER || capability == TeslaCapabilities.CAPABILITY_CONSUMER))
|| capability == CapabilityNetworkNodeProxy.NETWORK_NODE_PROXY_CAPABILITY
|| super.hasCapability(capability, facing);
|| (energyTesla != null && (capability == TeslaCapabilities.CAPABILITY_HOLDER || capability == TeslaCapabilities.CAPABILITY_CONSUMER))
|| capability == CapabilityNetworkNodeProxy.NETWORK_NODE_PROXY_CAPABILITY
|| super.hasCapability(capability, facing);
}
@Override

4
src/main/java/com/raoulvdberge/refinedstorage/tile/TileDiskDrive.java
View File

@@ -72,8 +72,8 @@ public class TileDiskDrive extends TileNode<NetworkNodeDiskDrive> {
state = DISK_STATE_DISCONNECTED;
} else {
state = getDiskState(
itemStorages[i] != null ? itemStorages[i].getStored() : fluidStorages[i].getStored(),
itemStorages[i] != null ? itemStorages[i].getCapacity() : fluidStorages[i].getCapacity()
itemStorages[i] != null ? itemStorages[i].getStored() : fluidStorages[i].getStored(),
itemStorages[i] != null ? itemStorages[i].getCapacity() : fluidStorages[i].getCapacity()
);
}
}

10
src/main/java/com/raoulvdberge/refinedstorage/tile/TileExporter.java
View File

@@ -40,12 +40,12 @@ public class TileExporter extends TileNode<NetworkNodeExporter> {
exporter.markDirty();
tile.getWorld().getMinecraftServer().getPlayerList().getPlayers().stream()
.filter(player -> player.openContainer instanceof ContainerExporter && ((ContainerExporter) player.openContainer).getTile().getPos().equals(tile.getPos()))
.forEach(player -> {
((ContainerExporter) player.openContainer).initSlots();
.filter(player -> player.openContainer instanceof ContainerExporter && ((ContainerExporter) player.openContainer).getTile().getPos().equals(tile.getPos()))
.forEach(player -> {
((ContainerExporter) player.openContainer).initSlots();
player.openContainer.detectAndSendChanges();
});
player.openContainer.detectAndSendChanges();
});
}
}, new ITileDataListener<Boolean>() {
@Override