From c7ef6d75ccc887a78a2b471014e35bfb2421c0fc Mon Sep 17 00:00:00 2001
From: Unknown <lemadec.fr@gmail.com>
Date: Thu, 24 May 2018 19:25:10 -0400
Subject: [PATCH] Code cleanup (decoration package)

---
 src/main/java/cr0s/warpdrive/WarpDrive.java               | 8 ++++----
 .../block/{passive => decoration}/BlockBedrockGlass.java  | 2 +-
 .../block/{passive => decoration}/BlockDecorative.java    | 2 +-
 .../warpdrive/block/{passive => decoration}/BlockGas.java | 2 +-
 .../{passive => decoration}/ItemBlockDecorative.java      | 2 +-
 src/main/java/cr0s/warpdrive/config/Recipes.java          | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)
 rename src/main/java/cr0s/warpdrive/block/{passive => decoration}/BlockBedrockGlass.java (97%)
 rename src/main/java/cr0s/warpdrive/block/{passive => decoration}/BlockDecorative.java (98%)
 rename src/main/java/cr0s/warpdrive/block/{passive => decoration}/BlockGas.java (98%)
 rename src/main/java/cr0s/warpdrive/block/{passive => decoration}/ItemBlockDecorative.java (96%)

diff --git a/src/main/java/cr0s/warpdrive/WarpDrive.java b/src/main/java/cr0s/warpdrive/WarpDrive.java
index 98766a12..306af6af 100644
--- a/src/main/java/cr0s/warpdrive/WarpDrive.java
+++ b/src/main/java/cr0s/warpdrive/WarpDrive.java
@@ -33,6 +33,10 @@ import cr0s.warpdrive.block.collection.BlockLaserTreeFarm;
 import cr0s.warpdrive.block.collection.BlockMiningLaser;
 import cr0s.warpdrive.block.collection.TileEntityLaserTreeFarm;
 import cr0s.warpdrive.block.collection.TileEntityMiningLaser;
+import cr0s.warpdrive.block.decoration.BlockBedrockGlass;
+import cr0s.warpdrive.block.decoration.BlockDecorative;
+import cr0s.warpdrive.block.decoration.BlockGas;
+import cr0s.warpdrive.block.decoration.ItemBlockDecorative;
 import cr0s.warpdrive.block.detection.BlockCamera;
 import cr0s.warpdrive.block.detection.BlockCloakingCoil;
 import cr0s.warpdrive.block.detection.BlockCloakingCore;
@@ -83,12 +87,8 @@ import cr0s.warpdrive.block.movement.TileEntityShipController;
 import cr0s.warpdrive.block.movement.TileEntityShipCore;
 import cr0s.warpdrive.block.movement.TileEntityTransporterBeacon;
 import cr0s.warpdrive.block.movement.TileEntityTransporterCore;
-import cr0s.warpdrive.block.passive.BlockBedrockGlass;
-import cr0s.warpdrive.block.passive.BlockDecorative;
-import cr0s.warpdrive.block.passive.BlockGas;
 import cr0s.warpdrive.block.passive.BlockHighlyAdvancedMachine;
 import cr0s.warpdrive.block.passive.BlockIridium;
-import cr0s.warpdrive.block.passive.ItemBlockDecorative;
 import cr0s.warpdrive.block.weapon.BlockLaserCamera;
 import cr0s.warpdrive.block.weapon.BlockWeaponController;
 import cr0s.warpdrive.block.weapon.TileEntityLaserCamera;
diff --git a/src/main/java/cr0s/warpdrive/block/passive/BlockBedrockGlass.java b/src/main/java/cr0s/warpdrive/block/decoration/BlockBedrockGlass.java
similarity index 97%
rename from src/main/java/cr0s/warpdrive/block/passive/BlockBedrockGlass.java
rename to src/main/java/cr0s/warpdrive/block/decoration/BlockBedrockGlass.java
index 5cd4b8a6..307b9d4d 100644
--- a/src/main/java/cr0s/warpdrive/block/passive/BlockBedrockGlass.java
+++ b/src/main/java/cr0s/warpdrive/block/decoration/BlockBedrockGlass.java
@@ -1,4 +1,4 @@
-package cr0s.warpdrive.block.passive;
+package cr0s.warpdrive.block.decoration;
 
 import cr0s.warpdrive.block.BlockAbstractBase;
 
