From 524770abba4f75ee624368054b14ce4de2dbe4ad Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Mon, 17 Sep 2018 07:34:13 +0100 Subject: [PATCH] Move around some classes that didnt need their own high level package --- src/main/java/techreborn/TechReborn.java | 2 +- src/main/java/techreborn/blocks/tier1/BlockPlayerDetector.java | 2 +- .../compat/immersiveengineering/RecipeImmersiveEngineering.java | 0 src/main/java/techreborn/compat/jei/TechRebornJeiPlugin.java | 0 src/main/java/techreborn/items/ItemFrequencyTransmitter.java | 2 +- .../java/techreborn/items/tool/industrial/ItemNanosaber.java | 2 +- src/main/java/techreborn/tiles/TileAlarm.java | 2 +- .../{dispenser => utils}/BehaviorDispenseScrapbox.java | 2 +- src/main/java/techreborn/{lib => utils}/MessageIDs.java | 2 +- 9 files changed, 7 insertions(+), 7 deletions(-) delete mode 100644 src/main/java/techreborn/compat/immersiveengineering/RecipeImmersiveEngineering.java delete mode 100644 src/main/java/techreborn/compat/jei/TechRebornJeiPlugin.java rename src/main/java/techreborn/{dispenser => utils}/BehaviorDispenseScrapbox.java (98%) rename src/main/java/techreborn/{lib => utils}/MessageIDs.java (98%) diff --git a/src/main/java/techreborn/TechReborn.java b/src/main/java/techreborn/TechReborn.java index 0eeb2b7af..3585236f3 100644 --- a/src/main/java/techreborn/TechReborn.java +++ b/src/main/java/techreborn/TechReborn.java @@ -56,7 +56,7 @@ import techreborn.api.TechRebornAPI; import techreborn.blocks.cable.EnumCableType; import techreborn.client.GuiHandler; import techreborn.command.TechRebornDevCommand; -import techreborn.dispenser.BehaviorDispenseScrapbox; +import techreborn.utils.BehaviorDispenseScrapbox; import techreborn.entities.EntityNukePrimed; import techreborn.events.BlockBreakHandler; import techreborn.events.TRRecipeHandler; diff --git a/src/main/java/techreborn/blocks/tier1/BlockPlayerDetector.java b/src/main/java/techreborn/blocks/tier1/BlockPlayerDetector.java index 2d4c49941..6541fdb0a 100644 --- a/src/main/java/techreborn/blocks/tier1/BlockPlayerDetector.java +++ b/src/main/java/techreborn/blocks/tier1/BlockPlayerDetector.java @@ -58,7 +58,7 @@ import reborncore.common.util.ChatUtils; import reborncore.common.util.StringUtils; import techreborn.TechReborn; import techreborn.init.ModBlocks; -import techreborn.lib.MessageIDs; +import techreborn.utils.MessageIDs; import techreborn.tiles.machine.tier1.TilePlayerDectector; import techreborn.utils.TechRebornCreativeTab; diff --git a/src/main/java/techreborn/compat/immersiveengineering/RecipeImmersiveEngineering.java b/src/main/java/techreborn/compat/immersiveengineering/RecipeImmersiveEngineering.java deleted file mode 100644 index e69de29bb..000000000 diff --git a/src/main/java/techreborn/compat/jei/TechRebornJeiPlugin.java b/src/main/java/techreborn/compat/jei/TechRebornJeiPlugin.java deleted file mode 100644 index e69de29bb..000000000 diff --git a/src/main/java/techreborn/items/ItemFrequencyTransmitter.java b/src/main/java/techreborn/items/ItemFrequencyTransmitter.java index acf440432..774ac17da 100644 --- a/src/main/java/techreborn/items/ItemFrequencyTransmitter.java +++ b/src/main/java/techreborn/items/ItemFrequencyTransmitter.java @@ -43,7 +43,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; import reborncore.client.hud.StackInfoElement; import reborncore.common.util.ChatUtils; import techreborn.init.TRItems; -import techreborn.lib.MessageIDs; +import techreborn.utils.MessageIDs; import javax.annotation.Nullable; import java.util.List; diff --git a/src/main/java/techreborn/items/tool/industrial/ItemNanosaber.java b/src/main/java/techreborn/items/tool/industrial/ItemNanosaber.java index cf7875d99..73376fd92 100644 --- a/src/main/java/techreborn/items/tool/industrial/ItemNanosaber.java +++ b/src/main/java/techreborn/items/tool/industrial/ItemNanosaber.java @@ -55,7 +55,7 @@ import reborncore.common.util.ChatUtils; import reborncore.common.util.ItemUtils; import techreborn.config.ConfigTechReborn; import techreborn.init.TRItems; -import techreborn.lib.MessageIDs; +import techreborn.utils.MessageIDs; import javax.annotation.Nullable; import java.util.List; diff --git a/src/main/java/techreborn/tiles/TileAlarm.java b/src/main/java/techreborn/tiles/TileAlarm.java index fecd3d009..05684ab18 100644 --- a/src/main/java/techreborn/tiles/TileAlarm.java +++ b/src/main/java/techreborn/tiles/TileAlarm.java @@ -41,7 +41,7 @@ import reborncore.common.util.ChatUtils; import techreborn.blocks.BlockAlarm; import techreborn.init.ModBlocks; import techreborn.init.ModSounds; -import techreborn.lib.MessageIDs; +import techreborn.utils.MessageIDs; public class TileAlarm extends TileEntity implements ITickable, IToolDrop { diff --git a/src/main/java/techreborn/dispenser/BehaviorDispenseScrapbox.java b/src/main/java/techreborn/utils/BehaviorDispenseScrapbox.java similarity index 98% rename from src/main/java/techreborn/dispenser/BehaviorDispenseScrapbox.java rename to src/main/java/techreborn/utils/BehaviorDispenseScrapbox.java index a50df14b3..73b79337f 100644 --- a/src/main/java/techreborn/dispenser/BehaviorDispenseScrapbox.java +++ b/src/main/java/techreborn/utils/BehaviorDispenseScrapbox.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package techreborn.dispenser; +package techreborn.utils; import net.minecraft.block.BlockDispenser; import net.minecraft.dispenser.BehaviorDefaultDispenseItem; diff --git a/src/main/java/techreborn/lib/MessageIDs.java b/src/main/java/techreborn/utils/MessageIDs.java similarity index 98% rename from src/main/java/techreborn/lib/MessageIDs.java rename to src/main/java/techreborn/utils/MessageIDs.java index 1f3204922..24a3b02b7 100644 --- a/src/main/java/techreborn/lib/MessageIDs.java +++ b/src/main/java/techreborn/utils/MessageIDs.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package techreborn.lib; +package techreborn.utils; /** * @author Prospector on 21/05/16