From bd822efe00f9d4427d7da878a7b828c1bb97ef24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20N=C3=BCcke?= Date: Wed, 8 Oct 2014 18:25:24 +0200 Subject: [PATCH] Yet more refactoring \o/ --- src/main/scala/li/cil/oc/Settings.scala | 2 +- .../oc/client/gui/DynamicGuiContainer.scala | 2 +- .../li/cil/oc/client/gui/TextBuffer.scala | 2 +- .../cil/oc/client/renderer/block/Cable.scala | 2 +- .../renderer/tileentity/ScreenRenderer.scala | 2 +- .../scala/li/cil/oc/common/EventHandler.scala | 10 +- src/main/scala/li/cil/oc/common/Proxy.scala | 41 ++++--- .../cil/oc/common/asm/ClassTransformer.scala | 4 +- .../scala/li/cil/oc/common/block/Cable.scala | 2 +- .../scala/li/cil/oc/common/block/Case.scala | 2 +- .../li/cil/oc/common/block/Charger.scala | 2 +- .../li/cil/oc/common/block/DiskDrive.scala | 2 +- .../cil/oc/common/block/PowerConverter.scala | 4 +- .../li/cil/oc/common/block/Redstone.scala | 2 +- .../cil/oc/common/block/RedstoneAware.scala | 2 +- .../cil/oc/common/block/RobotAfterimage.scala | 2 +- .../li/cil/oc/common/block/RobotProxy.scala | 2 +- .../scala/li/cil/oc/common/block/Screen.scala | 2 +- .../common/block/traits/PowerAcceptor.scala | 2 +- .../UniversalElectricityToolHandler.scala | 2 +- .../scala/li/cil/oc/common/init/Items.scala | 2 +- .../cil/oc/common/item/AbstractBusCard.scala | 2 +- .../li/cil/oc/common/item/IronNugget.scala | 2 +- .../li/cil/oc/common/item/RedstoneCard.scala | 6 +- .../li/cil/oc/common/recipe/Recipes.scala | 4 +- .../oc/common/tileentity/AccessPoint.scala | 2 +- .../cil/oc/common/tileentity/Hologram.scala | 4 +- .../cil/oc/common/tileentity/Redstone.scala | 2 +- .../cil/oc/common/tileentity/RobotProxy.scala | 2 +- .../cil/oc/common/tileentity/ServerRack.scala | 6 +- .../li/cil/oc/common/tileentity/Switch.scala | 2 +- .../tileentity/traits/AbstractBusAware.scala | 4 +- .../traits/BundledRedstoneAware.scala | 4 +- .../common/tileentity/traits/Computer.scala | 6 +- .../tileentity/traits/RedstoneAware.scala | 2 +- .../traits/power/AppliedEnergistics2.scala | 2 +- .../tileentity/traits/power/BuildCraft.scala | 2 +- .../traits/power/Factorization.scala | 2 +- .../traits/power/Galacticraft.scala | 2 +- .../power/IndustrialCraft2Classic.scala | 2 +- .../power/IndustrialCraft2Experimental.scala | 2 +- .../tileentity/traits/power/Mekanism.scala | 2 +- .../traits/power/RedstoneFlux.scala | 2 +- .../traits/power/UniversalElectricity.scala | 2 +- .../scala/li/cil/oc/integration/IMod.java | 2 - .../oc/{util/mods => integration}/Mods.scala | 110 +++++++++++------- .../scala/li/cil/oc/integration/Registry.java | 28 ----- .../cil/oc/integration/appeng/ModAppEng.java | 2 +- .../integration/buildcraft/ModBuildCraft.java | 2 +- .../cofh/energy/ModCoFHEnergy.java | 2 +- .../cofh/tileentity/ModCoFHTileEntity.java | 2 +- .../cofh/transport/ModCoFHTransport.java | 2 +- .../DriverComputerCraftMedia.scala | 4 +- .../computercraft/ModComputerCraft.scala | 2 +- .../oc/integration/enderio/ModEnderIO.java | 2 +- .../enderstorage/ModEnderStorage.java | 2 +- .../oc/integration/forestry/ModForestry.java | 2 +- .../oc/integration/gregtech/ModGregtech.java | 2 +- .../integration/ic2/ModIndustrialCraft2.java | 2 +- .../integration/mystcraft/ModMystcraft.java | 2 +- .../DriverBlockEnvironments.scala | 2 +- .../opencomputers/DriverRedstoneCard.scala | 4 +- .../opencomputers/ModOpenComputers.scala | 2 +- .../integration/railcraft/ModRailcraft.java | 2 +- .../DriverAbstractBusCard.scala | 5 +- .../stargatetech2/StargateTech2.scala | 3 +- .../integration/thaumcraft/ModThaumcraft.java | 2 +- .../thermalexpansion/ModThermalExpansion.java | 2 +- .../integration/tmechworks/ModTMechworks.java | 2 +- .../util}/BuildCraft.scala | 2 +- .../util}/BundledRedstone.scala | 4 +- .../util}/ComputerCraft.scala | 2 +- .../mods => integration/util}/GregTech.scala | 2 +- .../util}/IndustrialCraft2.scala | 3 +- .../{util/mods => integration/util}/NEI.scala | 3 +- .../mods => integration/util}/PortalGun.scala | 3 +- .../util}/ProjectRed.scala | 2 +- .../util}/StargateTech2.scala | 2 +- .../util}/TinkersConstruct.scala | 2 +- .../util}/UniversalElectricity.scala | 2 +- .../mods => integration/util}/Waila.scala | 3 +- .../util}/WirelessRedstone.scala | 3 +- .../util}/WirelessRedstoneCBE.scala | 2 +- .../util}/WirelessRedstoneSV.scala | 2 +- .../oc/integration/vanilla/ModVanilla.scala | 2 +- .../server/component/RedstoneWireless.scala | 18 +-- .../oc/server/component/robot/Player.scala | 6 +- .../li/cil/oc/server/fs/FileSystem.scala | 4 +- .../li/cil/oc/server/network/Network.scala | 2 +- src/main/scala/li/cil/oc/util/ItemCosts.scala | 2 +- 90 files changed, 210 insertions(+), 212 deletions(-) rename src/main/scala/li/cil/oc/{util/mods => integration}/Mods.scala (86%) delete mode 100644 src/main/scala/li/cil/oc/integration/Registry.java rename src/main/scala/li/cil/oc/integration/{opencomputers => stargatetech2}/DriverAbstractBusCard.scala (88%) rename src/main/scala/li/cil/oc/{util/mods => integration/util}/BuildCraft.scala (96%) rename src/main/scala/li/cil/oc/{util/mods => integration/util}/BundledRedstone.scala (73%) rename src/main/scala/li/cil/oc/{util/mods => integration/util}/ComputerCraft.scala (98%) rename src/main/scala/li/cil/oc/{util/mods => integration/util}/GregTech.scala (96%) rename src/main/scala/li/cil/oc/{util/mods => integration/util}/IndustrialCraft2.scala (87%) rename src/main/scala/li/cil/oc/{util/mods => integration/util}/NEI.scala (98%) rename src/main/scala/li/cil/oc/{util/mods => integration/util}/PortalGun.scala (88%) rename src/main/scala/li/cil/oc/{util/mods => integration/util}/ProjectRed.scala (82%) rename src/main/scala/li/cil/oc/{util/mods => integration/util}/StargateTech2.scala (92%) rename src/main/scala/li/cil/oc/{util/mods => integration/util}/TinkersConstruct.scala (83%) rename src/main/scala/li/cil/oc/{util/mods => integration/util}/UniversalElectricity.scala (92%) rename src/main/scala/li/cil/oc/{util/mods => integration/util}/Waila.scala (98%) rename src/main/scala/li/cil/oc/{util/mods => integration/util}/WirelessRedstone.scala (92%) rename src/main/scala/li/cil/oc/{util/mods => integration/util}/WirelessRedstoneCBE.scala (97%) rename src/main/scala/li/cil/oc/{util/mods => integration/util}/WirelessRedstoneSV.scala (98%) diff --git a/src/main/scala/li/cil/oc/Settings.scala b/src/main/scala/li/cil/oc/Settings.scala index 384be2ecd..6650a9708 100644 --- a/src/main/scala/li/cil/oc/Settings.scala +++ b/src/main/scala/li/cil/oc/Settings.scala @@ -12,7 +12,7 @@ import cpw.mods.fml.common.Loader import cpw.mods.fml.common.versioning.DefaultArtifactVersion import cpw.mods.fml.common.versioning.VersionRange import li.cil.oc.api.component.TextBuffer.ColorDepth -import li.cil.oc.util.mods.Mods +import li.cil.oc.integration.Mods import org.apache.commons.lang3.StringEscapeUtils import scala.collection.convert.WrapAsScala._ diff --git a/src/main/scala/li/cil/oc/client/gui/DynamicGuiContainer.scala b/src/main/scala/li/cil/oc/client/gui/DynamicGuiContainer.scala index 2fc764a85..ec9713ffa 100644 --- a/src/main/scala/li/cil/oc/client/gui/DynamicGuiContainer.scala +++ b/src/main/scala/li/cil/oc/client/gui/DynamicGuiContainer.scala @@ -4,7 +4,7 @@ import li.cil.oc.client.Textures import li.cil.oc.common.container.ComponentSlot import li.cil.oc.common.container.Player import li.cil.oc.util.RenderState -import li.cil.oc.util.mods.NEI +import li.cil.oc.integration.util.NEI import li.cil.oc.Localization import li.cil.oc.common import net.minecraft.client.renderer.Tessellator diff --git a/src/main/scala/li/cil/oc/client/gui/TextBuffer.scala b/src/main/scala/li/cil/oc/client/gui/TextBuffer.scala index 9ce48986f..457fff1ca 100644 --- a/src/main/scala/li/cil/oc/client/gui/TextBuffer.scala +++ b/src/main/scala/li/cil/oc/client/gui/TextBuffer.scala @@ -5,7 +5,7 @@ import li.cil.oc.client.renderer.gui.BufferRenderer import li.cil.oc.client.KeyBindings import li.cil.oc.client.Textures import li.cil.oc.util.RenderState -import li.cil.oc.util.mods.NEI +import li.cil.oc.integration.util.NEI import net.minecraft.client.Minecraft import net.minecraft.client.gui.GuiScreen import net.minecraft.client.renderer.Tessellator diff --git a/src/main/scala/li/cil/oc/client/renderer/block/Cable.scala b/src/main/scala/li/cil/oc/client/renderer/block/Cable.scala index 6d5148663..7e928146f 100644 --- a/src/main/scala/li/cil/oc/client/renderer/block/Cable.scala +++ b/src/main/scala/li/cil/oc/client/renderer/block/Cable.scala @@ -3,7 +3,7 @@ package li.cil.oc.client.renderer.block import codechicken.multipart.TileMultipart import li.cil.oc.client.Textures import li.cil.oc.common -import li.cil.oc.util.mods.Mods +import li.cil.oc.integration.Mods import net.minecraft.block.Block import net.minecraft.client.renderer.RenderBlocks import net.minecraft.tileentity.TileEntity diff --git a/src/main/scala/li/cil/oc/client/renderer/tileentity/ScreenRenderer.scala b/src/main/scala/li/cil/oc/client/renderer/tileentity/ScreenRenderer.scala index 798b20437..9bcb67622 100644 --- a/src/main/scala/li/cil/oc/client/renderer/tileentity/ScreenRenderer.scala +++ b/src/main/scala/li/cil/oc/client/renderer/tileentity/ScreenRenderer.scala @@ -5,7 +5,7 @@ import li.cil.oc.client.Textures import li.cil.oc.common.block import li.cil.oc.common.tileentity.Screen import li.cil.oc.util.RenderState -import li.cil.oc.util.mods.BuildCraft +import li.cil.oc.integration.util.BuildCraft import net.minecraft.client.Minecraft import net.minecraft.client.renderer.Tessellator import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer diff --git a/src/main/scala/li/cil/oc/common/EventHandler.scala b/src/main/scala/li/cil/oc/common/EventHandler.scala index de7c0670c..789df3478 100644 --- a/src/main/scala/li/cil/oc/common/EventHandler.scala +++ b/src/main/scala/li/cil/oc/common/EventHandler.scala @@ -11,12 +11,12 @@ import li.cil.oc.api.Network import li.cil.oc.client.renderer.PetRenderer import li.cil.oc.client.{PacketSender => ClientPacketSender} import li.cil.oc.common.tileentity.traits.power +import li.cil.oc.integration.Mods import li.cil.oc.server.{PacketSender => ServerPacketSender} import li.cil.oc.util.LuaStateFactory import li.cil.oc.util.SideTracker import li.cil.oc.util.UpdateCheck -import li.cil.oc.util.mods -import li.cil.oc.util.mods.Mods +import li.cil.oc.integration.util import net.minecraft.client.Minecraft import net.minecraft.entity.player.EntityPlayerMP import net.minecraft.item.ItemStack @@ -88,8 +88,8 @@ object EventHandler { def scheduleWirelessRedstone(rs: server.component.RedstoneWireless) { if (SideTracker.isServer) pending.synchronized { pending += (() => if (!rs.owner.isInvalid) { - mods.WirelessRedstone.addReceiver(rs) - mods.WirelessRedstone.updateOutput(rs) + util.WirelessRedstone.addReceiver(rs) + util.WirelessRedstone.updateOutput(rs) }) } } @@ -114,7 +114,7 @@ object EventHandler { if (!LuaStateFactory.isAvailable) { player.addChatMessage(Localization.Chat.WarningLuaFallback) } - if (Mods.ProjectRedTransmission.isAvailable && !mods.ProjectRed.isAPIAvailable) { + if (Mods.ProjectRedTransmission.isAvailable && !util.ProjectRed.isAPIAvailable) { player.addChatMessage(Localization.Chat.WarningProjectRed) } if (!Settings.get.pureIgnorePower && Settings.get.ignorePower) { diff --git a/src/main/scala/li/cil/oc/common/Proxy.scala b/src/main/scala/li/cil/oc/common/Proxy.scala index 1c2ac11ad..182a741d4 100644 --- a/src/main/scala/li/cil/oc/common/Proxy.scala +++ b/src/main/scala/li/cil/oc/common/Proxy.scala @@ -14,7 +14,7 @@ import li.cil.oc.common.multipart.MultiPart import li.cil.oc.common.recipe.Recipes import li.cil.oc.common.template.RobotTemplate import li.cil.oc.common.template.TabletTemplate -import li.cil.oc.integration.Registry +import li.cil.oc.integration.Mods import li.cil.oc.integration.appeng.ModAppEng import li.cil.oc.integration.buildcraft.ModBuildCraft import li.cil.oc.integration.cofh.energy.ModCoFHEnergy @@ -40,8 +40,7 @@ import li.cil.oc.server.machine.luaj.LuaJLuaArchitecture import li.cil.oc.server.network.WirelessNetwork import li.cil.oc.util.LuaStateFactory import li.cil.oc.util.UpdateCheck -import li.cil.oc.util.mods.ComputerCraft -import li.cil.oc.util.mods.Mods +import li.cil.oc.integration.util.ComputerCraft import net.minecraft.item.ItemStack import net.minecraft.nbt.NBTTagCompound import net.minecraftforge.common.ForgeChunkManager @@ -99,28 +98,28 @@ class Proxy { OpenComputers.channel.register(server.PacketHandler) OpenComputers.log.info("Initializing OpenComputers drivers.") - Registry.add(new ModAppEng) - Registry.add(new ModBuildCraft) - Registry.add(new ModCoFHEnergy) - Registry.add(new ModCoFHTileEntity) - Registry.add(new ModCoFHTransport) - Registry.add(new ModEnderIO) - Registry.add(new ModEnderStorage) - Registry.add(new ModForestry) - Registry.add(new ModGregtech) - Registry.add(new ModIndustrialCraft2) - Registry.add(new ModMystcraft) - Registry.add(ModOpenComputers) - Registry.add(new ModRailcraft) - Registry.add(new ModThaumcraft) - Registry.add(new ModThermalExpansion) - Registry.add(new ModTMechworks) - Registry.add(ModVanilla) + Mods.integrate(new ModAppEng) + Mods.integrate(new ModBuildCraft) + Mods.integrate(new ModCoFHEnergy) + Mods.integrate(new ModCoFHTileEntity) + Mods.integrate(new ModCoFHTransport) + Mods.integrate(new ModEnderIO) + Mods.integrate(new ModEnderStorage) + Mods.integrate(new ModForestry) + Mods.integrate(new ModGregtech) + Mods.integrate(new ModIndustrialCraft2) + Mods.integrate(new ModMystcraft) + Mods.integrate(ModOpenComputers) + Mods.integrate(new ModRailcraft) + Mods.integrate(new ModThaumcraft) + Mods.integrate(new ModThermalExpansion) + Mods.integrate(new ModTMechworks) + Mods.integrate(ModVanilla) // Register the general IPeripheral driver last, if at all, to avoid it // being used rather than other more concrete implementations, such as // is the case in the Redstone in Motion driver (replaces 'move'). - Registry.add(ModComputerCraft) + Mods.integrate(ModComputerCraft) OpenComputers.log.info("Initializing assembler templates.") RobotTemplate.register() diff --git a/src/main/scala/li/cil/oc/common/asm/ClassTransformer.scala b/src/main/scala/li/cil/oc/common/asm/ClassTransformer.scala index a1ecd79d1..695c6c90a 100644 --- a/src/main/scala/li/cil/oc/common/asm/ClassTransformer.scala +++ b/src/main/scala/li/cil/oc/common/asm/ClassTransformer.scala @@ -2,8 +2,8 @@ package li.cil.oc.common.asm import cpw.mods.fml.common.asm.transformers.deobf.FMLDeobfuscatingRemapper import li.cil.oc.common.asm.template.SimpleComponentImpl -import li.cil.oc.util.mods.Mods -import li.cil.oc.util.mods.Mods.Mod +import li.cil.oc.integration.Mods +import Mods.Mod import net.minecraft.launchwrapper.IClassTransformer import net.minecraft.launchwrapper.LaunchClassLoader import org.apache.logging.log4j.LogManager diff --git a/src/main/scala/li/cil/oc/common/block/Cable.scala b/src/main/scala/li/cil/oc/common/block/Cable.scala index 0d3bcac6c..51972d013 100644 --- a/src/main/scala/li/cil/oc/common/block/Cable.scala +++ b/src/main/scala/li/cil/oc/common/block/Cable.scala @@ -13,8 +13,8 @@ import li.cil.oc.api.tileentity.SidedEnvironment import li.cil.oc.client.Textures import li.cil.oc.common.multipart.CablePart import li.cil.oc.common.tileentity +import li.cil.oc.integration.Mods import li.cil.oc.util.Color -import li.cil.oc.util.mods.Mods import net.minecraft.block.Block import net.minecraft.client.renderer.texture.IIconRegister import net.minecraft.tileentity.TileEntity diff --git a/src/main/scala/li/cil/oc/common/block/Case.scala b/src/main/scala/li/cil/oc/common/block/Case.scala index 7830e8bce..934e6484c 100644 --- a/src/main/scala/li/cil/oc/common/block/Case.scala +++ b/src/main/scala/li/cil/oc/common/block/Case.scala @@ -6,7 +6,7 @@ import cpw.mods.fml.relauncher.Side import cpw.mods.fml.relauncher.SideOnly import li.cil.oc.common.GuiType import li.cil.oc.common.tileentity -import li.cil.oc.util.mods.BuildCraft +import li.cil.oc.integration.util.BuildCraft import li.cil.oc.util.Color import li.cil.oc.util.Tooltip import li.cil.oc.OpenComputers diff --git a/src/main/scala/li/cil/oc/common/block/Charger.scala b/src/main/scala/li/cil/oc/common/block/Charger.scala index bf478b25a..8fce8f1dc 100644 --- a/src/main/scala/li/cil/oc/common/block/Charger.scala +++ b/src/main/scala/li/cil/oc/common/block/Charger.scala @@ -6,7 +6,7 @@ import li.cil.oc.client.Textures import li.cil.oc.common.GuiType import li.cil.oc.common.tileentity import li.cil.oc.server.PacketSender -import li.cil.oc.util.mods.BuildCraft +import li.cil.oc.integration.util.BuildCraft import net.minecraft.block.Block import net.minecraft.client.renderer.texture.IIconRegister import net.minecraft.entity.player.EntityPlayer diff --git a/src/main/scala/li/cil/oc/common/block/DiskDrive.scala b/src/main/scala/li/cil/oc/common/block/DiskDrive.scala index 9b6154d39..74ba1d8a0 100644 --- a/src/main/scala/li/cil/oc/common/block/DiskDrive.scala +++ b/src/main/scala/li/cil/oc/common/block/DiskDrive.scala @@ -3,8 +3,8 @@ package li.cil.oc.common.block import li.cil.oc.OpenComputers import li.cil.oc.common.GuiType import li.cil.oc.common.tileentity +import li.cil.oc.integration.Mods import li.cil.oc.util.Tooltip -import li.cil.oc.util.mods.Mods import net.minecraft.entity.player.EntityPlayer import net.minecraft.item.ItemStack import net.minecraft.world.World diff --git a/src/main/scala/li/cil/oc/common/block/PowerConverter.scala b/src/main/scala/li/cil/oc/common/block/PowerConverter.scala index bc396c882..7daef5553 100644 --- a/src/main/scala/li/cil/oc/common/block/PowerConverter.scala +++ b/src/main/scala/li/cil/oc/common/block/PowerConverter.scala @@ -5,9 +5,9 @@ import java.util import li.cil.oc.Settings import li.cil.oc.common.tileentity +import li.cil.oc.integration.Mods import li.cil.oc.util.Tooltip -import li.cil.oc.util.mods.Mods -import li.cil.oc.util.mods.NEI +import li.cil.oc.integration.util.NEI import net.minecraft.entity.player.EntityPlayer import net.minecraft.item.ItemStack import net.minecraft.world.World diff --git a/src/main/scala/li/cil/oc/common/block/Redstone.scala b/src/main/scala/li/cil/oc/common/block/Redstone.scala index 4438e5560..06245ab08 100644 --- a/src/main/scala/li/cil/oc/common/block/Redstone.scala +++ b/src/main/scala/li/cil/oc/common/block/Redstone.scala @@ -3,8 +3,8 @@ package li.cil.oc.common.block import java.util import li.cil.oc.common.tileentity +import li.cil.oc.integration.Mods import li.cil.oc.util.Tooltip -import li.cil.oc.util.mods.Mods import net.minecraft.entity.player.EntityPlayer import net.minecraft.item.ItemStack import net.minecraft.world.World diff --git a/src/main/scala/li/cil/oc/common/block/RedstoneAware.scala b/src/main/scala/li/cil/oc/common/block/RedstoneAware.scala index d0c438db2..0574ec91c 100644 --- a/src/main/scala/li/cil/oc/common/block/RedstoneAware.scala +++ b/src/main/scala/li/cil/oc/common/block/RedstoneAware.scala @@ -2,7 +2,7 @@ package li.cil.oc.common.block import cpw.mods.fml.common.Optional import li.cil.oc.common.tileentity -import li.cil.oc.util.mods.Mods +import li.cil.oc.integration.Mods import net.minecraft.block.Block import net.minecraft.world.IBlockAccess import net.minecraft.world.World diff --git a/src/main/scala/li/cil/oc/common/block/RobotAfterimage.scala b/src/main/scala/li/cil/oc/common/block/RobotAfterimage.scala index 171da305e..fc66bbcf9 100644 --- a/src/main/scala/li/cil/oc/common/block/RobotAfterimage.scala +++ b/src/main/scala/li/cil/oc/common/block/RobotAfterimage.scala @@ -7,7 +7,7 @@ import cpw.mods.fml.relauncher.SideOnly import li.cil.oc.Settings import li.cil.oc.api import li.cil.oc.common.tileentity -import li.cil.oc.util.mods.NEI +import li.cil.oc.integration.util.NEI import net.minecraft.client.renderer.texture.IIconRegister import net.minecraft.entity.player.EntityPlayer import net.minecraft.item.EnumRarity diff --git a/src/main/scala/li/cil/oc/common/block/RobotProxy.scala b/src/main/scala/li/cil/oc/common/block/RobotProxy.scala index 01d024a1c..e8b0497b8 100644 --- a/src/main/scala/li/cil/oc/common/block/RobotProxy.scala +++ b/src/main/scala/li/cil/oc/common/block/RobotProxy.scala @@ -14,7 +14,7 @@ import li.cil.oc.server.PacketSender import li.cil.oc.server.component.robot import li.cil.oc.util.ItemUtils import li.cil.oc.util.Tooltip -import li.cil.oc.util.mods.NEI +import li.cil.oc.integration.util.NEI import net.minecraft.client.renderer.texture.IIconRegister import net.minecraft.entity.Entity import net.minecraft.entity.EntityLivingBase diff --git a/src/main/scala/li/cil/oc/common/block/Screen.scala b/src/main/scala/li/cil/oc/common/block/Screen.scala index 8467cf652..7e5ee801f 100644 --- a/src/main/scala/li/cil/oc/common/block/Screen.scala +++ b/src/main/scala/li/cil/oc/common/block/Screen.scala @@ -11,7 +11,7 @@ import li.cil.oc.common.tileentity import li.cil.oc.util.Color import li.cil.oc.util.PackedColor import li.cil.oc.util.Tooltip -import li.cil.oc.util.mods.BuildCraft +import li.cil.oc.integration.util.BuildCraft import net.minecraft.client.renderer.texture.IIconRegister import net.minecraft.entity.Entity import net.minecraft.entity.EntityLivingBase diff --git a/src/main/scala/li/cil/oc/common/block/traits/PowerAcceptor.scala b/src/main/scala/li/cil/oc/common/block/traits/PowerAcceptor.scala index 96efdc0bd..70b1ebc81 100644 --- a/src/main/scala/li/cil/oc/common/block/traits/PowerAcceptor.scala +++ b/src/main/scala/li/cil/oc/common/block/traits/PowerAcceptor.scala @@ -5,8 +5,8 @@ import java.util import cpw.mods.fml.common.Optional import li.cil.oc.common.block.SimpleBlock import li.cil.oc.common.tileentity.traits.power.UniversalElectricity +import li.cil.oc.integration.Mods import li.cil.oc.util.Tooltip -import li.cil.oc.util.mods.Mods import net.minecraft.block.Block import net.minecraft.entity.player.EntityPlayer import net.minecraft.item.ItemStack diff --git a/src/main/scala/li/cil/oc/common/event/UniversalElectricityToolHandler.scala b/src/main/scala/li/cil/oc/common/event/UniversalElectricityToolHandler.scala index fea727314..cc8c61637 100644 --- a/src/main/scala/li/cil/oc/common/event/UniversalElectricityToolHandler.scala +++ b/src/main/scala/li/cil/oc/common/event/UniversalElectricityToolHandler.scala @@ -2,7 +2,7 @@ package li.cil.oc.common.event import cpw.mods.fml.common.eventhandler.SubscribeEvent import li.cil.oc.api.event.RobotUsedToolEvent -import li.cil.oc.util.mods.UniversalElectricity +import li.cil.oc.integration.util.UniversalElectricity object UniversalElectricityToolHandler { @SubscribeEvent diff --git a/src/main/scala/li/cil/oc/common/init/Items.scala b/src/main/scala/li/cil/oc/common/init/Items.scala index 04b0d0da5..976a48523 100644 --- a/src/main/scala/li/cil/oc/common/init/Items.scala +++ b/src/main/scala/li/cil/oc/common/init/Items.scala @@ -9,8 +9,8 @@ import li.cil.oc.common.Loot import li.cil.oc.common.Tier import li.cil.oc.common.item import li.cil.oc.common.recipe.Recipes +import li.cil.oc.integration.Mods import li.cil.oc.util.Color -import li.cil.oc.util.mods.Mods import net.minecraft.block.Block import net.minecraft.creativetab.CreativeTabs import net.minecraft.entity.player.EntityPlayer diff --git a/src/main/scala/li/cil/oc/common/item/AbstractBusCard.scala b/src/main/scala/li/cil/oc/common/item/AbstractBusCard.scala index 9a9867915..b69c76d57 100644 --- a/src/main/scala/li/cil/oc/common/item/AbstractBusCard.scala +++ b/src/main/scala/li/cil/oc/common/item/AbstractBusCard.scala @@ -1,6 +1,6 @@ package li.cil.oc.common.item -import li.cil.oc.util.mods.Mods +import li.cil.oc.integration.Mods class AbstractBusCard(val parent: Delegator) extends Delegate with ItemTier { showInItemList = Mods.StargateTech2.isAvailable diff --git a/src/main/scala/li/cil/oc/common/item/IronNugget.scala b/src/main/scala/li/cil/oc/common/item/IronNugget.scala index 272b2d083..bda127968 100644 --- a/src/main/scala/li/cil/oc/common/item/IronNugget.scala +++ b/src/main/scala/li/cil/oc/common/item/IronNugget.scala @@ -1,6 +1,6 @@ package li.cil.oc.common.item -import li.cil.oc.util.mods.Mods +import li.cil.oc.integration.Mods class IronNugget(val parent: Delegator) extends Delegate { showInItemList = !Mods.GregTech.isAvailable diff --git a/src/main/scala/li/cil/oc/common/item/RedstoneCard.scala b/src/main/scala/li/cil/oc/common/item/RedstoneCard.scala index f8b23e792..d331e9d61 100644 --- a/src/main/scala/li/cil/oc/common/item/RedstoneCard.scala +++ b/src/main/scala/li/cil/oc/common/item/RedstoneCard.scala @@ -3,10 +3,10 @@ package li.cil.oc.common.item import java.util import li.cil.oc.common.Tier +import li.cil.oc.integration.Mods import li.cil.oc.util.Tooltip -import li.cil.oc.util.mods.BundledRedstone -import li.cil.oc.util.mods.Mods -import li.cil.oc.util.mods.WirelessRedstone +import li.cil.oc.integration.util.BundledRedstone +import li.cil.oc.integration.util.WirelessRedstone import net.minecraft.item.ItemStack class RedstoneCard(val parent: Delegator, val tier: Int) extends Delegate with ItemTier { diff --git a/src/main/scala/li/cil/oc/common/recipe/Recipes.scala b/src/main/scala/li/cil/oc/common/recipe/Recipes.scala index 4fcd30c58..4001b43bf 100644 --- a/src/main/scala/li/cil/oc/common/recipe/Recipes.scala +++ b/src/main/scala/li/cil/oc/common/recipe/Recipes.scala @@ -10,8 +10,8 @@ import li.cil.oc._ import li.cil.oc.common.block.SimpleBlock import li.cil.oc.common.init.Items import li.cil.oc.util.Color -import li.cil.oc.util.mods.GregTech -import li.cil.oc.util.mods.NEI +import li.cil.oc.integration.util.GregTech +import li.cil.oc.integration.util.NEI import net.minecraft.block.Block import net.minecraft.item.Item import net.minecraft.item.ItemBlock diff --git a/src/main/scala/li/cil/oc/common/tileentity/AccessPoint.scala b/src/main/scala/li/cil/oc/common/tileentity/AccessPoint.scala index 3c826fc51..da385eebc 100644 --- a/src/main/scala/li/cil/oc/common/tileentity/AccessPoint.scala +++ b/src/main/scala/li/cil/oc/common/tileentity/AccessPoint.scala @@ -9,8 +9,8 @@ import li.cil.oc.api.machine.Arguments import li.cil.oc.api.machine.Callback import li.cil.oc.api.machine.Context import li.cil.oc.api.network._ +import li.cil.oc.integration.Mods import li.cil.oc.util.ExtendedNBT._ -import li.cil.oc.util.mods.Mods import net.minecraft.entity.player.EntityPlayer import net.minecraft.nbt.NBTTagCompound import net.minecraftforge.common.util.Constants.NBT diff --git a/src/main/scala/li/cil/oc/common/tileentity/Hologram.scala b/src/main/scala/li/cil/oc/common/tileentity/Hologram.scala index 687807ca0..9036da795 100644 --- a/src/main/scala/li/cil/oc/common/tileentity/Hologram.scala +++ b/src/main/scala/li/cil/oc/common/tileentity/Hologram.scala @@ -11,9 +11,9 @@ import li.cil.oc.api.network._ import li.cil.oc.api.tileentity.Analyzable import li.cil.oc.api.tileentity.SidedEnvironment import li.cil.oc.common.SaveHandler +import li.cil.oc.integration.Mods import li.cil.oc.server.{PacketSender => ServerPacketSender} -import li.cil.oc.util.mods.Mods -import li.cil.oc.util.mods.Waila +import li.cil.oc.integration.util.Waila import net.minecraft.entity.player.EntityPlayer import net.minecraft.nbt.NBTTagCompound import net.minecraft.util.AxisAlignedBB diff --git a/src/main/scala/li/cil/oc/common/tileentity/Redstone.scala b/src/main/scala/li/cil/oc/common/tileentity/Redstone.scala index fb1fbfe2b..e007ff34f 100644 --- a/src/main/scala/li/cil/oc/common/tileentity/Redstone.scala +++ b/src/main/scala/li/cil/oc/common/tileentity/Redstone.scala @@ -6,7 +6,7 @@ import li.cil.oc.common.tileentity.traits.BundledRedstoneAware import li.cil.oc.common.tileentity.traits.Environment import li.cil.oc.server.component import li.cil.oc.util.ExtendedNBT._ -import li.cil.oc.util.mods.BundledRedstone +import li.cil.oc.integration.util.BundledRedstone import net.minecraft.nbt.NBTTagCompound import net.minecraftforge.common.util.ForgeDirection diff --git a/src/main/scala/li/cil/oc/common/tileentity/RobotProxy.scala b/src/main/scala/li/cil/oc/common/tileentity/RobotProxy.scala index 4c83374c9..073e9e16d 100644 --- a/src/main/scala/li/cil/oc/common/tileentity/RobotProxy.scala +++ b/src/main/scala/li/cil/oc/common/tileentity/RobotProxy.scala @@ -8,7 +8,7 @@ import li.cil.oc.api.machine.Arguments import li.cil.oc.api.machine.Callback import li.cil.oc.api.machine.Context import li.cil.oc.api.network._ -import li.cil.oc.util.mods.Mods +import li.cil.oc.integration.Mods import mods.immibis.redlogic.api.wiring.IWire import net.minecraft.entity.Entity import net.minecraft.entity.player.EntityPlayer diff --git a/src/main/scala/li/cil/oc/common/tileentity/ServerRack.scala b/src/main/scala/li/cil/oc/common/tileentity/ServerRack.scala index a14c54bf4..83ee297bb 100644 --- a/src/main/scala/li/cil/oc/common/tileentity/ServerRack.scala +++ b/src/main/scala/li/cil/oc/common/tileentity/ServerRack.scala @@ -12,13 +12,13 @@ import li.cil.oc.api.network._ import li.cil.oc.api.tileentity.Analyzable import li.cil.oc.client.Sound import li.cil.oc.common.Tier -import li.cil.oc.integration.opencomputers.DriverAbstractBusCard +import li.cil.oc.integration.Mods import li.cil.oc.integration.opencomputers.DriverRedstoneCard +import li.cil.oc.integration.stargatetech2.DriverAbstractBusCard import li.cil.oc.server.component import li.cil.oc.server.{PacketSender => ServerPacketSender} import li.cil.oc.util.ExtendedNBT._ -import li.cil.oc.util.mods.Mods -import li.cil.oc.util.mods.Waila +import li.cil.oc.integration.util.Waila import net.minecraft.entity.player.EntityPlayer import net.minecraft.item.ItemStack import net.minecraft.nbt.NBTTagCompound diff --git a/src/main/scala/li/cil/oc/common/tileentity/Switch.scala b/src/main/scala/li/cil/oc/common/tileentity/Switch.scala index 525d17986..590f24b2c 100644 --- a/src/main/scala/li/cil/oc/common/tileentity/Switch.scala +++ b/src/main/scala/li/cil/oc/common/tileentity/Switch.scala @@ -14,8 +14,8 @@ import li.cil.oc.common.InventorySlots import li.cil.oc.common.Slot import li.cil.oc.common.init.Items import li.cil.oc.common.item +import li.cil.oc.integration.Mods import li.cil.oc.server.PacketSender -import li.cil.oc.util.mods.Mods import net.minecraft.item.ItemStack import net.minecraft.nbt.NBTTagCompound import net.minecraftforge.common.util.ForgeDirection diff --git a/src/main/scala/li/cil/oc/common/tileentity/traits/AbstractBusAware.scala b/src/main/scala/li/cil/oc/common/tileentity/traits/AbstractBusAware.scala index e34bf0ca2..b215732a9 100644 --- a/src/main/scala/li/cil/oc/common/tileentity/traits/AbstractBusAware.scala +++ b/src/main/scala/li/cil/oc/common/tileentity/traits/AbstractBusAware.scala @@ -5,10 +5,10 @@ import cpw.mods.fml.relauncher.Side import cpw.mods.fml.relauncher.SideOnly import li.cil.oc.api.network import li.cil.oc.api.network.ManagedEnvironment +import li.cil.oc.integration.Mods import li.cil.oc.server.component import li.cil.oc.server.{PacketSender => ServerPacketSender} -import li.cil.oc.util.mods.Mods -import li.cil.oc.util.mods.StargateTech2 +import li.cil.oc.integration.util.StargateTech2 import net.minecraft.nbt.NBTTagCompound import stargatetech2.api.StargateTechAPI import stargatetech2.api.bus.IBusDevice diff --git a/src/main/scala/li/cil/oc/common/tileentity/traits/BundledRedstoneAware.scala b/src/main/scala/li/cil/oc/common/tileentity/traits/BundledRedstoneAware.scala index 1da732f4d..6ab3bf8af 100644 --- a/src/main/scala/li/cil/oc/common/tileentity/traits/BundledRedstoneAware.scala +++ b/src/main/scala/li/cil/oc/common/tileentity/traits/BundledRedstoneAware.scala @@ -2,9 +2,9 @@ package li.cil.oc.common.tileentity.traits import cpw.mods.fml.common.Optional import li.cil.oc.Settings +import li.cil.oc.integration.Mods import li.cil.oc.util.ExtendedNBT._ -import li.cil.oc.util.mods.Mods -import li.cil.oc.util.mods.ProjectRed +import li.cil.oc.integration.util.ProjectRed import mods.immibis.redlogic.api.wiring.IBundledEmitter import mods.immibis.redlogic.api.wiring.IBundledUpdatable import mods.immibis.redlogic.api.wiring.IInsulatedRedstoneWire diff --git a/src/main/scala/li/cil/oc/common/tileentity/traits/Computer.scala b/src/main/scala/li/cil/oc/common/tileentity/traits/Computer.scala index 5fc046827..f10f23046 100644 --- a/src/main/scala/li/cil/oc/common/tileentity/traits/Computer.scala +++ b/src/main/scala/li/cil/oc/common/tileentity/traits/Computer.scala @@ -15,12 +15,12 @@ import li.cil.oc.api.tileentity.Analyzable import li.cil.oc.client.Sound import li.cil.oc.common.Slot import li.cil.oc.common.tileentity.RobotProxy -import li.cil.oc.integration.opencomputers.DriverAbstractBusCard +import li.cil.oc.integration.Mods import li.cil.oc.integration.opencomputers.DriverRedstoneCard +import li.cil.oc.integration.stargatetech2.DriverAbstractBusCard import li.cil.oc.server.{PacketSender => ServerPacketSender} import li.cil.oc.util.ExtendedNBT._ -import li.cil.oc.util.mods.Mods -import li.cil.oc.util.mods.Waila +import li.cil.oc.integration.util.Waila import net.minecraft.entity.player.EntityPlayer import net.minecraft.nbt.NBTTagCompound import net.minecraft.nbt.NBTTagString diff --git a/src/main/scala/li/cil/oc/common/tileentity/traits/RedstoneAware.scala b/src/main/scala/li/cil/oc/common/tileentity/traits/RedstoneAware.scala index b4d2bcc60..3659c2b96 100644 --- a/src/main/scala/li/cil/oc/common/tileentity/traits/RedstoneAware.scala +++ b/src/main/scala/li/cil/oc/common/tileentity/traits/RedstoneAware.scala @@ -4,8 +4,8 @@ import cpw.mods.fml.common.Optional import cpw.mods.fml.relauncher.Side import cpw.mods.fml.relauncher.SideOnly import li.cil.oc.Settings +import li.cil.oc.integration.Mods import li.cil.oc.server.{PacketSender => ServerPacketSender} -import li.cil.oc.util.mods.Mods import mods.immibis.redlogic.api.wiring.IConnectable import mods.immibis.redlogic.api.wiring.IRedstoneEmitter import mods.immibis.redlogic.api.wiring.IRedstoneUpdatable diff --git a/src/main/scala/li/cil/oc/common/tileentity/traits/power/AppliedEnergistics2.scala b/src/main/scala/li/cil/oc/common/tileentity/traits/power/AppliedEnergistics2.scala index dc87a2d65..35981be85 100644 --- a/src/main/scala/li/cil/oc/common/tileentity/traits/power/AppliedEnergistics2.scala +++ b/src/main/scala/li/cil/oc/common/tileentity/traits/power/AppliedEnergistics2.scala @@ -13,7 +13,7 @@ import appeng.api.util.DimensionalCoord import cpw.mods.fml.common.Optional import li.cil.oc.Settings import li.cil.oc.common.EventHandler -import li.cil.oc.util.mods.Mods +import li.cil.oc.integration.Mods import net.minecraft.nbt.NBTTagCompound import net.minecraftforge.common.util.ForgeDirection diff --git a/src/main/scala/li/cil/oc/common/tileentity/traits/power/BuildCraft.scala b/src/main/scala/li/cil/oc/common/tileentity/traits/power/BuildCraft.scala index bad1d4372..68dff0212 100644 --- a/src/main/scala/li/cil/oc/common/tileentity/traits/power/BuildCraft.scala +++ b/src/main/scala/li/cil/oc/common/tileentity/traits/power/BuildCraft.scala @@ -5,8 +5,8 @@ import buildcraft.api.power.PowerHandler import cpw.mods.fml.common.Optional import li.cil.oc.OpenComputers import li.cil.oc.Settings +import li.cil.oc.integration.Mods import li.cil.oc.util.ExtendedNBT._ -import li.cil.oc.util.mods.Mods import net.minecraft.nbt.NBTTagCompound import net.minecraftforge.common.util.ForgeDirection diff --git a/src/main/scala/li/cil/oc/common/tileentity/traits/power/Factorization.scala b/src/main/scala/li/cil/oc/common/tileentity/traits/power/Factorization.scala index 56aca528c..1a8bf9d36 100644 --- a/src/main/scala/li/cil/oc/common/tileentity/traits/power/Factorization.scala +++ b/src/main/scala/li/cil/oc/common/tileentity/traits/power/Factorization.scala @@ -6,7 +6,7 @@ import factorization.api.Coord import factorization.api.IChargeConductor import li.cil.oc.OpenComputers import li.cil.oc.Settings -import li.cil.oc.util.mods.Mods +import li.cil.oc.integration.Mods import net.minecraft.nbt.NBTTagCompound trait Factorization extends Common { diff --git a/src/main/scala/li/cil/oc/common/tileentity/traits/power/Galacticraft.scala b/src/main/scala/li/cil/oc/common/tileentity/traits/power/Galacticraft.scala index 911ccd86c..6bf40426a 100644 --- a/src/main/scala/li/cil/oc/common/tileentity/traits/power/Galacticraft.scala +++ b/src/main/scala/li/cil/oc/common/tileentity/traits/power/Galacticraft.scala @@ -2,7 +2,7 @@ package li.cil.oc.common.tileentity.traits.power import cpw.mods.fml.common.Optional import li.cil.oc.Settings -import li.cil.oc.util.mods.Mods +import li.cil.oc.integration.Mods import micdoodle8.mods.galacticraft.api.power.EnergySource import net.minecraftforge.common.util.ForgeDirection diff --git a/src/main/scala/li/cil/oc/common/tileentity/traits/power/IndustrialCraft2Classic.scala b/src/main/scala/li/cil/oc/common/tileentity/traits/power/IndustrialCraft2Classic.scala index 92587eba6..7a72789f5 100644 --- a/src/main/scala/li/cil/oc/common/tileentity/traits/power/IndustrialCraft2Classic.scala +++ b/src/main/scala/li/cil/oc/common/tileentity/traits/power/IndustrialCraft2Classic.scala @@ -6,7 +6,7 @@ import ic2classic.api.Direction import li.cil.oc.OpenComputers import li.cil.oc.Settings import li.cil.oc.common.EventHandler -import li.cil.oc.util.mods.Mods +import li.cil.oc.integration.Mods import net.minecraft.nbt.NBTTagCompound import net.minecraft.tileentity.TileEntity import net.minecraftforge.common.MinecraftForge diff --git a/src/main/scala/li/cil/oc/common/tileentity/traits/power/IndustrialCraft2Experimental.scala b/src/main/scala/li/cil/oc/common/tileentity/traits/power/IndustrialCraft2Experimental.scala index 7922c1bdf..b2f4266f7 100644 --- a/src/main/scala/li/cil/oc/common/tileentity/traits/power/IndustrialCraft2Experimental.scala +++ b/src/main/scala/li/cil/oc/common/tileentity/traits/power/IndustrialCraft2Experimental.scala @@ -5,7 +5,7 @@ import cpw.mods.fml.common.eventhandler.Event import li.cil.oc.OpenComputers import li.cil.oc.Settings import li.cil.oc.common.EventHandler -import li.cil.oc.util.mods.Mods +import li.cil.oc.integration.Mods import net.minecraft.nbt.NBTTagCompound import net.minecraftforge.common.MinecraftForge import net.minecraftforge.common.util.ForgeDirection diff --git a/src/main/scala/li/cil/oc/common/tileentity/traits/power/Mekanism.scala b/src/main/scala/li/cil/oc/common/tileentity/traits/power/Mekanism.scala index e9b70d024..7accf7769 100644 --- a/src/main/scala/li/cil/oc/common/tileentity/traits/power/Mekanism.scala +++ b/src/main/scala/li/cil/oc/common/tileentity/traits/power/Mekanism.scala @@ -2,7 +2,7 @@ package li.cil.oc.common.tileentity.traits.power import cpw.mods.fml.common.Optional import li.cil.oc.Settings -import li.cil.oc.util.mods.Mods +import li.cil.oc.integration.Mods import net.minecraftforge.common.util.ForgeDirection trait Mekanism extends Common { diff --git a/src/main/scala/li/cil/oc/common/tileentity/traits/power/RedstoneFlux.scala b/src/main/scala/li/cil/oc/common/tileentity/traits/power/RedstoneFlux.scala index e729ec904..08c6ebdbc 100644 --- a/src/main/scala/li/cil/oc/common/tileentity/traits/power/RedstoneFlux.scala +++ b/src/main/scala/li/cil/oc/common/tileentity/traits/power/RedstoneFlux.scala @@ -2,7 +2,7 @@ package li.cil.oc.common.tileentity.traits.power import cpw.mods.fml.common.Optional import li.cil.oc.Settings -import li.cil.oc.util.mods.Mods +import li.cil.oc.integration.Mods import net.minecraftforge.common.util.ForgeDirection trait RedstoneFlux extends Common { diff --git a/src/main/scala/li/cil/oc/common/tileentity/traits/power/UniversalElectricity.scala b/src/main/scala/li/cil/oc/common/tileentity/traits/power/UniversalElectricity.scala index 3f6c7d9e9..883cf1e38 100644 --- a/src/main/scala/li/cil/oc/common/tileentity/traits/power/UniversalElectricity.scala +++ b/src/main/scala/li/cil/oc/common/tileentity/traits/power/UniversalElectricity.scala @@ -4,8 +4,8 @@ import cpw.mods.fml.common.Optional import li.cil.oc.OpenComputers import li.cil.oc.Settings import li.cil.oc.common.EventHandler +import li.cil.oc.integration.Mods import li.cil.oc.util.ExtendedNBT._ -import li.cil.oc.util.mods.Mods import net.minecraft.nbt.NBTTagCompound import net.minecraftforge.common.util.ForgeDirection import universalelectricity.api.core.grid.INode diff --git a/src/main/scala/li/cil/oc/integration/IMod.java b/src/main/scala/li/cil/oc/integration/IMod.java index c6d7fc079..339538a18 100644 --- a/src/main/scala/li/cil/oc/integration/IMod.java +++ b/src/main/scala/li/cil/oc/integration/IMod.java @@ -1,7 +1,5 @@ package li.cil.oc.integration; -import li.cil.oc.util.mods.Mods; - public interface IMod { Mods.Mod getMod(); diff --git a/src/main/scala/li/cil/oc/util/mods/Mods.scala b/src/main/scala/li/cil/oc/integration/Mods.scala similarity index 86% rename from src/main/scala/li/cil/oc/util/mods/Mods.scala rename to src/main/scala/li/cil/oc/integration/Mods.scala index 20ddf98a7..eb1979958 100644 --- a/src/main/scala/li/cil/oc/util/mods/Mods.scala +++ b/src/main/scala/li/cil/oc/integration/Mods.scala @@ -1,4 +1,4 @@ -package li.cil.oc.util.mods +package li.cil.oc.integration import cpw.mods.fml.common.Loader import cpw.mods.fml.common.ModAPIManager @@ -8,54 +8,14 @@ import li.cil.oc.Settings import scala.collection.mutable object Mods { - - object IDs { - final val AppliedEnergistics2 = "appliedenergistics2" - final val BattleGear2 = "battlegear2" - final val BuildCraft = "BuildCraft|Core" - final val BuildCraftPower = "BuildCraftAPI|power" - final val CoFHEnergy = "CoFHAPI|energy" - final val CoFHTileEntity = "CoFHAPI|tileentity" - final val CoFHTransport = "CoFHAPI|transport" - final val ComputerCraft = "ComputerCraft" - final val CraftingCosts = "CraftingCosts" - final val ElectricalAge = "Eln" - final val EnderIO = "EnderIO" - final val EnderStorage = "EnderStorage" - final val Factorization = "factorization" - final val Forestry = "Forestry" - final val ForgeMultipart = "ForgeMultipart" - final val Galacticraft = "Galacticraft API" - final val GregTech = "gregtech" - final val IndustrialCraft2 = "IC2" - final val IndustrialCraft2API = "IC2API" - final val IndustrialCraft2Classic = "IC2-Classic" - final val Mekanism = "Mekanism" - final val Minecraft = "Minecraft" - final val MineFactoryReloaded = "MineFactoryReloaded" - final val Mystcraft = "Mystcraft" - final val NotEnoughItems = "NotEnoughItems" - final val OpenComputers = "OpenComputers" - final val PortalGun = "PortalGun" - final val ProjectRedTransmission = "ProjRed|Transmission" - final val Railcraft = "Railcraft" - final val RedLogic = "RedLogic" - final val StargateTech2 = "StargateTech2" - final val Thaumcraft = "Thaumcraft" - final val ThermalExpansion = "ThermalExpansion" - final val TinkersConstruct = "TConstruct" - final val TMechWorks = "TMechworks" - final val UniversalElectricity = "UniversalElectricity" - final val VersionChecker = "VersionChecker" - final val Waila = "Waila" - final val WirelessRedstoneCBE = "WR-CBE|Core" - final val WirelessRedstoneSV = "WirelessRedstoneCore" - } + private val handlers = mutable.Set.empty[IMod] private val knownMods = mutable.ArrayBuffer.empty[Mod] lazy val isPowerProvidingModPresent = knownMods.exists(mod => mod.providesPower && mod.isAvailable) + // ----------------------------------------------------------------------- // + val AppliedEnergistics2 = new SimpleMod(IDs.AppliedEnergistics2) val BattleGear2 = new SimpleMod(IDs.BattleGear2) val BuildCraft = new SimpleMod(IDs.BuildCraft) @@ -107,6 +67,68 @@ object Mods { val WirelessRedstoneCBE = new SimpleMod(IDs.WirelessRedstoneCBE) val WirelessRedstoneSV = new SimpleMod(IDs.WirelessRedstoneSV) + // ----------------------------------------------------------------------- // + + def integrate(mod: IMod) { + val isBlacklisted = Settings.get.modBlacklist.contains(mod.getMod.id) + val alwaysEnabled = mod.getMod == null || mod == Mods.Minecraft + if (!isBlacklisted && (alwaysEnabled || mod.getMod.isAvailable) && handlers.add(mod)) { + OpenComputers.log.info(String.format("Initializing converters and drivers for '%s'.", mod.getMod.id)) + try mod.initialize() catch { + case e: Throwable => { + OpenComputers.log.warn(String.format("Error initializing handler for '%s'", mod.getMod.id), e) + } + } + } + } + + // ----------------------------------------------------------------------- // + + object IDs { + final val AppliedEnergistics2 = "appliedenergistics2" + final val BattleGear2 = "battlegear2" + final val BuildCraft = "BuildCraft|Core" + final val BuildCraftPower = "BuildCraftAPI|power" + final val CoFHEnergy = "CoFHAPI|energy" + final val CoFHTileEntity = "CoFHAPI|tileentity" + final val CoFHTransport = "CoFHAPI|transport" + final val ComputerCraft = "ComputerCraft" + final val CraftingCosts = "CraftingCosts" + final val ElectricalAge = "Eln" + final val EnderIO = "EnderIO" + final val EnderStorage = "EnderStorage" + final val Factorization = "factorization" + final val Forestry = "Forestry" + final val ForgeMultipart = "ForgeMultipart" + final val Galacticraft = "Galacticraft API" + final val GregTech = "gregtech" + final val IndustrialCraft2 = "IC2" + final val IndustrialCraft2API = "IC2API" + final val IndustrialCraft2Classic = "IC2-Classic" + final val Mekanism = "Mekanism" + final val Minecraft = "Minecraft" + final val MineFactoryReloaded = "MineFactoryReloaded" + final val Mystcraft = "Mystcraft" + final val NotEnoughItems = "NotEnoughItems" + final val OpenComputers = "OpenComputers" + final val PortalGun = "PortalGun" + final val ProjectRedTransmission = "ProjRed|Transmission" + final val Railcraft = "Railcraft" + final val RedLogic = "RedLogic" + final val StargateTech2 = "StargateTech2" + final val Thaumcraft = "Thaumcraft" + final val ThermalExpansion = "ThermalExpansion" + final val TinkersConstruct = "TConstruct" + final val TMechWorks = "TMechworks" + final val UniversalElectricity = "UniversalElectricity" + final val VersionChecker = "VersionChecker" + final val Waila = "Waila" + final val WirelessRedstoneCBE = "WR-CBE|Core" + final val WirelessRedstoneSV = "WirelessRedstoneCore" + } + + // ----------------------------------------------------------------------- // + trait Mod { knownMods += this diff --git a/src/main/scala/li/cil/oc/integration/Registry.java b/src/main/scala/li/cil/oc/integration/Registry.java deleted file mode 100644 index 01c39a1c9..000000000 --- a/src/main/scala/li/cil/oc/integration/Registry.java +++ /dev/null @@ -1,28 +0,0 @@ -package li.cil.oc.integration; - -import li.cil.oc.OpenComputers; -import li.cil.oc.Settings; -import li.cil.oc.util.mods.Mods; - -import java.util.HashSet; -import java.util.Set; - -public final class Registry { - private static final Set handlers = new HashSet(); - - private Registry() { - } - - public static void add(final IMod mod) { - final boolean isBlacklisted = Settings.get().modBlacklist().contains(mod.getMod().id()); - final boolean alwaysEnabled = mod.getMod() == null || mod == Mods.Minecraft(); - if (!isBlacklisted && (alwaysEnabled || mod.getMod().isAvailable()) && handlers.add(mod)) { - OpenComputers.log().info(String.format("Initializing converters and drivers for '%s'.", mod.getMod().id())); - try { - mod.initialize(); - } catch (Throwable e) { - OpenComputers.log().warn(String.format("Error initializing handler for '%s'", mod.getMod().id()), e); - } - } - } -} diff --git a/src/main/scala/li/cil/oc/integration/appeng/ModAppEng.java b/src/main/scala/li/cil/oc/integration/appeng/ModAppEng.java index 7d90ed666..14dd54f7f 100644 --- a/src/main/scala/li/cil/oc/integration/appeng/ModAppEng.java +++ b/src/main/scala/li/cil/oc/integration/appeng/ModAppEng.java @@ -2,7 +2,7 @@ package li.cil.oc.integration.appeng; import li.cil.oc.api.Driver; import li.cil.oc.integration.IMod; -import li.cil.oc.util.mods.Mods; +import li.cil.oc.integration.util.Mods; public class ModAppEng implements IMod { @Override diff --git a/src/main/scala/li/cil/oc/integration/buildcraft/ModBuildCraft.java b/src/main/scala/li/cil/oc/integration/buildcraft/ModBuildCraft.java index 71a95b7af..ea24a908d 100644 --- a/src/main/scala/li/cil/oc/integration/buildcraft/ModBuildCraft.java +++ b/src/main/scala/li/cil/oc/integration/buildcraft/ModBuildCraft.java @@ -2,7 +2,7 @@ package li.cil.oc.integration.buildcraft; import li.cil.oc.api.Driver; import li.cil.oc.integration.IMod; -import li.cil.oc.util.mods.Mods; +import li.cil.oc.integration.Mods; public final class ModBuildCraft implements IMod { @Override diff --git a/src/main/scala/li/cil/oc/integration/cofh/energy/ModCoFHEnergy.java b/src/main/scala/li/cil/oc/integration/cofh/energy/ModCoFHEnergy.java index 2690c732b..4c9c762bb 100644 --- a/src/main/scala/li/cil/oc/integration/cofh/energy/ModCoFHEnergy.java +++ b/src/main/scala/li/cil/oc/integration/cofh/energy/ModCoFHEnergy.java @@ -2,7 +2,7 @@ package li.cil.oc.integration.cofh.energy; import li.cil.oc.api.Driver; import li.cil.oc.integration.IMod; -import li.cil.oc.util.mods.Mods; +import li.cil.oc.integration.Mods; public final class ModCoFHEnergy implements IMod { @Override diff --git a/src/main/scala/li/cil/oc/integration/cofh/tileentity/ModCoFHTileEntity.java b/src/main/scala/li/cil/oc/integration/cofh/tileentity/ModCoFHTileEntity.java index 5953c05b0..d29caef42 100644 --- a/src/main/scala/li/cil/oc/integration/cofh/tileentity/ModCoFHTileEntity.java +++ b/src/main/scala/li/cil/oc/integration/cofh/tileentity/ModCoFHTileEntity.java @@ -2,7 +2,7 @@ package li.cil.oc.integration.cofh.tileentity; import li.cil.oc.api.Driver; import li.cil.oc.integration.IMod; -import li.cil.oc.util.mods.Mods; +import li.cil.oc.integration.Mods; public final class ModCoFHTileEntity implements IMod { @Override diff --git a/src/main/scala/li/cil/oc/integration/cofh/transport/ModCoFHTransport.java b/src/main/scala/li/cil/oc/integration/cofh/transport/ModCoFHTransport.java index aa906eb68..7bdffbe3d 100644 --- a/src/main/scala/li/cil/oc/integration/cofh/transport/ModCoFHTransport.java +++ b/src/main/scala/li/cil/oc/integration/cofh/transport/ModCoFHTransport.java @@ -2,7 +2,7 @@ package li.cil.oc.integration.cofh.transport; import li.cil.oc.api.Driver; import li.cil.oc.integration.IMod; -import li.cil.oc.util.mods.Mods; +import li.cil.oc.integration.Mods; public final class ModCoFHTransport implements IMod { @Override diff --git a/src/main/scala/li/cil/oc/integration/computercraft/DriverComputerCraftMedia.scala b/src/main/scala/li/cil/oc/integration/computercraft/DriverComputerCraftMedia.scala index 715583858..6d3fe7ab1 100644 --- a/src/main/scala/li/cil/oc/integration/computercraft/DriverComputerCraftMedia.scala +++ b/src/main/scala/li/cil/oc/integration/computercraft/DriverComputerCraftMedia.scala @@ -6,9 +6,9 @@ import li.cil.oc.Settings import li.cil.oc.api.driver.EnvironmentHost import li.cil.oc.api.fs.Label import li.cil.oc.common.Slot +import li.cil.oc.integration.Mods import li.cil.oc.integration.opencomputers.Item -import li.cil.oc.util.mods.ComputerCraft -import li.cil.oc.util.mods.Mods +import li.cil.oc.integration.util.ComputerCraft import net.minecraft.item.ItemStack import net.minecraft.nbt.NBTTagCompound diff --git a/src/main/scala/li/cil/oc/integration/computercraft/ModComputerCraft.scala b/src/main/scala/li/cil/oc/integration/computercraft/ModComputerCraft.scala index 093ead214..23710ee9d 100644 --- a/src/main/scala/li/cil/oc/integration/computercraft/ModComputerCraft.scala +++ b/src/main/scala/li/cil/oc/integration/computercraft/ModComputerCraft.scala @@ -2,7 +2,7 @@ package li.cil.oc.integration.computercraft import li.cil.oc.api.Driver import li.cil.oc.integration.IMod -import li.cil.oc.util.mods.Mods +import li.cil.oc.integration.Mods object ModComputerCraft extends IMod { def getMod = Mods.ComputerCraft diff --git a/src/main/scala/li/cil/oc/integration/enderio/ModEnderIO.java b/src/main/scala/li/cil/oc/integration/enderio/ModEnderIO.java index 9088d1bdb..1d61fc641 100644 --- a/src/main/scala/li/cil/oc/integration/enderio/ModEnderIO.java +++ b/src/main/scala/li/cil/oc/integration/enderio/ModEnderIO.java @@ -2,7 +2,7 @@ package li.cil.oc.integration.enderio; import li.cil.oc.api.Driver; import li.cil.oc.integration.IMod; -import li.cil.oc.util.mods.Mods; +import li.cil.oc.integration.Mods; public final class ModEnderIO implements IMod { @Override diff --git a/src/main/scala/li/cil/oc/integration/enderstorage/ModEnderStorage.java b/src/main/scala/li/cil/oc/integration/enderstorage/ModEnderStorage.java index 7cae0b46c..281f0debf 100644 --- a/src/main/scala/li/cil/oc/integration/enderstorage/ModEnderStorage.java +++ b/src/main/scala/li/cil/oc/integration/enderstorage/ModEnderStorage.java @@ -2,7 +2,7 @@ package li.cil.oc.integration.enderstorage; import li.cil.oc.api.Driver; import li.cil.oc.integration.IMod; -import li.cil.oc.util.mods.Mods; +import li.cil.oc.integration.Mods; public final class ModEnderStorage implements IMod { @Override diff --git a/src/main/scala/li/cil/oc/integration/forestry/ModForestry.java b/src/main/scala/li/cil/oc/integration/forestry/ModForestry.java index b3c7827b8..42ab160bb 100644 --- a/src/main/scala/li/cil/oc/integration/forestry/ModForestry.java +++ b/src/main/scala/li/cil/oc/integration/forestry/ModForestry.java @@ -2,7 +2,7 @@ package li.cil.oc.integration.forestry; import li.cil.oc.api.Driver; import li.cil.oc.integration.IMod; -import li.cil.oc.util.mods.Mods; +import li.cil.oc.integration.Mods; public class ModForestry implements IMod { @Override diff --git a/src/main/scala/li/cil/oc/integration/gregtech/ModGregtech.java b/src/main/scala/li/cil/oc/integration/gregtech/ModGregtech.java index 17c1a05b5..0df02e5f1 100644 --- a/src/main/scala/li/cil/oc/integration/gregtech/ModGregtech.java +++ b/src/main/scala/li/cil/oc/integration/gregtech/ModGregtech.java @@ -2,7 +2,7 @@ package li.cil.oc.integration.gregtech; import li.cil.oc.api.Driver; import li.cil.oc.integration.IMod; -import li.cil.oc.util.mods.Mods; +import li.cil.oc.integration.Mods; public final class ModGregtech implements IMod { @Override diff --git a/src/main/scala/li/cil/oc/integration/ic2/ModIndustrialCraft2.java b/src/main/scala/li/cil/oc/integration/ic2/ModIndustrialCraft2.java index 8f7675851..89d68ff9f 100644 --- a/src/main/scala/li/cil/oc/integration/ic2/ModIndustrialCraft2.java +++ b/src/main/scala/li/cil/oc/integration/ic2/ModIndustrialCraft2.java @@ -2,7 +2,7 @@ package li.cil.oc.integration.ic2; import li.cil.oc.api.Driver; import li.cil.oc.integration.IMod; -import li.cil.oc.util.mods.Mods; +import li.cil.oc.integration.Mods; public final class ModIndustrialCraft2 implements IMod { @Override diff --git a/src/main/scala/li/cil/oc/integration/mystcraft/ModMystcraft.java b/src/main/scala/li/cil/oc/integration/mystcraft/ModMystcraft.java index 7a0940c35..698e329e2 100644 --- a/src/main/scala/li/cil/oc/integration/mystcraft/ModMystcraft.java +++ b/src/main/scala/li/cil/oc/integration/mystcraft/ModMystcraft.java @@ -2,7 +2,7 @@ package li.cil.oc.integration.mystcraft; import li.cil.oc.api.Driver; import li.cil.oc.integration.IMod; -import li.cil.oc.util.mods.Mods; +import li.cil.oc.integration.Mods; public class ModMystcraft implements IMod { @Override diff --git a/src/main/scala/li/cil/oc/integration/opencomputers/DriverBlockEnvironments.scala b/src/main/scala/li/cil/oc/integration/opencomputers/DriverBlockEnvironments.scala index affbef73f..5b60ab8d8 100644 --- a/src/main/scala/li/cil/oc/integration/opencomputers/DriverBlockEnvironments.scala +++ b/src/main/scala/li/cil/oc/integration/opencomputers/DriverBlockEnvironments.scala @@ -8,7 +8,7 @@ import li.cil.oc.common import li.cil.oc.common.tileentity import li.cil.oc.server.component import li.cil.oc.server.machine.Machine -import li.cil.oc.util.mods.BundledRedstone +import li.cil.oc.integration.util.BundledRedstone import net.minecraft.block.Block import net.minecraft.item.ItemBlock import net.minecraft.item.ItemStack diff --git a/src/main/scala/li/cil/oc/integration/opencomputers/DriverRedstoneCard.scala b/src/main/scala/li/cil/oc/integration/opencomputers/DriverRedstoneCard.scala index 0ca348268..8ee6001c0 100644 --- a/src/main/scala/li/cil/oc/integration/opencomputers/DriverRedstoneCard.scala +++ b/src/main/scala/li/cil/oc/integration/opencomputers/DriverRedstoneCard.scala @@ -12,8 +12,8 @@ import li.cil.oc.common.item import li.cil.oc.common.tileentity.traits.BundledRedstoneAware import li.cil.oc.common.tileentity.traits.RedstoneAware import li.cil.oc.server.component -import li.cil.oc.util.mods.BundledRedstone -import li.cil.oc.util.mods.WirelessRedstone +import li.cil.oc.integration.util.BundledRedstone +import li.cil.oc.integration.util.WirelessRedstone import net.minecraft.item.ItemStack object DriverRedstoneCard extends Item with HostAware with EnvironmentAware { diff --git a/src/main/scala/li/cil/oc/integration/opencomputers/ModOpenComputers.scala b/src/main/scala/li/cil/oc/integration/opencomputers/ModOpenComputers.scala index c1fa40dd5..1907718ce 100644 --- a/src/main/scala/li/cil/oc/integration/opencomputers/ModOpenComputers.scala +++ b/src/main/scala/li/cil/oc/integration/opencomputers/ModOpenComputers.scala @@ -2,7 +2,7 @@ package li.cil.oc.integration.opencomputers import li.cil.oc.api import li.cil.oc.integration.IMod -import li.cil.oc.util.mods.Mods +import li.cil.oc.integration.Mods object ModOpenComputers extends IMod { override def getMod = Mods.OpenComputers diff --git a/src/main/scala/li/cil/oc/integration/railcraft/ModRailcraft.java b/src/main/scala/li/cil/oc/integration/railcraft/ModRailcraft.java index f378072f7..500165136 100644 --- a/src/main/scala/li/cil/oc/integration/railcraft/ModRailcraft.java +++ b/src/main/scala/li/cil/oc/integration/railcraft/ModRailcraft.java @@ -2,7 +2,7 @@ package li.cil.oc.integration.railcraft; import li.cil.oc.api.Driver; import li.cil.oc.integration.IMod; -import li.cil.oc.util.mods.Mods; +import li.cil.oc.integration.Mods; public final class ModRailcraft implements IMod { @Override diff --git a/src/main/scala/li/cil/oc/integration/opencomputers/DriverAbstractBusCard.scala b/src/main/scala/li/cil/oc/integration/stargatetech2/DriverAbstractBusCard.scala similarity index 88% rename from src/main/scala/li/cil/oc/integration/opencomputers/DriverAbstractBusCard.scala rename to src/main/scala/li/cil/oc/integration/stargatetech2/DriverAbstractBusCard.scala index a05f0ab2a..be1745c94 100644 --- a/src/main/scala/li/cil/oc/integration/opencomputers/DriverAbstractBusCard.scala +++ b/src/main/scala/li/cil/oc/integration/stargatetech2/DriverAbstractBusCard.scala @@ -1,12 +1,13 @@ -package li.cil.oc.integration.opencomputers +package li.cil.oc.integration.stargatetech2 import li.cil.oc.api import li.cil.oc.api.driver.EnvironmentAware import li.cil.oc.api.driver.EnvironmentHost import li.cil.oc.api.driver.item.HostAware import li.cil.oc.common.Slot +import li.cil.oc.integration.Mods +import li.cil.oc.integration.opencomputers.Item import li.cil.oc.server.component -import li.cil.oc.util.mods.Mods import net.minecraft.item.ItemStack import stargatetech2.api.bus.IBusDevice diff --git a/src/main/scala/li/cil/oc/integration/stargatetech2/StargateTech2.scala b/src/main/scala/li/cil/oc/integration/stargatetech2/StargateTech2.scala index a6e5adc6f..e88177a73 100644 --- a/src/main/scala/li/cil/oc/integration/stargatetech2/StargateTech2.scala +++ b/src/main/scala/li/cil/oc/integration/stargatetech2/StargateTech2.scala @@ -2,8 +2,7 @@ package li.cil.oc.integration.stargatetech2 import li.cil.oc.api import li.cil.oc.integration.IMod -import li.cil.oc.integration.opencomputers.DriverAbstractBusCard -import li.cil.oc.util.mods.Mods +import li.cil.oc.integration.Mods object StargateTech2 extends IMod { override def getMod = Mods.StargateTech2 diff --git a/src/main/scala/li/cil/oc/integration/thaumcraft/ModThaumcraft.java b/src/main/scala/li/cil/oc/integration/thaumcraft/ModThaumcraft.java index 61022ea59..b4610abf8 100644 --- a/src/main/scala/li/cil/oc/integration/thaumcraft/ModThaumcraft.java +++ b/src/main/scala/li/cil/oc/integration/thaumcraft/ModThaumcraft.java @@ -2,7 +2,7 @@ package li.cil.oc.integration.thaumcraft; import li.cil.oc.api.Driver; import li.cil.oc.integration.IMod; -import li.cil.oc.util.mods.Mods; +import li.cil.oc.integration.Mods; public class ModThaumcraft implements IMod { @Override diff --git a/src/main/scala/li/cil/oc/integration/thermalexpansion/ModThermalExpansion.java b/src/main/scala/li/cil/oc/integration/thermalexpansion/ModThermalExpansion.java index 079becbcc..e5133b6ec 100644 --- a/src/main/scala/li/cil/oc/integration/thermalexpansion/ModThermalExpansion.java +++ b/src/main/scala/li/cil/oc/integration/thermalexpansion/ModThermalExpansion.java @@ -2,7 +2,7 @@ package li.cil.oc.integration.thermalexpansion; import li.cil.oc.api.Driver; import li.cil.oc.integration.IMod; -import li.cil.oc.util.mods.Mods; +import li.cil.oc.integration.Mods; public final class ModThermalExpansion implements IMod { @Override diff --git a/src/main/scala/li/cil/oc/integration/tmechworks/ModTMechworks.java b/src/main/scala/li/cil/oc/integration/tmechworks/ModTMechworks.java index b5bd738d9..7968113e7 100644 --- a/src/main/scala/li/cil/oc/integration/tmechworks/ModTMechworks.java +++ b/src/main/scala/li/cil/oc/integration/tmechworks/ModTMechworks.java @@ -2,7 +2,7 @@ package li.cil.oc.integration.tmechworks; import li.cil.oc.api.Driver; import li.cil.oc.integration.IMod; -import li.cil.oc.util.mods.Mods; +import li.cil.oc.integration.Mods; public final class ModTMechworks implements IMod { @Override diff --git a/src/main/scala/li/cil/oc/util/mods/BuildCraft.scala b/src/main/scala/li/cil/oc/integration/util/BuildCraft.scala similarity index 96% rename from src/main/scala/li/cil/oc/util/mods/BuildCraft.scala rename to src/main/scala/li/cil/oc/integration/util/BuildCraft.scala index 3901637f3..333e30090 100644 --- a/src/main/scala/li/cil/oc/util/mods/BuildCraft.scala +++ b/src/main/scala/li/cil/oc/integration/util/BuildCraft.scala @@ -1,4 +1,4 @@ -package li.cil.oc.util.mods +package li.cil.oc.integration.util import buildcraft.api.tools.IToolWrench import cpw.mods.fml.common.ModAPIManager diff --git a/src/main/scala/li/cil/oc/util/mods/BundledRedstone.scala b/src/main/scala/li/cil/oc/integration/util/BundledRedstone.scala similarity index 73% rename from src/main/scala/li/cil/oc/util/mods/BundledRedstone.scala rename to src/main/scala/li/cil/oc/integration/util/BundledRedstone.scala index cbcdd0161..e63487213 100644 --- a/src/main/scala/li/cil/oc/util/mods/BundledRedstone.scala +++ b/src/main/scala/li/cil/oc/integration/util/BundledRedstone.scala @@ -1,4 +1,6 @@ -package li.cil.oc.util.mods +package li.cil.oc.integration.util + +import li.cil.oc.integration.Mods object BundledRedstone { def isAvailable = Mods.RedLogic.isAvailable || diff --git a/src/main/scala/li/cil/oc/util/mods/ComputerCraft.scala b/src/main/scala/li/cil/oc/integration/util/ComputerCraft.scala similarity index 98% rename from src/main/scala/li/cil/oc/util/mods/ComputerCraft.scala rename to src/main/scala/li/cil/oc/integration/util/ComputerCraft.scala index 0af508b9f..f486ead47 100644 --- a/src/main/scala/li/cil/oc/util/mods/ComputerCraft.scala +++ b/src/main/scala/li/cil/oc/integration/util/ComputerCraft.scala @@ -1,4 +1,4 @@ -package li.cil.oc.util.mods +package li.cil.oc.integration.util import dan200.computercraft.api.ComputerCraftAPI import dan200.computercraft.api.filesystem.IMount diff --git a/src/main/scala/li/cil/oc/util/mods/GregTech.scala b/src/main/scala/li/cil/oc/integration/util/GregTech.scala similarity index 96% rename from src/main/scala/li/cil/oc/util/mods/GregTech.scala rename to src/main/scala/li/cil/oc/integration/util/GregTech.scala index 35e2e3143..7b526bd59 100644 --- a/src/main/scala/li/cil/oc/util/mods/GregTech.scala +++ b/src/main/scala/li/cil/oc/integration/util/GregTech.scala @@ -1,4 +1,4 @@ -package li.cil.oc.util.mods +package li.cil.oc.integration.util import net.minecraft.item.ItemStack diff --git a/src/main/scala/li/cil/oc/util/mods/IndustrialCraft2.scala b/src/main/scala/li/cil/oc/integration/util/IndustrialCraft2.scala similarity index 87% rename from src/main/scala/li/cil/oc/util/mods/IndustrialCraft2.scala rename to src/main/scala/li/cil/oc/integration/util/IndustrialCraft2.scala index 4c0d4d36a..4c0ab7d32 100644 --- a/src/main/scala/li/cil/oc/util/mods/IndustrialCraft2.scala +++ b/src/main/scala/li/cil/oc/integration/util/IndustrialCraft2.scala @@ -1,5 +1,6 @@ -package li.cil.oc.util.mods +package li.cil.oc.integration.util +import li.cil.oc.integration.Mods import net.minecraft.item.ItemStack object IndustrialCraft2 { diff --git a/src/main/scala/li/cil/oc/util/mods/NEI.scala b/src/main/scala/li/cil/oc/integration/util/NEI.scala similarity index 98% rename from src/main/scala/li/cil/oc/util/mods/NEI.scala rename to src/main/scala/li/cil/oc/integration/util/NEI.scala index 89bcffefc..719809dae 100644 --- a/src/main/scala/li/cil/oc/util/mods/NEI.scala +++ b/src/main/scala/li/cil/oc/integration/util/NEI.scala @@ -1,4 +1,4 @@ -package li.cil.oc.util.mods +package li.cil.oc.integration.util import java.util @@ -13,6 +13,7 @@ import com.google.common.base.Strings import cpw.mods.fml.relauncher.Side import cpw.mods.fml.relauncher.SideOnly import li.cil.oc.api.driver.EnvironmentAware +import li.cil.oc.integration.Mods import li.cil.oc.server.driver.Registry import li.cil.oc.server.machine.Callbacks import net.minecraft.block.Block diff --git a/src/main/scala/li/cil/oc/util/mods/PortalGun.scala b/src/main/scala/li/cil/oc/integration/util/PortalGun.scala similarity index 88% rename from src/main/scala/li/cil/oc/util/mods/PortalGun.scala rename to src/main/scala/li/cil/oc/integration/util/PortalGun.scala index 742d1de6f..d0c33401a 100644 --- a/src/main/scala/li/cil/oc/util/mods/PortalGun.scala +++ b/src/main/scala/li/cil/oc/integration/util/PortalGun.scala @@ -1,5 +1,6 @@ -package li.cil.oc.util.mods +package li.cil.oc.integration.util +import li.cil.oc.integration.Mods import net.minecraft.item.ItemStack object PortalGun { diff --git a/src/main/scala/li/cil/oc/util/mods/ProjectRed.scala b/src/main/scala/li/cil/oc/integration/util/ProjectRed.scala similarity index 82% rename from src/main/scala/li/cil/oc/util/mods/ProjectRed.scala rename to src/main/scala/li/cil/oc/integration/util/ProjectRed.scala index 5edffb8a3..1cf171944 100644 --- a/src/main/scala/li/cil/oc/util/mods/ProjectRed.scala +++ b/src/main/scala/li/cil/oc/integration/util/ProjectRed.scala @@ -1,4 +1,4 @@ -package li.cil.oc.util.mods +package li.cil.oc.integration.util import mrtjp.projectred.api.ProjectRedAPI diff --git a/src/main/scala/li/cil/oc/util/mods/StargateTech2.scala b/src/main/scala/li/cil/oc/integration/util/StargateTech2.scala similarity index 92% rename from src/main/scala/li/cil/oc/util/mods/StargateTech2.scala rename to src/main/scala/li/cil/oc/integration/util/StargateTech2.scala index 2c1851561..41317fc0f 100644 --- a/src/main/scala/li/cil/oc/util/mods/StargateTech2.scala +++ b/src/main/scala/li/cil/oc/integration/util/StargateTech2.scala @@ -1,4 +1,4 @@ -package li.cil.oc.util.mods +package li.cil.oc.integration.util import net.minecraft.world.World import net.minecraftforge.common.MinecraftForge diff --git a/src/main/scala/li/cil/oc/util/mods/TinkersConstruct.scala b/src/main/scala/li/cil/oc/integration/util/TinkersConstruct.scala similarity index 83% rename from src/main/scala/li/cil/oc/util/mods/TinkersConstruct.scala rename to src/main/scala/li/cil/oc/integration/util/TinkersConstruct.scala index 39437c827..eb24e38f2 100644 --- a/src/main/scala/li/cil/oc/util/mods/TinkersConstruct.scala +++ b/src/main/scala/li/cil/oc/integration/util/TinkersConstruct.scala @@ -1,4 +1,4 @@ -package li.cil.oc.util.mods +package li.cil.oc.integration.util import net.minecraft.item.ItemStack diff --git a/src/main/scala/li/cil/oc/util/mods/UniversalElectricity.scala b/src/main/scala/li/cil/oc/integration/util/UniversalElectricity.scala similarity index 92% rename from src/main/scala/li/cil/oc/util/mods/UniversalElectricity.scala rename to src/main/scala/li/cil/oc/integration/util/UniversalElectricity.scala index 6d9497468..9b01969ce 100644 --- a/src/main/scala/li/cil/oc/util/mods/UniversalElectricity.scala +++ b/src/main/scala/li/cil/oc/integration/util/UniversalElectricity.scala @@ -1,4 +1,4 @@ -package li.cil.oc.util.mods +package li.cil.oc.integration.util import net.minecraft.item.ItemStack import net.minecraftforge.common.util.ForgeDirection diff --git a/src/main/scala/li/cil/oc/util/mods/Waila.scala b/src/main/scala/li/cil/oc/integration/util/Waila.scala similarity index 98% rename from src/main/scala/li/cil/oc/util/mods/Waila.scala rename to src/main/scala/li/cil/oc/integration/util/Waila.scala index b43b99a93..699a2ebb4 100644 --- a/src/main/scala/li/cil/oc/util/mods/Waila.scala +++ b/src/main/scala/li/cil/oc/integration/util/Waila.scala @@ -1,4 +1,4 @@ -package li.cil.oc.util.mods +package li.cil.oc.integration.util import java.util @@ -7,6 +7,7 @@ import li.cil.oc.Localization import li.cil.oc.Settings import li.cil.oc.common.block._ import li.cil.oc.common.tileentity +import li.cil.oc.integration.Mods import mcp.mobius.waila.api.IWailaConfigHandler import mcp.mobius.waila.api.IWailaDataAccessor import mcp.mobius.waila.api.IWailaDataProvider diff --git a/src/main/scala/li/cil/oc/util/mods/WirelessRedstone.scala b/src/main/scala/li/cil/oc/integration/util/WirelessRedstone.scala similarity index 92% rename from src/main/scala/li/cil/oc/util/mods/WirelessRedstone.scala rename to src/main/scala/li/cil/oc/integration/util/WirelessRedstone.scala index c03c828d6..db19c0341 100644 --- a/src/main/scala/li/cil/oc/util/mods/WirelessRedstone.scala +++ b/src/main/scala/li/cil/oc/integration/util/WirelessRedstone.scala @@ -1,5 +1,6 @@ -package li.cil.oc.util.mods +package li.cil.oc.integration.util +import li.cil.oc.integration.Mods import li.cil.oc.server.component.RedstoneWireless object WirelessRedstone { diff --git a/src/main/scala/li/cil/oc/util/mods/WirelessRedstoneCBE.scala b/src/main/scala/li/cil/oc/integration/util/WirelessRedstoneCBE.scala similarity index 97% rename from src/main/scala/li/cil/oc/util/mods/WirelessRedstoneCBE.scala rename to src/main/scala/li/cil/oc/integration/util/WirelessRedstoneCBE.scala index 22808050c..f8e368dca 100644 --- a/src/main/scala/li/cil/oc/util/mods/WirelessRedstoneCBE.scala +++ b/src/main/scala/li/cil/oc/integration/util/WirelessRedstoneCBE.scala @@ -1,4 +1,4 @@ -package li.cil.oc.util.mods +package li.cil.oc.integration.util import codechicken.wirelessredstone.core.WirelessReceivingDevice import codechicken.wirelessredstone.core.WirelessTransmittingDevice diff --git a/src/main/scala/li/cil/oc/util/mods/WirelessRedstoneSV.scala b/src/main/scala/li/cil/oc/integration/util/WirelessRedstoneSV.scala similarity index 98% rename from src/main/scala/li/cil/oc/util/mods/WirelessRedstoneSV.scala rename to src/main/scala/li/cil/oc/integration/util/WirelessRedstoneSV.scala index a83257186..fbeae9450 100644 --- a/src/main/scala/li/cil/oc/util/mods/WirelessRedstoneSV.scala +++ b/src/main/scala/li/cil/oc/integration/util/WirelessRedstoneSV.scala @@ -1,4 +1,4 @@ -package li.cil.oc.util.mods +package li.cil.oc.integration.util import li.cil.oc.server.component.RedstoneWireless import net.minecraft.world.World diff --git a/src/main/scala/li/cil/oc/integration/vanilla/ModVanilla.scala b/src/main/scala/li/cil/oc/integration/vanilla/ModVanilla.scala index af0e7d368..61b5fb149 100644 --- a/src/main/scala/li/cil/oc/integration/vanilla/ModVanilla.scala +++ b/src/main/scala/li/cil/oc/integration/vanilla/ModVanilla.scala @@ -2,7 +2,7 @@ package li.cil.oc.integration.vanilla import li.cil.oc.api.Driver import li.cil.oc.integration.IMod -import li.cil.oc.util.mods.Mods +import li.cil.oc.integration.Mods object ModVanilla extends IMod { def getMod = Mods.Minecraft diff --git a/src/main/scala/li/cil/oc/server/component/RedstoneWireless.scala b/src/main/scala/li/cil/oc/server/component/RedstoneWireless.scala index d2c520b85..afefbe1c8 100644 --- a/src/main/scala/li/cil/oc/server/component/RedstoneWireless.scala +++ b/src/main/scala/li/cil/oc/server/component/RedstoneWireless.scala @@ -10,8 +10,8 @@ import li.cil.oc.api.machine.Context import li.cil.oc.api.network._ import li.cil.oc.common.EventHandler import li.cil.oc.common.tileentity.traits.RedstoneAware -import li.cil.oc.util.mods -import li.cil.oc.util.mods.Mods +import li.cil.oc.integration.Mods +import li.cil.oc.integration.util import net.minecraft.nbt.NBTTagCompound @Optional.InterfaceList(Array( @@ -29,7 +29,7 @@ trait RedstoneWireless extends Redstone[RedstoneAware] with WirelessReceivingDev @Callback(doc = """function():number -- Get the wireless redstone input.""") def getWirelessInput(context: Context, args: Arguments): Array[AnyRef] = { - wirelessInput = mods.WirelessRedstone.getInput(this) + wirelessInput = util.WirelessRedstone.getInput(this) result(wirelessInput) } @@ -41,7 +41,7 @@ trait RedstoneWireless extends Redstone[RedstoneAware] with WirelessReceivingDev val oldValue = wirelessOutput wirelessOutput = args.checkBoolean(0) - mods.WirelessRedstone.updateOutput(this) + util.WirelessRedstone.updateOutput(this) context.pause(0.1) result(oldValue) @@ -55,14 +55,14 @@ trait RedstoneWireless extends Redstone[RedstoneAware] with WirelessReceivingDev val oldValue = wirelessFrequency val newValue = args.checkInteger(0) - mods.WirelessRedstone.removeReceiver(this) - mods.WirelessRedstone.removeTransmitter(this) + util.WirelessRedstone.removeReceiver(this) + util.WirelessRedstone.removeTransmitter(this) wirelessFrequency = newValue wirelessInput = false wirelessOutput = false - mods.WirelessRedstone.addReceiver(this) + util.WirelessRedstone.addReceiver(this) context.pause(0.5) result(oldValue) @@ -102,8 +102,8 @@ trait RedstoneWireless extends Redstone[RedstoneAware] with WirelessReceivingDev override def onDisconnect(node: Node) { super.onDisconnect(node) if (node == this.node) { - mods.WirelessRedstone.removeReceiver(this) - mods.WirelessRedstone.removeTransmitter(this) + util.WirelessRedstone.removeReceiver(this) + util.WirelessRedstone.removeTransmitter(this) } } diff --git a/src/main/scala/li/cil/oc/server/component/robot/Player.scala b/src/main/scala/li/cil/oc/server/component/robot/Player.scala index 829a499a7..3c31d7a74 100644 --- a/src/main/scala/li/cil/oc/server/component/robot/Player.scala +++ b/src/main/scala/li/cil/oc/server/component/robot/Player.scala @@ -9,9 +9,9 @@ import li.cil.oc.OpenComputers import li.cil.oc.Settings import li.cil.oc.api.event._ import li.cil.oc.common.tileentity -import li.cil.oc.util.mods.Mods -import li.cil.oc.util.mods.PortalGun -import li.cil.oc.util.mods.TinkersConstruct +import li.cil.oc.integration.Mods +import li.cil.oc.integration.util.PortalGun +import li.cil.oc.integration.util.TinkersConstruct import net.minecraft.block.Block import net.minecraft.block.BlockPistonBase import net.minecraft.entity.Entity diff --git a/src/main/scala/li/cil/oc/server/fs/FileSystem.scala b/src/main/scala/li/cil/oc/server/fs/FileSystem.scala index 8c343929f..a68936806 100644 --- a/src/main/scala/li/cil/oc/server/fs/FileSystem.scala +++ b/src/main/scala/li/cil/oc/server/fs/FileSystem.scala @@ -7,9 +7,9 @@ import java.util.UUID import li.cil.oc.api.driver.EnvironmentHost import li.cil.oc.api.fs.Label import li.cil.oc.api.fs.Mode +import li.cil.oc.integration.Mods import li.cil.oc.server.component -import li.cil.oc.util.mods.ComputerCraft -import li.cil.oc.util.mods.Mods +import li.cil.oc.integration.util.ComputerCraft import li.cil.oc.OpenComputers import li.cil.oc.Settings import li.cil.oc.api diff --git a/src/main/scala/li/cil/oc/server/network/Network.scala b/src/main/scala/li/cil/oc/server/network/Network.scala index 4dc1e527a..8c631eb87 100644 --- a/src/main/scala/li/cil/oc/server/network/Network.scala +++ b/src/main/scala/li/cil/oc/server/network/Network.scala @@ -14,8 +14,8 @@ import li.cil.oc.api.tileentity.SidedEnvironment import li.cil.oc.common.block.Cable import li.cil.oc.common.multipart.CablePart import li.cil.oc.common.tileentity +import li.cil.oc.integration.Mods import li.cil.oc.server.network.{Node => MutableNode} -import li.cil.oc.util.mods.Mods import li.cil.oc.util.Color import li.cil.oc.util.SideTracker import li.cil.oc.OpenComputers diff --git a/src/main/scala/li/cil/oc/util/ItemCosts.scala b/src/main/scala/li/cil/oc/util/ItemCosts.scala index 7df1205d5..121f0ef80 100644 --- a/src/main/scala/li/cil/oc/util/ItemCosts.scala +++ b/src/main/scala/li/cil/oc/util/ItemCosts.scala @@ -4,7 +4,7 @@ import java.util import li.cil.oc.Localization import li.cil.oc.common.init -import li.cil.oc.util.mods.Mods +import li.cil.oc.integration.Mods import net.minecraft.block.Block import net.minecraft.init.Blocks import net.minecraft.init.Items