diff --git a/build.gradle b/build.gradle index 6fbc6a136..13fa7adbb 100644 --- a/build.gradle +++ b/build.gradle @@ -17,17 +17,6 @@ buildscript { } } -repositories { - maven { - name 'CB Maven FS' - url "http://chickenbones.net/maven/" - } - maven { - name 'ForgeFS' - url 'http://files.minecraftforge.net/maven' - } -} - apply plugin: 'idea' idea { @@ -39,6 +28,21 @@ idea { apply plugin: 'net.minecraftforge.gradle.forge' +repositories { + maven { + name 'CB Maven FS' + url "http://chickenbones.net/maven/" + } + maven { + name 'ForgeFS' + url 'http://files.minecraftforge.net/maven' + } + maven { + name 'amadornes' + url "http://maven.amadornes.com/" + } +} + // Define properties file ext.configFile = file "build.properties" @@ -58,10 +62,14 @@ targetCompatibility = '1.8' minecraft { version = config.minecraft_version + "-" + config.forge_version - mappings = "stable_22" + mappings = "${config.mappings_version}" runDir = "run" } +dependencies { + deobfCompile "MCMultiPart:MCMultiPart:${config.mcmp_version}:universal" +} + processResources { // copy everything else, thats not the mcmod.info diff --git a/build.properties b/build.properties index de38fe0f0..84d0d4708 100644 --- a/build.properties +++ b/build.properties @@ -1,6 +1,7 @@ minecraft_version=1.8.9 +mappings_version=stable_22 forge_version=11.15.1.1722 -FMP_version=1.1.2.331 +mcmp_version=1.0.8 CCLIB_version=1.1.3.136 NEI_version=1.0.4.101 CCC_version=1.0.6.39 diff --git a/src/main/java/mekanism/api/gas/GasTransmission.java b/src/main/java/mekanism/api/gas/GasTransmission.java index c3e111689..0e688f462 100644 --- a/src/main/java/mekanism/api/gas/GasTransmission.java +++ b/src/main/java/mekanism/api/gas/GasTransmission.java @@ -12,7 +12,9 @@ import mekanism.api.transmitters.TransmissionType; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.world.World; /** * A handy class containing several utilities for efficient gas transfer. @@ -22,12 +24,17 @@ import net.minecraft.util.EnumFacing; public final class GasTransmission { public static IGasHandler[] getConnectedAcceptors(TileEntity tileEntity, Collection sides) + { + return getConnectedAcceptors(tileEntity.getPos(), tileEntity.getWorld(), sides); + } + + public static IGasHandler[] getConnectedAcceptors(BlockPos pos, World world, Collection sides) { IGasHandler[] acceptors = new IGasHandler[] {null, null, null, null, null, null}; for(EnumFacing orientation : sides) { - TileEntity acceptor = Coord4D.get(tileEntity).offset(orientation).getTileEntity(tileEntity.getWorld()); + TileEntity acceptor = world.getTileEntity(pos.offset(orientation)); if(acceptor instanceof IGasHandler) { @@ -45,7 +52,12 @@ public final class GasTransmission */ public static IGasHandler[] getConnectedAcceptors(TileEntity tileEntity) { - return getConnectedAcceptors(tileEntity, Arrays.asList(EnumFacing.VALUES)); + return getConnectedAcceptors(tileEntity.getPos(), tileEntity.getWorld(), Arrays.asList(EnumFacing.VALUES)); + } + + public static IGasHandler[] getConnectedAcceptors(BlockPos pos, World world) + { + return getConnectedAcceptors(pos, world, Arrays.asList(EnumFacing.VALUES)); } /** diff --git a/src/main/java/mekanism/common/ColourRGBA.java b/src/main/java/mekanism/common/ColourRGBA.java new file mode 100644 index 000000000..1311b1d01 --- /dev/null +++ b/src/main/java/mekanism/common/ColourRGBA.java @@ -0,0 +1,9 @@ +package mekanism.common; + +/** + * Created by ben on 30/04/16. + */ +public class ColourRGBA +{ + public ColourRGBA(double r, double g, double b, double a) {} +} diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index 3811d2a83..c82423942 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -61,6 +61,7 @@ import mekanism.common.frequency.FrequencyManager; import mekanism.common.integration.MekanismHooks; import mekanism.common.integration.OreDictManager; import mekanism.common.multiblock.MultiblockManager; +import mekanism.common.multipart.MultipartMekanism; import mekanism.common.network.PacketDataRequest.DataRequestMessage; import mekanism.common.network.PacketSimpleGui; import mekanism.common.network.PacketTransmitterUpdate.PacketType; @@ -1358,7 +1359,7 @@ public class Mekanism registerOreDict(); //Set up multiparts -//TODO reinstate Multipart support with MCMultipart new MultipartMekanism(); + new MultipartMekanism(); //Integrate with Waila FMLInterModComms.sendMessage("Waila", "register", "mekanism.common.integration.WailaDataProvider.register"); diff --git a/src/main/java/mekanism/common/MekanismItems.java b/src/main/java/mekanism/common/MekanismItems.java index e1af7a891..ff47cac9c 100644 --- a/src/main/java/mekanism/common/MekanismItems.java +++ b/src/main/java/mekanism/common/MekanismItems.java @@ -33,6 +33,9 @@ import mekanism.common.item.ItemSeismicReader; import mekanism.common.item.ItemShard; import mekanism.common.item.ItemUpgrade; import mekanism.common.item.ItemWalkieTalkie; +import mekanism.common.multipart.ItemGlowPanel; +import mekanism.common.multipart.ItemPartTransmitter; + import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -82,8 +85,8 @@ public class MekanismItems public static final ItemGaugeDropper GaugeDropper = (ItemGaugeDropper)new ItemGaugeDropper().setUnlocalizedName("GaugeDropper"); public static final Item ConfigurationCard = new ItemConfigurationCard().setUnlocalizedName("ConfigurationCard"); public static final Item CraftingFormula = new ItemCraftingFormula().setUnlocalizedName("CraftingFormula"); -// public static final Item PartTransmitter = new ItemPartTransmitter().setUnlocalizedName("MultipartTransmitter"); -// public static final Item GlowPanel = new ItemGlowPanel().setUnlocalizedName("GlowPanel"); + public static final Item PartTransmitter = new ItemPartTransmitter().setUnlocalizedName("MultipartTransmitter"); + public static final Item GlowPanel = new ItemGlowPanel().setUnlocalizedName("GlowPanel"); public static final ItemScubaTank ScubaTank = (ItemScubaTank)new ItemScubaTank().setUnlocalizedName("ScubaTank"); public static final ItemGasMask GasMask = (ItemGasMask)new ItemGasMask().setUnlocalizedName("GasMask"); public static final ItemJetpack Jetpack = (ItemJetpack)new ItemJetpack().setUnlocalizedName("Jetpack"); @@ -108,7 +111,7 @@ public class MekanismItems */ public static void register() { -// GameRegistry.registerItem(PartTransmitter, "PartTransmitter"); + GameRegistry.registerItem(PartTransmitter, "PartTransmitter"); GameRegistry.registerItem(ElectricBow, "ElectricBow"); GameRegistry.registerItem(Dust, "Dust"); GameRegistry.registerItem(Ingot, "Ingot"); @@ -158,7 +161,7 @@ public class MekanismItems GameRegistry.registerItem(Substrate, "Substrate"); GameRegistry.registerItem(Polyethene, "Polyethene"); GameRegistry.registerItem(BioFuel, "BioFuel"); -// GameRegistry.registerItem(GlowPanel, "GlowPanel"); + GameRegistry.registerItem(GlowPanel, "GlowPanel"); GameRegistry.registerItem(Flamethrower, "Flamethrower"); GameRegistry.registerItem(GaugeDropper, "GaugeDropper"); GameRegistry.registerItem(FactoryInstaller, "FactoryInstaller"); diff --git a/src/main/java/mekanism/common/Tier.java b/src/main/java/mekanism/common/Tier.java index 75cad341b..7359a1ed6 100644 --- a/src/main/java/mekanism/common/Tier.java +++ b/src/main/java/mekanism/common/Tier.java @@ -6,6 +6,7 @@ import java.util.ArrayList; import java.util.List; import mekanism.api.EnumColor; +import mekanism.common.multipart.TransmitterType; import mekanism.common.util.LangUtils; import net.minecraft.util.IStringSerializable; @@ -253,7 +254,7 @@ public final class Tier guiLocation = gui; } } -/* + public static enum CableTier implements ITier { BASIC(3200, TransmitterType.UNIVERSAL_CABLE_BASIC), @@ -577,7 +578,7 @@ public final class Tier return BASIC; } } - */ + public static enum FluidTankTier implements ITier { BASIC(14000, 400), diff --git a/src/main/java/mekanism/common/content/transporter/PathfinderCache.java b/src/main/java/mekanism/common/content/transporter/PathfinderCache.java index 6d897158c..9c56b7751 100644 --- a/src/main/java/mekanism/common/content/transporter/PathfinderCache.java +++ b/src/main/java/mekanism/common/content/transporter/PathfinderCache.java @@ -6,13 +6,15 @@ import java.util.List; import java.util.Map; import mekanism.api.Coord4D; + +import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; public class PathfinderCache { public static Map> cachedPaths = new HashMap>(); - public static void onChanged(Coord4D location) + public static void onChanged(BlockPos location) { reset(); } diff --git a/src/main/java/mekanism/common/content/transporter/TransporterStack.java b/src/main/java/mekanism/common/content/transporter/TransporterStack.java index 8670053ae..1c40f4136 100644 --- a/src/main/java/mekanism/common/content/transporter/TransporterStack.java +++ b/src/main/java/mekanism/common/content/transporter/TransporterStack.java @@ -275,31 +275,31 @@ public class TransporterStack } } - public int getSide(ILogisticalTransporter transporter) + public EnumFacing getSide(ILogisticalTransporter transporter) { if(progress < 50) { if(getPrev(transporter) != null) { - return transporter.coord().sideDifference(getPrev(transporter)).ordinal(); + return transporter.coord().sideDifference(getPrev(transporter)); } } else if(progress == 50) { if(getNext(transporter) != null) { - return getNext(transporter).sideDifference(transporter.coord()).ordinal(); + return getNext(transporter).sideDifference(transporter.coord()); } } else if(progress > 50) { if(getNext(transporter) != null) { - return getNext(transporter).sideDifference(transporter.coord()).ordinal(); + return getNext(transporter).sideDifference(transporter.coord()); } } - return 0; + return EnumFacing.DOWN; } public boolean canInsertToTransporter(TileEntity tileEntity, EnumFacing from) diff --git a/src/main/java/mekanism/common/multipart/ItemGlowPanel.java b/src/main/java/mekanism/common/multipart/ItemGlowPanel.java index c26831f21..cd76ea190 100644 --- a/src/main/java/mekanism/common/multipart/ItemGlowPanel.java +++ b/src/main/java/mekanism/common/multipart/ItemGlowPanel.java @@ -5,24 +5,32 @@ import java.util.List; import mekanism.api.EnumColor; import mekanism.common.Mekanism; import mekanism.common.util.LangUtils; -import net.minecraft.client.renderer.texture.IIconRegister; +//import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.util.StatCollector; +import net.minecraft.util.Vec3; import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; +/* import codechicken.lib.vec.BlockCoord; import codechicken.lib.vec.Vector3; import codechicken.microblock.HollowMicroblock; import codechicken.multipart.JItemMultiPart; import codechicken.multipart.TMultiPart; import codechicken.multipart.TileMultipart; +*/ +import mcmultipart.item.ItemMultiPart; +import mcmultipart.multipart.IMultipart; +import mcmultipart.multipart.IMultipartContainer; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -public class ItemGlowPanel extends JItemMultiPart +public class ItemGlowPanel extends ItemMultiPart { public ItemGlowPanel() { @@ -30,67 +38,66 @@ public class ItemGlowPanel extends JItemMultiPart setHasSubtypes(true); setCreativeTab(Mekanism.tabMekanism); } - - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister register) {} @Override - public TMultiPart newPart(ItemStack item, EntityPlayer player, World world, BlockCoord pos, int side, Vector3 vHit) + public IMultipart createPart(World world, BlockPos pos, EnumFacing orientation, Vec3 vHit, ItemStack item, EntityPlayer player) { EnumColor col = EnumColor.DYES[item.getItemDamage()]; - ForgeDirection orientation = getSideFromVector3(vHit.subtract(Vector3.center)); - + if(pos != null && orientation != null) { - BlockCoord pos1 = pos.copy().inset(orientation.getOpposite().ordinal()); + BlockPos pos1 = pos.offset(orientation); - if(world.isSideSolid(pos1.x, pos1.y, pos1.z, orientation.getOpposite())) + if(world.isSideSolid(pos1, orientation.getOpposite())) { return new PartGlowPanel(col, orientation); } - if(world.getTileEntity(pos.x, pos.y, pos.z) instanceof TileMultipart && ((TileMultipart) world.getTileEntity(pos.x, pos.y, pos.z)).partMap(orientation.ordinal()) instanceof HollowMicroblock) +/* + if(world.getTileEntity(pos.x, pos.y, pos.z) instanceof IMultipartContainer && ((TileMultipart) world.getTileEntity(pos.x, pos.y, pos.z)).partMap(orientation.ordinal()) instanceof HollowMicroblock) { return new PartGlowPanel(col, orientation); } +*/ } return null; } - public ForgeDirection getSideFromVector3(Vector3 vector) +/* + public EnumFacing getSideFromVector3(Vec3 vector) { - if(Math.abs(vector.x) > Math.abs(vector.y) && Math.abs(vector.x) > Math.abs(vector.z)) + if(Math.abs(vector.xCoord) > Math.abs(vector.yCoord) && Math.abs(vector.xCoord) > Math.abs(vector.zCoord)) { - if((vector.x < 0.5 && vector.x > 0) || vector.x == -0.5) + if((vector.xCoord < 0.5 && vector.xCoord > 0) || vector.xCoord == -0.5) { - return ForgeDirection.EAST; + return EnumFacing.EAST; } - return ForgeDirection.WEST; + return EnumFacing.WEST; } else if(Math.abs(vector.y) > Math.abs(vector.x) && Math.abs(vector.y) > Math.abs(vector.z)) { if((vector.y < 0.5 && vector.y > 0) || vector.y == -0.5) { - return ForgeDirection.UP; + return EnumFacing.UP; } - return ForgeDirection.DOWN; + return EnumFacing.DOWN; } else if(Math.abs(vector.z) > Math.abs(vector.x) && Math.abs(vector.z) > Math.abs(vector.y)) { if((vector.z < 0.5 && vector.z > 0) || vector.z == -0.5) { - return ForgeDirection.SOUTH; + return EnumFacing.SOUTH; } - return ForgeDirection.NORTH; + return EnumFacing.NORTH; } return null; } +*/ @Override public void getSubItems(Item item, CreativeTabs tab, List listToAddTo) diff --git a/src/main/java/mekanism/common/multipart/ItemPartTransmitter.java b/src/main/java/mekanism/common/multipart/ItemPartTransmitter.java index 5a1517e49..8235bee3d 100644 --- a/src/main/java/mekanism/common/multipart/ItemPartTransmitter.java +++ b/src/main/java/mekanism/common/multipart/ItemPartTransmitter.java @@ -15,23 +15,31 @@ import mekanism.common.Tier; import mekanism.common.Tier.BaseTier; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; -import net.minecraft.client.renderer.texture.IIconRegister; +//import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.settings.GameSettings; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; +import net.minecraft.util.Vec3; import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; +/* import codechicken.lib.vec.BlockCoord; import codechicken.lib.vec.Vector3; import codechicken.multipart.JItemMultiPart; import codechicken.multipart.TMultiPart; +*/ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -public class ItemPartTransmitter extends JItemMultiPart +import mcmultipart.item.ItemMultiPart; +import mcmultipart.multipart.IMultipart; + +public class ItemPartTransmitter extends ItemMultiPart { public ItemPartTransmitter() { @@ -41,21 +49,18 @@ public class ItemPartTransmitter extends JItemMultiPart } @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister register) {} - - @Override - public TMultiPart newPart(ItemStack stack, EntityPlayer player, World world, BlockCoord coord, int face, Vector3 vecHit) + public IMultipart createPart(World world, BlockPos pos, EnumFacing dir, Vec3 hit, ItemStack stack, EntityPlayer player) { TransmitterType type = TransmitterType.values()[stack.getItemDamage()]; +/* if(type.getTransmission() != TransmissionType.ITEM) { - Coord4D obj = new Coord4D(coord.x, coord.y, coord.z, world.provider.dimensionId); + Coord4D obj = new Coord4D(pos, world.provider.getDimensionId()); - List networks = new ArrayList<>(); + List networks = new ArrayList(); - for(ForgeDirection side : ForgeDirection.VALID_DIRECTIONS) + for(EnumFacing side : EnumFacing.values()) { TileEntity tile = obj.offset(side).getTileEntity(world); @@ -65,6 +70,7 @@ public class ItemPartTransmitter extends JItemMultiPart } } } +*/ return PartTransmitter.getPartType(TransmitterType.values()[getDamage(stack)]); } @@ -77,7 +83,7 @@ public class ItemPartTransmitter extends JItemMultiPart @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) + public void addInformation(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { if(!MekKeyHandler.getIsKeyPressed(MekanismKeyHandler.sneakKey)) { @@ -163,7 +169,7 @@ public class ItemPartTransmitter extends JItemMultiPart } @Override - public void getSubItems(Item item, CreativeTabs tab, List listToAddTo) + public void getSubItems(Item item, CreativeTabs tab, List listToAddTo) { for(TransmitterType type : TransmitterType.values()) { @@ -171,13 +177,6 @@ public class ItemPartTransmitter extends JItemMultiPart } } - @Override - @SideOnly(Side.CLIENT) - public int getSpriteNumber() - { - return 0; - } - @Override public String getUnlocalizedName(ItemStack stack) { diff --git a/src/main/java/mekanism/common/multipart/MultipartMekanism.java b/src/main/java/mekanism/common/multipart/MultipartMekanism.java index d9aa6d0de..52c043517 100644 --- a/src/main/java/mekanism/common/multipart/MultipartMekanism.java +++ b/src/main/java/mekanism/common/multipart/MultipartMekanism.java @@ -1,18 +1,26 @@ package mekanism.common.multipart; -import static mekanism.common.block.BlockMachine.MachineBlock.MACHINE_BLOCK_1; -import static mekanism.common.block.BlockMachine.MachineBlock.MACHINE_BLOCK_2; +import static mekanism.common.block.states.BlockStateMachine.MachineBlock.MACHINE_BLOCK_1; +import static mekanism.common.block.states.BlockStateMachine.MachineBlock.MACHINE_BLOCK_2; import mekanism.common.MekanismBlocks; import mekanism.common.Tier; -import mekanism.common.block.BlockMachine.MachineType; +import mekanism.common.block.states.BlockStateMachine.MachineType; import net.minecraft.item.ItemStack; +/* import codechicken.microblock.BlockMicroMaterial; import codechicken.microblock.MicroMaterialRegistry; import codechicken.multipart.MultiPartRegistry; import codechicken.multipart.MultiPartRegistry.IPartFactory; import codechicken.multipart.MultipartGenerator; import codechicken.multipart.TMultiPart; -import net.minecraft.fml.common.event.FMLInterModComms; +*/ +import mcmultipart.microblock.BlockMicroMaterial; +import mcmultipart.microblock.MicroblockRegistry; +import mcmultipart.multipart.IMultipart; +import mcmultipart.multipart.IPartFactory; +import mcmultipart.multipart.MultipartRegistry; + +import net.minecraftforge.fml.common.event.FMLInterModComms; public class MultipartMekanism implements IPartFactory { @@ -23,7 +31,7 @@ public class MultipartMekanism implements IPartFactory public void init() { - MultiPartRegistry.registerParts(this, new String[] {"mekanism:universal_cable_basic", + MultipartRegistry.registerPartFactory(this, "mekanism:universal_cable_basic", "mekanism:universal_cable_advanced", "mekanism:universal_cable_elite", "mekanism:universal_cable_ultimate", "mekanism:mechanical_pipe", "mekanism:mechanical_pipe_basic", "mekanism:mechanical_pipe_advanced", @@ -35,8 +43,9 @@ public class MultipartMekanism implements IPartFactory "mekanism:restrictive_transporter", "mekanism:diversion_transporter", "mekanism:thermodynamic_conductor_basic", "mekanism:thermodynamic_conductor_advanced", "mekanism:thermodynamic_conductor_elite", "mekanism:thermodynamic_conductor_ultimate", - "mekanism:glow_panel"}); + "mekanism:glow_panel"); +/* MultipartGenerator.registerPassThroughInterface("mekanism.api.IConfigurable"); MultipartGenerator.registerPassThroughInterface("mekanism.api.energy.IStrictEnergyAcceptor"); MultipartGenerator.registerPassThroughInterface("mekanism.api.gas.IGasHandler"); @@ -48,12 +57,13 @@ public class MultipartMekanism implements IPartFactory MultipartGenerator.registerPassThroughInterface("mekanism.common.base.ILogisticalTransporter"); MultipartGenerator.registerPassThroughInterface("mekanism.common.base.ITileNetwork"); MultipartGenerator.registerPassThroughInterface("cofh.api.energy.IEnergyHandler"); +*/ registerMicroMaterials(); } @Override - public TMultiPart createPart(String name, boolean client) + public IMultipart createPart(String name, boolean client) { if(name.equals("mekanism:universal_cable")) { @@ -163,11 +173,11 @@ public class MultipartMekanism implements IPartFactory { for(int i = 0; i < 16; i++) { - MicroMaterialRegistry.registerMaterial(new PlasticMicroMaterial(MekanismBlocks.PlasticBlock, i), BlockMicroMaterial.materialKey(MekanismBlocks.PlasticBlock, i)); - MicroMaterialRegistry.registerMaterial(new PlasticMicroMaterial(MekanismBlocks.GlowPlasticBlock, i), BlockMicroMaterial.materialKey(MekanismBlocks.GlowPlasticBlock, i)); - MicroMaterialRegistry.registerMaterial(new PlasticMicroMaterial(MekanismBlocks.SlickPlasticBlock, i), BlockMicroMaterial.materialKey(MekanismBlocks.SlickPlasticBlock, i)); - MicroMaterialRegistry.registerMaterial(new PlasticMicroMaterial(MekanismBlocks.ReinforcedPlasticBlock, i), BlockMicroMaterial.materialKey(MekanismBlocks.ReinforcedPlasticBlock, i)); - MicroMaterialRegistry.registerMaterial(new PlasticMicroMaterial(MekanismBlocks.RoadPlasticBlock, i), BlockMicroMaterial.materialKey(MekanismBlocks.RoadPlasticBlock, i)); +// MicroblockRegistry.registerMaterial(new PlasticMicroMaterial(MekanismBlocks.PlasticBlock, i), BlockMicroMaterial.materialKey(MekanismBlocks.PlasticBlock, i)); +// MicroMaterialRegistry.registerMaterial(new PlasticMicroMaterial(MekanismBlocks.GlowPlasticBlock, i), BlockMicroMaterial.materialKey(MekanismBlocks.GlowPlasticBlock, i)); +// MicroMaterialRegistry.registerMaterial(new PlasticMicroMaterial(MekanismBlocks.SlickPlasticBlock, i), BlockMicroMaterial.materialKey(MekanismBlocks.SlickPlasticBlock, i)); +// MicroMaterialRegistry.registerMaterial(new PlasticMicroMaterial(MekanismBlocks.ReinforcedPlasticBlock, i), BlockMicroMaterial.materialKey(MekanismBlocks.ReinforcedPlasticBlock, i)); +// MicroMaterialRegistry.registerMaterial(new PlasticMicroMaterial(MekanismBlocks.RoadPlasticBlock, i), BlockMicroMaterial.materialKey(MekanismBlocks.RoadPlasticBlock, i)); FMLInterModComms.sendMessage("ForgeMicroblock", "microMaterial", new ItemStack(MekanismBlocks.BasicBlock, 1, i)); diff --git a/src/main/java/mekanism/common/multipart/MultipartTransmitter.java b/src/main/java/mekanism/common/multipart/MultipartTransmitter.java index 33ef790bc..6845107e1 100644 --- a/src/main/java/mekanism/common/multipart/MultipartTransmitter.java +++ b/src/main/java/mekanism/common/multipart/MultipartTransmitter.java @@ -10,7 +10,10 @@ import mekanism.api.transmitters.TransmissionType; import mekanism.common.transmitters.Transmitter; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; + +import mcmultipart.block.TileMultipart; +import mcmultipart.multipart.IMultipartContainer; public class MultipartTransmitter> extends Transmitter { @@ -30,17 +33,17 @@ public class MultipartTransmitter> extends Tran @Override public World world() { - return getPart().world(); + return getPart().getWorld(); } @Override public Coord4D coord() { - return new Coord4D(getPart().x(), getPart().y(), getPart().z(), getPart().world().provider.dimensionId); + return new Coord4D(getPart().getPos(), getPart().getWorld().provider.getDimensionId()); } @Override - public Coord4D getAdjacentConnectableTransmitterCoord(ForgeDirection side) + public Coord4D getAdjacentConnectableTransmitterCoord(EnumFacing side) { Coord4D sideCoord = coord().offset(side); @@ -65,7 +68,7 @@ public class MultipartTransmitter> extends Tran } @Override - public A getAcceptor(ForgeDirection side) + public A getAcceptor(EnumFacing side) { return getPart().getCachedAcceptor(side); } @@ -73,7 +76,16 @@ public class MultipartTransmitter> extends Tran @Override public boolean isValid() { - return getPart().tile() != null && !getPart().tile().isInvalid() && !getPart().unloaded && coord().exists(world()); + IMultipartContainer cont = getPart().getContainer(); + if(cont == null) + return false; + + if(cont instanceof TileEntity && ((TileEntity)cont).isInvalid()) + { + return false; + } + + return !getPart().unloaded && coord().exists(world()); } @Override diff --git a/src/main/java/mekanism/common/multipart/MultipartTransporter.java b/src/main/java/mekanism/common/multipart/MultipartTransporter.java index 7fefc6720..b3bc9059d 100644 --- a/src/main/java/mekanism/common/multipart/MultipartTransporter.java +++ b/src/main/java/mekanism/common/multipart/MultipartTransporter.java @@ -23,7 +23,7 @@ import mekanism.common.util.TransporterUtils; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; public class MultipartTransporter extends MultipartTransmitter implements ILogisticalTransporter { @@ -91,7 +91,7 @@ public class MultipartTransporter extends MultipartTransmitter getNetworkedData(ArrayList data) { data = super.getNetworkedData(data); @@ -102,9 +104,9 @@ public class PartDiversionTransporter extends PartLogisticalTransporter } @Override - public ArrayList getSyncPacket(TransporterStack stack, boolean kill) + public ArrayList getSyncPacket(TransporterStack stack, boolean kill) { - ArrayList data = super.getSyncPacket(stack, kill); + ArrayList data = super.getSyncPacket(stack, kill); data.add(modes[0]); data.add(modes[1]); @@ -117,12 +119,12 @@ public class PartDiversionTransporter extends PartLogisticalTransporter } @Override - protected boolean onConfigure(EntityPlayer player, int part, int side) + protected boolean onConfigure(EntityPlayer player, int part, EnumFacing side) { - int newMode = (modes[side] + 1) % 3; + int newMode = (modes[side.ordinal()] + 1) % 3; String description = "ERROR"; - modes[side] = newMode; + modes[side.ordinal()] = newMode; switch(newMode) { @@ -138,16 +140,17 @@ public class PartDiversionTransporter extends PartLogisticalTransporter } refreshConnections(); - tile().notifyPartChange(this); + notifyPartUpdate(); notifyTileChange(); player.addChatMessage(new ChatComponentText(EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " " + LangUtils.localize("tooltip.configurator.toggleDiverter") + ": " + EnumColor.RED + description)); - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(tile()), getNetworkedData(new ArrayList())), new Range4D(Coord4D.get(tile()))); + Coord4D coord = new Coord4D(getPos(), getWorld().provider.getDimensionId()); + Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(coord, getNetworkedData(new ArrayList())), new Range4D(coord)); return true; } @Override - public boolean canConnect(ForgeDirection side) + public boolean canConnect(EnumFacing side) { if(!super.canConnect(side)) { @@ -155,9 +158,9 @@ public class PartDiversionTransporter extends PartLogisticalTransporter } int mode = modes[side.ordinal()]; - boolean redstone = world().isBlockIndirectlyGettingPowered(x(), y(), z()); + int redstone = getWorld().isBlockIndirectlyGettingPowered(getPos()); - if((mode == 2 && redstone == true) || (mode == 1 && redstone == false)) + if((mode == 2 && redstone > 0) || (mode == 1 && redstone == 0)) { return false; } diff --git a/src/main/java/mekanism/common/multipart/PartGlowPanel.java b/src/main/java/mekanism/common/multipart/PartGlowPanel.java index b1af8e81b..e55fe9af7 100644 --- a/src/main/java/mekanism/common/multipart/PartGlowPanel.java +++ b/src/main/java/mekanism/common/multipart/PartGlowPanel.java @@ -1,20 +1,26 @@ package mekanism.common.multipart; import java.util.Collections; +import java.util.List; import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.client.render.RenderGlowPanel; import mekanism.common.MekanismItems; import net.minecraft.client.particle.EffectRenderer; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.IIcon; +//import net.minecraft.util.IIcon; +import net.minecraft.network.PacketBuffer; +import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.MovingObjectPosition; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; +/* import codechicken.lib.data.MCDataInput; import codechicken.lib.data.MCDataOutput; -import codechicken.lib.vec.Cuboid6; +import codechicken.lib.vec.AxisAlignedBB; import codechicken.lib.vec.Rotation; import codechicken.lib.vec.Translation; import codechicken.lib.vec.Vector3; @@ -26,25 +32,35 @@ import codechicken.multipart.JNormalOcclusion; import codechicken.multipart.NormalOcclusionTest; import codechicken.multipart.TMultiPart; import codechicken.multipart.TileMultipart; +*/ +import mcmultipart.block.TileMultipart; +import mcmultipart.microblock.IMicroblock; +import mcmultipart.microblock.IMicroblock.IFaceMicroblock; +import mcmultipart.multipart.IMultipart; +import mcmultipart.multipart.IOccludingPart; +import mcmultipart.multipart.Multipart; +import mcmultipart.multipart.PartSlot; +import mcmultipart.raytrace.PartMOP; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -public class PartGlowPanel extends JCuboidPart implements JNormalOcclusion, JIconHitEffects +public class PartGlowPanel extends Multipart implements IOccludingPart//, JIconHitEffects { public EnumColor colour = EnumColor.WHITE; - public ForgeDirection side = ForgeDirection.DOWN; + public EnumFacing side = EnumFacing.DOWN; - public static Cuboid6[] bounds = new Cuboid6[6]; + public static AxisAlignedBB[] bounds = new AxisAlignedBB[6]; static { - Cuboid6 cuboid = new Cuboid6(0.25, 0, 0.25, 0.75, 0.125, 0.75); - Translation fromOrigin = new Translation(Vector3.center); - Translation toOrigin = (Translation)fromOrigin.inverse(); + AxisAlignedBB cuboid = new AxisAlignedBB(0.25, 0, 0.25, 0.75, 0.125, 0.75); +// Translation fromOrigin = new Translation(Vector3.center); +// Translation toOrigin = (Translation)fromOrigin.inverse(); for(int i = 0; i < 6; i++) { - bounds[i] = cuboid.copy().apply(toOrigin).apply(Rotation.sideRotations[i]).apply(fromOrigin); + bounds[i] = cuboid;//.copy().apply(toOrigin).apply(Rotation.sideRotations[i]).apply(fromOrigin); } } @@ -53,7 +69,7 @@ public class PartGlowPanel extends JCuboidPart implements JNormalOcclusion, JIco super(); } - public PartGlowPanel(EnumColor colour, ForgeDirection side) + public PartGlowPanel(EnumColor colour, EnumFacing side) { super(); setColour(colour); @@ -61,9 +77,9 @@ public class PartGlowPanel extends JCuboidPart implements JNormalOcclusion, JIco } @Override - public Cuboid6 getBounds() + public void addSelectionBoxes(List list) { - return bounds[side.ordinal()]; + list.add(bounds[side.ordinal()]); } @Override @@ -77,59 +93,60 @@ public class PartGlowPanel extends JCuboidPart implements JNormalOcclusion, JIco colour = newColour; } - public void setOrientation(ForgeDirection newSide) + public void setOrientation(EnumFacing newSide) { side = newSide; } @Override - public void onNeighborChanged() + public void onNeighborTileChange(EnumFacing side) { - if(!world().isRemote && !canStay()) + if(!getWorld().isRemote && !canStay()) { - TileMultipart.dropItem(new ItemStack(MekanismItems.GlowPanel, 1, colour.getMetaValue()), world(), Vector3.fromTileEntityCenter(tile())); - tile().remPart(this); + //TileMultipart.dropItem(new ItemStack(MekanismItems.GlowPanel, 1, colour.getMetaValue()), getWorld(), Vector3.fromTileEntityCenter(tile())); + getContainer().removePart(this); } } @Override - public void onPartChanged(TMultiPart other) + public void onPartChanged(IMultipart other) { - if(!world().isRemote && !canStay()) + if(!getWorld().isRemote && !canStay()) { - TileMultipart.dropItem(new ItemStack(MekanismItems.GlowPanel, 1, colour.getMetaValue()), world(), Vector3.fromTileEntityCenter(tile())); - tile().remPart(this); + //TileMultipart.dropItem(new ItemStack(MekanismItems.GlowPanel, 1, colour.getMetaValue()), getWorld(), Vector3.fromTileEntityCenter(tile())); + getContainer().removePart(this); } } @Override - public void writeDesc(MCDataOutput data) + public void writeUpdatePacket(PacketBuffer data) { data.writeInt(side.ordinal()); data.writeInt(colour.getMetaValue()); } @Override - public void readDesc(MCDataInput data) + public void readUpdatePacket(PacketBuffer data) { - side = ForgeDirection.getOrientation(data.readInt()); + side = EnumFacing.getFront(data.readInt()); colour = EnumColor.DYES[data.readInt()]; } @Override - public void save(NBTTagCompound nbt) + public void writeToNBT(NBTTagCompound nbt) { nbt.setInteger("side", side.ordinal()); nbt.setInteger("colour", colour.getMetaValue()); } @Override - public void load(NBTTagCompound nbt) + public void readFromNBT(NBTTagCompound nbt) { - side = ForgeDirection.getOrientation(nbt.getInteger("side")); + side = EnumFacing.getFront(nbt.getInteger("side")); colour = EnumColor.DYES[nbt.getInteger("colour")]; } +/* @Override @SideOnly(Side.CLIENT) public boolean renderStatic(Vector3 pos, int pass) @@ -142,6 +159,7 @@ public class PartGlowPanel extends JCuboidPart implements JNormalOcclusion, JIco return false; } +*/ @Override public int getLightValue() @@ -150,29 +168,26 @@ public class PartGlowPanel extends JCuboidPart implements JNormalOcclusion, JIco } @Override - public Iterable getOcclusionBoxes() + public void addOcclusionBoxes(List list) { - return getCollisionBoxes(); + addSelectionBoxes(list); } +/* @Override - public boolean occlusionTest(TMultiPart other) - { - return NormalOcclusionTest.apply(this, other); - } - - @Override - public IIcon getBreakingIcon(Object subPart, int side) + public TextureAtlasSprite getBreakingIcon(Object subPart, EnumFacing side) { return RenderGlowPanel.icon; } @Override - public IIcon getBrokenIcon(int side) + public TextureAtlasSprite getBrokenIcon(EnumFacing side) { return RenderGlowPanel.icon; } +*/ +/* @Override public void addHitEffects(MovingObjectPosition hit, EffectRenderer effectRenderer) { @@ -184,28 +199,23 @@ public class PartGlowPanel extends JCuboidPart implements JNormalOcclusion, JIco { IconHitEffects.addDestroyEffects(this, effectRenderer, false); } +*/ @Override - public Iterable getDrops() + public List getDrops() { - return Collections.singletonList(pickItem(null)); + return Collections.singletonList(getPickBlock(null, null)); } @Override - public ItemStack pickItem(MovingObjectPosition hit) + public ItemStack getPickBlock(EntityPlayer player, PartMOP hit) { return new ItemStack(MekanismItems.GlowPanel, 1, colour.getMetaValue()); } - @Override - public boolean doesTick() - { - return false; - } - public boolean canStay() { - Coord4D adj = Coord4D.get(tile()).offset(side); - return world().isSideSolid(adj.xCoord, adj.yCoord, adj.zCoord, side.getOpposite()) || tile().partMap(side.ordinal()) instanceof HollowMicroblock; + Coord4D adj = new Coord4D(getPos().offset(side), getWorld().provider.getDimensionId()); + return getWorld().isSideSolid(adj, side.getOpposite()) || (getContainer().getPartInSlot(PartSlot.getFaceSlot(side)) instanceof IFaceMicroblock && ((IFaceMicroblock)getContainer().getPartInSlot(PartSlot.getFaceSlot(side))).isFaceHollow()); } } diff --git a/src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java b/src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java index cfc1af977..6140ce46d 100644 --- a/src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java +++ b/src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java @@ -26,20 +26,25 @@ import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.util.InventoryUtils; import mekanism.common.util.LangUtils; import mekanism.common.util.TransporterUtils; -import net.minecraft.client.renderer.texture.IIconRegister; +//import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; +import net.minecraft.network.PacketBuffer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ChatComponentText; -import net.minecraft.util.IIcon; +//import net.minecraft.util.IIcon; import net.minecraftforge.common.util.Constants.NBT; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; +/* import codechicken.lib.data.MCDataInput; import codechicken.lib.data.MCDataOutput; import codechicken.lib.vec.Vector3; +*/ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -80,7 +85,7 @@ public class PartLogisticalTransporter extends PartTransmitter getNetworkedData(ArrayList data) { super.getNetworkedData(data); @@ -308,9 +317,9 @@ public class PartLogisticalTransporter extends PartTransmitter getSyncPacket(TransporterStack stack, boolean kill) { - ArrayList data = new ArrayList(); + ArrayList data = new ArrayList(); data.add(1); data.add(kill); @@ -325,9 +334,9 @@ public class PartLogisticalTransporter extends PartTransmitter 0) { @@ -168,7 +173,7 @@ public class PartMechanicalPipe extends PartTransmitter 0) { @@ -174,7 +179,7 @@ public class PartPressurizedTube extends PartTransmitter 0; } - public static byte setConnectionBit(byte connections, boolean toSet, ForgeDirection side) + public static byte setConnectionBit(byte connections, boolean toSet, EnumFacing side) { return (byte)((connections & ~(byte)(1 << side.ordinal())) | (byte)((toSet?1:0) << side.ordinal())); } - public abstract IIcon getCenterIcon(boolean opaque); + public abstract TextureAtlasSprite getCenterIcon(boolean opaque); - public abstract IIcon getSideIcon(boolean opaque); + public abstract TextureAtlasSprite getSideIcon(boolean opaque); - public abstract IIcon getSideIconRotated(boolean opaque); + public abstract TextureAtlasSprite getSideIconRotated(boolean opaque); @Override public void update() { - if(world().isRemote) + if(getWorld().isRemote) { if(delayTicks == 5) { @@ -179,7 +201,7 @@ public abstract class PartSidedPipe extends TMultiPart implements TSlottedPart, } } - if(!world().isRemote) + if(!getWorld().isRemote) { if(forceUpdate) { @@ -189,7 +211,7 @@ public abstract class PartSidedPipe extends TMultiPart implements TSlottedPart, if(sendDesc) { - sendDescUpdate(); + sendUpdatePacket(); sendDesc = false; } } @@ -210,7 +232,7 @@ public abstract class PartSidedPipe extends TMultiPart implements TSlottedPart, return false; } - public IIcon getIconForSide(ForgeDirection side, boolean opaque) + public TextureAtlasSprite getIconForSide(EnumFacing side, boolean opaque) { ConnectionType type = getConnectionType(side); @@ -220,19 +242,19 @@ public abstract class PartSidedPipe extends TMultiPart implements TSlottedPart, { return getCenterIcon(opaque); } - else if(getAllCurrentConnections() == 3 && side != ForgeDirection.DOWN && side != ForgeDirection.UP) + else if(getAllCurrentConnections() == 3 && side != EnumFacing.DOWN && side != EnumFacing.UP) { return getSideIcon(opaque); } - else if(getAllCurrentConnections() == 12 && (side == ForgeDirection.DOWN || side == ForgeDirection.UP)) + else if(getAllCurrentConnections() == 12 && (side == EnumFacing.DOWN || side == EnumFacing.UP)) { return getSideIcon(opaque); } - else if(getAllCurrentConnections() == 12 && (side == ForgeDirection.EAST || side == ForgeDirection.WEST)) + else if(getAllCurrentConnections() == 12 && (side == EnumFacing.EAST || side == EnumFacing.WEST)) { return getSideIconRotated(opaque); } - else if(getAllCurrentConnections() == 48 && side != ForgeDirection.EAST && side != ForgeDirection.WEST) + else if(getAllCurrentConnections() == 48 && side != EnumFacing.EAST && side != EnumFacing.WEST) { return getSideIconRotated(opaque); } @@ -253,11 +275,11 @@ public abstract class PartSidedPipe extends TMultiPart implements TSlottedPart, return connections; } - for(ForgeDirection side : ForgeDirection.VALID_DIRECTIONS) + for(EnumFacing side : EnumFacing.values()) { if(canConnectMutual(side)) { - TileEntity tileEntity = Coord4D.get(tile()).offset(side).getTileEntity(world()); + TileEntity tileEntity = getWorld().getTileEntity(getPos().offset(side)); if(tileEntity instanceof ITransmitterTile && TransmissionType.checkTransmissionType(((ITransmitterTile)tileEntity).getTransmitter(), getTransmitterType().getTransmission()) && isValidTransmitter(tileEntity)) { @@ -269,7 +291,7 @@ public abstract class PartSidedPipe extends TMultiPart implements TSlottedPart, return connections; } - public boolean getPossibleAcceptorConnection(ForgeDirection side) + public boolean getPossibleAcceptorConnection(EnumFacing side) { if(handlesRedstone() && redstoneReactive && redstonePowered) { @@ -278,7 +300,7 @@ public abstract class PartSidedPipe extends TMultiPart implements TSlottedPart, if(canConnectMutual(side)) { - TileEntity tileEntity = Coord4D.get(tile()).offset(side).getTileEntity(world()); + TileEntity tileEntity = getWorld().getTileEntity(getPos().offset(side)); if(isValidAcceptor(tileEntity, side)) { @@ -300,16 +322,16 @@ public abstract class PartSidedPipe extends TMultiPart implements TSlottedPart, return false; } - public boolean getPossibleTransmitterConnection(ForgeDirection side) + public boolean getPossibleTransmitterConnection(EnumFacing side) { - if(handlesRedstone() && redstoneReactive && MekanismUtils.isGettingPowered(world(), Coord4D.get(tile()))) + if(handlesRedstone() && redstoneReactive && MekanismUtils.isGettingPowered(getWorld(), new Coord4D(getPos()))) { return false; } if(canConnectMutual(side)) { - TileEntity tileEntity = Coord4D.get(tile()).offset(side).getTileEntity(world()); + TileEntity tileEntity = getWorld().getTileEntity(getPos().offset(side)); if(tileEntity instanceof ITransmitterTile && TransmissionType.checkTransmissionType(((ITransmitterTile)tileEntity).getTransmitter(), getTransmitterType().getTransmission()) && isValidTransmitter(tileEntity)) { @@ -329,19 +351,19 @@ public abstract class PartSidedPipe extends TMultiPart implements TSlottedPart, return connections; } - for(ForgeDirection side : ForgeDirection.VALID_DIRECTIONS) + for(EnumFacing side : EnumFacing.values()) { if(canConnectMutual(side)) { - Coord4D coord = Coord4D.get(tile()).getFromSide(side); + Coord4D coord = new Coord4D(getPos()).offset(side); - if(!world().isRemote && !coord.exists(world())) + if(!getWorld().isRemote && !coord.exists(getWorld())) { forceUpdate = true; continue; } - TileEntity tileEntity = coord.getTileEntity(world()); + TileEntity tileEntity = coord.getTileEntity(getWorld()); if(isValidAcceptor(tileEntity, side)) { @@ -376,67 +398,69 @@ public abstract class PartSidedPipe extends TMultiPart implements TSlottedPart, return true; } +/* @Override - public boolean occlusionTest(TMultiPart other) + public boolean occlusionTest(IMultipart other) { return NormalOcclusionTest.apply(this, other); } +*/ @Override - public Iterable getSubParts() + public void addSelectionBoxes(List list) { - Set subParts = new HashSet(); - - if(tile() != null) + if(getContainer() != null) { - for(ForgeDirection side : ForgeDirection.VALID_DIRECTIONS) + for(EnumFacing side : EnumFacing.values()) { int ord = side.ordinal(); byte connections = getAllCurrentConnections(); if(connectionMapContainsSide(connections, side) || side == testingSide) { - subParts.add(getTransmitterType().getSize() == Size.SMALL ? smallSides[ord] : largeSides[ord]); + list.add(getTransmitterType().getSize() == Size.SMALL ? smallSides[ord] : largeSides[ord]); } } } - subParts.add(getTransmitterType().getSize() == Size.SMALL ? smallSides[6] : largeSides[6]); - - return subParts; + list.add(getTransmitterType().getSize() == Size.SMALL ? smallSides[6] : largeSides[6]); } public abstract TransmitterType getTransmitterType(); @Override - public Iterable getCollisionBoxes() + public void addCollisionBoxes(AxisAlignedBB mask, List list, Entity collidingEntity) { - Set collisionBoxes = new HashSet(); - collisionBoxes.addAll((Collection)getSubParts()); - - return collisionBoxes; + addSelectionBoxes(list); } @Override - public Iterable getOcclusionBoxes() + public void addOcclusionBoxes(List list) { - return getCollisionBoxes(); + addSelectionBoxes(list); } @Override - public int getSlotMask() + public EnumSet getSlotMask() { - return PartMap.CENTER.mask; + return EnumSet.of(PartSlot.CENTER); } @Override - public IIcon getBreakingIcon(Object subPart, int side) + public EnumSet getOccludedSlots() + { + return EnumSet.of(PartSlot.CENTER); //TODO implement properly + } + +/* + @Override + public TextureAtlasSprite getBreakingIcon(Object subPart, EnumFacing side) { return getCenterIcon(true); } @Override - public IIcon getBrokenIcon(int side) + public TextureAtlasSprite getBrokenIcon(EnumFacing side) { return getCenterIcon(true); } @@ -448,9 +472,9 @@ public abstract class PartSidedPipe extends TMultiPart implements TSlottedPart, } @Override - public int getHollowSize(int side) + public int getHollowSize(EnumFacing side) { - ForgeDirection direction = ForgeDirection.getOrientation(side); + EnumFacing direction = EnumFacing.getOrientation(side); if(connectionMapContainsSide(getAllCurrentConnections(), direction) || direction == testingSide) { @@ -489,20 +513,21 @@ public abstract class PartSidedPipe extends TMultiPart implements TSlottedPart, { IconHitEffects.addDestroyEffects(this, effectRenderer, false); } +*/ - public abstract boolean isValidAcceptor(TileEntity tile, ForgeDirection side); + public abstract boolean isValidAcceptor(TileEntity tile, EnumFacing side); @Override - public boolean canConnectMutual(ForgeDirection side) + public boolean canConnectMutual(EnumFacing side) { if(!canConnect(side)) return false; - TileEntity tile = Coord4D.get(tile()).offset(side).getTileEntity(world()); + TileEntity tile = getWorld().getTileEntity(getPos().offset(side)); return (!(tile instanceof IBlockableConnection) || ((IBlockableConnection)tile).canConnect(side.getOpposite())); } @Override - public boolean canConnect(ForgeDirection side) + public boolean canConnect(EnumFacing side) { if(handlesRedstone() && redstoneReactive && redstonePowered) { @@ -510,14 +535,14 @@ public abstract class PartSidedPipe extends TMultiPart implements TSlottedPart, } testingSide = side; - boolean unblocked = tile().canReplacePart(this, this); + boolean unblocked = getContainer().canReplacePart(this, this); testingSide = null; return unblocked; } @Override - public void readDesc(MCDataInput packet) + public void readUpdatePacket(PacketBuffer packet) { currentTransmitterConnections = packet.readByte(); currentAcceptorConnections = packet.readByte(); @@ -527,15 +552,12 @@ public abstract class PartSidedPipe extends TMultiPart implements TSlottedPart, connectionTypes[i] = ConnectionType.values()[packet.readInt()]; } - if(tile() != null) - { - tile().internalPartChange(this); - tile().markRender(); - } + notifyPartUpdate(); + markRenderUpdate(); } @Override - public void writeDesc(MCDataOutput packet) + public void writeUpdatePacket(PacketBuffer packet) { packet.writeByte(currentTransmitterConnections); packet.writeByte(currentAcceptorConnections); @@ -547,9 +569,9 @@ public abstract class PartSidedPipe extends TMultiPart implements TSlottedPart, } @Override - public void load(NBTTagCompound nbtTags) + public void readFromNBT(NBTTagCompound nbtTags) { - super.load(nbtTags); + super.readFromNBT(nbtTags); redstoneReactive = nbtTags.getBoolean("redstoneReactive"); @@ -560,9 +582,9 @@ public abstract class PartSidedPipe extends TMultiPart implements TSlottedPart, } @Override - public void save(NBTTagCompound nbtTags) + public void writeToNBT(NBTTagCompound nbtTags) { - super.save(nbtTags); + super.writeToNBT(nbtTags); nbtTags.setBoolean("redstoneReactive", redstoneReactive); @@ -573,19 +595,19 @@ public abstract class PartSidedPipe extends TMultiPart implements TSlottedPart, } @Override - public boolean activate(EntityPlayer player, MovingObjectPosition part, ItemStack item) + public boolean onActivated(EntityPlayer player, ItemStack stack, PartMOP hit) { - if(item == null) + if(stack == null) { return false; } - if(MekanismUtils.hasUsableWrench(player, x(), y(), z()) && player.isSneaking()) + if(MekanismUtils.hasUsableWrench(player, getPos()) && player.isSneaking()) { - if(!world().isRemote) + if(!getWorld().isRemote) { - tile().dropItems(getDrops()); - tile().remPart(this); + //TODO tile().dropItems(getDrops()); + getContainer().removePart(this); } return true; @@ -595,36 +617,30 @@ public abstract class PartSidedPipe extends TMultiPart implements TSlottedPart, } @Override - public Iterable getDrops() + public List getDrops() { - return Collections.singletonList(pickItem(null)); + return Collections.singletonList(getPickBlock(null, null)); } @Override - public ItemStack pickItem(MovingObjectPosition hit) + public ItemStack getPickBlock(EntityPlayer player, PartMOP hit) { return new ItemStack(MekanismItems.PartTransmitter, 1, getTransmitterType().ordinal()); } - - @Override - public boolean doesTick() - { - return true; - } - + protected void onRefresh() {} public void refreshConnections() { if(redstoneReactive) { - redstonePowered = MekanismUtils.isGettingPowered(world(), Coord4D.get(tile())); + redstonePowered = MekanismUtils.isGettingPowered(getWorld(), new Coord4D(getPos())); } else { redstonePowered = false; } - if(!world().isRemote) + if(!getWorld().isRemote) { byte possibleTransmitters = getPossibleTransmitterConnections(); byte possibleAcceptors = getPossibleAcceptorConnections(); @@ -639,11 +655,11 @@ public abstract class PartSidedPipe extends TMultiPart implements TSlottedPart, } } - public void refreshConnections(ForgeDirection side) + public void refreshConnections(EnumFacing side) { if(redstoneReactive) { - redstonePowered = MekanismUtils.isGettingPowered(world(), Coord4D.get(tile())); + redstonePowered = MekanismUtils.isGettingPowered(getWorld(), new Coord4D(getPos())); } else { redstonePowered = false; @@ -652,7 +668,7 @@ public abstract class PartSidedPipe extends TMultiPart implements TSlottedPart, boolean possibleTransmitter = getPossibleTransmitterConnection(side); boolean possibleAcceptor = getPossibleAcceptorConnection(side); - if(!world().isRemote) + if(!getWorld().isRemote) { if((possibleTransmitter || possibleAcceptor) != connectionMapContainsSide(getAllCurrentConnections(), side)) { @@ -664,7 +680,7 @@ public abstract class PartSidedPipe extends TMultiPart implements TSlottedPart, } } - protected void onModeChange(ForgeDirection side) + protected void onModeChange(EnumFacing side) { markDirtyAcceptor(side); } @@ -674,7 +690,7 @@ public abstract class PartSidedPipe extends TMultiPart implements TSlottedPart, notifyTileChange(); } - protected void markDirtyAcceptor(ForgeDirection side) {} + protected void markDirtyAcceptor(EnumFacing side) {} @Override public void onAdded() @@ -684,6 +700,7 @@ public abstract class PartSidedPipe extends TMultiPart implements TSlottedPart, refreshConnections(); } +/*TODO onLoad()? @Override public void onChunkLoad() { @@ -692,15 +709,16 @@ public abstract class PartSidedPipe extends TMultiPart implements TSlottedPart, refreshConnections(); notifyTileChange(); } +*/ @Override - public void onNeighborTileChanged(int side, boolean weak) + public void onNeighborTileChange(EnumFacing side) { - refreshConnections(ForgeDirection.getOrientation(side)); + refreshConnections(side); } @Override - public void onNeighborChanged() + public void onNeighborBlockChange(Block block) { if(handlesRedstone()) { @@ -715,7 +733,7 @@ public abstract class PartSidedPipe extends TMultiPart implements TSlottedPart, } @Override - public void onPartChanged(TMultiPart part) + public void onPartChanged(IMultipart part) { super.onPartChanged(part); @@ -732,12 +750,12 @@ public abstract class PartSidedPipe extends TMultiPart implements TSlottedPart, public void handlePacketData(ByteBuf dataStream) throws Exception {} @Override - public ArrayList getNetworkedData(ArrayList data) + public ArrayList getNetworkedData(ArrayList data) { return data; } - public ConnectionType getConnectionType(ForgeDirection side) + public ConnectionType getConnectionType(EnumFacing side) { if(!connectionMapContainsSide(getAllCurrentConnections(), side)) { @@ -751,11 +769,11 @@ public abstract class PartSidedPipe extends TMultiPart implements TSlottedPart, return connectionTypes[side.ordinal()]; } - public List getConnections(ConnectionType type) + public List getConnections(ConnectionType type) { - List sides = new ArrayList(); + List sides = new ArrayList(); - for(ForgeDirection side : ForgeDirection.VALID_DIRECTIONS) + for(EnumFacing side : EnumFacing.values()) { if(getConnectionType(side) == type) { @@ -766,7 +784,8 @@ public abstract class PartSidedPipe extends TMultiPart implements TSlottedPart, return sides; } - public CCModel getModelForSide(ForgeDirection side, boolean internal) +/* + public String getModelForSide(EnumFacing side, boolean internal) { String sideName = side.name().toLowerCase(); String typeName = getConnectionType(side).name().toUpperCase(); @@ -786,13 +805,14 @@ public abstract class PartSidedPipe extends TMultiPart implements TSlottedPart, } } } +*/ @Override - public boolean onSneakRightClick(EntityPlayer player, int side) + public boolean onSneakRightClick(EntityPlayer player, EnumFacing side) { - if(!world().isRemote) + if(!getWorld().isRemote) { - ExtendedMOP hit = (ExtendedMOP)RayTracer.retraceBlock(world(), player, x(), y(), z()); + PartMOP hit = reTrace(getWorld(), getPos(), player); if(hit == null) { @@ -803,7 +823,7 @@ public abstract class PartSidedPipe extends TMultiPart implements TSlottedPart, connectionTypes[hit.subHit] = connectionTypes[hit.subHit].next(); sendDesc = true; - onModeChange(ForgeDirection.getOrientation(hit.subHit)); + onModeChange(EnumFacing.getFront(hit.subHit)); player.addChatMessage(new ChatComponentText("Connection type changed to " + connectionTypes[hit.subHit].toString())); return true; @@ -816,7 +836,16 @@ public abstract class PartSidedPipe extends TMultiPart implements TSlottedPart, return true; } - protected boolean onConfigure(EntityPlayer player, int part, int side) + private PartMOP reTrace(World world, BlockPos pos, EntityPlayer player) { + + Vec3 start = RayTraceUtils.getStart(player); + Vec3 end = RayTraceUtils.getEnd(player); + RayTraceResultPart result = ((TileMultipart)world.getTileEntity(pos)).getPartContainer().collisionRayTrace(start, end); + return result == null ? null : result.hit; + } + + + protected boolean onConfigure(EntityPlayer player, int part, EnumFacing side) { return false; } @@ -827,9 +856,9 @@ public abstract class PartSidedPipe extends TMultiPart implements TSlottedPart, } @Override - public boolean onRightClick(EntityPlayer player, int side) + public boolean onRightClick(EntityPlayer player, EnumFacing side) { - if(!world().isRemote && handlesRedstone()) + if(!getWorld().isRemote && handlesRedstone()) { redstoneReactive ^= true; refreshConnections(); @@ -859,14 +888,8 @@ public abstract class PartSidedPipe extends TMultiPart implements TSlottedPart, } } - @Override - public boolean weakTileChanges() - { - return false; - } - public void notifyTileChange() { - MekanismUtils.notifyLoadedNeighborsOfTileChange(world(), Coord4D.get(tile())); + MekanismUtils.notifyLoadedNeighborsOfTileChange(getWorld(), new Coord4D(getPos())); } } diff --git a/src/main/java/mekanism/common/multipart/PartThermodynamicConductor.java b/src/main/java/mekanism/common/multipart/PartThermodynamicConductor.java index 3a812fab7..703889bbb 100644 --- a/src/main/java/mekanism/common/multipart/PartThermodynamicConductor.java +++ b/src/main/java/mekanism/common/multipart/PartThermodynamicConductor.java @@ -6,23 +6,29 @@ import mekanism.api.Coord4D; import mekanism.api.IHeatTransfer; import mekanism.api.transmitters.TransmissionType; import mekanism.client.render.RenderPartTransmitter; +import mekanism.common.ColourRGBA; import mekanism.common.HeatNetwork; import mekanism.common.Tier; import mekanism.common.Tier.BaseTier; import mekanism.common.Tier.ConductorTier; import mekanism.common.util.HeatUtils; -import net.minecraft.client.renderer.texture.IIconRegister; +//import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.network.PacketBuffer; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.IIcon; -import net.minecraftforge.common.util.ForgeDirection; +//import net.minecraft.util.IIcon; +import net.minecraft.util.EnumFacing; +/* import codechicken.lib.colour.ColourRGBA; import codechicken.lib.data.MCDataInput; import codechicken.lib.data.MCDataOutput; import codechicken.lib.vec.Vector3; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +*/ public class PartThermodynamicConductor extends PartTransmitter implements IHeatTransfer { @@ -70,7 +76,7 @@ public class PartThermodynamicConductor extends PartTransmitter> extends PartSidedPipe implements ITransmitterTile, IAlloyInteraction { @@ -33,12 +33,13 @@ public abstract class PartTransmitter> extends return transmitterDelegate; } +/* @Override public void onWorldJoin() { super.onWorldJoin(); - if(!world().isRemote) + if(!getWorld().isRemote) { TransmitterNetworkRegistry.registerOrphanTransmitter(getTransmitter()); } @@ -48,19 +49,21 @@ public abstract class PartTransmitter> extends unloaded = false; } +*/ public abstract N createNewNetwork(); public abstract N createNetworkByMerging(Collection networks); +/* @Override - public void onChunkUnload() + public void onUnloaded() { - super.onChunkUnload(); + super.onUnloaded(); unloaded = true; - if(!world().isRemote) + if(!getWorld().isRemote) { getTransmitter().takeShare(); TransmitterNetworkRegistry.invalidateTransmitter(getTransmitter()); @@ -73,7 +76,7 @@ public abstract class PartTransmitter> extends @Override public void preRemove() { - if(!world().isRemote) + if(!getWorld().isRemote) { TransmitterNetworkRegistry.invalidateTransmitter(getTransmitter()); } @@ -83,6 +86,7 @@ public abstract class PartTransmitter> extends super.preRemove(); } +*/ @Override public void markDirtyTransmitters() @@ -96,7 +100,7 @@ public abstract class PartTransmitter> extends } @Override - public void markDirtyAcceptor(ForgeDirection side) + public void markDirtyAcceptor(EnumFacing side) { super.markDirtyAcceptor(side); @@ -106,7 +110,7 @@ public abstract class PartTransmitter> extends } } - public A getCachedAcceptor(ForgeDirection side) + public A getCachedAcceptor(EnumFacing side) { ConnectionType type = connectionTypes[side.ordinal()]; @@ -132,7 +136,7 @@ public abstract class PartTransmitter> extends { if(o1 instanceof IGridTransmitter && o2 instanceof IGridTransmitter) { - Coord4D thisCoord = Coord4D.get(tile()); + Coord4D thisCoord = new Coord4D(getPos(), getWorld().provider.getDimensionId()); Coord4D o1Coord = ((IGridTransmitter)o1).coord(); Coord4D o2Coord = ((IGridTransmitter)o2).coord(); diff --git a/src/main/java/mekanism/common/multipart/PartUniversalCable.java b/src/main/java/mekanism/common/multipart/PartUniversalCable.java index e5816ebbb..dee24528e 100644 --- a/src/main/java/mekanism/common/multipart/PartUniversalCable.java +++ b/src/main/java/mekanism/common/multipart/PartUniversalCable.java @@ -20,14 +20,19 @@ import mekanism.common.Tier.CableTier; import mekanism.common.base.EnergyAcceptorWrapper; import mekanism.common.util.CableUtils; import mekanism.common.util.MekanismUtils; -import net.minecraft.client.renderer.texture.IIconRegister; +//import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.network.PacketBuffer; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.IIcon; -import net.minecraftforge.common.util.ForgeDirection; +//import net.minecraft.util.IIcon; +import net.minecraft.util.EnumFacing; +/* import codechicken.lib.data.MCDataInput; import codechicken.lib.data.MCDataOutput; import codechicken.lib.vec.Vector3; +*/ import cofh.api.energy.IEnergyHandler; import cofh.api.energy.IEnergyProvider; import net.minecraftforge.fml.relauncher.Side; @@ -53,7 +58,7 @@ public class PartUniversalCable extends PartTransmitter sides = getConnections(ConnectionType.PULL); + List sides = getConnections(ConnectionType.PULL); if(!sides.isEmpty()) { - TileEntity[] connectedOutputters = CableUtils.getConnectedOutputters(tile()); + TileEntity[] connectedOutputters = CableUtils.getConnectedOutputters(getPos(), getWorld()); double canDraw = tier.cableCapacity/10F; - for(ForgeDirection side : sides) + for(EnumFacing side : sides) { if(connectedOutputters[side.ordinal()] != null) { @@ -135,7 +140,7 @@ public class PartUniversalCable extends PartTransmitter