From 2e184395bc21f9c3cb479562fbe697f27a90d48c Mon Sep 17 00:00:00 2001 From: SquidDev Date: Fri, 18 Sep 2015 07:33:28 +0100 Subject: [PATCH] Version bump --- gradle.properties | 2 +- .../AdapterNetworkedInventory.java | 20 +++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/gradle.properties b/gradle.properties index 48676af2..48e642e7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ # Mod stuff mc_version=1.7.10 forge_version=10.13.2.1291 -mod_version=0.2.2.1 +mod_version=0.2.2.2 # Various libraries cc_version=1.74 diff --git a/src/main/java/org/squiddev/cctweaks/integration/openperipheral/AdapterNetworkedInventory.java b/src/main/java/org/squiddev/cctweaks/integration/openperipheral/AdapterNetworkedInventory.java index 086452d7..d7436100 100644 --- a/src/main/java/org/squiddev/cctweaks/integration/openperipheral/AdapterNetworkedInventory.java +++ b/src/main/java/org/squiddev/cctweaks/integration/openperipheral/AdapterNetworkedInventory.java @@ -42,16 +42,16 @@ private static IInventory getInventory(INetworkAccess network, String name) { @ScriptCallable(returnTypes = ReturnType.NUMBER, description = "Pull an item from a slot in another inventory into a slot in this one. Returns the amount of items moved") public int pullItemRemote( IInventory target, @Env(IPeripheralEnvironments.ARG_NETWORK) INetworkAccess network, - @Arg(name = "remoteName", description = "The name of the remote inventory") String remote, - @Arg(name = "slot", description = "The slot in the OTHER inventory that you're pulling from") int fromSlot, + @Arg(name = "remoteName", description = "The name of the remote inventory") String remoteName, + @Arg(name = "fromSlot", description = "The slot in the OTHER inventory that you're pulling from") int fromSlot, @Optionals @Arg(name = "maxAmount", description = "The maximum amount of items you want to pull") Integer maxAmount, - @Arg(name = "direction", description = "The direction to pull from the OTHER inventory") ForgeDirection fromDirection, + @Arg(name = "fromDirection", description = "The direction to pull from the OTHER inventory") ForgeDirection fromDirection, @Arg(name = "intoSlot", description = "The slot in the current inventory that you want to pull into") Integer intoSlot, - @Arg(name = "direction", description = "The direction to push into the current inventory") ForgeDirection intoDirection + @Arg(name = "intoDirection", description = "The direction to push into the current inventory") ForgeDirection intoDirection ) { Preconditions.checkNotNull(network, "Cannot find the network"); - final IInventory otherInventory = Preconditions.checkNotNull(getInventory(network, remote), "Other inventory not found"); + final IInventory otherInventory = Preconditions.checkNotNull(getInventory(network, remoteName), "Other inventory not found"); final IInventory thisInventory = Preconditions.checkNotNull(InventoryUtils.getInventory(target), "Inventory not found"); if (otherInventory == target) return 0; @@ -80,16 +80,16 @@ public int pullItemRemote( @ScriptCallable(returnTypes = ReturnType.NUMBER, description = "Push an item from the current inventory into slot on the other one. Returns the amount of items moved") public int pushItemRemote( IInventory target, @Env(IPeripheralEnvironments.ARG_NETWORK) INetworkAccess network, - @Arg(name = "remoteName", description = "The name of the remote inventory") String remote, - @Arg(name = "slot", description = "The slot in the current inventory that you're pushing from") int fromSlot, + @Arg(name = "remoteName", description = "The name of the remote inventory") String remoteName, + @Arg(name = "fromSlot", description = "The slot in the current inventory that you're pushing from") int fromSlot, @Optionals @Arg(name = "maxAmount", description = "The maximum amount of items you want to push") Integer maxAmount, - @Arg(name = "direction", description = "The direction to push into the current inventory") ForgeDirection fromDirection, + @Arg(name = "fromDirection", description = "The direction to push into the current inventory") ForgeDirection fromDirection, @Arg(name = "intoSlot", description = "The slot in the other inventory that you want to push into") Integer intoSlot, - @Arg(name = "slot", description = "The slot in the other inventory that you're pulling from") ForgeDirection intoDirection + @Arg(name = "intoDirection", description = "The slot in the other inventory that you're pulling from") ForgeDirection intoDirection ) { Preconditions.checkNotNull(network, "Cannot find the network"); - final IInventory otherInventory = Preconditions.checkNotNull(getInventory(network, remote), "Other inventory not found"); + final IInventory otherInventory = Preconditions.checkNotNull(getInventory(network, remoteName), "Other inventory not found"); final IInventory thisInventory = Preconditions.checkNotNull(InventoryUtils.getInventory(target), "Inventory not found"); if (otherInventory == target) return 0;