diff --git a/src/main/java/crazypants/enderio/ClientProxy.java b/src/main/java/crazypants/enderio/ClientProxy.java index 4aa3827a..7c2efe53 100644 --- a/src/main/java/crazypants/enderio/ClientProxy.java +++ b/src/main/java/crazypants/enderio/ClientProxy.java @@ -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 eor = new ObeliskRenderer(new ItemStack(EnderIO.itemXpTransfer)); diff --git a/src/main/java/crazypants/enderio/EnderIO.java b/src/main/java/crazypants/enderio/EnderIO.java index 1cf312a6..668c51f8 100644 --- a/src/main/java/crazypants/enderio/EnderIO.java +++ b/src/main/java/crazypants/enderio/EnderIO.java @@ -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:Forge@10.13.0.1150,);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(); diff --git a/src/main/java/crazypants/enderio/config/Config.java b/src/main/java/crazypants/enderio/config/Config.java index e7356c2f..6029cce6 100644 --- a/src/main/java/crazypants/enderio/config/Config.java +++ b/src/main/java/crazypants/enderio/config/Config.java @@ -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 { diff --git a/src/main/java/crazypants/enderio/machine/attractor/ObeliskRenderer.java b/src/main/java/crazypants/enderio/machine/obelisk/ObeliskRenderer.java similarity index 98% rename from src/main/java/crazypants/enderio/machine/attractor/ObeliskRenderer.java rename to src/main/java/crazypants/enderio/machine/obelisk/ObeliskRenderer.java index cd842b83..47b6f3f6 100644 --- a/src/main/java/crazypants/enderio/machine/attractor/ObeliskRenderer.java +++ b/src/main/java/crazypants/enderio/machine/obelisk/ObeliskRenderer.java @@ -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) diff --git a/src/main/java/crazypants/enderio/machine/attractor/BlockAttractor.java b/src/main/java/crazypants/enderio/machine/obelisk/attractor/BlockAttractor.java similarity index 98% rename from src/main/java/crazypants/enderio/machine/attractor/BlockAttractor.java rename to src/main/java/crazypants/enderio/machine/obelisk/attractor/BlockAttractor.java index 67ead722..a078cc23 100644 --- a/src/main/java/crazypants/enderio/machine/attractor/BlockAttractor.java +++ b/src/main/java/crazypants/enderio/machine/obelisk/attractor/BlockAttractor.java @@ -1,4 +1,4 @@ -package crazypants.enderio.machine.attractor; +package crazypants.enderio.machine.obelisk.attractor; import java.util.Random; diff --git a/src/main/java/crazypants/enderio/machine/attractor/ContainerAttractor.java b/src/main/java/crazypants/enderio/machine/obelisk/attractor/ContainerAttractor.java similarity index 94% rename from src/main/java/crazypants/enderio/machine/attractor/ContainerAttractor.java rename to src/main/java/crazypants/enderio/machine/obelisk/attractor/ContainerAttractor.java index a440c2ea..e1255cfe 100644 --- a/src/main/java/crazypants/enderio/machine/attractor/ContainerAttractor.java +++ b/src/main/java/crazypants/enderio/machine/obelisk/attractor/ContainerAttractor.java @@ -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; diff --git a/src/main/java/crazypants/enderio/machine/attractor/GuiAttractor.java b/src/main/java/crazypants/enderio/machine/obelisk/attractor/GuiAttractor.java similarity index 97% rename from src/main/java/crazypants/enderio/machine/attractor/GuiAttractor.java rename to src/main/java/crazypants/enderio/machine/obelisk/attractor/GuiAttractor.java index 53f649bd..0cc0808a 100644 --- a/src/main/java/crazypants/enderio/machine/attractor/GuiAttractor.java +++ b/src/main/java/crazypants/enderio/machine/obelisk/attractor/GuiAttractor.java @@ -1,4 +1,4 @@ -package crazypants.enderio.machine.attractor; +package crazypants.enderio.machine.obelisk.attractor; import java.awt.Color; diff --git a/src/main/java/crazypants/enderio/machine/attractor/TileAttractor.java b/src/main/java/crazypants/enderio/machine/obelisk/attractor/TileAttractor.java similarity index 98% rename from src/main/java/crazypants/enderio/machine/attractor/TileAttractor.java rename to src/main/java/crazypants/enderio/machine/obelisk/attractor/TileAttractor.java index d52a0360..8e15246f 100644 --- a/src/main/java/crazypants/enderio/machine/attractor/TileAttractor.java +++ b/src/main/java/crazypants/enderio/machine/obelisk/attractor/TileAttractor.java @@ -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; diff --git a/src/main/java/crazypants/enderio/machine/spawnguard/SpawnGuardController.java b/src/main/java/crazypants/enderio/machine/obelisk/aversion/AversionObeliskController.java similarity index 51% rename from src/main/java/crazypants/enderio/machine/spawnguard/SpawnGuardController.java rename to src/main/java/crazypants/enderio/machine/obelisk/aversion/AversionObeliskController.java index e38c7473..176b2820 100644 --- a/src/main/java/crazypants/enderio/machine/spawnguard/SpawnGuardController.java +++ b/src/main/java/crazypants/enderio/machine/obelisk/aversion/AversionObeliskController.java @@ -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> perWorldGuards = new HashMap>(); + private Map> perWorldGuards = new HashMap>(); - private SpawnGuardController() { + private AversionObeliskController() { } - public void registerGuard(TileSpawnGuard guard) { + public void registerGuard(TileAversionObelisk guard) { if(guard == null) { return; } - Map chargers = getGuardsForWorld(guard.getWorldObj()); + Map chargers = getGuardsForWorld(guard.getWorldObj()); chargers.put(guard.getLocation(), guard); } - public void deregisterGuard(TileSpawnGuard guard) { + public void deregisterGuard(TileAversionObelisk guard) { if(guard == null) { return; } - Map chargers = getGuardsForWorld(guard.getWorldObj()); + Map chargers = getGuardsForWorld(guard.getWorldObj()); chargers.remove(guard.getLocation()); } @@ -59,8 +55,8 @@ public class SpawnGuardController { } - Map guards = getGuardsForWorld(evt.world); - for(TileSpawnGuard guard : guards.values()) { + Map 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 getGuardsForWorld(World world) { - Map res = perWorldGuards.get(world.provider.dimensionId); + private Map getGuardsForWorld(World world) { + Map res = perWorldGuards.get(world.provider.dimensionId); if(res == null) { - res = new HashMap(); + res = new HashMap(); perWorldGuards.put(world.provider.dimensionId, res); } return res; diff --git a/src/main/java/crazypants/enderio/machine/spawnguard/SpawnGuardRenderer.java b/src/main/java/crazypants/enderio/machine/obelisk/aversion/AversionObeliskRenderer.java similarity index 66% rename from src/main/java/crazypants/enderio/machine/spawnguard/SpawnGuardRenderer.java rename to src/main/java/crazypants/enderio/machine/obelisk/aversion/AversionObeliskRenderer.java index e4fd1c63..ae8684b1 100644 --- a/src/main/java/crazypants/enderio/machine/spawnguard/SpawnGuardRenderer.java +++ b/src/main/java/crazypants/enderio/machine/obelisk/aversion/AversionObeliskRenderer.java @@ -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 { +public class AversionObeliskRenderer extends ObeliskRenderer { 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; } diff --git a/src/main/java/crazypants/enderio/machine/spawnguard/BlockSpawnGuard.java b/src/main/java/crazypants/enderio/machine/obelisk/aversion/BlockAversionObelisk.java similarity index 81% rename from src/main/java/crazypants/enderio/machine/spawnguard/BlockSpawnGuard.java rename to src/main/java/crazypants/enderio/machine/obelisk/aversion/BlockAversionObelisk.java index e28bcf4b..ec769400 100644 --- a/src/main/java/crazypants/enderio/machine/spawnguard/BlockSpawnGuard.java +++ b/src/main/java/crazypants/enderio/machine/obelisk/aversion/BlockAversionObelisk.java @@ -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 { +public class BlockAversionObelisk extends AbstractMachineBlock { 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 { @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; } diff --git a/src/main/java/crazypants/enderio/machine/spawnguard/ContainerSpawnGuard.java b/src/main/java/crazypants/enderio/machine/obelisk/aversion/ContainerAversionObelisk.java similarity index 79% rename from src/main/java/crazypants/enderio/machine/spawnguard/ContainerSpawnGuard.java rename to src/main/java/crazypants/enderio/machine/obelisk/aversion/ContainerAversionObelisk.java index fd82b5a7..49807ef4 100644 --- a/src/main/java/crazypants/enderio/machine/spawnguard/ContainerSpawnGuard.java +++ b/src/main/java/crazypants/enderio/machine/obelisk/aversion/ContainerAversionObelisk.java @@ -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); } diff --git a/src/main/java/crazypants/enderio/machine/spawnguard/GuiSpawnGurad.java b/src/main/java/crazypants/enderio/machine/obelisk/aversion/GuiAversionObelisk.java similarity index 85% rename from src/main/java/crazypants/enderio/machine/spawnguard/GuiSpawnGurad.java rename to src/main/java/crazypants/enderio/machine/obelisk/aversion/GuiAversionObelisk.java index e5cbc45c..a8dce824 100644 --- a/src/main/java/crazypants/enderio/machine/spawnguard/GuiSpawnGurad.java +++ b/src/main/java/crazypants/enderio/machine/obelisk/aversion/GuiAversionObelisk.java @@ -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 { +public class GuiAversionObelisk extends GuiPoweredMachineBase { 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); diff --git a/src/main/java/crazypants/enderio/machine/spawnguard/TileSpawnGuard.java b/src/main/java/crazypants/enderio/machine/obelisk/aversion/TileAversionObelisk.java similarity index 91% rename from src/main/java/crazypants/enderio/machine/spawnguard/TileSpawnGuard.java rename to src/main/java/crazypants/enderio/machine/obelisk/aversion/TileAversionObelisk.java index 7d2fc83e..2c58120b 100644 --- a/src/main/java/crazypants/enderio/machine/spawnguard/TileSpawnGuard.java +++ b/src/main/java/crazypants/enderio/machine/obelisk/aversion/TileAversionObelisk.java @@ -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(); diff --git a/src/main/java/crazypants/enderio/machine/weather/BlockWeatherObelisk.java b/src/main/java/crazypants/enderio/machine/obelisk/weather/BlockWeatherObelisk.java similarity index 98% rename from src/main/java/crazypants/enderio/machine/weather/BlockWeatherObelisk.java rename to src/main/java/crazypants/enderio/machine/obelisk/weather/BlockWeatherObelisk.java index ac1fbb72..4912534c 100644 --- a/src/main/java/crazypants/enderio/machine/weather/BlockWeatherObelisk.java +++ b/src/main/java/crazypants/enderio/machine/obelisk/weather/BlockWeatherObelisk.java @@ -1,4 +1,4 @@ -package crazypants.enderio.machine.weather; +package crazypants.enderio.machine.obelisk.weather; import java.util.Random; diff --git a/src/main/java/crazypants/enderio/machine/weather/ContainerWeatherObelisk.java b/src/main/java/crazypants/enderio/machine/obelisk/weather/ContainerWeatherObelisk.java similarity index 96% rename from src/main/java/crazypants/enderio/machine/weather/ContainerWeatherObelisk.java rename to src/main/java/crazypants/enderio/machine/obelisk/weather/ContainerWeatherObelisk.java index b9245ce4..bcbba8f2 100644 --- a/src/main/java/crazypants/enderio/machine/weather/ContainerWeatherObelisk.java +++ b/src/main/java/crazypants/enderio/machine/obelisk/weather/ContainerWeatherObelisk.java @@ -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; diff --git a/src/main/java/crazypants/enderio/machine/weather/GuiWeatherObelisk.java b/src/main/java/crazypants/enderio/machine/obelisk/weather/GuiWeatherObelisk.java similarity index 97% rename from src/main/java/crazypants/enderio/machine/weather/GuiWeatherObelisk.java rename to src/main/java/crazypants/enderio/machine/obelisk/weather/GuiWeatherObelisk.java index bfb99823..4e601bfb 100644 --- a/src/main/java/crazypants/enderio/machine/weather/GuiWeatherObelisk.java +++ b/src/main/java/crazypants/enderio/machine/obelisk/weather/GuiWeatherObelisk.java @@ -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; diff --git a/src/main/java/crazypants/enderio/machine/weather/PacketActivateWeather.java b/src/main/java/crazypants/enderio/machine/obelisk/weather/PacketActivateWeather.java similarity index 95% rename from src/main/java/crazypants/enderio/machine/weather/PacketActivateWeather.java rename to src/main/java/crazypants/enderio/machine/obelisk/weather/PacketActivateWeather.java index d391d432..41a9ce45 100644 --- a/src/main/java/crazypants/enderio/machine/weather/PacketActivateWeather.java +++ b/src/main/java/crazypants/enderio/machine/obelisk/weather/PacketActivateWeather.java @@ -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; diff --git a/src/main/java/crazypants/enderio/machine/weather/PacketFinishWeather.java b/src/main/java/crazypants/enderio/machine/obelisk/weather/PacketFinishWeather.java similarity index 86% rename from src/main/java/crazypants/enderio/machine/weather/PacketFinishWeather.java rename to src/main/java/crazypants/enderio/machine/obelisk/weather/PacketFinishWeather.java index 6de0c287..39957d54 100644 --- a/src/main/java/crazypants/enderio/machine/weather/PacketFinishWeather.java +++ b/src/main/java/crazypants/enderio/machine/obelisk/weather/PacketFinishWeather.java @@ -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 { diff --git a/src/main/java/crazypants/enderio/machine/weather/TileWeatherObelisk.java b/src/main/java/crazypants/enderio/machine/obelisk/weather/TileWeatherObelisk.java similarity index 99% rename from src/main/java/crazypants/enderio/machine/weather/TileWeatherObelisk.java rename to src/main/java/crazypants/enderio/machine/obelisk/weather/TileWeatherObelisk.java index 6a68241e..095ea663 100644 --- a/src/main/java/crazypants/enderio/machine/weather/TileWeatherObelisk.java +++ b/src/main/java/crazypants/enderio/machine/obelisk/weather/TileWeatherObelisk.java @@ -1,4 +1,4 @@ -package crazypants.enderio.machine.weather; +package crazypants.enderio.machine.obelisk.weather; import java.awt.Color; diff --git a/src/main/java/crazypants/enderio/material/MaterialRecipes.java b/src/main/java/crazypants/enderio/material/MaterialRecipes.java index 607572ab..aa104f50 100644 --- a/src/main/java/crazypants/enderio/material/MaterialRecipes.java +++ b/src/main/java/crazypants/enderio/material/MaterialRecipes.java @@ -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;