From b4afd20e39383defc655a507a342e3ff4c6910cb Mon Sep 17 00:00:00 2001 From: Emanuel Rabina Date: Tue, 27 Feb 2024 23:09:02 +1300 Subject: [PATCH] Faction enum moved --- .../redhorizon/classic/{units => }/Faction.groovy | 10 +++++----- .../classic/extensions/MaterialExtensions.groovy | 10 +++++----- .../nz/net/ultraq/redhorizon/classic/maps/MapRA.groovy | 1 - .../redhorizon/classic/nodes/FactionColours.groovy | 2 +- .../classic/shaders/PalettedSpriteShader.groovy | 2 +- .../redhorizon/cli/objectviewer/UnitViewer.groovy | 2 +- .../explorer/scripts/UnitShowcaseScript.groovy | 2 +- 7 files changed, 14 insertions(+), 15 deletions(-) rename redhorizon-classic/source/nz/net/ultraq/redhorizon/classic/{units => }/Faction.groovy (96%) diff --git a/redhorizon-classic/source/nz/net/ultraq/redhorizon/classic/units/Faction.groovy b/redhorizon-classic/source/nz/net/ultraq/redhorizon/classic/Faction.groovy similarity index 96% rename from redhorizon-classic/source/nz/net/ultraq/redhorizon/classic/units/Faction.groovy rename to redhorizon-classic/source/nz/net/ultraq/redhorizon/classic/Faction.groovy index 1f196db2..9f5f3fde 100644 --- a/redhorizon-classic/source/nz/net/ultraq/redhorizon/classic/units/Faction.groovy +++ b/redhorizon-classic/source/nz/net/ultraq/redhorizon/classic/Faction.groovy @@ -1,12 +1,12 @@ -/* +/* * 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. @@ -14,7 +14,7 @@ * 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/redhorizon-classic/source/nz/net/ultraq/redhorizon/classic/extensions/MaterialExtensions.groovy b/redhorizon-classic/source/nz/net/ultraq/redhorizon/classic/extensions/MaterialExtensions.groovy index fa9186f6..255965a8 100644 --- a/redhorizon-classic/source/nz/net/ultraq/redhorizon/classic/extensions/MaterialExtensions.groovy +++ b/redhorizon-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 index f1b62112..f8346bf9 100644 --- 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 index 6761ea84..68150a86 100644 --- 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/redhorizon-classic/source/nz/net/ultraq/redhorizon/classic/shaders/PalettedSpriteShader.groovy b/redhorizon-classic/source/nz/net/ultraq/redhorizon/classic/shaders/PalettedSpriteShader.groovy index c25e3721..858bd4b7 100644 --- a/redhorizon-classic/source/nz/net/ultraq/redhorizon/classic/shaders/PalettedSpriteShader.groovy +++ b/redhorizon-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 index 3a1778bc..05266265 100644 --- 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/redhorizon-explorer/source/nz/net/ultraq/redhorizon/explorer/scripts/UnitShowcaseScript.groovy b/redhorizon-explorer/source/nz/net/ultraq/redhorizon/explorer/scripts/UnitShowcaseScript.groovy index 37d0417c..492aa50a 100644 --- a/redhorizon-explorer/source/nz/net/ultraq/redhorizon/explorer/scripts/UnitShowcaseScript.groovy +++ b/redhorizon-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