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

Mass refactor

Browse source
This commit is contained in:
Calclavia 2015-01-26 19:40:32 +08:00
parent 12612d680e
commit 44f9a6caa2
169 changed files with 634 additions and 632 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/scala/edx/basic/BasicContent.scala
View file

@ -15,8 +15,8 @@ import edx.mechanical.mech.gear.ItemHandCrank
import net.minecraft.block.Block import net.minecraft.block.Block
import net.minecraft.init.{Blocks, Items} import net.minecraft.init.{Blocks, Items}
import net.minecraft.item.{Item, ItemStack} import net.minecraft.item.{Item, ItemStack}
import resonant.lib.mod.content.ContentHolder import resonantengine.lib.utility.recipe.UniversalRecipe
import resonant.lib.utility.recipe.UniversalRecipe import resonantengine.prefab.modcontent.ContentHolder
; ;
object BasicContent extends ContentHolder object BasicContent extends ContentHolder

6
src/main/scala/edx/basic/blocks/ItemImprint.scala
View file

@ -8,9 +8,9 @@ import net.minecraft.entity.player.EntityPlayer
import net.minecraft.entity.{Entity, EntityList, EntityLivingBase, IProjectile} import net.minecraft.entity.{Entity, EntityList, EntityLivingBase, IProjectile}
import net.minecraft.item.{Item, ItemStack} import net.minecraft.item.{Item, ItemStack}
import net.minecraft.nbt.{NBTTagCompound, NBTTagList} import net.minecraft.nbt.{NBTTagCompound, NBTTagList}
import resonant.lib.utility.LanguageUtility import resonantengine.lib.utility.LanguageUtility
import resonant.lib.utility.nbt.NBTUtility import resonantengine.lib.utility.nbt.NBTUtility
import resonant.lib.wrapper.CollectionWrapper._ import resonantengine.lib.wrapper.CollectionWrapper._
import scala.collection.JavaConversions._ import scala.collection.JavaConversions._

6
src/main/scala/edx/basic/blocks/TileFilterable.scala
View file

