mirrors/CC-Tweaked
1
0
Fork 0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2024-06-26 07:03:22 +00:00
Code Issues Releases Wiki Activity

Revert a couple of changes to be backwards compatible

Browse Source 
- Restore ComputerState to the previous location
 - Add a stub constructor for GuiComputer
This commit is contained in:
SquidDev 2018-12-29 14:36:03 +00:00
parent ca334e7e5c
commit 8422a40c69
10 changed files with 31 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/dan200/computercraft/client/gui/GuiComputer.java
View File

@ -11,6 +11,7 @@
import dan200.computercraft.shared.computer.blocks.TileComputer;
import dan200.computercraft.shared.computer.core.ClientComputer;
import dan200.computercraft.shared.computer.core.ComputerFamily;
import dan200.computercraft.shared.computer.core.IComputer;
import dan200.computercraft.shared.computer.inventory.ContainerComputer;
import net.minecraft.client.gui.inventory.GuiContainer;
import net.minecraft.client.renderer.GlStateManager;
@ -43,6 +44,12 @@ public GuiComputer( Container container, ComputerFamily family, ClientComputer c
m_terminal = null;
}
@Deprecated
public GuiComputer( Container container, ComputerFamily family, IComputer computer, int termWidth, int termHeight )
{
this( container, family, (ClientComputer) computer, termWidth, termHeight );
}
public GuiComputer( TileComputer computer )
{
this(

1
src/main/java/dan200/computercraft/core/computer/Computer.java
View File

@ -676,6 +676,7 @@ public void addAPI( ILuaAPI api )
m_apis.add( api );
}
@SuppressWarnings( "deprecation" )
public void addAPI( dan200.computercraft.core.apis.ILuaAPI api )
{
addAPI( (ILuaAPI) api );

5
src/main/java/dan200/computercraft/shared/computer/blocks/BlockCommandComputer.java
View File

@ -8,7 +8,6 @@
import dan200.computercraft.ComputerCraft;
import dan200.computercraft.shared.computer.core.ComputerFamily;
import dan200.computercraft.shared.computer.core.ComputerState;
import dan200.computercraft.shared.util.DirectionUtil;
import net.minecraft.block.material.Material;
import net.minecraft.block.properties.PropertyDirection;
@ -46,7 +45,7 @@ public BlockCommandComputer()
setCreativeTab( ComputerCraft.mainCreativeTab );
setDefaultState( this.blockState.getBaseState()
.withProperty( Properties.FACING, EnumFacing.NORTH )
.withProperty( Properties.STATE, ComputerState.OFF )
.withProperty( Properties.STATE, ComputerState.Off )
);
}
@ -82,7 +81,7 @@ public int getMetaFromState( IBlockState state )
public IBlockState getActualState( @Nonnull IBlockState state, IBlockAccess world, BlockPos pos )
{
TileEntity tile = world.getTileEntity( pos );
return state.withProperty( Properties.STATE, tile instanceof TileComputer ? ((TileComputer) tile).getState() : ComputerState.OFF );
return state.withProperty( Properties.STATE, tile instanceof TileComputer ? ((TileComputer) tile).getState() : ComputerState.Off );
}
@Override

5
src/main/java/dan200/computercraft/shared/computer/blocks/BlockComputer.java
View File

@ -8,7 +8,6 @@
import dan200.computercraft.ComputerCraft;
import dan200.computercraft.shared.computer.core.ComputerFamily;
import dan200.computercraft.shared.computer.core.ComputerState;
import dan200.computercraft.shared.computer.items.ComputerItemFactory;
import dan200.computercraft.shared.computer.items.ItemComputer;
import dan200.computercraft.shared.util.DirectionUtil;
@ -52,7 +51,7 @@ public BlockComputer()
setDefaultState( this.blockState.getBaseState()
.withProperty( Properties.FACING, EnumFacing.NORTH )
.withProperty( Properties.ADVANCED, false )
.withProperty( Properties.STATE, ComputerState.OFF )
.withProperty( Properties.STATE, ComputerState.Off )
);
}
@ -126,7 +125,7 @@ protected IBlockState getDefaultBlockState( ComputerFamily family, EnumFacing pl
public IBlockState getActualState( @Nonnull IBlockState state, IBlockAccess world, BlockPos pos )
{
TileEntity tile = world.getTileEntity( pos );
return state.withProperty( Properties.STATE, tile instanceof TileComputer ? ((TileComputer) tile).getState() : ComputerState.OFF );
return state.withProperty( Properties.STATE, tile instanceof TileComputer ? ((TileComputer) tile).getState() : ComputerState.Off );
}
@Override

13
src/main/java/dan200/computercraft/shared/computer/core/ComputerState.java → src/main/java/dan200/computercraft/shared/computer/blocks/ComputerState.java
View File

@ -4,7 +4,7 @@
* Send enquiries to dratcliffe@gmail.com
*/
package dan200.computercraft.shared.computer.core;
package dan200.computercraft.shared.computer.blocks;
import net.minecraft.util.IStringSerializable;
@ -12,12 +12,15 @@
public enum ComputerState implements IStringSerializable
{
OFF( "off" ),
ON( "on" ),
BLINKING( "blinking" );
Off( "off" ),
On( "on" ),
Blinking( "blinking" );
private static final ComputerState[] VALUES = ComputerState.values();
// TODO: Move to dan200.computercraft.shared.computer.core in the future. We can't do it now
// as Plethora depends on it.
private String m_name;
ComputerState( String name )
@ -40,7 +43,7 @@ public String toString()
public static ComputerState valueOf( int ordinal )
{
return ordinal < 0 || ordinal >= VALUES.length ? ComputerState.OFF : VALUES[ordinal];
return ordinal < 0 || ordinal >= VALUES.length ? ComputerState.Off : VALUES[ordinal];
}
}

5
src/main/java/dan200/computercraft/shared/computer/blocks/TileComputer.java
View File

@ -8,7 +8,6 @@
import dan200.computercraft.ComputerCraft;
import dan200.computercraft.shared.computer.core.ComputerFamily;
import dan200.computercraft.shared.computer.core.ComputerState;
import dan200.computercraft.shared.computer.core.ServerComputer;
import dan200.computercraft.shared.computer.items.ComputerItemFactory;
import net.minecraft.block.state.IBlockState;
@ -25,7 +24,7 @@ public class TileComputer extends TileComputerBase
private static final String TAG_STATE = "state";
private ComputerProxy m_proxy;
private ComputerState state = ComputerState.OFF;
private ComputerState state = ComputerState.Off;
@Override
protected ServerComputer createComputer( int instanceID, int id )
@ -100,7 +99,7 @@ public void update()
if( !world.isRemote )
{
ServerComputer computer = getServerComputer();
state = computer == null ? ComputerState.OFF : computer.getState();
state = computer == null ? ComputerState.Off : computer.getState();
}
}

