Most of the 1.8 Port.
This commit is contained in:
@@ -28,7 +28,6 @@ import java.util.Set;
|
||||
|
||||
import io.netty.buffer.ByteBuf;
|
||||
import io.netty.buffer.Unpooled;
|
||||
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
@@ -37,8 +36,6 @@ import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.AxisAlignedBB;
|
||||
import net.minecraft.util.MovingObjectPosition;
|
||||
import net.minecraft.util.Vec3;
|
||||
import net.minecraftforge.common.util.ForgeDirection;
|
||||
|
||||
import codechicken.lib.data.MCDataInput;
|
||||
import codechicken.lib.data.MCDataOutput;
|
||||
import codechicken.lib.raytracer.IndexedCuboid6;
|
||||
@@ -51,7 +48,6 @@ import codechicken.multipart.NormalOcclusionTest;
|
||||
import codechicken.multipart.NormallyOccludedPart;
|
||||
import codechicken.multipart.TMultiPart;
|
||||
import codechicken.multipart.scalatraits.TIInventoryTile;
|
||||
|
||||
import appeng.api.implementations.parts.IPartCable;
|
||||
import appeng.api.networking.IGridNode;
|
||||
import appeng.api.parts.IFacadeContainer;
|
||||
@@ -65,6 +61,7 @@ import appeng.api.parts.SelectedPart;
|
||||
import appeng.api.util.AECableType;
|
||||
import appeng.api.util.AEColor;
|
||||
import appeng.api.util.DimensionalCoord;
|
||||
import appeng.api.util.ForgeDirection;
|
||||
import appeng.client.render.BusRenderHelper;
|
||||
import appeng.client.render.BusRenderer;
|
||||
import appeng.core.AEConfig;
|
||||
@@ -596,9 +593,9 @@ public class CableBusPart extends JCuboidPart implements JNormalOcclusion, IReds
|
||||
{
|
||||
// mark the chunk for save...
|
||||
TileEntity te = this.tile();
|
||||
if( te != null && te.getWorldObj() != null )
|
||||
if( te != null && te.getWorld() != null )
|
||||
{
|
||||
te.getWorldObj().getChunkFromBlockCoords( this.x(), this.z() ).isModified = true;
|
||||
te.getWorld().getChunkFromBlockCoords( this.x(), this.z() ).isModified = true;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -30,16 +30,13 @@ import net.minecraftforge.common.MinecraftForge;
|
||||
import net.minecraftforge.event.entity.player.PlayerDestroyItemEvent;
|
||||
import net.minecraftforge.event.entity.player.PlayerInteractEvent;
|
||||
import net.minecraftforge.event.entity.player.PlayerInteractEvent.Action;
|
||||
|
||||
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
|
||||
|
||||
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
|
||||
import codechicken.lib.packet.PacketCustom;
|
||||
import codechicken.lib.raytracer.RayTracer;
|
||||
import codechicken.lib.vec.BlockCoord;
|
||||
import codechicken.lib.vec.Vector3;
|
||||
import codechicken.multipart.TMultiPart;
|
||||
import codechicken.multipart.TileMultipart;
|
||||
|
||||
import appeng.block.AEBaseItemBlock;
|
||||
import appeng.core.sync.network.NetworkHandler;
|
||||
import appeng.core.sync.packets.PacketMultiPart;
|
||||
|
||||
@@ -26,12 +26,9 @@ import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.Vec3;
|
||||
import net.minecraftforge.common.util.ForgeDirection;
|
||||
|
||||
import codechicken.lib.vec.BlockCoord;
|
||||
import codechicken.multipart.TMultiPart;
|
||||
import codechicken.multipart.TileMultipart;
|
||||
|
||||
import appeng.api.parts.IFacadeContainer;
|
||||
import appeng.api.parts.IFacadePart;
|
||||
import appeng.api.parts.IPart;
|
||||
@@ -40,6 +37,7 @@ import appeng.api.parts.LayerFlags;
|
||||
import appeng.api.parts.SelectedPart;
|
||||
import appeng.api.util.AEColor;
|
||||
import appeng.api.util.DimensionalCoord;
|
||||
import appeng.api.util.ForgeDirection;
|
||||
import appeng.facade.FacadeContainer;
|
||||
import appeng.parts.CableBusStorage;
|
||||
import appeng.util.Platform;
|
||||
@@ -101,7 +99,7 @@ public class FMPPlacementHelper implements IPartHost
|
||||
|
||||
if( this.myMP.canAddPart( this.myPart ) && Platform.isServer() )
|
||||
{
|
||||
this.myMP = TileMultipart.addPart( this.myMP.getWorldObj(), loc, this.myPart );
|
||||
this.myMP = TileMultipart.addPart( this.myMP.getWorld(), loc, this.myPart );
|
||||
this.hasPart = true;
|
||||
}
|
||||
|
||||
@@ -302,7 +300,7 @@ public class FMPPlacementHelper implements IPartHost
|
||||
{
|
||||
if( this.myPart == null )
|
||||
{
|
||||
return this.myMP.getWorldObj() != null;
|
||||
return this.myMP.getWorld() != null;
|
||||
}
|
||||
return this.myPart.isInWorld();
|
||||
}
|
||||
|
||||
@@ -23,16 +23,14 @@ import java.util.Random;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.common.util.ForgeDirection;
|
||||
|
||||
import codechicken.lib.vec.BlockCoord;
|
||||
import codechicken.lib.vec.Cuboid6;
|
||||
import codechicken.multipart.IRandomDisplayTick;
|
||||
import codechicken.multipart.minecraft.McBlockPart;
|
||||
import codechicken.multipart.minecraft.McSidedMetaPart;
|
||||
|
||||
import appeng.api.AEApi;
|
||||
import appeng.api.exceptions.MissingDefinition;
|
||||
import appeng.api.util.ForgeDirection;
|
||||
|
||||
|
||||
public class QuartzTorchPart extends McSidedMetaPart implements IRandomDisplayTick
|
||||
|
||||
Reference in New Issue
Block a user