Skip to content

Commit

Permalink
Merge pull request #28 from LotuxPunk/new_methods
Browse files Browse the repository at this point in the history
remove HADS status
  • Loading branch information
LotuxPunk authored Mar 15, 2020
2 parents d269f4f + be1bfd8 commit 78c69cf
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 35 deletions.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ buildscript {
apply plugin: 'net.minecraftforge.gradle.forge'
//Only edit below this line, the above code adds and enables the necessary things for Forge to be setup.

version = "1.12.2-1.6.0.0"
version = "1.12.2-1.6.0.1"
group = "com.vandendaelen.handles" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
archivesBaseName = "handles"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
public class TileTardisInterfaceBase extends TileEntity {
private UUID ownerID = null;
public static final String peripheralName = "tardisinterface";
public static final List<String> METHODS = Arrays.asList("getTardisPos", "setTardisDestination","startFlight", "setDoors", "isInFlight","setFueling", "getArtron","isDoorsOpened","canFly","getTravelTime", "getWaypoint","setWaypoint","getHealthComponent","getDimensionsID","getDimensionName","setRelativePos", "setDimensionPos", "getTardisDestination", "getDimension", "getTargetDimension", "setField", "getField", "getSystemName", "setStealth", "getStealh", "setHADS", "getHADS");
public static final List<String> METHODS = Arrays.asList("getTardisPos", "setTardisDestination","startFlight", "setDoors", "isInFlight","setFueling", "getArtron","isDoorsOpened","canFly","getTravelTime", "getWaypoint","setWaypoint","getHealthComponent","getDimensionsID","getDimensionName","setRelativePos", "setDimensionPos", "getTardisDestination", "getDimension", "getTargetDimension", "setField", "getField", "getSystemName", "setStealth", "getStealh");

@Override
public void readFromNBT(NBTTagCompound compound) {
Expand Down Expand Up @@ -243,15 +243,4 @@ public Object[] setStealth(Object[] arguments, TileEntityTardis te){
public Object[] getStealth(TileEntityTardis te){
return new Object[] {te.isStealthMode()};
}

public Object[] setHADS(Object[] arguments, TileEntityTardis te){
if (!canRun())
return new Object[]{"Aprioritron broken"};
te.setHADS((boolean)arguments[0]);
return new Object[] {null};
}

public Object[] getHADS(TileEntityTardis te){
return new Object[] {te.isHADSEnabled()};
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -179,18 +179,6 @@ public Object[] callMethod(@Nonnull IComputerAccess computer, @Nonnull ILuaConte
throw new LuaException("Too many arguments : getStealth()");
return getStealth(te);
}
case 25:{//setHADS
if (arguments.length < 1)
throw new LuaException("Not enough argument : setHADS(boolean)");
if (arguments.length > 1)
throw new LuaException("Too many arguments : setHADS(boolean)");
return setHADS(arguments, te);
}
case 26:{ //getHADS
if (arguments.length >= 1)
throw new LuaException("Too many arguments : getHADS()");
return getHADS(te);
}
default:{
throw new LuaException("No method found");
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -223,14 +223,4 @@ public Object[] setStealth(Context context, Arguments args){
public Object[] getStealth(Context context, Arguments args){
return getStealth(getTardis());
}

@Callback
public Object[] setHADS(Context context, Arguments args){
return setHADS(args.toArray(),getTardis());
}

@Callback
public Object[] getHADS(Context context, Arguments args){
return getHADS(getTardis());
}
}

0 comments on commit 78c69cf

Please sign in to comment.