diff --git a/src/main/java/de/ellpeck/actuallyadditions/booklet/button/BookmarkButton.java b/src/main/java/de/ellpeck/actuallyadditions/booklet/button/BookmarkButton.java index 049ce41c1..c02bf2092 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/booklet/button/BookmarkButton.java +++ b/src/main/java/de/ellpeck/actuallyadditions/booklet/button/BookmarkButton.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.common.booklet.button; +package de.ellpeck.actuallyadditions.booklet.button; import java.util.ArrayList; import java.util.List; @@ -6,9 +6,9 @@ import java.util.List; import de.ellpeck.actuallyadditions.api.booklet.IBookletChapter; import de.ellpeck.actuallyadditions.api.booklet.IBookletPage; import de.ellpeck.actuallyadditions.common.ActuallyAdditions; -import de.ellpeck.actuallyadditions.common.booklet.gui.GuiBooklet; -import de.ellpeck.actuallyadditions.common.booklet.gui.GuiPage; -import de.ellpeck.actuallyadditions.common.booklet.misc.BookletUtils; +import de.ellpeck.actuallyadditions.booklet.gui.GuiBooklet; +import de.ellpeck.actuallyadditions.booklet.gui.GuiPage; +import de.ellpeck.actuallyadditions.booklet.misc.BookletUtils; import de.ellpeck.actuallyadditions.common.util.AssetUtil; import de.ellpeck.actuallyadditions.common.util.StackUtil; import de.ellpeck.actuallyadditions.common.util.StringUtil; diff --git a/src/main/java/de/ellpeck/actuallyadditions/booklet/button/EntryButton.java b/src/main/java/de/ellpeck/actuallyadditions/booklet/button/EntryButton.java index 64c2d0dda..39c539593 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/booklet/button/EntryButton.java +++ b/src/main/java/de/ellpeck/actuallyadditions/booklet/button/EntryButton.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.common.booklet.button; +package de.ellpeck.actuallyadditions.booklet.button; import de.ellpeck.actuallyadditions.api.booklet.internal.GuiBookletBase; import de.ellpeck.actuallyadditions.common.util.AssetUtil; diff --git a/src/main/java/de/ellpeck/actuallyadditions/booklet/button/TrialsButton.java b/src/main/java/de/ellpeck/actuallyadditions/booklet/button/TrialsButton.java index b823fadc9..24c09760a 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/booklet/button/TrialsButton.java +++ b/src/main/java/de/ellpeck/actuallyadditions/booklet/button/TrialsButton.java @@ -1,7 +1,7 @@ -package de.ellpeck.actuallyadditions.common.booklet.button; +package de.ellpeck.actuallyadditions.booklet.button; import de.ellpeck.actuallyadditions.common.ActuallyAdditions; -import de.ellpeck.actuallyadditions.common.booklet.gui.GuiBooklet; +import de.ellpeck.actuallyadditions.booklet.gui.GuiBooklet; import de.ellpeck.actuallyadditions.common.inventory.gui.TexturedButton; import de.ellpeck.actuallyadditions.common.util.StringUtil; import net.minecraft.client.Minecraft; diff --git a/src/main/java/de/ellpeck/actuallyadditions/booklet/chapter/BookletChapter.java b/src/main/java/de/ellpeck/actuallyadditions/booklet/chapter/BookletChapter.java index 1177878b5..0f46d1c30 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/booklet/chapter/BookletChapter.java +++ b/src/main/java/de/ellpeck/actuallyadditions/booklet/chapter/BookletChapter.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.common.booklet.chapter; +package de.ellpeck.actuallyadditions.booklet.chapter; import de.ellpeck.actuallyadditions.api.booklet.IBookletChapter; import de.ellpeck.actuallyadditions.api.booklet.IBookletEntry; diff --git a/src/main/java/de/ellpeck/actuallyadditions/booklet/chapter/BookletChapterCoffee.java b/src/main/java/de/ellpeck/actuallyadditions/booklet/chapter/BookletChapterCoffee.java index dd989a5b2..4f5932856 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/booklet/chapter/BookletChapterCoffee.java +++ b/src/main/java/de/ellpeck/actuallyadditions/booklet/chapter/BookletChapterCoffee.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.common.booklet.chapter; +package de.ellpeck.actuallyadditions.booklet.chapter; import java.util.ArrayList; import java.util.Arrays; @@ -8,8 +8,8 @@ import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI; import de.ellpeck.actuallyadditions.api.booklet.IBookletEntry; import de.ellpeck.actuallyadditions.api.booklet.IBookletPage; import de.ellpeck.actuallyadditions.api.recipe.CoffeeIngredient; -import de.ellpeck.actuallyadditions.common.booklet.page.BookletPage; -import de.ellpeck.actuallyadditions.common.booklet.page.PageCoffeeMachine; +import de.ellpeck.actuallyadditions.booklet.page.BookletPage; +import de.ellpeck.actuallyadditions.booklet.page.PageCoffeeMachine; import de.ellpeck.actuallyadditions.common.items.ItemCoffee; import net.minecraft.item.ItemStack; diff --git a/src/main/java/de/ellpeck/actuallyadditions/booklet/chapter/BookletChapterCrusher.java b/src/main/java/de/ellpeck/actuallyadditions/booklet/chapter/BookletChapterCrusher.java index b79361897..adaf39353 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/booklet/chapter/BookletChapterCrusher.java +++ b/src/main/java/de/ellpeck/actuallyadditions/booklet/chapter/BookletChapterCrusher.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.common.booklet.chapter; +package de.ellpeck.actuallyadditions.booklet.chapter; import java.util.ArrayList; import java.util.Arrays; @@ -7,7 +7,7 @@ import java.util.List; import de.ellpeck.actuallyadditions.api.booklet.IBookletEntry; import de.ellpeck.actuallyadditions.api.booklet.IBookletPage; import de.ellpeck.actuallyadditions.api.recipe.CrusherRecipe; -import de.ellpeck.actuallyadditions.common.booklet.page.PageCrusherRecipe; +import de.ellpeck.actuallyadditions.booklet.page.PageCrusherRecipe; import de.ellpeck.actuallyadditions.common.crafting.CrusherCrafting; import net.minecraft.item.ItemStack; diff --git a/src/main/java/de/ellpeck/actuallyadditions/booklet/chapter/BookletChapterTrials.java b/src/main/java/de/ellpeck/actuallyadditions/booklet/chapter/BookletChapterTrials.java index a53611e0e..3f64bc53e 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/booklet/chapter/BookletChapterTrials.java +++ b/src/main/java/de/ellpeck/actuallyadditions/booklet/chapter/BookletChapterTrials.java @@ -1,8 +1,8 @@ -package de.ellpeck.actuallyadditions.common.booklet.chapter; +package de.ellpeck.actuallyadditions.booklet.chapter; import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI; import de.ellpeck.actuallyadditions.common.ActuallyAdditions; -import de.ellpeck.actuallyadditions.common.booklet.page.PageTrials; +import de.ellpeck.actuallyadditions.booklet.page.PageTrials; import de.ellpeck.actuallyadditions.common.data.PlayerData; import de.ellpeck.actuallyadditions.common.util.StringUtil; import net.minecraft.client.Minecraft; diff --git a/src/main/java/de/ellpeck/actuallyadditions/booklet/entry/BookletEntry.java b/src/main/java/de/ellpeck/actuallyadditions/booklet/entry/BookletEntry.java index 1a4d3022d..2f3b9e25c 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/booklet/entry/BookletEntry.java +++ b/src/main/java/de/ellpeck/actuallyadditions/booklet/entry/BookletEntry.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.common.booklet.entry; +package de.ellpeck.actuallyadditions.booklet.entry; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/de/ellpeck/actuallyadditions/booklet/entry/BookletEntryAllItems.java b/src/main/java/de/ellpeck/actuallyadditions/booklet/entry/BookletEntryAllItems.java index 4ef6c6266..750600243 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/booklet/entry/BookletEntryAllItems.java +++ b/src/main/java/de/ellpeck/actuallyadditions/booklet/entry/BookletEntryAllItems.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.common.booklet.entry; +package de.ellpeck.actuallyadditions.booklet.entry; import java.util.List; diff --git a/src/main/java/de/ellpeck/actuallyadditions/booklet/entry/BookletEntryTrials.java b/src/main/java/de/ellpeck/actuallyadditions/booklet/entry/BookletEntryTrials.java index dfea18dc9..36cc1fc50 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/booklet/entry/BookletEntryTrials.java +++ b/src/main/java/de/ellpeck/actuallyadditions/booklet/entry/BookletEntryTrials.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.common.booklet.entry; +package de.ellpeck.actuallyadditions.booklet.entry; public class BookletEntryTrials extends BookletEntry { diff --git a/src/main/java/de/ellpeck/actuallyadditions/booklet/gui/GuiBooklet.java b/src/main/java/de/ellpeck/actuallyadditions/booklet/gui/GuiBooklet.java index d5e37dce8..49ee11aef 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/booklet/gui/GuiBooklet.java +++ b/src/main/java/de/ellpeck/actuallyadditions/booklet/gui/GuiBooklet.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.common.booklet.gui; +package de.ellpeck.actuallyadditions.booklet.gui; import java.io.IOException; import java.util.Arrays; @@ -11,8 +11,8 @@ import org.lwjgl.input.Mouse; import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI; import de.ellpeck.actuallyadditions.api.booklet.internal.GuiBookletBase; import de.ellpeck.actuallyadditions.common.ActuallyAdditions; -import de.ellpeck.actuallyadditions.common.booklet.button.BookmarkButton; -import de.ellpeck.actuallyadditions.common.booklet.button.TrialsButton; +import de.ellpeck.actuallyadditions.booklet.button.BookmarkButton; +import de.ellpeck.actuallyadditions.booklet.button.TrialsButton; import de.ellpeck.actuallyadditions.common.config.values.ConfigIntValues; import de.ellpeck.actuallyadditions.common.data.PlayerData; import de.ellpeck.actuallyadditions.common.data.PlayerData.PlayerSave; diff --git a/src/main/java/de/ellpeck/actuallyadditions/booklet/gui/GuiEntry.java b/src/main/java/de/ellpeck/actuallyadditions/booklet/gui/GuiEntry.java index 40a0218c8..f248ef891 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/booklet/gui/GuiEntry.java +++ b/src/main/java/de/ellpeck/actuallyadditions/booklet/gui/GuiEntry.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.common.booklet.gui; +package de.ellpeck.actuallyadditions.booklet.gui; import java.io.IOException; import java.util.List; @@ -7,9 +7,9 @@ import de.ellpeck.actuallyadditions.api.booklet.IBookletChapter; import de.ellpeck.actuallyadditions.api.booklet.IBookletEntry; import de.ellpeck.actuallyadditions.api.booklet.IBookletPage; import de.ellpeck.actuallyadditions.api.booklet.internal.GuiBookletBase; -import de.ellpeck.actuallyadditions.common.booklet.button.EntryButton; -import de.ellpeck.actuallyadditions.common.booklet.entry.BookletEntryTrials; -import de.ellpeck.actuallyadditions.common.booklet.misc.BookletUtils; +import de.ellpeck.actuallyadditions.booklet.button.EntryButton; +import de.ellpeck.actuallyadditions.booklet.entry.BookletEntryTrials; +import de.ellpeck.actuallyadditions.booklet.misc.BookletUtils; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; import net.minecraft.item.ItemStack; diff --git a/src/main/java/de/ellpeck/actuallyadditions/booklet/gui/GuiMainPage.java b/src/main/java/de/ellpeck/actuallyadditions/booklet/gui/GuiMainPage.java index acbb938b7..5d1af333a 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/booklet/gui/GuiMainPage.java +++ b/src/main/java/de/ellpeck/actuallyadditions/booklet/gui/GuiMainPage.java @@ -8,7 +8,7 @@ * © 2015-2017 Ellpeck */ -package de.ellpeck.actuallyadditions.common.booklet.gui; +package de.ellpeck.actuallyadditions.booklet.gui; import java.io.IOException; import java.util.ArrayList; @@ -17,8 +17,8 @@ import java.util.List; import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI; import de.ellpeck.actuallyadditions.api.booklet.IBookletEntry; import de.ellpeck.actuallyadditions.common.ActuallyAdditions; -import de.ellpeck.actuallyadditions.common.booklet.InitBooklet; -import de.ellpeck.actuallyadditions.common.booklet.button.EntryButton; +import de.ellpeck.actuallyadditions.booklet.InitBooklet; +import de.ellpeck.actuallyadditions.booklet.button.EntryButton; import de.ellpeck.actuallyadditions.common.config.GuiConfiguration; import de.ellpeck.actuallyadditions.common.data.PlayerData; import de.ellpeck.actuallyadditions.common.data.PlayerData.PlayerSave; diff --git a/src/main/java/de/ellpeck/actuallyadditions/booklet/gui/GuiPage.java b/src/main/java/de/ellpeck/actuallyadditions/booklet/gui/GuiPage.java index ad7472196..07c2a14a0 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/booklet/gui/GuiPage.java +++ b/src/main/java/de/ellpeck/actuallyadditions/booklet/gui/GuiPage.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.common.booklet.gui; +package de.ellpeck.actuallyadditions.booklet.gui; import java.awt.Desktop; import java.io.IOException; @@ -11,8 +11,8 @@ import de.ellpeck.actuallyadditions.api.booklet.IBookletChapter; import de.ellpeck.actuallyadditions.api.booklet.IBookletPage; import de.ellpeck.actuallyadditions.api.booklet.internal.GuiBookletBase; import de.ellpeck.actuallyadditions.common.ActuallyAdditions; -import de.ellpeck.actuallyadditions.common.booklet.misc.BookletUtils; -import de.ellpeck.actuallyadditions.common.booklet.page.ItemDisplay; +import de.ellpeck.actuallyadditions.booklet.misc.BookletUtils; +import de.ellpeck.actuallyadditions.booklet.page.ItemDisplay; import de.ellpeck.actuallyadditions.common.inventory.gui.TexturedButton; import de.ellpeck.actuallyadditions.common.util.StringUtil; import net.minecraft.client.gui.GuiButton; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/achievement/InitAchievements.java b/src/main/java/de/ellpeck/actuallyadditions/common/achievement/InitAchievements.java index 67359f588..b9e24d4aa 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/achievement/InitAchievements.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/achievement/InitAchievements.java @@ -1,8 +1,8 @@ //TODO Achievements -> Advancements? /* -package de.ellpeck.actuallyadditions.achievement; -import de.ellpeck.actuallyadditions.util.ModUtil; -import de.ellpeck.actuallyadditions.util.StringUtil; +package de.ellpeck.actuallyadditions.common.achievement; +import de.ellpeck.actuallyadditions.common.util.ModUtil; +import de.ellpeck.actuallyadditions.common.util.StringUtil; import net.minecraft.stats.Achievement; import net.minecraftforge.common.AchievementPage; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockAtomicReconstructor.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockAtomicReconstructor.java index 01d3486f3..964c408bc 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockAtomicReconstructor.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockAtomicReconstructor.java @@ -1,14 +1,14 @@ -package de.ellpeck.actuallyadditions.blocks; +package de.ellpeck.actuallyadditions.common.blocks; import de.ellpeck.actuallyadditions.api.lens.ILensItem; -import de.ellpeck.actuallyadditions.ActuallyAdditions; -import de.ellpeck.actuallyadditions.blocks.base.BlockContainerBase; -import de.ellpeck.actuallyadditions.blocks.base.BlockItemBase; -import de.ellpeck.actuallyadditions.config.values.ConfigIntValues; -import de.ellpeck.actuallyadditions.tile.TileEntityAtomicReconstructor; -import de.ellpeck.actuallyadditions.util.AssetUtil; -import de.ellpeck.actuallyadditions.util.StackUtil; -import de.ellpeck.actuallyadditions.util.StringUtil; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.blocks.base.BlockContainerBase; +import de.ellpeck.actuallyadditions.common.blocks.base.BlockItemBase; +import de.ellpeck.actuallyadditions.common.config.values.ConfigIntValues; +import de.ellpeck.actuallyadditions.common.tile.TileEntityAtomicReconstructor; +import de.ellpeck.actuallyadditions.common.util.AssetUtil; +import de.ellpeck.actuallyadditions.common.util.StackUtil; +import de.ellpeck.actuallyadditions.common.util.StringUtil; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.SoundType; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockBatteryBox.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockBatteryBox.java index 4a340b19b..bb52dc305 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockBatteryBox.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockBatteryBox.java @@ -1,9 +1,9 @@ -package de.ellpeck.actuallyadditions.blocks; +package de.ellpeck.actuallyadditions.common.blocks; -import de.ellpeck.actuallyadditions.blocks.base.BlockContainerBase; -import de.ellpeck.actuallyadditions.items.ItemBattery; -import de.ellpeck.actuallyadditions.tile.TileEntityBatteryBox; -import de.ellpeck.actuallyadditions.util.StackUtil; +import de.ellpeck.actuallyadditions.common.blocks.base.BlockContainerBase; +import de.ellpeck.actuallyadditions.common.items.ItemBattery; +import de.ellpeck.actuallyadditions.common.tile.TileEntityBatteryBox; +import de.ellpeck.actuallyadditions.common.util.StackUtil; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.SoundType; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockBioReactor.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockBioReactor.java index a6912f3d7..40e12d3cc 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockBioReactor.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockBioReactor.java @@ -1,7 +1,7 @@ -package de.ellpeck.actuallyadditions.blocks; +package de.ellpeck.actuallyadditions.common.blocks; -import de.ellpeck.actuallyadditions.blocks.base.BlockContainerBase; -import de.ellpeck.actuallyadditions.tile.TileEntityBioReactor; +import de.ellpeck.actuallyadditions.common.blocks.base.BlockContainerBase; +import de.ellpeck.actuallyadditions.common.tile.TileEntityBioReactor; import net.minecraft.block.BlockState; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockBreaker.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockBreaker.java index c744f8f77..c3416946d 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockBreaker.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockBreaker.java @@ -1,10 +1,10 @@ -package de.ellpeck.actuallyadditions.blocks; +package de.ellpeck.actuallyadditions.common.blocks; -import de.ellpeck.actuallyadditions.ActuallyAdditions; -import de.ellpeck.actuallyadditions.blocks.base.BlockContainerBase; -import de.ellpeck.actuallyadditions.inventory.GuiHandler; -import de.ellpeck.actuallyadditions.tile.TileEntityBreaker; -import de.ellpeck.actuallyadditions.tile.TileEntityPlacer; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.blocks.base.BlockContainerBase; +import de.ellpeck.actuallyadditions.common.inventory.GuiHandler; +import de.ellpeck.actuallyadditions.common.tile.TileEntityBreaker; +import de.ellpeck.actuallyadditions.common.tile.TileEntityPlacer; import net.minecraft.block.Block; import net.minecraft.block.BlockDirectional; import net.minecraft.block.SoundType; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockCanolaPress.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockCanolaPress.java index 3821954a6..103dcbbe2 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockCanolaPress.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockCanolaPress.java @@ -1,9 +1,9 @@ -package de.ellpeck.actuallyadditions.blocks; +package de.ellpeck.actuallyadditions.common.blocks; -import de.ellpeck.actuallyadditions.ActuallyAdditions; -import de.ellpeck.actuallyadditions.blocks.base.BlockContainerBase; -import de.ellpeck.actuallyadditions.inventory.GuiHandler; -import de.ellpeck.actuallyadditions.tile.TileEntityCanolaPress; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.blocks.base.BlockContainerBase; +import de.ellpeck.actuallyadditions.common.inventory.GuiHandler; +import de.ellpeck.actuallyadditions.common.tile.TileEntityCanolaPress; import net.minecraft.block.Block; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockCoalGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockCoalGenerator.java index dfe42276a..5a30a0c50 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockCoalGenerator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockCoalGenerator.java @@ -1,9 +1,9 @@ -package de.ellpeck.actuallyadditions.blocks; +package de.ellpeck.actuallyadditions.common.blocks; -import de.ellpeck.actuallyadditions.ActuallyAdditions; -import de.ellpeck.actuallyadditions.blocks.base.BlockContainerBase; -import de.ellpeck.actuallyadditions.inventory.GuiHandler; -import de.ellpeck.actuallyadditions.tile.TileEntityCoalGenerator; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.blocks.base.BlockContainerBase; +import de.ellpeck.actuallyadditions.common.inventory.GuiHandler; +import de.ellpeck.actuallyadditions.common.tile.TileEntityCoalGenerator; import net.minecraft.block.Block; import net.minecraft.block.BlockHorizontal; import net.minecraft.block.SoundType; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockCoffeeMachine.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockCoffeeMachine.java index c6426ac85..3755afd02 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockCoffeeMachine.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockCoffeeMachine.java @@ -1,9 +1,9 @@ -package de.ellpeck.actuallyadditions.blocks; +package de.ellpeck.actuallyadditions.common.blocks; -import de.ellpeck.actuallyadditions.ActuallyAdditions; -import de.ellpeck.actuallyadditions.blocks.base.BlockContainerBase; -import de.ellpeck.actuallyadditions.inventory.GuiHandler; -import de.ellpeck.actuallyadditions.tile.TileEntityCoffeeMachine; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.blocks.base.BlockContainerBase; +import de.ellpeck.actuallyadditions.common.inventory.GuiHandler; +import de.ellpeck.actuallyadditions.common.tile.TileEntityCoffeeMachine; import net.minecraft.block.Block; import net.minecraft.block.BlockHorizontal; import net.minecraft.block.SoundType; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockCompost.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockCompost.java index 477ec727b..f007f884b 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockCompost.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockCompost.java @@ -1,12 +1,12 @@ -package de.ellpeck.actuallyadditions.blocks; +package de.ellpeck.actuallyadditions.common.blocks; import de.ellpeck.actuallyadditions.api.recipe.CompostRecipe; -import de.ellpeck.actuallyadditions.blocks.base.BlockContainerBase; -import de.ellpeck.actuallyadditions.tile.TileEntityCompost; -import de.ellpeck.actuallyadditions.util.AssetUtil; -import de.ellpeck.actuallyadditions.util.ItemUtil; -import de.ellpeck.actuallyadditions.util.StackUtil; -import de.ellpeck.actuallyadditions.util.StringUtil; +import de.ellpeck.actuallyadditions.common.blocks.base.BlockContainerBase; +import de.ellpeck.actuallyadditions.common.tile.TileEntityCompost; +import de.ellpeck.actuallyadditions.common.util.AssetUtil; +import de.ellpeck.actuallyadditions.common.util.ItemUtil; +import de.ellpeck.actuallyadditions.common.util.StackUtil; +import de.ellpeck.actuallyadditions.common.util.StringUtil; import net.minecraft.block.Block; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockCrystal.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockCrystal.java index b8b17984e..14471d2b6 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockCrystal.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockCrystal.java @@ -1,9 +1,9 @@ -package de.ellpeck.actuallyadditions.blocks; +package de.ellpeck.actuallyadditions.common.blocks; -import de.ellpeck.actuallyadditions.ActuallyAdditions; -import de.ellpeck.actuallyadditions.blocks.base.BlockItemBase; -import de.ellpeck.actuallyadditions.items.metalists.TheCrystals; -import de.ellpeck.actuallyadditions.util.StringUtil; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.blocks.base.BlockItemBase; +import de.ellpeck.actuallyadditions.common.items.metalists.TheCrystals; +import de.ellpeck.actuallyadditions.common.util.StringUtil; import net.minecraft.block.Block; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockCrystalCluster.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockCrystalCluster.java index 6a0fe1a83..843a34874 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockCrystalCluster.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockCrystalCluster.java @@ -1,8 +1,8 @@ -package de.ellpeck.actuallyadditions.blocks; +package de.ellpeck.actuallyadditions.common.blocks; -import de.ellpeck.actuallyadditions.items.metalists.TheCrystals; -import de.ellpeck.actuallyadditions.util.IColorProvidingBlock; -import de.ellpeck.actuallyadditions.util.IColorProvidingItem; +import de.ellpeck.actuallyadditions.common.items.metalists.TheCrystals; +import de.ellpeck.actuallyadditions.common.util.IColorProvidingBlock; +import de.ellpeck.actuallyadditions.common.util.IColorProvidingItem; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.SoundType; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockDirectionalBreaker.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockDirectionalBreaker.java index 9e7a467a0..d5937a704 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockDirectionalBreaker.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockDirectionalBreaker.java @@ -1,9 +1,9 @@ -package de.ellpeck.actuallyadditions.blocks; +package de.ellpeck.actuallyadditions.common.blocks; -import de.ellpeck.actuallyadditions.ActuallyAdditions; -import de.ellpeck.actuallyadditions.blocks.base.BlockContainerBase; -import de.ellpeck.actuallyadditions.inventory.GuiHandler; -import de.ellpeck.actuallyadditions.tile.TileEntityDirectionalBreaker; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.blocks.base.BlockContainerBase; +import de.ellpeck.actuallyadditions.common.inventory.GuiHandler; +import de.ellpeck.actuallyadditions.common.tile.TileEntityDirectionalBreaker; import net.minecraft.block.BlockDirectional; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockDisplayStand.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockDisplayStand.java index e2ee15ef2..57a690c3d 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockDisplayStand.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockDisplayStand.java @@ -1,9 +1,9 @@ -package de.ellpeck.actuallyadditions.blocks; +package de.ellpeck.actuallyadditions.common.blocks; -import de.ellpeck.actuallyadditions.blocks.base.BlockContainerBase; -import de.ellpeck.actuallyadditions.tile.TileEntityDisplayStand; -import de.ellpeck.actuallyadditions.util.ItemUtil; -import de.ellpeck.actuallyadditions.util.StackUtil; +import de.ellpeck.actuallyadditions.common.blocks.base.BlockContainerBase; +import de.ellpeck.actuallyadditions.common.tile.TileEntityDisplayStand; +import de.ellpeck.actuallyadditions.common.util.ItemUtil; +import de.ellpeck.actuallyadditions.common.util.StackUtil; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockFaceShape; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockEnergizer.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockEnergizer.java index f04c7f32b..20fdb9d73 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockEnergizer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockEnergizer.java @@ -1,10 +1,10 @@ -package de.ellpeck.actuallyadditions.blocks; +package de.ellpeck.actuallyadditions.common.blocks; -import de.ellpeck.actuallyadditions.ActuallyAdditions; -import de.ellpeck.actuallyadditions.blocks.base.BlockContainerBase; -import de.ellpeck.actuallyadditions.inventory.GuiHandler; -import de.ellpeck.actuallyadditions.tile.TileEntityEnergizer; -import de.ellpeck.actuallyadditions.tile.TileEntityEnervator; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.blocks.base.BlockContainerBase; +import de.ellpeck.actuallyadditions.common.inventory.GuiHandler; +import de.ellpeck.actuallyadditions.common.tile.TileEntityEnergizer; +import de.ellpeck.actuallyadditions.common.tile.TileEntityEnervator; import net.minecraft.block.Block; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockFeeder.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockFeeder.java index 067357058..d3bed2e81 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockFeeder.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockFeeder.java @@ -1,9 +1,9 @@ -package de.ellpeck.actuallyadditions.blocks; +package de.ellpeck.actuallyadditions.common.blocks; -import de.ellpeck.actuallyadditions.ActuallyAdditions; -import de.ellpeck.actuallyadditions.blocks.base.BlockContainerBase; -import de.ellpeck.actuallyadditions.inventory.GuiHandler; -import de.ellpeck.actuallyadditions.tile.TileEntityFeeder; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.blocks.base.BlockContainerBase; +import de.ellpeck.actuallyadditions.common.inventory.GuiHandler; +import de.ellpeck.actuallyadditions.common.tile.TileEntityFeeder; import net.minecraft.block.Block; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockFermentingBarrel.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockFermentingBarrel.java index ea39a0b7e..9b28edf62 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockFermentingBarrel.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockFermentingBarrel.java @@ -1,9 +1,9 @@ -package de.ellpeck.actuallyadditions.blocks; +package de.ellpeck.actuallyadditions.common.blocks; -import de.ellpeck.actuallyadditions.ActuallyAdditions; -import de.ellpeck.actuallyadditions.blocks.base.BlockContainerBase; -import de.ellpeck.actuallyadditions.inventory.GuiHandler; -import de.ellpeck.actuallyadditions.tile.TileEntityFermentingBarrel; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.blocks.base.BlockContainerBase; +import de.ellpeck.actuallyadditions.common.inventory.GuiHandler; +import de.ellpeck.actuallyadditions.common.tile.TileEntityFermentingBarrel; import net.minecraft.block.Block; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockFireworkBox.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockFireworkBox.java index 4f474e6cf..4d400fc3a 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockFireworkBox.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockFireworkBox.java @@ -1,9 +1,9 @@ -package de.ellpeck.actuallyadditions.blocks; +package de.ellpeck.actuallyadditions.common.blocks; -import de.ellpeck.actuallyadditions.ActuallyAdditions; -import de.ellpeck.actuallyadditions.blocks.base.BlockContainerBase; -import de.ellpeck.actuallyadditions.inventory.GuiHandler; -import de.ellpeck.actuallyadditions.tile.TileEntityFireworkBox; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.blocks.base.BlockContainerBase; +import de.ellpeck.actuallyadditions.common.inventory.GuiHandler; +import de.ellpeck.actuallyadditions.common.tile.TileEntityFireworkBox; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockFishingNet.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockFishingNet.java index 9be3851bd..64d6181dc 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockFishingNet.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockFishingNet.java @@ -1,7 +1,7 @@ -package de.ellpeck.actuallyadditions.blocks; +package de.ellpeck.actuallyadditions.common.blocks; -import de.ellpeck.actuallyadditions.blocks.base.BlockContainerBase; -import de.ellpeck.actuallyadditions.tile.TileEntityFishingNet; +import de.ellpeck.actuallyadditions.common.blocks.base.BlockContainerBase; +import de.ellpeck.actuallyadditions.common.tile.TileEntityFishingNet; import net.minecraft.block.Block; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockFluidCollector.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockFluidCollector.java index c0253dbfd..59e7aeed6 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockFluidCollector.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockFluidCollector.java @@ -1,10 +1,10 @@ -package de.ellpeck.actuallyadditions.blocks; +package de.ellpeck.actuallyadditions.common.blocks; -import de.ellpeck.actuallyadditions.ActuallyAdditions; -import de.ellpeck.actuallyadditions.blocks.base.BlockContainerBase; -import de.ellpeck.actuallyadditions.inventory.GuiHandler; -import de.ellpeck.actuallyadditions.tile.TileEntityFluidCollector; -import de.ellpeck.actuallyadditions.tile.TileEntityFluidPlacer; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.blocks.base.BlockContainerBase; +import de.ellpeck.actuallyadditions.common.inventory.GuiHandler; +import de.ellpeck.actuallyadditions.common.tile.TileEntityFluidCollector; +import de.ellpeck.actuallyadditions.common.tile.TileEntityFluidPlacer; import net.minecraft.block.Block; import net.minecraft.block.BlockDirectional; import net.minecraft.block.SoundType; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockFurnaceDouble.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockFurnaceDouble.java index 68e66025d..ace7ffa23 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockFurnaceDouble.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockFurnaceDouble.java @@ -1,11 +1,11 @@ -package de.ellpeck.actuallyadditions.blocks; +package de.ellpeck.actuallyadditions.common.blocks; -import de.ellpeck.actuallyadditions.ActuallyAdditions; -import de.ellpeck.actuallyadditions.blocks.base.BlockContainerBase; -import de.ellpeck.actuallyadditions.blocks.base.BlockItemBase; -import de.ellpeck.actuallyadditions.inventory.GuiHandler; -import de.ellpeck.actuallyadditions.tile.TileEntityFurnaceDouble; -import de.ellpeck.actuallyadditions.util.StringUtil; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.blocks.base.BlockContainerBase; +import de.ellpeck.actuallyadditions.common.blocks.base.BlockItemBase; +import de.ellpeck.actuallyadditions.common.inventory.GuiHandler; +import de.ellpeck.actuallyadditions.common.tile.TileEntityFurnaceDouble; +import de.ellpeck.actuallyadditions.common.util.StringUtil; import net.minecraft.block.Block; import net.minecraft.block.BlockHorizontal; import net.minecraft.block.SoundType; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockFurnaceSolar.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockFurnaceSolar.java index e5fbbec98..62e9774b5 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockFurnaceSolar.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockFurnaceSolar.java @@ -1,7 +1,7 @@ -package de.ellpeck.actuallyadditions.blocks; +package de.ellpeck.actuallyadditions.common.blocks; -import de.ellpeck.actuallyadditions.blocks.base.BlockContainerBase; -import de.ellpeck.actuallyadditions.tile.TileEntityFurnaceSolar; +import de.ellpeck.actuallyadditions.common.blocks.base.BlockContainerBase; +import de.ellpeck.actuallyadditions.common.tile.TileEntityFurnaceSolar; import net.minecraft.block.Block; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockGeneric.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockGeneric.java index 47397876b..a4a4382ae 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockGeneric.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockGeneric.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.blocks; +package de.ellpeck.actuallyadditions.common.blocks; import net.minecraft.block.Block; import net.minecraft.block.SoundType; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockGreenhouseGlass.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockGreenhouseGlass.java index 4ba932e9a..90d68a3a4 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockGreenhouseGlass.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockGreenhouseGlass.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.blocks; +package de.ellpeck.actuallyadditions.common.blocks; import net.minecraft.block.Block; import net.minecraft.block.IGrowable; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockHeatCollector.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockHeatCollector.java index 454d6f3e4..8a53b62b9 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockHeatCollector.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockHeatCollector.java @@ -1,7 +1,7 @@ -package de.ellpeck.actuallyadditions.blocks; +package de.ellpeck.actuallyadditions.common.blocks; -import de.ellpeck.actuallyadditions.blocks.base.BlockContainerBase; -import de.ellpeck.actuallyadditions.tile.TileEntityHeatCollector; +import de.ellpeck.actuallyadditions.common.blocks.base.BlockContainerBase; +import de.ellpeck.actuallyadditions.common.tile.TileEntityHeatCollector; import net.minecraft.block.Block; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockItemViewer.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockItemViewer.java index 53c0f2b14..06919c29b 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockItemViewer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockItemViewer.java @@ -1,7 +1,7 @@ -package de.ellpeck.actuallyadditions.blocks; +package de.ellpeck.actuallyadditions.common.blocks; -import de.ellpeck.actuallyadditions.blocks.base.BlockContainerBase; -import de.ellpeck.actuallyadditions.tile.TileEntityItemViewer; +import de.ellpeck.actuallyadditions.common.blocks.base.BlockContainerBase; +import de.ellpeck.actuallyadditions.common.tile.TileEntityItemViewer; import net.minecraft.block.BlockState; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockLaserRelay.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockLaserRelay.java index 758ce2a0c..5523b6f29 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockLaserRelay.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockLaserRelay.java @@ -1,17 +1,17 @@ -package de.ellpeck.actuallyadditions.blocks; +package de.ellpeck.actuallyadditions.common.blocks; import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI; import de.ellpeck.actuallyadditions.api.laser.Network; -import de.ellpeck.actuallyadditions.ActuallyAdditions; -import de.ellpeck.actuallyadditions.blocks.base.BlockContainerBase; -import de.ellpeck.actuallyadditions.config.ConfigValues; -import de.ellpeck.actuallyadditions.inventory.GuiHandler; -import de.ellpeck.actuallyadditions.items.ItemEngineerGoggles; -import de.ellpeck.actuallyadditions.items.ItemLaserRelayUpgrade; -import de.ellpeck.actuallyadditions.items.ItemLaserWrench; -import de.ellpeck.actuallyadditions.tile.*; -import de.ellpeck.actuallyadditions.util.StackUtil; -import de.ellpeck.actuallyadditions.util.StringUtil; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.blocks.base.BlockContainerBase; +import de.ellpeck.actuallyadditions.common.config.ConfigValues; +import de.ellpeck.actuallyadditions.common.inventory.GuiHandler; +import de.ellpeck.actuallyadditions.common.items.ItemEngineerGoggles; +import de.ellpeck.actuallyadditions.common.items.ItemLaserRelayUpgrade; +import de.ellpeck.actuallyadditions.common.items.ItemLaserWrench; +import de.ellpeck.actuallyadditions.common.tile.*; +import de.ellpeck.actuallyadditions.common.util.StackUtil; +import de.ellpeck.actuallyadditions.common.util.StringUtil; import net.minecraft.block.BlockDirectional; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockLavaFactoryController.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockLavaFactoryController.java index ddb0d9350..a78652603 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockLavaFactoryController.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockLavaFactoryController.java @@ -1,9 +1,9 @@ -package de.ellpeck.actuallyadditions.blocks; +package de.ellpeck.actuallyadditions.common.blocks; -import de.ellpeck.actuallyadditions.ActuallyAdditions; -import de.ellpeck.actuallyadditions.blocks.base.BlockContainerBase; -import de.ellpeck.actuallyadditions.tile.TileEntityLavaFactoryController; -import de.ellpeck.actuallyadditions.util.StringUtil; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.blocks.base.BlockContainerBase; +import de.ellpeck.actuallyadditions.common.tile.TileEntityLavaFactoryController; +import de.ellpeck.actuallyadditions.common.util.StringUtil; import net.minecraft.block.Block; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockLeafGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockLeafGenerator.java index 2dae083b5..c80ee49a8 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockLeafGenerator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockLeafGenerator.java @@ -1,7 +1,7 @@ -package de.ellpeck.actuallyadditions.blocks; +package de.ellpeck.actuallyadditions.common.blocks; -import de.ellpeck.actuallyadditions.blocks.base.BlockContainerBase; -import de.ellpeck.actuallyadditions.tile.TileEntityLeafGenerator; +import de.ellpeck.actuallyadditions.common.blocks.base.BlockContainerBase; +import de.ellpeck.actuallyadditions.common.tile.TileEntityLeafGenerator; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.item.EnumRarity; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockMiner.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockMiner.java index d39567444..8ddaef9dd 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockMiner.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockMiner.java @@ -1,10 +1,10 @@ -package de.ellpeck.actuallyadditions.blocks; +package de.ellpeck.actuallyadditions.common.blocks; -import de.ellpeck.actuallyadditions.ActuallyAdditions; -import de.ellpeck.actuallyadditions.blocks.base.BlockContainerBase; -import de.ellpeck.actuallyadditions.inventory.GuiHandler; -import de.ellpeck.actuallyadditions.tile.TileEntityMiner; -import de.ellpeck.actuallyadditions.util.StringUtil; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.blocks.base.BlockContainerBase; +import de.ellpeck.actuallyadditions.common.inventory.GuiHandler; +import de.ellpeck.actuallyadditions.common.tile.TileEntityMiner; +import de.ellpeck.actuallyadditions.common.util.StringUtil; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockPhantom.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockPhantom.java index 198bfe763..c822180e7 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockPhantom.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockPhantom.java @@ -1,10 +1,10 @@ -package de.ellpeck.actuallyadditions.blocks; +package de.ellpeck.actuallyadditions.common.blocks; import de.ellpeck.actuallyadditions.api.tile.IPhantomTile; -import de.ellpeck.actuallyadditions.ActuallyAdditions; -import de.ellpeck.actuallyadditions.blocks.base.BlockContainerBase; -import de.ellpeck.actuallyadditions.tile.*; -import de.ellpeck.actuallyadditions.util.StringUtil; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.blocks.base.BlockContainerBase; +import de.ellpeck.actuallyadditions.common.tile.*; +import de.ellpeck.actuallyadditions.common.util.StringUtil; import net.minecraft.block.Block; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockPhantomBooster.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockPhantomBooster.java index a9118e31f..fd7afa336 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockPhantomBooster.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockPhantomBooster.java @@ -1,7 +1,7 @@ -package de.ellpeck.actuallyadditions.blocks; +package de.ellpeck.actuallyadditions.common.blocks; -import de.ellpeck.actuallyadditions.blocks.base.BlockContainerBase; -import de.ellpeck.actuallyadditions.tile.TileEntityPhantomBooster; +import de.ellpeck.actuallyadditions.common.blocks.base.BlockContainerBase; +import de.ellpeck.actuallyadditions.common.tile.TileEntityPhantomBooster; import net.minecraft.block.Block; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockPlayerInterface.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockPlayerInterface.java index 8c9e2113f..3c172454b 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockPlayerInterface.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockPlayerInterface.java @@ -1,8 +1,8 @@ -package de.ellpeck.actuallyadditions.blocks; +package de.ellpeck.actuallyadditions.common.blocks; -import de.ellpeck.actuallyadditions.blocks.base.BlockContainerBase; -import de.ellpeck.actuallyadditions.tile.TileEntityPlayerInterface; -import de.ellpeck.actuallyadditions.util.StringUtil; +import de.ellpeck.actuallyadditions.common.blocks.base.BlockContainerBase; +import de.ellpeck.actuallyadditions.common.tile.TileEntityPlayerInterface; +import de.ellpeck.actuallyadditions.common.util.StringUtil; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockRangedCollector.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockRangedCollector.java index 8635db572..7ebd0bd11 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockRangedCollector.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockRangedCollector.java @@ -1,9 +1,9 @@ -package de.ellpeck.actuallyadditions.blocks; +package de.ellpeck.actuallyadditions.common.blocks; -import de.ellpeck.actuallyadditions.ActuallyAdditions; -import de.ellpeck.actuallyadditions.blocks.base.BlockContainerBase; -import de.ellpeck.actuallyadditions.inventory.GuiHandler; -import de.ellpeck.actuallyadditions.tile.TileEntityRangedCollector; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.blocks.base.BlockContainerBase; +import de.ellpeck.actuallyadditions.common.inventory.GuiHandler; +import de.ellpeck.actuallyadditions.common.tile.TileEntityRangedCollector; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockShockSuppressor.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockShockSuppressor.java index 199a8fced..8b475d81f 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockShockSuppressor.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockShockSuppressor.java @@ -1,8 +1,8 @@ -package de.ellpeck.actuallyadditions.blocks; +package de.ellpeck.actuallyadditions.common.blocks; -import de.ellpeck.actuallyadditions.ActuallyAdditions; -import de.ellpeck.actuallyadditions.blocks.base.BlockContainerBase; -import de.ellpeck.actuallyadditions.tile.TileEntityShockSuppressor; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.blocks.base.BlockContainerBase; +import de.ellpeck.actuallyadditions.common.tile.TileEntityShockSuppressor; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.entity.Entity; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockSlabs.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockSlabs.java index 6e12bfd70..e84550701 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockSlabs.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockSlabs.java @@ -1,7 +1,7 @@ -package de.ellpeck.actuallyadditions.blocks; +package de.ellpeck.actuallyadditions.common.blocks; -import de.ellpeck.actuallyadditions.blocks.base.BlockItemBase; -import de.ellpeck.actuallyadditions.util.StackUtil; +import de.ellpeck.actuallyadditions.common.blocks.base.BlockItemBase; +import de.ellpeck.actuallyadditions.common.util.StackUtil; import net.minecraft.block.Block; import net.minecraft.block.BlockSlab; import net.minecraft.block.BlockState; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockSmileyCloud.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockSmileyCloud.java index e04e9b884..b74a9f991 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockSmileyCloud.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockSmileyCloud.java @@ -1,9 +1,9 @@ -package de.ellpeck.actuallyadditions.blocks; +package de.ellpeck.actuallyadditions.common.blocks; -import de.ellpeck.actuallyadditions.ActuallyAdditions; -import de.ellpeck.actuallyadditions.blocks.base.BlockContainerBase; -import de.ellpeck.actuallyadditions.inventory.GuiHandler; -import de.ellpeck.actuallyadditions.tile.TileEntitySmileyCloud; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.blocks.base.BlockContainerBase; +import de.ellpeck.actuallyadditions.common.inventory.GuiHandler; +import de.ellpeck.actuallyadditions.common.tile.TileEntitySmileyCloud; import net.minecraft.block.BlockHorizontal; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockTinyTorch.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockTinyTorch.java index 18819d225..bc428b544 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockTinyTorch.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockTinyTorch.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.blocks; +package de.ellpeck.actuallyadditions.common.blocks; import net.minecraft.block.Block; import net.minecraft.block.BlockTorch; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockWildPlant.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockWildPlant.java index 5c2f4412c..4504e3618 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockWildPlant.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockWildPlant.java @@ -1,11 +1,11 @@ -package de.ellpeck.actuallyadditions.blocks; +package de.ellpeck.actuallyadditions.common.blocks; -import de.ellpeck.actuallyadditions.ActuallyAdditions; -import de.ellpeck.actuallyadditions.blocks.base.BlockBushBase; -import de.ellpeck.actuallyadditions.blocks.base.BlockPlant; -import de.ellpeck.actuallyadditions.blocks.base.BlockItemBase; -import de.ellpeck.actuallyadditions.blocks.metalists.TheWildPlants; -import de.ellpeck.actuallyadditions.util.StringUtil; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.blocks.base.BlockBushBase; +import de.ellpeck.actuallyadditions.common.blocks.base.BlockPlant; +import de.ellpeck.actuallyadditions.common.blocks.base.BlockItemBase; +import de.ellpeck.actuallyadditions.common.blocks.metalists.TheWildPlants; +import de.ellpeck.actuallyadditions.common.util.StringUtil; import net.minecraft.block.Block; import net.minecraft.block.BlockCrops; import net.minecraft.block.material.Material; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/IHudDisplay.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/IHudDisplay.java index 5c842e942..25df9a7f0 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/IHudDisplay.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/IHudDisplay.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.blocks; +package de.ellpeck.actuallyadditions.common.blocks; import net.minecraft.client.MainWindow; import net.minecraft.client.Minecraft; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/InitBlocks.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/InitBlocks.java index 3954c427f..78010b4f0 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/InitBlocks.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/InitBlocks.java @@ -1,9 +1,9 @@ -package de.ellpeck.actuallyadditions.blocks; +package de.ellpeck.actuallyadditions.common.blocks; -import de.ellpeck.actuallyadditions.ActuallyAdditions; -import de.ellpeck.actuallyadditions.blocks.base.BlockPlant; -import de.ellpeck.actuallyadditions.blocks.metalists.TheMiscBlocks; -import de.ellpeck.actuallyadditions.items.metalists.TheCrystals; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.blocks.base.BlockPlant; +import de.ellpeck.actuallyadditions.common.blocks.metalists.TheMiscBlocks; +import de.ellpeck.actuallyadditions.common.items.metalists.TheCrystals; import net.minecraft.block.Block; import net.minecraft.block.StairsBlock; import net.minecraft.block.material.Material; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/base/BlockBase.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/base/BlockBase.java index dc5ecb1b5..bfe0223bc 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/base/BlockBase.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/base/BlockBase.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.blocks.base; +package de.ellpeck.actuallyadditions.common.blocks.base; import net.minecraft.block.Block; import net.minecraft.item.Item; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/base/BlockBushBase.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/base/BlockBushBase.java index a3d3a41a7..77d8be551 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/base/BlockBushBase.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/base/BlockBushBase.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.blocks.base; +package de.ellpeck.actuallyadditions.common.blocks.base; import net.minecraft.block.BushBlock; import net.minecraft.block.SoundType; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/base/BlockContainerBase.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/base/BlockContainerBase.java index b602fb9b0..ec314f2a3 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/base/BlockContainerBase.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/base/BlockContainerBase.java @@ -1,10 +1,10 @@ -package de.ellpeck.actuallyadditions.blocks.base; +package de.ellpeck.actuallyadditions.common.blocks.base; -import de.ellpeck.actuallyadditions.ActuallyAdditions; -import de.ellpeck.actuallyadditions.config.ConfigValues; -import de.ellpeck.actuallyadditions.tile.TileEntityBase; -import de.ellpeck.actuallyadditions.tile.TileEntityInventoryBase; -import de.ellpeck.actuallyadditions.util.StackUtil; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.config.ConfigValues; +import de.ellpeck.actuallyadditions.common.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.common.tile.TileEntityInventoryBase; +import de.ellpeck.actuallyadditions.common.util.StackUtil; import net.minecraft.block.*; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.MoverType; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/base/BlockFluidFlowing.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/base/BlockFluidFlowing.java index 88e0509f4..9349fe948 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/base/BlockFluidFlowing.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/base/BlockFluidFlowing.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.blocks.base; +package de.ellpeck.actuallyadditions.common.blocks.base; import net.minecraft.block.Block; import net.minecraft.block.FlowingFluidBlock; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/base/BlockItemBase.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/base/BlockItemBase.java index aa20febda..c127f0119 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/base/BlockItemBase.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/base/BlockItemBase.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.blocks.base; +package de.ellpeck.actuallyadditions.common.blocks.base; import net.minecraft.block.Block; import net.minecraft.item.BlockItem; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/base/BlockPlant.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/base/BlockPlant.java index 4f31a71e1..faddaf064 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/base/BlockPlant.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/base/BlockPlant.java @@ -8,9 +8,9 @@ * © 2015-2017 Ellpeck */ -package de.ellpeck.actuallyadditions.blocks.base; +package de.ellpeck.actuallyadditions.common.blocks.base; -import de.ellpeck.actuallyadditions.util.StackUtil; +import de.ellpeck.actuallyadditions.common.util.StackUtil; import net.minecraft.block.BlockState; import net.minecraft.block.CropsBlock; import net.minecraft.block.material.Material; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/base/BlockStair.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/base/BlockStair.java index efc5ab2fa..50dd3eac4 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/base/BlockStair.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/base/BlockStair.java @@ -1,8 +1,8 @@ -//package de.ellpeck.actuallyadditions.blocks.base; +//package de.ellpeck.actuallyadditions.common.blocks.base; // -//import de.ellpeck.actuallyadditions.ActuallyAdditions; -//import de.ellpeck.actuallyadditions.blocks.render.IHasModel; -//import de.ellpeck.actuallyadditions.util.ItemUtil; +//import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +//import de.ellpeck.actuallyadditions.common.blocks.render.IHasModel; +//import de.ellpeck.actuallyadditions.common.util.ItemUtil; //import net.minecraft.block.Block; //import net.minecraft.block.BlockStairs; //import net.minecraft.block.BlockState; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/base/IBaseBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/base/IBaseBlock.java index b22aef0f3..6e2ff583d 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/base/IBaseBlock.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/base/IBaseBlock.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.blocks.base; +package de.ellpeck.actuallyadditions.common.blocks.base; import net.minecraft.item.Rarity; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/metalists/TheColoredLampColors.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/metalists/TheColoredLampColors.java index f6927690a..13d39896e 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/metalists/TheColoredLampColors.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/metalists/TheColoredLampColors.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.blocks.metalists; +package de.ellpeck.actuallyadditions.common.blocks.metalists; import net.minecraft.util.IStringSerializable; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/metalists/TheMiscBlocks.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/metalists/TheMiscBlocks.java index a62a3286a..9ca4c7f14 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/metalists/TheMiscBlocks.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/metalists/TheMiscBlocks.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.blocks.metalists; +package de.ellpeck.actuallyadditions.common.blocks.metalists; import net.minecraft.item.Rarity; import net.minecraft.util.IStringSerializable; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/metalists/TheWildPlants.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/metalists/TheWildPlants.java index 48ae50da2..b02e6bd27 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/metalists/TheWildPlants.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/metalists/TheWildPlants.java @@ -1,7 +1,7 @@ -package de.ellpeck.actuallyadditions.blocks.metalists; +package de.ellpeck.actuallyadditions.common.blocks.metalists; import com.google.common.base.Preconditions; -import de.ellpeck.actuallyadditions.blocks.InitBlocks; +import de.ellpeck.actuallyadditions.common.blocks.InitBlocks; import net.minecraft.block.Block; import net.minecraft.item.Rarity; import net.minecraft.util.IStringSerializable; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/render/ActualCompostModel.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/render/ActualCompostModel.java index 8e576e986..6fd1a00eb 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/render/ActualCompostModel.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/render/ActualCompostModel.java @@ -1,6 +1,6 @@ -package de.ellpeck.actuallyadditions.blocks.render; +package de.ellpeck.actuallyadditions.common.blocks.render; -import de.ellpeck.actuallyadditions.blocks.BlockCompost; +import de.ellpeck.actuallyadditions.common.blocks.BlockCompost; import net.minecraft.block.BlockState; import net.minecraft.client.renderer.model.BakedQuad; import net.minecraft.client.renderer.model.IBakedModel; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/render/CompostModel.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/render/CompostModel.java index 4d0e6a5ad..a83601bac 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/render/CompostModel.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/render/CompostModel.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.blocks.render; +package de.ellpeck.actuallyadditions.common.blocks.render; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/render/IHasModel.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/render/IHasModel.java index 1cc39f8fc..f6f6f512d 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/render/IHasModel.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/render/IHasModel.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.blocks.render; +package de.ellpeck.actuallyadditions.common.blocks.render; @Deprecated public interface IHasModel { diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/render/RenderBatteryBox.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/render/RenderBatteryBox.java index b3f4f01b8..e070c913f 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/render/RenderBatteryBox.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/render/RenderBatteryBox.java @@ -1,11 +1,11 @@ -package de.ellpeck.actuallyadditions.blocks.render; +package de.ellpeck.actuallyadditions.common.blocks.render; import com.mojang.blaze3d.matrix.MatrixStack; -import de.ellpeck.actuallyadditions.ActuallyAdditions; -import de.ellpeck.actuallyadditions.items.ItemBattery; -import de.ellpeck.actuallyadditions.tile.TileEntityBatteryBox; -import de.ellpeck.actuallyadditions.util.AssetUtil; -import de.ellpeck.actuallyadditions.util.StackUtil; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.items.ItemBattery; +import de.ellpeck.actuallyadditions.common.tile.TileEntityBatteryBox; +import de.ellpeck.actuallyadditions.common.util.AssetUtil; +import de.ellpeck.actuallyadditions.common.util.StackUtil; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.renderer.IRenderTypeBuffer; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/render/RenderDisplayStand.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/render/RenderDisplayStand.java index 817b8830d..2d312fa19 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/render/RenderDisplayStand.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/render/RenderDisplayStand.java @@ -1,10 +1,10 @@ -package de.ellpeck.actuallyadditions.blocks.render; +package de.ellpeck.actuallyadditions.common.blocks.render; import com.mojang.blaze3d.matrix.MatrixStack; -import de.ellpeck.actuallyadditions.ActuallyAdditions; -import de.ellpeck.actuallyadditions.tile.TileEntityDisplayStand; -import de.ellpeck.actuallyadditions.util.AssetUtil; -import de.ellpeck.actuallyadditions.util.StackUtil; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.tile.TileEntityDisplayStand; +import de.ellpeck.actuallyadditions.common.util.AssetUtil; +import de.ellpeck.actuallyadditions.common.util.StackUtil; import net.minecraft.client.renderer.IRenderTypeBuffer; import net.minecraft.client.renderer.Quaternion; import net.minecraft.client.renderer.tileentity.TileEntityRenderer; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/render/RenderEmpowerer.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/render/RenderEmpowerer.java index 01cab58d0..46039fa9f 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/render/RenderEmpowerer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/render/RenderEmpowerer.java @@ -1,12 +1,12 @@ -package de.ellpeck.actuallyadditions.blocks.render; +package de.ellpeck.actuallyadditions.common.blocks.render; import com.mojang.blaze3d.matrix.MatrixStack; import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI; import de.ellpeck.actuallyadditions.api.recipe.EmpowererRecipe; -import de.ellpeck.actuallyadditions.ActuallyAdditions; -import de.ellpeck.actuallyadditions.tile.TileEntityEmpowerer; -import de.ellpeck.actuallyadditions.util.AssetUtil; -import de.ellpeck.actuallyadditions.util.StackUtil; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.tile.TileEntityEmpowerer; +import de.ellpeck.actuallyadditions.common.util.AssetUtil; +import de.ellpeck.actuallyadditions.common.util.StackUtil; import net.minecraft.client.renderer.IRenderTypeBuffer; import net.minecraft.client.renderer.Quaternion; import net.minecraft.client.renderer.tileentity.TileEntityRenderer; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/render/RenderLaserRelay.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/render/RenderLaserRelay.java index be1d71434..7a74cbf18 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/render/RenderLaserRelay.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/render/RenderLaserRelay.java @@ -1,16 +1,16 @@ -package de.ellpeck.actuallyadditions.blocks.render; +package de.ellpeck.actuallyadditions.common.blocks.render; import com.mojang.blaze3d.matrix.MatrixStack; import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI; import de.ellpeck.actuallyadditions.api.laser.IConnectionPair; import de.ellpeck.actuallyadditions.api.laser.LaserType; -import de.ellpeck.actuallyadditions.config.ConfigValues; -import de.ellpeck.actuallyadditions.items.InitItems; -import de.ellpeck.actuallyadditions.items.ItemEngineerGoggles; -import de.ellpeck.actuallyadditions.items.ItemLaserWrench; -import de.ellpeck.actuallyadditions.tile.TileEntityLaserRelay; -import de.ellpeck.actuallyadditions.util.AssetUtil; -import de.ellpeck.actuallyadditions.util.StackUtil; +import de.ellpeck.actuallyadditions.common.config.ConfigValues; +import de.ellpeck.actuallyadditions.common.items.InitItems; +import de.ellpeck.actuallyadditions.common.items.ItemEngineerGoggles; +import de.ellpeck.actuallyadditions.common.items.ItemLaserWrench; +import de.ellpeck.actuallyadditions.common.tile.TileEntityLaserRelay; +import de.ellpeck.actuallyadditions.common.util.AssetUtil; +import de.ellpeck.actuallyadditions.common.util.StackUtil; import io.netty.util.internal.ConcurrentSet; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.IRenderTypeBuffer; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/render/RenderReconstructorLens.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/render/RenderReconstructorLens.java index 1447529a0..745101299 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/render/RenderReconstructorLens.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/render/RenderReconstructorLens.java @@ -1,10 +1,10 @@ -package de.ellpeck.actuallyadditions.blocks.render; +package de.ellpeck.actuallyadditions.common.blocks.render; import com.mojang.blaze3d.matrix.MatrixStack; import de.ellpeck.actuallyadditions.api.lens.ILensItem; -import de.ellpeck.actuallyadditions.tile.TileEntityAtomicReconstructor; -import de.ellpeck.actuallyadditions.util.AssetUtil; -import de.ellpeck.actuallyadditions.util.StackUtil; +import de.ellpeck.actuallyadditions.common.tile.TileEntityAtomicReconstructor; +import de.ellpeck.actuallyadditions.common.util.AssetUtil; +import de.ellpeck.actuallyadditions.common.util.StackUtil; import net.minecraft.block.BlockState; import net.minecraft.client.renderer.IRenderTypeBuffer; import net.minecraft.client.renderer.Quaternion; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/render/Transformer.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/render/Transformer.java index f181c94a8..d779419a3 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/render/Transformer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/render/Transformer.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.blocks.render; +package de.ellpeck.actuallyadditions.common.blocks.render; //public class Transformer extends VertexTransformer { diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/config/ConfigCategories.java b/src/main/java/de/ellpeck/actuallyadditions/common/config/ConfigCategories.java index 1e0d7e303..afedc24a9 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/config/ConfigCategories.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/config/ConfigCategories.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.config; +package de.ellpeck.actuallyadditions.common.config; import java.util.Locale; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/config/ConfigValues.java b/src/main/java/de/ellpeck/actuallyadditions/common/config/ConfigValues.java index 28e86924c..3de114045 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/config/ConfigValues.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/config/ConfigValues.java @@ -1,10 +1,10 @@ -package de.ellpeck.actuallyadditions.config; +package de.ellpeck.actuallyadditions.common.config; -import de.ellpeck.actuallyadditions.ActuallyAdditions; -import de.ellpeck.actuallyadditions.config.values.ConfigBoolValues; -import de.ellpeck.actuallyadditions.config.values.ConfigIntListValues; -import de.ellpeck.actuallyadditions.config.values.ConfigIntValues; -import de.ellpeck.actuallyadditions.config.values.ConfigStringListValues; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.config.values.ConfigBoolValues; +import de.ellpeck.actuallyadditions.common.config.values.ConfigIntListValues; +import de.ellpeck.actuallyadditions.common.config.values.ConfigIntValues; +import de.ellpeck.actuallyadditions.common.config.values.ConfigStringListValues; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.Item; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/config/ConfigurationHandler.java b/src/main/java/de/ellpeck/actuallyadditions/common/config/ConfigurationHandler.java index b2a56adbf..03a0c5aab 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/config/ConfigurationHandler.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/config/ConfigurationHandler.java @@ -1,8 +1,8 @@ -package de.ellpeck.actuallyadditions.config; +package de.ellpeck.actuallyadditions.common.config; import java.io.File; -import de.ellpeck.actuallyadditions.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.config.Configuration; import net.minecraftforge.fml.client.event.ConfigChangedEvent; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/config/GuiConfiguration.java b/src/main/java/de/ellpeck/actuallyadditions/common/config/GuiConfiguration.java index 6f3ad4ec2..e260f0ad5 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/config/GuiConfiguration.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/config/GuiConfiguration.java @@ -1,9 +1,9 @@ -package de.ellpeck.actuallyadditions.config; +package de.ellpeck.actuallyadditions.common.config; import java.util.ArrayList; import java.util.List; -import de.ellpeck.actuallyadditions.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; import net.minecraft.client.gui.GuiScreen; import net.minecraftforge.common.config.ConfigElement; import net.minecraftforge.fml.client.config.GuiConfig; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/config/GuiFactory.java b/src/main/java/de/ellpeck/actuallyadditions/common/config/GuiFactory.java index d161ae5eb..ba9438d76 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/config/GuiFactory.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/config/GuiFactory.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.config; +package de.ellpeck.actuallyadditions.common.config; import java.util.Set; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/config/values/ConfigBoolValues.java b/src/main/java/de/ellpeck/actuallyadditions/common/config/values/ConfigBoolValues.java index d42f88e86..f0e5b4d38 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/config/values/ConfigBoolValues.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/config/values/ConfigBoolValues.java @@ -1,6 +1,6 @@ -package de.ellpeck.actuallyadditions.config.values; +package de.ellpeck.actuallyadditions.common.config.values; -import de.ellpeck.actuallyadditions.config.ConfigCategories; +import de.ellpeck.actuallyadditions.common.config.ConfigCategories; public enum ConfigBoolValues { diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/config/values/ConfigIntListValues.java b/src/main/java/de/ellpeck/actuallyadditions/common/config/values/ConfigIntListValues.java index d7ca3377b..817b9b4ba 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/config/values/ConfigIntListValues.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/config/values/ConfigIntListValues.java @@ -1,6 +1,6 @@ -package de.ellpeck.actuallyadditions.config.values; +package de.ellpeck.actuallyadditions.common.config.values; -import de.ellpeck.actuallyadditions.config.ConfigCategories; +import de.ellpeck.actuallyadditions.common.config.ConfigCategories; public enum ConfigIntListValues { diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/config/values/ConfigIntValues.java b/src/main/java/de/ellpeck/actuallyadditions/common/config/values/ConfigIntValues.java index 45d0896eb..07fb77abe 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/config/values/ConfigIntValues.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/config/values/ConfigIntValues.java @@ -1,6 +1,6 @@ -package de.ellpeck.actuallyadditions.config.values; +package de.ellpeck.actuallyadditions.common.config.values; -import de.ellpeck.actuallyadditions.config.ConfigCategories; +import de.ellpeck.actuallyadditions.common.config.ConfigCategories; public enum ConfigIntValues { diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/config/values/ConfigStringListValues.java b/src/main/java/de/ellpeck/actuallyadditions/common/config/values/ConfigStringListValues.java index ec0201a4e..485f3a04c 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/config/values/ConfigStringListValues.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/config/values/ConfigStringListValues.java @@ -1,6 +1,6 @@ -package de.ellpeck.actuallyadditions.config.values; +package de.ellpeck.actuallyadditions.common.config.values; -import de.ellpeck.actuallyadditions.config.ConfigCategories; +import de.ellpeck.actuallyadditions.common.config.ConfigCategories; public enum ConfigStringListValues { diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/crafting/BlockCrafting.java b/src/main/java/de/ellpeck/actuallyadditions/common/crafting/BlockCrafting.java index 16ca8468a..3b6a69606 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/crafting/BlockCrafting.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/crafting/BlockCrafting.java @@ -1,16 +1,16 @@ -package de.ellpeck.actuallyadditions.crafting; +package de.ellpeck.actuallyadditions.common.crafting; -import de.ellpeck.actuallyadditions.ActuallyAdditions; -import de.ellpeck.actuallyadditions.blocks.BlockColoredLamp; -import de.ellpeck.actuallyadditions.blocks.InitBlocks; -import de.ellpeck.actuallyadditions.blocks.metalists.TheMiscBlocks; -import de.ellpeck.actuallyadditions.config.values.ConfigBoolValues; -import de.ellpeck.actuallyadditions.items.InitItems; -import de.ellpeck.actuallyadditions.items.metalists.TheCrystals; -import de.ellpeck.actuallyadditions.items.metalists.TheMiscItems; -import de.ellpeck.actuallyadditions.util.RecipeUtil; -import de.ellpeck.actuallyadditions.util.Util; -import de.ellpeck.actuallyadditions.util.crafting.RecipeHandler; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.blocks.BlockColoredLamp; +import de.ellpeck.actuallyadditions.common.blocks.InitBlocks; +import de.ellpeck.actuallyadditions.common.blocks.metalists.TheMiscBlocks; +import de.ellpeck.actuallyadditions.common.config.values.ConfigBoolValues; +import de.ellpeck.actuallyadditions.common.items.InitItems; +import de.ellpeck.actuallyadditions.common.items.metalists.TheCrystals; +import de.ellpeck.actuallyadditions.common.items.metalists.TheMiscItems; +import de.ellpeck.actuallyadditions.common.util.RecipeUtil; +import de.ellpeck.actuallyadditions.common.util.Util; +import de.ellpeck.actuallyadditions.common.util.crafting.RecipeHandler; import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.init.Items; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/crafting/CrusherCrafting.java b/src/main/java/de/ellpeck/actuallyadditions/common/crafting/CrusherCrafting.java index c39e547d1..677334186 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/crafting/CrusherCrafting.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/crafting/CrusherCrafting.java @@ -1,17 +1,17 @@ -package de.ellpeck.actuallyadditions.crafting; +package de.ellpeck.actuallyadditions.common.crafting; import java.util.ArrayList; import java.util.List; import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI; import de.ellpeck.actuallyadditions.api.recipe.CrusherRecipe; -import de.ellpeck.actuallyadditions.ActuallyAdditions; -import de.ellpeck.actuallyadditions.items.InitItems; -import de.ellpeck.actuallyadditions.items.metalists.TheDusts; -import de.ellpeck.actuallyadditions.items.metalists.TheFoods; -import de.ellpeck.actuallyadditions.recipe.CrusherRecipeRegistry; -import de.ellpeck.actuallyadditions.util.RecipeUtil; -import de.ellpeck.actuallyadditions.util.StackUtil; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.items.InitItems; +import de.ellpeck.actuallyadditions.common.items.metalists.TheDusts; +import de.ellpeck.actuallyadditions.common.items.metalists.TheFoods; +import de.ellpeck.actuallyadditions.common.recipe.CrusherRecipeRegistry; +import de.ellpeck.actuallyadditions.common.util.RecipeUtil; +import de.ellpeck.actuallyadditions.common.util.StackUtil; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/crafting/FoodCrafting.java b/src/main/java/de/ellpeck/actuallyadditions/common/crafting/FoodCrafting.java index 0a0c2146b..f5eee976a 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/crafting/FoodCrafting.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/crafting/FoodCrafting.java @@ -1,11 +1,11 @@ -package de.ellpeck.actuallyadditions.crafting; +package de.ellpeck.actuallyadditions.common.crafting; -import de.ellpeck.actuallyadditions.items.InitItems; -import de.ellpeck.actuallyadditions.items.metalists.TheFoods; -import de.ellpeck.actuallyadditions.items.metalists.TheMiscItems; -import de.ellpeck.actuallyadditions.util.RecipeUtil; -import de.ellpeck.actuallyadditions.util.Util; -import de.ellpeck.actuallyadditions.util.crafting.RecipeHandler; +import de.ellpeck.actuallyadditions.common.items.InitItems; +import de.ellpeck.actuallyadditions.common.items.metalists.TheFoods; +import de.ellpeck.actuallyadditions.common.items.metalists.TheMiscItems; +import de.ellpeck.actuallyadditions.common.util.RecipeUtil; +import de.ellpeck.actuallyadditions.common.util.Util; +import de.ellpeck.actuallyadditions.common.util.crafting.RecipeHandler; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/crafting/InitCrafting.java b/src/main/java/de/ellpeck/actuallyadditions/common/crafting/InitCrafting.java index ce60d5b65..3d4bd0de9 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/crafting/InitCrafting.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/crafting/InitCrafting.java @@ -1,18 +1,18 @@ -package de.ellpeck.actuallyadditions.crafting; +package de.ellpeck.actuallyadditions.common.crafting; import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI; -import de.ellpeck.actuallyadditions.ActuallyAdditions; -import de.ellpeck.actuallyadditions.config.values.ConfigIntListValues; -import de.ellpeck.actuallyadditions.fluids.InitFluids; -import de.ellpeck.actuallyadditions.items.InitItems; -import de.ellpeck.actuallyadditions.items.metalists.TheMiscItems; -import de.ellpeck.actuallyadditions.misc.apiimpl.farmer.CactusFarmerBehavior; -import de.ellpeck.actuallyadditions.misc.apiimpl.farmer.DefaultFarmerBehavior; -import de.ellpeck.actuallyadditions.misc.apiimpl.farmer.MelonPumpkinFarmerBehavior; -import de.ellpeck.actuallyadditions.misc.apiimpl.farmer.NetherWartFarmerBehavior; -import de.ellpeck.actuallyadditions.misc.apiimpl.farmer.ReedFarmerBehavior; -import de.ellpeck.actuallyadditions.misc.apiimpl.farmer.exu.EnderlillyFarmerBehavior; -import de.ellpeck.actuallyadditions.misc.apiimpl.farmer.exu.RedOrchidFarmerBehavior; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.config.values.ConfigIntListValues; +import de.ellpeck.actuallyadditions.common.fluids.InitFluids; +import de.ellpeck.actuallyadditions.common.items.InitItems; +import de.ellpeck.actuallyadditions.common.items.metalists.TheMiscItems; +import de.ellpeck.actuallyadditions.common.misc.apiimpl.farmer.CactusFarmerBehavior; +import de.ellpeck.actuallyadditions.common.misc.apiimpl.farmer.DefaultFarmerBehavior; +import de.ellpeck.actuallyadditions.common.misc.apiimpl.farmer.MelonPumpkinFarmerBehavior; +import de.ellpeck.actuallyadditions.common.misc.apiimpl.farmer.NetherWartFarmerBehavior; +import de.ellpeck.actuallyadditions.common.misc.apiimpl.farmer.ReedFarmerBehavior; +import de.ellpeck.actuallyadditions.common.misc.apiimpl.farmer.exu.EnderlillyFarmerBehavior; +import de.ellpeck.actuallyadditions.common.misc.apiimpl.farmer.exu.RedOrchidFarmerBehavior; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.Ingredient; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/crafting/ItemCrafting.java b/src/main/java/de/ellpeck/actuallyadditions/common/crafting/ItemCrafting.java index bf484f229..5c70546c1 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/crafting/ItemCrafting.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/crafting/ItemCrafting.java @@ -1,21 +1,21 @@ -package de.ellpeck.actuallyadditions.crafting; +package de.ellpeck.actuallyadditions.common.crafting; import java.util.ArrayList; -import de.ellpeck.actuallyadditions.ActuallyAdditions; -import de.ellpeck.actuallyadditions.blocks.InitBlocks; -import de.ellpeck.actuallyadditions.blocks.metalists.TheColoredLampColors; -import de.ellpeck.actuallyadditions.blocks.metalists.TheMiscBlocks; -import de.ellpeck.actuallyadditions.config.values.ConfigBoolValues; -import de.ellpeck.actuallyadditions.items.InitItems; -import de.ellpeck.actuallyadditions.items.metalists.TheCrystals; -import de.ellpeck.actuallyadditions.items.metalists.TheDusts; -import de.ellpeck.actuallyadditions.items.metalists.TheFoods; -import de.ellpeck.actuallyadditions.items.metalists.TheMiscItems; -import de.ellpeck.actuallyadditions.items.metalists.ThePotionRings; -import de.ellpeck.actuallyadditions.util.RecipeUtil; -import de.ellpeck.actuallyadditions.util.Util; -import de.ellpeck.actuallyadditions.util.crafting.RecipeHandler; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.blocks.InitBlocks; +import de.ellpeck.actuallyadditions.common.blocks.metalists.TheColoredLampColors; +import de.ellpeck.actuallyadditions.common.blocks.metalists.TheMiscBlocks; +import de.ellpeck.actuallyadditions.common.config.values.ConfigBoolValues; +import de.ellpeck.actuallyadditions.common.items.InitItems; +import de.ellpeck.actuallyadditions.common.items.metalists.TheCrystals; +import de.ellpeck.actuallyadditions.common.items.metalists.TheDusts; +import de.ellpeck.actuallyadditions.common.items.metalists.TheFoods; +import de.ellpeck.actuallyadditions.common.items.metalists.TheMiscItems; +import de.ellpeck.actuallyadditions.common.items.metalists.ThePotionRings; +import de.ellpeck.actuallyadditions.common.util.RecipeUtil; +import de.ellpeck.actuallyadditions.common.util.Util; +import de.ellpeck.actuallyadditions.common.util.crafting.RecipeHandler; import net.minecraft.enchantment.EnchantmentData; import net.minecraft.init.Blocks; import net.minecraft.init.Enchantments; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/crafting/RecipeKeepDataShaped.java b/src/main/java/de/ellpeck/actuallyadditions/common/crafting/RecipeKeepDataShaped.java index a8800eb67..6f17d2dbb 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/crafting/RecipeKeepDataShaped.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/crafting/RecipeKeepDataShaped.java @@ -1,8 +1,8 @@ -package de.ellpeck.actuallyadditions.crafting; +package de.ellpeck.actuallyadditions.common.crafting; -import de.ellpeck.actuallyadditions.util.ItemUtil; -import de.ellpeck.actuallyadditions.util.StackUtil; -import de.ellpeck.actuallyadditions.util.crafting.RecipeHelper; +import de.ellpeck.actuallyadditions.common.util.ItemUtil; +import de.ellpeck.actuallyadditions.common.util.StackUtil; +import de.ellpeck.actuallyadditions.common.util.crafting.RecipeHelper; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/crafting/RecipeKeepDataShapeless.java b/src/main/java/de/ellpeck/actuallyadditions/common/crafting/RecipeKeepDataShapeless.java index d9361b3f4..14b5a105c 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/crafting/RecipeKeepDataShapeless.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/crafting/RecipeKeepDataShapeless.java @@ -1,8 +1,8 @@ -package de.ellpeck.actuallyadditions.crafting; +package de.ellpeck.actuallyadditions.common.crafting; -import de.ellpeck.actuallyadditions.util.ItemUtil; -import de.ellpeck.actuallyadditions.util.StackUtil; -import de.ellpeck.actuallyadditions.util.crafting.RecipeHelper; +import de.ellpeck.actuallyadditions.common.util.ItemUtil; +import de.ellpeck.actuallyadditions.common.util.StackUtil; +import de.ellpeck.actuallyadditions.common.util.crafting.RecipeHelper; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/crafting/RecipePotionRingCharging.java b/src/main/java/de/ellpeck/actuallyadditions/common/crafting/RecipePotionRingCharging.java index cf54471bc..3c4bf78b9 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/crafting/RecipePotionRingCharging.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/crafting/RecipePotionRingCharging.java @@ -1,8 +1,8 @@ -package de.ellpeck.actuallyadditions.crafting; +package de.ellpeck.actuallyadditions.common.crafting; -import de.ellpeck.actuallyadditions.items.ItemPotionRing; -import de.ellpeck.actuallyadditions.util.StackUtil; -import de.ellpeck.actuallyadditions.util.crafting.RecipeHelper; +import de.ellpeck.actuallyadditions.common.items.ItemPotionRing; +import de.ellpeck.actuallyadditions.common.util.StackUtil; +import de.ellpeck.actuallyadditions.common.util.crafting.RecipeHelper; import net.minecraft.init.Items; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/crafting/ToolCrafting.java b/src/main/java/de/ellpeck/actuallyadditions/common/crafting/ToolCrafting.java index 9fedd423c..56cff0c18 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/crafting/ToolCrafting.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/crafting/ToolCrafting.java @@ -1,11 +1,11 @@ -package de.ellpeck.actuallyadditions.crafting; +package de.ellpeck.actuallyadditions.common.crafting; import java.util.ArrayList; -import de.ellpeck.actuallyadditions.items.InitItems; -import de.ellpeck.actuallyadditions.items.metalists.TheCrystals; -import de.ellpeck.actuallyadditions.util.RecipeUtil; -import de.ellpeck.actuallyadditions.util.crafting.RecipeHandler; +import de.ellpeck.actuallyadditions.common.items.InitItems; +import de.ellpeck.actuallyadditions.common.items.metalists.TheCrystals; +import de.ellpeck.actuallyadditions.common.util.RecipeUtil; +import de.ellpeck.actuallyadditions.common.util.crafting.RecipeHandler; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.Item; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/creative/CreativeTab.java b/src/main/java/de/ellpeck/actuallyadditions/common/creative/CreativeTab.java index d012da69d..96178842d 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/creative/CreativeTab.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/creative/CreativeTab.java @@ -1,11 +1,11 @@ // todo: reimplement this the normal 1.14+ -//package de.ellpeck.actuallyadditions.creative; +//package de.ellpeck.actuallyadditions.common.creative; // //import de.ellpeck.actuallyadditions.api.misc.IDisableableItem; -//import de.ellpeck.actuallyadditions.ActuallyAdditions; -//import de.ellpeck.actuallyadditions.blocks.InitBlocks; -//import de.ellpeck.actuallyadditions.fluids.InitFluids; -//import de.ellpeck.actuallyadditions.items.InitItems; +//import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +//import de.ellpeck.actuallyadditions.common.blocks.InitBlocks; +//import de.ellpeck.actuallyadditions.common.fluids.InitFluids; +//import de.ellpeck.actuallyadditions.common.items.InitItems; //import net.minecraft.block.Block; //import net.minecraft.creativetab.CreativeTabs; //import net.minecraft.item.Item; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/data/PlayerData.java b/src/main/java/de/ellpeck/actuallyadditions/common/data/PlayerData.java index d221c0d13..2452504d9 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/data/PlayerData.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/data/PlayerData.java @@ -6,8 +6,8 @@ import java.util.UUID; import java.util.concurrent.ConcurrentHashMap; import de.ellpeck.actuallyadditions.api.booklet.IBookletPage; -import de.ellpeck.actuallyadditions.common.booklet.gui.GuiBooklet; -import de.ellpeck.actuallyadditions.common.booklet.misc.BookletUtils; +import de.ellpeck.actuallyadditions.booklet.gui.GuiBooklet; +import de.ellpeck.actuallyadditions.booklet.misc.BookletUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/data/WorldData.java b/src/main/java/de/ellpeck/actuallyadditions/common/data/WorldData.java index 1a371b80b..506a2a041 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/data/WorldData.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/data/WorldData.java @@ -1,12 +1,12 @@ -package de.ellpeck.actuallyadditions.data; +package de.ellpeck.actuallyadditions.common.data; import java.util.UUID; import java.util.concurrent.ConcurrentHashMap; import de.ellpeck.actuallyadditions.api.laser.Network; -import de.ellpeck.actuallyadditions.ActuallyAdditions; -import de.ellpeck.actuallyadditions.data.PlayerData.PlayerSave; -import de.ellpeck.actuallyadditions.misc.apiimpl.LaserRelayConnectionHandler; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.data.PlayerData.PlayerSave; +import de.ellpeck.actuallyadditions.common.misc.apiimpl.LaserRelayConnectionHandler; import io.netty.util.internal.ConcurrentSet; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/entity/EntityWorm.java b/src/main/java/de/ellpeck/actuallyadditions/common/entity/EntityWorm.java index ecb7bcace..d3edbcfbe 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/entity/EntityWorm.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/entity/EntityWorm.java @@ -1,7 +1,7 @@ -package de.ellpeck.actuallyadditions.entity; +package de.ellpeck.actuallyadditions.common.entity; -import de.ellpeck.actuallyadditions.config.values.ConfigIntValues; -import de.ellpeck.actuallyadditions.misc.apiimpl.farmer.DefaultFarmerBehavior; +import de.ellpeck.actuallyadditions.common.config.values.ConfigIntValues; +import de.ellpeck.actuallyadditions.common.misc.apiimpl.farmer.DefaultFarmerBehavior; import net.minecraft.block.Block; import net.minecraft.block.BlockBush; import net.minecraft.block.BlockDirt; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/entity/RenderWorm.java b/src/main/java/de/ellpeck/actuallyadditions/common/entity/RenderWorm.java index a1b0106ba..81171c735 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/entity/RenderWorm.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/entity/RenderWorm.java @@ -1,7 +1,7 @@ -package de.ellpeck.actuallyadditions.entity; +package de.ellpeck.actuallyadditions.common.entity; -import de.ellpeck.actuallyadditions.items.InitItems; -import de.ellpeck.actuallyadditions.util.AssetUtil; +import de.ellpeck.actuallyadditions.common.items.InitItems; +import de.ellpeck.actuallyadditions.common.util.AssetUtil; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.entity.Render; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/event/ClientEvents.java b/src/main/java/de/ellpeck/actuallyadditions/common/event/ClientEvents.java index b6530bf4e..d2950b071 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/event/ClientEvents.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/event/ClientEvents.java @@ -1,20 +1,20 @@ -package de.ellpeck.actuallyadditions.event; +package de.ellpeck.actuallyadditions.common.event; import java.util.Locale; import com.mojang.blaze3d.platform.GlStateManager; -import de.ellpeck.actuallyadditions.ActuallyAdditions; -import de.ellpeck.actuallyadditions.blocks.IHudDisplay; -import de.ellpeck.actuallyadditions.config.ConfigValues; -import de.ellpeck.actuallyadditions.config.values.ConfigBoolValues; -import de.ellpeck.actuallyadditions.config.values.ConfigIntValues; -import de.ellpeck.actuallyadditions.data.WorldData; -import de.ellpeck.actuallyadditions.inventory.gui.EnergyDisplay; -import de.ellpeck.actuallyadditions.items.ItemWingsOfTheBats; -import de.ellpeck.actuallyadditions.tile.IEnergyDisplay; -import de.ellpeck.actuallyadditions.tile.TileEntityBase; -import de.ellpeck.actuallyadditions.util.StackUtil; -import de.ellpeck.actuallyadditions.util.StringUtil; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.blocks.IHudDisplay; +import de.ellpeck.actuallyadditions.common.config.ConfigValues; +import de.ellpeck.actuallyadditions.common.config.values.ConfigBoolValues; +import de.ellpeck.actuallyadditions.common.config.values.ConfigIntValues; +import de.ellpeck.actuallyadditions.common.data.WorldData; +import de.ellpeck.actuallyadditions.common.inventory.gui.EnergyDisplay; +import de.ellpeck.actuallyadditions.common.items.ItemWingsOfTheBats; +import de.ellpeck.actuallyadditions.common.tile.IEnergyDisplay; +import de.ellpeck.actuallyadditions.common.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.common.util.StackUtil; +import de.ellpeck.actuallyadditions.common.util.StringUtil; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/event/CommonEvents.java b/src/main/java/de/ellpeck/actuallyadditions/common/event/CommonEvents.java index 3dd85b292..db87aaabb 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/event/CommonEvents.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/event/CommonEvents.java @@ -1,21 +1,21 @@ -package de.ellpeck.actuallyadditions.event; +package de.ellpeck.actuallyadditions.common.event; import java.util.Locale; -import de.ellpeck.actuallyadditions.ActuallyAdditions; -import de.ellpeck.actuallyadditions.config.values.ConfigBoolValues; -import de.ellpeck.actuallyadditions.data.PlayerData; -import de.ellpeck.actuallyadditions.data.WorldData; -import de.ellpeck.actuallyadditions.inventory.ContainerBag; -import de.ellpeck.actuallyadditions.items.InitItems; -import de.ellpeck.actuallyadditions.items.ItemBag; -import de.ellpeck.actuallyadditions.items.ItemDrill; -import de.ellpeck.actuallyadditions.items.metalists.TheMiscItems; -import de.ellpeck.actuallyadditions.network.PacketHandlerHelper; -import de.ellpeck.actuallyadditions.tile.FilterSettings; -import de.ellpeck.actuallyadditions.util.ItemStackHandlerAA; -import de.ellpeck.actuallyadditions.util.ItemUtil; -import de.ellpeck.actuallyadditions.util.StackUtil; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.config.values.ConfigBoolValues; +import de.ellpeck.actuallyadditions.common.data.PlayerData; +import de.ellpeck.actuallyadditions.common.data.WorldData; +import de.ellpeck.actuallyadditions.common.inventory.ContainerBag; +import de.ellpeck.actuallyadditions.common.items.InitItems; +import de.ellpeck.actuallyadditions.common.items.ItemBag; +import de.ellpeck.actuallyadditions.common.items.ItemDrill; +import de.ellpeck.actuallyadditions.common.items.metalists.TheMiscItems; +import de.ellpeck.actuallyadditions.common.network.PacketHandlerHelper; +import de.ellpeck.actuallyadditions.common.tile.FilterSettings; +import de.ellpeck.actuallyadditions.common.util.ItemStackHandlerAA; +import de.ellpeck.actuallyadditions.common.util.ItemUtil; +import de.ellpeck.actuallyadditions.common.util.StackUtil; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.monster.EntitySpider; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/fluids/FluidAA.java b/src/main/java/de/ellpeck/actuallyadditions/common/fluids/FluidAA.java index 8a29b3a6f..30cfd9245 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/fluids/FluidAA.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/fluids/FluidAA.java @@ -1,6 +1,6 @@ -package de.ellpeck.actuallyadditions.fluids; +package de.ellpeck.actuallyadditions.common.fluids; -import de.ellpeck.actuallyadditions.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fluids.Fluid; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/fluids/InitFluids.java b/src/main/java/de/ellpeck/actuallyadditions/common/fluids/InitFluids.java index 46c48e86b..9ceba2ae5 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/fluids/InitFluids.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/fluids/InitFluids.java @@ -1,8 +1,8 @@ -package de.ellpeck.actuallyadditions.fluids; +package de.ellpeck.actuallyadditions.common.fluids; import java.util.Locale; -import de.ellpeck.actuallyadditions.blocks.base.BlockFluidFlowing; +import de.ellpeck.actuallyadditions.common.blocks.base.BlockFluidFlowing; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.item.EnumRarity; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/gen/AAWorldGen.java b/src/main/java/de/ellpeck/actuallyadditions/common/gen/AAWorldGen.java index a3e62ed69..d50ed15b8 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/gen/AAWorldGen.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/gen/AAWorldGen.java @@ -1,20 +1,20 @@ -package de.ellpeck.actuallyadditions.gen; +package de.ellpeck.actuallyadditions.common.gen; import java.util.ArrayList; import java.util.Random; import org.apache.commons.lang3.ArrayUtils; -import de.ellpeck.actuallyadditions.ActuallyAdditions; -import de.ellpeck.actuallyadditions.blocks.BlockMisc; -import de.ellpeck.actuallyadditions.blocks.BlockWildPlant; -import de.ellpeck.actuallyadditions.blocks.InitBlocks; -import de.ellpeck.actuallyadditions.blocks.metalists.TheMiscBlocks; -import de.ellpeck.actuallyadditions.blocks.metalists.TheWildPlants; -import de.ellpeck.actuallyadditions.config.values.ConfigBoolValues; -import de.ellpeck.actuallyadditions.config.values.ConfigIntListValues; -import de.ellpeck.actuallyadditions.config.values.ConfigIntValues; -import de.ellpeck.actuallyadditions.util.WorldUtil; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.blocks.BlockMisc; +import de.ellpeck.actuallyadditions.common.blocks.BlockWildPlant; +import de.ellpeck.actuallyadditions.common.blocks.InitBlocks; +import de.ellpeck.actuallyadditions.common.blocks.metalists.TheMiscBlocks; +import de.ellpeck.actuallyadditions.common.blocks.metalists.TheWildPlants; +import de.ellpeck.actuallyadditions.common.config.values.ConfigBoolValues; +import de.ellpeck.actuallyadditions.common.config.values.ConfigIntListValues; +import de.ellpeck.actuallyadditions.common.config.values.ConfigIntValues; +import de.ellpeck.actuallyadditions.common.util.WorldUtil; import net.minecraft.block.Block; import net.minecraft.block.BlockHorizontal; import net.minecraft.block.material.Material; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/gen/WorldGenLushCaves.java b/src/main/java/de/ellpeck/actuallyadditions/common/gen/WorldGenLushCaves.java index 87877e190..f64ff0361 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/gen/WorldGenLushCaves.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/gen/WorldGenLushCaves.java @@ -1,14 +1,14 @@ -package de.ellpeck.actuallyadditions.gen; +package de.ellpeck.actuallyadditions.common.gen; import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Random; -import de.ellpeck.actuallyadditions.blocks.InitBlocks; -import de.ellpeck.actuallyadditions.config.values.ConfigBoolValues; -import de.ellpeck.actuallyadditions.misc.DungeonLoot; -import de.ellpeck.actuallyadditions.tile.TileEntityGiantChest; +import de.ellpeck.actuallyadditions.common.blocks.InitBlocks; +import de.ellpeck.actuallyadditions.common.config.values.ConfigBoolValues; +import de.ellpeck.actuallyadditions.common.misc.DungeonLoot; +import de.ellpeck.actuallyadditions.common.tile.TileEntityGiantChest; import net.minecraft.block.Block; import net.minecraft.block.BlockDirectional; import net.minecraft.block.state.IBlockState; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/gen/village/InitVillager.java b/src/main/java/de/ellpeck/actuallyadditions/common/gen/village/InitVillager.java index 2aaf9752e..d497bbffd 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/gen/village/InitVillager.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/gen/village/InitVillager.java @@ -1,19 +1,19 @@ -package de.ellpeck.actuallyadditions.gen.village; +package de.ellpeck.actuallyadditions.common.gen.village; -import de.ellpeck.actuallyadditions.ActuallyAdditions; -import de.ellpeck.actuallyadditions.blocks.InitBlocks; -import de.ellpeck.actuallyadditions.blocks.metalists.TheMiscBlocks; -import de.ellpeck.actuallyadditions.config.values.ConfigBoolValues; -import de.ellpeck.actuallyadditions.gen.village.component.VillageComponentCustomCropField; -import de.ellpeck.actuallyadditions.gen.village.component.VillageComponentEngineerHouse; -import de.ellpeck.actuallyadditions.gen.village.component.VillageComponentJamHouse; -import de.ellpeck.actuallyadditions.gen.village.component.handler.VillageCustomCropFieldHandler; -import de.ellpeck.actuallyadditions.gen.village.component.handler.VillageEngineerHouseHandler; -import de.ellpeck.actuallyadditions.gen.village.component.handler.VillageJamHouseHandler; -import de.ellpeck.actuallyadditions.items.InitItems; -import de.ellpeck.actuallyadditions.items.metalists.TheCrystals; -import de.ellpeck.actuallyadditions.items.metalists.TheJams; -import de.ellpeck.actuallyadditions.items.metalists.TheMiscItems; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.blocks.InitBlocks; +import de.ellpeck.actuallyadditions.common.blocks.metalists.TheMiscBlocks; +import de.ellpeck.actuallyadditions.common.config.values.ConfigBoolValues; +import de.ellpeck.actuallyadditions.common.gen.village.component.VillageComponentCustomCropField; +import de.ellpeck.actuallyadditions.common.gen.village.component.VillageComponentEngineerHouse; +import de.ellpeck.actuallyadditions.common.gen.village.component.VillageComponentJamHouse; +import de.ellpeck.actuallyadditions.common.gen.village.component.handler.VillageCustomCropFieldHandler; +import de.ellpeck.actuallyadditions.common.gen.village.component.handler.VillageEngineerHouseHandler; +import de.ellpeck.actuallyadditions.common.gen.village.component.handler.VillageJamHouseHandler; +import de.ellpeck.actuallyadditions.common.items.InitItems; +import de.ellpeck.actuallyadditions.common.items.metalists.TheCrystals; +import de.ellpeck.actuallyadditions.common.items.metalists.TheJams; +import de.ellpeck.actuallyadditions.common.items.metalists.TheMiscItems; import net.minecraft.entity.passive.EntityVillager.PriceInfo; import net.minecraft.item.ItemStack; import net.minecraft.world.gen.structure.MapGenStructureIO; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/gen/village/component/VillageComponentCustomCropField.java b/src/main/java/de/ellpeck/actuallyadditions/common/gen/village/component/VillageComponentCustomCropField.java index 478f19c6e..e188f6573 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/gen/village/component/VillageComponentCustomCropField.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/gen/village/component/VillageComponentCustomCropField.java @@ -1,9 +1,9 @@ -package de.ellpeck.actuallyadditions.gen.village.component; +package de.ellpeck.actuallyadditions.common.gen.village.component; import java.util.List; import java.util.Random; -import de.ellpeck.actuallyadditions.blocks.InitBlocks; +import de.ellpeck.actuallyadditions.common.blocks.InitBlocks; import net.minecraft.block.Block; import net.minecraft.block.BlockCrops; import net.minecraft.block.state.IBlockState; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/gen/village/component/VillageComponentEngineerHouse.java b/src/main/java/de/ellpeck/actuallyadditions/common/gen/village/component/VillageComponentEngineerHouse.java index a2676381a..b8928b8a6 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/gen/village/component/VillageComponentEngineerHouse.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/gen/village/component/VillageComponentEngineerHouse.java @@ -1,29 +1,29 @@ -package de.ellpeck.actuallyadditions.gen.village.component; +package de.ellpeck.actuallyadditions.common.gen.village.component; import java.util.List; import java.util.Random; import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI; import de.ellpeck.actuallyadditions.api.laser.LaserType; -import de.ellpeck.actuallyadditions.ActuallyAdditions; -import de.ellpeck.actuallyadditions.blocks.BlockColoredLamp; -import de.ellpeck.actuallyadditions.blocks.InitBlocks; -import de.ellpeck.actuallyadditions.blocks.metalists.TheColoredLampColors; -import de.ellpeck.actuallyadditions.blocks.metalists.TheMiscBlocks; -import de.ellpeck.actuallyadditions.config.values.ConfigBoolValues; -import de.ellpeck.actuallyadditions.fluids.InitFluids; -import de.ellpeck.actuallyadditions.gen.village.InitVillager; -import de.ellpeck.actuallyadditions.items.InitItems; -import de.ellpeck.actuallyadditions.items.metalists.TheMiscItems; -import de.ellpeck.actuallyadditions.misc.DungeonLoot; -import de.ellpeck.actuallyadditions.tile.TileEntityAtomicReconstructor; -import de.ellpeck.actuallyadditions.tile.TileEntityCanolaPress; -import de.ellpeck.actuallyadditions.tile.TileEntityCoalGenerator; -import de.ellpeck.actuallyadditions.tile.TileEntityCoffeeMachine; -import de.ellpeck.actuallyadditions.tile.TileEntityCompost; -import de.ellpeck.actuallyadditions.tile.TileEntityFermentingBarrel; -import de.ellpeck.actuallyadditions.tile.TileEntityGrinder; -import de.ellpeck.actuallyadditions.tile.TileEntityLaserRelayEnergy; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.blocks.BlockColoredLamp; +import de.ellpeck.actuallyadditions.common.blocks.InitBlocks; +import de.ellpeck.actuallyadditions.common.blocks.metalists.TheColoredLampColors; +import de.ellpeck.actuallyadditions.common.blocks.metalists.TheMiscBlocks; +import de.ellpeck.actuallyadditions.common.config.values.ConfigBoolValues; +import de.ellpeck.actuallyadditions.common.fluids.InitFluids; +import de.ellpeck.actuallyadditions.common.gen.village.InitVillager; +import de.ellpeck.actuallyadditions.common.items.InitItems; +import de.ellpeck.actuallyadditions.common.items.metalists.TheMiscItems; +import de.ellpeck.actuallyadditions.common.misc.DungeonLoot; +import de.ellpeck.actuallyadditions.common.tile.TileEntityAtomicReconstructor; +import de.ellpeck.actuallyadditions.common.tile.TileEntityCanolaPress; +import de.ellpeck.actuallyadditions.common.tile.TileEntityCoalGenerator; +import de.ellpeck.actuallyadditions.common.tile.TileEntityCoffeeMachine; +import de.ellpeck.actuallyadditions.common.tile.TileEntityCompost; +import de.ellpeck.actuallyadditions.common.tile.TileEntityFermentingBarrel; +import de.ellpeck.actuallyadditions.common.tile.TileEntityGrinder; +import de.ellpeck.actuallyadditions.common.tile.TileEntityLaserRelayEnergy; import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.init.Items; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/gen/village/component/VillageComponentJamHouse.java b/src/main/java/de/ellpeck/actuallyadditions/common/gen/village/component/VillageComponentJamHouse.java index 9719a0411..999e7c668 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/gen/village/component/VillageComponentJamHouse.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/gen/village/component/VillageComponentJamHouse.java @@ -1,13 +1,13 @@ -package de.ellpeck.actuallyadditions.gen.village.component; +package de.ellpeck.actuallyadditions.common.gen.village.component; import java.util.List; import java.util.Random; -import de.ellpeck.actuallyadditions.blocks.InitBlocks; -import de.ellpeck.actuallyadditions.config.values.ConfigBoolValues; -import de.ellpeck.actuallyadditions.gen.village.InitVillager; -import de.ellpeck.actuallyadditions.misc.DungeonLoot; -import de.ellpeck.actuallyadditions.tile.TileEntityGiantChest; +import de.ellpeck.actuallyadditions.common.blocks.InitBlocks; +import de.ellpeck.actuallyadditions.common.config.values.ConfigBoolValues; +import de.ellpeck.actuallyadditions.common.gen.village.InitVillager; +import de.ellpeck.actuallyadditions.common.misc.DungeonLoot; +import de.ellpeck.actuallyadditions.common.tile.TileEntityGiantChest; import net.minecraft.block.Block; import net.minecraft.block.BlockDoor; import net.minecraft.block.BlockLeaves; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/gen/village/component/handler/VillageCustomCropFieldHandler.java b/src/main/java/de/ellpeck/actuallyadditions/common/gen/village/component/handler/VillageCustomCropFieldHandler.java index 8147bc5b4..c8ef24225 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/gen/village/component/handler/VillageCustomCropFieldHandler.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/gen/village/component/handler/VillageCustomCropFieldHandler.java @@ -1,9 +1,9 @@ -package de.ellpeck.actuallyadditions.gen.village.component.handler; +package de.ellpeck.actuallyadditions.common.gen.village.component.handler; import java.util.List; import java.util.Random; -import de.ellpeck.actuallyadditions.gen.village.component.VillageComponentCustomCropField; +import de.ellpeck.actuallyadditions.common.gen.village.component.VillageComponentCustomCropField; import net.minecraft.util.EnumFacing; import net.minecraft.world.gen.structure.StructureComponent; import net.minecraft.world.gen.structure.StructureVillagePieces; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/gen/village/component/handler/VillageEngineerHouseHandler.java b/src/main/java/de/ellpeck/actuallyadditions/common/gen/village/component/handler/VillageEngineerHouseHandler.java index fd3edeb6e..b4a76d985 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/gen/village/component/handler/VillageEngineerHouseHandler.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/gen/village/component/handler/VillageEngineerHouseHandler.java @@ -1,9 +1,9 @@ -package de.ellpeck.actuallyadditions.gen.village.component.handler; +package de.ellpeck.actuallyadditions.common.gen.village.component.handler; import java.util.List; import java.util.Random; -import de.ellpeck.actuallyadditions.gen.village.component.VillageComponentEngineerHouse; +import de.ellpeck.actuallyadditions.common.gen.village.component.VillageComponentEngineerHouse; import net.minecraft.util.EnumFacing; import net.minecraft.world.gen.structure.StructureComponent; import net.minecraft.world.gen.structure.StructureVillagePieces; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/gen/village/component/handler/VillageJamHouseHandler.java b/src/main/java/de/ellpeck/actuallyadditions/common/gen/village/component/handler/VillageJamHouseHandler.java index 431838404..208571966 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/gen/village/component/handler/VillageJamHouseHandler.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/gen/village/component/handler/VillageJamHouseHandler.java @@ -1,9 +1,9 @@ -package de.ellpeck.actuallyadditions.gen.village.component.handler; +package de.ellpeck.actuallyadditions.common.gen.village.component.handler; import java.util.List; import java.util.Random; -import de.ellpeck.actuallyadditions.gen.village.component.VillageComponentJamHouse; +import de.ellpeck.actuallyadditions.common.gen.village.component.VillageComponentJamHouse; import net.minecraft.util.EnumFacing; import net.minecraft.world.gen.structure.StructureComponent; import net.minecraft.world.gen.structure.StructureVillagePieces; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerBag.java b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerBag.java index 742feede5..0f270ac68 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerBag.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerBag.java @@ -1,22 +1,22 @@ -package de.ellpeck.actuallyadditions.inventory; +package de.ellpeck.actuallyadditions.common.inventory; import java.util.ArrayList; import java.util.List; import org.apache.commons.lang3.tuple.Pair; -import de.ellpeck.actuallyadditions.ActuallyAdditions; -import de.ellpeck.actuallyadditions.config.values.ConfigStringListValues; -import de.ellpeck.actuallyadditions.inventory.slot.SlotDeletion; -import de.ellpeck.actuallyadditions.inventory.slot.SlotFilter; -import de.ellpeck.actuallyadditions.inventory.slot.SlotImmovable; -import de.ellpeck.actuallyadditions.inventory.slot.SlotItemHandlerUnconditioned; -import de.ellpeck.actuallyadditions.items.ItemBag; -import de.ellpeck.actuallyadditions.items.ItemDrill; -import de.ellpeck.actuallyadditions.network.gui.IButtonReactor; -import de.ellpeck.actuallyadditions.tile.FilterSettings; -import de.ellpeck.actuallyadditions.util.ItemStackHandlerAA; -import de.ellpeck.actuallyadditions.util.StackUtil; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.config.values.ConfigStringListValues; +import de.ellpeck.actuallyadditions.common.inventory.slot.SlotDeletion; +import de.ellpeck.actuallyadditions.common.inventory.slot.SlotFilter; +import de.ellpeck.actuallyadditions.common.inventory.slot.SlotImmovable; +import de.ellpeck.actuallyadditions.common.inventory.slot.SlotItemHandlerUnconditioned; +import de.ellpeck.actuallyadditions.common.items.ItemBag; +import de.ellpeck.actuallyadditions.common.items.ItemDrill; +import de.ellpeck.actuallyadditions.common.network.gui.IButtonReactor; +import de.ellpeck.actuallyadditions.common.tile.FilterSettings; +import de.ellpeck.actuallyadditions.common.util.ItemStackHandlerAA; +import de.ellpeck.actuallyadditions.common.util.StackUtil; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.ClickType; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerBioReactor.java b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerBioReactor.java index e523afca7..1fc2f6251 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerBioReactor.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerBioReactor.java @@ -1,9 +1,9 @@ -package de.ellpeck.actuallyadditions.inventory; +package de.ellpeck.actuallyadditions.common.inventory; -import de.ellpeck.actuallyadditions.inventory.slot.SlotItemHandlerUnconditioned; -import de.ellpeck.actuallyadditions.tile.TileEntityBase; -import de.ellpeck.actuallyadditions.tile.TileEntityBioReactor; -import de.ellpeck.actuallyadditions.util.StackUtil; +import de.ellpeck.actuallyadditions.common.inventory.slot.SlotItemHandlerUnconditioned; +import de.ellpeck.actuallyadditions.common.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.common.tile.TileEntityBioReactor; +import de.ellpeck.actuallyadditions.common.util.StackUtil; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerBreaker.java b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerBreaker.java index 47f97b8f1..312c30e22 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerBreaker.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerBreaker.java @@ -1,9 +1,9 @@ -package de.ellpeck.actuallyadditions.inventory; +package de.ellpeck.actuallyadditions.common.inventory; -import de.ellpeck.actuallyadditions.inventory.slot.SlotItemHandlerUnconditioned; -import de.ellpeck.actuallyadditions.tile.TileEntityBase; -import de.ellpeck.actuallyadditions.tile.TileEntityBreaker; -import de.ellpeck.actuallyadditions.util.StackUtil; +import de.ellpeck.actuallyadditions.common.inventory.slot.SlotItemHandlerUnconditioned; +import de.ellpeck.actuallyadditions.common.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.common.tile.TileEntityBreaker; +import de.ellpeck.actuallyadditions.common.util.StackUtil; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerCanolaPress.java b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerCanolaPress.java index cc76e9c23..291e7906b 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerCanolaPress.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerCanolaPress.java @@ -1,11 +1,11 @@ -package de.ellpeck.actuallyadditions.inventory; +package de.ellpeck.actuallyadditions.common.inventory; -import de.ellpeck.actuallyadditions.inventory.slot.SlotItemHandlerUnconditioned; -import de.ellpeck.actuallyadditions.items.InitItems; -import de.ellpeck.actuallyadditions.items.metalists.TheMiscItems; -import de.ellpeck.actuallyadditions.tile.TileEntityBase; -import de.ellpeck.actuallyadditions.tile.TileEntityCanolaPress; -import de.ellpeck.actuallyadditions.util.StackUtil; +import de.ellpeck.actuallyadditions.common.inventory.slot.SlotItemHandlerUnconditioned; +import de.ellpeck.actuallyadditions.common.items.InitItems; +import de.ellpeck.actuallyadditions.common.items.metalists.TheMiscItems; +import de.ellpeck.actuallyadditions.common.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.common.tile.TileEntityCanolaPress; +import de.ellpeck.actuallyadditions.common.util.StackUtil; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerCoalGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerCoalGenerator.java index dbdb2af3a..1e24ee893 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerCoalGenerator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerCoalGenerator.java @@ -72,4 +72,6 @@ public class ContainerCoalGenerator extends Container { @Override public boolean canInteractWith(EntityPlayer player) { - return this.genera \ No newline at end of file + return this.generator.canPlayerUse(player); + } +} \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerCoffeeMachine.java b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerCoffeeMachine.java index 9ba0a0c7d..c725ec806 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerCoffeeMachine.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerCoffeeMachine.java @@ -1,13 +1,13 @@ -package de.ellpeck.actuallyadditions.inventory; +package de.ellpeck.actuallyadditions.common.inventory; -import de.ellpeck.actuallyadditions.inventory.slot.SlotItemHandlerUnconditioned; -import de.ellpeck.actuallyadditions.inventory.slot.SlotOutput; -import de.ellpeck.actuallyadditions.items.InitItems; -import de.ellpeck.actuallyadditions.items.ItemCoffee; -import de.ellpeck.actuallyadditions.items.metalists.TheMiscItems; -import de.ellpeck.actuallyadditions.tile.TileEntityBase; -import de.ellpeck.actuallyadditions.tile.TileEntityCoffeeMachine; -import de.ellpeck.actuallyadditions.util.StackUtil; +import de.ellpeck.actuallyadditions.common.inventory.slot.SlotItemHandlerUnconditioned; +import de.ellpeck.actuallyadditions.common.inventory.slot.SlotOutput; +import de.ellpeck.actuallyadditions.common.items.InitItems; +import de.ellpeck.actuallyadditions.common.items.ItemCoffee; +import de.ellpeck.actuallyadditions.common.items.metalists.TheMiscItems; +import de.ellpeck.actuallyadditions.common.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.common.tile.TileEntityCoffeeMachine; +import de.ellpeck.actuallyadditions.common.util.StackUtil; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerDirectionalBreaker.java b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerDirectionalBreaker.java index baef1da4f..6dccfe5db 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerDirectionalBreaker.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerDirectionalBreaker.java @@ -73,4 +73,6 @@ public class ContainerDirectionalBreaker extends Container { @Override public boolean canInteractWith(EntityPlayer player) { - return this.brea \ No newline at end of file + return this.breaker.canPlayerUse(player); + } +} \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerDrill.java b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerDrill.java index d1e83d4b2..d6178c225 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerDrill.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerDrill.java @@ -1,11 +1,11 @@ -package de.ellpeck.actuallyadditions.inventory; +package de.ellpeck.actuallyadditions.common.inventory; -import de.ellpeck.actuallyadditions.inventory.slot.SlotImmovable; -import de.ellpeck.actuallyadditions.inventory.slot.SlotItemHandlerUnconditioned; -import de.ellpeck.actuallyadditions.items.ItemDrill; -import de.ellpeck.actuallyadditions.items.ItemDrillUpgrade; -import de.ellpeck.actuallyadditions.util.ItemStackHandlerAA; -import de.ellpeck.actuallyadditions.util.StackUtil; +import de.ellpeck.actuallyadditions.common.inventory.slot.SlotImmovable; +import de.ellpeck.actuallyadditions.common.inventory.slot.SlotItemHandlerUnconditioned; +import de.ellpeck.actuallyadditions.common.items.ItemDrill; +import de.ellpeck.actuallyadditions.common.items.ItemDrillUpgrade; +import de.ellpeck.actuallyadditions.common.util.ItemStackHandlerAA; +import de.ellpeck.actuallyadditions.common.util.StackUtil; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.ClickType; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerDropper.java b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerDropper.java index 41021bf27..be5b8902a 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerDropper.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerDropper.java @@ -1,10 +1,10 @@ -package de.ellpeck.actuallyadditions.inventory; +package de.ellpeck.actuallyadditions.common.inventory; -import de.ellpeck.actuallyadditions.blocks.InitBlocks; -import de.ellpeck.actuallyadditions.inventory.slot.SlotItemHandlerUnconditioned; -import de.ellpeck.actuallyadditions.tile.TileEntityBase; -import de.ellpeck.actuallyadditions.tile.TileEntityDropper; -import de.ellpeck.actuallyadditions.util.StackUtil; +import de.ellpeck.actuallyadditions.common.blocks.InitBlocks; +import de.ellpeck.actuallyadditions.common.inventory.slot.SlotItemHandlerUnconditioned; +import de.ellpeck.actuallyadditions.common.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.common.tile.TileEntityDropper; +import de.ellpeck.actuallyadditions.common.util.StackUtil; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerEnervator.java b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerEnervator.java index 812c9eca0..4ad456e97 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerEnervator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerEnervator.java @@ -1,10 +1,10 @@ -package de.ellpeck.actuallyadditions.inventory; +package de.ellpeck.actuallyadditions.common.inventory; -import de.ellpeck.actuallyadditions.inventory.slot.SlotItemHandlerUnconditioned; -import de.ellpeck.actuallyadditions.inventory.slot.SlotOutput; -import de.ellpeck.actuallyadditions.tile.TileEntityBase; -import de.ellpeck.actuallyadditions.tile.TileEntityEnervator; -import de.ellpeck.actuallyadditions.util.StackUtil; +import de.ellpeck.actuallyadditions.common.inventory.slot.SlotItemHandlerUnconditioned; +import de.ellpeck.actuallyadditions.common.inventory.slot.SlotOutput; +import de.ellpeck.actuallyadditions.common.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.common.tile.TileEntityEnervator; +import de.ellpeck.actuallyadditions.common.util.StackUtil; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerFermentingBarrel.java b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerFermentingBarrel.java index 29d811100..1bb33e31d 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerFermentingBarrel.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerFermentingBarrel.java @@ -1,8 +1,8 @@ -package de.ellpeck.actuallyadditions.inventory; +package de.ellpeck.actuallyadditions.common.inventory; -import de.ellpeck.actuallyadditions.tile.TileEntityBase; -import de.ellpeck.actuallyadditions.tile.TileEntityFermentingBarrel; -import de.ellpeck.actuallyadditions.util.StackUtil; +import de.ellpeck.actuallyadditions.common.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.common.tile.TileEntityFermentingBarrel; +import de.ellpeck.actuallyadditions.common.util.StackUtil; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerFilter.java b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerFilter.java index f5c2e06be..d7d499303 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerFilter.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerFilter.java @@ -1,10 +1,10 @@ -package de.ellpeck.actuallyadditions.inventory; +package de.ellpeck.actuallyadditions.common.inventory; -import de.ellpeck.actuallyadditions.inventory.slot.SlotFilter; -import de.ellpeck.actuallyadditions.inventory.slot.SlotImmovable; -import de.ellpeck.actuallyadditions.items.ItemDrill; -import de.ellpeck.actuallyadditions.util.ItemStackHandlerAA; -import de.ellpeck.actuallyadditions.util.StackUtil; +import de.ellpeck.actuallyadditions.common.inventory.slot.SlotFilter; +import de.ellpeck.actuallyadditions.common.inventory.slot.SlotImmovable; +import de.ellpeck.actuallyadditions.common.items.ItemDrill; +import de.ellpeck.actuallyadditions.common.util.ItemStackHandlerAA; +import de.ellpeck.actuallyadditions.common.util.StackUtil; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.ClickType; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerFireworkBox.java b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerFireworkBox.java index c8f36145a..de75c4fd8 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerFireworkBox.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerFireworkBox.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.inventory; +package de.ellpeck.actuallyadditions.common.inventory; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerFurnaceDouble.java b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerFurnaceDouble.java index f43cf62ec..dba124236 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerFurnaceDouble.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerFurnaceDouble.java @@ -1,10 +1,10 @@ -package de.ellpeck.actuallyadditions.inventory; +package de.ellpeck.actuallyadditions.common.inventory; -import de.ellpeck.actuallyadditions.inventory.slot.SlotItemHandlerUnconditioned; -import de.ellpeck.actuallyadditions.inventory.slot.SlotOutput; -import de.ellpeck.actuallyadditions.tile.TileEntityBase; -import de.ellpeck.actuallyadditions.tile.TileEntityFurnaceDouble; -import de.ellpeck.actuallyadditions.util.StackUtil; +import de.ellpeck.actuallyadditions.common.inventory.slot.SlotItemHandlerUnconditioned; +import de.ellpeck.actuallyadditions.common.inventory.slot.SlotOutput; +import de.ellpeck.actuallyadditions.common.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.common.tile.TileEntityFurnaceDouble; +import de.ellpeck.actuallyadditions.common.util.StackUtil; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerGiantChest.java b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerGiantChest.java index c0978ab45..58ccd1a48 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerGiantChest.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerGiantChest.java @@ -1,9 +1,9 @@ -package de.ellpeck.actuallyadditions.inventory; +package de.ellpeck.actuallyadditions.common.inventory; -import de.ellpeck.actuallyadditions.inventory.slot.SlotItemHandlerUnconditioned; -import de.ellpeck.actuallyadditions.tile.TileEntityBase; -import de.ellpeck.actuallyadditions.tile.TileEntityGiantChest; -import de.ellpeck.actuallyadditions.util.StackUtil; +import de.ellpeck.actuallyadditions.common.inventory.slot.SlotItemHandlerUnconditioned; +import de.ellpeck.actuallyadditions.common.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.common.tile.TileEntityGiantChest; +import de.ellpeck.actuallyadditions.common.util.StackUtil; import invtweaks.api.container.ChestContainer; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerGrinder.java b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerGrinder.java index caade7123..07c22fed7 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerGrinder.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerGrinder.java @@ -1,11 +1,11 @@ -package de.ellpeck.actuallyadditions.inventory; +package de.ellpeck.actuallyadditions.common.inventory; -import de.ellpeck.actuallyadditions.inventory.slot.SlotItemHandlerUnconditioned; -import de.ellpeck.actuallyadditions.inventory.slot.SlotOutput; -import de.ellpeck.actuallyadditions.recipe.CrusherRecipeRegistry; -import de.ellpeck.actuallyadditions.tile.TileEntityBase; -import de.ellpeck.actuallyadditions.tile.TileEntityGrinder; -import de.ellpeck.actuallyadditions.util.StackUtil; +import de.ellpeck.actuallyadditions.common.inventory.slot.SlotItemHandlerUnconditioned; +import de.ellpeck.actuallyadditions.common.inventory.slot.SlotOutput; +import de.ellpeck.actuallyadditions.common.recipe.CrusherRecipeRegistry; +import de.ellpeck.actuallyadditions.common.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.common.tile.TileEntityGrinder; +import de.ellpeck.actuallyadditions.common.util.StackUtil; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerInputter.java b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerInputter.java index 3fda08dde..57eb54f4f 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerInputter.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerInputter.java @@ -1,11 +1,11 @@ -package de.ellpeck.actuallyadditions.inventory; +package de.ellpeck.actuallyadditions.common.inventory; -import de.ellpeck.actuallyadditions.inventory.gui.GuiInputter; -import de.ellpeck.actuallyadditions.inventory.slot.SlotFilter; -import de.ellpeck.actuallyadditions.inventory.slot.SlotItemHandlerUnconditioned; -import de.ellpeck.actuallyadditions.tile.TileEntityBase; -import de.ellpeck.actuallyadditions.tile.TileEntityInputter; -import de.ellpeck.actuallyadditions.util.StackUtil; +import de.ellpeck.actuallyadditions.common.inventory.gui.GuiInputter; +import de.ellpeck.actuallyadditions.common.inventory.slot.SlotFilter; +import de.ellpeck.actuallyadditions.common.inventory.slot.SlotItemHandlerUnconditioned; +import de.ellpeck.actuallyadditions.common.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.common.tile.TileEntityInputter; +import de.ellpeck.actuallyadditions.common.util.StackUtil; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.ClickType; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerMiner.java b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerMiner.java index 035833cf3..20eb5986c 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerMiner.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerMiner.java @@ -1,9 +1,9 @@ -package de.ellpeck.actuallyadditions.inventory; +package de.ellpeck.actuallyadditions.common.inventory; -import de.ellpeck.actuallyadditions.inventory.slot.SlotItemHandlerUnconditioned; -import de.ellpeck.actuallyadditions.tile.TileEntityBase; -import de.ellpeck.actuallyadditions.tile.TileEntityMiner; -import de.ellpeck.actuallyadditions.util.StackUtil; +import de.ellpeck.actuallyadditions.common.inventory.slot.SlotItemHandlerUnconditioned; +import de.ellpeck.actuallyadditions.common.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.common.tile.TileEntityMiner; +import de.ellpeck.actuallyadditions.common.util.StackUtil; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerOilGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerOilGenerator.java index 80ec33944..a4918632c 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerOilGenerator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerOilGenerator.java @@ -1,8 +1,8 @@ -package de.ellpeck.actuallyadditions.inventory; +package de.ellpeck.actuallyadditions.common.inventory; -import de.ellpeck.actuallyadditions.tile.TileEntityBase; -import de.ellpeck.actuallyadditions.tile.TileEntityOilGenerator; -import de.ellpeck.actuallyadditions.util.StackUtil; +import de.ellpeck.actuallyadditions.common.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.common.tile.TileEntityOilGenerator; +import de.ellpeck.actuallyadditions.common.util.StackUtil; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerRangedCollector.java b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerRangedCollector.java index cc6b2086f..baa09df02 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerRangedCollector.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerRangedCollector.java @@ -1,10 +1,10 @@ -package de.ellpeck.actuallyadditions.inventory; +package de.ellpeck.actuallyadditions.common.inventory; -import de.ellpeck.actuallyadditions.inventory.slot.SlotFilter; -import de.ellpeck.actuallyadditions.inventory.slot.SlotItemHandlerUnconditioned; -import de.ellpeck.actuallyadditions.tile.TileEntityBase; -import de.ellpeck.actuallyadditions.tile.TileEntityRangedCollector; -import de.ellpeck.actuallyadditions.util.StackUtil; +import de.ellpeck.actuallyadditions.common.inventory.slot.SlotFilter; +import de.ellpeck.actuallyadditions.common.inventory.slot.SlotItemHandlerUnconditioned; +import de.ellpeck.actuallyadditions.common.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.common.tile.TileEntityRangedCollector; +import de.ellpeck.actuallyadditions.common.util.StackUtil; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.ClickType; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerRepairer.java b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerRepairer.java index 51b6f8729..86d5595a1 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerRepairer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerRepairer.java @@ -1,10 +1,10 @@ -package de.ellpeck.actuallyadditions.inventory; +package de.ellpeck.actuallyadditions.common.inventory; -import de.ellpeck.actuallyadditions.inventory.slot.SlotItemHandlerUnconditioned; -import de.ellpeck.actuallyadditions.inventory.slot.SlotOutput; -import de.ellpeck.actuallyadditions.tile.TileEntityBase; -import de.ellpeck.actuallyadditions.tile.TileEntityItemRepairer; -import de.ellpeck.actuallyadditions.util.StackUtil; +import de.ellpeck.actuallyadditions.common.inventory.slot.SlotItemHandlerUnconditioned; +import de.ellpeck.actuallyadditions.common.inventory.slot.SlotOutput; +import de.ellpeck.actuallyadditions.common.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.common.tile.TileEntityItemRepairer; +import de.ellpeck.actuallyadditions.common.util.StackUtil; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerSmileyCloud.java b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerSmileyCloud.java index 933729263..aceba256d 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerSmileyCloud.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerSmileyCloud.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.inventory; +package de.ellpeck.actuallyadditions.common.inventory; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerXPSolidifier.java b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerXPSolidifier.java index 39c133df5..cbe931159 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerXPSolidifier.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerXPSolidifier.java @@ -1,11 +1,11 @@ -package de.ellpeck.actuallyadditions.inventory; +package de.ellpeck.actuallyadditions.common.inventory; -import de.ellpeck.actuallyadditions.inventory.slot.SlotItemHandlerUnconditioned; -import de.ellpeck.actuallyadditions.inventory.slot.SlotOutput; -import de.ellpeck.actuallyadditions.items.ItemSolidifiedExperience; -import de.ellpeck.actuallyadditions.tile.TileEntityBase; -import de.ellpeck.actuallyadditions.tile.TileEntityXPSolidifier; -import de.ellpeck.actuallyadditions.util.StackUtil; +import de.ellpeck.actuallyadditions.common.inventory.slot.SlotItemHandlerUnconditioned; +import de.ellpeck.actuallyadditions.common.inventory.slot.SlotOutput; +import de.ellpeck.actuallyadditions.common.items.ItemSolidifiedExperience; +import de.ellpeck.actuallyadditions.common.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.common.tile.TileEntityXPSolidifier; +import de.ellpeck.actuallyadditions.common.util.StackUtil; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/inventory/GuiHandler.java b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/GuiHandler.java index 6d19cfcbd..dc76cbbc0 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/inventory/GuiHandler.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/GuiHandler.java @@ -1,41 +1,41 @@ -package de.ellpeck.actuallyadditions.inventory; +package de.ellpeck.actuallyadditions.common.inventory; -import de.ellpeck.actuallyadditions.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; import de.ellpeck.actuallyadditions.booklet.gui.GuiBooklet; import de.ellpeck.actuallyadditions.booklet.gui.GuiMainPage; import de.ellpeck.actuallyadditions.booklet.misc.BookletUtils; -import de.ellpeck.actuallyadditions.data.PlayerData; -import de.ellpeck.actuallyadditions.inventory.gui.GuiBag; -import de.ellpeck.actuallyadditions.inventory.gui.GuiBioReactor; -import de.ellpeck.actuallyadditions.inventory.gui.GuiBreaker; -import de.ellpeck.actuallyadditions.inventory.gui.GuiCanolaPress; -import de.ellpeck.actuallyadditions.inventory.gui.GuiCoalGenerator; -import de.ellpeck.actuallyadditions.inventory.gui.GuiCoffeeMachine; -import de.ellpeck.actuallyadditions.inventory.gui.GuiDirectionalBreaker; -import de.ellpeck.actuallyadditions.inventory.gui.GuiDrill; -import de.ellpeck.actuallyadditions.inventory.gui.GuiDropper; -import de.ellpeck.actuallyadditions.inventory.gui.GuiEnergizer; -import de.ellpeck.actuallyadditions.inventory.gui.GuiEnervator; -import de.ellpeck.actuallyadditions.inventory.gui.GuiFarmer; -import de.ellpeck.actuallyadditions.inventory.gui.GuiFeeder; -import de.ellpeck.actuallyadditions.inventory.gui.GuiFermentingBarrel; -import de.ellpeck.actuallyadditions.inventory.gui.GuiFilter; -import de.ellpeck.actuallyadditions.inventory.gui.GuiFluidCollector; -import de.ellpeck.actuallyadditions.inventory.gui.GuiFurnaceDouble; -import de.ellpeck.actuallyadditions.inventory.gui.GuiGiantChest; -import de.ellpeck.actuallyadditions.inventory.gui.GuiGrinder; -import de.ellpeck.actuallyadditions.inventory.gui.GuiInputter; -import de.ellpeck.actuallyadditions.inventory.gui.GuiLaserRelayItemWhitelist; -import de.ellpeck.actuallyadditions.inventory.gui.GuiMiner; -import de.ellpeck.actuallyadditions.inventory.gui.GuiOilGenerator; -import de.ellpeck.actuallyadditions.inventory.gui.GuiPhantomPlacer; -import de.ellpeck.actuallyadditions.inventory.gui.GuiRangedCollector; -import de.ellpeck.actuallyadditions.inventory.gui.GuiRepairer; -import de.ellpeck.actuallyadditions.inventory.gui.GuiSmileyCloud; -import de.ellpeck.actuallyadditions.inventory.gui.GuiXPSolidifier; -import de.ellpeck.actuallyadditions.items.ItemBooklet; -import de.ellpeck.actuallyadditions.tile.TileEntityBase; -import de.ellpeck.actuallyadditions.util.compat.CompatUtil; +import de.ellpeck.actuallyadditions.common.data.PlayerData; +import de.ellpeck.actuallyadditions.common.inventory.gui.GuiBag; +import de.ellpeck.actuallyadditions.common.inventory.gui.GuiBioReactor; +import de.ellpeck.actuallyadditions.common.inventory.gui.GuiBreaker; +import de.ellpeck.actuallyadditions.common.inventory.gui.GuiCanolaPress; +import de.ellpeck.actuallyadditions.common.inventory.gui.GuiCoalGenerator; +import de.ellpeck.actuallyadditions.common.inventory.gui.GuiCoffeeMachine; +import de.ellpeck.actuallyadditions.common.inventory.gui.GuiDirectionalBreaker; +import de.ellpeck.actuallyadditions.common.inventory.gui.GuiDrill; +import de.ellpeck.actuallyadditions.common.inventory.gui.GuiDropper; +import de.ellpeck.actuallyadditions.common.inventory.gui.GuiEnergizer; +import de.ellpeck.actuallyadditions.common.inventory.gui.GuiEnervator; +import de.ellpeck.actuallyadditions.common.inventory.gui.GuiFarmer; +import de.ellpeck.actuallyadditions.common.inventory.gui.GuiFeeder; +import de.ellpeck.actuallyadditions.common.inventory.gui.GuiFermentingBarrel; +import de.ellpeck.actuallyadditions.common.inventory.gui.GuiFilter; +import de.ellpeck.actuallyadditions.common.inventory.gui.GuiFluidCollector; +import de.ellpeck.actuallyadditions.common.inventory.gui.GuiFurnaceDouble; +import de.ellpeck.actuallyadditions.common.inventory.gui.GuiGiantChest; +import de.ellpeck.actuallyadditions.common.inventory.gui.GuiGrinder; +import de.ellpeck.actuallyadditions.common.inventory.gui.GuiInputter; +import de.ellpeck.actuallyadditions.common.inventory.gui.GuiLaserRelayItemWhitelist; +import de.ellpeck.actuallyadditions.common.inventory.gui.GuiMiner; +import de.ellpeck.actuallyadditions.common.inventory.gui.GuiOilGenerator; +import de.ellpeck.actuallyadditions.common.inventory.gui.GuiPhantomPlacer; +import de.ellpeck.actuallyadditions.common.inventory.gui.GuiRangedCollector; +import de.ellpeck.actuallyadditions.common.inventory.gui.GuiRepairer; +import de.ellpeck.actuallyadditions.common.inventory.gui.GuiSmileyCloud; +import de.ellpeck.actuallyadditions.common.inventory.gui.GuiXPSolidifier; +import de.ellpeck.actuallyadditions.common.items.ItemBooklet; +import de.ellpeck.actuallyadditions.common.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.common.util.compat.CompatUtil; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/EnergyDisplay.java b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/EnergyDisplay.java index f0b263073..3fc2913c8 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/EnergyDisplay.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/EnergyDisplay.java @@ -1,12 +1,12 @@ -package de.ellpeck.actuallyadditions.inventory.gui; +package de.ellpeck.actuallyadditions.common.inventory.gui; import java.text.NumberFormat; import java.util.ArrayList; import java.util.List; -import de.ellpeck.actuallyadditions.tile.CustomEnergyStorage; -import de.ellpeck.actuallyadditions.util.AssetUtil; -import de.ellpeck.actuallyadditions.util.StringUtil; +import de.ellpeck.actuallyadditions.common.tile.CustomEnergyStorage; +import de.ellpeck.actuallyadditions.common.util.AssetUtil; +import de.ellpeck.actuallyadditions.common.util.StringUtil; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Gui; import net.minecraft.client.renderer.GlStateManager; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/FilterSettingsGui.java b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/FilterSettingsGui.java index e97dfd633..3fc98ec0b 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/FilterSettingsGui.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/FilterSettingsGui.java @@ -1,13 +1,13 @@ -package de.ellpeck.actuallyadditions.inventory.gui; +package de.ellpeck.actuallyadditions.common.inventory.gui; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import de.ellpeck.actuallyadditions.ActuallyAdditions; -import de.ellpeck.actuallyadditions.inventory.gui.GuiInputter.SmallerButton; -import de.ellpeck.actuallyadditions.tile.FilterSettings; -import de.ellpeck.actuallyadditions.util.StringUtil; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.inventory.gui.GuiInputter.SmallerButton; +import de.ellpeck.actuallyadditions.common.tile.FilterSettings; +import de.ellpeck.actuallyadditions.common.util.StringUtil; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Gui; import net.minecraft.client.gui.GuiButton; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/FluidDisplay.java b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/FluidDisplay.java index 94b3a14c1..60cc8be59 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/FluidDisplay.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/FluidDisplay.java @@ -1,10 +1,10 @@ -package de.ellpeck.actuallyadditions.inventory.gui; +package de.ellpeck.actuallyadditions.common.inventory.gui; import java.text.NumberFormat; import java.util.Collections; -import de.ellpeck.actuallyadditions.util.AssetUtil; -import de.ellpeck.actuallyadditions.util.StringUtil; +import de.ellpeck.actuallyadditions.common.util.AssetUtil; +import de.ellpeck.actuallyadditions.common.util.StringUtil; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Gui; import net.minecraft.client.renderer.GlStateManager; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiBag.java b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiBag.java index 7262add5c..fbb30a8f1 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiBag.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiBag.java @@ -1,15 +1,15 @@ -package de.ellpeck.actuallyadditions.inventory.gui; +package de.ellpeck.actuallyadditions.common.inventory.gui; import java.io.IOException; import java.util.ArrayList; import java.util.List; -import de.ellpeck.actuallyadditions.ActuallyAdditions; -import de.ellpeck.actuallyadditions.inventory.ContainerBag; -import de.ellpeck.actuallyadditions.network.PacketClientToServer; -import de.ellpeck.actuallyadditions.network.PacketHandler; -import de.ellpeck.actuallyadditions.util.AssetUtil; -import de.ellpeck.actuallyadditions.util.StringUtil; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.inventory.ContainerBag; +import de.ellpeck.actuallyadditions.common.network.PacketClientToServer; +import de.ellpeck.actuallyadditions.common.network.PacketHandler; +import de.ellpeck.actuallyadditions.common.util.AssetUtil; +import de.ellpeck.actuallyadditions.common.util.StringUtil; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.renderer.GlStateManager; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiBioReactor.java b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiBioReactor.java index be05276d0..378143f72 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiBioReactor.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiBioReactor.java @@ -1,9 +1,9 @@ -package de.ellpeck.actuallyadditions.inventory.gui; +package de.ellpeck.actuallyadditions.common.inventory.gui; -import de.ellpeck.actuallyadditions.inventory.ContainerBioReactor; -import de.ellpeck.actuallyadditions.tile.TileEntityBase; -import de.ellpeck.actuallyadditions.tile.TileEntityBioReactor; -import de.ellpeck.actuallyadditions.util.AssetUtil; +import de.ellpeck.actuallyadditions.common.inventory.ContainerBioReactor; +import de.ellpeck.actuallyadditions.common.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.common.tile.TileEntityBioReactor; +import de.ellpeck.actuallyadditions.common.util.AssetUtil; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.InventoryPlayer; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiBreaker.java b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiBreaker.java index 1a5df69d0..a9759ff06 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiBreaker.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiBreaker.java @@ -1,9 +1,9 @@ -package de.ellpeck.actuallyadditions.inventory.gui; +package de.ellpeck.actuallyadditions.common.inventory.gui; -import de.ellpeck.actuallyadditions.inventory.ContainerBreaker; -import de.ellpeck.actuallyadditions.tile.TileEntityBase; -import de.ellpeck.actuallyadditions.tile.TileEntityBreaker; -import de.ellpeck.actuallyadditions.util.AssetUtil; +import de.ellpeck.actuallyadditions.common.inventory.ContainerBreaker; +import de.ellpeck.actuallyadditions.common.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.common.tile.TileEntityBreaker; +import de.ellpeck.actuallyadditions.common.util.AssetUtil; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiCanolaPress.java b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiCanolaPress.java index cc500c879..3ec5b0fdb 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiCanolaPress.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiCanolaPress.java @@ -1,9 +1,9 @@ -package de.ellpeck.actuallyadditions.inventory.gui; +package de.ellpeck.actuallyadditions.common.inventory.gui; -import de.ellpeck.actuallyadditions.inventory.ContainerCanolaPress; -import de.ellpeck.actuallyadditions.tile.TileEntityBase; -import de.ellpeck.actuallyadditions.tile.TileEntityCanolaPress; -import de.ellpeck.actuallyadditions.util.AssetUtil; +import de.ellpeck.actuallyadditions.common.inventory.ContainerCanolaPress; +import de.ellpeck.actuallyadditions.common.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.common.tile.TileEntityCanolaPress; +import de.ellpeck.actuallyadditions.common.util.AssetUtil; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiCoalGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiCoalGenerator.java index 5eac61e92..122dad0bc 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiCoalGenerator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiCoalGenerator.java @@ -1,9 +1,9 @@ -package de.ellpeck.actuallyadditions.inventory.gui; +package de.ellpeck.actuallyadditions.common.inventory.gui; -import de.ellpeck.actuallyadditions.inventory.ContainerCoalGenerator; -import de.ellpeck.actuallyadditions.tile.TileEntityBase; -import de.ellpeck.actuallyadditions.tile.TileEntityCoalGenerator; -import de.ellpeck.actuallyadditions.util.AssetUtil; +import de.ellpeck.actuallyadditions.common.inventory.ContainerCoalGenerator; +import de.ellpeck.actuallyadditions.common.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.common.tile.TileEntityCoalGenerator; +import de.ellpeck.actuallyadditions.common.util.AssetUtil; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiCoffeeMachine.java b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiCoffeeMachine.java index 361969a39..d64bbb0d5 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiCoffeeMachine.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiCoffeeMachine.java @@ -1,14 +1,14 @@ -package de.ellpeck.actuallyadditions.inventory.gui; +package de.ellpeck.actuallyadditions.common.inventory.gui; import java.util.Collections; -import de.ellpeck.actuallyadditions.ActuallyAdditions; -import de.ellpeck.actuallyadditions.inventory.ContainerCoffeeMachine; -import de.ellpeck.actuallyadditions.network.PacketHandlerHelper; -import de.ellpeck.actuallyadditions.tile.TileEntityBase; -import de.ellpeck.actuallyadditions.tile.TileEntityCoffeeMachine; -import de.ellpeck.actuallyadditions.util.AssetUtil; -import de.ellpeck.actuallyadditions.util.StringUtil; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.inventory.ContainerCoffeeMachine; +import de.ellpeck.actuallyadditions.common.network.PacketHandlerHelper; +import de.ellpeck.actuallyadditions.common.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.common.tile.TileEntityCoffeeMachine; +import de.ellpeck.actuallyadditions.common.util.AssetUtil; +import de.ellpeck.actuallyadditions.common.util.StringUtil; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.InventoryPlayer; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiDirectionalBreaker.java b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiDirectionalBreaker.java index 691aebab5..458f04f3b 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiDirectionalBreaker.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiDirectionalBreaker.java @@ -1,9 +1,9 @@ -package de.ellpeck.actuallyadditions.inventory.gui; +package de.ellpeck.actuallyadditions.common.inventory.gui; -import de.ellpeck.actuallyadditions.inventory.ContainerDirectionalBreaker; -import de.ellpeck.actuallyadditions.tile.TileEntityBase; -import de.ellpeck.actuallyadditions.tile.TileEntityDirectionalBreaker; -import de.ellpeck.actuallyadditions.util.AssetUtil; +import de.ellpeck.actuallyadditions.common.inventory.ContainerDirectionalBreaker; +import de.ellpeck.actuallyadditions.common.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.common.tile.TileEntityDirectionalBreaker; +import de.ellpeck.actuallyadditions.common.util.AssetUtil; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiDrill.java b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiDrill.java index a064938a3..529290b5f 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiDrill.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiDrill.java @@ -1,9 +1,9 @@ -package de.ellpeck.actuallyadditions.inventory.gui; +package de.ellpeck.actuallyadditions.common.inventory.gui; -import de.ellpeck.actuallyadditions.ActuallyAdditions; -import de.ellpeck.actuallyadditions.inventory.ContainerDrill; -import de.ellpeck.actuallyadditions.util.AssetUtil; -import de.ellpeck.actuallyadditions.util.StringUtil; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.inventory.ContainerDrill; +import de.ellpeck.actuallyadditions.common.util.AssetUtil; +import de.ellpeck.actuallyadditions.common.util.StringUtil; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiEnergizer.java b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiEnergizer.java index ceec9052e..f28ec247f 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiEnergizer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiEnergizer.java @@ -1,9 +1,9 @@ -package de.ellpeck.actuallyadditions.inventory.gui; +package de.ellpeck.actuallyadditions.common.inventory.gui; -import de.ellpeck.actuallyadditions.inventory.ContainerEnergizer; -import de.ellpeck.actuallyadditions.tile.TileEntityBase; -import de.ellpeck.actuallyadditions.tile.TileEntityEnergizer; -import de.ellpeck.actuallyadditions.util.AssetUtil; +import de.ellpeck.actuallyadditions.common.inventory.ContainerEnergizer; +import de.ellpeck.actuallyadditions.common.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.common.tile.TileEntityEnergizer; +import de.ellpeck.actuallyadditions.common.util.AssetUtil; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiEnervator.java b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiEnervator.java index 8fc8d3ea0..577dbc666 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiEnervator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiEnervator.java @@ -1,9 +1,9 @@ -package de.ellpeck.actuallyadditions.inventory.gui; +package de.ellpeck.actuallyadditions.common.inventory.gui; -import de.ellpeck.actuallyadditions.inventory.ContainerEnervator; -import de.ellpeck.actuallyadditions.tile.TileEntityBase; -import de.ellpeck.actuallyadditions.tile.TileEntityEnervator; -import de.ellpeck.actuallyadditions.util.AssetUtil; +import de.ellpeck.actuallyadditions.common.inventory.ContainerEnervator; +import de.ellpeck.actuallyadditions.common.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.common.tile.TileEntityEnervator; +import de.ellpeck.actuallyadditions.common.util.AssetUtil; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiFarmer.java b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiFarmer.java index 5a2d14c0c..85499c58e 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiFarmer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiFarmer.java @@ -1,9 +1,9 @@ -package de.ellpeck.actuallyadditions.inventory.gui; +package de.ellpeck.actuallyadditions.common.inventory.gui; -import de.ellpeck.actuallyadditions.inventory.ContainerFarmer; -import de.ellpeck.actuallyadditions.tile.TileEntityBase; -import de.ellpeck.actuallyadditions.tile.TileEntityFarmer; -import de.ellpeck.actuallyadditions.util.AssetUtil; +import de.ellpeck.actuallyadditions.common.inventory.ContainerFarmer; +import de.ellpeck.actuallyadditions.common.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.common.tile.TileEntityFarmer; +import de.ellpeck.actuallyadditions.common.util.AssetUtil; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiFeeder.java b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiFeeder.java index bbb1b9afc..485da8fa3 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiFeeder.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiFeeder.java @@ -1,13 +1,13 @@ -package de.ellpeck.actuallyadditions.inventory.gui; +package de.ellpeck.actuallyadditions.common.inventory.gui; import java.util.Arrays; -import de.ellpeck.actuallyadditions.ActuallyAdditions; -import de.ellpeck.actuallyadditions.inventory.ContainerFeeder; -import de.ellpeck.actuallyadditions.tile.TileEntityBase; -import de.ellpeck.actuallyadditions.tile.TileEntityFeeder; -import de.ellpeck.actuallyadditions.util.AssetUtil; -import de.ellpeck.actuallyadditions.util.StringUtil; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.inventory.ContainerFeeder; +import de.ellpeck.actuallyadditions.common.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.common.tile.TileEntityFeeder; +import de.ellpeck.actuallyadditions.common.util.AssetUtil; +import de.ellpeck.actuallyadditions.common.util.StringUtil; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiFermentingBarrel.java b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiFermentingBarrel.java index b9d59d184..adadf97ea 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiFermentingBarrel.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiFermentingBarrel.java @@ -1,9 +1,9 @@ -package de.ellpeck.actuallyadditions.inventory.gui; +package de.ellpeck.actuallyadditions.common.inventory.gui; -import de.ellpeck.actuallyadditions.inventory.ContainerFermentingBarrel; -import de.ellpeck.actuallyadditions.tile.TileEntityBase; -import de.ellpeck.actuallyadditions.tile.TileEntityFermentingBarrel; -import de.ellpeck.actuallyadditions.util.AssetUtil; +import de.ellpeck.actuallyadditions.common.inventory.ContainerFermentingBarrel; +import de.ellpeck.actuallyadditions.common.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.common.tile.TileEntityFermentingBarrel; +import de.ellpeck.actuallyadditions.common.util.AssetUtil; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiFilter.java b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiFilter.java index 6a568b3f4..69675e4f3 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiFilter.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiFilter.java @@ -1,9 +1,9 @@ -package de.ellpeck.actuallyadditions.inventory.gui; +package de.ellpeck.actuallyadditions.common.inventory.gui; -import de.ellpeck.actuallyadditions.ActuallyAdditions; -import de.ellpeck.actuallyadditions.inventory.ContainerFilter; -import de.ellpeck.actuallyadditions.util.AssetUtil; -import de.ellpeck.actuallyadditions.util.StringUtil; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.inventory.ContainerFilter; +import de.ellpeck.actuallyadditions.common.util.AssetUtil; +import de.ellpeck.actuallyadditions.common.util.StringUtil; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiFluidCollector.java b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiFluidCollector.java index 806a865b0..ad693e5ef 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiFluidCollector.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiFluidCollector.java @@ -1,9 +1,9 @@ -package de.ellpeck.actuallyadditions.inventory.gui; +package de.ellpeck.actuallyadditions.common.inventory.gui; -import de.ellpeck.actuallyadditions.inventory.ContainerFluidCollector; -import de.ellpeck.actuallyadditions.tile.TileEntityBase; -import de.ellpeck.actuallyadditions.tile.TileEntityFluidCollector; -import de.ellpeck.actuallyadditions.util.AssetUtil; +import de.ellpeck.actuallyadditions.common.inventory.ContainerFluidCollector; +import de.ellpeck.actuallyadditions.common.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.common.tile.TileEntityFluidCollector; +import de.ellpeck.actuallyadditions.common.util.AssetUtil; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiFurnaceDouble.java b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiFurnaceDouble.java index 0e6272ef5..70f9432f4 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiFurnaceDouble.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiFurnaceDouble.java @@ -1,15 +1,15 @@ -package de.ellpeck.actuallyadditions.inventory.gui; +package de.ellpeck.actuallyadditions.common.inventory.gui; import java.io.IOException; import java.util.Collections; -import de.ellpeck.actuallyadditions.ActuallyAdditions; -import de.ellpeck.actuallyadditions.inventory.ContainerFurnaceDouble; -import de.ellpeck.actuallyadditions.network.PacketHandlerHelper; -import de.ellpeck.actuallyadditions.tile.TileEntityBase; -import de.ellpeck.actuallyadditions.tile.TileEntityFurnaceDouble; -import de.ellpeck.actuallyadditions.util.AssetUtil; -import de.ellpeck.actuallyadditions.util.StringUtil; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.inventory.ContainerFurnaceDouble; +import de.ellpeck.actuallyadditions.common.network.PacketHandlerHelper; +import de.ellpeck.actuallyadditions.common.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.common.tile.TileEntityFurnaceDouble; +import de.ellpeck.actuallyadditions.common.util.AssetUtil; +import de.ellpeck.actuallyadditions.common.util.StringUtil; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.InventoryPlayer; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiGiantChest.java b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiGiantChest.java index 0e55109d5..ce5d702f9 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiGiantChest.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiGiantChest.java @@ -1,14 +1,14 @@ -package de.ellpeck.actuallyadditions.inventory.gui; +package de.ellpeck.actuallyadditions.common.inventory.gui; import java.io.IOException; -import de.ellpeck.actuallyadditions.inventory.ContainerGiantChest; -import de.ellpeck.actuallyadditions.network.PacketHandlerHelper; -import de.ellpeck.actuallyadditions.tile.TileEntityBase; -import de.ellpeck.actuallyadditions.tile.TileEntityGiantChest; -import de.ellpeck.actuallyadditions.tile.TileEntityGiantChestLarge; -import de.ellpeck.actuallyadditions.tile.TileEntityGiantChestMedium; -import de.ellpeck.actuallyadditions.util.AssetUtil; +import de.ellpeck.actuallyadditions.common.inventory.ContainerGiantChest; +import de.ellpeck.actuallyadditions.common.network.PacketHandlerHelper; +import de.ellpeck.actuallyadditions.common.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.common.tile.TileEntityGiantChest; +import de.ellpeck.actuallyadditions.common.tile.TileEntityGiantChestLarge; +import de.ellpeck.actuallyadditions.common.tile.TileEntityGiantChestMedium; +import de.ellpeck.actuallyadditions.common.util.AssetUtil; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.InventoryPlayer; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiGrinder.java b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiGrinder.java index 8509beaf7..c5fe34401 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiGrinder.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiGrinder.java @@ -1,15 +1,15 @@ -package de.ellpeck.actuallyadditions.inventory.gui; +package de.ellpeck.actuallyadditions.common.inventory.gui; import java.io.IOException; import java.util.Collections; -import de.ellpeck.actuallyadditions.ActuallyAdditions; -import de.ellpeck.actuallyadditions.inventory.ContainerGrinder; -import de.ellpeck.actuallyadditions.network.PacketHandlerHelper; -import de.ellpeck.actuallyadditions.tile.TileEntityBase; -import de.ellpeck.actuallyadditions.tile.TileEntityGrinder; -import de.ellpeck.actuallyadditions.util.AssetUtil; -import de.ellpeck.actuallyadditions.util.StringUtil; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.inventory.ContainerGrinder; +import de.ellpeck.actuallyadditions.common.network.PacketHandlerHelper; +import de.ellpeck.actuallyadditions.common.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.common.tile.TileEntityGrinder; +import de.ellpeck.actuallyadditions.common.util.AssetUtil; +import de.ellpeck.actuallyadditions.common.util.StringUtil; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.InventoryPlayer; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiInputter.java b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiInputter.java index 966daf76a..5d49a85ab 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiInputter.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiInputter.java @@ -1,16 +1,16 @@ -package de.ellpeck.actuallyadditions.inventory.gui; +package de.ellpeck.actuallyadditions.common.inventory.gui; import java.io.IOException; import org.lwjgl.input.Keyboard; -import de.ellpeck.actuallyadditions.ActuallyAdditions; -import de.ellpeck.actuallyadditions.inventory.ContainerInputter; -import de.ellpeck.actuallyadditions.network.PacketHandlerHelper; -import de.ellpeck.actuallyadditions.tile.TileEntityBase; -import de.ellpeck.actuallyadditions.tile.TileEntityInputter; -import de.ellpeck.actuallyadditions.util.AssetUtil; -import de.ellpeck.actuallyadditions.util.StringUtil; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.inventory.ContainerInputter; +import de.ellpeck.actuallyadditions.common.network.PacketHandlerHelper; +import de.ellpeck.actuallyadditions.common.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.common.tile.TileEntityInputter; +import de.ellpeck.actuallyadditions.common.util.AssetUtil; +import de.ellpeck.actuallyadditions.common.util.StringUtil; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiTextField; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiMiner.java b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiMiner.java index d0ac44d92..c4760adda 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiMiner.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiMiner.java @@ -1,11 +1,11 @@ -package de.ellpeck.actuallyadditions.inventory.gui; +package de.ellpeck.actuallyadditions.common.inventory.gui; -import de.ellpeck.actuallyadditions.inventory.ContainerMiner; -import de.ellpeck.actuallyadditions.network.PacketHandlerHelper; -import de.ellpeck.actuallyadditions.tile.TileEntityBase; -import de.ellpeck.actuallyadditions.tile.TileEntityMiner; -import de.ellpeck.actuallyadditions.util.AssetUtil; -import de.ellpeck.actuallyadditions.util.StringUtil; +import de.ellpeck.actuallyadditions.common.inventory.ContainerMiner; +import de.ellpeck.actuallyadditions.common.network.PacketHandlerHelper; +import de.ellpeck.actuallyadditions.common.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.common.tile.TileEntityMiner; +import de.ellpeck.actuallyadditions.common.util.AssetUtil; +import de.ellpeck.actuallyadditions.common.util.StringUtil; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.InventoryPlayer; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiOilGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiOilGenerator.java index 7b1f1a46a..ca9c5e9a1 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiOilGenerator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiOilGenerator.java @@ -1,10 +1,10 @@ -package de.ellpeck.actuallyadditions.inventory.gui; +package de.ellpeck.actuallyadditions.common.inventory.gui; -import de.ellpeck.actuallyadditions.inventory.ContainerOilGenerator; -import de.ellpeck.actuallyadditions.tile.TileEntityBase; -import de.ellpeck.actuallyadditions.tile.TileEntityOilGenerator; -import de.ellpeck.actuallyadditions.util.AssetUtil; -import de.ellpeck.actuallyadditions.util.StringUtil; +import de.ellpeck.actuallyadditions.common.inventory.ContainerOilGenerator; +import de.ellpeck.actuallyadditions.common.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.common.tile.TileEntityOilGenerator; +import de.ellpeck.actuallyadditions.common.util.AssetUtil; +import de.ellpeck.actuallyadditions.common.util.StringUtil; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.InventoryPlayer; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiPhantomPlacer.java b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiPhantomPlacer.java index f418ef460..db4e9a958 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiPhantomPlacer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiPhantomPlacer.java @@ -1,16 +1,16 @@ -package de.ellpeck.actuallyadditions.inventory.gui; +package de.ellpeck.actuallyadditions.common.inventory.gui; import java.io.IOException; import java.util.ArrayList; import java.util.List; -import de.ellpeck.actuallyadditions.ActuallyAdditions; -import de.ellpeck.actuallyadditions.inventory.ContainerPhantomPlacer; -import de.ellpeck.actuallyadditions.network.PacketHandlerHelper; -import de.ellpeck.actuallyadditions.tile.TileEntityBase; -import de.ellpeck.actuallyadditions.tile.TileEntityPhantomPlacer; -import de.ellpeck.actuallyadditions.util.AssetUtil; -import de.ellpeck.actuallyadditions.util.StringUtil; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.inventory.ContainerPhantomPlacer; +import de.ellpeck.actuallyadditions.common.network.PacketHandlerHelper; +import de.ellpeck.actuallyadditions.common.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.common.tile.TileEntityPhantomPlacer; +import de.ellpeck.actuallyadditions.common.util.AssetUtil; +import de.ellpeck.actuallyadditions.common.util.StringUtil; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.InventoryPlayer; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiRangedCollector.java b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiRangedCollector.java index 6e7b95f47..c822339a1 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiRangedCollector.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiRangedCollector.java @@ -1,10 +1,10 @@ -package de.ellpeck.actuallyadditions.inventory.gui; +package de.ellpeck.actuallyadditions.common.inventory.gui; -import de.ellpeck.actuallyadditions.inventory.ContainerRangedCollector; -import de.ellpeck.actuallyadditions.network.PacketHandlerHelper; -import de.ellpeck.actuallyadditions.tile.TileEntityBase; -import de.ellpeck.actuallyadditions.tile.TileEntityRangedCollector; -import de.ellpeck.actuallyadditions.util.AssetUtil; +import de.ellpeck.actuallyadditions.common.inventory.ContainerRangedCollector; +import de.ellpeck.actuallyadditions.common.network.PacketHandlerHelper; +import de.ellpeck.actuallyadditions.common.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.common.tile.TileEntityRangedCollector; +import de.ellpeck.actuallyadditions.common.util.AssetUtil; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.InventoryPlayer; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiRepairer.java b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiRepairer.java index 351a05644..8cd893291 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiRepairer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiRepairer.java @@ -1,9 +1,9 @@ -package de.ellpeck.actuallyadditions.inventory.gui; +package de.ellpeck.actuallyadditions.common.inventory.gui; -import de.ellpeck.actuallyadditions.inventory.ContainerRepairer; -import de.ellpeck.actuallyadditions.tile.TileEntityBase; -import de.ellpeck.actuallyadditions.tile.TileEntityItemRepairer; -import de.ellpeck.actuallyadditions.util.AssetUtil; +import de.ellpeck.actuallyadditions.common.inventory.ContainerRepairer; +import de.ellpeck.actuallyadditions.common.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.common.tile.TileEntityItemRepairer; +import de.ellpeck.actuallyadditions.common.util.AssetUtil; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiSmileyCloud.java b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiSmileyCloud.java index e5325e522..a50edcb51 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiSmileyCloud.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiSmileyCloud.java @@ -1,17 +1,17 @@ -package de.ellpeck.actuallyadditions.inventory.gui; +package de.ellpeck.actuallyadditions.common.inventory.gui; import java.io.IOException; import org.lwjgl.input.Keyboard; -import de.ellpeck.actuallyadditions.ActuallyAdditions; -import de.ellpeck.actuallyadditions.inventory.ContainerSmileyCloud; -import de.ellpeck.actuallyadditions.network.PacketClientToServer; -import de.ellpeck.actuallyadditions.network.PacketHandler; -import de.ellpeck.actuallyadditions.tile.TileEntityBase; -import de.ellpeck.actuallyadditions.tile.TileEntitySmileyCloud; -import de.ellpeck.actuallyadditions.util.AssetUtil; -import de.ellpeck.actuallyadditions.util.StringUtil; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.inventory.ContainerSmileyCloud; +import de.ellpeck.actuallyadditions.common.network.PacketClientToServer; +import de.ellpeck.actuallyadditions.common.network.PacketHandler; +import de.ellpeck.actuallyadditions.common.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.common.tile.TileEntitySmileyCloud; +import de.ellpeck.actuallyadditions.common.util.AssetUtil; +import de.ellpeck.actuallyadditions.common.util.StringUtil; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiTextField; import net.minecraft.client.renderer.GlStateManager; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiWtfMojang.java b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiWtfMojang.java index 14266b1d6..571909e24 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiWtfMojang.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiWtfMojang.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.inventory.gui; +package de.ellpeck.actuallyadditions.common.inventory.gui; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.inventory.Container; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiXPSolidifier.java b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiXPSolidifier.java index 7bb3e1045..f3b2d2ba9 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiXPSolidifier.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiXPSolidifier.java @@ -1,11 +1,11 @@ -package de.ellpeck.actuallyadditions.inventory.gui; +package de.ellpeck.actuallyadditions.common.inventory.gui; -import de.ellpeck.actuallyadditions.inventory.ContainerXPSolidifier; -import de.ellpeck.actuallyadditions.network.PacketHandlerHelper; -import de.ellpeck.actuallyadditions.tile.TileEntityBase; -import de.ellpeck.actuallyadditions.tile.TileEntityXPSolidifier; -import de.ellpeck.actuallyadditions.util.AssetUtil; -import de.ellpeck.actuallyadditions.util.StringUtil; +import de.ellpeck.actuallyadditions.common.inventory.ContainerXPSolidifier; +import de.ellpeck.actuallyadditions.common.network.PacketHandlerHelper; +import de.ellpeck.actuallyadditions.common.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.common.tile.TileEntityXPSolidifier; +import de.ellpeck.actuallyadditions.common.util.AssetUtil; +import de.ellpeck.actuallyadditions.common.util.StringUtil; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.renderer.GlStateManager; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/TexturedButton.java b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/TexturedButton.java index 7c69b7350..279d8a3ba 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/TexturedButton.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/TexturedButton.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.inventory.gui; +package de.ellpeck.actuallyadditions.common.inventory.gui; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/inventory/slot/SlotDeletion.java b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/slot/SlotDeletion.java index 99b8c113a..94079d9f5 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/inventory/slot/SlotDeletion.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/slot/SlotDeletion.java @@ -1,6 +1,6 @@ -package de.ellpeck.actuallyadditions.inventory.slot; +package de.ellpeck.actuallyadditions.common.inventory.slot; -import de.ellpeck.actuallyadditions.util.ItemStackHandlerAA; +import de.ellpeck.actuallyadditions.common.util.ItemStackHandlerAA; import net.minecraft.item.ItemStack; public class SlotDeletion extends SlotItemHandlerUnconditioned { diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/inventory/slot/SlotFilter.java b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/slot/SlotFilter.java index 2836d23b7..0b87b4d4d 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/inventory/slot/SlotFilter.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/slot/SlotFilter.java @@ -1,9 +1,9 @@ -package de.ellpeck.actuallyadditions.inventory.slot; +package de.ellpeck.actuallyadditions.common.inventory.slot; -import de.ellpeck.actuallyadditions.items.ItemFilter; -import de.ellpeck.actuallyadditions.tile.FilterSettings; -import de.ellpeck.actuallyadditions.util.ItemStackHandlerAA; -import de.ellpeck.actuallyadditions.util.StackUtil; +import de.ellpeck.actuallyadditions.common.items.ItemFilter; +import de.ellpeck.actuallyadditions.common.tile.FilterSettings; +import de.ellpeck.actuallyadditions.common.util.ItemStackHandlerAA; +import de.ellpeck.actuallyadditions.common.util.StackUtil; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/inventory/slot/SlotImmovable.java b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/slot/SlotImmovable.java index 19376f951..8f72bcf38 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/inventory/slot/SlotImmovable.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/slot/SlotImmovable.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.inventory.slot; +package de.ellpeck.actuallyadditions.common.inventory.slot; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/inventory/slot/SlotItemHandlerUnconditioned.java b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/slot/SlotItemHandlerUnconditioned.java index f92ada38a..ee6c6cf60 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/inventory/slot/SlotItemHandlerUnconditioned.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/slot/SlotItemHandlerUnconditioned.java @@ -1,8 +1,8 @@ -package de.ellpeck.actuallyadditions.inventory.slot; +package de.ellpeck.actuallyadditions.common.inventory.slot; import javax.annotation.Nonnull; -import de.ellpeck.actuallyadditions.util.ItemStackHandlerAA; +import de.ellpeck.actuallyadditions.common.util.ItemStackHandlerAA; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraftforge.items.SlotItemHandler; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/inventory/slot/SlotOutput.java b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/slot/SlotOutput.java index 4939d8390..9f43e1ed7 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/inventory/slot/SlotOutput.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/slot/SlotOutput.java @@ -1,6 +1,6 @@ -package de.ellpeck.actuallyadditions.inventory.slot; +package de.ellpeck.actuallyadditions.common.inventory.slot; -import de.ellpeck.actuallyadditions.util.ItemStackHandlerAA; +import de.ellpeck.actuallyadditions.common.util.ItemStackHandlerAA; import net.minecraft.item.ItemStack; public class SlotOutput extends SlotItemHandlerUnconditioned { diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/items/InitItems.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/InitItems.java index 345bf1a80..1daff7e35 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/items/InitItems.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/InitItems.java @@ -1,22 +1,22 @@ -package de.ellpeck.actuallyadditions.items; +package de.ellpeck.actuallyadditions.common.items; import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI; -import de.ellpeck.actuallyadditions.ActuallyAdditions; -import de.ellpeck.actuallyadditions.blocks.InitBlocks; -import de.ellpeck.actuallyadditions.items.base.ItemArmorAA; -import de.ellpeck.actuallyadditions.items.base.ItemFoodSeed; -import de.ellpeck.actuallyadditions.items.base.ItemHoeAA; -import de.ellpeck.actuallyadditions.items.base.ItemSeed; -import de.ellpeck.actuallyadditions.items.base.ItemSwordAA; -import de.ellpeck.actuallyadditions.items.lens.ItemLens; -import de.ellpeck.actuallyadditions.items.metalists.TheCrystals; -import de.ellpeck.actuallyadditions.items.metalists.TheFoods; -import de.ellpeck.actuallyadditions.items.metalists.TheMiscItems; -import de.ellpeck.actuallyadditions.material.InitArmorMaterials; -import de.ellpeck.actuallyadditions.material.InitToolMaterials; -import de.ellpeck.actuallyadditions.tile.TileEntityGiantChest; -import de.ellpeck.actuallyadditions.tile.TileEntityGiantChestMedium; -import de.ellpeck.actuallyadditions.util.Util; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.blocks.InitBlocks; +import de.ellpeck.actuallyadditions.common.items.base.ItemArmorAA; +import de.ellpeck.actuallyadditions.common.items.base.ItemFoodSeed; +import de.ellpeck.actuallyadditions.common.items.base.ItemHoeAA; +import de.ellpeck.actuallyadditions.common.items.base.ItemSeed; +import de.ellpeck.actuallyadditions.common.items.base.ItemSwordAA; +import de.ellpeck.actuallyadditions.common.items.lens.ItemLens; +import de.ellpeck.actuallyadditions.common.items.metalists.TheCrystals; +import de.ellpeck.actuallyadditions.common.items.metalists.TheFoods; +import de.ellpeck.actuallyadditions.common.items.metalists.TheMiscItems; +import de.ellpeck.actuallyadditions.common.material.InitArmorMaterials; +import de.ellpeck.actuallyadditions.common.material.InitToolMaterials; +import de.ellpeck.actuallyadditions.common.tile.TileEntityGiantChest; +import de.ellpeck.actuallyadditions.common.tile.TileEntityGiantChestMedium; +import de.ellpeck.actuallyadditions.common.util.Util; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.init.MobEffects; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemAxeAA.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemAxeAA.java index 397abb26e..458c34d6c 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemAxeAA.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemAxeAA.java @@ -1,11 +1,11 @@ -package de.ellpeck.actuallyadditions.items; +package de.ellpeck.actuallyadditions.common.items; import java.util.Collections; import java.util.Set; import com.google.common.collect.Sets; -import de.ellpeck.actuallyadditions.items.base.ItemToolAA; +import de.ellpeck.actuallyadditions.common.items.base.ItemToolAA; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemBag.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemBag.java index a686285cf..e464ee3e3 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemBag.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemBag.java @@ -1,11 +1,11 @@ -package de.ellpeck.actuallyadditions.items; +package de.ellpeck.actuallyadditions.common.items; -import de.ellpeck.actuallyadditions.ActuallyAdditions; -import de.ellpeck.actuallyadditions.inventory.ContainerBag; -import de.ellpeck.actuallyadditions.inventory.GuiHandler.GuiTypes; -import de.ellpeck.actuallyadditions.items.base.ItemBase; -import de.ellpeck.actuallyadditions.util.ItemStackHandlerAA; -import de.ellpeck.actuallyadditions.util.StackUtil; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.inventory.ContainerBag; +import de.ellpeck.actuallyadditions.common.inventory.GuiHandler.GuiTypes; +import de.ellpeck.actuallyadditions.common.items.base.ItemBase; +import de.ellpeck.actuallyadditions.common.util.ItemStackHandlerAA; +import de.ellpeck.actuallyadditions.common.util.StackUtil; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemBattery.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemBattery.java index b2820a6bb..1e0d8993c 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemBattery.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemBattery.java @@ -74,4 +74,6 @@ public class ItemBattery extends ItemEnergy { public void addInformation(ItemStack stack, World playerIn, List list, ITooltipFlag advanced) { super.addInformation(stack, playerIn, list, advanced); list.add(StringUtil.localize("tooltip." + ActuallyAdditions.MODID + ".battery." + (ItemUtil.isEnabled(stack) ? "discharge" : "noDischarge"))); - list.add(StringUtil.localize("tooltip." + ActuallyAdditions.MO \ No newline at end of file + list.add(StringUtil.localize("tooltip." + ActuallyAdditions.MODID + ".battery.changeMode")); + } +} diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemBooklet.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemBooklet.java index 29e4c732c..8931a4eb0 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemBooklet.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemBooklet.java @@ -1,18 +1,18 @@ -package de.ellpeck.actuallyadditions.items; +package de.ellpeck.actuallyadditions.common.items; import java.util.List; import javax.annotation.Nullable; import de.ellpeck.actuallyadditions.api.booklet.IBookletPage; -import de.ellpeck.actuallyadditions.ActuallyAdditions; -import de.ellpeck.actuallyadditions.blocks.IHudDisplay; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.blocks.IHudDisplay; import de.ellpeck.actuallyadditions.booklet.misc.BookletUtils; -import de.ellpeck.actuallyadditions.inventory.GuiHandler; -import de.ellpeck.actuallyadditions.items.base.ItemBase; -import de.ellpeck.actuallyadditions.util.AssetUtil; -import de.ellpeck.actuallyadditions.util.StackUtil; -import de.ellpeck.actuallyadditions.util.StringUtil; +import de.ellpeck.actuallyadditions.common.inventory.GuiHandler; +import de.ellpeck.actuallyadditions.common.items.base.ItemBase; +import de.ellpeck.actuallyadditions.common.util.AssetUtil; +import de.ellpeck.actuallyadditions.common.util.StackUtil; +import de.ellpeck.actuallyadditions.common.util.StringUtil; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemCoffee.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemCoffee.java index 190c7f5bc..c61cc5d69 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemCoffee.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemCoffee.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.items; +package de.ellpeck.actuallyadditions.common.items; import java.util.ArrayList; import java.util.List; @@ -7,11 +7,11 @@ import javax.annotation.Nullable; import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI; import de.ellpeck.actuallyadditions.api.recipe.CoffeeIngredient; -import de.ellpeck.actuallyadditions.ActuallyAdditions; -import de.ellpeck.actuallyadditions.items.base.ItemFoodBase; -import de.ellpeck.actuallyadditions.items.metalists.TheMiscItems; -import de.ellpeck.actuallyadditions.util.ItemUtil; -import de.ellpeck.actuallyadditions.util.StringUtil; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.items.base.ItemFoodBase; +import de.ellpeck.actuallyadditions.common.items.metalists.TheMiscItems; +import de.ellpeck.actuallyadditions.common.util.ItemUtil; +import de.ellpeck.actuallyadditions.common.util.StringUtil; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.EntityLivingBase; import net.minecraft.init.Items; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemCoffeeBean.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemCoffeeBean.java index 3be7032c8..defb39422 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemCoffeeBean.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemCoffeeBean.java @@ -1,6 +1,6 @@ -package de.ellpeck.actuallyadditions.items; +package de.ellpeck.actuallyadditions.common.items; -import de.ellpeck.actuallyadditions.items.base.ItemFoodBase; +import de.ellpeck.actuallyadditions.common.items.base.ItemFoodBase; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemCrafterOnAStick.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemCrafterOnAStick.java index b308aa44f..68cd230be 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemCrafterOnAStick.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemCrafterOnAStick.java @@ -1,8 +1,8 @@ -package de.ellpeck.actuallyadditions.items; +package de.ellpeck.actuallyadditions.common.items; -import de.ellpeck.actuallyadditions.ActuallyAdditions; -import de.ellpeck.actuallyadditions.inventory.GuiHandler; -import de.ellpeck.actuallyadditions.items.base.ItemBase; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.inventory.GuiHandler; +import de.ellpeck.actuallyadditions.common.items.base.ItemBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemCrystal.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemCrystal.java index 2a57aee3f..bafa64ff3 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemCrystal.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemCrystal.java @@ -1,9 +1,9 @@ -package de.ellpeck.actuallyadditions.items; +package de.ellpeck.actuallyadditions.common.items; -import de.ellpeck.actuallyadditions.ActuallyAdditions; -import de.ellpeck.actuallyadditions.blocks.BlockCrystal; -import de.ellpeck.actuallyadditions.items.base.ItemBase; -import de.ellpeck.actuallyadditions.util.StringUtil; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.blocks.BlockCrystal; +import de.ellpeck.actuallyadditions.common.items.base.ItemBase; +import de.ellpeck.actuallyadditions.common.util.StringUtil; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemCrystalShard.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemCrystalShard.java index f1dfcc899..492059fff 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemCrystalShard.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemCrystalShard.java @@ -1,10 +1,10 @@ -package de.ellpeck.actuallyadditions.items; +package de.ellpeck.actuallyadditions.common.items; -import de.ellpeck.actuallyadditions.ActuallyAdditions; -import de.ellpeck.actuallyadditions.blocks.BlockCrystal; -import de.ellpeck.actuallyadditions.items.base.ItemBase; -import de.ellpeck.actuallyadditions.util.IColorProvidingItem; -import de.ellpeck.actuallyadditions.util.StringUtil; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.blocks.BlockCrystal; +import de.ellpeck.actuallyadditions.common.items.base.ItemBase; +import de.ellpeck.actuallyadditions.common.util.IColorProvidingItem; +import de.ellpeck.actuallyadditions.common.util.StringUtil; import net.minecraft.client.renderer.color.IItemColor; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.EnumRarity; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemDrill.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemDrill.java index a2903a0c3..5d8b66f55 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemDrill.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemDrill.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.items; +package de.ellpeck.actuallyadditions.common.items; import java.util.HashSet; import java.util.List; @@ -6,17 +6,17 @@ import java.util.Set; import com.google.common.collect.Multimap; -import de.ellpeck.actuallyadditions.ActuallyAdditions; -import de.ellpeck.actuallyadditions.blocks.metalists.TheColoredLampColors; -import de.ellpeck.actuallyadditions.config.values.ConfigStringListValues; -import de.ellpeck.actuallyadditions.inventory.ContainerDrill; -import de.ellpeck.actuallyadditions.inventory.GuiHandler; -import de.ellpeck.actuallyadditions.items.base.ItemEnergy; -import de.ellpeck.actuallyadditions.tile.TileEntityInventoryBase; -import de.ellpeck.actuallyadditions.util.ItemStackHandlerAA; -import de.ellpeck.actuallyadditions.util.ItemUtil; -import de.ellpeck.actuallyadditions.util.StackUtil; -import de.ellpeck.actuallyadditions.util.WorldUtil; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.blocks.metalists.TheColoredLampColors; +import de.ellpeck.actuallyadditions.common.config.values.ConfigStringListValues; +import de.ellpeck.actuallyadditions.common.inventory.ContainerDrill; +import de.ellpeck.actuallyadditions.common.inventory.GuiHandler; +import de.ellpeck.actuallyadditions.common.items.base.ItemEnergy; +import de.ellpeck.actuallyadditions.common.tile.TileEntityInventoryBase; +import de.ellpeck.actuallyadditions.common.util.ItemStackHandlerAA; +import de.ellpeck.actuallyadditions.common.util.ItemUtil; +import de.ellpeck.actuallyadditions.common.util.StackUtil; +import de.ellpeck.actuallyadditions.common.util.WorldUtil; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemDrillUpgrade.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemDrillUpgrade.java index 7a5015062..636d14343 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemDrillUpgrade.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemDrillUpgrade.java @@ -1,6 +1,6 @@ -package de.ellpeck.actuallyadditions.items; +package de.ellpeck.actuallyadditions.common.items; -import de.ellpeck.actuallyadditions.items.base.ItemBase; +import de.ellpeck.actuallyadditions.common.items.base.ItemBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemDust.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemDust.java index 0f017ede3..3395e7fed 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemDust.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemDust.java @@ -1,10 +1,10 @@ -package de.ellpeck.actuallyadditions.items; +package de.ellpeck.actuallyadditions.common.items; -import de.ellpeck.actuallyadditions.ActuallyAdditions; -import de.ellpeck.actuallyadditions.items.base.ItemBase; -import de.ellpeck.actuallyadditions.items.metalists.TheDusts; -import de.ellpeck.actuallyadditions.util.IColorProvidingItem; -import de.ellpeck.actuallyadditions.util.StringUtil; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.items.base.ItemBase; +import de.ellpeck.actuallyadditions.common.items.metalists.TheDusts; +import de.ellpeck.actuallyadditions.common.util.IColorProvidingItem; +import de.ellpeck.actuallyadditions.common.util.StringUtil; import net.minecraft.client.renderer.color.IItemColor; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.EnumRarity; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemEngineerGoggles.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemEngineerGoggles.java index 9fdbd3043..8759a039c 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemEngineerGoggles.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemEngineerGoggles.java @@ -1,13 +1,13 @@ -package de.ellpeck.actuallyadditions.items; +package de.ellpeck.actuallyadditions.common.items; import java.util.List; import java.util.Set; import de.ellpeck.actuallyadditions.api.misc.IGoggles; -import de.ellpeck.actuallyadditions.ActuallyAdditions; -import de.ellpeck.actuallyadditions.items.base.ItemArmorAA; -import de.ellpeck.actuallyadditions.material.InitArmorMaterials; -import de.ellpeck.actuallyadditions.util.StackUtil; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.items.base.ItemArmorAA; +import de.ellpeck.actuallyadditions.common.material.InitArmorMaterials; +import de.ellpeck.actuallyadditions.common.util.StackUtil; import io.netty.util.internal.ConcurrentSet; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemFertilizer.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemFertilizer.java index 7a6c996dc..d1b055991 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemFertilizer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemFertilizer.java @@ -1,7 +1,7 @@ -package de.ellpeck.actuallyadditions.items; +package de.ellpeck.actuallyadditions.common.items; -import de.ellpeck.actuallyadditions.items.base.ItemBase; -import de.ellpeck.actuallyadditions.misc.DispenserHandlerFertilize; +import de.ellpeck.actuallyadditions.common.items.base.ItemBase; +import de.ellpeck.actuallyadditions.common.misc.DispenserHandlerFertilize; import net.minecraft.block.BlockDispenser; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumRarity; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemFilter.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemFilter.java index b2ed87283..1ace38ea8 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemFilter.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemFilter.java @@ -1,13 +1,13 @@ -package de.ellpeck.actuallyadditions.items; +package de.ellpeck.actuallyadditions.common.items; import java.util.List; -import de.ellpeck.actuallyadditions.ActuallyAdditions; -import de.ellpeck.actuallyadditions.inventory.ContainerFilter; -import de.ellpeck.actuallyadditions.inventory.GuiHandler; -import de.ellpeck.actuallyadditions.items.base.ItemBase; -import de.ellpeck.actuallyadditions.util.ItemStackHandlerAA; -import de.ellpeck.actuallyadditions.util.StackUtil; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.inventory.ContainerFilter; +import de.ellpeck.actuallyadditions.common.inventory.GuiHandler; +import de.ellpeck.actuallyadditions.common.items.base.ItemBase; +import de.ellpeck.actuallyadditions.common.util.ItemStackHandlerAA; +import de.ellpeck.actuallyadditions.common.util.StackUtil; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumRarity; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemFoods.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemFoods.java index 6a756b50f..2ccb3d65f 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemFoods.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemFoods.java @@ -1,10 +1,10 @@ -package de.ellpeck.actuallyadditions.items; +package de.ellpeck.actuallyadditions.common.items; -import de.ellpeck.actuallyadditions.ActuallyAdditions; -import de.ellpeck.actuallyadditions.items.base.ItemFoodBase; -import de.ellpeck.actuallyadditions.items.metalists.TheFoods; -import de.ellpeck.actuallyadditions.util.StackUtil; -import de.ellpeck.actuallyadditions.util.StringUtil; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.items.base.ItemFoodBase; +import de.ellpeck.actuallyadditions.common.items.metalists.TheFoods; +import de.ellpeck.actuallyadditions.common.util.StackUtil; +import de.ellpeck.actuallyadditions.common.util.StringUtil; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemGeneric.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemGeneric.java index 1cfdb83c4..6b4da3235 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemGeneric.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemGeneric.java @@ -1,6 +1,6 @@ -package de.ellpeck.actuallyadditions.items; +package de.ellpeck.actuallyadditions.common.items; -import de.ellpeck.actuallyadditions.items.base.ItemBase; +import de.ellpeck.actuallyadditions.common.items.base.ItemBase; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemGrowthRing.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemGrowthRing.java index 6f18e4720..b5b539f64 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemGrowthRing.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemGrowthRing.java @@ -1,10 +1,10 @@ -package de.ellpeck.actuallyadditions.items; +package de.ellpeck.actuallyadditions.common.items; import java.util.ArrayList; import java.util.List; -import de.ellpeck.actuallyadditions.items.base.ItemEnergy; -import de.ellpeck.actuallyadditions.util.StackUtil; +import de.ellpeck.actuallyadditions.common.items.base.ItemEnergy; +import de.ellpeck.actuallyadditions.common.util.StackUtil; import net.minecraft.block.Block; import net.minecraft.block.BlockGrass; import net.minecraft.block.IGrowable; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemHairyBall.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemHairyBall.java index fd704b923..858eea8ed 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemHairyBall.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemHairyBall.java @@ -69,4 +69,6 @@ public class ItemHairyBall extends ItemBase { @Override public EnumRarity getRarity(ItemStack stack) { - return \ No newline at end of file + return EnumRarity.EPIC; + } +} diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemKnife.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemKnife.java index d5271f560..e4590d2d0 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemKnife.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemKnife.java @@ -1,8 +1,8 @@ -package de.ellpeck.actuallyadditions.items; +package de.ellpeck.actuallyadditions.common.items; import com.google.common.collect.Multimap; -import de.ellpeck.actuallyadditions.items.base.ItemBase; +import de.ellpeck.actuallyadditions.common.items.base.ItemBase; import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.ai.attributes.AttributeModifier; import net.minecraft.inventory.EntityEquipmentSlot; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemLaserRelayUpgrade.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemLaserRelayUpgrade.java index 02a6f8860..cd6d78f6d 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemLaserRelayUpgrade.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemLaserRelayUpgrade.java @@ -1,6 +1,6 @@ -package de.ellpeck.actuallyadditions.items; +package de.ellpeck.actuallyadditions.common.items; -import de.ellpeck.actuallyadditions.items.base.ItemBase; +import de.ellpeck.actuallyadditions.common.items.base.ItemBase; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemLaserWrench.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemLaserWrench.java index 5802e7f4a..c8ccc4193 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemLaserWrench.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemLaserWrench.java @@ -1,12 +1,12 @@ -package de.ellpeck.actuallyadditions.items; +package de.ellpeck.actuallyadditions.common.items; import java.util.List; import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI; -import de.ellpeck.actuallyadditions.ActuallyAdditions; -import de.ellpeck.actuallyadditions.items.base.ItemBase; -import de.ellpeck.actuallyadditions.tile.TileEntityLaserRelay; -import de.ellpeck.actuallyadditions.util.StringUtil; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.items.base.ItemBase; +import de.ellpeck.actuallyadditions.common.tile.TileEntityLaserRelay; +import de.ellpeck.actuallyadditions.common.util.StringUtil; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumRarity; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemMagnetRing.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemMagnetRing.java index a2fd0f9b5..39ffcff58 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemMagnetRing.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemMagnetRing.java @@ -1,9 +1,9 @@ -package de.ellpeck.actuallyadditions.items; +package de.ellpeck.actuallyadditions.common.items; import java.util.List; -import de.ellpeck.actuallyadditions.items.base.ItemEnergy; -import de.ellpeck.actuallyadditions.util.ItemUtil; +import de.ellpeck.actuallyadditions.common.items.base.ItemEnergy; +import de.ellpeck.actuallyadditions.common.util.ItemUtil; import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemMisc.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemMisc.java index 1ae8bde09..29faecfd7 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemMisc.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemMisc.java @@ -1,10 +1,10 @@ -package de.ellpeck.actuallyadditions.items; +package de.ellpeck.actuallyadditions.common.items; -import de.ellpeck.actuallyadditions.ActuallyAdditions; -import de.ellpeck.actuallyadditions.fluids.InitFluids; -import de.ellpeck.actuallyadditions.items.base.ItemBase; -import de.ellpeck.actuallyadditions.items.metalists.TheMiscItems; -import de.ellpeck.actuallyadditions.util.StringUtil; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.fluids.InitFluids; +import de.ellpeck.actuallyadditions.common.items.base.ItemBase; +import de.ellpeck.actuallyadditions.common.items.metalists.TheMiscItems; +import de.ellpeck.actuallyadditions.common.util.StringUtil; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemPickaxeAA.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemPickaxeAA.java index 7d31c77a6..b729c662a 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemPickaxeAA.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemPickaxeAA.java @@ -1,11 +1,11 @@ -package de.ellpeck.actuallyadditions.items; +package de.ellpeck.actuallyadditions.common.items; import java.util.Collections; import java.util.Set; import com.google.common.collect.Sets; -import de.ellpeck.actuallyadditions.items.base.ItemToolAA; +import de.ellpeck.actuallyadditions.common.items.base.ItemToolAA; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemPlayerProbe.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemPlayerProbe.java index 453fb2db7..244f3bfec 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemPlayerProbe.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemPlayerProbe.java @@ -1,15 +1,15 @@ -package de.ellpeck.actuallyadditions.items; +package de.ellpeck.actuallyadditions.common.items; import java.util.List; import java.util.UUID; import javax.annotation.Nullable; -import de.ellpeck.actuallyadditions.ActuallyAdditions; -import de.ellpeck.actuallyadditions.items.base.ItemBase; -import de.ellpeck.actuallyadditions.tile.TileEntityPlayerInterface; -import de.ellpeck.actuallyadditions.util.StackUtil; -import de.ellpeck.actuallyadditions.util.StringUtil; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.items.base.ItemBase; +import de.ellpeck.actuallyadditions.common.tile.TileEntityPlayerInterface; +import de.ellpeck.actuallyadditions.common.util.StackUtil; +import de.ellpeck.actuallyadditions.common.util.StringUtil; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemPotionRing.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemPotionRing.java index f8745b79f..2070ec442 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemPotionRing.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemPotionRing.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.items; +package de.ellpeck.actuallyadditions.common.items; import java.util.Collections; import java.util.List; @@ -6,13 +6,13 @@ import java.util.List; import javax.annotation.Nullable; import de.ellpeck.actuallyadditions.api.misc.IDisplayStandItem; -import de.ellpeck.actuallyadditions.ActuallyAdditions; -import de.ellpeck.actuallyadditions.items.base.ItemBase; -import de.ellpeck.actuallyadditions.items.metalists.ThePotionRings; -import de.ellpeck.actuallyadditions.util.IColorProvidingItem; -import de.ellpeck.actuallyadditions.util.StackUtil; -import de.ellpeck.actuallyadditions.util.StringUtil; -import de.ellpeck.actuallyadditions.util.Util; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.items.base.ItemBase; +import de.ellpeck.actuallyadditions.common.items.metalists.ThePotionRings; +import de.ellpeck.actuallyadditions.common.util.IColorProvidingItem; +import de.ellpeck.actuallyadditions.common.util.StackUtil; +import de.ellpeck.actuallyadditions.common.util.StringUtil; +import de.ellpeck.actuallyadditions.common.util.Util; import net.minecraft.client.renderer.color.IItemColor; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.creativetab.CreativeTabs; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemResonantRice.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemResonantRice.java index 89590bab3..334316135 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemResonantRice.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemResonantRice.java @@ -1,6 +1,6 @@ -package de.ellpeck.actuallyadditions.items; +package de.ellpeck.actuallyadditions.common.items; -import de.ellpeck.actuallyadditions.items.base.ItemBase; +import de.ellpeck.actuallyadditions.common.items.base.ItemBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemShovelAA.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemShovelAA.java index 851a1fc2c..3b1e7fbd0 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemShovelAA.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemShovelAA.java @@ -1,11 +1,11 @@ -package de.ellpeck.actuallyadditions.items; +package de.ellpeck.actuallyadditions.common.items; import java.util.Collections; import java.util.Set; import com.google.common.collect.Sets; -import de.ellpeck.actuallyadditions.items.base.ItemToolAA; +import de.ellpeck.actuallyadditions.common.items.base.ItemToolAA; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemSolidifiedExperience.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemSolidifiedExperience.java index d6f26b228..382e5b1f7 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemSolidifiedExperience.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemSolidifiedExperience.java @@ -1,8 +1,8 @@ -package de.ellpeck.actuallyadditions.items; +package de.ellpeck.actuallyadditions.common.items; -import de.ellpeck.actuallyadditions.ActuallyAdditions; -import de.ellpeck.actuallyadditions.config.values.ConfigBoolValues; -import de.ellpeck.actuallyadditions.items.base.ItemBase; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.config.values.ConfigBoolValues; +import de.ellpeck.actuallyadditions.common.items.base.ItemBase; import net.minecraft.entity.EntityCreature; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.item.EntityXPOrb; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemSpawnerChanger.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemSpawnerChanger.java index d537f31ec..f6ccdfa64 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemSpawnerChanger.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemSpawnerChanger.java @@ -1,12 +1,12 @@ -package de.ellpeck.actuallyadditions.items; +package de.ellpeck.actuallyadditions.common.items; import java.util.List; -import de.ellpeck.actuallyadditions.ActuallyAdditions; -import de.ellpeck.actuallyadditions.config.values.ConfigStringListValues; -import de.ellpeck.actuallyadditions.items.base.ItemBase; -import de.ellpeck.actuallyadditions.util.StackUtil; -import de.ellpeck.actuallyadditions.util.StringUtil; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.config.values.ConfigStringListValues; +import de.ellpeck.actuallyadditions.common.items.base.ItemBase; +import de.ellpeck.actuallyadditions.common.util.StackUtil; +import de.ellpeck.actuallyadditions.common.util.StringUtil; import net.minecraft.block.state.IBlockState; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.EntityList; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemTeleStaff.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemTeleStaff.java index db397e3b5..676649e43 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemTeleStaff.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemTeleStaff.java @@ -1,7 +1,7 @@ -package de.ellpeck.actuallyadditions.items; +package de.ellpeck.actuallyadditions.common.items; -import de.ellpeck.actuallyadditions.items.base.ItemEnergy; -import de.ellpeck.actuallyadditions.util.WorldUtil; +import de.ellpeck.actuallyadditions.common.items.base.ItemEnergy; +import de.ellpeck.actuallyadditions.common.util.WorldUtil; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.init.SoundEvents; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemWaterBowl.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemWaterBowl.java index 8cc59d02a..685fa7b3f 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemWaterBowl.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemWaterBowl.java @@ -1,9 +1,9 @@ -package de.ellpeck.actuallyadditions.items; +package de.ellpeck.actuallyadditions.common.items; -import de.ellpeck.actuallyadditions.config.values.ConfigBoolValues; -import de.ellpeck.actuallyadditions.items.base.ItemBase; -import de.ellpeck.actuallyadditions.util.StackUtil; -import de.ellpeck.actuallyadditions.util.WorldUtil; +import de.ellpeck.actuallyadditions.common.config.values.ConfigBoolValues; +import de.ellpeck.actuallyadditions.common.items.base.ItemBase; +import de.ellpeck.actuallyadditions.common.util.StackUtil; +import de.ellpeck.actuallyadditions.common.util.WorldUtil; import net.minecraft.block.Block; import net.minecraft.block.BlockLiquid; import net.minecraft.block.material.Material; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemWaterRemovalRing.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemWaterRemovalRing.java index f00f50879..c6af39562 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemWaterRemovalRing.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemWaterRemovalRing.java @@ -1,7 +1,7 @@ -package de.ellpeck.actuallyadditions.items; +package de.ellpeck.actuallyadditions.common.items; -import de.ellpeck.actuallyadditions.items.base.ItemEnergy; -import de.ellpeck.actuallyadditions.util.StackUtil; +import de.ellpeck.actuallyadditions.common.items.base.ItemEnergy; +import de.ellpeck.actuallyadditions.common.util.StackUtil; import net.minecraft.block.Block; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemWingsOfTheBats.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemWingsOfTheBats.java index e56cdf910..8607b0d88 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemWingsOfTheBats.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemWingsOfTheBats.java @@ -1,12 +1,12 @@ -package de.ellpeck.actuallyadditions.items; +package de.ellpeck.actuallyadditions.common.items; -import de.ellpeck.actuallyadditions.ActuallyAdditions; -import de.ellpeck.actuallyadditions.config.values.ConfigBoolValues; -import de.ellpeck.actuallyadditions.data.PlayerData; -import de.ellpeck.actuallyadditions.items.base.ItemBase; -import de.ellpeck.actuallyadditions.items.metalists.TheMiscItems; -import de.ellpeck.actuallyadditions.network.PacketHandlerHelper; -import de.ellpeck.actuallyadditions.util.StackUtil; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.config.values.ConfigBoolValues; +import de.ellpeck.actuallyadditions.common.data.PlayerData; +import de.ellpeck.actuallyadditions.common.items.base.ItemBase; +import de.ellpeck.actuallyadditions.common.items.metalists.TheMiscItems; +import de.ellpeck.actuallyadditions.common.network.PacketHandlerHelper; +import de.ellpeck.actuallyadditions.common.util.StackUtil; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemWorm.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemWorm.java index 6066b3151..9cd422415 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemWorm.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemWorm.java @@ -1,11 +1,11 @@ -package de.ellpeck.actuallyadditions.items; +package de.ellpeck.actuallyadditions.common.items; import java.util.List; -import de.ellpeck.actuallyadditions.ActuallyAdditions; -import de.ellpeck.actuallyadditions.config.values.ConfigBoolValues; -import de.ellpeck.actuallyadditions.entity.EntityWorm; -import de.ellpeck.actuallyadditions.items.base.ItemBase; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.config.values.ConfigBoolValues; +import de.ellpeck.actuallyadditions.common.entity.EntityWorm; +import de.ellpeck.actuallyadditions.common.items.base.ItemBase; import net.minecraft.block.BlockGrass; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/items/base/ItemBase.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/base/ItemBase.java index 307ea49c1..789d016da 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/items/base/ItemBase.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/base/ItemBase.java @@ -1,7 +1,7 @@ -package de.ellpeck.actuallyadditions.items.base; +package de.ellpeck.actuallyadditions.common.items.base; -import de.ellpeck.actuallyadditions.ActuallyAdditions; -import de.ellpeck.actuallyadditions.util.ItemUtil; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.util.ItemUtil; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/items/base/ItemEnergy.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/base/ItemEnergy.java index 79f2c0233..d4fe0d897 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/items/base/ItemEnergy.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/base/ItemEnergy.java @@ -1,13 +1,13 @@ -package de.ellpeck.actuallyadditions.items.base; +package de.ellpeck.actuallyadditions.common.items.base; import java.text.NumberFormat; import java.util.List; import javax.annotation.Nullable; -import de.ellpeck.actuallyadditions.ActuallyAdditions; -import de.ellpeck.actuallyadditions.tile.CustomEnergyStorage; -import de.ellpeck.actuallyadditions.util.AssetUtil; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.tile.CustomEnergyStorage; +import de.ellpeck.actuallyadditions.common.util.AssetUtil; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/items/base/ItemFoodBase.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/base/ItemFoodBase.java index 1909b6d66..0e094dbce 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/items/base/ItemFoodBase.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/base/ItemFoodBase.java @@ -1,7 +1,7 @@ -package de.ellpeck.actuallyadditions.items.base; +package de.ellpeck.actuallyadditions.common.items.base; -import de.ellpeck.actuallyadditions.ActuallyAdditions; -import de.ellpeck.actuallyadditions.util.ItemUtil; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.util.ItemUtil; import net.minecraft.item.ItemFood; import net.minecraft.item.ItemStack; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/items/base/ItemFoodSeed.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/base/ItemFoodSeed.java index 64e36d1a8..c0755b069 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/items/base/ItemFoodSeed.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/base/ItemFoodSeed.java @@ -1,8 +1,8 @@ -package de.ellpeck.actuallyadditions.items.base; +package de.ellpeck.actuallyadditions.common.items.base; -import de.ellpeck.actuallyadditions.ActuallyAdditions; -import de.ellpeck.actuallyadditions.blocks.base.BlockPlant; -import de.ellpeck.actuallyadditions.util.ItemUtil; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.blocks.base.BlockPlant; +import de.ellpeck.actuallyadditions.common.util.ItemUtil; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/items/base/ItemSwordAA.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/base/ItemSwordAA.java index 2c991b119..b78d2560a 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/items/base/ItemSwordAA.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/base/ItemSwordAA.java @@ -1,11 +1,11 @@ -package de.ellpeck.actuallyadditions.items.base; +package de.ellpeck.actuallyadditions.common.items.base; import de.ellpeck.actuallyadditions.api.misc.IDisableableItem; -import de.ellpeck.actuallyadditions.ActuallyAdditions; -import de.ellpeck.actuallyadditions.blocks.base.BlockItemBase; -import de.ellpeck.actuallyadditions.config.ConfigurationHandler; -import de.ellpeck.actuallyadditions.util.ItemUtil; -import de.ellpeck.actuallyadditions.util.StringUtil; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.blocks.base.BlockItemBase; +import de.ellpeck.actuallyadditions.common.config.ConfigurationHandler; +import de.ellpeck.actuallyadditions.common.util.ItemUtil; +import de.ellpeck.actuallyadditions.common.util.StringUtil; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemSword; import net.minecraftforge.common.IRarity; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/items/base/ItemToolAA.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/base/ItemToolAA.java index 17aa42bd3..f8a699148 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/items/base/ItemToolAA.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/base/ItemToolAA.java @@ -1,13 +1,13 @@ -package de.ellpeck.actuallyadditions.items.base; +package de.ellpeck.actuallyadditions.common.items.base; import java.util.Set; import de.ellpeck.actuallyadditions.api.misc.IDisableableItem; -import de.ellpeck.actuallyadditions.ActuallyAdditions; -import de.ellpeck.actuallyadditions.config.ConfigurationHandler; -import de.ellpeck.actuallyadditions.util.ItemUtil; -import de.ellpeck.actuallyadditions.util.StackUtil; -import de.ellpeck.actuallyadditions.util.StringUtil; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.config.ConfigurationHandler; +import de.ellpeck.actuallyadditions.common.util.ItemUtil; +import de.ellpeck.actuallyadditions.common.util.StackUtil; +import de.ellpeck.actuallyadditions.common.util.StringUtil; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemTool; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/items/lens/LensColor.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/lens/LensColor.java index f40d577e1..9d689dfbc 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/items/lens/LensColor.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/lens/LensColor.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.items.lens; +package de.ellpeck.actuallyadditions.common.items.lens; import java.util.List; import java.util.Map; @@ -8,7 +8,7 @@ import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI; import de.ellpeck.actuallyadditions.api.internal.IAtomicReconstructor; import de.ellpeck.actuallyadditions.api.lens.Lens; import de.ellpeck.actuallyadditions.api.recipe.IColorLensChanger; -import de.ellpeck.actuallyadditions.util.StackUtil; +import de.ellpeck.actuallyadditions.common.util.StackUtil; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.item.EntityItem; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/items/lens/LensDeath.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/lens/LensDeath.java index 7acd0e403..8fe503067 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/items/lens/LensDeath.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/lens/LensDeath.java @@ -1,10 +1,10 @@ -package de.ellpeck.actuallyadditions.items.lens; +package de.ellpeck.actuallyadditions.common.items.lens; import java.util.ArrayList; import de.ellpeck.actuallyadditions.api.internal.IAtomicReconstructor; import de.ellpeck.actuallyadditions.api.lens.Lens; -import de.ellpeck.actuallyadditions.misc.DamageSources; +import de.ellpeck.actuallyadditions.common.misc.DamageSources; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; import net.minecraft.util.math.AxisAlignedBB; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/items/lens/LensDetonation.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/lens/LensDetonation.java index 6b98b9f6f..23ac7e243 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/items/lens/LensDetonation.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/lens/LensDetonation.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.items.lens; +package de.ellpeck.actuallyadditions.common.items.lens; import de.ellpeck.actuallyadditions.api.internal.IAtomicReconstructor; import de.ellpeck.actuallyadditions.api.lens.Lens; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/items/lens/LensDisenchanting.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/lens/LensDisenchanting.java index 790e3a2fb..5851c5d59 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/items/lens/LensDisenchanting.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/lens/LensDisenchanting.java @@ -1,12 +1,12 @@ -package de.ellpeck.actuallyadditions.items.lens; +package de.ellpeck.actuallyadditions.common.items.lens; import java.util.List; import java.util.Map; import de.ellpeck.actuallyadditions.api.internal.IAtomicReconstructor; import de.ellpeck.actuallyadditions.api.lens.Lens; -import de.ellpeck.actuallyadditions.util.ItemUtil; -import de.ellpeck.actuallyadditions.util.StackUtil; +import de.ellpeck.actuallyadditions.common.util.ItemUtil; +import de.ellpeck.actuallyadditions.common.util.StackUtil; import net.minecraft.block.state.IBlockState; import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnchantmentData; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/items/lens/LensDisruption.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/lens/LensDisruption.java index bb66be9e4..c3f5f8d7a 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/items/lens/LensDisruption.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/lens/LensDisruption.java @@ -1,12 +1,12 @@ -package de.ellpeck.actuallyadditions.items.lens; +package de.ellpeck.actuallyadditions.common.items.lens; import java.util.ArrayList; import de.ellpeck.actuallyadditions.api.internal.IAtomicReconstructor; import de.ellpeck.actuallyadditions.api.lens.Lens; -import de.ellpeck.actuallyadditions.ActuallyAdditions; -import de.ellpeck.actuallyadditions.config.values.ConfigIntValues; -import de.ellpeck.actuallyadditions.util.StackUtil; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.config.values.ConfigIntValues; +import de.ellpeck.actuallyadditions.common.util.StackUtil; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.item.EntityItem; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/items/lens/LensKiller.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/lens/LensKiller.java index 612766e86..c3570bfd2 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/items/lens/LensKiller.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/lens/LensKiller.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.items.lens; +package de.ellpeck.actuallyadditions.common.items.lens; import de.ellpeck.actuallyadditions.api.internal.IAtomicReconstructor; import net.minecraft.entity.EntityLivingBase; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/items/lens/LensRecipeHandler.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/lens/LensRecipeHandler.java index 9cf577ff0..0798b52e1 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/items/lens/LensRecipeHandler.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/lens/LensRecipeHandler.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.items.lens; +package de.ellpeck.actuallyadditions.common.items.lens; import java.util.ArrayList; import java.util.List; @@ -10,14 +10,14 @@ import de.ellpeck.actuallyadditions.api.lens.Lens; import de.ellpeck.actuallyadditions.api.recipe.ColorLensChangerByDyeMeta; import de.ellpeck.actuallyadditions.api.recipe.IColorLensChanger; import de.ellpeck.actuallyadditions.api.recipe.LensConversionRecipe; -import de.ellpeck.actuallyadditions.blocks.InitBlocks; -import de.ellpeck.actuallyadditions.config.values.ConfigBoolValues; -import de.ellpeck.actuallyadditions.items.InitItems; -import de.ellpeck.actuallyadditions.items.metalists.TheCrystals; -import de.ellpeck.actuallyadditions.items.metalists.TheMiscItems; -import de.ellpeck.actuallyadditions.recipe.ColorLensRotator; -import de.ellpeck.actuallyadditions.recipe.EnchBookConversion; -import de.ellpeck.actuallyadditions.util.RecipeUtil; +import de.ellpeck.actuallyadditions.common.blocks.InitBlocks; +import de.ellpeck.actuallyadditions.common.config.values.ConfigBoolValues; +import de.ellpeck.actuallyadditions.common.items.InitItems; +import de.ellpeck.actuallyadditions.common.items.metalists.TheCrystals; +import de.ellpeck.actuallyadditions.common.items.metalists.TheMiscItems; +import de.ellpeck.actuallyadditions.common.recipe.ColorLensRotator; +import de.ellpeck.actuallyadditions.common.recipe.EnchBookConversion; +import de.ellpeck.actuallyadditions.common.util.RecipeUtil; import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.init.Items; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/items/lens/Lenses.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/lens/Lenses.java index 28d87fd34..43231be05 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/items/lens/Lenses.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/lens/Lenses.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.items.lens; +package de.ellpeck.actuallyadditions.common.items.lens; import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI; import de.ellpeck.actuallyadditions.api.lens.LensConversion; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/items/metalists/TheCrystals.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/metalists/TheCrystals.java index 0e87f1e88..eadd19cf0 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/items/metalists/TheCrystals.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/metalists/TheCrystals.java @@ -1,6 +1,6 @@ -package de.ellpeck.actuallyadditions.items.metalists; +package de.ellpeck.actuallyadditions.common.items.metalists; -import de.ellpeck.actuallyadditions.util.Util; +import de.ellpeck.actuallyadditions.common.util.Util; import net.minecraft.item.Rarity; import net.minecraft.util.IStringSerializable; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/items/metalists/TheDusts.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/metalists/TheDusts.java index f288baa15..9151d2b5e 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/items/metalists/TheDusts.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/metalists/TheDusts.java @@ -21,4 +21,7 @@ public enum TheDusts { TheDusts(String name, int color, EnumRarity rarity) { this.name = name; this.color = color; - this.rarity = rarit \ No newline at end of file + this.rarity = rarity; + } + +} \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/items/metalists/TheFoods.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/metalists/TheFoods.java index c304cea57..a904343b6 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/items/metalists/TheFoods.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/metalists/TheFoods.java @@ -1,7 +1,7 @@ -package de.ellpeck.actuallyadditions.items.metalists; +package de.ellpeck.actuallyadditions.common.items.metalists; -import de.ellpeck.actuallyadditions.items.InitItems; -import de.ellpeck.actuallyadditions.util.StackUtil; +import de.ellpeck.actuallyadditions.common.items.InitItems; +import de.ellpeck.actuallyadditions.common.util.StackUtil; import net.minecraft.init.Items; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/items/metalists/TheJams.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/metalists/TheJams.java index 2b79665b1..822d4baf2 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/items/metalists/TheJams.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/metalists/TheJams.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.items.metalists; +package de.ellpeck.actuallyadditions.common.items.metalists; import net.minecraft.item.EnumRarity; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/items/metalists/TheMiscItems.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/metalists/TheMiscItems.java index 29dbccb4b..f48951e35 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/items/metalists/TheMiscItems.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/metalists/TheMiscItems.java @@ -1,6 +1,6 @@ -package de.ellpeck.actuallyadditions.items.metalists; +package de.ellpeck.actuallyadditions.common.items.metalists; -import de.ellpeck.actuallyadditions.util.Util; +import de.ellpeck.actuallyadditions.common.util.Util; import net.minecraft.item.EnumRarity; import net.minecraftforge.common.IRarity; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/items/metalists/ThePotionRings.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/metalists/ThePotionRings.java index 2d9021b14..719e9d8c3 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/items/metalists/ThePotionRings.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/metalists/ThePotionRings.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.items.metalists; +package de.ellpeck.actuallyadditions.common.items.metalists; import net.minecraft.init.Blocks; import net.minecraft.init.Items; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/jei/JEIActuallyAdditionsPlugin.java b/src/main/java/de/ellpeck/actuallyadditions/common/jei/JEIActuallyAdditionsPlugin.java index ebcd5e6b3..387809613 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/jei/JEIActuallyAdditionsPlugin.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/jei/JEIActuallyAdditionsPlugin.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.jei; +package de.ellpeck.actuallyadditions.common.jei; import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI; import de.ellpeck.actuallyadditions.api.booklet.IBookletPage; @@ -7,25 +7,25 @@ import de.ellpeck.actuallyadditions.api.recipe.CompostRecipe; import de.ellpeck.actuallyadditions.api.recipe.CrusherRecipe; import de.ellpeck.actuallyadditions.api.recipe.EmpowererRecipe; import de.ellpeck.actuallyadditions.api.recipe.LensConversionRecipe; -import de.ellpeck.actuallyadditions.blocks.InitBlocks; -import de.ellpeck.actuallyadditions.inventory.gui.GuiCoffeeMachine; -import de.ellpeck.actuallyadditions.inventory.gui.GuiFurnaceDouble; -import de.ellpeck.actuallyadditions.inventory.gui.GuiGrinder; -import de.ellpeck.actuallyadditions.items.InitItems; -import de.ellpeck.actuallyadditions.items.metalists.TheMiscItems; -import de.ellpeck.actuallyadditions.jei.booklet.BookletRecipeCategory; -import de.ellpeck.actuallyadditions.jei.booklet.BookletRecipeWrapper; -import de.ellpeck.actuallyadditions.jei.coffee.CoffeeMachineRecipeCategory; -import de.ellpeck.actuallyadditions.jei.coffee.CoffeeMachineRecipeWrapper; -import de.ellpeck.actuallyadditions.jei.compost.CompostRecipeCategory; -import de.ellpeck.actuallyadditions.jei.compost.CompostRecipeWrapper; -import de.ellpeck.actuallyadditions.jei.crusher.CrusherRecipeCategory; -import de.ellpeck.actuallyadditions.jei.crusher.CrusherRecipeWrapper; -import de.ellpeck.actuallyadditions.jei.empowerer.EmpowererRecipeCategory; -import de.ellpeck.actuallyadditions.jei.empowerer.EmpowererRecipeWrapper; -import de.ellpeck.actuallyadditions.jei.reconstructor.ReconstructorRecipeCategory; -import de.ellpeck.actuallyadditions.jei.reconstructor.ReconstructorRecipeWrapper; -import de.ellpeck.actuallyadditions.util.Util; +import de.ellpeck.actuallyadditions.common.blocks.InitBlocks; +import de.ellpeck.actuallyadditions.common.inventory.gui.GuiCoffeeMachine; +import de.ellpeck.actuallyadditions.common.inventory.gui.GuiFurnaceDouble; +import de.ellpeck.actuallyadditions.common.inventory.gui.GuiGrinder; +import de.ellpeck.actuallyadditions.common.items.InitItems; +import de.ellpeck.actuallyadditions.common.items.metalists.TheMiscItems; +import de.ellpeck.actuallyadditions.common.jei.booklet.BookletRecipeCategory; +import de.ellpeck.actuallyadditions.common.jei.booklet.BookletRecipeWrapper; +import de.ellpeck.actuallyadditions.common.jei.coffee.CoffeeMachineRecipeCategory; +import de.ellpeck.actuallyadditions.common.jei.coffee.CoffeeMachineRecipeWrapper; +import de.ellpeck.actuallyadditions.common.jei.compost.CompostRecipeCategory; +import de.ellpeck.actuallyadditions.common.jei.compost.CompostRecipeWrapper; +import de.ellpeck.actuallyadditions.common.jei.crusher.CrusherRecipeCategory; +import de.ellpeck.actuallyadditions.common.jei.crusher.CrusherRecipeWrapper; +import de.ellpeck.actuallyadditions.common.jei.empowerer.EmpowererRecipeCategory; +import de.ellpeck.actuallyadditions.common.jei.empowerer.EmpowererRecipeWrapper; +import de.ellpeck.actuallyadditions.common.jei.reconstructor.ReconstructorRecipeCategory; +import de.ellpeck.actuallyadditions.common.jei.reconstructor.ReconstructorRecipeWrapper; +import de.ellpeck.actuallyadditions.common.util.Util; import mezz.jei.api.IJeiHelpers; import mezz.jei.api.IModPlugin; import mezz.jei.api.IModRegistry; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/jei/RecipeWrapperWithButton.java b/src/main/java/de/ellpeck/actuallyadditions/common/jei/RecipeWrapperWithButton.java index 3b4c47eae..25d929a47 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/jei/RecipeWrapperWithButton.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/jei/RecipeWrapperWithButton.java @@ -7,8 +7,8 @@ import javax.annotation.Nullable; import de.ellpeck.actuallyadditions.api.booklet.IBookletPage; import de.ellpeck.actuallyadditions.common.ActuallyAdditions; -import de.ellpeck.actuallyadditions.common.booklet.gui.GuiBooklet; -import de.ellpeck.actuallyadditions.common.booklet.misc.BookletUtils; +import de.ellpeck.actuallyadditions.booklet.gui.GuiBooklet; +import de.ellpeck.actuallyadditions.booklet.misc.BookletUtils; import de.ellpeck.actuallyadditions.common.inventory.gui.TexturedButton; import de.ellpeck.actuallyadditions.common.util.StringUtil; import mezz.jei.api.recipe.IRecipeWrapper; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/jei/booklet/BookletRecipeWrapper.java b/src/main/java/de/ellpeck/actuallyadditions/common/jei/booklet/BookletRecipeWrapper.java index 691dcf0ff..bacd3124b 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/jei/booklet/BookletRecipeWrapper.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/jei/booklet/BookletRecipeWrapper.java @@ -1,13 +1,13 @@ -package de.ellpeck.actuallyadditions.jei.booklet; +package de.ellpeck.actuallyadditions.common.jei.booklet; import java.util.ArrayList; import java.util.List; import de.ellpeck.actuallyadditions.api.booklet.IBookletChapter; import de.ellpeck.actuallyadditions.api.booklet.IBookletPage; -import de.ellpeck.actuallyadditions.ActuallyAdditions; -import de.ellpeck.actuallyadditions.jei.RecipeWrapperWithButton; -import de.ellpeck.actuallyadditions.util.StringUtil; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.jei.RecipeWrapperWithButton; +import de.ellpeck.actuallyadditions.common.util.StringUtil; import mezz.jei.api.ingredients.IIngredients; import mezz.jei.api.ingredients.VanillaTypes; import net.minecraft.client.Minecraft; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/jei/coffee/CoffeeMachineRecipeCategory.java b/src/main/java/de/ellpeck/actuallyadditions/common/jei/coffee/CoffeeMachineRecipeCategory.java index 7750f8a8f..9879f6672 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/jei/coffee/CoffeeMachineRecipeCategory.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/jei/coffee/CoffeeMachineRecipeCategory.java @@ -1,11 +1,11 @@ -package de.ellpeck.actuallyadditions.jei.coffee; +package de.ellpeck.actuallyadditions.common.jei.coffee; import java.util.Arrays; -import de.ellpeck.actuallyadditions.ActuallyAdditions; -import de.ellpeck.actuallyadditions.tile.TileEntityCoffeeMachine; -import de.ellpeck.actuallyadditions.util.AssetUtil; -import de.ellpeck.actuallyadditions.util.StringUtil; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.tile.TileEntityCoffeeMachine; +import de.ellpeck.actuallyadditions.common.util.AssetUtil; +import de.ellpeck.actuallyadditions.common.util.StringUtil; import mezz.jei.api.IGuiHelper; import mezz.jei.api.gui.IDrawable; import mezz.jei.api.gui.IRecipeLayout; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/jei/coffee/CoffeeMachineRecipeWrapper.java b/src/main/java/de/ellpeck/actuallyadditions/common/jei/coffee/CoffeeMachineRecipeWrapper.java index b3fabd3cc..b5673f2a9 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/jei/coffee/CoffeeMachineRecipeWrapper.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/jei/coffee/CoffeeMachineRecipeWrapper.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.jei.coffee; +package de.ellpeck.actuallyadditions.common.jei.coffee; import java.util.ArrayList; import java.util.List; @@ -8,14 +8,14 @@ import com.google.common.base.Strings; import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI; import de.ellpeck.actuallyadditions.api.booklet.IBookletPage; import de.ellpeck.actuallyadditions.api.recipe.CoffeeIngredient; -import de.ellpeck.actuallyadditions.ActuallyAdditions; -import de.ellpeck.actuallyadditions.blocks.InitBlocks; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.blocks.InitBlocks; import de.ellpeck.actuallyadditions.booklet.misc.BookletUtils; -import de.ellpeck.actuallyadditions.items.InitItems; -import de.ellpeck.actuallyadditions.items.metalists.TheMiscItems; -import de.ellpeck.actuallyadditions.jei.RecipeWrapperWithButton; -import de.ellpeck.actuallyadditions.tile.TileEntityCoffeeMachine; -import de.ellpeck.actuallyadditions.util.StringUtil; +import de.ellpeck.actuallyadditions.common.items.InitItems; +import de.ellpeck.actuallyadditions.common.items.metalists.TheMiscItems; +import de.ellpeck.actuallyadditions.common.jei.RecipeWrapperWithButton; +import de.ellpeck.actuallyadditions.common.tile.TileEntityCoffeeMachine; +import de.ellpeck.actuallyadditions.common.util.StringUtil; import mezz.jei.api.ingredients.IIngredients; import mezz.jei.api.ingredients.VanillaTypes; import net.minecraft.client.Minecraft; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/jei/compost/CompostRecipeCategory.java b/src/main/java/de/ellpeck/actuallyadditions/common/jei/compost/CompostRecipeCategory.java index cac42c196..406c7b421 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/jei/compost/CompostRecipeCategory.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/jei/compost/CompostRecipeCategory.java @@ -1,10 +1,10 @@ -package de.ellpeck.actuallyadditions.jei.compost; +package de.ellpeck.actuallyadditions.common.jei.compost; import java.util.Arrays; -import de.ellpeck.actuallyadditions.ActuallyAdditions; -import de.ellpeck.actuallyadditions.util.AssetUtil; -import de.ellpeck.actuallyadditions.util.StringUtil; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.util.AssetUtil; +import de.ellpeck.actuallyadditions.common.util.StringUtil; import mezz.jei.api.IGuiHelper; import mezz.jei.api.gui.IDrawable; import mezz.jei.api.gui.IRecipeLayout; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/jei/compost/CompostRecipeWrapper.java b/src/main/java/de/ellpeck/actuallyadditions/common/jei/compost/CompostRecipeWrapper.java index ced8ef301..6c383ef77 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/jei/compost/CompostRecipeWrapper.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/jei/compost/CompostRecipeWrapper.java @@ -1,13 +1,13 @@ -package de.ellpeck.actuallyadditions.jei.compost; +package de.ellpeck.actuallyadditions.common.jei.compost; import java.util.Arrays; import de.ellpeck.actuallyadditions.api.booklet.IBookletPage; import de.ellpeck.actuallyadditions.api.recipe.CompostRecipe; -import de.ellpeck.actuallyadditions.blocks.InitBlocks; +import de.ellpeck.actuallyadditions.common.blocks.InitBlocks; import de.ellpeck.actuallyadditions.booklet.misc.BookletUtils; -import de.ellpeck.actuallyadditions.jei.RecipeWrapperWithButton; -import de.ellpeck.actuallyadditions.tile.TileEntityCompost; +import de.ellpeck.actuallyadditions.common.jei.RecipeWrapperWithButton; +import de.ellpeck.actuallyadditions.common.tile.TileEntityCompost; import mezz.jei.api.ingredients.IIngredients; import mezz.jei.api.ingredients.VanillaTypes; import net.minecraft.client.Minecraft; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/jei/crusher/CrusherRecipeWrapper.java b/src/main/java/de/ellpeck/actuallyadditions/common/jei/crusher/CrusherRecipeWrapper.java index ffcc6318b..ad8dedb52 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/jei/crusher/CrusherRecipeWrapper.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/jei/crusher/CrusherRecipeWrapper.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.jei.crusher; +package de.ellpeck.actuallyadditions.common.jei.crusher; import java.util.ArrayList; import java.util.Arrays; @@ -6,11 +6,11 @@ import java.util.List; import de.ellpeck.actuallyadditions.api.booklet.IBookletPage; import de.ellpeck.actuallyadditions.api.recipe.CrusherRecipe; -import de.ellpeck.actuallyadditions.blocks.InitBlocks; +import de.ellpeck.actuallyadditions.common.blocks.InitBlocks; import de.ellpeck.actuallyadditions.booklet.misc.BookletUtils; -import de.ellpeck.actuallyadditions.jei.RecipeWrapperWithButton; -import de.ellpeck.actuallyadditions.util.StackUtil; -import de.ellpeck.actuallyadditions.util.StringUtil; +import de.ellpeck.actuallyadditions.common.jei.RecipeWrapperWithButton; +import de.ellpeck.actuallyadditions.common.util.StackUtil; +import de.ellpeck.actuallyadditions.common.util.StringUtil; import mezz.jei.api.ingredients.IIngredients; import mezz.jei.api.ingredients.VanillaTypes; import net.minecraft.client.Minecraft; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/jei/empowerer/EmpowererRecipeCategory.java b/src/main/java/de/ellpeck/actuallyadditions/common/jei/empowerer/EmpowererRecipeCategory.java index bbd8863de..d4931237c 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/jei/empowerer/EmpowererRecipeCategory.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/jei/empowerer/EmpowererRecipeCategory.java @@ -1,10 +1,10 @@ -package de.ellpeck.actuallyadditions.jei.empowerer; +package de.ellpeck.actuallyadditions.common.jei.empowerer; import java.util.Arrays; -import de.ellpeck.actuallyadditions.ActuallyAdditions; -import de.ellpeck.actuallyadditions.util.AssetUtil; -import de.ellpeck.actuallyadditions.util.StringUtil; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.util.AssetUtil; +import de.ellpeck.actuallyadditions.common.util.StringUtil; import mezz.jei.api.IGuiHelper; import mezz.jei.api.gui.IDrawable; import mezz.jei.api.gui.IRecipeLayout; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/jei/empowerer/EmpowererRecipeWrapper.java b/src/main/java/de/ellpeck/actuallyadditions/common/jei/empowerer/EmpowererRecipeWrapper.java index 5236e7000..272c3d99d 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/jei/empowerer/EmpowererRecipeWrapper.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/jei/empowerer/EmpowererRecipeWrapper.java @@ -6,7 +6,7 @@ import java.util.List; import de.ellpeck.actuallyadditions.api.booklet.IBookletPage; import de.ellpeck.actuallyadditions.api.recipe.EmpowererRecipe; import de.ellpeck.actuallyadditions.common.blocks.InitBlocks; -import de.ellpeck.actuallyadditions.common.booklet.misc.BookletUtils; +import de.ellpeck.actuallyadditions.booklet.misc.BookletUtils; import de.ellpeck.actuallyadditions.common.jei.RecipeWrapperWithButton; import mezz.jei.api.ingredients.IIngredients; import mezz.jei.api.ingredients.VanillaTypes; @@ -50,4 +50,6 @@ public class EmpowererRecipeWrapper extends RecipeWrapperWithButton { @Override public IBookletPage getPage() { - return BookletUtils.findFirstPageForStack(new ItemStack(InitBlocks.b \ No newline at end of file + return BookletUtils.findFirstPageForStack(new ItemStack(InitBlocks.blockEmpowerer)); + } +} diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/jei/reconstructor/ReconstructorRecipeCategory.java b/src/main/java/de/ellpeck/actuallyadditions/common/jei/reconstructor/ReconstructorRecipeCategory.java index 2bbd6c522..457c13518 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/jei/reconstructor/ReconstructorRecipeCategory.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/jei/reconstructor/ReconstructorRecipeCategory.java @@ -1,9 +1,9 @@ -package de.ellpeck.actuallyadditions.jei.reconstructor; +package de.ellpeck.actuallyadditions.common.jei.reconstructor; -import de.ellpeck.actuallyadditions.ActuallyAdditions; -import de.ellpeck.actuallyadditions.blocks.InitBlocks; -import de.ellpeck.actuallyadditions.util.AssetUtil; -import de.ellpeck.actuallyadditions.util.StringUtil; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.blocks.InitBlocks; +import de.ellpeck.actuallyadditions.common.util.AssetUtil; +import de.ellpeck.actuallyadditions.common.util.StringUtil; import mezz.jei.api.IGuiHelper; import mezz.jei.api.gui.IDrawable; import mezz.jei.api.gui.IRecipeLayout; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/jei/reconstructor/ReconstructorRecipeWrapper.java b/src/main/java/de/ellpeck/actuallyadditions/common/jei/reconstructor/ReconstructorRecipeWrapper.java index 43f93be60..40047020a 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/jei/reconstructor/ReconstructorRecipeWrapper.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/jei/reconstructor/ReconstructorRecipeWrapper.java @@ -5,7 +5,7 @@ import java.util.Arrays; import de.ellpeck.actuallyadditions.api.booklet.IBookletPage; import de.ellpeck.actuallyadditions.api.recipe.LensConversionRecipe; import de.ellpeck.actuallyadditions.common.blocks.InitBlocks; -import de.ellpeck.actuallyadditions.common.booklet.misc.BookletUtils; +import de.ellpeck.actuallyadditions.booklet.misc.BookletUtils; import de.ellpeck.actuallyadditions.common.jei.RecipeWrapperWithButton; import de.ellpeck.actuallyadditions.common.recipe.EnchBookConversion; import mezz.jei.api.ingredients.IIngredients; @@ -79,4 +79,8 @@ public class ReconstructorRecipeWrapper extends RecipeWrapperWithButton { @Override public void getIngredients(IIngredients ingredients) { ingredients.setInput(VanillaTypes.ITEM, BOOK); - ingredients.setOutput(VanillaTypes.I \ No newline at end of file + ingredients.setOutput(VanillaTypes.ITEM, OUT); + } + + } +} diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/material/InitToolMaterials.java b/src/main/java/de/ellpeck/actuallyadditions/common/material/InitToolMaterials.java index b4ca61934..56ac25e09 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/material/InitToolMaterials.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/material/InitToolMaterials.java @@ -1,8 +1,8 @@ -package de.ellpeck.actuallyadditions.material; +package de.ellpeck.actuallyadditions.common.material; import java.util.Locale; -import de.ellpeck.actuallyadditions.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; import net.minecraft.item.Item.ToolMaterial; import net.minecraftforge.common.util.EnumHelper; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/misc/BannerHelper.java b/src/main/java/de/ellpeck/actuallyadditions/common/misc/BannerHelper.java index fc3faa045..6a20ff1b1 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/misc/BannerHelper.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/misc/BannerHelper.java @@ -1,9 +1,9 @@ -package de.ellpeck.actuallyadditions.misc; +package de.ellpeck.actuallyadditions.common.misc; import java.util.Locale; -import de.ellpeck.actuallyadditions.ActuallyAdditions; -import de.ellpeck.actuallyadditions.items.InitItems; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.items.InitItems; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.BannerPattern; import net.minecraftforge.common.util.EnumHelper; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/misc/DamageSources.java b/src/main/java/de/ellpeck/actuallyadditions/common/misc/DamageSources.java index 208da1276..7455c8099 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/misc/DamageSources.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/misc/DamageSources.java @@ -1,6 +1,6 @@ -package de.ellpeck.actuallyadditions.misc; +package de.ellpeck.actuallyadditions.common.misc; -import de.ellpeck.actuallyadditions.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; import net.minecraft.entity.EntityLivingBase; import net.minecraft.util.DamageSource; import net.minecraft.util.text.ITextComponent; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/misc/DispenserHandlerFertilize.java b/src/main/java/de/ellpeck/actuallyadditions/common/misc/DispenserHandlerFertilize.java index 96d00f250..84d7f8133 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/misc/DispenserHandlerFertilize.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/misc/DispenserHandlerFertilize.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.misc; +package de.ellpeck.actuallyadditions.common.misc; import net.minecraft.block.BlockDispenser; import net.minecraft.dispenser.BehaviorDefaultDispenseItem; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/misc/DungeonLoot.java b/src/main/java/de/ellpeck/actuallyadditions/common/misc/DungeonLoot.java index 9948a3b8b..80076b258 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/misc/DungeonLoot.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/misc/DungeonLoot.java @@ -1,13 +1,13 @@ -package de.ellpeck.actuallyadditions.misc; +package de.ellpeck.actuallyadditions.common.misc; -import de.ellpeck.actuallyadditions.ActuallyAdditions; -import de.ellpeck.actuallyadditions.blocks.InitBlocks; -import de.ellpeck.actuallyadditions.blocks.metalists.TheMiscBlocks; -import de.ellpeck.actuallyadditions.config.values.ConfigBoolValues; -import de.ellpeck.actuallyadditions.items.InitItems; -import de.ellpeck.actuallyadditions.items.metalists.TheCrystals; -import de.ellpeck.actuallyadditions.items.metalists.TheJams; -import de.ellpeck.actuallyadditions.items.metalists.TheMiscItems; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.blocks.InitBlocks; +import de.ellpeck.actuallyadditions.common.blocks.metalists.TheMiscBlocks; +import de.ellpeck.actuallyadditions.common.config.values.ConfigBoolValues; +import de.ellpeck.actuallyadditions.common.items.InitItems; +import de.ellpeck.actuallyadditions.common.items.metalists.TheCrystals; +import de.ellpeck.actuallyadditions.common.items.metalists.TheJams; +import de.ellpeck.actuallyadditions.common.items.metalists.TheMiscItems; import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/misc/apiimpl/ConnectionPair.java b/src/main/java/de/ellpeck/actuallyadditions/common/misc/apiimpl/ConnectionPair.java index 2669680b6..c70970bb1 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/misc/apiimpl/ConnectionPair.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/misc/apiimpl/ConnectionPair.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.misc.apiimpl; +package de.ellpeck.actuallyadditions.common.misc.apiimpl; import de.ellpeck.actuallyadditions.api.laser.IConnectionPair; import de.ellpeck.actuallyadditions.api.laser.LaserType; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/misc/apiimpl/LaserRelayConnectionHandler.java b/src/main/java/de/ellpeck/actuallyadditions/common/misc/apiimpl/LaserRelayConnectionHandler.java index b401bcfc5..578287a5b 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/misc/apiimpl/LaserRelayConnectionHandler.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/misc/apiimpl/LaserRelayConnectionHandler.java @@ -1,11 +1,11 @@ -package de.ellpeck.actuallyadditions.misc.apiimpl; +package de.ellpeck.actuallyadditions.common.misc.apiimpl; import de.ellpeck.actuallyadditions.api.laser.IConnectionPair; import de.ellpeck.actuallyadditions.api.laser.ILaserRelayConnectionHandler; import de.ellpeck.actuallyadditions.api.laser.LaserType; import de.ellpeck.actuallyadditions.api.laser.Network; -import de.ellpeck.actuallyadditions.data.WorldData; -import de.ellpeck.actuallyadditions.tile.TileEntityLaserRelay; +import de.ellpeck.actuallyadditions.common.data.WorldData; +import de.ellpeck.actuallyadditions.common.tile.TileEntityLaserRelay; import io.netty.util.internal.ConcurrentSet; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/misc/apiimpl/MethodHandler.java b/src/main/java/de/ellpeck/actuallyadditions/common/misc/apiimpl/MethodHandler.java index 850db31f3..58ebaef17 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/misc/apiimpl/MethodHandler.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/misc/apiimpl/MethodHandler.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.misc.apiimpl; +package de.ellpeck.actuallyadditions.common.misc.apiimpl; import java.util.ArrayList; import java.util.List; @@ -12,18 +12,18 @@ import de.ellpeck.actuallyadditions.api.internal.IMethodHandler; import de.ellpeck.actuallyadditions.api.lens.Lens; import de.ellpeck.actuallyadditions.api.recipe.CoffeeIngredient; import de.ellpeck.actuallyadditions.api.recipe.LensConversionRecipe; -import de.ellpeck.actuallyadditions.blocks.BlockLaserRelay; +import de.ellpeck.actuallyadditions.common.blocks.BlockLaserRelay; import de.ellpeck.actuallyadditions.booklet.chapter.BookletChapter; import de.ellpeck.actuallyadditions.booklet.chapter.BookletChapterTrials; import de.ellpeck.actuallyadditions.booklet.page.PageCrafting; import de.ellpeck.actuallyadditions.booklet.page.PageFurnace; import de.ellpeck.actuallyadditions.booklet.page.PagePicture; import de.ellpeck.actuallyadditions.booklet.page.PageTextOnly; -import de.ellpeck.actuallyadditions.config.values.ConfigStringListValues; -import de.ellpeck.actuallyadditions.items.lens.LensRecipeHandler; -import de.ellpeck.actuallyadditions.recipe.CrusherRecipeRegistry; -import de.ellpeck.actuallyadditions.tile.TileEntityAtomicReconstructor; -import de.ellpeck.actuallyadditions.util.StackUtil; +import de.ellpeck.actuallyadditions.common.config.values.ConfigStringListValues; +import de.ellpeck.actuallyadditions.common.items.lens.LensRecipeHandler; +import de.ellpeck.actuallyadditions.common.recipe.CrusherRecipeRegistry; +import de.ellpeck.actuallyadditions.common.tile.TileEntityAtomicReconstructor; +import de.ellpeck.actuallyadditions.common.util.StackUtil; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.item.EntityItem; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/misc/apiimpl/farmer/CactusFarmerBehavior.java b/src/main/java/de/ellpeck/actuallyadditions/common/misc/apiimpl/farmer/CactusFarmerBehavior.java index 8b07dd9b1..20bd799c8 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/misc/apiimpl/farmer/CactusFarmerBehavior.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/misc/apiimpl/farmer/CactusFarmerBehavior.java @@ -77,4 +77,5 @@ public class CactusFarmerBehavior implements IFarmerBehavior { @Override public int getPriority() { return 4; - \ No newline at end of file + } +} diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/misc/apiimpl/farmer/DefaultFarmerBehavior.java b/src/main/java/de/ellpeck/actuallyadditions/common/misc/apiimpl/farmer/DefaultFarmerBehavior.java index dc85f5bdf..103f412d2 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/misc/apiimpl/farmer/DefaultFarmerBehavior.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/misc/apiimpl/farmer/DefaultFarmerBehavior.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.misc.apiimpl.farmer; +package de.ellpeck.actuallyadditions.common.misc.apiimpl.farmer; import java.util.ArrayList; import java.util.List; @@ -6,7 +6,7 @@ import java.util.List; import de.ellpeck.actuallyadditions.api.farmer.FarmerResult; import de.ellpeck.actuallyadditions.api.farmer.IFarmerBehavior; import de.ellpeck.actuallyadditions.api.internal.IFarmer; -import de.ellpeck.actuallyadditions.util.StackUtil; +import de.ellpeck.actuallyadditions.common.util.StackUtil; import net.minecraft.block.Block; import net.minecraft.block.BlockCrops; import net.minecraft.block.BlockDirt; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/misc/apiimpl/farmer/MelonPumpkinFarmerBehavior.java b/src/main/java/de/ellpeck/actuallyadditions/common/misc/apiimpl/farmer/MelonPumpkinFarmerBehavior.java index 34e692d40..5fe739b58 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/misc/apiimpl/farmer/MelonPumpkinFarmerBehavior.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/misc/apiimpl/farmer/MelonPumpkinFarmerBehavior.java @@ -1,9 +1,9 @@ -package de.ellpeck.actuallyadditions.misc.apiimpl.farmer; +package de.ellpeck.actuallyadditions.common.misc.apiimpl.farmer; import de.ellpeck.actuallyadditions.api.farmer.FarmerResult; import de.ellpeck.actuallyadditions.api.farmer.IFarmerBehavior; import de.ellpeck.actuallyadditions.api.internal.IFarmer; -import de.ellpeck.actuallyadditions.util.StackUtil; +import de.ellpeck.actuallyadditions.common.util.StackUtil; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/misc/apiimpl/farmer/NetherWartFarmerBehavior.java b/src/main/java/de/ellpeck/actuallyadditions/common/misc/apiimpl/farmer/NetherWartFarmerBehavior.java index 220880e08..31756bea6 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/misc/apiimpl/farmer/NetherWartFarmerBehavior.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/misc/apiimpl/farmer/NetherWartFarmerBehavior.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.misc.apiimpl.farmer; +package de.ellpeck.actuallyadditions.common.misc.apiimpl.farmer; import de.ellpeck.actuallyadditions.api.farmer.FarmerResult; import de.ellpeck.actuallyadditions.api.farmer.IFarmerBehavior; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/misc/apiimpl/farmer/ReedFarmerBehavior.java b/src/main/java/de/ellpeck/actuallyadditions/common/misc/apiimpl/farmer/ReedFarmerBehavior.java index cee1d1976..c06763513 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/misc/apiimpl/farmer/ReedFarmerBehavior.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/misc/apiimpl/farmer/ReedFarmerBehavior.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.misc.apiimpl.farmer; +package de.ellpeck.actuallyadditions.common.misc.apiimpl.farmer; import de.ellpeck.actuallyadditions.api.farmer.FarmerResult; import de.ellpeck.actuallyadditions.api.farmer.IFarmerBehavior; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/misc/apiimpl/farmer/exu/EnderlillyFarmerBehavior.java b/src/main/java/de/ellpeck/actuallyadditions/common/misc/apiimpl/farmer/exu/EnderlillyFarmerBehavior.java index 82690b953..9d4ec5b0a 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/misc/apiimpl/farmer/exu/EnderlillyFarmerBehavior.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/misc/apiimpl/farmer/exu/EnderlillyFarmerBehavior.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.misc.apiimpl.farmer.exu; +package de.ellpeck.actuallyadditions.common.misc.apiimpl.farmer.exu; import net.minecraft.block.Block; import net.minecraft.block.BlockDirt; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/misc/apiimpl/farmer/exu/RedOrchidFarmerBehavior.java b/src/main/java/de/ellpeck/actuallyadditions/common/misc/apiimpl/farmer/exu/RedOrchidFarmerBehavior.java index f19a48483..cad139dd7 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/misc/apiimpl/farmer/exu/RedOrchidFarmerBehavior.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/misc/apiimpl/farmer/exu/RedOrchidFarmerBehavior.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.misc.apiimpl.farmer.exu; +package de.ellpeck.actuallyadditions.common.misc.apiimpl.farmer.exu; import net.minecraft.block.Block; import net.minecraft.block.BlockRedstoneOre; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/misc/cloud/ISmileyCloudEasterEgg.java b/src/main/java/de/ellpeck/actuallyadditions/common/misc/cloud/ISmileyCloudEasterEgg.java index 47ff80f82..2b2a70999 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/misc/cloud/ISmileyCloudEasterEgg.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/misc/cloud/ISmileyCloudEasterEgg.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.misc.cloud; +package de.ellpeck.actuallyadditions.common.misc.cloud; public interface ISmileyCloudEasterEgg { diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/misc/cloud/SmileyCloudEasterEggs.java b/src/main/java/de/ellpeck/actuallyadditions/common/misc/cloud/SmileyCloudEasterEggs.java index b6e6ec025..0c0067364 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/misc/cloud/SmileyCloudEasterEggs.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/misc/cloud/SmileyCloudEasterEggs.java @@ -1,13 +1,13 @@ -package de.ellpeck.actuallyadditions.misc.cloud; +package de.ellpeck.actuallyadditions.common.misc.cloud; import java.util.ArrayList; import java.util.List; -import de.ellpeck.actuallyadditions.blocks.InitBlocks; -import de.ellpeck.actuallyadditions.items.InitItems; -import de.ellpeck.actuallyadditions.items.metalists.TheFoods; -import de.ellpeck.actuallyadditions.items.metalists.TheMiscItems; -import de.ellpeck.actuallyadditions.util.AssetUtil; +import de.ellpeck.actuallyadditions.common.blocks.InitBlocks; +import de.ellpeck.actuallyadditions.common.items.InitItems; +import de.ellpeck.actuallyadditions.common.items.metalists.TheFoods; +import de.ellpeck.actuallyadditions.common.items.metalists.TheMiscItems; +import de.ellpeck.actuallyadditions.common.util.AssetUtil; import net.minecraft.block.Block; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.init.Blocks; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/misc/special/RenderSpecial.java b/src/main/java/de/ellpeck/actuallyadditions/common/misc/special/RenderSpecial.java index 9ebb27002..6eb6704d7 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/misc/special/RenderSpecial.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/misc/special/RenderSpecial.java @@ -1,7 +1,7 @@ -package de.ellpeck.actuallyadditions.misc.special; +package de.ellpeck.actuallyadditions.common.misc.special; -import de.ellpeck.actuallyadditions.util.AssetUtil; -import de.ellpeck.actuallyadditions.util.StackUtil; +import de.ellpeck.actuallyadditions.common.util.AssetUtil; +import de.ellpeck.actuallyadditions.common.util.StackUtil; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/misc/special/SpecialRenderInit.java b/src/main/java/de/ellpeck/actuallyadditions/common/misc/special/SpecialRenderInit.java index 48f44d110..5851fcd22 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/misc/special/SpecialRenderInit.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/misc/special/SpecialRenderInit.java @@ -1,10 +1,10 @@ -package de.ellpeck.actuallyadditions.misc.special; +package de.ellpeck.actuallyadditions.common.misc.special; import java.util.HashMap; import java.util.Locale; import java.util.Properties; -import de.ellpeck.actuallyadditions.util.StackUtil; +import de.ellpeck.actuallyadditions.common.util.StackUtil; import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/misc/special/ThreadSpecialFetcher.java b/src/main/java/de/ellpeck/actuallyadditions/common/misc/special/ThreadSpecialFetcher.java index 7046900c5..e3ee3bef7 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/misc/special/ThreadSpecialFetcher.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/misc/special/ThreadSpecialFetcher.java @@ -1,10 +1,10 @@ -package de.ellpeck.actuallyadditions.misc.special; +package de.ellpeck.actuallyadditions.common.misc.special; import java.io.InputStreamReader; import java.net.URL; import java.util.Properties; -import de.ellpeck.actuallyadditions.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; public class ThreadSpecialFetcher extends Thread { diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/network/IDataHandler.java b/src/main/java/de/ellpeck/actuallyadditions/common/network/IDataHandler.java index 7ccd79231..b1e6263a2 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/network/IDataHandler.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/network/IDataHandler.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.network; +package de.ellpeck.actuallyadditions.common.network; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/network/PacketClientToServer.java b/src/main/java/de/ellpeck/actuallyadditions/common/network/PacketClientToServer.java index 695e81d8e..60a4d1242 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/network/PacketClientToServer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/network/PacketClientToServer.java @@ -1,6 +1,6 @@ -package de.ellpeck.actuallyadditions.network; +package de.ellpeck.actuallyadditions.common.network; -import de.ellpeck.actuallyadditions.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; import io.netty.buffer.ByteBuf; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.PacketBuffer; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/network/PacketHandler.java b/src/main/java/de/ellpeck/actuallyadditions/common/network/PacketHandler.java index 61a9f3c40..f3d2c71c0 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/network/PacketHandler.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/network/PacketHandler.java @@ -171,4 +171,7 @@ public final class PacketHandler { DATA_HANDLERS.add(GUI_NUMBER_TO_TILE_HANDLER); DATA_HANDLERS.add(SYNC_PLAYER_DATA); DATA_HANDLERS.add(GUI_BUTTON_TO_CONTAINER_HANDLER); - DATA_HANDLERS.add(LASER_PARTICLE_HA \ No newline at end of file + DATA_HANDLERS.add(LASER_PARTICLE_HANDLER); + DATA_HANDLERS.add(PLAYER_DATA_TO_SERVER); + } +} diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/network/PacketHandlerHelper.java b/src/main/java/de/ellpeck/actuallyadditions/common/network/PacketHandlerHelper.java index 5020f7f02..e10467906 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/network/PacketHandlerHelper.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/network/PacketHandlerHelper.java @@ -1,10 +1,10 @@ -package de.ellpeck.actuallyadditions.network; +package de.ellpeck.actuallyadditions.common.network; import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI; import de.ellpeck.actuallyadditions.api.booklet.IBookletChapter; import de.ellpeck.actuallyadditions.booklet.chapter.BookletChapterTrials; -import de.ellpeck.actuallyadditions.data.PlayerData; -import de.ellpeck.actuallyadditions.data.PlayerData.PlayerSave; +import de.ellpeck.actuallyadditions.common.data.PlayerData; +import de.ellpeck.actuallyadditions.common.data.PlayerData.PlayerSave; import net.minecraft.client.Minecraft; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/network/PacketServerToClient.java b/src/main/java/de/ellpeck/actuallyadditions/common/network/PacketServerToClient.java index 704454058..3907ea441 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/network/PacketServerToClient.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/network/PacketServerToClient.java @@ -1,6 +1,6 @@ -package de.ellpeck.actuallyadditions.network; +package de.ellpeck.actuallyadditions.common.network; -import de.ellpeck.actuallyadditions.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; import io.netty.buffer.ByteBuf; import net.minecraft.client.Minecraft; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/network/gui/IButtonReactor.java b/src/main/java/de/ellpeck/actuallyadditions/common/network/gui/IButtonReactor.java index 0d756862e..4f6a86d2a 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/network/gui/IButtonReactor.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/network/gui/IButtonReactor.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.network.gui; +package de.ellpeck.actuallyadditions.common.network.gui; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/network/gui/INumberReactor.java b/src/main/java/de/ellpeck/actuallyadditions/common/network/gui/INumberReactor.java index 8b44e0ae5..69330dded 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/network/gui/INumberReactor.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/network/gui/INumberReactor.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.network.gui; +package de.ellpeck.actuallyadditions.common.network.gui; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/network/gui/IStringReactor.java b/src/main/java/de/ellpeck/actuallyadditions/common/network/gui/IStringReactor.java index 498fc875d..b9307e334 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/network/gui/IStringReactor.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/network/gui/IStringReactor.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.network.gui; +package de.ellpeck.actuallyadditions.common.network.gui; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/ore/InitOreDict.java b/src/main/java/de/ellpeck/actuallyadditions/common/ore/InitOreDict.java index 6bdf539c5..b16792384 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/ore/InitOreDict.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/ore/InitOreDict.java @@ -1,12 +1,12 @@ -package de.ellpeck.actuallyadditions.ore; +package de.ellpeck.actuallyadditions.common.ore; -import de.ellpeck.actuallyadditions.ActuallyAdditions; -import de.ellpeck.actuallyadditions.blocks.InitBlocks; -import de.ellpeck.actuallyadditions.blocks.metalists.TheMiscBlocks; -import de.ellpeck.actuallyadditions.items.InitItems; -import de.ellpeck.actuallyadditions.items.metalists.TheDusts; -import de.ellpeck.actuallyadditions.items.metalists.TheFoods; -import de.ellpeck.actuallyadditions.items.metalists.TheMiscItems; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.blocks.InitBlocks; +import de.ellpeck.actuallyadditions.common.blocks.metalists.TheMiscBlocks; +import de.ellpeck.actuallyadditions.common.items.InitItems; +import de.ellpeck.actuallyadditions.common.items.metalists.TheDusts; +import de.ellpeck.actuallyadditions.common.items.metalists.TheFoods; +import de.ellpeck.actuallyadditions.common.items.metalists.TheMiscItems; import net.minecraft.block.Block; import net.minecraft.init.Items; import net.minecraft.item.Item; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/particle/ParticleBeam.java b/src/main/java/de/ellpeck/actuallyadditions/common/particle/ParticleBeam.java index e6c5a9a84..54216eb31 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/particle/ParticleBeam.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/particle/ParticleBeam.java @@ -1,6 +1,6 @@ -package de.ellpeck.actuallyadditions.particle; +package de.ellpeck.actuallyadditions.common.particle; -import de.ellpeck.actuallyadditions.util.AssetUtil; +import de.ellpeck.actuallyadditions.common.util.AssetUtil; import net.minecraft.client.particle.Particle; import net.minecraft.client.renderer.BufferBuilder; import net.minecraft.entity.Entity; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/particle/ParticleLaserItem.java b/src/main/java/de/ellpeck/actuallyadditions/common/particle/ParticleLaserItem.java index 11b5e10b0..33cbdef72 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/particle/ParticleLaserItem.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/particle/ParticleLaserItem.java @@ -1,9 +1,9 @@ -package de.ellpeck.actuallyadditions.particle; +package de.ellpeck.actuallyadditions.common.particle; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL14; -import de.ellpeck.actuallyadditions.util.AssetUtil; +import de.ellpeck.actuallyadditions.common.util.AssetUtil; import net.minecraft.client.Minecraft; import net.minecraft.client.particle.Particle; import net.minecraft.client.renderer.BufferBuilder; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/proxy/ClientProxy.java b/src/main/java/de/ellpeck/actuallyadditions/common/proxy/ClientProxy.java index 96baf0104..87a30aff4 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/proxy/ClientProxy.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/proxy/ClientProxy.java @@ -1,36 +1,36 @@ -package de.ellpeck.actuallyadditions.proxy; +package de.ellpeck.actuallyadditions.common.proxy; import java.util.ArrayList; import java.util.List; -import de.ellpeck.actuallyadditions.ActuallyAdditions; -import de.ellpeck.actuallyadditions.ClientRegistryHandler; -import de.ellpeck.actuallyadditions.blocks.InitBlocks; -import de.ellpeck.actuallyadditions.blocks.render.RenderBatteryBox; -import de.ellpeck.actuallyadditions.blocks.render.RenderDisplayStand; -import de.ellpeck.actuallyadditions.blocks.render.RenderEmpowerer; -import de.ellpeck.actuallyadditions.blocks.render.RenderLaserRelay; -import de.ellpeck.actuallyadditions.blocks.render.RenderReconstructorLens; -import de.ellpeck.actuallyadditions.blocks.render.RenderSmileyCloud; -import de.ellpeck.actuallyadditions.entity.InitEntities; -import de.ellpeck.actuallyadditions.entity.RenderWorm; -import de.ellpeck.actuallyadditions.event.ClientEvents; -import de.ellpeck.actuallyadditions.misc.special.SpecialRenderInit; -import de.ellpeck.actuallyadditions.tile.TileEntityAtomicReconstructor; -import de.ellpeck.actuallyadditions.tile.TileEntityBatteryBox; -import de.ellpeck.actuallyadditions.tile.TileEntityCompost; -import de.ellpeck.actuallyadditions.tile.TileEntityDisplayStand; -import de.ellpeck.actuallyadditions.tile.TileEntityEmpowerer; -import de.ellpeck.actuallyadditions.tile.TileEntityLaserRelay; -import de.ellpeck.actuallyadditions.tile.TileEntityLaserRelayEnergy; -import de.ellpeck.actuallyadditions.tile.TileEntityLaserRelayEnergyAdvanced; -import de.ellpeck.actuallyadditions.tile.TileEntityLaserRelayEnergyExtreme; -import de.ellpeck.actuallyadditions.tile.TileEntityLaserRelayFluids; -import de.ellpeck.actuallyadditions.tile.TileEntityLaserRelayItem; -import de.ellpeck.actuallyadditions.tile.TileEntityLaserRelayItemWhitelist; -import de.ellpeck.actuallyadditions.tile.TileEntitySmileyCloud; -import de.ellpeck.actuallyadditions.util.IColorProvidingBlock; -import de.ellpeck.actuallyadditions.util.IColorProvidingItem; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.ClientRegistryHandler; +import de.ellpeck.actuallyadditions.common.blocks.InitBlocks; +import de.ellpeck.actuallyadditions.common.blocks.render.RenderBatteryBox; +import de.ellpeck.actuallyadditions.common.blocks.render.RenderDisplayStand; +import de.ellpeck.actuallyadditions.common.blocks.render.RenderEmpowerer; +import de.ellpeck.actuallyadditions.common.blocks.render.RenderLaserRelay; +import de.ellpeck.actuallyadditions.common.blocks.render.RenderReconstructorLens; +import de.ellpeck.actuallyadditions.common.blocks.render.RenderSmileyCloud; +import de.ellpeck.actuallyadditions.common.entity.InitEntities; +import de.ellpeck.actuallyadditions.common.entity.RenderWorm; +import de.ellpeck.actuallyadditions.common.event.ClientEvents; +import de.ellpeck.actuallyadditions.common.misc.special.SpecialRenderInit; +import de.ellpeck.actuallyadditions.common.tile.TileEntityAtomicReconstructor; +import de.ellpeck.actuallyadditions.common.tile.TileEntityBatteryBox; +import de.ellpeck.actuallyadditions.common.tile.TileEntityCompost; +import de.ellpeck.actuallyadditions.common.tile.TileEntityDisplayStand; +import de.ellpeck.actuallyadditions.common.tile.TileEntityEmpowerer; +import de.ellpeck.actuallyadditions.common.tile.TileEntityLaserRelay; +import de.ellpeck.actuallyadditions.common.tile.TileEntityLaserRelayEnergy; +import de.ellpeck.actuallyadditions.common.tile.TileEntityLaserRelayEnergyAdvanced; +import de.ellpeck.actuallyadditions.common.tile.TileEntityLaserRelayEnergyExtreme; +import de.ellpeck.actuallyadditions.common.tile.TileEntityLaserRelayFluids; +import de.ellpeck.actuallyadditions.common.tile.TileEntityLaserRelayItem; +import de.ellpeck.actuallyadditions.common.tile.TileEntityLaserRelayItemWhitelist; +import de.ellpeck.actuallyadditions.common.tile.TileEntitySmileyCloud; +import de.ellpeck.actuallyadditions.common.util.IColorProvidingBlock; +import de.ellpeck.actuallyadditions.common.util.IColorProvidingItem; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/proxy/IProxy.java b/src/main/java/de/ellpeck/actuallyadditions/common/proxy/IProxy.java index db6eaace7..25b38c2a7 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/proxy/IProxy.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/proxy/IProxy.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.proxy; +package de.ellpeck.actuallyadditions.common.proxy; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/proxy/ServerProxy.java b/src/main/java/de/ellpeck/actuallyadditions/common/proxy/ServerProxy.java index 6f8577ec9..6d98199fd 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/proxy/ServerProxy.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/proxy/ServerProxy.java @@ -44,4 +44,6 @@ public class ServerProxy implements IProxy { @Override public EntityPlayer getCurrentPlayer() { - return nul \ No newline at end of file + return null; + } +} diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/recipe/ColorLensRotator.java b/src/main/java/de/ellpeck/actuallyadditions/common/recipe/ColorLensRotator.java index 6a000c596..5d01c283b 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/recipe/ColorLensRotator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/recipe/ColorLensRotator.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.recipe; +package de.ellpeck.actuallyadditions.common.recipe; import java.util.HashMap; import java.util.List; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/recipe/CrusherRecipeRegistry.java b/src/main/java/de/ellpeck/actuallyadditions/common/recipe/CrusherRecipeRegistry.java index f28dd2900..aa0344522 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/recipe/CrusherRecipeRegistry.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/recipe/CrusherRecipeRegistry.java @@ -1,13 +1,13 @@ -package de.ellpeck.actuallyadditions.recipe; +package de.ellpeck.actuallyadditions.common.recipe; import java.util.ArrayList; import java.util.List; import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI; import de.ellpeck.actuallyadditions.api.recipe.CrusherRecipe; -import de.ellpeck.actuallyadditions.ActuallyAdditions; -import de.ellpeck.actuallyadditions.config.values.ConfigStringListValues; -import de.ellpeck.actuallyadditions.util.StackUtil; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.config.values.ConfigStringListValues; +import de.ellpeck.actuallyadditions.common.util.StackUtil; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/recipe/EmpowererHandler.java b/src/main/java/de/ellpeck/actuallyadditions/common/recipe/EmpowererHandler.java index 0d85ff127..54d396820 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/recipe/EmpowererHandler.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/recipe/EmpowererHandler.java @@ -1,15 +1,15 @@ -package de.ellpeck.actuallyadditions.recipe; +package de.ellpeck.actuallyadditions.common.recipe; import java.util.ArrayList; import java.util.List; import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI; import de.ellpeck.actuallyadditions.api.recipe.EmpowererRecipe; -import de.ellpeck.actuallyadditions.blocks.InitBlocks; -import de.ellpeck.actuallyadditions.items.InitItems; -import de.ellpeck.actuallyadditions.items.metalists.TheCrystals; -import de.ellpeck.actuallyadditions.items.metalists.TheMiscItems; -import de.ellpeck.actuallyadditions.util.RecipeUtil; +import de.ellpeck.actuallyadditions.common.blocks.InitBlocks; +import de.ellpeck.actuallyadditions.common.items.InitItems; +import de.ellpeck.actuallyadditions.common.items.metalists.TheCrystals; +import de.ellpeck.actuallyadditions.common.items.metalists.TheMiscItems; +import de.ellpeck.actuallyadditions.common.util.RecipeUtil; import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.init.Items; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/recipe/EnchBookConversion.java b/src/main/java/de/ellpeck/actuallyadditions/common/recipe/EnchBookConversion.java index d0812b046..5e078e8c5 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/recipe/EnchBookConversion.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/recipe/EnchBookConversion.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.recipe; +package de.ellpeck.actuallyadditions.common.recipe; import java.util.Map; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/recipe/HairyBallHandler.java b/src/main/java/de/ellpeck/actuallyadditions/common/recipe/HairyBallHandler.java index 7e576db80..aeb38bbaa 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/recipe/HairyBallHandler.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/recipe/HairyBallHandler.java @@ -1,7 +1,7 @@ -package de.ellpeck.actuallyadditions.recipe; +package de.ellpeck.actuallyadditions.common.recipe; import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI; -import de.ellpeck.actuallyadditions.items.InitItems; +import de.ellpeck.actuallyadditions.common.items.InitItems; import net.minecraft.block.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/recipe/TreasureChestHandler.java b/src/main/java/de/ellpeck/actuallyadditions/common/recipe/TreasureChestHandler.java index a1cb303a4..f9fef39a7 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/recipe/TreasureChestHandler.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/recipe/TreasureChestHandler.java @@ -1,8 +1,8 @@ -package de.ellpeck.actuallyadditions.recipe; +package de.ellpeck.actuallyadditions.common.recipe; import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI; -import de.ellpeck.actuallyadditions.items.InitItems; -import de.ellpeck.actuallyadditions.items.metalists.TheJams; +import de.ellpeck.actuallyadditions.common.items.InitItems; +import de.ellpeck.actuallyadditions.common.items.metalists.TheJams; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/util/compat/CompatFastBench.java b/src/main/java/de/ellpeck/actuallyadditions/common/util/compat/CompatFastBench.java index b1854d0ff..36c60b428 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/util/compat/CompatFastBench.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/util/compat/CompatFastBench.java @@ -24,4 +24,6 @@ public class CompatFastBench { @SideOnly(Side.CLIENT) public static Gui getFastBenchGui(EntityPlayer p, World world) { return new GuiFastBench(p.inventory, world, BlockPos.ORIGIN); - } \ No newline at end of file + } + +} diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/util/compat/IMCHandler.java b/src/main/java/de/ellpeck/actuallyadditions/common/util/compat/IMCHandler.java index f48be0f88..a655ae15f 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/util/compat/IMCHandler.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/util/compat/IMCHandler.java @@ -1,15 +1,15 @@ -package de.ellpeck.actuallyadditions.util.compat; +package de.ellpeck.actuallyadditions.common.util.compat; import org.apache.commons.lang3.ArrayUtils; -import de.ellpeck.actuallyadditions.blocks.BlockGiantChest; -import de.ellpeck.actuallyadditions.blocks.BlockItemViewer; -import de.ellpeck.actuallyadditions.blocks.BlockItemViewerHopping; -import de.ellpeck.actuallyadditions.blocks.BlockLaserRelay; -import de.ellpeck.actuallyadditions.blocks.BlockPhantom; -import de.ellpeck.actuallyadditions.blocks.BlockTinyTorch; -import de.ellpeck.actuallyadditions.blocks.BlockWildPlant; -import de.ellpeck.actuallyadditions.blocks.base.BlockPlant; +import de.ellpeck.actuallyadditions.common.blocks.BlockGiantChest; +import de.ellpeck.actuallyadditions.common.blocks.BlockItemViewer; +import de.ellpeck.actuallyadditions.common.blocks.BlockItemViewerHopping; +import de.ellpeck.actuallyadditions.common.blocks.BlockLaserRelay; +import de.ellpeck.actuallyadditions.common.blocks.BlockPhantom; +import de.ellpeck.actuallyadditions.common.blocks.BlockTinyTorch; +import de.ellpeck.actuallyadditions.common.blocks.BlockWildPlant; +import de.ellpeck.actuallyadditions.common.blocks.base.BlockPlant; import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraftforge.fml.common.event.FMLInterModComms; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/util/compat/SlotlessableItemHandlerWrapper.java b/src/main/java/de/ellpeck/actuallyadditions/common/util/compat/SlotlessableItemHandlerWrapper.java index 5fba9f8a9..744a6dfb1 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/util/compat/SlotlessableItemHandlerWrapper.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/util/compat/SlotlessableItemHandlerWrapper.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.util.compat; +package de.ellpeck.actuallyadditions.common.util.compat; import net.minecraftforge.items.IItemHandler; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/util/crafting/BlankRecipe.java b/src/main/java/de/ellpeck/actuallyadditions/common/util/crafting/BlankRecipe.java index dd517486d..a8cb99a6e 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/util/crafting/BlankRecipe.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/util/crafting/BlankRecipe.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.util.crafting; +package de.ellpeck.actuallyadditions.common.util.crafting; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/util/crafting/IRecipeGrouped.java b/src/main/java/de/ellpeck/actuallyadditions/common/util/crafting/IRecipeGrouped.java index 692596929..a9bf577e6 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/util/crafting/IRecipeGrouped.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/util/crafting/IRecipeGrouped.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.util.crafting; +package de.ellpeck.actuallyadditions.common.util.crafting; public interface IRecipeGrouped { diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/util/crafting/RecipeHandler.java b/src/main/java/de/ellpeck/actuallyadditions/common/util/crafting/RecipeHandler.java index b4b9a7716..fab6683d2 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/util/crafting/RecipeHandler.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/util/crafting/RecipeHandler.java @@ -8,7 +8,7 @@ Original: https://github.com/Glitchfiend/BiomesOPlenty/blob/0f8be0526e01d918cf8f22d4904a3b74981dee6f/src/main/java/biomesoplenty/common/util/inventory/CraftingUtil.java (edited to work with multiple mods) */ -package de.ellpeck.actuallyadditions.util.crafting; +package de.ellpeck.actuallyadditions.common.util.crafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/util/crafting/RecipeHelper.java b/src/main/java/de/ellpeck/actuallyadditions/common/util/crafting/RecipeHelper.java index ca3778122..dff4ce228 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/util/crafting/RecipeHelper.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/util/crafting/RecipeHelper.java @@ -1,10 +1,10 @@ -package de.ellpeck.actuallyadditions.util.crafting; +package de.ellpeck.actuallyadditions.common.util.crafting; import java.util.List; import de.ellpeck.actuallyadditions.api.misc.IDisableableItem; -import de.ellpeck.actuallyadditions.ActuallyAdditions; -import de.ellpeck.actuallyadditions.RegistryHandler; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.RegistryHandler; import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemStack;