From cc29dd6333e3f3c7dbc9d1defd4744ded93cdcc9 Mon Sep 17 00:00:00 2001 From: TheBusyBiscuit Date: Thu, 26 Sep 2019 13:53:36 +0200 Subject: [PATCH] Refactoring --- .../machines/electric/{ => geo}/GEOMiner.java | 2 +- .../machines/electric/{ => geo}/GEOScannerBlock.java | 2 +- .../machines/electric/{ => geo}/NetherDrill.java | 3 ++- .../SlimefunItem/machines/electric/{ => geo}/OilPump.java | 2 +- .../machines/electric/{ => gps}/GPSTransmitter.java | 2 +- src/me/mrCookieSlime/Slimefun/Setup/SlimefunSetup.java | 8 ++++---- 6 files changed, 10 insertions(+), 9 deletions(-) rename src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/electric/{ => geo}/GEOMiner.java (99%) rename src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/electric/{ => geo}/GEOScannerBlock.java (98%) rename src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/electric/{ => geo}/NetherDrill.java (97%) rename src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/electric/{ => geo}/OilPump.java (99%) rename src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/electric/{ => gps}/GPSTransmitter.java (99%) diff --git a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/electric/GEOMiner.java b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/electric/geo/GEOMiner.java similarity index 99% rename from src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/electric/GEOMiner.java rename to src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/electric/geo/GEOMiner.java index 3885813ea..50b95ed7a 100644 --- a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/electric/GEOMiner.java +++ b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/electric/geo/GEOMiner.java @@ -1,4 +1,4 @@ -package me.mrCookieSlime.Slimefun.Objects.SlimefunItem.machines.electric; +package me.mrCookieSlime.Slimefun.Objects.SlimefunItem.machines.electric.geo; import java.util.LinkedList; import java.util.List; diff --git a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/electric/GEOScannerBlock.java b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/electric/geo/GEOScannerBlock.java similarity index 98% rename from src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/electric/GEOScannerBlock.java rename to src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/electric/geo/GEOScannerBlock.java index 3bb21daa0..19b253b48 100644 --- a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/electric/GEOScannerBlock.java +++ b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/electric/geo/GEOScannerBlock.java @@ -1,4 +1,4 @@ -package me.mrCookieSlime.Slimefun.Objects.SlimefunItem.machines.electric; +package me.mrCookieSlime.Slimefun.Objects.SlimefunItem.machines.electric.geo; import org.bukkit.inventory.ItemStack; diff --git a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/electric/NetherDrill.java b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/electric/geo/NetherDrill.java similarity index 97% rename from src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/electric/NetherDrill.java rename to src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/electric/geo/NetherDrill.java index 534f690cd..19176d154 100644 --- a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/electric/NetherDrill.java +++ b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/electric/geo/NetherDrill.java @@ -1,4 +1,4 @@ -package me.mrCookieSlime.Slimefun.Objects.SlimefunItem.machines.electric; +package me.mrCookieSlime.Slimefun.Objects.SlimefunItem.machines.electric.geo; import org.bukkit.Material; import org.bukkit.inventory.ItemStack; @@ -10,6 +10,7 @@ import me.mrCookieSlime.Slimefun.Lists.SlimefunItems; import me.mrCookieSlime.Slimefun.Objects.Category; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.ADrill; +@Deprecated public abstract class NetherDrill extends ADrill { public NetherDrill(Category category, ItemStack item, String name, RecipeType recipeType, ItemStack[] recipe) { diff --git a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/electric/OilPump.java b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/electric/geo/OilPump.java similarity index 99% rename from src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/electric/OilPump.java rename to src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/electric/geo/OilPump.java index bc13f061c..61ec4b34a 100644 --- a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/electric/OilPump.java +++ b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/electric/geo/OilPump.java @@ -1,4 +1,4 @@ -package me.mrCookieSlime.Slimefun.Objects.SlimefunItem.machines.electric; +package me.mrCookieSlime.Slimefun.Objects.SlimefunItem.machines.electric.geo; import org.bukkit.Material; import org.bukkit.block.Block; diff --git a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/electric/GPSTransmitter.java b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/electric/gps/GPSTransmitter.java similarity index 99% rename from src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/electric/GPSTransmitter.java rename to src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/electric/gps/GPSTransmitter.java index e9ea21b70..4809316f9 100644 --- a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/electric/GPSTransmitter.java +++ b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/electric/gps/GPSTransmitter.java @@ -1,4 +1,4 @@ -package me.mrCookieSlime.Slimefun.Objects.SlimefunItem.machines.electric; +package me.mrCookieSlime.Slimefun.Objects.SlimefunItem.machines.electric.gps; import java.util.UUID; diff --git a/src/me/mrCookieSlime/Slimefun/Setup/SlimefunSetup.java b/src/me/mrCookieSlime/Slimefun/Setup/SlimefunSetup.java index 2caf877e5..69b79a054 100644 --- a/src/me/mrCookieSlime/Slimefun/Setup/SlimefunSetup.java +++ b/src/me/mrCookieSlime/Slimefun/Setup/SlimefunSetup.java @@ -132,11 +132,7 @@ import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.machines.electric.FluidPum import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.machines.electric.FoodComposter; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.machines.electric.FoodFabricator; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.machines.electric.Freezer; -import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.machines.electric.GEOScannerBlock; -import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.machines.electric.GPSTransmitter; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.machines.electric.HeatedPressureChamber; -import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.machines.electric.NetherDrill; -import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.machines.electric.OilPump; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.machines.electric.Refinery; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.machines.electric.WitherAssembler; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.machines.electric.XPCollector; @@ -144,6 +140,10 @@ import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.machines.electric.generato import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.machines.electric.generators.CoalGenerator; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.machines.electric.generators.CombustionGenerator; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.machines.electric.generators.LavaGenerator; +import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.machines.electric.geo.GEOScannerBlock; +import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.machines.electric.geo.NetherDrill; +import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.machines.electric.geo.OilPump; +import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.machines.electric.gps.GPSTransmitter; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.multiblocks.ArmorForge; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.multiblocks.AutomatedPanningMachine; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.multiblocks.Compressor;