diff --git a/src/main/java/crazypants/enderio/ClientProxy.java b/src/main/java/crazypants/enderio/ClientProxy.java index 8c53148a..19a63a4e 100644 --- a/src/main/java/crazypants/enderio/ClientProxy.java +++ b/src/main/java/crazypants/enderio/ClientProxy.java @@ -103,8 +103,6 @@ import crazypants.enderio.machine.spawner.BrokenSpawnerRenderer; import crazypants.enderio.machine.spawnguard.BlockSpawnGuard; import crazypants.enderio.machine.spawnguard.SpawnGuardRenderer; import crazypants.enderio.machine.spawnguard.TileSpawnGuard; -import crazypants.enderio.machine.still.BlockVat; -import crazypants.enderio.machine.still.VatRenderer; import crazypants.enderio.machine.tank.TankFluidRenderer; import crazypants.enderio.machine.tank.TankItemRenderer; import crazypants.enderio.machine.tank.TileTank; @@ -112,6 +110,8 @@ import crazypants.enderio.machine.transceiver.TileTransceiver; import crazypants.enderio.machine.transceiver.render.TransceiverRenderer; import crazypants.enderio.machine.vacuum.BlockVacuumChest; import crazypants.enderio.machine.vacuum.VacuumChestRenderer; +import crazypants.enderio.machine.vat.BlockVat; +import crazypants.enderio.machine.vat.VatRenderer; import crazypants.enderio.machine.xp.BlockExperienceObelisk; import crazypants.enderio.machine.xp.ExperienceObliskRenderer; import crazypants.enderio.machine.xp.TileExperienceOblisk; diff --git a/src/main/java/crazypants/enderio/EnderIO.java b/src/main/java/crazypants/enderio/EnderIO.java index 62f4cf6a..a7493d69 100644 --- a/src/main/java/crazypants/enderio/EnderIO.java +++ b/src/main/java/crazypants/enderio/EnderIO.java @@ -118,12 +118,12 @@ import crazypants.enderio.machine.spawner.BlockPoweredSpawner; import crazypants.enderio.machine.spawner.ItemBrokenSpawner; import crazypants.enderio.machine.spawner.PoweredSpawnerConfig; import crazypants.enderio.machine.spawnguard.BlockSpawnGuard; -import crazypants.enderio.machine.still.BlockVat; -import crazypants.enderio.machine.still.VatRecipeManager; import crazypants.enderio.machine.tank.BlockTank; import crazypants.enderio.machine.transceiver.BlockTransceiver; import crazypants.enderio.machine.transceiver.ServerChannelRegister; import crazypants.enderio.machine.vacuum.BlockVacuumChest; +import crazypants.enderio.machine.vat.BlockVat; +import crazypants.enderio.machine.vat.VatRecipeManager; import crazypants.enderio.machine.wireless.BlockWirelessCharger; import crazypants.enderio.machine.xp.BlockExperienceObelisk; import crazypants.enderio.machine.xp.ItemXpTransfer; diff --git a/src/main/java/crazypants/enderio/api/IMC.java b/src/main/java/crazypants/enderio/api/IMC.java index 5648a5d3..218608b7 100644 --- a/src/main/java/crazypants/enderio/api/IMC.java +++ b/src/main/java/crazypants/enderio/api/IMC.java @@ -9,7 +9,7 @@ import crazypants.enderio.machine.painter.PaintSourceValidator; import crazypants.enderio.machine.slicensplice.SliceAndSpliceRecipeManager; import crazypants.enderio.machine.soul.SoulBinderRecipeManager; import crazypants.enderio.machine.spawner.PoweredSpawnerConfig; -import crazypants.enderio.machine.still.VatRecipeManager; +import crazypants.enderio.machine.vat.VatRecipeManager; import crazypants.enderio.teleport.TravelController; /** diff --git a/src/main/java/crazypants/enderio/machine/still/BlockVat.java b/src/main/java/crazypants/enderio/machine/vat/BlockVat.java similarity index 99% rename from src/main/java/crazypants/enderio/machine/still/BlockVat.java rename to src/main/java/crazypants/enderio/machine/vat/BlockVat.java index b076734d..b6d64776 100644 --- a/src/main/java/crazypants/enderio/machine/still/BlockVat.java +++ b/src/main/java/crazypants/enderio/machine/vat/BlockVat.java @@ -1,4 +1,4 @@ -package crazypants.enderio.machine.still; +package crazypants.enderio.machine.vat; import java.util.Random; diff --git a/src/main/java/crazypants/enderio/machine/still/ContainerVat.java b/src/main/java/crazypants/enderio/machine/vat/ContainerVat.java similarity index 95% rename from src/main/java/crazypants/enderio/machine/still/ContainerVat.java rename to src/main/java/crazypants/enderio/machine/vat/ContainerVat.java index 07141e57..2c870e87 100644 --- a/src/main/java/crazypants/enderio/machine/still/ContainerVat.java +++ b/src/main/java/crazypants/enderio/machine/vat/ContainerVat.java @@ -1,4 +1,4 @@ -package crazypants.enderio.machine.still; +package crazypants.enderio.machine.vat; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Slot; diff --git a/src/main/java/crazypants/enderio/machine/still/GuiVat.java b/src/main/java/crazypants/enderio/machine/vat/GuiVat.java similarity index 99% rename from src/main/java/crazypants/enderio/machine/still/GuiVat.java rename to src/main/java/crazypants/enderio/machine/vat/GuiVat.java index 40250167..6f249989 100644 --- a/src/main/java/crazypants/enderio/machine/still/GuiVat.java +++ b/src/main/java/crazypants/enderio/machine/vat/GuiVat.java @@ -1,4 +1,4 @@ -package crazypants.enderio.machine.still; +package crazypants.enderio.machine.vat; import java.awt.Color; import java.awt.Rectangle; diff --git a/src/main/java/crazypants/enderio/machine/still/PacketDumpTank.java b/src/main/java/crazypants/enderio/machine/vat/PacketDumpTank.java similarity index 96% rename from src/main/java/crazypants/enderio/machine/still/PacketDumpTank.java rename to src/main/java/crazypants/enderio/machine/vat/PacketDumpTank.java index 93432370..2d85bdd0 100644 --- a/src/main/java/crazypants/enderio/machine/still/PacketDumpTank.java +++ b/src/main/java/crazypants/enderio/machine/vat/PacketDumpTank.java @@ -1,4 +1,4 @@ -package crazypants.enderio.machine.still; +package crazypants.enderio.machine.vat; import io.netty.buffer.ByteBuf; import net.minecraftforge.fluids.FluidTank; diff --git a/src/main/java/crazypants/enderio/machine/still/PacketTanks.java b/src/main/java/crazypants/enderio/machine/vat/PacketTanks.java similarity index 98% rename from src/main/java/crazypants/enderio/machine/still/PacketTanks.java rename to src/main/java/crazypants/enderio/machine/vat/PacketTanks.java index 81a52941..1cabb95a 100644 --- a/src/main/java/crazypants/enderio/machine/still/PacketTanks.java +++ b/src/main/java/crazypants/enderio/machine/vat/PacketTanks.java @@ -1,4 +1,4 @@ -package crazypants.enderio.machine.still; +package crazypants.enderio.machine.vat; import io.netty.buffer.ByteBuf; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/crazypants/enderio/machine/still/PacketVatProgress.java b/src/main/java/crazypants/enderio/machine/vat/PacketVatProgress.java similarity index 98% rename from src/main/java/crazypants/enderio/machine/still/PacketVatProgress.java rename to src/main/java/crazypants/enderio/machine/vat/PacketVatProgress.java index 5ab11ba5..6be33b1d 100644 --- a/src/main/java/crazypants/enderio/machine/still/PacketVatProgress.java +++ b/src/main/java/crazypants/enderio/machine/vat/PacketVatProgress.java @@ -1,4 +1,4 @@ -package crazypants.enderio.machine.still; +package crazypants.enderio.machine.vat; import io.netty.buffer.ByteBuf; import net.minecraftforge.fluids.FluidRegistry; diff --git a/src/main/java/crazypants/enderio/machine/still/TileVat.java b/src/main/java/crazypants/enderio/machine/vat/TileVat.java similarity index 99% rename from src/main/java/crazypants/enderio/machine/still/TileVat.java rename to src/main/java/crazypants/enderio/machine/vat/TileVat.java index a02b2cb9..a361664e 100644 --- a/src/main/java/crazypants/enderio/machine/still/TileVat.java +++ b/src/main/java/crazypants/enderio/machine/vat/TileVat.java @@ -1,4 +1,4 @@ -package crazypants.enderio.machine.still; +package crazypants.enderio.machine.vat; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/crazypants/enderio/machine/still/VatMachineRecipe.java b/src/main/java/crazypants/enderio/machine/vat/VatMachineRecipe.java similarity index 97% rename from src/main/java/crazypants/enderio/machine/still/VatMachineRecipe.java rename to src/main/java/crazypants/enderio/machine/vat/VatMachineRecipe.java index 7373cc2a..5ff7b0cf 100644 --- a/src/main/java/crazypants/enderio/machine/still/VatMachineRecipe.java +++ b/src/main/java/crazypants/enderio/machine/vat/VatMachineRecipe.java @@ -1,4 +1,4 @@ -package crazypants.enderio.machine.still; +package crazypants.enderio.machine.vat; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/crazypants/enderio/machine/still/VatRecipe.java b/src/main/java/crazypants/enderio/machine/vat/VatRecipe.java similarity index 99% rename from src/main/java/crazypants/enderio/machine/still/VatRecipe.java rename to src/main/java/crazypants/enderio/machine/vat/VatRecipe.java index 20701ffe..ddccd02d 100644 --- a/src/main/java/crazypants/enderio/machine/still/VatRecipe.java +++ b/src/main/java/crazypants/enderio/machine/vat/VatRecipe.java @@ -1,4 +1,4 @@ -package crazypants.enderio.machine.still; +package crazypants.enderio.machine.vat; import java.util.Collections; import java.util.List; diff --git a/src/main/java/crazypants/enderio/machine/still/VatRecipeManager.java b/src/main/java/crazypants/enderio/machine/vat/VatRecipeManager.java similarity index 98% rename from src/main/java/crazypants/enderio/machine/still/VatRecipeManager.java rename to src/main/java/crazypants/enderio/machine/vat/VatRecipeManager.java index c390ea66..684ab767 100644 --- a/src/main/java/crazypants/enderio/machine/still/VatRecipeManager.java +++ b/src/main/java/crazypants/enderio/machine/vat/VatRecipeManager.java @@ -1,4 +1,4 @@ -package crazypants.enderio.machine.still; +package crazypants.enderio.machine.vat; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/crazypants/enderio/machine/still/VatRenderer.java b/src/main/java/crazypants/enderio/machine/vat/VatRenderer.java similarity index 99% rename from src/main/java/crazypants/enderio/machine/still/VatRenderer.java rename to src/main/java/crazypants/enderio/machine/vat/VatRenderer.java index ec58cd31..174be697 100644 --- a/src/main/java/crazypants/enderio/machine/still/VatRenderer.java +++ b/src/main/java/crazypants/enderio/machine/vat/VatRenderer.java @@ -1,4 +1,4 @@ -package crazypants.enderio.machine.still; +package crazypants.enderio.machine.vat; import java.util.List; diff --git a/src/main/java/crazypants/enderio/nei/VatRecipeHandler.java b/src/main/java/crazypants/enderio/nei/VatRecipeHandler.java index 02901310..520489fe 100644 --- a/src/main/java/crazypants/enderio/nei/VatRecipeHandler.java +++ b/src/main/java/crazypants/enderio/nei/VatRecipeHandler.java @@ -22,8 +22,8 @@ import crazypants.enderio.gui.IconEIO; import crazypants.enderio.machine.power.PowerDisplayUtil; import crazypants.enderio.machine.recipe.IRecipe; import crazypants.enderio.machine.recipe.RecipeInput; -import crazypants.enderio.machine.still.GuiVat; -import crazypants.enderio.machine.still.VatRecipeManager; +import crazypants.enderio.machine.vat.GuiVat; +import crazypants.enderio.machine.vat.VatRecipeManager; import crazypants.render.RenderUtil; import crazypants.util.FluidUtil;