Skip to content

Commit 87205c6

Browse files
VexatosVexatos
committedJan 25, 2016
Done.
1 parent a31fbd7 commit 87205c6

File tree

7 files changed

+36
-10
lines changed

7 files changed

+36
-10
lines changed
 

‎changelog.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ This version comes with a 1.8.9 port in addition to many additions.
2626
- Mods supported right now are ComputerCraft, OpenComputers, TIS-3D, Flamingo, Storage Drawers, Charset and WAILA.
2727
* [1.8.9] Added Charset Wires Bundled Cable support for ComputerCraft.
2828
* [1.8.9] Added Charset Wires Bundled Cable support for Computronics.
29-
* [1.8.9] The Tape Drive has been moved over to asie's new mod, Charset Audio. This means it no longer is in Computronics, but this mod will add support for it once the API is done.
29+
* [1.8.9] The Tape Drive and all related Audio stuff has been moved over to asie's new mod, Charset Audio. This means it no longer is in Computronics, but this mod will add support for it once the API is done.
3030

3131
==== 1.6.0 ====
3232

‎src/main/java/pl/asie/computronics/block/BlockColorfulLamp.java

+13-3
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,16 @@ protected BlockState createActualBlockState() {
5757
return new BlockState(this, BUNDLED, BRIGHTNESS);
5858
}
5959

