v0.4.5: Restore RS 1.6.16 compat

refinedmods · Apr 26, 2020 · f35708f · f35708f
1 parent 195c654
commit f35708f
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Refined Storage Addons Changelog
 
+### 0.4.5
+- Refined Storage 1.6.16 compatibility (raoulvdberge)
+
 ### 0.4.4
 - Refined Storage 1.6.13 compatibility (raoulvdberge)
 

diff --git a/build.gradle b/build.gradle
@@ -11,7 +11,7 @@ apply plugin: 'net.minecraftforge.gradle.forge'
 apply plugin: 'maven'
 apply plugin: 'maven-publish'
 
-version = "0.4.4"
+version = "0.4.5"
 def env = System.getenv()
 if (env.BUILD_NUMBER) {
     version = version + "-" + "${env.BUILD_NUMBER}"
@@ -24,7 +24,7 @@ sourceCompatibility = 1.8
 targetCompatibility = 1.8
 
 minecraft {
-    version = "1.12.2-14.23.4.2703"
+    version = "1.12.2-14.23.5.2838"
     runDir = "run"
     useDepAts = true
     mappings = "snapshot_20180714"
@@ -40,7 +40,7 @@ repositories {
 }
 
 dependencies {
-    deobfCompile "refinedstorage:refinedstorage:1.6.13-373"
+    deobfCompile "refinedstorage:refinedstorage:1.6.16-386"
 }
 
 processResources {

diff --git a/src/main/java/com/raoulvdberge/refinedstorageaddons/RSAddons.java b/src/main/java/com/raoulvdberge/refinedstorageaddons/RSAddons.java
@@ -21,7 +21,7 @@ public final class RSAddons {
 
     public static final String ID = "refinedstorageaddons";
     public static final String VERSION = "@version@";
-    public static final String DEPENDENCIES = "required-after:refinedstorage@[1.6.9,);";
+    public static final String DEPENDENCIES = "required-after:refinedstorage@[1.6.16,);";
     public static final String GUI_FACTORY = "com.raoulvdberge.refinedstorageaddons.gui.config.ModGuiFactory";
 
     @Mod.Instance

diff --git a/...m/raoulvdberge/refinedstorageaddons/apiimpl/network/grid/WirelessCraftingGridFactory.java b/...m/raoulvdberge/refinedstorageaddons/apiimpl/network/grid/WirelessCraftingGridFactory.java
@@ -15,8 +15,8 @@
 public class WirelessCraftingGridFactory implements IGridFactory {
     @Nullable
     @Override
-    public IGrid createFromStack(EntityPlayer player, ItemStack stack) {
-        return new WirelessCraftingGrid(stack, !player.getEntityWorld().isRemote);
+    public IGrid createFromStack(EntityPlayer player, ItemStack stack, int slotId) {
+        return new WirelessCraftingGrid(stack, !player.getEntityWorld().isRemote, slotId);
     }
 
     @Nullable

diff --git a/...oulvdberge/refinedstorageaddons/apiimpl/network/item/NetworkItemWirelessCraftingGrid.java b/...oulvdberge/refinedstorageaddons/apiimpl/network/item/NetworkItemWirelessCraftingGrid.java
@@ -19,13 +19,15 @@ public class NetworkItemWirelessCraftingGrid extends NetworkItemWirelessGrid {
     private INetworkItemHandler handler;
     private ItemStack stack;
     private EntityPlayer player;
+    private int slotId;
 
-    public NetworkItemWirelessCraftingGrid(INetworkItemHandler handler, EntityPlayer player, ItemStack stack) {
-        super(handler, player, stack);
+    public NetworkItemWirelessCraftingGrid(INetworkItemHandler handler, EntityPlayer player, ItemStack stack, int slotId) {
+        super(handler, player, stack, slotId);
 
         this.handler = handler;
         this.player = player;
         this.stack = stack;
+        this.slotId = slotId;
     }
 
     @Override
@@ -40,7 +42,7 @@ public boolean onOpen(INetwork network) {
             return false;
         }
 
-        API.instance().getGridManager().openGrid(WirelessCraftingGrid.ID, (EntityPlayerMP) player, stack);
+        API.instance().getGridManager().openGrid(WirelessCraftingGrid.ID, (EntityPlayerMP) player, stack, slotId);
 
         drainEnergy(RSAddons.INSTANCE.config.wirelessCraftingGridOpenUsage);
 

diff --git a/src/main/java/com/raoulvdberge/refinedstorageaddons/item/ItemWirelessCraftingGrid.java b/src/main/java/com/raoulvdberge/refinedstorageaddons/item/ItemWirelessCraftingGrid.java
@@ -20,7 +20,7 @@ public ItemWirelessCraftingGrid() {
 
     @Override
     @Nonnull
-    public INetworkItem provide(INetworkItemHandler handler, EntityPlayer player, ItemStack stack) {
-        return new NetworkItemWirelessCraftingGrid(handler, player, stack);
+    public INetworkItem provide(INetworkItemHandler handler, EntityPlayer player, ItemStack stack, int slotId) {
+        return new NetworkItemWirelessCraftingGrid(handler, player, stack, slotId);
     }
 }
diff --git a/src/main/java/com/raoulvdberge/refinedstorageaddons/item/WirelessCraftingGrid.java b/src/main/java/com/raoulvdberge/refinedstorageaddons/item/WirelessCraftingGrid.java
@@ -45,8 +45,8 @@ public void onCraftMatrixChanged(IInventory inventory) {
     private boolean server;
     private Set<IGridCraftingListener> craftingListeners = new HashSet<>();
 
-    public WirelessCraftingGrid(ItemStack stack, boolean server) {
-        super(stack);
+    public WirelessCraftingGrid(ItemStack stack, boolean server, int slotId) {
+        super(stack, slotId);
 
         this.controllerDimension = ItemWirelessCraftingGrid.getDimensionId(stack);
         this.server = server;