From d39fb8299251fa3d4d9319a24c79514d902a22dc Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Thu, 7 Jan 2016 18:20:59 +0100 Subject: [PATCH] EVERYTHING IS BROKEN --- build.gradle | 24 +-- gradle/wrapper/gradle-wrapper.jar | Bin 51017 -> 52271 bytes gradle/wrapper/gradle-wrapper.properties | 4 +- .../cofh/api/energy/IEnergyConnection.java | 4 +- .../java/cofh/api/energy/IEnergyHandler.java | 10 +- .../java/cofh/api/energy/IEnergyProvider.java | 8 +- .../java/cofh/api/energy/IEnergyReceiver.java | 8 +- .../cofh/api/energy/ItemEnergyContainer.java | 18 +- .../actuallyadditions/api/Position.java | 60 ++++-- .../api/block/IHudDisplay.java | 4 +- .../api/booklet/BookletPage.java | 4 +- .../api/internal/IBookletGui.java | 4 +- .../actuallyadditions/api/package-info.java | 2 +- .../api/tile/IEnergyDisplay.java | 4 +- .../mod/ActuallyAdditions.java | 10 +- .../mod/blocks/BlockAtomicReconstructor.java | 4 +- .../mod/blocks/BlockBlackLotus.java | 4 +- .../mod/blocks/BlockBookletStand.java | 4 +- .../mod/blocks/BlockBreaker.java | 4 +- .../mod/blocks/BlockCanolaPress.java | 4 +- .../mod/blocks/BlockCoalGenerator.java | 4 +- .../mod/blocks/BlockCoffeeMachine.java | 4 +- .../mod/blocks/BlockColoredLamp.java | 4 +- .../mod/blocks/BlockCompost.java | 4 +- .../mod/blocks/BlockCrystal.java | 4 +- .../mod/blocks/BlockDirectionalBreaker.java | 4 +- .../mod/blocks/BlockDropper.java | 4 +- .../mod/blocks/BlockEnergizer.java | 4 +- .../mod/blocks/BlockFeeder.java | 4 +- .../mod/blocks/BlockFermentingBarrel.java | 4 +- .../mod/blocks/BlockFireworkBox.java | 4 +- .../mod/blocks/BlockFishingNet.java | 4 +- .../mod/blocks/BlockFluidCollector.java | 4 +- .../mod/blocks/BlockFurnaceDouble.java | 4 +- .../mod/blocks/BlockFurnaceSolar.java | 4 +- .../mod/blocks/BlockGeneric.java | 4 +- .../mod/blocks/BlockGiantChest.java | 4 +- .../mod/blocks/BlockGreenhouseGlass.java | 4 +- .../mod/blocks/BlockGrinder.java | 4 +- .../mod/blocks/BlockHeatCollector.java | 4 +- .../mod/blocks/BlockInputter.java | 4 +- .../mod/blocks/BlockItemRepairer.java | 4 +- .../mod/blocks/BlockLampPowerer.java | 4 +- .../mod/blocks/BlockLaserRelay.java | 4 +- .../blocks/BlockLavaFactoryController.java | 4 +- .../mod/blocks/BlockLeafGenerator.java | 4 +- .../mod/blocks/BlockMiner.java | 4 +- .../mod/blocks/BlockMisc.java | 4 +- .../mod/blocks/BlockOilGenerator.java | 4 +- .../mod/blocks/BlockPhantom.java | 18 +- .../mod/blocks/BlockPhantomBooster.java | 4 +- .../mod/blocks/BlockRangedCollector.java | 4 +- .../mod/blocks/BlockSlabs.java | 4 +- .../mod/blocks/BlockSmileyCloud.java | 4 +- .../mod/blocks/BlockTreasureChest.java | 4 +- .../mod/blocks/BlockWildPlant.java | 4 +- .../mod/blocks/BlockXPSolidifier.java | 4 +- .../mod/blocks/base/BlockBase.java | 2 +- .../mod/blocks/base/BlockBushBase.java | 2 +- .../mod/blocks/base/BlockContainerBase.java | 21 +- .../mod/blocks/base/BlockFluidFlowing.java | 6 +- .../mod/blocks/base/BlockPlant.java | 6 +- .../mod/blocks/base/BlockStair.java | 2 +- .../mod/blocks/base/BlockWallAA.java | 6 +- .../mod/blocks/render/RenderInventory.java | 2 +- .../mod/booklet/GuiAAAchievements.java | 2 +- .../mod/booklet/GuiBooklet.java | 4 +- .../mod/booklet/GuiBookletStand.java | 4 +- .../mod/booklet/page/PageCoffeeRecipe.java | 4 +- .../mod/booklet/page/PageCrafting.java | 6 +- .../mod/booklet/page/PageCrusherRecipe.java | 4 +- .../mod/booklet/page/PageFurnace.java | 4 +- .../mod/booklet/page/PagePicture.java | 4 +- .../mod/booklet/page/PageReconstructor.java | 4 +- .../mod/booklet/page/PageTextOnly.java | 4 +- .../mod/config/ConfigurationHandler.java | 4 +- .../mod/config/GuiConfiguration.java | 4 +- .../mod/config/GuiFactory.java | 2 +- .../mod/crafting/BlockCrafting.java | 2 +- .../mod/crafting/FoodCrafting.java | 2 +- .../mod/crafting/ItemCrafting.java | 2 +- .../mod/crafting/MiscCrafting.java | 2 +- .../mod/crafting/ToolCrafting.java | 2 +- .../mod/creative/CreativeTab.java | 4 +- .../mod/event/BucketFillEvent.java | 4 +- .../mod/event/EntityLivingEvent.java | 2 +- .../actuallyadditions/mod/event/HudEvent.java | 2 +- .../mod/event/InitEvents.java | 2 +- .../mod/event/LivingDropEvent.java | 2 +- .../mod/event/LogoutEvent.java | 4 +- .../mod/event/PlayerObtainEvents.java | 4 +- .../mod/event/TooltipEvent.java | 2 +- .../mod/event/WorldDecorationEvent.java | 4 +- .../mod/event/WorldLoadingEvents.java | 2 +- .../mod/gen/InitVillager.java | 2 +- .../mod/gen/JamVillagerTradeHandler.java | 2 +- .../actuallyadditions/mod/gen/OreGen.java | 4 +- .../gen/VillageCustomCropFieldHandler.java | 2 +- .../mod/gen/VillageJamHouseHandler.java | 2 +- .../mod/inventory/ContainerEnergizer.java | 4 +- .../mod/inventory/ContainerEnervator.java | 4 +- .../mod/inventory/GuiHandler.java | 4 +- .../mod/inventory/gui/GuiBreaker.java | 4 +- .../mod/inventory/gui/GuiCanolaPress.java | 4 +- .../mod/inventory/gui/GuiCoalGenerator.java | 4 +- .../mod/inventory/gui/GuiCoffeeMachine.java | 4 +- .../mod/inventory/gui/GuiCrafter.java | 4 +- .../inventory/gui/GuiDirectionalBreaker.java | 4 +- .../mod/inventory/gui/GuiDrill.java | 4 +- .../mod/inventory/gui/GuiDropper.java | 4 +- .../mod/inventory/gui/GuiEnergizer.java | 4 +- .../mod/inventory/gui/GuiEnervator.java | 4 +- .../mod/inventory/gui/GuiFeeder.java | 4 +- .../inventory/gui/GuiFermentingBarrel.java | 4 +- .../mod/inventory/gui/GuiFluidCollector.java | 4 +- .../mod/inventory/gui/GuiFurnaceDouble.java | 4 +- .../mod/inventory/gui/GuiGiantChest.java | 4 +- .../mod/inventory/gui/GuiGrinder.java | 4 +- .../mod/inventory/gui/GuiInputter.java | 4 +- .../mod/inventory/gui/GuiMiner.java | 4 +- .../mod/inventory/gui/GuiOilGenerator.java | 4 +- .../mod/inventory/gui/GuiPhantomPlacer.java | 4 +- .../mod/inventory/gui/GuiRangedCollector.java | 4 +- .../mod/inventory/gui/GuiRepairer.java | 4 +- .../mod/inventory/gui/GuiSmileyCloud.java | 4 +- .../mod/inventory/gui/GuiXPSolidifier.java | 4 +- .../mod/items/InitForeignPaxels.java | 4 +- .../mod/items/ItemBattery.java | 4 +- .../mod/items/ItemBooklet.java | 4 +- .../mod/items/ItemChestToCrateUpgrade.java | 4 +- .../mod/items/ItemCoffee.java | 6 +- .../mod/items/ItemCoffeeBean.java | 4 +- .../mod/items/ItemCrafterOnAStick.java | 4 +- .../mod/items/ItemCrystal.java | 4 +- .../mod/items/ItemDrill.java | 4 +- .../mod/items/ItemDrillUpgrade.java | 4 +- .../actuallyadditions/mod/items/ItemDust.java | 4 +- .../mod/items/ItemFertilizer.java | 4 +- .../mod/items/ItemFoods.java | 4 +- .../mod/items/ItemGeneric.java | 4 +- .../mod/items/ItemGrowthRing.java | 27 +-- .../mod/items/ItemHairyBall.java | 4 +- .../actuallyadditions/mod/items/ItemJams.java | 4 +- .../mod/items/ItemKnife.java | 4 +- .../mod/items/ItemLaserWrench.java | 4 +- .../mod/items/ItemLeafBlower.java | 4 +- .../mod/items/ItemMagnetRing.java | 4 +- .../actuallyadditions/mod/items/ItemMisc.java | 4 +- .../mod/items/ItemPhantomConnector.java | 4 +- .../mod/items/ItemPotionRing.java | 4 +- .../mod/items/ItemResonantRice.java | 4 +- .../actuallyadditions/mod/items/ItemSeed.java | 6 +- .../mod/items/ItemSolidifiedExperience.java | 4 +- .../mod/items/ItemTeleStaff.java | 4 +- .../mod/items/ItemWaterRemovalRing.java | 4 +- .../mod/items/ItemWingsOfTheBats.java | 4 +- .../mod/items/base/ItemAllToolAA.java | 8 +- .../mod/items/base/ItemArmorAA.java | 6 +- .../mod/items/base/ItemAxeAA.java | 6 +- .../mod/items/base/ItemBase.java | 2 +- .../mod/items/base/ItemBucketAA.java | 6 +- .../mod/items/base/ItemEnergy.java | 6 +- .../mod/items/base/ItemFoodBase.java | 2 +- .../mod/items/base/ItemHoeAA.java | 6 +- .../mod/items/base/ItemPickaxeAA.java | 6 +- .../mod/items/base/ItemShovelAA.java | 6 +- .../mod/items/base/ItemSwordAA.java | 6 +- .../mod/items/lens/ItemLens.java | 4 +- .../mod/misc/EntityColoredParticleFX.java | 4 +- .../mod/misc/LaserRelayConnectionHandler.java | 6 +- .../mod/misc/special/SpecialRenderInit.java | 4 +- .../mod/nei/NEIScreenEvents.java | 2 +- .../mod/network/PacketBookletStandButton.java | 6 +- .../mod/network/PacketHandler.java | 6 +- .../mod/network/PacketParticle.java | 10 +- .../mod/network/gui/PacketGuiButton.java | 6 +- .../mod/network/gui/PacketGuiNumber.java | 6 +- .../mod/network/gui/PacketGuiString.java | 6 +- .../mod/proxy/ClientProxy.java | 12 +- .../actuallyadditions/mod/proxy/IProxy.java | 6 +- .../mod/proxy/ServerProxy.java | 6 +- .../mod/recipe/FuelHandler.java | 4 +- .../tile/TileEntityAtomicReconstructor.java | 6 +- .../mod/tile/TileEntityBase.java | 2 +- .../mod/tile/TileEntityCanolaPress.java | 4 +- .../mod/tile/TileEntityCoalGenerator.java | 4 +- .../mod/tile/TileEntityCoffeeMachine.java | 4 +- .../tile/TileEntityDirectionalBreaker.java | 4 +- .../mod/tile/TileEntityEnergizer.java | 4 +- .../mod/tile/TileEntityEnervator.java | 4 +- .../mod/tile/TileEntityFeeder.java | 4 +- .../mod/tile/TileEntityFermentingBarrel.java | 4 +- .../mod/tile/TileEntityFireworkBox.java | 4 +- .../mod/tile/TileEntityFluidCollector.java | 4 +- .../mod/tile/TileEntityFurnaceDouble.java | 4 +- .../mod/tile/TileEntityFurnaceSolar.java | 4 +- .../mod/tile/TileEntityGrinder.java | 4 +- .../mod/tile/TileEntityHeatCollector.java | 4 +- .../mod/tile/TileEntityItemRepairer.java | 4 +- .../mod/tile/TileEntityLaserRelay.java | 4 +- .../tile/TileEntityLavaFactoryController.java | 4 +- .../mod/tile/TileEntityLeafGenerator.java | 6 +- .../mod/tile/TileEntityMiner.java | 6 +- .../mod/tile/TileEntityOilGenerator.java | 4 +- .../mod/tile/TileEntityPhantomEnergyface.java | 37 ++-- .../mod/tile/TileEntityPhantomPlacer.java | 4 +- .../mod/tile/TileEntityPhantomface.java | 4 +- .../mod/tile/TileEntitySmileyCloud.java | 4 +- .../UpdateCheckerClientNotificationEvent.java | 4 +- .../actuallyadditions/mod/util/AssetUtil.java | 9 +- .../mod/util/CompatUtil.java | 2 +- .../actuallyadditions/mod/util/Util.java | 2 +- .../actuallyadditions/mod/util/WorldUtil.java | 182 ++++++++---------- .../util/playerdata/PersistentClientData.java | 4 +- 214 files changed, 621 insertions(+), 623 deletions(-) diff --git a/build.gradle b/build.gradle index 50fc36cf7..6c8599a08 100644 --- a/build.gradle +++ b/build.gradle @@ -1,31 +1,27 @@ buildscript { repositories { - mavenCentral() + jcenter() maven { name = "forge" url = "http://files.minecraftforge.net/maven" } - maven { - name = "sonatype" - url = "https://oss.sonatype.org/content/repositories/snapshots/" - } } dependencies { - classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT' + classpath 'net.minecraftforge.gradle:ForgeGradle:2.1-SNAPSHOT' } } - -apply plugin: 'forge' -apply plugin: 'maven' +apply plugin: 'net.minecraftforge.gradle.forge' version = "1.7.10-r20" group = "de.ellpeck.actuallyadditions" archivesBaseName = "ActuallyAdditions" minecraft { - version = "1.7.10-10.13.4.1558-1.7.10" + version = "1.8.9-11.15.0.1684" runDir = "idea" + mappings = "stable_20" + replaceIn "ModUtil.java" replace "@VERSION@", project.version.toString() } @@ -42,10 +38,10 @@ repositories { } dependencies { - compile "mcp.mobius.waila:Waila:1.5.10_1.7.10" - compile "codechicken:CodeChickenLib:1.7.10-1.1.3.138:dev" - compile "codechicken:CodeChickenCore:1.7.10-1.0.7.46:dev" - compile "codechicken:NotEnoughItems:1.7.10-1.0.5.110:dev" + //compile "mcp.mobius.waila:Waila:1.5.10_1.7.10" + //compile "codechicken:CodeChickenLib:1.7.10-1.1.3.138:dev" + //compile "codechicken:CodeChickenCore:1.7.10-1.0.7.46:dev" + //compile "codechicken:NotEnoughItems:1.7.10-1.0.5.110:dev" } processResources { diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index b7612167031001b7b84baf2a959e8ea8ad03c011..30d399d8d2bf522ff5de94bf434a7cc43a9a74b5 100644 GIT binary patch delta 22968 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 0){ for(int i = 0; i < tile.getSizeInventory(); i++){ - this.dropSlotFromInventory(i, tile, world, x, y, z); + this.dropSlotFromInventory(i, tile, world, position); } } } } } - public void dropSlotFromInventory(int i, TileEntityInventoryBase tile, World world, int x, int y, int z){ + public void dropSlotFromInventory(int i, TileEntityInventoryBase tile, World world, Position pos){ ItemStack stack = tile.getStackInSlot(i); if(stack != null && stack.stackSize > 0){ float dX = Util.RANDOM.nextFloat()*0.8F+0.1F; float dY = Util.RANDOM.nextFloat()*0.8F+0.1F; float dZ = Util.RANDOM.nextFloat()*0.8F+0.1F; - EntityItem entityItem = new EntityItem(world, x+dX, y+dY, z+dZ, stack.copy()); + EntityItem entityItem = new EntityItem(world, pos.getX()+dX, pos.getY()+dY, pos.getZ()+dZ, stack.copy()); if(stack.hasTagCompound()){ entityItem.getEntityItem().setTagCompound((NBTTagCompound)stack.getTagCompound().copy()); } @@ -106,7 +109,7 @@ public abstract class BlockContainerBase extends BlockContainer{ } @Override - public void onNeighborBlockChange(World world, int x, int y, int z, Block block){ + public void onNeighborBlockChange(World world, BlockPos pos, IBlockState state){ this.updateRedstoneState(world, x, y, z); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockFluidFlowing.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockFluidFlowing.java index 9d2904dd2..8d908eaed 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockFluidFlowing.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockFluidFlowing.java @@ -10,9 +10,6 @@ package de.ellpeck.actuallyadditions.mod.blocks.base; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import de.ellpeck.actuallyadditions.mod.creative.CreativeTab; import de.ellpeck.actuallyadditions.mod.util.ModUtil; import net.minecraft.block.material.Material; @@ -24,6 +21,9 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.fluids.BlockFluidClassic; import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class BlockFluidFlowing extends BlockFluidClassic{ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockPlant.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockPlant.java index 20fc6f7ed..03d5e7839 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockPlant.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockPlant.java @@ -10,9 +10,6 @@ package de.ellpeck.actuallyadditions.mod.blocks.base; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import de.ellpeck.actuallyadditions.mod.creative.CreativeTab; import de.ellpeck.actuallyadditions.mod.util.ModUtil; import net.minecraft.block.BlockCrops; @@ -24,6 +21,9 @@ import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.EnumPlantType; +import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import java.util.Random; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockStair.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockStair.java index 23801f1f0..dff258270 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockStair.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockStair.java @@ -11,13 +11,13 @@ package de.ellpeck.actuallyadditions.mod.blocks.base; -import cpw.mods.fml.common.registry.GameRegistry; import de.ellpeck.actuallyadditions.mod.creative.CreativeTab; import de.ellpeck.actuallyadditions.mod.util.ModUtil; import net.minecraft.block.Block; import net.minecraft.block.BlockStairs; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; +import net.minecraftforge.fml.common.registry.GameRegistry; public class BlockStair extends BlockStairs{ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockWallAA.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockWallAA.java index 73bb30c6b..cedfd9fbe 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockWallAA.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockWallAA.java @@ -10,9 +10,6 @@ package de.ellpeck.actuallyadditions.mod.blocks.base; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import de.ellpeck.actuallyadditions.mod.creative.CreativeTab; import de.ellpeck.actuallyadditions.mod.util.ModUtil; import net.minecraft.block.Block; @@ -22,6 +19,9 @@ import net.minecraft.item.EnumRarity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; +import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import java.util.List; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderInventory.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderInventory.java index 17af8debd..64dcdf922 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderInventory.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderInventory.java @@ -10,11 +10,11 @@ package de.ellpeck.actuallyadditions.mod.blocks.render; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.world.IBlockAccess; +import net.minecraftforge.fml.client.registry.ISimpleBlockRenderingHandler; import org.lwjgl.opengl.GL11; public class RenderInventory implements ISimpleBlockRenderingHandler{ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/GuiAAAchievements.java b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/GuiAAAchievements.java index 12a3c628e..571fc71a1 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/GuiAAAchievements.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/GuiAAAchievements.java @@ -10,12 +10,12 @@ package de.ellpeck.actuallyadditions.mod.booklet; -import cpw.mods.fml.relauncher.ReflectionHelper; import de.ellpeck.actuallyadditions.mod.achievement.InitAchievements; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.gui.achievement.GuiAchievements; import net.minecraft.stats.StatFileWriter; +import net.minecraftforge.fml.relauncher.ReflectionHelper; /** * (Partially excerpted from Botania by Vazkii with permission, thanks!) diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/GuiBooklet.java b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/GuiBooklet.java index dec0ba126..50432e30c 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/GuiBooklet.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/GuiBooklet.java @@ -10,8 +10,6 @@ package de.ellpeck.actuallyadditions.mod.booklet; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI; import de.ellpeck.actuallyadditions.api.booklet.BookletPage; import de.ellpeck.actuallyadditions.api.internal.EntrySet; @@ -38,6 +36,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.IChatComponent; import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.input.Keyboard; import org.lwjgl.input.Mouse; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/GuiBookletStand.java b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/GuiBookletStand.java index 99493b6f7..485893374 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/GuiBookletStand.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/GuiBookletStand.java @@ -10,14 +10,14 @@ package de.ellpeck.actuallyadditions.mod.booklet; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import de.ellpeck.actuallyadditions.mod.network.PacketBookletStandButton; import de.ellpeck.actuallyadditions.mod.network.PacketHandler; import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; import de.ellpeck.actuallyadditions.mod.tile.TileEntityBookletStand; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import java.util.Objects; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageCoffeeRecipe.java b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageCoffeeRecipe.java index 28df34a68..4523443c8 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageCoffeeRecipe.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageCoffeeRecipe.java @@ -10,8 +10,6 @@ package de.ellpeck.actuallyadditions.mod.booklet.page; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import de.ellpeck.actuallyadditions.api.internal.IBookletGui; import de.ellpeck.actuallyadditions.api.recipe.coffee.CoffeeBrewing; import de.ellpeck.actuallyadditions.api.recipe.coffee.CoffeeIngredient; @@ -24,6 +22,8 @@ import de.ellpeck.actuallyadditions.mod.util.StringUtil; import de.ellpeck.actuallyadditions.mod.util.Util; import net.minecraft.client.Minecraft; import net.minecraft.item.ItemStack; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class PageCoffeeRecipe extends BookletPageAA{ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageCrafting.java b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageCrafting.java index d75445402..f879909b2 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageCrafting.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageCrafting.java @@ -10,9 +10,6 @@ package de.ellpeck.actuallyadditions.mod.booklet.page; -import cpw.mods.fml.relauncher.ReflectionHelper; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import de.ellpeck.actuallyadditions.api.internal.IBookletGui; import de.ellpeck.actuallyadditions.mod.booklet.GuiBooklet; import de.ellpeck.actuallyadditions.mod.proxy.ClientProxy; @@ -26,6 +23,9 @@ import net.minecraft.item.crafting.IRecipe; import net.minecraft.item.crafting.ShapedRecipes; import net.minecraft.item.crafting.ShapelessRecipes; import net.minecraft.util.EnumChatFormatting; +import net.minecraftforge.fml.relauncher.ReflectionHelper; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.oredict.ShapedOreRecipe; import net.minecraftforge.oredict.ShapelessOreRecipe; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageCrusherRecipe.java b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageCrusherRecipe.java index 46a5237e5..34d7ff5d8 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageCrusherRecipe.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageCrusherRecipe.java @@ -10,8 +10,6 @@ package de.ellpeck.actuallyadditions.mod.booklet.page; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import de.ellpeck.actuallyadditions.api.internal.IBookletGui; import de.ellpeck.actuallyadditions.api.recipe.CrusherRecipe; import de.ellpeck.actuallyadditions.mod.booklet.GuiBooklet; @@ -23,6 +21,8 @@ import de.ellpeck.actuallyadditions.mod.util.Util; import net.minecraft.client.Minecraft; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import java.util.List; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageFurnace.java b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageFurnace.java index a0d71421b..f9c2b3d5a 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageFurnace.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageFurnace.java @@ -10,8 +10,6 @@ package de.ellpeck.actuallyadditions.mod.booklet.page; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import de.ellpeck.actuallyadditions.api.internal.IBookletGui; import de.ellpeck.actuallyadditions.mod.booklet.GuiBooklet; import de.ellpeck.actuallyadditions.mod.proxy.ClientProxy; @@ -23,6 +21,8 @@ import net.minecraft.client.Minecraft; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.FurnaceRecipes; import net.minecraft.util.EnumChatFormatting; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import java.util.Map; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PagePicture.java b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PagePicture.java index 2b51ea8c1..356e631d7 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PagePicture.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PagePicture.java @@ -10,13 +10,13 @@ package de.ellpeck.actuallyadditions.mod.booklet.page; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import de.ellpeck.actuallyadditions.api.internal.IBookletGui; import de.ellpeck.actuallyadditions.mod.util.AssetUtil; import de.ellpeck.actuallyadditions.mod.util.StringUtil; import net.minecraft.client.Minecraft; import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class PagePicture extends PageTextOnly{ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageReconstructor.java b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageReconstructor.java index 14f794561..adc883a3c 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageReconstructor.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageReconstructor.java @@ -10,8 +10,6 @@ package de.ellpeck.actuallyadditions.mod.booklet.page; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import de.ellpeck.actuallyadditions.api.internal.IBookletGui; import de.ellpeck.actuallyadditions.api.recipe.LensNoneRecipe; import de.ellpeck.actuallyadditions.mod.blocks.InitBlocks; @@ -24,6 +22,8 @@ import de.ellpeck.actuallyadditions.mod.util.Util; import net.minecraft.client.Minecraft; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageTextOnly.java b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageTextOnly.java index 3d151190a..11d28dda9 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageTextOnly.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageTextOnly.java @@ -10,12 +10,12 @@ package de.ellpeck.actuallyadditions.mod.booklet.page; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import de.ellpeck.actuallyadditions.api.internal.IBookletGui; import de.ellpeck.actuallyadditions.mod.util.StringUtil; import net.minecraft.client.Minecraft; import net.minecraft.item.ItemStack; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class PageTextOnly extends BookletPageAA{ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/config/ConfigurationHandler.java b/src/main/java/de/ellpeck/actuallyadditions/mod/config/ConfigurationHandler.java index 74940a7a3..d05064a5f 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/config/ConfigurationHandler.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/config/ConfigurationHandler.java @@ -10,11 +10,11 @@ package de.ellpeck.actuallyadditions.mod.config; -import cpw.mods.fml.client.event.ConfigChangedEvent; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; import de.ellpeck.actuallyadditions.mod.util.ModUtil; import de.ellpeck.actuallyadditions.mod.util.Util; import net.minecraftforge.common.config.Configuration; +import net.minecraftforge.fml.client.event.ConfigChangedEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import java.io.File; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/config/GuiConfiguration.java b/src/main/java/de/ellpeck/actuallyadditions/mod/config/GuiConfiguration.java index d291a4734..b5256965c 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/config/GuiConfiguration.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/config/GuiConfiguration.java @@ -10,12 +10,12 @@ package de.ellpeck.actuallyadditions.mod.config; -import cpw.mods.fml.client.config.GuiConfig; -import cpw.mods.fml.client.config.IConfigElement; import de.ellpeck.actuallyadditions.mod.util.ModUtil; import net.minecraft.client.gui.GuiScreen; import net.minecraftforge.common.config.ConfigCategory; import net.minecraftforge.common.config.ConfigElement; +import net.minecraftforge.fml.client.config.GuiConfig; +import net.minecraftforge.fml.client.config.IConfigElement; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/config/GuiFactory.java b/src/main/java/de/ellpeck/actuallyadditions/mod/config/GuiFactory.java index 8399db8bb..ec8280c6a 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/config/GuiFactory.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/config/GuiFactory.java @@ -10,9 +10,9 @@ package de.ellpeck.actuallyadditions.mod.config; -import cpw.mods.fml.client.IModGuiFactory; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; +import net.minecraftforge.fml.client.IModGuiFactory; import java.util.Set; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/BlockCrafting.java b/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/BlockCrafting.java index 41234ed48..1e92a2ba2 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/BlockCrafting.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/BlockCrafting.java @@ -10,7 +10,6 @@ package de.ellpeck.actuallyadditions.mod.crafting; -import cpw.mods.fml.common.registry.GameRegistry; import de.ellpeck.actuallyadditions.mod.blocks.BlockColoredLamp; import de.ellpeck.actuallyadditions.mod.blocks.InitBlocks; import de.ellpeck.actuallyadditions.mod.blocks.metalists.TheMiscBlocks; @@ -23,6 +22,7 @@ import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; +import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.oredict.ShapedOreRecipe; import net.minecraftforge.oredict.ShapelessOreRecipe; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/FoodCrafting.java b/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/FoodCrafting.java index 1c5ce4981..ce9c4ad1a 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/FoodCrafting.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/FoodCrafting.java @@ -10,7 +10,6 @@ package de.ellpeck.actuallyadditions.mod.crafting; -import cpw.mods.fml.common.registry.GameRegistry; import de.ellpeck.actuallyadditions.mod.config.values.ConfigCrafting; import de.ellpeck.actuallyadditions.mod.items.InitItems; import de.ellpeck.actuallyadditions.mod.items.metalists.TheFoods; @@ -20,6 +19,7 @@ import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; +import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.oredict.ShapedOreRecipe; import net.minecraftforge.oredict.ShapelessOreRecipe; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/ItemCrafting.java b/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/ItemCrafting.java index 4a7102a3d..81f9a6afa 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/ItemCrafting.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/ItemCrafting.java @@ -10,7 +10,6 @@ package de.ellpeck.actuallyadditions.mod.crafting; -import cpw.mods.fml.common.registry.GameRegistry; import de.ellpeck.actuallyadditions.mod.blocks.InitBlocks; import de.ellpeck.actuallyadditions.mod.blocks.metalists.TheColoredLampColors; import de.ellpeck.actuallyadditions.mod.blocks.metalists.TheMiscBlocks; @@ -27,6 +26,7 @@ import net.minecraft.item.ItemFood; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraftforge.common.IPlantable; +import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.ShapedOreRecipe; import net.minecraftforge.oredict.ShapelessOreRecipe; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/MiscCrafting.java b/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/MiscCrafting.java index d6d23082d..9618d86cd 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/MiscCrafting.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/MiscCrafting.java @@ -10,7 +10,6 @@ package de.ellpeck.actuallyadditions.mod.crafting; -import cpw.mods.fml.common.registry.GameRegistry; import de.ellpeck.actuallyadditions.mod.blocks.InitBlocks; import de.ellpeck.actuallyadditions.mod.config.values.ConfigCrafting; import de.ellpeck.actuallyadditions.mod.items.InitItems; @@ -21,6 +20,7 @@ import de.ellpeck.actuallyadditions.mod.util.Util; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; +import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.oredict.ShapedOreRecipe; import net.minecraftforge.oredict.ShapelessOreRecipe; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/ToolCrafting.java b/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/ToolCrafting.java index 08c35de25..03649ffc4 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/ToolCrafting.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/ToolCrafting.java @@ -10,7 +10,6 @@ package de.ellpeck.actuallyadditions.mod.crafting; -import cpw.mods.fml.common.registry.GameRegistry; import de.ellpeck.actuallyadditions.mod.config.values.ConfigCrafting; import de.ellpeck.actuallyadditions.mod.items.InitItems; import de.ellpeck.actuallyadditions.mod.items.metalists.TheCrystals; @@ -21,6 +20,7 @@ import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; +import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.oredict.ShapedOreRecipe; import net.minecraftforge.oredict.ShapelessOreRecipe; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/creative/CreativeTab.java b/src/main/java/de/ellpeck/actuallyadditions/mod/creative/CreativeTab.java index 2892dae62..3db5c496e 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/creative/CreativeTab.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/creative/CreativeTab.java @@ -10,8 +10,6 @@ package de.ellpeck.actuallyadditions.mod.creative; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import de.ellpeck.actuallyadditions.mod.blocks.InitBlocks; import de.ellpeck.actuallyadditions.mod.items.InitForeignPaxels; import de.ellpeck.actuallyadditions.mod.items.InitItems; @@ -20,6 +18,8 @@ import net.minecraft.block.Block; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import java.util.List; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/event/BucketFillEvent.java b/src/main/java/de/ellpeck/actuallyadditions/mod/event/BucketFillEvent.java index 28af86047..3c82914e9 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/event/BucketFillEvent.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/event/BucketFillEvent.java @@ -10,14 +10,14 @@ package de.ellpeck.actuallyadditions.mod.event; -import cpw.mods.fml.common.eventhandler.Event; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; import de.ellpeck.actuallyadditions.mod.blocks.InitBlocks; import de.ellpeck.actuallyadditions.mod.items.InitItems; import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.event.entity.player.FillBucketEvent; +import net.minecraftforge.fml.common.eventhandler.Event; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; public class BucketFillEvent{ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/event/EntityLivingEvent.java b/src/main/java/de/ellpeck/actuallyadditions/mod/event/EntityLivingEvent.java index cd0400cb1..263ae1bb5 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/event/EntityLivingEvent.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/event/EntityLivingEvent.java @@ -10,7 +10,6 @@ package de.ellpeck.actuallyadditions.mod.event; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; import de.ellpeck.actuallyadditions.mod.config.values.ConfigBoolValues; import de.ellpeck.actuallyadditions.mod.items.InitItems; import de.ellpeck.actuallyadditions.mod.items.ItemWingsOfTheBats; @@ -20,6 +19,7 @@ import net.minecraft.entity.passive.EntityOcelot; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import java.util.UUID; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/event/HudEvent.java b/src/main/java/de/ellpeck/actuallyadditions/mod/event/HudEvent.java index 41fa9d6a9..013f39e8b 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/event/HudEvent.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/event/HudEvent.java @@ -10,7 +10,6 @@ package de.ellpeck.actuallyadditions.mod.event; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; import de.ellpeck.actuallyadditions.api.block.IHudDisplay; import de.ellpeck.actuallyadditions.api.tile.IEnergyDisplay; import de.ellpeck.actuallyadditions.mod.tile.IRedstoneToggle; @@ -27,6 +26,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.MovingObjectPosition; import net.minecraftforge.client.event.RenderGameOverlayEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; public class HudEvent{ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/event/InitEvents.java b/src/main/java/de/ellpeck/actuallyadditions/mod/event/InitEvents.java index 6571dc5b6..1ddf59809 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/event/InitEvents.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/event/InitEvents.java @@ -10,13 +10,13 @@ package de.ellpeck.actuallyadditions.mod.event; -import cpw.mods.fml.common.Loader; import de.ellpeck.actuallyadditions.mod.config.values.ConfigBoolValues; import de.ellpeck.actuallyadditions.mod.nei.NEIScreenEvents; import de.ellpeck.actuallyadditions.mod.update.UpdateCheckerClientNotificationEvent; import de.ellpeck.actuallyadditions.mod.util.ModUtil; import de.ellpeck.actuallyadditions.mod.util.Util; import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.fml.common.Loader; public class InitEvents{ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/event/LivingDropEvent.java b/src/main/java/de/ellpeck/actuallyadditions/mod/event/LivingDropEvent.java index 670af2274..c84cf1df8 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/event/LivingDropEvent.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/event/LivingDropEvent.java @@ -10,7 +10,6 @@ package de.ellpeck.actuallyadditions.mod.event; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; import de.ellpeck.actuallyadditions.mod.config.values.ConfigBoolValues; import de.ellpeck.actuallyadditions.mod.items.InitItems; import de.ellpeck.actuallyadditions.mod.items.metalists.TheMiscItems; @@ -22,6 +21,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraftforge.event.entity.living.LivingDropsEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; public class LivingDropEvent{ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/event/LogoutEvent.java b/src/main/java/de/ellpeck/actuallyadditions/mod/event/LogoutEvent.java index f2cf9d19b..2d14f6a0e 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/event/LogoutEvent.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/event/LogoutEvent.java @@ -10,9 +10,9 @@ package de.ellpeck.actuallyadditions.mod.event; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.gameevent.PlayerEvent; import de.ellpeck.actuallyadditions.mod.items.ItemWingsOfTheBats; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.gameevent.PlayerEvent; public class LogoutEvent{ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/event/PlayerObtainEvents.java b/src/main/java/de/ellpeck/actuallyadditions/mod/event/PlayerObtainEvents.java index 5298c7744..541857866 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/event/PlayerObtainEvents.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/event/PlayerObtainEvents.java @@ -10,8 +10,6 @@ package de.ellpeck.actuallyadditions.mod.event; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.gameevent.PlayerEvent; import de.ellpeck.actuallyadditions.mod.achievement.InitAchievements; import de.ellpeck.actuallyadditions.mod.achievement.TheAchievements; import de.ellpeck.actuallyadditions.mod.config.values.ConfigBoolValues; @@ -25,6 +23,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.gameevent.PlayerEvent; import java.util.Locale; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/event/TooltipEvent.java b/src/main/java/de/ellpeck/actuallyadditions/mod/event/TooltipEvent.java index ed04f0706..77b3e0dfc 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/event/TooltipEvent.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/event/TooltipEvent.java @@ -10,7 +10,6 @@ package de.ellpeck.actuallyadditions.mod.event; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; import de.ellpeck.actuallyadditions.mod.config.values.ConfigBoolValues; import de.ellpeck.actuallyadditions.mod.util.KeyUtil; import de.ellpeck.actuallyadditions.mod.util.ModUtil; @@ -19,6 +18,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.item.Item; import net.minecraft.util.EnumChatFormatting; import net.minecraftforge.event.entity.player.ItemTooltipEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.oredict.OreDictionary; public class TooltipEvent{ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/event/WorldDecorationEvent.java b/src/main/java/de/ellpeck/actuallyadditions/mod/event/WorldDecorationEvent.java index 313d588e8..6703a23bd 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/event/WorldDecorationEvent.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/event/WorldDecorationEvent.java @@ -10,8 +10,6 @@ package de.ellpeck.actuallyadditions.mod.event; -import cpw.mods.fml.common.eventhandler.Event; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; import de.ellpeck.actuallyadditions.mod.blocks.InitBlocks; import de.ellpeck.actuallyadditions.mod.blocks.metalists.TheWildPlants; import de.ellpeck.actuallyadditions.mod.config.ConfigValues; @@ -23,6 +21,8 @@ import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.world.biome.BiomeGenOcean; import net.minecraftforge.event.terraingen.DecorateBiomeEvent; +import net.minecraftforge.fml.common.eventhandler.Event; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import java.util.ArrayList; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/event/WorldLoadingEvents.java b/src/main/java/de/ellpeck/actuallyadditions/mod/event/WorldLoadingEvents.java index 1f28e41ad..602ca99b7 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/event/WorldLoadingEvents.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/event/WorldLoadingEvents.java @@ -10,10 +10,10 @@ package de.ellpeck.actuallyadditions.mod.event; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; import de.ellpeck.actuallyadditions.mod.misc.LaserRelayConnectionHandler; import de.ellpeck.actuallyadditions.mod.misc.WorldData; import net.minecraftforge.event.world.WorldEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; public class WorldLoadingEvents{ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/gen/InitVillager.java b/src/main/java/de/ellpeck/actuallyadditions/mod/gen/InitVillager.java index e9de392f4..1c1871173 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/gen/InitVillager.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/gen/InitVillager.java @@ -10,7 +10,6 @@ package de.ellpeck.actuallyadditions.mod.gen; -import cpw.mods.fml.common.registry.VillagerRegistry; import de.ellpeck.actuallyadditions.mod.config.values.ConfigBoolValues; import de.ellpeck.actuallyadditions.mod.config.values.ConfigIntValues; import de.ellpeck.actuallyadditions.mod.items.InitItems; @@ -21,6 +20,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.WeightedRandomChestContent; import net.minecraft.world.gen.structure.MapGenStructureIO; import net.minecraftforge.common.ChestGenHooks; +import net.minecraftforge.fml.common.registry.VillagerRegistry; public class InitVillager{ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/gen/JamVillagerTradeHandler.java b/src/main/java/de/ellpeck/actuallyadditions/mod/gen/JamVillagerTradeHandler.java index 232558eac..9beb433f5 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/gen/JamVillagerTradeHandler.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/gen/JamVillagerTradeHandler.java @@ -10,7 +10,6 @@ package de.ellpeck.actuallyadditions.mod.gen; -import cpw.mods.fml.common.registry.VillagerRegistry; import de.ellpeck.actuallyadditions.mod.items.InitItems; import de.ellpeck.actuallyadditions.mod.items.metalists.TheJams; import net.minecraft.entity.passive.EntityVillager; @@ -19,6 +18,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.MathHelper; import net.minecraft.village.MerchantRecipe; import net.minecraft.village.MerchantRecipeList; +import net.minecraftforge.fml.common.registry.VillagerRegistry; import net.minecraftforge.oredict.OreDictionary; import java.util.ArrayList; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/gen/OreGen.java b/src/main/java/de/ellpeck/actuallyadditions/mod/gen/OreGen.java index 7ab3e8097..821c09b24 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/gen/OreGen.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/gen/OreGen.java @@ -10,8 +10,6 @@ package de.ellpeck.actuallyadditions.mod.gen; -import cpw.mods.fml.common.IWorldGenerator; -import cpw.mods.fml.common.registry.GameRegistry; import de.ellpeck.actuallyadditions.mod.blocks.InitBlocks; import de.ellpeck.actuallyadditions.mod.blocks.metalists.TheMiscBlocks; import de.ellpeck.actuallyadditions.mod.config.ConfigValues; @@ -25,6 +23,8 @@ import net.minecraft.world.World; import net.minecraft.world.WorldType; import net.minecraft.world.chunk.IChunkProvider; import net.minecraft.world.gen.feature.WorldGenMinable; +import net.minecraftforge.fml.common.IWorldGenerator; +import net.minecraftforge.fml.common.registry.GameRegistry; import java.util.Random; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/gen/VillageCustomCropFieldHandler.java b/src/main/java/de/ellpeck/actuallyadditions/mod/gen/VillageCustomCropFieldHandler.java index 75d078aa7..e627eb36a 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/gen/VillageCustomCropFieldHandler.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/gen/VillageCustomCropFieldHandler.java @@ -10,8 +10,8 @@ package de.ellpeck.actuallyadditions.mod.gen; -import cpw.mods.fml.common.registry.VillagerRegistry; import net.minecraft.world.gen.structure.StructureVillagePieces; +import net.minecraftforge.fml.common.registry.VillagerRegistry; import java.util.List; import java.util.Random; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/gen/VillageJamHouseHandler.java b/src/main/java/de/ellpeck/actuallyadditions/mod/gen/VillageJamHouseHandler.java index 2910e7ce5..96acd1046 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/gen/VillageJamHouseHandler.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/gen/VillageJamHouseHandler.java @@ -10,8 +10,8 @@ package de.ellpeck.actuallyadditions.mod.gen; -import cpw.mods.fml.common.registry.VillagerRegistry; import net.minecraft.world.gen.structure.StructureVillagePieces; +import net.minecraftforge.fml.common.registry.VillagerRegistry; import java.util.List; import java.util.Random; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerEnergizer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerEnergizer.java index 4272e5b1d..100336929 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerEnergizer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerEnergizer.java @@ -11,8 +11,6 @@ package de.ellpeck.actuallyadditions.mod.inventory; import cofh.api.energy.IEnergyContainerItem; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import de.ellpeck.actuallyadditions.mod.inventory.slot.SlotOutput; import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; import de.ellpeck.actuallyadditions.mod.tile.TileEntityEnergizer; @@ -24,6 +22,8 @@ import net.minecraft.inventory.Slot; import net.minecraft.item.ItemArmor; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; @InventoryContainer public class ContainerEnergizer extends Container{ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerEnervator.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerEnervator.java index a5b0411b1..5b16f26fd 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerEnervator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerEnervator.java @@ -11,8 +11,6 @@ package de.ellpeck.actuallyadditions.mod.inventory; import cofh.api.energy.IEnergyContainerItem; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import de.ellpeck.actuallyadditions.mod.inventory.slot.SlotOutput; import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; import de.ellpeck.actuallyadditions.mod.tile.TileEntityEnervator; @@ -24,6 +22,8 @@ import net.minecraft.inventory.Slot; import net.minecraft.item.ItemArmor; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; @InventoryContainer public class ContainerEnervator extends Container{ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/GuiHandler.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/GuiHandler.java index 5091d906b..3af5ee610 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/GuiHandler.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/GuiHandler.java @@ -10,8 +10,6 @@ package de.ellpeck.actuallyadditions.mod.inventory; -import cpw.mods.fml.common.network.IGuiHandler; -import cpw.mods.fml.common.network.NetworkRegistry; import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; import de.ellpeck.actuallyadditions.mod.booklet.GuiBooklet; import de.ellpeck.actuallyadditions.mod.booklet.GuiBookletStand; @@ -20,6 +18,8 @@ import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; import de.ellpeck.actuallyadditions.mod.util.ModUtil; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; +import net.minecraftforge.fml.common.network.IGuiHandler; +import net.minecraftforge.fml.common.network.NetworkRegistry; public class GuiHandler implements IGuiHandler{ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiBreaker.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiBreaker.java index bae4df8a2..fdd4f1b8a 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiBreaker.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiBreaker.java @@ -10,8 +10,6 @@ package de.ellpeck.actuallyadditions.mod.inventory.gui; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import de.ellpeck.actuallyadditions.mod.inventory.ContainerBreaker; import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; import de.ellpeck.actuallyadditions.mod.tile.TileEntityBreaker; @@ -19,6 +17,8 @@ import de.ellpeck.actuallyadditions.mod.util.AssetUtil; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; @SideOnly(Side.CLIENT) diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiCanolaPress.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiCanolaPress.java index daaab89d2..5d879498f 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiCanolaPress.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiCanolaPress.java @@ -10,8 +10,6 @@ package de.ellpeck.actuallyadditions.mod.inventory.gui; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import de.ellpeck.actuallyadditions.mod.inventory.ContainerCanolaPress; import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; import de.ellpeck.actuallyadditions.mod.tile.TileEntityCanolaPress; @@ -20,6 +18,8 @@ import de.ellpeck.actuallyadditions.mod.util.StringUtil; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; import java.util.Collections; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiCoalGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiCoalGenerator.java index 894188f72..34284d992 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiCoalGenerator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiCoalGenerator.java @@ -10,8 +10,6 @@ package de.ellpeck.actuallyadditions.mod.inventory.gui; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import de.ellpeck.actuallyadditions.mod.inventory.ContainerCoalGenerator; import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; import de.ellpeck.actuallyadditions.mod.tile.TileEntityCoalGenerator; @@ -19,6 +17,8 @@ import de.ellpeck.actuallyadditions.mod.util.AssetUtil; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; import java.util.Collections; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiCoffeeMachine.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiCoffeeMachine.java index 3d0c443f9..8365ae208 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiCoffeeMachine.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiCoffeeMachine.java @@ -10,8 +10,6 @@ package de.ellpeck.actuallyadditions.mod.inventory.gui; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import de.ellpeck.actuallyadditions.mod.inventory.ContainerCoffeeMachine; import de.ellpeck.actuallyadditions.mod.network.PacketHandler; import de.ellpeck.actuallyadditions.mod.network.gui.PacketGuiButton; @@ -26,6 +24,8 @@ import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; import java.util.Collections; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiCrafter.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiCrafter.java index 6d282f751..94a5a3cf5 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiCrafter.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiCrafter.java @@ -10,14 +10,14 @@ package de.ellpeck.actuallyadditions.mod.inventory.gui; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import de.ellpeck.actuallyadditions.mod.inventory.ContainerCrafter; import de.ellpeck.actuallyadditions.mod.util.AssetUtil; import de.ellpeck.actuallyadditions.mod.util.ModUtil; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; @SideOnly(Side.CLIENT) diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiDirectionalBreaker.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiDirectionalBreaker.java index 4855a3589..c84dd0562 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiDirectionalBreaker.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiDirectionalBreaker.java @@ -10,8 +10,6 @@ package de.ellpeck.actuallyadditions.mod.inventory.gui; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import de.ellpeck.actuallyadditions.mod.inventory.ContainerDirectionalBreaker; import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; import de.ellpeck.actuallyadditions.mod.tile.TileEntityDirectionalBreaker; @@ -19,6 +17,8 @@ import de.ellpeck.actuallyadditions.mod.util.AssetUtil; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; import java.util.Collections; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiDrill.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiDrill.java index b87a2cabe..1b54f1b7f 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiDrill.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiDrill.java @@ -10,14 +10,14 @@ package de.ellpeck.actuallyadditions.mod.inventory.gui; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import de.ellpeck.actuallyadditions.mod.inventory.ContainerDrill; import de.ellpeck.actuallyadditions.mod.util.AssetUtil; import de.ellpeck.actuallyadditions.mod.util.ModUtil; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; @SideOnly(Side.CLIENT) diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiDropper.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiDropper.java index e6a58242e..55700e1a6 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiDropper.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiDropper.java @@ -10,8 +10,6 @@ package de.ellpeck.actuallyadditions.mod.inventory.gui; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import de.ellpeck.actuallyadditions.mod.inventory.ContainerDropper; import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; import de.ellpeck.actuallyadditions.mod.tile.TileEntityDropper; @@ -19,6 +17,8 @@ import de.ellpeck.actuallyadditions.mod.util.AssetUtil; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; @SideOnly(Side.CLIENT) diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiEnergizer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiEnergizer.java index b8aa7d0a0..f0651cda5 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiEnergizer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiEnergizer.java @@ -10,8 +10,6 @@ package de.ellpeck.actuallyadditions.mod.inventory.gui; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import de.ellpeck.actuallyadditions.mod.inventory.ContainerEnergizer; import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; import de.ellpeck.actuallyadditions.mod.tile.TileEntityEnergizer; @@ -19,6 +17,8 @@ import de.ellpeck.actuallyadditions.mod.util.AssetUtil; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; import java.util.Collections; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiEnervator.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiEnervator.java index 06edf819e..51d3d471b 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiEnervator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiEnervator.java @@ -10,8 +10,6 @@ package de.ellpeck.actuallyadditions.mod.inventory.gui; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import de.ellpeck.actuallyadditions.mod.inventory.ContainerEnervator; import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; import de.ellpeck.actuallyadditions.mod.tile.TileEntityEnervator; @@ -19,6 +17,8 @@ import de.ellpeck.actuallyadditions.mod.util.AssetUtil; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; import java.util.Collections; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFeeder.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFeeder.java index 72ed73899..d8a17b528 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFeeder.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFeeder.java @@ -10,8 +10,6 @@ package de.ellpeck.actuallyadditions.mod.inventory.gui; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import de.ellpeck.actuallyadditions.mod.inventory.ContainerFeeder; import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; import de.ellpeck.actuallyadditions.mod.tile.TileEntityFeeder; @@ -21,6 +19,8 @@ import de.ellpeck.actuallyadditions.mod.util.StringUtil; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; import java.util.Arrays; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFermentingBarrel.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFermentingBarrel.java index f2973c826..f8344d823 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFermentingBarrel.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFermentingBarrel.java @@ -10,8 +10,6 @@ package de.ellpeck.actuallyadditions.mod.inventory.gui; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import de.ellpeck.actuallyadditions.mod.inventory.ContainerFermentingBarrel; import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; import de.ellpeck.actuallyadditions.mod.tile.TileEntityFermentingBarrel; @@ -20,6 +18,8 @@ import de.ellpeck.actuallyadditions.mod.util.StringUtil; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; import java.util.Collections; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFluidCollector.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFluidCollector.java index eb045ba56..1bf5e1945 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFluidCollector.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFluidCollector.java @@ -10,8 +10,6 @@ package de.ellpeck.actuallyadditions.mod.inventory.gui; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import de.ellpeck.actuallyadditions.mod.inventory.ContainerFluidCollector; import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; import de.ellpeck.actuallyadditions.mod.tile.TileEntityFluidCollector; @@ -20,6 +18,8 @@ import de.ellpeck.actuallyadditions.mod.util.StringUtil; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; import java.util.Collections; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFurnaceDouble.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFurnaceDouble.java index c01c42b63..782522bd9 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFurnaceDouble.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFurnaceDouble.java @@ -10,8 +10,6 @@ package de.ellpeck.actuallyadditions.mod.inventory.gui; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import de.ellpeck.actuallyadditions.mod.inventory.ContainerFurnaceDouble; import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; import de.ellpeck.actuallyadditions.mod.tile.TileEntityFurnaceDouble; @@ -19,6 +17,8 @@ import de.ellpeck.actuallyadditions.mod.util.AssetUtil; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; import java.util.Collections; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiGiantChest.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiGiantChest.java index c6886eaf8..e4d74c735 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiGiantChest.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiGiantChest.java @@ -10,8 +10,6 @@ package de.ellpeck.actuallyadditions.mod.inventory.gui; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import de.ellpeck.actuallyadditions.mod.inventory.ContainerGiantChest; import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; import de.ellpeck.actuallyadditions.mod.tile.TileEntityGiantChest; @@ -19,6 +17,8 @@ import de.ellpeck.actuallyadditions.mod.util.AssetUtil; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; @SideOnly(Side.CLIENT) diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiGrinder.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiGrinder.java index a1b577afd..f35b9a896 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiGrinder.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiGrinder.java @@ -10,8 +10,6 @@ package de.ellpeck.actuallyadditions.mod.inventory.gui; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import de.ellpeck.actuallyadditions.mod.inventory.ContainerGrinder; import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; import de.ellpeck.actuallyadditions.mod.tile.TileEntityGrinder; @@ -19,6 +17,8 @@ import de.ellpeck.actuallyadditions.mod.util.AssetUtil; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; import java.util.Collections; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiInputter.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiInputter.java index f9bc8901c..688cbbb53 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiInputter.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiInputter.java @@ -10,8 +10,6 @@ package de.ellpeck.actuallyadditions.mod.inventory.gui; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import de.ellpeck.actuallyadditions.mod.inventory.ContainerInputter; import de.ellpeck.actuallyadditions.mod.network.PacketHandler; import de.ellpeck.actuallyadditions.mod.network.gui.PacketGuiButton; @@ -30,6 +28,8 @@ import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiMiner.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiMiner.java index aa36e573b..84f85d8da 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiMiner.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiMiner.java @@ -10,8 +10,6 @@ package de.ellpeck.actuallyadditions.mod.inventory.gui; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import de.ellpeck.actuallyadditions.mod.inventory.ContainerMiner; import de.ellpeck.actuallyadditions.mod.network.PacketHandler; import de.ellpeck.actuallyadditions.mod.network.gui.PacketGuiButton; @@ -24,6 +22,8 @@ import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; @SideOnly(Side.CLIENT) diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiOilGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiOilGenerator.java index b496249bf..739d83c54 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiOilGenerator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiOilGenerator.java @@ -10,8 +10,6 @@ package de.ellpeck.actuallyadditions.mod.inventory.gui; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import de.ellpeck.actuallyadditions.mod.inventory.ContainerOilGenerator; import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; import de.ellpeck.actuallyadditions.mod.tile.TileEntityOilGenerator; @@ -20,6 +18,8 @@ import de.ellpeck.actuallyadditions.mod.util.StringUtil; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; import java.util.Collections; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiPhantomPlacer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiPhantomPlacer.java index 2384e1295..bb0bd73df 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiPhantomPlacer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiPhantomPlacer.java @@ -10,8 +10,6 @@ package de.ellpeck.actuallyadditions.mod.inventory.gui; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import de.ellpeck.actuallyadditions.mod.inventory.ContainerPhantomPlacer; import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; import de.ellpeck.actuallyadditions.mod.tile.TileEntityPhantomPlacer; @@ -19,6 +17,8 @@ import de.ellpeck.actuallyadditions.mod.util.AssetUtil; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; @SideOnly(Side.CLIENT) diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiRangedCollector.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiRangedCollector.java index 12e6a091b..df0cf5715 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiRangedCollector.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiRangedCollector.java @@ -10,8 +10,6 @@ package de.ellpeck.actuallyadditions.mod.inventory.gui; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import de.ellpeck.actuallyadditions.mod.inventory.ContainerRangedCollector; import de.ellpeck.actuallyadditions.mod.network.PacketHandler; import de.ellpeck.actuallyadditions.mod.network.gui.PacketGuiButton; @@ -26,6 +24,8 @@ import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; import java.util.Collections; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiRepairer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiRepairer.java index 9f7419ea6..7674cfd8b 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiRepairer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiRepairer.java @@ -10,8 +10,6 @@ package de.ellpeck.actuallyadditions.mod.inventory.gui; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import de.ellpeck.actuallyadditions.mod.inventory.ContainerRepairer; import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; import de.ellpeck.actuallyadditions.mod.tile.TileEntityItemRepairer; @@ -19,6 +17,8 @@ import de.ellpeck.actuallyadditions.mod.util.AssetUtil; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; import java.util.Collections; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiSmileyCloud.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiSmileyCloud.java index ca4ea5b6b..c234dfffc 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiSmileyCloud.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiSmileyCloud.java @@ -10,8 +10,6 @@ package de.ellpeck.actuallyadditions.mod.inventory.gui; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import de.ellpeck.actuallyadditions.mod.inventory.ContainerSmileyCloud; import de.ellpeck.actuallyadditions.mod.network.PacketHandler; import de.ellpeck.actuallyadditions.mod.network.gui.PacketGuiString; @@ -26,6 +24,8 @@ import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiXPSolidifier.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiXPSolidifier.java index 927ef180e..a43378617 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiXPSolidifier.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiXPSolidifier.java @@ -10,8 +10,6 @@ package de.ellpeck.actuallyadditions.mod.inventory.gui; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import de.ellpeck.actuallyadditions.mod.inventory.ContainerXPSolidifier; import de.ellpeck.actuallyadditions.mod.network.PacketHandler; import de.ellpeck.actuallyadditions.mod.network.gui.PacketGuiButton; @@ -25,6 +23,8 @@ import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; @SideOnly(Side.CLIENT) diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/InitForeignPaxels.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/InitForeignPaxels.java index 0ca1e7904..001d1be79 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/InitForeignPaxels.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/InitForeignPaxels.java @@ -10,8 +10,6 @@ package de.ellpeck.actuallyadditions.mod.items; -import cpw.mods.fml.common.Loader; -import cpw.mods.fml.common.registry.GameRegistry; import de.ellpeck.actuallyadditions.mod.config.values.ConfigBoolValues; import de.ellpeck.actuallyadditions.mod.config.values.ConfigCrafting; import de.ellpeck.actuallyadditions.mod.crafting.ToolCrafting; @@ -23,6 +21,8 @@ import de.ellpeck.actuallyadditions.mod.util.Util; import net.minecraft.item.EnumRarity; import net.minecraft.item.Item; import net.minecraft.item.ItemTool; +import net.minecraftforge.fml.common.Loader; +import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.oredict.ShapelessOreRecipe; public class InitForeignPaxels{ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemBattery.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemBattery.java index 876c0da5c..60f4efc9d 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemBattery.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemBattery.java @@ -10,14 +10,14 @@ package de.ellpeck.actuallyadditions.mod.items; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import de.ellpeck.actuallyadditions.mod.items.base.ItemEnergy; import de.ellpeck.actuallyadditions.mod.util.ModUtil; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class ItemBattery extends ItemEnergy{ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemBooklet.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemBooklet.java index eb3f2d640..3f59f4e37 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemBooklet.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemBooklet.java @@ -10,8 +10,6 @@ package de.ellpeck.actuallyadditions.mod.items; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI; import de.ellpeck.actuallyadditions.api.block.IHudDisplay; import de.ellpeck.actuallyadditions.api.booklet.BookletPage; @@ -37,6 +35,8 @@ import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.IIcon; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import java.util.List; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemChestToCrateUpgrade.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemChestToCrateUpgrade.java index 44dbb5073..055baebc6 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemChestToCrateUpgrade.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemChestToCrateUpgrade.java @@ -10,8 +10,6 @@ package de.ellpeck.actuallyadditions.mod.items; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import de.ellpeck.actuallyadditions.mod.blocks.InitBlocks; import de.ellpeck.actuallyadditions.mod.items.base.ItemBase; import de.ellpeck.actuallyadditions.mod.tile.TileEntityGiantChest; @@ -26,6 +24,8 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityChest; import net.minecraft.util.IIcon; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class ItemChestToCrateUpgrade extends ItemBase{ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCoffee.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCoffee.java index 09759a516..ab5e0baf8 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCoffee.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCoffee.java @@ -10,9 +10,6 @@ package de.ellpeck.actuallyadditions.mod.items; -import cpw.mods.fml.common.Loader; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI; import de.ellpeck.actuallyadditions.api.recipe.coffee.CoffeeBrewing; import de.ellpeck.actuallyadditions.api.recipe.coffee.CoffeeIngredient; @@ -34,6 +31,9 @@ import net.minecraft.potion.PotionEffect; import net.minecraft.util.IIcon; import net.minecraft.util.StringUtils; import net.minecraft.world.World; +import net.minecraftforge.fml.common.Loader; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCoffeeBean.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCoffeeBean.java index aa1079412..665bc602c 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCoffeeBean.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCoffeeBean.java @@ -10,14 +10,14 @@ package de.ellpeck.actuallyadditions.mod.items; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import de.ellpeck.actuallyadditions.mod.items.base.ItemFoodBase; import de.ellpeck.actuallyadditions.mod.util.ModUtil; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class ItemCoffeeBean extends ItemFoodBase{ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCrafterOnAStick.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCrafterOnAStick.java index 1014d5911..c368a6273 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCrafterOnAStick.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCrafterOnAStick.java @@ -10,8 +10,6 @@ package de.ellpeck.actuallyadditions.mod.items; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; import de.ellpeck.actuallyadditions.mod.inventory.GuiHandler; import de.ellpeck.actuallyadditions.mod.items.base.ItemBase; @@ -22,6 +20,8 @@ import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class ItemCrafterOnAStick extends ItemBase{ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCrystal.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCrystal.java index 7c29da0db..6be08f01d 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCrystal.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCrystal.java @@ -10,8 +10,6 @@ package de.ellpeck.actuallyadditions.mod.items; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import de.ellpeck.actuallyadditions.mod.blocks.BlockCrystal; import de.ellpeck.actuallyadditions.mod.items.base.ItemBase; import de.ellpeck.actuallyadditions.mod.util.ModUtil; @@ -22,6 +20,8 @@ import net.minecraft.item.EnumRarity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import java.util.List; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemDrill.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemDrill.java index 1a39b8ad3..8fc4f5075 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemDrill.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemDrill.java @@ -12,8 +12,6 @@ package de.ellpeck.actuallyadditions.mod.items; import cofh.api.energy.IEnergyContainerItem; import com.google.common.collect.Multimap; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; import de.ellpeck.actuallyadditions.mod.blocks.metalists.TheColoredLampColors; import de.ellpeck.actuallyadditions.mod.config.ConfigValues; @@ -44,6 +42,8 @@ import net.minecraft.util.IIcon; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import java.util.HashSet; import java.util.List; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemDrillUpgrade.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemDrillUpgrade.java index b7c7a22bb..2644fea3b 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemDrillUpgrade.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemDrillUpgrade.java @@ -10,8 +10,6 @@ package de.ellpeck.actuallyadditions.mod.items; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import de.ellpeck.actuallyadditions.mod.items.base.ItemBase; import de.ellpeck.actuallyadditions.mod.util.ModUtil; import net.minecraft.client.renderer.texture.IIconRegister; @@ -20,6 +18,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.IIcon; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class ItemDrillUpgrade extends ItemBase{ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemDust.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemDust.java index 7a0f24051..e7b8e0583 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemDust.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemDust.java @@ -10,8 +10,6 @@ package de.ellpeck.actuallyadditions.mod.items; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import de.ellpeck.actuallyadditions.mod.items.base.ItemBase; import de.ellpeck.actuallyadditions.mod.items.metalists.TheDusts; import de.ellpeck.actuallyadditions.mod.util.ModUtil; @@ -22,6 +20,8 @@ import net.minecraft.item.EnumRarity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import java.util.List; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFertilizer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFertilizer.java index e11edd912..67626e437 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFertilizer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFertilizer.java @@ -10,8 +10,6 @@ package de.ellpeck.actuallyadditions.mod.items; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import de.ellpeck.actuallyadditions.mod.items.base.ItemBase; import de.ellpeck.actuallyadditions.mod.util.ModUtil; import net.minecraft.client.renderer.texture.IIconRegister; @@ -21,6 +19,8 @@ import net.minecraft.item.ItemDye; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class ItemFertilizer extends ItemBase{ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFoods.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFoods.java index 61dc3c9c5..131b9c766 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFoods.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFoods.java @@ -10,8 +10,6 @@ package de.ellpeck.actuallyadditions.mod.items; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import de.ellpeck.actuallyadditions.mod.items.base.ItemFoodBase; import de.ellpeck.actuallyadditions.mod.items.metalists.TheFoods; import de.ellpeck.actuallyadditions.mod.util.ModUtil; @@ -27,6 +25,8 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import java.util.List; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemGeneric.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemGeneric.java index eee02d5ae..e84a0e536 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemGeneric.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemGeneric.java @@ -10,14 +10,14 @@ package de.ellpeck.actuallyadditions.mod.items; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import de.ellpeck.actuallyadditions.mod.items.base.ItemBase; import de.ellpeck.actuallyadditions.mod.util.ModUtil; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class ItemGeneric extends ItemBase{ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemGrowthRing.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemGrowthRing.java index 0f0b832bf..1323a00b5 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemGrowthRing.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemGrowthRing.java @@ -10,22 +10,17 @@ package de.ellpeck.actuallyadditions.mod.items; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import de.ellpeck.actuallyadditions.api.Position; import de.ellpeck.actuallyadditions.mod.items.base.ItemEnergy; -import de.ellpeck.actuallyadditions.mod.util.ModUtil; import de.ellpeck.actuallyadditions.mod.util.Util; import net.minecraft.block.Block; import net.minecraft.block.BlockGrass; import net.minecraft.block.IGrowable; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; import net.minecraft.world.World; import net.minecraftforge.common.IPlantable; @@ -51,10 +46,10 @@ public class ItemGrowthRing extends ItemEnergy{ if(equipped != null && equipped == stack && this.getEnergyStored(stack) >= energyUse){ ArrayList blocks = new ArrayList(); - if(stack.stackTagCompound == null){ + if(stack.getTagCompound() == null){ stack.setTagCompound(new NBTTagCompound()); } - int waitTime = stack.stackTagCompound.getInteger("WaitTime"); + int waitTime = stack.getTagCompound().getInteger("WaitTime"); //Adding all possible Blocks if(waitTime >= 30){ @@ -97,28 +92,16 @@ public class ItemGrowthRing extends ItemEnergy{ } } - stack.stackTagCompound.setInteger("WaitTime", 0); + stack.getTagCompound().setInteger("WaitTime", 0); } else{ - stack.stackTagCompound.setInteger("WaitTime", waitTime+1); + stack.getTagCompound().setInteger("WaitTime", waitTime+1); } } } @Override public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.epic; - } - - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister iconReg){ - this.itemIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getBaseName()); - } - - @Override - @SideOnly(Side.CLIENT) - public IIcon getIcon(ItemStack stack, int pass){ - return this.itemIcon; + return EnumRarity.EPIC; } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemHairyBall.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemHairyBall.java index 52cfc181b..20d8707d4 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemHairyBall.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemHairyBall.java @@ -10,8 +10,6 @@ package de.ellpeck.actuallyadditions.mod.items; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI; import de.ellpeck.actuallyadditions.api.recipe.BallOfFurReturn; import de.ellpeck.actuallyadditions.mod.items.base.ItemBase; @@ -25,6 +23,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.util.WeightedRandom; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class ItemHairyBall extends ItemBase{ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemJams.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemJams.java index be4f9301b..0765a01d5 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemJams.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemJams.java @@ -10,8 +10,6 @@ package de.ellpeck.actuallyadditions.mod.items; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import de.ellpeck.actuallyadditions.mod.items.base.ItemFoodBase; import de.ellpeck.actuallyadditions.mod.items.metalists.TheJams; import de.ellpeck.actuallyadditions.mod.util.ModUtil; @@ -27,6 +25,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.potion.PotionEffect; import net.minecraft.util.IIcon; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import java.util.List; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemKnife.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemKnife.java index c50f7609e..fb108cd6e 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemKnife.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemKnife.java @@ -11,8 +11,6 @@ package de.ellpeck.actuallyadditions.mod.items; import com.google.common.collect.Multimap; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import de.ellpeck.actuallyadditions.mod.items.base.ItemBase; import de.ellpeck.actuallyadditions.mod.util.ModUtil; import net.minecraft.client.renderer.texture.IIconRegister; @@ -21,6 +19,8 @@ import net.minecraft.entity.ai.attributes.AttributeModifier; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class ItemKnife extends ItemBase{ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemLaserWrench.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemLaserWrench.java index cc67f58c2..a5284f36d 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemLaserWrench.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemLaserWrench.java @@ -10,8 +10,6 @@ package de.ellpeck.actuallyadditions.mod.items; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import de.ellpeck.actuallyadditions.api.Position; import de.ellpeck.actuallyadditions.mod.items.base.ItemBase; import de.ellpeck.actuallyadditions.mod.misc.LaserRelayConnectionHandler; @@ -28,6 +26,8 @@ import net.minecraft.util.ChatComponentText; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.IIcon; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import java.util.List; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemLeafBlower.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemLeafBlower.java index 0d216d4a1..bfe8d9eb7 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemLeafBlower.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemLeafBlower.java @@ -10,8 +10,6 @@ package de.ellpeck.actuallyadditions.mod.items; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import de.ellpeck.actuallyadditions.api.Position; import de.ellpeck.actuallyadditions.mod.config.values.ConfigBoolValues; import de.ellpeck.actuallyadditions.mod.items.base.ItemBase; @@ -27,6 +25,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import java.util.ArrayList; import java.util.Collections; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemMagnetRing.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemMagnetRing.java index 789057721..316180063 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemMagnetRing.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemMagnetRing.java @@ -10,8 +10,6 @@ package de.ellpeck.actuallyadditions.mod.items; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import de.ellpeck.actuallyadditions.mod.items.base.ItemEnergy; import de.ellpeck.actuallyadditions.mod.util.ModUtil; import net.minecraft.client.renderer.texture.IIconRegister; @@ -24,6 +22,8 @@ import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.IIcon; import net.minecraft.util.Vec3; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import java.util.ArrayList; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemMisc.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemMisc.java index 312de25d8..23472a6ae 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemMisc.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemMisc.java @@ -10,8 +10,6 @@ package de.ellpeck.actuallyadditions.mod.items; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import de.ellpeck.actuallyadditions.mod.items.base.ItemBase; import de.ellpeck.actuallyadditions.mod.items.metalists.TheMiscItems; import de.ellpeck.actuallyadditions.mod.util.ModUtil; @@ -22,6 +20,8 @@ import net.minecraft.item.EnumRarity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import java.util.List; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemPhantomConnector.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemPhantomConnector.java index 9550aa187..412e5deca 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemPhantomConnector.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemPhantomConnector.java @@ -10,8 +10,6 @@ package de.ellpeck.actuallyadditions.mod.items; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import de.ellpeck.actuallyadditions.api.Position; import de.ellpeck.actuallyadditions.api.tile.IPhantomTile; import de.ellpeck.actuallyadditions.mod.items.base.ItemBase; @@ -30,6 +28,8 @@ import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.IIcon; import net.minecraft.world.World; import net.minecraftforge.common.DimensionManager; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import java.util.List; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemPotionRing.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemPotionRing.java index c9cdf04b4..194b3c4a1 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemPotionRing.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemPotionRing.java @@ -10,8 +10,6 @@ package de.ellpeck.actuallyadditions.mod.items; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import de.ellpeck.actuallyadditions.mod.items.base.ItemBase; import de.ellpeck.actuallyadditions.mod.items.metalists.ThePotionRings; import de.ellpeck.actuallyadditions.mod.util.ModUtil; @@ -26,6 +24,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.potion.PotionEffect; import net.minecraft.util.IIcon; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import java.util.List; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemResonantRice.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemResonantRice.java index 4d58e6737..f44589ba8 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemResonantRice.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemResonantRice.java @@ -10,8 +10,6 @@ package de.ellpeck.actuallyadditions.mod.items; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import de.ellpeck.actuallyadditions.mod.items.base.ItemBase; import de.ellpeck.actuallyadditions.mod.util.ModUtil; import net.minecraft.client.renderer.texture.IIconRegister; @@ -20,6 +18,8 @@ import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class ItemResonantRice extends ItemBase{ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemSeed.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemSeed.java index d4de3266d..963fee470 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemSeed.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemSeed.java @@ -10,9 +10,6 @@ package de.ellpeck.actuallyadditions.mod.items; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import de.ellpeck.actuallyadditions.mod.blocks.base.BlockPlant; import de.ellpeck.actuallyadditions.mod.creative.CreativeTab; import de.ellpeck.actuallyadditions.mod.util.ModUtil; @@ -25,6 +22,9 @@ import net.minecraft.item.ItemSeeds; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; +import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class ItemSeed extends ItemSeeds{ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemSolidifiedExperience.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemSolidifiedExperience.java index cbcd4cb1d..436ae8830 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemSolidifiedExperience.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemSolidifiedExperience.java @@ -10,8 +10,6 @@ package de.ellpeck.actuallyadditions.mod.items; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import de.ellpeck.actuallyadditions.mod.items.base.ItemBase; import de.ellpeck.actuallyadditions.mod.util.ModUtil; import net.minecraft.client.renderer.texture.IIconRegister; @@ -21,6 +19,8 @@ import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class ItemSolidifiedExperience extends ItemBase{ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemTeleStaff.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemTeleStaff.java index c40772a6f..09e883165 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemTeleStaff.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemTeleStaff.java @@ -10,8 +10,6 @@ package de.ellpeck.actuallyadditions.mod.items; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import de.ellpeck.actuallyadditions.mod.items.base.ItemEnergy; import de.ellpeck.actuallyadditions.mod.util.ModUtil; import de.ellpeck.actuallyadditions.mod.util.WorldUtil; @@ -27,6 +25,8 @@ import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.Vec3; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class ItemTeleStaff extends ItemEnergy{ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemWaterRemovalRing.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemWaterRemovalRing.java index 8e2ca8196..292bcf747 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemWaterRemovalRing.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemWaterRemovalRing.java @@ -10,8 +10,6 @@ package de.ellpeck.actuallyadditions.mod.items; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import de.ellpeck.actuallyadditions.mod.items.base.ItemEnergy; import de.ellpeck.actuallyadditions.mod.util.ModUtil; import net.minecraft.client.renderer.texture.IIconRegister; @@ -23,6 +21,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class ItemWaterRemovalRing extends ItemEnergy{ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemWingsOfTheBats.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemWingsOfTheBats.java index 49b857391..542877f35 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemWingsOfTheBats.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemWingsOfTheBats.java @@ -10,8 +10,6 @@ package de.ellpeck.actuallyadditions.mod.items; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import de.ellpeck.actuallyadditions.mod.items.base.ItemBase; import de.ellpeck.actuallyadditions.mod.util.ModUtil; import net.minecraft.client.renderer.texture.IIconRegister; @@ -19,6 +17,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import java.util.ArrayList; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemAllToolAA.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemAllToolAA.java index 16c486a85..4ad3ac597 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemAllToolAA.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemAllToolAA.java @@ -11,10 +11,6 @@ package de.ellpeck.actuallyadditions.mod.items.base; import com.google.common.collect.Sets; -import cpw.mods.fml.common.eventhandler.Event; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import de.ellpeck.actuallyadditions.mod.config.ConfigValues; import de.ellpeck.actuallyadditions.mod.creative.CreativeTab; import de.ellpeck.actuallyadditions.mod.util.ItemUtil; @@ -31,6 +27,10 @@ import net.minecraft.util.IIcon; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.UseHoeEvent; +import net.minecraftforge.fml.common.eventhandler.Event; +import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.oredict.OreDictionary; import java.util.HashSet; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemArmorAA.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemArmorAA.java index fc8b8c4b9..5580aef27 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemArmorAA.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemArmorAA.java @@ -10,9 +10,6 @@ package de.ellpeck.actuallyadditions.mod.items.base; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import de.ellpeck.actuallyadditions.mod.creative.CreativeTab; import de.ellpeck.actuallyadditions.mod.util.ItemUtil; import de.ellpeck.actuallyadditions.mod.util.ModUtil; @@ -22,6 +19,9 @@ import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemArmor; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; +import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class ItemArmorAA extends ItemArmor{ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemAxeAA.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemAxeAA.java index e45d8fa22..8c6fa7608 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemAxeAA.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemAxeAA.java @@ -10,9 +10,6 @@ package de.ellpeck.actuallyadditions.mod.items.base; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import de.ellpeck.actuallyadditions.mod.creative.CreativeTab; import de.ellpeck.actuallyadditions.mod.util.ItemUtil; import de.ellpeck.actuallyadditions.mod.util.ModUtil; @@ -21,6 +18,9 @@ import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemAxe; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; +import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class ItemAxeAA extends ItemAxe{ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemBase.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemBase.java index 33a1e543c..f8eeb4f60 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemBase.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemBase.java @@ -10,10 +10,10 @@ package de.ellpeck.actuallyadditions.mod.items.base; -import cpw.mods.fml.common.registry.GameRegistry; import de.ellpeck.actuallyadditions.mod.creative.CreativeTab; import de.ellpeck.actuallyadditions.mod.util.ModUtil; import net.minecraft.item.Item; +import net.minecraftforge.fml.common.registry.GameRegistry; public class ItemBase extends Item{ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemBucketAA.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemBucketAA.java index bda610a17..a1c729c26 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemBucketAA.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemBucketAA.java @@ -10,9 +10,6 @@ package de.ellpeck.actuallyadditions.mod.items.base; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import de.ellpeck.actuallyadditions.mod.creative.CreativeTab; import de.ellpeck.actuallyadditions.mod.util.ModUtil; import net.minecraft.block.Block; @@ -22,6 +19,9 @@ import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemBucket; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; +import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class ItemBucketAA extends ItemBucket{ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemEnergy.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemEnergy.java index c6500734d..932bceac7 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemEnergy.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemEnergy.java @@ -11,9 +11,6 @@ package de.ellpeck.actuallyadditions.mod.items.base; import cofh.api.energy.ItemEnergyContainer; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import de.ellpeck.actuallyadditions.mod.creative.CreativeTab; import de.ellpeck.actuallyadditions.mod.util.ModUtil; import net.minecraft.creativetab.CreativeTabs; @@ -22,6 +19,9 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; +import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import java.util.List; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemFoodBase.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemFoodBase.java index 85938c9fb..5953c2b85 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemFoodBase.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemFoodBase.java @@ -10,10 +10,10 @@ package de.ellpeck.actuallyadditions.mod.items.base; -import cpw.mods.fml.common.registry.GameRegistry; import de.ellpeck.actuallyadditions.mod.creative.CreativeTab; import de.ellpeck.actuallyadditions.mod.util.ModUtil; import net.minecraft.item.ItemFood; +import net.minecraftforge.fml.common.registry.GameRegistry; public class ItemFoodBase extends ItemFood{ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemHoeAA.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemHoeAA.java index 32f7d747c..067e180cf 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemHoeAA.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemHoeAA.java @@ -10,9 +10,6 @@ package de.ellpeck.actuallyadditions.mod.items.base; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import de.ellpeck.actuallyadditions.mod.creative.CreativeTab; import de.ellpeck.actuallyadditions.mod.util.ItemUtil; import de.ellpeck.actuallyadditions.mod.util.ModUtil; @@ -22,6 +19,9 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemHoe; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; +import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class ItemHoeAA extends ItemHoe{ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemPickaxeAA.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemPickaxeAA.java index fd43b29c7..07e962076 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemPickaxeAA.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemPickaxeAA.java @@ -10,9 +10,6 @@ package de.ellpeck.actuallyadditions.mod.items.base; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import de.ellpeck.actuallyadditions.mod.creative.CreativeTab; import de.ellpeck.actuallyadditions.mod.util.ItemUtil; import de.ellpeck.actuallyadditions.mod.util.ModUtil; @@ -21,6 +18,9 @@ import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemPickaxe; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; +import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class ItemPickaxeAA extends ItemPickaxe{ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemShovelAA.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemShovelAA.java index dbb5cfffc..e25d82710 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemShovelAA.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemShovelAA.java @@ -10,9 +10,6 @@ package de.ellpeck.actuallyadditions.mod.items.base; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import de.ellpeck.actuallyadditions.mod.creative.CreativeTab; import de.ellpeck.actuallyadditions.mod.util.ItemUtil; import de.ellpeck.actuallyadditions.mod.util.ModUtil; @@ -22,6 +19,9 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemSpade; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; +import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class ItemShovelAA extends ItemSpade{ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemSwordAA.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemSwordAA.java index 9c18affac..aa5e505bc 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemSwordAA.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemSwordAA.java @@ -10,9 +10,6 @@ package de.ellpeck.actuallyadditions.mod.items.base; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import de.ellpeck.actuallyadditions.mod.blocks.base.ItemBlockBase; import de.ellpeck.actuallyadditions.mod.creative.CreativeTab; import de.ellpeck.actuallyadditions.mod.util.ItemUtil; @@ -22,6 +19,9 @@ import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemSword; import net.minecraft.util.IIcon; +import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class ItemSwordAA extends ItemSword{ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/ItemLens.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/ItemLens.java index f8a22c60e..81353a9b9 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/ItemLens.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/ItemLens.java @@ -10,8 +10,6 @@ package de.ellpeck.actuallyadditions.mod.items.lens; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import de.ellpeck.actuallyadditions.api.lens.ILensItem; import de.ellpeck.actuallyadditions.api.lens.Lens; import de.ellpeck.actuallyadditions.mod.items.base.ItemBase; @@ -20,6 +18,8 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class ItemLens extends ItemBase implements ILensItem{ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/EntityColoredParticleFX.java b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/EntityColoredParticleFX.java index 3b798cb92..e2753ae57 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/EntityColoredParticleFX.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/EntityColoredParticleFX.java @@ -10,10 +10,10 @@ package de.ellpeck.actuallyadditions.mod.misc; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.particle.EntityReddustFX; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class EntityColoredParticleFX extends EntityReddustFX{ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/LaserRelayConnectionHandler.java b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/LaserRelayConnectionHandler.java index f22e75638..3b124b5ab 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/LaserRelayConnectionHandler.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/LaserRelayConnectionHandler.java @@ -19,8 +19,8 @@ import io.netty.util.internal.ConcurrentSet; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumFacing; import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; public class LaserRelayConnectionHandler{ @@ -171,9 +171,9 @@ public class LaserRelayConnectionHandler{ if(relay != null){ //Get every side of the relay for(int i = 0; i <= 5; i++){ - ForgeDirection side = ForgeDirection.getOrientation(i); + EnumFacing side = WorldUtil.getDirectionBySidesInOrder(i); //Get the Position at the side - Position pos = WorldUtil.getCoordsFromSide(side, relay.getX(), relay.getY(), relay.getZ(), 0); + Position pos = WorldUtil.getCoordsFromSide(side, relay, 0); if(!pos.isEqual(energyGottenFrom)){ TileEntity tile = pos.getTileEntity(world); if(tile instanceof IEnergyReceiver && !(tile instanceof TileEntityLaserRelay)){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/special/SpecialRenderInit.java b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/special/SpecialRenderInit.java index c35584b61..7262f67eb 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/special/SpecialRenderInit.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/special/SpecialRenderInit.java @@ -10,14 +10,14 @@ package de.ellpeck.actuallyadditions.mod.misc.special; -import cpw.mods.fml.common.eventhandler.EventPriority; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; import de.ellpeck.actuallyadditions.mod.util.StringUtil; import de.ellpeck.actuallyadditions.mod.util.Util; import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.client.event.RenderPlayerEvent; +import net.minecraftforge.fml.common.eventhandler.EventPriority; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEIScreenEvents.java b/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEIScreenEvents.java index 24cc50d60..b5ecf7382 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEIScreenEvents.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEIScreenEvents.java @@ -12,7 +12,6 @@ package de.ellpeck.actuallyadditions.mod.nei; import codechicken.nei.recipe.GuiRecipe; import codechicken.nei.recipe.IRecipeHandler; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI; import de.ellpeck.actuallyadditions.api.booklet.BookletPage; import de.ellpeck.actuallyadditions.api.booklet.INEIRecipeHandler; @@ -23,6 +22,7 @@ import de.ellpeck.actuallyadditions.mod.util.ModUtil; import de.ellpeck.actuallyadditions.mod.util.StringUtil; import net.minecraft.client.Minecraft; import net.minecraftforge.client.event.GuiScreenEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; public class NEIScreenEvents{ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/network/PacketBookletStandButton.java b/src/main/java/de/ellpeck/actuallyadditions/mod/network/PacketBookletStandButton.java index d9072b17c..3c057128e 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/network/PacketBookletStandButton.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/network/PacketBookletStandButton.java @@ -10,9 +10,6 @@ package de.ellpeck.actuallyadditions.mod.network; -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 de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI; import de.ellpeck.actuallyadditions.api.internal.EntrySet; import de.ellpeck.actuallyadditions.mod.tile.TileEntityBookletStand; @@ -21,6 +18,9 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.common.DimensionManager; +import net.minecraftforge.fml.common.network.simpleimpl.IMessage; +import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; +import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; import java.util.Objects; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/network/PacketHandler.java b/src/main/java/de/ellpeck/actuallyadditions/mod/network/PacketHandler.java index f682126b4..b92c6468e 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/network/PacketHandler.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/network/PacketHandler.java @@ -10,13 +10,13 @@ package de.ellpeck.actuallyadditions.mod.network; -import cpw.mods.fml.common.network.NetworkRegistry; -import cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper; -import cpw.mods.fml.relauncher.Side; import de.ellpeck.actuallyadditions.mod.network.gui.PacketGuiButton; import de.ellpeck.actuallyadditions.mod.network.gui.PacketGuiNumber; import de.ellpeck.actuallyadditions.mod.network.gui.PacketGuiString; import de.ellpeck.actuallyadditions.mod.util.ModUtil; +import net.minecraftforge.fml.common.network.NetworkRegistry; +import net.minecraftforge.fml.common.network.simpleimpl.SimpleNetworkWrapper; +import net.minecraftforge.fml.relauncher.Side; public class PacketHandler{ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/network/PacketParticle.java b/src/main/java/de/ellpeck/actuallyadditions/mod/network/PacketParticle.java index 696bbb27c..c05847186 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/network/PacketParticle.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/network/PacketParticle.java @@ -10,16 +10,16 @@ package de.ellpeck.actuallyadditions.mod.network; -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 cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import de.ellpeck.actuallyadditions.mod.misc.EntityColoredParticleFX; import io.netty.buffer.ByteBuf; import net.minecraft.client.Minecraft; import net.minecraft.util.Vec3; import net.minecraft.world.World; +import net.minecraftforge.fml.common.network.simpleimpl.IMessage; +import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; +import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class PacketParticle implements IMessage{ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/network/gui/PacketGuiButton.java b/src/main/java/de/ellpeck/actuallyadditions/mod/network/gui/PacketGuiButton.java index e300aa37c..466af0851 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/network/gui/PacketGuiButton.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/network/gui/PacketGuiButton.java @@ -10,14 +10,14 @@ package de.ellpeck.actuallyadditions.mod.network.gui; -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 io.netty.buffer.ByteBuf; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.common.DimensionManager; +import net.minecraftforge.fml.common.network.simpleimpl.IMessage; +import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; +import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; public class PacketGuiButton implements IMessage{ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/network/gui/PacketGuiNumber.java b/src/main/java/de/ellpeck/actuallyadditions/mod/network/gui/PacketGuiNumber.java index ed52de8f0..a8fcf7a00 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/network/gui/PacketGuiNumber.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/network/gui/PacketGuiNumber.java @@ -10,14 +10,14 @@ package de.ellpeck.actuallyadditions.mod.network.gui; -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 io.netty.buffer.ByteBuf; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.common.DimensionManager; +import net.minecraftforge.fml.common.network.simpleimpl.IMessage; +import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; +import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; public class PacketGuiNumber implements IMessage{ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/network/gui/PacketGuiString.java b/src/main/java/de/ellpeck/actuallyadditions/mod/network/gui/PacketGuiString.java index 504ceb8af..660b9621a 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/network/gui/PacketGuiString.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/network/gui/PacketGuiString.java @@ -10,14 +10,14 @@ package de.ellpeck.actuallyadditions.mod.network.gui; -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 io.netty.buffer.ByteBuf; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.common.DimensionManager; +import net.minecraftforge.fml.common.network.simpleimpl.IMessage; +import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; +import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; public class PacketGuiString implements IMessage{ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/proxy/ClientProxy.java b/src/main/java/de/ellpeck/actuallyadditions/mod/proxy/ClientProxy.java index b996e177d..6cc76f337 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/proxy/ClientProxy.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/proxy/ClientProxy.java @@ -11,12 +11,6 @@ package de.ellpeck.actuallyadditions.mod.proxy; -import cpw.mods.fml.client.registry.ClientRegistry; -import cpw.mods.fml.client.registry.RenderingRegistry; -import cpw.mods.fml.common.event.FMLInitializationEvent; -import cpw.mods.fml.common.event.FMLPostInitializationEvent; -import cpw.mods.fml.common.event.FMLPreInitializationEvent; -import cpw.mods.fml.common.registry.VillagerRegistry; import de.ellpeck.actuallyadditions.mod.blocks.render.*; import de.ellpeck.actuallyadditions.mod.blocks.render.model.*; import de.ellpeck.actuallyadditions.mod.config.values.ConfigBoolValues; @@ -30,6 +24,12 @@ import de.ellpeck.actuallyadditions.mod.util.playerdata.PersistentClientData; import net.minecraft.client.Minecraft; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fml.client.registry.ClientRegistry; +import net.minecraftforge.fml.client.registry.RenderingRegistry; +import net.minecraftforge.fml.common.event.FMLInitializationEvent; +import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; +import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; +import net.minecraftforge.fml.common.registry.VillagerRegistry; import java.io.File; import java.util.Calendar; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/proxy/IProxy.java b/src/main/java/de/ellpeck/actuallyadditions/mod/proxy/IProxy.java index 9a78e2dc7..7ad5c04c1 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/proxy/IProxy.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/proxy/IProxy.java @@ -10,9 +10,9 @@ package de.ellpeck.actuallyadditions.mod.proxy; -import cpw.mods.fml.common.event.FMLInitializationEvent; -import cpw.mods.fml.common.event.FMLPostInitializationEvent; -import cpw.mods.fml.common.event.FMLPreInitializationEvent; +import net.minecraftforge.fml.common.event.FMLInitializationEvent; +import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; +import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; public interface IProxy{ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/proxy/ServerProxy.java b/src/main/java/de/ellpeck/actuallyadditions/mod/proxy/ServerProxy.java index 280201a4a..46fe08e15 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/proxy/ServerProxy.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/proxy/ServerProxy.java @@ -10,10 +10,10 @@ package de.ellpeck.actuallyadditions.mod.proxy; -import cpw.mods.fml.common.event.FMLInitializationEvent; -import cpw.mods.fml.common.event.FMLPostInitializationEvent; -import cpw.mods.fml.common.event.FMLPreInitializationEvent; import de.ellpeck.actuallyadditions.mod.util.ModUtil; +import net.minecraftforge.fml.common.event.FMLInitializationEvent; +import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; +import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; @SuppressWarnings("unused") public class ServerProxy implements IProxy{ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/recipe/FuelHandler.java b/src/main/java/de/ellpeck/actuallyadditions/mod/recipe/FuelHandler.java index 69cb9d1ed..dd8cdb85a 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/recipe/FuelHandler.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/recipe/FuelHandler.java @@ -10,8 +10,6 @@ package de.ellpeck.actuallyadditions.mod.recipe; -import cpw.mods.fml.common.IFuelHandler; -import cpw.mods.fml.common.registry.GameRegistry; import de.ellpeck.actuallyadditions.mod.blocks.InitBlocks; import de.ellpeck.actuallyadditions.mod.blocks.metalists.TheMiscBlocks; import de.ellpeck.actuallyadditions.mod.items.InitItems; @@ -20,6 +18,8 @@ import de.ellpeck.actuallyadditions.mod.util.ModUtil; import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraftforge.fml.common.IFuelHandler; +import net.minecraftforge.fml.common.registry.GameRegistry; import org.apache.commons.lang3.tuple.Pair; import java.util.HashMap; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityAtomicReconstructor.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityAtomicReconstructor.java index df63dd939..295f953dc 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityAtomicReconstructor.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityAtomicReconstructor.java @@ -12,9 +12,6 @@ package de.ellpeck.actuallyadditions.mod.tile; import cofh.api.energy.EnergyStorage; import cofh.api.energy.IEnergyReceiver; -import cpw.mods.fml.common.network.NetworkRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import de.ellpeck.actuallyadditions.api.Position; import de.ellpeck.actuallyadditions.api.internal.IAtomicReconstructor; import de.ellpeck.actuallyadditions.api.lens.ILensItem; @@ -29,6 +26,9 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.fml.common.network.NetworkRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class TileEntityAtomicReconstructor extends TileEntityInventoryBase implements IEnergyReceiver, IEnergySaver, IRedstoneToggle, IEnergyDisplay, IAtomicReconstructor{ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityBase.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityBase.java index 24ac027f7..66587be8f 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityBase.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityBase.java @@ -10,7 +10,6 @@ package de.ellpeck.actuallyadditions.mod.tile; -import cpw.mods.fml.common.registry.GameRegistry; import de.ellpeck.actuallyadditions.mod.config.values.ConfigIntValues; import de.ellpeck.actuallyadditions.mod.network.VanillaPacketSyncer; import de.ellpeck.actuallyadditions.mod.util.ModUtil; @@ -21,6 +20,7 @@ import net.minecraft.network.Packet; import net.minecraft.network.play.server.S35PacketUpdateTileEntity; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; +import net.minecraftforge.fml.common.registry.GameRegistry; public abstract class TileEntityBase extends TileEntity{ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCanolaPress.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCanolaPress.java index 642e82d4a..afef8ee91 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCanolaPress.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCanolaPress.java @@ -12,8 +12,6 @@ package de.ellpeck.actuallyadditions.mod.tile; import cofh.api.energy.EnergyStorage; import cofh.api.energy.IEnergyReceiver; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import de.ellpeck.actuallyadditions.mod.blocks.InitBlocks; import de.ellpeck.actuallyadditions.mod.items.InitItems; import de.ellpeck.actuallyadditions.mod.items.metalists.TheMiscItems; @@ -23,6 +21,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.*; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class TileEntityCanolaPress extends TileEntityInventoryBase implements IEnergyReceiver, IFluidHandler, IEnergySaver, IFluidSaver{ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCoalGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCoalGenerator.java index c7abc6359..18d75dd85 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCoalGenerator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCoalGenerator.java @@ -12,13 +12,13 @@ package de.ellpeck.actuallyadditions.mod.tile; import cofh.api.energy.EnergyStorage; import cofh.api.energy.IEnergyProvider; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import de.ellpeck.actuallyadditions.mod.util.WorldUtil; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntityFurnace; import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class TileEntityCoalGenerator extends TileEntityInventoryBase implements IEnergyProvider, IEnergySaver{ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCoffeeMachine.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCoffeeMachine.java index 474a2bd48..ae2282ac6 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCoffeeMachine.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCoffeeMachine.java @@ -12,8 +12,6 @@ package de.ellpeck.actuallyadditions.mod.tile; import cofh.api.energy.EnergyStorage; import cofh.api.energy.IEnergyReceiver; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import de.ellpeck.actuallyadditions.api.recipe.coffee.CoffeeIngredient; import de.ellpeck.actuallyadditions.mod.items.InitItems; import de.ellpeck.actuallyadditions.mod.items.ItemCoffee; @@ -26,6 +24,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.*; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class TileEntityCoffeeMachine extends TileEntityInventoryBase implements IButtonReactor, IEnergyReceiver, IFluidSaver, IFluidHandler, IEnergySaver{ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityDirectionalBreaker.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityDirectionalBreaker.java index a9ea0224c..a99c73b9d 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityDirectionalBreaker.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityDirectionalBreaker.java @@ -12,8 +12,6 @@ package de.ellpeck.actuallyadditions.mod.tile; import cofh.api.energy.EnergyStorage; import cofh.api.energy.IEnergyReceiver; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import de.ellpeck.actuallyadditions.api.Position; import de.ellpeck.actuallyadditions.mod.util.WorldUtil; import net.minecraft.block.Block; @@ -21,6 +19,8 @@ import net.minecraft.block.BlockAir; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import java.util.ArrayList; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityEnergizer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityEnergizer.java index 5fa0a8159..2fdbf37e9 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityEnergizer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityEnergizer.java @@ -13,11 +13,11 @@ package de.ellpeck.actuallyadditions.mod.tile; import cofh.api.energy.EnergyStorage; import cofh.api.energy.IEnergyContainerItem; import cofh.api.energy.IEnergyReceiver; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class TileEntityEnergizer extends TileEntityInventoryBase implements IEnergyReceiver, IEnergySaver{ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityEnervator.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityEnervator.java index 6246344b2..7745377b5 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityEnervator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityEnervator.java @@ -13,12 +13,12 @@ package de.ellpeck.actuallyadditions.mod.tile; import cofh.api.energy.EnergyStorage; import cofh.api.energy.IEnergyContainerItem; import cofh.api.energy.IEnergyProvider; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import de.ellpeck.actuallyadditions.mod.util.WorldUtil; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class TileEntityEnervator extends TileEntityInventoryBase implements IEnergyProvider, IEnergySaver{ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFeeder.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFeeder.java index 94d752215..c53a7e601 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFeeder.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFeeder.java @@ -10,13 +10,13 @@ package de.ellpeck.actuallyadditions.mod.tile; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import de.ellpeck.actuallyadditions.mod.util.Util; import net.minecraft.entity.passive.EntityAnimal; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.AxisAlignedBB; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import java.util.List; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFermentingBarrel.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFermentingBarrel.java index 70c06465e..ffd613b71 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFermentingBarrel.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFermentingBarrel.java @@ -10,8 +10,6 @@ package de.ellpeck.actuallyadditions.mod.tile; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import de.ellpeck.actuallyadditions.mod.blocks.InitBlocks; import de.ellpeck.actuallyadditions.mod.util.WorldUtil; import net.minecraft.init.Items; @@ -19,6 +17,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.*; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class TileEntityFermentingBarrel extends TileEntityInventoryBase implements IFluidHandler, IFluidSaver{ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFireworkBox.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFireworkBox.java index c5a9c907e..2daff36b6 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFireworkBox.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFireworkBox.java @@ -12,8 +12,6 @@ package de.ellpeck.actuallyadditions.mod.tile; import cofh.api.energy.EnergyStorage; import cofh.api.energy.IEnergyReceiver; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import de.ellpeck.actuallyadditions.api.tile.IEnergyDisplay; import de.ellpeck.actuallyadditions.mod.util.Util; import net.minecraft.entity.item.EntityFireworkRocket; @@ -24,6 +22,8 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.util.MathHelper; import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class TileEntityFireworkBox extends TileEntityBase implements IEnergyReceiver, IRedstoneToggle, IEnergyDisplay, IEnergySaver{ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFluidCollector.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFluidCollector.java index 881c2ce01..dd5b7a213 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFluidCollector.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFluidCollector.java @@ -10,8 +10,6 @@ package de.ellpeck.actuallyadditions.mod.tile; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import de.ellpeck.actuallyadditions.api.Position; import de.ellpeck.actuallyadditions.mod.util.WorldUtil; import net.minecraft.block.Block; @@ -20,6 +18,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.*; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class TileEntityFluidCollector extends TileEntityInventoryBase implements IFluidHandler, IFluidSaver, IRedstoneToggle{ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFurnaceDouble.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFurnaceDouble.java index 23bdef8b5..012a91583 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFurnaceDouble.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFurnaceDouble.java @@ -12,12 +12,12 @@ package de.ellpeck.actuallyadditions.mod.tile; import cofh.api.energy.EnergyStorage; import cofh.api.energy.IEnergyReceiver; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.FurnaceRecipes; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class TileEntityFurnaceDouble extends TileEntityInventoryBase implements IEnergyReceiver, IEnergySaver{ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFurnaceSolar.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFurnaceSolar.java index a23286de8..79234d481 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFurnaceSolar.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFurnaceSolar.java @@ -12,12 +12,12 @@ package de.ellpeck.actuallyadditions.mod.tile; import cofh.api.energy.EnergyStorage; import cofh.api.energy.IEnergyProvider; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import de.ellpeck.actuallyadditions.api.tile.IEnergyDisplay; import de.ellpeck.actuallyadditions.mod.util.WorldUtil; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class TileEntityFurnaceSolar extends TileEntityBase implements IEnergyProvider, IEnergySaver, IEnergyDisplay{ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityGrinder.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityGrinder.java index 34aeaca9e..29f560b1b 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityGrinder.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityGrinder.java @@ -13,14 +13,14 @@ package de.ellpeck.actuallyadditions.mod.tile; import cofh.api.energy.EnergyStorage; import cofh.api.energy.IEnergyReceiver; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import de.ellpeck.actuallyadditions.mod.recipe.CrusherRecipeRegistry; import de.ellpeck.actuallyadditions.mod.util.ModUtil; import de.ellpeck.actuallyadditions.mod.util.Util; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import java.util.List; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityHeatCollector.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityHeatCollector.java index 1c1855a72..d1a17a8a7 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityHeatCollector.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityHeatCollector.java @@ -12,8 +12,6 @@ package de.ellpeck.actuallyadditions.mod.tile; import cofh.api.energy.EnergyStorage; import cofh.api.energy.IEnergyProvider; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import de.ellpeck.actuallyadditions.api.Position; import de.ellpeck.actuallyadditions.api.tile.IEnergyDisplay; import de.ellpeck.actuallyadditions.mod.util.Util; @@ -22,6 +20,8 @@ import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import java.util.ArrayList; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityItemRepairer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityItemRepairer.java index a9b99ca18..5e53b3c21 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityItemRepairer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityItemRepairer.java @@ -12,11 +12,11 @@ package de.ellpeck.actuallyadditions.mod.tile; import cofh.api.energy.EnergyStorage; import cofh.api.energy.IEnergyReceiver; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class TileEntityItemRepairer extends TileEntityInventoryBase implements IEnergyReceiver, IEnergySaver{ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLaserRelay.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLaserRelay.java index f66135ba7..4424f4c31 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLaserRelay.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLaserRelay.java @@ -11,8 +11,6 @@ package de.ellpeck.actuallyadditions.mod.tile; import cofh.api.energy.IEnergyReceiver; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import de.ellpeck.actuallyadditions.api.Position; import de.ellpeck.actuallyadditions.mod.config.values.ConfigBoolValues; import de.ellpeck.actuallyadditions.mod.config.values.ConfigIntValues; @@ -27,6 +25,8 @@ import net.minecraft.network.NetworkManager; import net.minecraft.network.Packet; import net.minecraft.network.play.server.S35PacketUpdateTileEntity; import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class TileEntityLaserRelay extends TileEntityBase implements IEnergyReceiver{ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLavaFactoryController.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLavaFactoryController.java index 42a07c10a..181f8de5f 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLavaFactoryController.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLavaFactoryController.java @@ -12,8 +12,6 @@ package de.ellpeck.actuallyadditions.mod.tile; import cofh.api.energy.EnergyStorage; import cofh.api.energy.IEnergyReceiver; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import de.ellpeck.actuallyadditions.api.tile.IEnergyDisplay; import de.ellpeck.actuallyadditions.mod.blocks.InitBlocks; import de.ellpeck.actuallyadditions.mod.blocks.metalists.TheMiscBlocks; @@ -21,6 +19,8 @@ import de.ellpeck.actuallyadditions.mod.util.WorldUtil; import net.minecraft.init.Blocks; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class TileEntityLavaFactoryController extends TileEntityBase implements IEnergyReceiver, IEnergySaver, IEnergyDisplay{ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLeafGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLeafGenerator.java index edba85251..de36d2910 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLeafGenerator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLeafGenerator.java @@ -12,9 +12,6 @@ package de.ellpeck.actuallyadditions.mod.tile; import cofh.api.energy.EnergyStorage; import cofh.api.energy.IEnergyProvider; -import cpw.mods.fml.common.network.NetworkRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import de.ellpeck.actuallyadditions.api.Position; import de.ellpeck.actuallyadditions.api.tile.IEnergyDisplay; import de.ellpeck.actuallyadditions.mod.network.PacketHandler; @@ -23,6 +20,9 @@ import de.ellpeck.actuallyadditions.mod.util.WorldUtil; import net.minecraft.block.Block; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.fml.common.network.NetworkRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import java.util.ArrayList; import java.util.Collections; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityMiner.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityMiner.java index bef5ae9cf..f5f43c4af 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityMiner.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityMiner.java @@ -12,9 +12,6 @@ package de.ellpeck.actuallyadditions.mod.tile; import cofh.api.energy.EnergyStorage; import cofh.api.energy.IEnergyReceiver; -import cpw.mods.fml.common.network.NetworkRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import de.ellpeck.actuallyadditions.api.tile.IEnergyDisplay; import de.ellpeck.actuallyadditions.mod.config.ConfigValues; import de.ellpeck.actuallyadditions.mod.network.PacketHandler; @@ -28,6 +25,9 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.IFluidBlock; +import net.minecraftforge.fml.common.network.NetworkRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.oredict.OreDictionary; import java.util.ArrayList; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityOilGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityOilGenerator.java index c34d821b9..53a5715b9 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityOilGenerator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityOilGenerator.java @@ -12,14 +12,14 @@ package de.ellpeck.actuallyadditions.mod.tile; import cofh.api.energy.EnergyStorage; import cofh.api.energy.IEnergyProvider; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import de.ellpeck.actuallyadditions.mod.blocks.InitBlocks; import de.ellpeck.actuallyadditions.mod.util.WorldUtil; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.*; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class TileEntityOilGenerator extends TileEntityInventoryBase implements IEnergyProvider, IFluidHandler, IEnergySaver, IFluidSaver{ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomEnergyface.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomEnergyface.java index f29374bdf..4e39ebbbb 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomEnergyface.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomEnergyface.java @@ -13,10 +13,11 @@ package de.ellpeck.actuallyadditions.mod.tile; import cofh.api.energy.IEnergyHandler; import cofh.api.energy.IEnergyProvider; import cofh.api.energy.IEnergyReceiver; +import de.ellpeck.actuallyadditions.api.Position; import de.ellpeck.actuallyadditions.mod.blocks.BlockPhantom; import de.ellpeck.actuallyadditions.mod.util.WorldUtil; import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; public class TileEntityPhantomEnergyface extends TileEntityPhantomface implements IEnergyHandler{ @@ -26,17 +27,17 @@ public class TileEntityPhantomEnergyface extends TileEntityPhantomface implement } @Override - public int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate){ + public int receiveEnergy(EnumFacing from, int maxReceive, boolean simulate){ return this.isBoundThingInRange() && this.getReceiver() != null ? this.getReceiver().receiveEnergy(from, maxReceive, simulate) : 0; } @Override - public int extractEnergy(ForgeDirection from, int maxExtract, boolean simulate){ + public int extractEnergy(EnumFacing from, int maxExtract, boolean simulate){ return this.isBoundThingInRange() && this.getProvider() != null ? this.getProvider().extractEnergy(from, maxExtract, simulate) : 0; } @Override - public int getEnergyStored(ForgeDirection from){ + public int getEnergyStored(EnumFacing from){ if(this.isBoundThingInRange()){ if(this.getProvider() != null){ return this.getProvider().getEnergyStored(from); @@ -49,7 +50,7 @@ public class TileEntityPhantomEnergyface extends TileEntityPhantomface implement } @Override - public int getMaxEnergyStored(ForgeDirection from){ + public int getMaxEnergyStored(EnumFacing from){ if(this.isBoundThingInRange()){ if(this.getProvider() != null){ return this.getProvider().getMaxEnergyStored(from); @@ -63,7 +64,7 @@ public class TileEntityPhantomEnergyface extends TileEntityPhantomface implement public IEnergyProvider getProvider(){ if(this.boundPosition != null){ - TileEntity tile = worldObj.getTileEntity(boundPosition.getX(), boundPosition.getY(), boundPosition.getZ()); + TileEntity tile = worldObj.getTileEntity(boundPosition.toBlockPos()); if(tile instanceof IEnergyProvider){ return (IEnergyProvider)tile; } @@ -73,7 +74,7 @@ public class TileEntityPhantomEnergyface extends TileEntityPhantomface implement public IEnergyReceiver getReceiver(){ if(this.boundPosition != null){ - TileEntity tile = worldObj.getTileEntity(boundPosition.getX(), boundPosition.getY(), boundPosition.getZ()); + TileEntity tile = worldObj.getTileEntity(boundPosition.toBlockPos()); if(tile instanceof IEnergyReceiver){ return (IEnergyReceiver)tile; } @@ -87,12 +88,12 @@ public class TileEntityPhantomEnergyface extends TileEntityPhantomface implement if(!worldObj.isRemote){ if(this.isBoundThingInRange() && this.getProvider() != null){ - this.pushEnergy(ForgeDirection.UP); - this.pushEnergy(ForgeDirection.DOWN); - this.pushEnergy(ForgeDirection.NORTH); - this.pushEnergy(ForgeDirection.EAST); - this.pushEnergy(ForgeDirection.SOUTH); - this.pushEnergy(ForgeDirection.WEST); + this.pushEnergy(EnumFacing.UP); + this.pushEnergy(EnumFacing.DOWN); + this.pushEnergy(EnumFacing.NORTH); + this.pushEnergy(EnumFacing.EAST); + this.pushEnergy(EnumFacing.SOUTH); + this.pushEnergy(EnumFacing.WEST); } } } @@ -102,11 +103,11 @@ public class TileEntityPhantomEnergyface extends TileEntityPhantomface implement return super.isBoundThingInRange() && (worldObj.getTileEntity(boundPosition.getX(), boundPosition.getY(), boundPosition.getZ()) instanceof IEnergyReceiver || worldObj.getTileEntity(boundPosition.getX(), boundPosition.getY(), boundPosition.getZ()) instanceof IEnergyProvider); } - private void pushEnergy(ForgeDirection side){ - TileEntity tile = WorldUtil.getTileEntityFromSide(side, worldObj, xCoord, yCoord, zCoord); - if(tile != null && tile instanceof IEnergyReceiver && this.getProvider().getEnergyStored(ForgeDirection.UNKNOWN) > 0){ + private void pushEnergy(EnumFacing side){ + TileEntity tile = WorldUtil.getTileEntityFromSide(side, worldObj, Position.fromTileEntity(this)); + if(tile != null && tile instanceof IEnergyReceiver && this.getProvider().getEnergyStored(side.getOpposite()) > 0){ if(((IEnergyReceiver)tile).canConnectEnergy(side.getOpposite()) && this.canConnectEnergy(side)){ - int receive = this.extractEnergy(side, Math.min(((IEnergyReceiver)tile).getMaxEnergyStored(ForgeDirection.UNKNOWN)-((IEnergyReceiver)tile).getEnergyStored(ForgeDirection.UNKNOWN), this.getEnergyStored(ForgeDirection.UNKNOWN)), true); + int receive = this.extractEnergy(side, Math.min(((IEnergyReceiver)tile).getMaxEnergyStored(side.getOpposite())-((IEnergyReceiver)tile).getEnergyStored(side.getOpposite()), this.getEnergyStored(side)), true); int actualReceive = ((IEnergyReceiver)tile).receiveEnergy(side.getOpposite(), receive, false); this.extractEnergy(side, actualReceive, false); } @@ -114,7 +115,7 @@ public class TileEntityPhantomEnergyface extends TileEntityPhantomface implement } @Override - public boolean canConnectEnergy(ForgeDirection from){ + public boolean canConnectEnergy(EnumFacing from){ if(this.isBoundThingInRange()){ if(this.getProvider() != null){ return this.getProvider().canConnectEnergy(from); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomPlacer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomPlacer.java index 50eba8341..8c04c5328 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomPlacer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomPlacer.java @@ -10,8 +10,6 @@ package de.ellpeck.actuallyadditions.mod.tile; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import de.ellpeck.actuallyadditions.api.Position; import de.ellpeck.actuallyadditions.api.tile.IPhantomTile; import de.ellpeck.actuallyadditions.mod.inventory.GuiHandler; @@ -23,6 +21,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.Vec3; import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import java.util.ArrayList; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomface.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomface.java index 869af8fb0..3882d7863 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomface.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomface.java @@ -10,8 +10,6 @@ package de.ellpeck.actuallyadditions.mod.tile; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import de.ellpeck.actuallyadditions.api.Position; import de.ellpeck.actuallyadditions.api.tile.IPhantomTile; import de.ellpeck.actuallyadditions.mod.blocks.BlockPhantom; @@ -23,6 +21,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.Vec3; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class TileEntityPhantomface extends TileEntityInventoryBase implements IPhantomTile{ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntitySmileyCloud.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntitySmileyCloud.java index a1ebe1825..e3569d266 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntitySmileyCloud.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntitySmileyCloud.java @@ -10,11 +10,11 @@ package de.ellpeck.actuallyadditions.mod.tile; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import de.ellpeck.actuallyadditions.mod.network.gui.IStringReactor; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import java.util.Objects; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/update/UpdateCheckerClientNotificationEvent.java b/src/main/java/de/ellpeck/actuallyadditions/mod/update/UpdateCheckerClientNotificationEvent.java index 5b321bbe9..483c430dc 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/update/UpdateCheckerClientNotificationEvent.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/update/UpdateCheckerClientNotificationEvent.java @@ -10,13 +10,13 @@ package de.ellpeck.actuallyadditions.mod.update; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.gameevent.TickEvent; import de.ellpeck.actuallyadditions.mod.util.ModUtil; import de.ellpeck.actuallyadditions.mod.util.StringUtil; import net.minecraft.client.Minecraft; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.IChatComponent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.gameevent.TickEvent; public class UpdateCheckerClientNotificationEvent{ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/util/AssetUtil.java b/src/main/java/de/ellpeck/actuallyadditions/mod/util/AssetUtil.java index 8ce53337a..061ee263b 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/util/AssetUtil.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/util/AssetUtil.java @@ -10,18 +10,21 @@ package de.ellpeck.actuallyadditions.mod.util; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import de.ellpeck.actuallyadditions.mod.booklet.GuiBooklet; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; -import net.minecraft.client.renderer.*; +import net.minecraft.client.renderer.ItemRenderer; +import net.minecraft.client.renderer.OpenGlHelper; +import net.minecraft.client.renderer.RenderHelper; +import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/util/CompatUtil.java b/src/main/java/de/ellpeck/actuallyadditions/mod/util/CompatUtil.java index b3628afc9..b15b83d4d 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/util/CompatUtil.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/util/CompatUtil.java @@ -10,12 +10,12 @@ package de.ellpeck.actuallyadditions.mod.util; -import cpw.mods.fml.common.event.FMLInterModComms; import de.ellpeck.actuallyadditions.mod.items.ItemSeed; import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraftforge.fml.common.event.FMLInterModComms; public class CompatUtil{ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/util/Util.java b/src/main/java/de/ellpeck/actuallyadditions/mod/util/Util.java index 119674142..c2fda193c 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/util/Util.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/util/Util.java @@ -10,7 +10,6 @@ package de.ellpeck.actuallyadditions.mod.util; -import cpw.mods.fml.common.FMLCommonHandler; import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI; import de.ellpeck.actuallyadditions.api.recipe.CrusherRecipe; import de.ellpeck.actuallyadditions.api.recipe.LensNoneRecipe; @@ -23,6 +22,7 @@ import net.minecraft.item.crafting.IRecipe; import net.minecraft.util.EnumChatFormatting; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.util.EnumHelper; +import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.oredict.OreDictionary; import java.util.List; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/util/WorldUtil.java b/src/main/java/de/ellpeck/actuallyadditions/mod/util/WorldUtil.java index 3cbf8c8df..e571d55e2 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/util/WorldUtil.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/util/WorldUtil.java @@ -28,6 +28,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.network.play.client.C07PacketPlayerDigging; import net.minecraft.network.play.server.S23PacketBlockChange; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumFacing; import net.minecraft.util.MathHelper; import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.Vec3; @@ -35,49 +36,29 @@ import net.minecraft.world.World; import net.minecraft.world.WorldServer; import net.minecraftforge.common.ForgeHooks; import net.minecraftforge.common.IPlantable; -import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.event.world.BlockEvent; import net.minecraftforge.fluids.*; import java.util.ArrayList; public class WorldUtil{ - /** - * Vertical Directions in Order: - * Up, Down - */ - public static final ForgeDirection[] VERTICAL_DIRECTIONS_ORDER = new ForgeDirection[]{ForgeDirection.UP, ForgeDirection.DOWN}; - /** - * Cardinal Directions in Order: - * North, East, South, West - */ - public static final ForgeDirection[] CARDINAL_DIRECTIONS_ORDER = new ForgeDirection[]{ForgeDirection.NORTH, ForgeDirection.EAST, ForgeDirection.SOUTH, ForgeDirection.WEST}; - - public static void breakBlockAtSide(ForgeDirection side, World world, int x, int y, int z){ - breakBlockAtSide(side, world, x, y, z, 0); + public static void breakBlockAtSide(EnumFacing side, World world, Position pos){ + breakBlockAtSide(side, world, pos, 0); } - public static void breakBlockAtSide(ForgeDirection side, World world, int x, int y, int z, int offset){ - if(side == ForgeDirection.UNKNOWN){ - world.setBlockToAir(x, y, z); - return; - } - Position c = getCoordsFromSide(side, x, y, z, offset); + public static void breakBlockAtSide(EnumFacing side, World world, Position pos, int offset){ + Position c = getCoordsFromSide(side, pos, offset); if(c != null){ - world.setBlockToAir(c.getX(), c.getY(), c.getZ()); + world.setBlockToAir(pos.toBlockPos()); } } - public static Position getCoordsFromSide(ForgeDirection side, int x, int y, int z, int offset){ - if(side == ForgeDirection.UNKNOWN){ - return null; - } - return new Position(x+side.offsetX*(offset+1), y+side.offsetY*(offset+1), z+side.offsetZ*(offset+1)); + public static Position getCoordsFromSide(EnumFacing side, Position pos, int offset){ + return new Position(pos.getX()+side.getFrontOffsetX()*(offset+1), pos.getY()+side.getFrontOffsetY()*(offset+1), pos.getZ()+side.getFrontOffsetZ()*(offset+1)); } - public static void pushEnergy(World world, int x, int y, int z, ForgeDirection side, EnergyStorage storage){ - TileEntity tile = getTileEntityFromSide(side, world, x, y, z); + public static void pushEnergy(World world, Position pos, EnumFacing side, EnergyStorage storage){ + TileEntity tile = getTileEntityFromSide(side, world, pos); if(tile != null && tile instanceof IEnergyReceiver && storage.getEnergyStored() > 0){ if(((IEnergyReceiver)tile).canConnectEnergy(side.getOpposite())){ int receive = ((IEnergyReceiver)tile).receiveEnergy(side.getOpposite(), Math.min(storage.getMaxExtract(), storage.getEnergyStored()), false); @@ -86,10 +67,10 @@ public class WorldUtil{ } } - public static TileEntity getTileEntityFromSide(ForgeDirection side, World world, int x, int y, int z){ - Position c = getCoordsFromSide(side, x, y, z, 0); + public static TileEntity getTileEntityFromSide(EnumFacing side, World world, Position pos){ + Position c = getCoordsFromSide(side, pos, 0); if(c != null){ - return world.getTileEntity(c.getX(), c.getY(), c.getZ()); + return world.getTileEntity(pos.toBlockPos()); } return null; } @@ -97,26 +78,23 @@ public class WorldUtil{ /** * Checks if a given Block with a given Meta is present in given Positions * - * @param positions The Positions, an array of {xCoord, yCoord, zCoord} arrays containing RELATIVE Positions + * @param positions The Positions, an array of {xCoord, yCoord, zCoord} arrays containing Positions * @param block The Block * @param meta The Meta * @param world The World - * @param x The Start X Coord - * @param y The Start Y Coord - * @param z The Start Z Coord * @return Is every block present? */ - public static boolean hasBlocksInPlacesGiven(int[][] positions, Block block, int meta, World world, int x, int y, int z){ - for(int[] xYZ : positions){ - if(!(world.getBlock(x+xYZ[0], y+xYZ[1], z+xYZ[2]) == block && world.getBlockMetadata(x+xYZ[0], y+xYZ[1], z+xYZ[2]) == meta)){ + public static boolean hasBlocksInPlacesGiven(Position[] positions, Block block, int meta, World world){ + for(Position pos : positions){ + if(!(pos.getBlock(world) == block && pos.getMetadata(world) == meta)){ return false; } } return true; } - public static void pushFluid(World world, int x, int y, int z, ForgeDirection side, FluidTank tank){ - TileEntity tile = getTileEntityFromSide(side, world, x, y, z); + public static void pushFluid(World world, Position pos, EnumFacing side, FluidTank tank){ + TileEntity tile = getTileEntityFromSide(side, world, pos); if(tile != null && tank.getFluid() != null && tile instanceof IFluidHandler){ if(((IFluidHandler)tile).canFill(side.getOpposite(), tank.getFluid().getFluid())){ int receive = ((IFluidHandler)tile).fill(side.getOpposite(), tank.getFluid(), true); @@ -125,15 +103,16 @@ public class WorldUtil{ } } - public static ItemStack placeBlockAtSide(ForgeDirection side, World world, int x, int y, int z, ItemStack stack){ + public static ItemStack placeBlockAtSide(EnumFacing side, World world, Position pos, ItemStack stack){ if(world instanceof WorldServer && stack != null && stack.getItem() != null){ + Position offsetPos = pos.getOffsetPosition(side); //Fluids FluidStack fluid = FluidContainerRegistry.getFluidForFilledItem(stack); - if(fluid != null && fluid.getFluid().getBlock() != null && fluid.getFluid().getBlock().canPlaceBlockAt(world, x+side.offsetX, y+side.offsetY, z+side.offsetZ)){ - Block block = world.getBlock(x+side.offsetX, y+side.offsetY, z+side.offsetZ); + if(fluid != null && fluid.getFluid().getBlock() != null && fluid.getFluid().getBlock().canPlaceBlockAt(world, offsetPos.toBlockPos())){ + Block block = offsetPos.getBlock(world); if(!(block instanceof IFluidBlock) && block != Blocks.lava && block != Blocks.water && block != Blocks.flowing_lava && block != Blocks.flowing_water){ - if(world.setBlock(x+side.offsetX, y+side.offsetY, z+side.offsetZ, fluid.getFluid().getBlock())){ + if(offsetPos.setBlock(world, fluid.getFluid().getBlock(), 0, 2)){ return stack.getItem().getContainerItem(stack); } } @@ -141,14 +120,14 @@ public class WorldUtil{ //Redstone else if(stack.getItem() == Items.redstone){ - world.setBlock(x+side.offsetX, y+side.offsetY, z+side.offsetZ, Blocks.redstone_wire); + offsetPos.setBlock(world, Blocks.redstone_wire, 0, 2); stack.stackSize--; } //Plants else if(stack.getItem() instanceof IPlantable){ - if(((IPlantable)stack.getItem()).getPlant(world, x, y, z).canPlaceBlockAt(world, x+side.offsetX, y+side.offsetY, z+side.offsetZ)){ - if(world.setBlock(x+side.offsetX, y+side.offsetY, z+side.offsetZ, ((IPlantable)stack.getItem()).getPlant(world, x, y, z))){ + if(((IPlantable)stack.getItem()).getPlant(world, offsetPos.toBlockPos()).getBlock().canPlaceBlockAt(world, offsetPos.toBlockPos())){ + if(offsetPos.setBlockState(world, ((IPlantable)stack.getItem()).getPlant(world, offsetPos.toBlockPos()), 0, 2)){ stack.stackSize--; } } @@ -156,29 +135,26 @@ public class WorldUtil{ else{ try{ //Blocks - stack.tryPlaceItemIntoWorld(FakePlayerUtil.getFakePlayer(world), world, x, y, z, side == ForgeDirection.UNKNOWN ? 0 : side.ordinal(), 0, 0, 0); + stack.onItemUse(FakePlayerUtil.getFakePlayer(world), world, pos.toBlockPos(), side, 0, 0, 0); return stack; } catch(Exception e){ - ModUtil.LOGGER.error("Something that places Blocks at "+x+", "+y+", "+z+" in World "+world.provider.dimensionId+" threw an Exception! Don't let that happen again!"); + ModUtil.LOGGER.error("Something that places Blocks at "+offsetPos.getX()+", "+offsetPos.getY()+", "+offsetPos.getZ()+" in World "+world.provider.getDimensionId()+" threw an Exception! Don't let that happen again!"); } } } return stack; } - public static boolean dropItemAtSide(ForgeDirection side, World world, int x, int y, int z, ItemStack stack){ - if(side != ForgeDirection.UNKNOWN){ - Position coords = getCoordsFromSide(side, x, y, z, 0); - if(coords != null){ - EntityItem item = new EntityItem(world, coords.getX()+0.5, coords.getY()+0.5, coords.getZ()+0.5, stack); - item.motionX = 0; - item.motionY = 0; - item.motionZ = 0; - world.spawnEntityInWorld(item); - } + public static void dropItemAtSide(EnumFacing side, World world, Position pos, ItemStack stack){ + Position coords = getCoordsFromSide(side, pos, 0); + if(coords != null){ + EntityItem item = new EntityItem(world, coords.getX()+0.5, coords.getY()+0.5, coords.getZ()+0.5, stack); + item.motionX = 0; + item.motionY = 0; + item.motionZ = 0; + world.spawnEntityInWorld(item); } - return false; } public static void fillBucket(FluidTank tank, ItemStack[] slots, int inputSlot, int outputSlot){ @@ -231,30 +207,34 @@ public class WorldUtil{ } } - public static ForgeDirection getDirectionBySidesInOrder(int side){ - if(side >= 0 && side < VERTICAL_DIRECTIONS_ORDER.length+CARDINAL_DIRECTIONS_ORDER.length){ - if(side < VERTICAL_DIRECTIONS_ORDER.length){ - return VERTICAL_DIRECTIONS_ORDER[side]; - } - else{ - return CARDINAL_DIRECTIONS_ORDER[side-VERTICAL_DIRECTIONS_ORDER.length]; - } + public static EnumFacing getDirectionBySidesInOrder(int side){ + switch(side){ + case 0: + return EnumFacing.UP; + case 1: + return EnumFacing.DOWN; + case 2: + return EnumFacing.NORTH; + case 3: + return EnumFacing.EAST; + case 4: + return EnumFacing.SOUTH; + default: + return EnumFacing.WEST; } - return ForgeDirection.UNKNOWN; } - public static ArrayList getMaterialsAround(World world, int x, int y, int z){ + public static ArrayList getMaterialsAround(World world, Position pos){ ArrayList blocks = new ArrayList(); - blocks.add(world.getBlock(x+1, y, z).getMaterial()); - blocks.add(world.getBlock(x-1, y, z).getMaterial()); - blocks.add(world.getBlock(x, y, z+1).getMaterial()); - blocks.add(world.getBlock(x, y, z-1).getMaterial()); - + blocks.add(pos.getOffsetPosition(EnumFacing.NORTH).getMaterial(world)); + blocks.add(pos.getOffsetPosition(EnumFacing.EAST).getMaterial(world)); + blocks.add(pos.getOffsetPosition(EnumFacing.SOUTH).getMaterial(world)); + blocks.add(pos.getOffsetPosition(EnumFacing.WEST).getMaterial(world)); return blocks; } public static boolean addToInventory(IInventory inventory, int start, int end, ArrayList stacks, boolean actuallyDo){ - return addToInventory(inventory, start, end, stacks, ForgeDirection.UNKNOWN, actuallyDo); + return addToInventory(inventory, start, end, stacks, EnumFacing.UP, actuallyDo, true); } /** @@ -262,11 +242,11 @@ public class WorldUtil{ * * @param inventory The inventory to try to put the items into * @param stacks The stacks to be put into the slots (Items don't actually get removed from there!) - * @param side The side to input from (use UNKNOWN if it should always work) + * @param side The side to input from * @param actuallyDo Do it or just test if it works? * @return Does it work? */ - public static boolean addToInventory(IInventory inventory, int start, int end, ArrayList stacks, ForgeDirection side, boolean actuallyDo){ + public static boolean addToInventory(IInventory inventory, int start, int end, ArrayList stacks, EnumFacing side, boolean actuallyDo, boolean shouldAlwaysWork){ //Copy the slots if just testing to later load them again ItemStack[] backupSlots = null; if(!actuallyDo){ @@ -282,7 +262,7 @@ public class WorldUtil{ int working = 0; for(ItemStack stackToPutIn : stacks){ for(int i = start; i < end; i++){ - if(side == ForgeDirection.UNKNOWN || ((!(inventory instanceof ISidedInventory) || ((ISidedInventory)inventory).canInsertItem(i, stackToPutIn, side.ordinal())) && inventory.isItemValidForSlot(i, stackToPutIn))){ + if(shouldAlwaysWork || ((!(inventory instanceof ISidedInventory) || ((ISidedInventory)inventory).canInsertItem(i, stackToPutIn, side)) && inventory.isItemValidForSlot(i, stackToPutIn))){ ItemStack stackInQuestion = inventory.getStackInSlot(i); if(stackToPutIn != null && (stackInQuestion == null || (stackInQuestion.isItemEqual(stackToPutIn) && stackInQuestion.getMaxStackSize() >= stackInQuestion.stackSize+stackToPutIn.stackSize))){ if(stackInQuestion == null){ @@ -310,11 +290,11 @@ public class WorldUtil{ } public static boolean addToInventory(IInventory inventory, ArrayList stacks, boolean actuallyDo){ - return addToInventory(inventory, stacks, ForgeDirection.UNKNOWN, actuallyDo); + return addToInventory(inventory, stacks, EnumFacing.UP, actuallyDo); } - public static boolean addToInventory(IInventory inventory, ArrayList stacks, ForgeDirection side, boolean actuallyDo){ - return addToInventory(inventory, 0, inventory.getSizeInventory(), stacks, side, actuallyDo); + public static boolean addToInventory(IInventory inventory, ArrayList stacks, EnumFacing side, boolean actuallyDo){ + return addToInventory(inventory, 0, inventory.getSizeInventory(), stacks, side, actuallyDo, false); } public static int findFirstFilledSlot(ItemStack[] slots){ @@ -337,7 +317,7 @@ public class WorldUtil{ double d0 = player.prevPosX+(player.posX-player.prevPosX)*(double)f; double d1 = player.prevPosY+(player.posY-player.prevPosY)*(double)f+(double)(world.isRemote ? player.getEyeHeight()-player.getDefaultEyeHeight() : player.getEyeHeight()); double d2 = player.prevPosZ+(player.posZ-player.prevPosZ)*(double)f; - Vec3 vec3 = Vec3.createVectorHelper(d0, d1, d2); + Vec3 vec3 = new Vec3(d0, d1, d2); float f3 = MathHelper.cos(-f2*0.017453292F-(float)Math.PI); float f4 = MathHelper.sin(-f2*0.017453292F-(float)Math.PI); float f5 = -MathHelper.cos(-f1*0.017453292F); @@ -345,7 +325,7 @@ public class WorldUtil{ float f7 = f4*f5; float f8 = f3*f5; Vec3 vec31 = vec3.addVector((double)f7*distance, (double)f6*distance, (double)f8*distance); - return world.func_147447_a(vec3, vec31, p1, p2, p3); + return world.rayTraceBlocks(vec3, vec31, p1, p2, p3); } public static MovingObjectPosition getNearestBlockWithDefaultReachDistance(World world, EntityPlayer player){ @@ -356,51 +336,48 @@ public class WorldUtil{ * Harvests a Block by a Player * * @param world The World - * @param xPos The X Coordinate - * @param yPos The Y Coordinate - * @param zPos The Z Coordinate * @param player The Player * @return If the Block could be harvested normally (so that it drops an item) */ - public static boolean playerHarvestBlock(World world, int xPos, int yPos, int zPos, EntityPlayer player){ - Block block = world.getBlock(xPos, yPos, zPos); - int meta = world.getBlockMetadata(xPos, yPos, zPos); + public static boolean playerHarvestBlock(World world, Position pos, EntityPlayer player){ + Block block = pos.getBlock(world); + int meta = pos.getMetadata(world); //If the Block can be harvested or not - boolean canHarvest = block.canHarvestBlock(player, meta); + boolean canHarvest = block.canHarvestBlock(world, pos.toBlockPos(), player); //Send Block Breaking Event if(player instanceof EntityPlayerMP){ - BlockEvent.BreakEvent event = ForgeHooks.onBlockBreakEvent(world, ((EntityPlayerMP)player).theItemInWorldManager.getGameType(), (EntityPlayerMP)player, xPos, yPos, zPos); - if(event.isCanceled()){ + int event = ForgeHooks.onBlockBreakEvent(world, ((EntityPlayerMP)player).theItemInWorldManager.getGameType(), (EntityPlayerMP)player, pos.toBlockPos()); + if(event == -1){ return false; } } if(!world.isRemote){ //Server-Side only, special cases - block.onBlockHarvested(world, xPos, yPos, zPos, meta, player); + block.onBlockHarvested(world, pos.toBlockPos(), pos.getBlockState(world), player); } else{ //Shows the Harvest Particles and plays the Block's Sound - world.playAuxSFX(2001, xPos, yPos, zPos, Block.getIdFromBlock(block)+(meta << 12)); + world.playAuxSFX(2001, pos.toBlockPos(), Block.getIdFromBlock(block)+(meta << 12)); } //If the Block was actually "removed", meaning it will drop an Item - boolean removed = block.removedByPlayer(world, player, xPos, yPos, zPos, canHarvest); + boolean removed = block.removedByPlayer(world, pos.toBlockPos(), player, canHarvest); //Actually removes the Block from the World if(removed){ //Before the Block is destroyed, special cases - block.onBlockDestroyedByPlayer(world, xPos, yPos, zPos, meta); + block.onBlockDestroyedByPlayer(world, pos.toBlockPos(), pos.getBlockState(world)); if(!world.isRemote && !player.capabilities.isCreativeMode){ //Actually drops the Block's Items etc. if(canHarvest){ - block.harvestBlock(world, player, xPos, yPos, zPos, meta); + block.harvestBlock(world, player, pos.toBlockPos(), pos.getBlockState(world), pos.getTileEntity(world)); } //Only drop XP when no Silk Touch is applied if(!EnchantmentHelper.getSilkTouchModifier(player)){ //Drop XP depending on Fortune Level - block.dropXpOnBlockBreak(world, xPos, yPos, zPos, block.getExpDrop(world, meta, EnchantmentHelper.getFortuneModifier(player))); + block.dropXpOnBlockBreak(world, pos.toBlockPos(), block.getExpDrop(world, pos.toBlockPos(), EnchantmentHelper.getFortuneModifier(player))); } } } @@ -408,12 +385,13 @@ public class WorldUtil{ if(!world.isRemote){ //Update the Client of a Block Change if(player instanceof EntityPlayerMP){ - ((EntityPlayerMP)player).playerNetServerHandler.sendPacket(new S23PacketBlockChange(xPos, yPos, zPos, world)); + ((EntityPlayerMP)player).playerNetServerHandler.sendPacket(new S23PacketBlockChange(world, pos.toBlockPos())); } } else{ //Check the Server if a Block that changed on the Client really changed, if not, revert the change - Minecraft.getMinecraft().getNetHandler().addToSendQueue(new C07PacketPlayerDigging(2, xPos, yPos, zPos, Minecraft.getMinecraft().objectMouseOver.sideHit)); + //TODO Check if this is the right action + Minecraft.getMinecraft().getNetHandler().addToSendQueue(new C07PacketPlayerDigging(C07PacketPlayerDigging.Action.START_DESTROY_BLOCK, pos.toBlockPos(), Minecraft.getMinecraft().objectMouseOver.sideHit)); } return removed; } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/util/playerdata/PersistentClientData.java b/src/main/java/de/ellpeck/actuallyadditions/mod/util/playerdata/PersistentClientData.java index 10e0ce3da..1e8c97fb7 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/util/playerdata/PersistentClientData.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/util/playerdata/PersistentClientData.java @@ -10,8 +10,6 @@ package de.ellpeck.actuallyadditions.mod.util.playerdata; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import de.ellpeck.actuallyadditions.api.internal.EntrySet; import de.ellpeck.actuallyadditions.mod.booklet.BookletUtils; import de.ellpeck.actuallyadditions.mod.booklet.GuiBooklet; @@ -21,6 +19,8 @@ import net.minecraft.client.Minecraft; import net.minecraft.nbt.CompressedStreamTools; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import java.io.File; import java.io.FileInputStream;