Faction enum moved

ultraq · Feb 27, 2024 · b4afd20 · b4afd20
1 parent be1bf8c
commit b4afd20
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 15 deletions.
diff --git a/...q/redhorizon/classic/units/Faction.groovy → .../ultraq/redhorizon/classic/Faction.groovy b/...q/redhorizon/classic/units/Faction.groovy → .../ultraq/redhorizon/classic/Faction.groovy
@@ -1,20 +1,20 @@
-/* 
+/*
  * Copyright 2022, Emanuel Rabina (http://www.ultraq.net.nz/)
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *     http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 
-package nz.net.ultraq.redhorizon.classic.units
+package nz.net.ultraq.redhorizon.classic
 
 /**
  * Available factions in classic C&C.

diff --git a/...izon-classic/source/nz/net/ultraq/redhorizon/classic/extensions/MaterialExtensions.groovy b/...izon-classic/source/nz/net/ultraq/redhorizon/classic/extensions/MaterialExtensions.groovy
@@ -1,12 +1,12 @@
-/* 
+/*
  * Copyright 2023, Emanuel Rabina (http://www.ultraq.net.nz/)
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *     http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,7 +16,7 @@
 
 package nz.net.ultraq.redhorizon.classic.extensions
 
-import nz.net.ultraq.redhorizon.classic.units.Faction
+import nz.net.ultraq.redhorizon.classic.Faction
 import nz.net.ultraq.redhorizon.engine.graphics.Material
 import nz.net.ultraq.redhorizon.engine.graphics.Texture
 

diff --git a/redhorizon-classic/source/nz/net/ultraq/redhorizon/classic/maps/MapRA.groovy b/redhorizon-classic/source/nz/net/ultraq/redhorizon/classic/maps/MapRA.groovy
@@ -20,7 +20,6 @@ import nz.net.ultraq.redhorizon.classic.filetypes.MapFile
 import nz.net.ultraq.redhorizon.classic.filetypes.PalFile
 import nz.net.ultraq.redhorizon.classic.filetypes.ShpFile
 import nz.net.ultraq.redhorizon.classic.filetypes.TmpFileRA
-import nz.net.ultraq.redhorizon.classic.units.Faction
 import nz.net.ultraq.redhorizon.classic.units.UnitData
 import nz.net.ultraq.redhorizon.engine.graphics.GraphicsRenderer
 import nz.net.ultraq.redhorizon.engine.graphics.Material

diff --git a/redhorizon-classic/source/nz/net/ultraq/redhorizon/classic/nodes/FactionColours.groovy b/redhorizon-classic/source/nz/net/ultraq/redhorizon/classic/nodes/FactionColours.groovy
@@ -16,7 +16,7 @@
 
 package nz.net.ultraq.redhorizon.classic.nodes
 
-import nz.net.ultraq.redhorizon.classic.units.Faction
+import nz.net.ultraq.redhorizon.classic.Faction
 
 /**
  * Any paletted item in the C&C classic games where a faction colour can be

diff --git a/...rizon-classic/source/nz/net/ultraq/redhorizon/classic/shaders/PalettedSpriteShader.groovy b/...rizon-classic/source/nz/net/ultraq/redhorizon/classic/shaders/PalettedSpriteShader.groovy
@@ -16,7 +16,7 @@
 
 package nz.net.ultraq.redhorizon.classic.shaders
 
-import nz.net.ultraq.redhorizon.classic.units.Faction
+import nz.net.ultraq.redhorizon.classic.Faction
 import nz.net.ultraq.redhorizon.engine.graphics.ShaderConfig
 
 /**

diff --git a/redhorizon-cli/source/nz/net/ultraq/redhorizon/cli/objectviewer/UnitViewer.groovy b/redhorizon-cli/source/nz/net/ultraq/redhorizon/cli/objectviewer/UnitViewer.groovy
@@ -16,8 +16,8 @@
 
 package nz.net.ultraq.redhorizon.cli.objectviewer
 
+import nz.net.ultraq.redhorizon.classic.Faction
 import nz.net.ultraq.redhorizon.classic.filetypes.ShpFile
-import nz.net.ultraq.redhorizon.classic.units.Faction
 import nz.net.ultraq.redhorizon.classic.units.UnitData
 import nz.net.ultraq.redhorizon.engine.graphics.GraphicsConfiguration
 import nz.net.ultraq.redhorizon.engine.input.KeyControl

diff --git a/...rizon-explorer/source/nz/net/ultraq/redhorizon/explorer/scripts/UnitShowcaseScript.groovy b/...rizon-explorer/source/nz/net/ultraq/redhorizon/explorer/scripts/UnitShowcaseScript.groovy
@@ -16,8 +16,8 @@
 
 package nz.net.ultraq.redhorizon.explorer.scripts
 
+import nz.net.ultraq.redhorizon.classic.Faction
 import nz.net.ultraq.redhorizon.classic.nodes.FactionColours
-import nz.net.ultraq.redhorizon.classic.units.Faction
 import nz.net.ultraq.redhorizon.classic.units.Unit
 import nz.net.ultraq.redhorizon.engine.input.KeyControl
 import nz.net.ultraq.redhorizon.engine.input.RemoveControlFunction