Refactor obelisk packages and some cleanup

This commit is contained in:
tterrag1098 committed 2015-04-12 04:18:15 -04:00
1 parent 91b455e20f
commit 79516999fe
21 files changed
+78 -88

No files matched your search

@@ -67,9 +67,6 @@ import crazypants.enderio.item.skull.EndermanSkullRenderer;
import crazypants.enderio.machine.AbstractMachineBlock;
import crazypants.enderio.machine.AbstractMachineRenderer;
import crazypants.enderio.machine.TechneMachineRenderer;
import crazypants.enderio.machine.attractor.BlockAttractor;
import crazypants.enderio.machine.attractor.ObeliskRenderer;
import crazypants.enderio.machine.attractor.TileAttractor;
import crazypants.enderio.machine.capbank.BlockCapBank;
import crazypants.enderio.machine.capbank.TileCapBank;
import crazypants.enderio.machine.capbank.render.CapBankRenderer;
@@ -89,6 +86,14 @@ import crazypants.enderio.machine.killera.KillerJoeRenderer;
import crazypants.enderio.machine.killera.TileKillerJoe;
import crazypants.enderio.machine.light.BlockElectricLight;
import crazypants.enderio.machine.light.ElectricLightRenderer;
import crazypants.enderio.machine.obelisk.ObeliskRenderer;
import crazypants.enderio.machine.obelisk.attractor.BlockAttractor;
import crazypants.enderio.machine.obelisk.attractor.TileAttractor;
import crazypants.enderio.machine.obelisk.aversion.AversionObeliskRenderer;
import crazypants.enderio.machine.obelisk.aversion.BlockAversionObelisk;
import crazypants.enderio.machine.obelisk.aversion.TileAversionObelisk;
import crazypants.enderio.machine.obelisk.weather.BlockWeatherObelisk;
import crazypants.enderio.machine.obelisk.weather.TileWeatherObelisk;
import crazypants.enderio.machine.painter.BlockPaintedFenceGate;
import crazypants.enderio.machine.painter.BlockPaintedFenceGateRenderer;
import crazypants.enderio.machine.painter.BlockPaintedGlowstone;
@@ -106,9 +111,6 @@ import crazypants.enderio.machine.solar.SolarPanelRenderer;
import crazypants.enderio.machine.soul.BlockSoulBinder;
import crazypants.enderio.machine.soul.SoulBinderRenderer;
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.tank.TankFluidRenderer;
import crazypants.enderio.machine.tank.TankItemRenderer;
import crazypants.enderio.machine.tank.TileTank;
@@ -118,8 +120,6 @@ import crazypants.enderio.machine.vacuum.BlockVacuumChest;
import crazypants.enderio.machine.vacuum.VacuumChestRenderer;
import crazypants.enderio.machine.vat.BlockVat;
import crazypants.enderio.machine.vat.TileVat;
import crazypants.enderio.machine.weather.BlockWeatherObelisk;
import crazypants.enderio.machine.weather.TileWeatherObelisk;
import crazypants.enderio.machine.xp.BlockExperienceObelisk;
import crazypants.enderio.machine.xp.TileExperienceOblisk;
import crazypants.enderio.material.BlockFusedQuartz;
@@ -257,9 +257,9 @@ public class ClientProxy extends CommonProxy {
ClientRegistry.bindTileEntitySpecialRenderer(TileAttractor.class, attRen);
MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockAttractor), attRen);
SpawnGuardRenderer sgr = new SpawnGuardRenderer();
BlockSpawnGuard.renderId = BlockAttractor.renderId;
ClientRegistry.bindTileEntitySpecialRenderer(TileSpawnGuard.class, sgr);
AversionObeliskRenderer sgr = new AversionObeliskRenderer();
BlockAversionObelisk.renderId = BlockAttractor.renderId;
ClientRegistry.bindTileEntitySpecialRenderer(TileAversionObelisk.class, sgr);
MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockSpawnGuard), sgr);
ObeliskRenderer<TileExperienceOblisk> eor = new ObeliskRenderer<TileExperienceOblisk>(new ItemStack(EnderIO.itemXpTransfer));
@@ -79,7 +79,6 @@ import crazypants.enderio.machine.MachineRecipes;
import crazypants.enderio.machine.PacketRedstoneMode;
import crazypants.enderio.machine.alloy.AlloyRecipeManager;
import crazypants.enderio.machine.alloy.BlockAlloySmelter;
import crazypants.enderio.machine.attractor.BlockAttractor;
import crazypants.enderio.machine.buffer.BlockBuffer;
import crazypants.enderio.machine.capbank.BlockCapBank;
import crazypants.enderio.machine.crafter.BlockCrafter;
@@ -98,6 +97,9 @@ import crazypants.enderio.machine.killera.BlockKillerJoe;
import crazypants.enderio.machine.light.BlockElectricLight;
import crazypants.enderio.machine.light.BlockLightNode;
import crazypants.enderio.machine.monitor.BlockPowerMonitor;
import crazypants.enderio.machine.obelisk.attractor.BlockAttractor;
import crazypants.enderio.machine.obelisk.aversion.BlockAversionObelisk;
import crazypants.enderio.machine.obelisk.weather.BlockWeatherObelisk;
import crazypants.enderio.machine.painter.BlockPaintedCarpet;
import crazypants.enderio.machine.painter.BlockPaintedFence;
import crazypants.enderio.machine.painter.BlockPaintedFenceGate;
@@ -118,14 +120,12 @@ import crazypants.enderio.machine.soul.SoulBinderRecipeManager;
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.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.weather.BlockWeatherObelisk;
import crazypants.enderio.machine.wireless.BlockWirelessCharger;
import crazypants.enderio.machine.xp.BlockExperienceObelisk;
import crazypants.enderio.machine.xp.ItemXpTransfer;
@@ -153,7 +153,6 @@ import crazypants.enderio.teleport.telepad.BlockTelePad;
import crazypants.enderio.teleport.telepad.ItemCoordSelector;
import crazypants.enderio.thaumcraft.ThaumcraftCompat;
import crazypants.util.EntityUtil;
import static crazypants.enderio.EnderIO.*;
@Mod(modid = MODID, name = MOD_NAME, version = VERSION, dependencies = "required-after:[email protected],);after:MineFactoryReloaded;after:Waila@[1.5.8,);after:Thaumcraft", guiFactory = "crazypants.enderio.config.ConfigFactoryEIO")
@@ -243,7 +242,7 @@ public class EnderIO {
public static BlockSliceAndSplice blockSliceAndSplice;
public static BlockSoulBinder blockSoulFuser;
public static BlockAttractor blockAttractor;
public static BlockSpawnGuard blockSpawnGuard;
public static BlockAversionObelisk blockSpawnGuard;
public static BlockExperienceObelisk blockExperianceOblisk;
public static BlockWeatherObelisk blockWeatherObelisk;
public static BlockTransceiver blockTransceiver;
@@ -351,7 +350,7 @@ public class EnderIO {
blockPoweredSpawner = BlockPoweredSpawner.create();
blockKillerJoe = BlockKillerJoe.create();
blockAttractor = BlockAttractor.create();
blockSpawnGuard = BlockSpawnGuard.create();
blockSpawnGuard = BlockAversionObelisk.create();
blockExperianceOblisk = BlockExperienceObelisk.create();
blockWeatherObelisk = BlockWeatherObelisk.create();
blockEnchanter = BlockEnchanter.create();
@@ -15,7 +15,7 @@ import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import cpw.mods.fml.common.registry.GameRegistry;
import crazypants.enderio.EnderIO;
import crazypants.enderio.Log;
import crazypants.enderio.machine.weather.TileWeatherObelisk.WeatherTask;
import crazypants.enderio.machine.obelisk.weather.TileWeatherObelisk.WeatherTask;
import crazypants.vecmath.VecmathUtil;
public final class Config {
@@ -1,4 +1,4 @@
package crazypants.enderio.machine.attractor;
package crazypants.enderio.machine.obelisk;
import java.util.Random;
@@ -25,6 +25,7 @@ import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import crazypants.enderio.EnderIO;
import crazypants.enderio.machine.obelisk.attractor.BlockAttractor;
import crazypants.render.BoundingBox;
import crazypants.render.CubeRenderer;
import crazypants.render.RenderUtil;
@@ -32,6 +33,7 @@ import crazypants.render.VertexTransform;
import crazypants.vecmath.Vector3d;
import crazypants.vecmath.Vector3f;
import crazypants.vecmath.Vertex;
import static org.lwjgl.opengl.GL11.*;
@SideOnly(Side.CLIENT)
@@ -1,4 +1,4 @@
package crazypants.enderio.machine.attractor;
package crazypants.enderio.machine.obelisk.attractor;
import java.util.Random;
@@ -1,4 +1,4 @@
package crazypants.enderio.machine.attractor;
package crazypants.enderio.machine.obelisk.attractor;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.inventory.Slot;
@@ -1,4 +1,4 @@
package crazypants.enderio.machine.attractor;
package crazypants.enderio.machine.obelisk.attractor;
import java.awt.Color;
@@ -1,4 +1,4 @@
package crazypants.enderio.machine.attractor;
package crazypants.enderio.machine.obelisk.attractor;
import java.util.ArrayList;
import java.util.HashSet;
@@ -39,8 +39,6 @@ import crazypants.enderio.machine.SlotDefinition;
import crazypants.enderio.machine.ranged.IRanged;
import crazypants.enderio.machine.ranged.RangeEntity;
import crazypants.enderio.power.BasicCapacitor;
import crazypants.enderio.power.Capacitors;
import crazypants.enderio.power.ICapacitor;
import crazypants.render.BoundingBox;
import crazypants.util.BlockCoord;
import crazypants.vecmath.Vector3d;
@@ -1,4 +1,4 @@
package crazypants.enderio.machine.spawnguard;
package crazypants.enderio.machine.obelisk.aversion;
import java.util.HashMap;
import java.util.Map;
@@ -7,42 +7,38 @@ import net.minecraft.entity.monster.EntitySlime;
import net.minecraft.entity.passive.EntitySquid;
import net.minecraft.world.World;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.entity.living.LivingDropsEvent;
import net.minecraftforge.event.entity.living.LivingSpawnEvent;
import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.eventhandler.Event.Result;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import crazypants.enderio.config.Config;
import crazypants.enderio.machine.wireless.IWirelessCharger;
import crazypants.enderio.machine.wireless.WirelessChargerController;
import crazypants.util.BlockCoord;
public class SpawnGuardController {
public class AversionObeliskController {
public static SpawnGuardController instance = new SpawnGuardController();
public static AversionObeliskController instance = new AversionObeliskController();
static {
MinecraftForge.EVENT_BUS.register(SpawnGuardController.instance);
MinecraftForge.EVENT_BUS.register(AversionObeliskController.instance);
}
private Map<Integer, Map<BlockCoord, TileSpawnGuard>> perWorldGuards = new HashMap<Integer, Map<BlockCoord, TileSpawnGuard>>();
private Map<Integer, Map<BlockCoord, TileAversionObelisk>> perWorldGuards = new HashMap<Integer, Map<BlockCoord, TileAversionObelisk>>();
private SpawnGuardController() {
private AversionObeliskController() {
}
public void registerGuard(TileSpawnGuard guard) {
public void registerGuard(TileAversionObelisk guard) {
if(guard == null) {
return;
}
Map<BlockCoord, TileSpawnGuard> chargers = getGuardsForWorld(guard.getWorldObj());
Map<BlockCoord, TileAversionObelisk> chargers = getGuardsForWorld(guard.getWorldObj());
chargers.put(guard.getLocation(), guard);
}
public void deregisterGuard(TileSpawnGuard guard) {
public void deregisterGuard(TileAversionObelisk guard) {
if(guard == null) {
return;
}
Map<BlockCoord, TileSpawnGuard> chargers = getGuardsForWorld(guard.getWorldObj());
Map<BlockCoord, TileAversionObelisk> chargers = getGuardsForWorld(guard.getWorldObj());
chargers.remove(guard.getLocation());
}
@@ -59,8 +55,8 @@ public class SpawnGuardController {
}
Map<BlockCoord, TileSpawnGuard> guards = getGuardsForWorld(evt.world);
for(TileSpawnGuard guard : guards.values()) {
Map<BlockCoord, TileAversionObelisk> guards = getGuardsForWorld(evt.world);
for(TileAversionObelisk guard : guards.values()) {
if(guard.isSpawnPrevented(evt.entityLiving)) {
evt.setResult(Result.DENY);
return;
@@ -68,10 +64,10 @@ public class SpawnGuardController {
}
}
private Map<BlockCoord, TileSpawnGuard> getGuardsForWorld(World world) {
Map<BlockCoord, TileSpawnGuard> res = perWorldGuards.get(world.provider.dimensionId);
private Map<BlockCoord, TileAversionObelisk> getGuardsForWorld(World world) {
Map<BlockCoord, TileAversionObelisk> res = perWorldGuards.get(world.provider.dimensionId);
if(res == null) {
res = new HashMap<BlockCoord, TileSpawnGuard>();
res = new HashMap<BlockCoord, TileAversionObelisk>();
perWorldGuards.put(world.provider.dimensionId, res);
}
return res;
@@ -1,28 +1,28 @@
package crazypants.enderio.machine.spawnguard;
package crazypants.enderio.machine.obelisk.aversion;
import net.minecraft.item.ItemStack;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import crazypants.enderio.EnderIO;
import crazypants.enderio.item.skull.BlockEndermanSkull;
import crazypants.enderio.machine.attractor.ObeliskRenderer;
import crazypants.enderio.machine.obelisk.ObeliskRenderer;
@SideOnly(Side.CLIENT)
public class SpawnGuardRenderer extends ObeliskRenderer<TileSpawnGuard> {
public class AversionObeliskRenderer extends ObeliskRenderer<TileAversionObelisk> {
private ItemStack offStack = new ItemStack(EnderIO.blockEndermanSkull, 1, BlockEndermanSkull.SkullType.TORMENTED.ordinal());
private ItemStack onStack = new ItemStack(EnderIO.blockEndermanSkull, 1, BlockEndermanSkull.SkullType.REANIMATED_TORMENTED.ordinal());
public SpawnGuardRenderer() {
public AversionObeliskRenderer() {
super(null);
}
@Override
protected ItemStack getFloatingItem(TileSpawnGuard te) {
protected ItemStack getFloatingItem(TileAversionObelisk te) {
if(te == null) {
return offStack;
}
TileSpawnGuard sg = te;
TileAversionObelisk sg = te;
if(sg.isActive()) {
return onStack;
}
@@ -1,4 +1,4 @@
package crazypants.enderio.machine.spawnguard;
package crazypants.enderio.machine.obelisk.aversion;
import java.util.Random;
@@ -6,7 +6,6 @@ import net.minecraft.client.Minecraft;
import net.minecraft.client.particle.EntityFX;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.AxisAlignedBB;
import net.minecraft.world.World;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -14,30 +13,30 @@ import crazypants.enderio.GuiHandler;
import crazypants.enderio.ModObject;
import crazypants.enderio.machine.AbstractMachineBlock;
public class BlockSpawnGuard extends AbstractMachineBlock<TileSpawnGuard> {
public class BlockAversionObelisk extends AbstractMachineBlock<TileAversionObelisk> {
public static int renderId;
public static BlockSpawnGuard create() {
BlockSpawnGuard res = new BlockSpawnGuard();
public static BlockAversionObelisk create() {
BlockAversionObelisk res = new BlockAversionObelisk();
res.init();
//Just making sure its loaded
SpawnGuardController.instance.toString();
AversionObeliskController.instance.toString();
return res;
}
}
protected BlockSpawnGuard() {
super(ModObject.blockSpawnGuard, TileSpawnGuard.class);
protected BlockAversionObelisk() {
super(ModObject.blockSpawnGuard, TileAversionObelisk.class);
setObeliskBounds();
}
@Override
public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) {
TileEntity te = world.getTileEntity(x, y, z);
if(te instanceof TileSpawnGuard) {
return new ContainerSpawnGuard(player.inventory, (TileSpawnGuard)te);
if(te instanceof TileAversionObelisk) {
return new ContainerAversionObelisk(player.inventory, (TileAversionObelisk)te);
}
return null;
}
@@ -45,8 +44,8 @@ public class BlockSpawnGuard extends AbstractMachineBlock<TileSpawnGuard> {
@Override
public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) {
TileEntity te = world.getTileEntity(x, y, z);
if(te instanceof TileSpawnGuard) {
return new GuiSpawnGurad(player.inventory, (TileSpawnGuard)te);
if(te instanceof TileAversionObelisk) {
return new GuiAversionObelisk(player.inventory, (TileAversionObelisk)te);
}
return null;
}
@@ -1,4 +1,4 @@
package crazypants.enderio.machine.spawnguard;
package crazypants.enderio.machine.obelisk.aversion;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.inventory.Slot;
@@ -6,9 +6,9 @@ import net.minecraft.item.ItemStack;
import crazypants.enderio.machine.AbstractMachineEntity;
import crazypants.enderio.machine.gui.AbstractMachineContainer;
public class ContainerSpawnGuard extends AbstractMachineContainer {
public class ContainerAversionObelisk extends AbstractMachineContainer {
public ContainerSpawnGuard(InventoryPlayer playerInv, AbstractMachineEntity te) {
public ContainerAversionObelisk(InventoryPlayer playerInv, AbstractMachineEntity te) {
super(playerInv, te);
}
@@ -1,4 +1,4 @@
package crazypants.enderio.machine.spawnguard;
package crazypants.enderio.machine.obelisk.aversion;
import java.awt.Color;
@@ -14,14 +14,14 @@ import crazypants.render.ColorUtil;
import crazypants.render.RenderUtil;
import crazypants.util.Lang;
public class GuiSpawnGurad extends GuiPoweredMachineBase<TileSpawnGuard> {
public class GuiAversionObelisk extends GuiPoweredMachineBase<TileAversionObelisk> {
ToggleButtonEIO showRangeB;
private static final int RANGE_ID = 8738924;
public GuiSpawnGurad(InventoryPlayer par1InventoryPlayer, TileSpawnGuard te) {
super(te, new ContainerSpawnGuard(par1InventoryPlayer, te));
public GuiAversionObelisk(InventoryPlayer par1InventoryPlayer, TileAversionObelisk te) {
super(te, new ContainerAversionObelisk(par1InventoryPlayer, te));
int x = getXSize() - 5 - BUTTON_SIZE;
showRangeB = new ToggleButtonEIO(this, RANGE_ID, x, 44, IconEIO.ADD_BUT, IconEIO.ADD_BUT);
@@ -1,4 +1,4 @@
package crazypants.enderio.machine.spawnguard;
package crazypants.enderio.machine.obelisk.aversion;
import net.minecraft.entity.EntityList;
import net.minecraft.entity.EntityLiving;
@@ -17,21 +17,18 @@ import crazypants.enderio.machine.SlotDefinition;
import crazypants.enderio.machine.ranged.IRanged;
import crazypants.enderio.machine.ranged.RangeEntity;
import crazypants.enderio.power.BasicCapacitor;
import crazypants.enderio.power.Capacitors;
import crazypants.enderio.power.ICapacitor;
import crazypants.render.BoundingBox;
public class TileSpawnGuard extends AbstractPowerConsumerEntity implements IRanged {
public class TileAversionObelisk extends AbstractPowerConsumerEntity implements IRanged {
private int powerPerTick;
private int range;
private int rangeSqu;
private boolean registered = false;
private AxisAlignedBB bounds;
private boolean showingRange;
public TileSpawnGuard() {
public TileAversionObelisk() {
super(new SlotDefinition(12, 0));
}
@@ -60,7 +57,7 @@ public class TileSpawnGuard extends AbstractPowerConsumerEntity implements IRang
@Override
public void invalidate() {
super.invalidate();
SpawnGuardController.instance.deregisterGuard(this);
AversionObeliskController.instance.deregisterGuard(this);
registered = false;
}
@@ -85,7 +82,6 @@ public class TileSpawnGuard extends AbstractPowerConsumerEntity implements IRang
powerPerTick = Config.spawnGuardPowerPerTickLevelThree;
break;
}
rangeSqu = range * range;
setCapacitor(new BasicCapacitor(powerPerTick * 8, getCapacitor().getMaxEnergyStored(), powerPerTick));
BoundingBox bb = new BoundingBox(getLocation());
@@ -128,7 +124,7 @@ public class TileSpawnGuard extends AbstractPowerConsumerEntity implements IRang
protected boolean processTasks(boolean redstoneCheckPassed) {
if(redstoneCheckPassed && hasPower()) {
if(!registered) {
SpawnGuardController.instance.registerGuard(this);
AversionObeliskController.instance.registerGuard(this);
registered = true;
}
usePower();
@@ -1,4 +1,4 @@
package crazypants.enderio.machine.weather;
package crazypants.enderio.machine.obelisk.weather;
import java.util.Random;
@@ -1,4 +1,4 @@
package crazypants.enderio.machine.weather;
package crazypants.enderio.machine.obelisk.weather;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.inventory.ICrafting;
@@ -1,4 +1,4 @@
package crazypants.enderio.machine.weather;
package crazypants.enderio.machine.obelisk.weather;
import java.awt.Color;
import java.text.NumberFormat;
@@ -15,7 +15,7 @@ import org.lwjgl.opengl.GL11;
import crazypants.enderio.gui.IconButtonEIO;
import crazypants.enderio.gui.IconEIO;
import crazypants.enderio.machine.gui.GuiPoweredMachineBase;
import crazypants.enderio.machine.weather.TileWeatherObelisk.WeatherTask;
import crazypants.enderio.machine.obelisk.weather.TileWeatherObelisk.WeatherTask;
import crazypants.enderio.network.PacketHandler;
import crazypants.util.Lang;
@@ -1,4 +1,4 @@
package crazypants.enderio.machine.weather;
package crazypants.enderio.machine.obelisk.weather;
import io.netty.buffer.ByteBuf;
import cpw.mods.fml.common.network.simpleimpl.IMessage;
@@ -1,10 +1,10 @@
package crazypants.enderio.machine.weather;
package crazypants.enderio.machine.obelisk.weather;
import cpw.mods.fml.common.network.simpleimpl.IMessage;
import cpw.mods.fml.common.network.simpleimpl.IMessageHandler;
import cpw.mods.fml.common.network.simpleimpl.MessageContext;
import crazypants.enderio.EnderIO;
import crazypants.enderio.machine.weather.TileWeatherObelisk.WeatherTask;
import crazypants.enderio.machine.obelisk.weather.TileWeatherObelisk.WeatherTask;
public class PacketFinishWeather extends PacketActivateWeather {
@@ -1,4 +1,4 @@
package crazypants.enderio.machine.weather;
package crazypants.enderio.machine.obelisk.weather;
import java.awt.Color;
@@ -18,7 +18,7 @@ import net.minecraftforge.oredict.ShapelessOreRecipe;
import cpw.mods.fml.common.registry.GameRegistry;
import crazypants.enderio.EnderIO;
import crazypants.enderio.config.Config;
import crazypants.enderio.machine.weather.TileWeatherObelisk.WeatherTask;
import crazypants.enderio.machine.obelisk.weather.TileWeatherObelisk.WeatherTask;
import crazypants.util.OreDictionaryHelper;