diff --git a/atomic/src/main/scala/resonantinduction/atomic/Atomic.java b/atomic/src/main/scala/resonantinduction/atomic/Atomic.java index ee98ef693..8498e0e07 100644 --- a/atomic/src/main/scala/resonantinduction/atomic/Atomic.java +++ b/atomic/src/main/scala/resonantinduction/atomic/Atomic.java @@ -54,39 +54,39 @@ import resonant.lib.recipe.UniversalRecipe; import resonant.lib.render.RenderUtility; import resonant.lib.thermal.EventThermal.EventThermalUpdate; import resonant.lib.utility.nbt.NBTUtility; -import resonantinduction.atomic.base.ItemCell; -import resonantinduction.atomic.fission.BlockUraniumOre; -import resonantinduction.atomic.fission.ItemBreederFuel; -import resonantinduction.atomic.fission.ItemFissileFuel; -import resonantinduction.atomic.fission.ItemRadioactive; -import resonantinduction.atomic.fission.ItemUranium; -import resonantinduction.atomic.fission.reactor.BlockToxicWaste; -import resonantinduction.atomic.fission.reactor.TileControlRod; -import resonantinduction.atomic.fission.reactor.TileReactorCell; -import resonantinduction.atomic.fusion.BlockPlasmaHeater; -import resonantinduction.atomic.fusion.TileElectromagnet; -import resonantinduction.atomic.fusion.TilePlasma; -import resonantinduction.atomic.fusion.TilePlasmaHeater; -import resonantinduction.atomic.particle.accelerator.BlockAccelerator; -import resonantinduction.atomic.particle.accelerator.EntityParticle; -import resonantinduction.atomic.particle.accelerator.ItemDarkMatter; -import resonantinduction.atomic.particle.accelerator.TileAccelerator; -import resonantinduction.atomic.particle.fulmination.FulminationHandler; -import resonantinduction.atomic.particle.fulmination.ItemAntimatter; -import resonantinduction.atomic.particle.fulmination.TileFulmination; -import resonantinduction.atomic.particle.quantum.TileQuantumAssembler; -import resonantinduction.atomic.process.BlockChemicalExtractor; -import resonantinduction.atomic.process.ItemHazmat; -import resonantinduction.atomic.process.TileChemicalExtractor; -import resonantinduction.atomic.process.fission.BlockCentrifuge; -import resonantinduction.atomic.process.fission.BlockNuclearBoiler; -import resonantinduction.atomic.process.fission.TileCentrifuge; -import resonantinduction.atomic.process.fission.TileNuclearBoiler; -import resonantinduction.atomic.process.sensor.TileSiren; -import resonantinduction.atomic.process.sensor.TileThermometer; -import resonantinduction.atomic.process.turbine.BlockElectricTurbine; -import resonantinduction.atomic.process.turbine.TileElectricTurbine; -import resonantinduction.atomic.process.turbine.TileFunnel; +import resonantinduction.atomic.blocks.BlockToxicWaste; +import resonantinduction.atomic.blocks.BlockUraniumOre; +import resonantinduction.atomic.blocks.TileElectromagnet; +import resonantinduction.atomic.blocks.TileSiren; +import resonantinduction.atomic.items.ItemAntimatter; +import resonantinduction.atomic.items.ItemBreederFuel; +import resonantinduction.atomic.items.ItemCell; +import resonantinduction.atomic.items.ItemDarkMatter; +import resonantinduction.atomic.items.ItemFissileFuel; +import resonantinduction.atomic.items.ItemHazmat; +import resonantinduction.atomic.items.ItemRadioactive; +import resonantinduction.atomic.items.ItemUranium; +import resonantinduction.atomic.machine.accelerator.BlockAccelerator; +import resonantinduction.atomic.machine.accelerator.EntityParticle; +import resonantinduction.atomic.machine.accelerator.TileAccelerator; +import resonantinduction.atomic.machine.boiler.BlockNuclearBoiler; +import resonantinduction.atomic.machine.boiler.TileNuclearBoiler; +import resonantinduction.atomic.machine.centrifuge.BlockCentrifuge; +import resonantinduction.atomic.machine.centrifuge.TileCentrifuge; +import resonantinduction.atomic.machine.extractor.BlockChemicalExtractor; +import resonantinduction.atomic.machine.extractor.TileChemicalExtractor; +import resonantinduction.atomic.machine.extractor.turbine.BlockElectricTurbine; +import resonantinduction.atomic.machine.extractor.turbine.TileElectricTurbine; +import resonantinduction.atomic.machine.extractor.turbine.TileFunnel; +import resonantinduction.atomic.machine.fulmination.FulminationHandler; +import resonantinduction.atomic.machine.fulmination.TileFulmination; +import resonantinduction.atomic.machine.plasma.BlockPlasmaHeater; +import resonantinduction.atomic.machine.plasma.TilePlasma; +import resonantinduction.atomic.machine.plasma.TilePlasmaHeater; +import resonantinduction.atomic.machine.quantum.TileQuantumAssembler; +import resonantinduction.atomic.machine.reactor.TileControlRod; +import resonantinduction.atomic.machine.reactor.TileReactorCell; +import resonantinduction.atomic.machine.thermometer.TileThermometer; import resonantinduction.atomic.schematic.SchematicAccelerator; import resonantinduction.atomic.schematic.SchematicBreedingReactor; import resonantinduction.atomic.schematic.SchematicFissionReactor; diff --git a/atomic/src/main/scala/resonantinduction/atomic/ClientProxy.java b/atomic/src/main/scala/resonantinduction/atomic/ClientProxy.java index de290b7fd..afec02b0b 100644 --- a/atomic/src/main/scala/resonantinduction/atomic/ClientProxy.java +++ b/atomic/src/main/scala/resonantinduction/atomic/ClientProxy.java @@ -7,30 +7,30 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import resonant.lib.render.block.BlockRenderingHandler; -import resonantinduction.atomic.fission.reactor.GuiReactorCell; -import resonantinduction.atomic.fission.reactor.RenderReactorCell; -import resonantinduction.atomic.fission.reactor.TileReactorCell; -import resonantinduction.atomic.fusion.RenderPlasmaHeater; -import resonantinduction.atomic.fusion.TilePlasmaHeater; -import resonantinduction.atomic.particle.accelerator.EntityParticle; -import resonantinduction.atomic.particle.accelerator.GuiAccelerator; -import resonantinduction.atomic.particle.accelerator.RenderParticle; -import resonantinduction.atomic.particle.accelerator.TileAccelerator; -import resonantinduction.atomic.particle.quantum.GuiQuantumAssembler; -import resonantinduction.atomic.particle.quantum.TileQuantumAssembler; -import resonantinduction.atomic.process.RenderChemicalExtractor; -import resonantinduction.atomic.process.TileChemicalExtractor; -import resonantinduction.atomic.process.fission.GuiCentrifuge; -import resonantinduction.atomic.process.fission.GuiChemicalExtractor; -import resonantinduction.atomic.process.fission.GuiNuclearBoiler; -import resonantinduction.atomic.process.fission.RenderCentrifuge; -import resonantinduction.atomic.process.fission.RenderNuclearBoiler; -import resonantinduction.atomic.process.fission.TileCentrifuge; -import resonantinduction.atomic.process.fission.TileNuclearBoiler; -import resonantinduction.atomic.process.sensor.RenderThermometer; -import resonantinduction.atomic.process.sensor.TileThermometer; -import resonantinduction.atomic.process.turbine.RenderElectricTurbine; -import resonantinduction.atomic.process.turbine.TileElectricTurbine; +import resonantinduction.atomic.machine.accelerator.EntityParticle; +import resonantinduction.atomic.machine.accelerator.GuiAccelerator; +import resonantinduction.atomic.machine.accelerator.RenderParticle; +import resonantinduction.atomic.machine.accelerator.TileAccelerator; +import resonantinduction.atomic.machine.boiler.GuiChemicalExtractor; +import resonantinduction.atomic.machine.boiler.GuiNuclearBoiler; +import resonantinduction.atomic.machine.boiler.RenderNuclearBoiler; +import resonantinduction.atomic.machine.boiler.TileNuclearBoiler; +import resonantinduction.atomic.machine.centrifuge.GuiCentrifuge; +import resonantinduction.atomic.machine.centrifuge.RenderCentrifuge; +import resonantinduction.atomic.machine.centrifuge.TileCentrifuge; +import resonantinduction.atomic.machine.extractor.RenderChemicalExtractor; +import resonantinduction.atomic.machine.extractor.TileChemicalExtractor; +import resonantinduction.atomic.machine.extractor.turbine.RenderElectricTurbine; +import resonantinduction.atomic.machine.extractor.turbine.TileElectricTurbine; +import resonantinduction.atomic.machine.plasma.RenderPlasmaHeater; +import resonantinduction.atomic.machine.plasma.TilePlasmaHeater; +import resonantinduction.atomic.machine.quantum.GuiQuantumAssembler; +import resonantinduction.atomic.machine.quantum.TileQuantumAssembler; +import resonantinduction.atomic.machine.reactor.GuiReactorCell; +import resonantinduction.atomic.machine.reactor.RenderReactorCell; +import resonantinduction.atomic.machine.reactor.TileReactorCell; +import resonantinduction.atomic.machine.thermometer.RenderThermometer; +import resonantinduction.atomic.machine.thermometer.TileThermometer; import cpw.mods.fml.client.registry.ClientRegistry; import cpw.mods.fml.client.registry.RenderingRegistry; diff --git a/atomic/src/main/scala/resonantinduction/atomic/CommonProxy.java b/atomic/src/main/scala/resonantinduction/atomic/CommonProxy.java index b050b43e5..4192408e8 100644 --- a/atomic/src/main/scala/resonantinduction/atomic/CommonProxy.java +++ b/atomic/src/main/scala/resonantinduction/atomic/CommonProxy.java @@ -4,18 +4,18 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import resonant.lib.prefab.ProxyBase; -import resonantinduction.atomic.fission.reactor.ContainerReactorCell; -import resonantinduction.atomic.fission.reactor.TileReactorCell; -import resonantinduction.atomic.fusion.ContainerNuclearBoiler; -import resonantinduction.atomic.particle.accelerator.ContainerAccelerator; -import resonantinduction.atomic.particle.accelerator.TileAccelerator; -import resonantinduction.atomic.particle.quantum.ContainerQuantumAssembler; -import resonantinduction.atomic.particle.quantum.TileQuantumAssembler; -import resonantinduction.atomic.process.ContainerChemicalExtractor; -import resonantinduction.atomic.process.TileChemicalExtractor; -import resonantinduction.atomic.process.fission.ContainerCentrifuge; -import resonantinduction.atomic.process.fission.TileCentrifuge; -import resonantinduction.atomic.process.fission.TileNuclearBoiler; +import resonantinduction.atomic.machine.accelerator.ContainerAccelerator; +import resonantinduction.atomic.machine.accelerator.TileAccelerator; +import resonantinduction.atomic.machine.boiler.TileNuclearBoiler; +import resonantinduction.atomic.machine.centrifuge.ContainerCentrifuge; +import resonantinduction.atomic.machine.centrifuge.TileCentrifuge; +import resonantinduction.atomic.machine.extractor.ContainerChemicalExtractor; +import resonantinduction.atomic.machine.extractor.TileChemicalExtractor; +import resonantinduction.atomic.machine.plasma.ContainerNuclearBoiler; +import resonantinduction.atomic.machine.quantum.ContainerQuantumAssembler; +import resonantinduction.atomic.machine.quantum.TileQuantumAssembler; +import resonantinduction.atomic.machine.reactor.ContainerReactorCell; +import resonantinduction.atomic.machine.reactor.TileReactorCell; public class CommonProxy extends ProxyBase { diff --git a/atomic/src/main/scala/resonantinduction/atomic/base/ItemASBase.java b/atomic/src/main/scala/resonantinduction/atomic/base/ItemASBase.java deleted file mode 100644 index eb2921b35..000000000 --- a/atomic/src/main/scala/resonantinduction/atomic/base/ItemASBase.java +++ /dev/null @@ -1,15 +0,0 @@ -package resonantinduction.atomic.base; - -import resonant.lib.prefab.item.ItemBase; -import resonantinduction.core.Reference; -import resonantinduction.core.Settings; -import resonantinduction.core.TabRI; - -public class ItemASBase extends ItemBase -{ - /** Must be called while in mod init phase. */ - public ItemASBase(int itemID, String name) - { - super(itemID); - } -} diff --git a/atomic/src/main/scala/resonantinduction/atomic/base/ItemElectricAS.java b/atomic/src/main/scala/resonantinduction/atomic/base/ItemElectricAS.java deleted file mode 100644 index 03cf98d88..000000000 --- a/atomic/src/main/scala/resonantinduction/atomic/base/ItemElectricAS.java +++ /dev/null @@ -1,21 +0,0 @@ -package resonantinduction.atomic.base; - -import resonantinduction.core.Reference; -import resonantinduction.core.Settings; -import resonantinduction.core.TabRI; -import universalelectricity.api.UniversalClass; -import universalelectricity.api.item.IEnergyItem; -import universalelectricity.api.item.ItemElectric; - -@UniversalClass -public abstract class ItemElectricAS extends ItemElectric implements IEnergyItem -{ - public ItemElectricAS(int itemID, String name) - { - super(Settings.CONFIGURATION.getItem(name, itemID).getInt()); - this.setUnlocalizedName(Reference.PREFIX + name); - this.setCreativeTab(TabRI.DEFAULT); - this.setTextureName(Reference.PREFIX + name); - - } -} diff --git a/atomic/src/main/scala/resonantinduction/atomic/fission/reactor/BlockToxicWaste.java b/atomic/src/main/scala/resonantinduction/atomic/blocks/BlockToxicWaste.java similarity index 97% rename from atomic/src/main/scala/resonantinduction/atomic/fission/reactor/BlockToxicWaste.java rename to atomic/src/main/scala/resonantinduction/atomic/blocks/BlockToxicWaste.java index a6080c6fa..cc3b22da9 100644 --- a/atomic/src/main/scala/resonantinduction/atomic/fission/reactor/BlockToxicWaste.java +++ b/atomic/src/main/scala/resonantinduction/atomic/blocks/BlockToxicWaste.java @@ -1,4 +1,4 @@ -package resonantinduction.atomic.fission.reactor; +package resonantinduction.atomic.blocks; import java.util.Random; diff --git a/atomic/src/main/scala/resonantinduction/atomic/fission/BlockUraniumOre.java b/atomic/src/main/scala/resonantinduction/atomic/blocks/BlockUraniumOre.java similarity index 97% rename from atomic/src/main/scala/resonantinduction/atomic/fission/BlockUraniumOre.java rename to atomic/src/main/scala/resonantinduction/atomic/blocks/BlockUraniumOre.java index d33d469db..043aa34da 100644 --- a/atomic/src/main/scala/resonantinduction/atomic/fission/BlockUraniumOre.java +++ b/atomic/src/main/scala/resonantinduction/atomic/blocks/BlockUraniumOre.java @@ -1,4 +1,4 @@ -package resonantinduction.atomic.fission; +package resonantinduction.atomic.blocks; import java.util.Random; diff --git a/atomic/src/main/scala/resonantinduction/atomic/fusion/TileElectromagnet.java b/atomic/src/main/scala/resonantinduction/atomic/blocks/TileElectromagnet.java similarity index 98% rename from atomic/src/main/scala/resonantinduction/atomic/fusion/TileElectromagnet.java rename to atomic/src/main/scala/resonantinduction/atomic/blocks/TileElectromagnet.java index 48f9f3244..f8c6ccaf2 100644 --- a/atomic/src/main/scala/resonantinduction/atomic/fusion/TileElectromagnet.java +++ b/atomic/src/main/scala/resonantinduction/atomic/blocks/TileElectromagnet.java @@ -1,4 +1,4 @@ -package resonantinduction.atomic.fusion; +package resonantinduction.atomic.blocks; import java.util.List; diff --git a/atomic/src/main/scala/resonantinduction/atomic/process/sensor/TileSiren.java b/atomic/src/main/scala/resonantinduction/atomic/blocks/TileSiren.java similarity index 97% rename from atomic/src/main/scala/resonantinduction/atomic/process/sensor/TileSiren.java rename to atomic/src/main/scala/resonantinduction/atomic/blocks/TileSiren.java index a80211d5c..6d52f5619 100644 --- a/atomic/src/main/scala/resonantinduction/atomic/process/sensor/TileSiren.java +++ b/atomic/src/main/scala/resonantinduction/atomic/blocks/TileSiren.java @@ -1,4 +1,4 @@ -package resonantinduction.atomic.process.sensor; +package resonantinduction.atomic.blocks; import net.minecraft.entity.player.EntityPlayer; import net.minecraftforge.common.ForgeDirection; diff --git a/atomic/src/main/scala/resonantinduction/atomic/particle/fulmination/ItemAntimatter.java b/atomic/src/main/scala/resonantinduction/atomic/items/ItemAntimatter.java similarity index 98% rename from atomic/src/main/scala/resonantinduction/atomic/particle/fulmination/ItemAntimatter.java rename to atomic/src/main/scala/resonantinduction/atomic/items/ItemAntimatter.java index f24afb6bf..0ca6b2ed2 100644 --- a/atomic/src/main/scala/resonantinduction/atomic/particle/fulmination/ItemAntimatter.java +++ b/atomic/src/main/scala/resonantinduction/atomic/items/ItemAntimatter.java @@ -1,4 +1,4 @@ -package resonantinduction.atomic.particle.fulmination; +package resonantinduction.atomic.items; import java.util.List; @@ -19,7 +19,6 @@ import resonant.api.explosion.IExplosion; import resonant.lib.flag.FlagRegistry; import resonant.lib.prefab.poison.PoisonRadiation; import resonantinduction.atomic.Atomic; -import resonantinduction.atomic.base.ItemCell; import resonantinduction.core.Reference; import resonantinduction.core.ResonantInduction; import resonantinduction.core.Settings; diff --git a/atomic/src/main/scala/resonantinduction/atomic/fission/ItemBreederFuel.java b/atomic/src/main/scala/resonantinduction/atomic/items/ItemBreederFuel.java similarity index 95% rename from atomic/src/main/scala/resonantinduction/atomic/fission/ItemBreederFuel.java rename to atomic/src/main/scala/resonantinduction/atomic/items/ItemBreederFuel.java index ac406e9dc..77643766c 100644 --- a/atomic/src/main/scala/resonantinduction/atomic/fission/ItemBreederFuel.java +++ b/atomic/src/main/scala/resonantinduction/atomic/items/ItemBreederFuel.java @@ -1,4 +1,4 @@ -package resonantinduction.atomic.fission; +package resonantinduction.atomic.items; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; diff --git a/atomic/src/main/scala/resonantinduction/atomic/base/ItemCell.java b/atomic/src/main/scala/resonantinduction/atomic/items/ItemCell.java similarity index 97% rename from atomic/src/main/scala/resonantinduction/atomic/base/ItemCell.java rename to atomic/src/main/scala/resonantinduction/atomic/items/ItemCell.java index 6212a0f4b..d1448c98c 100644 --- a/atomic/src/main/scala/resonantinduction/atomic/base/ItemCell.java +++ b/atomic/src/main/scala/resonantinduction/atomic/items/ItemCell.java @@ -1,4 +1,4 @@ -package resonantinduction.atomic.base; +package resonantinduction.atomic.items; import java.util.List; diff --git a/atomic/src/main/scala/resonantinduction/atomic/particle/accelerator/ItemDarkMatter.java b/atomic/src/main/scala/resonantinduction/atomic/items/ItemDarkMatter.java similarity index 59% rename from atomic/src/main/scala/resonantinduction/atomic/particle/accelerator/ItemDarkMatter.java rename to atomic/src/main/scala/resonantinduction/atomic/items/ItemDarkMatter.java index 9df2c4c00..ec11854e6 100644 --- a/atomic/src/main/scala/resonantinduction/atomic/particle/accelerator/ItemDarkMatter.java +++ b/atomic/src/main/scala/resonantinduction/atomic/items/ItemDarkMatter.java @@ -1,6 +1,5 @@ -package resonantinduction.atomic.particle.accelerator; +package resonantinduction.atomic.items; -import resonantinduction.atomic.base.ItemCell; /** Strange matter cell */ public class ItemDarkMatter extends ItemCell diff --git a/atomic/src/main/scala/resonantinduction/atomic/fission/ItemFissileFuel.java b/atomic/src/main/scala/resonantinduction/atomic/items/ItemFissileFuel.java similarity index 98% rename from atomic/src/main/scala/resonantinduction/atomic/fission/ItemFissileFuel.java rename to atomic/src/main/scala/resonantinduction/atomic/items/ItemFissileFuel.java index 2a7458b5c..d3f6209ed 100644 --- a/atomic/src/main/scala/resonantinduction/atomic/fission/ItemFissileFuel.java +++ b/atomic/src/main/scala/resonantinduction/atomic/items/ItemFissileFuel.java @@ -1,4 +1,4 @@ -package resonantinduction.atomic.fission; +package resonantinduction.atomic.items; import java.util.List; diff --git a/atomic/src/main/scala/resonantinduction/atomic/process/ItemHazmat.java b/atomic/src/main/scala/resonantinduction/atomic/items/ItemHazmat.java similarity index 97% rename from atomic/src/main/scala/resonantinduction/atomic/process/ItemHazmat.java rename to atomic/src/main/scala/resonantinduction/atomic/items/ItemHazmat.java index b068e5620..b791ab5e8 100644 --- a/atomic/src/main/scala/resonantinduction/atomic/process/ItemHazmat.java +++ b/atomic/src/main/scala/resonantinduction/atomic/items/ItemHazmat.java @@ -1,4 +1,4 @@ -package resonantinduction.atomic.process; +package resonantinduction.atomic.items; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; diff --git a/atomic/src/main/scala/resonantinduction/atomic/fission/ItemRadioactive.java b/atomic/src/main/scala/resonantinduction/atomic/items/ItemRadioactive.java similarity index 94% rename from atomic/src/main/scala/resonantinduction/atomic/fission/ItemRadioactive.java rename to atomic/src/main/scala/resonantinduction/atomic/items/ItemRadioactive.java index 9cf21a9e2..0ff714210 100644 --- a/atomic/src/main/scala/resonantinduction/atomic/fission/ItemRadioactive.java +++ b/atomic/src/main/scala/resonantinduction/atomic/items/ItemRadioactive.java @@ -1,4 +1,4 @@ -package resonantinduction.atomic.fission; +package resonantinduction.atomic.items; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; diff --git a/atomic/src/main/scala/resonantinduction/atomic/fission/ItemUranium.java b/atomic/src/main/scala/resonantinduction/atomic/items/ItemUranium.java similarity index 97% rename from atomic/src/main/scala/resonantinduction/atomic/fission/ItemUranium.java rename to atomic/src/main/scala/resonantinduction/atomic/items/ItemUranium.java index 022820096..dc356da34 100644 --- a/atomic/src/main/scala/resonantinduction/atomic/fission/ItemUranium.java +++ b/atomic/src/main/scala/resonantinduction/atomic/items/ItemUranium.java @@ -1,4 +1,4 @@ -package resonantinduction.atomic.fission; +package resonantinduction.atomic.items; import java.util.List; diff --git a/atomic/src/main/scala/resonantinduction/atomic/particle/accelerator/BlockAccelerator.java b/atomic/src/main/scala/resonantinduction/atomic/machine/accelerator/BlockAccelerator.java similarity index 94% rename from atomic/src/main/scala/resonantinduction/atomic/particle/accelerator/BlockAccelerator.java rename to atomic/src/main/scala/resonantinduction/atomic/machine/accelerator/BlockAccelerator.java index 0b229d6be..992ea0607 100644 --- a/atomic/src/main/scala/resonantinduction/atomic/particle/accelerator/BlockAccelerator.java +++ b/atomic/src/main/scala/resonantinduction/atomic/machine/accelerator/BlockAccelerator.java @@ -1,4 +1,4 @@ -package resonantinduction.atomic.particle.accelerator; +package resonantinduction.atomic.machine.accelerator; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; diff --git a/atomic/src/main/scala/resonantinduction/atomic/particle/accelerator/ContainerAccelerator.java b/atomic/src/main/scala/resonantinduction/atomic/machine/accelerator/ContainerAccelerator.java similarity index 97% rename from atomic/src/main/scala/resonantinduction/atomic/particle/accelerator/ContainerAccelerator.java rename to atomic/src/main/scala/resonantinduction/atomic/machine/accelerator/ContainerAccelerator.java index fc9a8ed6a..515637d8e 100644 --- a/atomic/src/main/scala/resonantinduction/atomic/particle/accelerator/ContainerAccelerator.java +++ b/atomic/src/main/scala/resonantinduction/atomic/machine/accelerator/ContainerAccelerator.java @@ -1,4 +1,4 @@ -package resonantinduction.atomic.particle.accelerator; +package resonantinduction.atomic.machine.accelerator; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; diff --git a/atomic/src/main/scala/resonantinduction/atomic/particle/accelerator/EntityParticle.java b/atomic/src/main/scala/resonantinduction/atomic/machine/accelerator/EntityParticle.java similarity index 99% rename from atomic/src/main/scala/resonantinduction/atomic/particle/accelerator/EntityParticle.java rename to atomic/src/main/scala/resonantinduction/atomic/machine/accelerator/EntityParticle.java index 0ff4487e9..25d01b306 100644 --- a/atomic/src/main/scala/resonantinduction/atomic/particle/accelerator/EntityParticle.java +++ b/atomic/src/main/scala/resonantinduction/atomic/machine/accelerator/EntityParticle.java @@ -1,4 +1,4 @@ -package resonantinduction.atomic.particle.accelerator; +package resonantinduction.atomic.machine.accelerator; import java.util.List; diff --git a/atomic/src/main/scala/resonantinduction/atomic/particle/accelerator/GuiAccelerator.java b/atomic/src/main/scala/resonantinduction/atomic/machine/accelerator/GuiAccelerator.java similarity index 98% rename from atomic/src/main/scala/resonantinduction/atomic/particle/accelerator/GuiAccelerator.java rename to atomic/src/main/scala/resonantinduction/atomic/machine/accelerator/GuiAccelerator.java index 2499bf6a2..92b481dd3 100644 --- a/atomic/src/main/scala/resonantinduction/atomic/particle/accelerator/GuiAccelerator.java +++ b/atomic/src/main/scala/resonantinduction/atomic/machine/accelerator/GuiAccelerator.java @@ -1,4 +1,4 @@ -package resonantinduction.atomic.particle.accelerator; +package resonantinduction.atomic.machine.accelerator; import net.minecraft.entity.player.InventoryPlayer; import resonant.lib.gui.GuiContainerBase; diff --git a/atomic/src/main/scala/resonantinduction/atomic/particle/accelerator/RenderParticle.java b/atomic/src/main/scala/resonantinduction/atomic/machine/accelerator/RenderParticle.java similarity index 98% rename from atomic/src/main/scala/resonantinduction/atomic/particle/accelerator/RenderParticle.java rename to atomic/src/main/scala/resonantinduction/atomic/machine/accelerator/RenderParticle.java index 5f054fb51..ff73580ee 100644 --- a/atomic/src/main/scala/resonantinduction/atomic/particle/accelerator/RenderParticle.java +++ b/atomic/src/main/scala/resonantinduction/atomic/machine/accelerator/RenderParticle.java @@ -1,4 +1,4 @@ -package resonantinduction.atomic.particle.accelerator; +package resonantinduction.atomic.machine.accelerator; import java.util.Random; diff --git a/atomic/src/main/scala/resonantinduction/atomic/particle/accelerator/TileAccelerator.java b/atomic/src/main/scala/resonantinduction/atomic/machine/accelerator/TileAccelerator.java similarity index 98% rename from atomic/src/main/scala/resonantinduction/atomic/particle/accelerator/TileAccelerator.java rename to atomic/src/main/scala/resonantinduction/atomic/machine/accelerator/TileAccelerator.java index 01d22c781..83d32ba81 100644 --- a/atomic/src/main/scala/resonantinduction/atomic/particle/accelerator/TileAccelerator.java +++ b/atomic/src/main/scala/resonantinduction/atomic/machine/accelerator/TileAccelerator.java @@ -1,4 +1,4 @@ -package resonantinduction.atomic.particle.accelerator; +package resonantinduction.atomic.machine.accelerator; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; @@ -13,7 +13,8 @@ import resonant.api.IRotatable; import resonant.lib.network.Synced; import resonant.lib.prefab.tile.TileElectricalInventory; import resonantinduction.atomic.Atomic; -import resonantinduction.atomic.particle.fulmination.ItemAntimatter; +import resonantinduction.atomic.items.ItemAntimatter; +import resonantinduction.atomic.items.ItemDarkMatter; import resonantinduction.core.Reference; import resonantinduction.core.ResonantInduction; import resonantinduction.core.Settings; diff --git a/atomic/src/main/scala/resonantinduction/atomic/process/fission/BlockNuclearBoiler.java b/atomic/src/main/scala/resonantinduction/atomic/machine/boiler/BlockNuclearBoiler.java similarity index 96% rename from atomic/src/main/scala/resonantinduction/atomic/process/fission/BlockNuclearBoiler.java rename to atomic/src/main/scala/resonantinduction/atomic/machine/boiler/BlockNuclearBoiler.java index b8db81dc2..7235580f3 100644 --- a/atomic/src/main/scala/resonantinduction/atomic/process/fission/BlockNuclearBoiler.java +++ b/atomic/src/main/scala/resonantinduction/atomic/machine/boiler/BlockNuclearBoiler.java @@ -1,4 +1,4 @@ -package resonantinduction.atomic.process.fission; +package resonantinduction.atomic.machine.boiler; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; diff --git a/atomic/src/main/scala/resonantinduction/atomic/process/fission/GuiChemicalExtractor.java b/atomic/src/main/scala/resonantinduction/atomic/machine/boiler/GuiChemicalExtractor.java similarity index 95% rename from atomic/src/main/scala/resonantinduction/atomic/process/fission/GuiChemicalExtractor.java rename to atomic/src/main/scala/resonantinduction/atomic/machine/boiler/GuiChemicalExtractor.java index bf1ae2243..c0dd746a3 100644 --- a/atomic/src/main/scala/resonantinduction/atomic/process/fission/GuiChemicalExtractor.java +++ b/atomic/src/main/scala/resonantinduction/atomic/machine/boiler/GuiChemicalExtractor.java @@ -1,10 +1,10 @@ -package resonantinduction.atomic.process.fission; +package resonantinduction.atomic.machine.boiler; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.StatCollector; import resonant.lib.gui.GuiContainerBase; -import resonantinduction.atomic.process.ContainerChemicalExtractor; -import resonantinduction.atomic.process.TileChemicalExtractor; +import resonantinduction.atomic.machine.extractor.ContainerChemicalExtractor; +import resonantinduction.atomic.machine.extractor.TileChemicalExtractor; import universalelectricity.api.energy.UnitDisplay.Unit; public class GuiChemicalExtractor extends GuiContainerBase diff --git a/atomic/src/main/scala/resonantinduction/atomic/process/fission/GuiNuclearBoiler.java b/atomic/src/main/scala/resonantinduction/atomic/machine/boiler/GuiNuclearBoiler.java similarity index 96% rename from atomic/src/main/scala/resonantinduction/atomic/process/fission/GuiNuclearBoiler.java rename to atomic/src/main/scala/resonantinduction/atomic/machine/boiler/GuiNuclearBoiler.java index 883116392..2b6569075 100644 --- a/atomic/src/main/scala/resonantinduction/atomic/process/fission/GuiNuclearBoiler.java +++ b/atomic/src/main/scala/resonantinduction/atomic/machine/boiler/GuiNuclearBoiler.java @@ -1,9 +1,9 @@ -package resonantinduction.atomic.process.fission; +package resonantinduction.atomic.machine.boiler; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.StatCollector; import resonant.lib.gui.GuiContainerBase; -import resonantinduction.atomic.fusion.ContainerNuclearBoiler; +import resonantinduction.atomic.machine.plasma.ContainerNuclearBoiler; import universalelectricity.api.energy.UnitDisplay.Unit; public class GuiNuclearBoiler extends GuiContainerBase diff --git a/atomic/src/main/scala/resonantinduction/atomic/process/fission/RenderNuclearBoiler.java b/atomic/src/main/scala/resonantinduction/atomic/machine/boiler/RenderNuclearBoiler.java similarity index 97% rename from atomic/src/main/scala/resonantinduction/atomic/process/fission/RenderNuclearBoiler.java rename to atomic/src/main/scala/resonantinduction/atomic/machine/boiler/RenderNuclearBoiler.java index 0b22abb37..fb3d8fe98 100644 --- a/atomic/src/main/scala/resonantinduction/atomic/process/fission/RenderNuclearBoiler.java +++ b/atomic/src/main/scala/resonantinduction/atomic/machine/boiler/RenderNuclearBoiler.java @@ -1,4 +1,4 @@ -package resonantinduction.atomic.process.fission; +package resonantinduction.atomic.machine.boiler; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; diff --git a/atomic/src/main/scala/resonantinduction/atomic/process/fission/TileNuclearBoiler.java b/atomic/src/main/scala/resonantinduction/atomic/machine/boiler/TileNuclearBoiler.java similarity index 99% rename from atomic/src/main/scala/resonantinduction/atomic/process/fission/TileNuclearBoiler.java rename to atomic/src/main/scala/resonantinduction/atomic/machine/boiler/TileNuclearBoiler.java index 8061cef67..36eef9065 100644 --- a/atomic/src/main/scala/resonantinduction/atomic/process/fission/TileNuclearBoiler.java +++ b/atomic/src/main/scala/resonantinduction/atomic/machine/boiler/TileNuclearBoiler.java @@ -1,4 +1,4 @@ -package resonantinduction.atomic.process.fission; +package resonantinduction.atomic.machine.boiler; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.ISidedInventory; diff --git a/atomic/src/main/scala/resonantinduction/atomic/process/fission/BlockCentrifuge.java b/atomic/src/main/scala/resonantinduction/atomic/machine/centrifuge/BlockCentrifuge.java similarity index 96% rename from atomic/src/main/scala/resonantinduction/atomic/process/fission/BlockCentrifuge.java rename to atomic/src/main/scala/resonantinduction/atomic/machine/centrifuge/BlockCentrifuge.java index 6a04f2637..76fb30eff 100644 --- a/atomic/src/main/scala/resonantinduction/atomic/process/fission/BlockCentrifuge.java +++ b/atomic/src/main/scala/resonantinduction/atomic/machine/centrifuge/BlockCentrifuge.java @@ -1,4 +1,4 @@ -package resonantinduction.atomic.process.fission; +package resonantinduction.atomic.machine.centrifuge; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; diff --git a/atomic/src/main/scala/resonantinduction/atomic/process/fission/ContainerCentrifuge.java b/atomic/src/main/scala/resonantinduction/atomic/machine/centrifuge/ContainerCentrifuge.java similarity index 98% rename from atomic/src/main/scala/resonantinduction/atomic/process/fission/ContainerCentrifuge.java rename to atomic/src/main/scala/resonantinduction/atomic/machine/centrifuge/ContainerCentrifuge.java index 62e5526f3..c2ebc5fa8 100644 --- a/atomic/src/main/scala/resonantinduction/atomic/process/fission/ContainerCentrifuge.java +++ b/atomic/src/main/scala/resonantinduction/atomic/machine/centrifuge/ContainerCentrifuge.java @@ -1,4 +1,4 @@ -package resonantinduction.atomic.process.fission; +package resonantinduction.atomic.machine.centrifuge; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; diff --git a/atomic/src/main/scala/resonantinduction/atomic/process/fission/GuiCentrifuge.java b/atomic/src/main/scala/resonantinduction/atomic/machine/centrifuge/GuiCentrifuge.java similarity index 95% rename from atomic/src/main/scala/resonantinduction/atomic/process/fission/GuiCentrifuge.java rename to atomic/src/main/scala/resonantinduction/atomic/machine/centrifuge/GuiCentrifuge.java index 7542f5528..1484b819d 100644 --- a/atomic/src/main/scala/resonantinduction/atomic/process/fission/GuiCentrifuge.java +++ b/atomic/src/main/scala/resonantinduction/atomic/machine/centrifuge/GuiCentrifuge.java @@ -1,8 +1,9 @@ -package resonantinduction.atomic.process.fission; +package resonantinduction.atomic.machine.centrifuge; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.StatCollector; import resonant.lib.gui.GuiContainerBase; +import resonantinduction.atomic.machine.boiler.TileNuclearBoiler; import universalelectricity.api.energy.UnitDisplay.Unit; public class GuiCentrifuge extends GuiContainerBase diff --git a/atomic/src/main/scala/resonantinduction/atomic/process/fission/RenderCentrifuge.java b/atomic/src/main/scala/resonantinduction/atomic/machine/centrifuge/RenderCentrifuge.java similarity index 96% rename from atomic/src/main/scala/resonantinduction/atomic/process/fission/RenderCentrifuge.java rename to atomic/src/main/scala/resonantinduction/atomic/machine/centrifuge/RenderCentrifuge.java index 0d20cd4f5..782f60c4a 100644 --- a/atomic/src/main/scala/resonantinduction/atomic/process/fission/RenderCentrifuge.java +++ b/atomic/src/main/scala/resonantinduction/atomic/machine/centrifuge/RenderCentrifuge.java @@ -1,4 +1,4 @@ -package resonantinduction.atomic.process.fission; +package resonantinduction.atomic.machine.centrifuge; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; diff --git a/atomic/src/main/scala/resonantinduction/atomic/process/fission/TileCentrifuge.java b/atomic/src/main/scala/resonantinduction/atomic/machine/centrifuge/TileCentrifuge.java similarity index 99% rename from atomic/src/main/scala/resonantinduction/atomic/process/fission/TileCentrifuge.java rename to atomic/src/main/scala/resonantinduction/atomic/machine/centrifuge/TileCentrifuge.java index 291052a26..4f65daa2c 100644 --- a/atomic/src/main/scala/resonantinduction/atomic/process/fission/TileCentrifuge.java +++ b/atomic/src/main/scala/resonantinduction/atomic/machine/centrifuge/TileCentrifuge.java @@ -1,4 +1,4 @@ -package resonantinduction.atomic.process.fission; +package resonantinduction.atomic.machine.centrifuge; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.ISidedInventory; diff --git a/atomic/src/main/scala/resonantinduction/atomic/process/BlockChemicalExtractor.java b/atomic/src/main/scala/resonantinduction/atomic/machine/extractor/BlockChemicalExtractor.java similarity index 96% rename from atomic/src/main/scala/resonantinduction/atomic/process/BlockChemicalExtractor.java rename to atomic/src/main/scala/resonantinduction/atomic/machine/extractor/BlockChemicalExtractor.java index 49bca240f..748d897cd 100644 --- a/atomic/src/main/scala/resonantinduction/atomic/process/BlockChemicalExtractor.java +++ b/atomic/src/main/scala/resonantinduction/atomic/machine/extractor/BlockChemicalExtractor.java @@ -1,4 +1,4 @@ -package resonantinduction.atomic.process; +package resonantinduction.atomic.machine.extractor; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; diff --git a/atomic/src/main/scala/resonantinduction/atomic/process/ContainerChemicalExtractor.java b/atomic/src/main/scala/resonantinduction/atomic/machine/extractor/ContainerChemicalExtractor.java similarity index 96% rename from atomic/src/main/scala/resonantinduction/atomic/process/ContainerChemicalExtractor.java rename to atomic/src/main/scala/resonantinduction/atomic/machine/extractor/ContainerChemicalExtractor.java index 88858a1c9..65a4fcf58 100644 --- a/atomic/src/main/scala/resonantinduction/atomic/process/ContainerChemicalExtractor.java +++ b/atomic/src/main/scala/resonantinduction/atomic/machine/extractor/ContainerChemicalExtractor.java @@ -1,4 +1,4 @@ -package resonantinduction.atomic.process; +package resonantinduction.atomic.machine.extractor; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Slot; diff --git a/atomic/src/main/scala/resonantinduction/atomic/process/RenderChemicalExtractor.java b/atomic/src/main/scala/resonantinduction/atomic/machine/extractor/RenderChemicalExtractor.java similarity index 97% rename from atomic/src/main/scala/resonantinduction/atomic/process/RenderChemicalExtractor.java rename to atomic/src/main/scala/resonantinduction/atomic/machine/extractor/RenderChemicalExtractor.java index 917938302..7ef1e1768 100644 --- a/atomic/src/main/scala/resonantinduction/atomic/process/RenderChemicalExtractor.java +++ b/atomic/src/main/scala/resonantinduction/atomic/machine/extractor/RenderChemicalExtractor.java @@ -1,4 +1,4 @@ -package resonantinduction.atomic.process; +package resonantinduction.atomic.machine.extractor; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; diff --git a/atomic/src/main/scala/resonantinduction/atomic/process/TileChemicalExtractor.java b/atomic/src/main/scala/resonantinduction/atomic/machine/extractor/TileChemicalExtractor.java similarity index 99% rename from atomic/src/main/scala/resonantinduction/atomic/process/TileChemicalExtractor.java rename to atomic/src/main/scala/resonantinduction/atomic/machine/extractor/TileChemicalExtractor.java index fbbb8be84..9fead1efe 100644 --- a/atomic/src/main/scala/resonantinduction/atomic/process/TileChemicalExtractor.java +++ b/atomic/src/main/scala/resonantinduction/atomic/machine/extractor/TileChemicalExtractor.java @@ -1,4 +1,4 @@ -package resonantinduction.atomic.process; +package resonantinduction.atomic.machine.extractor; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.ISidedInventory; diff --git a/atomic/src/main/scala/resonantinduction/atomic/process/TileProcess.java b/atomic/src/main/scala/resonantinduction/atomic/machine/extractor/TileProcess.java similarity index 98% rename from atomic/src/main/scala/resonantinduction/atomic/process/TileProcess.java rename to atomic/src/main/scala/resonantinduction/atomic/machine/extractor/TileProcess.java index a244ba797..c15357d2d 100644 --- a/atomic/src/main/scala/resonantinduction/atomic/process/TileProcess.java +++ b/atomic/src/main/scala/resonantinduction/atomic/machine/extractor/TileProcess.java @@ -1,4 +1,4 @@ -package resonantinduction.atomic.process; +package resonantinduction.atomic.machine.extractor; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidContainerRegistry; diff --git a/atomic/src/main/scala/resonantinduction/atomic/process/turbine/BlockElectricTurbine.java b/atomic/src/main/scala/resonantinduction/atomic/machine/extractor/turbine/BlockElectricTurbine.java similarity index 93% rename from atomic/src/main/scala/resonantinduction/atomic/process/turbine/BlockElectricTurbine.java rename to atomic/src/main/scala/resonantinduction/atomic/machine/extractor/turbine/BlockElectricTurbine.java index 55de84303..c544676cb 100644 --- a/atomic/src/main/scala/resonantinduction/atomic/process/turbine/BlockElectricTurbine.java +++ b/atomic/src/main/scala/resonantinduction/atomic/machine/extractor/turbine/BlockElectricTurbine.java @@ -1,4 +1,4 @@ -package resonantinduction.atomic.process.turbine; +package resonantinduction.atomic.machine.extractor.turbine; import net.minecraft.block.material.Material; import net.minecraft.tileentity.TileEntity; diff --git a/atomic/src/main/scala/resonantinduction/atomic/process/turbine/RenderElectricTurbine.java b/atomic/src/main/scala/resonantinduction/atomic/machine/extractor/turbine/RenderElectricTurbine.java similarity index 98% rename from atomic/src/main/scala/resonantinduction/atomic/process/turbine/RenderElectricTurbine.java rename to atomic/src/main/scala/resonantinduction/atomic/machine/extractor/turbine/RenderElectricTurbine.java index 9f92181d0..7fe630c7d 100644 --- a/atomic/src/main/scala/resonantinduction/atomic/process/turbine/RenderElectricTurbine.java +++ b/atomic/src/main/scala/resonantinduction/atomic/machine/extractor/turbine/RenderElectricTurbine.java @@ -1,4 +1,4 @@ -package resonantinduction.atomic.process.turbine; +package resonantinduction.atomic.machine.extractor.turbine; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; diff --git a/atomic/src/main/scala/resonantinduction/atomic/process/turbine/TileElectricTurbine.java b/atomic/src/main/scala/resonantinduction/atomic/machine/extractor/turbine/TileElectricTurbine.java similarity index 96% rename from atomic/src/main/scala/resonantinduction/atomic/process/turbine/TileElectricTurbine.java rename to atomic/src/main/scala/resonantinduction/atomic/machine/extractor/turbine/TileElectricTurbine.java index 1b33dd072..0b8053351 100644 --- a/atomic/src/main/scala/resonantinduction/atomic/process/turbine/TileElectricTurbine.java +++ b/atomic/src/main/scala/resonantinduction/atomic/machine/extractor/turbine/TileElectricTurbine.java @@ -1,4 +1,4 @@ -package resonantinduction.atomic.process.turbine; +package resonantinduction.atomic.machine.extractor.turbine; import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.fluids.Fluid; diff --git a/atomic/src/main/scala/resonantinduction/atomic/process/turbine/TileFunnel.java b/atomic/src/main/scala/resonantinduction/atomic/machine/extractor/turbine/TileFunnel.java similarity index 98% rename from atomic/src/main/scala/resonantinduction/atomic/process/turbine/TileFunnel.java rename to atomic/src/main/scala/resonantinduction/atomic/machine/extractor/turbine/TileFunnel.java index 5e8e4c405..d6c8bc126 100644 --- a/atomic/src/main/scala/resonantinduction/atomic/process/turbine/TileFunnel.java +++ b/atomic/src/main/scala/resonantinduction/atomic/machine/extractor/turbine/TileFunnel.java @@ -1,4 +1,4 @@ -package resonantinduction.atomic.process.turbine; +package resonantinduction.atomic.machine.extractor.turbine; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; diff --git a/atomic/src/main/scala/resonantinduction/atomic/particle/fulmination/FulminationHandler.java b/atomic/src/main/scala/resonantinduction/atomic/machine/fulmination/FulminationHandler.java similarity index 98% rename from atomic/src/main/scala/resonantinduction/atomic/particle/fulmination/FulminationHandler.java rename to atomic/src/main/scala/resonantinduction/atomic/machine/fulmination/FulminationHandler.java index 8c75218a5..b609fcb2e 100644 --- a/atomic/src/main/scala/resonantinduction/atomic/particle/fulmination/FulminationHandler.java +++ b/atomic/src/main/scala/resonantinduction/atomic/machine/fulmination/FulminationHandler.java @@ -1,4 +1,4 @@ -package resonantinduction.atomic.particle.fulmination; +package resonantinduction.atomic.machine.fulmination; import java.util.ArrayList; import java.util.HashSet; diff --git a/atomic/src/main/scala/resonantinduction/atomic/particle/fulmination/TileFulmination.java b/atomic/src/main/scala/resonantinduction/atomic/machine/fulmination/TileFulmination.java similarity index 97% rename from atomic/src/main/scala/resonantinduction/atomic/particle/fulmination/TileFulmination.java rename to atomic/src/main/scala/resonantinduction/atomic/machine/fulmination/TileFulmination.java index b56d680ba..926518c72 100644 --- a/atomic/src/main/scala/resonantinduction/atomic/particle/fulmination/TileFulmination.java +++ b/atomic/src/main/scala/resonantinduction/atomic/machine/fulmination/TileFulmination.java @@ -1,4 +1,4 @@ -package resonantinduction.atomic.particle.fulmination; +package resonantinduction.atomic.machine.fulmination; import java.util.EnumSet; diff --git a/atomic/src/main/scala/resonantinduction/atomic/fusion/BlockPlasmaHeater.java b/atomic/src/main/scala/resonantinduction/atomic/machine/plasma/BlockPlasmaHeater.java similarity index 96% rename from atomic/src/main/scala/resonantinduction/atomic/fusion/BlockPlasmaHeater.java rename to atomic/src/main/scala/resonantinduction/atomic/machine/plasma/BlockPlasmaHeater.java index a45a63d87..fad749f0e 100644 --- a/atomic/src/main/scala/resonantinduction/atomic/fusion/BlockPlasmaHeater.java +++ b/atomic/src/main/scala/resonantinduction/atomic/machine/plasma/BlockPlasmaHeater.java @@ -1,4 +1,4 @@ -package resonantinduction.atomic.fusion; +package resonantinduction.atomic.machine.plasma; import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.entity.player.EntityPlayer; diff --git a/atomic/src/main/scala/resonantinduction/atomic/fusion/ContainerNuclearBoiler.java b/atomic/src/main/scala/resonantinduction/atomic/machine/plasma/ContainerNuclearBoiler.java similarity index 97% rename from atomic/src/main/scala/resonantinduction/atomic/fusion/ContainerNuclearBoiler.java rename to atomic/src/main/scala/resonantinduction/atomic/machine/plasma/ContainerNuclearBoiler.java index 07bb9e453..a53f7e070 100644 --- a/atomic/src/main/scala/resonantinduction/atomic/fusion/ContainerNuclearBoiler.java +++ b/atomic/src/main/scala/resonantinduction/atomic/machine/plasma/ContainerNuclearBoiler.java @@ -1,4 +1,4 @@ -package resonantinduction.atomic.fusion; +package resonantinduction.atomic.machine.plasma; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; @@ -9,7 +9,7 @@ import resonant.lib.gui.ContainerBase; import resonant.lib.prefab.slot.SlotEnergyItem; import resonant.lib.prefab.slot.SlotSpecific; import resonantinduction.atomic.Atomic; -import resonantinduction.atomic.process.fission.TileNuclearBoiler; +import resonantinduction.atomic.machine.boiler.TileNuclearBoiler; /** Nuclear boiler container */ public class ContainerNuclearBoiler extends ContainerBase diff --git a/atomic/src/main/scala/resonantinduction/atomic/fusion/RenderPlasmaHeater.java b/atomic/src/main/scala/resonantinduction/atomic/machine/plasma/RenderPlasmaHeater.java similarity index 96% rename from atomic/src/main/scala/resonantinduction/atomic/fusion/RenderPlasmaHeater.java rename to atomic/src/main/scala/resonantinduction/atomic/machine/plasma/RenderPlasmaHeater.java index b41700cdc..7d726a3c2 100644 --- a/atomic/src/main/scala/resonantinduction/atomic/fusion/RenderPlasmaHeater.java +++ b/atomic/src/main/scala/resonantinduction/atomic/machine/plasma/RenderPlasmaHeater.java @@ -1,4 +1,4 @@ -package resonantinduction.atomic.fusion; +package resonantinduction.atomic.machine.plasma; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; diff --git a/atomic/src/main/scala/resonantinduction/atomic/fusion/TilePlasma.java b/atomic/src/main/scala/resonantinduction/atomic/machine/plasma/TilePlasma.java similarity index 98% rename from atomic/src/main/scala/resonantinduction/atomic/fusion/TilePlasma.java rename to atomic/src/main/scala/resonantinduction/atomic/machine/plasma/TilePlasma.java index cb0bed3d3..fde393bf1 100644 --- a/atomic/src/main/scala/resonantinduction/atomic/fusion/TilePlasma.java +++ b/atomic/src/main/scala/resonantinduction/atomic/machine/plasma/TilePlasma.java @@ -1,4 +1,4 @@ -package resonantinduction.atomic.fusion; +package resonantinduction.atomic.machine.plasma; import java.util.ArrayList; diff --git a/atomic/src/main/scala/resonantinduction/atomic/fusion/TilePlasmaHeater.java b/atomic/src/main/scala/resonantinduction/atomic/machine/plasma/TilePlasmaHeater.java similarity index 99% rename from atomic/src/main/scala/resonantinduction/atomic/fusion/TilePlasmaHeater.java rename to atomic/src/main/scala/resonantinduction/atomic/machine/plasma/TilePlasmaHeater.java index 22ea8a404..4ab1db628 100644 --- a/atomic/src/main/scala/resonantinduction/atomic/fusion/TilePlasmaHeater.java +++ b/atomic/src/main/scala/resonantinduction/atomic/machine/plasma/TilePlasmaHeater.java @@ -1,4 +1,4 @@ -package resonantinduction.atomic.fusion; +package resonantinduction.atomic.machine.plasma; import java.util.HashMap; diff --git a/atomic/src/main/scala/resonantinduction/atomic/particle/quantum/ContainerQuantumAssembler.java b/atomic/src/main/scala/resonantinduction/atomic/machine/quantum/ContainerQuantumAssembler.java similarity index 98% rename from atomic/src/main/scala/resonantinduction/atomic/particle/quantum/ContainerQuantumAssembler.java rename to atomic/src/main/scala/resonantinduction/atomic/machine/quantum/ContainerQuantumAssembler.java index 2d17eba21..b62230a6b 100644 --- a/atomic/src/main/scala/resonantinduction/atomic/particle/quantum/ContainerQuantumAssembler.java +++ b/atomic/src/main/scala/resonantinduction/atomic/machine/quantum/ContainerQuantumAssembler.java @@ -1,4 +1,4 @@ -package resonantinduction.atomic.particle.quantum; +package resonantinduction.atomic.machine.quantum; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; diff --git a/atomic/src/main/scala/resonantinduction/atomic/particle/quantum/GuiQuantumAssembler.java b/atomic/src/main/scala/resonantinduction/atomic/machine/quantum/GuiQuantumAssembler.java similarity index 97% rename from atomic/src/main/scala/resonantinduction/atomic/particle/quantum/GuiQuantumAssembler.java rename to atomic/src/main/scala/resonantinduction/atomic/machine/quantum/GuiQuantumAssembler.java index 401a9ea3f..08bb630a2 100644 --- a/atomic/src/main/scala/resonantinduction/atomic/particle/quantum/GuiQuantumAssembler.java +++ b/atomic/src/main/scala/resonantinduction/atomic/machine/quantum/GuiQuantumAssembler.java @@ -1,4 +1,4 @@ -package resonantinduction.atomic.particle.quantum; +package resonantinduction.atomic.machine.quantum; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; diff --git a/atomic/src/main/scala/resonantinduction/atomic/particle/quantum/RenderQuantumAssembler.java b/atomic/src/main/scala/resonantinduction/atomic/machine/quantum/RenderQuantumAssembler.java similarity index 98% rename from atomic/src/main/scala/resonantinduction/atomic/particle/quantum/RenderQuantumAssembler.java rename to atomic/src/main/scala/resonantinduction/atomic/machine/quantum/RenderQuantumAssembler.java index 5a3f3f353..6db92dbaa 100644 --- a/atomic/src/main/scala/resonantinduction/atomic/particle/quantum/RenderQuantumAssembler.java +++ b/atomic/src/main/scala/resonantinduction/atomic/machine/quantum/RenderQuantumAssembler.java @@ -1,4 +1,4 @@ -package resonantinduction.atomic.particle.quantum; +package resonantinduction.atomic.machine.quantum; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.entity.RenderItem; diff --git a/atomic/src/main/scala/resonantinduction/atomic/particle/quantum/TileQuantumAssembler.java b/atomic/src/main/scala/resonantinduction/atomic/machine/quantum/TileQuantumAssembler.java similarity index 99% rename from atomic/src/main/scala/resonantinduction/atomic/particle/quantum/TileQuantumAssembler.java rename to atomic/src/main/scala/resonantinduction/atomic/machine/quantum/TileQuantumAssembler.java index f7bdaff16..4f8b807e3 100644 --- a/atomic/src/main/scala/resonantinduction/atomic/particle/quantum/TileQuantumAssembler.java +++ b/atomic/src/main/scala/resonantinduction/atomic/machine/quantum/TileQuantumAssembler.java @@ -1,4 +1,4 @@ -package resonantinduction.atomic.particle.quantum; +package resonantinduction.atomic.machine.quantum; import net.minecraft.block.material.Material; import net.minecraft.entity.item.EntityItem; diff --git a/atomic/src/main/scala/resonantinduction/atomic/fission/reactor/BlockReactorDrain.java b/atomic/src/main/scala/resonantinduction/atomic/machine/reactor/BlockReactorDrain.java similarity index 97% rename from atomic/src/main/scala/resonantinduction/atomic/fission/reactor/BlockReactorDrain.java rename to atomic/src/main/scala/resonantinduction/atomic/machine/reactor/BlockReactorDrain.java index 67db7d1bc..f4e1c504e 100644 --- a/atomic/src/main/scala/resonantinduction/atomic/fission/reactor/BlockReactorDrain.java +++ b/atomic/src/main/scala/resonantinduction/atomic/machine/reactor/BlockReactorDrain.java @@ -1,4 +1,4 @@ -package resonantinduction.atomic.fission.reactor; +package resonantinduction.atomic.machine.reactor; import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.entity.EntityLivingBase; diff --git a/atomic/src/main/scala/resonantinduction/atomic/fission/reactor/ContainerReactorCell.java b/atomic/src/main/scala/resonantinduction/atomic/machine/reactor/ContainerReactorCell.java similarity index 93% rename from atomic/src/main/scala/resonantinduction/atomic/fission/reactor/ContainerReactorCell.java rename to atomic/src/main/scala/resonantinduction/atomic/machine/reactor/ContainerReactorCell.java index 928fd15cc..44fa4057f 100644 --- a/atomic/src/main/scala/resonantinduction/atomic/fission/reactor/ContainerReactorCell.java +++ b/atomic/src/main/scala/resonantinduction/atomic/machine/reactor/ContainerReactorCell.java @@ -1,12 +1,12 @@ -package resonantinduction.atomic.fission.reactor; +package resonantinduction.atomic.machine.reactor; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import resonant.lib.gui.ContainerBase; import resonant.lib.prefab.slot.SlotSpecific; -import resonantinduction.atomic.fission.ItemBreederFuel; -import resonantinduction.atomic.fission.ItemFissileFuel; +import resonantinduction.atomic.items.ItemBreederFuel; +import resonantinduction.atomic.items.ItemFissileFuel; public class ContainerReactorCell extends ContainerBase { diff --git a/atomic/src/main/scala/resonantinduction/atomic/fission/reactor/GuiReactorCell.java b/atomic/src/main/scala/resonantinduction/atomic/machine/reactor/GuiReactorCell.java similarity index 98% rename from atomic/src/main/scala/resonantinduction/atomic/fission/reactor/GuiReactorCell.java rename to atomic/src/main/scala/resonantinduction/atomic/machine/reactor/GuiReactorCell.java index 139c81de3..3d53db773 100644 --- a/atomic/src/main/scala/resonantinduction/atomic/fission/reactor/GuiReactorCell.java +++ b/atomic/src/main/scala/resonantinduction/atomic/machine/reactor/GuiReactorCell.java @@ -1,4 +1,4 @@ -package resonantinduction.atomic.fission.reactor; +package resonantinduction.atomic.machine.reactor; import java.util.List; diff --git a/atomic/src/main/scala/resonantinduction/atomic/fission/reactor/RenderReactorCell.java b/atomic/src/main/scala/resonantinduction/atomic/machine/reactor/RenderReactorCell.java similarity index 98% rename from atomic/src/main/scala/resonantinduction/atomic/fission/reactor/RenderReactorCell.java rename to atomic/src/main/scala/resonantinduction/atomic/machine/reactor/RenderReactorCell.java index 2e975f836..1e9933f0b 100644 --- a/atomic/src/main/scala/resonantinduction/atomic/fission/reactor/RenderReactorCell.java +++ b/atomic/src/main/scala/resonantinduction/atomic/machine/reactor/RenderReactorCell.java @@ -1,4 +1,4 @@ -package resonantinduction.atomic.fission.reactor; +package resonantinduction.atomic.machine.reactor; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; diff --git a/atomic/src/main/scala/resonantinduction/atomic/fission/reactor/TileControlRod.java b/atomic/src/main/scala/resonantinduction/atomic/machine/reactor/TileControlRod.java similarity index 88% rename from atomic/src/main/scala/resonantinduction/atomic/fission/reactor/TileControlRod.java rename to atomic/src/main/scala/resonantinduction/atomic/machine/reactor/TileControlRod.java index d7ebe620d..9d2c362ec 100644 --- a/atomic/src/main/scala/resonantinduction/atomic/fission/reactor/TileControlRod.java +++ b/atomic/src/main/scala/resonantinduction/atomic/machine/reactor/TileControlRod.java @@ -1,4 +1,4 @@ -package resonantinduction.atomic.fission.reactor; +package resonantinduction.atomic.machine.reactor; import net.minecraft.block.material.Material; import resonant.lib.content.module.TileBlock; diff --git a/atomic/src/main/scala/resonantinduction/atomic/fission/reactor/TileReactorCell.java b/atomic/src/main/scala/resonantinduction/atomic/machine/reactor/TileReactorCell.java similarity index 99% rename from atomic/src/main/scala/resonantinduction/atomic/fission/reactor/TileReactorCell.java rename to atomic/src/main/scala/resonantinduction/atomic/machine/reactor/TileReactorCell.java index afdc99b2b..b16f7d76c 100644 --- a/atomic/src/main/scala/resonantinduction/atomic/fission/reactor/TileReactorCell.java +++ b/atomic/src/main/scala/resonantinduction/atomic/machine/reactor/TileReactorCell.java @@ -1,4 +1,4 @@ -package resonantinduction.atomic.fission.reactor; +package resonantinduction.atomic.machine.reactor; import java.util.ArrayList; import java.util.List; @@ -38,7 +38,7 @@ import resonant.lib.thermal.ThermalPhysics; import resonant.lib.utility.inventory.InventoryUtility; import resonantinduction.atomic.Atomic; import resonantinduction.atomic.ReactorExplosion; -import resonantinduction.atomic.fusion.TilePlasma; +import resonantinduction.atomic.machine.plasma.TilePlasma; import resonantinduction.core.Reference; import resonantinduction.core.ResonantInduction; import universalelectricity.api.UniversalElectricity; diff --git a/atomic/src/main/scala/resonantinduction/atomic/fission/reactor/TileReactorDrain.java b/atomic/src/main/scala/resonantinduction/atomic/machine/reactor/TileReactorDrain.java similarity index 99% rename from atomic/src/main/scala/resonantinduction/atomic/fission/reactor/TileReactorDrain.java rename to atomic/src/main/scala/resonantinduction/atomic/machine/reactor/TileReactorDrain.java index be5699db8..a94c27a61 100644 --- a/atomic/src/main/scala/resonantinduction/atomic/fission/reactor/TileReactorDrain.java +++ b/atomic/src/main/scala/resonantinduction/atomic/machine/reactor/TileReactorDrain.java @@ -1,4 +1,4 @@ -package resonantinduction.atomic.fission.reactor; +package resonantinduction.atomic.machine.reactor; import java.util.ArrayList; import java.util.HashSet; diff --git a/atomic/src/main/scala/resonantinduction/atomic/process/sensor/ItemBlockThermometer.java b/atomic/src/main/scala/resonantinduction/atomic/machine/thermometer/ItemBlockThermometer.java similarity index 98% rename from atomic/src/main/scala/resonantinduction/atomic/process/sensor/ItemBlockThermometer.java rename to atomic/src/main/scala/resonantinduction/atomic/machine/thermometer/ItemBlockThermometer.java index c492f2f04..664266add 100644 --- a/atomic/src/main/scala/resonantinduction/atomic/process/sensor/ItemBlockThermometer.java +++ b/atomic/src/main/scala/resonantinduction/atomic/machine/thermometer/ItemBlockThermometer.java @@ -1,4 +1,4 @@ -package resonantinduction.atomic.process.sensor; +package resonantinduction.atomic.machine.thermometer; import java.util.List; diff --git a/atomic/src/main/scala/resonantinduction/atomic/process/sensor/RenderThermometer.java b/atomic/src/main/scala/resonantinduction/atomic/machine/thermometer/RenderThermometer.java similarity index 95% rename from atomic/src/main/scala/resonantinduction/atomic/process/sensor/RenderThermometer.java rename to atomic/src/main/scala/resonantinduction/atomic/machine/thermometer/RenderThermometer.java index ac75814a5..611e7d042 100644 --- a/atomic/src/main/scala/resonantinduction/atomic/process/sensor/RenderThermometer.java +++ b/atomic/src/main/scala/resonantinduction/atomic/machine/thermometer/RenderThermometer.java @@ -1,4 +1,4 @@ -package resonantinduction.atomic.process.sensor; +package resonantinduction.atomic.machine.thermometer; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; diff --git a/atomic/src/main/scala/resonantinduction/atomic/process/sensor/TileThermometer.java b/atomic/src/main/scala/resonantinduction/atomic/machine/thermometer/TileThermometer.java similarity index 99% rename from atomic/src/main/scala/resonantinduction/atomic/process/sensor/TileThermometer.java rename to atomic/src/main/scala/resonantinduction/atomic/machine/thermometer/TileThermometer.java index d74cfe322..99ef4dfe5 100644 --- a/atomic/src/main/scala/resonantinduction/atomic/process/sensor/TileThermometer.java +++ b/atomic/src/main/scala/resonantinduction/atomic/machine/thermometer/TileThermometer.java @@ -1,4 +1,4 @@ -package resonantinduction.atomic.process.sensor; +package resonantinduction.atomic.machine.thermometer; import java.util.ArrayList;