Anvilcraft/WarpDrive
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Removed ComputerCraft special casing

Browse source
This commit is contained in:
Unknown 2018-12-28 23:43:21 +01:00 • committed by unknown
parent ccc7b2392f
commit 63ec17a037
2 changed files with 0 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/main/java/cr0s/warpdrive/config/WarpDriveConfig.java
View file

@ -147,7 +147,6 @@ public class WarpDriveConfig {
public static ItemStack IC2_emptyCell;
public static Block IC2_rubberWood;
public static ItemStack IC2_Resin;
public static Block CC_Computer, CC_peripheral, CCT_Turtle, CCT_Expanded, CCT_Advanced;
// Mod configuration (see loadConfig() for comments/definitions)
// General
@ -1234,7 +1233,6 @@ public class WarpDriveConfig {
}
if (isComputerCraftLoaded) {
loadCC();
CompatComputerCraft.register();
}
@ -1472,19 +1470,6 @@ public class WarpDriveConfig {
}
}
private static void loadCC() {
try {
CC_Computer = getBlockOrFire("computercraft:CC-Computer");
CC_peripheral = getBlockOrFire("computercraft:CC-Peripheral");
CCT_Turtle = getBlockOrFire("computercraft:CC-Turtle");
CCT_Expanded = getBlockOrFire("computercraft:CC-TurtleExpanded");
CCT_Advanced = getBlockOrFire("computercraft:CC-TurtleAdvanced");
} catch (final Exception exception) {
WarpDrive.logger.error("Error loading ComputerCraft classes");
exception.printStackTrace();
}
}
public static DocumentBuilder getXmlDocumentBuilder() {
if (xmlDocumentBuilder == null) {

9
src/main/java/cr0s/warpdrive/data/JumpBlock.java
View file

@ -344,15 +344,6 @@ public class JumpBlock {
}
}
if ( newTileEntity != null
&& ( block == WarpDriveConfig.CC_Computer
|| block == WarpDriveConfig.CC_peripheral
|| block == WarpDriveConfig.CCT_Turtle
|| block == WarpDriveConfig.CCT_Expanded
|| block == WarpDriveConfig.CCT_Advanced ) ) {
newTileEntity.invalidate();
}
if (newTileEntity != null) {
targetWorld.setTileEntity(target, newTileEntity);
if (isForgeMultipart) {