tilera
/
electrodynamics
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

More mass refactor

This commit is contained in:
Calclavia 2015-01-26 20:17:04 +08:00
parent 5b60c3ba71
commit 6bbff66710
69 changed files with 89 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/scala/edx/basic/blocks/TileImprinter.scala
View File

@ -19,9 +19,9 @@ import net.minecraft.network.Packet
import net.minecraft.util.IIcon
import net.minecraftforge.common.util.ForgeDirection
import org.lwjgl.opengl.GL11
import resonantengine.api.network.IPacketReceiver
import resonantengine.core.ResonantEngine
import resonantengine.lib.network.discriminator.{PacketTile, PacketType}
import resonantengine.lib.network.handle.IPacketReceiver
import resonantengine.lib.prefab.tile.spatial.{ResonantBlock, ResonantTile}
import resonantengine.lib.render.RenderItemOverlayUtility
import resonantengine.lib.transform.vector.{Vector2, Vector3}

4
src/main/scala/edx/basic/engineering/TileEngineeringTable.scala
View File

@ -25,12 +25,12 @@ import net.minecraftforge.oredict.OreDictionary
import org.apache.commons.lang3.ArrayUtils
import org.lwjgl.opengl.GL11
import resonantengine.api.gui.ISlotPickResult
import resonantengine.api.recipe.{MachineRecipes, RecipeResource, RecipeType}
import resonantengine.api.edx.recipe.{MachineRecipes, RecipeResource, RecipeType}
import resonantengine.api.network.IPacketReceiver
import resonantengine.api.tile.IRotatable
import resonantengine.core.ResonantEngine
import resonantengine.lib.collection.Pair
import resonantengine.lib.network.discriminator.{PacketTile, PacketType}
import resonantengine.lib.network.handle.IPacketReceiver
import resonantengine.lib.prefab.gui.ContainerDummy
import resonantengine.lib.prefab.tile.item.ItemBlockSaved
import resonantengine.lib.prefab.tile.mixed.TileInventory

2
src/main/scala/edx/basic/fluid/gutter/TileGutter.scala
View File

@ -18,7 +18,7 @@ import net.minecraftforge.client.model.AdvancedModelLoader
import net.minecraftforge.common.util.ForgeDirection
import net.minecraftforge.fluids._
import org.lwjgl.opengl.GL11
import resonantengine.api.recipe.{MachineRecipes, RecipeType}
import resonantengine.api.edx.recipe.{MachineRecipes, RecipeType}
import resonantengine.lib.prefab.fluid.NodeFluid
import resonantengine.lib.render.{FluidRenderUtility, RenderUtility}
import resonantengine.lib.transform.region.Cuboid

2
src/main/scala/edx/basic/fluid/tank/TileTank.scala
View File

@ -18,7 +18,7 @@ import net.minecraftforge.common.util.ForgeDirection
import net.minecraftforge.fluids._
import org.lwjgl.opengl.GL11
import resonantengine.api.tile.IRemovable.ISneakPickup
import resonantengine.api.tile.node.INode
import resonantengine.api.graph.node.INode
import resonantengine.lib.grid.core.Node
import resonantengine.lib.render.block.RenderConnectedTexture
import resonantengine.lib.render.{FluidRenderUtility, RenderBlockUtility, RenderUtility}

4
src/main/scala/edx/basic/process/grinding/TileWorkbench.scala
View File

@ -11,10 +11,10 @@ import net.minecraft.util.ResourceLocation
import net.minecraftforge.client.model.AdvancedModelLoader
import net.minecraftforge.oredict.OreDictionary
import org.lwjgl.opengl.GL11
import resonantengine.api.recipe.{MachineRecipes, RecipeType}
import resonantengine.api.edx.recipe.{MachineRecipes, RecipeType}
import resonantengine.lib.content.prefab.TInventory
import resonantengine.lib.network.discriminator.PacketType
import resonantengine.lib.network.handle.{TPacketReceiver, TPacketSender}
import resonantengine.prefab.network.{TPacketReceiver, TPacketSender}
import resonantengine.lib.prefab.tile.spatial.ResonantTile
import resonantengine.lib.render.{RenderItemOverlayUtility, RenderUtility}
import resonantengine.lib.transform.vector.Vector3

3
src/main/scala/edx/basic/process/mixing/ItemGlassJar.scala
View File