5
src/main/java/dan200/computercraft/shared/computer/core/ClientComputer.java
View File

@ -9,6 +9,7 @@
import com.google.common.base.Objects;
import dan200.computercraft.ComputerCraft;
import dan200.computercraft.shared.common.ClientTerminal;
import dan200.computercraft.shared.computer.blocks.ComputerState;
import dan200.computercraft.shared.network.server.ComputerActionServerMessage;
import dan200.computercraft.shared.network.server.QueueEventServerMessage;
import dan200.computercraft.shared.network.server.RequestComputerMessage;
@ -109,8 +110,8 @@ public void setState( ComputerState state, NBTTagCompound userData )
boolean oldBlinking = m_blinking;
NBTTagCompound oldUserData = m_userData;
m_on = state != ComputerState.OFF;
m_blinking = state == ComputerState.BLINKING;
m_on = state != ComputerState.Off;
m_blinking = state == ComputerState.Blinking;
m_userData = userData;
m_changed |= m_on != oldOn || m_blinking != oldBlinking || !Objects.equal( m_userData, oldUserData );

5
src/main/java/dan200/computercraft/shared/computer/core/IComputer.java
View File

@ -7,6 +7,7 @@
package dan200.computercraft.shared.computer.core;
import dan200.computercraft.shared.common.ITerminal;
import dan200.computercraft.shared.computer.blocks.ComputerState;
public interface IComputer extends ITerminal
{
@ -31,7 +32,7 @@ default void queueEvent( String event )
default ComputerState getState()
{
if( !isOn() ) return ComputerState.OFF;
return isCursorDisplayed() ? ComputerState.BLINKING : ComputerState.ON;
if( !isOn() ) return ComputerState.Off;
return isCursorDisplayed() ? ComputerState.Blinking : ComputerState.On;
}
}

2
src/main/java/dan200/computercraft/shared/network/client/ComputerDataClientMessage.java
View File

@ -6,7 +6,7 @@
package dan200.computercraft.shared.network.client;
import dan200.computercraft.shared.computer.core.ComputerState;
import dan200.computercraft.shared.computer.blocks.ComputerState;
import dan200.computercraft.shared.computer.core.ServerComputer;
import dan200.computercraft.shared.network.NetworkMessages;
import net.minecraft.nbt.NBTTagCompound;

4
src/main/java/dan200/computercraft/shared/pocket/items/ItemPocketComputer.java
View File

@ -16,7 +16,7 @@
import dan200.computercraft.shared.common.IColouredItem;
import dan200.computercraft.shared.computer.core.ClientComputer;
import dan200.computercraft.shared.computer.core.ComputerFamily;
import dan200.computercraft.shared.computer.core.ComputerState;
import dan200.computercraft.shared.computer.blocks.ComputerState;
import dan200.computercraft.shared.computer.core.ServerComputer;
import dan200.computercraft.shared.computer.items.IComputerItem;
import dan200.computercraft.shared.pocket.apis.PocketAPI;
@ -454,7 +454,7 @@ private void setSessionID( @Nonnull ItemStack stack, int sessionID )
public ComputerState getState( @Nonnull ItemStack stack )
{
ClientComputer computer = getClientComputer( stack );
return computer == null ? ComputerState.OFF : computer.getState();
return computer == null ? ComputerState.Off : computer.getState();
}
@SideOnly( Side.CLIENT )