diff --git a/src/main/java/cr0s/warpdrive/block/passive/BlockDecorative.java b/src/main/java/cr0s/warpdrive/block/decoration/BlockDecorative.java
similarity index 98%
rename from src/main/java/cr0s/warpdrive/block/passive/BlockDecorative.java
rename to src/main/java/cr0s/warpdrive/block/decoration/BlockDecorative.java
index 642882a7..a5211f68 100644
--- a/src/main/java/cr0s/warpdrive/block/passive/BlockDecorative.java
+++ b/src/main/java/cr0s/warpdrive/block/decoration/BlockDecorative.java
@@ -1,4 +1,4 @@
-package cr0s.warpdrive.block.passive;
+package cr0s.warpdrive.block.decoration;
 
 import cr0s.warpdrive.WarpDrive;
 import cr0s.warpdrive.block.BlockAbstractBase;
diff --git a/src/main/java/cr0s/warpdrive/block/passive/BlockGas.java b/src/main/java/cr0s/warpdrive/block/decoration/BlockGas.java
similarity index 98%
rename from src/main/java/cr0s/warpdrive/block/passive/BlockGas.java
rename to src/main/java/cr0s/warpdrive/block/decoration/BlockGas.java
index 565ce878..f85845ec 100644
--- a/src/main/java/cr0s/warpdrive/block/passive/BlockGas.java
+++ b/src/main/java/cr0s/warpdrive/block/decoration/BlockGas.java
@@ -1,4 +1,4 @@
-package cr0s.warpdrive.block.passive;
+package cr0s.warpdrive.block.decoration;
 
 import cr0s.warpdrive.block.BlockAbstractBase;
 import cr0s.warpdrive.data.CelestialObjectManager;
diff --git a/src/main/java/cr0s/warpdrive/block/passive/ItemBlockDecorative.java b/src/main/java/cr0s/warpdrive/block/decoration/ItemBlockDecorative.java
similarity index 96%
rename from src/main/java/cr0s/warpdrive/block/passive/ItemBlockDecorative.java
rename to src/main/java/cr0s/warpdrive/block/decoration/ItemBlockDecorative.java
index 664fc889..49505c0a 100644
--- a/src/main/java/cr0s/warpdrive/block/passive/ItemBlockDecorative.java
+++ b/src/main/java/cr0s/warpdrive/block/decoration/ItemBlockDecorative.java
@@ -1,4 +1,4 @@
-package cr0s.warpdrive.block.passive;
+package cr0s.warpdrive.block.decoration;
 
 import cr0s.warpdrive.data.EnumDecorativeType;
 
diff --git a/src/main/java/cr0s/warpdrive/config/Recipes.java b/src/main/java/cr0s/warpdrive/config/Recipes.java
index 4679c7eb..6449c54c 100644
--- a/src/main/java/cr0s/warpdrive/config/Recipes.java
+++ b/src/main/java/cr0s/warpdrive/config/Recipes.java
@@ -2,8 +2,8 @@ package cr0s.warpdrive.config;
 
 import cr0s.warpdrive.WarpDrive;
 import cr0s.warpdrive.api.ParticleRegistry;
+import cr0s.warpdrive.block.decoration.BlockDecorative;
 import cr0s.warpdrive.block.detection.BlockSiren;
-import cr0s.warpdrive.block.passive.BlockDecorative;
 import cr0s.warpdrive.data.EnumComponentType;
 import cr0s.warpdrive.data.EnumDecorativeType;
 import cr0s.warpdrive.data.EnumForceFieldShape;