60+
@Override
61+
public IBlockState getStateFromMeta(int meta) {
62+
return super.getStateFromMeta(meta).withProperty(BRIGHTNESS, meta);
63+
}
64+
65+
@Override
66+
public int getMetaFromState(IBlockState state) {
67+
return super.getMetaFromState(state) | state.getValue(BRIGHTNESS);
68+
}
69+
6070
@Override
6171
protected IBlockState createDefaultState() {
6272
return super.createDefaultState().withProperty(BRIGHTNESS, 0);
@@ -73,17 +83,17 @@ public void onNeighborBlockChange(World world, BlockPos pos, IBlockState state,
7383

7484
@Override
7585
public int getLightValue(IBlockAccess world, BlockPos pos) {
76-
TileEntity tile = world.getTileEntity(pos);
86+
/*TileEntity tile = world.getTileEntity(pos);
7787
if(tile instanceof TileColorfulLamp) {
7888
int color = ((TileColorfulLamp) tile).getLampColor();
7989
//this.lightValue = world.getBlockState(pos).getValue(BRIGHTNESS);
80-
this.lightValue = color == 0 ? 0 : 15; //TODO do this
90+
this.lightValue = color == 0 ? 0 : 15;
8191
if(world instanceof World) {
8292
((World) world).notifyLightSet(pos);
8393
((World) world).markBlockRangeForRenderUpdate(pos.add(-1, -1, -1), pos.add(1, 1, 1));
8494
}
8595
return this.lightValue;
86-
}
96+
}*/
8797
return this.lightValue = world.getBlockState(pos).getValue(BRIGHTNESS);
8898
}
8999

‎src/main/java/pl/asie/computronics/block/BlockPeripheral.java

+6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package pl.asie.computronics.block;
22

3+
import net.minecraft.block.Block;
34
import net.minecraft.block.material.Material;
45
import net.minecraft.block.state.IBlockState;
56
import net.minecraft.entity.player.EntityPlayer;
@@ -66,6 +67,11 @@ public boolean recolorBlock(World world, BlockPos pos, EnumFacing side, EnumDyeC
6667
return super.recolorBlock(world, pos, side, color);
6768
}
6869

70+
@Override
71+
public void onNeighborBlockChange(World world, BlockPos pos, IBlockState state, Block block) {
72+
super.onNeighborBlockChange(world, pos, state, block);
73+
}
74+
6975
@Override
7076
public boolean hasTileEntity(IBlockState state) {
7177
return true;

‎src/main/java/pl/asie/computronics/integration/charset/wires/ComputronicsBundledRedstoneIntegration.java

+12
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,11 @@
88
import net.minecraftforge.common.capabilities.CapabilityInject;
99
import net.minecraftforge.common.capabilities.ICapabilityProvider;
1010
import net.minecraftforge.event.AttachCapabilitiesEvent;
11+
import net.minecraftforge.fml.common.Optional;
1112
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
1213
import pl.asie.charset.api.wires.IBundledEmitter;
1314
import pl.asie.charset.api.wires.IBundledReceiver;
15+
import pl.asie.computronics.reference.Mods;
1416
import pl.asie.computronics.util.internal.IComputronicsPeripheral;
1517
import pl.asie.lib.api.tile.IBundledRedstoneProvider;
1618

@@ -42,6 +44,16 @@ public boolean isReceiver(ICapabilityProvider tile, EnumFacing side) {
4244
return tile.hasCapability(CHARSET_RECEIVER, side);
4345
}
4446

47+
@Optional.Method(modid = Mods.API.CharsetWires)
48+
public IBundledEmitter getEmitter(ICapabilityProvider tile, EnumFacing side) {
49+
return tile.getCapability(CHARSET_EMITTER, side);
50+
}
51+
52+
@Optional.Method(modid = Mods.API.CharsetWires)
53+
public IBundledReceiver getReceiver(ICapabilityProvider tile, EnumFacing side) {
54+
return tile.getCapability(CHARSET_RECEIVER, side);
55+
}
56+
4557
private boolean registered = false;
4658

4759
private void register() {

‎src/main/java/pl/asie/computronics/tile/TileCipherBlock.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -286,12 +286,12 @@ public void removeFromNBTForTransfer(NBTTagCompound data) {
286286

287287
@Override
288288
public boolean canBundledConnectToInput(EnumFacing side) {
289-
return side == worldObj.getBlockState(getPos()).getValue(Computronics.cipher.rotation.FACING).rotateY();
289+
return worldObj != null && side == worldObj.getBlockState(getPos()).getValue(Computronics.cipher.rotation.FACING).rotateY();
290290
}
291291

292292
@Override
293293
public boolean canBundledConnectToOutput(EnumFacing side) {
294-
return side == worldObj.getBlockState(getPos()).getValue(Computronics.cipher.rotation.FACING).rotateYCCW();
294+
return worldObj != null && side == worldObj.getBlockState(getPos()).getValue(Computronics.cipher.rotation.FACING).rotateYCCW();
295295
}
296296

297297
@Override

‎src/main/java/pl/asie/computronics/tile/TileColorfulLamp.java

+1-3
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,13 @@
33
import dan200.computercraft.api.lua.ILuaContext;
44
import dan200.computercraft.api.lua.LuaException;
55
import dan200.computercraft.api.peripheral.IComputerAccess;
6+
import li.cil.oc.api.driver.Block;
67
import li.cil.oc.api.machine.Arguments;
78
import li.cil.oc.api.machine.Callback;
89
import li.cil.oc.api.machine.Context;
910
import net.minecraft.block.state.IBlockState;
1011
import net.minecraft.nbt.NBTTagCompound;
11-
import net.minecraft.util.BlockPos;
1212
import net.minecraft.util.EnumFacing;
13-
import net.minecraft.world.World;
1413
import net.minecraftforge.fml.common.Optional;
1514
import pl.asie.computronics.Computronics;
1615
import pl.asie.computronics.block.BlockColorfulLamp;
@@ -89,7 +88,6 @@ public void setLampColor(int color) {
8988
}
9089
this.markDirty();
9190
this.worldObj.markBlockForUpdate(getPos());
92-
worldObj.notifyBlockOfStateChange(getPos(), getBlockType());
9391
}
9492

9593
@Callback(doc = "function():number; Returns the current lamp color", direct = true)

‎src/main/java/pl/asie/lib/block/BlockBase.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -353,7 +353,7 @@ public boolean rotateBlock(World world, BlockPos pos, EnumFacing side) {
353353
world.setBlockState(pos, state.withProperty(rotation.FACING, side), 3);
354354
return true;
355355
} else if(rotation == Rotation.FOUR) {
356-
world.setBlockState(pos, state.withProperty(rotation.FACING, f.rotateAround(EnumFacing.Axis.Y)), 3);
356+
world.setBlockState(pos, state.withProperty(rotation.FACING, f.rotateY()), 3);
357357
return true;
358358
}
359359
return false;

0 commit comments

Comments
 (0)
Please sign in to comment.