0.7.18 in one commit.

This commit is contained in:
Raoul Van den Berge
2016-06-24 20:01:24 +02:00
parent 1aedd44683
commit e331712585
6 changed files with 13 additions and 10 deletions

View File

@@ -1,5 +1,10 @@
# Refined Storage Changelog # Refined Storage Changelog
### 0.7.18
**Bugfixes**
- Fixed cables sending updates when not needed
- Fixed cables not connecting to foreign machines that implement the API
### 0.7.17 ### 0.7.17
**Bugfixes** **Bugfixes**
- Fixed getting wrong items back in grid - Fixed getting wrong items back in grid

View File

@@ -12,7 +12,7 @@ buildscript {
} }
apply plugin: 'net.minecraftforge.gradle.forge' apply plugin: 'net.minecraftforge.gradle.forge'
version = "0.7.17" version = "0.7.18"
group = "refinedstorage" group = "refinedstorage"
archivesBaseName = "refinedstorage" archivesBaseName = "refinedstorage"

View File

@@ -19,7 +19,7 @@ import refinedstorage.proxy.CommonProxy;
@Mod(modid = RefinedStorage.ID, version = RefinedStorage.VERSION) @Mod(modid = RefinedStorage.ID, version = RefinedStorage.VERSION)
public final class RefinedStorage { public final class RefinedStorage {
public static final String ID = "refinedstorage"; public static final String ID = "refinedstorage";
public static final String VERSION = "0.7.17"; public static final String VERSION = "0.7.18";
public static final SimpleNetworkWrapper NETWORK = NetworkRegistry.INSTANCE.newSimpleChannel(ID); public static final SimpleNetworkWrapper NETWORK = NetworkRegistry.INSTANCE.newSimpleChannel(ID);

View File

@@ -10,8 +10,8 @@ import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IBlockAccess; import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World; import net.minecraft.world.World;
import refinedstorage.RefinedStorageBlocks; import refinedstorage.RefinedStorageBlocks;
import refinedstorage.api.RefinedStorageCapabilities;
import refinedstorage.tile.TileCable; import refinedstorage.tile.TileCable;
import refinedstorage.tile.TileSlave;
public class BlockCable extends BlockSlave { public class BlockCable extends BlockSlave {
public static final AxisAlignedBB CABLE_AABB = new AxisAlignedBB(4 * (1F / 16F), 4 * (1F / 16F), 4 * (1F / 16F), 1 - 4 * (1F / 16F), 1 - 4 * (1F / 16F), 1 - 4 * (1F / 16F)); public static final AxisAlignedBB CABLE_AABB = new AxisAlignedBB(4 * (1F / 16F), 4 * (1F / 16F), 4 * (1F / 16F), 1 - 4 * (1F / 16F), 1 - 4 * (1F / 16F), 1 - 4 * (1F / 16F));
@@ -57,7 +57,7 @@ public class BlockCable extends BlockSlave {
} }
public static boolean hasConnectionWith(IBlockAccess world, BlockPos pos) { public static boolean hasConnectionWith(IBlockAccess world, BlockPos pos) {
return world.getBlockState(pos).getBlock() == RefinedStorageBlocks.CONTROLLER || world.getTileEntity(pos) instanceof TileSlave; return world.getBlockState(pos).getBlock() == RefinedStorageBlocks.CONTROLLER || (world.getTileEntity(pos) != null && world.getTileEntity(pos).hasCapability(RefinedStorageCapabilities.NETWORK_SLAVE_CAPABILITY, null));
} }
@Override @Override

View File

@@ -52,7 +52,7 @@ public abstract class TileSlave extends TileBase implements INetworkSlave, ISync
updateSlave(); updateSlave();
} }
if (active != isActive()) { if (active != isActive() && canSendConnectivityUpdate()) {
RefinedStorageUtils.updateBlock(worldObj, pos); RefinedStorageUtils.updateBlock(worldObj, pos);
active = isActive(); active = isActive();
@@ -68,9 +68,7 @@ public abstract class TileSlave extends TileBase implements INetworkSlave, ISync
this.network = network; this.network = network;
this.connected = true; this.connected = true;
if (!(this instanceof TileCable)) {
this.network.addSlave(this); this.network.addSlave(this);
}
world.notifyNeighborsOfStateChange(pos, getBlockType()); world.notifyNeighborsOfStateChange(pos, getBlockType());
@@ -235,6 +233,6 @@ public abstract class TileSlave extends TileBase implements INetworkSlave, ISync
@Override @Override
public boolean equals(Object other) { public boolean equals(Object other) {
return other instanceof TileSlave && ((TileSlave) other).getPos().equals(pos); return other instanceof TileSlave && ((TileSlave) other).getPosition().equals(getPosition());
} }
} }

View File

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