From 6bbff667100ca7f401f2dd5d3fd9d0161ef62ded Mon Sep 17 00:00:00 2001 From: Calclavia Date: Mon, 26 Jan 2015 20:17:04 +0800 Subject: [PATCH] More mass refactor --- src/main/scala/edx/basic/blocks/TileImprinter.scala | 2 +- .../scala/edx/basic/engineering/TileEngineeringTable.scala | 4 ++-- src/main/scala/edx/basic/fluid/gutter/TileGutter.scala | 2 +- src/main/scala/edx/basic/fluid/tank/TileTank.scala | 2 +- .../scala/edx/basic/process/grinding/TileWorkbench.scala | 4 ++-- src/main/scala/edx/basic/process/mixing/ItemGlassJar.scala | 3 ++- src/main/scala/edx/basic/process/mixing/TileGlassJar.scala | 4 ++-- src/main/scala/edx/basic/process/sifting/ItemSieve.scala | 2 +- src/main/scala/edx/basic/process/sifting/TileSieve.scala | 4 ++-- .../scala/edx/basic/process/smelting/TileCastingMold.scala | 4 ++-- .../edx/basic/process/smelting/firebox/TileFirebox.scala | 2 +- .../edx/basic/process/smelting/firebox/TileHotPlate.scala | 2 +- src/main/scala/edx/core/ResonantPartFactory.scala | 4 ++-- src/main/scala/edx/core/Settings.scala | 2 +- src/main/scala/edx/core/interfaces/TNodeMechanical.scala | 4 ++-- src/main/scala/edx/core/prefab/node/NodeFluidPressure.scala | 3 +-- src/main/scala/edx/core/prefab/node/TileFluidProvider.scala | 2 +- src/main/scala/edx/core/prefab/part/PacketMultiPart.scala | 2 +- .../edx/core/prefab/part/connector/TPartNodeProvider.scala | 2 +- .../prefab/pass/{TDebugInfo.java => TraitDebugInfo.java} | 4 ++-- .../pass/{TNodeProvider.java => TraitNodeProvider.java} | 6 +++--- src/main/scala/edx/core/resource/AutoResourceFactory.scala | 2 +- src/main/scala/edx/core/resource/alloy/Alloy.scala | 2 +- .../scala/edx/electrical/battery/ItemBlockBattery.scala | 2 +- src/main/scala/edx/electrical/battery/TileBattery.scala | 4 ++-- src/main/scala/edx/electrical/multimeter/Graph.scala | 2 +- .../scala/edx/electrical/multimeter/PartMultimeter.scala | 5 +++-- .../scala/edx/electrical/multimeter/RenderMultimeter.scala | 2 +- src/main/scala/edx/electrical/tesla/TileTesla.scala | 2 +- .../electrical/transformer/ElectricTransformerNode.scala | 2 +- .../electrical/transformer/PartElectricTransformer.scala | 4 ++-- .../edx/electrical/transformer/RenderTransformer.scala | 2 +- src/main/scala/edx/electrical/wire/flat/PartFlatWire.scala | 2 +- src/main/scala/edx/mechanical/fluid/pipe/NodePipe.scala | 2 +- src/main/scala/edx/mechanical/fluid/pipe/RenderPipe.scala | 4 ++-- .../scala/edx/mechanical/fluid/transport/NodePump.scala | 2 +- src/main/scala/edx/mechanical/machine/TileDetector.scala | 2 +- .../scala/edx/mechanical/machine/edit/TileBreaker.scala | 2 +- src/main/scala/edx/mechanical/machine/edit/TilePlacer.scala | 2 +- src/main/scala/edx/mechanical/mech/TileMechanical.scala | 2 +- src/main/scala/edx/mechanical/mech/gear/NodeGear.scala | 2 +- src/main/scala/edx/mechanical/mech/gear/PartGear.scala | 2 +- src/main/scala/edx/mechanical/mech/gear/RenderGear.scala | 2 +- .../scala/edx/mechanical/mech/gearshaft/NodeGearShaft.scala | 2 +- .../edx/mechanical/mech/gearshaft/RenderGearShaft.scala | 2 +- .../scala/edx/mechanical/mech/grid/GridMechanical.scala | 2 +- .../scala/edx/mechanical/mech/grid/NodeMechanical.scala | 6 +++--- .../mech/process/crusher/TileMechanicalPiston.scala | 2 +- .../mechanical/mech/process/grinder/TileGrindingWheel.scala | 2 +- .../scala/edx/mechanical/mech/process/mixer/MixerNode.scala | 2 +- .../edx/mechanical/mech/process/mixer/RenderMixer.scala | 2 +- .../scala/edx/mechanical/mech/process/mixer/TileMixer.scala | 2 +- .../edx/mechanical/mech/turbine/RenderWaterTurbine.scala | 2 +- .../edx/mechanical/mech/turbine/TileWaterTurbine.scala | 2 +- src/main/scala/edx/quantum/blocks/TileElectromagnet.scala | 2 +- src/main/scala/edx/quantum/gate/RenderQuantumGlyph.scala | 2 +- src/main/scala/edx/quantum/items/ItemBreederFuel.scala | 2 +- src/main/scala/edx/quantum/items/ItemFuelRod.scala | 2 +- .../edx/quantum/machine/accelerator/TileAccelerator.scala | 2 +- .../edx/quantum/machine/boiler/TileNuclearBoiler.scala | 2 +- .../edx/quantum/machine/centrifuge/TileCentrifuge.scala | 2 +- .../scala/edx/quantum/machine/extractor/TileProcess.scala | 2 +- .../scala/edx/quantum/machine/plasma/TilePlasmaHeater.scala | 2 +- .../edx/quantum/machine/quantum/TileQuantumAssembler.scala | 4 ++-- src/main/scala/edx/quantum/reactor/TileReactorCell.scala | 4 ++-- .../scala/edx/quantum/schematic/SchematicAccelerator.scala | 2 +- .../edx/quantum/schematic/SchematicBreedingReactor.scala | 2 +- .../edx/quantum/schematic/SchematicFissionReactor.scala | 2 +- .../edx/quantum/schematic/SchematicFusionReactor.scala | 2 +- 69 files changed, 89 insertions(+), 88 deletions(-) rename src/main/scala/edx/core/prefab/pass/{TDebugInfo.java => TraitDebugInfo.java} (80%) rename src/main/scala/edx/core/prefab/pass/{TNodeProvider.java => TraitNodeProvider.java} (83%) diff --git a/src/main/scala/edx/basic/blocks/TileImprinter.scala b/src/main/scala/edx/basic/blocks/TileImprinter.scala index bdb4fb358..353287002 100644 --- a/src/main/scala/edx/basic/blocks/TileImprinter.scala +++ b/src/main/scala/edx/basic/blocks/TileImprinter.scala @@ -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} diff --git a/src/main/scala/edx/basic/engineering/TileEngineeringTable.scala b/src/main/scala/edx/basic/engineering/TileEngineeringTable.scala index 2f5acd650..c174c931d 100644 --- a/src/main/scala/edx/basic/engineering/TileEngineeringTable.scala +++ b/src/main/scala/edx/basic/engineering/TileEngineeringTable.scala @@ -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 diff --git a/src/main/scala/edx/basic/fluid/gutter/TileGutter.scala b/src/main/scala/edx/basic/fluid/gutter/TileGutter.scala index 93b73e517..b1f833309 100644 --- a/src/main/scala/edx/basic/fluid/gutter/TileGutter.scala +++ b/src/main/scala/edx/basic/fluid/gutter/TileGutter.scala @@ -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 diff --git a/src/main/scala/edx/basic/fluid/tank/TileTank.scala b/src/main/scala/edx/basic/fluid/tank/TileTank.scala index 92aa7af8b..1b6f997fb 100644 --- a/src/main/scala/edx/basic/fluid/tank/TileTank.scala +++ b/src/main/scala/edx/basic/fluid/tank/TileTank.scala @@ -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} diff --git a/src/main/scala/edx/basic/process/grinding/TileWorkbench.scala b/src/main/scala/edx/basic/process/grinding/TileWorkbench.scala index f4e71a408..ab5a7b087 100644 --- a/src/main/scala/edx/basic/process/grinding/TileWorkbench.scala +++ b/src/main/scala/edx/basic/process/grinding/TileWorkbench.scala @@ -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 diff --git a/src/main/scala/edx/basic/process/mixing/ItemGlassJar.scala b/src/main/scala/edx/basic/process/mixing/ItemGlassJar.scala index 1ca6ac9e7..e6e1ee135 100644 --- a/src/main/scala/edx/basic/process/mixing/ItemGlassJar.scala +++ b/src/main/scala/edx/basic/process/mixing/ItemGlassJar.scala @@ -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 /** diff --git a/src/main/scala/edx/basic/process/mixing/TileGlassJar.scala b/src/main/scala/edx/basic/process/mixing/TileGlassJar.scala index 686e3f21e..934ada1e9 100644 --- a/src/main/scala/edx/basic/process/mixing/TileGlassJar.scala +++ b/src/main/scala/edx/basic/process/mixing/TileGlassJar.scala @@ -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 diff --git a/src/main/scala/edx/basic/process/sifting/ItemSieve.scala b/src/main/scala/edx/basic/process/sifting/ItemSieve.scala index 9fcc5d6c2..124932180 100644 --- a/src/main/scala/edx/basic/process/sifting/ItemSieve.scala +++ b/src/main/scala/edx/basic/process/sifting/ItemSieve.scala @@ -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 diff --git a/src/main/scala/edx/basic/process/sifting/TileSieve.scala b/src/main/scala/edx/basic/process/sifting/TileSieve.scala index a58d76772..98080697d 100644 --- a/src/main/scala/edx/basic/process/sifting/TileSieve.scala +++ b/src/main/scala/edx/basic/process/sifting/TileSieve.scala @@ -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} diff --git a/src/main/scala/edx/basic/process/smelting/TileCastingMold.scala b/src/main/scala/edx/basic/process/smelting/TileCastingMold.scala index e46f70604..d8052cc5c 100644 --- a/src/main/scala/edx/basic/process/smelting/TileCastingMold.scala +++ b/src/main/scala/edx/basic/process/smelting/TileCastingMold.scala @@ -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 diff --git a/src/main/scala/edx/basic/process/smelting/firebox/TileFirebox.scala b/src/main/scala/edx/basic/process/smelting/firebox/TileFirebox.scala index 706458335..927543bf4 100644 --- a/src/main/scala/edx/basic/process/smelting/firebox/TileFirebox.scala +++ b/src/main/scala/edx/basic/process/smelting/firebox/TileFirebox.scala @@ -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 diff --git a/src/main/scala/edx/basic/process/smelting/firebox/TileHotPlate.scala b/src/main/scala/edx/basic/process/smelting/firebox/TileHotPlate.scala index 2c486b206..252adbad6 100644 --- a/src/main/scala/edx/basic/process/smelting/firebox/TileHotPlate.scala +++ b/src/main/scala/edx/basic/process/smelting/firebox/TileHotPlate.scala @@ -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} diff --git a/src/main/scala/edx/core/ResonantPartFactory.scala b/src/main/scala/edx/core/ResonantPartFactory.scala index b1e169af1..846dc2573 100644 --- a/src/main/scala/edx/core/ResonantPartFactory.scala +++ b/src/main/scala/edx/core/ResonantPartFactory.scala @@ -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") } diff --git a/src/main/scala/edx/core/Settings.scala b/src/main/scala/edx/core/Settings.scala index 208302fa3..d84cd2495 100644 --- a/src/main/scala/edx/core/Settings.scala +++ b/src/main/scala/edx/core/Settings.scala @@ -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 diff --git a/src/main/scala/edx/core/interfaces/TNodeMechanical.scala b/src/main/scala/edx/core/interfaces/TNodeMechanical.scala index e27585b27..42fe0e840 100644 --- a/src/main/scala/edx/core/interfaces/TNodeMechanical.scala +++ b/src/main/scala/edx/core/interfaces/TNodeMechanical.scala @@ -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 diff --git a/src/main/scala/edx/core/prefab/node/NodeFluidPressure.scala b/src/main/scala/edx/core/prefab/node/NodeFluidPressure.scala index 0eff749d8..00f36af70 100644 --- a/src/main/scala/edx/core/prefab/node/NodeFluidPressure.scala +++ b/src/main/scala/edx/core/prefab/node/NodeFluidPressure.scala @@ -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 diff --git a/src/main/scala/edx/core/prefab/node/TileFluidProvider.scala b/src/main/scala/edx/core/prefab/node/TileFluidProvider.scala index 97cbc1d2d..430b169d3 100644 --- a/src/main/scala/edx/core/prefab/node/TileFluidProvider.scala +++ b/src/main/scala/edx/core/prefab/node/TileFluidProvider.scala @@ -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._ diff --git a/src/main/scala/edx/core/prefab/part/PacketMultiPart.scala b/src/main/scala/edx/core/prefab/part/PacketMultiPart.scala index 357ff1f17..860a1add6 100644 --- a/src/main/scala/edx/core/prefab/part/PacketMultiPart.scala +++ b/src/main/scala/edx/core/prefab/part/PacketMultiPart.scala @@ -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 /** diff --git a/src/main/scala/edx/core/prefab/part/connector/TPartNodeProvider.scala b/src/main/scala/edx/core/prefab/part/connector/TPartNodeProvider.scala index b5f65cc0e..9c810c6fe 100644 --- a/src/main/scala/edx/core/prefab/part/connector/TPartNodeProvider.scala +++ b/src/main/scala/edx/core/prefab/part/connector/TPartNodeProvider.scala @@ -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._ diff --git a/src/main/scala/edx/core/prefab/pass/TDebugInfo.java b/src/main/scala/edx/core/prefab/pass/TraitDebugInfo.java similarity index 80% rename from src/main/scala/edx/core/prefab/pass/TDebugInfo.java rename to src/main/scala/edx/core/prefab/pass/TraitDebugInfo.java index c9b1e5698..ac76f098f 100644 --- a/src/main/scala/edx/core/prefab/pass/TDebugInfo.java +++ b/src/main/scala/edx/core/prefab/pass/TraitDebugInfo.java @@ -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 getDebugInfo() diff --git a/src/main/scala/edx/core/prefab/pass/TNodeProvider.java b/src/main/scala/edx/core/prefab/pass/TraitNodeProvider.java similarity index 83% rename from src/main/scala/edx/core/prefab/pass/TNodeProvider.java rename to src/main/scala/edx/core/prefab/pass/TraitNodeProvider.java index 78fe564e5..c8ac7e098 100644 --- a/src/main/scala/edx/core/prefab/pass/TNodeProvider.java +++ b/src/main/scala/edx/core/prefab/pass/TraitNodeProvider.java @@ -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 getNode(Class nodeType, ForgeDirection from) diff --git a/src/main/scala/edx/core/resource/AutoResourceFactory.scala b/src/main/scala/edx/core/resource/AutoResourceFactory.scala index 033379af6..bed1767c5 100644 --- a/src/main/scala/edx/core/resource/AutoResourceFactory.scala +++ b/src/main/scala/edx/core/resource/AutoResourceFactory.scala @@ -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._ diff --git a/src/main/scala/edx/core/resource/alloy/Alloy.scala b/src/main/scala/edx/core/resource/alloy/Alloy.scala index 1d557dca9..fd2e1881c 100644 --- a/src/main/scala/edx/core/resource/alloy/Alloy.scala +++ b/src/main/scala/edx/core/resource/alloy/Alloy.scala @@ -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._ /** diff --git a/src/main/scala/edx/electrical/battery/ItemBlockBattery.scala b/src/main/scala/edx/electrical/battery/ItemBlockBattery.scala index 90c6e335d..2d4cae8f9 100644 --- a/src/main/scala/edx/electrical/battery/ItemBlockBattery.scala +++ b/src/main/scala/edx/electrical/battery/ItemBlockBattery.scala @@ -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 diff --git a/src/main/scala/edx/electrical/battery/TileBattery.scala b/src/main/scala/edx/electrical/battery/TileBattery.scala index 74302574e..b42a9d9c8 100644 --- a/src/main/scala/edx/electrical/battery/TileBattery.scala +++ b/src/main/scala/edx/electrical/battery/TileBattery.scala @@ -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 diff --git a/src/main/scala/edx/electrical/multimeter/Graph.scala b/src/main/scala/edx/electrical/multimeter/Graph.scala index 52e861861..f9ee8a2cd 100644 --- a/src/main/scala/edx/electrical/multimeter/Graph.scala +++ b/src/main/scala/edx/electrical/multimeter/Graph.scala @@ -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._ diff --git a/src/main/scala/edx/electrical/multimeter/PartMultimeter.scala b/src/main/scala/edx/electrical/multimeter/PartMultimeter.scala index 73d685531..cfcd086c3 100644 --- a/src/main/scala/edx/electrical/multimeter/PartMultimeter.scala +++ b/src/main/scala/edx/electrical/multimeter/PartMultimeter.scala @@ -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 diff --git a/src/main/scala/edx/electrical/multimeter/RenderMultimeter.scala b/src/main/scala/edx/electrical/multimeter/RenderMultimeter.scala index 3abe2cbca..340f74924 100644 --- a/src/main/scala/edx/electrical/multimeter/RenderMultimeter.scala +++ b/src/main/scala/edx/electrical/multimeter/RenderMultimeter.scala @@ -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 diff --git a/src/main/scala/edx/electrical/tesla/TileTesla.scala b/src/main/scala/edx/electrical/tesla/TileTesla.scala index 25f490df7..31842a0e3 100644 --- a/src/main/scala/edx/electrical/tesla/TileTesla.scala +++ b/src/main/scala/edx/electrical/tesla/TileTesla.scala @@ -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 diff --git a/src/main/scala/edx/electrical/transformer/ElectricTransformerNode.scala b/src/main/scala/edx/electrical/transformer/ElectricTransformerNode.scala index 035cea821..239f9ab95 100644 --- a/src/main/scala/edx/electrical/transformer/ElectricTransformerNode.scala +++ b/src/main/scala/edx/electrical/transformer/ElectricTransformerNode.scala @@ -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 /** diff --git a/src/main/scala/edx/electrical/transformer/PartElectricTransformer.scala b/src/main/scala/edx/electrical/transformer/PartElectricTransformer.scala index 2d9d7af95..1b1c1fd22 100644 --- a/src/main/scala/edx/electrical/transformer/PartElectricTransformer.scala +++ b/src/main/scala/edx/electrical/transformer/PartElectricTransformer.scala @@ -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 /** diff --git a/src/main/scala/edx/electrical/transformer/RenderTransformer.scala b/src/main/scala/edx/electrical/transformer/RenderTransformer.scala index 5cdaebfe4..2525f99f7 100644 --- a/src/main/scala/edx/electrical/transformer/RenderTransformer.scala +++ b/src/main/scala/edx/electrical/transformer/RenderTransformer.scala @@ -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) diff --git a/src/main/scala/edx/electrical/wire/flat/PartFlatWire.scala b/src/main/scala/edx/electrical/wire/flat/PartFlatWire.scala index 39160f193..a3a423b04 100644 --- a/src/main/scala/edx/electrical/wire/flat/PartFlatWire.scala +++ b/src/main/scala/edx/electrical/wire/flat/PartFlatWire.scala @@ -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._ diff --git a/src/main/scala/edx/mechanical/fluid/pipe/NodePipe.scala b/src/main/scala/edx/mechanical/fluid/pipe/NodePipe.scala index 011fe8abc..71b461942 100644 --- a/src/main/scala/edx/mechanical/fluid/pipe/NodePipe.scala +++ b/src/main/scala/edx/mechanical/fluid/pipe/NodePipe.scala @@ -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 diff --git a/src/main/scala/edx/mechanical/fluid/pipe/RenderPipe.scala b/src/main/scala/edx/mechanical/fluid/pipe/RenderPipe.scala index 4334e92cf..18a88fc79 100644 --- a/src/main/scala/edx/mechanical/fluid/pipe/RenderPipe.scala +++ b/src/main/scala/edx/mechanical/fluid/pipe/RenderPipe.scala @@ -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) diff --git a/src/main/scala/edx/mechanical/fluid/transport/NodePump.scala b/src/main/scala/edx/mechanical/fluid/transport/NodePump.scala index 67d4618d5..d62356973 100644 --- a/src/main/scala/edx/mechanical/fluid/transport/NodePump.scala +++ b/src/main/scala/edx/mechanical/fluid/transport/NodePump.scala @@ -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 diff --git a/src/main/scala/edx/mechanical/machine/TileDetector.scala b/src/main/scala/edx/mechanical/machine/TileDetector.scala index eb4b9e958..9d0ab99a8 100644 --- a/src/main/scala/edx/mechanical/machine/TileDetector.scala +++ b/src/main/scala/edx/mechanical/machine/TileDetector.scala @@ -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 diff --git a/src/main/scala/edx/mechanical/machine/edit/TileBreaker.scala b/src/main/scala/edx/mechanical/machine/edit/TileBreaker.scala index e8330f6a9..63723881d 100644 --- a/src/main/scala/edx/mechanical/machine/edit/TileBreaker.scala +++ b/src/main/scala/edx/mechanical/machine/edit/TileBreaker.scala @@ -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} diff --git a/src/main/scala/edx/mechanical/machine/edit/TilePlacer.scala b/src/main/scala/edx/mechanical/machine/edit/TilePlacer.scala index abaf6775c..3a1180cc8 100644 --- a/src/main/scala/edx/mechanical/machine/edit/TilePlacer.scala +++ b/src/main/scala/edx/mechanical/machine/edit/TilePlacer.scala @@ -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 diff --git a/src/main/scala/edx/mechanical/mech/TileMechanical.scala b/src/main/scala/edx/mechanical/mech/TileMechanical.scala index 245a2ef37..ebc73edbe 100644 --- a/src/main/scala/edx/mechanical/mech/TileMechanical.scala +++ b/src/main/scala/edx/mechanical/mech/TileMechanical.scala @@ -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 diff --git a/src/main/scala/edx/mechanical/mech/gear/NodeGear.scala b/src/main/scala/edx/mechanical/mech/gear/NodeGear.scala index 76510a82d..1391ddc9e 100644 --- a/src/main/scala/edx/mechanical/mech/gear/NodeGear.scala +++ b/src/main/scala/edx/mechanical/mech/gear/NodeGear.scala @@ -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._ diff --git a/src/main/scala/edx/mechanical/mech/gear/PartGear.scala b/src/main/scala/edx/mechanical/mech/gear/PartGear.scala index 39482e21e..7b24340ac 100644 --- a/src/main/scala/edx/mechanical/mech/gear/PartGear.scala +++ b/src/main/scala/edx/mechanical/mech/gear/PartGear.scala @@ -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 diff --git a/src/main/scala/edx/mechanical/mech/gear/RenderGear.scala b/src/main/scala/edx/mechanical/mech/gear/RenderGear.scala index 441c41b5a..580fdc4a1 100644 --- a/src/main/scala/edx/mechanical/mech/gear/RenderGear.scala +++ b/src/main/scala/edx/mechanical/mech/gear/RenderGear.scala @@ -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) diff --git a/src/main/scala/edx/mechanical/mech/gearshaft/NodeGearShaft.scala b/src/main/scala/edx/mechanical/mech/gearshaft/NodeGearShaft.scala index b12f8ab20..c0e773fd8 100644 --- a/src/main/scala/edx/mechanical/mech/gearshaft/NodeGearShaft.scala +++ b/src/main/scala/edx/mechanical/mech/gearshaft/NodeGearShaft.scala @@ -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._ diff --git a/src/main/scala/edx/mechanical/mech/gearshaft/RenderGearShaft.scala b/src/main/scala/edx/mechanical/mech/gearshaft/RenderGearShaft.scala index 9fb69ad0d..65e1513ac 100644 --- a/src/main/scala/edx/mechanical/mech/gearshaft/RenderGearShaft.scala +++ b/src/main/scala/edx/mechanical/mech/gearshaft/RenderGearShaft.scala @@ -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._ diff --git a/src/main/scala/edx/mechanical/mech/grid/GridMechanical.scala b/src/main/scala/edx/mechanical/mech/grid/GridMechanical.scala index f48679126..4f0b7fb2b 100644 --- a/src/main/scala/edx/mechanical/mech/grid/GridMechanical.scala +++ b/src/main/scala/edx/mechanical/mech/grid/GridMechanical.scala @@ -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._ diff --git a/src/main/scala/edx/mechanical/mech/grid/NodeMechanical.scala b/src/main/scala/edx/mechanical/mech/grid/NodeMechanical.scala index c555c45a2..feacd61ec 100644 --- a/src/main/scala/edx/mechanical/mech/grid/NodeMechanical.scala +++ b/src/main/scala/edx/mechanical/mech/grid/NodeMechanical.scala @@ -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._ diff --git a/src/main/scala/edx/mechanical/mech/process/crusher/TileMechanicalPiston.scala b/src/main/scala/edx/mechanical/mech/process/crusher/TileMechanicalPiston.scala index 800327659..bc022afb8 100644 --- a/src/main/scala/edx/mechanical/mech/process/crusher/TileMechanicalPiston.scala +++ b/src/main/scala/edx/mechanical/mech/process/crusher/TileMechanicalPiston.scala @@ -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 diff --git a/src/main/scala/edx/mechanical/mech/process/grinder/TileGrindingWheel.scala b/src/main/scala/edx/mechanical/mech/process/grinder/TileGrindingWheel.scala index 69728b670..cc7128b1b 100644 --- a/src/main/scala/edx/mechanical/mech/process/grinder/TileGrindingWheel.scala +++ b/src/main/scala/edx/mechanical/mech/process/grinder/TileGrindingWheel.scala @@ -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 diff --git a/src/main/scala/edx/mechanical/mech/process/mixer/MixerNode.scala b/src/main/scala/edx/mechanical/mech/process/mixer/MixerNode.scala index 8548633c1..3934c9ed4 100644 --- a/src/main/scala/edx/mechanical/mech/process/mixer/MixerNode.scala +++ b/src/main/scala/edx/mechanical/mech/process/mixer/MixerNode.scala @@ -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 diff --git a/src/main/scala/edx/mechanical/mech/process/mixer/RenderMixer.scala b/src/main/scala/edx/mechanical/mech/process/mixer/RenderMixer.scala index e526fbfb2..4a43a8619 100644 --- a/src/main/scala/edx/mechanical/mech/process/mixer/RenderMixer.scala +++ b/src/main/scala/edx/mechanical/mech/process/mixer/RenderMixer.scala @@ -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 /** diff --git a/src/main/scala/edx/mechanical/mech/process/mixer/TileMixer.scala b/src/main/scala/edx/mechanical/mech/process/mixer/TileMixer.scala index 22b165586..45d3eb1c6 100644 --- a/src/main/scala/edx/mechanical/mech/process/mixer/TileMixer.scala +++ b/src/main/scala/edx/mechanical/mech/process/mixer/TileMixer.scala @@ -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 diff --git a/src/main/scala/edx/mechanical/mech/turbine/RenderWaterTurbine.scala b/src/main/scala/edx/mechanical/mech/turbine/RenderWaterTurbine.scala index 74aaaa51d..541215661 100644 --- a/src/main/scala/edx/mechanical/mech/turbine/RenderWaterTurbine.scala +++ b/src/main/scala/edx/mechanical/mech/turbine/RenderWaterTurbine.scala @@ -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 diff --git a/src/main/scala/edx/mechanical/mech/turbine/TileWaterTurbine.scala b/src/main/scala/edx/mechanical/mech/turbine/TileWaterTurbine.scala index 05e95aa60..ddb23245d 100644 --- a/src/main/scala/edx/mechanical/mech/turbine/TileWaterTurbine.scala +++ b/src/main/scala/edx/mechanical/mech/turbine/TileWaterTurbine.scala @@ -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._ diff --git a/src/main/scala/edx/quantum/blocks/TileElectromagnet.scala b/src/main/scala/edx/quantum/blocks/TileElectromagnet.scala index 64ebc00d0..5e14135df 100644 --- a/src/main/scala/edx/quantum/blocks/TileElectromagnet.scala +++ b/src/main/scala/edx/quantum/blocks/TileElectromagnet.scala @@ -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._ /** diff --git a/src/main/scala/edx/quantum/gate/RenderQuantumGlyph.scala b/src/main/scala/edx/quantum/gate/RenderQuantumGlyph.scala index 9f52ba6e3..0bf2bb6a5 100644 --- a/src/main/scala/edx/quantum/gate/RenderQuantumGlyph.scala +++ b/src/main/scala/edx/quantum/gate/RenderQuantumGlyph.scala @@ -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 diff --git a/src/main/scala/edx/quantum/items/ItemBreederFuel.scala b/src/main/scala/edx/quantum/items/ItemBreederFuel.scala index 85bf44a30..f5045f713 100644 --- a/src/main/scala/edx/quantum/items/ItemBreederFuel.scala +++ b/src/main/scala/edx/quantum/items/ItemBreederFuel.scala @@ -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 diff --git a/src/main/scala/edx/quantum/items/ItemFuelRod.scala b/src/main/scala/edx/quantum/items/ItemFuelRod.scala index 1a5f4f5a7..a6f7e509a 100644 --- a/src/main/scala/edx/quantum/items/ItemFuelRod.scala +++ b/src/main/scala/edx/quantum/items/ItemFuelRod.scala @@ -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._ diff --git a/src/main/scala/edx/quantum/machine/accelerator/TileAccelerator.scala b/src/main/scala/edx/quantum/machine/accelerator/TileAccelerator.scala index d343a9c46..02f81e680 100644 --- a/src/main/scala/edx/quantum/machine/accelerator/TileAccelerator.scala +++ b/src/main/scala/edx/quantum/machine/accelerator/TileAccelerator.scala @@ -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 diff --git a/src/main/scala/edx/quantum/machine/boiler/TileNuclearBoiler.scala b/src/main/scala/edx/quantum/machine/boiler/TileNuclearBoiler.scala index baab6e850..13b615988 100644 --- a/src/main/scala/edx/quantum/machine/boiler/TileNuclearBoiler.scala +++ b/src/main/scala/edx/quantum/machine/boiler/TileNuclearBoiler.scala @@ -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 diff --git a/src/main/scala/edx/quantum/machine/centrifuge/TileCentrifuge.scala b/src/main/scala/edx/quantum/machine/centrifuge/TileCentrifuge.scala index 1d1115061..3f2e44290 100644 --- a/src/main/scala/edx/quantum/machine/centrifuge/TileCentrifuge.scala +++ b/src/main/scala/edx/quantum/machine/centrifuge/TileCentrifuge.scala @@ -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 diff --git a/src/main/scala/edx/quantum/machine/extractor/TileProcess.scala b/src/main/scala/edx/quantum/machine/extractor/TileProcess.scala index 9234c2a28..e1efb4e5e 100644 --- a/src/main/scala/edx/quantum/machine/extractor/TileProcess.scala +++ b/src/main/scala/edx/quantum/machine/extractor/TileProcess.scala @@ -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 diff --git a/src/main/scala/edx/quantum/machine/plasma/TilePlasmaHeater.scala b/src/main/scala/edx/quantum/machine/plasma/TilePlasmaHeater.scala index a1d297e1f..74173bc77 100644 --- a/src/main/scala/edx/quantum/machine/plasma/TilePlasmaHeater.scala +++ b/src/main/scala/edx/quantum/machine/plasma/TilePlasmaHeater.scala @@ -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 diff --git a/src/main/scala/edx/quantum/machine/quantum/TileQuantumAssembler.scala b/src/main/scala/edx/quantum/machine/quantum/TileQuantumAssembler.scala index db4e71241..9af6c29ea 100644 --- a/src/main/scala/edx/quantum/machine/quantum/TileQuantumAssembler.scala +++ b/src/main/scala/edx/quantum/machine/quantum/TileQuantumAssembler.scala @@ -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 diff --git a/src/main/scala/edx/quantum/reactor/TileReactorCell.scala b/src/main/scala/edx/quantum/reactor/TileReactorCell.scala index 0e1601fc4..2a3c7ec2f 100644 --- a/src/main/scala/edx/quantum/reactor/TileReactorCell.scala +++ b/src/main/scala/edx/quantum/reactor/TileReactorCell.scala @@ -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} diff --git a/src/main/scala/edx/quantum/schematic/SchematicAccelerator.scala b/src/main/scala/edx/quantum/schematic/SchematicAccelerator.scala index 17916f09f..3b29ecc3b 100644 --- a/src/main/scala/edx/quantum/schematic/SchematicAccelerator.scala +++ b/src/main/scala/edx/quantum/schematic/SchematicAccelerator.scala @@ -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 { diff --git a/src/main/scala/edx/quantum/schematic/SchematicBreedingReactor.scala b/src/main/scala/edx/quantum/schematic/SchematicBreedingReactor.scala index 3bb21679b..6ad36e1a6 100644 --- a/src/main/scala/edx/quantum/schematic/SchematicBreedingReactor.scala +++ b/src/main/scala/edx/quantum/schematic/SchematicBreedingReactor.scala @@ -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 { diff --git a/src/main/scala/edx/quantum/schematic/SchematicFissionReactor.scala b/src/main/scala/edx/quantum/schematic/SchematicFissionReactor.scala index ccd56d62e..1af814866 100644 --- a/src/main/scala/edx/quantum/schematic/SchematicFissionReactor.scala +++ b/src/main/scala/edx/quantum/schematic/SchematicFissionReactor.scala @@ -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 { diff --git a/src/main/scala/edx/quantum/schematic/SchematicFusionReactor.scala b/src/main/scala/edx/quantum/schematic/SchematicFusionReactor.scala index a49bab920..cdd31606f 100644 --- a/src/main/scala/edx/quantum/schematic/SchematicFusionReactor.scala +++ b/src/main/scala/edx/quantum/schematic/SchematicFusionReactor.scala @@ -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 {