fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Port to 1.11

Browse Source
This commit is contained in:
yueh
2016-12-08 12:42:00 +01:00
parent 589730bfad
commit ed9e6dd21c
262 changed files with 4027 additions and 3954 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/hooks/DispenserBehaviorTinyTNT.java
+2 -2
View File
@@ -41,8 +41,8 @@ public final class DispenserBehaviorTinyTNT extends BehaviorDefaultDispenseItem
final int j = dispenser.getBlockPos().getY() + enumfacing.getFrontOffsetY();
final int k = dispenser.getBlockPos().getZ() + enumfacing.getFrontOffsetZ();
final EntityTinyTNTPrimed primedTinyTNTEntity = new EntityTinyTNTPrimed( world, i + 0.5F, j + 0.5F, k + 0.5F, null );
world.spawnEntityInWorld( primedTinyTNTEntity );
--dispensedItem.stackSize;
world.spawnEntity( primedTinyTNTEntity );
dispensedItem.setCount( dispensedItem.getCount() - 1 );
return dispensedItem;
}
}
src/main/java/appeng/hooks/DispenserMatterCannon.java
+1 -1
View File
@@ -65,7 +65,7 @@ public final class DispenserMatterCannon extends BehaviorDefaultDispenseItem
p.posY += dir.yOffset;
p.posZ += dir.zOffset;
dispensedItem = tm.onItemRightClick( dispensedItem, w, p, null ).getResult();
dispensedItem = tm.onItemRightClick( w, p, null ).getResult();
}
}
return dispensedItem;
src/main/java/appeng/hooks/TickHandler.java
+2 -2
View File
@@ -46,7 +46,7 @@ import appeng.api.parts.CableRenderMode;
import appeng.api.util.AEColor;
import appeng.core.AEConfig;
import appeng.core.AELog;
import appeng.core.CommonHelper;
import appeng.core.AppEng;
import appeng.core.sync.packets.PacketPaintedEntity;
import appeng.crafting.CraftingJob;
import appeng.me.Grid;
@@ -189,7 +189,7 @@ public class TickHandler
if( currentMode != this.crm )
{
this.crm = currentMode;
CommonHelper.proxy.triggerUpdates();
AppEng.proxy.triggerUpdates();
}
}