@ -6,9 +6,9 @@ import net.minecraft.entity.player.EntityPlayer
import net.minecraft.item.ItemStack import net.minecraft.item.ItemStack
import net.minecraft.nbt.NBTTagCompound import net.minecraft.nbt.NBTTagCompound
import net.minecraftforge.common.util.ForgeDirection import net.minecraftforge.common.util.ForgeDirection
import resonant.api.tile.{IFilterable, IRotatable} import resonantengine.api.tile.{IFilterable, IRotatable}
import resonant.lib.prefab.tile.mixed.TileInventory import resonantengine.lib.prefab.tile.mixed.TileInventory
import resonant.lib.transform.vector.Vector3 import resonantengine.lib.transform.vector.Vector3
object TileFilterable object TileFilterable
{ {

14
src/main/scala/edx/basic/blocks/TileImprinter.scala
View file

@ -19,13 +19,13 @@ import net.minecraft.network.Packet
import net.minecraft.util.IIcon import net.minecraft.util.IIcon
import net.minecraftforge.common.util.ForgeDirection import net.minecraftforge.common.util.ForgeDirection
import org.lwjgl.opengl.GL11 import org.lwjgl.opengl.GL11
import resonant.core.ResonantEngine import resonantengine.core.ResonantEngine
import resonant.lib.network.discriminator.{PacketTile, PacketType} import resonantengine.lib.network.discriminator.{PacketTile, PacketType}
import resonant.lib.network.handle.IPacketReceiver import resonantengine.lib.network.handle.IPacketReceiver
import resonant.lib.prefab.tile.spatial.{ResonantBlock, ResonantTile} import resonantengine.lib.prefab.tile.spatial.{ResonantBlock, ResonantTile}
import resonant.lib.render.RenderItemOverlayUtility import resonantengine.lib.render.RenderItemOverlayUtility
import resonant.lib.transform.vector.{Vector2, Vector3} import resonantengine.lib.transform.vector.{Vector2, Vector3}
import resonant.lib.utility.inventory.InventoryUtility import resonantengine.lib.utility.inventory.InventoryUtility
import scala.collection.JavaConversions._ import scala.collection.JavaConversions._

8
src/main/scala/edx/basic/blocks/TileTurntable.scala
View file

@ -9,10 +9,10 @@ import net.minecraft.client.renderer.texture.IIconRegister
import net.minecraft.util.IIcon import net.minecraft.util.IIcon
import net.minecraft.world.{IBlockAccess, World} import net.minecraft.world.{IBlockAccess, World}
import net.minecraftforge.common.util.ForgeDirection import net.minecraftforge.common.util.ForgeDirection
import resonant.api.tile.IRotatable import resonantengine.api.tile.IRotatable
import resonant.lib.prefab.tile.spatial.ResonantBlock import resonantengine.lib.prefab.tile.spatial.ResonantBlock
import resonant.lib.prefab.tile.traits.TRotatable import resonantengine.lib.prefab.tile.traits.TRotatable
import resonant.lib.transform.vector.Vector3 import resonantengine.lib.transform.vector.Vector3
object TileTurntable object TileTurntable
{ {

32
src/main/scala/edx/basic/engineering/TileEngineeringTable.scala
View file

@ -24,22 +24,22 @@ import net.minecraftforge.common.util.ForgeDirection
import net.minecraftforge.oredict.OreDictionary import net.minecraftforge.oredict.OreDictionary
import org.apache.commons.lang3.ArrayUtils import org.apache.commons.lang3.ArrayUtils
import org.lwjgl.opengl.GL11 import org.lwjgl.opengl.GL11
import resonant.api.gui.ISlotPickResult import resonantengine.api.gui.ISlotPickResult
import resonant.api.recipe.{MachineRecipes, RecipeResource, RecipeType} import resonantengine.api.recipe.{MachineRecipes, RecipeResource, RecipeType}
import resonant.api.tile.IRotatable import resonantengine.api.tile.IRotatable
import resonant.core.ResonantEngine import resonantengine.core.ResonantEngine
import resonant.lib.collection.Pair import resonantengine.lib.collection.Pair
import resonant.lib.network.discriminator.{PacketTile, PacketType} import resonantengine.lib.network.discriminator.{PacketTile, PacketType}
import resonant.lib.network.handle.IPacketReceiver import resonantengine.lib.network.handle.IPacketReceiver
import resonant.lib.prefab.gui.ContainerDummy import resonantengine.lib.prefab.gui.ContainerDummy
import resonant.lib.prefab.tile.item.ItemBlockSaved import resonantengine.lib.prefab.tile.item.ItemBlockSaved
import resonant.lib.prefab.tile.mixed.TileInventory import resonantengine.lib.prefab.tile.mixed.TileInventory
import resonant.lib.render.RenderItemOverlayUtility import resonantengine.lib.render.RenderItemOverlayUtility
import resonant.lib.transform.region.Cuboid import resonantengine.lib.transform.region.Cuboid
import resonant.lib.transform.vector.{Vector2, Vector3} import resonantengine.lib.transform.vector.{Vector2, Vector3}
import resonant.lib.utility.LanguageUtility import resonantengine.lib.utility.LanguageUtility
import resonant.lib.utility.inventory.AutoCraftingManager.IAutoCrafter import resonantengine.lib.utility.inventory.AutoCraftingManager.IAutoCrafter
import resonant.lib.utility.inventory.{AutoCraftingManager, InventoryUtility} import resonantengine.lib.utility.inventory.{AutoCraftingManager, InventoryUtility}
import scala.collection.JavaConversions._ import scala.collection.JavaConversions._

8
src/main/scala/edx/basic/fluid/grate/TileGrate.scala
View file

@ -14,10 +14,10 @@ import net.minecraft.util.{ChatComponentText, IIcon}
import net.minecraft.world.IBlockAccess import net.minecraft.world.IBlockAccess
import net.minecraftforge.common.util.ForgeDirection import net.minecraftforge.common.util.ForgeDirection
import net.minecraftforge.fluids.{Fluid, FluidContainerRegistry, FluidRegistry, FluidStack} import net.minecraftforge.fluids.{Fluid, FluidContainerRegistry, FluidRegistry, FluidStack}
import resonant.lib.mod.config.Config import resonantengine.lib.mod.config.Config
import resonant.lib.prefab.tile.traits.TRotatable import resonantengine.lib.prefab.tile.traits.TRotatable
import resonant.lib.transform.vector.Vector3 import resonantengine.lib.transform.vector.Vector3
import resonant.lib.utility.FluidUtility import resonantengine.lib.utility.FluidUtility
object TileGrate object TileGrate
{ {

16
src/main/scala/edx/basic/fluid/gutter/TileGutter.scala
View file

@ -18,14 +18,14 @@ import net.minecraftforge.client.model.AdvancedModelLoader
import net.minecraftforge.common.util.ForgeDirection import net.minecraftforge.common.util.ForgeDirection
import net.minecraftforge.fluids._ import net.minecraftforge.fluids._
import org.lwjgl.opengl.GL11 import org.lwjgl.opengl.GL11
import resonant.api.recipe.{MachineRecipes, RecipeType} import resonantengine.api.recipe.{MachineRecipes, RecipeType}
import resonant.lib.prefab.fluid.NodeFluid import resonantengine.lib.prefab.fluid.NodeFluid
import resonant.lib.render.{FluidRenderUtility, RenderUtility} import resonantengine.lib.render.{FluidRenderUtility, RenderUtility}
import resonant.lib.transform.region.Cuboid import resonantengine.lib.transform.region.Cuboid
import resonant.lib.transform.vector.Vector3 import resonantengine.lib.transform.vector.Vector3
import resonant.lib.utility.FluidUtility import resonantengine.lib.utility.FluidUtility
import resonant.lib.utility.inventory.InventoryUtility import resonantengine.lib.utility.inventory.InventoryUtility
import resonant.lib.wrapper.BitmaskWrapper._ import resonantengine.lib.wrapper.BitmaskWrapper._
import scala.collection.convert.wrapAll._ import scala.collection.convert.wrapAll._

8
src/main/scala/edx/basic/fluid/tank/ItemBlockTank.scala
View file

@ -9,10 +9,10 @@ import net.minecraft.nbt.NBTTagCompound
import net.minecraft.tileentity.TileEntity import net.minecraft.tileentity.TileEntity
import net.minecraft.world.World import net.minecraft.world.World
import net.minecraftforge.fluids.{FluidContainerRegistry, FluidStack, IFluidContainerItem} import net.minecraftforge.fluids.{FluidContainerRegistry, FluidStack, IFluidContainerItem}
import resonant.lib.utility.LanguageUtility import resonantengine.lib.utility.LanguageUtility
import resonant.lib.utility.science.UnitDisplay import resonantengine.lib.utility.science.UnitDisplay
import resonant.lib.utility.science.UnitDisplay.Unit import resonantengine.lib.utility.science.UnitDisplay.Unit
import resonant.lib.wrapper.CollectionWrapper._ import resonantengine.lib.wrapper.CollectionWrapper._
/** /**
* @author Darkguardsman * @author Darkguardsman

16
src/main/scala/edx/basic/fluid/tank/TileTank.scala
View file

@ -17,14 +17,14 @@ import net.minecraft.world.IBlockAccess
import net.minecraftforge.common.util.ForgeDirection import net.minecraftforge.common.util.ForgeDirection
import net.minecraftforge.fluids._ import net.minecraftforge.fluids._
import org.lwjgl.opengl.GL11 import org.lwjgl.opengl.GL11
import resonant.api.tile.IRemovable.ISneakPickup import resonantengine.api.tile.IRemovable.ISneakPickup
import resonant.api.tile.node.INode import resonantengine.api.tile.node.INode
import resonant.lib.grid.core.Node import resonantengine.lib.grid.core.Node
import resonant.lib.render.block.RenderConnectedTexture import resonantengine.lib.render.block.RenderConnectedTexture
import resonant.lib.render.{FluidRenderUtility, RenderBlockUtility, RenderUtility} import resonantengine.lib.render.{FluidRenderUtility, RenderBlockUtility, RenderUtility}
import resonant.lib.transform.vector.Vector3 import resonantengine.lib.transform.vector.Vector3
import resonant.lib.utility.FluidUtility import resonantengine.lib.utility.FluidUtility
import resonant.lib.wrapper.BitmaskWrapper._ import resonantengine.lib.wrapper.BitmaskWrapper._
/** /**
* Tile/Block class for basic Dynamic tanks * Tile/Block class for basic Dynamic tanks

18
src/main/scala/edx/basic/process/grinding/TileWorkbench.scala
View file

@ -11,15 +11,15 @@ import net.minecraft.util.ResourceLocation
import net.minecraftforge.client.model.AdvancedModelLoader import net.minecraftforge.client.model.AdvancedModelLoader
import net.minecraftforge.oredict.OreDictionary import net.minecraftforge.oredict.OreDictionary
import org.lwjgl.opengl.GL11 import org.lwjgl.opengl.GL11
import resonant.api.recipe.{MachineRecipes, RecipeType} import resonantengine.api.recipe.{MachineRecipes, RecipeType}
import resonant.lib.content.prefab.TInventory import resonantengine.lib.content.prefab.TInventory
import resonant.lib.network.discriminator.PacketType import resonantengine.lib.network.discriminator.PacketType
import resonant.lib.network.handle.{TPacketReceiver, TPacketSender} import resonantengine.lib.network.handle.{TPacketReceiver, TPacketSender}
import resonant.lib.prefab.tile.spatial.ResonantTile import resonantengine.lib.prefab.tile.spatial.ResonantTile
import resonant.lib.render.{RenderItemOverlayUtility, RenderUtility} import resonantengine.lib.render.{RenderItemOverlayUtility, RenderUtility}
import resonant.lib.transform.vector.Vector3 import resonantengine.lib.transform.vector.Vector3
import resonant.lib.utility.inventory.InventoryUtility import resonantengine.lib.utility.inventory.InventoryUtility
import resonant.lib.wrapper.ByteBufWrapper._ import resonantengine.lib.wrapper.ByteBufWrapper._
/** /**
* The workbench is meant for manual ore and wood processing. * The workbench is meant for manual ore and wood processing.

6
src/main/scala/edx/basic/process/mixing/ItemGlassJar.scala
View file

@ -6,9 +6,9 @@ import net.minecraft.entity.Entity
import net.minecraft.entity.player.EntityPlayer import net.minecraft.entity.player.EntityPlayer
import net.minecraft.item.ItemStack import net.minecraft.item.ItemStack
import net.minecraft.world.World import net.minecraft.world.World
import resonant.lib.prefab.tile.item.ItemBlockSaved import resonantengine.lib.prefab.tile.item.ItemBlockSaved
import resonant.lib.transform.vector.{IVector3, Vector3} import resonantengine.lib.transform.vector.{IVector3, Vector3}
import resonant.lib.utility.nbt.NBTUtility import resonantengine.lib.utility.nbt.NBTUtility
/** /**
* The ItemBlock for the glass jar * The ItemBlock for the glass jar

28
src/main/scala/edx/basic/process/mixing/TileGlassJar.scala
View file

@ -18,20 +18,20 @@ import net.minecraft.util.ResourceLocation
import net.minecraftforge.client.IItemRenderer.ItemRenderType import net.minecraftforge.client.IItemRenderer.ItemRenderType
import net.minecraftforge.client.model.AdvancedModelLoader import net.minecraftforge.client.model.AdvancedModelLoader
import org.lwjgl.opengl.GL11 import org.lwjgl.opengl.GL11
import resonant.api.items.ISimpleItemRenderer import resonantengine.api.items.ISimpleItemRenderer
import resonant.lib.factory.resources.ResourceFactory import resonantengine.lib.factory.resources.ResourceFactory
import resonant.lib.factory.resources.item.TItemResource import resonantengine.lib.factory.resources.item.TItemResource
import resonant.lib.network.discriminator.PacketType import resonantengine.lib.network.discriminator.PacketType
import resonant.lib.network.handle.{TPacketReceiver, TPacketSender} import resonantengine.lib.network.handle.{TPacketReceiver, TPacketSender}
import resonant.lib.prefab.tile.item.ItemBlockSaved import resonantengine.lib.prefab.tile.item.ItemBlockSaved
import resonant.lib.prefab.tile.spatial.ResonantTile import resonantengine.lib.prefab.tile.spatial.ResonantTile
import resonant.lib.render.RenderUtility import resonantengine.lib.render.RenderUtility
import resonant.lib.render.model.ModelCube import resonantengine.lib.render.model.ModelCube
import resonant.lib.transform.region.Cuboid import resonantengine.lib.transform.region.Cuboid
import resonant.lib.transform.vector.{Vector3, VectorWorld} import resonantengine.lib.transform.vector.{Vector3, VectorWorld}
import resonant.lib.utility.inventory.InventoryUtility import resonantengine.lib.utility.inventory.InventoryUtility
import resonant.lib.utility.nbt.NBTUtility import resonantengine.lib.utility.nbt.NBTUtility
import resonant.lib.wrapper.ByteBufWrapper._ import resonantengine.lib.wrapper.ByteBufWrapper._
/** /**
* A glass jar for mixing different dusts/refined together. * A glass jar for mixing different dusts/refined together.

16
src/main/scala/edx/basic/process/sifting/ItemSieve.scala
View file

@ -6,14 +6,14 @@ import net.minecraft.block.Block
import net.minecraft.entity.player.EntityPlayer import net.minecraft.entity.player.EntityPlayer
import net.minecraft.item.{EnumAction, ItemStack} import net.minecraft.item.{EnumAction, ItemStack}
import net.minecraft.world.World import net.minecraft.world.World
import resonant.api.recipe.{MachineRecipes, RecipeType} import resonantengine.api.recipe.{MachineRecipes, RecipeType}
import resonant.lib.prefab.tile.item.ItemBlockSaved import resonantengine.lib.prefab.tile.item.ItemBlockSaved
import resonant.lib.render.EnumColor import resonantengine.lib.render.EnumColor
import resonant.lib.transform.vector.Vector3 import resonantengine.lib.transform.vector.Vector3
import resonant.lib.utility.inventory.{ExternalInventory, InventoryUtility} import resonantengine.lib.utility.inventory.{ExternalInventory, InventoryUtility}
import resonant.lib.utility.nbt.NBTUtility import resonantengine.lib.utility.nbt.NBTUtility
import resonant.lib.wrapper.CollectionWrapper._ import resonantengine.lib.wrapper.CollectionWrapper._
import resonant.lib.wrapper.StringWrapper._ import resonantengine.lib.wrapper.StringWrapper._
/** /**
* The ItemBlock for the glass jar * The ItemBlock for the glass jar

22
src/main/scala/edx/basic/process/sifting/TileSieve.scala
View file

@ -14,17 +14,17 @@ import net.minecraft.util.ResourceLocation
import net.minecraftforge.client.IItemRenderer.ItemRenderType import net.minecraftforge.client.IItemRenderer.ItemRenderType
import net.minecraftforge.client.model.AdvancedModelLoader import net.minecraftforge.client.model.AdvancedModelLoader
import org.lwjgl.opengl.GL11 import org.lwjgl.opengl.GL11
import resonant.api.items.ISimpleItemRenderer import resonantengine.api.items.ISimpleItemRenderer
import resonant.lib.content.prefab.TInventory import resonantengine.lib.content.prefab.TInventory
import resonant.lib.network.discriminator.PacketType import resonantengine.lib.network.discriminator.PacketType
import resonant.lib.network.handle.{TPacketReceiver, TPacketSender} import resonantengine.lib.network.handle.{TPacketReceiver, TPacketSender}
import resonant.lib.prefab.tile.item.ItemBlockSaved import resonantengine.lib.prefab.tile.item.ItemBlockSaved
import resonant.lib.prefab.tile.spatial.ResonantTile import resonantengine.lib.prefab.tile.spatial.ResonantTile
import resonant.lib.render.{RenderItemOverlayUtility, RenderUtility} import resonantengine.lib.render.{RenderItemOverlayUtility, RenderUtility}
import resonant.lib.transform.region.Cuboid import resonantengine.lib.transform.region.Cuboid
import resonant.lib.transform.vector.Vector3 import resonantengine.lib.transform.vector.Vector3
import resonant.lib.utility.inventory.InventoryUtility import resonantengine.lib.utility.inventory.InventoryUtility
import resonant.lib.wrapper.ByteBufWrapper._ import resonantengine.lib.wrapper.ByteBufWrapper._
object TileSieve object TileSieve
{ {

2
src/main/scala/edx/basic/process/smelting/RenderCastingMold.scala
View file

@ -7,7 +7,7 @@ import net.minecraft.tileentity.TileEntity
import net.minecraft.util.ResourceLocation import net.minecraft.util.ResourceLocation
import net.minecraftforge.client.model.{AdvancedModelLoader, IModelCustom} import net.minecraftforge.client.model.{AdvancedModelLoader, IModelCustom}
import org.lwjgl.opengl.GL11 import org.lwjgl.opengl.GL11
import resonant.lib.render.{RenderItemOverlayUtility, RenderUtility} import resonantengine.lib.render.{RenderItemOverlayUtility, RenderUtility}
@SideOnly(Side.CLIENT) object RenderCastingMold @SideOnly(Side.CLIENT) object RenderCastingMold
{ {

14
src/main/scala/edx/basic/process/smelting/TileCastingMold.scala
View file

@ -8,13 +8,13 @@ import net.minecraft.item.ItemStack
import net.minecraft.nbt.NBTTagCompound import net.minecraft.nbt.NBTTagCompound
import net.minecraftforge.common.util.ForgeDirection import net.minecraftforge.common.util.ForgeDirection
import net.minecraftforge.fluids._ import net.minecraftforge.fluids._
import resonant.api.recipe.{MachineRecipes, RecipeResource, RecipeType} import resonantengine.api.recipe.{MachineRecipes, RecipeResource, RecipeType}
import resonant.lib.network.discriminator.{PacketTile, PacketType} import resonantengine.lib.network.discriminator.{PacketTile, PacketType}
import resonant.lib.network.handle.IPacketReceiver import resonantengine.lib.network.handle.IPacketReceiver
import resonant.lib.prefab.tile.mixed.TileInventory import resonantengine.lib.prefab.tile.mixed.TileInventory
import resonant.lib.transform.vector.Vector3 import resonantengine.lib.transform.vector.Vector3
import resonant.lib.utility.FluidUtility import resonantengine.lib.utility.FluidUtility
import resonant.lib.utility.inventory.InventoryUtility import resonantengine.lib.utility.inventory.InventoryUtility
/** /**
* Turns molten fuilds into ingots. * Turns molten fuilds into ingots.

2
src/main/scala/edx/basic/process/smelting/firebox/RenderHotPlate.scala
View file

@ -5,7 +5,7 @@ import net.minecraft.client.renderer.RenderBlocks
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer
import net.minecraft.tileentity.TileEntity import net.minecraft.tileentity.TileEntity
import net.minecraftforge.common.util.ForgeDirection import net.minecraftforge.common.util.ForgeDirection
import resonant.lib.render.RenderItemOverlayUtility import resonantengine.lib.render.RenderItemOverlayUtility
@SideOnly(Side.CLIENT) class RenderHotPlate extends TileEntitySpecialRenderer @SideOnly(Side.CLIENT) class RenderHotPlate extends TileEntitySpecialRenderer
{ {

24
src/main/scala/edx/basic/process/smelting/firebox/TileFirebox.scala
View file

@ -18,18 +18,18 @@ import net.minecraft.util.IIcon
import net.minecraftforge.common.MinecraftForge import net.minecraftforge.common.MinecraftForge
import net.minecraftforge.common.util.ForgeDirection import net.minecraftforge.common.util.ForgeDirection
import net.minecraftforge.fluids._ import net.minecraftforge.fluids._
import resonant.lib.content.prefab.{TIO, TInventory} import resonantengine.lib.content.prefab.{TIO, TInventory}
import resonant.lib.grid.core.TBlockNodeProvider import resonantengine.lib.grid.core.TBlockNodeProvider
import resonant.lib.grid.energy.EnergyStorage import resonantengine.lib.grid.energy.EnergyStorage
import resonant.lib.grid.energy.electric.NodeElectricComponent import resonantengine.lib.grid.energy.electric.NodeElectricComponent
import resonant.lib.grid.thermal.{BoilEvent, ThermalPhysics} import resonantengine.lib.grid.thermal.{BoilEvent, ThermalPhysics}
import resonant.lib.network.discriminator.PacketType import resonantengine.lib.network.discriminator.PacketType
import resonant.lib.network.handle.{TPacketReceiver, TPacketSender} import resonantengine.lib.network.handle.{TPacketReceiver, TPacketSender}
import resonant.lib.prefab.tile.spatial.{ResonantBlock, ResonantTile} import resonantengine.lib.prefab.tile.spatial.{ResonantBlock, ResonantTile}
import resonant.lib.transform.vector.Vector3 import resonantengine.lib.transform.vector.Vector3
import resonant.lib.utility.FluidUtility import resonantengine.lib.utility.FluidUtility
import resonant.lib.wrapper.ByteBufWrapper._ import resonantengine.lib.wrapper.ByteBufWrapper._
import resonant.lib.wrapper.CollectionWrapper._ import resonantengine.lib.wrapper.CollectionWrapper._
/** /**
* Meant to replace the furnace class. * Meant to replace the furnace class.

16
src/main/scala/edx/basic/process/smelting/firebox/TileHotPlate.scala
View file

@ -11,14 +11,14 @@ import net.minecraft.item.crafting.FurnaceRecipes
import net.minecraft.nbt.NBTTagCompound import net.minecraft.nbt.NBTTagCompound
import net.minecraft.util.IIcon import net.minecraft.util.IIcon
import net.minecraft.world.IBlockAccess import net.minecraft.world.IBlockAccess
import resonant.lib.content.prefab.TInventory import resonantengine.lib.content.prefab.TInventory
import resonant.lib.network.discriminator.PacketType import resonantengine.lib.network.discriminator.PacketType
import resonant.lib.network.handle.{TPacketReceiver, TPacketSender} import resonantengine.lib.network.handle.{TPacketReceiver, TPacketSender}
import resonant.lib.prefab.tile.spatial.{ResonantBlock, ResonantTile} import resonantengine.lib.prefab.tile.spatial.{ResonantBlock, ResonantTile}
import resonant.lib.transform.region.Cuboid import resonantengine.lib.transform.region.Cuboid
import resonant.lib.transform.vector.{Vector2, Vector3} import resonantengine.lib.transform.vector.{Vector2, Vector3}
import resonant.lib.wrapper.ByteBufWrapper._ import resonantengine.lib.wrapper.ByteBufWrapper._
import resonant.lib.wrapper.RandomWrapper._ import resonantengine.lib.wrapper.RandomWrapper._
/** /**
* For smelting items. * For smelting items.

4
src/main/scala/edx/basic/waila/Waila.scala
View file

@ -1,8 +1,8 @@
package edx.basic.waila package edx.basic.waila
import cpw.mods.fml.common.event.FMLInterModComms import cpw.mods.fml.common.event.FMLInterModComms
import resonant.lib.mod.compat.Mods import resonantengine.lib.mod.compat.Mods
import resonant.lib.mod.loadable.ICompatProxy import resonantengine.lib.mod.loadable.ICompatProxy
/** /**
* @author tgame14 * @author tgame14

2
src/main/scala/edx/basic/waila/WailaFluidTank.scala
View file

@ -7,7 +7,7 @@ import mcp.mobius.waila.api.{IWailaConfigHandler, IWailaDataAccessor, IWailaData
import net.minecraft.item.ItemStack import net.minecraft.item.ItemStack
import net.minecraft.tileentity.TileEntity import net.minecraft.tileentity.TileEntity
import net.minecraftforge.fluids.IFluidTank import net.minecraftforge.fluids.IFluidTank
import resonant.lib.utility.LanguageUtility import resonantengine.lib.utility.LanguageUtility
/** /**
* Waila support for tanks * Waila support for tanks

6
src/main/scala/edx/core/ClientProxy.scala
View file

@ -33,9 +33,9 @@ import net.minecraft.client.particle.{EntityDiggingFX, EntityFX}
import net.minecraft.entity.player.EntityPlayer import net.minecraft.entity.player.EntityPlayer
import net.minecraft.item.Item import net.minecraft.item.Item
import net.minecraft.world.World import net.minecraft.world.World
import resonant.lib.render.fx.FXElectricBolt2 import resonantengine.lib.render.fx.FXElectricBolt2
import resonant.lib.render.wrapper.ItemRenderHandler import resonantengine.lib.render.wrapper.ItemRenderHandler
import resonant.lib.transform.vector.Vector3 import resonantengine.lib.transform.vector.Vector3
/** @author Calclavia */ /** @author Calclavia */
@SideOnly(Side.CLIENT) class ClientProxy extends CommonProxy @SideOnly(Side.CLIENT) class ClientProxy extends CommonProxy

4
src/main/scala/edx/core/CommonProxy.scala
View file

@ -14,8 +14,8 @@ import net.minecraft.block.Block
import net.minecraft.entity.player.EntityPlayer import net.minecraft.entity.player.EntityPlayer
import net.minecraft.tileentity.TileEntity import net.minecraft.tileentity.TileEntity
import net.minecraft.world.World import net.minecraft.world.World
import resonant.lib.mod.AbstractProxy import resonantengine.lib.mod.AbstractProxy
import resonant.lib.transform.vector.Vector3 import resonantengine.lib.transform.vector.Vector3
/** /**
* @author Calclavia * @author Calclavia

6
src/main/scala/edx/core/Electrodynamics.scala
View file

@ -13,9 +13,9 @@ import edx.quantum.QuantumContent
import net.minecraftforge.common.MinecraftForge import net.minecraftforge.common.MinecraftForge
import net.minecraftforge.common.config.Configuration import net.minecraftforge.common.config.Configuration
import org.modstats.{ModstatInfo, Modstats} import org.modstats.{ModstatInfo, Modstats}
import resonant.core.ResonantEngine import resonantengine.core.ResonantEngine
import resonant.lib.mod.config.ConfigHandler import resonantengine.lib.mod.config.ConfigHandler
import resonant.lib.mod.loadable.LoadableHandler import resonantengine.lib.mod.loadable.LoadableHandler
/** The core module of Resonant Induction /** The core module of Resonant Induction
* *

2
src/main/scala/edx/core/ResonantPartFactory.scala
View file

@ -25,7 +25,7 @@ object ResonantPartFactory extends IPartFactory
MultiPartRegistry.registerParts(this, partMap.keys.toArray) MultiPartRegistry.registerParts(this, partMap.keys.toArray)
MultipartGenerator.registerTrait("resonant.api.tile.INodeProvider", "edx.core.prefab.pass.TNodeProvider") MultipartGenerator.registerTrait("resonant.api.tile.INodeProvider", "edx.core.prefab.pass.TNodeProvider")
MultipartGenerator.registerTrait("resonant.lib.debug.IDebugInfo", "edx.core.prefab.pass.TDebugInfo") MultipartGenerator.registerTrait("resonant.core.debug.IDebugInfo", "edx.core.prefab.pass.TDebugInfo")
MultipartGenerator.registerPassThroughInterface("net.minecraftforge.fluids.IFluidHandler") MultipartGenerator.registerPassThroughInterface("net.minecraftforge.fluids.IFluidHandler")
} }

8
src/main/scala/edx/core/Settings.scala
View file

@ -4,10 +4,10 @@ import cpw.mods.fml.common.eventhandler.SubscribeEvent
import net.minecraft.block.Block import net.minecraft.block.Block
import net.minecraft.item.ItemStack import net.minecraft.item.ItemStack
import net.minecraftforge.common.config.Configuration import net.minecraftforge.common.config.Configuration
import resonant.api.recipe.QuantumAssemblerRecipes import resonantengine.api.recipe.QuantumAssemblerRecipes
import resonant.lib.mod.config.Config import resonantengine.lib.mod.config.Config
import resonant.lib.mod.config.ConfigEvent.PostConfigEvent import resonantengine.lib.mod.config.ConfigEvent.PostConfigEvent
import resonant.lib.prefab.poison.PotionRadiation import resonantengine.lib.prefab.poison.PotionRadiation
import scala.collection.convert.wrapAll._ import scala.collection.convert.wrapAll._

2
src/main/scala/edx/core/handler/TextureHookHandler.scala
View file

@ -5,7 +5,7 @@ import cpw.mods.fml.relauncher.{Side, SideOnly}
import edx.core.Reference import edx.core.Reference
import edx.quantum.QuantumContent import edx.quantum.QuantumContent
import net.minecraftforge.client.event.TextureStitchEvent import net.minecraftforge.client.event.TextureStitchEvent
import resonant.lib.render.RenderUtility import resonantengine.lib.render.RenderUtility
/** Event handler for texture events /** Event handler for texture events
* @author Calclavia * @author Calclavia

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

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

8
src/main/scala/edx/core/prefab/node/NodeFluidPressure.scala
View file

@ -2,10 +2,10 @@ package edx.core.prefab.node
import net.minecraftforge.common.util.ForgeDirection import net.minecraftforge.common.util.ForgeDirection
import net.minecraftforge.fluids.{FluidContainerRegistry, IFluidHandler} import net.minecraftforge.fluids.{FluidContainerRegistry, IFluidHandler}
import resonant.api.IUpdate import resonantengine.api.IUpdate
import resonant.api.tile.INodeProvider import resonantengine.api.tile.INodeProvider
import resonant.lib.grid.core.UpdateTicker import resonantengine.lib.grid.core.UpdateTicker
import resonant.lib.prefab.fluid.NodeFluid import resonantengine.lib.prefab.fluid.NodeFluid
import scala.collection.convert.wrapAll._ import scala.collection.convert.wrapAll._

2
src/main/scala/edx/core/prefab/node/TMultipartNode.scala
View file

@ -3,7 +3,7 @@ package edx.core.prefab.node
import codechicken.multipart.TMultiPart import codechicken.multipart.TMultiPart
import net.minecraft.tileentity.TileEntity import net.minecraft.tileentity.TileEntity
import net.minecraft.world.World import net.minecraft.world.World
import resonant.lib.grid.core.NodeConnector import resonantengine.lib.grid.core.NodeConnector
/** /**
* A trait that allows nodes to works with Forge Multipart. This trait MUST be mixed in. * A trait that allows nodes to works with Forge Multipart. This trait MUST be mixed in.

12
src/main/scala/edx/core/prefab/node/TileFluidProvider.scala
View file

@ -5,12 +5,12 @@ import net.minecraft.block.material.Material
import net.minecraft.nbt.NBTTagCompound import net.minecraft.nbt.NBTTagCompound
import net.minecraftforge.common.util.ForgeDirection import net.minecraftforge.common.util.ForgeDirection
import net.minecraftforge.fluids._ import net.minecraftforge.fluids._
import resonant.lib.grid.core.TBlockNodeProvider import resonantengine.lib.grid.core.TBlockNodeProvider
import resonant.lib.network.discriminator.PacketType import resonantengine.lib.network.discriminator.PacketType
import resonant.lib.network.handle.{TPacketReceiver, TPacketSender} import resonantengine.lib.network.handle.{TPacketReceiver, TPacketSender}
import resonant.lib.prefab.fluid.NodeFluid import resonantengine.lib.prefab.fluid.NodeFluid
import resonant.lib.prefab.tile.spatial.ResonantTile import resonantengine.lib.prefab.tile.spatial.ResonantTile
import resonant.lib.wrapper.ByteBufWrapper._ import resonantengine.lib.wrapper.ByteBufWrapper._
/** /**
* A prefab class for tiles that use the fluid network. * A prefab class for tiles that use the fluid network.

8
src/main/scala/edx/core/prefab/part/ChickenBonesWrapper.scala
View file

@ -1,7 +1,7 @@
package edx.core.prefab.part package edx.core.prefab.part
import codechicken.lib.vec.Cuboid6 import codechicken.lib.vec.Cuboid6
import resonant.lib.transform.region.Cuboid import resonantengine.lib.transform.region.Cuboid
/** /**
* Wraps ChickenBone's Vector3 with UE's Vector3. * Wraps ChickenBone's Vector3 with UE's Vector3.
@ -9,11 +9,11 @@ import resonant.lib.transform.region.Cuboid
*/ */
object ChickenBonesWrapper object ChickenBonesWrapper
{ {
implicit def asUEVector3(vec: codechicken.lib.vec.Vector3): resonant.lib.transform.vector.Vector3 = new resonant.lib.transform.vector.Vector3(vec.x, vec.y, vec.z) implicit def asUEVector3(vec: codechicken.lib.vec.Vector3): resonantengine.lib.transform.vector.Vector3 = new resonantengine.lib.transform.vector.Vector3(vec.x, vec.y, vec.z)
implicit def asUEVector3(vec: codechicken.lib.vec.BlockCoord): resonant.lib.transform.vector.Vector3 = new resonant.lib.transform.vector.Vector3(vec.x, vec.y, vec.z) implicit def asUEVector3(vec: codechicken.lib.vec.BlockCoord): resonantengine.lib.transform.vector.Vector3 = new resonantengine.lib.transform.vector.Vector3(vec.x, vec.y, vec.z)
implicit def asCBVector3(vec: resonant.lib.transform.vector.Vector3): codechicken.lib.vec.Vector3 = new codechicken.lib.vec.Vector3(vec.x, vec.y, vec.z) implicit def asCBVector3(vec: resonantengine.lib.transform.vector.Vector3): codechicken.lib.vec.Vector3 = new codechicken.lib.vec.Vector3(vec.x, vec.y, vec.z)
implicit def asCuboid(cuboid: Cuboid6): Cuboid = new Cuboid(cuboid.min, cuboid.max) implicit def asCuboid(cuboid: Cuboid6): Cuboid = new Cuboid(cuboid.min, cuboid.max)

6
src/main/scala/edx/core/prefab/part/PacketMultiPart.scala
View file

@ -4,9 +4,9 @@ import codechicken.multipart.{TMultiPart, TileMultipart}
import io.netty.buffer.ByteBuf import io.netty.buffer.ByteBuf
import io.netty.channel.ChannelHandlerContext import io.netty.channel.ChannelHandlerContext
import net.minecraft.entity.player.EntityPlayer import net.minecraft.entity.player.EntityPlayer
import resonant.lib.network.discriminator.PacketType import resonantengine.lib.network.discriminator.PacketType
import resonant.lib.network.handle.TPacketReceiver import resonantengine.lib.network.handle.TPacketReceiver
import resonant.lib.transform.vector.Vector3 import resonantengine.lib.transform.vector.Vector3
/** /**
* Packet handler for blocks and tile entities. * Packet handler for blocks and tile entities.

2
src/main/scala/edx/core/prefab/part/connector/PartAbstract.scala
View file

@ -5,7 +5,7 @@ import codechicken.multipart.{IRedstonePart, TMultiPart}
import edx.core.ResonantPartFactory import edx.core.ResonantPartFactory
import net.minecraft.item.ItemStack import net.minecraft.item.ItemStack
import net.minecraft.util.MovingObjectPosition import net.minecraft.util.MovingObjectPosition
import resonant.lib.prefab.tile.traits.TTicker import resonantengine.lib.prefab.tile.traits.TTicker
import scala.collection.convert.wrapAll._ import scala.collection.convert.wrapAll._
import scala.collection.mutable import scala.collection.mutable

4
src/main/scala/edx/core/prefab/part/connector/PartFramedNode.scala
View file

@ -11,8 +11,8 @@ import edx.core.prefab.part.CuboidShapes
import net.minecraft.entity.player.EntityPlayer import net.minecraft.entity.player.EntityPlayer
import net.minecraft.util.MovingObjectPosition import net.minecraft.util.MovingObjectPosition
import net.minecraftforge.common.util.ForgeDirection import net.minecraftforge.common.util.ForgeDirection
import resonant.lib.grid.core.NodeConnector import resonantengine.lib.grid.core.NodeConnector
import resonant.lib.wrapper.BitmaskWrapper._ import resonantengine.lib.wrapper.BitmaskWrapper._
import scala.collection.convert.wrapAll._ import scala.collection.convert.wrapAll._
import scala.collection.mutable import scala.collection.mutable

4
src/main/scala/edx/core/prefab/part/connector/TPartNodeProvider.scala
View file

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

2
src/main/scala/edx/core/prefab/pass/TDebugInfo.java
View file

@ -2,7 +2,7 @@ package edx.core.prefab.pass;
import codechicken.multipart.TMultiPart; import codechicken.multipart.TMultiPart;
import codechicken.multipart.TileMultipart; import codechicken.multipart.TileMultipart;
import resonant.lib.debug.IDebugInfo; import resonantengine.core.debug.IDebugInfo;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;

4
src/main/scala/edx/core/prefab/pass/TNodeProvider.java
View file

@ -4,8 +4,8 @@ import codechicken.multipart.PartMap;
import codechicken.multipart.TMultiPart; import codechicken.multipart.TMultiPart;
import codechicken.multipart.TileMultipart; import codechicken.multipart.TileMultipart;
import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.common.util.ForgeDirection;
import resonant.api.tile.INodeProvider; import resonantengine.api.tile.INodeProvider;
import resonant.api.tile.node.INode; import resonantengine.api.tile.node.INode;
/** /**
* TNodeProvider multipart Trait. * TNodeProvider multipart Trait.

8
src/main/scala/edx/core/resource/AutoResourceFactory.scala
View file

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

6
src/main/scala/edx/core/resource/alloy/Alloy.scala
View file

@ -1,14 +1,14 @@
package edx.core.resource.alloy package edx.core.resource.alloy
import net.minecraft.nbt.NBTTagCompound import net.minecraft.nbt.NBTTagCompound
import resonant.lib.utility.nbt.ISaveObj import resonantengine.api.ISave
import resonant.lib.wrapper.NBTWrapper._ import resonantengine.lib.wrapper.NBTWrapper._
/** /**
* A class that stores alloy objects. Alloys are materials that are composed of other materials. * A class that stores alloy objects. Alloys are materials that are composed of other materials.
* @author Calclavia * @author Calclavia
*/ */
class Alloy(val max: Int) extends ISaveObj class Alloy(val max: Int) extends ISave
{ {
var content = Map.empty[String, Int] var content = Map.empty[String, Int]

4
src/main/scala/edx/core/resource/alloy/AlloyUtility.scala
View file

@ -3,8 +3,8 @@ package edx.core.resource.alloy
import java.awt.Color import java.awt.Color
import net.minecraft.item.ItemStack import net.minecraft.item.ItemStack
import resonant.lib.factory.resources.ResourceFactory import resonantengine.lib.factory.resources.ResourceFactory
import resonant.lib.utility.nbt.NBTUtility import resonantengine.lib.utility.nbt.NBTUtility
/** /**
* Manages alloys and metal mixtures * Manages alloys and metal mixtures

8
src/main/scala/edx/core/resource/alloy/TAlloyItem.scala
View file

@ -4,10 +4,10 @@ import java.util
import net.minecraft.entity.player.EntityPlayer import net.minecraft.entity.player.EntityPlayer
import net.minecraft.item.{Item, ItemStack} import net.minecraft.item.{Item, ItemStack}
import resonant.lib.render.EnumColor import resonantengine.lib.render.EnumColor
import resonant.lib.utility.nbt.NBTUtility import resonantengine.lib.utility.nbt.NBTUtility
import resonant.lib.wrapper.CollectionWrapper._ import resonantengine.lib.wrapper.CollectionWrapper._
import resonant.lib.wrapper.StringWrapper._ import resonantengine.lib.wrapper.StringWrapper._
/** /**
* A trait applied to all items that can store alloys within them * A trait applied to all items that can store alloys within them

6
src/main/scala/edx/core/resource/content/BlockDecoration.scala
View file

@ -9,9 +9,9 @@ import net.minecraft.client.renderer.texture.IIconRegister
import net.minecraft.creativetab.CreativeTabs import net.minecraft.creativetab.CreativeTabs
import net.minecraft.item.{Item, ItemStack} import net.minecraft.item.{Item, ItemStack}
import net.minecraft.util.IIcon import net.minecraft.util.IIcon
import resonant.lib.prefab.tile.item.ItemBlockMetadata import resonantengine.lib.prefab.tile.item.ItemBlockMetadata
import resonant.lib.prefab.tile.spatial.ResonantBlock import resonantengine.lib.prefab.tile.spatial.ResonantBlock
import resonant.lib.wrapper.CollectionWrapper._ import resonantengine.lib.wrapper.CollectionWrapper._
/** /**
* A block used to build machines or decoration. * A block used to build machines or decoration.

2
src/main/scala/edx/core/resource/content/ItemDust.scala
View file

@ -2,7 +2,7 @@ package edx.core.resource.content
import edx.core.Reference import edx.core.Reference
import net.minecraft.creativetab.CreativeTabs import net.minecraft.creativetab.CreativeTabs
import resonant.lib.factory.resources.item.TItemResource import resonantengine.lib.factory.resources.item.TItemResource
/** /**
* Item for ore dusts * Item for ore dusts

2
src/main/scala/edx/core/resource/content/ItemMoltenBucket.scala
View file

@ -2,7 +2,7 @@ package edx.core.resource.content
import edx.core.Reference import edx.core.Reference
import net.minecraft.creativetab.CreativeTabs import net.minecraft.creativetab.CreativeTabs
import resonant.lib.factory.resources.item.TItemResource import resonantengine.lib.factory.resources.item.TItemResource
/** /**
* @author Calclavia * @author Calclavia

4
src/main/scala/edx/core/resource/content/ItemRefinedDust.scala
View file

@ -7,8 +7,8 @@ import net.minecraft.entity.player.EntityPlayer
import net.minecraft.init.Blocks import net.minecraft.init.Blocks
import net.minecraft.item.{Item, ItemStack} import net.minecraft.item.{Item, ItemStack}
import net.minecraft.world.World import net.minecraft.world.World
import resonant.lib.factory.resources.item.TItemResource import resonantengine.lib.factory.resources.item.TItemResource
import resonant.lib.transform.vector.Vector3 import resonantengine.lib.transform.vector.Vector3
/** /**
* @author Calclavia * @author Calclavia

2
src/main/scala/edx/core/resource/content/ItemRubble.scala
View file

@ -2,7 +2,7 @@ package edx.core.resource.content
import edx.core.Reference import edx.core.Reference
import net.minecraft.creativetab.CreativeTabs import net.minecraft.creativetab.CreativeTabs
import resonant.lib.factory.resources.item.TItemResource import resonantengine.lib.factory.resources.item.TItemResource
/** /**
* @author Calclavia * @author Calclavia

4
src/main/scala/edx/core/resource/content/TileDust.scala
View file

@ -3,8 +3,8 @@ package edx.core.resource.content
import edx.core.Reference import edx.core.Reference
import net.minecraft.block.material.Material import net.minecraft.block.material.Material
import net.minecraft.nbt.NBTTagCompound import net.minecraft.nbt.NBTTagCompound
import resonant.lib.prefab.tile.spatial.ResonantTile import resonantengine.lib.prefab.tile.spatial.ResonantTile
import resonant.lib.transform.region.Cuboid import resonantengine.lib.transform.region.Cuboid
/** /**
* A block for physical dust blocks * A block for physical dust blocks

2
src/main/scala/edx/core/util/MultipartUtil.scala
View file

@ -6,7 +6,7 @@ import net.minecraft.init.Blocks
import net.minecraft.tileentity.TileEntity import net.minecraft.tileentity.TileEntity
import net.minecraft.world.{IBlockAccess, World} import net.minecraft.world.{IBlockAccess, World}
import net.minecraftforge.common.util.ForgeDirection import net.minecraftforge.common.util.ForgeDirection
import resonant.lib.transform.vector.{Vector3, VectorWorld} import resonantengine.lib.transform.vector.{Vector3, VectorWorld}
/** /**
* Multipart Utilities * Multipart Utilities

5
src/main/scala/edx/electrical/ElectricalContent.scala
View file

@ -25,8 +25,9 @@ import net.minecraft.util.ResourceLocation
import net.minecraftforge.client.event.TextureStitchEvent import net.minecraftforge.client.event.TextureStitchEvent
import net.minecraftforge.common.MinecraftForge import net.minecraftforge.common.MinecraftForge
import net.minecraftforge.oredict.{OreDictionary, ShapelessOreRecipe} import net.minecraftforge.oredict.{OreDictionary, ShapelessOreRecipe}
import resonant.lib.mod.content.{ContentHolder, ExplicitContentName} import resonantengine.api.modcontent.ExplicitContentName
import resonant.lib.utility.recipe.UniversalRecipe import resonantengine.lib.utility.recipe.UniversalRecipe
import resonantengine.prefab.modcontent.ContentHolder
object ElectricalContent extends ContentHolder object ElectricalContent extends ContentHolder
{ {

2
src/main/scala/edx/electrical/battery/GridBattery.scala
View file

@ -2,7 +2,7 @@ package edx.electrical.battery
import java.util.{Arrays, LinkedHashSet, Set} import java.util.{Arrays, LinkedHashSet, Set}
import resonant.lib.grid.core.Grid import resonantengine.lib.grid.core.Grid
import scala.collection.JavaConversions._ import scala.collection.JavaConversions._

10
src/main/scala/edx/electrical/battery/ItemBlockBattery.scala
View file

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

26
src/main/scala/edx/electrical/battery/TileBattery.scala
View file

@ -15,19 +15,19 @@ import net.minecraftforge.client.IItemRenderer.ItemRenderType
import net.minecraftforge.client.model.AdvancedModelLoader import net.minecraftforge.client.model.AdvancedModelLoader
import net.minecraftforge.common.util.ForgeDirection import net.minecraftforge.common.util.ForgeDirection
import org.lwjgl.opengl.GL11._ import org.lwjgl.opengl.GL11._
import resonant.api.items.ISimpleItemRenderer import resonantengine.api.items.ISimpleItemRenderer
import resonant.lib.content.prefab.TIO import resonantengine.lib.content.prefab.TIO
import resonant.lib.grid.core.TBlockNodeProvider import resonantengine.lib.grid.core.TBlockNodeProvider
import resonant.lib.grid.energy.EnergyStorage import resonantengine.lib.grid.energy.EnergyStorage
import resonant.lib.grid.energy.electric.NodeElectricComponent import resonantengine.lib.grid.energy.electric.NodeElectricComponent
import resonant.lib.network.discriminator.PacketType import resonantengine.lib.network.discriminator.PacketType
import resonant.lib.network.handle.{TPacketReceiver, TPacketSender} import resonantengine.lib.network.handle.{TPacketReceiver, TPacketSender}
import resonant.lib.prefab.tile.spatial.ResonantTile import resonantengine.lib.prefab.tile.spatial.ResonantTile
import resonant.lib.prefab.tile.traits.TEnergyProvider import resonantengine.lib.prefab.tile.traits.TEnergyProvider
import resonant.lib.render.RenderUtility import resonantengine.lib.render.RenderUtility
import resonant.lib.transform.vector.Vector3 import resonantengine.lib.transform.vector.Vector3
import resonant.lib.utility.science.UnitDisplay import resonantengine.lib.utility.science.UnitDisplay
import resonant.lib.wrapper.ByteBufWrapper._ import resonantengine.lib.wrapper.ByteBufWrapper._
/** A modular battery box that allows shared connections with boxes next to it. /** A modular battery box that allows shared connections with boxes next to it.
* *

14
src/main/scala/edx/electrical/generator/TileMotor.scala
View file

@ -10,13 +10,13 @@ import net.minecraft.util.{ChatComponentText, ResourceLocation}
import net.minecraftforge.client.model.AdvancedModelLoader import net.minecraftforge.client.model.AdvancedModelLoader
import net.minecraftforge.common.util.ForgeDirection import net.minecraftforge.common.util.ForgeDirection
import org.lwjgl.opengl.GL11 import org.lwjgl.opengl.GL11
import resonant.lib.content.prefab.TIO import resonantengine.lib.content.prefab.TIO
import resonant.lib.grid.core.TBlockNodeProvider import resonantengine.lib.grid.core.TBlockNodeProvider
import resonant.lib.grid.energy.electric.NodeElectricComponent import resonantengine.lib.grid.energy.electric.NodeElectricComponent
import resonant.lib.prefab.tile.spatial.ResonantTile import resonantengine.lib.prefab.tile.spatial.ResonantTile
import resonant.lib.prefab.tile.traits.TRotatable import resonantengine.lib.prefab.tile.traits.TRotatable
import resonant.lib.render.RenderUtility import resonantengine.lib.render.RenderUtility
import resonant.lib.transform.vector.Vector3 import resonantengine.lib.transform.vector.Vector3
/** /**
* A kinetic energy to electrical energy converter. * A kinetic energy to electrical energy converter.

12
src/main/scala/edx/electrical/generator/TileSolarPanel.scala
View file

@ -6,12 +6,12 @@ import net.minecraft.block.material.Material
import net.minecraft.client.renderer.texture.IIconRegister import net.minecraft.client.renderer.texture.IIconRegister
import net.minecraft.util.IIcon import net.minecraft.util.IIcon
import net.minecraftforge.common.util.ForgeDirection import net.minecraftforge.common.util.ForgeDirection
import resonant.lib.content.prefab.TIO import resonantengine.lib.content.prefab.TIO
import resonant.lib.grid.core.TBlockNodeProvider import resonantengine.lib.grid.core.TBlockNodeProvider
import resonant.lib.grid.energy.electric.NodeElectricComponent import resonantengine.lib.grid.energy.electric.NodeElectricComponent
import resonant.lib.prefab.tile.spatial.{ResonantBlock, ResonantTile} import resonantengine.lib.prefab.tile.spatial.{ResonantBlock, ResonantTile}
import resonant.lib.render.block.RenderConnectedTexture import resonantengine.lib.render.block.RenderConnectedTexture
import resonant.lib.transform.region.Cuboid import resonantengine.lib.transform.region.Cuboid
import scala.collection.convert.wrapAll._ import scala.collection.convert.wrapAll._

8
src/main/scala/edx/electrical/generator/TileThermopile.scala
View file

@ -7,10 +7,10 @@ import net.minecraft.client.renderer.texture.IIconRegister
import net.minecraft.init.Blocks import net.minecraft.init.Blocks
import net.minecraft.util.IIcon import net.minecraft.util.IIcon
import net.minecraftforge.common.util.ForgeDirection import net.minecraftforge.common.util.ForgeDirection
import resonant.lib.content.prefab.TIO import resonantengine.lib.content.prefab.TIO
import resonant.lib.grid.core.TBlockNodeProvider import resonantengine.lib.grid.core.TBlockNodeProvider
import resonant.lib.grid.energy.electric.NodeElectricComponent import resonantengine.lib.grid.energy.electric.NodeElectricComponent
import resonant.lib.prefab.tile.spatial.{ResonantBlock, ResonantTile} import resonantengine.lib.prefab.tile.spatial.{ResonantBlock, ResonantTile}
import scala.collection.convert.wrapAll._ import scala.collection.convert.wrapAll._

8
src/main/scala/edx/electrical/multimeter/Graph.scala
View file

@ -1,9 +1,9 @@
package edx.electrical.multimeter package edx.electrical.multimeter
import net.minecraft.nbt.NBTTagCompound import net.minecraft.nbt.NBTTagCompound
import resonant.lib.collection.EvictingList import resonantengine.api.ISave
import resonant.lib.utility.nbt.ISaveObj import resonantengine.lib.collection.EvictingList
import resonant.lib.wrapper.NBTWrapper._ import resonantengine.lib.wrapper.NBTWrapper._
import scala.collection.JavaConversions._ import scala.collection.JavaConversions._
@ -12,7 +12,7 @@ import scala.collection.JavaConversions._
* *
* @author Calclavia * @author Calclavia
*/ */
class Graph[V](val name: String, val maxPoints: Int = 0)(implicit n: Numeric[V]) extends ISaveObj class Graph[V](val name: String, val maxPoints: Int = 0)(implicit n: Numeric[V]) extends ISave
{ {
/** /**
* Each point represents a tick. * Each point represents a tick.

8
src/main/scala/edx/electrical/multimeter/GridMultimeter.scala
View file

@ -1,10 +1,10 @@
package edx.electrical.multimeter package edx.electrical.multimeter
import net.minecraft.nbt.{NBTTagCompound, NBTTagList} import net.minecraft.nbt.{NBTTagCompound, NBTTagList}
import resonant.lib.grid.core.Grid import resonantengine.lib.grid.core.Grid
import resonant.lib.transform.vector.Vector3 import resonantengine.lib.transform.vector.Vector3
import resonant.lib.utility.LanguageUtility import resonantengine.lib.utility.LanguageUtility
import resonant.lib.utility.science.UnitDisplay import resonantengine.lib.utility.science.UnitDisplay
import scala.collection.convert.wrapAll._ import scala.collection.convert.wrapAll._
import scala.collection.mutable.ArrayBuffer import scala.collection.mutable.ArrayBuffer

8
src/main/scala/edx/electrical/multimeter/GuiMultimeter.scala
View file

@ -6,10 +6,10 @@ package edx.electrical.multimeter
import cpw.mods.fml.relauncher.{Side, SideOnly} import cpw.mods.fml.relauncher.{Side, SideOnly}
import net.minecraft.client.gui.{GuiButton, GuiTextField} import net.minecraft.client.gui.{GuiButton, GuiTextField}
import net.minecraft.entity.player.InventoryPlayer import net.minecraft.entity.player.InventoryPlayer
import resonant.lib.prefab.gui.GuiContainerBase import resonantengine.lib.prefab.gui.GuiContainerBase
import resonant.lib.render.EnumColor import resonantengine.lib.render.EnumColor
import resonant.lib.utility.LanguageUtility import resonantengine.lib.utility.LanguageUtility
import resonant.lib.wrapper.CollectionWrapper._ import resonantengine.lib.wrapper.CollectionWrapper._
/** /**
* Multimeter GUI * Multimeter GUI

6
src/main/scala/edx/electrical/multimeter/ItemMultimeter.scala
View file

@ -14,9 +14,9 @@ import net.minecraft.tileentity.TileEntity
import net.minecraft.util.MathHelper import net.minecraft.util.MathHelper
import net.minecraft.world.World import net.minecraft.world.World
import org.lwjgl.input.Keyboard import org.lwjgl.input.Keyboard
import resonant.lib.render.EnumColor import resonantengine.lib.render.EnumColor
import resonant.lib.utility.LanguageUtility import resonantengine.lib.utility.LanguageUtility
import resonant.lib.wrapper.CollectionWrapper._ import resonantengine.lib.wrapper.CollectionWrapper._
class ItemMultimeter extends JItemMultiPart with IHighlight class ItemMultimeter extends JItemMultiPart with IHighlight
{ {

12
src/main/scala/edx/electrical/multimeter/PartMultimeter.scala
View file

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

8
src/main/scala/edx/electrical/multimeter/RenderMultimeter.scala
View file

@ -9,10 +9,10 @@ import net.minecraft.util.ResourceLocation
import net.minecraftforge.client.IItemRenderer import net.minecraftforge.client.IItemRenderer
import net.minecraftforge.common.util.ForgeDirection import net.minecraftforge.common.util.ForgeDirection
import org.lwjgl.opengl.GL11 import org.lwjgl.opengl.GL11
import resonant.api.items.ISimpleItemRenderer import resonantengine.api.items.ISimpleItemRenderer
import resonant.lib.render.RenderUtility import resonantengine.lib.render.RenderUtility
import resonant.lib.transform.vector.Vector3 import resonantengine.lib.transform.vector.Vector3
import resonant.lib.utility.LanguageUtility import resonantengine.lib.utility.LanguageUtility
/** /**
* Class used to render text onto the multimeter block. * Class used to render text onto the multimeter block.

2
src/main/scala/edx/electrical/tesla/TeslaGrid.java
View file

@ -4,7 +4,7 @@
package edx.electrical.tesla; package edx.electrical.tesla;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import resonant.api.mffs.fortron.IServerThread; import resonantengine.api.mffs.fortron.IServerThread;
import java.util.Collections; import java.util.Collections;
import java.util.Iterator; import java.util.Iterator;

24
src/main/scala/edx/electrical/tesla/TileTesla.scala
View file

@ -17,18 +17,18 @@ import net.minecraft.tileentity.TileEntity
import net.minecraft.util.ChatComponentText import net.minecraft.util.ChatComponentText
import net.minecraft.world.World import net.minecraft.world.World
import net.minecraftforge.common.util.ForgeDirection import net.minecraftforge.common.util.ForgeDirection
import resonant.lib.content.prefab.TIO import resonantengine.lib.content.prefab.TIO
import resonant.lib.grid.core.TBlockNodeProvider import resonantengine.lib.grid.core.TBlockNodeProvider
import resonant.lib.grid.energy.EnergyStorage import resonantengine.lib.grid.energy.EnergyStorage
import resonant.lib.grid.energy.electric.NodeElectricComponent import resonantengine.lib.grid.energy.electric.NodeElectricComponent
import resonant.lib.network.discriminator.{PacketTile, PacketType} import resonantengine.lib.network.discriminator.{PacketTile, PacketType}
import resonant.lib.network.handle.{TPacketReceiver, TPacketSender} import resonantengine.lib.network.handle.{TPacketReceiver, TPacketSender}
import resonant.lib.prefab.tile.multiblock.reference.{IMultiBlockStructure, MultiBlockHandler} import resonantengine.lib.prefab.tile.multiblock.reference.{IMultiBlockStructure, MultiBlockHandler}
import resonant.lib.prefab.tile.spatial.ResonantTile import resonantengine.lib.prefab.tile.spatial.ResonantTile
import resonant.lib.prefab.tile.traits.TEnergyProvider import resonantengine.lib.prefab.tile.traits.TEnergyProvider
import resonant.lib.render.EnumColor import resonantengine.lib.render.EnumColor
import resonant.lib.transform.vector.{Vector3, VectorWorld} import resonantengine.lib.transform.vector.{Vector3, VectorWorld}
import resonant.lib.utility.{LanguageUtility, LinkUtility} import resonantengine.lib.utility.{LanguageUtility, LinkUtility}
import scala.collection.JavaConversions._ import scala.collection.JavaConversions._

4
src/main/scala/edx/electrical/transformer/ElectricTransformerNode.scala
View file

@ -1,8 +1,8 @@
package edx.electrical.transformer package edx.electrical.transformer
import net.minecraftforge.common.util.ForgeDirection import net.minecraftforge.common.util.ForgeDirection
import resonant.api.tile.INodeProvider import resonantengine.api.tile.INodeProvider
import resonant.lib.grid.energy.electric.NodeElectricComponent import resonantengine.lib.grid.energy.electric.NodeElectricComponent
/** /**
* Created by robert on 8/11/2014. * Created by robert on 8/11/2014.

6
src/main/scala/edx/electrical/transformer/PartElectricTransformer.scala
View file

@ -10,9 +10,9 @@ import net.minecraft.item.ItemStack
import net.minecraft.nbt.NBTTagCompound import net.minecraft.nbt.NBTTagCompound
import net.minecraft.util.{ChatComponentText, MovingObjectPosition} import net.minecraft.util.{ChatComponentText, MovingObjectPosition}
import net.minecraftforge.common.util.ForgeDirection import net.minecraftforge.common.util.ForgeDirection
import resonant.api.tile.INodeProvider import resonantengine.api.tile.INodeProvider
import resonant.api.tile.node.INode import resonantengine.api.tile.node.INode
import resonant.lib.utility.WrenchUtility import resonantengine.lib.utility.WrenchUtility
/** /**
* TODO: We can't use face parts, need to use thicker ones. Also, transformer is currently NO-OP * TODO: We can't use face parts, need to use thicker ones. Also, transformer is currently NO-OP

4
src/main/scala/edx/electrical/transformer/RenderTransformer.scala
View file

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

8
src/main/scala/edx/electrical/wire/ItemWire.scala
View file

@ -17,10 +17,10 @@ import net.minecraft.item.{Item, ItemStack}
import net.minecraft.world.World import net.minecraft.world.World
import net.minecraftforge.common.util.ForgeDirection import net.minecraftforge.common.util.ForgeDirection
import org.lwjgl.input.Keyboard import org.lwjgl.input.Keyboard
import resonant.lib.render.EnumColor import resonantengine.lib.render.EnumColor
import resonant.lib.utility.LanguageUtility import resonantengine.lib.utility.LanguageUtility
import resonant.lib.utility.science.UnitDisplay import resonantengine.lib.utility.science.UnitDisplay
import resonant.lib.wrapper.CollectionWrapper._ import resonantengine.lib.wrapper.CollectionWrapper._
class ItemWire extends TItemMultiPart class ItemWire extends TItemMultiPart
{ {

4
src/main/scala/edx/electrical/wire/flat/PartFlatWire.scala
View file

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

4
src/main/scala/edx/electrical/wire/framed/PartFramedWire.scala
View file

@ -10,8 +10,8 @@ import edx.electrical.wire.base.TWire
import net.minecraft.client.renderer.RenderBlocks import net.minecraft.client.renderer.RenderBlocks
import net.minecraft.nbt.NBTTagCompound import net.minecraft.nbt.NBTTagCompound
import net.minecraftforge.common.util.ForgeDirection import net.minecraftforge.common.util.ForgeDirection
import resonant.lib.grid.energy.electric.NodeElectricComponent import resonantengine.lib.grid.energy.electric.NodeElectricComponent
import resonant.lib.wrapper.BitmaskWrapper._ import resonantengine.lib.wrapper.BitmaskWrapper._
/** /**
* Fluid transport pipe * Fluid transport pipe

2
src/main/scala/edx/electrical/wire/framed/RenderFramedWire.scala
View file

@ -10,7 +10,7 @@ import edx.core.render.InvertX
import edx.core.util.ResonantUtil import edx.core.util.ResonantUtil
import net.minecraft.util.{IIcon, ResourceLocation} import net.minecraft.util.{IIcon, ResourceLocation}
import net.minecraftforge.common.util.ForgeDirection import net.minecraftforge.common.util.ForgeDirection
import resonant.lib.wrapper.BitmaskWrapper._ import resonantengine.lib.wrapper.BitmaskWrapper._
import scala.collection.convert.wrapAll._ import scala.collection.convert.wrapAll._
import scala.collection.mutable import scala.collection.mutable

8
src/main/scala/edx/mechanical/MechanicalContent.scala
View file

@ -16,10 +16,10 @@ import edx.mechanical.mech.turbine.{TileWaterTurbine, TileWindTurbine}
import net.minecraft.block.Block import net.minecraft.block.Block
import net.minecraft.init.{Blocks, Items} import net.minecraft.init.{Blocks, Items}
import net.minecraft.item.{Item, ItemStack} import net.minecraft.item.{Item, ItemStack}
import resonant.api.tile.node.NodeRegistry import resonantengine.api.tile.node.NodeRegistry
import resonant.lib.mod.content.ContentHolder import resonantengine.lib.utility.recipe.UniversalRecipe
import resonant.lib.utility.recipe.UniversalRecipe import resonantengine.lib.world.schematic.{SchematicPlate, SchematicRegistry}
import resonant.lib.world.schematic.{SchematicPlate, SchematicRegistry} import resonantengine.prefab.modcontent.ContentHolder
/** /**
* The core contents of Resonant Induction * The core contents of Resonant Induction

8
src/main/scala/edx/mechanical/fluid/pipe/ItemPipe.scala
View file

@ -10,10 +10,10 @@ import net.minecraft.entity.player.EntityPlayer
import net.minecraft.item.{Item, ItemStack} import net.minecraft.item.{Item, ItemStack}
import net.minecraft.world.World import net.minecraft.world.World
import org.lwjgl.input.Keyboard import org.lwjgl.input.Keyboard
import resonant.lib.render.EnumColor import resonantengine.lib.render.EnumColor
import resonant.lib.utility.LanguageUtility import resonantengine.lib.utility.LanguageUtility
import resonant.lib.utility.science.UnitDisplay import resonantengine.lib.utility.science.UnitDisplay
import resonant.lib.wrapper.CollectionWrapper._ import resonantengine.lib.wrapper.CollectionWrapper._
class ItemPipe extends TItemMultiPart class ItemPipe extends TItemMultiPart
{ {

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 edx.core.prefab.part.connector.TColorable
import net.minecraftforge.common.util.ForgeDirection import net.minecraftforge.common.util.ForgeDirection
import net.minecraftforge.fluids.IFluidHandler import net.minecraftforge.fluids.IFluidHandler
import resonant.api.tile.INodeProvider import resonantengine.api.tile.INodeProvider
/** /**
* Pressure node for the pipe * Pressure node for the pipe

4
src/main/scala/edx/mechanical/fluid/pipe/PartPipe.scala
View file

@ -16,8 +16,8 @@ import net.minecraft.item.ItemStack
import net.minecraft.nbt.NBTTagCompound import net.minecraft.nbt.NBTTagCompound
import net.minecraftforge.common.util.ForgeDirection import net.minecraftforge.common.util.ForgeDirection
import net.minecraftforge.fluids._ import net.minecraftforge.fluids._
import resonant.lib.collection.EvictingList import resonantengine.lib.collection.EvictingList
import resonant.lib.wrapper.BitmaskWrapper._ import resonantengine.lib.wrapper.BitmaskWrapper._
import scala.collection.convert.wrapAll._ import scala.collection.convert.wrapAll._
import scala.collection.mutable import scala.collection.mutable

10
src/main/scala/edx/mechanical/fluid/pipe/RenderPipe.scala
View file

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

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 edx.core.prefab.node.NodeFluidPressure
import net.minecraftforge.common.util.ForgeDirection import net.minecraftforge.common.util.ForgeDirection
import net.minecraftforge.fluids.IFluidHandler import net.minecraftforge.fluids.IFluidHandler
import resonant.api.tile.INodeProvider import resonantengine.api.tile.INodeProvider
/** /**
* A node for the pump * A node for the pump

6
src/main/scala/edx/mechanical/fluid/transport/TilePump.scala
View file

@ -8,9 +8,9 @@ import net.minecraftforge.client.model.AdvancedModelLoader
import net.minecraftforge.common.util.ForgeDirection import net.minecraftforge.common.util.ForgeDirection
import net.minecraftforge.fluids.{Fluid, FluidStack, FluidTankInfo, IFluidHandler} import net.minecraftforge.fluids.{Fluid, FluidStack, FluidTankInfo, IFluidHandler}
import org.lwjgl.opengl.GL11 import org.lwjgl.opengl.GL11
import resonant.api.tile.IRotatable import resonantengine.api.tile.IRotatable
import resonant.lib.render.RenderUtility import resonantengine.lib.render.RenderUtility
import resonant.lib.transform.vector.Vector3 import resonantengine.lib.transform.vector.Vector3
import scala.collection.mutable import scala.collection.mutable

8
src/main/scala/edx/mechanical/machine/TileDetector.scala
View file

@ -17,10 +17,10 @@ import net.minecraft.tileentity.TileEntity
import net.minecraft.util.{AxisAlignedBB, IIcon} import net.minecraft.util.{AxisAlignedBB, IIcon}
import net.minecraft.world.IBlockAccess import net.minecraft.world.IBlockAccess
import net.minecraftforge.common.util.ForgeDirection import net.minecraftforge.common.util.ForgeDirection
import resonant.core.ResonantEngine import resonantengine.core.ResonantEngine
import resonant.lib.network.discriminator.{PacketTile, PacketType} import resonantengine.lib.network.discriminator.{PacketTile, PacketType}
import resonant.lib.network.handle.TPacketReceiver import resonantengine.lib.network.handle.TPacketReceiver
import resonant.lib.prefab.tile.spatial.ResonantBlock import resonantengine.lib.prefab.tile.spatial.ResonantBlock
class TileDetector extends TileFilterable with TPacketReceiver class TileDetector extends TileFilterable with TPacketReceiver
{ {

12
src/main/scala/edx/mechanical/machine/edit/TileBreaker.scala
View file

@ -15,12 +15,12 @@ import net.minecraft.nbt.NBTTagCompound
import net.minecraft.util.IIcon import net.minecraft.util.IIcon
import net.minecraft.world.IBlockAccess import net.minecraft.world.IBlockAccess
import net.minecraftforge.common.util.ForgeDirection import net.minecraftforge.common.util.ForgeDirection
import resonant.lib.network.discriminator.{PacketTile, PacketType} import resonantengine.lib.network.discriminator.{PacketTile, PacketType}
import resonant.lib.network.handle.IPacketReceiver import resonantengine.lib.network.handle.IPacketReceiver
import resonant.lib.prefab.tile.spatial.ResonantTile import resonantengine.lib.prefab.tile.spatial.ResonantTile
import resonant.lib.prefab.tile.traits.TRotatable import resonantengine.lib.prefab.tile.traits.TRotatable
import resonant.lib.transform.vector.{Vector3, VectorWorld} import resonantengine.lib.transform.vector.{Vector3, VectorWorld}
import resonant.lib.utility.inventory.InternalInventoryHandler import resonantengine.lib.utility.inventory.InternalInventoryHandler
/** /**
* @author tgame14 * @author tgame14

18
src/main/scala/edx/mechanical/machine/edit/TilePlacer.scala
View file

@ -13,15 +13,15 @@ import net.minecraft.util.{ChatComponentText, IIcon}
import net.minecraft.world.IBlockAccess import net.minecraft.world.IBlockAccess
import net.minecraftforge.common.util.ForgeDirection import net.minecraftforge.common.util.ForgeDirection
import org.lwjgl.opengl.GL11 import org.lwjgl.opengl.GL11
import resonant.lib.content.prefab.TInventory import resonantengine.lib.content.prefab.TInventory
import resonant.lib.network.discriminator.PacketTile import resonantengine.lib.network.discriminator.PacketTile
import resonant.lib.network.handle.TPacketSender import resonantengine.lib.network.handle.TPacketSender
import resonant.lib.prefab.tile.spatial.ResonantTile import resonantengine.lib.prefab.tile.spatial.ResonantTile
import resonant.lib.prefab.tile.traits.TRotatable import resonantengine.lib.prefab.tile.traits.TRotatable
import resonant.lib.render.RenderItemOverlayUtility import resonantengine.lib.render.RenderItemOverlayUtility
import resonant.lib.transform.vector.Vector3 import resonantengine.lib.transform.vector.Vector3
import resonant.lib.utility.LanguageUtility import resonantengine.lib.utility.LanguageUtility
import resonant.lib.utility.inventory.{InternalInventoryHandler, InventoryUtility} import resonantengine.lib.utility.inventory.{InternalInventoryHandler, InventoryUtility}
/** /**
* @author tgame14 * @author tgame14

2
src/main/scala/edx/mechanical/mech/PartMechanical.scala
View file

@ -6,7 +6,7 @@ import edx.core.prefab.part.connector.{PartAbstract, TPartNodeProvider}
import edx.mechanical.mech.grid.NodeMechanical import edx.mechanical.mech.grid.NodeMechanical
import net.minecraft.nbt.NBTTagCompound import net.minecraft.nbt.NBTTagCompound
import net.minecraftforge.common.util.ForgeDirection import net.minecraftforge.common.util.ForgeDirection
import resonant.lib.transform.vector.VectorWorld import resonantengine.lib.transform.vector.VectorWorld
/** We assume all the force acting on the gear is 90 degrees. /** We assume all the force acting on the gear is 90 degrees.
* *

14
src/main/scala/edx/mechanical/mech/TileMechanical.scala
View file

@ -5,13 +5,13 @@ import io.netty.buffer.ByteBuf
import net.minecraft.block.material.Material import net.minecraft.block.material.Material
import net.minecraft.entity.player.EntityPlayer import net.minecraft.entity.player.EntityPlayer
import net.minecraftforge.common.util.ForgeDirection import net.minecraftforge.common.util.ForgeDirection
import resonant.lib.grid.core.TBlockNodeProvider import resonantengine.lib.grid.core.TBlockNodeProvider
import resonant.lib.network.discriminator.PacketType import resonantengine.lib.network.discriminator.PacketType
import resonant.lib.network.handle.{TPacketReceiver, TPacketSender} import resonantengine.lib.network.handle.{TPacketReceiver, TPacketSender}
import resonant.lib.prefab.tile.spatial.ResonantTile import resonantengine.lib.prefab.tile.spatial.ResonantTile
import resonant.lib.prefab.tile.traits.TRotatable import resonantengine.lib.prefab.tile.traits.TRotatable
import resonant.lib.transform.vector.Vector3 import resonantengine.lib.transform.vector.Vector3
import resonant.lib.wrapper.ByteBufWrapper._ import resonantengine.lib.wrapper.ByteBufWrapper._
import scala.collection.convert.wrapAll._ import scala.collection.convert.wrapAll._

4
src/main/scala/edx/mechanical/mech/gear/GearMultiBlockHandler.scala
View file

@ -2,8 +2,8 @@ package edx.mechanical.mech.gear
import codechicken.multipart.TileMultipart import codechicken.multipart.TileMultipart
import net.minecraftforge.common.util.ForgeDirection import net.minecraftforge.common.util.ForgeDirection
import resonant.lib.prefab.tile.multiblock.reference.MultiBlockHandler import resonantengine.lib.prefab.tile.multiblock.reference.MultiBlockHandler
import resonant.lib.transform.vector.Vector3 import resonantengine.lib.transform.vector.Vector3
class GearMultiBlockHandler(wrapper: PartGear) extends MultiBlockHandler[PartGear](wrapper: PartGear) class GearMultiBlockHandler(wrapper: PartGear) extends MultiBlockHandler[PartGear](wrapper: PartGear)
{ {

2
src/main/scala/edx/mechanical/mech/gear/ItemGear.scala
View file

@ -13,7 +13,7 @@ import net.minecraft.entity.player.EntityPlayer
import net.minecraft.item.{Item, ItemStack} import net.minecraft.item.{Item, ItemStack}
import net.minecraft.tileentity.TileEntity import net.minecraft.tileentity.TileEntity
import net.minecraft.world.World import net.minecraft.world.World
import resonant.lib.wrapper.CollectionWrapper._ import resonantengine.lib.wrapper.CollectionWrapper._
class ItemGear extends JItemMultiPart with IHighlight class ItemGear extends JItemMultiPart with IHighlight
{ {

6
src/main/scala/edx/mechanical/mech/gear/NodeGear.scala
View file

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

8
src/main/scala/edx/mechanical/mech/gear/PartGear.scala
View file

@ -15,9 +15,9 @@ import net.minecraft.nbt.NBTTagCompound
import net.minecraft.util.MovingObjectPosition import net.minecraft.util.MovingObjectPosition
import net.minecraft.world.World import net.minecraft.world.World
import net.minecraftforge.common.util.ForgeDirection import net.minecraftforge.common.util.ForgeDirection
import resonant.api.tile.node.INode import resonantengine.api.tile.node.INode
import resonant.lib.prefab.tile.multiblock.reference.IMultiBlockStructure import resonantengine.lib.prefab.tile.multiblock.reference.IMultiBlockStructure
import resonant.lib.utility.WrenchUtility import resonantengine.lib.utility.WrenchUtility
/** /**
* We assume all the force acting on the gear is 90 degrees. * We assume all the force acting on the gear is 90 degrees.
@ -117,7 +117,7 @@ class PartGear extends PartMechanical with IMultiBlockStructure[PartGear]
override def getMultiBlock: GearMultiBlockHandler = multiBlock override def getMultiBlock: GearMultiBlockHandler = multiBlock
override def getMultiBlockVectors: java.util.List[resonant.lib.transform.vector.Vector3] = new resonant.lib.transform.vector.Vector3().getAround(this.world, placementSide, 1) override def getMultiBlockVectors: java.util.List[resonantengine.lib.transform.vector.Vector3] = new resonantengine.lib.transform.vector.Vector3().getAround(this.world, placementSide, 1)
def getWorld: World = def getWorld: World =
{ {

4
src/main/scala/edx/mechanical/mech/gear/RenderGear.scala
View file

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

2
src/main/scala/edx/mechanical/mech/gearshaft/ItemGearShaft.scala
View file

@ -10,7 +10,7 @@ import net.minecraft.creativetab.CreativeTabs
import net.minecraft.entity.player.EntityPlayer import net.minecraft.entity.player.EntityPlayer
import net.minecraft.item.{Item, ItemStack} import net.minecraft.item.{Item, ItemStack}
import net.minecraft.world.World import net.minecraft.world.World
import resonant.lib.wrapper.CollectionWrapper._ import resonantengine.lib.wrapper.CollectionWrapper._
class ItemGearShaft extends Item with TItemMultiPart with IHighlight class ItemGearShaft extends Item with TItemMultiPart with IHighlight
{ {

6
src/main/scala/edx/mechanical/mech/gearshaft/NodeGearShaft.scala
View file

@ -4,9 +4,9 @@ import edx.core.interfaces.TNodeMechanical
import edx.mechanical.mech.gear.{NodeGear, PartGear} import edx.mechanical.mech.gear.{NodeGear, PartGear}
import edx.mechanical.mech.grid.NodeMechanical import edx.mechanical.mech.grid.NodeMechanical
import net.minecraftforge.common.util.ForgeDirection import net.minecraftforge.common.util.ForgeDirection
import resonant.api.tile.INodeProvider import resonantengine.api.tile.INodeProvider
import resonant.lib.transform.vector.Vector3 import resonantengine.lib.transform.vector.Vector3
import resonant.lib.wrapper.ForgeDirectionWrapper._ import resonantengine.lib.wrapper.ForgeDirectionWrapper._
class NodeGearShaft(parent: PartGearShaft) extends NodeMechanical(parent) class NodeGearShaft(parent: PartGearShaft) extends NodeMechanical(parent)
{ {

6
src/main/scala/edx/mechanical/mech/gearshaft/RenderGearShaft.scala
View file

@ -9,9 +9,9 @@ import net.minecraftforge.client.model.AdvancedModelLoader
import net.minecraftforge.common.util.ForgeDirection import net.minecraftforge.common.util.ForgeDirection
import org.lwjgl.opengl.GL11 import org.lwjgl.opengl.GL11
import org.lwjgl.opengl.GL11.glRotatef import org.lwjgl.opengl.GL11.glRotatef
import resonant.api.items.ISimpleItemRenderer import resonantengine.api.items.ISimpleItemRenderer
import resonant.lib.render.RenderUtility import resonantengine.lib.render.RenderUtility
import resonant.lib.wrapper.ForgeDirectionWrapper._ import resonantengine.lib.wrapper.ForgeDirectionWrapper._
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
object RenderGearShaft extends ISimpleItemRenderer object RenderGearShaft extends ISimpleItemRenderer

4
src/main/scala/edx/mechanical/mech/grid/GridMechanical.scala
View file

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

8
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.interfaces.TNodeMechanical
import edx.core.prefab.node.TMultipartNode import edx.core.prefab.node.TMultipartNode
import resonant.api.tile.INodeProvider import resonantengine.api.tile.INodeProvider
import resonant.lib.debug.IDebugInfo import resonantengine.core.debug.IDebugInfo
import resonant.lib.grid.core.{GridNode, NodeGrid, TTileConnector} import resonantengine.lib.grid.core.{GridNode, NodeGrid, TTileConnector}
import resonant.lib.transform.vector.IVectorWorld import resonantengine.lib.transform.vector.IVectorWorld
import scala.beans.BeanProperty import scala.beans.BeanProperty
import scala.collection.convert.wrapAll._ import scala.collection.convert.wrapAll._

2
src/main/scala/edx/mechanical/mech/process/crusher/RenderMechanicalPiston.scala
View file

@ -9,7 +9,7 @@ import net.minecraftforge.client.model.{AdvancedModelLoader, IModelCustom}
import net.minecraftforge.common.util.ForgeDirection import net.minecraftforge.common.util.ForgeDirection
import org.apache.commons.lang3.ArrayUtils import org.apache.commons.lang3.ArrayUtils
import org.lwjgl.opengl.GL11 import org.lwjgl.opengl.GL11
import resonant.lib.render.RenderUtility import resonantengine.lib.render.RenderUtility
@SideOnly(Side.CLIENT) object RenderMechanicalPiston @SideOnly(Side.CLIENT) object RenderMechanicalPiston
{ {

10
src/main/scala/edx/mechanical/mech/process/crusher/TileMechanicalPiston.scala
View file

@ -10,11 +10,11 @@ import net.minecraft.item.ItemStack
import net.minecraft.nbt.NBTTagCompound import net.minecraft.nbt.NBTTagCompound
import net.minecraft.tileentity.TileEntity import net.minecraft.tileentity.TileEntity
import net.minecraft.world.World import net.minecraft.world.World
import resonant.api.recipe.{MachineRecipes, RecipeResource, RecipeType} import resonantengine.api.recipe.{MachineRecipes, RecipeResource, RecipeType}
import resonant.lib.mod.config.Config import resonantengine.lib.mod.config.Config
import resonant.lib.transform.vector.Vector3 import resonantengine.lib.transform.vector.Vector3
import resonant.lib.utility.MovementUtility import resonantengine.lib.utility.MovementUtility
import resonant.lib.utility.inventory.InventoryUtility import resonantengine.lib.utility.inventory.InventoryUtility
/** /**
* Mechanical driven piston that can be used to move basic blocks and crush ores * Mechanical driven piston that can be used to move basic blocks and crush ores

14
src/main/scala/edx/mechanical/mech/process/grinder/TileGrindingWheel.scala
View file

@ -11,13 +11,13 @@ import net.minecraft.util.ResourceLocation
import net.minecraftforge.client.model.AdvancedModelLoader import net.minecraftforge.client.model.AdvancedModelLoader
import net.minecraftforge.common.util.ForgeDirection import net.minecraftforge.common.util.ForgeDirection
import org.lwjgl.opengl.GL11._ import org.lwjgl.opengl.GL11._
import resonant.api.recipe.{MachineRecipes, RecipeType} import resonantengine.api.recipe.{MachineRecipes, RecipeType}
import resonant.lib.prefab.Timer import resonantengine.lib.prefab.Timer
import resonant.lib.prefab.damage.CustomDamageSource import resonantengine.lib.prefab.damage.CustomDamageSource
import resonant.lib.render.RenderUtility import resonantengine.lib.render.RenderUtility
import resonant.lib.transform.region.Cuboid import resonantengine.lib.transform.region.Cuboid
import resonant.lib.transform.rotation.AngleAxis import resonantengine.lib.transform.rotation.AngleAxis
import resonant.lib.transform.vector.Vector3 import resonantengine.lib.transform.vector.Vector3
/** /**
* The grinding wheel. This block will face the direction in which it can rotate. * The grinding wheel. This block will face the direction in which it can rotate.

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 edx.mechanical.mech.grid.NodeMechanical
import net.minecraftforge.common.util.ForgeDirection import net.minecraftforge.common.util.ForgeDirection
import resonant.api.tile.INodeProvider import resonantengine.api.tile.INodeProvider
/** /**
* Node designed just for the Mixer to use * Node designed just for the Mixer to use

4
src/main/scala/edx/mechanical/mech/process/mixer/RenderMixer.scala
View file

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

10
src/main/scala/edx/mechanical/mech/process/mixer/TileMixer.scala
View file

@ -15,11 +15,11 @@ import net.minecraftforge.client.model.{AdvancedModelLoader, IModelCustom}
import net.minecraftforge.fluids.IFluidBlock import net.minecraftforge.fluids.IFluidBlock
import org.lwjgl.opengl.GL11 import org.lwjgl.opengl.GL11
import org.lwjgl.opengl.GL11._ import org.lwjgl.opengl.GL11._
import resonant.api.recipe.{MachineRecipes, RecipeType} import resonantengine.api.recipe.{MachineRecipes, RecipeType}
import resonant.lib.prefab.Timer import resonantengine.lib.prefab.Timer
import resonant.lib.render.RenderUtility import resonantengine.lib.render.RenderUtility
import resonant.lib.transform.rotation.Quaternion import resonantengine.lib.transform.rotation.Quaternion
import resonant.lib.transform.vector.Vector3 import resonantengine.lib.transform.vector.Vector3
import scala.collection.JavaConversions._ import scala.collection.JavaConversions._

Some files were not shown because too many files have changed in this diff Show more