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

Fixed SGCraft compatibility with 1.12.2

Browse source 
This only applies from Stargate Networks 2.0.0, but dependency can't be added explicitly due to the mod reporting invalid version information.
This commit is contained in:
Unknown 2019-08-28 10:31:18 +02:00 committed by unknown
parent 02a4a86381
commit 3efc76c328
5 changed files with 33 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
run/mods-ref/SGCraft-1.3-mc1.12.2.jar
View file

Binary file not shown.

BIN
run/mods-ref/SGCraft-2.0.2.jar Normal file
View file

Binary file not shown.

4
src/main/java/cr0s/warpdrive/WarpDrive.java
View file

@ -211,7 +211,9 @@ import javax.annotation.Nullable;
+ "after:ic2;"
+ "after:icbmclassic;"
+ "after:metalchests@[v5.8.1,);"
+ "after:opencomputers;",
+ "after:opencomputers;"
// + "after:sgcraft@[2.0.0,);"
,
certificateFingerprint = "f7be6b40743c6a8205df86c5e57547d578605d8a"
)
public class WarpDrive {

37
src/main/java/cr0s/warpdrive/compat/CompatSGCraft.java
View file

@ -28,9 +28,9 @@ public class CompatSGCraft implements IBlockTransformer {
public static void register() {
try {
classBaseTileEntity = Class.forName("gcewing.sg.BaseTileEntity");
classDHDBlock = Class.forName("gcewing.sg.DHDBlock");
classSGBaseBlock = Class.forName("gcewing.sg.SGBaseBlock");
classSGBaseTE = Class.forName("gcewing.sg.SGBaseTE");
classDHDBlock = Class.forName("gcewing.sg.block.DHDBlock");
classSGBaseBlock = Class.forName("gcewing.sg.block.SGBaseBlock");
classSGBaseTE = Class.forName("gcewing.sg.tileentity.SGBaseTE");
methodSGBaseTE_sgStateDescription = classSGBaseTE.getMethod("sgStateDescription");
WarpDriveConfig.registerBlockTransformer("SGCraft", new CompatSGCraft());
@ -73,7 +73,9 @@ public class CompatSGCraft implements IBlockTransformer {
// nothing to do
}
private static final byte[] mrotDHD = { 3, 0, 1, 2, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 };
// 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15
private static final byte[] mrotSGBase = { 3, 2, 0, 1, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 };
private static final int[] rotFacingDirectionOfBase = { 3, 0, 1, 2, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 };
@Override
public int rotate(final Block block, final int metadata, final NBTTagCompound nbtTileEntity, final ITransformation transformation) {
@ -124,14 +126,33 @@ public class CompatSGCraft implements IBlockTransformer {
}
}
if (classDHDBlock.isInstance(block) || classSGBaseBlock.isInstance(block)) {
// Ring renderer orientation
if (nbtTileEntity.hasKey("facingDirectionOfBase")) {
final int facing = nbtTileEntity.getByte("facingDirectionOfBase");
switch (rotationSteps) {
case 1:
return mrotDHD[metadata];
nbtTileEntity.setInteger("facingDirectionOfBase", rotFacingDirectionOfBase[facing]);
break;
case 2:
return mrotDHD[mrotDHD[metadata]];
nbtTileEntity.setInteger("facingDirectionOfBase", rotFacingDirectionOfBase[rotFacingDirectionOfBase[facing]]);
break;
case 3:
return mrotDHD[mrotDHD[mrotDHD[metadata]]];
nbtTileEntity.setInteger("facingDirectionOfBase", rotFacingDirectionOfBase[rotFacingDirectionOfBase[rotFacingDirectionOfBase[facing]]]);
break;
default:
break;
}
}
if ( classDHDBlock.isInstance(block)
|| classSGBaseBlock.isInstance(block) ) {
switch (rotationSteps) {
case 1:
return mrotSGBase[metadata];
case 2:
return mrotSGBase[mrotSGBase[metadata]];
case 3:
return mrotSGBase[mrotSGBase[mrotSGBase[metadata]]];
default:
return metadata;
}

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

@ -1565,7 +1565,7 @@ public class WarpDriveConfig {
CompatRefinedStorage.register();
}
final boolean isSGCraftLoaded = Loader.isModLoaded("SGCraft");
final boolean isSGCraftLoaded = Loader.isModLoaded("sgcraft");
if (isSGCraftLoaded) {
CompatSGCraft.register();
}