@ -6,8 +6,9 @@ import net.minecraft.entity.Entity
import net.minecraft.entity.player.EntityPlayer
import net.minecraft.item.ItemStack
import net.minecraft.world.World
import resonantengine.api.transform.vector.IVector3
import resonantengine.lib.prefab.tile.item.ItemBlockSaved
import resonantengine.lib.transform.vector.{IVector3, Vector3}
import resonantengine.lib.transform.vector.Vector3
import resonantengine.lib.utility.nbt.NBTUtility
/**

4
src/main/scala/edx/basic/process/mixing/TileGlassJar.scala
View File

@ -18,11 +18,11 @@ import net.minecraft.util.ResourceLocation
import net.minecraftforge.client.IItemRenderer.ItemRenderType
import net.minecraftforge.client.model.AdvancedModelLoader
import org.lwjgl.opengl.GL11
import resonantengine.api.items.ISimpleItemRenderer
import resonantengine.api.item.ISimpleItemRenderer
import resonantengine.lib.factory.resources.ResourceFactory
import resonantengine.lib.factory.resources.item.TItemResource
import resonantengine.lib.network.discriminator.PacketType
import resonantengine.lib.network.handle.{TPacketReceiver, TPacketSender}
import resonantengine.prefab.network.{TPacketReceiver, TPacketSender}
import resonantengine.lib.prefab.tile.item.ItemBlockSaved
import resonantengine.lib.prefab.tile.spatial.ResonantTile
import resonantengine.lib.render.RenderUtility

2
src/main/scala/edx/basic/process/sifting/ItemSieve.scala
View File

@ -6,7 +6,7 @@ import net.minecraft.block.Block
import net.minecraft.entity.player.EntityPlayer
import net.minecraft.item.{EnumAction, ItemStack}
import net.minecraft.world.World
import resonantengine.api.recipe.{MachineRecipes, RecipeType}
import resonantengine.api.edx.recipe.{MachineRecipes, RecipeType}
import resonantengine.lib.prefab.tile.item.ItemBlockSaved
import resonantengine.lib.render.EnumColor
import resonantengine.lib.transform.vector.Vector3

4
src/main/scala/edx/basic/process/sifting/TileSieve.scala
View File

@ -14,10 +14,10 @@ import net.minecraft.util.ResourceLocation
import net.minecraftforge.client.IItemRenderer.ItemRenderType
import net.minecraftforge.client.model.AdvancedModelLoader
import org.lwjgl.opengl.GL11
import resonantengine.api.items.ISimpleItemRenderer
import resonantengine.api.item.ISimpleItemRenderer
import resonantengine.lib.content.prefab.TInventory
import resonantengine.lib.network.discriminator.PacketType
import resonantengine.lib.network.handle.{TPacketReceiver, TPacketSender}
import resonantengine.prefab.network.{TPacketReceiver, TPacketSender}
import resonantengine.lib.prefab.tile.item.ItemBlockSaved
import resonantengine.lib.prefab.tile.spatial.ResonantTile
import resonantengine.lib.render.{RenderItemOverlayUtility, RenderUtility}

4
src/main/scala/edx/basic/process/smelting/TileCastingMold.scala
View File

@ -8,9 +8,9 @@ import net.minecraft.item.ItemStack
import net.minecraft.nbt.NBTTagCompound
import net.minecraftforge.common.util.ForgeDirection
import net.minecraftforge.fluids._
import resonantengine.api.recipe.{MachineRecipes, RecipeResource, RecipeType}
import resonantengine.api.edx.recipe.{MachineRecipes, RecipeResource, RecipeType}
import resonantengine.api.network.IPacketReceiver
import resonantengine.lib.network.discriminator.{PacketTile, PacketType}
import resonantengine.lib.network.handle.IPacketReceiver
import resonantengine.lib.prefab.tile.mixed.TileInventory
import resonantengine.lib.transform.vector.Vector3
import resonantengine.lib.utility.FluidUtility

2
src/main/scala/edx/basic/process/smelting/firebox/TileFirebox.scala
View File

@ -24,7 +24,7 @@ import resonantengine.lib.grid.energy.EnergyStorage
import resonantengine.lib.grid.energy.electric.NodeElectricComponent
import resonantengine.lib.grid.thermal.{BoilEvent, ThermalPhysics}
import resonantengine.lib.network.discriminator.PacketType
import resonantengine.lib.network.handle.{TPacketReceiver, TPacketSender}
import resonantengine.prefab.network.{TPacketReceiver, TPacketSender}
import resonantengine.lib.prefab.tile.spatial.{ResonantBlock, ResonantTile}
import resonantengine.lib.transform.vector.Vector3
import resonantengine.lib.utility.FluidUtility

2
src/main/scala/edx/basic/process/smelting/firebox/TileHotPlate.scala
View File

@ -13,7 +13,7 @@ import net.minecraft.util.IIcon
import net.minecraft.world.IBlockAccess
import resonantengine.lib.content.prefab.TInventory
import resonantengine.lib.network.discriminator.PacketType
import resonantengine.lib.network.handle.{TPacketReceiver, TPacketSender}
import resonantengine.prefab.network.{TPacketReceiver, TPacketSender}
import resonantengine.lib.prefab.tile.spatial.{ResonantBlock, ResonantTile}
import resonantengine.lib.transform.region.Cuboid
import resonantengine.lib.transform.vector.{Vector2, Vector3}

4
src/main/scala/edx/core/ResonantPartFactory.scala
View File

@ -24,8 +24,8 @@ object ResonantPartFactory extends IPartFactory
{
MultiPartRegistry.registerParts(this, partMap.keys.toArray)
MultipartGenerator.registerTrait("resonant.api.tile.INodeProvider", "edx.core.prefab.pass.TNodeProvider")
MultipartGenerator.registerTrait("resonant.core.debug.IDebugInfo", "edx.core.prefab.pass.TDebugInfo")
MultipartGenerator.registerTrait("resonantengine.api.graph.INodeProvider", "edx.core.prefab.pass.TraitNodeProvider")
MultipartGenerator.registerTrait("resonantengine.api.tile.IDebugInfo", "edx.core.prefab.pass.TraitDebugInfo")
MultipartGenerator.registerPassThroughInterface("net.minecraftforge.fluids.IFluidHandler")
}

2
src/main/scala/edx/core/Settings.scala
View File

@ -4,7 +4,7 @@ import cpw.mods.fml.common.eventhandler.SubscribeEvent
import net.minecraft.block.Block
import net.minecraft.item.ItemStack
import net.minecraftforge.common.config.Configuration
import resonantengine.api.recipe.QuantumAssemblerRecipes
import resonantengine.api.edx.recipe.QuantumAssemblerRecipes
import resonantengine.lib.mod.config.Config
import resonantengine.lib.mod.config.ConfigEvent.PostConfigEvent
import resonantengine.lib.prefab.poison.PotionRadiation

4
src/main/scala/edx/core/interfaces/TNodeMechanical.scala
View File

@ -1,7 +1,7 @@
package edx.core.interfaces
import resonantengine.api.tile.node.INode
import resonantengine.lib.transform.vector.IVectorWorld
import resonantengine.api.graph.node.INode
import resonantengine.api.transform.vector.IVectorWorld
/**
* Applied to any node that will act as a mechanical object

3
src/main/scala/edx/core/prefab/node/NodeFluidPressure.scala
View File

@ -2,8 +2,7 @@ package edx.core.prefab.node
import net.minecraftforge.common.util.ForgeDirection
import net.minecraftforge.fluids.{FluidContainerRegistry, IFluidHandler}
import resonantengine.api.IUpdate
import resonantengine.api.tile.INodeProvider
import resonantengine.api.graph.{IUpdate, INodeProvider}
import resonantengine.lib.grid.core.UpdateTicker
import resonantengine.lib.prefab.fluid.NodeFluid

2
src/main/scala/edx/core/prefab/node/TileFluidProvider.scala
View File

@ -7,7 +7,7 @@ import net.minecraftforge.common.util.ForgeDirection
import net.minecraftforge.fluids._
import resonantengine.lib.grid.core.TBlockNodeProvider
import resonantengine.lib.network.discriminator.PacketType
import resonantengine.lib.network.handle.{TPacketReceiver, TPacketSender}
import resonantengine.prefab.network.{TPacketReceiver, TPacketSender}
import resonantengine.lib.prefab.fluid.NodeFluid
import resonantengine.lib.prefab.tile.spatial.ResonantTile
import resonantengine.lib.wrapper.ByteBufWrapper._

2
src/main/scala/edx/core/prefab/part/PacketMultiPart.scala
View File

@ -5,7 +5,7 @@ import io.netty.buffer.ByteBuf
import io.netty.channel.ChannelHandlerContext
import net.minecraft.entity.player.EntityPlayer
import resonantengine.lib.network.discriminator.PacketType
import resonantengine.lib.network.handle.TPacketReceiver
import resonantengine.prefab.network.TPacketReceiver
import resonantengine.lib.transform.vector.Vector3
/**

2
src/main/scala/edx/core/prefab/part/connector/TPartNodeProvider.scala
View File

@ -4,7 +4,7 @@ import java.util.{List => JList}
import codechicken.multipart.TMultiPart
import net.minecraft.nbt.NBTTagCompound
import resonantengine.api.ISave
import resonantengine.api.misc.ISave
import resonantengine.lib.grid.core.TNodeProvider
import scala.collection.convert.wrapAll._

4
src/main/scala/edx/core/prefab/pass/TDebugInfo.java → src/main/scala/edx/core/prefab/pass/TraitDebugInfo.java
View File

@ -2,7 +2,7 @@ package edx.core.prefab.pass;
import codechicken.multipart.TMultiPart;
import codechicken.multipart.TileMultipart;
import resonantengine.core.debug.IDebugInfo;
import resonantengine.api.tile.IDebugInfo;
import java.util.ArrayList;
import java.util.List;
@ -10,7 +10,7 @@ import java.util.List;
/**
* @author Calclavia
*/
public class TDebugInfo extends TileMultipart implements IDebugInfo
public class TraitDebugInfo extends TileMultipart implements IDebugInfo
{
@Override
public List<String> getDebugInfo()

6
src/main/scala/edx/core/prefab/pass/TNodeProvider.java → src/main/scala/edx/core/prefab/pass/TraitNodeProvider.java
View File

@ -4,8 +4,8 @@ import codechicken.multipart.PartMap;
import codechicken.multipart.TMultiPart;
import codechicken.multipart.TileMultipart;
import net.minecraftforge.common.util.ForgeDirection;
import resonantengine.api.tile.INodeProvider;
import resonantengine.api.tile.node.INode;
import resonantengine.api.graph.INodeProvider;
import resonantengine.api.graph.node.INode;
/**
* TNodeProvider multipart Trait.
@ -13,7 +13,7 @@ import resonantengine.api.tile.node.INode;
*
* @author Calclavia
*/
public class TNodeProvider extends TileMultipart implements INodeProvider
public class TraitNodeProvider extends TileMultipart implements INodeProvider
{
@Override
public <N extends INode> N getNode(Class<? extends N> nodeType, ForgeDirection from)

2
src/main/scala/edx/core/resource/AutoResourceFactory.scala
View File

@ -20,7 +20,7 @@ import net.minecraft.util.{IIcon, ResourceLocation}
import net.minecraftforge.client.event.TextureStitchEvent
import net.minecraftforge.fluids.{Fluid, FluidContainerRegistry, FluidRegistry, FluidStack}
import net.minecraftforge.oredict.OreDictionary
import resonantengine.api.recipe.{MachineRecipes, RecipeType}
import resonantengine.api.edx.recipe.{MachineRecipes, RecipeType}
import resonantengine.lib.factory.resources.ResourceFactory
import resonantengine.lib.utility.LanguageUtility
import resonantengine.lib.wrapper.StringWrapper._

2
src/main/scala/edx/core/resource/alloy/Alloy.scala
View File

@ -1,7 +1,7 @@
package edx.core.resource.alloy
import net.minecraft.nbt.NBTTagCompound
import resonantengine.api.ISave
import resonantengine.api.misc.ISave
import resonantengine.lib.wrapper.NBTWrapper._
/**

2
src/main/scala/edx/electrical/battery/ItemBlockBattery.scala
View File

@ -8,7 +8,7 @@ import net.minecraft.entity.player.EntityPlayer
import net.minecraft.item.{Item, ItemBlock, ItemStack}
import net.minecraft.nbt.NBTTagCompound
import net.minecraft.world.World
import resonantengine.api.items.IEnergyItem
import resonantengine.api.item.IEnergyItem
import resonantengine.lib.render.EnumColor
import resonantengine.lib.utility.LanguageUtility
import resonantengine.lib.utility.science.UnitDisplay

4
src/main/scala/edx/electrical/battery/TileBattery.scala
View File

@ -15,13 +15,13 @@ import net.minecraftforge.client.IItemRenderer.ItemRenderType
import net.minecraftforge.client.model.AdvancedModelLoader
import net.minecraftforge.common.util.ForgeDirection
import org.lwjgl.opengl.GL11._
import resonantengine.api.items.ISimpleItemRenderer
import resonantengine.api.item.ISimpleItemRenderer
import resonantengine.lib.content.prefab.TIO
import resonantengine.lib.grid.core.TBlockNodeProvider
import resonantengine.lib.grid.energy.EnergyStorage
import resonantengine.lib.grid.energy.electric.NodeElectricComponent
import resonantengine.lib.network.discriminator.PacketType
import resonantengine.lib.network.handle.{TPacketReceiver, TPacketSender}
import resonantengine.prefab.network.{TPacketReceiver, TPacketSender}
import resonantengine.lib.prefab.tile.spatial.ResonantTile
import resonantengine.lib.prefab.tile.traits.TEnergyProvider
import resonantengine.lib.render.RenderUtility

2
src/main/scala/edx/electrical/multimeter/Graph.scala
View File

@ -1,7 +1,7 @@
package edx.electrical.multimeter
import net.minecraft.nbt.NBTTagCompound
import resonantengine.api.ISave
import resonantengine.api.misc.ISave
import resonantengine.lib.collection.EvictingList
import resonantengine.lib.wrapper.NBTWrapper._

5
src/main/scala/edx/electrical/multimeter/PartMultimeter.scala
View File

@ -20,10 +20,11 @@ import net.minecraft.tileentity.TileEntity
import net.minecraft.util.{ChatComponentText, MovingObjectPosition}
import net.minecraftforge.common.util.ForgeDirection
import net.minecraftforge.fluids.{FluidTankInfo, IFluidHandler}
import resonantengine.api.tile.{INodeProvider, IRemovable}
import resonantengine.api.graph.INodeProvider
import resonantengine.api.network.IPacketReceiver
import resonantengine.api.tile.IRemovable
import resonantengine.lib.mod.compat.energy.Compatibility
import resonantengine.lib.network.discriminator.PacketType
import resonantengine.lib.network.handle.IPacketReceiver
import resonantengine.lib.transform.vector.Vector3
import resonantengine.lib.utility.WrenchUtility

2
src/main/scala/edx/electrical/multimeter/RenderMultimeter.scala
View File

@ -9,7 +9,7 @@ import net.minecraft.util.ResourceLocation
import net.minecraftforge.client.IItemRenderer
import net.minecraftforge.common.util.ForgeDirection
import org.lwjgl.opengl.GL11
import resonantengine.api.items.ISimpleItemRenderer
import resonantengine.api.item.ISimpleItemRenderer
import resonantengine.lib.render.RenderUtility
import resonantengine.lib.transform.vector.Vector3
import resonantengine.lib.utility.LanguageUtility

2
src/main/scala/edx/electrical/tesla/TileTesla.scala
View File

@ -22,7 +22,7 @@ import resonantengine.lib.grid.core.TBlockNodeProvider
import resonantengine.lib.grid.energy.EnergyStorage
import resonantengine.lib.grid.energy.electric.NodeElectricComponent
import resonantengine.lib.network.discriminator.{PacketTile, PacketType}
import resonantengine.lib.network.handle.{TPacketReceiver, TPacketSender}
import resonantengine.prefab.network.{TPacketReceiver, TPacketSender}
import resonantengine.lib.prefab.tile.multiblock.reference.{IMultiBlockStructure, MultiBlockHandler}
import resonantengine.lib.prefab.tile.spatial.ResonantTile
import resonantengine.lib.prefab.tile.traits.TEnergyProvider

2
src/main/scala/edx/electrical/transformer/ElectricTransformerNode.scala
View File

@ -1,7 +1,7 @@
package edx.electrical.transformer
import net.minecraftforge.common.util.ForgeDirection
import resonantengine.api.tile.INodeProvider
import resonantengine.api.graph.INodeProvider
import resonantengine.lib.grid.energy.electric.NodeElectricComponent
/**

4
src/main/scala/edx/electrical/transformer/PartElectricTransformer.scala
View File

@ -10,8 +10,8 @@ import net.minecraft.item.ItemStack
import net.minecraft.nbt.NBTTagCompound
import net.minecraft.util.{ChatComponentText, MovingObjectPosition}
import net.minecraftforge.common.util.ForgeDirection
import resonantengine.api.tile.INodeProvider
import resonantengine.api.tile.node.INode
import resonantengine.api.graph.INodeProvider
import resonantengine.api.graph.node.INode
import resonantengine.lib.utility.WrenchUtility
/**

2
src/main/scala/edx/electrical/transformer/RenderTransformer.scala
View File

@ -9,7 +9,7 @@ import net.minecraftforge.client.IItemRenderer
import net.minecraftforge.client.model.AdvancedModelLoader
import net.minecraftforge.client.model.obj.WavefrontObject
import org.lwjgl.opengl.GL11
import resonantengine.api.items.ISimpleItemRenderer
import resonantengine.api.item.ISimpleItemRenderer
import resonantengine.lib.render.RenderUtility
@SideOnly(Side.CLIENT)

2
src/main/scala/edx/electrical/wire/flat/PartFlatWire.scala
View File

@ -20,7 +20,7 @@ import net.minecraft.nbt.NBTTagCompound
import net.minecraft.util.{IIcon, MovingObjectPosition}
import net.minecraftforge.common.util.ForgeDirection
import org.lwjgl.opengl.GL11
import resonantengine.api.tile.INodeProvider
import resonantengine.api.graph.INodeProvider
import resonantengine.lib.grid.energy.electric.{NodeElectricComponent, NodeElectricJunction}
import scala.collection.convert.wrapAll._

2
src/main/scala/edx/mechanical/fluid/pipe/NodePipe.scala
View File

@ -4,7 +4,7 @@ import edx.core.prefab.node.{NodeFluidPressure, TMultipartNode}
import edx.core.prefab.part.connector.TColorable
import net.minecraftforge.common.util.ForgeDirection
import net.minecraftforge.fluids.IFluidHandler
import resonantengine.api.tile.INodeProvider
import resonantengine.api.graph.INodeProvider
/**
* Pressure node for the pipe

4
src/main/scala/edx/mechanical/fluid/pipe/RenderPipe.scala
View File

@ -10,10 +10,10 @@ import net.minecraftforge.client.IItemRenderer.ItemRenderType
import net.minecraftforge.client.model.AdvancedModelLoader
import net.minecraftforge.common.util.ForgeDirection
import org.lwjgl.opengl.GL11
import resonantengine.api.items.ISimpleItemRenderer
import resonantengine.api.item.ISimpleItemRenderer
import resonantengine.lib.render.{FluidRenderUtility, RenderUtility}
import resonantengine.lib.transform.vector.Vector3
import resonantengine.lib.world.WorldUtility
import resonantengine.lib.utility.WorldUtility
import resonantengine.lib.wrapper.BitmaskWrapper._
@SideOnly(Side.CLIENT)

2
src/main/scala/edx/mechanical/fluid/transport/NodePump.scala
View File

@ -3,7 +3,7 @@ package edx.mechanical.fluid.transport
import edx.core.prefab.node.NodeFluidPressure
import net.minecraftforge.common.util.ForgeDirection
import net.minecraftforge.fluids.IFluidHandler
import resonantengine.api.tile.INodeProvider
import resonantengine.api.graph.INodeProvider
/**
* A node for the pump

2
src/main/scala/edx/mechanical/machine/TileDetector.scala
View File

@ -19,7 +19,7 @@ import net.minecraft.world.IBlockAccess
import net.minecraftforge.common.util.ForgeDirection
import resonantengine.core.ResonantEngine
import resonantengine.lib.network.discriminator.{PacketTile, PacketType}
import resonantengine.lib.network.handle.TPacketReceiver
import resonantengine.prefab.network.TPacketReceiver
import resonantengine.lib.prefab.tile.spatial.ResonantBlock
class TileDetector extends TileFilterable with TPacketReceiver

2
src/main/scala/edx/mechanical/machine/edit/TileBreaker.scala
View File

@ -15,8 +15,8 @@ import net.minecraft.nbt.NBTTagCompound
import net.minecraft.util.IIcon
import net.minecraft.world.IBlockAccess
import net.minecraftforge.common.util.ForgeDirection
import resonantengine.api.network.IPacketReceiver
import resonantengine.lib.network.discriminator.{PacketTile, PacketType}
import resonantengine.lib.network.handle.IPacketReceiver
import resonantengine.lib.prefab.tile.spatial.ResonantTile
import resonantengine.lib.prefab.tile.traits.TRotatable
import resonantengine.lib.transform.vector.{Vector3, VectorWorld}

2
src/main/scala/edx/mechanical/machine/edit/TilePlacer.scala
View File

@ -15,7 +15,7 @@ import net.minecraftforge.common.util.ForgeDirection
import org.lwjgl.opengl.GL11
import resonantengine.lib.content.prefab.TInventory
import resonantengine.lib.network.discriminator.PacketTile
import resonantengine.lib.network.handle.TPacketSender
import resonantengine.prefab.network.TPacketSender
import resonantengine.lib.prefab.tile.spatial.ResonantTile
import resonantengine.lib.prefab.tile.traits.TRotatable
import resonantengine.lib.render.RenderItemOverlayUtility

2
src/main/scala/edx/mechanical/mech/TileMechanical.scala
View File

@ -7,7 +7,7 @@ import net.minecraft.entity.player.EntityPlayer
import net.minecraftforge.common.util.ForgeDirection
import resonantengine.lib.grid.core.TBlockNodeProvider
import resonantengine.lib.network.discriminator.PacketType
import resonantengine.lib.network.handle.{TPacketReceiver, TPacketSender}
import resonantengine.prefab.network.{TPacketReceiver, TPacketSender}
import resonantengine.lib.prefab.tile.spatial.ResonantTile
import resonantengine.lib.prefab.tile.traits.TRotatable
import resonantengine.lib.transform.vector.Vector3

2
src/main/scala/edx/mechanical/mech/gear/NodeGear.scala
View File

@ -7,7 +7,7 @@ import edx.mechanical.mech.gearshaft.{NodeGearShaft, PartGearShaft}
import edx.mechanical.mech.grid.NodeMechanical
import net.minecraft.tileentity.TileEntity
import net.minecraftforge.common.util.ForgeDirection
import resonantengine.api.tile.INodeProvider
import resonantengine.api.graph.INodeProvider
import resonantengine.lib.transform.vector.Vector3
import resonantengine.lib.wrapper.ForgeDirectionWrapper._

2
src/main/scala/edx/mechanical/mech/gear/PartGear.scala
View File

@ -15,7 +15,7 @@ import net.minecraft.nbt.NBTTagCompound
import net.minecraft.util.MovingObjectPosition
import net.minecraft.world.World
import net.minecraftforge.common.util.ForgeDirection
import resonantengine.api.tile.node.INode
import resonantengine.api.graph.node.INode
import resonantengine.lib.prefab.tile.multiblock.reference.IMultiBlockStructure
import resonantengine.lib.utility.WrenchUtility

2
src/main/scala/edx/mechanical/mech/gear/RenderGear.scala
View File

@ -8,7 +8,7 @@ import net.minecraftforge.client.IItemRenderer
import net.minecraftforge.client.model.{AdvancedModelLoader, IModelCustom}
import net.minecraftforge.common.util.ForgeDirection
import org.lwjgl.opengl.GL11
import resonantengine.api.items.ISimpleItemRenderer
import resonantengine.api.item.ISimpleItemRenderer
import resonantengine.lib.render.RenderUtility
@SideOnly(Side.CLIENT)

2
src/main/scala/edx/mechanical/mech/gearshaft/NodeGearShaft.scala
View File

@ -4,7 +4,7 @@ import edx.core.interfaces.TNodeMechanical
import edx.mechanical.mech.gear.{NodeGear, PartGear}
import edx.mechanical.mech.grid.NodeMechanical
import net.minecraftforge.common.util.ForgeDirection
import resonantengine.api.tile.INodeProvider
import resonantengine.api.graph.INodeProvider
import resonantengine.lib.transform.vector.Vector3
import resonantengine.lib.wrapper.ForgeDirectionWrapper._

2
src/main/scala/edx/mechanical/mech/gearshaft/RenderGearShaft.scala
View File

@ -9,7 +9,7 @@ import net.minecraftforge.client.model.AdvancedModelLoader
import net.minecraftforge.common.util.ForgeDirection
import org.lwjgl.opengl.GL11
import org.lwjgl.opengl.GL11.glRotatef
import resonantengine.api.items.ISimpleItemRenderer
import resonantengine.api.item.ISimpleItemRenderer
import resonantengine.lib.render.RenderUtility
import resonantengine.lib.wrapper.ForgeDirectionWrapper._

2
src/main/scala/edx/mechanical/mech/grid/GridMechanical.scala
View File

@ -1,6 +1,6 @@
package edx.mechanical.mech.grid
import resonantengine.api.IUpdate
import resonantengine.api.graph.IUpdate
import resonantengine.lib.grid.core.{GridNode, UpdateTicker}
import scala.collection.convert.wrapAll._

6
src/main/scala/edx/mechanical/mech/grid/NodeMechanical.scala
View File

@ -2,10 +2,10 @@ package edx.mechanical.mech.grid
import edx.core.interfaces.TNodeMechanical
import edx.core.prefab.node.TMultipartNode
import resonantengine.api.tile.INodeProvider
import resonantengine.core.debug.IDebugInfo
import resonantengine.api.graph.INodeProvider
import resonantengine.api.tile.IDebugInfo
import resonantengine.api.transform.vector.IVectorWorld
import resonantengine.lib.grid.core.{GridNode, NodeGrid, TTileConnector}
import resonantengine.lib.transform.vector.IVectorWorld
import scala.beans.BeanProperty
import scala.collection.convert.wrapAll._

2
src/main/scala/edx/mechanical/mech/process/crusher/TileMechanicalPiston.scala
View File

@ -10,7 +10,7 @@ import net.minecraft.item.ItemStack
import net.minecraft.nbt.NBTTagCompound
import net.minecraft.tileentity.TileEntity
import net.minecraft.world.World
import resonantengine.api.recipe.{MachineRecipes, RecipeResource, RecipeType}
import resonantengine.api.edx.recipe.{MachineRecipes, RecipeResource, RecipeType}
import resonantengine.lib.mod.config.Config
import resonantengine.lib.transform.vector.Vector3
import resonantengine.lib.utility.MovementUtility

2
src/main/scala/edx/mechanical/mech/process/grinder/TileGrindingWheel.scala
View File

@ -11,7 +11,7 @@ import net.minecraft.util.ResourceLocation
import net.minecraftforge.client.model.AdvancedModelLoader
import net.minecraftforge.common.util.ForgeDirection
import org.lwjgl.opengl.GL11._
import resonantengine.api.recipe.{MachineRecipes, RecipeType}
import resonantengine.api.edx.recipe.{MachineRecipes, RecipeType}
import resonantengine.lib.prefab.Timer
import resonantengine.lib.prefab.damage.CustomDamageSource
import resonantengine.lib.render.RenderUtility

2
src/main/scala/edx/mechanical/mech/process/mixer/MixerNode.scala
View File

@ -2,7 +2,7 @@ package edx.mechanical.mech.process.mixer
import edx.mechanical.mech.grid.NodeMechanical
import net.minecraftforge.common.util.ForgeDirection
import resonantengine.api.tile.INodeProvider
import resonantengine.api.graph.INodeProvider
/**
* Node designed just for the Mixer to use

2
src/main/scala/edx/mechanical/mech/process/mixer/RenderMixer.scala
View File

@ -10,7 +10,7 @@ import net.minecraftforge.client.IItemRenderer
import net.minecraftforge.client.model.{AdvancedModelLoader, IModelCustom}
import org.lwjgl.opengl.GL11
import org.lwjgl.opengl.GL11.{glPopMatrix, glPushMatrix, glTranslatef}
import resonantengine.api.items.ISimpleItemRenderer
import resonantengine.api.item.ISimpleItemRenderer
import resonantengine.lib.render.RenderUtility
/**

2
src/main/scala/edx/mechanical/mech/process/mixer/TileMixer.scala
View File

@ -15,7 +15,7 @@ import net.minecraftforge.client.model.{AdvancedModelLoader, IModelCustom}
import net.minecraftforge.fluids.IFluidBlock
import org.lwjgl.opengl.GL11
import org.lwjgl.opengl.GL11._
import resonantengine.api.recipe.{MachineRecipes, RecipeType}
import resonantengine.api.edx.recipe.{MachineRecipes, RecipeType}
import resonantengine.lib.prefab.Timer
import resonantengine.lib.render.RenderUtility
import resonantengine.lib.transform.rotation.Quaternion

2
src/main/scala/edx/mechanical/mech/turbine/RenderWaterTurbine.scala
View File

@ -9,7 +9,7 @@ import net.minecraft.util.ResourceLocation
import net.minecraftforge.client.IItemRenderer
import net.minecraftforge.client.model.{AdvancedModelLoader, IModelCustom}
import org.lwjgl.opengl.GL11
import resonantengine.api.items.ISimpleItemRenderer
import resonantengine.api.item.ISimpleItemRenderer
import resonantengine.lib.render.RenderUtility
@SideOnly(Side.CLIENT) object RenderWaterTurbine

2
src/main/scala/edx/mechanical/mech/turbine/TileWaterTurbine.scala
View File

@ -13,7 +13,7 @@ import net.minecraft.tileentity.TileEntity
import net.minecraft.util.Vec3
import net.minecraft.world.IBlockAccess
import net.minecraftforge.common.util.ForgeDirection
import resonantengine.api.tile.INodeProvider
import resonantengine.api.graph.INodeProvider
import resonantengine.lib.prefab.tile.item.ItemBlockMetadata
import resonantengine.lib.transform.vector.Vector3
import resonantengine.lib.wrapper.CollectionWrapper._

2
src/main/scala/edx/quantum/blocks/TileElectromagnet.scala
View File

@ -16,7 +16,7 @@ import resonantengine.lib.prefab.tile.item.ItemBlockMetadata
import resonantengine.lib.prefab.tile.spatial.ResonantBlock
import resonantengine.lib.render.{RenderBlockUtility, RenderUtility}
import resonantengine.lib.transform.vector.Vector3
import resonantengine.lib.world.WorldUtility
import resonantengine.lib.utility.WorldUtility
import resonantengine.lib.wrapper.CollectionWrapper._
/**

2
src/main/scala/edx/quantum/gate/RenderQuantumGlyph.scala
View File

@ -7,7 +7,7 @@ import net.minecraft.init.Blocks
import net.minecraft.item.ItemStack
import net.minecraftforge.client.IItemRenderer
import org.lwjgl.opengl.GL11
import resonantengine.api.items.ISimpleItemRenderer
import resonantengine.api.item.ISimpleItemRenderer
import resonantengine.lib.render.RenderUtility
object RenderQuantumGlyph extends ISimpleItemRenderer

2
src/main/scala/edx/quantum/items/ItemBreederFuel.scala
View File

@ -1,7 +1,7 @@
package edx.quantum.items
import net.minecraft.item.ItemStack
import resonantengine.api.tile.{IReactor, IReactorComponent}
import resonantengine.api.edx.machine.{IReactor, IReactorComponent}
/**
* Breeder rods

2
src/main/scala/edx/quantum/items/ItemFuelRod.scala
View File

@ -8,7 +8,7 @@ import net.minecraft.creativetab.CreativeTabs
import net.minecraft.item.{Item, ItemStack}
import net.minecraft.tileentity.TileEntity
import net.minecraftforge.common.util.ForgeDirection
import resonantengine.api.tile.{IReactor, IReactorComponent}
import resonantengine.api.edx.machine.{IReactor, IReactorComponent}
import resonantengine.lib.grid.thermal.GridThermal
import resonantengine.lib.transform.vector.VectorWorld
import resonantengine.lib.wrapper.CollectionWrapper._

2
src/main/scala/edx/quantum/machine/accelerator/TileAccelerator.scala
View File

@ -16,7 +16,7 @@ import resonantengine.api.tile.{IElectromagnet, IRotatable}
import resonantengine.lib.content.prefab.TInventory
import resonantengine.lib.grid.energy.EnergyStorage
import resonantengine.lib.network.discriminator.{PacketTile, PacketType}
import resonantengine.lib.network.handle.{TPacketReceiver, TPacketSender}
import resonantengine.prefab.network.{TPacketReceiver, TPacketSender}
import resonantengine.lib.prefab.tile.spatial.ResonantTile
import resonantengine.lib.prefab.tile.traits.TEnergyProvider
import resonantengine.lib.transform.vector.Vector3

2
src/main/scala/edx/quantum/machine/boiler/TileNuclearBoiler.scala
View File

@ -10,13 +10,13 @@ import net.minecraft.nbt.NBTTagCompound
import net.minecraft.network.Packet
import net.minecraftforge.common.util.ForgeDirection
import net.minecraftforge.fluids._
import resonantengine.api.network.IPacketReceiver
import resonantengine.core.ResonantEngine
import resonantengine.lib.content.prefab.{TIO, TInventory}
import resonantengine.lib.grid.core.TBlockNodeProvider
import resonantengine.lib.grid.energy.EnergyStorage
import resonantengine.lib.grid.energy.electric.NodeElectricComponent
import resonantengine.lib.network.discriminator.{PacketTile, PacketType}
import resonantengine.lib.network.handle.IPacketReceiver
import resonantengine.lib.prefab.tile.spatial.ResonantTile
import resonantengine.lib.prefab.tile.traits.{TEnergyProvider, TRotatable}
import resonantengine.lib.transform.vector.Vector3

2
src/main/scala/edx/quantum/machine/centrifuge/TileCentrifuge.scala
View File

@ -11,13 +11,13 @@ import net.minecraft.nbt.NBTTagCompound
import net.minecraft.tileentity.TileEntity
import net.minecraftforge.common.util.ForgeDirection
import net.minecraftforge.fluids._
import resonantengine.api.network.IPacketReceiver
import resonantengine.lib.content.prefab.{TIO, TInventory}
import resonantengine.lib.grid.core.TBlockNodeProvider
import resonantengine.lib.grid.energy.EnergyStorage
import resonantengine.lib.grid.energy.electric.NodeElectricComponent
import resonantengine.lib.mod.compat.energy.Compatibility
import resonantengine.lib.network.discriminator.{PacketTile, PacketType}
import resonantengine.lib.network.handle.IPacketReceiver
import resonantengine.lib.prefab.tile.spatial.ResonantTile
import resonantengine.lib.prefab.tile.traits.{TEnergyProvider, TRotatable}
import resonantengine.lib.transform.vector.Vector3

2
src/main/scala/edx/quantum/machine/extractor/TileProcess.scala
View File

@ -3,7 +3,7 @@ package edx.quantum.machine.extractor
import net.minecraft.block.material.Material
import net.minecraft.item.ItemStack
import net.minecraftforge.fluids.{FluidContainerRegistry, FluidStack, FluidTank}
import resonantengine.api.recipe.{MachineRecipes, RecipeResource}
import resonantengine.api.edx.recipe.{MachineRecipes, RecipeResource}
import resonantengine.lib.content.prefab.TInventory
import resonantengine.lib.grid.core.TBlockNodeProvider
import resonantengine.lib.prefab.tile.spatial.ResonantTile

2
src/main/scala/edx/quantum/machine/plasma/TilePlasmaHeater.scala
View File

@ -11,13 +11,13 @@ import net.minecraft.nbt.NBTTagCompound
import net.minecraft.network.Packet
import net.minecraftforge.common.util.ForgeDirection
import net.minecraftforge.fluids._
import resonantengine.api.network.IPacketReceiver
import resonantengine.core.ResonantEngine
import resonantengine.lib.grid.core.TBlockNodeProvider
import resonantengine.lib.grid.energy.EnergyStorage
import resonantengine.lib.grid.energy.electric.NodeElectricComponent
import resonantengine.lib.mod.config.Config
import resonantengine.lib.network.discriminator.{PacketTile, PacketType}
import resonantengine.lib.network.handle.IPacketReceiver
import resonantengine.lib.prefab.tile.spatial.ResonantTile
import resonantengine.lib.prefab.tile.traits.TEnergyProvider
import resonantengine.lib.transform.vector.Vector3

4
src/main/scala/edx/quantum/machine/quantum/TileQuantumAssembler.scala
View File

@ -8,13 +8,13 @@ import net.minecraft.entity.item.EntityItem
import net.minecraft.entity.player.EntityPlayer
import net.minecraft.item.{Item, ItemStack}
import net.minecraft.nbt.NBTTagCompound
import resonantengine.api.recipe.QuantumAssemblerRecipes
import resonantengine.api.edx.recipe.QuantumAssemblerRecipes
import resonantengine.api.network.IPacketReceiver
import resonantengine.lib.content.prefab.TInventory
import resonantengine.lib.grid.core.TBlockNodeProvider
import resonantengine.lib.grid.energy.EnergyStorage
import resonantengine.lib.grid.energy.electric.NodeElectricComponent
import resonantengine.lib.network.discriminator.{PacketTile, PacketType}
import resonantengine.lib.network.handle.IPacketReceiver
import resonantengine.lib.prefab.tile.spatial.ResonantTile
import resonantengine.lib.prefab.tile.traits.TEnergyProvider
import resonantengine.lib.transform.vector.Vector3

4
src/main/scala/edx/quantum/reactor/TileReactorCell.scala
View File

@ -19,9 +19,9 @@ import net.minecraft.world.World
import net.minecraftforge.client.model.AdvancedModelLoader
import net.minecraftforge.common.util.ForgeDirection
import org.lwjgl.opengl.GL11
import resonantengine.api.tile.{IReactor, IReactorComponent}
import resonantengine.api.edx.machine.{IReactor, IReactorComponent}
import resonantengine.lib.grid.thermal.{GridThermal, ThermalPhysics}
import resonantengine.lib.network.handle.{TPacketReceiver, TPacketSender}
import resonantengine.prefab.network.{TPacketReceiver, TPacketSender}
import resonantengine.lib.prefab.poison.PoisonRadiation
import resonantengine.lib.prefab.tile.mixed.TileInventory
import resonantengine.lib.prefab.tile.multiblock.reference.{IMultiBlockStructure, MultiBlockHandler}

2
src/main/scala/edx/quantum/schematic/SchematicAccelerator.scala
View File

@ -8,7 +8,7 @@ import net.minecraft.init.Blocks
import net.minecraftforge.common.util.ForgeDirection
import resonantengine.lib.collection.Pair
import resonantengine.lib.transform.vector.Vector3
import resonantengine.lib.world.schematic.Schematic
import resonantengine.lib.schematic.Schematic
class SchematicAccelerator extends Schematic
{

2
src/main/scala/edx/quantum/schematic/SchematicBreedingReactor.scala
View File

@ -8,7 +8,7 @@ import net.minecraft.init.Blocks
import net.minecraftforge.common.util.ForgeDirection
import resonantengine.lib.collection.Pair
import resonantengine.lib.transform.vector.Vector3
import resonantengine.lib.world.schematic.Schematic
import resonantengine.lib.schematic.Schematic
class SchematicBreedingReactor extends Schematic
{

2
src/main/scala/edx/quantum/schematic/SchematicFissionReactor.scala
View File

@ -8,7 +8,7 @@ import net.minecraft.init.Blocks
import net.minecraftforge.common.util.ForgeDirection
import resonantengine.lib.collection.Pair
import resonantengine.lib.transform.vector.Vector3
import resonantengine.lib.world.schematic.Schematic
import resonantengine.lib.schematic.Schematic
class SchematicFissionReactor extends Schematic
{

2
src/main/scala/edx/quantum/schematic/SchematicFusionReactor.scala
View File

@ -8,7 +8,7 @@ import net.minecraft.init.Blocks
import net.minecraftforge.common.util.ForgeDirection
import resonantengine.lib.collection.Pair
import resonantengine.lib.transform.vector.Vector3
import resonantengine.lib.world.schematic.Schematic
import resonantengine.lib.schematic.Schematic
class SchematicFusionReactor extends Schematic
{