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

Wireless Transmitter can now only be placed on Cable

Browse Source
This commit is contained in:
Raoul Van den Berge
2016-08-22 02:26:34 +02:00
parent e96bd24629
commit df9ba7e854
3 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -11,6 +11,7 @@
**Features** **Features**
- Added fluid storage - Added fluid storage
- Energy usage of Wireless Grid is now configurable - Energy usage of Wireless Grid is now configurable
- Wireless Transmitter can now only be placed on Cable
### 0.8.20 ### 0.8.20
**Bugfixes** **Bugfixes**

7
src/main/java/refinedstorage/block/BlockWirelessTransmitter.java
View File

@@ -14,7 +14,7 @@ import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World; import net.minecraft.world.World;
import refinedstorage.RefinedStorage; import refinedstorage.RefinedStorage;
import refinedstorage.RefinedStorageGui; import refinedstorage.RefinedStorageGui;
import refinedstorage.tile.TileNode; import refinedstorage.tile.TileCable;
import refinedstorage.tile.TileWirelessTransmitter; import refinedstorage.tile.TileWirelessTransmitter;
public class BlockWirelessTransmitter extends BlockNode { public class BlockWirelessTransmitter extends BlockNode {
@@ -65,10 +65,7 @@ public class BlockWirelessTransmitter extends BlockNode {
@Override @Override
public boolean canPlaceBlockAt(World world, BlockPos pos) { public boolean canPlaceBlockAt(World world, BlockPos pos) {
BlockPos downPos = pos.offset(EnumFacing.DOWN); return world.getTileEntity(pos.offset(EnumFacing.DOWN)) instanceof TileCable;
IBlockState down = world.getBlockState(downPos);
return down.getBlock().canPlaceTorchOnTop(down, world, downPos) || (world.getTileEntity(downPos) instanceof TileNode && !(world.getTileEntity(downPos) instanceof TileWirelessTransmitter));
} }
@Override @Override

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

@@ -51,7 +51,7 @@ public class ClientStackFluid implements IClientStack {
public void draw(GuiBase gui, int x, int y, boolean isOverWithShift) { public void draw(GuiBase gui, int x, int y, boolean isOverWithShift) {
GuiBase.FLUID_RENDERER.draw(gui.mc, x, y, stack); GuiBase.FLUID_RENDERER.draw(gui.mc, x, y, stack);
gui.drawQuantity(x, y, String.format(Locale.US, "%.1f", (float) stack.amount / 1000).replace(".0", "") + "B"); gui.drawQuantity(x, y, String.format(Locale.US, "%.1f", (float) stack.amount / 1000).replace(".0", ""));
} }
@Override @Override