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

0.9.1 hotfix

Browse Source
This commit is contained in:
Raoul Van den Berge
2016-08-24 22:27:15 +02:00
parent 5695b81cf4
commit 4af6f7386f
11 changed files with 35 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/refinedstorage/RefinedStorage.java
View File

@@ -19,7 +19,7 @@ import refinedstorage.proxy.CommonProxy;
@Mod(modid = RefinedStorage.ID, version = RefinedStorage.VERSION, dependencies = RefinedStorage.DEPENDENCIES)
public final class RefinedStorage {
public static final String ID = "refinedstorage";
public static final String VERSION = "0.9";
public static final String VERSION = "0.9.1";
public static final String DEPENDENCIES = "required-after:mcmultipart@[1.2.1,);";
@SidedProxy(clientSide = "refinedstorage.proxy.ClientProxy", serverSide = "refinedstorage.proxy.ServerProxy")

20
src/main/java/refinedstorage/api/network/NetworkUtils.java
View File

@@ -1,8 +1,12 @@
package refinedstorage.api.network;
import io.netty.buffer.ByteBuf;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fml.common.network.ByteBufUtils;
import refinedstorage.api.autocrafting.ICraftingPattern;
import refinedstorage.api.storage.CompareUtils;
@@ -43,4 +47,20 @@ public final class NetworkUtils {
result = 31 * result + world.provider.getDimension();
return result;
}
public static void writeStack(ByteBuf buf, INetworkMaster network, ItemStack stack) {
buf.writeInt(Item.getIdFromItem(stack.getItem()));
buf.writeInt(stack.stackSize);
buf.writeInt(stack.getItemDamage());
ByteBufUtils.writeTag(buf, stack.getTagCompound());
buf.writeInt(getItemStackHashCode(stack));
buf.writeBoolean(hasPattern(network, stack));
}
public static void writeFluidStack(ByteBuf buf, FluidStack stack) {
buf.writeInt(getFluidStackHashCode(stack));
ByteBufUtils.writeUTF8String(buf, FluidRegistry.getFluidName(stack.getFluid()));
buf.writeInt(stack.amount);
ByteBufUtils.writeTag(buf, stack.tag);
}
}

8
src/main/java/refinedstorage/gui/grid/stack/ClientStackFluid.java
View File

@@ -4,7 +4,6 @@ import io.netty.buffer.ByteBuf;
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fml.common.network.ByteBufUtils;
import refinedstorage.api.network.NetworkUtils;
import refinedstorage.gui.GuiBase;
import java.util.Locale;
@@ -58,11 +57,4 @@ public class ClientStackFluid implements IClientStack {
public boolean equals(Object obj) {
return obj instanceof ClientStackFluid && ((ClientStackFluid) obj).getStack().isFluidEqual(stack);
}
public static void write(ByteBuf buf, FluidStack stack) {
buf.writeInt(NetworkUtils.getFluidStackHashCode(stack));
ByteBufUtils.writeUTF8String(buf, FluidRegistry.getFluidName(stack.getFluid()));
buf.writeInt(stack.amount);
ByteBufUtils.writeTag(buf, stack.tag);
}
}

11
src/main/java/refinedstorage/gui/grid/stack/ClientStackItem.java
View File

@@ -7,8 +7,6 @@ import net.minecraft.client.resources.I18n;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fml.common.network.ByteBufUtils;
import refinedstorage.api.network.INetworkMaster;
import refinedstorage.api.network.NetworkUtils;
import refinedstorage.gui.GuiBase;
import java.util.Locale;
@@ -87,13 +85,4 @@ public class ClientStackItem implements IClientStack {
public boolean equals(Object obj) {
return obj instanceof IClientStack && ((ClientStackItem) obj).getHash() == hash;
}
public static void write(ByteBuf buf, INetworkMaster network, ItemStack stack) {
buf.writeInt(Item.getIdFromItem(stack.getItem()));
buf.writeInt(stack.stackSize);
buf.writeInt(stack.getItemDamage());
ByteBufUtils.writeTag(buf, stack.getTagCompound());
buf.writeInt(NetworkUtils.getItemStackHashCode(stack));
buf.writeBoolean(NetworkUtils.hasPattern(network, stack));
}
}

3
src/main/java/refinedstorage/network/MessageGridFluidDelta.java
View File

@@ -6,6 +6,7 @@ import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler;
import net.minecraftforge.fml.common.network.simpleimpl.MessageContext;
import refinedstorage.api.network.NetworkUtils;
import refinedstorage.gui.grid.GuiGrid;
import refinedstorage.gui.grid.stack.ClientStackFluid;
@@ -31,7 +32,7 @@ public class MessageGridFluidDelta implements IMessage, IMessageHandler<MessageG
@Override
public void toBytes(ByteBuf buf) {
ClientStackFluid.write(buf, stack);
NetworkUtils.writeFluidStack(buf, stack);
buf.writeInt(delta);
}

3
src/main/java/refinedstorage/network/MessageGridFluidUpdate.java
View File

@@ -6,6 +6,7 @@ import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler;
import net.minecraftforge.fml.common.network.simpleimpl.MessageContext;
import refinedstorage.api.network.INetworkMaster;
import refinedstorage.api.network.NetworkUtils;
import refinedstorage.gui.grid.GuiGrid;
import refinedstorage.gui.grid.stack.ClientStackFluid;
@@ -37,7 +38,7 @@ public class MessageGridFluidUpdate implements IMessage, IMessageHandler<Message
buf.writeInt(network.getFluidStorage().getStacks().size());
for (FluidStack stack : network.getFluidStorage().getStacks()) {
ClientStackFluid.write(buf, stack);
NetworkUtils.writeFluidStack(buf, stack);
}
}

3
src/main/java/refinedstorage/network/MessageGridItemDelta.java
View File

@@ -7,6 +7,7 @@ import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler;
import net.minecraftforge.fml.common.network.simpleimpl.MessageContext;
import refinedstorage.api.network.INetworkMaster;
import refinedstorage.api.network.NetworkUtils;
import refinedstorage.gui.grid.GuiGrid;
import refinedstorage.gui.grid.stack.ClientStackItem;
@@ -34,7 +35,7 @@ public class MessageGridItemDelta implements IMessage, IMessageHandler<MessageGr
@Override
public void toBytes(ByteBuf buf) {
ClientStackItem.write(buf, network, stack);
NetworkUtils.writeStack(buf, network, stack);
buf.writeInt(delta);
}

3
src/main/java/refinedstorage/network/MessageGridItemUpdate.java
View File

@@ -6,6 +6,7 @@ import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler;
import net.minecraftforge.fml.common.network.simpleimpl.MessageContext;
import refinedstorage.api.network.INetworkMaster;
import refinedstorage.api.network.NetworkUtils;
import refinedstorage.gui.grid.GuiGrid;
import refinedstorage.gui.grid.stack.ClientStackItem;
@@ -37,7 +38,7 @@ public class MessageGridItemUpdate implements IMessage, IMessageHandler<MessageG
buf.writeInt(network.getItemStorage().getStacks().size());
for (ItemStack stack : network.getItemStorage().getStacks()) {
ClientStackItem.write(buf, network, stack);
NetworkUtils.writeStack(buf, network, stack);
}
}

2
src/main/resources/mcmod.info
View File

@@ -3,7 +3,7 @@
"modid": "refinedstorage",
"name": "Refined Storage",
"description": "A Minecraft mod all about storage.",
"version": "0.9",
"version": "0.9.1",
"mcversion": "1.10.2",
"url": "",
"updateUrl": "",