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

Merge pull request #336 from Andrew2448/ic2fix

Browse source 
Fix for crashes with people using the latest IC versions. Will be backwards compatible until ICustomElectricItem is removed. Also includes Omniwrench module bugfixes.
This commit is contained in:
Claire 2013-06-22 01:25:02 -07:00
commit 30b472b144
3 changed files with 21 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
build.xml
View file

@ -16,7 +16,7 @@
<property name="forge.version" value="${minecraft.version}-${forgemajor.version}.${forgebuild}"/>
<property name="forgeant.version" value="${forgemajor.version}.${forgebuild}"/>
<property name="ic2api.version" value="1.115.304-lf"/>
<property name="ic2api.version" value="1.116.354-lf"/>
<property name="ueapi.version" value="1.3.1.56"/>
<property name="asapi.version" value="0.5.1.3"/>
<property name="icbmapi.version" value="1.1.1.26"/>
@ -155,6 +155,8 @@
</move>
<move file="${download.dir}/ic2/api/item/ICustomElectricItem.java" todir="${mcpsrc.dir}/ic2/api/"/>
<move file="${download.dir}/ic2/api/item/ISpecialElectricItem.java" todir="${mcpsrc.dir}/ic2/api/"/>
<move file="${download.dir}/ic2/api/item/IElectricItemManager.java" todir="${mcpsrc.dir}/ic2/api/"/>
<move file="${download.dir}/ic2/api/item/IElectricItem.java" todir="${mcpsrc.dir}/ic2/api/"/>
<move file="${download.dir}/ic2/api/item/ElectricItem.java" todir="${mcpsrc.dir}/ic2/api/"/>
<move file="${download.dir}/ic2/api/item/Items.java" todir="${mcpsrc.dir}/ic2/api/"/>

2
src/minecraft/net/machinemuse/powersuits/powermodule/tool/OmniWrenchModule.java
View file

@ -94,7 +94,7 @@ public class OmniWrenchModule extends PowerModuleBase implements IRightClickModu
}
return !world.isRemote;
}
if (Block.blocksList[bId].rotateBlock(world, x, y, z, ForgeDirection.getOrientation(side))) {
if ((Block.blocksList[bId] != null) && Block.blocksList[bId].rotateBlock(world, x, y, z, ForgeDirection.getOrientation(side))) {
return !world.isRemote;
}

24
src/minecraft/net/machinemuse/utils/MuseBlockUtils.java
View file

@ -52,9 +52,9 @@ public class MuseBlockUtils {
return (meta + 8) % 16;
case 9:
for (int i = 2; i < 6; i++) {
int[] coords = new int[3];
int[] coords;
coords = getAdjacentCoordinatesForSide(x, y, z, i);
if (world.getBlockId(coords[0], coords[1], coords[2]) == Block.chest.blockID) {
if (world.getBlockId(coords[0], coords[1], coords[2]) == block) {
world.setBlockMetadataWithNotify(coords[0], coords[1], coords[2], SIDE_OPPOSITE[meta], 1);
return SIDE_OPPOSITE[meta];
}
@ -72,9 +72,12 @@ public class MuseBlockUtils {
return 5 + shift;
if (meta == 7)
return 0 + shift;
if (meta == 0)
if (meta == 0) {
return 7 + shift;
break;
}
return meta + shift;
case 11:
meta++; return meta % 16;
}
return meta;
}
@ -108,9 +111,9 @@ public class MuseBlockUtils {
return (meta + 8) % 16;
case 9:
for (int i = 2; i < 6; i++) {
int[] coords = new int[3];
int[] coords;
coords = getAdjacentCoordinatesForSide(x, y, z, i);
if (world.getBlockId(coords[0], coords[1], coords[2]) == Block.chest.blockID) {
if (world.getBlockId(coords[0], coords[1], coords[2]) == block) {
world.setBlockMetadataWithNotify(coords[0], coords[1], coords[2], SIDE_OPPOSITE[meta], 1);
return SIDE_OPPOSITE[meta];
}
@ -131,6 +134,8 @@ public class MuseBlockUtils {
if (meta == 0)
return 7 + shift;
break;
case 11:
meta++; return meta % 16;
}
return meta;
}
@ -141,7 +146,7 @@ public class MuseBlockUtils {
static {
rotateType[Block.wood.blockID] = 7;
rotateType[Block.dispenser.blockID] = 1;
rotateType[Block.dispenser.blockID] = 2;
rotateType[Block.railPowered.blockID] = 3;
rotateType[Block.railDetector.blockID] = 3;
rotateType[Block.pistonStickyBase.blockID] = 2;
@ -151,6 +156,7 @@ public class MuseBlockUtils {
rotateType[Block.chest.blockID] = 9;
rotateType[Block.furnaceIdle.blockID] = 1;
rotateType[Block.furnaceBurning.blockID] = 1;
rotateType[Block.signPost.blockID] = 11;
rotateType[Block.rail.blockID] = 3;
rotateType[Block.stairsCobblestone.blockID] = 5;
rotateType[Block.lever.blockID] = 10;
@ -167,6 +173,10 @@ public class MuseBlockUtils {
rotateType[Block.stairsWoodSpruce.blockID] = 5;
rotateType[Block.stairsWoodBirch.blockID] = 5;
rotateType[Block.stairsWoodJungle.blockID] = 5;
rotateType[Block.chestTrapped.blockID] = 9;
rotateType[Block.stairsNetherQuartz.blockID] = 5;
rotateType[Block.hopperBlock.blockID] = 2;
rotateType[Block.railActivator.blockID] = 3;
rotateType[Block.dropper.blockID] = 2;
}
}