- * You should to implement {@link ConstraintWidgetFactory} if you what use custom type in your {@link org.terasology.config.flexible.AutoConfig}
+ * You should to implement {@link ConstraintWidgetFactory} if you what use custom type in your {@link org.terasology.engine.config.flexible.AutoConfig}
*
* @param
* TODO: Restored for API reasons, may be duplicating code elsewhere. Should be reviewed.
*
diff --git a/engine/src/main/java/org/terasology/input/RegisterBindAxis.java b/engine/src/main/java/org/terasology/input/RegisterBindAxis.java
index 6c0b63eb1..864f58de6 100644
--- a/engine/src/main/java/org/terasology/input/RegisterBindAxis.java
+++ b/engine/src/main/java/org/terasology/input/RegisterBindAxis.java
@@ -1,20 +1,7 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.input;
+package org.terasology.engine.input;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
diff --git a/engine/src/main/java/org/terasology/input/RegisterBindButton.java b/engine/src/main/java/org/terasology/input/RegisterBindButton.java
index 2782b8990..4b40efb00 100644
--- a/engine/src/main/java/org/terasology/input/RegisterBindButton.java
+++ b/engine/src/main/java/org/terasology/input/RegisterBindButton.java
@@ -1,20 +1,9 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.input;
+package org.terasology.engine.input;
+
+import org.terasology.input.ActivateMode;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
diff --git a/engine/src/main/java/org/terasology/input/RegisterRealBindAxis.java b/engine/src/main/java/org/terasology/input/RegisterRealBindAxis.java
index ed2992e43..217ae68c4 100644
--- a/engine/src/main/java/org/terasology/input/RegisterRealBindAxis.java
+++ b/engine/src/main/java/org/terasology/input/RegisterRealBindAxis.java
@@ -1,20 +1,7 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.input;
+package org.terasology.engine.input;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
diff --git a/engine/src/main/java/org/terasology/input/SendEventMode.java b/engine/src/main/java/org/terasology/input/SendEventMode.java
index 098a2a18e..d6a6e1ae0 100644
--- a/engine/src/main/java/org/terasology/input/SendEventMode.java
+++ b/engine/src/main/java/org/terasology/input/SendEventMode.java
@@ -1,20 +1,7 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.input;
+package org.terasology.engine.input;
/**
*/
diff --git a/engine/src/main/java/org/terasology/input/binds/general/ActivateButton.java b/engine/src/main/java/org/terasology/input/binds/general/ActivateButton.java
index d12573b7c..8dc0b4a6c 100644
--- a/engine/src/main/java/org/terasology/input/binds/general/ActivateButton.java
+++ b/engine/src/main/java/org/terasology/input/binds/general/ActivateButton.java
@@ -1,26 +1,13 @@
-/*
- * Copyright 2018 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.input.binds.general;
+package org.terasology.engine.input.binds.general;
-import org.terasology.input.BindButtonEvent;
-import org.terasology.input.DefaultBinding;
+import org.terasology.engine.input.BindButtonEvent;
+import org.terasology.engine.input.DefaultBinding;
import org.terasology.input.InputType;
import org.terasology.input.Keyboard;
-import org.terasology.input.RegisterBindButton;
+import org.terasology.engine.input.RegisterBindButton;
/**
* Activates the selected widget.
diff --git a/engine/src/main/java/org/terasology/input/binds/general/ChatButton.java b/engine/src/main/java/org/terasology/input/binds/general/ChatButton.java
index cfd0557e4..1aad87c18 100644
--- a/engine/src/main/java/org/terasology/input/binds/general/ChatButton.java
+++ b/engine/src/main/java/org/terasology/input/binds/general/ChatButton.java
@@ -1,26 +1,13 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.input.binds.general;
+package org.terasology.engine.input.binds.general;
-import org.terasology.input.BindButtonEvent;
-import org.terasology.input.DefaultBinding;
+import org.terasology.engine.input.BindButtonEvent;
+import org.terasology.engine.input.DefaultBinding;
import org.terasology.input.InputType;
import org.terasology.input.Keyboard;
-import org.terasology.input.RegisterBindButton;
+import org.terasology.engine.input.RegisterBindButton;
/**
* Toggles the display of ChatScreen (through ChatSystem)
diff --git a/engine/src/main/java/org/terasology/input/binds/general/ConsoleButton.java b/engine/src/main/java/org/terasology/input/binds/general/ConsoleButton.java
index def90f94b..e489bbaba 100644
--- a/engine/src/main/java/org/terasology/input/binds/general/ConsoleButton.java
+++ b/engine/src/main/java/org/terasology/input/binds/general/ConsoleButton.java
@@ -1,26 +1,13 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.input.binds.general;
+package org.terasology.engine.input.binds.general;
-import org.terasology.input.BindButtonEvent;
-import org.terasology.input.DefaultBinding;
+import org.terasology.engine.input.BindButtonEvent;
+import org.terasology.engine.input.DefaultBinding;
import org.terasology.input.InputType;
import org.terasology.input.Keyboard;
-import org.terasology.input.RegisterBindButton;
+import org.terasology.engine.input.RegisterBindButton;
/**
*/
diff --git a/engine/src/main/java/org/terasology/input/binds/general/HideHUDButton.java b/engine/src/main/java/org/terasology/input/binds/general/HideHUDButton.java
index c128d699c..c33714cc1 100644
--- a/engine/src/main/java/org/terasology/input/binds/general/HideHUDButton.java
+++ b/engine/src/main/java/org/terasology/input/binds/general/HideHUDButton.java
@@ -1,25 +1,12 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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 org.terasology.input.binds.general;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.input.binds.general;
-import org.terasology.input.BindButtonEvent;
-import org.terasology.input.DefaultBinding;
+import org.terasology.engine.input.BindButtonEvent;
+import org.terasology.engine.input.DefaultBinding;
import org.terasology.input.InputType;
import org.terasology.input.Keyboard;
-import org.terasology.input.RegisterBindButton;
+import org.terasology.engine.input.RegisterBindButton;
/**
*/
diff --git a/engine/src/main/java/org/terasology/input/binds/general/OnlinePlayersButton.java b/engine/src/main/java/org/terasology/input/binds/general/OnlinePlayersButton.java
index e3564045e..32e742411 100644
--- a/engine/src/main/java/org/terasology/input/binds/general/OnlinePlayersButton.java
+++ b/engine/src/main/java/org/terasology/input/binds/general/OnlinePlayersButton.java
@@ -1,25 +1,12 @@
-/*
- * Copyright 2015 MovingBlocks
- *
- * 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 org.terasology.input.binds.general;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.input.binds.general;
-import org.terasology.input.BindButtonEvent;
-import org.terasology.input.DefaultBinding;
+import org.terasology.engine.input.BindButtonEvent;
+import org.terasology.engine.input.DefaultBinding;
import org.terasology.input.InputType;
import org.terasology.input.Keyboard;
-import org.terasology.input.RegisterBindButton;
+import org.terasology.engine.input.RegisterBindButton;
@RegisterBindButton(id = "showOnlinePlayers", description = "${engine:menu#binding-show-online-players}", category = "general")
@DefaultBinding(type = InputType.KEY, id = Keyboard.KeyId.F2)
diff --git a/engine/src/main/java/org/terasology/input/binds/general/PauseButton.java b/engine/src/main/java/org/terasology/input/binds/general/PauseButton.java
index 6f4c46874..360050f4b 100644
--- a/engine/src/main/java/org/terasology/input/binds/general/PauseButton.java
+++ b/engine/src/main/java/org/terasology/input/binds/general/PauseButton.java
@@ -1,27 +1,14 @@
-/*
- * Copyright 2017 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.input.binds.general;
+package org.terasology.engine.input.binds.general;
-import org.terasology.input.BindButtonEvent;
+import org.terasology.engine.input.BindButtonEvent;
import org.terasology.input.ControllerId;
-import org.terasology.input.DefaultBinding;
+import org.terasology.engine.input.DefaultBinding;
import org.terasology.input.InputType;
import org.terasology.input.Keyboard;
-import org.terasology.input.RegisterBindButton;
+import org.terasology.engine.input.RegisterBindButton;
@RegisterBindButton(id = "pause", description = "${engine:menu#binding-pause}", category = "general")
@DefaultBinding(type = InputType.KEY, id = Keyboard.KeyId.ESCAPE)
diff --git a/engine/src/main/java/org/terasology/input/binds/general/ScreenshotButton.java b/engine/src/main/java/org/terasology/input/binds/general/ScreenshotButton.java
index 7ec5339f8..7377bc5c9 100644
--- a/engine/src/main/java/org/terasology/input/binds/general/ScreenshotButton.java
+++ b/engine/src/main/java/org/terasology/input/binds/general/ScreenshotButton.java
@@ -1,26 +1,13 @@
-/*
- * Copyright 2017 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.input.binds.general;
+package org.terasology.engine.input.binds.general;
-import org.terasology.input.BindButtonEvent;
-import org.terasology.input.DefaultBinding;
+import org.terasology.engine.input.BindButtonEvent;
+import org.terasology.engine.input.DefaultBinding;
import org.terasology.input.InputType;
import org.terasology.input.Keyboard;
-import org.terasology.input.RegisterBindButton;
+import org.terasology.engine.input.RegisterBindButton;
@RegisterBindButton(id = "screenshot", description = "${engine:menu#binding-screenshot}", category = "general")
@DefaultBinding(type = InputType.KEY, id = Keyboard.KeyId.F12)
diff --git a/engine/src/main/java/org/terasology/input/binds/general/TabbingModifierButton.java b/engine/src/main/java/org/terasology/input/binds/general/TabbingModifierButton.java
index f40c315fe..742db0c00 100644
--- a/engine/src/main/java/org/terasology/input/binds/general/TabbingModifierButton.java
+++ b/engine/src/main/java/org/terasology/input/binds/general/TabbingModifierButton.java
@@ -1,26 +1,13 @@
-/*
- * Copyright 2018 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.input.binds.general;
+package org.terasology.engine.input.binds.general;
-import org.terasology.input.BindButtonEvent;
-import org.terasology.input.DefaultBinding;
+import org.terasology.engine.input.BindButtonEvent;
+import org.terasology.engine.input.DefaultBinding;
import org.terasology.input.InputType;
import org.terasology.input.Keyboard;
-import org.terasology.input.RegisterBindButton;
+import org.terasology.engine.input.RegisterBindButton;
/**
* Modifies the behaviour of tabbing between widgets
diff --git a/engine/src/main/java/org/terasology/input/binds/general/TabbingUIButton.java b/engine/src/main/java/org/terasology/input/binds/general/TabbingUIButton.java
index 12a83b661..e4ac0c4d5 100644
--- a/engine/src/main/java/org/terasology/input/binds/general/TabbingUIButton.java
+++ b/engine/src/main/java/org/terasology/input/binds/general/TabbingUIButton.java
@@ -1,26 +1,13 @@
-/*
- * Copyright 2018 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.input.binds.general;
+package org.terasology.engine.input.binds.general;
-import org.terasology.input.BindButtonEvent;
-import org.terasology.input.DefaultBinding;
+import org.terasology.engine.input.BindButtonEvent;
+import org.terasology.engine.input.DefaultBinding;
import org.terasology.input.InputType;
import org.terasology.input.Keyboard;
-import org.terasology.input.RegisterBindButton;
+import org.terasology.engine.input.RegisterBindButton;
/**
* Tabs between widgets in order.
diff --git a/engine/src/main/java/org/terasology/input/binds/general/package-info.java b/engine/src/main/java/org/terasology/input/binds/general/package-info.java
index 55880e47c..d74ba1763 100644
--- a/engine/src/main/java/org/terasology/input/binds/general/package-info.java
+++ b/engine/src/main/java/org/terasology/input/binds/general/package-info.java
@@ -1,24 +1,11 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
@API
@InputCategory(id = "general",
displayName = "${engine:menu#category-general}"
- ) package org.terasology.input.binds.general;
+ ) package org.terasology.engine.input.binds.general;
import org.terasology.module.sandbox.API;
import org.terasology.input.InputCategory;
diff --git a/engine/src/main/java/org/terasology/input/binds/interaction/AttackButton.java b/engine/src/main/java/org/terasology/input/binds/interaction/AttackButton.java
index a4ab078b9..b43356cae 100644
--- a/engine/src/main/java/org/terasology/input/binds/interaction/AttackButton.java
+++ b/engine/src/main/java/org/terasology/input/binds/interaction/AttackButton.java
@@ -1,26 +1,13 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.input.binds.interaction;
+package org.terasology.engine.input.binds.interaction;
-import org.terasology.input.BindButtonEvent;
+import org.terasology.engine.input.BindButtonEvent;
+import org.terasology.engine.input.DefaultBinding;
+import org.terasology.engine.input.RegisterBindButton;
import org.terasology.input.ControllerId;
-import org.terasology.input.DefaultBinding;
import org.terasology.input.InputType;
-import org.terasology.input.RegisterBindButton;
/**
*/
diff --git a/engine/src/main/java/org/terasology/input/binds/interaction/FrobButton.java b/engine/src/main/java/org/terasology/input/binds/interaction/FrobButton.java
index 33ea41348..de435b7e7 100644
--- a/engine/src/main/java/org/terasology/input/binds/interaction/FrobButton.java
+++ b/engine/src/main/java/org/terasology/input/binds/interaction/FrobButton.java
@@ -1,27 +1,14 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.input.binds.interaction;
+package org.terasology.engine.input.binds.interaction;
-import org.terasology.input.BindButtonEvent;
+import org.terasology.engine.input.BindButtonEvent;
+import org.terasology.engine.input.DefaultBinding;
+import org.terasology.engine.input.RegisterBindButton;
import org.terasology.input.ControllerId;
-import org.terasology.input.DefaultBinding;
import org.terasology.input.InputType;
import org.terasology.input.Keyboard;
-import org.terasology.input.RegisterBindButton;
/**
*/
diff --git a/engine/src/main/java/org/terasology/input/binds/interaction/package-info.java b/engine/src/main/java/org/terasology/input/binds/interaction/package-info.java
index 6d08c4f23..c6337f90b 100644
--- a/engine/src/main/java/org/terasology/input/binds/interaction/package-info.java
+++ b/engine/src/main/java/org/terasology/input/binds/interaction/package-info.java
@@ -1,18 +1,5 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
@API
@@ -21,7 +8,7 @@
ordering = {
"engine:attack",
"engine:frob"
- }) package org.terasology.input.binds.interaction;
+ }) package org.terasology.engine.input.binds.interaction;
import org.terasology.module.sandbox.API;
import org.terasology.input.InputCategory;
diff --git a/engine/src/main/java/org/terasology/input/binds/inventory/UseItemButton.java b/engine/src/main/java/org/terasology/input/binds/inventory/UseItemButton.java
index 8bfd70f53..4e9a340b5 100644
--- a/engine/src/main/java/org/terasology/input/binds/inventory/UseItemButton.java
+++ b/engine/src/main/java/org/terasology/input/binds/inventory/UseItemButton.java
@@ -1,25 +1,12 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.input.binds.inventory;
+package org.terasology.engine.input.binds.inventory;
-import org.terasology.input.BindButtonEvent;
-import org.terasology.input.DefaultBinding;
+import org.terasology.engine.input.BindButtonEvent;
+import org.terasology.engine.input.DefaultBinding;
+import org.terasology.engine.input.RegisterBindButton;
import org.terasology.input.InputType;
-import org.terasology.input.RegisterBindButton;
import org.terasology.input.ControllerId;
import org.terasology.module.sandbox.API;
diff --git a/engine/src/main/java/org/terasology/input/binds/inventory/package-info.java b/engine/src/main/java/org/terasology/input/binds/inventory/package-info.java
index 461672979..27279841f 100644
--- a/engine/src/main/java/org/terasology/input/binds/inventory/package-info.java
+++ b/engine/src/main/java/org/terasology/input/binds/inventory/package-info.java
@@ -1,21 +1,8 @@
-/*
- * Copyright 2016 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
@InputCategory(id = "inventory",
displayName = "${engine:menu#category-inventory}"
-) package org.terasology.input.binds.inventory;
+) package org.terasology.engine.input.binds.inventory;
import org.terasology.input.InputCategory;
diff --git a/engine/src/main/java/org/terasology/input/binds/movement/AutoMoveButton.java b/engine/src/main/java/org/terasology/input/binds/movement/AutoMoveButton.java
index e4054b574..e359e0fc5 100644
--- a/engine/src/main/java/org/terasology/input/binds/movement/AutoMoveButton.java
+++ b/engine/src/main/java/org/terasology/input/binds/movement/AutoMoveButton.java
@@ -1,25 +1,12 @@
-/*
- * Copyright 2016 MovingBlocks
- *
- * 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 org.terasology.input.binds.movement;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.input.binds.movement;
-import org.terasology.input.BindButtonEvent;
-import org.terasology.input.DefaultBinding;
+import org.terasology.engine.input.BindButtonEvent;
+import org.terasology.engine.input.DefaultBinding;
import org.terasology.input.InputType;
import org.terasology.input.Keyboard;
-import org.terasology.input.RegisterBindButton;
+import org.terasology.engine.input.RegisterBindButton;
@RegisterBindButton(id = "autoMoveMode", description = "${engine:menu#binding-autoMove-mode}")
@DefaultBinding(id = Keyboard.KeyId.R, type = InputType.KEY)
diff --git a/engine/src/main/java/org/terasology/input/binds/movement/BackwardsButton.java b/engine/src/main/java/org/terasology/input/binds/movement/BackwardsButton.java
index 13e08fedd..269da00c8 100644
--- a/engine/src/main/java/org/terasology/input/binds/movement/BackwardsButton.java
+++ b/engine/src/main/java/org/terasology/input/binds/movement/BackwardsButton.java
@@ -1,26 +1,13 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.input.binds.movement;
+package org.terasology.engine.input.binds.movement;
-import org.terasology.input.BindButtonEvent;
-import org.terasology.input.DefaultBinding;
+import org.terasology.engine.input.BindButtonEvent;
+import org.terasology.engine.input.DefaultBinding;
import org.terasology.input.InputType;
import org.terasology.input.Keyboard;
-import org.terasology.input.RegisterBindButton;
+import org.terasology.engine.input.RegisterBindButton;
/**
*/
diff --git a/engine/src/main/java/org/terasology/input/binds/movement/CrouchButton.java b/engine/src/main/java/org/terasology/input/binds/movement/CrouchButton.java
index c058315ec..1cfa5fff7 100644
--- a/engine/src/main/java/org/terasology/input/binds/movement/CrouchButton.java
+++ b/engine/src/main/java/org/terasology/input/binds/movement/CrouchButton.java
@@ -1,26 +1,13 @@
-/*
- * Copyright 2014 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.input.binds.movement;
+package org.terasology.engine.input.binds.movement;
-import org.terasology.input.BindButtonEvent;
-import org.terasology.input.DefaultBinding;
+import org.terasology.engine.input.BindButtonEvent;
+import org.terasology.engine.input.DefaultBinding;
import org.terasology.input.InputType;
import org.terasology.input.Keyboard;
-import org.terasology.input.RegisterBindButton;
+import org.terasology.engine.input.RegisterBindButton;
/**
*/
diff --git a/engine/src/main/java/org/terasology/input/binds/movement/CrouchModeButton.java b/engine/src/main/java/org/terasology/input/binds/movement/CrouchModeButton.java
index f4d93bcb5..022a61ec1 100644
--- a/engine/src/main/java/org/terasology/input/binds/movement/CrouchModeButton.java
+++ b/engine/src/main/java/org/terasology/input/binds/movement/CrouchModeButton.java
@@ -1,25 +1,12 @@
-/*
- * Copyright 2016 MovingBlocks
- *
- * 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 org.terasology.input.binds.movement;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.input.binds.movement;
-import org.terasology.input.BindButtonEvent;
-import org.terasology.input.DefaultBinding;
+import org.terasology.engine.input.BindButtonEvent;
+import org.terasology.engine.input.DefaultBinding;
import org.terasology.input.InputType;
import org.terasology.input.Keyboard;
-import org.terasology.input.RegisterBindButton;
+import org.terasology.engine.input.RegisterBindButton;
/**
*/
diff --git a/engine/src/main/java/org/terasology/input/binds/movement/ForwardsButton.java b/engine/src/main/java/org/terasology/input/binds/movement/ForwardsButton.java
index d86bb7a70..ae35edead 100644
--- a/engine/src/main/java/org/terasology/input/binds/movement/ForwardsButton.java
+++ b/engine/src/main/java/org/terasology/input/binds/movement/ForwardsButton.java
@@ -1,26 +1,13 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.input.binds.movement;
+package org.terasology.engine.input.binds.movement;
-import org.terasology.input.BindButtonEvent;
-import org.terasology.input.DefaultBinding;
+import org.terasology.engine.input.BindButtonEvent;
+import org.terasology.engine.input.DefaultBinding;
import org.terasology.input.InputType;
import org.terasology.input.Keyboard;
-import org.terasology.input.RegisterBindButton;
+import org.terasology.engine.input.RegisterBindButton;
/**
*/
diff --git a/engine/src/main/java/org/terasology/input/binds/movement/ForwardsMovementAxis.java b/engine/src/main/java/org/terasology/input/binds/movement/ForwardsMovementAxis.java
index 6a76df1bb..a46757025 100644
--- a/engine/src/main/java/org/terasology/input/binds/movement/ForwardsMovementAxis.java
+++ b/engine/src/main/java/org/terasology/input/binds/movement/ForwardsMovementAxis.java
@@ -1,24 +1,11 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.input.binds.movement;
+package org.terasology.engine.input.binds.movement;
-import org.terasology.input.BindAxisEvent;
-import org.terasology.input.RegisterBindAxis;
-import org.terasology.input.SendEventMode;
+import org.terasology.engine.input.BindAxisEvent;
+import org.terasology.engine.input.RegisterBindAxis;
+import org.terasology.engine.input.SendEventMode;
/**
*/
diff --git a/engine/src/main/java/org/terasology/input/binds/movement/ForwardsRealMovementAxis.java b/engine/src/main/java/org/terasology/input/binds/movement/ForwardsRealMovementAxis.java
index 136c41468..76bab81fa 100644
--- a/engine/src/main/java/org/terasology/input/binds/movement/ForwardsRealMovementAxis.java
+++ b/engine/src/main/java/org/terasology/input/binds/movement/ForwardsRealMovementAxis.java
@@ -1,27 +1,14 @@
-/*
- * Copyright 2015 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.input.binds.movement;
+package org.terasology.engine.input.binds.movement;
-import org.terasology.input.BindAxisEvent;
+import org.terasology.engine.input.BindAxisEvent;
import org.terasology.input.ControllerId;
-import org.terasology.input.DefaultBinding;
+import org.terasology.engine.input.DefaultBinding;
import org.terasology.input.InputType;
-import org.terasology.input.RegisterRealBindAxis;
-import org.terasology.input.SendEventMode;
+import org.terasology.engine.input.RegisterRealBindAxis;
+import org.terasology.engine.input.SendEventMode;
/**
*/
diff --git a/engine/src/main/java/org/terasology/input/binds/movement/JumpButton.java b/engine/src/main/java/org/terasology/input/binds/movement/JumpButton.java
index 1966f1604..55c83859f 100644
--- a/engine/src/main/java/org/terasology/input/binds/movement/JumpButton.java
+++ b/engine/src/main/java/org/terasology/input/binds/movement/JumpButton.java
@@ -1,27 +1,14 @@
-/*
- * Copyright 2014 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.input.binds.movement;
+package org.terasology.engine.input.binds.movement;
-import org.terasology.input.BindButtonEvent;
+import org.terasology.engine.input.BindButtonEvent;
import org.terasology.input.ControllerId;
-import org.terasology.input.DefaultBinding;
+import org.terasology.engine.input.DefaultBinding;
import org.terasology.input.InputType;
import org.terasology.input.Keyboard;
-import org.terasology.input.RegisterBindButton;
+import org.terasology.engine.input.RegisterBindButton;
/**
*/
diff --git a/engine/src/main/java/org/terasology/input/binds/movement/LeftStrafeButton.java b/engine/src/main/java/org/terasology/input/binds/movement/LeftStrafeButton.java
index 00710a558..1791cfb14 100644
--- a/engine/src/main/java/org/terasology/input/binds/movement/LeftStrafeButton.java
+++ b/engine/src/main/java/org/terasology/input/binds/movement/LeftStrafeButton.java
@@ -1,26 +1,13 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.input.binds.movement;
+package org.terasology.engine.input.binds.movement;
-import org.terasology.input.BindButtonEvent;
-import org.terasology.input.DefaultBinding;
+import org.terasology.engine.input.BindButtonEvent;
+import org.terasology.engine.input.DefaultBinding;
import org.terasology.input.InputType;
import org.terasology.input.Keyboard;
-import org.terasology.input.RegisterBindButton;
+import org.terasology.engine.input.RegisterBindButton;
/**
*/
diff --git a/engine/src/main/java/org/terasology/input/binds/movement/RightStrafeButton.java b/engine/src/main/java/org/terasology/input/binds/movement/RightStrafeButton.java
index c7643aa8c..ed9bb1070 100644
--- a/engine/src/main/java/org/terasology/input/binds/movement/RightStrafeButton.java
+++ b/engine/src/main/java/org/terasology/input/binds/movement/RightStrafeButton.java
@@ -1,26 +1,13 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.input.binds.movement;
+package org.terasology.engine.input.binds.movement;
-import org.terasology.input.BindButtonEvent;
-import org.terasology.input.DefaultBinding;
+import org.terasology.engine.input.BindButtonEvent;
+import org.terasology.engine.input.DefaultBinding;
import org.terasology.input.InputType;
import org.terasology.input.Keyboard;
-import org.terasology.input.RegisterBindButton;
+import org.terasology.engine.input.RegisterBindButton;
/**
*/
diff --git a/engine/src/main/java/org/terasology/input/binds/movement/RotationPitchAxis.java b/engine/src/main/java/org/terasology/input/binds/movement/RotationPitchAxis.java
index 015153026..ea161d311 100644
--- a/engine/src/main/java/org/terasology/input/binds/movement/RotationPitchAxis.java
+++ b/engine/src/main/java/org/terasology/input/binds/movement/RotationPitchAxis.java
@@ -1,27 +1,14 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.input.binds.movement;
+package org.terasology.engine.input.binds.movement;
-import org.terasology.input.BindAxisEvent;
+import org.terasology.engine.input.BindAxisEvent;
import org.terasology.input.ControllerId;
-import org.terasology.input.DefaultBinding;
+import org.terasology.engine.input.DefaultBinding;
import org.terasology.input.InputType;
-import org.terasology.input.RegisterRealBindAxis;
-import org.terasology.input.SendEventMode;
+import org.terasology.engine.input.RegisterRealBindAxis;
+import org.terasology.engine.input.SendEventMode;
/**
* Relates to the vertical screen axis, i.e. look up/down.
diff --git a/engine/src/main/java/org/terasology/input/binds/movement/RotationYawAxis.java b/engine/src/main/java/org/terasology/input/binds/movement/RotationYawAxis.java
index 648927a59..4fb608a1a 100644
--- a/engine/src/main/java/org/terasology/input/binds/movement/RotationYawAxis.java
+++ b/engine/src/main/java/org/terasology/input/binds/movement/RotationYawAxis.java
@@ -1,27 +1,14 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.input.binds.movement;
+package org.terasology.engine.input.binds.movement;
-import org.terasology.input.BindAxisEvent;
+import org.terasology.engine.input.BindAxisEvent;
import org.terasology.input.ControllerId;
-import org.terasology.input.DefaultBinding;
+import org.terasology.engine.input.DefaultBinding;
import org.terasology.input.InputType;
-import org.terasology.input.RegisterRealBindAxis;
-import org.terasology.input.SendEventMode;
+import org.terasology.engine.input.RegisterRealBindAxis;
+import org.terasology.engine.input.SendEventMode;
/**
* Relates to the horizontal screen axis, i.e. look left/right.
diff --git a/engine/src/main/java/org/terasology/input/binds/movement/StrafeMovementAxis.java b/engine/src/main/java/org/terasology/input/binds/movement/StrafeMovementAxis.java
index 835f61eb9..af649fee1 100644
--- a/engine/src/main/java/org/terasology/input/binds/movement/StrafeMovementAxis.java
+++ b/engine/src/main/java/org/terasology/input/binds/movement/StrafeMovementAxis.java
@@ -1,24 +1,11 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.input.binds.movement;
+package org.terasology.engine.input.binds.movement;
-import org.terasology.input.BindAxisEvent;
-import org.terasology.input.RegisterBindAxis;
-import org.terasology.input.SendEventMode;
+import org.terasology.engine.input.BindAxisEvent;
+import org.terasology.engine.input.RegisterBindAxis;
+import org.terasology.engine.input.SendEventMode;
/**
*/
diff --git a/engine/src/main/java/org/terasology/input/binds/movement/StrafeRealMovementAxis.java b/engine/src/main/java/org/terasology/input/binds/movement/StrafeRealMovementAxis.java
index f43fe43df..258715aa8 100644
--- a/engine/src/main/java/org/terasology/input/binds/movement/StrafeRealMovementAxis.java
+++ b/engine/src/main/java/org/terasology/input/binds/movement/StrafeRealMovementAxis.java
@@ -1,27 +1,14 @@
-/*
- * Copyright 2015 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.input.binds.movement;
+package org.terasology.engine.input.binds.movement;
-import org.terasology.input.BindAxisEvent;
+import org.terasology.engine.input.BindAxisEvent;
+import org.terasology.engine.input.DefaultBinding;
+import org.terasology.engine.input.RegisterRealBindAxis;
+import org.terasology.engine.input.SendEventMode;
import org.terasology.input.ControllerId;
-import org.terasology.input.DefaultBinding;
import org.terasology.input.InputType;
-import org.terasology.input.RegisterRealBindAxis;
-import org.terasology.input.SendEventMode;
/**
*/
diff --git a/engine/src/main/java/org/terasology/input/binds/movement/ToggleSpeedPermanentlyButton.java b/engine/src/main/java/org/terasology/input/binds/movement/ToggleSpeedPermanentlyButton.java
index b137ff67d..7242db3e9 100644
--- a/engine/src/main/java/org/terasology/input/binds/movement/ToggleSpeedPermanentlyButton.java
+++ b/engine/src/main/java/org/terasology/input/binds/movement/ToggleSpeedPermanentlyButton.java
@@ -1,26 +1,13 @@
-/*
- * Copyright 2014 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.input.binds.movement;
+package org.terasology.engine.input.binds.movement;
-import org.terasology.input.BindButtonEvent;
-import org.terasology.input.DefaultBinding;
+import org.terasology.engine.input.BindButtonEvent;
+import org.terasology.engine.input.DefaultBinding;
import org.terasology.input.InputType;
import org.terasology.input.Keyboard;
-import org.terasology.input.RegisterBindButton;
+import org.terasology.engine.input.RegisterBindButton;
/**
*/
diff --git a/engine/src/main/java/org/terasology/input/binds/movement/ToggleSpeedTemporarilyButton.java b/engine/src/main/java/org/terasology/input/binds/movement/ToggleSpeedTemporarilyButton.java
index 6ca8f6739..756d5332e 100644
--- a/engine/src/main/java/org/terasology/input/binds/movement/ToggleSpeedTemporarilyButton.java
+++ b/engine/src/main/java/org/terasology/input/binds/movement/ToggleSpeedTemporarilyButton.java
@@ -1,26 +1,13 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.input.binds.movement;
+package org.terasology.engine.input.binds.movement;
-import org.terasology.input.BindButtonEvent;
-import org.terasology.input.DefaultBinding;
+import org.terasology.engine.input.BindButtonEvent;
+import org.terasology.engine.input.DefaultBinding;
import org.terasology.input.InputType;
import org.terasology.input.Keyboard;
-import org.terasology.input.RegisterBindButton;
+import org.terasology.engine.input.RegisterBindButton;
/**
*/
diff --git a/engine/src/main/java/org/terasology/input/binds/movement/VerticalMovementAxis.java b/engine/src/main/java/org/terasology/input/binds/movement/VerticalMovementAxis.java
index 69362c355..c17d1f30d 100644
--- a/engine/src/main/java/org/terasology/input/binds/movement/VerticalMovementAxis.java
+++ b/engine/src/main/java/org/terasology/input/binds/movement/VerticalMovementAxis.java
@@ -1,24 +1,11 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.input.binds.movement;
+package org.terasology.engine.input.binds.movement;
-import org.terasology.input.BindAxisEvent;
-import org.terasology.input.RegisterBindAxis;
-import org.terasology.input.SendEventMode;
+import org.terasology.engine.input.BindAxisEvent;
+import org.terasology.engine.input.RegisterBindAxis;
+import org.terasology.engine.input.SendEventMode;
/**
*/
diff --git a/engine/src/main/java/org/terasology/input/binds/movement/VerticalRealMovementAxis.java b/engine/src/main/java/org/terasology/input/binds/movement/VerticalRealMovementAxis.java
index e4612799d..26f65c5af 100644
--- a/engine/src/main/java/org/terasology/input/binds/movement/VerticalRealMovementAxis.java
+++ b/engine/src/main/java/org/terasology/input/binds/movement/VerticalRealMovementAxis.java
@@ -1,27 +1,14 @@
-/*
- * Copyright 2015 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.input.binds.movement;
+package org.terasology.engine.input.binds.movement;
-import org.terasology.input.BindAxisEvent;
+import org.terasology.engine.input.BindAxisEvent;
import org.terasology.input.ControllerId;
-import org.terasology.input.DefaultBinding;
+import org.terasology.engine.input.DefaultBinding;
import org.terasology.input.InputType;
-import org.terasology.input.RegisterRealBindAxis;
-import org.terasology.input.SendEventMode;
+import org.terasology.engine.input.RegisterRealBindAxis;
+import org.terasology.engine.input.SendEventMode;
/**
*/
diff --git a/engine/src/main/java/org/terasology/input/binds/movement/package-info.java b/engine/src/main/java/org/terasology/input/binds/movement/package-info.java
index ed433a2f6..8104306aa 100644
--- a/engine/src/main/java/org/terasology/input/binds/movement/package-info.java
+++ b/engine/src/main/java/org/terasology/input/binds/movement/package-info.java
@@ -1,18 +1,5 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
@API
@@ -29,7 +16,7 @@
"engine:crouchMode",
"engine:jump",
"engine:crouch"
- }) package org.terasology.input.binds.movement;
+ }) package org.terasology.engine.input.binds.movement;
import org.terasology.module.sandbox.API;
import org.terasology.input.InputCategory;
diff --git a/engine/src/main/java/org/terasology/input/cameraTarget/CameraOutEvent.java b/engine/src/main/java/org/terasology/input/cameraTarget/CameraOutEvent.java
index 2953b8905..8ef4bf8dc 100644
--- a/engine/src/main/java/org/terasology/input/cameraTarget/CameraOutEvent.java
+++ b/engine/src/main/java/org/terasology/input/cameraTarget/CameraOutEvent.java
@@ -1,21 +1,8 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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 org.terasology.input.cameraTarget;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.input.cameraTarget;
-import org.terasology.entitySystem.event.Event;
+import org.terasology.engine.entitySystem.event.Event;
/**
* Event when the camera ceases to be over an entity - sent to the involved entity
diff --git a/engine/src/main/java/org/terasology/input/cameraTarget/CameraOverEvent.java b/engine/src/main/java/org/terasology/input/cameraTarget/CameraOverEvent.java
index 9eb88b3ab..fbd28a39e 100644
--- a/engine/src/main/java/org/terasology/input/cameraTarget/CameraOverEvent.java
+++ b/engine/src/main/java/org/terasology/input/cameraTarget/CameraOverEvent.java
@@ -1,22 +1,9 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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 org.terasology.input.cameraTarget;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.input.cameraTarget;
-import org.terasology.entitySystem.event.Event;
+import org.terasology.engine.entitySystem.event.Event;
/**
* This event is sent when the camera starts pointing at a target, to the target
diff --git a/engine/src/main/java/org/terasology/input/cameraTarget/CameraTargetChangedEvent.java b/engine/src/main/java/org/terasology/input/cameraTarget/CameraTargetChangedEvent.java
index 2c11ddf4c..7401b7c3b 100644
--- a/engine/src/main/java/org/terasology/input/cameraTarget/CameraTargetChangedEvent.java
+++ b/engine/src/main/java/org/terasology/input/cameraTarget/CameraTargetChangedEvent.java
@@ -1,23 +1,10 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.input.cameraTarget;
+package org.terasology.engine.input.cameraTarget;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.entitySystem.event.Event;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.event.Event;
/**
*/
diff --git a/engine/src/main/java/org/terasology/input/cameraTarget/CameraTargetSystem.java b/engine/src/main/java/org/terasology/input/cameraTarget/CameraTargetSystem.java
index becc814b0..6d652acaf 100644
--- a/engine/src/main/java/org/terasology/input/cameraTarget/CameraTargetSystem.java
+++ b/engine/src/main/java/org/terasology/input/cameraTarget/CameraTargetSystem.java
@@ -1,38 +1,25 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.input.cameraTarget;
+package org.terasology.engine.input.cameraTarget;
import com.google.common.base.Objects;
import org.joml.RoundingMode;
import org.joml.Vector3f;
import org.joml.Vector3i;
-import org.terasology.config.Config;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.entitySystem.systems.BaseComponentSystem;
-import org.terasology.logic.players.LocalPlayer;
+import org.terasology.engine.config.Config;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.systems.BaseComponentSystem;
+import org.terasology.engine.logic.players.LocalPlayer;
import org.terasology.math.TeraMath;
-import org.terasology.physics.CollisionGroup;
-import org.terasology.physics.HitResult;
-import org.terasology.physics.Physics;
-import org.terasology.physics.StandardCollisionGroup;
-import org.terasology.registry.In;
-import org.terasology.rendering.world.WorldRenderer;
-import org.terasology.world.BlockEntityRegistry;
-import org.terasology.world.block.BlockComponent;
+import org.terasology.engine.physics.CollisionGroup;
+import org.terasology.engine.physics.HitResult;
+import org.terasology.engine.physics.Physics;
+import org.terasology.engine.physics.StandardCollisionGroup;
+import org.terasology.engine.registry.In;
+import org.terasology.engine.rendering.world.WorldRenderer;
+import org.terasology.engine.world.BlockEntityRegistry;
+import org.terasology.engine.world.block.BlockComponent;
import java.util.Arrays;
diff --git a/engine/src/main/java/org/terasology/input/cameraTarget/PlayerTargetSystem.java b/engine/src/main/java/org/terasology/input/cameraTarget/PlayerTargetSystem.java
index a2697c83d..97ea0d4dc 100644
--- a/engine/src/main/java/org/terasology/input/cameraTarget/PlayerTargetSystem.java
+++ b/engine/src/main/java/org/terasology/input/cameraTarget/PlayerTargetSystem.java
@@ -1,35 +1,22 @@
-/*
- * Copyright 2015 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.input.cameraTarget;
+package org.terasology.engine.input.cameraTarget;
import org.joml.Vector3f;
import org.joml.Vector3ic;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.entitySystem.systems.BaseComponentSystem;
-import org.terasology.entitySystem.systems.RegisterSystem;
-import org.terasology.entitySystem.systems.UpdateSubscriberSystem;
-import org.terasology.logic.characters.CharacterComponent;
-import org.terasology.logic.players.FirstPersonHeldItemMountPointComponent;
-import org.terasology.logic.players.LocalPlayer;
-import org.terasology.logic.players.PlayerTargetChangedEvent;
-import org.terasology.physics.Physics;
-import org.terasology.registry.In;
-import org.terasology.registry.Share;
-import org.terasology.world.BlockEntityRegistry;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.systems.BaseComponentSystem;
+import org.terasology.engine.entitySystem.systems.RegisterSystem;
+import org.terasology.engine.entitySystem.systems.UpdateSubscriberSystem;
+import org.terasology.engine.logic.characters.CharacterComponent;
+import org.terasology.engine.logic.players.FirstPersonHeldItemMountPointComponent;
+import org.terasology.engine.logic.players.LocalPlayer;
+import org.terasology.engine.logic.players.PlayerTargetChangedEvent;
+import org.terasology.engine.physics.Physics;
+import org.terasology.engine.registry.In;
+import org.terasology.engine.registry.Share;
+import org.terasology.engine.world.BlockEntityRegistry;
/**
* Tracks the targeted entity (within interaction range) of the local player.
diff --git a/engine/src/main/java/org/terasology/input/cameraTarget/TargetSystem.java b/engine/src/main/java/org/terasology/input/cameraTarget/TargetSystem.java
index 4cdb55db1..7b3706dcc 100644
--- a/engine/src/main/java/org/terasology/input/cameraTarget/TargetSystem.java
+++ b/engine/src/main/java/org/terasology/input/cameraTarget/TargetSystem.java
@@ -1,31 +1,18 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.input.cameraTarget;
+package org.terasology.engine.input.cameraTarget;
import org.joml.Vector3f;
import org.joml.Vector3i;
import org.joml.Vector3ic;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.logic.location.LocationComponent;
-import org.terasology.physics.CollisionGroup;
-import org.terasology.physics.HitResult;
-import org.terasology.physics.Physics;
-import org.terasology.physics.StandardCollisionGroup;
-import org.terasology.world.BlockEntityRegistry;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.logic.location.LocationComponent;
+import org.terasology.engine.physics.CollisionGroup;
+import org.terasology.engine.physics.HitResult;
+import org.terasology.engine.physics.Physics;
+import org.terasology.engine.physics.StandardCollisionGroup;
+import org.terasology.engine.world.BlockEntityRegistry;
import java.util.Arrays;
diff --git a/engine/src/main/java/org/terasology/input/cameraTarget/package-info.java b/engine/src/main/java/org/terasology/input/cameraTarget/package-info.java
index f98fa6ecf..3d1adefe5 100644
--- a/engine/src/main/java/org/terasology/input/cameraTarget/package-info.java
+++ b/engine/src/main/java/org/terasology/input/cameraTarget/package-info.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-@API package org.terasology.input.cameraTarget;
+@API package org.terasology.engine.input.cameraTarget;
import org.terasology.module.sandbox.API;
diff --git a/engine/src/main/java/org/terasology/input/events/AxisEvent.java b/engine/src/main/java/org/terasology/input/events/AxisEvent.java
index 8a0b66059..3caa8c461 100644
--- a/engine/src/main/java/org/terasology/input/events/AxisEvent.java
+++ b/engine/src/main/java/org/terasology/input/events/AxisEvent.java
@@ -1,20 +1,7 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.input.events;
+package org.terasology.engine.input.events;
/**
diff --git a/engine/src/main/java/org/terasology/input/events/ButtonEvent.java b/engine/src/main/java/org/terasology/input/events/ButtonEvent.java
index b0a092fd2..137f611b8 100644
--- a/engine/src/main/java/org/terasology/input/events/ButtonEvent.java
+++ b/engine/src/main/java/org/terasology/input/events/ButtonEvent.java
@@ -1,20 +1,7 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.input.events;
+package org.terasology.engine.input.events;
import org.terasology.input.ButtonState;
diff --git a/engine/src/main/java/org/terasology/input/events/CharEvent.java b/engine/src/main/java/org/terasology/input/events/CharEvent.java
index c2f85d8e1..a26f52298 100644
--- a/engine/src/main/java/org/terasology/input/events/CharEvent.java
+++ b/engine/src/main/java/org/terasology/input/events/CharEvent.java
@@ -1,7 +1,7 @@
-// Copyright 2020 The Terasology Foundation
+// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.input.events;
+package org.terasology.engine.input.events;
public final class CharEvent extends InputEvent {
diff --git a/engine/src/main/java/org/terasology/input/events/InputEvent.java b/engine/src/main/java/org/terasology/input/events/InputEvent.java
index 1387d7c30..6bdea4091 100644
--- a/engine/src/main/java/org/terasology/input/events/InputEvent.java
+++ b/engine/src/main/java/org/terasology/input/events/InputEvent.java
@@ -1,24 +1,11 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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 org.terasology.input.events;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.input.events;
import org.joml.Vector3fc;
import org.joml.Vector3ic;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.entitySystem.event.ConsumableEvent;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.event.ConsumableEvent;
public abstract class InputEvent implements ConsumableEvent {
diff --git a/engine/src/main/java/org/terasology/input/events/KeyDownEvent.java b/engine/src/main/java/org/terasology/input/events/KeyDownEvent.java
index f10278e83..103b6bcde 100644
--- a/engine/src/main/java/org/terasology/input/events/KeyDownEvent.java
+++ b/engine/src/main/java/org/terasology/input/events/KeyDownEvent.java
@@ -1,7 +1,7 @@
-// Copyright 2020 The Terasology Foundation
+// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.input.events;
+package org.terasology.engine.input.events;
import org.terasology.input.ButtonState;
import org.terasology.input.Input;
diff --git a/engine/src/main/java/org/terasology/input/events/KeyEvent.java b/engine/src/main/java/org/terasology/input/events/KeyEvent.java
index b4b8be48d..deb0d727d 100644
--- a/engine/src/main/java/org/terasology/input/events/KeyEvent.java
+++ b/engine/src/main/java/org/terasology/input/events/KeyEvent.java
@@ -1,7 +1,7 @@
-// Copyright 2020 The Terasology Foundation
+// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.input.events;
+package org.terasology.engine.input.events;
import org.terasology.input.ButtonState;
import org.terasology.input.Input;
diff --git a/engine/src/main/java/org/terasology/input/events/KeyRepeatEvent.java b/engine/src/main/java/org/terasology/input/events/KeyRepeatEvent.java
index 35ec521dc..ac95bed5d 100644
--- a/engine/src/main/java/org/terasology/input/events/KeyRepeatEvent.java
+++ b/engine/src/main/java/org/terasology/input/events/KeyRepeatEvent.java
@@ -1,7 +1,7 @@
-// Copyright 2020 The Terasology Foundation
+// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.input.events;
+package org.terasology.engine.input.events;
import org.terasology.input.ButtonState;
import org.terasology.input.Input;
diff --git a/engine/src/main/java/org/terasology/input/events/KeyUpEvent.java b/engine/src/main/java/org/terasology/input/events/KeyUpEvent.java
index 365d6c0d7..1095d38a6 100644
--- a/engine/src/main/java/org/terasology/input/events/KeyUpEvent.java
+++ b/engine/src/main/java/org/terasology/input/events/KeyUpEvent.java
@@ -1,7 +1,7 @@
-// Copyright 2020 The Terasology Foundation
+// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.input.events;
+package org.terasology.engine.input.events;
import org.terasology.input.ButtonState;
import org.terasology.input.Input;
diff --git a/engine/src/main/java/org/terasology/input/events/LeftMouseDownButtonEvent.java b/engine/src/main/java/org/terasology/input/events/LeftMouseDownButtonEvent.java
index 072fee3ab..6cb3403b0 100644
--- a/engine/src/main/java/org/terasology/input/events/LeftMouseDownButtonEvent.java
+++ b/engine/src/main/java/org/terasology/input/events/LeftMouseDownButtonEvent.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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 org.terasology.input.events;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.input.events;
import org.terasology.input.MouseInput;
diff --git a/engine/src/main/java/org/terasology/input/events/LeftMouseUpButtonEvent.java b/engine/src/main/java/org/terasology/input/events/LeftMouseUpButtonEvent.java
index 642378bcc..b88524620 100644
--- a/engine/src/main/java/org/terasology/input/events/LeftMouseUpButtonEvent.java
+++ b/engine/src/main/java/org/terasology/input/events/LeftMouseUpButtonEvent.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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 org.terasology.input.events;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.input.events;
import org.terasology.input.MouseInput;
diff --git a/engine/src/main/java/org/terasology/input/events/MouseAxisEvent.java b/engine/src/main/java/org/terasology/input/events/MouseAxisEvent.java
index cf1451eb0..4201b0cc4 100644
--- a/engine/src/main/java/org/terasology/input/events/MouseAxisEvent.java
+++ b/engine/src/main/java/org/terasology/input/events/MouseAxisEvent.java
@@ -1,20 +1,7 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.input.events;
+package org.terasology.engine.input.events;
/**
* Event when the mouse moved along one axis.
diff --git a/engine/src/main/java/org/terasology/input/events/MouseButtonEvent.java b/engine/src/main/java/org/terasology/input/events/MouseButtonEvent.java
index cd168ac25..5dda1a097 100644
--- a/engine/src/main/java/org/terasology/input/events/MouseButtonEvent.java
+++ b/engine/src/main/java/org/terasology/input/events/MouseButtonEvent.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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 org.terasology.input.events;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.input.events;
import org.terasology.input.ButtonState;
diff --git a/engine/src/main/java/org/terasology/input/events/MouseDownButtonEvent.java b/engine/src/main/java/org/terasology/input/events/MouseDownButtonEvent.java
index 5b38e08b7..c5428ce38 100644
--- a/engine/src/main/java/org/terasology/input/events/MouseDownButtonEvent.java
+++ b/engine/src/main/java/org/terasology/input/events/MouseDownButtonEvent.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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 org.terasology.input.events;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.input.events;
import org.terasology.input.ButtonState;
diff --git a/engine/src/main/java/org/terasology/input/events/MouseUpButtonEvent.java b/engine/src/main/java/org/terasology/input/events/MouseUpButtonEvent.java
index 0b317fe54..92754cdd0 100644
--- a/engine/src/main/java/org/terasology/input/events/MouseUpButtonEvent.java
+++ b/engine/src/main/java/org/terasology/input/events/MouseUpButtonEvent.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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 org.terasology.input.events;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.input.events;
import org.terasology.input.ButtonState;
diff --git a/engine/src/main/java/org/terasology/input/events/MouseWheelEvent.java b/engine/src/main/java/org/terasology/input/events/MouseWheelEvent.java
index cdfa88164..ef3665f0e 100644
--- a/engine/src/main/java/org/terasology/input/events/MouseWheelEvent.java
+++ b/engine/src/main/java/org/terasology/input/events/MouseWheelEvent.java
@@ -1,20 +1,7 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.input.events;
+package org.terasology.engine.input.events;
import org.joml.Vector2i;
diff --git a/engine/src/main/java/org/terasology/input/events/RightMouseDownButtonEvent.java b/engine/src/main/java/org/terasology/input/events/RightMouseDownButtonEvent.java
index b990a5d6b..50c3a7239 100644
--- a/engine/src/main/java/org/terasology/input/events/RightMouseDownButtonEvent.java
+++ b/engine/src/main/java/org/terasology/input/events/RightMouseDownButtonEvent.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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 org.terasology.input.events;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.input.events;
import org.terasology.input.MouseInput;
diff --git a/engine/src/main/java/org/terasology/input/events/RightMouseUpButtonEvent.java b/engine/src/main/java/org/terasology/input/events/RightMouseUpButtonEvent.java
index f7c344c73..04fb080c2 100644
--- a/engine/src/main/java/org/terasology/input/events/RightMouseUpButtonEvent.java
+++ b/engine/src/main/java/org/terasology/input/events/RightMouseUpButtonEvent.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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 org.terasology.input.events;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.input.events;
import org.terasology.input.MouseInput;
diff --git a/engine/src/main/java/org/terasology/input/events/package-info.java b/engine/src/main/java/org/terasology/input/events/package-info.java
index 1ddbc3dbd..babe5c285 100644
--- a/engine/src/main/java/org/terasology/input/events/package-info.java
+++ b/engine/src/main/java/org/terasology/input/events/package-info.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-@API package org.terasology.input.events;
+@API package org.terasology.engine.input.events;
import org.terasology.module.sandbox.API;
diff --git a/engine/src/main/java/org/terasology/input/internal/AbstractBindableAxis.java b/engine/src/main/java/org/terasology/input/internal/AbstractBindableAxis.java
index ed27ed396..5d07691f2 100644
--- a/engine/src/main/java/org/terasology/input/internal/AbstractBindableAxis.java
+++ b/engine/src/main/java/org/terasology/input/internal/AbstractBindableAxis.java
@@ -1,27 +1,14 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.input.internal;
+package org.terasology.engine.input.internal;
import com.google.common.collect.Lists;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.input.BindAxisEvent;
-import org.terasology.input.BindAxisSubscriber;
-import org.terasology.input.BindableAxis;
-import org.terasology.input.SendEventMode;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.input.BindAxisEvent;
+import org.terasology.engine.input.BindAxisSubscriber;
+import org.terasology.engine.input.BindableAxis;
+import org.terasology.engine.input.SendEventMode;
import org.joml.Vector3f;
import org.joml.Vector3i;
diff --git a/engine/src/main/java/org/terasology/input/internal/BindCommands.java b/engine/src/main/java/org/terasology/input/internal/BindCommands.java
index 3f2a6877d..eda08c08c 100644
--- a/engine/src/main/java/org/terasology/input/internal/BindCommands.java
+++ b/engine/src/main/java/org/terasology/input/internal/BindCommands.java
@@ -1,31 +1,18 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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 org.terasology.input.internal;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.input.internal;
-import org.terasology.engine.SimpleUri;
-import org.terasology.engine.subsystem.config.BindsManager;
-import org.terasology.entitySystem.systems.BaseComponentSystem;
-import org.terasology.entitySystem.systems.RegisterSystem;
+import org.terasology.engine.core.SimpleUri;
+import org.terasology.engine.core.subsystem.config.BindsManager;
+import org.terasology.engine.entitySystem.systems.BaseComponentSystem;
+import org.terasology.engine.entitySystem.systems.RegisterSystem;
import org.terasology.input.Input;
import org.terasology.input.Keyboard;
import org.terasology.input.Keyboard.KeyId;
-import org.terasology.logic.console.commandSystem.annotations.Command;
-import org.terasology.logic.console.commandSystem.annotations.CommandParam;
-import org.terasology.logic.permission.PermissionManager;
-import org.terasology.registry.In;
+import org.terasology.engine.logic.console.commandSystem.annotations.Command;
+import org.terasology.engine.logic.console.commandSystem.annotations.CommandParam;
+import org.terasology.engine.logic.permission.PermissionManager;
+import org.terasology.engine.registry.In;
import java.util.Collections;
import java.util.HashMap;
diff --git a/engine/src/main/java/org/terasology/input/internal/BindableAxisImpl.java b/engine/src/main/java/org/terasology/input/internal/BindableAxisImpl.java
index 047b95abe..7a152d046 100644
--- a/engine/src/main/java/org/terasology/input/internal/BindableAxisImpl.java
+++ b/engine/src/main/java/org/terasology/input/internal/BindableAxisImpl.java
@@ -1,23 +1,10 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.input.internal;
+package org.terasology.engine.input.internal;
-import org.terasology.input.BindAxisEvent;
-import org.terasology.input.BindableButton;
+import org.terasology.engine.input.BindAxisEvent;
+import org.terasology.engine.input.BindableButton;
import org.terasology.input.ButtonState;
/**
diff --git a/engine/src/main/java/org/terasology/input/internal/BindableButtonImpl.java b/engine/src/main/java/org/terasology/input/internal/BindableButtonImpl.java
index 6ceba35ab..8528259b1 100644
--- a/engine/src/main/java/org/terasology/input/internal/BindableButtonImpl.java
+++ b/engine/src/main/java/org/terasology/input/internal/BindableButtonImpl.java
@@ -1,30 +1,17 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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 org.terasology.input.internal;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.input.internal;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
import org.joml.Vector3fc;
import org.joml.Vector3ic;
-import org.terasology.engine.SimpleUri;
-import org.terasology.entitySystem.entity.EntityRef;
+import org.terasology.engine.core.SimpleUri;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.input.BindableButton;
import org.terasology.input.ActivateMode;
-import org.terasology.input.BindButtonEvent;
-import org.terasology.input.BindButtonSubscriber;
-import org.terasology.input.BindableButton;
+import org.terasology.engine.input.BindButtonEvent;
+import org.terasology.engine.input.BindButtonSubscriber;
import org.terasology.input.ButtonState;
import org.terasology.input.Input;
@@ -36,7 +23,7 @@ import java.util.Set;
* mouse wheel).
*
- * Needs to be sent against a client entity, e.g., the targeted entity should have a {@link org.terasology.network.ClientComponent}.
+ * Needs to be sent against a client entity, e.g., the targeted entity should have a {@link org.terasology.engine.network.ClientComponent}.
*/
@OwnerEvent
public class ChatMessageEvent implements MessageEvent {
@@ -39,8 +27,8 @@ public class ChatMessageEvent implements MessageEvent {
/**
* A chat message is associated with the entity that sent it.
*
- * This entity may often be a player, but it can be any entity with a {@link org.terasology.logic.common.DisplayNameComponent}.
- * If the entity also has a {@link org.terasology.network.ColorComponent}, the sender's name will be colorized.
+ * This entity may often be a player, but it can be any entity with a {@link DisplayNameComponent}.
+ * If the entity also has a {@link org.terasology.engine.network.ColorComponent}, the sender's name will be colorized.
*
* Note: The exact representation of sender and message is up to the processing system.
*
diff --git a/engine/src/main/java/org/terasology/logic/chat/ChatSystem.java b/engine/src/main/java/org/terasology/logic/chat/ChatSystem.java
index 2d96eef68..bd0420d17 100644
--- a/engine/src/main/java/org/terasology/logic/chat/ChatSystem.java
+++ b/engine/src/main/java/org/terasology/logic/chat/ChatSystem.java
@@ -1,46 +1,33 @@
-/*
- * Copyright 2017 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.logic.chat;
+package org.terasology.engine.logic.chat;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.terasology.assets.ResourceUrn;
-import org.terasology.entitySystem.entity.EntityManager;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.entitySystem.event.ReceiveEvent;
-import org.terasology.entitySystem.systems.BaseComponentSystem;
-import org.terasology.entitySystem.systems.RegisterSystem;
+import org.terasology.engine.entitySystem.entity.EntityManager;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.event.ReceiveEvent;
+import org.terasology.engine.entitySystem.systems.BaseComponentSystem;
+import org.terasology.engine.entitySystem.systems.RegisterSystem;
+import org.terasology.engine.logic.common.DisplayNameComponent;
+import org.terasology.engine.logic.console.ConsoleColors;
+import org.terasology.engine.logic.console.CoreMessageType;
+import org.terasology.engine.logic.console.Message;
+import org.terasology.engine.logic.console.MessageEvent;
+import org.terasology.engine.logic.console.commandSystem.annotations.Command;
+import org.terasology.engine.logic.console.commandSystem.annotations.CommandParam;
+import org.terasology.engine.logic.console.commandSystem.annotations.Sender;
+import org.terasology.engine.logic.console.suggesters.OnlineUsernameSuggester;
+import org.terasology.engine.logic.console.ui.NotificationOverlay;
import org.terasology.input.ButtonState;
-import org.terasology.input.binds.general.ChatButton;
-import org.terasology.logic.common.DisplayNameComponent;
-import org.terasology.logic.console.ConsoleColors;
-import org.terasology.logic.console.CoreMessageType;
-import org.terasology.logic.console.Message;
-import org.terasology.logic.console.MessageEvent;
-import org.terasology.logic.console.commandSystem.annotations.Command;
-import org.terasology.logic.console.commandSystem.annotations.CommandParam;
-import org.terasology.logic.console.commandSystem.annotations.Sender;
-import org.terasology.logic.console.suggesters.OnlineUsernameSuggester;
-import org.terasology.logic.console.ui.NotificationOverlay;
-import org.terasology.logic.permission.PermissionManager;
-import org.terasology.network.ClientComponent;
+import org.terasology.engine.input.binds.general.ChatButton;
+import org.terasology.engine.logic.permission.PermissionManager;
+import org.terasology.engine.network.ClientComponent;
import org.terasology.nui.FontColor;
-import org.terasology.registry.In;
-import org.terasology.rendering.nui.NUIManager;
+import org.terasology.engine.registry.In;
+import org.terasology.engine.rendering.nui.NUIManager;
import java.util.Arrays;
diff --git a/engine/src/main/java/org/terasology/logic/chat/package-info.java b/engine/src/main/java/org/terasology/logic/chat/package-info.java
index fd5f20a89..6895670aa 100644
--- a/engine/src/main/java/org/terasology/logic/chat/package-info.java
+++ b/engine/src/main/java/org/terasology/logic/chat/package-info.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-@API package org.terasology.logic.chat;
+@API package org.terasology.engine.logic.chat;
import org.terasology.module.sandbox.API;
diff --git a/engine/src/main/java/org/terasology/logic/clipboard/ClipboardClientSystem.java b/engine/src/main/java/org/terasology/logic/clipboard/ClipboardClientSystem.java
index 2038cdf7c..f31824a23 100644
--- a/engine/src/main/java/org/terasology/logic/clipboard/ClipboardClientSystem.java
+++ b/engine/src/main/java/org/terasology/logic/clipboard/ClipboardClientSystem.java
@@ -1,24 +1,11 @@
-/*
- * Copyright 2015 MovingBlocks
- *
- * 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 org.terasology.logic.clipboard;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.clipboard;
-import org.terasology.entitySystem.systems.BaseComponentSystem;
-import org.terasology.entitySystem.systems.RegisterMode;
-import org.terasology.entitySystem.systems.RegisterSystem;
-import org.terasology.registry.Share;
+import org.terasology.engine.entitySystem.systems.BaseComponentSystem;
+import org.terasology.engine.entitySystem.systems.RegisterMode;
+import org.terasology.engine.entitySystem.systems.RegisterSystem;
+import org.terasology.engine.registry.Share;
import java.awt.*;
import java.awt.datatransfer.Clipboard;
diff --git a/engine/src/main/java/org/terasology/logic/clipboard/ClipboardManager.java b/engine/src/main/java/org/terasology/logic/clipboard/ClipboardManager.java
index 7f2984634..43d85d95f 100644
--- a/engine/src/main/java/org/terasology/logic/clipboard/ClipboardManager.java
+++ b/engine/src/main/java/org/terasology/logic/clipboard/ClipboardManager.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2015 MovingBlocks
- *
- * 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 org.terasology.logic.clipboard;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.clipboard;
import org.terasology.module.sandbox.API;
diff --git a/engine/src/main/java/org/terasology/logic/common/ActivateEvent.java b/engine/src/main/java/org/terasology/logic/common/ActivateEvent.java
index 036f5b0ae..8aeb18b59 100644
--- a/engine/src/main/java/org/terasology/logic/common/ActivateEvent.java
+++ b/engine/src/main/java/org/terasology/logic/common/ActivateEvent.java
@@ -1,25 +1,12 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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 org.terasology.logic.common;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.common;
import org.joml.Vector3f;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.entitySystem.event.AbstractConsumableEvent;
-import org.terasology.logic.characters.events.ActivationRequest;
-import org.terasology.logic.location.LocationComponent;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.event.AbstractConsumableEvent;
+import org.terasology.engine.logic.location.LocationComponent;
+import org.terasology.engine.logic.characters.events.ActivationRequest;
/**
*/
diff --git a/engine/src/main/java/org/terasology/logic/common/DisplayNameComponent.java b/engine/src/main/java/org/terasology/logic/common/DisplayNameComponent.java
index fdb21dd7b..90d790e80 100644
--- a/engine/src/main/java/org/terasology/logic/common/DisplayNameComponent.java
+++ b/engine/src/main/java/org/terasology/logic/common/DisplayNameComponent.java
@@ -1,24 +1,11 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.logic.common;
+package org.terasology.engine.logic.common;
-import org.terasology.entitySystem.Component;
-import org.terasology.network.Replicate;
-import org.terasology.world.block.items.AddToBlockBasedItem;
+import org.terasology.engine.entitySystem.Component;
+import org.terasology.engine.network.Replicate;
+import org.terasology.engine.world.block.items.AddToBlockBasedItem;
/**
*/
diff --git a/engine/src/main/java/org/terasology/logic/common/InspectionToolComponent.java b/engine/src/main/java/org/terasology/logic/common/InspectionToolComponent.java
index c02003ba8..08afaca89 100644
--- a/engine/src/main/java/org/terasology/logic/common/InspectionToolComponent.java
+++ b/engine/src/main/java/org/terasology/logic/common/InspectionToolComponent.java
@@ -1,23 +1,10 @@
-/*
- * Copyright 2014 MovingBlocks
- *
- * 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 org.terasology.logic.common;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.common;
-import org.terasology.entitySystem.Component;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.network.Replicate;
+import org.terasology.engine.entitySystem.Component;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.network.Replicate;
/**
* Component of the inspection tool which can be used to view the json data of
diff --git a/engine/src/main/java/org/terasology/logic/common/RetainComponentsComponent.java b/engine/src/main/java/org/terasology/logic/common/RetainComponentsComponent.java
index e32f4b44a..3f051ce87 100644
--- a/engine/src/main/java/org/terasology/logic/common/RetainComponentsComponent.java
+++ b/engine/src/main/java/org/terasology/logic/common/RetainComponentsComponent.java
@@ -1,23 +1,10 @@
-/*
- * Copyright 2020 MovingBlocks
- *
- * 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 org.terasology.logic.common;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.common;
import com.google.common.collect.Sets;
-import org.terasology.entitySystem.Component;
-import org.terasology.network.Replicate;
+import org.terasology.engine.entitySystem.Component;
+import org.terasology.engine.network.Replicate;
import java.util.Set;
diff --git a/engine/src/main/java/org/terasology/logic/common/lifespan/LifespanComponent.java b/engine/src/main/java/org/terasology/logic/common/lifespan/LifespanComponent.java
index 81dd41d40..d01c04b6c 100644
--- a/engine/src/main/java/org/terasology/logic/common/lifespan/LifespanComponent.java
+++ b/engine/src/main/java/org/terasology/logic/common/lifespan/LifespanComponent.java
@@ -1,23 +1,10 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.logic.common.lifespan;
+package org.terasology.engine.logic.common.lifespan;
-import org.terasology.entitySystem.Component;
-import org.terasology.network.Replicate;
+import org.terasology.engine.entitySystem.Component;
+import org.terasology.engine.network.Replicate;
/**
* Component describes the lifespan of an entity. When the lifespan ends the entity is destroyed.
diff --git a/engine/src/main/java/org/terasology/logic/common/lifespan/LifespanSystem.java b/engine/src/main/java/org/terasology/logic/common/lifespan/LifespanSystem.java
index 3f57918aa..c3084f692 100644
--- a/engine/src/main/java/org/terasology/logic/common/lifespan/LifespanSystem.java
+++ b/engine/src/main/java/org/terasology/logic/common/lifespan/LifespanSystem.java
@@ -1,31 +1,18 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.logic.common.lifespan;
+package org.terasology.engine.logic.common.lifespan;
-import org.terasology.engine.Time;
-import org.terasology.entitySystem.entity.EntityManager;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.entitySystem.entity.lifecycleEvents.OnAddedComponent;
-import org.terasology.entitySystem.event.ReceiveEvent;
-import org.terasology.entitySystem.systems.BaseComponentSystem;
-import org.terasology.entitySystem.systems.RegisterMode;
-import org.terasology.entitySystem.systems.RegisterSystem;
-import org.terasology.entitySystem.systems.UpdateSubscriberSystem;
-import org.terasology.registry.In;
+import org.terasology.engine.core.Time;
+import org.terasology.engine.entitySystem.entity.EntityManager;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.entity.lifecycleEvents.OnAddedComponent;
+import org.terasology.engine.entitySystem.event.ReceiveEvent;
+import org.terasology.engine.entitySystem.systems.BaseComponentSystem;
+import org.terasology.engine.entitySystem.systems.RegisterMode;
+import org.terasology.engine.entitySystem.systems.RegisterSystem;
+import org.terasology.engine.entitySystem.systems.UpdateSubscriberSystem;
+import org.terasology.engine.registry.In;
/**
*/
diff --git a/engine/src/main/java/org/terasology/logic/common/lifespan/package-info.java b/engine/src/main/java/org/terasology/logic/common/lifespan/package-info.java
index 9b43fe5fa..2aec71cfc 100644
--- a/engine/src/main/java/org/terasology/logic/common/lifespan/package-info.java
+++ b/engine/src/main/java/org/terasology/logic/common/lifespan/package-info.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-@API package org.terasology.logic.common.lifespan;
+@API package org.terasology.engine.logic.common.lifespan;
import org.terasology.module.sandbox.API;
diff --git a/engine/src/main/java/org/terasology/logic/common/package-info.java b/engine/src/main/java/org/terasology/logic/common/package-info.java
index 7c5191f2b..634ce4552 100644
--- a/engine/src/main/java/org/terasology/logic/common/package-info.java
+++ b/engine/src/main/java/org/terasology/logic/common/package-info.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-@API package org.terasology.logic.common;
+@API package org.terasology.engine.logic.common;
import org.terasology.module.sandbox.API;
diff --git a/engine/src/main/java/org/terasology/logic/config/ModuleConfigComponent.java b/engine/src/main/java/org/terasology/logic/config/ModuleConfigComponent.java
index 861260205..ec9036c6a 100644
--- a/engine/src/main/java/org/terasology/logic/config/ModuleConfigComponent.java
+++ b/engine/src/main/java/org/terasology/logic/config/ModuleConfigComponent.java
@@ -1,21 +1,8 @@
-/*
- * Copyright 2015 MovingBlocks
- *
- * 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 org.terasology.logic.config;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.config;
-import org.terasology.entitySystem.Component;
+import org.terasology.engine.entitySystem.Component;
import java.util.Map;
diff --git a/engine/src/main/java/org/terasology/logic/config/ModuleConfigManager.java b/engine/src/main/java/org/terasology/logic/config/ModuleConfigManager.java
index aa70e6d1c..82298d51a 100644
--- a/engine/src/main/java/org/terasology/logic/config/ModuleConfigManager.java
+++ b/engine/src/main/java/org/terasology/logic/config/ModuleConfigManager.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2015 MovingBlocks
- *
- * 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 org.terasology.logic.config;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.config;
import org.terasology.module.sandbox.API;
diff --git a/engine/src/main/java/org/terasology/logic/config/ModuleConfigSystem.java b/engine/src/main/java/org/terasology/logic/config/ModuleConfigSystem.java
index 15bc476b9..fb5026e9d 100644
--- a/engine/src/main/java/org/terasology/logic/config/ModuleConfigSystem.java
+++ b/engine/src/main/java/org/terasology/logic/config/ModuleConfigSystem.java
@@ -1,28 +1,15 @@
-/*
- * Copyright 2015 MovingBlocks
- *
- * 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 org.terasology.logic.config;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.config;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.terasology.entitySystem.prefab.Prefab;
-import org.terasology.entitySystem.prefab.PrefabManager;
-import org.terasology.entitySystem.systems.BaseComponentSystem;
-import org.terasology.entitySystem.systems.RegisterSystem;
-import org.terasology.registry.In;
-import org.terasology.registry.Share;
+import org.terasology.engine.entitySystem.prefab.Prefab;
+import org.terasology.engine.entitySystem.prefab.PrefabManager;
+import org.terasology.engine.entitySystem.systems.BaseComponentSystem;
+import org.terasology.engine.entitySystem.systems.RegisterSystem;
+import org.terasology.engine.registry.In;
+import org.terasology.engine.registry.Share;
import java.util.HashMap;
import java.util.Map;
diff --git a/engine/src/main/java/org/terasology/logic/console/CommandEvent.java b/engine/src/main/java/org/terasology/logic/console/CommandEvent.java
index d1cac8128..5e8841a32 100644
--- a/engine/src/main/java/org/terasology/logic/console/CommandEvent.java
+++ b/engine/src/main/java/org/terasology/logic/console/CommandEvent.java
@@ -1,23 +1,10 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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 org.terasology.logic.console;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.console;
-import org.terasology.entitySystem.event.Event;
+import org.terasology.engine.entitySystem.event.Event;
import org.terasology.naming.Name;
-import org.terasology.network.ServerEvent;
+import org.terasology.engine.network.ServerEvent;
import java.util.List;
diff --git a/engine/src/main/java/org/terasology/logic/console/Console.java b/engine/src/main/java/org/terasology/logic/console/Console.java
index 9aaa608e4..da4c169e9 100644
--- a/engine/src/main/java/org/terasology/logic/console/Console.java
+++ b/engine/src/main/java/org/terasology/logic/console/Console.java
@@ -1,22 +1,9 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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 org.terasology.logic.console;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.console;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.logic.console.commandSystem.ConsoleCommand;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.logic.console.commandSystem.ConsoleCommand;
import org.terasology.naming.Name;
import java.util.Collection;
@@ -29,7 +16,7 @@ public interface Console {
String NEW_LINE = "\n";
/**
- * Registers a {@link org.terasology.logic.console.commandSystem.ConsoleCommand}.
+ * Registers a {@link ConsoleCommand}.
*
* @param command The command to be registered
*/
diff --git a/engine/src/main/java/org/terasology/logic/console/ConsoleColors.java b/engine/src/main/java/org/terasology/logic/console/ConsoleColors.java
index a7e75f82d..7c7dba971 100644
--- a/engine/src/main/java/org/terasology/logic/console/ConsoleColors.java
+++ b/engine/src/main/java/org/terasology/logic/console/ConsoleColors.java
@@ -1,20 +1,7 @@
-/*
- * Copyright 2014 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.logic.console;
+package org.terasology.engine.logic.console;
import org.terasology.nui.Color;
diff --git a/engine/src/main/java/org/terasology/logic/console/ConsoleImpl.java b/engine/src/main/java/org/terasology/logic/console/ConsoleImpl.java
index 4601dd352..f96a6a919 100644
--- a/engine/src/main/java/org/terasology/logic/console/ConsoleImpl.java
+++ b/engine/src/main/java/org/terasology/logic/console/ConsoleImpl.java
@@ -1,20 +1,7 @@
-/*
- * Copyright 2017 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.logic.console;
+package org.terasology.engine.logic.console;
import com.google.common.base.Preconditions;
import com.google.common.base.Strings;
@@ -25,17 +12,17 @@ import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.terasology.context.Context;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.logic.console.commandSystem.ConsoleCommand;
-import org.terasology.logic.console.commandSystem.exceptions.CommandExecutionException;
-import org.terasology.logic.permission.PermissionManager;
+import org.terasology.engine.context.Context;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.logic.console.commandSystem.ConsoleCommand;
+import org.terasology.engine.logic.console.commandSystem.exceptions.CommandExecutionException;
+import org.terasology.engine.logic.permission.PermissionManager;
import org.terasology.naming.Name;
-import org.terasology.network.ClientComponent;
-import org.terasology.network.NetworkSystem;
+import org.terasology.engine.network.ClientComponent;
+import org.terasology.engine.network.NetworkSystem;
import org.terasology.nui.FontColor;
import org.terasology.nui.FontUnderline;
-import org.terasology.utilities.collection.CircularBuffer;
+import org.terasology.engine.utilities.collection.CircularBuffer;
import java.util.Arrays;
import java.util.Collection;
@@ -67,7 +54,7 @@ public class ConsoleImpl implements Console {
}
/**
- * Registers a {@link org.terasology.logic.console.commandSystem.ConsoleCommand}.
+ * Registers a {@link ConsoleCommand}.
*
* @param command The command to be registered
*/
diff --git a/engine/src/main/java/org/terasology/logic/console/ConsoleMessageEvent.java b/engine/src/main/java/org/terasology/logic/console/ConsoleMessageEvent.java
index 5b6ed9e03..cb0506ee9 100644
--- a/engine/src/main/java/org/terasology/logic/console/ConsoleMessageEvent.java
+++ b/engine/src/main/java/org/terasology/logic/console/ConsoleMessageEvent.java
@@ -1,21 +1,8 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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 org.terasology.logic.console;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.console;
-import org.terasology.network.OwnerEvent;
+import org.terasology.engine.network.OwnerEvent;
/**
* Use to send console messages to a client
diff --git a/engine/src/main/java/org/terasology/logic/console/ConsoleSubscriber.java b/engine/src/main/java/org/terasology/logic/console/ConsoleSubscriber.java
index 5ccb14951..6e1a58b42 100644
--- a/engine/src/main/java/org/terasology/logic/console/ConsoleSubscriber.java
+++ b/engine/src/main/java/org/terasology/logic/console/ConsoleSubscriber.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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 org.terasology.logic.console;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.console;
/**
* Interface for subscribers to messages being added to the console
diff --git a/engine/src/main/java/org/terasology/logic/console/ConsoleSystem.java b/engine/src/main/java/org/terasology/logic/console/ConsoleSystem.java
index 2ad3aba7b..a11931535 100644
--- a/engine/src/main/java/org/terasology/logic/console/ConsoleSystem.java
+++ b/engine/src/main/java/org/terasology/logic/console/ConsoleSystem.java
@@ -1,33 +1,20 @@
-/*
- * Copyright 2016 MovingBlocks
- *
- * 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 org.terasology.logic.console;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.console;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.entitySystem.event.EventPriority;
-import org.terasology.entitySystem.event.ReceiveEvent;
-import org.terasology.entitySystem.systems.BaseComponentSystem;
-import org.terasology.entitySystem.systems.RegisterMode;
-import org.terasology.entitySystem.systems.RegisterSystem;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.event.EventPriority;
+import org.terasology.engine.entitySystem.event.ReceiveEvent;
+import org.terasology.engine.entitySystem.systems.BaseComponentSystem;
+import org.terasology.engine.entitySystem.systems.RegisterMode;
+import org.terasology.engine.entitySystem.systems.RegisterSystem;
+import org.terasology.engine.logic.console.commandSystem.ConsoleCommand;
+import org.terasology.engine.logic.console.ui.NotificationOverlay;
import org.terasology.input.ButtonState;
-import org.terasology.input.binds.general.ConsoleButton;
-import org.terasology.logic.console.commandSystem.ConsoleCommand;
-import org.terasology.logic.console.ui.NotificationOverlay;
-import org.terasology.network.ClientComponent;
-import org.terasology.registry.In;
-import org.terasology.rendering.nui.NUIManager;
+import org.terasology.engine.input.binds.general.ConsoleButton;
+import org.terasology.engine.network.ClientComponent;
+import org.terasology.engine.registry.In;
+import org.terasology.engine.rendering.nui.NUIManager;
@RegisterSystem
public class ConsoleSystem extends BaseComponentSystem {
diff --git a/engine/src/main/java/org/terasology/logic/console/CoreMessageType.java b/engine/src/main/java/org/terasology/logic/console/CoreMessageType.java
index 21f8edd7a..2e72e54e7 100644
--- a/engine/src/main/java/org/terasology/logic/console/CoreMessageType.java
+++ b/engine/src/main/java/org/terasology/logic/console/CoreMessageType.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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 org.terasology.logic.console;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.console;
import org.terasology.nui.Color;
diff --git a/engine/src/main/java/org/terasology/logic/console/ErrorMessageEvent.java b/engine/src/main/java/org/terasology/logic/console/ErrorMessageEvent.java
index 7d6375608..bb1f95731 100644
--- a/engine/src/main/java/org/terasology/logic/console/ErrorMessageEvent.java
+++ b/engine/src/main/java/org/terasology/logic/console/ErrorMessageEvent.java
@@ -1,21 +1,8 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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 org.terasology.logic.console;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.console;
-import org.terasology.network.OwnerEvent;
+import org.terasology.engine.network.OwnerEvent;
/**
* Use to send error messages to a client
diff --git a/engine/src/main/java/org/terasology/logic/console/Message.java b/engine/src/main/java/org/terasology/logic/console/Message.java
index 1e2b7af06..13cfa02a9 100644
--- a/engine/src/main/java/org/terasology/logic/console/Message.java
+++ b/engine/src/main/java/org/terasology/logic/console/Message.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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 org.terasology.logic.console;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.console;
/**
*/
diff --git a/engine/src/main/java/org/terasology/logic/console/MessageEvent.java b/engine/src/main/java/org/terasology/logic/console/MessageEvent.java
index abf0a75be..1bede4ceb 100644
--- a/engine/src/main/java/org/terasology/logic/console/MessageEvent.java
+++ b/engine/src/main/java/org/terasology/logic/console/MessageEvent.java
@@ -1,22 +1,9 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.logic.console;
+package org.terasology.engine.logic.console;
-import org.terasology.entitySystem.event.Event;
+import org.terasology.engine.entitySystem.event.Event;
@FunctionalInterface
public interface MessageEvent extends Event {
diff --git a/engine/src/main/java/org/terasology/logic/console/MessageType.java b/engine/src/main/java/org/terasology/logic/console/MessageType.java
index e6d1dc33d..236f276d9 100644
--- a/engine/src/main/java/org/terasology/logic/console/MessageType.java
+++ b/engine/src/main/java/org/terasology/logic/console/MessageType.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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 org.terasology.logic.console;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.console;
import org.terasology.nui.Color;
diff --git a/engine/src/main/java/org/terasology/logic/console/commandSystem/AbstractCommand.java b/engine/src/main/java/org/terasology/logic/console/commandSystem/AbstractCommand.java
index 4185c687c..bc0386924 100644
--- a/engine/src/main/java/org/terasology/logic/console/commandSystem/AbstractCommand.java
+++ b/engine/src/main/java/org/terasology/logic/console/commandSystem/AbstractCommand.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2014 MovingBlocks
- *
- * 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 org.terasology.logic.console.commandSystem;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.console.commandSystem;
import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableList;
@@ -21,15 +8,15 @@ import com.google.common.collect.Lists;
import com.google.common.collect.Queues;
import com.google.common.collect.Sets;
import com.google.common.primitives.Primitives;
-import org.terasology.context.Context;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.logic.console.commandSystem.exceptions.CommandExecutionException;
-import org.terasology.logic.console.commandSystem.exceptions.CommandInitializationException;
-import org.terasology.logic.console.commandSystem.exceptions.CommandParameterParseException;
-import org.terasology.logic.console.commandSystem.exceptions.CommandSuggestionException;
-import org.terasology.logic.permission.PermissionManager;
+import org.terasology.engine.context.Context;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.logic.console.commandSystem.exceptions.CommandExecutionException;
+import org.terasology.engine.logic.console.commandSystem.exceptions.CommandInitializationException;
+import org.terasology.engine.logic.console.commandSystem.exceptions.CommandParameterParseException;
+import org.terasology.engine.logic.console.commandSystem.exceptions.CommandSuggestionException;
+import org.terasology.engine.logic.permission.PermissionManager;
import org.terasology.naming.Name;
-import org.terasology.utilities.reflection.SpecificAccessibleObject;
+import org.terasology.engine.utilities.reflection.SpecificAccessibleObject;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
diff --git a/engine/src/main/java/org/terasology/logic/console/commandSystem/CommandParameter.java b/engine/src/main/java/org/terasology/logic/console/commandSystem/CommandParameter.java
index d0ff26882..3ce9d4366 100644
--- a/engine/src/main/java/org/terasology/logic/console/commandSystem/CommandParameter.java
+++ b/engine/src/main/java/org/terasology/logic/console/commandSystem/CommandParameter.java
@@ -1,28 +1,15 @@
-/*
- * Copyright 2014 MovingBlocks
- *
- * 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 org.terasology.logic.console.commandSystem;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.console.commandSystem;
import com.google.common.base.Preconditions;
import com.google.common.primitives.Primitives;
-import org.terasology.context.Context;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.logic.console.commandSystem.adapter.ParameterAdapterManager;
-import org.terasology.logic.console.commandSystem.exceptions.CommandParameterParseException;
-import org.terasology.logic.console.commandSystem.exceptions.SuggesterInstantiationException;
-import org.terasology.registry.InjectionHelper;
+import org.terasology.engine.context.Context;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.logic.console.commandSystem.adapter.ParameterAdapterManager;
+import org.terasology.engine.logic.console.commandSystem.exceptions.CommandParameterParseException;
+import org.terasology.engine.logic.console.commandSystem.exceptions.SuggesterInstantiationException;
+import org.terasology.engine.registry.InjectionHelper;
import java.lang.reflect.Array;
import java.util.Arrays;
diff --git a/engine/src/main/java/org/terasology/logic/console/commandSystem/CommandParameterSuggester.java b/engine/src/main/java/org/terasology/logic/console/commandSystem/CommandParameterSuggester.java
index 44337f0f3..ce5081722 100644
--- a/engine/src/main/java/org/terasology/logic/console/commandSystem/CommandParameterSuggester.java
+++ b/engine/src/main/java/org/terasology/logic/console/commandSystem/CommandParameterSuggester.java
@@ -1,21 +1,8 @@
-/*
- * Copyright 2014 MovingBlocks
- *
- * 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 org.terasology.logic.console.commandSystem;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.console.commandSystem;
-import org.terasology.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.entity.EntityRef;
import org.terasology.module.sandbox.API;
import java.util.Set;
@@ -23,7 +10,7 @@ import java.util.Set;
/**
* A class used for suggesting command parameter values
*
- * Constructor arguments will be filled from the {@link org.terasology.context.Context} via dependency injection.
+ * Constructor arguments will be filled from the {@link org.terasology.engine.context.Context} via dependency injection.
*/
@API
@FunctionalInterface
diff --git a/engine/src/main/java/org/terasology/logic/console/commandSystem/ConsoleCommand.java b/engine/src/main/java/org/terasology/logic/console/commandSystem/ConsoleCommand.java
index f1d015b95..64c9b59d1 100644
--- a/engine/src/main/java/org/terasology/logic/console/commandSystem/ConsoleCommand.java
+++ b/engine/src/main/java/org/terasology/logic/console/commandSystem/ConsoleCommand.java
@@ -1,24 +1,12 @@
-/*
- * Copyright 2016 MovingBlocks
- *
- * 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 org.terasology.logic.console.commandSystem;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.console.commandSystem;
import com.google.common.collect.ImmutableList;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.logic.console.commandSystem.exceptions.CommandExecutionException;
-import org.terasology.logic.console.commandSystem.exceptions.CommandSuggestionException;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.logic.console.Console;
+import org.terasology.engine.logic.console.commandSystem.exceptions.CommandExecutionException;
+import org.terasology.engine.logic.console.commandSystem.exceptions.CommandSuggestionException;
import org.terasology.module.sandbox.API;
import org.terasology.naming.Name;
@@ -27,7 +15,7 @@ import java.util.List;
import java.util.Set;
/**
- * Interface of commands used in a {@link org.terasology.logic.console.Console}.
+ * Interface of commands used in a {@link Console}.
*/
@API
public interface ConsoleCommand extends Comparable
* The method has been made for the usage on the client. It triggers a {@link ActivationPredicted} event on the
* client and a {@link ActivationRequest} event on the server which will lead to a {@link
- * org.terasology.logic.common.ActivateEvent} on the server.
+ * ActivateEvent} on the server.
*
* @param usedOwnedEntity an entity owned by the player like an item.
*/
diff --git a/engine/src/main/java/org/terasology/logic/players/LocalPlayerSystem.java b/engine/src/main/java/org/terasology/logic/players/LocalPlayerSystem.java
index 4ce8dca5c..321aa406e 100644
--- a/engine/src/main/java/org/terasology/logic/players/LocalPlayerSystem.java
+++ b/engine/src/main/java/org/terasology/logic/players/LocalPlayerSystem.java
@@ -1,70 +1,70 @@
// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.logic.players;
+package org.terasology.engine.logic.players;
import org.joml.Math;
import org.joml.Matrix4f;
import org.joml.Quaternionf;
import org.joml.Vector3f;
import org.terasology.assets.ResourceUrn;
-import org.terasology.config.Config;
-import org.terasology.engine.SimpleUri;
-import org.terasology.engine.Time;
-import org.terasology.engine.subsystem.config.BindsManager;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.entitySystem.event.EventPriority;
-import org.terasology.entitySystem.event.ReceiveEvent;
-import org.terasology.entitySystem.systems.BaseComponentSystem;
-import org.terasology.entitySystem.systems.RenderSystem;
-import org.terasology.entitySystem.systems.UpdateSubscriberSystem;
+import org.terasology.engine.config.Config;
+import org.terasology.engine.core.SimpleUri;
+import org.terasology.engine.core.Time;
+import org.terasology.engine.core.subsystem.config.BindsManager;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.event.EventPriority;
+import org.terasology.engine.entitySystem.event.ReceiveEvent;
+import org.terasology.engine.entitySystem.systems.BaseComponentSystem;
+import org.terasology.engine.entitySystem.systems.RenderSystem;
+import org.terasology.engine.entitySystem.systems.UpdateSubscriberSystem;
+import org.terasology.engine.logic.characters.CharacterComponent;
+import org.terasology.engine.logic.characters.CharacterMoveInputEvent;
+import org.terasology.engine.logic.characters.CharacterMovementComponent;
+import org.terasology.engine.logic.characters.MovementMode;
+import org.terasology.engine.logic.location.LocationComponent;
+import org.terasology.engine.logic.players.event.LocalPlayerInitializedEvent;
+import org.terasology.engine.logic.players.event.OnPlayerSpawnedEvent;
import org.terasology.input.ButtonState;
import org.terasology.input.Input;
-import org.terasology.input.InputSystem;
-import org.terasology.input.binds.interaction.FrobButton;
-import org.terasology.input.binds.inventory.UseItemButton;
-import org.terasology.input.binds.movement.AutoMoveButton;
-import org.terasology.input.binds.movement.CrouchButton;
-import org.terasology.input.binds.movement.CrouchModeButton;
-import org.terasology.input.binds.movement.ForwardsMovementAxis;
-import org.terasology.input.binds.movement.ForwardsRealMovementAxis;
-import org.terasology.input.binds.movement.JumpButton;
-import org.terasology.input.binds.movement.RotationPitchAxis;
-import org.terasology.input.binds.movement.RotationYawAxis;
-import org.terasology.input.binds.movement.StrafeMovementAxis;
-import org.terasology.input.binds.movement.StrafeRealMovementAxis;
-import org.terasology.input.binds.movement.ToggleSpeedPermanentlyButton;
-import org.terasology.input.binds.movement.ToggleSpeedTemporarilyButton;
-import org.terasology.input.binds.movement.VerticalMovementAxis;
-import org.terasology.input.binds.movement.VerticalRealMovementAxis;
-import org.terasology.input.events.MouseAxisEvent;
-import org.terasology.input.events.MouseAxisEvent.MouseAxis;
+import org.terasology.engine.input.InputSystem;
+import org.terasology.engine.input.binds.interaction.FrobButton;
+import org.terasology.engine.input.binds.inventory.UseItemButton;
+import org.terasology.engine.input.binds.movement.AutoMoveButton;
+import org.terasology.engine.input.binds.movement.CrouchButton;
+import org.terasology.engine.input.binds.movement.CrouchModeButton;
+import org.terasology.engine.input.binds.movement.ForwardsMovementAxis;
+import org.terasology.engine.input.binds.movement.ForwardsRealMovementAxis;
+import org.terasology.engine.input.binds.movement.JumpButton;
+import org.terasology.engine.input.binds.movement.RotationPitchAxis;
+import org.terasology.engine.input.binds.movement.RotationYawAxis;
+import org.terasology.engine.input.binds.movement.StrafeMovementAxis;
+import org.terasology.engine.input.binds.movement.StrafeRealMovementAxis;
+import org.terasology.engine.input.binds.movement.ToggleSpeedPermanentlyButton;
+import org.terasology.engine.input.binds.movement.ToggleSpeedTemporarilyButton;
+import org.terasology.engine.input.binds.movement.VerticalMovementAxis;
+import org.terasology.engine.input.binds.movement.VerticalRealMovementAxis;
+import org.terasology.engine.input.events.MouseAxisEvent;
+import org.terasology.engine.input.events.MouseAxisEvent.MouseAxis;
import org.terasology.joml.geom.AABBf;
-import org.terasology.logic.characters.CharacterComponent;
-import org.terasology.logic.characters.CharacterHeldItemComponent;
-import org.terasology.logic.characters.CharacterMoveInputEvent;
-import org.terasology.logic.characters.CharacterMovementComponent;
-import org.terasology.logic.characters.MovementMode;
-import org.terasology.logic.characters.events.OnItemUseEvent;
-import org.terasology.logic.characters.events.ScaleToRequest;
-import org.terasology.logic.characters.interactions.InteractionUtil;
-import org.terasology.logic.delay.DelayManager;
-import org.terasology.logic.location.LocationComponent;
-import org.terasology.logic.players.event.LocalPlayerInitializedEvent;
-import org.terasology.logic.players.event.OnPlayerSpawnedEvent;
-import org.terasology.network.ClientComponent;
-import org.terasology.network.NetworkMode;
-import org.terasology.network.NetworkSystem;
-import org.terasology.physics.engine.PhysicsEngine;
-import org.terasology.registry.In;
-import org.terasology.rendering.AABBRenderer;
-import org.terasology.rendering.BlockOverlayRenderer;
-import org.terasology.rendering.cameras.Camera;
-import org.terasology.rendering.cameras.PerspectiveCamera;
-import org.terasology.rendering.logic.MeshComponent;
-import org.terasology.world.WorldProvider;
-import org.terasology.world.block.Block;
-import org.terasology.world.block.BlockComponent;
-import org.terasology.world.block.regions.BlockRegionComponent;
+import org.terasology.engine.logic.characters.CharacterHeldItemComponent;
+import org.terasology.engine.logic.characters.events.OnItemUseEvent;
+import org.terasology.engine.logic.characters.events.ScaleToRequest;
+import org.terasology.engine.logic.characters.interactions.InteractionUtil;
+import org.terasology.engine.logic.delay.DelayManager;
+import org.terasology.engine.network.ClientComponent;
+import org.terasology.engine.network.NetworkMode;
+import org.terasology.engine.network.NetworkSystem;
+import org.terasology.engine.physics.engine.PhysicsEngine;
+import org.terasology.engine.registry.In;
+import org.terasology.engine.rendering.AABBRenderer;
+import org.terasology.engine.rendering.BlockOverlayRenderer;
+import org.terasology.engine.rendering.cameras.Camera;
+import org.terasology.engine.rendering.cameras.PerspectiveCamera;
+import org.terasology.engine.rendering.logic.MeshComponent;
+import org.terasology.engine.world.WorldProvider;
+import org.terasology.engine.world.block.Block;
+import org.terasology.engine.world.block.BlockComponent;
+import org.terasology.engine.world.block.regions.BlockRegionComponent;
import java.util.List;
diff --git a/engine/src/main/java/org/terasology/logic/players/MenuControlSystem.java b/engine/src/main/java/org/terasology/logic/players/MenuControlSystem.java
index bd13f0087..61214ab7a 100644
--- a/engine/src/main/java/org/terasology/logic/players/MenuControlSystem.java
+++ b/engine/src/main/java/org/terasology/logic/players/MenuControlSystem.java
@@ -1,31 +1,31 @@
// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.logic.players;
+package org.terasology.engine.logic.players;
-import org.terasology.audio.AudioManager;
-import org.terasology.engine.Time;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.entitySystem.event.ReceiveEvent;
-import org.terasology.entitySystem.systems.BaseComponentSystem;
-import org.terasology.entitySystem.systems.RegisterMode;
-import org.terasology.entitySystem.systems.RegisterSystem;
+import org.terasology.engine.audio.AudioManager;
+import org.terasology.engine.core.Time;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.event.ReceiveEvent;
+import org.terasology.engine.entitySystem.systems.BaseComponentSystem;
+import org.terasology.engine.entitySystem.systems.RegisterMode;
+import org.terasology.engine.entitySystem.systems.RegisterSystem;
+import org.terasology.engine.logic.characters.CharacterComponent;
import org.terasology.input.ButtonState;
-import org.terasology.input.binds.general.OnlinePlayersButton;
-import org.terasology.input.binds.general.PauseButton;
-import org.terasology.input.binds.general.ScreenshotButton;
-import org.terasology.logic.characters.CharacterComponent;
-import org.terasology.logic.characters.events.PlayerDeathEvent;
-import org.terasology.network.ClientComponent;
-import org.terasology.network.NetworkMode;
-import org.terasology.network.NetworkSystem;
-import org.terasology.registry.CoreRegistry;
-import org.terasology.registry.In;
-import org.terasology.rendering.nui.NUIManager;
-import org.terasology.rendering.nui.layers.ingame.DeathScreen;
-import org.terasology.rendering.nui.layers.ingame.OnlinePlayersOverlay;
-import org.terasology.rendering.opengl.ScreenGrabber;
-import org.terasology.utilities.Assets;
+import org.terasology.engine.input.binds.general.OnlinePlayersButton;
+import org.terasology.engine.input.binds.general.PauseButton;
+import org.terasology.engine.input.binds.general.ScreenshotButton;
+import org.terasology.engine.logic.characters.events.PlayerDeathEvent;
+import org.terasology.engine.network.ClientComponent;
+import org.terasology.engine.network.NetworkMode;
+import org.terasology.engine.network.NetworkSystem;
+import org.terasology.engine.registry.CoreRegistry;
+import org.terasology.engine.registry.In;
+import org.terasology.engine.rendering.nui.NUIManager;
+import org.terasology.engine.rendering.nui.layers.ingame.DeathScreen;
+import org.terasology.engine.rendering.nui.layers.ingame.OnlinePlayersOverlay;
+import org.terasology.engine.rendering.opengl.ScreenGrabber;
+import org.terasology.engine.utilities.Assets;
/**
diff --git a/engine/src/main/java/org/terasology/logic/players/PlayerCharacterComponent.java b/engine/src/main/java/org/terasology/logic/players/PlayerCharacterComponent.java
index 09ed91706..f207a7d14 100644
--- a/engine/src/main/java/org/terasology/logic/players/PlayerCharacterComponent.java
+++ b/engine/src/main/java/org/terasology/logic/players/PlayerCharacterComponent.java
@@ -1,21 +1,8 @@
-/*
- * Copyright 2017 MovingBlocks
- *
- * 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 org.terasology.logic.players;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.players;
-import org.terasology.entitySystem.Component;
+import org.terasology.engine.entitySystem.Component;
/**
* This is only attached to the player entities.
- * The {@link org.terasology.registry.In} annotation can be used to access objects
- * in the parent {@link org.terasology.context.Context}.
+ * The {@link org.terasology.engine.registry.In} annotation can be used to access objects
+ * in the parent {@link org.terasology.engine.context.Context}.
*/
@API
@Retention(RetentionPolicy.RUNTIME)
diff --git a/engine/src/main/java/org/terasology/persistence/typeHandling/TypeHandlerLibraryImpl.java b/engine/src/main/java/org/terasology/persistence/typeHandling/TypeHandlerLibraryImpl.java
index 904d3a19d..dd2fcd1a2 100644
--- a/engine/src/main/java/org/terasology/persistence/typeHandling/TypeHandlerLibraryImpl.java
+++ b/engine/src/main/java/org/terasology/persistence/typeHandling/TypeHandlerLibraryImpl.java
@@ -1,7 +1,7 @@
// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.persistence.typeHandling;
+package org.terasology.engine.persistence.typeHandling;
import org.joml.Quaternionf;
import org.joml.Quaternionfc;
@@ -12,55 +12,56 @@ import org.joml.Vector3ic;
import org.joml.Vector4fc;
import org.joml.Vector4ic;
import org.reflections.Reflections;
-import org.terasology.engine.module.ModuleManager;
-import org.terasology.entitySystem.prefab.Prefab;
+import org.terasology.engine.core.module.ModuleManager;
+import org.terasology.engine.entitySystem.prefab.Prefab;
+import org.terasology.engine.math.IntegerRange;
+import org.terasology.engine.persistence.typeHandling.extensionTypes.ColorTypeHandler;
+import org.terasology.engine.persistence.typeHandling.extensionTypes.ColorcTypeHandler;
+import org.terasology.engine.persistence.typeHandling.extensionTypes.NameTypeHandler;
+import org.terasology.engine.persistence.typeHandling.extensionTypes.PrefabTypeHandler;
+import org.terasology.engine.persistence.typeHandling.extensionTypes.TextureRegionTypeHandler;
+import org.terasology.engine.persistence.typeHandling.extensionTypes.UITextureRegionTypeHandler;
+import org.terasology.engine.persistence.typeHandling.extensionTypes.factories.AssetTypeHandlerFactory;
+import org.terasology.engine.persistence.typeHandling.extensionTypes.factories.ComponentClassTypeHandlerFactory;
+import org.terasology.engine.persistence.typeHandling.extensionTypes.factories.TextureRegionAssetTypeHandlerFactory;
+import org.terasology.engine.persistence.typeHandling.mathTypes.AABBfTypeHandler;
+import org.terasology.engine.persistence.typeHandling.mathTypes.AABBiTypeHandler;
+import org.terasology.engine.persistence.typeHandling.mathTypes.BlockAreaTypeHandler;
+import org.terasology.engine.persistence.typeHandling.mathTypes.BlockAreacTypeHandler;
+import org.terasology.engine.persistence.typeHandling.mathTypes.BlockRegionTypeHandler;
+import org.terasology.engine.persistence.typeHandling.mathTypes.IntegerRangeHandler;
+import org.terasology.engine.persistence.typeHandling.mathTypes.QuaternionfTypeHandler;
+import org.terasology.engine.persistence.typeHandling.mathTypes.QuaternionfcTypeHandler;
+import org.terasology.engine.persistence.typeHandling.mathTypes.RectanglefTypeHandler;
+import org.terasology.engine.persistence.typeHandling.mathTypes.RectangleiTypeHandler;
+import org.terasology.engine.persistence.typeHandling.mathTypes.Vector2fTypeHandler;
+import org.terasology.engine.persistence.typeHandling.mathTypes.Vector2fcTypeHandler;
+import org.terasology.engine.persistence.typeHandling.mathTypes.Vector2iTypeHandler;
+import org.terasology.engine.persistence.typeHandling.mathTypes.Vector2icTypeHandler;
+import org.terasology.engine.persistence.typeHandling.mathTypes.Vector3fTypeHandler;
+import org.terasology.engine.persistence.typeHandling.mathTypes.Vector3fcTypeHandler;
+import org.terasology.engine.persistence.typeHandling.mathTypes.Vector3iTypeHandler;
+import org.terasology.engine.persistence.typeHandling.mathTypes.Vector3icTypeHandler;
+import org.terasology.engine.persistence.typeHandling.mathTypes.Vector4fTypeHandler;
+import org.terasology.engine.persistence.typeHandling.mathTypes.Vector4fcTypeHandler;
+import org.terasology.engine.persistence.typeHandling.mathTypes.Vector4iTypeHandler;
+import org.terasology.engine.persistence.typeHandling.mathTypes.Vector4icTypeHandler;
+import org.terasology.engine.persistence.typeHandling.reflection.ModuleEnvironmentSandbox;
+import org.terasology.engine.rendering.assets.texture.TextureRegion;
+import org.terasology.engine.world.block.BlockArea;
+import org.terasology.engine.world.block.BlockAreac;
+import org.terasology.engine.world.block.BlockRegion;
import org.terasology.joml.geom.AABBf;
import org.terasology.joml.geom.AABBi;
import org.terasology.joml.geom.Rectanglef;
import org.terasology.joml.geom.Rectanglei;
-import org.terasology.math.IntegerRange;
import org.terasology.naming.Name;
import org.terasology.nui.Color;
import org.terasology.nui.Colorc;
import org.terasology.nui.UITextureRegion;
-import org.terasology.persistence.typeHandling.extensionTypes.ColorTypeHandler;
-import org.terasology.persistence.typeHandling.extensionTypes.ColorcTypeHandler;
-import org.terasology.persistence.typeHandling.extensionTypes.NameTypeHandler;
-import org.terasology.persistence.typeHandling.extensionTypes.PrefabTypeHandler;
-import org.terasology.persistence.typeHandling.extensionTypes.TextureRegionTypeHandler;
-import org.terasology.persistence.typeHandling.extensionTypes.UITextureRegionTypeHandler;
-import org.terasology.persistence.typeHandling.extensionTypes.factories.AssetTypeHandlerFactory;
-import org.terasology.persistence.typeHandling.extensionTypes.factories.ComponentClassTypeHandlerFactory;
-import org.terasology.persistence.typeHandling.extensionTypes.factories.TextureRegionAssetTypeHandlerFactory;
-import org.terasology.persistence.typeHandling.mathTypes.AABBfTypeHandler;
-import org.terasology.persistence.typeHandling.mathTypes.AABBiTypeHandler;
-import org.terasology.persistence.typeHandling.mathTypes.BlockAreaTypeHandler;
-import org.terasology.persistence.typeHandling.mathTypes.BlockAreacTypeHandler;
-import org.terasology.persistence.typeHandling.mathTypes.BlockRegionTypeHandler;
-import org.terasology.persistence.typeHandling.mathTypes.IntegerRangeHandler;
-import org.terasology.persistence.typeHandling.mathTypes.QuaternionfTypeHandler;
-import org.terasology.persistence.typeHandling.mathTypes.QuaternionfcTypeHandler;
-import org.terasology.persistence.typeHandling.mathTypes.RectanglefTypeHandler;
-import org.terasology.persistence.typeHandling.mathTypes.RectangleiTypeHandler;
-import org.terasology.persistence.typeHandling.mathTypes.Vector2fTypeHandler;
-import org.terasology.persistence.typeHandling.mathTypes.Vector2fcTypeHandler;
-import org.terasology.persistence.typeHandling.mathTypes.Vector2iTypeHandler;
-import org.terasology.persistence.typeHandling.mathTypes.Vector2icTypeHandler;
-import org.terasology.persistence.typeHandling.mathTypes.Vector3fTypeHandler;
-import org.terasology.persistence.typeHandling.mathTypes.Vector3fcTypeHandler;
-import org.terasology.persistence.typeHandling.mathTypes.Vector3iTypeHandler;
-import org.terasology.persistence.typeHandling.mathTypes.Vector3icTypeHandler;
-import org.terasology.persistence.typeHandling.mathTypes.Vector4fTypeHandler;
-import org.terasology.persistence.typeHandling.mathTypes.Vector4fcTypeHandler;
-import org.terasology.persistence.typeHandling.mathTypes.Vector4iTypeHandler;
-import org.terasology.persistence.typeHandling.mathTypes.Vector4icTypeHandler;
-import org.terasology.persistence.typeHandling.reflection.ModuleEnvironmentSandbox;
+import org.terasology.persistence.typeHandling.TypeHandlerLibrary;
import org.terasology.persistence.typeHandling.reflection.SerializationSandbox;
import org.terasology.reflection.TypeRegistry;
-import org.terasology.rendering.assets.texture.TextureRegion;
-import org.terasology.world.block.BlockArea;
-import org.terasology.world.block.BlockAreac;
-import org.terasology.world.block.BlockRegion;
/**
* A library of type handlers. This is used for the construction of class metadata. This library should be initialised
diff --git a/engine/src/main/java/org/terasology/persistence/typeHandling/extensionTypes/AssetTypeHandler.java b/engine/src/main/java/org/terasology/persistence/typeHandling/extensionTypes/AssetTypeHandler.java
index 32a6ac092..2884cadbd 100644
--- a/engine/src/main/java/org/terasology/persistence/typeHandling/extensionTypes/AssetTypeHandler.java
+++ b/engine/src/main/java/org/terasology/persistence/typeHandling/extensionTypes/AssetTypeHandler.java
@@ -1,24 +1,11 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.persistence.typeHandling.extensionTypes;
+package org.terasology.engine.persistence.typeHandling.extensionTypes;
import com.google.common.base.Strings;
-import org.terasology.utilities.Assets;
import org.terasology.assets.Asset;
+import org.terasology.engine.utilities.Assets;
import org.terasology.persistence.typeHandling.StringRepresentationTypeHandler;
import java.util.Optional;
diff --git a/engine/src/main/java/org/terasology/persistence/typeHandling/extensionTypes/BlockFamilyTypeHandler.java b/engine/src/main/java/org/terasology/persistence/typeHandling/extensionTypes/BlockFamilyTypeHandler.java
index 115e516cf..45951c57c 100644
--- a/engine/src/main/java/org/terasology/persistence/typeHandling/extensionTypes/BlockFamilyTypeHandler.java
+++ b/engine/src/main/java/org/terasology/persistence/typeHandling/extensionTypes/BlockFamilyTypeHandler.java
@@ -1,23 +1,10 @@
-/*
- * Copyright 2018 MovingBlocks
- *
- * 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 org.terasology.persistence.typeHandling.extensionTypes;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.persistence.typeHandling.extensionTypes;
+import org.terasology.engine.world.block.BlockManager;
+import org.terasology.engine.world.block.family.BlockFamily;
import org.terasology.persistence.typeHandling.StringRepresentationTypeHandler;
-import org.terasology.world.block.BlockManager;
-import org.terasology.world.block.family.BlockFamily;
/**
* Return the block family based on the registered string id.
diff --git a/engine/src/main/java/org/terasology/persistence/typeHandling/extensionTypes/BlockTypeHandler.java b/engine/src/main/java/org/terasology/persistence/typeHandling/extensionTypes/BlockTypeHandler.java
index 7ed890637..23a63d7b2 100644
--- a/engine/src/main/java/org/terasology/persistence/typeHandling/extensionTypes/BlockTypeHandler.java
+++ b/engine/src/main/java/org/terasology/persistence/typeHandling/extensionTypes/BlockTypeHandler.java
@@ -1,23 +1,10 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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 org.terasology.persistence.typeHandling.extensionTypes;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.persistence.typeHandling.extensionTypes;
+import org.terasology.engine.world.block.Block;
+import org.terasology.engine.world.block.BlockManager;
import org.terasology.persistence.typeHandling.StringRepresentationTypeHandler;
-import org.terasology.world.block.Block;
-import org.terasology.world.block.BlockManager;
/**
*/
diff --git a/engine/src/main/java/org/terasology/persistence/typeHandling/extensionTypes/CollisionGroupTypeHandler.java b/engine/src/main/java/org/terasology/persistence/typeHandling/extensionTypes/CollisionGroupTypeHandler.java
index 534a5243c..3ba39d834 100644
--- a/engine/src/main/java/org/terasology/persistence/typeHandling/extensionTypes/CollisionGroupTypeHandler.java
+++ b/engine/src/main/java/org/terasology/persistence/typeHandling/extensionTypes/CollisionGroupTypeHandler.java
@@ -1,24 +1,11 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.persistence.typeHandling.extensionTypes;
+package org.terasology.engine.persistence.typeHandling.extensionTypes;
+import org.terasology.engine.physics.CollisionGroup;
+import org.terasology.engine.physics.CollisionGroupManager;
import org.terasology.persistence.typeHandling.StringRepresentationTypeHandler;
-import org.terasology.physics.CollisionGroup;
-import org.terasology.physics.CollisionGroupManager;
/**
*/
diff --git a/engine/src/main/java/org/terasology/persistence/typeHandling/extensionTypes/ColorTypeHandler.java b/engine/src/main/java/org/terasology/persistence/typeHandling/extensionTypes/ColorTypeHandler.java
index c7d32b643..dc217ab1e 100644
--- a/engine/src/main/java/org/terasology/persistence/typeHandling/extensionTypes/ColorTypeHandler.java
+++ b/engine/src/main/java/org/terasology/persistence/typeHandling/extensionTypes/ColorTypeHandler.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2014 MovingBlocks
- *
- * 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 org.terasology.persistence.typeHandling.extensionTypes;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.persistence.typeHandling.extensionTypes;
import gnu.trove.list.TIntList;
import org.terasology.nui.Color;
diff --git a/engine/src/main/java/org/terasology/persistence/typeHandling/extensionTypes/ColorcTypeHandler.java b/engine/src/main/java/org/terasology/persistence/typeHandling/extensionTypes/ColorcTypeHandler.java
index 90dfc6ca6..d8533cd84 100644
--- a/engine/src/main/java/org/terasology/persistence/typeHandling/extensionTypes/ColorcTypeHandler.java
+++ b/engine/src/main/java/org/terasology/persistence/typeHandling/extensionTypes/ColorcTypeHandler.java
@@ -1,7 +1,7 @@
-// Copyright 2020 The Terasology Foundation
+// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.persistence.typeHandling.extensionTypes;
+package org.terasology.engine.persistence.typeHandling.extensionTypes;
import gnu.trove.list.TIntList;
import org.terasology.nui.Color;
diff --git a/engine/src/main/java/org/terasology/persistence/typeHandling/extensionTypes/ComponentClassTypeHandler.java b/engine/src/main/java/org/terasology/persistence/typeHandling/extensionTypes/ComponentClassTypeHandler.java
index 04c2d666f..1213c5d8a 100644
--- a/engine/src/main/java/org/terasology/persistence/typeHandling/extensionTypes/ComponentClassTypeHandler.java
+++ b/engine/src/main/java/org/terasology/persistence/typeHandling/extensionTypes/ComponentClassTypeHandler.java
@@ -1,21 +1,8 @@
-/*
- * Copyright 2020 MovingBlocks
- *
- * 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 org.terasology.persistence.typeHandling.extensionTypes;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.persistence.typeHandling.extensionTypes;
-import org.terasology.entitySystem.Component;
+import org.terasology.engine.entitySystem.Component;
import org.terasology.persistence.typeHandling.StringRepresentationTypeHandler;
import org.terasology.persistence.typeHandling.TypeHandlerContext;
diff --git a/engine/src/main/java/org/terasology/persistence/typeHandling/extensionTypes/EntityRefTypeHandler.java b/engine/src/main/java/org/terasology/persistence/typeHandling/extensionTypes/EntityRefTypeHandler.java
index 01a26aa49..61377cf41 100644
--- a/engine/src/main/java/org/terasology/persistence/typeHandling/extensionTypes/EntityRefTypeHandler.java
+++ b/engine/src/main/java/org/terasology/persistence/typeHandling/extensionTypes/EntityRefTypeHandler.java
@@ -1,23 +1,10 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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 org.terasology.persistence.typeHandling.extensionTypes;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.persistence.typeHandling.extensionTypes;
import gnu.trove.iterator.TLongIterator;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.entitySystem.entity.internal.EngineEntityManager;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.entity.internal.EngineEntityManager;
import org.terasology.persistence.typeHandling.PersistedData;
import org.terasology.persistence.typeHandling.PersistedDataArray;
import org.terasology.persistence.typeHandling.PersistedDataSerializer;
diff --git a/engine/src/main/java/org/terasology/persistence/typeHandling/extensionTypes/ModifiableValueTypeHandler.java b/engine/src/main/java/org/terasology/persistence/typeHandling/extensionTypes/ModifiableValueTypeHandler.java
index 395212f6d..bf1b7a193 100644
--- a/engine/src/main/java/org/terasology/persistence/typeHandling/extensionTypes/ModifiableValueTypeHandler.java
+++ b/engine/src/main/java/org/terasology/persistence/typeHandling/extensionTypes/ModifiableValueTypeHandler.java
@@ -1,16 +1,16 @@
-// Copyright 2020 The Terasology Foundation
+// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.persistence.typeHandling.extensionTypes;
+package org.terasology.engine.persistence.typeHandling.extensionTypes;
import gnu.trove.list.TFloatList;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.terasology.engine.persistence.typeHandling.RegisterTypeHandler;
+import org.terasology.engine.utilities.modifiable.ModifiableValue;
import org.terasology.persistence.typeHandling.PersistedData;
import org.terasology.persistence.typeHandling.PersistedDataArray;
import org.terasology.persistence.typeHandling.PersistedDataSerializer;
-import org.terasology.persistence.typeHandling.RegisterTypeHandler;
-import org.terasology.utilities.modifiable.ModifiableValue;
import java.util.Optional;
diff --git a/engine/src/main/java/org/terasology/persistence/typeHandling/extensionTypes/NameTypeHandler.java b/engine/src/main/java/org/terasology/persistence/typeHandling/extensionTypes/NameTypeHandler.java
index 73f7fcb5b..45abd6bc0 100644
--- a/engine/src/main/java/org/terasology/persistence/typeHandling/extensionTypes/NameTypeHandler.java
+++ b/engine/src/main/java/org/terasology/persistence/typeHandling/extensionTypes/NameTypeHandler.java
@@ -1,20 +1,7 @@
-/*
- * Copyright 2014 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.persistence.typeHandling.extensionTypes;
+package org.terasology.engine.persistence.typeHandling.extensionTypes;
import org.terasology.naming.Name;
import org.terasology.persistence.typeHandling.StringRepresentationTypeHandler;
diff --git a/engine/src/main/java/org/terasology/persistence/typeHandling/extensionTypes/PrefabTypeHandler.java b/engine/src/main/java/org/terasology/persistence/typeHandling/extensionTypes/PrefabTypeHandler.java
index 068f0702b..ae36eba00 100644
--- a/engine/src/main/java/org/terasology/persistence/typeHandling/extensionTypes/PrefabTypeHandler.java
+++ b/engine/src/main/java/org/terasology/persistence/typeHandling/extensionTypes/PrefabTypeHandler.java
@@ -1,23 +1,10 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.persistence.typeHandling.extensionTypes;
+package org.terasology.engine.persistence.typeHandling.extensionTypes;
-import org.terasology.utilities.Assets;
-import org.terasology.entitySystem.prefab.Prefab;
+import org.terasology.engine.entitySystem.prefab.Prefab;
+import org.terasology.engine.utilities.Assets;
import org.terasology.persistence.typeHandling.StringRepresentationTypeHandler;
/**
diff --git a/engine/src/main/java/org/terasology/persistence/typeHandling/extensionTypes/TextureRegionAssetTypeHandler.java b/engine/src/main/java/org/terasology/persistence/typeHandling/extensionTypes/TextureRegionAssetTypeHandler.java
index bf16867ea..44413eb61 100644
--- a/engine/src/main/java/org/terasology/persistence/typeHandling/extensionTypes/TextureRegionAssetTypeHandler.java
+++ b/engine/src/main/java/org/terasology/persistence/typeHandling/extensionTypes/TextureRegionAssetTypeHandler.java
@@ -1,25 +1,12 @@
-/*
- * Copyright 2017 MovingBlocks
- *
- * 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 org.terasology.persistence.typeHandling.extensionTypes;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.persistence.typeHandling.extensionTypes;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.terasology.engine.rendering.assets.texture.TextureRegionAsset;
+import org.terasology.engine.utilities.Assets;
import org.terasology.persistence.typeHandling.StringRepresentationTypeHandler;
-import org.terasology.rendering.assets.texture.TextureRegionAsset;
-import org.terasology.utilities.Assets;
import java.util.Optional;
diff --git a/engine/src/main/java/org/terasology/persistence/typeHandling/extensionTypes/TextureRegionTypeHandler.java b/engine/src/main/java/org/terasology/persistence/typeHandling/extensionTypes/TextureRegionTypeHandler.java
index 545c36685..4bf0a91e8 100644
--- a/engine/src/main/java/org/terasology/persistence/typeHandling/extensionTypes/TextureRegionTypeHandler.java
+++ b/engine/src/main/java/org/terasology/persistence/typeHandling/extensionTypes/TextureRegionTypeHandler.java
@@ -1,27 +1,14 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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 org.terasology.persistence.typeHandling.extensionTypes;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.persistence.typeHandling.extensionTypes;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.terasology.utilities.Assets;
import org.terasology.assets.Asset;
+import org.terasology.engine.rendering.assets.texture.TextureRegion;
+import org.terasology.engine.rendering.assets.texture.TextureRegionAsset;
+import org.terasology.engine.utilities.Assets;
import org.terasology.persistence.typeHandling.StringRepresentationTypeHandler;
-import org.terasology.rendering.assets.texture.TextureRegion;
-import org.terasology.rendering.assets.texture.TextureRegionAsset;
import java.util.Optional;
diff --git a/engine/src/main/java/org/terasology/persistence/typeHandling/extensionTypes/UITextureRegionTypeHandler.java b/engine/src/main/java/org/terasology/persistence/typeHandling/extensionTypes/UITextureRegionTypeHandler.java
index a45722f0b..df7959bdf 100644
--- a/engine/src/main/java/org/terasology/persistence/typeHandling/extensionTypes/UITextureRegionTypeHandler.java
+++ b/engine/src/main/java/org/terasology/persistence/typeHandling/extensionTypes/UITextureRegionTypeHandler.java
@@ -1,27 +1,14 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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 org.terasology.persistence.typeHandling.extensionTypes;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.persistence.typeHandling.extensionTypes;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.terasology.assets.Asset;
+import org.terasology.engine.rendering.assets.texture.TextureRegionAsset;
+import org.terasology.engine.utilities.Assets;
import org.terasology.nui.UITextureRegion;
import org.terasology.persistence.typeHandling.StringRepresentationTypeHandler;
-import org.terasology.rendering.assets.texture.TextureRegionAsset;
-import org.terasology.utilities.Assets;
import java.util.Optional;
diff --git a/engine/src/main/java/org/terasology/persistence/typeHandling/extensionTypes/factories/AssetTypeHandlerFactory.java b/engine/src/main/java/org/terasology/persistence/typeHandling/extensionTypes/factories/AssetTypeHandlerFactory.java
index eeedc5502..9762ca20a 100644
--- a/engine/src/main/java/org/terasology/persistence/typeHandling/extensionTypes/factories/AssetTypeHandlerFactory.java
+++ b/engine/src/main/java/org/terasology/persistence/typeHandling/extensionTypes/factories/AssetTypeHandlerFactory.java
@@ -1,25 +1,12 @@
-/*
- * Copyright 2018 MovingBlocks
- *
- * 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 org.terasology.persistence.typeHandling.extensionTypes.factories;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.persistence.typeHandling.extensionTypes.factories;
import org.terasology.assets.Asset;
+import org.terasology.engine.persistence.typeHandling.extensionTypes.AssetTypeHandler;
import org.terasology.persistence.typeHandling.TypeHandler;
-import org.terasology.persistence.typeHandling.TypeHandlerFactory;
import org.terasology.persistence.typeHandling.TypeHandlerContext;
-import org.terasology.persistence.typeHandling.extensionTypes.AssetTypeHandler;
+import org.terasology.persistence.typeHandling.TypeHandlerFactory;
import org.terasology.reflection.TypeInfo;
import java.util.Optional;
diff --git a/engine/src/main/java/org/terasology/persistence/typeHandling/extensionTypes/factories/ComponentClassTypeHandlerFactory.java b/engine/src/main/java/org/terasology/persistence/typeHandling/extensionTypes/factories/ComponentClassTypeHandlerFactory.java
index 44cde4f5b..4d9acc4be 100644
--- a/engine/src/main/java/org/terasology/persistence/typeHandling/extensionTypes/factories/ComponentClassTypeHandlerFactory.java
+++ b/engine/src/main/java/org/terasology/persistence/typeHandling/extensionTypes/factories/ComponentClassTypeHandlerFactory.java
@@ -1,25 +1,12 @@
-/*
- * Copyright 2020 MovingBlocks
- *
- * 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 org.terasology.persistence.typeHandling.extensionTypes.factories;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.persistence.typeHandling.extensionTypes.factories;
-import org.terasology.entitySystem.Component;
+import org.terasology.engine.entitySystem.Component;
+import org.terasology.engine.persistence.typeHandling.extensionTypes.ComponentClassTypeHandler;
import org.terasology.persistence.typeHandling.SpecificTypeHandlerFactory;
import org.terasology.persistence.typeHandling.TypeHandler;
import org.terasology.persistence.typeHandling.TypeHandlerContext;
-import org.terasology.persistence.typeHandling.extensionTypes.ComponentClassTypeHandler;
import org.terasology.reflection.TypeInfo;
public class ComponentClassTypeHandlerFactory extends SpecificTypeHandlerFactory
*
*
* Also
*
diff --git a/engine/src/main/java/org/terasology/world/chunks/pipeline/stages/MultiplyRequirementChunkTask.java b/engine/src/main/java/org/terasology/world/chunks/pipeline/stages/MultiplyRequirementChunkTask.java
index 59bad8c0b..52ea92856 100644
--- a/engine/src/main/java/org/terasology/world/chunks/pipeline/stages/MultiplyRequirementChunkTask.java
+++ b/engine/src/main/java/org/terasology/world/chunks/pipeline/stages/MultiplyRequirementChunkTask.java
@@ -1,10 +1,10 @@
-// Copyright 2020 The Terasology Foundation
+// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.world.chunks.pipeline.stages;
+package org.terasology.engine.world.chunks.pipeline.stages;
import org.joml.Vector3ic;
-import org.terasology.world.chunks.Chunk;
+import org.terasology.engine.world.chunks.Chunk;
import java.util.Collection;
import java.util.Set;
diff --git a/engine/src/main/java/org/terasology/world/chunks/pipeline/stages/SingleChunkTask.java b/engine/src/main/java/org/terasology/world/chunks/pipeline/stages/SingleChunkTask.java
index 93f1dcf7c..6a92018d7 100644
--- a/engine/src/main/java/org/terasology/world/chunks/pipeline/stages/SingleChunkTask.java
+++ b/engine/src/main/java/org/terasology/world/chunks/pipeline/stages/SingleChunkTask.java
@@ -1,11 +1,11 @@
-// Copyright 2020 The Terasology Foundation
+// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.world.chunks.pipeline.stages;
+package org.terasology.engine.world.chunks.pipeline.stages;
import com.google.common.base.Preconditions;
import org.joml.Vector3ic;
-import org.terasology.world.chunks.Chunk;
+import org.terasology.engine.world.chunks.Chunk;
import java.util.Collection;
import java.util.Optional;
diff --git a/engine/src/main/java/org/terasology/world/chunks/remoteChunkProvider/ChunkReadyListener.java b/engine/src/main/java/org/terasology/world/chunks/remoteChunkProvider/ChunkReadyListener.java
index 05614576c..7302957c1 100644
--- a/engine/src/main/java/org/terasology/world/chunks/remoteChunkProvider/ChunkReadyListener.java
+++ b/engine/src/main/java/org/terasology/world/chunks/remoteChunkProvider/ChunkReadyListener.java
@@ -1,20 +1,7 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.world.chunks.remoteChunkProvider;
+package org.terasology.engine.world.chunks.remoteChunkProvider;
import org.joml.Vector3ic;
diff --git a/engine/src/main/java/org/terasology/world/chunks/remoteChunkProvider/RemoteChunkProvider.java b/engine/src/main/java/org/terasology/world/chunks/remoteChunkProvider/RemoteChunkProvider.java
index 446866c35..86f127264 100644
--- a/engine/src/main/java/org/terasology/world/chunks/remoteChunkProvider/RemoteChunkProvider.java
+++ b/engine/src/main/java/org/terasology/world/chunks/remoteChunkProvider/RemoteChunkProvider.java
@@ -1,7 +1,7 @@
// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.world.chunks.remoteChunkProvider;
+package org.terasology.engine.world.chunks.remoteChunkProvider;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
@@ -11,23 +11,23 @@ import org.joml.Vector3i;
import org.joml.Vector3ic;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.logic.players.LocalPlayer;
-import org.terasology.monitoring.chunk.ChunkMonitor;
-import org.terasology.world.block.BlockManager;
-import org.terasology.world.block.BlockRegion;
-import org.terasology.world.chunks.Chunk;
-import org.terasology.world.chunks.ChunkProvider;
-import org.terasology.world.chunks.Chunks;
-import org.terasology.world.chunks.event.BeforeChunkUnload;
-import org.terasology.world.chunks.event.OnChunkLoaded;
-import org.terasology.world.chunks.pipeline.ChunkProcessingPipeline;
-import org.terasology.world.chunks.pipeline.PositionFuture;
-import org.terasology.world.chunks.pipeline.stages.ChunkTaskProvider;
-import org.terasology.world.internal.ChunkViewCore;
-import org.terasology.world.internal.ChunkViewCoreImpl;
-import org.terasology.world.propagation.light.InternalLightProcessor;
-import org.terasology.world.propagation.light.LightMerger;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.logic.players.LocalPlayer;
+import org.terasology.engine.monitoring.chunk.ChunkMonitor;
+import org.terasology.engine.world.internal.ChunkViewCore;
+import org.terasology.engine.world.internal.ChunkViewCoreImpl;
+import org.terasology.engine.world.propagation.light.InternalLightProcessor;
+import org.terasology.engine.world.propagation.light.LightMerger;
+import org.terasology.engine.world.block.BlockManager;
+import org.terasology.engine.world.block.BlockRegion;
+import org.terasology.engine.world.chunks.Chunk;
+import org.terasology.engine.world.chunks.ChunkProvider;
+import org.terasology.engine.world.chunks.Chunks;
+import org.terasology.engine.world.chunks.event.BeforeChunkUnload;
+import org.terasology.engine.world.chunks.event.OnChunkLoaded;
+import org.terasology.engine.world.chunks.pipeline.ChunkProcessingPipeline;
+import org.terasology.engine.world.chunks.pipeline.PositionFuture;
+import org.terasology.engine.world.chunks.pipeline.stages.ChunkTaskProvider;
import java.util.Collection;
import java.util.Comparator;
@@ -42,13 +42,13 @@ import java.util.stream.StreamSupport;
/**
* Provides chunks received from remote source.
*
- * Loading/Unload chunks dependent on {@link org.terasology.network.Server}
+ * Loading/Unload chunks dependent on {@link org.terasology.engine.network.Server}
*
* {@link OnChunkLoaded} when chunk received from server and processed.
*
- * {@link BeforeChunkUnload} when {@link org.terasology.network.Server} send invalidate chunk and chunk removing
+ * {@link BeforeChunkUnload} when {@link org.terasology.engine.network.Server} send invalidate chunk and chunk removing
*/
public class RemoteChunkProvider implements ChunkProvider {
diff --git a/engine/src/main/java/org/terasology/world/generation/BaseFacetedWorldGenerator.java b/engine/src/main/java/org/terasology/world/generation/BaseFacetedWorldGenerator.java
index 835da3069..6e33bbb9a 100644
--- a/engine/src/main/java/org/terasology/world/generation/BaseFacetedWorldGenerator.java
+++ b/engine/src/main/java/org/terasology/world/generation/BaseFacetedWorldGenerator.java
@@ -1,26 +1,13 @@
-/*
- * Copyright 2015 MovingBlocks
- *
- * 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 org.terasology.world.generation;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.world.generation;
-import org.terasology.engine.SimpleUri;
-import org.terasology.world.chunks.CoreChunk;
-import org.terasology.world.generator.ScalableWorldGenerator;
-import org.terasology.world.generator.WorldConfigurator;
-import org.terasology.world.generator.WorldGenerator;
-import org.terasology.world.zones.Zone;
+import org.terasology.engine.core.SimpleUri;
+import org.terasology.engine.world.chunks.CoreChunk;
+import org.terasology.engine.world.generator.ScalableWorldGenerator;
+import org.terasology.engine.world.generator.WorldConfigurator;
+import org.terasology.engine.world.generator.WorldGenerator;
+import org.terasology.engine.world.zones.Zone;
import java.util.List;
diff --git a/engine/src/main/java/org/terasology/world/generation/Border3D.java b/engine/src/main/java/org/terasology/world/generation/Border3D.java
index 360b234ce..9d56d8db3 100644
--- a/engine/src/main/java/org/terasology/world/generation/Border3D.java
+++ b/engine/src/main/java/org/terasology/world/generation/Border3D.java
@@ -1,25 +1,12 @@
-/*
- * Copyright 2014 MovingBlocks
- *
- * 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 org.terasology.world.generation;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.world.generation;
import com.google.common.base.Preconditions;
import org.joml.Vector3ic;
-import org.terasology.world.block.BlockArea;
-import org.terasology.world.block.BlockRegion;
-import org.terasology.world.block.BlockRegionc;
+import org.terasology.engine.world.block.BlockArea;
+import org.terasology.engine.world.block.BlockRegion;
+import org.terasology.engine.world.block.BlockRegionc;
import java.util.Objects;
diff --git a/engine/src/main/java/org/terasology/world/generation/ConfigurableFacetProvider.java b/engine/src/main/java/org/terasology/world/generation/ConfigurableFacetProvider.java
index 661747964..52f3abb63 100644
--- a/engine/src/main/java/org/terasology/world/generation/ConfigurableFacetProvider.java
+++ b/engine/src/main/java/org/terasology/world/generation/ConfigurableFacetProvider.java
@@ -1,21 +1,8 @@
-/*
- * Copyright 2014 MovingBlocks
- *
- * 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 org.terasology.world.generation;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.world.generation;
-import org.terasology.entitySystem.Component;
+import org.terasology.engine.entitySystem.Component;
public interface ConfigurableFacetProvider extends FacetProvider {
String getConfigurationName();
diff --git a/engine/src/main/java/org/terasology/world/generation/EntityBuffer.java b/engine/src/main/java/org/terasology/world/generation/EntityBuffer.java
index 40c30dea3..736fc3556 100644
--- a/engine/src/main/java/org/terasology/world/generation/EntityBuffer.java
+++ b/engine/src/main/java/org/terasology/world/generation/EntityBuffer.java
@@ -1,22 +1,9 @@
-/*
- * Copyright 2015 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.world.generation;
+package org.terasology.engine.world.generation;
-import org.terasology.entitySystem.entity.EntityStore;
+import org.terasology.engine.entitySystem.entity.EntityStore;
/**
* A buffer for {@link EntityStore} instances.
diff --git a/engine/src/main/java/org/terasology/world/generation/EntityProvider.java b/engine/src/main/java/org/terasology/world/generation/EntityProvider.java
index cda053ef9..b63028740 100644
--- a/engine/src/main/java/org/terasology/world/generation/EntityProvider.java
+++ b/engine/src/main/java/org/terasology/world/generation/EntityProvider.java
@@ -1,20 +1,7 @@
-/*
- * Copyright 2015 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.world.generation;
+package org.terasology.engine.world.generation;
/**
diff --git a/engine/src/main/java/org/terasology/world/generation/EntityProviderPlugin.java b/engine/src/main/java/org/terasology/world/generation/EntityProviderPlugin.java
index 2531c1af9..2225f7877 100644
--- a/engine/src/main/java/org/terasology/world/generation/EntityProviderPlugin.java
+++ b/engine/src/main/java/org/terasology/world/generation/EntityProviderPlugin.java
@@ -1,22 +1,9 @@
-/*
- * Copyright 2015 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.world.generation;
+package org.terasology.engine.world.generation;
-import org.terasology.world.generator.plugin.WorldGeneratorPlugin;
+import org.terasology.engine.world.generator.plugin.WorldGeneratorPlugin;
/**
* A marker interface that combines {@link EntityProvider} and {@link WorldGeneratorPlugin}.
diff --git a/engine/src/main/java/org/terasology/world/generation/Facet.java b/engine/src/main/java/org/terasology/world/generation/Facet.java
index 96e236060..2e2579a0e 100644
--- a/engine/src/main/java/org/terasology/world/generation/Facet.java
+++ b/engine/src/main/java/org/terasology/world/generation/Facet.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2014 MovingBlocks
- *
- * 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 org.terasology.world.generation;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.world.generation;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
diff --git a/engine/src/main/java/org/terasology/world/generation/FacetBorder.java b/engine/src/main/java/org/terasology/world/generation/FacetBorder.java
index 3e068a6a0..ff8144782 100644
--- a/engine/src/main/java/org/terasology/world/generation/FacetBorder.java
+++ b/engine/src/main/java/org/terasology/world/generation/FacetBorder.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2014 MovingBlocks
- *
- * 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 org.terasology.world.generation;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.world.generation;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
diff --git a/engine/src/main/java/org/terasology/world/generation/FacetName.java b/engine/src/main/java/org/terasology/world/generation/FacetName.java
index 392525b36..5f3de5c44 100644
--- a/engine/src/main/java/org/terasology/world/generation/FacetName.java
+++ b/engine/src/main/java/org/terasology/world/generation/FacetName.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2014 MovingBlocks
- *
- * 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 org.terasology.world.generation;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.world.generation;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
diff --git a/engine/src/main/java/org/terasology/world/generation/FacetProvider.java b/engine/src/main/java/org/terasology/world/generation/FacetProvider.java
index f5163fc91..742826609 100644
--- a/engine/src/main/java/org/terasology/world/generation/FacetProvider.java
+++ b/engine/src/main/java/org/terasology/world/generation/FacetProvider.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2014 MovingBlocks
- *
- * 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 org.terasology.world.generation;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.world.generation;
/**
*/
diff --git a/engine/src/main/java/org/terasology/world/generation/FacetProviderPlugin.java b/engine/src/main/java/org/terasology/world/generation/FacetProviderPlugin.java
index 8945e6a79..e44af7238 100644
--- a/engine/src/main/java/org/terasology/world/generation/FacetProviderPlugin.java
+++ b/engine/src/main/java/org/terasology/world/generation/FacetProviderPlugin.java
@@ -1,21 +1,8 @@
-/*
- * Copyright 2014 MovingBlocks
- *
- * 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 org.terasology.world.generation;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.world.generation;
-import org.terasology.world.generator.plugin.WorldGeneratorPlugin;
+import org.terasology.engine.world.generator.plugin.WorldGeneratorPlugin;
public interface FacetProviderPlugin extends FacetProvider, WorldGeneratorPlugin {
}
diff --git a/engine/src/main/java/org/terasology/world/generation/FacetedWorldConfigurator.java b/engine/src/main/java/org/terasology/world/generation/FacetedWorldConfigurator.java
index 7e0035266..4acfabead 100644
--- a/engine/src/main/java/org/terasology/world/generation/FacetedWorldConfigurator.java
+++ b/engine/src/main/java/org/terasology/world/generation/FacetedWorldConfigurator.java
@@ -1,12 +1,12 @@
// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.world.generation;
+package org.terasology.engine.world.generation;
import com.google.common.collect.Maps;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.terasology.entitySystem.Component;
-import org.terasology.world.generator.WorldConfigurator;
+import org.terasology.engine.entitySystem.Component;
+import org.terasology.engine.world.generator.WorldConfigurator;
import java.util.Collections;
import java.util.List;
diff --git a/engine/src/main/java/org/terasology/world/generation/GeneratingRegion.java b/engine/src/main/java/org/terasology/world/generation/GeneratingRegion.java
index cfb4d4bb7..e80b2dfae 100644
--- a/engine/src/main/java/org/terasology/world/generation/GeneratingRegion.java
+++ b/engine/src/main/java/org/terasology/world/generation/GeneratingRegion.java
@@ -1,21 +1,8 @@
-/*
- * Copyright 2014 MovingBlocks
- *
- * 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 org.terasology.world.generation;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.world.generation;
-import org.terasology.world.block.BlockRegion;
+import org.terasology.engine.world.block.BlockRegion;
/**
*/
diff --git a/engine/src/main/java/org/terasology/world/generation/Produces.java b/engine/src/main/java/org/terasology/world/generation/Produces.java
index d8d333207..3b214f463 100644
--- a/engine/src/main/java/org/terasology/world/generation/Produces.java
+++ b/engine/src/main/java/org/terasology/world/generation/Produces.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2014 MovingBlocks
- *
- * 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 org.terasology.world.generation;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.world.generation;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
diff --git a/engine/src/main/java/org/terasology/world/generation/Region.java b/engine/src/main/java/org/terasology/world/generation/Region.java
index 508dee19c..988520271 100644
--- a/engine/src/main/java/org/terasology/world/generation/Region.java
+++ b/engine/src/main/java/org/terasology/world/generation/Region.java
@@ -1,21 +1,8 @@
-/*
- * Copyright 2014 MovingBlocks
- *
- * 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 org.terasology.world.generation;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.world.generation;
-import org.terasology.world.block.BlockRegion;
+import org.terasology.engine.world.block.BlockRegion;
/**
*/
diff --git a/engine/src/main/java/org/terasology/world/generation/RegionImpl.java b/engine/src/main/java/org/terasology/world/generation/RegionImpl.java
index 93dc6f99a..d273a0316 100644
--- a/engine/src/main/java/org/terasology/world/generation/RegionImpl.java
+++ b/engine/src/main/java/org/terasology/world/generation/RegionImpl.java
@@ -1,11 +1,11 @@
// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.world.generation;
+package org.terasology.engine.world.generation;
import com.google.common.collect.ListMultimap;
import com.google.common.collect.Sets;
-import org.terasology.utilities.collection.TypeMap;
-import org.terasology.world.block.BlockRegion;
+import org.terasology.engine.utilities.collection.TypeMap;
+import org.terasology.engine.world.block.BlockRegion;
import java.util.Map;
import java.util.Set;
diff --git a/engine/src/main/java/org/terasology/world/generation/Requires.java b/engine/src/main/java/org/terasology/world/generation/Requires.java
index 1ff19284d..2a6147cb1 100644
--- a/engine/src/main/java/org/terasology/world/generation/Requires.java
+++ b/engine/src/main/java/org/terasology/world/generation/Requires.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2014 MovingBlocks
- *
- * 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 org.terasology.world.generation;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.world.generation;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
diff --git a/engine/src/main/java/org/terasology/world/generation/RequiresRasterizer.java b/engine/src/main/java/org/terasology/world/generation/RequiresRasterizer.java
index 1063563bf..c54059b01 100644
--- a/engine/src/main/java/org/terasology/world/generation/RequiresRasterizer.java
+++ b/engine/src/main/java/org/terasology/world/generation/RequiresRasterizer.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2019 MovingBlocks
- *
- * 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 org.terasology.world.generation;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.world.generation;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
diff --git a/engine/src/main/java/org/terasology/world/generation/ScalableFacetProvider.java b/engine/src/main/java/org/terasology/world/generation/ScalableFacetProvider.java
index 561ff13c2..37df18999 100644
--- a/engine/src/main/java/org/terasology/world/generation/ScalableFacetProvider.java
+++ b/engine/src/main/java/org/terasology/world/generation/ScalableFacetProvider.java
@@ -1,7 +1,7 @@
// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.world.generation;
+package org.terasology.engine.world.generation;
public interface ScalableFacetProvider extends FacetProvider {
void process(GeneratingRegion region, float scale);
diff --git a/engine/src/main/java/org/terasology/world/generation/ScalableWorldRasterizer.java b/engine/src/main/java/org/terasology/world/generation/ScalableWorldRasterizer.java
index 9be22b107..11d855a98 100644
--- a/engine/src/main/java/org/terasology/world/generation/ScalableWorldRasterizer.java
+++ b/engine/src/main/java/org/terasology/world/generation/ScalableWorldRasterizer.java
@@ -1,9 +1,9 @@
// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.world.generation;
+package org.terasology.engine.world.generation;
-import org.terasology.world.chunks.CoreChunk;
+import org.terasology.engine.world.chunks.CoreChunk;
public interface ScalableWorldRasterizer extends WorldRasterizer {
void generateChunk(CoreChunk chunk, Region chunkRegion, float scale);
diff --git a/engine/src/main/java/org/terasology/world/generation/Updates.java b/engine/src/main/java/org/terasology/world/generation/Updates.java
index 4dd406729..e15265601 100644
--- a/engine/src/main/java/org/terasology/world/generation/Updates.java
+++ b/engine/src/main/java/org/terasology/world/generation/Updates.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2014 MovingBlocks
- *
- * 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 org.terasology.world.generation;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.world.generation;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
diff --git a/engine/src/main/java/org/terasology/world/generation/World.java b/engine/src/main/java/org/terasology/world/generation/World.java
index 1a77d30f9..fc4b4d64e 100644
--- a/engine/src/main/java/org/terasology/world/generation/World.java
+++ b/engine/src/main/java/org/terasology/world/generation/World.java
@@ -1,9 +1,9 @@
// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.world.generation;
+package org.terasology.engine.world.generation;
-import org.terasology.world.block.BlockRegion;
-import org.terasology.world.chunks.CoreChunk;
+import org.terasology.engine.world.block.BlockRegion;
+import org.terasology.engine.world.chunks.CoreChunk;
import java.util.Set;
diff --git a/engine/src/main/java/org/terasology/world/generation/WorldBuilder.java b/engine/src/main/java/org/terasology/world/generation/WorldBuilder.java
index bd9c68c28..8fcb39bb9 100644
--- a/engine/src/main/java/org/terasology/world/generation/WorldBuilder.java
+++ b/engine/src/main/java/org/terasology/world/generation/WorldBuilder.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2014 MovingBlocks
- *
- * 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 org.terasology.world.generation;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.world.generation;
import com.google.common.collect.ArrayListMultimap;
import com.google.common.collect.ListMultimap;
@@ -22,10 +9,10 @@ import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.terasology.world.generator.plugin.WorldGeneratorPluginLibrary;
-import org.terasology.world.zones.ProviderStore;
-import org.terasology.world.zones.Zone;
-import org.terasology.world.zones.ZonePlugin;
+import org.terasology.engine.world.generator.plugin.WorldGeneratorPluginLibrary;
+import org.terasology.engine.world.zones.ProviderStore;
+import org.terasology.engine.world.zones.Zone;
+import org.terasology.engine.world.zones.ZonePlugin;
import java.util.ArrayList;
import java.util.Arrays;
diff --git a/engine/src/main/java/org/terasology/world/generation/WorldFacet.java b/engine/src/main/java/org/terasology/world/generation/WorldFacet.java
index 7144b44aa..4eeee7149 100644
--- a/engine/src/main/java/org/terasology/world/generation/WorldFacet.java
+++ b/engine/src/main/java/org/terasology/world/generation/WorldFacet.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2014 MovingBlocks
- *
- * 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 org.terasology.world.generation;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.world.generation;
/**
*/
diff --git a/engine/src/main/java/org/terasology/world/generation/WorldFacet2D.java b/engine/src/main/java/org/terasology/world/generation/WorldFacet2D.java
index 6f27d6cfe..5fbdaa1bf 100644
--- a/engine/src/main/java/org/terasology/world/generation/WorldFacet2D.java
+++ b/engine/src/main/java/org/terasology/world/generation/WorldFacet2D.java
@@ -1,21 +1,8 @@
-/*
- * Copyright 2014 MovingBlocks
- *
- * 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 org.terasology.world.generation;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.world.generation;
-import org.terasology.world.block.BlockAreac;
+import org.terasology.engine.world.block.BlockAreac;
/**
*/
diff --git a/engine/src/main/java/org/terasology/world/generation/WorldFacet3D.java b/engine/src/main/java/org/terasology/world/generation/WorldFacet3D.java
index d4aec92f6..b8bf39e68 100644
--- a/engine/src/main/java/org/terasology/world/generation/WorldFacet3D.java
+++ b/engine/src/main/java/org/terasology/world/generation/WorldFacet3D.java
@@ -1,21 +1,8 @@
-/*
- * Copyright 2014 MovingBlocks
- *
- * 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 org.terasology.world.generation;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.world.generation;
-import org.terasology.world.block.BlockRegionc;
+import org.terasology.engine.world.block.BlockRegionc;
/**
*/
diff --git a/engine/src/main/java/org/terasology/world/generation/WorldImpl.java b/engine/src/main/java/org/terasology/world/generation/WorldImpl.java
index 614ea724b..fa0e0a9a2 100644
--- a/engine/src/main/java/org/terasology/world/generation/WorldImpl.java
+++ b/engine/src/main/java/org/terasology/world/generation/WorldImpl.java
@@ -1,11 +1,11 @@
// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.world.generation;
+package org.terasology.engine.world.generation;
import com.google.common.collect.ListMultimap;
import com.google.common.collect.Sets;
-import org.terasology.world.block.BlockRegion;
-import org.terasology.world.chunks.CoreChunk;
+import org.terasology.engine.world.block.BlockRegion;
+import org.terasology.engine.world.chunks.CoreChunk;
import java.util.Collection;
import java.util.LinkedHashSet;
diff --git a/engine/src/main/java/org/terasology/world/generation/WorldRasterizer.java b/engine/src/main/java/org/terasology/world/generation/WorldRasterizer.java
index 99cbbd5af..e00335462 100644
--- a/engine/src/main/java/org/terasology/world/generation/WorldRasterizer.java
+++ b/engine/src/main/java/org/terasology/world/generation/WorldRasterizer.java
@@ -1,21 +1,8 @@
-/*
- * Copyright 2014 MovingBlocks
- *
- * 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 org.terasology.world.generation;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.world.generation;
-import org.terasology.world.chunks.CoreChunk;
+import org.terasology.engine.world.chunks.CoreChunk;
/**
*/
diff --git a/engine/src/main/java/org/terasology/world/generation/WorldRasterizerPlugin.java b/engine/src/main/java/org/terasology/world/generation/WorldRasterizerPlugin.java
index e5ce0cdf5..6fbaaa75e 100644
--- a/engine/src/main/java/org/terasology/world/generation/WorldRasterizerPlugin.java
+++ b/engine/src/main/java/org/terasology/world/generation/WorldRasterizerPlugin.java
@@ -1,21 +1,8 @@
-/*
- * Copyright 2014 MovingBlocks
- *
- * 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 org.terasology.world.generation;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.world.generation;
-import org.terasology.world.generator.plugin.WorldGeneratorPlugin;
+import org.terasology.engine.world.generator.plugin.WorldGeneratorPlugin;
public interface WorldRasterizerPlugin extends WorldRasterizer, WorldGeneratorPlugin {
}
diff --git a/engine/src/main/java/org/terasology/world/generation/facets/DensityFacet.java b/engine/src/main/java/org/terasology/world/generation/facets/DensityFacet.java
index a1c2985cf..de7f76670 100644
--- a/engine/src/main/java/org/terasology/world/generation/facets/DensityFacet.java
+++ b/engine/src/main/java/org/terasology/world/generation/facets/DensityFacet.java
@@ -1,23 +1,10 @@
-/*
- * Copyright 2014 MovingBlocks
- *
- * 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 org.terasology.world.generation.facets;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.world.generation.facets;
-import org.terasology.world.block.BlockRegionc;
-import org.terasology.world.generation.Border3D;
-import org.terasology.world.generation.facets.base.BaseFieldFacet3D;
+import org.terasology.engine.world.generation.facets.base.BaseFieldFacet3D;
+import org.terasology.engine.world.block.BlockRegionc;
+import org.terasology.engine.world.generation.Border3D;
/**
*/
diff --git a/engine/src/main/java/org/terasology/world/generation/facets/ElevationFacet.java b/engine/src/main/java/org/terasology/world/generation/facets/ElevationFacet.java
index 5dda20dcc..78de41ee0 100644
--- a/engine/src/main/java/org/terasology/world/generation/facets/ElevationFacet.java
+++ b/engine/src/main/java/org/terasology/world/generation/facets/ElevationFacet.java
@@ -1,11 +1,11 @@
-// Copyright 2020 The Terasology Foundation
+// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.world.generation.facets;
+package org.terasology.engine.world.generation.facets;
-import org.terasology.world.block.BlockRegionc;
-import org.terasology.world.generation.Border3D;
-import org.terasology.world.generation.facets.base.BaseFieldFacet2D;
+import org.terasology.engine.world.generation.facets.base.BaseFieldFacet2D;
+import org.terasology.engine.world.block.BlockRegionc;
+import org.terasology.engine.world.generation.Border3D;
/**
* This facet represents the approximate height of the conceptual surface of the ground at each position.
diff --git a/engine/src/main/java/org/terasology/world/generation/facets/SeaLevelFacet.java b/engine/src/main/java/org/terasology/world/generation/facets/SeaLevelFacet.java
index 0924c9f91..1de4993ae 100644
--- a/engine/src/main/java/org/terasology/world/generation/facets/SeaLevelFacet.java
+++ b/engine/src/main/java/org/terasology/world/generation/facets/SeaLevelFacet.java
@@ -1,23 +1,10 @@
-/*
- * Copyright 2014 MovingBlocks
- *
- * 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 org.terasology.world.generation.facets;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.world.generation.facets;
-import org.terasology.world.block.BlockRegion;
-import org.terasology.world.generation.Border3D;
-import org.terasology.world.generation.facets.base.BaseFacet2D;
+import org.terasology.engine.world.generation.facets.base.BaseFacet2D;
+import org.terasology.engine.world.block.BlockRegion;
+import org.terasology.engine.world.generation.Border3D;
/**
* Stores where sea level is
diff --git a/engine/src/main/java/org/terasology/world/generation/facets/SpawnHeightFacet.java b/engine/src/main/java/org/terasology/world/generation/facets/SpawnHeightFacet.java
index 0e883ee52..28c0d5872 100644
--- a/engine/src/main/java/org/terasology/world/generation/facets/SpawnHeightFacet.java
+++ b/engine/src/main/java/org/terasology/world/generation/facets/SpawnHeightFacet.java
@@ -1,23 +1,10 @@
-/*
- * Copyright 2018 MovingBlocks
- *
- * 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 org.terasology.world.generation.facets;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.world.generation.facets;
-import org.terasology.world.block.BlockRegion;
-import org.terasology.world.generation.Border3D;
-import org.terasology.world.generation.facets.base.BaseStrictlySparseFieldFacet2D;
+import org.terasology.engine.world.generation.facets.base.BaseStrictlySparseFieldFacet2D;
+import org.terasology.engine.world.block.BlockRegion;
+import org.terasology.engine.world.generation.Border3D;
/***
* Stores the height at which the player may be spawned, if it exists for a given coordinate
diff --git a/engine/src/main/java/org/terasology/world/generation/facets/StrictlySparseSeaLevelFacet.java b/engine/src/main/java/org/terasology/world/generation/facets/StrictlySparseSeaLevelFacet.java
index 7543d5758..35d829103 100644
--- a/engine/src/main/java/org/terasology/world/generation/facets/StrictlySparseSeaLevelFacet.java
+++ b/engine/src/main/java/org/terasology/world/generation/facets/StrictlySparseSeaLevelFacet.java
@@ -1,24 +1,11 @@
-/*
- * Copyright 2018 MovingBlocks
- *
- * 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 org.terasology.world.generation.facets;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.world.generation.facets;
+import org.terasology.engine.world.generation.facets.base.BaseStrictlySparseFieldFacet2D;
import org.terasology.math.TeraMath;
-import org.terasology.world.block.BlockRegion;
-import org.terasology.world.generation.Border3D;
-import org.terasology.world.generation.facets.base.BaseStrictlySparseFieldFacet2D;
+import org.terasology.engine.world.block.BlockRegion;
+import org.terasology.engine.world.generation.Border3D;
import java.util.Optional;
diff --git a/engine/src/main/java/org/terasology/world/generation/facets/SurfaceDepthFacet.java b/engine/src/main/java/org/terasology/world/generation/facets/SurfaceDepthFacet.java
index 439ac5d77..6371026aa 100644
--- a/engine/src/main/java/org/terasology/world/generation/facets/SurfaceDepthFacet.java
+++ b/engine/src/main/java/org/terasology/world/generation/facets/SurfaceDepthFacet.java
@@ -1,23 +1,10 @@
-/*
- * Copyright 2017 MovingBlocks
- *
- * 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 org.terasology.world.generation.facets;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.world.generation.facets;
-import org.terasology.world.block.BlockRegion;
-import org.terasology.world.generation.Border3D;
-import org.terasology.world.generation.facets.base.BaseFieldFacet2D;
+import org.terasology.engine.world.generation.facets.base.BaseFieldFacet2D;
+import org.terasology.engine.world.block.BlockRegion;
+import org.terasology.engine.world.generation.Border3D;
/**
* Stores the surface depth limits.
diff --git a/engine/src/main/java/org/terasology/world/generation/facets/SurfaceHumidityFacet.java b/engine/src/main/java/org/terasology/world/generation/facets/SurfaceHumidityFacet.java
index eca19e694..b0c34fe4d 100644
--- a/engine/src/main/java/org/terasology/world/generation/facets/SurfaceHumidityFacet.java
+++ b/engine/src/main/java/org/terasology/world/generation/facets/SurfaceHumidityFacet.java
@@ -1,24 +1,11 @@
-/*
- * Copyright 2014 MovingBlocks
- *
- * 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 org.terasology.world.generation.facets;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.world.generation.facets;
-import org.terasology.world.block.BlockRegion;
-import org.terasology.world.generation.Border3D;
-import org.terasology.world.generation.FacetName;
-import org.terasology.world.generation.facets.base.BaseFieldFacet2D;
+import org.terasology.engine.world.generation.facets.base.BaseFieldFacet2D;
+import org.terasology.engine.world.block.BlockRegion;
+import org.terasology.engine.world.generation.Border3D;
+import org.terasology.engine.world.generation.FacetName;
/**
* Values in between 0-1
diff --git a/engine/src/main/java/org/terasology/world/generation/facets/SurfaceTemperatureFacet.java b/engine/src/main/java/org/terasology/world/generation/facets/SurfaceTemperatureFacet.java
index bec3f6ce5..9244f7aa1 100644
--- a/engine/src/main/java/org/terasology/world/generation/facets/SurfaceTemperatureFacet.java
+++ b/engine/src/main/java/org/terasology/world/generation/facets/SurfaceTemperatureFacet.java
@@ -1,24 +1,11 @@
-/*
- * Copyright 2014 MovingBlocks
- *
- * 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 org.terasology.world.generation.facets;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.world.generation.facets;
-import org.terasology.world.block.BlockRegion;
-import org.terasology.world.generation.Border3D;
-import org.terasology.world.generation.FacetName;
-import org.terasology.world.generation.facets.base.BaseFieldFacet2D;
+import org.terasology.engine.world.generation.facets.base.BaseFieldFacet2D;
+import org.terasology.engine.world.block.BlockRegion;
+import org.terasology.engine.world.generation.Border3D;
+import org.terasology.engine.world.generation.FacetName;
/**
*/
diff --git a/engine/src/main/java/org/terasology/world/generation/facets/SurfacesFacet.java b/engine/src/main/java/org/terasology/world/generation/facets/SurfacesFacet.java
index 6bec63abf..ca2a329d2 100644
--- a/engine/src/main/java/org/terasology/world/generation/facets/SurfacesFacet.java
+++ b/engine/src/main/java/org/terasology/world/generation/facets/SurfacesFacet.java
@@ -1,12 +1,12 @@
-// Copyright 2020 The Terasology Foundation
+// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.world.generation.facets;
+package org.terasology.engine.world.generation.facets;
import org.joml.Vector3ic;
-import org.terasology.world.block.BlockRegion;
-import org.terasology.world.generation.Border3D;
-import org.terasology.world.generation.facets.base.VerticallySparseBooleanFacet3D;
+import org.terasology.engine.world.generation.facets.base.VerticallySparseBooleanFacet3D;
+import org.terasology.engine.world.block.BlockRegion;
+import org.terasology.engine.world.generation.Border3D;
import java.util.Optional;
diff --git a/engine/src/main/java/org/terasology/world/generation/facets/base/BaseBooleanFieldFacet2D.java b/engine/src/main/java/org/terasology/world/generation/facets/base/BaseBooleanFieldFacet2D.java
index 43cdaf7ef..4ebc1b6f6 100644
--- a/engine/src/main/java/org/terasology/world/generation/facets/base/BaseBooleanFieldFacet2D.java
+++ b/engine/src/main/java/org/terasology/world/generation/facets/base/BaseBooleanFieldFacet2D.java
@@ -1,24 +1,11 @@
-/*
- * Copyright 2014 MovingBlocks
- *
- * 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 org.terasology.world.generation.facets.base;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.world.generation.facets.base;
import com.google.common.base.Preconditions;
import org.joml.Vector2ic;
-import org.terasology.world.block.BlockRegion;
-import org.terasology.world.generation.Border3D;
+import org.terasology.engine.world.block.BlockRegion;
+import org.terasology.engine.world.generation.Border3D;
/**
* An abstract, but complete implementation of {@link BooleanFieldFacet2D} that
diff --git a/engine/src/main/java/org/terasology/world/generation/facets/base/BaseBooleanFieldFacet3D.java b/engine/src/main/java/org/terasology/world/generation/facets/base/BaseBooleanFieldFacet3D.java
index 16b1e82d5..ddbc7c128 100644
--- a/engine/src/main/java/org/terasology/world/generation/facets/base/BaseBooleanFieldFacet3D.java
+++ b/engine/src/main/java/org/terasology/world/generation/facets/base/BaseBooleanFieldFacet3D.java
@@ -1,11 +1,11 @@
// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.world.generation.facets.base;
+package org.terasology.engine.world.generation.facets.base;
import com.google.common.base.Preconditions;
import org.joml.Vector3ic;
-import org.terasology.world.block.BlockRegion;
-import org.terasology.world.generation.Border3D;
+import org.terasology.engine.world.block.BlockRegion;
+import org.terasology.engine.world.generation.Border3D;
/**
*/
diff --git a/engine/src/main/java/org/terasology/world/generation/facets/base/BaseFacet2D.java b/engine/src/main/java/org/terasology/world/generation/facets/base/BaseFacet2D.java
index d89c5321b..0089b53b6 100644
--- a/engine/src/main/java/org/terasology/world/generation/facets/base/BaseFacet2D.java
+++ b/engine/src/main/java/org/terasology/world/generation/facets/base/BaseFacet2D.java
@@ -1,26 +1,13 @@
-/*
- * Copyright 2014 MovingBlocks
- *
- * 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 org.terasology.world.generation.facets.base;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.world.generation.facets.base;
import org.joml.Vector3i;
-import org.terasology.world.block.BlockArea;
-import org.terasology.world.block.BlockAreac;
-import org.terasology.world.block.BlockRegionc;
-import org.terasology.world.generation.Border3D;
-import org.terasology.world.generation.WorldFacet2D;
+import org.terasology.engine.world.block.BlockArea;
+import org.terasology.engine.world.block.BlockAreac;
+import org.terasology.engine.world.block.BlockRegionc;
+import org.terasology.engine.world.generation.Border3D;
+import org.terasology.engine.world.generation.WorldFacet2D;
/**
*/
diff --git a/engine/src/main/java/org/terasology/world/generation/facets/base/BaseFacet3D.java b/engine/src/main/java/org/terasology/world/generation/facets/base/BaseFacet3D.java
index a69405461..cb52360c7 100644
--- a/engine/src/main/java/org/terasology/world/generation/facets/base/BaseFacet3D.java
+++ b/engine/src/main/java/org/terasology/world/generation/facets/base/BaseFacet3D.java
@@ -1,25 +1,12 @@
-/*
- * Copyright 2014 MovingBlocks
- *
- * 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 org.terasology.world.generation.facets.base;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.world.generation.facets.base;
import org.joml.Vector3i;
-import org.terasology.world.block.BlockRegion;
-import org.terasology.world.block.BlockRegionc;
-import org.terasology.world.generation.Border3D;
-import org.terasology.world.generation.WorldFacet3D;
+import org.terasology.engine.world.block.BlockRegion;
+import org.terasology.engine.world.block.BlockRegionc;
+import org.terasology.engine.world.generation.Border3D;
+import org.terasology.engine.world.generation.WorldFacet3D;
/**
*/
diff --git a/engine/src/main/java/org/terasology/world/generation/facets/base/BaseFieldFacet2D.java b/engine/src/main/java/org/terasology/world/generation/facets/base/BaseFieldFacet2D.java
index 4b6088948..9468f5e03 100644
--- a/engine/src/main/java/org/terasology/world/generation/facets/base/BaseFieldFacet2D.java
+++ b/engine/src/main/java/org/terasology/world/generation/facets/base/BaseFieldFacet2D.java
@@ -1,24 +1,11 @@
-/*
- * Copyright 2014 MovingBlocks
- *
- * 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 org.terasology.world.generation.facets.base;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.world.generation.facets.base;
import com.google.common.base.Preconditions;
import org.joml.Vector2ic;
-import org.terasology.world.block.BlockRegionc;
-import org.terasology.world.generation.Border3D;
+import org.terasology.engine.world.block.BlockRegionc;
+import org.terasology.engine.world.generation.Border3D;
/**
*/
diff --git a/engine/src/main/java/org/terasology/world/generation/facets/base/BaseFieldFacet3D.java b/engine/src/main/java/org/terasology/world/generation/facets/base/BaseFieldFacet3D.java
index bd9e3399a..fb3f1ea59 100644
--- a/engine/src/main/java/org/terasology/world/generation/facets/base/BaseFieldFacet3D.java
+++ b/engine/src/main/java/org/terasology/world/generation/facets/base/BaseFieldFacet3D.java
@@ -1,11 +1,11 @@
// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.world.generation.facets.base;
+package org.terasology.engine.world.generation.facets.base;
import com.google.common.base.Preconditions;
import org.joml.Vector3ic;
-import org.terasology.world.block.BlockRegionc;
-import org.terasology.world.generation.Border3D;
+import org.terasology.engine.world.block.BlockRegionc;
+import org.terasology.engine.world.generation.Border3D;
/**
*/
diff --git a/engine/src/main/java/org/terasology/world/generation/facets/base/BaseObjectFacet2D.java b/engine/src/main/java/org/terasology/world/generation/facets/base/BaseObjectFacet2D.java
index 65c09cb75..9ff89b00a 100644
--- a/engine/src/main/java/org/terasology/world/generation/facets/base/BaseObjectFacet2D.java
+++ b/engine/src/main/java/org/terasology/world/generation/facets/base/BaseObjectFacet2D.java
@@ -1,24 +1,11 @@
-/*
- * Copyright 2014 MovingBlocks
- *
- * 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 org.terasology.world.generation.facets.base;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.world.generation.facets.base;
import com.google.common.base.Preconditions;
import org.joml.Vector2ic;
-import org.terasology.world.block.BlockRegion;
-import org.terasology.world.generation.Border3D;
+import org.terasology.engine.world.block.BlockRegion;
+import org.terasology.engine.world.generation.Border3D;
import java.lang.reflect.Array;
diff --git a/engine/src/main/java/org/terasology/world/generation/facets/base/BaseObjectFacet3D.java b/engine/src/main/java/org/terasology/world/generation/facets/base/BaseObjectFacet3D.java
index 32ba8ed2a..6c3e5c4fa 100644
--- a/engine/src/main/java/org/terasology/world/generation/facets/base/BaseObjectFacet3D.java
+++ b/engine/src/main/java/org/terasology/world/generation/facets/base/BaseObjectFacet3D.java
@@ -1,11 +1,11 @@
// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.world.generation.facets.base;
+package org.terasology.engine.world.generation.facets.base;
import com.google.common.base.Preconditions;
import org.joml.Vector3ic;
-import org.terasology.world.block.BlockRegion;
-import org.terasology.world.generation.Border3D;
+import org.terasology.engine.world.block.BlockRegion;
+import org.terasology.engine.world.generation.Border3D;
import java.lang.reflect.Array;
diff --git a/engine/src/main/java/org/terasology/world/generation/facets/base/BaseSparseFacet2D.java b/engine/src/main/java/org/terasology/world/generation/facets/base/BaseSparseFacet2D.java
index a32f4acf9..5f3949bda 100644
--- a/engine/src/main/java/org/terasology/world/generation/facets/base/BaseSparseFacet2D.java
+++ b/engine/src/main/java/org/terasology/world/generation/facets/base/BaseSparseFacet2D.java
@@ -1,27 +1,14 @@
-/*
- * Copyright 2018 MovingBlocks
- *
- * 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 org.terasology.world.generation.facets.base;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.world.generation.facets.base;
import org.joml.Vector2i;
import org.joml.Vector2ic;
import org.joml.Vector3i;
-import org.terasology.world.block.BlockAreac;
-import org.terasology.world.block.BlockRegion;
-import org.terasology.world.generation.Border3D;
-import org.terasology.world.generation.WorldFacet2D;
+import org.terasology.engine.world.block.BlockAreac;
+import org.terasology.engine.world.block.BlockRegion;
+import org.terasology.engine.world.generation.Border3D;
+import org.terasology.engine.world.generation.WorldFacet2D;
/***
* A base class for sparse (map-based) 2D facets.
diff --git a/engine/src/main/java/org/terasology/world/generation/facets/base/BaseStrictlySparseFieldFacet2D.java b/engine/src/main/java/org/terasology/world/generation/facets/base/BaseStrictlySparseFieldFacet2D.java
index e3e5482a0..996291590 100644
--- a/engine/src/main/java/org/terasology/world/generation/facets/base/BaseStrictlySparseFieldFacet2D.java
+++ b/engine/src/main/java/org/terasology/world/generation/facets/base/BaseStrictlySparseFieldFacet2D.java
@@ -1,24 +1,11 @@
-/*
- * Copyright 2018 MovingBlocks
- *
- * 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 org.terasology.world.generation.facets.base;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.world.generation.facets.base;
import org.joml.Vector2i;
import org.joml.Vector2ic;
-import org.terasology.world.block.BlockRegion;
-import org.terasology.world.generation.Border3D;
+import org.terasology.engine.world.block.BlockRegion;
+import org.terasology.engine.world.generation.Border3D;
import java.util.HashMap;
import java.util.Optional;
diff --git a/engine/src/main/java/org/terasology/world/generation/facets/base/BooleanFieldFacet2D.java b/engine/src/main/java/org/terasology/world/generation/facets/base/BooleanFieldFacet2D.java
index 5aed8c69b..5cfa3452d 100644
--- a/engine/src/main/java/org/terasology/world/generation/facets/base/BooleanFieldFacet2D.java
+++ b/engine/src/main/java/org/terasology/world/generation/facets/base/BooleanFieldFacet2D.java
@@ -1,22 +1,9 @@
-/*
- * Copyright 2014 MovingBlocks
- *
- * 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 org.terasology.world.generation.facets.base;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.world.generation.facets.base;
import org.joml.Vector2ic;
-import org.terasology.world.generation.WorldFacet2D;
+import org.terasology.engine.world.generation.WorldFacet2D;
/**
* A {@link WorldFacet2D}-based facet that provides boolean values
diff --git a/engine/src/main/java/org/terasology/world/generation/facets/base/BooleanFieldFacet3D.java b/engine/src/main/java/org/terasology/world/generation/facets/base/BooleanFieldFacet3D.java
index fd7028104..5899e179b 100644
--- a/engine/src/main/java/org/terasology/world/generation/facets/base/BooleanFieldFacet3D.java
+++ b/engine/src/main/java/org/terasology/world/generation/facets/base/BooleanFieldFacet3D.java
@@ -1,9 +1,9 @@
// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.world.generation.facets.base;
+package org.terasology.engine.world.generation.facets.base;
import org.joml.Vector3ic;
-import org.terasology.world.generation.WorldFacet3D;
+import org.terasology.engine.world.generation.WorldFacet3D;
/**
*/
diff --git a/engine/src/main/java/org/terasology/world/generation/facets/base/FieldFacet2D.java b/engine/src/main/java/org/terasology/world/generation/facets/base/FieldFacet2D.java
index eb3563a40..c12aa6d7a 100644
--- a/engine/src/main/java/org/terasology/world/generation/facets/base/FieldFacet2D.java
+++ b/engine/src/main/java/org/terasology/world/generation/facets/base/FieldFacet2D.java
@@ -1,22 +1,9 @@
-/*
- * Copyright 2014 MovingBlocks
- *
- * 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 org.terasology.world.generation.facets.base;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.world.generation.facets.base;
import org.joml.Vector2ic;
-import org.terasology.world.generation.WorldFacet2D;
+import org.terasology.engine.world.generation.WorldFacet2D;
/**
*/
diff --git a/engine/src/main/java/org/terasology/world/generation/facets/base/FieldFacet3D.java b/engine/src/main/java/org/terasology/world/generation/facets/base/FieldFacet3D.java
index fd89d15ed..d683a73b7 100644
--- a/engine/src/main/java/org/terasology/world/generation/facets/base/FieldFacet3D.java
+++ b/engine/src/main/java/org/terasology/world/generation/facets/base/FieldFacet3D.java
@@ -1,9 +1,9 @@
// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.world.generation.facets.base;
+package org.terasology.engine.world.generation.facets.base;
import org.joml.Vector3ic;
-import org.terasology.world.generation.WorldFacet3D;
+import org.terasology.engine.world.generation.WorldFacet3D;
/**
*/
diff --git a/engine/src/main/java/org/terasology/world/generation/facets/base/ObjectFacet2D.java b/engine/src/main/java/org/terasology/world/generation/facets/base/ObjectFacet2D.java
index e3e1ff497..09132038e 100644
--- a/engine/src/main/java/org/terasology/world/generation/facets/base/ObjectFacet2D.java
+++ b/engine/src/main/java/org/terasology/world/generation/facets/base/ObjectFacet2D.java
@@ -1,22 +1,9 @@
-/*
- * Copyright 2014 MovingBlocks
- *
- * 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 org.terasology.world.generation.facets.base;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.world.generation.facets.base;
import org.joml.Vector2ic;
-import org.terasology.world.generation.WorldFacet2D;
+import org.terasology.engine.world.generation.WorldFacet2D;
/**
*/
diff --git a/engine/src/main/java/org/terasology/world/generation/facets/base/ObjectFacet3D.java b/engine/src/main/java/org/terasology/world/generation/facets/base/ObjectFacet3D.java
index 693021e7c..54b3a3101 100644
--- a/engine/src/main/java/org/terasology/world/generation/facets/base/ObjectFacet3D.java
+++ b/engine/src/main/java/org/terasology/world/generation/facets/base/ObjectFacet3D.java
@@ -1,22 +1,9 @@
-/*
- * Copyright 2014 MovingBlocks
- *
- * 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 org.terasology.world.generation.facets.base;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.world.generation.facets.base;
import org.joml.Vector3ic;
-import org.terasology.world.generation.WorldFacet3D;
+import org.terasology.engine.world.generation.WorldFacet3D;
/**
*/
diff --git a/engine/src/main/java/org/terasology/world/generation/facets/base/SparseBooleanFieldFacet3D.java b/engine/src/main/java/org/terasology/world/generation/facets/base/SparseBooleanFieldFacet3D.java
index 717774721..e0b42010c 100644
--- a/engine/src/main/java/org/terasology/world/generation/facets/base/SparseBooleanFieldFacet3D.java
+++ b/engine/src/main/java/org/terasology/world/generation/facets/base/SparseBooleanFieldFacet3D.java
@@ -1,26 +1,13 @@
-/*
- * Copyright 2014 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.world.generation.facets.base;
+package org.terasology.engine.world.generation.facets.base;
import com.google.common.collect.Maps;
import org.joml.Vector3i;
import org.joml.Vector3ic;
-import org.terasology.world.block.BlockRegionc;
-import org.terasology.world.generation.Border3D;
+import org.terasology.engine.world.block.BlockRegionc;
+import org.terasology.engine.world.generation.Border3D;
import java.util.Collections;
import java.util.Map;
diff --git a/engine/src/main/java/org/terasology/world/generation/facets/base/SparseFacet3D.java b/engine/src/main/java/org/terasology/world/generation/facets/base/SparseFacet3D.java
index 7f560afca..9031125fc 100644
--- a/engine/src/main/java/org/terasology/world/generation/facets/base/SparseFacet3D.java
+++ b/engine/src/main/java/org/terasology/world/generation/facets/base/SparseFacet3D.java
@@ -1,26 +1,13 @@
-/*
- * Copyright 2014 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.world.generation.facets.base;
+package org.terasology.engine.world.generation.facets.base;
import org.joml.Vector3i;
-import org.terasology.world.block.BlockRegion;
-import org.terasology.world.block.BlockRegionc;
-import org.terasology.world.generation.Border3D;
-import org.terasology.world.generation.WorldFacet3D;
+import org.terasology.engine.world.block.BlockRegion;
+import org.terasology.engine.world.block.BlockRegionc;
+import org.terasology.engine.world.generation.Border3D;
+import org.terasology.engine.world.generation.WorldFacet3D;
/**
* A base class for sparse (map-based) implementations of {@link WorldFacet3D}.
diff --git a/engine/src/main/java/org/terasology/world/generation/facets/base/SparseFieldFacet3D.java b/engine/src/main/java/org/terasology/world/generation/facets/base/SparseFieldFacet3D.java
index 5e7e55da5..743dd44e4 100644
--- a/engine/src/main/java/org/terasology/world/generation/facets/base/SparseFieldFacet3D.java
+++ b/engine/src/main/java/org/terasology/world/generation/facets/base/SparseFieldFacet3D.java
@@ -1,13 +1,13 @@
// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.world.generation.facets.base;
+package org.terasology.engine.world.generation.facets.base;
import com.google.common.collect.Maps;
import org.joml.Vector3i;
import org.joml.Vector3ic;
-import org.terasology.world.block.BlockRegionc;
-import org.terasology.world.generation.Border3D;
+import org.terasology.engine.world.block.BlockRegionc;
+import org.terasology.engine.world.generation.Border3D;
import java.util.Collections;
import java.util.Map;
diff --git a/engine/src/main/java/org/terasology/world/generation/facets/base/SparseObjectFacet3D.java b/engine/src/main/java/org/terasology/world/generation/facets/base/SparseObjectFacet3D.java
index 1800df0d6..7a78ab323 100644
--- a/engine/src/main/java/org/terasology/world/generation/facets/base/SparseObjectFacet3D.java
+++ b/engine/src/main/java/org/terasology/world/generation/facets/base/SparseObjectFacet3D.java
@@ -1,26 +1,13 @@
-/*
- * Copyright 2014 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.world.generation.facets.base;
+package org.terasology.engine.world.generation.facets.base;
import com.google.common.collect.Maps;
import org.joml.Vector3i;
import org.joml.Vector3ic;
-import org.terasology.world.block.BlockRegionc;
-import org.terasology.world.generation.Border3D;
+import org.terasology.engine.world.block.BlockRegionc;
+import org.terasology.engine.world.generation.Border3D;
import java.util.Collections;
import java.util.Map;
diff --git a/engine/src/main/java/org/terasology/world/generation/facets/base/VerticallySparseBooleanFacet3D.java b/engine/src/main/java/org/terasology/world/generation/facets/base/VerticallySparseBooleanFacet3D.java
index c987c9c94..3f42e097b 100644
--- a/engine/src/main/java/org/terasology/world/generation/facets/base/VerticallySparseBooleanFacet3D.java
+++ b/engine/src/main/java/org/terasology/world/generation/facets/base/VerticallySparseBooleanFacet3D.java
@@ -1,14 +1,14 @@
-// Copyright 2020 The Terasology Foundation
+// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.world.generation.facets.base;
+package org.terasology.engine.world.generation.facets.base;
import org.joml.Vector3i;
import org.joml.Vector3ic;
-import org.terasology.world.block.BlockRegion;
-import org.terasology.world.block.BlockRegionc;
-import org.terasology.world.generation.Border3D;
-import org.terasology.world.generation.WorldFacet3D;
+import org.terasology.engine.world.block.BlockRegion;
+import org.terasology.engine.world.block.BlockRegionc;
+import org.terasology.engine.world.generation.Border3D;
+import org.terasology.engine.world.generation.WorldFacet3D;
import java.util.HashSet;
import java.util.Set;
diff --git a/engine/src/main/java/org/terasology/world/generation/facets/base/package-info.java b/engine/src/main/java/org/terasology/world/generation/facets/base/package-info.java
index 69a197f53..ee39e9f6c 100644
--- a/engine/src/main/java/org/terasology/world/generation/facets/base/package-info.java
+++ b/engine/src/main/java/org/terasology/world/generation/facets/base/package-info.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2014 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-@API package org.terasology.world.generation.facets.base;
+@API package org.terasology.engine.world.generation.facets.base;
import org.terasology.module.sandbox.API;
diff --git a/engine/src/main/java/org/terasology/world/generation/facets/package-info.java b/engine/src/main/java/org/terasology/world/generation/facets/package-info.java
index ff0f41a96..51acfb380 100644
--- a/engine/src/main/java/org/terasology/world/generation/facets/package-info.java
+++ b/engine/src/main/java/org/terasology/world/generation/facets/package-info.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2014 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-@API package org.terasology.world.generation.facets;
+@API package org.terasology.engine.world.generation.facets;
import org.terasology.module.sandbox.API;
diff --git a/engine/src/main/java/org/terasology/world/generation/impl/EntityBufferImpl.java b/engine/src/main/java/org/terasology/world/generation/impl/EntityBufferImpl.java
index 41fad27be..0c3def90c 100644
--- a/engine/src/main/java/org/terasology/world/generation/impl/EntityBufferImpl.java
+++ b/engine/src/main/java/org/terasology/world/generation/impl/EntityBufferImpl.java
@@ -1,10 +1,10 @@
// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.world.generation.impl;
+package org.terasology.engine.world.generation.impl;
-import org.terasology.entitySystem.entity.EntityStore;
-import org.terasology.world.generation.EntityBuffer;
+import org.terasology.engine.entitySystem.entity.EntityStore;
+import org.terasology.engine.world.generation.EntityBuffer;
import java.util.ArrayList;
import java.util.Collections;
diff --git a/engine/src/main/java/org/terasology/world/generation/package-info.java b/engine/src/main/java/org/terasology/world/generation/package-info.java
index 95991cd1f..f1e6cd17c 100644
--- a/engine/src/main/java/org/terasology/world/generation/package-info.java
+++ b/engine/src/main/java/org/terasology/world/generation/package-info.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2014 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-@API package org.terasology.world.generation;
+@API package org.terasology.engine.world.generation;
import org.terasology.module.sandbox.API;
diff --git a/engine/src/main/java/org/terasology/world/generator/ChunkGenerationPass.java b/engine/src/main/java/org/terasology/world/generator/ChunkGenerationPass.java
index e2e80444f..3a9d77fe6 100644
--- a/engine/src/main/java/org/terasology/world/generator/ChunkGenerationPass.java
+++ b/engine/src/main/java/org/terasology/world/generator/ChunkGenerationPass.java
@@ -1,22 +1,9 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.world.generator;
+package org.terasology.engine.world.generator;
-import org.terasology.world.chunks.CoreChunk;
+import org.terasology.engine.world.chunks.CoreChunk;
import java.util.Map;
diff --git a/engine/src/main/java/org/terasology/world/generator/RegisterWorldGenerator.java b/engine/src/main/java/org/terasology/world/generator/RegisterWorldGenerator.java
index 8c11b1b1c..50295a1e4 100644
--- a/engine/src/main/java/org/terasology/world/generator/RegisterWorldGenerator.java
+++ b/engine/src/main/java/org/terasology/world/generator/RegisterWorldGenerator.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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 org.terasology.world.generator;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.world.generator;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
@@ -21,7 +8,7 @@ import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
/**
- * Marks a class as world generator. Field annotated with {@link org.terasology.registry.In} will
+ * Marks a class as world generator. Field annotated with {@link org.terasology.engine.registry.In} will
* be injected after construction.
*/
@Retention(RetentionPolicy.RUNTIME)
diff --git a/engine/src/main/java/org/terasology/world/generator/ScalableWorldGenerator.java b/engine/src/main/java/org/terasology/world/generator/ScalableWorldGenerator.java
index 82442745f..62ce895eb 100644
--- a/engine/src/main/java/org/terasology/world/generator/ScalableWorldGenerator.java
+++ b/engine/src/main/java/org/terasology/world/generator/ScalableWorldGenerator.java
@@ -1,10 +1,9 @@
// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.world.generator;
+package org.terasology.engine.world.generator;
-import org.terasology.world.chunks.CoreChunk;
-import org.terasology.world.generation.EntityBuffer;
+import org.terasology.engine.world.chunks.CoreChunk;
public interface ScalableWorldGenerator extends WorldGenerator {
/**
diff --git a/engine/src/main/java/org/terasology/world/generator/UnresolvedWorldGeneratorException.java b/engine/src/main/java/org/terasology/world/generator/UnresolvedWorldGeneratorException.java
index 06285c48d..7bb36730d 100644
--- a/engine/src/main/java/org/terasology/world/generator/UnresolvedWorldGeneratorException.java
+++ b/engine/src/main/java/org/terasology/world/generator/UnresolvedWorldGeneratorException.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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 org.terasology.world.generator;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.world.generator;
/**
*/
diff --git a/engine/src/main/java/org/terasology/world/generator/WorldConfigurator.java b/engine/src/main/java/org/terasology/world/generator/WorldConfigurator.java
index f279f4f43..0c7ba35b3 100644
--- a/engine/src/main/java/org/terasology/world/generator/WorldConfigurator.java
+++ b/engine/src/main/java/org/terasology/world/generator/WorldConfigurator.java
@@ -1,8 +1,8 @@
// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.world.generator;
+package org.terasology.engine.world.generator;
-import org.terasology.entitySystem.Component;
+import org.terasology.engine.entitySystem.Component;
import java.util.Map;
diff --git a/engine/src/main/java/org/terasology/world/generator/WorldConfiguratorAdapter.java b/engine/src/main/java/org/terasology/world/generator/WorldConfiguratorAdapter.java
index f6e3385ce..be27cb316 100644
--- a/engine/src/main/java/org/terasology/world/generator/WorldConfiguratorAdapter.java
+++ b/engine/src/main/java/org/terasology/world/generator/WorldConfiguratorAdapter.java
@@ -1,8 +1,8 @@
// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.world.generator;
+package org.terasology.engine.world.generator;
-import org.terasology.entitySystem.Component;
+import org.terasology.engine.entitySystem.Component;
import java.util.Collections;
import java.util.Map;
diff --git a/engine/src/main/java/org/terasology/world/generator/WorldGenerator.java b/engine/src/main/java/org/terasology/world/generator/WorldGenerator.java
index a022ce770..ef22f7fde 100644
--- a/engine/src/main/java/org/terasology/world/generator/WorldGenerator.java
+++ b/engine/src/main/java/org/terasology/world/generator/WorldGenerator.java
@@ -1,29 +1,17 @@
-/*
- * Copyright 2015 MovingBlocks
- *
- * 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 org.terasology.world.generator;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.world.generator;
import org.joml.Vector3fc;
-import org.terasology.engine.SimpleUri;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.logic.spawner.FixedSpawner;
-import org.terasology.world.chunks.CoreChunk;
-import org.terasology.world.generation.EntityBuffer;
-import org.terasology.world.generation.World;
-import org.terasology.world.zones.Zone;
+import org.terasology.engine.core.SimpleUri;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.logic.spawner.FixedSpawner;
+import org.terasology.engine.world.generation.BaseFacetedWorldGenerator;
+import org.terasology.engine.world.generation.EntityBuffer;
+import org.terasology.engine.world.generation.World;
+import org.terasology.engine.world.chunks.CoreChunk;
+import org.terasology.engine.world.zones.Zone;
import java.util.List;
@@ -44,7 +32,7 @@ public interface WorldGenerator {
/**
* Sets the seed to use for creating of the world made by this world generator.
*
- * NOTE: this is a String value. The long value used in {@link org.terasology.world.generation.BaseFacetedWorldGenerator},
+ * NOTE: this is a String value. The long value used in {@link BaseFacetedWorldGenerator},
* which is the most commonly used implementation of this interface, is calculated as hash of this String value.
*
* @param seed Value of the seed
diff --git a/engine/src/main/java/org/terasology/world/generator/internal/WorldGeneratorInfo.java b/engine/src/main/java/org/terasology/world/generator/internal/WorldGeneratorInfo.java
index 126ded429..9deea3517 100644
--- a/engine/src/main/java/org/terasology/world/generator/internal/WorldGeneratorInfo.java
+++ b/engine/src/main/java/org/terasology/world/generator/internal/WorldGeneratorInfo.java
@@ -1,21 +1,8 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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 org.terasology.world.generator.internal;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.world.generator.internal;
-import org.terasology.engine.SimpleUri;
+import org.terasology.engine.core.SimpleUri;
import java.util.Objects;
diff --git a/engine/src/main/java/org/terasology/world/generator/internal/WorldGeneratorManager.java b/engine/src/main/java/org/terasology/world/generator/internal/WorldGeneratorManager.java
index e9875b1ff..5a40da40b 100644
--- a/engine/src/main/java/org/terasology/world/generator/internal/WorldGeneratorManager.java
+++ b/engine/src/main/java/org/terasology/world/generator/internal/WorldGeneratorManager.java
@@ -1,23 +1,23 @@
// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.world.generator.internal;
+package org.terasology.engine.world.generator.internal;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Lists;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.terasology.context.Context;
-import org.terasology.engine.SimpleUri;
-import org.terasology.engine.module.ModuleManager;
+import org.terasology.engine.context.Context;
+import org.terasology.engine.core.SimpleUri;
+import org.terasology.engine.core.module.ModuleManager;
import org.terasology.module.DependencyResolver;
import org.terasology.module.Module;
import org.terasology.module.ModuleEnvironment;
import org.terasology.module.ResolutionResult;
import org.terasology.naming.Name;
-import org.terasology.registry.InjectionHelper;
-import org.terasology.world.generator.RegisterWorldGenerator;
-import org.terasology.world.generator.UnresolvedWorldGeneratorException;
-import org.terasology.world.generator.WorldGenerator;
+import org.terasology.engine.registry.InjectionHelper;
+import org.terasology.engine.world.generator.RegisterWorldGenerator;
+import org.terasology.engine.world.generator.UnresolvedWorldGeneratorException;
+import org.terasology.engine.world.generator.WorldGenerator;
import java.lang.reflect.InvocationTargetException;
import java.util.Collections;
diff --git a/engine/src/main/java/org/terasology/world/generator/package-info.java b/engine/src/main/java/org/terasology/world/generator/package-info.java
index 1e9ecdd05..e91056435 100644
--- a/engine/src/main/java/org/terasology/world/generator/package-info.java
+++ b/engine/src/main/java/org/terasology/world/generator/package-info.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-@API package org.terasology.world.generator;
+@API package org.terasology.engine.world.generator;
import org.terasology.module.sandbox.API;
diff --git a/engine/src/main/java/org/terasology/world/generator/plugin/DefaultWorldGeneratorPluginLibrary.java b/engine/src/main/java/org/terasology/world/generator/plugin/DefaultWorldGeneratorPluginLibrary.java
index 5acfaa4a7..42eeee2e3 100644
--- a/engine/src/main/java/org/terasology/world/generator/plugin/DefaultWorldGeneratorPluginLibrary.java
+++ b/engine/src/main/java/org/terasology/world/generator/plugin/DefaultWorldGeneratorPluginLibrary.java
@@ -1,10 +1,10 @@
// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.world.generator.plugin;
+package org.terasology.engine.world.generator.plugin;
import com.google.common.collect.Lists;
import org.terasology.assets.ResourceUrn;
-import org.terasology.context.Context;
+import org.terasology.engine.context.Context;
import org.terasology.module.ModuleEnvironment;
import org.terasology.reflection.copy.CopyStrategyLibrary;
import org.terasology.reflection.metadata.ClassLibrary;
diff --git a/engine/src/main/java/org/terasology/world/generator/plugin/RegisterPlugin.java b/engine/src/main/java/org/terasology/world/generator/plugin/RegisterPlugin.java
index b079f0e04..f6af70b2e 100644
--- a/engine/src/main/java/org/terasology/world/generator/plugin/RegisterPlugin.java
+++ b/engine/src/main/java/org/terasology/world/generator/plugin/RegisterPlugin.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2014 MovingBlocks
- *
- * 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 org.terasology.world.generator.plugin;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.world.generator.plugin;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
diff --git a/engine/src/main/java/org/terasology/world/generator/plugin/TempWorldGeneratorPluginLibrary.java b/engine/src/main/java/org/terasology/world/generator/plugin/TempWorldGeneratorPluginLibrary.java
index 5b82177d2..b07abb783 100644
--- a/engine/src/main/java/org/terasology/world/generator/plugin/TempWorldGeneratorPluginLibrary.java
+++ b/engine/src/main/java/org/terasology/world/generator/plugin/TempWorldGeneratorPluginLibrary.java
@@ -1,21 +1,8 @@
-/*
- * Copyright 2014 MovingBlocks
- *
- * 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 org.terasology.world.generator.plugin;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.world.generator.plugin;
-import org.terasology.context.Context;
+import org.terasology.engine.context.Context;
import org.terasology.module.ModuleEnvironment;
/**
diff --git a/engine/src/main/java/org/terasology/world/generator/plugin/WorldGeneratorPlugin.java b/engine/src/main/java/org/terasology/world/generator/plugin/WorldGeneratorPlugin.java
index f390c926b..cc4e260a3 100644
--- a/engine/src/main/java/org/terasology/world/generator/plugin/WorldGeneratorPlugin.java
+++ b/engine/src/main/java/org/terasology/world/generator/plugin/WorldGeneratorPlugin.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2014 MovingBlocks
- *
- * 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 org.terasology.world.generator.plugin;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.world.generator.plugin;
/**
*/
diff --git a/engine/src/main/java/org/terasology/world/generator/plugin/WorldGeneratorPluginLibrary.java b/engine/src/main/java/org/terasology/world/generator/plugin/WorldGeneratorPluginLibrary.java
index e116b9b1a..db2dc0d8e 100644
--- a/engine/src/main/java/org/terasology/world/generator/plugin/WorldGeneratorPluginLibrary.java
+++ b/engine/src/main/java/org/terasology/world/generator/plugin/WorldGeneratorPluginLibrary.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2014 MovingBlocks
- *
- * 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 org.terasology.world.generator.plugin;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.world.generator.plugin;
import java.util.List;
diff --git a/engine/src/main/java/org/terasology/world/generator/plugin/package-info.java b/engine/src/main/java/org/terasology/world/generator/plugin/package-info.java
index 71a0f1ad3..85f718af5 100644
--- a/engine/src/main/java/org/terasology/world/generator/plugin/package-info.java
+++ b/engine/src/main/java/org/terasology/world/generator/plugin/package-info.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2014 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-@API package org.terasology.world.generator.plugin;
+@API package org.terasology.engine.world.generator.plugin;
import org.terasology.module.sandbox.API;
diff --git a/engine/src/main/java/org/terasology/world/internal/AbstractWorldProviderDecorator.java b/engine/src/main/java/org/terasology/world/internal/AbstractWorldProviderDecorator.java
index 451e56170..dd1435e17 100644
--- a/engine/src/main/java/org/terasology/world/internal/AbstractWorldProviderDecorator.java
+++ b/engine/src/main/java/org/terasology/world/internal/AbstractWorldProviderDecorator.java
@@ -1,14 +1,14 @@
// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.world.internal;
+package org.terasology.engine.world.internal;
import org.joml.Vector3ic;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.world.WorldChangeListener;
-import org.terasology.world.block.Block;
-import org.terasology.world.block.BlockRegionc;
-import org.terasology.world.time.WorldTime;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.world.WorldChangeListener;
+import org.terasology.engine.world.block.Block;
+import org.terasology.engine.world.block.BlockRegionc;
+import org.terasology.engine.world.time.WorldTime;
import java.util.Collection;
import java.util.Map;
diff --git a/engine/src/main/java/org/terasology/world/internal/ChunkViewCore.java b/engine/src/main/java/org/terasology/world/internal/ChunkViewCore.java
index ce4d1cfd1..e91b6d0cb 100644
--- a/engine/src/main/java/org/terasology/world/internal/ChunkViewCore.java
+++ b/engine/src/main/java/org/terasology/world/internal/ChunkViewCore.java
@@ -1,15 +1,16 @@
// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.world.internal;
+package org.terasology.engine.world.internal;
import org.joml.Vector3ic;
-import org.terasology.world.ChunkView;
+import org.terasology.engine.world.chunks.Chunks;
+import org.terasology.engine.world.ChunkView;
public interface ChunkViewCore extends ChunkView {
/**
- * Sets the light level at the given position. the value is usually bounded by {@link org.terasology.world.chunks.Chunks#MAX_LIGHT}
+ * Sets the light level at the given position. the value is usually bounded by {@link Chunks#MAX_LIGHT}
*
* @param pos The position relative to the corner of the chunk
* @param light set the light value of a block.
@@ -17,7 +18,7 @@ public interface ChunkViewCore extends ChunkView {
void setLight(Vector3ic pos, byte light);
/**
- * Sets the light level at the given coordinates. the value is usually bounded by {@link org.terasology.world.chunks.Chunks#MAX_LIGHT}
+ * Sets the light level at the given coordinates. the value is usually bounded by {@link Chunks#MAX_LIGHT}
*
* @param blockX X offset from the corner of the chunk
* @param blockY Y offset from the corner of the chunk
@@ -28,7 +29,7 @@ public interface ChunkViewCore extends ChunkView {
/**
- * Sets the sunlight level at the given position. the value is usually bounded by {@link org.terasology.world.chunks.Chunks#MAX_SUNLIGHT}
+ * Sets the sunlight level at the given position. the value is usually bounded by {@link Chunks#MAX_SUNLIGHT}
*
* @param pos The position relative to the corner of the chunk
* @param light set the sunlight light value of a block.
@@ -37,7 +38,7 @@ public interface ChunkViewCore extends ChunkView {
/**
- * Sets the sunlight level at the given coordinates. the value is usually bounded by {@link org.terasology.world.chunks.Chunks#MAX_SUNLIGHT}
+ * Sets the sunlight level at the given coordinates. the value is usually bounded by {@link Chunks#MAX_SUNLIGHT}
*
* @param blockX X offset from the corner of the chunk
* @param blockY Y offset from the corner of the chunk
diff --git a/engine/src/main/java/org/terasology/world/internal/ChunkViewCoreImpl.java b/engine/src/main/java/org/terasology/world/internal/ChunkViewCoreImpl.java
index 9c4624b17..9a0aa941f 100644
--- a/engine/src/main/java/org/terasology/world/internal/ChunkViewCoreImpl.java
+++ b/engine/src/main/java/org/terasology/world/internal/ChunkViewCoreImpl.java
@@ -1,31 +1,18 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.world.internal;
+package org.terasology.engine.world.internal;
import org.joml.Vector3i;
import org.joml.Vector3ic;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.terasology.math.TeraMath;
-import org.terasology.world.block.Block;
-import org.terasology.world.block.BlockRegion;
-import org.terasology.world.block.BlockRegionc;
-import org.terasology.world.chunks.Chunk;
-import org.terasology.world.chunks.Chunks;
+import org.terasology.engine.world.block.Block;
+import org.terasology.engine.world.block.BlockRegion;
+import org.terasology.engine.world.block.BlockRegionc;
+import org.terasology.engine.world.chunks.Chunk;
+import org.terasology.engine.world.chunks.Chunks;
/**
*/
diff --git a/engine/src/main/java/org/terasology/world/internal/EntityAwareWorldProvider.java b/engine/src/main/java/org/terasology/world/internal/EntityAwareWorldProvider.java
index 1629da18a..cca285a8c 100644
--- a/engine/src/main/java/org/terasology/world/internal/EntityAwareWorldProvider.java
+++ b/engine/src/main/java/org/terasology/world/internal/EntityAwareWorldProvider.java
@@ -1,20 +1,7 @@
-/*
- * Copyright 2016 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.world.internal;
+package org.terasology.engine.world.internal;
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableSet;
@@ -28,35 +15,35 @@ import org.joml.Vector3i;
import org.joml.Vector3ic;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.terasology.context.Context;
-import org.terasology.engine.ComponentSystemManager;
-import org.terasology.engine.GameThread;
-import org.terasology.entitySystem.Component;
-import org.terasology.entitySystem.ComponentContainer;
-import org.terasology.entitySystem.entity.EntityBuilder;
-import org.terasology.entitySystem.entity.EntityManager;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.entitySystem.entity.internal.EngineEntityManager;
-import org.terasology.entitySystem.entity.internal.EntityChangeSubscriber;
-import org.terasology.entitySystem.entity.lifecycleEvents.BeforeDeactivateComponent;
-import org.terasology.entitySystem.entity.lifecycleEvents.BeforeEntityCreated;
-import org.terasology.entitySystem.entity.lifecycleEvents.OnActivatedComponent;
-import org.terasology.entitySystem.entity.lifecycleEvents.OnChangedComponent;
-import org.terasology.entitySystem.event.ReceiveEvent;
-import org.terasology.entitySystem.metadata.ComponentMetadata;
-import org.terasology.entitySystem.prefab.Prefab;
-import org.terasology.entitySystem.systems.UpdateSubscriberSystem;
-import org.terasology.logic.common.RetainComponentsComponent;
-import org.terasology.logic.location.LocationComponent;
-import org.terasology.monitoring.PerformanceMonitor;
-import org.terasology.network.NetworkComponent;
+import org.terasology.engine.context.Context;
+import org.terasology.engine.core.ComponentSystemManager;
+import org.terasology.engine.core.GameThread;
+import org.terasology.engine.entitySystem.Component;
+import org.terasology.engine.entitySystem.ComponentContainer;
+import org.terasology.engine.entitySystem.entity.EntityBuilder;
+import org.terasology.engine.entitySystem.entity.EntityManager;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.entity.internal.EngineEntityManager;
+import org.terasology.engine.entitySystem.entity.internal.EntityChangeSubscriber;
+import org.terasology.engine.entitySystem.entity.lifecycleEvents.BeforeDeactivateComponent;
+import org.terasology.engine.entitySystem.entity.lifecycleEvents.BeforeEntityCreated;
+import org.terasology.engine.entitySystem.entity.lifecycleEvents.OnActivatedComponent;
+import org.terasology.engine.entitySystem.entity.lifecycleEvents.OnChangedComponent;
+import org.terasology.engine.entitySystem.event.ReceiveEvent;
+import org.terasology.engine.entitySystem.metadata.ComponentMetadata;
+import org.terasology.engine.entitySystem.prefab.Prefab;
+import org.terasology.engine.entitySystem.systems.UpdateSubscriberSystem;
+import org.terasology.engine.logic.common.RetainComponentsComponent;
+import org.terasology.engine.logic.location.LocationComponent;
+import org.terasology.engine.monitoring.PerformanceMonitor;
+import org.terasology.engine.network.NetworkComponent;
import org.terasology.reflection.metadata.FieldMetadata;
-import org.terasology.world.BlockEntityRegistry;
-import org.terasology.world.OnChangedBlock;
-import org.terasology.world.block.Block;
-import org.terasology.world.block.BlockComponent;
-import org.terasology.world.block.BlockRegion;
-import org.terasology.world.block.regions.BlockRegionComponent;
+import org.terasology.engine.world.BlockEntityRegistry;
+import org.terasology.engine.world.OnChangedBlock;
+import org.terasology.engine.world.block.Block;
+import org.terasology.engine.world.block.BlockComponent;
+import org.terasology.engine.world.block.BlockRegion;
+import org.terasology.engine.world.block.regions.BlockRegionComponent;
import java.util.Collection;
import java.util.Collections;
diff --git a/engine/src/main/java/org/terasology/world/internal/WorldInfo.java b/engine/src/main/java/org/terasology/world/internal/WorldInfo.java
index e2c8c4755..0687830ec 100644
--- a/engine/src/main/java/org/terasology/world/internal/WorldInfo.java
+++ b/engine/src/main/java/org/terasology/world/internal/WorldInfo.java
@@ -1,22 +1,9 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.world.internal;
+package org.terasology.engine.world.internal;
-import org.terasology.engine.SimpleUri;
+import org.terasology.engine.core.SimpleUri;
/**
* Summary information on a world.
diff --git a/engine/src/main/java/org/terasology/world/internal/WorldProviderCore.java b/engine/src/main/java/org/terasology/world/internal/WorldProviderCore.java
index df6a175d3..b26ab27fb 100644
--- a/engine/src/main/java/org/terasology/world/internal/WorldProviderCore.java
+++ b/engine/src/main/java/org/terasology/world/internal/WorldProviderCore.java
@@ -1,14 +1,14 @@
// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.world.internal;
+package org.terasology.engine.world.internal;
import com.google.common.collect.Maps;
import org.joml.Vector3ic;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.world.WorldChangeListener;
-import org.terasology.world.block.Block;
-import org.terasology.world.block.BlockRegionc;
-import org.terasology.world.time.WorldTime;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.world.WorldChangeListener;
+import org.terasology.engine.world.block.Block;
+import org.terasology.engine.world.block.BlockRegionc;
+import org.terasology.engine.world.time.WorldTime;
import java.util.Collection;
import java.util.Map;
diff --git a/engine/src/main/java/org/terasology/world/internal/WorldProviderCoreImpl.java b/engine/src/main/java/org/terasology/world/internal/WorldProviderCoreImpl.java
index 5306cade3..548eda202 100644
--- a/engine/src/main/java/org/terasology/world/internal/WorldProviderCoreImpl.java
+++ b/engine/src/main/java/org/terasology/world/internal/WorldProviderCoreImpl.java
@@ -1,7 +1,7 @@
// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.world.internal;
+package org.terasology.engine.world.internal;
import com.google.common.base.Predicate;
import com.google.common.collect.FluentIterable;
@@ -9,36 +9,36 @@ import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import org.joml.Vector3i;
import org.joml.Vector3ic;
-import org.terasology.context.Context;
-import org.terasology.engine.SimpleUri;
-import org.terasology.entitySystem.entity.EntityManager;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.world.WorldChangeListener;
-import org.terasology.world.WorldComponent;
-import org.terasology.world.block.Block;
-import org.terasology.world.block.BlockRegion;
-import org.terasology.world.block.BlockRegionc;
-import org.terasology.world.chunks.Chunk;
-import org.terasology.world.chunks.ChunkProvider;
-import org.terasology.world.chunks.Chunks;
-import org.terasology.world.chunks.CoreChunk;
-import org.terasology.world.chunks.LitChunk;
-import org.terasology.world.chunks.ManagedChunk;
-import org.terasology.world.chunks.RenderableChunk;
-import org.terasology.world.propagation.BatchPropagator;
-import org.terasology.world.propagation.BlockChange;
-import org.terasology.world.propagation.PropagationRules;
-import org.terasology.world.propagation.PropagatorWorldView;
-import org.terasology.world.propagation.StandardBatchPropagator;
-import org.terasology.world.propagation.SunlightRegenBatchPropagator;
-import org.terasology.world.propagation.light.LightPropagationRules;
-import org.terasology.world.propagation.light.LightWorldView;
-import org.terasology.world.propagation.light.SunlightPropagationRules;
-import org.terasology.world.propagation.light.SunlightRegenPropagationRules;
-import org.terasology.world.propagation.light.SunlightRegenWorldView;
-import org.terasology.world.propagation.light.SunlightWorldView;
-import org.terasology.world.time.WorldTime;
-import org.terasology.world.time.WorldTimeImpl;
+import org.terasology.engine.context.Context;
+import org.terasology.engine.core.SimpleUri;
+import org.terasology.engine.entitySystem.entity.EntityManager;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.world.propagation.BatchPropagator;
+import org.terasology.engine.world.propagation.BlockChange;
+import org.terasology.engine.world.propagation.PropagationRules;
+import org.terasology.engine.world.propagation.PropagatorWorldView;
+import org.terasology.engine.world.propagation.StandardBatchPropagator;
+import org.terasology.engine.world.propagation.SunlightRegenBatchPropagator;
+import org.terasology.engine.world.propagation.light.LightPropagationRules;
+import org.terasology.engine.world.propagation.light.LightWorldView;
+import org.terasology.engine.world.propagation.light.SunlightPropagationRules;
+import org.terasology.engine.world.propagation.light.SunlightRegenPropagationRules;
+import org.terasology.engine.world.propagation.light.SunlightRegenWorldView;
+import org.terasology.engine.world.propagation.light.SunlightWorldView;
+import org.terasology.engine.world.WorldChangeListener;
+import org.terasology.engine.world.WorldComponent;
+import org.terasology.engine.world.block.Block;
+import org.terasology.engine.world.block.BlockRegion;
+import org.terasology.engine.world.block.BlockRegionc;
+import org.terasology.engine.world.chunks.Chunk;
+import org.terasology.engine.world.chunks.ChunkProvider;
+import org.terasology.engine.world.chunks.Chunks;
+import org.terasology.engine.world.chunks.CoreChunk;
+import org.terasology.engine.world.chunks.LitChunk;
+import org.terasology.engine.world.chunks.ManagedChunk;
+import org.terasology.engine.world.chunks.RenderableChunk;
+import org.terasology.engine.world.time.WorldTime;
+import org.terasology.engine.world.time.WorldTimeImpl;
import java.util.Collection;
import java.util.HashMap;
diff --git a/engine/src/main/java/org/terasology/world/internal/WorldProviderWrapper.java b/engine/src/main/java/org/terasology/world/internal/WorldProviderWrapper.java
index 1b2b05828..a2180aa33 100644
--- a/engine/src/main/java/org/terasology/world/internal/WorldProviderWrapper.java
+++ b/engine/src/main/java/org/terasology/world/internal/WorldProviderWrapper.java
@@ -1,17 +1,17 @@
// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.world.internal;
+package org.terasology.engine.world.internal;
import org.joml.RoundingMode;
import org.joml.Vector3fc;
import org.joml.Vector3i;
import org.joml.Vector3ic;
-import org.terasology.world.WorldChangeListener;
-import org.terasology.world.WorldProvider;
-import org.terasology.world.block.Block;
-import org.terasology.world.block.BlockRegionc;
-import org.terasology.world.chunks.blockdata.ExtraBlockDataManager;
+import org.terasology.engine.world.WorldChangeListener;
+import org.terasology.engine.world.WorldProvider;
+import org.terasology.engine.world.block.Block;
+import org.terasology.engine.world.block.BlockRegionc;
+import org.terasology.engine.world.chunks.blockdata.ExtraBlockDataManager;
import java.util.Collection;
diff --git a/engine/src/main/java/org/terasology/world/package-info.java b/engine/src/main/java/org/terasology/world/package-info.java
index d8dae117e..c4aac5a73 100644
--- a/engine/src/main/java/org/terasology/world/package-info.java
+++ b/engine/src/main/java/org/terasology/world/package-info.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-@API package org.terasology.world;
+@API package org.terasology.engine.world;
import org.terasology.module.sandbox.API;
diff --git a/engine/src/main/java/org/terasology/world/propagation/AbstractFullWorldView.java b/engine/src/main/java/org/terasology/world/propagation/AbstractFullWorldView.java
index e9b3248b9..74fae33ef 100644
--- a/engine/src/main/java/org/terasology/world/propagation/AbstractFullWorldView.java
+++ b/engine/src/main/java/org/terasology/world/propagation/AbstractFullWorldView.java
@@ -1,29 +1,16 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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 org.terasology.world.propagation;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.world.propagation;
import org.joml.Vector3i;
import org.joml.Vector3ic;
-import org.terasology.world.block.Block;
-import org.terasology.world.block.BlockRegion;
-import org.terasology.world.chunks.Chunk;
-import org.terasology.world.chunks.ChunkProvider;
-import org.terasology.world.chunks.Chunks;
-import org.terasology.world.chunks.CoreChunk;
-import org.terasology.world.chunks.LitChunk;
+import org.terasology.engine.world.block.Block;
+import org.terasology.engine.world.block.BlockRegion;
+import org.terasology.engine.world.chunks.Chunk;
+import org.terasology.engine.world.chunks.ChunkProvider;
+import org.terasology.engine.world.chunks.Chunks;
+import org.terasology.engine.world.chunks.CoreChunk;
+import org.terasology.engine.world.chunks.LitChunk;
/**
* A base world view implementation sitting on ChunkProvider.
diff --git a/engine/src/main/java/org/terasology/world/propagation/BatchPropagator.java b/engine/src/main/java/org/terasology/world/propagation/BatchPropagator.java
index b1b846144..7dd3b5d69 100644
--- a/engine/src/main/java/org/terasology/world/propagation/BatchPropagator.java
+++ b/engine/src/main/java/org/terasology/world/propagation/BatchPropagator.java
@@ -1,12 +1,12 @@
// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.world.propagation;
+package org.terasology.engine.world.propagation;
import org.joml.Math;
import org.joml.Vector3ic;
-import org.terasology.math.Side;
-import org.terasology.world.block.Block;
-import org.terasology.world.chunks.LitChunk;
+import org.terasology.engine.math.Side;
+import org.terasology.engine.world.block.Block;
+import org.terasology.engine.world.chunks.LitChunk;
/**
* Handles propagating values through blocks on a block by block basis.
diff --git a/engine/src/main/java/org/terasology/world/propagation/BlockChange.java b/engine/src/main/java/org/terasology/world/propagation/BlockChange.java
index 8327c52fb..3c274cdd8 100644
--- a/engine/src/main/java/org/terasology/world/propagation/BlockChange.java
+++ b/engine/src/main/java/org/terasology/world/propagation/BlockChange.java
@@ -1,23 +1,10 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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 org.terasology.world.propagation;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.world.propagation;
import org.joml.Vector3i;
import org.joml.Vector3ic;
-import org.terasology.world.block.Block;
+import org.terasology.engine.world.block.Block;
/**
* Represents a block change at a given position. Used to update listeners that a block has been changed
diff --git a/engine/src/main/java/org/terasology/world/propagation/LocalChunkView.java b/engine/src/main/java/org/terasology/world/propagation/LocalChunkView.java
index 278a221e4..ed0a53267 100644
--- a/engine/src/main/java/org/terasology/world/propagation/LocalChunkView.java
+++ b/engine/src/main/java/org/terasology/world/propagation/LocalChunkView.java
@@ -1,12 +1,12 @@
-// Copyright 2020 The Terasology Foundation
+// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.world.propagation;
+package org.terasology.engine.world.propagation;
import org.joml.Vector3i;
import org.joml.Vector3ic;
-import org.terasology.world.block.Block;
-import org.terasology.world.chunks.Chunk;
-import org.terasology.world.chunks.Chunks;
+import org.terasology.engine.world.block.Block;
+import org.terasology.engine.world.chunks.Chunk;
+import org.terasology.engine.world.chunks.Chunks;
/**
* Provides a simple view over some chunks using a propagation rule.
diff --git a/engine/src/main/java/org/terasology/world/propagation/PropagationComparison.java b/engine/src/main/java/org/terasology/world/propagation/PropagationComparison.java
index 29caf5edf..3a69df08f 100644
--- a/engine/src/main/java/org/terasology/world/propagation/PropagationComparison.java
+++ b/engine/src/main/java/org/terasology/world/propagation/PropagationComparison.java
@@ -1,20 +1,7 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.world.propagation;
+package org.terasology.engine.world.propagation;
/**
* An enum that describes how propagation rules have changes when blocks are replaced with others
diff --git a/engine/src/main/java/org/terasology/world/propagation/PropagationRules.java b/engine/src/main/java/org/terasology/world/propagation/PropagationRules.java
index 9c7a4cd43..5e69cb62c 100644
--- a/engine/src/main/java/org/terasology/world/propagation/PropagationRules.java
+++ b/engine/src/main/java/org/terasology/world/propagation/PropagationRules.java
@@ -1,11 +1,11 @@
// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.world.propagation;
+package org.terasology.engine.world.propagation;
import org.joml.Vector3ic;
-import org.terasology.math.Side;
-import org.terasology.world.block.Block;
-import org.terasology.world.chunks.LitChunk;
+import org.terasology.engine.math.Side;
+import org.terasology.engine.world.block.Block;
+import org.terasology.engine.world.chunks.LitChunk;
/**
* Rules to drive value propagation.
diff --git a/engine/src/main/java/org/terasology/world/propagation/PropagatorWorldView.java b/engine/src/main/java/org/terasology/world/propagation/PropagatorWorldView.java
index a601ac2b9..a0d473f92 100644
--- a/engine/src/main/java/org/terasology/world/propagation/PropagatorWorldView.java
+++ b/engine/src/main/java/org/terasology/world/propagation/PropagatorWorldView.java
@@ -1,22 +1,9 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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 org.terasology.world.propagation;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.world.propagation;
import org.joml.Vector3ic;
-import org.terasology.world.block.Block;
+import org.terasology.engine.world.block.Block;
/**
* A view providing access to the world specifically for batch propagation
diff --git a/engine/src/main/java/org/terasology/world/propagation/SingleChunkView.java b/engine/src/main/java/org/terasology/world/propagation/SingleChunkView.java
index 9c164d653..d73b51c62 100644
--- a/engine/src/main/java/org/terasology/world/propagation/SingleChunkView.java
+++ b/engine/src/main/java/org/terasology/world/propagation/SingleChunkView.java
@@ -1,24 +1,11 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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 org.terasology.world.propagation;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.world.propagation;
import org.joml.Vector3ic;
-import org.terasology.world.block.Block;
-import org.terasology.world.chunks.Chunks;
-import org.terasology.world.chunks.LitChunk;
+import org.terasology.engine.world.block.Block;
+import org.terasology.engine.world.chunks.Chunks;
+import org.terasology.engine.world.chunks.LitChunk;
/**
* Provides a view over a single chunk using a given propagation rule.
diff --git a/engine/src/main/java/org/terasology/world/propagation/StandardBatchPropagator.java b/engine/src/main/java/org/terasology/world/propagation/StandardBatchPropagator.java
index 220c1fa84..8239e03a0 100644
--- a/engine/src/main/java/org/terasology/world/propagation/StandardBatchPropagator.java
+++ b/engine/src/main/java/org/terasology/world/propagation/StandardBatchPropagator.java
@@ -1,17 +1,17 @@
// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.world.propagation;
+package org.terasology.engine.world.propagation;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
import org.joml.Vector3i;
import org.joml.Vector3ic;
-import org.terasology.math.Side;
-import org.terasology.world.block.Block;
-import org.terasology.world.block.BlockRegion;
-import org.terasology.world.block.BlockRegionc;
-import org.terasology.world.chunks.Chunks;
-import org.terasology.world.chunks.LitChunk;
+import org.terasology.engine.math.Side;
+import org.terasology.engine.world.block.Block;
+import org.terasology.engine.world.block.BlockRegion;
+import org.terasology.engine.world.block.BlockRegionc;
+import org.terasology.engine.world.chunks.Chunks;
+import org.terasology.engine.world.chunks.LitChunk;
import java.util.Arrays;
import java.util.Map;
diff --git a/engine/src/main/java/org/terasology/world/propagation/SunlightRegenBatchPropagator.java b/engine/src/main/java/org/terasology/world/propagation/SunlightRegenBatchPropagator.java
index e3cc5f310..3f37b677b 100644
--- a/engine/src/main/java/org/terasology/world/propagation/SunlightRegenBatchPropagator.java
+++ b/engine/src/main/java/org/terasology/world/propagation/SunlightRegenBatchPropagator.java
@@ -1,14 +1,14 @@
// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.world.propagation;
+package org.terasology.engine.world.propagation;
import com.google.common.collect.Sets;
import org.joml.Vector3i;
import org.joml.Vector3ic;
-import org.terasology.math.Side;
-import org.terasology.world.block.Block;
-import org.terasology.world.chunks.Chunks;
-import org.terasology.world.chunks.LitChunk;
+import org.terasology.engine.math.Side;
+import org.terasology.engine.world.block.Block;
+import org.terasology.engine.world.chunks.Chunks;
+import org.terasology.engine.world.chunks.LitChunk;
import java.util.Arrays;
import java.util.Set;
diff --git a/engine/src/main/java/org/terasology/world/propagation/light/CommonLightPropagationRules.java b/engine/src/main/java/org/terasology/world/propagation/light/CommonLightPropagationRules.java
index 777f95fe3..8159ad0f4 100644
--- a/engine/src/main/java/org/terasology/world/propagation/light/CommonLightPropagationRules.java
+++ b/engine/src/main/java/org/terasology/world/propagation/light/CommonLightPropagationRules.java
@@ -1,24 +1,11 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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 org.terasology.world.propagation.light;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.world.propagation.light;
-import org.terasology.math.Side;
-import org.terasology.world.block.Block;
-import org.terasology.world.propagation.PropagationComparison;
-import org.terasology.world.propagation.PropagationRules;
+import org.terasology.engine.math.Side;
+import org.terasology.engine.world.block.Block;
+import org.terasology.engine.world.propagation.PropagationComparison;
+import org.terasology.engine.world.propagation.PropagationRules;
/**
* Defines a set of common rules for how light should propagate
diff --git a/engine/src/main/java/org/terasology/world/propagation/light/InternalLightProcessor.java b/engine/src/main/java/org/terasology/world/propagation/light/InternalLightProcessor.java
index da3c18fd4..711771213 100644
--- a/engine/src/main/java/org/terasology/world/propagation/light/InternalLightProcessor.java
+++ b/engine/src/main/java/org/terasology/world/propagation/light/InternalLightProcessor.java
@@ -1,30 +1,17 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.world.propagation.light;
+package org.terasology.engine.world.propagation.light;
import org.joml.Vector3i;
-import org.terasology.math.Side;
-import org.terasology.world.block.Block;
-import org.terasology.world.chunks.Chunks;
-import org.terasology.world.chunks.LitChunk;
-import org.terasology.world.propagation.BatchPropagator;
-import org.terasology.world.propagation.PropagationRules;
-import org.terasology.world.propagation.SingleChunkView;
-import org.terasology.world.propagation.StandardBatchPropagator;
+import org.terasology.engine.math.Side;
+import org.terasology.engine.world.block.Block;
+import org.terasology.engine.world.chunks.Chunks;
+import org.terasology.engine.world.chunks.LitChunk;
+import org.terasology.engine.world.propagation.BatchPropagator;
+import org.terasology.engine.world.propagation.PropagationRules;
+import org.terasology.engine.world.propagation.SingleChunkView;
+import org.terasology.engine.world.propagation.StandardBatchPropagator;
/**
* For doing an initial lighting sweep during chunk generation - bound to the chunk and assumed blank slate
diff --git a/engine/src/main/java/org/terasology/world/propagation/light/LightMerger.java b/engine/src/main/java/org/terasology/world/propagation/light/LightMerger.java
index bf31bb206..68602e99c 100644
--- a/engine/src/main/java/org/terasology/world/propagation/light/LightMerger.java
+++ b/engine/src/main/java/org/terasology/world/propagation/light/LightMerger.java
@@ -1,19 +1,19 @@
-// Copyright 2020 The Terasology Foundation
+// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.world.propagation.light;
+package org.terasology.engine.world.propagation.light;
import com.google.common.base.Preconditions;
import com.google.common.collect.Lists;
import org.joml.Vector3i;
-import org.terasology.math.Side;
-import org.terasology.world.chunks.Chunk;
-import org.terasology.world.chunks.LitChunk;
-import org.terasology.world.propagation.BatchPropagator;
-import org.terasology.world.propagation.LocalChunkView;
-import org.terasology.world.propagation.PropagationRules;
-import org.terasology.world.propagation.PropagatorWorldView;
-import org.terasology.world.propagation.StandardBatchPropagator;
-import org.terasology.world.propagation.SunlightRegenBatchPropagator;
+import org.terasology.engine.math.Side;
+import org.terasology.engine.world.chunks.Chunk;
+import org.terasology.engine.world.chunks.LitChunk;
+import org.terasology.engine.world.propagation.BatchPropagator;
+import org.terasology.engine.world.propagation.LocalChunkView;
+import org.terasology.engine.world.propagation.PropagationRules;
+import org.terasology.engine.world.propagation.PropagatorWorldView;
+import org.terasology.engine.world.propagation.StandardBatchPropagator;
+import org.terasology.engine.world.propagation.SunlightRegenBatchPropagator;
import java.util.Arrays;
import java.util.Comparator;
diff --git a/engine/src/main/java/org/terasology/world/propagation/light/LightPropagationRules.java b/engine/src/main/java/org/terasology/world/propagation/light/LightPropagationRules.java
index 0936a38ea..9bf36a659 100644
--- a/engine/src/main/java/org/terasology/world/propagation/light/LightPropagationRules.java
+++ b/engine/src/main/java/org/terasology/world/propagation/light/LightPropagationRules.java
@@ -1,25 +1,12 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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 org.terasology.world.propagation.light;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.world.propagation.light;
import org.joml.Vector3ic;
-import org.terasology.math.Side;
-import org.terasology.world.block.Block;
-import org.terasology.world.chunks.Chunks;
-import org.terasology.world.chunks.LitChunk;
+import org.terasology.engine.math.Side;
+import org.terasology.engine.world.block.Block;
+import org.terasology.engine.world.chunks.Chunks;
+import org.terasology.engine.world.chunks.LitChunk;
/**
* Rules for how standard light should propagate.
diff --git a/engine/src/main/java/org/terasology/world/propagation/light/LightWorldView.java b/engine/src/main/java/org/terasology/world/propagation/light/LightWorldView.java
index 9dd98e583..89cc8e10e 100644
--- a/engine/src/main/java/org/terasology/world/propagation/light/LightWorldView.java
+++ b/engine/src/main/java/org/terasology/world/propagation/light/LightWorldView.java
@@ -1,24 +1,11 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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 org.terasology.world.propagation.light;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.world.propagation.light;
import org.joml.Vector3ic;
-import org.terasology.world.chunks.ChunkProvider;
-import org.terasology.world.chunks.LitChunk;
-import org.terasology.world.propagation.AbstractFullWorldView;
+import org.terasology.engine.world.chunks.ChunkProvider;
+import org.terasology.engine.world.chunks.LitChunk;
+import org.terasology.engine.world.propagation.AbstractFullWorldView;
/**
* Basic world view that provides access to the standard lighting in the world.
diff --git a/engine/src/main/java/org/terasology/world/propagation/light/SunlightPropagationRules.java b/engine/src/main/java/org/terasology/world/propagation/light/SunlightPropagationRules.java
index d19a85d01..841ba93e2 100644
--- a/engine/src/main/java/org/terasology/world/propagation/light/SunlightPropagationRules.java
+++ b/engine/src/main/java/org/terasology/world/propagation/light/SunlightPropagationRules.java
@@ -1,27 +1,14 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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 org.terasology.world.propagation.light;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.world.propagation.light;
import org.joml.Vector3ic;
-import org.terasology.math.Side;
-import org.terasology.world.block.Block;
-import org.terasology.world.chunks.Chunks;
-import org.terasology.world.chunks.LitChunk;
-import org.terasology.world.propagation.PropagatorWorldView;
-import org.terasology.world.propagation.SingleChunkView;
+import org.terasology.engine.math.Side;
+import org.terasology.engine.world.block.Block;
+import org.terasology.engine.world.chunks.Chunks;
+import org.terasology.engine.world.chunks.LitChunk;
+import org.terasology.engine.world.propagation.PropagatorWorldView;
+import org.terasology.engine.world.propagation.SingleChunkView;
/**
* Rules that determine how the sunlight propagates
diff --git a/engine/src/main/java/org/terasology/world/propagation/light/SunlightRegenPropagationRules.java b/engine/src/main/java/org/terasology/world/propagation/light/SunlightRegenPropagationRules.java
index de24ad5b0..0522ac828 100644
--- a/engine/src/main/java/org/terasology/world/propagation/light/SunlightRegenPropagationRules.java
+++ b/engine/src/main/java/org/terasology/world/propagation/light/SunlightRegenPropagationRules.java
@@ -1,13 +1,13 @@
// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.world.propagation.light;
+package org.terasology.engine.world.propagation.light;
import org.joml.Vector3ic;
-import org.terasology.math.Side;
-import org.terasology.world.block.Block;
-import org.terasology.world.chunks.Chunks;
-import org.terasology.world.chunks.LitChunk;
-import org.terasology.world.propagation.PropagationComparison;
+import org.terasology.engine.math.Side;
+import org.terasology.engine.world.block.Block;
+import org.terasology.engine.world.chunks.Chunks;
+import org.terasology.engine.world.chunks.LitChunk;
+import org.terasology.engine.world.propagation.PropagationComparison;
/**
* Defines and interfaces how sunlight values regenerate per block
diff --git a/engine/src/main/java/org/terasology/world/propagation/light/SunlightRegenWorldView.java b/engine/src/main/java/org/terasology/world/propagation/light/SunlightRegenWorldView.java
index 277e40af7..683b5b4cb 100644
--- a/engine/src/main/java/org/terasology/world/propagation/light/SunlightRegenWorldView.java
+++ b/engine/src/main/java/org/terasology/world/propagation/light/SunlightRegenWorldView.java
@@ -1,11 +1,11 @@
// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.world.propagation.light;
+package org.terasology.engine.world.propagation.light;
import org.joml.Vector3ic;
-import org.terasology.world.chunks.ChunkProvider;
-import org.terasology.world.chunks.LitChunk;
-import org.terasology.world.propagation.AbstractFullWorldView;
+import org.terasology.engine.world.chunks.ChunkProvider;
+import org.terasology.engine.world.chunks.LitChunk;
+import org.terasology.engine.world.propagation.AbstractFullWorldView;
/**
* Gets the sunlight regen values from the chunk.
diff --git a/engine/src/main/java/org/terasology/world/propagation/light/SunlightWorldView.java b/engine/src/main/java/org/terasology/world/propagation/light/SunlightWorldView.java
index aa24bde7c..1e6d10dbf 100644
--- a/engine/src/main/java/org/terasology/world/propagation/light/SunlightWorldView.java
+++ b/engine/src/main/java/org/terasology/world/propagation/light/SunlightWorldView.java
@@ -1,24 +1,11 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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 org.terasology.world.propagation.light;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.world.propagation.light;
import org.joml.Vector3ic;
-import org.terasology.world.chunks.ChunkProvider;
-import org.terasology.world.chunks.LitChunk;
-import org.terasology.world.propagation.AbstractFullWorldView;
+import org.terasology.engine.world.chunks.ChunkProvider;
+import org.terasology.engine.world.chunks.LitChunk;
+import org.terasology.engine.world.propagation.AbstractFullWorldView;
/**
* Gets the sunlight from the chunk.
diff --git a/engine/src/main/java/org/terasology/world/selection/BlockSelectionComponent.java b/engine/src/main/java/org/terasology/world/selection/BlockSelectionComponent.java
index 0df2c87cc..5b2c58329 100644
--- a/engine/src/main/java/org/terasology/world/selection/BlockSelectionComponent.java
+++ b/engine/src/main/java/org/terasology/world/selection/BlockSelectionComponent.java
@@ -1,25 +1,13 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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 org.terasology.world.selection;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.world.selection;
import org.joml.Vector3i;
-import org.terasology.entitySystem.Component;
+import org.terasology.engine.entitySystem.Component;
+import org.terasology.engine.logic.selection.MovableSelectionStartEvent;
import org.terasology.module.sandbox.API;
-import org.terasology.rendering.assets.texture.Texture;
-import org.terasology.world.block.BlockRegion;
+import org.terasology.engine.rendering.assets.texture.Texture;
+import org.terasology.engine.world.block.BlockRegion;
/**
*
*
*
*/
diff --git a/engine/src/main/java/org/terasology/entitySystem/ComponentContainer.java b/engine/src/main/java/org/terasology/entitySystem/ComponentContainer.java
index d16fb4661..822ceb6d7 100644
--- a/engine/src/main/java/org/terasology/entitySystem/ComponentContainer.java
+++ b/engine/src/main/java/org/terasology/entitySystem/ComponentContainer.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.entitySystem;
+package org.terasology.engine.entitySystem;
import java.util.List;
diff --git a/engine/src/main/java/org/terasology/entitySystem/MutableComponentContainer.java b/engine/src/main/java/org/terasology/entitySystem/MutableComponentContainer.java
index 706b6300c..08a0efad1 100644
--- a/engine/src/main/java/org/terasology/entitySystem/MutableComponentContainer.java
+++ b/engine/src/main/java/org/terasology/entitySystem/MutableComponentContainer.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.entitySystem;
+package org.terasology.engine.entitySystem;
import java.util.Optional;
import java.util.function.Function;
diff --git a/engine/src/main/java/org/terasology/entitySystem/Owns.java b/engine/src/main/java/org/terasology/entitySystem/Owns.java
index 2dbf0c33b..7e6a32560 100644
--- a/engine/src/main/java/org/terasology/entitySystem/Owns.java
+++ b/engine/src/main/java/org/terasology/entitySystem/Owns.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.terasology.entitySystem;
+package org.terasology.engine.entitySystem;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
diff --git a/engine/src/main/java/org/terasology/entitySystem/entity/EntityBuilder.java b/engine/src/main/java/org/terasology/entitySystem/entity/EntityBuilder.java
index 76d1a74a8..6135aff5e 100644
--- a/engine/src/main/java/org/terasology/entitySystem/entity/EntityBuilder.java
+++ b/engine/src/main/java/org/terasology/entitySystem/entity/EntityBuilder.java
@@ -1,19 +1,19 @@
// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.entitySystem.entity;
+package org.terasology.engine.entitySystem.entity;
import com.google.common.collect.Maps;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.terasology.entitySystem.Component;
-import org.terasology.entitySystem.MutableComponentContainer;
-import org.terasology.entitySystem.entity.internal.EngineEntityManager;
-import org.terasology.entitySystem.entity.internal.EngineEntityPool;
-import org.terasology.entitySystem.entity.internal.EntityInfoComponent;
-import org.terasology.entitySystem.entity.internal.EntityScope;
-import org.terasology.entitySystem.entity.lifecycleEvents.OnActivatedComponent;
-import org.terasology.entitySystem.entity.lifecycleEvents.OnAddedComponent;
-import org.terasology.entitySystem.prefab.Prefab;
+import org.terasology.engine.entitySystem.Component;
+import org.terasology.engine.entitySystem.MutableComponentContainer;
+import org.terasology.engine.entitySystem.entity.internal.EngineEntityManager;
+import org.terasology.engine.entitySystem.entity.internal.EngineEntityPool;
+import org.terasology.engine.entitySystem.entity.internal.EntityInfoComponent;
+import org.terasology.engine.entitySystem.entity.internal.EntityScope;
+import org.terasology.engine.entitySystem.entity.lifecycleEvents.OnActivatedComponent;
+import org.terasology.engine.entitySystem.entity.lifecycleEvents.OnAddedComponent;
+import org.terasology.engine.entitySystem.prefab.Prefab;
import java.util.Collections;
import java.util.List;
diff --git a/engine/src/main/java/org/terasology/entitySystem/entity/EntityManager.java b/engine/src/main/java/org/terasology/entitySystem/entity/EntityManager.java
index 8c962123e..75676102d 100644
--- a/engine/src/main/java/org/terasology/entitySystem/entity/EntityManager.java
+++ b/engine/src/main/java/org/terasology/entitySystem/entity/EntityManager.java
@@ -13,16 +13,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.entitySystem.entity;
+package org.terasology.engine.entitySystem.entity;
-import org.terasology.entitySystem.Component;
-import org.terasology.entitySystem.entity.internal.EngineEntityPool;
-import org.terasology.entitySystem.event.internal.EventSystem;
-import org.terasology.entitySystem.metadata.ComponentLibrary;
-import org.terasology.entitySystem.prefab.PrefabManager;
-import org.terasology.entitySystem.sectors.SectorSimulationComponent;
-import org.terasology.game.GameManifest;
-import org.terasology.world.internal.WorldInfo;
+import org.terasology.engine.entitySystem.Component;
+import org.terasology.engine.entitySystem.entity.internal.EngineEntityPool;
+import org.terasology.engine.entitySystem.event.internal.EventSystem;
+import org.terasology.engine.entitySystem.metadata.ComponentLibrary;
+import org.terasology.engine.entitySystem.prefab.PrefabManager;
+import org.terasology.engine.entitySystem.sectors.SectorSimulationComponent;
+import org.terasology.engine.game.GameManifest;
+import org.terasology.engine.world.internal.WorldInfo;
import java.util.List;
import java.util.Map;
diff --git a/engine/src/main/java/org/terasology/entitySystem/entity/EntityPool.java b/engine/src/main/java/org/terasology/entitySystem/entity/EntityPool.java
index 1a4a43161..c1608971e 100644
--- a/engine/src/main/java/org/terasology/entitySystem/entity/EntityPool.java
+++ b/engine/src/main/java/org/terasology/entitySystem/entity/EntityPool.java
@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.entitySystem.entity;
+package org.terasology.engine.entitySystem.entity;
import org.joml.Quaternionfc;
import org.joml.Vector3fc;
-import org.terasology.entitySystem.Component;
-import org.terasology.entitySystem.prefab.Prefab;
+import org.terasology.engine.entitySystem.Component;
+import org.terasology.engine.entitySystem.prefab.Prefab;
public interface EntityPool {
diff --git a/engine/src/main/java/org/terasology/entitySystem/entity/EntityRef.java b/engine/src/main/java/org/terasology/entitySystem/entity/EntityRef.java
index 95f3f46f0..3a722cfae 100644
--- a/engine/src/main/java/org/terasology/entitySystem/entity/EntityRef.java
+++ b/engine/src/main/java/org/terasology/entitySystem/entity/EntityRef.java
@@ -13,15 +13,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.entitySystem.entity;
+package org.terasology.engine.entitySystem.entity;
import com.google.common.base.Objects;
-import org.terasology.entitySystem.MutableComponentContainer;
-import org.terasology.entitySystem.entity.internal.EntityScope;
-import org.terasology.entitySystem.entity.internal.NullEntityRef;
-import org.terasology.entitySystem.event.Event;
-import org.terasology.entitySystem.prefab.Prefab;
-import org.terasology.entitySystem.sectors.SectorSimulationComponent;
+import org.terasology.engine.entitySystem.MutableComponentContainer;
+import org.terasology.engine.entitySystem.entity.internal.EntityScope;
+import org.terasology.engine.entitySystem.entity.internal.NullEntityRef;
+import org.terasology.engine.entitySystem.event.Event;
+import org.terasology.engine.entitySystem.prefab.Prefab;
+import org.terasology.engine.entitySystem.sectors.SectorSimulationComponent;
/**
* A wrapper around an entity id providing access to common functionality
diff --git a/engine/src/main/java/org/terasology/entitySystem/entity/EntityStore.java b/engine/src/main/java/org/terasology/entitySystem/entity/EntityStore.java
index 1263d01c0..87c4623b6 100644
--- a/engine/src/main/java/org/terasology/entitySystem/entity/EntityStore.java
+++ b/engine/src/main/java/org/terasology/entitySystem/entity/EntityStore.java
@@ -13,13 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.entitySystem.entity;
+package org.terasology.engine.entitySystem.entity;
import com.google.common.collect.Maps;
-import org.terasology.entitySystem.Component;
-import org.terasology.entitySystem.MutableComponentContainer;
-import org.terasology.entitySystem.prefab.Prefab;
+import org.terasology.engine.entitySystem.Component;
+import org.terasology.engine.entitySystem.MutableComponentContainer;
+import org.terasology.engine.entitySystem.prefab.Prefab;
import java.util.Collections;
import java.util.List;
diff --git a/engine/src/main/java/org/terasology/entitySystem/entity/LowLevelEntityManager.java b/engine/src/main/java/org/terasology/entitySystem/entity/LowLevelEntityManager.java
index a1785158d..06a61f3f8 100644
--- a/engine/src/main/java/org/terasology/entitySystem/entity/LowLevelEntityManager.java
+++ b/engine/src/main/java/org/terasology/entitySystem/entity/LowLevelEntityManager.java
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.entitySystem.entity;
+package org.terasology.engine.entitySystem.entity;
-import org.terasology.entitySystem.Component;
-import org.terasology.entitySystem.entity.internal.EngineEntityPool;
-import org.terasology.entitySystem.entity.internal.EngineSectorManager;
+import org.terasology.engine.entitySystem.Component;
+import org.terasology.engine.entitySystem.entity.internal.EngineEntityPool;
+import org.terasology.engine.entitySystem.entity.internal.EngineSectorManager;
public interface LowLevelEntityManager extends EntityManager {
diff --git a/engine/src/main/java/org/terasology/entitySystem/entity/SectorManager.java b/engine/src/main/java/org/terasology/entitySystem/entity/SectorManager.java
index 5db54c849..b2d1abc96 100644
--- a/engine/src/main/java/org/terasology/entitySystem/entity/SectorManager.java
+++ b/engine/src/main/java/org/terasology/entitySystem/entity/SectorManager.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.entitySystem.entity;
+package org.terasology.engine.entitySystem.entity;
public interface SectorManager extends EntityPool {
}
diff --git a/engine/src/main/java/org/terasology/entitySystem/entity/internal/BaseEntityRef.java b/engine/src/main/java/org/terasology/entitySystem/entity/internal/BaseEntityRef.java
index 24aaa13c4..c0d7f1205 100644
--- a/engine/src/main/java/org/terasology/entitySystem/entity/internal/BaseEntityRef.java
+++ b/engine/src/main/java/org/terasology/entitySystem/entity/internal/BaseEntityRef.java
@@ -13,28 +13,28 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.entitySystem.entity.internal;
+package org.terasology.engine.entitySystem.entity.internal;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.terasology.entitySystem.Component;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.entitySystem.entity.LowLevelEntityManager;
-import org.terasology.entitySystem.event.Event;
-import org.terasology.entitySystem.prefab.Prefab;
-import org.terasology.entitySystem.sectors.SectorSimulationComponent;
-import org.terasology.network.NetworkComponent;
-import org.terasology.persistence.serializers.EntityDataJSONFormat;
-import org.terasology.persistence.serializers.EntitySerializer;
+import org.terasology.engine.entitySystem.Component;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.entity.LowLevelEntityManager;
+import org.terasology.engine.entitySystem.event.Event;
+import org.terasology.engine.entitySystem.prefab.Prefab;
+import org.terasology.engine.entitySystem.sectors.SectorSimulationComponent;
+import org.terasology.engine.network.NetworkComponent;
+import org.terasology.engine.persistence.serializers.EntityDataJSONFormat;
+import org.terasology.engine.persistence.serializers.EntitySerializer;
import java.security.AccessController;
import java.security.PrivilegedAction;
import java.util.Collections;
import java.util.List;
-import static org.terasology.entitySystem.entity.internal.EntityScope.CHUNK;
-import static org.terasology.entitySystem.entity.internal.EntityScope.GLOBAL;
-import static org.terasology.entitySystem.entity.internal.EntityScope.SECTOR;
+import static org.terasology.engine.entitySystem.entity.internal.EntityScope.CHUNK;
+import static org.terasology.engine.entitySystem.entity.internal.EntityScope.GLOBAL;
+import static org.terasology.engine.entitySystem.entity.internal.EntityScope.SECTOR;
/**
*/
diff --git a/engine/src/main/java/org/terasology/entitySystem/entity/internal/ComponentTable.java b/engine/src/main/java/org/terasology/entitySystem/entity/internal/ComponentTable.java
index 18d77a27d..b870be673 100644
--- a/engine/src/main/java/org/terasology/entitySystem/entity/internal/ComponentTable.java
+++ b/engine/src/main/java/org/terasology/entitySystem/entity/internal/ComponentTable.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.entitySystem.entity.internal;
+package org.terasology.engine.entitySystem.entity.internal;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
@@ -23,7 +23,7 @@ import gnu.trove.map.TLongObjectMap;
import gnu.trove.map.hash.TLongObjectHashMap;
import gnu.trove.set.TLongSet;
import gnu.trove.set.hash.TLongHashSet;
-import org.terasology.entitySystem.Component;
+import org.terasology.engine.entitySystem.Component;
import java.util.List;
import java.util.Map;
diff --git a/engine/src/main/java/org/terasology/entitySystem/entity/internal/DefaultRefStrategy.java b/engine/src/main/java/org/terasology/entitySystem/entity/internal/DefaultRefStrategy.java
index 035496b50..ff49f8844 100644
--- a/engine/src/main/java/org/terasology/entitySystem/entity/internal/DefaultRefStrategy.java
+++ b/engine/src/main/java/org/terasology/entitySystem/entity/internal/DefaultRefStrategy.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.entitySystem.entity.internal;
+package org.terasology.engine.entitySystem.entity.internal;
-import org.terasology.entitySystem.entity.LowLevelEntityManager;
+import org.terasology.engine.entitySystem.entity.LowLevelEntityManager;
/**
*/
diff --git a/engine/src/main/java/org/terasology/entitySystem/entity/internal/EngineEntityManager.java b/engine/src/main/java/org/terasology/entitySystem/entity/internal/EngineEntityManager.java
index 7fa5f1c80..2bfa2aa7d 100644
--- a/engine/src/main/java/org/terasology/entitySystem/entity/internal/EngineEntityManager.java
+++ b/engine/src/main/java/org/terasology/entitySystem/entity/internal/EngineEntityManager.java
@@ -1,24 +1,11 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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 org.terasology.entitySystem.entity.internal;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.entitySystem.entity.internal;
-import org.terasology.entitySystem.Component;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.entitySystem.entity.LowLevelEntityManager;
-import org.terasology.entitySystem.event.internal.EventSystem;
+import org.terasology.engine.entitySystem.Component;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.entity.LowLevelEntityManager;
+import org.terasology.engine.entitySystem.event.internal.EventSystem;
import org.terasology.persistence.typeHandling.TypeHandlerLibrary;
import java.util.Optional;
diff --git a/engine/src/main/java/org/terasology/entitySystem/entity/internal/EngineEntityPool.java b/engine/src/main/java/org/terasology/entitySystem/entity/internal/EngineEntityPool.java
index 76e69aafc..44c24514b 100644
--- a/engine/src/main/java/org/terasology/entitySystem/entity/internal/EngineEntityPool.java
+++ b/engine/src/main/java/org/terasology/entitySystem/entity/internal/EngineEntityPool.java
@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.entitySystem.entity.internal;
+package org.terasology.engine.entitySystem.entity.internal;
-import org.terasology.entitySystem.Component;
-import org.terasology.entitySystem.entity.EntityPool;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.entitySystem.prefab.Prefab;
+import org.terasology.engine.entitySystem.Component;
+import org.terasology.engine.entitySystem.entity.EntityPool;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.prefab.Prefab;
import java.util.Optional;
diff --git a/engine/src/main/java/org/terasology/entitySystem/entity/internal/EngineSectorManager.java b/engine/src/main/java/org/terasology/entitySystem/entity/internal/EngineSectorManager.java
index 866bdb086..817a362c9 100644
--- a/engine/src/main/java/org/terasology/entitySystem/entity/internal/EngineSectorManager.java
+++ b/engine/src/main/java/org/terasology/entitySystem/entity/internal/EngineSectorManager.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.entitySystem.entity.internal;
+package org.terasology.engine.entitySystem.entity.internal;
-import org.terasology.entitySystem.entity.SectorManager;
+import org.terasology.engine.entitySystem.entity.SectorManager;
public interface EngineSectorManager extends SectorManager, EngineEntityPool {
}
diff --git a/engine/src/main/java/org/terasology/entitySystem/entity/internal/EntityChangeSubscriber.java b/engine/src/main/java/org/terasology/entitySystem/entity/internal/EntityChangeSubscriber.java
index 038eb55b2..07d18ecf8 100644
--- a/engine/src/main/java/org/terasology/entitySystem/entity/internal/EntityChangeSubscriber.java
+++ b/engine/src/main/java/org/terasology/entitySystem/entity/internal/EntityChangeSubscriber.java
@@ -14,10 +14,10 @@
* limitations under the License.
*/
-package org.terasology.entitySystem.entity.internal;
+package org.terasology.engine.entitySystem.entity.internal;
-import org.terasology.entitySystem.Component;
-import org.terasology.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.Component;
+import org.terasology.engine.entitySystem.entity.EntityRef;
import java.util.Collection;
diff --git a/engine/src/main/java/org/terasology/entitySystem/entity/internal/EntityDestroySubscriber.java b/engine/src/main/java/org/terasology/entitySystem/entity/internal/EntityDestroySubscriber.java
index 67aaa025b..e8399c366 100644
--- a/engine/src/main/java/org/terasology/entitySystem/entity/internal/EntityDestroySubscriber.java
+++ b/engine/src/main/java/org/terasology/entitySystem/entity/internal/EntityDestroySubscriber.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.entitySystem.entity.internal;
+package org.terasology.engine.entitySystem.entity.internal;
-import org.terasology.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.entity.EntityRef;
/**
* See {@link EngineEntityManager#subscribeForDestruction(EntityDestroySubscriber)}.
diff --git a/engine/src/main/java/org/terasology/entitySystem/entity/internal/EntityInfoComponent.java b/engine/src/main/java/org/terasology/entitySystem/entity/internal/EntityInfoComponent.java
index 3de67dce0..c4f431815 100644
--- a/engine/src/main/java/org/terasology/entitySystem/entity/internal/EntityInfoComponent.java
+++ b/engine/src/main/java/org/terasology/entitySystem/entity/internal/EntityInfoComponent.java
@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.entitySystem.entity.internal;
+package org.terasology.engine.entitySystem.entity.internal;
-import org.terasology.entitySystem.Component;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.entitySystem.prefab.Prefab;
-import org.terasology.network.Replicate;
+import org.terasology.engine.entitySystem.Component;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.prefab.Prefab;
+import org.terasology.engine.network.Replicate;
import javax.annotation.Nullable;
@@ -29,7 +29,7 @@ public class EntityInfoComponent implements Component {
// TODO: Switch this to use Optional
*
diff --git a/engine/src/main/java/org/terasology/entitySystem/systems/internal/DoNotAutoRegister.java b/engine/src/main/java/org/terasology/entitySystem/systems/internal/DoNotAutoRegister.java
index 738eaecac..5fde31d33 100644
--- a/engine/src/main/java/org/terasology/entitySystem/systems/internal/DoNotAutoRegister.java
+++ b/engine/src/main/java/org/terasology/entitySystem/systems/internal/DoNotAutoRegister.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.entitySystem.systems.internal;
+package org.terasology.engine.entitySystem.systems.internal;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
diff --git a/engine/src/main/java/org/terasology/entitySystem/systems/package-info.java b/engine/src/main/java/org/terasology/entitySystem/systems/package-info.java
index 86f6ecc7c..0cfdaa330 100644
--- a/engine/src/main/java/org/terasology/entitySystem/systems/package-info.java
+++ b/engine/src/main/java/org/terasology/entitySystem/systems/package-info.java
@@ -14,6 +14,6 @@
* limitations under the License.
*/
-@API package org.terasology.entitySystem.systems;
+@API package org.terasology.engine.entitySystem.systems;
import org.terasology.module.sandbox.API;
diff --git a/engine/src/main/java/org/terasology/game/Game.java b/engine/src/main/java/org/terasology/game/Game.java
index bcf23844c..1a6c65d81 100644
--- a/engine/src/main/java/org/terasology/game/Game.java
+++ b/engine/src/main/java/org/terasology/game/Game.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.game;
+package org.terasology.engine.game;
/**
*/
diff --git a/engine/src/main/java/org/terasology/game/GameManifest.java b/engine/src/main/java/org/terasology/game/GameManifest.java
index a207c112a..a9f80bbf2 100644
--- a/engine/src/main/java/org/terasology/game/GameManifest.java
+++ b/engine/src/main/java/org/terasology/game/GameManifest.java
@@ -13,22 +13,22 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.game;
+package org.terasology.engine.game;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
-import org.terasology.engine.TerasologyConstants;
+import org.terasology.engine.core.TerasologyConstants;
import org.terasology.naming.Name;
import org.terasology.naming.NameVersion;
import org.terasology.naming.Version;
import org.terasology.naming.gson.NameTypeAdapter;
import org.terasology.naming.gson.VersionTypeAdapter;
-import org.terasology.utilities.gson.CaseInsensitiveEnumTypeAdapterFactory;
-import org.terasology.utilities.gson.UriTypeAdapterFactory;
-import org.terasology.world.internal.WorldInfo;
+import org.terasology.engine.utilities.gson.CaseInsensitiveEnumTypeAdapterFactory;
+import org.terasology.engine.utilities.gson.UriTypeAdapterFactory;
+import org.terasology.engine.world.internal.WorldInfo;
import java.io.BufferedReader;
import java.io.IOException;
diff --git a/engine/src/main/java/org/terasology/i18n/I18nSubsystem.java b/engine/src/main/java/org/terasology/i18n/I18nSubsystem.java
index 24c33de2e..a60f153c5 100644
--- a/engine/src/main/java/org/terasology/i18n/I18nSubsystem.java
+++ b/engine/src/main/java/org/terasology/i18n/I18nSubsystem.java
@@ -1,28 +1,15 @@
-/*
- * Copyright 2015 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.i18n;
+package org.terasology.engine.i18n;
import org.terasology.assets.AssetFactory;
import org.terasology.assets.module.ModuleAwareAssetTypeManager;
-import org.terasology.context.Context;
-import org.terasology.engine.GameEngine;
-import org.terasology.engine.subsystem.EngineSubsystem;
-import org.terasology.i18n.assets.Translation;
-import org.terasology.i18n.assets.TranslationData;
+import org.terasology.engine.context.Context;
+import org.terasology.engine.core.GameEngine;
+import org.terasology.engine.core.subsystem.EngineSubsystem;
+import org.terasology.engine.i18n.assets.TranslationData;
+import org.terasology.engine.i18n.assets.Translation;
/**
* Registers internationalization systems.
diff --git a/engine/src/main/java/org/terasology/i18n/StandardTranslationProject.java b/engine/src/main/java/org/terasology/i18n/StandardTranslationProject.java
index 560fcf72d..ebd684f1a 100644
--- a/engine/src/main/java/org/terasology/i18n/StandardTranslationProject.java
+++ b/engine/src/main/java/org/terasology/i18n/StandardTranslationProject.java
@@ -1,22 +1,9 @@
-/*
- * Copyright 2015 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.i18n;
+package org.terasology.engine.i18n;
-import org.terasology.i18n.assets.Translation;
+import org.terasology.engine.i18n.assets.Translation;
import org.terasology.naming.Name;
import java.util.HashMap;
diff --git a/engine/src/main/java/org/terasology/i18n/TranslationProject.java b/engine/src/main/java/org/terasology/i18n/TranslationProject.java
index bf1e134d4..36625f4c5 100644
--- a/engine/src/main/java/org/terasology/i18n/TranslationProject.java
+++ b/engine/src/main/java/org/terasology/i18n/TranslationProject.java
@@ -1,26 +1,13 @@
-/*
- * Copyright 2015 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.i18n;
+package org.terasology.engine.i18n;
import java.util.Locale;
import java.util.Optional;
import java.util.Set;
-import org.terasology.i18n.assets.Translation;
+import org.terasology.engine.i18n.assets.Translation;
import org.terasology.naming.Name;
/**
diff --git a/engine/src/main/java/org/terasology/i18n/TranslationRefreshSystem.java b/engine/src/main/java/org/terasology/i18n/TranslationRefreshSystem.java
index b620396b5..e77e2be86 100644
--- a/engine/src/main/java/org/terasology/i18n/TranslationRefreshSystem.java
+++ b/engine/src/main/java/org/terasology/i18n/TranslationRefreshSystem.java
@@ -1,23 +1,10 @@
-/*
- * Copyright 2017 MovingBlocks
- *
- * 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 org.terasology.i18n;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.i18n;
-import org.terasology.entitySystem.systems.BaseComponentSystem;
-import org.terasology.entitySystem.systems.RegisterSystem;
-import org.terasology.registry.In;
+import org.terasology.engine.entitySystem.systems.BaseComponentSystem;
+import org.terasology.engine.entitySystem.systems.RegisterSystem;
+import org.terasology.engine.registry.In;
/**
* This system refreshes the translation system during the initialization, reloading the i18n files from the module environment.
diff --git a/engine/src/main/java/org/terasology/i18n/TranslationSystem.java b/engine/src/main/java/org/terasology/i18n/TranslationSystem.java
index 406064610..8377e3f47 100644
--- a/engine/src/main/java/org/terasology/i18n/TranslationSystem.java
+++ b/engine/src/main/java/org/terasology/i18n/TranslationSystem.java
@@ -1,22 +1,9 @@
-/*
- * Copyright 2015 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.i18n;
+package org.terasology.engine.i18n;
-import org.terasology.engine.Uri;
+import org.terasology.engine.core.Uri;
import org.terasology.module.sandbox.API;
import org.terasology.nui.translate.Translator;
diff --git a/engine/src/main/java/org/terasology/i18n/TranslationSystemImpl.java b/engine/src/main/java/org/terasology/i18n/TranslationSystemImpl.java
index caf2c5c80..04791a7f9 100644
--- a/engine/src/main/java/org/terasology/i18n/TranslationSystemImpl.java
+++ b/engine/src/main/java/org/terasology/i18n/TranslationSystemImpl.java
@@ -1,20 +1,20 @@
-/*
- * Copyright 2015 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.i18n;
+package org.terasology.engine.i18n;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.terasology.assets.ResourceUrn;
+import org.terasology.assets.management.AssetManager;
+import org.terasology.engine.config.Config;
+import org.terasology.engine.config.SystemConfig;
+import org.terasology.engine.context.Context;
+import org.terasology.engine.core.SimpleUri;
+import org.terasology.engine.core.Uri;
+import org.terasology.engine.i18n.assets.Translation;
+import org.terasology.engine.persistence.TemplateEngine;
+import org.terasology.engine.persistence.TemplateEngineImpl;
import java.util.HashMap;
import java.util.List;
@@ -25,19 +25,6 @@ import java.util.Set;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.function.Consumer;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.terasology.assets.ResourceUrn;
-import org.terasology.assets.management.AssetManager;
-import org.terasology.config.Config;
-import org.terasology.config.SystemConfig;
-import org.terasology.context.Context;
-import org.terasology.engine.SimpleUri;
-import org.terasology.engine.Uri;
-import org.terasology.i18n.assets.Translation;
-import org.terasology.persistence.TemplateEngine;
-import org.terasology.persistence.TemplateEngineImpl;
-
/**
* A translation system that uses {@link Translation} data assets to
* perform the lookup.
diff --git a/engine/src/main/java/org/terasology/i18n/assets/Translation.java b/engine/src/main/java/org/terasology/i18n/assets/Translation.java
index d1ced5304..3097312c3 100644
--- a/engine/src/main/java/org/terasology/i18n/assets/Translation.java
+++ b/engine/src/main/java/org/terasology/i18n/assets/Translation.java
@@ -1,20 +1,7 @@
-/*
- * Copyright 2015 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.i18n.assets;
+package org.terasology.engine.i18n.assets;
import java.lang.ref.WeakReference;
import java.util.HashMap;
@@ -27,7 +14,7 @@ import java.util.function.Consumer;
import org.terasology.assets.Asset;
import org.terasology.assets.AssetType;
import org.terasology.assets.ResourceUrn;
-import org.terasology.engine.Uri;
+import org.terasology.engine.core.Uri;
import org.terasology.naming.Name;
import com.google.common.base.Objects;
diff --git a/engine/src/main/java/org/terasology/i18n/assets/TranslationData.java b/engine/src/main/java/org/terasology/i18n/assets/TranslationData.java
index 33d3866ed..58e3a821a 100644
--- a/engine/src/main/java/org/terasology/i18n/assets/TranslationData.java
+++ b/engine/src/main/java/org/terasology/i18n/assets/TranslationData.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2015 MovingBlocks
- *
- * 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 org.terasology.i18n.assets;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.i18n.assets;
import java.util.Collections;
import java.util.HashMap;
@@ -21,7 +8,7 @@ import java.util.Locale;
import java.util.Map;
import org.terasology.assets.AssetData;
-import org.terasology.engine.Uri;
+import org.terasology.engine.core.Uri;
import com.google.common.base.Preconditions;
diff --git a/engine/src/main/java/org/terasology/i18n/assets/TranslationFormat.java b/engine/src/main/java/org/terasology/i18n/assets/TranslationFormat.java
index 5be99b3fb..93ed3ec6c 100644
--- a/engine/src/main/java/org/terasology/i18n/assets/TranslationFormat.java
+++ b/engine/src/main/java/org/terasology/i18n/assets/TranslationFormat.java
@@ -1,20 +1,7 @@
-/*
- * Copyright 2015 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.i18n.assets;
+package org.terasology.engine.i18n.assets;
import com.google.common.base.Charsets;
import com.google.common.reflect.TypeToken;
@@ -28,7 +15,7 @@ import org.terasology.assets.exceptions.InvalidAssetFilenameException;
import org.terasology.assets.format.AssetDataFile;
import org.terasology.assets.format.AssetFileFormat;
import org.terasology.assets.module.annotations.RegisterAssetFileFormat;
-import org.terasology.engine.SimpleUri;
+import org.terasology.engine.core.SimpleUri;
import org.terasology.naming.Name;
import java.io.IOException;
diff --git a/engine/src/main/java/org/terasology/i18n/assets/package-info.java b/engine/src/main/java/org/terasology/i18n/assets/package-info.java
index 163c7eb50..893a2a748 100644
--- a/engine/src/main/java/org/terasology/i18n/assets/package-info.java
+++ b/engine/src/main/java/org/terasology/i18n/assets/package-info.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2015 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-@API package org.terasology.i18n.assets;
+@API package org.terasology.engine.i18n.assets;
import org.terasology.module.sandbox.API;
diff --git a/engine/src/main/java/org/terasology/identity/BadEncryptedDataException.java b/engine/src/main/java/org/terasology/identity/BadEncryptedDataException.java
index c1fc017d8..2a3804d85 100644
--- a/engine/src/main/java/org/terasology/identity/BadEncryptedDataException.java
+++ b/engine/src/main/java/org/terasology/identity/BadEncryptedDataException.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.identity;
+package org.terasology.engine.identity;
/**
* This exception indicates an issue during decryption c
diff --git a/engine/src/main/java/org/terasology/identity/CertificateGenerator.java b/engine/src/main/java/org/terasology/identity/CertificateGenerator.java
index e755ab51c..f1a30c906 100644
--- a/engine/src/main/java/org/terasology/identity/CertificateGenerator.java
+++ b/engine/src/main/java/org/terasology/identity/CertificateGenerator.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.identity;
+package org.terasology.engine.identity;
import com.google.common.base.Charsets;
diff --git a/engine/src/main/java/org/terasology/identity/CertificatePair.java b/engine/src/main/java/org/terasology/identity/CertificatePair.java
index 43f6f33f5..f3b602da5 100644
--- a/engine/src/main/java/org/terasology/identity/CertificatePair.java
+++ b/engine/src/main/java/org/terasology/identity/CertificatePair.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.identity;
+package org.terasology.engine.identity;
/**
* Holds a public/private certificate pair
diff --git a/engine/src/main/java/org/terasology/identity/ClientIdentity.java b/engine/src/main/java/org/terasology/identity/ClientIdentity.java
index b5d9df42e..5f50f84fc 100644
--- a/engine/src/main/java/org/terasology/identity/ClientIdentity.java
+++ b/engine/src/main/java/org/terasology/identity/ClientIdentity.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.identity;
+package org.terasology.engine.identity;
-import org.terasology.config.SecurityConfig;
+import org.terasology.engine.config.SecurityConfig;
import java.util.Objects;
diff --git a/engine/src/main/java/org/terasology/identity/IdentityConstants.java b/engine/src/main/java/org/terasology/identity/IdentityConstants.java
index 2d157ee71..b22947127 100644
--- a/engine/src/main/java/org/terasology/identity/IdentityConstants.java
+++ b/engine/src/main/java/org/terasology/identity/IdentityConstants.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.identity;
+package org.terasology.engine.identity;
/**
* Collection of constants related to Identity and Authentication
diff --git a/engine/src/main/java/org/terasology/identity/PrivateIdentityCertificate.java b/engine/src/main/java/org/terasology/identity/PrivateIdentityCertificate.java
index 3d372a8cb..4fb50aede 100644
--- a/engine/src/main/java/org/terasology/identity/PrivateIdentityCertificate.java
+++ b/engine/src/main/java/org/terasology/identity/PrivateIdentityCertificate.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.terasology.identity;
+package org.terasology.engine.identity;
import javax.crypto.BadPaddingException;
import javax.crypto.Cipher;
diff --git a/engine/src/main/java/org/terasology/identity/PublicIdentityCertificate.java b/engine/src/main/java/org/terasology/identity/PublicIdentityCertificate.java
index cf52da873..7cf1a9135 100644
--- a/engine/src/main/java/org/terasology/identity/PublicIdentityCertificate.java
+++ b/engine/src/main/java/org/terasology/identity/PublicIdentityCertificate.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.terasology.identity;
+package org.terasology.engine.identity;
import com.google.common.base.Charsets;
diff --git a/engine/src/main/java/org/terasology/identity/SecretGenerator.java b/engine/src/main/java/org/terasology/identity/SecretGenerator.java
index 5ce59b42c..2f60c52e0 100644
--- a/engine/src/main/java/org/terasology/identity/SecretGenerator.java
+++ b/engine/src/main/java/org/terasology/identity/SecretGenerator.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.identity;
+package org.terasology.engine.identity;
import org.terasology.math.TeraMath;
diff --git a/engine/src/main/java/org/terasology/identity/storageServiceClient/APISession.java b/engine/src/main/java/org/terasology/identity/storageServiceClient/APISession.java
index 108e54871..74e264758 100644
--- a/engine/src/main/java/org/terasology/identity/storageServiceClient/APISession.java
+++ b/engine/src/main/java/org/terasology/identity/storageServiceClient/APISession.java
@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.identity.storageServiceClient;
+package org.terasology.engine.identity.storageServiceClient;
-import org.terasology.identity.ClientIdentity;
-import org.terasology.identity.PublicIdentityCertificate;
+import org.terasology.engine.identity.ClientIdentity;
+import org.terasology.engine.identity.PublicIdentityCertificate;
import java.io.IOException;
import java.net.URL;
diff --git a/engine/src/main/java/org/terasology/identity/storageServiceClient/Action.java b/engine/src/main/java/org/terasology/identity/storageServiceClient/Action.java
index 101f8d944..23ac6962d 100644
--- a/engine/src/main/java/org/terasology/identity/storageServiceClient/Action.java
+++ b/engine/src/main/java/org/terasology/identity/storageServiceClient/Action.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.identity.storageServiceClient;
+package org.terasology.engine.identity.storageServiceClient;
/**
* Represents an interaction that can be made with the storage service server.
diff --git a/engine/src/main/java/org/terasology/identity/storageServiceClient/BigIntegerBase64Serializer.java b/engine/src/main/java/org/terasology/identity/storageServiceClient/BigIntegerBase64Serializer.java
index b94b4e382..0872039f2 100644
--- a/engine/src/main/java/org/terasology/identity/storageServiceClient/BigIntegerBase64Serializer.java
+++ b/engine/src/main/java/org/terasology/identity/storageServiceClient/BigIntegerBase64Serializer.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.identity.storageServiceClient;
+package org.terasology.engine.identity.storageServiceClient;
import com.google.gson.JsonSerializer;
import com.google.gson.JsonDeserializer;
diff --git a/engine/src/main/java/org/terasology/identity/storageServiceClient/HttpMethod.java b/engine/src/main/java/org/terasology/identity/storageServiceClient/HttpMethod.java
index 99b172939..0fbb11296 100644
--- a/engine/src/main/java/org/terasology/identity/storageServiceClient/HttpMethod.java
+++ b/engine/src/main/java/org/terasology/identity/storageServiceClient/HttpMethod.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.identity.storageServiceClient;
+package org.terasology.engine.identity.storageServiceClient;
public enum HttpMethod {
GET,
diff --git a/engine/src/main/java/org/terasology/identity/storageServiceClient/IdentityBundle.java b/engine/src/main/java/org/terasology/identity/storageServiceClient/IdentityBundle.java
index adfdc532d..0170da077 100644
--- a/engine/src/main/java/org/terasology/identity/storageServiceClient/IdentityBundle.java
+++ b/engine/src/main/java/org/terasology/identity/storageServiceClient/IdentityBundle.java
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.identity.storageServiceClient;
+package org.terasology.engine.identity.storageServiceClient;
-import org.terasology.identity.ClientIdentity;
-import org.terasology.identity.PrivateIdentityCertificate;
-import org.terasology.identity.PublicIdentityCertificate;
+import org.terasology.engine.identity.ClientIdentity;
+import org.terasology.engine.identity.PrivateIdentityCertificate;
+import org.terasology.engine.identity.PublicIdentityCertificate;
import java.util.HashMap;
import java.util.List;
diff --git a/engine/src/main/java/org/terasology/identity/storageServiceClient/IdentityConflict.java b/engine/src/main/java/org/terasology/identity/storageServiceClient/IdentityConflict.java
index 1bcb15ba6..69a079313 100644
--- a/engine/src/main/java/org/terasology/identity/storageServiceClient/IdentityConflict.java
+++ b/engine/src/main/java/org/terasology/identity/storageServiceClient/IdentityConflict.java
@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.identity.storageServiceClient;
+package org.terasology.engine.identity.storageServiceClient;
-import org.terasology.identity.ClientIdentity;
-import org.terasology.identity.PublicIdentityCertificate;
+import org.terasology.engine.identity.ClientIdentity;
+import org.terasology.engine.identity.PublicIdentityCertificate;
public final class IdentityConflict {
diff --git a/engine/src/main/java/org/terasology/identity/storageServiceClient/IdentityConflictSolution.java b/engine/src/main/java/org/terasology/identity/storageServiceClient/IdentityConflictSolution.java
index 4f6b9e75a..f67c3c5f0 100644
--- a/engine/src/main/java/org/terasology/identity/storageServiceClient/IdentityConflictSolution.java
+++ b/engine/src/main/java/org/terasology/identity/storageServiceClient/IdentityConflictSolution.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.identity.storageServiceClient;
+package org.terasology.engine.identity.storageServiceClient;
public enum IdentityConflictSolution {
KEEP_LOCAL,
diff --git a/engine/src/main/java/org/terasology/identity/storageServiceClient/InitializeFromTokenAction.java b/engine/src/main/java/org/terasology/identity/storageServiceClient/InitializeFromTokenAction.java
index 4bbd6e572..c2332768b 100644
--- a/engine/src/main/java/org/terasology/identity/storageServiceClient/InitializeFromTokenAction.java
+++ b/engine/src/main/java/org/terasology/identity/storageServiceClient/InitializeFromTokenAction.java
@@ -1,6 +1,6 @@
// Copyright 2020 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.identity.storageServiceClient;
+package org.terasology.engine.identity.storageServiceClient;
/**
*/
diff --git a/engine/src/main/java/org/terasology/identity/storageServiceClient/LoginAction.java b/engine/src/main/java/org/terasology/identity/storageServiceClient/LoginAction.java
index 2fd77ab96..8680df743 100644
--- a/engine/src/main/java/org/terasology/identity/storageServiceClient/LoginAction.java
+++ b/engine/src/main/java/org/terasology/identity/storageServiceClient/LoginAction.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.identity.storageServiceClient;
+package org.terasology.engine.identity.storageServiceClient;
import java.net.URL;
diff --git a/engine/src/main/java/org/terasology/identity/storageServiceClient/LogoutAction.java b/engine/src/main/java/org/terasology/identity/storageServiceClient/LogoutAction.java
index 1457fec98..a8bcac464 100644
--- a/engine/src/main/java/org/terasology/identity/storageServiceClient/LogoutAction.java
+++ b/engine/src/main/java/org/terasology/identity/storageServiceClient/LogoutAction.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.identity.storageServiceClient;
+package org.terasology.engine.identity.storageServiceClient;
/**
*/
diff --git a/engine/src/main/java/org/terasology/identity/storageServiceClient/PutIdentityAction.java b/engine/src/main/java/org/terasology/identity/storageServiceClient/PutIdentityAction.java
index 5d4dc7667..6f47b505a 100644
--- a/engine/src/main/java/org/terasology/identity/storageServiceClient/PutIdentityAction.java
+++ b/engine/src/main/java/org/terasology/identity/storageServiceClient/PutIdentityAction.java
@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.identity.storageServiceClient;
+package org.terasology.engine.identity.storageServiceClient;
-import org.terasology.identity.ClientIdentity;
-import org.terasology.identity.PublicIdentityCertificate;
+import org.terasology.engine.identity.ClientIdentity;
+import org.terasology.engine.identity.PublicIdentityCertificate;
import java.util.Map;
diff --git a/engine/src/main/java/org/terasology/identity/storageServiceClient/ServiceApiRequest.java b/engine/src/main/java/org/terasology/identity/storageServiceClient/ServiceApiRequest.java
index b9ffdcc2c..e8d16a4e5 100644
--- a/engine/src/main/java/org/terasology/identity/storageServiceClient/ServiceApiRequest.java
+++ b/engine/src/main/java/org/terasology/identity/storageServiceClient/ServiceApiRequest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.identity.storageServiceClient;
+package org.terasology.engine.identity.storageServiceClient;
import com.google.gson.Gson;
diff --git a/engine/src/main/java/org/terasology/identity/storageServiceClient/StatusMessageTranslator.java b/engine/src/main/java/org/terasology/identity/storageServiceClient/StatusMessageTranslator.java
index 1f563f012..0c330c36e 100644
--- a/engine/src/main/java/org/terasology/identity/storageServiceClient/StatusMessageTranslator.java
+++ b/engine/src/main/java/org/terasology/identity/storageServiceClient/StatusMessageTranslator.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.identity.storageServiceClient;
+package org.terasology.engine.identity.storageServiceClient;
-import org.terasology.i18n.TranslationSystem;
+import org.terasology.engine.i18n.TranslationSystem;
public final class StatusMessageTranslator {
diff --git a/engine/src/main/java/org/terasology/identity/storageServiceClient/StorageServiceException.java b/engine/src/main/java/org/terasology/identity/storageServiceClient/StorageServiceException.java
index 29a6ca12f..757595750 100644
--- a/engine/src/main/java/org/terasology/identity/storageServiceClient/StorageServiceException.java
+++ b/engine/src/main/java/org/terasology/identity/storageServiceClient/StorageServiceException.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.identity.storageServiceClient;
+package org.terasology.engine.identity.storageServiceClient;
public class StorageServiceException extends Exception {
diff --git a/engine/src/main/java/org/terasology/identity/storageServiceClient/StorageServiceWorker.java b/engine/src/main/java/org/terasology/identity/storageServiceClient/StorageServiceWorker.java
index a7abd0ff2..1be1a1de9 100644
--- a/engine/src/main/java/org/terasology/identity/storageServiceClient/StorageServiceWorker.java
+++ b/engine/src/main/java/org/terasology/identity/storageServiceClient/StorageServiceWorker.java
@@ -13,21 +13,21 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.identity.storageServiceClient;
+package org.terasology.engine.identity.storageServiceClient;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Maps;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.terasology.config.Config;
-import org.terasology.config.IdentityStorageServiceConfig;
-import org.terasology.config.SecurityConfig;
-import org.terasology.context.Context;
-import org.terasology.i18n.TranslationSystem;
-import org.terasology.identity.ClientIdentity;
-import org.terasology.identity.PublicIdentityCertificate;
-import org.terasology.logic.console.Console;
-import org.terasology.logic.console.CoreMessageType;
+import org.terasology.engine.config.Config;
+import org.terasology.engine.config.IdentityStorageServiceConfig;
+import org.terasology.engine.config.SecurityConfig;
+import org.terasology.engine.context.Context;
+import org.terasology.engine.i18n.TranslationSystem;
+import org.terasology.engine.identity.ClientIdentity;
+import org.terasology.engine.identity.PublicIdentityCertificate;
+import org.terasology.engine.logic.console.Console;
+import org.terasology.engine.logic.console.CoreMessageType;
import java.net.URL;
import java.util.ArrayDeque;
diff --git a/engine/src/main/java/org/terasology/identity/storageServiceClient/StorageServiceWorkerStatus.java b/engine/src/main/java/org/terasology/identity/storageServiceClient/StorageServiceWorkerStatus.java
index 2b1692f73..96eaf37bf 100644
--- a/engine/src/main/java/org/terasology/identity/storageServiceClient/StorageServiceWorkerStatus.java
+++ b/engine/src/main/java/org/terasology/identity/storageServiceClient/StorageServiceWorkerStatus.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.identity.storageServiceClient;
+package org.terasology.engine.identity.storageServiceClient;
public enum StorageServiceWorkerStatus {
LOGGED_OUT(true, "${engine:menu#storage-service-logged-out}", "${engine:menu#storage-service-log-in}"),
diff --git a/engine/src/main/java/org/terasology/identity/storageServiceClient/SyncIdentitiesAction.java b/engine/src/main/java/org/terasology/identity/storageServiceClient/SyncIdentitiesAction.java
index 747dd0f9c..dfc5d42c9 100644
--- a/engine/src/main/java/org/terasology/identity/storageServiceClient/SyncIdentitiesAction.java
+++ b/engine/src/main/java/org/terasology/identity/storageServiceClient/SyncIdentitiesAction.java
@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.identity.storageServiceClient;
+package org.terasology.engine.identity.storageServiceClient;
import com.google.common.collect.MapDifference;
import com.google.common.collect.Maps;
-import org.terasology.identity.ClientIdentity;
-import org.terasology.identity.PublicIdentityCertificate;
+import org.terasology.engine.identity.ClientIdentity;
+import org.terasology.engine.identity.PublicIdentityCertificate;
import java.util.Map;
diff --git a/engine/src/main/java/org/terasology/input/BindAxisEvent.java b/engine/src/main/java/org/terasology/input/BindAxisEvent.java
index 6bbd829d2..ad8b5002b 100644
--- a/engine/src/main/java/org/terasology/input/BindAxisEvent.java
+++ b/engine/src/main/java/org/terasology/input/BindAxisEvent.java
@@ -1,22 +1,9 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.input;
+package org.terasology.engine.input;
-import org.terasology.input.events.AxisEvent;
+import org.terasology.engine.input.events.AxisEvent;
/**
*/
diff --git a/engine/src/main/java/org/terasology/input/BindAxisSubscriber.java b/engine/src/main/java/org/terasology/input/BindAxisSubscriber.java
index 36222d139..c10a59caa 100644
--- a/engine/src/main/java/org/terasology/input/BindAxisSubscriber.java
+++ b/engine/src/main/java/org/terasology/input/BindAxisSubscriber.java
@@ -1,22 +1,9 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.input;
+package org.terasology.engine.input;
-import org.terasology.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.entity.EntityRef;
@FunctionalInterface
public interface BindAxisSubscriber {
diff --git a/engine/src/main/java/org/terasology/input/BindButtonEvent.java b/engine/src/main/java/org/terasology/input/BindButtonEvent.java
index ccb83e052..fa424cf96 100644
--- a/engine/src/main/java/org/terasology/input/BindButtonEvent.java
+++ b/engine/src/main/java/org/terasology/input/BindButtonEvent.java
@@ -1,23 +1,11 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.input;
+package org.terasology.engine.input;
-import org.terasology.engine.SimpleUri;
-import org.terasology.input.events.ButtonEvent;
+import org.terasology.engine.core.SimpleUri;
+import org.terasology.engine.input.events.ButtonEvent;
+import org.terasology.input.ButtonState;
/**
*/
diff --git a/engine/src/main/java/org/terasology/input/BindButtonSubscriber.java b/engine/src/main/java/org/terasology/input/BindButtonSubscriber.java
index 2d094f509..a8b839b43 100644
--- a/engine/src/main/java/org/terasology/input/BindButtonSubscriber.java
+++ b/engine/src/main/java/org/terasology/input/BindButtonSubscriber.java
@@ -1,22 +1,9 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.input;
+package org.terasology.engine.input;
-import org.terasology.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.entity.EntityRef;
/**
* Interface for subscribing to bind button events
diff --git a/engine/src/main/java/org/terasology/input/BindableAxis.java b/engine/src/main/java/org/terasology/input/BindableAxis.java
index 3b5fad5fb..6fdee7946 100644
--- a/engine/src/main/java/org/terasology/input/BindableAxis.java
+++ b/engine/src/main/java/org/terasology/input/BindableAxis.java
@@ -1,20 +1,7 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.input;
+package org.terasology.engine.input;
/**
* A Bind Axis is a (simulated) analog input axis, maintaining a value between -1 and 1.
diff --git a/engine/src/main/java/org/terasology/input/BindableButton.java b/engine/src/main/java/org/terasology/input/BindableButton.java
index d172ac12f..27ad321fa 100644
--- a/engine/src/main/java/org/terasology/input/BindableButton.java
+++ b/engine/src/main/java/org/terasology/input/BindableButton.java
@@ -1,25 +1,15 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.input;
+package org.terasology.engine.input;
import org.joml.Vector3fc;
import org.joml.Vector3ic;
-import org.terasology.engine.SimpleUri;
-import org.terasology.entitySystem.entity.EntityRef;
+import org.terasology.engine.core.SimpleUri;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.input.ActivateMode;
+import org.terasology.input.ButtonState;
+import org.terasology.input.Input;
/**
*/
diff --git a/engine/src/main/java/org/terasology/input/DefaultBinding.java b/engine/src/main/java/org/terasology/input/DefaultBinding.java
index 910230462..3263ccf54 100644
--- a/engine/src/main/java/org/terasology/input/DefaultBinding.java
+++ b/engine/src/main/java/org/terasology/input/DefaultBinding.java
@@ -1,20 +1,9 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.input;
+package org.terasology.engine.input;
+
+import org.terasology.input.InputType;
import java.lang.annotation.ElementType;
import java.lang.annotation.Repeatable;
diff --git a/engine/src/main/java/org/terasology/input/DefaultBindings.java b/engine/src/main/java/org/terasology/input/DefaultBindings.java
index 12f3dd1ab..d433f90e3 100644
--- a/engine/src/main/java/org/terasology/input/DefaultBindings.java
+++ b/engine/src/main/java/org/terasology/input/DefaultBindings.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2015 MovingBlocks
- *
- * 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 org.terasology.input;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.input;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
diff --git a/engine/src/main/java/org/terasology/input/InputSystem.java b/engine/src/main/java/org/terasology/input/InputSystem.java
index c48650c8e..417dc6c95 100644
--- a/engine/src/main/java/org/terasology/input/InputSystem.java
+++ b/engine/src/main/java/org/terasology/input/InputSystem.java
@@ -1,21 +1,27 @@
-// Copyright 2020 The Terasology Foundation
+// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.input;
+package org.terasology.engine.input;
import com.google.common.collect.Queues;
import org.joml.Vector2d;
import org.joml.Vector2i;
-import org.terasology.config.ControllerConfig.ControllerInfo;
-import org.terasology.config.facade.InputDeviceConfiguration;
-import org.terasology.engine.SimpleUri;
-import org.terasology.engine.Time;
-import org.terasology.engine.subsystem.DisplayDevice;
-import org.terasology.engine.subsystem.config.BindsManager;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.entitySystem.systems.BaseComponentSystem;
-import org.terasology.entitySystem.systems.RegisterSystem;
-import org.terasology.input.cameraTarget.CameraTargetSystem;
+import org.terasology.engine.config.ControllerConfig.ControllerInfo;
+import org.terasology.engine.config.facade.InputDeviceConfiguration;
+import org.terasology.engine.core.SimpleUri;
+import org.terasology.engine.core.Time;
+import org.terasology.engine.core.subsystem.DisplayDevice;
+import org.terasology.engine.core.subsystem.config.BindsManager;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.systems.BaseComponentSystem;
+import org.terasology.engine.entitySystem.systems.RegisterSystem;
+import org.terasology.input.ButtonState;
+import org.terasology.input.ControllerDevice;
+import org.terasology.input.ControllerId;
+import org.terasology.input.Input;
+import org.terasology.input.InputType;
+import org.terasology.input.MouseInput;
+import org.terasology.engine.input.cameraTarget.CameraTargetSystem;
import org.terasology.input.device.CharKeyboardAction;
import org.terasology.input.device.ControllerAction;
import org.terasology.input.device.KeyboardDevice;
@@ -25,26 +31,26 @@ import org.terasology.input.device.RawKeyboardAction;
import org.terasology.input.device.nulldevices.NullControllerDevice;
import org.terasology.input.device.nulldevices.NullKeyboardDevice;
import org.terasology.input.device.nulldevices.NullMouseDevice;
-import org.terasology.input.events.CharEvent;
-import org.terasology.input.events.InputEvent;
-import org.terasology.input.events.KeyDownEvent;
-import org.terasology.input.events.KeyEvent;
-import org.terasology.input.events.KeyRepeatEvent;
-import org.terasology.input.events.KeyUpEvent;
-import org.terasology.input.events.LeftMouseDownButtonEvent;
-import org.terasology.input.events.LeftMouseUpButtonEvent;
-import org.terasology.input.events.MouseAxisEvent;
-import org.terasology.input.events.MouseAxisEvent.MouseAxis;
-import org.terasology.input.events.MouseButtonEvent;
-import org.terasology.input.events.MouseDownButtonEvent;
-import org.terasology.input.events.MouseUpButtonEvent;
-import org.terasology.input.events.MouseWheelEvent;
-import org.terasology.input.events.RightMouseDownButtonEvent;
-import org.terasology.input.events.RightMouseUpButtonEvent;
-import org.terasology.input.internal.AbstractBindableAxis;
-import org.terasology.input.internal.BindableRealAxis;
-import org.terasology.logic.players.LocalPlayer;
-import org.terasology.registry.In;
+import org.terasology.engine.input.events.CharEvent;
+import org.terasology.engine.input.events.InputEvent;
+import org.terasology.engine.input.events.KeyDownEvent;
+import org.terasology.engine.input.events.KeyEvent;
+import org.terasology.engine.input.events.KeyRepeatEvent;
+import org.terasology.engine.input.events.KeyUpEvent;
+import org.terasology.engine.input.events.LeftMouseDownButtonEvent;
+import org.terasology.engine.input.events.LeftMouseUpButtonEvent;
+import org.terasology.engine.input.events.MouseAxisEvent;
+import org.terasology.engine.input.events.MouseAxisEvent.MouseAxis;
+import org.terasology.engine.input.events.MouseButtonEvent;
+import org.terasology.engine.input.events.MouseDownButtonEvent;
+import org.terasology.engine.input.events.MouseUpButtonEvent;
+import org.terasology.engine.input.events.MouseWheelEvent;
+import org.terasology.engine.input.events.RightMouseDownButtonEvent;
+import org.terasology.engine.input.events.RightMouseUpButtonEvent;
+import org.terasology.engine.input.internal.AbstractBindableAxis;
+import org.terasology.engine.input.internal.BindableRealAxis;
+import org.terasology.engine.logic.players.LocalPlayer;
+import org.terasology.engine.registry.In;
import java.util.List;
import java.util.Queue;
@@ -550,7 +556,7 @@ public class InputSystem extends BaseComponentSystem {
/**
* API-exposed caller to {@link BindsManager#getBindsConfig()} and
- * {@link org.terasology.config.BindsConfig#getBinds(SimpleUri)}.
+ * {@link org.terasology.engine.config.BindsConfig#getBinds(SimpleUri)}.
*
* When the BindableButton changes state it sends out events like an actual key or button does. It also allows direct
- * subscription via the {@link org.terasology.input.BindButtonSubscriber} interface.
+ * subscription via the {@link BindButtonSubscriber} interface.
*/
public class BindableButtonImpl implements BindableButton {
diff --git a/engine/src/main/java/org/terasology/input/internal/BindableRealAxis.java b/engine/src/main/java/org/terasology/input/internal/BindableRealAxis.java
index 6dc3f9151..35eaf8c3a 100644
--- a/engine/src/main/java/org/terasology/input/internal/BindableRealAxis.java
+++ b/engine/src/main/java/org/terasology/input/internal/BindableRealAxis.java
@@ -1,22 +1,9 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.input.internal;
+package org.terasology.engine.input.internal;
-import org.terasology.input.BindAxisEvent;
+import org.terasology.engine.input.BindAxisEvent;
/**
* This implementation is linked to a real axis.
diff --git a/engine/src/main/java/org/terasology/input/lwjgl/LwjglControllerDevice.java b/engine/src/main/java/org/terasology/input/lwjgl/LwjglControllerDevice.java
index b5b13737d..665b64ed4 100644
--- a/engine/src/main/java/org/terasology/input/lwjgl/LwjglControllerDevice.java
+++ b/engine/src/main/java/org/terasology/input/lwjgl/LwjglControllerDevice.java
@@ -1,7 +1,7 @@
-// Copyright 2020 The Terasology Foundation
+// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.input.lwjgl;
+package org.terasology.engine.input.lwjgl;
import com.google.common.collect.Lists;
import com.google.common.io.ByteStreams;
@@ -12,8 +12,8 @@ import org.lwjgl.glfw.GLFWGamepadState;
import org.lwjgl.system.MemoryUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.terasology.config.ControllerConfig;
-import org.terasology.engine.TerasologyConstants;
+import org.terasology.engine.config.ControllerConfig;
+import org.terasology.engine.core.TerasologyConstants;
import org.terasology.input.ButtonState;
import org.terasology.input.ControllerDevice;
import org.terasology.input.ControllerId;
diff --git a/engine/src/main/java/org/terasology/input/lwjgl/LwjglKeyboardDevice.java b/engine/src/main/java/org/terasology/input/lwjgl/LwjglKeyboardDevice.java
index 2928b18cd..fea921302 100644
--- a/engine/src/main/java/org/terasology/input/lwjgl/LwjglKeyboardDevice.java
+++ b/engine/src/main/java/org/terasology/input/lwjgl/LwjglKeyboardDevice.java
@@ -1,7 +1,7 @@
-// Copyright 2020 The Terasology Foundation
+// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.input.lwjgl;
+package org.terasology.engine.input.lwjgl;
import com.google.common.collect.Lists;
import gnu.trove.map.TIntIntMap;
@@ -11,10 +11,6 @@ import gnu.trove.set.hash.TIntHashSet;
import org.lwjgl.glfw.GLFW;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.terasology.context.Context;
-import org.terasology.engine.subsystem.DisplayDevice;
-import org.terasology.engine.subsystem.lwjgl.LwjglDisplayDevice;
-import org.terasology.engine.subsystem.lwjgl.LwjglGraphics;
import org.terasology.input.ButtonState;
import org.terasology.input.Input;
import org.terasology.input.InputType;
diff --git a/engine/src/main/java/org/terasology/input/lwjgl/LwjglMouseDevice.java b/engine/src/main/java/org/terasology/input/lwjgl/LwjglMouseDevice.java
index 096f6d52d..18b061757 100644
--- a/engine/src/main/java/org/terasology/input/lwjgl/LwjglMouseDevice.java
+++ b/engine/src/main/java/org/terasology/input/lwjgl/LwjglMouseDevice.java
@@ -1,7 +1,7 @@
-// Copyright 2020 The Terasology Foundation
+// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.input.lwjgl;
+package org.terasology.engine.input.lwjgl;
import com.google.common.collect.Lists;
import gnu.trove.set.TIntSet;
@@ -10,7 +10,7 @@ import org.joml.Vector2d;
import org.joml.Vector2i;
import org.lwjgl.BufferUtils;
import org.lwjgl.glfw.GLFW;
-import org.terasology.config.RenderingConfig;
+import org.terasology.engine.config.RenderingConfig;
import org.terasology.input.ButtonState;
import org.terasology.input.InputType;
import org.terasology.input.MouseInput;
diff --git a/engine/src/main/java/org/terasology/input/package-info.java b/engine/src/main/java/org/terasology/input/package-info.java
index b533aad51..9e7b7e3c1 100644
--- a/engine/src/main/java/org/terasology/input/package-info.java
+++ b/engine/src/main/java/org/terasology/input/package-info.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-@API package org.terasology.input;
+@API package org.terasology.engine.input;
import org.terasology.module.sandbox.API;
diff --git a/engine/src/main/java/org/terasology/logic/actions/ActionTarget.java b/engine/src/main/java/org/terasology/logic/actions/ActionTarget.java
index 62cf4c9b2..7f3c331ae 100644
--- a/engine/src/main/java/org/terasology/logic/actions/ActionTarget.java
+++ b/engine/src/main/java/org/terasology/logic/actions/ActionTarget.java
@@ -1,20 +1,7 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.logic.actions;
+package org.terasology.engine.logic.actions;
/**
*/
diff --git a/engine/src/main/java/org/terasology/logic/actions/PlaySoundAction.java b/engine/src/main/java/org/terasology/logic/actions/PlaySoundAction.java
index 0b1a85f4a..65490ad0b 100644
--- a/engine/src/main/java/org/terasology/logic/actions/PlaySoundAction.java
+++ b/engine/src/main/java/org/terasology/logic/actions/PlaySoundAction.java
@@ -1,34 +1,21 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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 org.terasology.logic.actions;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.actions;
import org.joml.Vector3f;
-import org.terasology.audio.AudioManager;
-import org.terasology.audio.StaticSound;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.entitySystem.event.ReceiveEvent;
-import org.terasology.entitySystem.systems.BaseComponentSystem;
-import org.terasology.entitySystem.systems.RegisterMode;
-import org.terasology.entitySystem.systems.RegisterSystem;
-import org.terasology.logic.characters.events.ActivationPredicted;
-import org.terasology.logic.common.ActivateEvent;
-import org.terasology.logic.players.LocalPlayer;
-import org.terasology.registry.In;
-import org.terasology.utilities.random.FastRandom;
-import org.terasology.utilities.random.Random;
+import org.terasology.engine.audio.AudioManager;
+import org.terasology.engine.audio.StaticSound;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.event.ReceiveEvent;
+import org.terasology.engine.entitySystem.systems.BaseComponentSystem;
+import org.terasology.engine.entitySystem.systems.RegisterMode;
+import org.terasology.engine.entitySystem.systems.RegisterSystem;
+import org.terasology.engine.logic.players.LocalPlayer;
+import org.terasology.engine.logic.characters.events.ActivationPredicted;
+import org.terasology.engine.logic.common.ActivateEvent;
+import org.terasology.engine.registry.In;
+import org.terasology.engine.utilities.random.FastRandom;
+import org.terasology.engine.utilities.random.Random;
/**
* This systems handles the playing of sounds in response to events, on both server and client,
diff --git a/engine/src/main/java/org/terasology/logic/actions/PlaySoundActionComponent.java b/engine/src/main/java/org/terasology/logic/actions/PlaySoundActionComponent.java
index c59a9edbb..105bfc17a 100644
--- a/engine/src/main/java/org/terasology/logic/actions/PlaySoundActionComponent.java
+++ b/engine/src/main/java/org/terasology/logic/actions/PlaySoundActionComponent.java
@@ -1,23 +1,10 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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 org.terasology.logic.actions;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.actions;
import com.google.common.collect.Lists;
-import org.terasology.audio.StaticSound;
-import org.terasology.entitySystem.Component;
+import org.terasology.engine.audio.StaticSound;
+import org.terasology.engine.entitySystem.Component;
import java.util.Arrays;
import java.util.List;
diff --git a/engine/src/main/java/org/terasology/logic/actions/SpawnPrefabAction.java b/engine/src/main/java/org/terasology/logic/actions/SpawnPrefabAction.java
index ca67478d8..cd3f95811 100644
--- a/engine/src/main/java/org/terasology/logic/actions/SpawnPrefabAction.java
+++ b/engine/src/main/java/org/terasology/logic/actions/SpawnPrefabAction.java
@@ -1,30 +1,17 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.logic.actions;
+package org.terasology.engine.logic.actions;
import org.joml.Vector3f;
-import org.terasology.entitySystem.entity.EntityManager;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.entitySystem.event.ReceiveEvent;
-import org.terasology.entitySystem.systems.BaseComponentSystem;
-import org.terasology.entitySystem.systems.RegisterMode;
-import org.terasology.entitySystem.systems.RegisterSystem;
-import org.terasology.logic.common.ActivateEvent;
-import org.terasology.registry.In;
+import org.terasology.engine.entitySystem.entity.EntityManager;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.event.ReceiveEvent;
+import org.terasology.engine.entitySystem.systems.BaseComponentSystem;
+import org.terasology.engine.entitySystem.systems.RegisterMode;
+import org.terasology.engine.entitySystem.systems.RegisterSystem;
+import org.terasology.engine.logic.common.ActivateEvent;
+import org.terasology.engine.registry.In;
/**
*/
diff --git a/engine/src/main/java/org/terasology/logic/actions/SpawnPrefabActionComponent.java b/engine/src/main/java/org/terasology/logic/actions/SpawnPrefabActionComponent.java
index 24aea7b63..0db63be15 100644
--- a/engine/src/main/java/org/terasology/logic/actions/SpawnPrefabActionComponent.java
+++ b/engine/src/main/java/org/terasology/logic/actions/SpawnPrefabActionComponent.java
@@ -1,22 +1,9 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.logic.actions;
+package org.terasology.engine.logic.actions;
-import org.terasology.entitySystem.Component;
+import org.terasology.engine.entitySystem.Component;
/**
*/
diff --git a/engine/src/main/java/org/terasology/logic/actions/package-info.java b/engine/src/main/java/org/terasology/logic/actions/package-info.java
index 5b660aa21..fd8afd988 100644
--- a/engine/src/main/java/org/terasology/logic/actions/package-info.java
+++ b/engine/src/main/java/org/terasology/logic/actions/package-info.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-@API package org.terasology.logic.actions;
+@API package org.terasology.engine.logic.actions;
import org.terasology.module.sandbox.API;
diff --git a/engine/src/main/java/org/terasology/logic/afk/AfkAuthoritySystem.java b/engine/src/main/java/org/terasology/logic/afk/AfkAuthoritySystem.java
index 56acb79d2..4613df733 100644
--- a/engine/src/main/java/org/terasology/logic/afk/AfkAuthoritySystem.java
+++ b/engine/src/main/java/org/terasology/logic/afk/AfkAuthoritySystem.java
@@ -1,21 +1,21 @@
-// Copyright 2020 The Terasology Foundation
+// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.logic.afk;
+package org.terasology.engine.logic.afk;
-import org.terasology.engine.Time;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.entitySystem.event.ReceiveEvent;
-import org.terasology.entitySystem.systems.BaseComponentSystem;
-import org.terasology.entitySystem.systems.RegisterMode;
-import org.terasology.entitySystem.systems.RegisterSystem;
-import org.terasology.logic.delay.DelayManager;
-import org.terasology.logic.delay.PeriodicActionTriggeredEvent;
-import org.terasology.logic.players.LocalPlayer;
-import org.terasology.network.Client;
-import org.terasology.network.NetworkSystem;
-import org.terasology.network.events.ConnectedEvent;
-import org.terasology.network.events.DisconnectedEvent;
-import org.terasology.registry.In;
+import org.terasology.engine.core.Time;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.event.ReceiveEvent;
+import org.terasology.engine.entitySystem.systems.BaseComponentSystem;
+import org.terasology.engine.entitySystem.systems.RegisterMode;
+import org.terasology.engine.entitySystem.systems.RegisterSystem;
+import org.terasology.engine.logic.delay.DelayManager;
+import org.terasology.engine.logic.delay.PeriodicActionTriggeredEvent;
+import org.terasology.engine.logic.players.LocalPlayer;
+import org.terasology.engine.network.Client;
+import org.terasology.engine.network.NetworkSystem;
+import org.terasology.engine.network.events.ConnectedEvent;
+import org.terasology.engine.network.events.DisconnectedEvent;
+import org.terasology.engine.registry.In;
@RegisterSystem(RegisterMode.AUTHORITY)
public class AfkAuthoritySystem extends BaseComponentSystem {
diff --git a/engine/src/main/java/org/terasology/logic/afk/AfkClientSystem.java b/engine/src/main/java/org/terasology/logic/afk/AfkClientSystem.java
index fdedb6113..283a4e9cf 100644
--- a/engine/src/main/java/org/terasology/logic/afk/AfkClientSystem.java
+++ b/engine/src/main/java/org/terasology/logic/afk/AfkClientSystem.java
@@ -1,29 +1,28 @@
-// Copyright 2020 The Terasology Foundation
+// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.logic.afk;
+package org.terasology.engine.logic.afk;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.terasology.assets.ResourceUrn;
-import org.terasology.engine.Time;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.entitySystem.event.EventPriority;
-import org.terasology.entitySystem.event.ReceiveEvent;
-import org.terasology.entitySystem.systems.BaseComponentSystem;
-import org.terasology.entitySystem.systems.RegisterMode;
-import org.terasology.entitySystem.systems.RegisterSystem;
-import org.terasology.game.Game;
+import org.terasology.engine.core.Time;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.event.EventPriority;
+import org.terasology.engine.entitySystem.event.ReceiveEvent;
+import org.terasology.engine.entitySystem.systems.BaseComponentSystem;
+import org.terasology.engine.entitySystem.systems.RegisterMode;
+import org.terasology.engine.entitySystem.systems.RegisterSystem;
+import org.terasology.engine.game.Game;
+import org.terasology.engine.logic.console.Console;
+import org.terasology.engine.logic.console.commandSystem.annotations.Command;
+import org.terasology.engine.logic.players.LocalPlayer;
import org.terasology.input.Keyboard;
-import org.terasology.input.events.KeyDownEvent;
-import org.terasology.logic.console.Console;
-import org.terasology.logic.console.commandSystem.annotations.Command;
-import org.terasology.logic.permission.PermissionManager;
-import org.terasology.logic.players.LocalPlayer;
-import org.terasology.network.NetworkMode;
-import org.terasology.network.NetworkSystem;
-import org.terasology.physics.events.MovedEvent;
-import org.terasology.registry.In;
-import org.terasology.rendering.nui.NUIManager;
+import org.terasology.engine.input.events.KeyDownEvent;
+import org.terasology.engine.logic.permission.PermissionManager;
+import org.terasology.engine.network.NetworkMode;
+import org.terasology.engine.network.NetworkSystem;
+import org.terasology.engine.physics.events.MovedEvent;
+import org.terasology.engine.registry.In;
+import org.terasology.engine.rendering.nui.NUIManager;
@RegisterSystem(RegisterMode.CLIENT)
public class AfkClientSystem extends BaseComponentSystem {
diff --git a/engine/src/main/java/org/terasology/logic/afk/AfkComponent.java b/engine/src/main/java/org/terasology/logic/afk/AfkComponent.java
index cb83228f2..c23c15e6f 100644
--- a/engine/src/main/java/org/terasology/logic/afk/AfkComponent.java
+++ b/engine/src/main/java/org/terasology/logic/afk/AfkComponent.java
@@ -1,9 +1,9 @@
-// Copyright 2020 The Terasology Foundation
+// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.logic.afk;
+package org.terasology.engine.logic.afk;
-import org.terasology.entitySystem.Component;
-import org.terasology.network.Replicate;
+import org.terasology.engine.entitySystem.Component;
+import org.terasology.engine.network.Replicate;
public class AfkComponent implements Component {
diff --git a/engine/src/main/java/org/terasology/logic/afk/AfkDetectEvent.java b/engine/src/main/java/org/terasology/logic/afk/AfkDetectEvent.java
index 77aea5db8..0072e6ad2 100644
--- a/engine/src/main/java/org/terasology/logic/afk/AfkDetectEvent.java
+++ b/engine/src/main/java/org/terasology/logic/afk/AfkDetectEvent.java
@@ -1,9 +1,9 @@
-// Copyright 2020 The Terasology Foundation
+// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.logic.afk;
+package org.terasology.engine.logic.afk;
-import org.terasology.network.BroadcastEvent;
-import org.terasology.network.NetworkEvent;
+import org.terasology.engine.network.BroadcastEvent;
+import org.terasology.engine.network.NetworkEvent;
@BroadcastEvent
public class AfkDetectEvent extends NetworkEvent {
diff --git a/engine/src/main/java/org/terasology/logic/afk/AfkEvent.java b/engine/src/main/java/org/terasology/logic/afk/AfkEvent.java
index 855131ace..764f0cd44 100644
--- a/engine/src/main/java/org/terasology/logic/afk/AfkEvent.java
+++ b/engine/src/main/java/org/terasology/logic/afk/AfkEvent.java
@@ -1,10 +1,10 @@
-// Copyright 2020 The Terasology Foundation
+// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.logic.afk;
+package org.terasology.engine.logic.afk;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.network.BroadcastEvent;
-import org.terasology.network.NetworkEvent;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.network.BroadcastEvent;
+import org.terasology.engine.network.NetworkEvent;
@BroadcastEvent
public class AfkEvent extends NetworkEvent {
diff --git a/engine/src/main/java/org/terasology/logic/afk/AfkRequest.java b/engine/src/main/java/org/terasology/logic/afk/AfkRequest.java
index 442c94cbe..7630bd4d3 100644
--- a/engine/src/main/java/org/terasology/logic/afk/AfkRequest.java
+++ b/engine/src/main/java/org/terasology/logic/afk/AfkRequest.java
@@ -1,10 +1,10 @@
-// Copyright 2020 The Terasology Foundation
+// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.logic.afk;
+package org.terasology.engine.logic.afk;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.network.NetworkEvent;
-import org.terasology.network.ServerEvent;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.network.NetworkEvent;
+import org.terasology.engine.network.ServerEvent;
@ServerEvent
public class AfkRequest extends NetworkEvent {
diff --git a/engine/src/main/java/org/terasology/logic/ai/AICommands.java b/engine/src/main/java/org/terasology/logic/ai/AICommands.java
index a5b66d198..65504288f 100644
--- a/engine/src/main/java/org/terasology/logic/ai/AICommands.java
+++ b/engine/src/main/java/org/terasology/logic/ai/AICommands.java
@@ -1,26 +1,13 @@
-/*
- * Copyright 2014 MovingBlocks
- *
- * 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 org.terasology.logic.ai;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.ai;
-import org.terasology.entitySystem.entity.EntityManager;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.entitySystem.systems.BaseComponentSystem;
-import org.terasology.entitySystem.systems.RegisterSystem;
-import org.terasology.logic.console.commandSystem.annotations.Command;
-import org.terasology.registry.In;
+import org.terasology.engine.entitySystem.entity.EntityManager;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.systems.BaseComponentSystem;
+import org.terasology.engine.entitySystem.systems.RegisterSystem;
+import org.terasology.engine.logic.console.commandSystem.annotations.Command;
+import org.terasology.engine.registry.In;
import com.google.common.collect.Iterables;
diff --git a/engine/src/main/java/org/terasology/logic/ai/HierarchicalAIComponent.java b/engine/src/main/java/org/terasology/logic/ai/HierarchicalAIComponent.java
index 07a5b783d..241f7f14a 100644
--- a/engine/src/main/java/org/terasology/logic/ai/HierarchicalAIComponent.java
+++ b/engine/src/main/java/org/terasology/logic/ai/HierarchicalAIComponent.java
@@ -1,21 +1,8 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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 org.terasology.logic.ai;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.ai;
-import org.terasology.entitySystem.Component;
+import org.terasology.engine.entitySystem.Component;
import org.joml.Vector3f;
/**
diff --git a/engine/src/main/java/org/terasology/logic/ai/HierarchicalAISystem.java b/engine/src/main/java/org/terasology/logic/ai/HierarchicalAISystem.java
index c0bbaad24..2ccdaad6b 100644
--- a/engine/src/main/java/org/terasology/logic/ai/HierarchicalAISystem.java
+++ b/engine/src/main/java/org/terasology/logic/ai/HierarchicalAISystem.java
@@ -1,39 +1,26 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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 org.terasology.logic.ai;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.ai;
import org.joml.Vector3f;
import org.joml.Vector3fc;
-import org.terasology.engine.Time;
-import org.terasology.entitySystem.entity.EntityManager;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.entitySystem.event.ReceiveEvent;
-import org.terasology.entitySystem.systems.BaseComponentSystem;
-import org.terasology.entitySystem.systems.RegisterMode;
-import org.terasology.entitySystem.systems.RegisterSystem;
-import org.terasology.entitySystem.systems.UpdateSubscriberSystem;
-import org.terasology.logic.characters.CharacterMoveInputEvent;
-import org.terasology.logic.characters.CharacterMovementComponent;
-import org.terasology.logic.characters.events.HorizontalCollisionEvent;
-import org.terasology.logic.location.LocationComponent;
-import org.terasology.logic.players.LocalPlayer;
-import org.terasology.registry.In;
-import org.terasology.utilities.random.FastRandom;
-import org.terasology.utilities.random.Random;
-import org.terasology.world.WorldProvider;
+import org.terasology.engine.core.Time;
+import org.terasology.engine.entitySystem.entity.EntityManager;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.event.ReceiveEvent;
+import org.terasology.engine.entitySystem.systems.BaseComponentSystem;
+import org.terasology.engine.entitySystem.systems.RegisterMode;
+import org.terasology.engine.entitySystem.systems.RegisterSystem;
+import org.terasology.engine.entitySystem.systems.UpdateSubscriberSystem;
+import org.terasology.engine.logic.characters.CharacterMoveInputEvent;
+import org.terasology.engine.logic.characters.CharacterMovementComponent;
+import org.terasology.engine.logic.location.LocationComponent;
+import org.terasology.engine.logic.players.LocalPlayer;
+import org.terasology.engine.logic.characters.events.HorizontalCollisionEvent;
+import org.terasology.engine.registry.In;
+import org.terasology.engine.utilities.random.FastRandom;
+import org.terasology.engine.utilities.random.Random;
+import org.terasology.engine.world.WorldProvider;
/**
* Hierarchical AI, idea from robotics
diff --git a/engine/src/main/java/org/terasology/logic/ai/SimpleAIComponent.java b/engine/src/main/java/org/terasology/logic/ai/SimpleAIComponent.java
index 7bd548f98..452cd9a6f 100644
--- a/engine/src/main/java/org/terasology/logic/ai/SimpleAIComponent.java
+++ b/engine/src/main/java/org/terasology/logic/ai/SimpleAIComponent.java
@@ -1,21 +1,8 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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 org.terasology.logic.ai;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.ai;
-import org.terasology.entitySystem.Component;
+import org.terasology.engine.entitySystem.Component;
import org.joml.Vector3f;
/**
diff --git a/engine/src/main/java/org/terasology/logic/ai/SimpleAISystem.java b/engine/src/main/java/org/terasology/logic/ai/SimpleAISystem.java
index 5afe1b256..d58d30b02 100644
--- a/engine/src/main/java/org/terasology/logic/ai/SimpleAISystem.java
+++ b/engine/src/main/java/org/terasology/logic/ai/SimpleAISystem.java
@@ -1,39 +1,26 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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 org.terasology.logic.ai;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.ai;
import org.joml.Quaternionf;
import org.joml.Vector3f;
-import org.terasology.engine.Time;
-import org.terasology.entitySystem.entity.EntityManager;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.entitySystem.event.ReceiveEvent;
-import org.terasology.entitySystem.systems.BaseComponentSystem;
-import org.terasology.entitySystem.systems.RegisterMode;
-import org.terasology.entitySystem.systems.RegisterSystem;
-import org.terasology.entitySystem.systems.UpdateSubscriberSystem;
-import org.terasology.logic.characters.CharacterMoveInputEvent;
-import org.terasology.logic.characters.CharacterMovementComponent;
-import org.terasology.logic.characters.events.HorizontalCollisionEvent;
-import org.terasology.logic.location.LocationComponent;
-import org.terasology.logic.players.LocalPlayer;
-import org.terasology.registry.In;
-import org.terasology.utilities.random.FastRandom;
-import org.terasology.utilities.random.Random;
-import org.terasology.world.WorldProvider;
+import org.terasology.engine.core.Time;
+import org.terasology.engine.entitySystem.entity.EntityManager;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.event.ReceiveEvent;
+import org.terasology.engine.entitySystem.systems.BaseComponentSystem;
+import org.terasology.engine.entitySystem.systems.RegisterMode;
+import org.terasology.engine.entitySystem.systems.RegisterSystem;
+import org.terasology.engine.entitySystem.systems.UpdateSubscriberSystem;
+import org.terasology.engine.logic.characters.CharacterMoveInputEvent;
+import org.terasology.engine.logic.characters.CharacterMovementComponent;
+import org.terasology.engine.logic.location.LocationComponent;
+import org.terasology.engine.logic.players.LocalPlayer;
+import org.terasology.engine.logic.characters.events.HorizontalCollisionEvent;
+import org.terasology.engine.registry.In;
+import org.terasology.engine.utilities.random.FastRandom;
+import org.terasology.engine.utilities.random.Random;
+import org.terasology.engine.world.WorldProvider;
/**
*/
diff --git a/engine/src/main/java/org/terasology/logic/ai/package-info.java b/engine/src/main/java/org/terasology/logic/ai/package-info.java
index dc61468f0..138aab2f9 100644
--- a/engine/src/main/java/org/terasology/logic/ai/package-info.java
+++ b/engine/src/main/java/org/terasology/logic/ai/package-info.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-@API package org.terasology.logic.ai;
+@API package org.terasology.engine.logic.ai;
import org.terasology.module.sandbox.API;
diff --git a/engine/src/main/java/org/terasology/logic/autoCreate/AutoCreateComponent.java b/engine/src/main/java/org/terasology/logic/autoCreate/AutoCreateComponent.java
index 4bb9806d8..a299601fe 100644
--- a/engine/src/main/java/org/terasology/logic/autoCreate/AutoCreateComponent.java
+++ b/engine/src/main/java/org/terasology/logic/autoCreate/AutoCreateComponent.java
@@ -1,22 +1,9 @@
-/*
- * Copyright 2014 MovingBlocks
- *
- * 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 org.terasology.logic.autoCreate;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.autoCreate;
import org.terasology.module.sandbox.API;
-import org.terasology.entitySystem.Component;
+import org.terasology.engine.entitySystem.Component;
/**
* This component is used to mark prefabs that should automatically created when a game begins or is loaded, if one does not already exist.
diff --git a/engine/src/main/java/org/terasology/logic/autoCreate/AutoCreateSystem.java b/engine/src/main/java/org/terasology/logic/autoCreate/AutoCreateSystem.java
index dfcf70a1a..407b1e636 100644
--- a/engine/src/main/java/org/terasology/logic/autoCreate/AutoCreateSystem.java
+++ b/engine/src/main/java/org/terasology/logic/autoCreate/AutoCreateSystem.java
@@ -1,30 +1,17 @@
-/*
- * Copyright 2014 MovingBlocks
- *
- * 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 org.terasology.logic.autoCreate;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.autoCreate;
import com.google.common.collect.Sets;
-import org.terasology.entitySystem.entity.EntityManager;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.entitySystem.prefab.Prefab;
-import org.terasology.entitySystem.prefab.PrefabManager;
-import org.terasology.entitySystem.systems.BaseComponentSystem;
-import org.terasology.entitySystem.systems.RegisterSystem;
-import org.terasology.network.NetworkMode;
-import org.terasology.network.NetworkSystem;
-import org.terasology.registry.In;
+import org.terasology.engine.entitySystem.entity.EntityManager;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.prefab.Prefab;
+import org.terasology.engine.entitySystem.prefab.PrefabManager;
+import org.terasology.engine.entitySystem.systems.BaseComponentSystem;
+import org.terasology.engine.entitySystem.systems.RegisterSystem;
+import org.terasology.engine.network.NetworkMode;
+import org.terasology.engine.network.NetworkSystem;
+import org.terasology.engine.registry.In;
import java.util.Set;
diff --git a/engine/src/main/java/org/terasology/logic/behavior/BehaviorAction.java b/engine/src/main/java/org/terasology/logic/behavior/BehaviorAction.java
index 1aaa6b3e0..5591224c7 100644
--- a/engine/src/main/java/org/terasology/logic/behavior/BehaviorAction.java
+++ b/engine/src/main/java/org/terasology/logic/behavior/BehaviorAction.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2017 MovingBlocks
- *
- * 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 org.terasology.logic.behavior;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.behavior;
import org.terasology.module.sandbox.API;
diff --git a/engine/src/main/java/org/terasology/logic/behavior/BehaviorComponent.java b/engine/src/main/java/org/terasology/logic/behavior/BehaviorComponent.java
index 580fa41cf..566f1c3ea 100644
--- a/engine/src/main/java/org/terasology/logic/behavior/BehaviorComponent.java
+++ b/engine/src/main/java/org/terasology/logic/behavior/BehaviorComponent.java
@@ -1,22 +1,9 @@
-/*
- * Copyright 2017 MovingBlocks
- *
- * 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 org.terasology.logic.behavior;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.behavior;
-import org.terasology.entitySystem.Component;
-import org.terasology.logic.behavior.asset.BehaviorTree;
+import org.terasology.engine.entitySystem.Component;
+import org.terasology.engine.logic.behavior.asset.BehaviorTree;
import org.terasology.module.sandbox.API;
/**
diff --git a/engine/src/main/java/org/terasology/logic/behavior/BehaviorSystem.java b/engine/src/main/java/org/terasology/logic/behavior/BehaviorSystem.java
index f217f8c69..ebd7a3a79 100644
--- a/engine/src/main/java/org/terasology/logic/behavior/BehaviorSystem.java
+++ b/engine/src/main/java/org/terasology/logic/behavior/BehaviorSystem.java
@@ -1,31 +1,31 @@
// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.logic.behavior;
+package org.terasology.engine.logic.behavior;
import com.google.common.collect.Lists;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.terasology.assets.ResourceUrn;
import org.terasology.assets.management.AssetManager;
-import org.terasology.engine.paths.PathManager;
-import org.terasology.entitySystem.entity.EntityManager;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.entitySystem.entity.lifecycleEvents.OnActivatedComponent;
-import org.terasology.entitySystem.entity.lifecycleEvents.OnAddedComponent;
-import org.terasology.entitySystem.event.ReceiveEvent;
-import org.terasology.entitySystem.prefab.PrefabManager;
-import org.terasology.entitySystem.systems.BaseComponentSystem;
-import org.terasology.entitySystem.systems.RegisterMode;
-import org.terasology.entitySystem.systems.RegisterSystem;
-import org.terasology.entitySystem.systems.UpdateSubscriberSystem;
-import org.terasology.logic.behavior.asset.BehaviorTree;
-import org.terasology.logic.behavior.asset.BehaviorTreeData;
-import org.terasology.logic.behavior.asset.BehaviorTreeFormat;
-import org.terasology.logic.behavior.core.Actor;
-import org.terasology.logic.behavior.core.BehaviorNode;
+import org.terasology.engine.core.paths.PathManager;
+import org.terasology.engine.entitySystem.entity.EntityManager;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.entity.lifecycleEvents.OnActivatedComponent;
+import org.terasology.engine.entitySystem.entity.lifecycleEvents.OnAddedComponent;
+import org.terasology.engine.entitySystem.event.ReceiveEvent;
+import org.terasology.engine.entitySystem.prefab.PrefabManager;
+import org.terasology.engine.entitySystem.systems.BaseComponentSystem;
+import org.terasology.engine.entitySystem.systems.RegisterMode;
+import org.terasology.engine.entitySystem.systems.RegisterSystem;
+import org.terasology.engine.entitySystem.systems.UpdateSubscriberSystem;
+import org.terasology.engine.logic.behavior.asset.BehaviorTree;
+import org.terasology.engine.logic.behavior.asset.BehaviorTreeData;
+import org.terasology.engine.logic.behavior.asset.BehaviorTreeFormat;
+import org.terasology.engine.logic.behavior.core.Actor;
+import org.terasology.engine.logic.behavior.core.BehaviorNode;
import org.terasology.naming.Name;
-import org.terasology.registry.In;
-import org.terasology.registry.Share;
+import org.terasology.engine.registry.In;
+import org.terasology.engine.registry.Share;
import java.io.FileOutputStream;
import java.io.IOException;
diff --git a/engine/src/main/java/org/terasology/logic/behavior/Callback.java b/engine/src/main/java/org/terasology/logic/behavior/Callback.java
index 80d4a8d8d..24028be8c 100644
--- a/engine/src/main/java/org/terasology/logic/behavior/Callback.java
+++ b/engine/src/main/java/org/terasology/logic/behavior/Callback.java
@@ -1,22 +1,9 @@
-/*
- * Copyright 2019 MovingBlocks
- *
- * 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 org.terasology.logic.behavior;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.behavior;
-import org.terasology.logic.behavior.core.BehaviorNode;
-import org.terasology.logic.behavior.core.BehaviorState;
+import org.terasology.engine.logic.behavior.core.BehaviorNode;
+import org.terasology.engine.logic.behavior.core.BehaviorState;
public interface Callback {
void afterExecute(BehaviorNode node, BehaviorState state);
diff --git a/engine/src/main/java/org/terasology/logic/behavior/CollectiveBehaviorComponent.java b/engine/src/main/java/org/terasology/logic/behavior/CollectiveBehaviorComponent.java
index e5b928ca3..228c37730 100644
--- a/engine/src/main/java/org/terasology/logic/behavior/CollectiveBehaviorComponent.java
+++ b/engine/src/main/java/org/terasology/logic/behavior/CollectiveBehaviorComponent.java
@@ -1,22 +1,9 @@
-/*
- * Copyright 2019 MovingBlocks
- *
- * 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 org.terasology.logic.behavior;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.behavior;
-import org.terasology.entitySystem.Component;
-import org.terasology.logic.behavior.asset.BehaviorTree;
+import org.terasology.engine.entitySystem.Component;
+import org.terasology.engine.logic.behavior.asset.BehaviorTree;
import org.terasology.module.sandbox.API;
/**
diff --git a/engine/src/main/java/org/terasology/logic/behavior/CollectiveBehaviorSystem.java b/engine/src/main/java/org/terasology/logic/behavior/CollectiveBehaviorSystem.java
index 9fb61213a..1d5303ba9 100644
--- a/engine/src/main/java/org/terasology/logic/behavior/CollectiveBehaviorSystem.java
+++ b/engine/src/main/java/org/terasology/logic/behavior/CollectiveBehaviorSystem.java
@@ -1,32 +1,32 @@
// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.logic.behavior;
+package org.terasology.engine.logic.behavior;
import com.google.common.collect.Lists;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.terasology.assets.ResourceUrn;
import org.terasology.assets.management.AssetManager;
-import org.terasology.audio.StaticSound;
-import org.terasology.engine.paths.PathManager;
-import org.terasology.entitySystem.entity.EntityManager;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.entitySystem.entity.lifecycleEvents.OnActivatedComponent;
-import org.terasology.entitySystem.entity.lifecycleEvents.OnAddedComponent;
-import org.terasology.entitySystem.event.ReceiveEvent;
-import org.terasology.entitySystem.prefab.PrefabManager;
-import org.terasology.entitySystem.systems.BaseComponentSystem;
-import org.terasology.entitySystem.systems.RegisterMode;
-import org.terasology.entitySystem.systems.RegisterSystem;
-import org.terasology.entitySystem.systems.UpdateSubscriberSystem;
-import org.terasology.logic.behavior.asset.BehaviorTree;
-import org.terasology.logic.behavior.asset.BehaviorTreeData;
-import org.terasology.logic.behavior.asset.BehaviorTreeFormat;
-import org.terasology.logic.behavior.core.Actor;
-import org.terasology.logic.behavior.core.BehaviorNode;
+import org.terasology.engine.audio.StaticSound;
+import org.terasology.engine.core.paths.PathManager;
+import org.terasology.engine.entitySystem.entity.EntityManager;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.entity.lifecycleEvents.OnActivatedComponent;
+import org.terasology.engine.entitySystem.entity.lifecycleEvents.OnAddedComponent;
+import org.terasology.engine.entitySystem.event.ReceiveEvent;
+import org.terasology.engine.entitySystem.prefab.PrefabManager;
+import org.terasology.engine.entitySystem.systems.BaseComponentSystem;
+import org.terasology.engine.entitySystem.systems.RegisterMode;
+import org.terasology.engine.entitySystem.systems.RegisterSystem;
+import org.terasology.engine.entitySystem.systems.UpdateSubscriberSystem;
+import org.terasology.engine.logic.behavior.asset.BehaviorTree;
+import org.terasology.engine.logic.behavior.asset.BehaviorTreeData;
+import org.terasology.engine.logic.behavior.asset.BehaviorTreeFormat;
+import org.terasology.engine.logic.behavior.core.Actor;
+import org.terasology.engine.logic.behavior.core.BehaviorNode;
import org.terasology.naming.Name;
-import org.terasology.registry.In;
-import org.terasology.registry.Share;
+import org.terasology.engine.registry.In;
+import org.terasology.engine.registry.Share;
import java.io.FileOutputStream;
import java.io.IOException;
diff --git a/engine/src/main/java/org/terasology/logic/behavior/CollectiveInterpreter.java b/engine/src/main/java/org/terasology/logic/behavior/CollectiveInterpreter.java
index 9ffe5e558..dba243f0e 100644
--- a/engine/src/main/java/org/terasology/logic/behavior/CollectiveInterpreter.java
+++ b/engine/src/main/java/org/terasology/logic/behavior/CollectiveInterpreter.java
@@ -1,24 +1,11 @@
-/*
- * Copyright 2019 MovingBlocks
- *
- * 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 org.terasology.logic.behavior;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.behavior;
-import org.terasology.logic.behavior.asset.BehaviorTree;
-import org.terasology.logic.behavior.core.Actor;
-import org.terasology.logic.behavior.core.CollectiveBehaviorTreeRunner;
-import org.terasology.logic.common.DisplayNameComponent;
+import org.terasology.engine.logic.behavior.asset.BehaviorTree;
+import org.terasology.engine.logic.behavior.core.Actor;
+import org.terasology.engine.logic.behavior.core.CollectiveBehaviorTreeRunner;
+import org.terasology.engine.logic.common.DisplayNameComponent;
import org.terasology.module.sandbox.API;
import java.util.Set;
diff --git a/engine/src/main/java/org/terasology/logic/behavior/DefaultBehaviorTreeRunner.java b/engine/src/main/java/org/terasology/logic/behavior/DefaultBehaviorTreeRunner.java
index 92da0378f..e77180e5b 100644
--- a/engine/src/main/java/org/terasology/logic/behavior/DefaultBehaviorTreeRunner.java
+++ b/engine/src/main/java/org/terasology/logic/behavior/DefaultBehaviorTreeRunner.java
@@ -1,26 +1,13 @@
-/*
- * Copyright 2017 MovingBlocks
- *
- * 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 org.terasology.logic.behavior;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.behavior;
-import org.terasology.logic.behavior.asset.BehaviorTree;
-import org.terasology.logic.behavior.core.Actor;
-import org.terasology.logic.behavior.core.BehaviorNode;
-import org.terasology.logic.behavior.core.BehaviorState;
-import org.terasology.logic.behavior.core.BehaviorTreeRunner;
-import org.terasology.logic.behavior.core.DelegateNode;
+import org.terasology.engine.logic.behavior.asset.BehaviorTree;
+import org.terasology.engine.logic.behavior.core.Actor;
+import org.terasology.engine.logic.behavior.core.BehaviorNode;
+import org.terasology.engine.logic.behavior.core.BehaviorState;
+import org.terasology.engine.logic.behavior.core.BehaviorTreeRunner;
+import org.terasology.engine.logic.behavior.core.DelegateNode;
/**
* Tree runner, that runs the given tree.
diff --git a/engine/src/main/java/org/terasology/logic/behavior/DefaultCollectiveBehaviorTreeRunner.java b/engine/src/main/java/org/terasology/logic/behavior/DefaultCollectiveBehaviorTreeRunner.java
index 9d7199289..b7384420f 100644
--- a/engine/src/main/java/org/terasology/logic/behavior/DefaultCollectiveBehaviorTreeRunner.java
+++ b/engine/src/main/java/org/terasology/logic/behavior/DefaultCollectiveBehaviorTreeRunner.java
@@ -1,26 +1,13 @@
-/*
- * Copyright 2019 MovingBlocks
- *
- * 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 org.terasology.logic.behavior;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.behavior;
-import org.terasology.logic.behavior.asset.BehaviorTree;
-import org.terasology.logic.behavior.core.Actor;
-import org.terasology.logic.behavior.core.BehaviorNode;
-import org.terasology.logic.behavior.core.BehaviorState;
-import org.terasology.logic.behavior.core.CollectiveBehaviorTreeRunner;
-import org.terasology.logic.behavior.core.DelegateNode;
+import org.terasology.engine.logic.behavior.asset.BehaviorTree;
+import org.terasology.engine.logic.behavior.core.Actor;
+import org.terasology.engine.logic.behavior.core.BehaviorNode;
+import org.terasology.engine.logic.behavior.core.BehaviorState;
+import org.terasology.engine.logic.behavior.core.CollectiveBehaviorTreeRunner;
+import org.terasology.engine.logic.behavior.core.DelegateNode;
import java.util.Set;
diff --git a/engine/src/main/java/org/terasology/logic/behavior/GroupMindComponent.java b/engine/src/main/java/org/terasology/logic/behavior/GroupMindComponent.java
index 462cb61ce..6ca360e26 100644
--- a/engine/src/main/java/org/terasology/logic/behavior/GroupMindComponent.java
+++ b/engine/src/main/java/org/terasology/logic/behavior/GroupMindComponent.java
@@ -1,22 +1,9 @@
-/*
- * Copyright 2019 MovingBlocks
- *
- * 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 org.terasology.logic.behavior;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.behavior;
-import org.terasology.entitySystem.Component;
-import org.terasology.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.Component;
+import org.terasology.engine.entitySystem.entity.EntityRef;
import java.util.HashSet;
import java.util.Set;
diff --git a/engine/src/main/java/org/terasology/logic/behavior/GroupTagComponent.java b/engine/src/main/java/org/terasology/logic/behavior/GroupTagComponent.java
index 19553b82b..f71a1a16b 100644
--- a/engine/src/main/java/org/terasology/logic/behavior/GroupTagComponent.java
+++ b/engine/src/main/java/org/terasology/logic/behavior/GroupTagComponent.java
@@ -1,23 +1,9 @@
-/*
- * Copyright 2019 MovingBlocks
- *
- * 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 org.terasology.logic.behavior;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.behavior;
-import org.terasology.entitySystem.Component;
-import org.terasology.logic.behavior.Interpreter;
-import org.terasology.logic.behavior.asset.BehaviorTree;
+import org.terasology.engine.entitySystem.Component;
+import org.terasology.engine.logic.behavior.asset.BehaviorTree;
import java.util.ArrayList;
import java.util.List;
diff --git a/engine/src/main/java/org/terasology/logic/behavior/Interpreter.java b/engine/src/main/java/org/terasology/logic/behavior/Interpreter.java
index 7ef4b8b4b..3090cdce5 100644
--- a/engine/src/main/java/org/terasology/logic/behavior/Interpreter.java
+++ b/engine/src/main/java/org/terasology/logic/behavior/Interpreter.java
@@ -1,24 +1,11 @@
-/*
- * Copyright 2017 MovingBlocks
- *
- * 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 org.terasology.logic.behavior;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.behavior;
-import org.terasology.logic.behavior.asset.BehaviorTree;
-import org.terasology.logic.behavior.core.Actor;
-import org.terasology.logic.behavior.core.BehaviorTreeRunner;
-import org.terasology.logic.common.DisplayNameComponent;
+import org.terasology.engine.logic.behavior.asset.BehaviorTree;
+import org.terasology.engine.logic.behavior.core.Actor;
+import org.terasology.engine.logic.behavior.core.BehaviorTreeRunner;
+import org.terasology.engine.logic.common.DisplayNameComponent;
import org.terasology.module.sandbox.API;
/**
diff --git a/engine/src/main/java/org/terasology/logic/behavior/actions/CounterAction.java b/engine/src/main/java/org/terasology/logic/behavior/actions/CounterAction.java
index 14449d575..d71a3bc84 100644
--- a/engine/src/main/java/org/terasology/logic/behavior/actions/CounterAction.java
+++ b/engine/src/main/java/org/terasology/logic/behavior/actions/CounterAction.java
@@ -1,24 +1,11 @@
-/*
- * Copyright 2017 MovingBlocks
- *
- * 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 org.terasology.logic.behavior.actions;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.behavior.actions;
-import org.terasology.logic.behavior.BehaviorAction;
-import org.terasology.logic.behavior.core.Actor;
-import org.terasology.logic.behavior.core.BaseAction;
-import org.terasology.logic.behavior.core.BehaviorState;
+import org.terasology.engine.logic.behavior.BehaviorAction;
+import org.terasology.engine.logic.behavior.core.Actor;
+import org.terasology.engine.logic.behavior.core.BaseAction;
+import org.terasology.engine.logic.behavior.core.BehaviorState;
import org.terasology.module.sandbox.API;
import org.terasology.nui.properties.Range;
diff --git a/engine/src/main/java/org/terasology/logic/behavior/actions/InvertAction.java b/engine/src/main/java/org/terasology/logic/behavior/actions/InvertAction.java
index f64ed2026..e2c32a459 100644
--- a/engine/src/main/java/org/terasology/logic/behavior/actions/InvertAction.java
+++ b/engine/src/main/java/org/terasology/logic/behavior/actions/InvertAction.java
@@ -1,24 +1,11 @@
-/*
- * Copyright 2017 MovingBlocks
- *
- * 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 org.terasology.logic.behavior.actions;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.behavior.actions;
-import org.terasology.logic.behavior.BehaviorAction;
-import org.terasology.logic.behavior.core.Actor;
-import org.terasology.logic.behavior.core.BaseAction;
-import org.terasology.logic.behavior.core.BehaviorState;
+import org.terasology.engine.logic.behavior.BehaviorAction;
+import org.terasology.engine.logic.behavior.core.Actor;
+import org.terasology.engine.logic.behavior.core.BaseAction;
+import org.terasology.engine.logic.behavior.core.BehaviorState;
import org.terasology.module.sandbox.API;
/**
diff --git a/engine/src/main/java/org/terasology/logic/behavior/actions/LookupAction.java b/engine/src/main/java/org/terasology/logic/behavior/actions/LookupAction.java
index 140be0fbe..87a9da9f9 100644
--- a/engine/src/main/java/org/terasology/logic/behavior/actions/LookupAction.java
+++ b/engine/src/main/java/org/terasology/logic/behavior/actions/LookupAction.java
@@ -1,26 +1,13 @@
-/*
- * Copyright 2017 MovingBlocks
- *
- * 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 org.terasology.logic.behavior.actions;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.behavior.actions;
-import org.terasology.logic.behavior.BehaviorAction;
-import org.terasology.logic.behavior.asset.BehaviorTree;
-import org.terasology.logic.behavior.core.Actor;
-import org.terasology.logic.behavior.core.BaseAction;
-import org.terasology.logic.behavior.core.BehaviorNode;
-import org.terasology.logic.behavior.core.BehaviorState;
+import org.terasology.engine.logic.behavior.BehaviorAction;
+import org.terasology.engine.logic.behavior.asset.BehaviorTree;
+import org.terasology.engine.logic.behavior.core.Actor;
+import org.terasology.engine.logic.behavior.core.BaseAction;
+import org.terasology.engine.logic.behavior.core.BehaviorNode;
+import org.terasology.engine.logic.behavior.core.BehaviorState;
import org.terasology.module.sandbox.API;
import org.terasology.nui.properties.OneOf;
diff --git a/engine/src/main/java/org/terasology/logic/behavior/actions/LoopAction.java b/engine/src/main/java/org/terasology/logic/behavior/actions/LoopAction.java
index ded24ee64..777210eb4 100644
--- a/engine/src/main/java/org/terasology/logic/behavior/actions/LoopAction.java
+++ b/engine/src/main/java/org/terasology/logic/behavior/actions/LoopAction.java
@@ -1,24 +1,11 @@
-/*
- * Copyright 2017 MovingBlocks
- *
- * 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 org.terasology.logic.behavior.actions;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.behavior.actions;
-import org.terasology.logic.behavior.BehaviorAction;
-import org.terasology.logic.behavior.core.Actor;
-import org.terasology.logic.behavior.core.BaseAction;
-import org.terasology.logic.behavior.core.BehaviorState;
+import org.terasology.engine.logic.behavior.BehaviorAction;
+import org.terasology.engine.logic.behavior.core.Actor;
+import org.terasology.engine.logic.behavior.core.BaseAction;
+import org.terasology.engine.logic.behavior.core.BehaviorState;
import org.terasology.module.sandbox.API;
/**
diff --git a/engine/src/main/java/org/terasology/logic/behavior/actions/Print.java b/engine/src/main/java/org/terasology/logic/behavior/actions/Print.java
index 94568427e..3f8e1306e 100644
--- a/engine/src/main/java/org/terasology/logic/behavior/actions/Print.java
+++ b/engine/src/main/java/org/terasology/logic/behavior/actions/Print.java
@@ -1,24 +1,11 @@
-/*
- * Copyright 2017 MovingBlocks
- *
- * 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 org.terasology.logic.behavior.actions;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.behavior.actions;
-import org.terasology.logic.behavior.BehaviorAction;
-import org.terasology.logic.behavior.core.Actor;
-import org.terasology.logic.behavior.core.BaseAction;
-import org.terasology.logic.behavior.core.BehaviorState;
+import org.terasology.engine.logic.behavior.BehaviorAction;
+import org.terasology.engine.logic.behavior.core.Actor;
+import org.terasology.engine.logic.behavior.core.BaseAction;
+import org.terasology.engine.logic.behavior.core.BehaviorState;
/*
This is a test-related action.
diff --git a/engine/src/main/java/org/terasology/logic/behavior/actions/SleepAction.java b/engine/src/main/java/org/terasology/logic/behavior/actions/SleepAction.java
index 8e7d099aa..fbdc0fba9 100644
--- a/engine/src/main/java/org/terasology/logic/behavior/actions/SleepAction.java
+++ b/engine/src/main/java/org/terasology/logic/behavior/actions/SleepAction.java
@@ -1,24 +1,11 @@
-/*
- * Copyright 2017 MovingBlocks
- *
- * 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 org.terasology.logic.behavior.actions;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.behavior.actions;
-import org.terasology.logic.behavior.BehaviorAction;
-import org.terasology.logic.behavior.core.Actor;
-import org.terasology.logic.behavior.core.BaseAction;
-import org.terasology.logic.behavior.core.BehaviorState;
+import org.terasology.engine.logic.behavior.BehaviorAction;
+import org.terasology.engine.logic.behavior.core.Actor;
+import org.terasology.engine.logic.behavior.core.BaseAction;
+import org.terasology.engine.logic.behavior.core.BehaviorState;
import org.terasology.module.sandbox.API;
import org.terasology.nui.properties.Range;
diff --git a/engine/src/main/java/org/terasology/logic/behavior/actions/TimeoutAction.java b/engine/src/main/java/org/terasology/logic/behavior/actions/TimeoutAction.java
index ffd11ad9c..870e3937c 100644
--- a/engine/src/main/java/org/terasology/logic/behavior/actions/TimeoutAction.java
+++ b/engine/src/main/java/org/terasology/logic/behavior/actions/TimeoutAction.java
@@ -1,26 +1,13 @@
-/*
- * Copyright 2017 MovingBlocks
- *
- * 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 org.terasology.logic.behavior.actions;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.behavior.actions;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.terasology.logic.behavior.BehaviorAction;
-import org.terasology.logic.behavior.core.Actor;
-import org.terasology.logic.behavior.core.BaseAction;
-import org.terasology.logic.behavior.core.BehaviorState;
+import org.terasology.engine.logic.behavior.BehaviorAction;
+import org.terasology.engine.logic.behavior.core.Actor;
+import org.terasology.engine.logic.behavior.core.BaseAction;
+import org.terasology.engine.logic.behavior.core.BehaviorState;
import org.terasology.module.sandbox.API;
import org.terasology.nui.properties.Range;
diff --git a/engine/src/main/java/org/terasology/logic/behavior/actions/conditions/ConditionAction.java b/engine/src/main/java/org/terasology/logic/behavior/actions/conditions/ConditionAction.java
index 3fc0bcaae..dc6483d38 100644
--- a/engine/src/main/java/org/terasology/logic/behavior/actions/conditions/ConditionAction.java
+++ b/engine/src/main/java/org/terasology/logic/behavior/actions/conditions/ConditionAction.java
@@ -1,31 +1,18 @@
-/*
- * Copyright 2017 MovingBlocks
- *
- * 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 org.terasology.logic.behavior.actions.conditions;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.behavior.actions.conditions;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.terasology.engine.module.ModuleManager;
-import org.terasology.entitySystem.Component;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.entitySystem.metadata.ComponentLibrary;
-import org.terasology.logic.behavior.BehaviorAction;
-import org.terasology.logic.behavior.core.Actor;
-import org.terasology.logic.behavior.core.BaseAction;
-import org.terasology.logic.behavior.core.BehaviorState;
-import org.terasology.registry.In;
+import org.terasology.engine.core.module.ModuleManager;
+import org.terasology.engine.entitySystem.Component;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.metadata.ComponentLibrary;
+import org.terasology.engine.logic.behavior.BehaviorAction;
+import org.terasology.engine.logic.behavior.core.Actor;
+import org.terasology.engine.logic.behavior.core.BaseAction;
+import org.terasology.engine.logic.behavior.core.BehaviorState;
+import org.terasology.engine.registry.In;
import java.util.Collection;
diff --git a/engine/src/main/java/org/terasology/logic/behavior/actions/conditions/GuardAction.java b/engine/src/main/java/org/terasology/logic/behavior/actions/conditions/GuardAction.java
index 09a7ba424..9f873264b 100644
--- a/engine/src/main/java/org/terasology/logic/behavior/actions/conditions/GuardAction.java
+++ b/engine/src/main/java/org/terasology/logic/behavior/actions/conditions/GuardAction.java
@@ -1,24 +1,11 @@
-/*
- * Copyright 2017 MovingBlocks
- *
- * 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 org.terasology.logic.behavior.actions.conditions;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.behavior.actions.conditions;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.terasology.logic.behavior.BehaviorAction;
-import org.terasology.logic.behavior.core.Actor;
+import org.terasology.engine.logic.behavior.BehaviorAction;
+import org.terasology.engine.logic.behavior.core.Actor;
/**
* Condition decorator node.
@@ -34,7 +21,7 @@ import org.terasology.logic.behavior.core.Actor;
@BehaviorAction(name = "guard", isDecorator = true)
public class GuardAction extends ConditionAction {
- private static final Logger logger = LoggerFactory.getLogger(org.terasology.logic.behavior.actions.conditions.GuardAction.class);
+ private static final Logger logger = LoggerFactory.getLogger(GuardAction.class);
@Override
public boolean prune(Actor actor) {
diff --git a/engine/src/main/java/org/terasology/logic/behavior/actions/package-info.java b/engine/src/main/java/org/terasology/logic/behavior/actions/package-info.java
index 54761a2a9..a450c90b3 100644
--- a/engine/src/main/java/org/terasology/logic/behavior/actions/package-info.java
+++ b/engine/src/main/java/org/terasology/logic/behavior/actions/package-info.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2017 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-@API package org.terasology.logic.behavior.actions;
+@API package org.terasology.engine.logic.behavior.actions;
import org.terasology.module.sandbox.API;
diff --git a/engine/src/main/java/org/terasology/logic/behavior/asset/BehaviorTree.java b/engine/src/main/java/org/terasology/logic/behavior/asset/BehaviorTree.java
index 2e5814343..b43806266 100644
--- a/engine/src/main/java/org/terasology/logic/behavior/asset/BehaviorTree.java
+++ b/engine/src/main/java/org/terasology/logic/behavior/asset/BehaviorTree.java
@@ -1,24 +1,11 @@
-/*
- * Copyright 2017 MovingBlocks
- *
- * 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 org.terasology.logic.behavior.asset;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.behavior.asset;
import org.terasology.assets.Asset;
import org.terasology.assets.AssetType;
import org.terasology.assets.ResourceUrn;
-import org.terasology.logic.behavior.core.BehaviorNode;
+import org.terasology.engine.logic.behavior.core.BehaviorNode;
import org.terasology.module.sandbox.API;
/**
diff --git a/engine/src/main/java/org/terasology/logic/behavior/asset/BehaviorTreeData.java b/engine/src/main/java/org/terasology/logic/behavior/asset/BehaviorTreeData.java
index efd8cab6f..b46f99c1c 100644
--- a/engine/src/main/java/org/terasology/logic/behavior/asset/BehaviorTreeData.java
+++ b/engine/src/main/java/org/terasology/logic/behavior/asset/BehaviorTreeData.java
@@ -1,22 +1,9 @@
-/*
- * Copyright 2017 MovingBlocks
- *
- * 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 org.terasology.logic.behavior.asset;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.behavior.asset;
import org.terasology.assets.AssetData;
-import org.terasology.logic.behavior.core.BehaviorNode;
+import org.terasology.engine.logic.behavior.core.BehaviorNode;
/**
*/
diff --git a/engine/src/main/java/org/terasology/logic/behavior/asset/BehaviorTreeFormat.java b/engine/src/main/java/org/terasology/logic/behavior/asset/BehaviorTreeFormat.java
index d565219de..aa3b7e859 100644
--- a/engine/src/main/java/org/terasology/logic/behavior/asset/BehaviorTreeFormat.java
+++ b/engine/src/main/java/org/terasology/logic/behavior/asset/BehaviorTreeFormat.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2017 MovingBlocks
- *
- * 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 org.terasology.logic.behavior.asset;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.behavior.asset;
import com.google.common.base.Charsets;
import org.slf4j.Logger;
@@ -22,9 +9,9 @@ import org.terasology.assets.ResourceUrn;
import org.terasology.assets.format.AbstractAssetFileFormat;
import org.terasology.assets.format.AssetDataFile;
import org.terasology.assets.module.annotations.RegisterAssetFileFormat;
-import org.terasology.logic.behavior.core.BehaviorNode;
-import org.terasology.logic.behavior.core.BehaviorTreeBuilder;
-import org.terasology.registry.CoreRegistry;
+import org.terasology.engine.logic.behavior.core.BehaviorNode;
+import org.terasology.engine.logic.behavior.core.BehaviorTreeBuilder;
+import org.terasology.engine.registry.CoreRegistry;
import java.io.IOException;
import java.io.InputStream;
diff --git a/engine/src/main/java/org/terasology/logic/behavior/asset/Group.java b/engine/src/main/java/org/terasology/logic/behavior/asset/Group.java
index ce36da61f..1c850ba58 100644
--- a/engine/src/main/java/org/terasology/logic/behavior/asset/Group.java
+++ b/engine/src/main/java/org/terasology/logic/behavior/asset/Group.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2019 MovingBlocks
- *
- * 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 org.terasology.logic.behavior.asset;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.behavior.asset;
import org.terasology.assets.Asset;
import org.terasology.assets.AssetType;
diff --git a/engine/src/main/java/org/terasology/logic/behavior/asset/GroupBuilder.java b/engine/src/main/java/org/terasology/logic/behavior/asset/GroupBuilder.java
index de19148ba..6ad794fb9 100644
--- a/engine/src/main/java/org/terasology/logic/behavior/asset/GroupBuilder.java
+++ b/engine/src/main/java/org/terasology/logic/behavior/asset/GroupBuilder.java
@@ -1,25 +1,12 @@
-/*
- * Copyright 2019 MovingBlocks
- *
- * 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 org.terasology.logic.behavior.asset;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.behavior.asset;
import com.google.gson.Gson;
import com.google.gson.JsonIOException;
import com.google.gson.JsonSyntaxException;
import org.terasology.module.sandbox.API;
-import org.terasology.registry.In;
+import org.terasology.engine.registry.In;
import java.io.InputStream;
import java.io.InputStreamReader;
diff --git a/engine/src/main/java/org/terasology/logic/behavior/asset/GroupData.java b/engine/src/main/java/org/terasology/logic/behavior/asset/GroupData.java
index b4d6628f5..db5e7ad4d 100644
--- a/engine/src/main/java/org/terasology/logic/behavior/asset/GroupData.java
+++ b/engine/src/main/java/org/terasology/logic/behavior/asset/GroupData.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2019 MovingBlocks
- *
- * 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 org.terasology.logic.behavior.asset;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.behavior.asset;
import org.terasology.assets.AssetData;
diff --git a/engine/src/main/java/org/terasology/logic/behavior/asset/GroupFactory.java b/engine/src/main/java/org/terasology/logic/behavior/asset/GroupFactory.java
index b8e36fa2f..f632a77d5 100644
--- a/engine/src/main/java/org/terasology/logic/behavior/asset/GroupFactory.java
+++ b/engine/src/main/java/org/terasology/logic/behavior/asset/GroupFactory.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2019 MovingBlocks
- *
- * 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 org.terasology.logic.behavior.asset;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.behavior.asset;
import org.terasology.assets.AssetFactory;
import org.terasology.assets.AssetType;
diff --git a/engine/src/main/java/org/terasology/logic/behavior/asset/GroupFormat.java b/engine/src/main/java/org/terasology/logic/behavior/asset/GroupFormat.java
index 71863fa18..0a5f568b0 100644
--- a/engine/src/main/java/org/terasology/logic/behavior/asset/GroupFormat.java
+++ b/engine/src/main/java/org/terasology/logic/behavior/asset/GroupFormat.java
@@ -1,25 +1,12 @@
-/*
- * Copyright 2019 MovingBlocks
- *
- * 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 org.terasology.logic.behavior.asset;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.behavior.asset;
import org.terasology.assets.ResourceUrn;
import org.terasology.assets.format.AbstractAssetFileFormat;
import org.terasology.assets.format.AssetDataFile;
import org.terasology.assets.module.annotations.RegisterAssetFileFormat;
-import org.terasology.registry.CoreRegistry;
+import org.terasology.engine.registry.CoreRegistry;
import java.io.IOException;
import java.util.List;
diff --git a/engine/src/main/java/org/terasology/logic/behavior/asset/package-info.java b/engine/src/main/java/org/terasology/logic/behavior/asset/package-info.java
index 26456eb94..335972da4 100644
--- a/engine/src/main/java/org/terasology/logic/behavior/asset/package-info.java
+++ b/engine/src/main/java/org/terasology/logic/behavior/asset/package-info.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2017 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-@API package org.terasology.logic.behavior.asset;
+@API package org.terasology.engine.logic.behavior.asset;
import org.terasology.module.sandbox.API;
diff --git a/engine/src/main/java/org/terasology/logic/behavior/core/Action.java b/engine/src/main/java/org/terasology/logic/behavior/core/Action.java
index fad993c00..8a14d0c6b 100644
--- a/engine/src/main/java/org/terasology/logic/behavior/core/Action.java
+++ b/engine/src/main/java/org/terasology/logic/behavior/core/Action.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2017 MovingBlocks
- *
- * 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 org.terasology.logic.behavior.core;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.behavior.core;
import org.terasology.module.sandbox.API;
diff --git a/engine/src/main/java/org/terasology/logic/behavior/core/ActionNode.java b/engine/src/main/java/org/terasology/logic/behavior/core/ActionNode.java
index 4a47347b1..1edcd706c 100644
--- a/engine/src/main/java/org/terasology/logic/behavior/core/ActionNode.java
+++ b/engine/src/main/java/org/terasology/logic/behavior/core/ActionNode.java
@@ -1,26 +1,13 @@
-/*
- * Copyright 2017 MovingBlocks
- *
- * 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 org.terasology.logic.behavior.core;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.behavior.core;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.terasology.nui.properties.OneOfProviderFactory;
import org.terasology.nui.properties.PropertyProvider;
import org.terasology.reflection.reflect.ReflectFactory;
-import org.terasology.registry.CoreRegistry;
+import org.terasology.engine.registry.CoreRegistry;
/**
* An action node uses a associated Action to control the result state.
diff --git a/engine/src/main/java/org/terasology/logic/behavior/core/Actor.java b/engine/src/main/java/org/terasology/logic/behavior/core/Actor.java
index bbc32b1a7..eddbfcba9 100644
--- a/engine/src/main/java/org/terasology/logic/behavior/core/Actor.java
+++ b/engine/src/main/java/org/terasology/logic/behavior/core/Actor.java
@@ -1,33 +1,20 @@
-/*
- * Copyright 2017 MovingBlocks
- *
- * 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 org.terasology.logic.behavior.core;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.behavior.core;
import com.google.common.collect.Maps;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.terasology.assets.ResourceUrn;
-import org.terasology.engine.ComponentFieldUri;
-import org.terasology.entitySystem.Component;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.entitySystem.metadata.ComponentLibrary;
-import org.terasology.entitySystem.metadata.ComponentMetadata;
-import org.terasology.entitySystem.metadata.EntitySystemLibrary;
+import org.terasology.engine.core.ComponentFieldUri;
+import org.terasology.engine.entitySystem.Component;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.metadata.ComponentLibrary;
+import org.terasology.engine.entitySystem.metadata.ComponentMetadata;
+import org.terasology.engine.entitySystem.metadata.EntitySystemLibrary;
import org.terasology.module.sandbox.API;
import org.terasology.reflection.metadata.FieldMetadata;
-import org.terasology.registry.CoreRegistry;
+import org.terasology.engine.registry.CoreRegistry;
import java.lang.reflect.Field;
import java.util.Map;
diff --git a/engine/src/main/java/org/terasology/logic/behavior/core/BaseAction.java b/engine/src/main/java/org/terasology/logic/behavior/core/BaseAction.java
index e50da0f3b..64e5fd802 100644
--- a/engine/src/main/java/org/terasology/logic/behavior/core/BaseAction.java
+++ b/engine/src/main/java/org/terasology/logic/behavior/core/BaseAction.java
@@ -1,21 +1,8 @@
-/*
- * Copyright 2017 MovingBlocks
- *
- * 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 org.terasology.logic.behavior.core;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.behavior.core;
-import org.terasology.logic.behavior.BehaviorAction;
+import org.terasology.engine.logic.behavior.BehaviorAction;
import org.terasology.module.sandbox.API;
/**
diff --git a/engine/src/main/java/org/terasology/logic/behavior/core/BehaviorEvent.java b/engine/src/main/java/org/terasology/logic/behavior/core/BehaviorEvent.java
index 447dd4b62..95aea57de 100644
--- a/engine/src/main/java/org/terasology/logic/behavior/core/BehaviorEvent.java
+++ b/engine/src/main/java/org/terasology/logic/behavior/core/BehaviorEvent.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2017 MovingBlocks
- *
- * 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 org.terasology.logic.behavior.core;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.behavior.core;
/**
* WIP - part of the event handling solution, will be rewritten
diff --git a/engine/src/main/java/org/terasology/logic/behavior/core/BehaviorNode.java b/engine/src/main/java/org/terasology/logic/behavior/core/BehaviorNode.java
index bced40cc5..65e590892 100644
--- a/engine/src/main/java/org/terasology/logic/behavior/core/BehaviorNode.java
+++ b/engine/src/main/java/org/terasology/logic/behavior/core/BehaviorNode.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2017 MovingBlocks
- *
- * 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 org.terasology.logic.behavior.core;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.behavior.core;
import org.terasology.nui.properties.PropertyProvider;
diff --git a/engine/src/main/java/org/terasology/logic/behavior/core/BehaviorState.java b/engine/src/main/java/org/terasology/logic/behavior/core/BehaviorState.java
index aafef11d9..c66ceb86c 100644
--- a/engine/src/main/java/org/terasology/logic/behavior/core/BehaviorState.java
+++ b/engine/src/main/java/org/terasology/logic/behavior/core/BehaviorState.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2017 MovingBlocks
- *
- * 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 org.terasology.logic.behavior.core;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.behavior.core;
/**
* The state of a behavior node.
diff --git a/engine/src/main/java/org/terasology/logic/behavior/core/BehaviorTreeBuilder.java b/engine/src/main/java/org/terasology/logic/behavior/core/BehaviorTreeBuilder.java
index 9e5022748..c020d98c8 100644
--- a/engine/src/main/java/org/terasology/logic/behavior/core/BehaviorTreeBuilder.java
+++ b/engine/src/main/java/org/terasology/logic/behavior/core/BehaviorTreeBuilder.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2017 MovingBlocks
- *
- * 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 org.terasology.logic.behavior.core;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.behavior.core;
import com.google.common.collect.Maps;
import com.google.gson.Gson;
@@ -36,13 +23,13 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.terasology.assets.ResourceUrn;
import org.terasology.assets.management.AssetManager;
-import org.terasology.engine.module.ModuleManager;
-import org.terasology.logic.behavior.BehaviorAction;
-import org.terasology.logic.behavior.asset.BehaviorTree;
+import org.terasology.engine.core.module.ModuleManager;
+import org.terasology.engine.logic.behavior.asset.BehaviorTree;
+import org.terasology.engine.logic.behavior.BehaviorAction;
import org.terasology.module.ModuleEnvironment;
-import org.terasology.registry.CoreRegistry;
-import org.terasology.registry.InjectionHelper;
-import org.terasology.utilities.gson.UriTypeAdapterFactory;
+import org.terasology.engine.registry.CoreRegistry;
+import org.terasology.engine.registry.InjectionHelper;
+import org.terasology.engine.utilities.gson.UriTypeAdapterFactory;
import java.io.IOException;
import java.io.InputStream;
diff --git a/engine/src/main/java/org/terasology/logic/behavior/core/BehaviorTreeRunner.java b/engine/src/main/java/org/terasology/logic/behavior/core/BehaviorTreeRunner.java
index 2b0b0223d..c15871714 100644
--- a/engine/src/main/java/org/terasology/logic/behavior/core/BehaviorTreeRunner.java
+++ b/engine/src/main/java/org/terasology/logic/behavior/core/BehaviorTreeRunner.java
@@ -1,21 +1,8 @@
-/*
- * Copyright 2017 MovingBlocks
- *
- * 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 org.terasology.logic.behavior.core;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.behavior.core;
-import org.terasology.logic.behavior.asset.BehaviorTree;
+import org.terasology.engine.logic.behavior.asset.BehaviorTree;
/**
* Interface for runnable trees.
diff --git a/engine/src/main/java/org/terasology/logic/behavior/core/CollectiveBehaviorTreeRunner.java b/engine/src/main/java/org/terasology/logic/behavior/core/CollectiveBehaviorTreeRunner.java
index 509874e4e..e50301a15 100644
--- a/engine/src/main/java/org/terasology/logic/behavior/core/CollectiveBehaviorTreeRunner.java
+++ b/engine/src/main/java/org/terasology/logic/behavior/core/CollectiveBehaviorTreeRunner.java
@@ -1,21 +1,8 @@
-/*
- * Copyright 2019 MovingBlocks
- *
- * 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 org.terasology.logic.behavior.core;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.behavior.core;
-import org.terasology.logic.behavior.asset.BehaviorTree;
+import org.terasology.engine.logic.behavior.asset.BehaviorTree;
import java.util.Set;
diff --git a/engine/src/main/java/org/terasology/logic/behavior/core/CompositeNode.java b/engine/src/main/java/org/terasology/logic/behavior/core/CompositeNode.java
index 7567a2f97..27f3ec97a 100644
--- a/engine/src/main/java/org/terasology/logic/behavior/core/CompositeNode.java
+++ b/engine/src/main/java/org/terasology/logic/behavior/core/CompositeNode.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2017 MovingBlocks
- *
- * 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 org.terasology.logic.behavior.core;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.behavior.core;
import com.google.common.collect.Lists;
import org.terasology.nui.properties.PropertyProvider;
diff --git a/engine/src/main/java/org/terasology/logic/behavior/core/DecoratorNode.java b/engine/src/main/java/org/terasology/logic/behavior/core/DecoratorNode.java
index bcab7ecb5..9ad31ff67 100644
--- a/engine/src/main/java/org/terasology/logic/behavior/core/DecoratorNode.java
+++ b/engine/src/main/java/org/terasology/logic/behavior/core/DecoratorNode.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2017 MovingBlocks
- *
- * 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 org.terasology.logic.behavior.core;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.behavior.core;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/engine/src/main/java/org/terasology/logic/behavior/core/DelegateNode.java b/engine/src/main/java/org/terasology/logic/behavior/core/DelegateNode.java
index b97eec432..3ac4d559f 100644
--- a/engine/src/main/java/org/terasology/logic/behavior/core/DelegateNode.java
+++ b/engine/src/main/java/org/terasology/logic/behavior/core/DelegateNode.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2017 MovingBlocks
- *
- * 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 org.terasology.logic.behavior.core;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.behavior.core;
import org.terasology.nui.properties.PropertyProvider;
diff --git a/engine/src/main/java/org/terasology/logic/behavior/core/DynamicSelectorNode.java b/engine/src/main/java/org/terasology/logic/behavior/core/DynamicSelectorNode.java
index fc01957f9..6dc321e33 100644
--- a/engine/src/main/java/org/terasology/logic/behavior/core/DynamicSelectorNode.java
+++ b/engine/src/main/java/org/terasology/logic/behavior/core/DynamicSelectorNode.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2017 MovingBlocks
- *
- * 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 org.terasology.logic.behavior.core;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.behavior.core;
import java.util.BitSet;
diff --git a/engine/src/main/java/org/terasology/logic/behavior/core/FailureNode.java b/engine/src/main/java/org/terasology/logic/behavior/core/FailureNode.java
index 8fad7add4..4fa13b006 100644
--- a/engine/src/main/java/org/terasology/logic/behavior/core/FailureNode.java
+++ b/engine/src/main/java/org/terasology/logic/behavior/core/FailureNode.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2017 MovingBlocks
- *
- * 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 org.terasology.logic.behavior.core;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.behavior.core;
/**
* Fails always.
diff --git a/engine/src/main/java/org/terasology/logic/behavior/core/LeafNode.java b/engine/src/main/java/org/terasology/logic/behavior/core/LeafNode.java
index 860a07769..abd6d88ab 100644
--- a/engine/src/main/java/org/terasology/logic/behavior/core/LeafNode.java
+++ b/engine/src/main/java/org/terasology/logic/behavior/core/LeafNode.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2017 MovingBlocks
- *
- * 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 org.terasology.logic.behavior.core;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.behavior.core;
import org.terasology.nui.properties.PropertyProvider;
diff --git a/engine/src/main/java/org/terasology/logic/behavior/core/ParallelNode.java b/engine/src/main/java/org/terasology/logic/behavior/core/ParallelNode.java
index 05dbaad31..ac9ee5c64 100644
--- a/engine/src/main/java/org/terasology/logic/behavior/core/ParallelNode.java
+++ b/engine/src/main/java/org/terasology/logic/behavior/core/ParallelNode.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2017 MovingBlocks
- *
- * 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 org.terasology.logic.behavior.core;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.behavior.core;
/**
* Runs all children parallel.
diff --git a/engine/src/main/java/org/terasology/logic/behavior/core/RunningNode.java b/engine/src/main/java/org/terasology/logic/behavior/core/RunningNode.java
index 501524d65..e3d59a153 100644
--- a/engine/src/main/java/org/terasology/logic/behavior/core/RunningNode.java
+++ b/engine/src/main/java/org/terasology/logic/behavior/core/RunningNode.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2017 MovingBlocks
- *
- * 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 org.terasology.logic.behavior.core;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.behavior.core;
/**
* Runs always.
diff --git a/engine/src/main/java/org/terasology/logic/behavior/core/SelectorNode.java b/engine/src/main/java/org/terasology/logic/behavior/core/SelectorNode.java
index ed7c6176b..5b13e264b 100644
--- a/engine/src/main/java/org/terasology/logic/behavior/core/SelectorNode.java
+++ b/engine/src/main/java/org/terasology/logic/behavior/core/SelectorNode.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2017 MovingBlocks
- *
- * 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 org.terasology.logic.behavior.core;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.behavior.core;
import java.util.Iterator;
diff --git a/engine/src/main/java/org/terasology/logic/behavior/core/SequenceNode.java b/engine/src/main/java/org/terasology/logic/behavior/core/SequenceNode.java
index 05c85a95a..c5de642ba 100644
--- a/engine/src/main/java/org/terasology/logic/behavior/core/SequenceNode.java
+++ b/engine/src/main/java/org/terasology/logic/behavior/core/SequenceNode.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2017 MovingBlocks
- *
- * 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 org.terasology.logic.behavior.core;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.behavior.core;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/engine/src/main/java/org/terasology/logic/behavior/core/SuccessNode.java b/engine/src/main/java/org/terasology/logic/behavior/core/SuccessNode.java
index 5752acdd1..7d978a6e2 100644
--- a/engine/src/main/java/org/terasology/logic/behavior/core/SuccessNode.java
+++ b/engine/src/main/java/org/terasology/logic/behavior/core/SuccessNode.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2017 MovingBlocks
- *
- * 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 org.terasology.logic.behavior.core;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.behavior.core;
/**
* Succeed always.
diff --git a/engine/src/main/java/org/terasology/logic/behavior/core/Visitor.java b/engine/src/main/java/org/terasology/logic/behavior/core/Visitor.java
index ad189d86b..27dbc31dc 100644
--- a/engine/src/main/java/org/terasology/logic/behavior/core/Visitor.java
+++ b/engine/src/main/java/org/terasology/logic/behavior/core/Visitor.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2017 MovingBlocks
- *
- * 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 org.terasology.logic.behavior.core;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.behavior.core;
/**
* The visitor to iterate a tree of behavior nodes
diff --git a/engine/src/main/java/org/terasology/logic/behavior/core/package-info.java b/engine/src/main/java/org/terasology/logic/behavior/core/package-info.java
index 327d0e334..7a0d63492 100644
--- a/engine/src/main/java/org/terasology/logic/behavior/core/package-info.java
+++ b/engine/src/main/java/org/terasology/logic/behavior/core/package-info.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2017 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-@API package org.terasology.logic.behavior.core;
+@API package org.terasology.engine.logic.behavior.core;
import org.terasology.module.sandbox.API;
diff --git a/engine/src/main/java/org/terasology/logic/behavior/nui/BTEditorButton.java b/engine/src/main/java/org/terasology/logic/behavior/nui/BTEditorButton.java
index 9cb144aaf..5746b8d2e 100644
--- a/engine/src/main/java/org/terasology/logic/behavior/nui/BTEditorButton.java
+++ b/engine/src/main/java/org/terasology/logic/behavior/nui/BTEditorButton.java
@@ -1,25 +1,12 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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 org.terasology.logic.behavior.nui;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.behavior.nui;
-import org.terasology.input.BindButtonEvent;
-import org.terasology.input.DefaultBinding;
+import org.terasology.engine.input.BindButtonEvent;
+import org.terasology.engine.input.DefaultBinding;
import org.terasology.input.InputType;
import org.terasology.input.Keyboard;
-import org.terasology.input.RegisterBindButton;
+import org.terasology.engine.input.RegisterBindButton;
/**
*/
diff --git a/engine/src/main/java/org/terasology/logic/behavior/nui/BehaviorEditor.java b/engine/src/main/java/org/terasology/logic/behavior/nui/BehaviorEditor.java
index 8c0f95a0e..14edde29d 100644
--- a/engine/src/main/java/org/terasology/logic/behavior/nui/BehaviorEditor.java
+++ b/engine/src/main/java/org/terasology/logic/behavior/nui/BehaviorEditor.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2017 MovingBlocks
- *
- * 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 org.terasology.logic.behavior.nui;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.behavior.nui;
import com.google.common.base.Charsets;
import com.google.common.collect.Lists;
@@ -24,15 +11,15 @@ import org.abego.treelayout.util.DefaultConfiguration;
import org.abego.treelayout.util.FixedNodeExtentProvider;
import org.joml.Vector2f;
import org.joml.Vector2i;
-import org.terasology.context.Context;
-import org.terasology.logic.behavior.BehaviorSystem;
-import org.terasology.logic.behavior.DefaultBehaviorTreeRunner;
-import org.terasology.logic.behavior.asset.BehaviorTree;
-import org.terasology.logic.behavior.asset.BehaviorTreeFormat;
-import org.terasology.logic.behavior.core.BehaviorNode;
-import org.terasology.logic.behavior.core.BehaviorState;
-import org.terasology.logic.behavior.core.BehaviorTreeBuilder;
-import org.terasology.logic.behavior.core.Visitor;
+import org.terasology.engine.context.Context;
+import org.terasology.engine.logic.behavior.asset.BehaviorTree;
+import org.terasology.engine.logic.behavior.asset.BehaviorTreeFormat;
+import org.terasology.engine.logic.behavior.core.BehaviorNode;
+import org.terasology.engine.logic.behavior.core.BehaviorState;
+import org.terasology.engine.logic.behavior.core.BehaviorTreeBuilder;
+import org.terasology.engine.logic.behavior.core.Visitor;
+import org.terasology.engine.logic.behavior.BehaviorSystem;
+import org.terasology.engine.logic.behavior.DefaultBehaviorTreeRunner;
import org.terasology.nui.BaseInteractionListener;
import org.terasology.nui.Canvas;
import org.terasology.nui.Color;
@@ -44,7 +31,7 @@ import org.terasology.nui.events.NUIMouseClickEvent;
import org.terasology.nui.events.NUIMouseOverEvent;
import org.terasology.nui.events.NUIMouseReleaseEvent;
import org.terasology.nui.layouts.ZoomableLayout;
-import org.terasology.registry.CoreRegistry;
+import org.terasology.engine.registry.CoreRegistry;
import java.awt.geom.Rectangle2D;
import java.io.ByteArrayOutputStream;
diff --git a/engine/src/main/java/org/terasology/logic/behavior/nui/BehaviorEditorScreen.java b/engine/src/main/java/org/terasology/logic/behavior/nui/BehaviorEditorScreen.java
index 06902ac52..8c0337593 100644
--- a/engine/src/main/java/org/terasology/logic/behavior/nui/BehaviorEditorScreen.java
+++ b/engine/src/main/java/org/terasology/logic/behavior/nui/BehaviorEditorScreen.java
@@ -1,43 +1,30 @@
-/*
- * Copyright 2015 MovingBlocks
- *
- * 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 org.terasology.logic.behavior.nui;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.behavior.nui;
import com.google.common.collect.Lists;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.terasology.context.Context;
-import org.terasology.entitySystem.Component;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.logic.behavior.BehaviorComponent;
-import org.terasology.logic.behavior.BehaviorSystem;
-import org.terasology.logic.behavior.Interpreter;
-import org.terasology.logic.behavior.asset.BehaviorTree;
-import org.terasology.logic.behavior.core.ActionNode;
-import org.terasology.logic.behavior.core.BehaviorNode;
+import org.terasology.engine.context.Context;
+import org.terasology.engine.entitySystem.Component;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.logic.behavior.asset.BehaviorTree;
+import org.terasology.engine.logic.behavior.core.ActionNode;
+import org.terasology.engine.logic.behavior.core.BehaviorNode;
+import org.terasology.engine.logic.behavior.BehaviorComponent;
+import org.terasology.engine.logic.behavior.BehaviorSystem;
+import org.terasology.engine.logic.behavior.Interpreter;
import org.terasology.nui.WidgetUtil;
import org.terasology.nui.widgets.UIDropdown;
import org.terasology.nui.widgets.UIList;
import org.terasology.reflection.reflect.ReflectFactory;
-import org.terasology.registry.In;
-import org.terasology.rendering.nui.CoreScreenLayer;
-import org.terasology.rendering.nui.NUIManager;
+import org.terasology.engine.registry.In;
+import org.terasology.engine.rendering.nui.CoreScreenLayer;
+import org.terasology.engine.rendering.nui.NUIManager;
import org.terasology.nui.databinding.Binding;
import org.terasology.nui.databinding.ReadOnlyBinding;
import org.terasology.nui.itemRendering.ToStringTextRenderer;
-import org.terasology.rendering.nui.layers.mainMenu.EnterTextPopup;
+import org.terasology.engine.rendering.nui.layers.mainMenu.EnterTextPopup;
import org.terasology.nui.layouts.PropertyLayout;
import org.terasology.nui.properties.OneOfProviderFactory;
import org.terasology.nui.properties.Property;
diff --git a/engine/src/main/java/org/terasology/logic/behavior/nui/BehaviorNodeComponent.java b/engine/src/main/java/org/terasology/logic/behavior/nui/BehaviorNodeComponent.java
index f7f7f01c3..d8d4633b0 100644
--- a/engine/src/main/java/org/terasology/logic/behavior/nui/BehaviorNodeComponent.java
+++ b/engine/src/main/java/org/terasology/logic/behavior/nui/BehaviorNodeComponent.java
@@ -1,21 +1,8 @@
-/*
- * Copyright 2017 MovingBlocks
- *
- * 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 org.terasology.logic.behavior.nui;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.behavior.nui;
-import org.terasology.entitySystem.Component;
+import org.terasology.engine.entitySystem.Component;
import org.terasology.module.sandbox.API;
import org.terasology.nui.Color;
diff --git a/engine/src/main/java/org/terasology/logic/behavior/nui/BehaviorNodeFactory.java b/engine/src/main/java/org/terasology/logic/behavior/nui/BehaviorNodeFactory.java
index 182ab3745..e86a27ea0 100644
--- a/engine/src/main/java/org/terasology/logic/behavior/nui/BehaviorNodeFactory.java
+++ b/engine/src/main/java/org/terasology/logic/behavior/nui/BehaviorNodeFactory.java
@@ -1,48 +1,35 @@
-/*
- * Copyright 2017 MovingBlocks
- *
- * 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 org.terasology.logic.behavior.nui;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.behavior.nui;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import org.terasology.assets.ResourceUrn;
import org.terasology.assets.management.AssetManager;
-import org.terasology.audio.StaticSound;
-import org.terasology.audio.StreamingSound;
-import org.terasology.engine.ComponentFieldUri;
-import org.terasology.engine.SimpleUri;
-import org.terasology.entitySystem.entity.EntityBuilder;
-import org.terasology.entitySystem.entity.EntityManager;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.entitySystem.metadata.ComponentLibrary;
-import org.terasology.entitySystem.metadata.ComponentMetadata;
-import org.terasology.entitySystem.prefab.Prefab;
-import org.terasology.entitySystem.prefab.PrefabManager;
-import org.terasology.entitySystem.systems.BaseComponentSystem;
-import org.terasology.entitySystem.systems.RegisterSystem;
-import org.terasology.logic.behavior.core.BehaviorNode;
-import org.terasology.logic.behavior.core.BehaviorTreeBuilder;
+import org.terasology.engine.audio.StaticSound;
+import org.terasology.engine.audio.StreamingSound;
+import org.terasology.engine.core.ComponentFieldUri;
+import org.terasology.engine.core.SimpleUri;
+import org.terasology.engine.entitySystem.entity.EntityBuilder;
+import org.terasology.engine.entitySystem.entity.EntityManager;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.metadata.ComponentLibrary;
+import org.terasology.engine.entitySystem.metadata.ComponentMetadata;
+import org.terasology.engine.entitySystem.prefab.Prefab;
+import org.terasology.engine.entitySystem.prefab.PrefabManager;
+import org.terasology.engine.entitySystem.systems.BaseComponentSystem;
+import org.terasology.engine.entitySystem.systems.RegisterSystem;
+import org.terasology.engine.logic.behavior.core.BehaviorNode;
+import org.terasology.engine.logic.behavior.core.BehaviorTreeBuilder;
import org.terasology.nui.databinding.ReadOnlyBinding;
import org.terasology.nui.itemRendering.StringTextRenderer;
import org.terasology.nui.properties.OneOfProviderFactory;
import org.terasology.reflection.metadata.FieldMetadata;
-import org.terasology.registry.In;
-import org.terasology.registry.Share;
-import org.terasology.rendering.assets.animation.MeshAnimation;
-import org.terasology.utilities.Assets;
-import org.terasology.utilities.ReflectionUtil;
+import org.terasology.engine.registry.In;
+import org.terasology.engine.registry.Share;
+import org.terasology.engine.rendering.assets.animation.MeshAnimation;
+import org.terasology.engine.utilities.Assets;
+import org.terasology.engine.utilities.ReflectionUtil;
import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Type;
diff --git a/engine/src/main/java/org/terasology/logic/behavior/nui/BehaviorTreeClientSystem.java b/engine/src/main/java/org/terasology/logic/behavior/nui/BehaviorTreeClientSystem.java
index bf1ce4255..53cf06df6 100644
--- a/engine/src/main/java/org/terasology/logic/behavior/nui/BehaviorTreeClientSystem.java
+++ b/engine/src/main/java/org/terasology/logic/behavior/nui/BehaviorTreeClientSystem.java
@@ -1,31 +1,18 @@
-/*
- * Copyright 2020 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.logic.behavior.nui;
+package org.terasology.engine.logic.behavior.nui;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.entitySystem.event.ReceiveEvent;
-import org.terasology.entitySystem.systems.BaseComponentSystem;
-import org.terasology.entitySystem.systems.RegisterMode;
-import org.terasology.entitySystem.systems.RegisterSystem;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.event.ReceiveEvent;
+import org.terasology.engine.entitySystem.systems.BaseComponentSystem;
+import org.terasology.engine.entitySystem.systems.RegisterMode;
+import org.terasology.engine.entitySystem.systems.RegisterSystem;
import org.terasology.input.ButtonState;
-import org.terasology.logic.console.Console;
-import org.terasology.logic.console.CoreMessageType;
-import org.terasology.network.ClientComponent;
-import org.terasology.registry.In;
+import org.terasology.engine.logic.console.Console;
+import org.terasology.engine.logic.console.CoreMessageType;
+import org.terasology.engine.network.ClientComponent;
+import org.terasology.engine.registry.In;
@RegisterSystem(RegisterMode.REMOTE_CLIENT)
public class BehaviorTreeClientSystem extends BaseComponentSystem {
diff --git a/engine/src/main/java/org/terasology/logic/behavior/nui/BehaviorTreeEditorSystem.java b/engine/src/main/java/org/terasology/logic/behavior/nui/BehaviorTreeEditorSystem.java
index 5285a94ad..9842909ad 100644
--- a/engine/src/main/java/org/terasology/logic/behavior/nui/BehaviorTreeEditorSystem.java
+++ b/engine/src/main/java/org/terasology/logic/behavior/nui/BehaviorTreeEditorSystem.java
@@ -1,29 +1,16 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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 org.terasology.logic.behavior.nui;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.behavior.nui;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.entitySystem.event.ReceiveEvent;
-import org.terasology.entitySystem.systems.BaseComponentSystem;
-import org.terasology.entitySystem.systems.RegisterMode;
-import org.terasology.entitySystem.systems.RegisterSystem;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.event.ReceiveEvent;
+import org.terasology.engine.entitySystem.systems.BaseComponentSystem;
+import org.terasology.engine.entitySystem.systems.RegisterMode;
+import org.terasology.engine.entitySystem.systems.RegisterSystem;
import org.terasology.input.ButtonState;
-import org.terasology.network.ClientComponent;
-import org.terasology.registry.In;
-import org.terasology.rendering.nui.NUIManager;
+import org.terasology.engine.network.ClientComponent;
+import org.terasology.engine.registry.In;
+import org.terasology.engine.rendering.nui.NUIManager;
/**
* Opens the bt editor screen.
diff --git a/engine/src/main/java/org/terasology/logic/behavior/nui/Port.java b/engine/src/main/java/org/terasology/logic/behavior/nui/Port.java
index 26a8febbe..742f9639a 100644
--- a/engine/src/main/java/org/terasology/logic/behavior/nui/Port.java
+++ b/engine/src/main/java/org/terasology/logic/behavior/nui/Port.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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 org.terasology.logic.behavior.nui;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.behavior.nui;
import org.joml.Vector2f;
import org.joml.Vector2i;
@@ -25,7 +12,7 @@ import org.terasology.nui.CoreWidget;
import org.terasology.nui.InteractionListener;
import org.terasology.nui.UITextureRegion;
import org.terasology.nui.events.NUIMouseClickEvent;
-import org.terasology.utilities.Assets;
+import org.terasology.engine.utilities.Assets;
/**
* Represents a port at a RenderableNode. There are several types of ports:
diff --git a/engine/src/main/java/org/terasology/logic/behavior/nui/PortList.java b/engine/src/main/java/org/terasology/logic/behavior/nui/PortList.java
index 263606901..e29b5c726 100644
--- a/engine/src/main/java/org/terasology/logic/behavior/nui/PortList.java
+++ b/engine/src/main/java/org/terasology/logic/behavior/nui/PortList.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2017 MovingBlocks
- *
- * 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 org.terasology.logic.behavior.nui;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.behavior.nui;
import com.google.common.collect.Lists;
import org.terasology.joml.geom.Rectanglei;
diff --git a/engine/src/main/java/org/terasology/logic/behavior/nui/RenderableNode.java b/engine/src/main/java/org/terasology/logic/behavior/nui/RenderableNode.java
index b4d0ca7ba..4074a21cf 100644
--- a/engine/src/main/java/org/terasology/logic/behavior/nui/RenderableNode.java
+++ b/engine/src/main/java/org/terasology/logic/behavior/nui/RenderableNode.java
@@ -1,28 +1,15 @@
-/*
- * Copyright 2017 MovingBlocks
- *
- * 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 org.terasology.logic.behavior.nui;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.behavior.nui;
import com.google.common.collect.Lists;
import org.joml.Vector2f;
import org.joml.Vector2i;
+import org.terasology.engine.logic.behavior.core.BehaviorNode;
+import org.terasology.engine.logic.behavior.core.BehaviorState;
import org.terasology.input.Keyboard;
import org.terasology.input.MouseInput;
import org.terasology.input.device.KeyboardDevice;
-import org.terasology.logic.behavior.core.BehaviorNode;
-import org.terasology.logic.behavior.core.BehaviorState;
import org.terasology.nui.BaseInteractionListener;
import org.terasology.nui.Canvas;
import org.terasology.nui.CoreWidget;
@@ -34,7 +21,7 @@ import org.terasology.nui.events.NUIMouseOverEvent;
import org.terasology.nui.events.NUIMouseReleaseEvent;
import org.terasology.nui.layouts.ZoomableLayout;
import org.terasology.nui.properties.PropertyProvider;
-import org.terasology.utilities.Assets;
+import org.terasology.engine.utilities.Assets;
import java.util.List;
diff --git a/engine/src/main/java/org/terasology/logic/behavior/nui/TreeAccessor.java b/engine/src/main/java/org/terasology/logic/behavior/nui/TreeAccessor.java
index 8e9846315..103f2947a 100644
--- a/engine/src/main/java/org/terasology/logic/behavior/nui/TreeAccessor.java
+++ b/engine/src/main/java/org/terasology/logic/behavior/nui/TreeAccessor.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2017 MovingBlocks
- *
- * 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 org.terasology.logic.behavior.nui;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.behavior.nui;
import java.util.Arrays;
import java.util.List;
diff --git a/engine/src/main/java/org/terasology/logic/behavior/nui/package-info.java b/engine/src/main/java/org/terasology/logic/behavior/nui/package-info.java
index ec39db1fa..5862f9a96 100644
--- a/engine/src/main/java/org/terasology/logic/behavior/nui/package-info.java
+++ b/engine/src/main/java/org/terasology/logic/behavior/nui/package-info.java
@@ -1,23 +1,10 @@
-/*
- * Copyright 2017 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
@API
@InputCategory(id = "behavior",
displayName = "${engine:menu#category-behavior}"
- ) package org.terasology.logic.behavior.nui;
+ ) package org.terasology.engine.logic.behavior.nui;
import org.terasology.module.sandbox.API;
import org.terasology.input.InputCategory;
diff --git a/engine/src/main/java/org/terasology/logic/behavior/package-info.java b/engine/src/main/java/org/terasology/logic/behavior/package-info.java
index 3b3deafec..e9f891ac4 100644
--- a/engine/src/main/java/org/terasology/logic/behavior/package-info.java
+++ b/engine/src/main/java/org/terasology/logic/behavior/package-info.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2017 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-@API package org.terasology.logic.behavior;
+@API package org.terasology.engine.logic.behavior;
import org.terasology.module.sandbox.API;
diff --git a/engine/src/main/java/org/terasology/logic/characters/AffectItemUseCooldownTimeEvent.java b/engine/src/main/java/org/terasology/logic/characters/AffectItemUseCooldownTimeEvent.java
index 3656325ef..30ce0c268 100644
--- a/engine/src/main/java/org/terasology/logic/characters/AffectItemUseCooldownTimeEvent.java
+++ b/engine/src/main/java/org/terasology/logic/characters/AffectItemUseCooldownTimeEvent.java
@@ -1,21 +1,8 @@
-/*
- * Copyright 2016 MovingBlocks
- *
- * 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 org.terasology.logic.characters;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.characters;
-import org.terasology.entitySystem.event.AbstractValueModifiableEvent;
+import org.terasology.engine.entitySystem.event.AbstractValueModifiableEvent;
public class AffectItemUseCooldownTimeEvent extends AbstractValueModifiableEvent {
public AffectItemUseCooldownTimeEvent(float baseValue) {
diff --git a/engine/src/main/java/org/terasology/logic/characters/AffectJumpForceEvent.java b/engine/src/main/java/org/terasology/logic/characters/AffectJumpForceEvent.java
index 7407e7378..ee21122ab 100644
--- a/engine/src/main/java/org/terasology/logic/characters/AffectJumpForceEvent.java
+++ b/engine/src/main/java/org/terasology/logic/characters/AffectJumpForceEvent.java
@@ -1,21 +1,8 @@
-/*
- * Copyright 2016 MovingBlocks
- *
- * 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 org.terasology.logic.characters;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.characters;
-import org.terasology.entitySystem.event.AbstractValueModifiableEvent;
+import org.terasology.engine.entitySystem.event.AbstractValueModifiableEvent;
public class AffectJumpForceEvent extends AbstractValueModifiableEvent {
public AffectJumpForceEvent(float baseValue) {
diff --git a/engine/src/main/java/org/terasology/logic/characters/AffectMultiJumpEvent.java b/engine/src/main/java/org/terasology/logic/characters/AffectMultiJumpEvent.java
index 8bafe7a7d..eb58662d6 100644
--- a/engine/src/main/java/org/terasology/logic/characters/AffectMultiJumpEvent.java
+++ b/engine/src/main/java/org/terasology/logic/characters/AffectMultiJumpEvent.java
@@ -1,22 +1,9 @@
-/*
- * Copyright 2016 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.logic.characters;
+package org.terasology.engine.logic.characters;
-import org.terasology.entitySystem.event.AbstractValueModifiableEvent;
+import org.terasology.engine.entitySystem.event.AbstractValueModifiableEvent;
public class AffectMultiJumpEvent extends AbstractValueModifiableEvent {
public AffectMultiJumpEvent(int baseValue) {
diff --git a/engine/src/main/java/org/terasology/logic/characters/AliveCharacterComponent.java b/engine/src/main/java/org/terasology/logic/characters/AliveCharacterComponent.java
index 74a1cf153..dccc08bbd 100644
--- a/engine/src/main/java/org/terasology/logic/characters/AliveCharacterComponent.java
+++ b/engine/src/main/java/org/terasology/logic/characters/AliveCharacterComponent.java
@@ -1,22 +1,9 @@
-/*
- * Copyright 2017 MovingBlocks
- *
- * 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 org.terasology.logic.characters;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.characters;
-import org.terasology.entitySystem.Component;
-import org.terasology.network.Replicate;
+import org.terasology.engine.entitySystem.Component;
+import org.terasology.engine.network.Replicate;
/**
* This is only attached to the alive character entities.
diff --git a/engine/src/main/java/org/terasology/logic/characters/CharacterComponent.java b/engine/src/main/java/org/terasology/logic/characters/CharacterComponent.java
index af9eb2097..514569e32 100644
--- a/engine/src/main/java/org/terasology/logic/characters/CharacterComponent.java
+++ b/engine/src/main/java/org/terasology/logic/characters/CharacterComponent.java
@@ -1,25 +1,14 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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 org.terasology.logic.characters;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.characters;
-import org.terasology.entitySystem.Component;
-import org.terasology.entitySystem.Owns;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.network.FieldReplicateType;
-import org.terasology.network.Replicate;
+import org.terasology.engine.entitySystem.Component;
+import org.terasology.engine.entitySystem.Owns;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.logic.characters.interactions.InteractionEndPredicted;
+import org.terasology.engine.logic.characters.interactions.InteractionStartPredicted;
+import org.terasology.engine.network.FieldReplicateType;
+import org.terasology.engine.network.Replicate;
/**
* Information common to characters (the physical body of players and creatures)
@@ -55,8 +44,8 @@ public final class CharacterComponent implements Component {
* This field is only set for clients (including clients that are servers). The clients set it
* best to their knowledge.
*
- * The events {@link org.terasology.logic.characters.interactions.InteractionStartPredicted} and
- * {@link org.terasology.logic.characters.interactions.InteractionEndPredicted} inform about changes of this
+ * The events {@link InteractionStartPredicted} and
+ * {@link InteractionEndPredicted} inform about changes of this
* field.
*/
public EntityRef predictedInteractionTarget = EntityRef.NULL;
diff --git a/engine/src/main/java/org/terasology/logic/characters/CharacterHeldItemAuthoritySystem.java b/engine/src/main/java/org/terasology/logic/characters/CharacterHeldItemAuthoritySystem.java
index 582be50c6..4b8b3dce8 100644
--- a/engine/src/main/java/org/terasology/logic/characters/CharacterHeldItemAuthoritySystem.java
+++ b/engine/src/main/java/org/terasology/logic/characters/CharacterHeldItemAuthoritySystem.java
@@ -1,26 +1,13 @@
-/*
- * Copyright 2015 MovingBlocks
- *
- * 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 org.terasology.logic.characters;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.characters;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.entitySystem.event.ReceiveEvent;
-import org.terasology.entitySystem.systems.BaseComponentSystem;
-import org.terasology.entitySystem.systems.RegisterMode;
-import org.terasology.entitySystem.systems.RegisterSystem;
-import org.terasology.logic.characters.events.ChangeHeldItemRequest;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.event.ReceiveEvent;
+import org.terasology.engine.entitySystem.systems.BaseComponentSystem;
+import org.terasology.engine.entitySystem.systems.RegisterMode;
+import org.terasology.engine.entitySystem.systems.RegisterSystem;
+import org.terasology.engine.logic.characters.events.ChangeHeldItemRequest;
@RegisterSystem(RegisterMode.AUTHORITY)
public class CharacterHeldItemAuthoritySystem extends BaseComponentSystem {
diff --git a/engine/src/main/java/org/terasology/logic/characters/CharacterHeldItemComponent.java b/engine/src/main/java/org/terasology/logic/characters/CharacterHeldItemComponent.java
index 20aa38a45..04803d462 100644
--- a/engine/src/main/java/org/terasology/logic/characters/CharacterHeldItemComponent.java
+++ b/engine/src/main/java/org/terasology/logic/characters/CharacterHeldItemComponent.java
@@ -1,23 +1,10 @@
-/*
- * Copyright 2015 MovingBlocks
- *
- * 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 org.terasology.logic.characters;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.characters;
-import org.terasology.entitySystem.Component;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.network.Replicate;
+import org.terasology.engine.entitySystem.Component;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.network.Replicate;
public class CharacterHeldItemComponent implements Component {
diff --git a/engine/src/main/java/org/terasology/logic/characters/CharacterImpulseEvent.java b/engine/src/main/java/org/terasology/logic/characters/CharacterImpulseEvent.java
index 0c228d5ed..f1834096b 100644
--- a/engine/src/main/java/org/terasology/logic/characters/CharacterImpulseEvent.java
+++ b/engine/src/main/java/org/terasology/logic/characters/CharacterImpulseEvent.java
@@ -1,22 +1,9 @@
-/*
- * Copyright 2016 MovingBlocks
- *
- * 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 org.terasology.logic.characters;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.characters;
import org.joml.Vector3f;
-import org.terasology.entitySystem.event.Event;
+import org.terasology.engine.entitySystem.event.Event;
public class CharacterImpulseEvent implements Event {
Vector3f direction;
diff --git a/engine/src/main/java/org/terasology/logic/characters/CharacterMoveInputEvent.java b/engine/src/main/java/org/terasology/logic/characters/CharacterMoveInputEvent.java
index 1ea5756d7..7d1e257e2 100644
--- a/engine/src/main/java/org/terasology/logic/characters/CharacterMoveInputEvent.java
+++ b/engine/src/main/java/org/terasology/logic/characters/CharacterMoveInputEvent.java
@@ -1,25 +1,12 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.logic.characters;
+package org.terasology.engine.logic.characters;
import org.joml.Vector3f;
import org.joml.Vector3fc;
-import org.terasology.network.NetworkEvent;
-import org.terasology.network.ServerEvent;
+import org.terasology.engine.network.NetworkEvent;
+import org.terasology.engine.network.ServerEvent;
/**
*/
diff --git a/engine/src/main/java/org/terasology/logic/characters/CharacterMovementComponent.java b/engine/src/main/java/org/terasology/logic/characters/CharacterMovementComponent.java
index f9e9e8b66..5ca6c8a29 100644
--- a/engine/src/main/java/org/terasology/logic/characters/CharacterMovementComponent.java
+++ b/engine/src/main/java/org/terasology/logic/characters/CharacterMovementComponent.java
@@ -1,29 +1,16 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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 org.terasology.logic.characters;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.characters;
import com.google.common.collect.Lists;
import org.joml.Vector3f;
-import org.terasology.entitySystem.Component;
-import org.terasology.network.FieldReplicateType;
-import org.terasology.network.Replicate;
+import org.terasology.engine.entitySystem.Component;
+import org.terasology.engine.network.FieldReplicateType;
+import org.terasology.engine.network.Replicate;
import org.terasology.nui.properties.Range;
-import org.terasology.physics.CollisionGroup;
-import org.terasology.physics.StandardCollisionGroup;
+import org.terasology.engine.physics.CollisionGroup;
+import org.terasology.engine.physics.StandardCollisionGroup;
import java.util.List;
diff --git a/engine/src/main/java/org/terasology/logic/characters/CharacterMovementSystemUtility.java b/engine/src/main/java/org/terasology/logic/characters/CharacterMovementSystemUtility.java
index f99b6de0c..8fa3cacdc 100644
--- a/engine/src/main/java/org/terasology/logic/characters/CharacterMovementSystemUtility.java
+++ b/engine/src/main/java/org/terasology/logic/characters/CharacterMovementSystemUtility.java
@@ -1,15 +1,15 @@
-// Copyright 2020 The Terasology Foundation
+// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.logic.characters;
+package org.terasology.engine.logic.characters;
import com.google.common.collect.Lists;
import org.joml.Quaternionf;
import org.joml.Vector3f;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.logic.location.LocationComponent;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.logic.location.LocationComponent;
import org.terasology.math.TeraMath;
-import org.terasology.physics.engine.CharacterCollider;
-import org.terasology.physics.engine.PhysicsEngine;
+import org.terasology.engine.physics.engine.CharacterCollider;
+import org.terasology.engine.physics.engine.PhysicsEngine;
/**
* Contains logic used by both {@link ClientCharacterPredictionSystem} and {@link ServerCharacterPredictionSystem}.
diff --git a/engine/src/main/java/org/terasology/logic/characters/CharacterMover.java b/engine/src/main/java/org/terasology/logic/characters/CharacterMover.java
index af6e84ccb..ad65b5878 100644
--- a/engine/src/main/java/org/terasology/logic/characters/CharacterMover.java
+++ b/engine/src/main/java/org/terasology/logic/characters/CharacterMover.java
@@ -1,22 +1,9 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.logic.characters;
+package org.terasology.engine.logic.characters;
-import org.terasology.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.entity.EntityRef;
/**
* A CharacterMover is responsible for calculating character movement and generating related events.
diff --git a/engine/src/main/java/org/terasology/logic/characters/CharacterScalingSystem.java b/engine/src/main/java/org/terasology/logic/characters/CharacterScalingSystem.java
index 5db19dfcc..845eaab9c 100644
--- a/engine/src/main/java/org/terasology/logic/characters/CharacterScalingSystem.java
+++ b/engine/src/main/java/org/terasology/logic/characters/CharacterScalingSystem.java
@@ -1,29 +1,16 @@
-/*
- * Copyright 2020 MovingBlocks
- *
- * 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 org.terasology.logic.characters;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.characters;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.entitySystem.event.EventPriority;
-import org.terasology.entitySystem.event.ReceiveEvent;
-import org.terasology.entitySystem.systems.BaseComponentSystem;
-import org.terasology.entitySystem.systems.RegisterMode;
-import org.terasology.entitySystem.systems.RegisterSystem;
-import org.terasology.logic.characters.events.OnScaleEvent;
-import org.terasology.logic.characters.events.ScaleByRequest;
-import org.terasology.logic.characters.events.ScaleToRequest;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.event.EventPriority;
+import org.terasology.engine.entitySystem.event.ReceiveEvent;
+import org.terasology.engine.entitySystem.systems.BaseComponentSystem;
+import org.terasology.engine.entitySystem.systems.RegisterMode;
+import org.terasology.engine.entitySystem.systems.RegisterSystem;
+import org.terasology.engine.logic.characters.events.OnScaleEvent;
+import org.terasology.engine.logic.characters.events.ScaleByRequest;
+import org.terasology.engine.logic.characters.events.ScaleToRequest;
/**
* Authority system to finally "accept" scaling requests.
diff --git a/engine/src/main/java/org/terasology/logic/characters/CharacterSoundComponent.java b/engine/src/main/java/org/terasology/logic/characters/CharacterSoundComponent.java
index b662c92d3..16b72e463 100644
--- a/engine/src/main/java/org/terasology/logic/characters/CharacterSoundComponent.java
+++ b/engine/src/main/java/org/terasology/logic/characters/CharacterSoundComponent.java
@@ -1,24 +1,11 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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 org.terasology.logic.characters;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.characters;
import com.google.common.collect.Lists;
-import org.terasology.audio.StaticSound;
-import org.terasology.entitySystem.Component;
+import org.terasology.engine.audio.StaticSound;
+import org.terasology.engine.entitySystem.Component;
import java.util.List;
diff --git a/engine/src/main/java/org/terasology/logic/characters/CharacterSoundSystem.java b/engine/src/main/java/org/terasology/logic/characters/CharacterSoundSystem.java
index 7d1e79e77..b3b64f294 100644
--- a/engine/src/main/java/org/terasology/logic/characters/CharacterSoundSystem.java
+++ b/engine/src/main/java/org/terasology/logic/characters/CharacterSoundSystem.java
@@ -1,47 +1,34 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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 org.terasology.logic.characters;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.characters;
import org.joml.RoundingMode;
import org.joml.Vector3f;
import org.joml.Vector3i;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.terasology.audio.StaticSound;
-import org.terasology.audio.events.PlaySoundEvent;
-import org.terasology.engine.Time;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.entitySystem.event.ReceiveEvent;
-import org.terasology.entitySystem.systems.BaseComponentSystem;
-import org.terasology.entitySystem.systems.RegisterMode;
-import org.terasology.entitySystem.systems.RegisterSystem;
-import org.terasology.logic.characters.events.FootstepEvent;
-import org.terasology.logic.characters.events.JumpEvent;
-import org.terasology.logic.characters.events.OnEnterBlockEvent;
-import org.terasology.logic.characters.events.PlayerDeathEvent;
-import org.terasology.logic.characters.events.SwimStrokeEvent;
-import org.terasology.logic.characters.events.VerticalCollisionEvent;
-import org.terasology.logic.health.DoDestroyEvent;
-import org.terasology.logic.location.LocationComponent;
-import org.terasology.logic.players.event.OnPlayerRespawnedEvent;
-import org.terasology.registry.In;
-import org.terasology.utilities.random.FastRandom;
-import org.terasology.utilities.random.Random;
-import org.terasology.world.WorldProvider;
-import org.terasology.world.block.Block;
+import org.terasology.engine.audio.StaticSound;
+import org.terasology.engine.audio.events.PlaySoundEvent;
+import org.terasology.engine.core.Time;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.event.ReceiveEvent;
+import org.terasology.engine.entitySystem.systems.BaseComponentSystem;
+import org.terasology.engine.entitySystem.systems.RegisterMode;
+import org.terasology.engine.entitySystem.systems.RegisterSystem;
+import org.terasology.engine.logic.characters.events.FootstepEvent;
+import org.terasology.engine.logic.characters.events.JumpEvent;
+import org.terasology.engine.logic.characters.events.OnEnterBlockEvent;
+import org.terasology.engine.logic.characters.events.PlayerDeathEvent;
+import org.terasology.engine.logic.characters.events.SwimStrokeEvent;
+import org.terasology.engine.logic.characters.events.VerticalCollisionEvent;
+import org.terasology.engine.logic.health.DoDestroyEvent;
+import org.terasology.engine.logic.location.LocationComponent;
+import org.terasology.engine.logic.players.event.OnPlayerRespawnedEvent;
+import org.terasology.engine.registry.In;
+import org.terasology.engine.utilities.random.FastRandom;
+import org.terasology.engine.utilities.random.Random;
+import org.terasology.engine.world.WorldProvider;
+import org.terasology.engine.world.block.Block;
import java.util.List;
diff --git a/engine/src/main/java/org/terasology/logic/characters/CharacterStateEvent.java b/engine/src/main/java/org/terasology/logic/characters/CharacterStateEvent.java
index 51d443054..dc0dd4eb6 100644
--- a/engine/src/main/java/org/terasology/logic/characters/CharacterStateEvent.java
+++ b/engine/src/main/java/org/terasology/logic/characters/CharacterStateEvent.java
@@ -1,28 +1,15 @@
-/*
- * Copyright 2016 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.logic.characters;
+package org.terasology.engine.logic.characters;
import org.joml.Quaternionf;
import org.joml.Quaternionfc;
import org.joml.Vector3f;
import org.joml.Vector3fc;
import org.joml.Vector3i;
-import org.terasology.network.BroadcastEvent;
-import org.terasology.network.NetworkEvent;
+import org.terasology.engine.network.BroadcastEvent;
+import org.terasology.engine.network.NetworkEvent;
@BroadcastEvent
public class CharacterStateEvent extends NetworkEvent {
diff --git a/engine/src/main/java/org/terasology/logic/characters/CharacterSystem.java b/engine/src/main/java/org/terasology/logic/characters/CharacterSystem.java
index d050ce0fa..cbd6567d1 100644
--- a/engine/src/main/java/org/terasology/logic/characters/CharacterSystem.java
+++ b/engine/src/main/java/org/terasology/logic/characters/CharacterSystem.java
@@ -1,68 +1,55 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.logic.characters;
+package org.terasology.engine.logic.characters;
import com.google.common.collect.Sets;
import org.joml.Vector3f;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.terasology.engine.Time;
-import org.terasology.entitySystem.entity.EntityManager;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.entitySystem.event.EventPriority;
-import org.terasology.entitySystem.event.ReceiveEvent;
-import org.terasology.entitySystem.prefab.Prefab;
-import org.terasology.entitySystem.systems.BaseComponentSystem;
-import org.terasology.entitySystem.systems.RegisterMode;
-import org.terasology.entitySystem.systems.RegisterSystem;
-import org.terasology.entitySystem.systems.UpdateSubscriberSystem;
-import org.terasology.input.binds.interaction.AttackButton;
-import org.terasology.input.cameraTarget.PlayerTargetSystem;
-import org.terasology.logic.characters.events.ActivationRequest;
-import org.terasology.logic.characters.events.ActivationRequestDenied;
-import org.terasology.logic.characters.events.AttackEvent;
-import org.terasology.logic.characters.events.AttackRequest;
-import org.terasology.logic.characters.events.DeathEvent;
-import org.terasology.logic.characters.events.OnItemUseEvent;
-import org.terasology.logic.characters.events.OnScaleEvent;
-import org.terasology.logic.characters.events.PlayerDeathEvent;
-import org.terasology.logic.characters.interactions.InteractionUtil;
-import org.terasology.logic.common.ActivateEvent;
-import org.terasology.logic.common.DisplayNameComponent;
-import org.terasology.logic.health.BeforeDestroyEvent;
-import org.terasology.logic.health.DestroyEvent;
-import org.terasology.logic.health.EngineDamageTypes;
-import org.terasology.logic.inventory.ItemComponent;
-import org.terasology.logic.location.LocationComponent;
-import org.terasology.logic.players.PlayerCharacterComponent;
-import org.terasology.network.ClientComponent;
-import org.terasology.network.NetworkSystem;
-import org.terasology.physics.CollisionGroup;
-import org.terasology.physics.HitResult;
-import org.terasology.physics.Physics;
-import org.terasology.physics.StandardCollisionGroup;
-import org.terasology.physics.engine.PhysicsEngine;
-import org.terasology.recording.DirectionAndOriginPosRecorderList;
-import org.terasology.recording.RecordAndReplayCurrentStatus;
-import org.terasology.recording.RecordAndReplayStatus;
-import org.terasology.registry.In;
-import org.terasology.world.BlockEntityRegistry;
-import org.terasology.world.block.BlockComponent;
-import org.terasology.world.block.regions.ActAsBlockComponent;
+import org.terasology.engine.core.Time;
+import org.terasology.engine.entitySystem.entity.EntityManager;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.event.EventPriority;
+import org.terasology.engine.entitySystem.event.ReceiveEvent;
+import org.terasology.engine.entitySystem.prefab.Prefab;
+import org.terasology.engine.entitySystem.systems.BaseComponentSystem;
+import org.terasology.engine.entitySystem.systems.RegisterMode;
+import org.terasology.engine.entitySystem.systems.RegisterSystem;
+import org.terasology.engine.entitySystem.systems.UpdateSubscriberSystem;
+import org.terasology.engine.input.binds.interaction.AttackButton;
+import org.terasology.engine.input.cameraTarget.PlayerTargetSystem;
+import org.terasology.engine.logic.characters.events.ActivationRequest;
+import org.terasology.engine.logic.characters.events.ActivationRequestDenied;
+import org.terasology.engine.logic.characters.events.AttackEvent;
+import org.terasology.engine.logic.characters.events.AttackRequest;
+import org.terasology.engine.logic.characters.events.DeathEvent;
+import org.terasology.engine.logic.characters.events.OnItemUseEvent;
+import org.terasology.engine.logic.characters.events.OnScaleEvent;
+import org.terasology.engine.logic.characters.events.PlayerDeathEvent;
+import org.terasology.engine.logic.characters.interactions.InteractionUtil;
+import org.terasology.engine.logic.common.ActivateEvent;
+import org.terasology.engine.logic.common.DisplayNameComponent;
+import org.terasology.engine.logic.health.BeforeDestroyEvent;
+import org.terasology.engine.logic.health.DestroyEvent;
+import org.terasology.engine.logic.health.EngineDamageTypes;
+import org.terasology.engine.logic.inventory.ItemComponent;
+import org.terasology.engine.logic.location.LocationComponent;
+import org.terasology.engine.logic.players.PlayerCharacterComponent;
+import org.terasology.engine.network.ClientComponent;
+import org.terasology.engine.network.NetworkSystem;
+import org.terasology.engine.physics.CollisionGroup;
+import org.terasology.engine.physics.HitResult;
+import org.terasology.engine.physics.Physics;
+import org.terasology.engine.physics.StandardCollisionGroup;
+import org.terasology.engine.physics.engine.PhysicsEngine;
+import org.terasology.engine.recording.DirectionAndOriginPosRecorderList;
+import org.terasology.engine.recording.RecordAndReplayCurrentStatus;
+import org.terasology.engine.recording.RecordAndReplayStatus;
+import org.terasology.engine.registry.In;
+import org.terasology.engine.world.BlockEntityRegistry;
+import org.terasology.engine.world.block.BlockComponent;
+import org.terasology.engine.world.block.regions.ActAsBlockComponent;
import java.util.Optional;
diff --git a/engine/src/main/java/org/terasology/logic/characters/CharacterTeleportEvent.java b/engine/src/main/java/org/terasology/logic/characters/CharacterTeleportEvent.java
index e5067d9ab..0cc580e4e 100644
--- a/engine/src/main/java/org/terasology/logic/characters/CharacterTeleportEvent.java
+++ b/engine/src/main/java/org/terasology/logic/characters/CharacterTeleportEvent.java
@@ -1,23 +1,9 @@
-/*
- * Copyright 2016 MovingBlocks
- *
- * 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 org.terasology.logic.characters;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.characters;
-import org.joml.Vector3f;
import org.joml.Vector3fc;
-import org.terasology.entitySystem.event.Event;
+import org.terasology.engine.entitySystem.event.Event;
/**
* Used within the server to trigger a teleport of a character. Just chaining the position is not possible due to
diff --git a/engine/src/main/java/org/terasology/logic/characters/ClientCharacterPredictionSystem.java b/engine/src/main/java/org/terasology/logic/characters/ClientCharacterPredictionSystem.java
index 32df2feb8..083d1f6a2 100644
--- a/engine/src/main/java/org/terasology/logic/characters/ClientCharacterPredictionSystem.java
+++ b/engine/src/main/java/org/terasology/logic/characters/ClientCharacterPredictionSystem.java
@@ -1,20 +1,7 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.logic.characters;
+package org.terasology.engine.logic.characters;
import com.google.common.collect.Maps;
import com.google.common.collect.Queues;
@@ -22,22 +9,22 @@ import org.joml.Quaternionf;
import org.joml.Vector3f;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.terasology.engine.Time;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.entitySystem.entity.lifecycleEvents.BeforeDeactivateComponent;
-import org.terasology.entitySystem.entity.lifecycleEvents.OnActivatedComponent;
-import org.terasology.entitySystem.event.ReceiveEvent;
-import org.terasology.entitySystem.systems.BaseComponentSystem;
-import org.terasology.entitySystem.systems.RegisterMode;
-import org.terasology.entitySystem.systems.RegisterSystem;
-import org.terasology.entitySystem.systems.UpdateSubscriberSystem;
-import org.terasology.logic.location.LocationComponent;
-import org.terasology.logic.players.LocalPlayer;
-import org.terasology.network.ClientComponent;
-import org.terasology.physics.engine.PhysicsEngine;
-import org.terasology.registry.In;
-import org.terasology.utilities.collection.CircularBuffer;
-import org.terasology.world.WorldProvider;
+import org.terasology.engine.core.Time;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.entity.lifecycleEvents.BeforeDeactivateComponent;
+import org.terasology.engine.entitySystem.entity.lifecycleEvents.OnActivatedComponent;
+import org.terasology.engine.entitySystem.event.ReceiveEvent;
+import org.terasology.engine.entitySystem.systems.BaseComponentSystem;
+import org.terasology.engine.entitySystem.systems.RegisterMode;
+import org.terasology.engine.entitySystem.systems.RegisterSystem;
+import org.terasology.engine.entitySystem.systems.UpdateSubscriberSystem;
+import org.terasology.engine.logic.location.LocationComponent;
+import org.terasology.engine.logic.players.LocalPlayer;
+import org.terasology.engine.network.ClientComponent;
+import org.terasology.engine.physics.engine.PhysicsEngine;
+import org.terasology.engine.registry.In;
+import org.terasology.engine.utilities.collection.CircularBuffer;
+import org.terasology.engine.world.WorldProvider;
import java.util.Deque;
import java.util.Iterator;
diff --git a/engine/src/main/java/org/terasology/logic/characters/GazeAuthoritySystem.java b/engine/src/main/java/org/terasology/logic/characters/GazeAuthoritySystem.java
index ba6d45058..88e77a6fc 100644
--- a/engine/src/main/java/org/terasology/logic/characters/GazeAuthoritySystem.java
+++ b/engine/src/main/java/org/terasology/logic/characters/GazeAuthoritySystem.java
@@ -1,37 +1,24 @@
-/*
- * Copyright 2016 MovingBlocks
- *
- * 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 org.terasology.logic.characters;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.characters;
import org.joml.Quaternionf;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.terasology.config.Config;
-import org.terasology.entitySystem.entity.EntityBuilder;
-import org.terasology.entitySystem.entity.EntityManager;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.entitySystem.entity.lifecycleEvents.OnActivatedComponent;
-import org.terasology.entitySystem.event.EventPriority;
-import org.terasology.entitySystem.event.ReceiveEvent;
-import org.terasology.entitySystem.systems.BaseComponentSystem;
-import org.terasology.entitySystem.systems.RegisterMode;
-import org.terasology.entitySystem.systems.RegisterSystem;
-import org.terasology.logic.characters.events.OnScaleEvent;
-import org.terasology.logic.location.Location;
-import org.terasology.logic.location.LocationComponent;
-import org.terasology.registry.In;
+import org.terasology.engine.config.Config;
+import org.terasology.engine.entitySystem.entity.EntityBuilder;
+import org.terasology.engine.entitySystem.entity.EntityManager;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.entity.lifecycleEvents.OnActivatedComponent;
+import org.terasology.engine.entitySystem.event.EventPriority;
+import org.terasology.engine.entitySystem.event.ReceiveEvent;
+import org.terasology.engine.entitySystem.systems.BaseComponentSystem;
+import org.terasology.engine.entitySystem.systems.RegisterMode;
+import org.terasology.engine.entitySystem.systems.RegisterSystem;
+import org.terasology.engine.logic.characters.events.OnScaleEvent;
+import org.terasology.engine.logic.location.Location;
+import org.terasology.engine.logic.location.LocationComponent;
+import org.terasology.engine.registry.In;
/**
* Gaze describes where the character is looking.
diff --git a/engine/src/main/java/org/terasology/logic/characters/GazeMountPointComponent.java b/engine/src/main/java/org/terasology/logic/characters/GazeMountPointComponent.java
index 7cdd492c4..cdb6ef5e8 100644
--- a/engine/src/main/java/org/terasology/logic/characters/GazeMountPointComponent.java
+++ b/engine/src/main/java/org/terasology/logic/characters/GazeMountPointComponent.java
@@ -1,25 +1,12 @@
-/*
- * Copyright 2015 MovingBlocks
- *
- * 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 org.terasology.logic.characters;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.characters;
import org.joml.Vector3f;
-import org.terasology.entitySystem.Component;
-import org.terasology.entitySystem.Owns;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.network.Replicate;
+import org.terasology.engine.entitySystem.Component;
+import org.terasology.engine.entitySystem.Owns;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.network.Replicate;
/**
* The gaze mount point represents a character's "eyes".
diff --git a/engine/src/main/java/org/terasology/logic/characters/GetMaxSpeedEvent.java b/engine/src/main/java/org/terasology/logic/characters/GetMaxSpeedEvent.java
index fa8fda90e..94604f49c 100644
--- a/engine/src/main/java/org/terasology/logic/characters/GetMaxSpeedEvent.java
+++ b/engine/src/main/java/org/terasology/logic/characters/GetMaxSpeedEvent.java
@@ -1,21 +1,8 @@
-/*
- * Copyright 2014 MovingBlocks
- *
- * 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 org.terasology.logic.characters;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.characters;
-import org.terasology.entitySystem.event.AbstractValueModifiableEvent;
+import org.terasology.engine.entitySystem.event.AbstractValueModifiableEvent;
public class GetMaxSpeedEvent extends AbstractValueModifiableEvent {
private MovementMode movementMode;
diff --git a/engine/src/main/java/org/terasology/logic/characters/KinematicCharacterMover.java b/engine/src/main/java/org/terasology/logic/characters/KinematicCharacterMover.java
index 56b9671b9..2e39ae7d0 100644
--- a/engine/src/main/java/org/terasology/logic/characters/KinematicCharacterMover.java
+++ b/engine/src/main/java/org/terasology/logic/characters/KinematicCharacterMover.java
@@ -1,6 +1,6 @@
// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.logic.characters;
+package org.terasology.engine.logic.characters;
import org.joml.Math;
import org.joml.Quaternionf;
@@ -8,21 +8,21 @@ import org.joml.Vector3f;
import org.joml.Vector3i;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.logic.characters.events.FootstepEvent;
-import org.terasology.logic.characters.events.HorizontalCollisionEvent;
-import org.terasology.logic.characters.events.JumpEvent;
-import org.terasology.logic.characters.events.OnEnterBlockEvent;
-import org.terasology.logic.characters.events.SwimStrokeEvent;
-import org.terasology.logic.characters.events.VerticalCollisionEvent;
-import org.terasology.logic.location.LocationComponent;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.logic.characters.events.FootstepEvent;
+import org.terasology.engine.logic.characters.events.HorizontalCollisionEvent;
+import org.terasology.engine.logic.characters.events.JumpEvent;
+import org.terasology.engine.logic.characters.events.OnEnterBlockEvent;
+import org.terasology.engine.logic.characters.events.SwimStrokeEvent;
+import org.terasology.engine.logic.characters.events.VerticalCollisionEvent;
+import org.terasology.engine.logic.location.LocationComponent;
import org.terasology.math.TeraMath;
-import org.terasology.physics.engine.CharacterCollider;
-import org.terasology.physics.engine.PhysicsEngine;
-import org.terasology.physics.engine.SweepCallback;
-import org.terasology.physics.events.MovedEvent;
-import org.terasology.world.WorldProvider;
-import org.terasology.world.block.Block;
+import org.terasology.engine.physics.engine.CharacterCollider;
+import org.terasology.engine.physics.engine.PhysicsEngine;
+import org.terasology.engine.physics.engine.SweepCallback;
+import org.terasology.engine.physics.events.MovedEvent;
+import org.terasology.engine.world.WorldProvider;
+import org.terasology.engine.world.block.Block;
/**
* Calculates character movement using a physics-engine provided CharacterCollider.
diff --git a/engine/src/main/java/org/terasology/logic/characters/MovementMode.java b/engine/src/main/java/org/terasology/logic/characters/MovementMode.java
index 23930ddc7..ba4e3c694 100644
--- a/engine/src/main/java/org/terasology/logic/characters/MovementMode.java
+++ b/engine/src/main/java/org/terasology/logic/characters/MovementMode.java
@@ -1,20 +1,7 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.logic.characters;
+package org.terasology.engine.logic.characters;
/**
*/
diff --git a/engine/src/main/java/org/terasology/logic/characters/PredictionSystem.java b/engine/src/main/java/org/terasology/logic/characters/PredictionSystem.java
index ae6e4b379..b6975c048 100644
--- a/engine/src/main/java/org/terasology/logic/characters/PredictionSystem.java
+++ b/engine/src/main/java/org/terasology/logic/characters/PredictionSystem.java
@@ -1,22 +1,9 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.logic.characters;
+package org.terasology.engine.logic.characters;
-import org.terasology.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.entity.EntityRef;
/**
* Interface for the system that provides the ability to compensate for lag, by rewinding and replaying state
diff --git a/engine/src/main/java/org/terasology/logic/characters/ServerCharacterPredictionSystem.java b/engine/src/main/java/org/terasology/logic/characters/ServerCharacterPredictionSystem.java
index c10cbf508..a0cad623a 100644
--- a/engine/src/main/java/org/terasology/logic/characters/ServerCharacterPredictionSystem.java
+++ b/engine/src/main/java/org/terasology/logic/characters/ServerCharacterPredictionSystem.java
@@ -1,20 +1,7 @@
-/*
- * Copyright 2016 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.logic.characters;
+package org.terasology.engine.logic.characters;
import com.google.common.collect.Lists;
@@ -23,28 +10,28 @@ import org.joml.Quaternionf;
import org.joml.Vector3f;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.terasology.engine.Time;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.entitySystem.entity.lifecycleEvents.BeforeDeactivateComponent;
-import org.terasology.entitySystem.entity.lifecycleEvents.OnActivatedComponent;
-import org.terasology.entitySystem.event.ReceiveEvent;
-import org.terasology.entitySystem.systems.BaseComponentSystem;
-import org.terasology.entitySystem.systems.RegisterMode;
-import org.terasology.entitySystem.systems.RegisterSystem;
-import org.terasology.entitySystem.systems.UpdateSubscriberSystem;
-import org.terasology.logic.characters.events.SetMovementModeEvent;
-import org.terasology.logic.location.LocationComponent;
-import org.terasology.logic.players.LocalPlayer;
-import org.terasology.network.NetworkSystem;
-import org.terasology.physics.engine.CharacterCollider;
-import org.terasology.physics.engine.PhysicsEngine;
-import org.terasology.recording.CharacterStateEventPositionMap;
-import org.terasology.recording.RecordAndReplayCurrentStatus;
-import org.terasology.recording.RecordAndReplayStatus;
-import org.terasology.registry.In;
-import org.terasology.registry.Share;
-import org.terasology.utilities.collection.CircularBuffer;
-import org.terasology.world.WorldProvider;
+import org.terasology.engine.core.Time;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.entity.lifecycleEvents.BeforeDeactivateComponent;
+import org.terasology.engine.entitySystem.entity.lifecycleEvents.OnActivatedComponent;
+import org.terasology.engine.entitySystem.event.ReceiveEvent;
+import org.terasology.engine.entitySystem.systems.BaseComponentSystem;
+import org.terasology.engine.entitySystem.systems.RegisterMode;
+import org.terasology.engine.entitySystem.systems.RegisterSystem;
+import org.terasology.engine.entitySystem.systems.UpdateSubscriberSystem;
+import org.terasology.engine.logic.characters.events.SetMovementModeEvent;
+import org.terasology.engine.logic.location.LocationComponent;
+import org.terasology.engine.logic.players.LocalPlayer;
+import org.terasology.engine.network.NetworkSystem;
+import org.terasology.engine.physics.engine.CharacterCollider;
+import org.terasology.engine.physics.engine.PhysicsEngine;
+import org.terasology.engine.recording.CharacterStateEventPositionMap;
+import org.terasology.engine.recording.RecordAndReplayCurrentStatus;
+import org.terasology.engine.recording.RecordAndReplayStatus;
+import org.terasology.engine.registry.In;
+import org.terasology.engine.registry.Share;
+import org.terasology.engine.utilities.collection.CircularBuffer;
+import org.terasology.engine.world.WorldProvider;
import java.util.List;
import java.util.Map;
diff --git a/engine/src/main/java/org/terasology/logic/characters/StandComponent.java b/engine/src/main/java/org/terasology/logic/characters/StandComponent.java
index 1e8e9c760..5ac7ab3eb 100644
--- a/engine/src/main/java/org/terasology/logic/characters/StandComponent.java
+++ b/engine/src/main/java/org/terasology/logic/characters/StandComponent.java
@@ -1,23 +1,10 @@
-/*
- * Copyright 2014 MovingBlocks
- *
- * 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 org.terasology.logic.characters;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.characters;
import com.google.common.collect.Lists;
-import org.terasology.entitySystem.Component;
-import org.terasology.rendering.assets.animation.MeshAnimation;
+import org.terasology.engine.entitySystem.Component;
+import org.terasology.engine.rendering.assets.animation.MeshAnimation;
import java.util.List;
diff --git a/engine/src/main/java/org/terasology/logic/characters/VisualCharacterComponent.java b/engine/src/main/java/org/terasology/logic/characters/VisualCharacterComponent.java
index d7ad31fbf..7f3051d66 100644
--- a/engine/src/main/java/org/terasology/logic/characters/VisualCharacterComponent.java
+++ b/engine/src/main/java/org/terasology/logic/characters/VisualCharacterComponent.java
@@ -1,25 +1,12 @@
-/*
- * Copyright 2017 MovingBlocks
- *
- * 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 org.terasology.logic.characters;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.characters;
-import org.terasology.entitySystem.Component;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.logic.characters.events.CreateVisualCharacterEvent;
-import org.terasology.network.NoReplicate;
-import org.terasology.network.Replicate;
+import org.terasology.engine.entitySystem.Component;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.logic.characters.events.CreateVisualCharacterEvent;
+import org.terasology.engine.network.NoReplicate;
+import org.terasology.engine.network.Replicate;
/**
* Add this component to characters to give them a visual appearance.
diff --git a/engine/src/main/java/org/terasology/logic/characters/VisualCharacterSystem.java b/engine/src/main/java/org/terasology/logic/characters/VisualCharacterSystem.java
index 99b4621ce..d3460c2c1 100644
--- a/engine/src/main/java/org/terasology/logic/characters/VisualCharacterSystem.java
+++ b/engine/src/main/java/org/terasology/logic/characters/VisualCharacterSystem.java
@@ -1,40 +1,27 @@
-/*
- * Copyright 2017 MovingBlocks
- *
- * 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 org.terasology.logic.characters;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.characters;
import org.joml.Quaternionf;
import org.joml.Vector3f;
import org.terasology.assets.management.AssetManager;
-import org.terasology.engine.modes.loadProcesses.AwaitedLocalCharacterSpawnEvent;
-import org.terasology.entitySystem.entity.EntityBuilder;
-import org.terasology.entitySystem.entity.EntityManager;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.entitySystem.entity.lifecycleEvents.BeforeDeactivateComponent;
-import org.terasology.entitySystem.entity.lifecycleEvents.OnActivatedComponent;
-import org.terasology.entitySystem.event.EventPriority;
-import org.terasology.entitySystem.event.ReceiveEvent;
-import org.terasology.entitySystem.prefab.Prefab;
-import org.terasology.entitySystem.systems.BaseComponentSystem;
-import org.terasology.entitySystem.systems.RegisterMode;
-import org.terasology.entitySystem.systems.RegisterSystem;
-import org.terasology.logic.characters.events.CreateVisualCharacterEvent;
-import org.terasology.logic.location.Location;
-import org.terasology.logic.location.LocationComponent;
-import org.terasology.logic.players.LocalPlayer;
-import org.terasology.registry.In;
+import org.terasology.engine.core.modes.loadProcesses.AwaitedLocalCharacterSpawnEvent;
+import org.terasology.engine.entitySystem.entity.EntityBuilder;
+import org.terasology.engine.entitySystem.entity.EntityManager;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.entity.lifecycleEvents.BeforeDeactivateComponent;
+import org.terasology.engine.entitySystem.entity.lifecycleEvents.OnActivatedComponent;
+import org.terasology.engine.entitySystem.event.EventPriority;
+import org.terasology.engine.entitySystem.event.ReceiveEvent;
+import org.terasology.engine.entitySystem.prefab.Prefab;
+import org.terasology.engine.entitySystem.systems.BaseComponentSystem;
+import org.terasology.engine.entitySystem.systems.RegisterMode;
+import org.terasology.engine.entitySystem.systems.RegisterSystem;
+import org.terasology.engine.logic.characters.events.CreateVisualCharacterEvent;
+import org.terasology.engine.logic.location.Location;
+import org.terasology.engine.logic.location.LocationComponent;
+import org.terasology.engine.logic.players.LocalPlayer;
+import org.terasology.engine.registry.In;
/**
* This system is responsible for sending a {@link CreateVisualCharacterEvent} according to how it is specified in
diff --git a/engine/src/main/java/org/terasology/logic/characters/WalkComponent.java b/engine/src/main/java/org/terasology/logic/characters/WalkComponent.java
index 5ed70b0b9..68169ce6a 100644
--- a/engine/src/main/java/org/terasology/logic/characters/WalkComponent.java
+++ b/engine/src/main/java/org/terasology/logic/characters/WalkComponent.java
@@ -1,23 +1,10 @@
-/*
- * Copyright 2014 MovingBlocks
- *
- * 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 org.terasology.logic.characters;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.characters;
import com.google.common.collect.Lists;
-import org.terasology.entitySystem.Component;
-import org.terasology.rendering.assets.animation.MeshAnimation;
+import org.terasology.engine.entitySystem.Component;
+import org.terasology.engine.rendering.assets.animation.MeshAnimation;
import java.util.List;
diff --git a/engine/src/main/java/org/terasology/logic/characters/events/ActivationPredicted.java b/engine/src/main/java/org/terasology/logic/characters/events/ActivationPredicted.java
index 9103ad211..9ec0d3ae9 100644
--- a/engine/src/main/java/org/terasology/logic/characters/events/ActivationPredicted.java
+++ b/engine/src/main/java/org/terasology/logic/characters/events/ActivationPredicted.java
@@ -1,24 +1,11 @@
-/*
- * Copyright 2014 MovingBlocks
- *
- * 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 org.terasology.logic.characters.events;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.characters.events;
import org.joml.Vector3f;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.entitySystem.event.AbstractConsumableEvent;
-import org.terasology.logic.location.LocationComponent;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.event.AbstractConsumableEvent;
+import org.terasology.engine.logic.location.LocationComponent;
/**
*/
diff --git a/engine/src/main/java/org/terasology/logic/characters/events/ActivationRequest.java b/engine/src/main/java/org/terasology/logic/characters/events/ActivationRequest.java
index 890240e7a..4e8b9eb18 100644
--- a/engine/src/main/java/org/terasology/logic/characters/events/ActivationRequest.java
+++ b/engine/src/main/java/org/terasology/logic/characters/events/ActivationRequest.java
@@ -1,25 +1,12 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.logic.characters.events;
+package org.terasology.engine.logic.characters.events;
import org.joml.Vector3f;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.network.NetworkEvent;
-import org.terasology.network.ServerEvent;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.network.NetworkEvent;
+import org.terasology.engine.network.ServerEvent;
/**
*/
diff --git a/engine/src/main/java/org/terasology/logic/characters/events/ActivationRequestDenied.java b/engine/src/main/java/org/terasology/logic/characters/events/ActivationRequestDenied.java
index e1fb2fd05..948acce08 100644
--- a/engine/src/main/java/org/terasology/logic/characters/events/ActivationRequestDenied.java
+++ b/engine/src/main/java/org/terasology/logic/characters/events/ActivationRequestDenied.java
@@ -1,21 +1,8 @@
-/*
- * Copyright 2014 MovingBlocks
- *
- * 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 org.terasology.logic.characters.events;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.characters.events;
-import org.terasology.entitySystem.event.Event;
+import org.terasology.engine.entitySystem.event.Event;
/**
* This event is attached to the character.
diff --git a/engine/src/main/java/org/terasology/logic/characters/events/AttackEvent.java b/engine/src/main/java/org/terasology/logic/characters/events/AttackEvent.java
index 7aec5c00f..42d5cf248 100644
--- a/engine/src/main/java/org/terasology/logic/characters/events/AttackEvent.java
+++ b/engine/src/main/java/org/terasology/logic/characters/events/AttackEvent.java
@@ -1,22 +1,9 @@
-/*
- * Copyright 2016 MovingBlocks
- *
- * 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 org.terasology.logic.characters.events;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.characters.events;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.entitySystem.event.AbstractConsumableEvent;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.event.AbstractConsumableEvent;
/**
* This event happens on the server after a AttackRequest has been sent by the client.
diff --git a/engine/src/main/java/org/terasology/logic/characters/events/AttackRequest.java b/engine/src/main/java/org/terasology/logic/characters/events/AttackRequest.java
index 6fe5589fc..8c6c37af7 100644
--- a/engine/src/main/java/org/terasology/logic/characters/events/AttackRequest.java
+++ b/engine/src/main/java/org/terasology/logic/characters/events/AttackRequest.java
@@ -1,24 +1,11 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.logic.characters.events;
+package org.terasology.engine.logic.characters.events;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.network.NetworkEvent;
-import org.terasology.network.ServerEvent;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.network.NetworkEvent;
+import org.terasology.engine.network.ServerEvent;
/**
*/
diff --git a/engine/src/main/java/org/terasology/logic/characters/events/ChangeHeldItemRequest.java b/engine/src/main/java/org/terasology/logic/characters/events/ChangeHeldItemRequest.java
index 610b5be82..7d9769251 100644
--- a/engine/src/main/java/org/terasology/logic/characters/events/ChangeHeldItemRequest.java
+++ b/engine/src/main/java/org/terasology/logic/characters/events/ChangeHeldItemRequest.java
@@ -1,23 +1,10 @@
-/*
- * Copyright 2015 MovingBlocks
- *
- * 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 org.terasology.logic.characters.events;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.characters.events;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.entitySystem.event.Event;
-import org.terasology.network.ServerEvent;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.event.Event;
+import org.terasology.engine.network.ServerEvent;
@ServerEvent
public class ChangeHeldItemRequest implements Event {
diff --git a/engine/src/main/java/org/terasology/logic/characters/events/CollisionEvent.java b/engine/src/main/java/org/terasology/logic/characters/events/CollisionEvent.java
index aaabddcf2..0d50306f2 100644
--- a/engine/src/main/java/org/terasology/logic/characters/events/CollisionEvent.java
+++ b/engine/src/main/java/org/terasology/logic/characters/events/CollisionEvent.java
@@ -1,22 +1,9 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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 org.terasology.logic.characters.events;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.characters.events;
import org.joml.Vector3f;
-import org.terasology.entitySystem.event.Event;
+import org.terasology.engine.entitySystem.event.Event;
/**
*/
diff --git a/engine/src/main/java/org/terasology/logic/characters/events/CreateVisualCharacterEvent.java b/engine/src/main/java/org/terasology/logic/characters/events/CreateVisualCharacterEvent.java
index 671684d65..00d585ae3 100644
--- a/engine/src/main/java/org/terasology/logic/characters/events/CreateVisualCharacterEvent.java
+++ b/engine/src/main/java/org/terasology/logic/characters/events/CreateVisualCharacterEvent.java
@@ -1,24 +1,11 @@
-/*
- * Copyright 2017 MovingBlocks
- *
- * 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 org.terasology.logic.characters.events;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.characters.events;
-import org.terasology.entitySystem.entity.EntityBuilder;
-import org.terasology.entitySystem.event.AbstractConsumableEvent;
-import org.terasology.entitySystem.event.EventPriority;
-import org.terasology.logic.characters.VisualCharacterComponent;
+import org.terasology.engine.entitySystem.entity.EntityBuilder;
+import org.terasology.engine.entitySystem.event.AbstractConsumableEvent;
+import org.terasology.engine.entitySystem.event.EventPriority;
+import org.terasology.engine.logic.characters.VisualCharacterComponent;
/**
* Sent to the character entities when a visual representation of it should be created for them: The event will be send
diff --git a/engine/src/main/java/org/terasology/logic/characters/events/DeathEvent.java b/engine/src/main/java/org/terasology/logic/characters/events/DeathEvent.java
index bcba2391d..1d7da2430 100644
--- a/engine/src/main/java/org/terasology/logic/characters/events/DeathEvent.java
+++ b/engine/src/main/java/org/terasology/logic/characters/events/DeathEvent.java
@@ -1,23 +1,10 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.logic.characters.events;
+package org.terasology.engine.logic.characters.events;
-import org.terasology.entitySystem.event.Event;
-import org.terasology.network.OwnerEvent;
+import org.terasology.engine.entitySystem.event.Event;
+import org.terasology.engine.network.OwnerEvent;
/**
* This event is sent to the client entity when the character dies.
diff --git a/engine/src/main/java/org/terasology/logic/characters/events/FootstepEvent.java b/engine/src/main/java/org/terasology/logic/characters/events/FootstepEvent.java
index ba86498b3..377df20b8 100644
--- a/engine/src/main/java/org/terasology/logic/characters/events/FootstepEvent.java
+++ b/engine/src/main/java/org/terasology/logic/characters/events/FootstepEvent.java
@@ -1,21 +1,8 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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 org.terasology.logic.characters.events;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.characters.events;
-import org.terasology.entitySystem.event.Event;
+import org.terasology.engine.entitySystem.event.Event;
/**
*/
diff --git a/engine/src/main/java/org/terasology/logic/characters/events/HorizontalCollisionEvent.java b/engine/src/main/java/org/terasology/logic/characters/events/HorizontalCollisionEvent.java
index 1bbb3e2d6..e06b25d17 100644
--- a/engine/src/main/java/org/terasology/logic/characters/events/HorizontalCollisionEvent.java
+++ b/engine/src/main/java/org/terasology/logic/characters/events/HorizontalCollisionEvent.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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 org.terasology.logic.characters.events;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.characters.events;
import org.joml.Vector3f;
diff --git a/engine/src/main/java/org/terasology/logic/characters/events/JumpEvent.java b/engine/src/main/java/org/terasology/logic/characters/events/JumpEvent.java
index 65c6f81f6..e10354352 100644
--- a/engine/src/main/java/org/terasology/logic/characters/events/JumpEvent.java
+++ b/engine/src/main/java/org/terasology/logic/characters/events/JumpEvent.java
@@ -1,21 +1,8 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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 org.terasology.logic.characters.events;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.characters.events;
-import org.terasology.entitySystem.event.Event;
+import org.terasology.engine.entitySystem.event.Event;
/**
*/
diff --git a/engine/src/main/java/org/terasology/logic/characters/events/OnEnterBlockEvent.java b/engine/src/main/java/org/terasology/logic/characters/events/OnEnterBlockEvent.java
index ca9dc6bb1..9852efd29 100644
--- a/engine/src/main/java/org/terasology/logic/characters/events/OnEnterBlockEvent.java
+++ b/engine/src/main/java/org/terasology/logic/characters/events/OnEnterBlockEvent.java
@@ -1,23 +1,10 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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 org.terasology.logic.characters.events;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.characters.events;
import org.joml.Vector3i;
-import org.terasology.entitySystem.event.Event;
-import org.terasology.world.block.Block;
+import org.terasology.engine.entitySystem.event.Event;
+import org.terasology.engine.world.block.Block;
/**
* This event gets sent to the player entity when it enters a new block.
diff --git a/engine/src/main/java/org/terasology/logic/characters/events/OnItemUseEvent.java b/engine/src/main/java/org/terasology/logic/characters/events/OnItemUseEvent.java
index d2f072736..6faa06a05 100644
--- a/engine/src/main/java/org/terasology/logic/characters/events/OnItemUseEvent.java
+++ b/engine/src/main/java/org/terasology/logic/characters/events/OnItemUseEvent.java
@@ -1,22 +1,9 @@
-/*
- * Copyright 2016 MovingBlocks
- *
- * 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 org.terasology.logic.characters.events;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.characters.events;
-import org.terasology.entitySystem.event.AbstractConsumableEvent;
+import org.terasology.engine.entitySystem.event.AbstractConsumableEvent;
/**
* Consuming this event means that the subsequent actions should cancel
diff --git a/engine/src/main/java/org/terasology/logic/characters/events/OnScaleEvent.java b/engine/src/main/java/org/terasology/logic/characters/events/OnScaleEvent.java
index df61cb2b7..25be07516 100644
--- a/engine/src/main/java/org/terasology/logic/characters/events/OnScaleEvent.java
+++ b/engine/src/main/java/org/terasology/logic/characters/events/OnScaleEvent.java
@@ -1,21 +1,8 @@
-/*
- * Copyright 2020 MovingBlocks
- *
- * 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 org.terasology.logic.characters.events;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.characters.events;
-import org.terasology.entitySystem.event.Event;
+import org.terasology.engine.entitySystem.event.Event;
/**
* Immutable event to notify that a character entity is scaled.
diff --git a/engine/src/main/java/org/terasology/logic/characters/events/PlayerDeathEvent.java b/engine/src/main/java/org/terasology/logic/characters/events/PlayerDeathEvent.java
index 8e2644718..2a07ae9f6 100644
--- a/engine/src/main/java/org/terasology/logic/characters/events/PlayerDeathEvent.java
+++ b/engine/src/main/java/org/terasology/logic/characters/events/PlayerDeathEvent.java
@@ -1,23 +1,10 @@
-/*
- * Copyright 2017 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.logic.characters.events;
+package org.terasology.engine.logic.characters.events;
-import org.terasology.entitySystem.event.Event;
-import org.terasology.network.OwnerEvent;
+import org.terasology.engine.entitySystem.event.Event;
+import org.terasology.engine.network.OwnerEvent;
/**
* This event is sent to the player entity when the player dies.
diff --git a/engine/src/main/java/org/terasology/logic/characters/events/ScaleByRequest.java b/engine/src/main/java/org/terasology/logic/characters/events/ScaleByRequest.java
index 9b74758e6..8cdf3f6d8 100644
--- a/engine/src/main/java/org/terasology/logic/characters/events/ScaleByRequest.java
+++ b/engine/src/main/java/org/terasology/logic/characters/events/ScaleByRequest.java
@@ -1,21 +1,8 @@
-/*
- * Copyright 2020 MovingBlocks
- *
- * 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 org.terasology.logic.characters.events;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.characters.events;
-import org.terasology.entitySystem.event.AbstractConsumableEvent;
+import org.terasology.engine.entitySystem.event.AbstractConsumableEvent;
/**
* Mutable event to request that some character entity should be scaled by the given factor.
diff --git a/engine/src/main/java/org/terasology/logic/characters/events/ScaleToRequest.java b/engine/src/main/java/org/terasology/logic/characters/events/ScaleToRequest.java
index 2ff60ce43..25ede667a 100644
--- a/engine/src/main/java/org/terasology/logic/characters/events/ScaleToRequest.java
+++ b/engine/src/main/java/org/terasology/logic/characters/events/ScaleToRequest.java
@@ -1,21 +1,8 @@
-/*
- * Copyright 2020 MovingBlocks
- *
- * 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 org.terasology.logic.characters.events;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.characters.events;
-import org.terasology.entitySystem.event.AbstractConsumableEvent;
+import org.terasology.engine.entitySystem.event.AbstractConsumableEvent;
/**
* Mutable event to request that some character entity should be scaled to a target value.
diff --git a/engine/src/main/java/org/terasology/logic/characters/events/SetMovementModeEvent.java b/engine/src/main/java/org/terasology/logic/characters/events/SetMovementModeEvent.java
index 1ca34aa43..c86fb1168 100644
--- a/engine/src/main/java/org/terasology/logic/characters/events/SetMovementModeEvent.java
+++ b/engine/src/main/java/org/terasology/logic/characters/events/SetMovementModeEvent.java
@@ -1,22 +1,9 @@
-/*
- * Copyright 2014 MovingBlocks
- *
- * 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 org.terasology.logic.characters.events;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.characters.events;
-import org.terasology.entitySystem.event.Event;
-import org.terasology.logic.characters.MovementMode;
+import org.terasology.engine.entitySystem.event.Event;
+import org.terasology.engine.logic.characters.MovementMode;
/**
*/
diff --git a/engine/src/main/java/org/terasology/logic/characters/events/SwimStrokeEvent.java b/engine/src/main/java/org/terasology/logic/characters/events/SwimStrokeEvent.java
index 7692f4db7..1e08af845 100644
--- a/engine/src/main/java/org/terasology/logic/characters/events/SwimStrokeEvent.java
+++ b/engine/src/main/java/org/terasology/logic/characters/events/SwimStrokeEvent.java
@@ -1,22 +1,9 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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 org.terasology.logic.characters.events;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.characters.events;
-import org.terasology.entitySystem.event.Event;
-import org.terasology.world.block.Block;
+import org.terasology.engine.entitySystem.event.Event;
+import org.terasology.engine.world.block.Block;
/**
* This event is sent when a character moves far enough to trigger a swim stroke (similar to a footstep on land)
diff --git a/engine/src/main/java/org/terasology/logic/characters/events/VerticalCollisionEvent.java b/engine/src/main/java/org/terasology/logic/characters/events/VerticalCollisionEvent.java
index 8bdc625e9..0e367149e 100644
--- a/engine/src/main/java/org/terasology/logic/characters/events/VerticalCollisionEvent.java
+++ b/engine/src/main/java/org/terasology/logic/characters/events/VerticalCollisionEvent.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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 org.terasology.logic.characters.events;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.characters.events;
import org.joml.Vector3f;
diff --git a/engine/src/main/java/org/terasology/logic/characters/events/package-info.java b/engine/src/main/java/org/terasology/logic/characters/events/package-info.java
index a21105866..214808ad0 100644
--- a/engine/src/main/java/org/terasology/logic/characters/events/package-info.java
+++ b/engine/src/main/java/org/terasology/logic/characters/events/package-info.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-@API package org.terasology.logic.characters.events;
+@API package org.terasology.engine.logic.characters.events;
import org.terasology.module.sandbox.API;
diff --git a/engine/src/main/java/org/terasology/logic/characters/interactions/InteractionEndEvent.java b/engine/src/main/java/org/terasology/logic/characters/interactions/InteractionEndEvent.java
index 6c7ad8d53..3e3abb609 100644
--- a/engine/src/main/java/org/terasology/logic/characters/interactions/InteractionEndEvent.java
+++ b/engine/src/main/java/org/terasology/logic/characters/interactions/InteractionEndEvent.java
@@ -1,22 +1,9 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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 org.terasology.logic.characters.interactions;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.characters.interactions;
-import org.terasology.entitySystem.event.Event;
-import org.terasology.network.OwnerEvent;
+import org.terasology.engine.entitySystem.event.Event;
+import org.terasology.engine.network.OwnerEvent;
/**
* Represents the end of an interaction between for example a character and a container.
diff --git a/engine/src/main/java/org/terasology/logic/characters/interactions/InteractionEndPredicted.java b/engine/src/main/java/org/terasology/logic/characters/interactions/InteractionEndPredicted.java
index 881130e3a..3e3473b72 100644
--- a/engine/src/main/java/org/terasology/logic/characters/interactions/InteractionEndPredicted.java
+++ b/engine/src/main/java/org/terasology/logic/characters/interactions/InteractionEndPredicted.java
@@ -1,22 +1,9 @@
-/*
- * Copyright 2014 MovingBlocks
- *
- * 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 org.terasology.logic.characters.interactions;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.characters.interactions;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.entitySystem.event.Event;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.event.Event;
import org.terasology.module.sandbox.API;
/**
diff --git a/engine/src/main/java/org/terasology/logic/characters/interactions/InteractionEndRequest.java b/engine/src/main/java/org/terasology/logic/characters/interactions/InteractionEndRequest.java
index 38a26baf4..db6ff98c8 100644
--- a/engine/src/main/java/org/terasology/logic/characters/interactions/InteractionEndRequest.java
+++ b/engine/src/main/java/org/terasology/logic/characters/interactions/InteractionEndRequest.java
@@ -1,22 +1,9 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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 org.terasology.logic.characters.interactions;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.characters.interactions;
-import org.terasology.entitySystem.event.Event;
-import org.terasology.network.ServerEvent;
+import org.terasology.engine.entitySystem.event.Event;
+import org.terasology.engine.network.ServerEvent;
/**
* Request the server to cancel the current interaction.
diff --git a/engine/src/main/java/org/terasology/logic/characters/interactions/InteractionScreenComponent.java b/engine/src/main/java/org/terasology/logic/characters/interactions/InteractionScreenComponent.java
index 02596f1b3..ed3ec4ecb 100644
--- a/engine/src/main/java/org/terasology/logic/characters/interactions/InteractionScreenComponent.java
+++ b/engine/src/main/java/org/terasology/logic/characters/interactions/InteractionScreenComponent.java
@@ -1,21 +1,8 @@
-/*
- * Copyright 2014 MovingBlocks
- *
- * 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 org.terasology.logic.characters.interactions;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.characters.interactions;
-import org.terasology.entitySystem.Component;
+import org.terasology.engine.entitySystem.Component;
import org.terasology.module.sandbox.API;
/**
diff --git a/engine/src/main/java/org/terasology/logic/characters/interactions/InteractionStartPredicted.java b/engine/src/main/java/org/terasology/logic/characters/interactions/InteractionStartPredicted.java
index 51b6470b0..20c9d41e7 100644
--- a/engine/src/main/java/org/terasology/logic/characters/interactions/InteractionStartPredicted.java
+++ b/engine/src/main/java/org/terasology/logic/characters/interactions/InteractionStartPredicted.java
@@ -1,22 +1,9 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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 org.terasology.logic.characters.interactions;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.characters.interactions;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.entitySystem.event.Event;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.event.Event;
import org.terasology.module.sandbox.API;
/**
diff --git a/engine/src/main/java/org/terasology/logic/characters/interactions/InteractionSystem.java b/engine/src/main/java/org/terasology/logic/characters/interactions/InteractionSystem.java
index 1063a0aef..dd430bf6f 100644
--- a/engine/src/main/java/org/terasology/logic/characters/interactions/InteractionSystem.java
+++ b/engine/src/main/java/org/terasology/logic/characters/interactions/InteractionSystem.java
@@ -1,36 +1,23 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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 org.terasology.logic.characters.interactions;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.characters.interactions;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.terasology.assets.ResourceUrn;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.entitySystem.event.ReceiveEvent;
-import org.terasology.entitySystem.systems.BaseComponentSystem;
-import org.terasology.entitySystem.systems.RegisterMode;
-import org.terasology.entitySystem.systems.RegisterSystem;
-import org.terasology.logic.characters.CharacterComponent;
-import org.terasology.logic.characters.events.ActivationPredicted;
-import org.terasology.logic.characters.events.ActivationRequestDenied;
-import org.terasology.logic.common.ActivateEvent;
-import org.terasology.network.ClientComponent;
-import org.terasology.registry.In;
-import org.terasology.rendering.nui.NUIManager;
-import org.terasology.rendering.nui.ScreenLayerClosedEvent;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.event.ReceiveEvent;
+import org.terasology.engine.entitySystem.systems.BaseComponentSystem;
+import org.terasology.engine.entitySystem.systems.RegisterMode;
+import org.terasology.engine.entitySystem.systems.RegisterSystem;
+import org.terasology.engine.logic.characters.CharacterComponent;
+import org.terasology.engine.logic.common.ActivateEvent;
+import org.terasology.engine.logic.characters.events.ActivationPredicted;
+import org.terasology.engine.logic.characters.events.ActivationRequestDenied;
+import org.terasology.engine.network.ClientComponent;
+import org.terasology.engine.registry.In;
+import org.terasology.engine.rendering.nui.NUIManager;
+import org.terasology.engine.rendering.nui.ScreenLayerClosedEvent;
/**
*/
diff --git a/engine/src/main/java/org/terasology/logic/characters/interactions/InteractionTargetComponent.java b/engine/src/main/java/org/terasology/logic/characters/interactions/InteractionTargetComponent.java
index b29f41828..44b14e402 100644
--- a/engine/src/main/java/org/terasology/logic/characters/interactions/InteractionTargetComponent.java
+++ b/engine/src/main/java/org/terasology/logic/characters/interactions/InteractionTargetComponent.java
@@ -1,21 +1,8 @@
-/*
- * Copyright 2014 MovingBlocks
- *
- * 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 org.terasology.logic.characters.interactions;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.characters.interactions;
-import org.terasology.entitySystem.Component;
+import org.terasology.engine.entitySystem.Component;
/**
*/
diff --git a/engine/src/main/java/org/terasology/logic/characters/interactions/InteractionUtil.java b/engine/src/main/java/org/terasology/logic/characters/interactions/InteractionUtil.java
index dbfc9cd2d..b27cd5640 100644
--- a/engine/src/main/java/org/terasology/logic/characters/interactions/InteractionUtil.java
+++ b/engine/src/main/java/org/terasology/logic/characters/interactions/InteractionUtil.java
@@ -1,30 +1,17 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.logic.characters.interactions;
+package org.terasology.engine.logic.characters.interactions;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.terasology.assets.ResourceUrn;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.logic.characters.CharacterComponent;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.logic.characters.CharacterComponent;
import org.terasology.module.sandbox.API;
/**
- * Utility class for entities with the {@link org.terasology.logic.characters.CharacterComponent}.
+ * Utility class for entities with the {@link CharacterComponent}.
*/
@API
public final class InteractionUtil {
diff --git a/engine/src/main/java/org/terasology/logic/characters/package-info.java b/engine/src/main/java/org/terasology/logic/characters/package-info.java
index 2b889132c..03f33261e 100644
--- a/engine/src/main/java/org/terasology/logic/characters/package-info.java
+++ b/engine/src/main/java/org/terasology/logic/characters/package-info.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-@API package org.terasology.logic.characters;
+@API package org.terasology.engine.logic.characters;
import org.terasology.module.sandbox.API;
diff --git a/engine/src/main/java/org/terasology/logic/chat/ChatMessageEvent.java b/engine/src/main/java/org/terasology/logic/chat/ChatMessageEvent.java
index 0175e3cfc..a49ee169a 100644
--- a/engine/src/main/java/org/terasology/logic/chat/ChatMessageEvent.java
+++ b/engine/src/main/java/org/terasology/logic/chat/ChatMessageEvent.java
@@ -1,32 +1,20 @@
-/*
- * Copyright 2017 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.logic.chat;
+package org.terasology.engine.logic.chat;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.logic.console.CoreMessageType;
-import org.terasology.logic.console.Message;
-import org.terasology.logic.console.MessageEvent;
-import org.terasology.logic.players.PlayerUtil;
-import org.terasology.network.OwnerEvent;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.logic.common.DisplayNameComponent;
+import org.terasology.engine.logic.console.CoreMessageType;
+import org.terasology.engine.logic.console.Message;
+import org.terasology.engine.logic.console.MessageEvent;
+import org.terasology.engine.logic.players.PlayerUtil;
+import org.terasology.engine.network.OwnerEvent;
/**
* Indicate that a message should be printed to the chat console.
*
* Command names are case-insensitive.
- * Command methods can have an {@link org.terasology.entitySystem.entity.EntityRef} parameter at the end,
+ * Command methods can have an {@link org.terasology.engine.entitySystem.entity.EntityRef} parameter at the end,
* which will be populated with the entity of the client calling the command.
* Parameters should be annotated by the {@link CommandParam} annotation.
*
diff --git a/engine/src/main/java/org/terasology/logic/console/commandSystem/annotations/CommandParam.java b/engine/src/main/java/org/terasology/logic/console/commandSystem/annotations/CommandParam.java
index ce3bb6ec7..6b9d188df 100644
--- a/engine/src/main/java/org/terasology/logic/console/commandSystem/annotations/CommandParam.java
+++ b/engine/src/main/java/org/terasology/logic/console/commandSystem/annotations/CommandParam.java
@@ -1,24 +1,11 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.logic.console.commandSystem.annotations;
+package org.terasology.engine.logic.console.commandSystem.annotations;
import com.google.common.collect.Sets;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.logic.console.commandSystem.CommandParameterSuggester;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.logic.console.commandSystem.CommandParameterSuggester;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
diff --git a/engine/src/main/java/org/terasology/logic/console/commandSystem/annotations/Sender.java b/engine/src/main/java/org/terasology/logic/console/commandSystem/annotations/Sender.java
index 32198fb68..2b5d6d081 100644
--- a/engine/src/main/java/org/terasology/logic/console/commandSystem/annotations/Sender.java
+++ b/engine/src/main/java/org/terasology/logic/console/commandSystem/annotations/Sender.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2014 MovingBlocks
- *
- * 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 org.terasology.logic.console.commandSystem.annotations;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.console.commandSystem.annotations;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
diff --git a/engine/src/main/java/org/terasology/logic/console/commandSystem/annotations/package-info.java b/engine/src/main/java/org/terasology/logic/console/commandSystem/annotations/package-info.java
index f2222d3de..11047f974 100644
--- a/engine/src/main/java/org/terasology/logic/console/commandSystem/annotations/package-info.java
+++ b/engine/src/main/java/org/terasology/logic/console/commandSystem/annotations/package-info.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2014 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-@API package org.terasology.logic.console.commandSystem.annotations;
+@API package org.terasology.engine.logic.console.commandSystem.annotations;
import org.terasology.module.sandbox.API;
diff --git a/engine/src/main/java/org/terasology/logic/console/commandSystem/exceptions/CommandExecutionException.java b/engine/src/main/java/org/terasology/logic/console/commandSystem/exceptions/CommandExecutionException.java
index 83c385233..df2ef70ee 100644
--- a/engine/src/main/java/org/terasology/logic/console/commandSystem/exceptions/CommandExecutionException.java
+++ b/engine/src/main/java/org/terasology/logic/console/commandSystem/exceptions/CommandExecutionException.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2014 MovingBlocks
- *
- * 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 org.terasology.logic.console.commandSystem.exceptions;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.console.commandSystem.exceptions;
/**
*/
diff --git a/engine/src/main/java/org/terasology/logic/console/commandSystem/exceptions/CommandInitializationException.java b/engine/src/main/java/org/terasology/logic/console/commandSystem/exceptions/CommandInitializationException.java
index 11c9b2a03..d3f51bb02 100644
--- a/engine/src/main/java/org/terasology/logic/console/commandSystem/exceptions/CommandInitializationException.java
+++ b/engine/src/main/java/org/terasology/logic/console/commandSystem/exceptions/CommandInitializationException.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2014 MovingBlocks
- *
- * 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 org.terasology.logic.console.commandSystem.exceptions;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.console.commandSystem.exceptions;
/**
*/
diff --git a/engine/src/main/java/org/terasology/logic/console/commandSystem/exceptions/CommandParameterParseException.java b/engine/src/main/java/org/terasology/logic/console/commandSystem/exceptions/CommandParameterParseException.java
index c83fa7c69..afee185d5 100644
--- a/engine/src/main/java/org/terasology/logic/console/commandSystem/exceptions/CommandParameterParseException.java
+++ b/engine/src/main/java/org/terasology/logic/console/commandSystem/exceptions/CommandParameterParseException.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2014 MovingBlocks
- *
- * 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 org.terasology.logic.console.commandSystem.exceptions;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.console.commandSystem.exceptions;
/**
*/
diff --git a/engine/src/main/java/org/terasology/logic/console/commandSystem/exceptions/CommandSuggestionException.java b/engine/src/main/java/org/terasology/logic/console/commandSystem/exceptions/CommandSuggestionException.java
index d794e61fe..edbc521c1 100644
--- a/engine/src/main/java/org/terasology/logic/console/commandSystem/exceptions/CommandSuggestionException.java
+++ b/engine/src/main/java/org/terasology/logic/console/commandSystem/exceptions/CommandSuggestionException.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2014 MovingBlocks
- *
- * 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 org.terasology.logic.console.commandSystem.exceptions;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.console.commandSystem.exceptions;
/**
* Thrown while suggesting a command parameter
diff --git a/engine/src/main/java/org/terasology/logic/console/commandSystem/exceptions/SuggesterInstantiationException.java b/engine/src/main/java/org/terasology/logic/console/commandSystem/exceptions/SuggesterInstantiationException.java
index a8c66c503..b315f4c49 100644
--- a/engine/src/main/java/org/terasology/logic/console/commandSystem/exceptions/SuggesterInstantiationException.java
+++ b/engine/src/main/java/org/terasology/logic/console/commandSystem/exceptions/SuggesterInstantiationException.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2014 MovingBlocks
- *
- * 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 org.terasology.logic.console.commandSystem.exceptions;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.console.commandSystem.exceptions;
/**
* Thrown when a suggester fails instantiating via the newInstance command
diff --git a/engine/src/main/java/org/terasology/logic/console/commands/ClientCommands.java b/engine/src/main/java/org/terasology/logic/console/commands/ClientCommands.java
index d37a53a2a..4aec785ba 100644
--- a/engine/src/main/java/org/terasology/logic/console/commands/ClientCommands.java
+++ b/engine/src/main/java/org/terasology/logic/console/commands/ClientCommands.java
@@ -1,24 +1,24 @@
-// Copyright 2020 The Terasology Foundation
+// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.logic.console.commands;
+package org.terasology.engine.logic.console.commands;
import org.joml.Vector3f;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.entitySystem.systems.BaseComponentSystem;
-import org.terasology.entitySystem.systems.RegisterSystem;
-import org.terasology.input.cameraTarget.CameraTargetSystem;
-import org.terasology.logic.console.commandSystem.annotations.Command;
-import org.terasology.logic.console.commandSystem.annotations.CommandParam;
-import org.terasology.logic.console.commandSystem.annotations.Sender;
-import org.terasology.logic.location.LocationComponent;
-import org.terasology.logic.permission.PermissionManager;
-import org.terasology.logic.players.StaticSpawnLocationComponent;
-import org.terasology.logic.players.event.WorldtimeResetEvent;
-import org.terasology.network.ClientComponent;
-import org.terasology.network.NetworkSystem;
-import org.terasology.registry.In;
-import org.terasology.world.WorldProvider;
-import org.terasology.world.sun.CelestialSystem;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.systems.BaseComponentSystem;
+import org.terasology.engine.entitySystem.systems.RegisterSystem;
+import org.terasology.engine.input.cameraTarget.CameraTargetSystem;
+import org.terasology.engine.logic.console.commandSystem.annotations.Command;
+import org.terasology.engine.logic.console.commandSystem.annotations.CommandParam;
+import org.terasology.engine.logic.console.commandSystem.annotations.Sender;
+import org.terasology.engine.logic.location.LocationComponent;
+import org.terasology.engine.logic.players.StaticSpawnLocationComponent;
+import org.terasology.engine.logic.players.event.WorldtimeResetEvent;
+import org.terasology.engine.logic.permission.PermissionManager;
+import org.terasology.engine.network.ClientComponent;
+import org.terasology.engine.network.NetworkSystem;
+import org.terasology.engine.registry.In;
+import org.terasology.engine.world.WorldProvider;
+import org.terasology.engine.world.sun.CelestialSystem;
/**
* This class contains basic client commands for debugging eg.
diff --git a/engine/src/main/java/org/terasology/logic/console/commands/CoreCommands.java b/engine/src/main/java/org/terasology/logic/console/commands/CoreCommands.java
index e76b70dad..57685227f 100644
--- a/engine/src/main/java/org/terasology/logic/console/commands/CoreCommands.java
+++ b/engine/src/main/java/org/terasology/logic/console/commands/CoreCommands.java
@@ -1,71 +1,71 @@
-// Copyright 2020 The Terasology Foundation
+// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.logic.console.commands;
+package org.terasology.engine.logic.console.commands;
import com.google.common.collect.Ordering;
import com.google.common.collect.Streams;
import org.joml.Vector3f;
import org.terasology.assets.ResourceUrn;
import org.terasology.assets.management.AssetManager;
-import org.terasology.config.Config;
-import org.terasology.engine.GameEngine;
-import org.terasology.engine.SimpleUri;
-import org.terasology.engine.TerasologyConstants;
-import org.terasology.engine.Time;
-import org.terasology.engine.modes.StateLoading;
-import org.terasology.engine.modes.StateMainMenu;
-import org.terasology.engine.module.ModuleManager;
-import org.terasology.engine.paths.PathManager;
-import org.terasology.engine.subsystem.DisplayDevice;
-import org.terasology.entitySystem.Component;
-import org.terasology.entitySystem.entity.EntityManager;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.entitySystem.entity.internal.EngineEntityManager;
-import org.terasology.entitySystem.prefab.Prefab;
-import org.terasology.entitySystem.prefab.PrefabManager;
-import org.terasology.entitySystem.systems.BaseComponentSystem;
-import org.terasology.entitySystem.systems.RegisterSystem;
-import org.terasology.i18n.TranslationProject;
-import org.terasology.i18n.TranslationSystem;
-import org.terasology.logic.console.Console;
-import org.terasology.logic.console.ConsoleColors;
-import org.terasology.logic.console.commandSystem.ConsoleCommand;
-import org.terasology.logic.console.commandSystem.annotations.Command;
-import org.terasology.logic.console.commandSystem.annotations.CommandParam;
-import org.terasology.logic.console.commandSystem.annotations.Sender;
-import org.terasology.logic.console.suggesters.CommandNameSuggester;
-import org.terasology.logic.console.suggesters.ScreenSuggester;
-import org.terasology.logic.console.suggesters.SkinSuggester;
-import org.terasology.logic.inventory.events.DropItemEvent;
-import org.terasology.logic.location.LocationComponent;
-import org.terasology.logic.permission.PermissionManager;
-import org.terasology.math.Direction;
+import org.terasology.engine.config.Config;
+import org.terasology.engine.core.GameEngine;
+import org.terasology.engine.core.SimpleUri;
+import org.terasology.engine.core.TerasologyConstants;
+import org.terasology.engine.core.Time;
+import org.terasology.engine.core.modes.StateLoading;
+import org.terasology.engine.core.modes.StateMainMenu;
+import org.terasology.engine.core.module.ModuleManager;
+import org.terasology.engine.core.paths.PathManager;
+import org.terasology.engine.core.subsystem.DisplayDevice;
+import org.terasology.engine.entitySystem.Component;
+import org.terasology.engine.entitySystem.entity.EntityManager;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.entity.internal.EngineEntityManager;
+import org.terasology.engine.entitySystem.prefab.Prefab;
+import org.terasology.engine.entitySystem.prefab.PrefabManager;
+import org.terasology.engine.entitySystem.systems.BaseComponentSystem;
+import org.terasology.engine.entitySystem.systems.RegisterSystem;
+import org.terasology.engine.i18n.TranslationProject;
+import org.terasology.engine.i18n.TranslationSystem;
+import org.terasology.engine.logic.console.commandSystem.ConsoleCommand;
+import org.terasology.engine.logic.console.commandSystem.annotations.Command;
+import org.terasology.engine.logic.console.commandSystem.annotations.CommandParam;
+import org.terasology.engine.logic.console.commandSystem.annotations.Sender;
+import org.terasology.engine.logic.console.suggesters.CommandNameSuggester;
+import org.terasology.engine.logic.console.suggesters.ScreenSuggester;
+import org.terasology.engine.logic.console.suggesters.SkinSuggester;
+import org.terasology.engine.logic.inventory.events.DropItemEvent;
+import org.terasology.engine.logic.location.LocationComponent;
+import org.terasology.engine.logic.console.Console;
+import org.terasology.engine.logic.console.ConsoleColors;
+import org.terasology.engine.logic.permission.PermissionManager;
+import org.terasology.engine.math.Direction;
import org.terasology.naming.Name;
-import org.terasology.network.ClientComponent;
-import org.terasology.network.JoinStatus;
-import org.terasology.network.NetworkMode;
-import org.terasology.network.NetworkSystem;
-import org.terasology.network.PingService;
-import org.terasology.network.Server;
+import org.terasology.engine.network.ClientComponent;
+import org.terasology.engine.network.JoinStatus;
+import org.terasology.engine.network.NetworkMode;
+import org.terasology.engine.network.NetworkSystem;
+import org.terasology.engine.network.PingService;
+import org.terasology.engine.network.Server;
import org.terasology.nui.FontColor;
import org.terasology.nui.asset.UIElement;
import org.terasology.nui.skin.UISkin;
-import org.terasology.persistence.WorldDumper;
-import org.terasology.persistence.serializers.PrefabSerializer;
-import org.terasology.registry.In;
-import org.terasology.rendering.nui.NUIManager;
-import org.terasology.rendering.nui.editor.layers.NUIEditorScreen;
-import org.terasology.rendering.nui.editor.layers.NUISkinEditorScreen;
-import org.terasology.rendering.nui.editor.systems.NUIEditorSystem;
-import org.terasology.rendering.nui.editor.systems.NUISkinEditorSystem;
-import org.terasology.rendering.nui.layers.mainMenu.MessagePopup;
-import org.terasology.rendering.nui.layers.mainMenu.WaitPopup;
-import org.terasology.utilities.Assets;
-import org.terasology.world.block.BlockManager;
-import org.terasology.world.block.BlockUri;
-import org.terasology.world.block.family.BlockFamily;
-import org.terasology.world.block.items.BlockItemFactory;
-import org.terasology.world.block.loader.BlockFamilyDefinition;
+import org.terasology.engine.persistence.WorldDumper;
+import org.terasology.engine.persistence.serializers.PrefabSerializer;
+import org.terasology.engine.registry.In;
+import org.terasology.engine.rendering.nui.NUIManager;
+import org.terasology.engine.rendering.nui.editor.layers.NUIEditorScreen;
+import org.terasology.engine.rendering.nui.editor.layers.NUISkinEditorScreen;
+import org.terasology.engine.rendering.nui.editor.systems.NUIEditorSystem;
+import org.terasology.engine.rendering.nui.editor.systems.NUISkinEditorSystem;
+import org.terasology.engine.rendering.nui.layers.mainMenu.MessagePopup;
+import org.terasology.engine.rendering.nui.layers.mainMenu.WaitPopup;
+import org.terasology.engine.utilities.Assets;
+import org.terasology.engine.world.block.BlockManager;
+import org.terasology.engine.world.block.BlockUri;
+import org.terasology.engine.world.block.family.BlockFamily;
+import org.terasology.engine.world.block.items.BlockItemFactory;
+import org.terasology.engine.world.block.loader.BlockFamilyDefinition;
import java.io.IOException;
import java.net.UnknownHostException;
diff --git a/engine/src/main/java/org/terasology/logic/console/commands/ServerCommands.java b/engine/src/main/java/org/terasology/logic/console/commands/ServerCommands.java
index ba4f5aca9..57ce31d9d 100644
--- a/engine/src/main/java/org/terasology/logic/console/commands/ServerCommands.java
+++ b/engine/src/main/java/org/terasology/logic/console/commands/ServerCommands.java
@@ -1,45 +1,32 @@
-/*
- * Copyright 2014 MovingBlocks
- *
- * 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 org.terasology.logic.console.commands;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.console.commands;
import org.joml.Vector3i;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.terasology.config.Config;
-import org.terasology.engine.GameEngine;
-import org.terasology.entitySystem.entity.EntityManager;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.entitySystem.systems.BaseComponentSystem;
-import org.terasology.entitySystem.systems.RegisterSystem;
-import org.terasology.logic.common.DisplayNameComponent;
-import org.terasology.logic.console.Console;
-import org.terasology.logic.console.commandSystem.annotations.Command;
-import org.terasology.logic.console.commandSystem.annotations.CommandParam;
-import org.terasology.logic.console.commandSystem.annotations.Sender;
-import org.terasology.logic.console.suggesters.UsernameSuggester;
-import org.terasology.logic.permission.PermissionManager;
-import org.terasology.logic.players.PlayerUtil;
-import org.terasology.network.Client;
-import org.terasology.network.ClientComponent;
-import org.terasology.network.ClientInfoComponent;
-import org.terasology.network.NetworkComponent;
-import org.terasology.network.NetworkSystem;
-import org.terasology.persistence.StorageManager;
-import org.terasology.registry.In;
-import org.terasology.world.chunks.ChunkProvider;
+import org.terasology.engine.config.Config;
+import org.terasology.engine.core.GameEngine;
+import org.terasology.engine.entitySystem.entity.EntityManager;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.systems.BaseComponentSystem;
+import org.terasology.engine.entitySystem.systems.RegisterSystem;
+import org.terasology.engine.logic.console.commandSystem.annotations.Command;
+import org.terasology.engine.logic.console.commandSystem.annotations.CommandParam;
+import org.terasology.engine.logic.console.commandSystem.annotations.Sender;
+import org.terasology.engine.logic.console.suggesters.UsernameSuggester;
+import org.terasology.engine.logic.players.PlayerUtil;
+import org.terasology.engine.logic.common.DisplayNameComponent;
+import org.terasology.engine.logic.console.Console;
+import org.terasology.engine.logic.permission.PermissionManager;
+import org.terasology.engine.network.Client;
+import org.terasology.engine.network.ClientComponent;
+import org.terasology.engine.network.ClientInfoComponent;
+import org.terasology.engine.network.NetworkComponent;
+import org.terasology.engine.network.NetworkSystem;
+import org.terasology.engine.persistence.StorageManager;
+import org.terasology.engine.registry.In;
+import org.terasology.engine.world.chunks.ChunkProvider;
/**
* Commands to administer a remote server
diff --git a/engine/src/main/java/org/terasology/logic/console/commands/WorldCommands.java b/engine/src/main/java/org/terasology/logic/console/commands/WorldCommands.java
index 1b7db7c74..0bc375891 100644
--- a/engine/src/main/java/org/terasology/logic/console/commands/WorldCommands.java
+++ b/engine/src/main/java/org/terasology/logic/console/commands/WorldCommands.java
@@ -1,34 +1,21 @@
-/*
- * Copyright 2018 MovingBlocks
- *
- * 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 org.terasology.logic.console.commands;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.console.commands;
-import org.terasology.entitySystem.entity.EntityManager;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.entitySystem.entity.internal.EngineEntityPool;
-import org.terasology.entitySystem.systems.BaseComponentSystem;
-import org.terasology.entitySystem.systems.RegisterSystem;
-import org.terasology.logic.chat.ChatMessageEvent;
-import org.terasology.logic.common.DisplayNameComponent;
-import org.terasology.logic.console.commandSystem.annotations.Command;
-import org.terasology.logic.console.commandSystem.annotations.CommandParam;
-import org.terasology.logic.console.commandSystem.annotations.Sender;
-import org.terasology.network.ColorComponent;
+import org.terasology.engine.entitySystem.entity.EntityManager;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.entity.internal.EngineEntityPool;
+import org.terasology.engine.entitySystem.systems.BaseComponentSystem;
+import org.terasology.engine.entitySystem.systems.RegisterSystem;
+import org.terasology.engine.logic.console.commandSystem.annotations.Command;
+import org.terasology.engine.logic.console.commandSystem.annotations.CommandParam;
+import org.terasology.engine.logic.console.commandSystem.annotations.Sender;
+import org.terasology.engine.logic.chat.ChatMessageEvent;
+import org.terasology.engine.logic.common.DisplayNameComponent;
+import org.terasology.engine.network.ColorComponent;
import org.terasology.nui.Color;
-import org.terasology.registry.In;
-import org.terasology.world.internal.WorldInfo;
+import org.terasology.engine.registry.In;
+import org.terasology.engine.world.internal.WorldInfo;
import java.util.Map;
diff --git a/engine/src/main/java/org/terasology/logic/console/package-info.java b/engine/src/main/java/org/terasology/logic/console/package-info.java
index adbe397e7..b1b1edf6c 100644
--- a/engine/src/main/java/org/terasology/logic/console/package-info.java
+++ b/engine/src/main/java/org/terasology/logic/console/package-info.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-@API package org.terasology.logic.console;
+@API package org.terasology.engine.logic.console;
import org.terasology.module.sandbox.API;
diff --git a/engine/src/main/java/org/terasology/logic/console/suggesters/AssetSuggester.java b/engine/src/main/java/org/terasology/logic/console/suggesters/AssetSuggester.java
index ee636c454..fce9c9730 100644
--- a/engine/src/main/java/org/terasology/logic/console/suggesters/AssetSuggester.java
+++ b/engine/src/main/java/org/terasology/logic/console/suggesters/AssetSuggester.java
@@ -1,27 +1,14 @@
-/*
- * Copyright 2016 MovingBlocks
- *
- * 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 org.terasology.logic.console.suggesters;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.console.suggesters;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
import org.terasology.assets.Asset;
import org.terasology.assets.ResourceUrn;
import org.terasology.assets.management.AssetManager;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.logic.console.commandSystem.CommandParameterSuggester;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.logic.console.commandSystem.CommandParameterSuggester;
import java.util.Map;
import java.util.Set;
diff --git a/engine/src/main/java/org/terasology/logic/console/suggesters/BlockFamilySuggester.java b/engine/src/main/java/org/terasology/logic/console/suggesters/BlockFamilySuggester.java
index d71b66b92..17ec9011f 100644
--- a/engine/src/main/java/org/terasology/logic/console/suggesters/BlockFamilySuggester.java
+++ b/engine/src/main/java/org/terasology/logic/console/suggesters/BlockFamilySuggester.java
@@ -1,26 +1,13 @@
-/*
- * Copyright 2014 MovingBlocks
- *
- * 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 org.terasology.logic.console.suggesters;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.console.suggesters;
import com.google.common.collect.Sets;
import org.terasology.assets.ResourceUrn;
import org.terasology.assets.management.AssetManager;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.logic.console.commandSystem.CommandParameterSuggester;
-import org.terasology.world.block.loader.BlockFamilyDefinition;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.logic.console.commandSystem.CommandParameterSuggester;
+import org.terasology.engine.world.block.loader.BlockFamilyDefinition;
import java.util.Set;
diff --git a/engine/src/main/java/org/terasology/logic/console/suggesters/CommandNameSuggester.java b/engine/src/main/java/org/terasology/logic/console/suggesters/CommandNameSuggester.java
index c98ec4b96..0a301d612 100644
--- a/engine/src/main/java/org/terasology/logic/console/suggesters/CommandNameSuggester.java
+++ b/engine/src/main/java/org/terasology/logic/console/suggesters/CommandNameSuggester.java
@@ -1,25 +1,12 @@
-/*
- * Copyright 2014 MovingBlocks
- *
- * 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 org.terasology.logic.console.suggesters;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.console.suggesters;
import com.google.common.collect.Sets;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.logic.console.Console;
-import org.terasology.logic.console.commandSystem.CommandParameterSuggester;
-import org.terasology.logic.console.commandSystem.ConsoleCommand;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.logic.console.commandSystem.CommandParameterSuggester;
+import org.terasology.engine.logic.console.commandSystem.ConsoleCommand;
+import org.terasology.engine.logic.console.Console;
import org.terasology.naming.Name;
import java.util.Collection;
diff --git a/engine/src/main/java/org/terasology/logic/console/suggesters/OnlineUsernameSuggester.java b/engine/src/main/java/org/terasology/logic/console/suggesters/OnlineUsernameSuggester.java
index 482663bc3..c85ca5036 100644
--- a/engine/src/main/java/org/terasology/logic/console/suggesters/OnlineUsernameSuggester.java
+++ b/engine/src/main/java/org/terasology/logic/console/suggesters/OnlineUsernameSuggester.java
@@ -1,26 +1,13 @@
-/*
- * Copyright 2014 MovingBlocks
- *
- * 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 org.terasology.logic.console.suggesters;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.console.suggesters;
import com.google.common.collect.Sets;
-import org.terasology.entitySystem.entity.EntityManager;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.logic.common.DisplayNameComponent;
-import org.terasology.logic.console.commandSystem.CommandParameterSuggester;
-import org.terasology.network.ClientComponent;
+import org.terasology.engine.entitySystem.entity.EntityManager;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.logic.console.commandSystem.CommandParameterSuggester;
+import org.terasology.engine.logic.common.DisplayNameComponent;
+import org.terasology.engine.network.ClientComponent;
import java.util.Set;
diff --git a/engine/src/main/java/org/terasology/logic/console/suggesters/PrefabSuggester.java b/engine/src/main/java/org/terasology/logic/console/suggesters/PrefabSuggester.java
index 3f98df649..ece0d5215 100644
--- a/engine/src/main/java/org/terasology/logic/console/suggesters/PrefabSuggester.java
+++ b/engine/src/main/java/org/terasology/logic/console/suggesters/PrefabSuggester.java
@@ -1,25 +1,12 @@
-/*
- * Copyright 2014 MovingBlocks
- *
- * 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 org.terasology.logic.console.suggesters;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.console.suggesters;
import com.google.common.collect.Sets;
import org.terasology.assets.management.AssetManager;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.entitySystem.prefab.Prefab;
-import org.terasology.logic.console.commandSystem.CommandParameterSuggester;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.prefab.Prefab;
+import org.terasology.engine.logic.console.commandSystem.CommandParameterSuggester;
import java.util.Set;
diff --git a/engine/src/main/java/org/terasology/logic/console/suggesters/ScreenSuggester.java b/engine/src/main/java/org/terasology/logic/console/suggesters/ScreenSuggester.java
index 12addda01..cf48e2041 100644
--- a/engine/src/main/java/org/terasology/logic/console/suggesters/ScreenSuggester.java
+++ b/engine/src/main/java/org/terasology/logic/console/suggesters/ScreenSuggester.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2016 MovingBlocks
- *
- * 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 org.terasology.logic.console.suggesters;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.console.suggesters;
import org.terasology.assets.management.AssetManager;
import org.terasology.nui.asset.UIElement;
diff --git a/engine/src/main/java/org/terasology/logic/console/suggesters/SkinSuggester.java b/engine/src/main/java/org/terasology/logic/console/suggesters/SkinSuggester.java
index 024785a97..c4cf70691 100644
--- a/engine/src/main/java/org/terasology/logic/console/suggesters/SkinSuggester.java
+++ b/engine/src/main/java/org/terasology/logic/console/suggesters/SkinSuggester.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2016 MovingBlocks
- *
- * 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 org.terasology.logic.console.suggesters;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.console.suggesters;
import org.terasology.assets.management.AssetManager;
import org.terasology.nui.skin.UISkin;
diff --git a/engine/src/main/java/org/terasology/logic/console/suggesters/UsernameSuggester.java b/engine/src/main/java/org/terasology/logic/console/suggesters/UsernameSuggester.java
index 70208c94e..bf4920007 100644
--- a/engine/src/main/java/org/terasology/logic/console/suggesters/UsernameSuggester.java
+++ b/engine/src/main/java/org/terasology/logic/console/suggesters/UsernameSuggester.java
@@ -1,26 +1,13 @@
-/*
- * Copyright 2015 MovingBlocks
- *
- * 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 org.terasology.logic.console.suggesters;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.console.suggesters;
import com.google.common.collect.Sets;
-import org.terasology.entitySystem.entity.EntityManager;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.logic.common.DisplayNameComponent;
-import org.terasology.logic.console.commandSystem.CommandParameterSuggester;
-import org.terasology.network.ClientInfoComponent;
+import org.terasology.engine.entitySystem.entity.EntityManager;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.logic.console.commandSystem.CommandParameterSuggester;
+import org.terasology.engine.logic.common.DisplayNameComponent;
+import org.terasology.engine.network.ClientInfoComponent;
import java.util.Set;
diff --git a/engine/src/main/java/org/terasology/logic/console/suggesters/package-info.java b/engine/src/main/java/org/terasology/logic/console/suggesters/package-info.java
index 9335ec9b4..0b3fdaea2 100644
--- a/engine/src/main/java/org/terasology/logic/console/suggesters/package-info.java
+++ b/engine/src/main/java/org/terasology/logic/console/suggesters/package-info.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2014 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-@API package org.terasology.logic.console.suggesters;
+@API package org.terasology.engine.logic.console.suggesters;
import org.terasology.module.sandbox.API;
diff --git a/engine/src/main/java/org/terasology/logic/console/ui/ChatScreen.java b/engine/src/main/java/org/terasology/logic/console/ui/ChatScreen.java
index 90e9a73ba..433eb669d 100644
--- a/engine/src/main/java/org/terasology/logic/console/ui/ChatScreen.java
+++ b/engine/src/main/java/org/terasology/logic/console/ui/ChatScreen.java
@@ -1,32 +1,19 @@
-/*
- * Copyright 2014 MovingBlocks
- *
- * 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 org.terasology.logic.console.ui;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.console.ui;
import org.codehaus.plexus.util.StringUtils;
+import org.terasology.engine.logic.players.LocalPlayer;
import org.terasology.input.MouseInput;
-import org.terasology.logic.console.Console;
-import org.terasology.logic.console.CoreMessageType;
-import org.terasology.logic.console.Message;
-import org.terasology.logic.players.LocalPlayer;
+import org.terasology.engine.logic.console.Console;
+import org.terasology.engine.logic.console.CoreMessageType;
+import org.terasology.engine.logic.console.Message;
import org.terasology.naming.Name;
import org.terasology.nui.BaseInteractionListener;
import org.terasology.nui.InteractionListener;
-import org.terasology.registry.In;
-import org.terasology.rendering.nui.CoreScreenLayer;
-import org.terasology.rendering.nui.NUIManager;
+import org.terasology.engine.registry.In;
+import org.terasology.engine.rendering.nui.CoreScreenLayer;
+import org.terasology.engine.rendering.nui.NUIManager;
import org.terasology.nui.databinding.ReadOnlyBinding;
import org.terasology.nui.events.NUIMouseClickEvent;
import org.terasology.nui.layouts.ScrollableArea;
diff --git a/engine/src/main/java/org/terasology/logic/console/ui/ConsoleScreen.java b/engine/src/main/java/org/terasology/logic/console/ui/ConsoleScreen.java
index e9e43d47b..e8a2c5194 100644
--- a/engine/src/main/java/org/terasology/logic/console/ui/ConsoleScreen.java
+++ b/engine/src/main/java/org/terasology/logic/console/ui/ConsoleScreen.java
@@ -1,32 +1,19 @@
-/*
- * Copyright 2016 MovingBlocks
- *
- * 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 org.terasology.logic.console.ui;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.console.ui;
import org.codehaus.plexus.util.StringUtils;
+import org.terasology.engine.logic.players.LocalPlayer;
import org.terasology.input.MouseInput;
-import org.terasology.logic.console.Console;
-import org.terasology.logic.console.Message;
-import org.terasology.logic.players.LocalPlayer;
+import org.terasology.engine.logic.console.Console;
+import org.terasology.engine.logic.console.Message;
import org.terasology.nui.BaseInteractionListener;
import org.terasology.nui.InteractionListener;
-import org.terasology.registry.In;
+import org.terasology.engine.registry.In;
import org.terasology.nui.FontColor;
-import org.terasology.rendering.nui.CoreScreenLayer;
-import org.terasology.rendering.nui.animation.SwipeMenuAnimationSystem;
-import org.terasology.rendering.nui.animation.SwipeMenuAnimationSystem.Direction;
+import org.terasology.engine.rendering.nui.CoreScreenLayer;
+import org.terasology.engine.rendering.nui.animation.SwipeMenuAnimationSystem;
+import org.terasology.engine.rendering.nui.animation.SwipeMenuAnimationSystem.Direction;
import org.terasology.nui.databinding.ReadOnlyBinding;
import org.terasology.nui.events.NUIMouseClickEvent;
import org.terasology.nui.layouts.ScrollableArea;
diff --git a/engine/src/main/java/org/terasology/logic/console/ui/CyclingTabCompletionEngine.java b/engine/src/main/java/org/terasology/logic/console/ui/CyclingTabCompletionEngine.java
index b10f82170..7eb37cf9a 100644
--- a/engine/src/main/java/org/terasology/logic/console/ui/CyclingTabCompletionEngine.java
+++ b/engine/src/main/java/org/terasology/logic/console/ui/CyclingTabCompletionEngine.java
@@ -1,34 +1,21 @@
-/*
- * Copyright 2014 MovingBlocks
- *
- * 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 org.terasology.logic.console.ui;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.console.ui;
import com.google.common.collect.Collections2;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.logic.console.Console;
-import org.terasology.logic.console.ConsoleColors;
-import org.terasology.logic.console.CoreMessageType;
-import org.terasology.logic.console.Message;
-import org.terasology.logic.console.commandSystem.ConsoleCommand;
-import org.terasology.logic.console.commandSystem.exceptions.CommandSuggestionException;
-import org.terasology.logic.players.LocalPlayer;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.logic.console.commandSystem.ConsoleCommand;
+import org.terasology.engine.logic.console.commandSystem.exceptions.CommandSuggestionException;
+import org.terasology.engine.logic.players.LocalPlayer;
+import org.terasology.engine.logic.console.Console;
+import org.terasology.engine.logic.console.ConsoleColors;
+import org.terasology.engine.logic.console.CoreMessageType;
+import org.terasology.engine.logic.console.Message;
import org.terasology.naming.Name;
import org.terasology.nui.FontColor;
-import org.terasology.utilities.CamelCaseMatcher;
+import org.terasology.engine.utilities.CamelCaseMatcher;
import java.util.Collection;
import java.util.Collections;
diff --git a/engine/src/main/java/org/terasology/logic/console/ui/NotificationOverlay.java b/engine/src/main/java/org/terasology/logic/console/ui/NotificationOverlay.java
index f361915d6..78f3da3d6 100644
--- a/engine/src/main/java/org/terasology/logic/console/ui/NotificationOverlay.java
+++ b/engine/src/main/java/org/terasology/logic/console/ui/NotificationOverlay.java
@@ -1,29 +1,16 @@
-/*
- * Copyright 2016 MovingBlocks
- *
- * 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 org.terasology.logic.console.ui;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.console.ui;
import com.google.common.collect.Iterables;
import org.codehaus.plexus.util.StringUtils;
import org.terasology.assets.ResourceUrn;
-import org.terasology.logic.console.Console;
-import org.terasology.logic.console.CoreMessageType;
-import org.terasology.logic.console.Message;
+import org.terasology.engine.logic.console.Console;
+import org.terasology.engine.logic.console.CoreMessageType;
+import org.terasology.engine.logic.console.Message;
import org.terasology.nui.Canvas;
-import org.terasology.registry.In;
-import org.terasology.rendering.nui.CoreScreenLayer;
+import org.terasology.engine.registry.In;
+import org.terasology.engine.rendering.nui.CoreScreenLayer;
import org.terasology.nui.databinding.ReadOnlyBinding;
import org.terasology.nui.widgets.UILabel;
diff --git a/engine/src/main/java/org/terasology/logic/console/ui/TabCompletionEngine.java b/engine/src/main/java/org/terasology/logic/console/ui/TabCompletionEngine.java
index 179a0bf3c..2dea13091 100644
--- a/engine/src/main/java/org/terasology/logic/console/ui/TabCompletionEngine.java
+++ b/engine/src/main/java/org/terasology/logic/console/ui/TabCompletionEngine.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2014 MovingBlocks
- *
- * 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 org.terasology.logic.console.ui;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.console.ui;
/**
*/
diff --git a/engine/src/main/java/org/terasology/logic/console/ui/UICommandEntry.java b/engine/src/main/java/org/terasology/logic/console/ui/UICommandEntry.java
index c1b694cfc..62d4ec014 100644
--- a/engine/src/main/java/org/terasology/logic/console/ui/UICommandEntry.java
+++ b/engine/src/main/java/org/terasology/logic/console/ui/UICommandEntry.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2014 MovingBlocks
- *
- * 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 org.terasology.logic.console.ui;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.console.ui;
import com.google.common.collect.Lists;
import org.terasology.input.Keyboard;
diff --git a/engine/src/main/java/org/terasology/logic/debug/ChunkEventErrorLogger.java b/engine/src/main/java/org/terasology/logic/debug/ChunkEventErrorLogger.java
index 152337836..404d43563 100644
--- a/engine/src/main/java/org/terasology/logic/debug/ChunkEventErrorLogger.java
+++ b/engine/src/main/java/org/terasology/logic/debug/ChunkEventErrorLogger.java
@@ -1,31 +1,18 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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 org.terasology.logic.debug;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.debug;
import com.google.common.collect.Sets;
import org.joml.Vector3ic;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.entitySystem.event.ReceiveEvent;
-import org.terasology.entitySystem.systems.BaseComponentSystem;
-import org.terasology.entitySystem.systems.RegisterSystem;
-import org.terasology.world.WorldComponent;
-import org.terasology.world.chunks.event.BeforeChunkUnload;
-import org.terasology.world.chunks.event.OnChunkLoaded;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.event.ReceiveEvent;
+import org.terasology.engine.entitySystem.systems.BaseComponentSystem;
+import org.terasology.engine.entitySystem.systems.RegisterSystem;
+import org.terasology.engine.world.WorldComponent;
+import org.terasology.engine.world.chunks.event.BeforeChunkUnload;
+import org.terasology.engine.world.chunks.event.OnChunkLoaded;
import java.util.Set;
diff --git a/engine/src/main/java/org/terasology/logic/debug/DebugProperties.java b/engine/src/main/java/org/terasology/logic/debug/DebugProperties.java
index 138578fdc..7929fc812 100644
--- a/engine/src/main/java/org/terasology/logic/debug/DebugProperties.java
+++ b/engine/src/main/java/org/terasology/logic/debug/DebugProperties.java
@@ -1,21 +1,8 @@
-/*
- * Copyright 2014 MovingBlocks
- *
- * 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 org.terasology.logic.debug;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.debug;
-import org.terasology.rendering.nui.layers.hud.CoreHudWidget;
+import org.terasology.engine.rendering.nui.layers.hud.CoreHudWidget;
import org.terasology.nui.layouts.ColumnLayout;
import org.terasology.nui.layouts.PropertyLayout;
diff --git a/engine/src/main/java/org/terasology/logic/debug/DebugPropertiesSystem.java b/engine/src/main/java/org/terasology/logic/debug/DebugPropertiesSystem.java
index c7174eb20..237b525a0 100644
--- a/engine/src/main/java/org/terasology/logic/debug/DebugPropertiesSystem.java
+++ b/engine/src/main/java/org/terasology/logic/debug/DebugPropertiesSystem.java
@@ -1,29 +1,16 @@
-/*
- * Copyright 2014 MovingBlocks
- *
- * 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 org.terasology.logic.debug;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.debug;
-import org.terasology.entitySystem.systems.BaseComponentSystem;
-import org.terasology.entitySystem.systems.RegisterMode;
-import org.terasology.entitySystem.systems.RegisterSystem;
+import org.terasology.engine.entitySystem.systems.BaseComponentSystem;
+import org.terasology.engine.entitySystem.systems.RegisterMode;
+import org.terasology.engine.entitySystem.systems.RegisterSystem;
import org.terasology.module.sandbox.API;
import org.terasology.nui.properties.OneOfProviderFactory;
import org.terasology.reflection.reflect.ReflectFactory;
-import org.terasology.registry.In;
-import org.terasology.registry.Share;
-import org.terasology.rendering.nui.NUIManager;
+import org.terasology.engine.registry.In;
+import org.terasology.engine.registry.Share;
+import org.terasology.engine.rendering.nui.NUIManager;
import org.terasology.nui.layouts.PropertyLayout;
import org.terasology.nui.properties.PropertyProvider;
diff --git a/engine/src/main/java/org/terasology/logic/debug/MovementDebugCommands.java b/engine/src/main/java/org/terasology/logic/debug/MovementDebugCommands.java
index 76a86c824..05f610ecd 100644
--- a/engine/src/main/java/org/terasology/logic/debug/MovementDebugCommands.java
+++ b/engine/src/main/java/org/terasology/logic/debug/MovementDebugCommands.java
@@ -1,50 +1,37 @@
-/*
- * Copyright 2016 MovingBlocks
- *
- * 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 org.terasology.logic.debug;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.debug;
import org.joml.Quaternionf;
import org.joml.Vector3f;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.terasology.assets.ResourceUrn;
-import org.terasology.config.Config;
-import org.terasology.entitySystem.entity.EntityManager;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.entitySystem.prefab.Prefab;
-import org.terasology.entitySystem.systems.BaseComponentSystem;
-import org.terasology.entitySystem.systems.RegisterSystem;
-import org.terasology.logic.characters.CharacterImpulseEvent;
-import org.terasology.logic.characters.CharacterMovementComponent;
-import org.terasology.logic.characters.CharacterTeleportEvent;
-import org.terasology.logic.characters.GazeMountPointComponent;
-import org.terasology.logic.characters.MovementMode;
-import org.terasology.logic.characters.events.ScaleToRequest;
-import org.terasology.logic.characters.events.SetMovementModeEvent;
-import org.terasology.logic.common.DisplayNameComponent;
-import org.terasology.logic.console.commandSystem.annotations.Command;
-import org.terasology.logic.console.commandSystem.annotations.CommandParam;
-import org.terasology.logic.console.commandSystem.annotations.Sender;
-import org.terasology.logic.location.Location;
-import org.terasology.logic.location.LocationComponent;
-import org.terasology.logic.permission.PermissionManager;
-import org.terasology.network.ClientComponent;
-import org.terasology.physics.engine.PhysicsEngine;
-import org.terasology.registry.In;
-import org.terasology.registry.Share;
-import org.terasology.utilities.Assets;
+import org.terasology.engine.config.Config;
+import org.terasology.engine.entitySystem.entity.EntityManager;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.prefab.Prefab;
+import org.terasology.engine.entitySystem.systems.BaseComponentSystem;
+import org.terasology.engine.entitySystem.systems.RegisterSystem;
+import org.terasology.engine.logic.characters.CharacterImpulseEvent;
+import org.terasology.engine.logic.characters.CharacterMovementComponent;
+import org.terasology.engine.logic.characters.CharacterTeleportEvent;
+import org.terasology.engine.logic.characters.MovementMode;
+import org.terasology.engine.logic.common.DisplayNameComponent;
+import org.terasology.engine.logic.console.commandSystem.annotations.Command;
+import org.terasology.engine.logic.console.commandSystem.annotations.CommandParam;
+import org.terasology.engine.logic.console.commandSystem.annotations.Sender;
+import org.terasology.engine.logic.location.Location;
+import org.terasology.engine.logic.location.LocationComponent;
+import org.terasology.engine.logic.characters.GazeMountPointComponent;
+import org.terasology.engine.logic.characters.events.ScaleToRequest;
+import org.terasology.engine.logic.characters.events.SetMovementModeEvent;
+import org.terasology.engine.logic.permission.PermissionManager;
+import org.terasology.engine.network.ClientComponent;
+import org.terasology.engine.physics.engine.PhysicsEngine;
+import org.terasology.engine.registry.In;
+import org.terasology.engine.registry.Share;
+import org.terasology.engine.utilities.Assets;
import java.util.Optional;
diff --git a/engine/src/main/java/org/terasology/logic/delay/DelayManager.java b/engine/src/main/java/org/terasology/logic/delay/DelayManager.java
index 16d0f09fe..208b33a93 100644
--- a/engine/src/main/java/org/terasology/logic/delay/DelayManager.java
+++ b/engine/src/main/java/org/terasology/logic/delay/DelayManager.java
@@ -1,21 +1,8 @@
-/*
- * Copyright 2014 MovingBlocks
- *
- * 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 org.terasology.logic.delay;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.delay;
-import org.terasology.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.entity.EntityRef;
/**
* Delayed action allows you to schedule a one-off event being sent to this entity after the specified delay time
diff --git a/engine/src/main/java/org/terasology/logic/delay/DelayedActionComponent.java b/engine/src/main/java/org/terasology/logic/delay/DelayedActionComponent.java
index 18801df75..c3595f7df 100644
--- a/engine/src/main/java/org/terasology/logic/delay/DelayedActionComponent.java
+++ b/engine/src/main/java/org/terasology/logic/delay/DelayedActionComponent.java
@@ -1,22 +1,9 @@
-/*
- * Copyright 2014 MovingBlocks
- *
- * 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 org.terasology.logic.delay;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.delay;
-import org.terasology.entitySystem.Component;
-import org.terasology.world.block.ForceBlockActive;
+import org.terasology.engine.entitySystem.Component;
+import org.terasology.engine.world.block.ForceBlockActive;
import java.util.HashMap;
import java.util.HashSet;
diff --git a/engine/src/main/java/org/terasology/logic/delay/DelayedActionSystem.java b/engine/src/main/java/org/terasology/logic/delay/DelayedActionSystem.java
index 7bca306df..5408a6ab5 100644
--- a/engine/src/main/java/org/terasology/logic/delay/DelayedActionSystem.java
+++ b/engine/src/main/java/org/terasology/logic/delay/DelayedActionSystem.java
@@ -1,36 +1,23 @@
-/*
- * Copyright 2018 MovingBlocks
- *
- * 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 org.terasology.logic.delay;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.delay;
import com.google.common.collect.Ordering;
import com.google.common.collect.SortedSetMultimap;
import com.google.common.collect.TreeMultimap;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.terasology.engine.Time;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.entitySystem.entity.lifecycleEvents.BeforeDeactivateComponent;
-import org.terasology.entitySystem.entity.lifecycleEvents.OnActivatedComponent;
-import org.terasology.entitySystem.event.ReceiveEvent;
-import org.terasology.entitySystem.systems.BaseComponentSystem;
-import org.terasology.entitySystem.systems.RegisterMode;
-import org.terasology.entitySystem.systems.RegisterSystem;
-import org.terasology.entitySystem.systems.UpdateSubscriberSystem;
-import org.terasology.registry.In;
-import org.terasology.registry.Share;
+import org.terasology.engine.core.Time;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.entity.lifecycleEvents.BeforeDeactivateComponent;
+import org.terasology.engine.entitySystem.entity.lifecycleEvents.OnActivatedComponent;
+import org.terasology.engine.entitySystem.event.ReceiveEvent;
+import org.terasology.engine.entitySystem.systems.BaseComponentSystem;
+import org.terasology.engine.entitySystem.systems.RegisterMode;
+import org.terasology.engine.entitySystem.systems.RegisterSystem;
+import org.terasology.engine.entitySystem.systems.UpdateSubscriberSystem;
+import org.terasology.engine.registry.In;
+import org.terasology.engine.registry.Share;
import java.util.Iterator;
import java.util.LinkedList;
diff --git a/engine/src/main/java/org/terasology/logic/delay/DelayedActionTriggeredEvent.java b/engine/src/main/java/org/terasology/logic/delay/DelayedActionTriggeredEvent.java
index 01e155c16..8eee7a8d7 100644
--- a/engine/src/main/java/org/terasology/logic/delay/DelayedActionTriggeredEvent.java
+++ b/engine/src/main/java/org/terasology/logic/delay/DelayedActionTriggeredEvent.java
@@ -1,21 +1,8 @@
-/*
- * Copyright 2014 MovingBlocks
- *
- * 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 org.terasology.logic.delay;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.delay;
-import org.terasology.entitySystem.event.Event;
+import org.terasology.engine.entitySystem.event.Event;
/**
*/
diff --git a/engine/src/main/java/org/terasology/logic/delay/PeriodicActionComponent.java b/engine/src/main/java/org/terasology/logic/delay/PeriodicActionComponent.java
index 82ca366f1..22379ff54 100644
--- a/engine/src/main/java/org/terasology/logic/delay/PeriodicActionComponent.java
+++ b/engine/src/main/java/org/terasology/logic/delay/PeriodicActionComponent.java
@@ -1,22 +1,9 @@
-/*
- * Copyright 2014 MovingBlocks
- *
- * 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 org.terasology.logic.delay;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.delay;
-import org.terasology.entitySystem.Component;
-import org.terasology.world.block.ForceBlockActive;
+import org.terasology.engine.entitySystem.Component;
+import org.terasology.engine.world.block.ForceBlockActive;
import java.util.HashMap;
import java.util.HashSet;
diff --git a/engine/src/main/java/org/terasology/logic/delay/PeriodicActionTriggeredEvent.java b/engine/src/main/java/org/terasology/logic/delay/PeriodicActionTriggeredEvent.java
index 10b494876..13ed31c54 100644
--- a/engine/src/main/java/org/terasology/logic/delay/PeriodicActionTriggeredEvent.java
+++ b/engine/src/main/java/org/terasology/logic/delay/PeriodicActionTriggeredEvent.java
@@ -1,21 +1,8 @@
-/*
- * Copyright 2014 MovingBlocks
- *
- * 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 org.terasology.logic.delay;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.delay;
-import org.terasology.entitySystem.event.Event;
+import org.terasology.engine.entitySystem.event.Event;
/**
*/
diff --git a/engine/src/main/java/org/terasology/logic/delay/package-info.java b/engine/src/main/java/org/terasology/logic/delay/package-info.java
index a9bc33ab8..332fe3c5f 100644
--- a/engine/src/main/java/org/terasology/logic/delay/package-info.java
+++ b/engine/src/main/java/org/terasology/logic/delay/package-info.java
@@ -1,18 +1,5 @@
-/*
- * Copyright 2014 MovingBlocks
- *
- * 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.
- */
-@API package org.terasology.logic.delay;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+@API package org.terasology.engine.logic.delay;
import org.terasology.module.sandbox.API;
diff --git a/engine/src/main/java/org/terasology/logic/health/BeforeDestroyEvent.java b/engine/src/main/java/org/terasology/logic/health/BeforeDestroyEvent.java
index ba653b992..581c4bb49 100644
--- a/engine/src/main/java/org/terasology/logic/health/BeforeDestroyEvent.java
+++ b/engine/src/main/java/org/terasology/logic/health/BeforeDestroyEvent.java
@@ -1,23 +1,10 @@
-/*
- * Copyright 2014 MovingBlocks
- *
- * 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 org.terasology.logic.health;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.health;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.entitySystem.event.AbstractConsumableEvent;
-import org.terasology.entitySystem.prefab.Prefab;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.event.AbstractConsumableEvent;
+import org.terasology.engine.entitySystem.prefab.Prefab;
/**
*/
diff --git a/engine/src/main/java/org/terasology/logic/health/DestroyEvent.java b/engine/src/main/java/org/terasology/logic/health/DestroyEvent.java
index ac50fa3e2..f96eace94 100644
--- a/engine/src/main/java/org/terasology/logic/health/DestroyEvent.java
+++ b/engine/src/main/java/org/terasology/logic/health/DestroyEvent.java
@@ -1,23 +1,10 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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 org.terasology.logic.health;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.health;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.entitySystem.event.Event;
-import org.terasology.entitySystem.prefab.Prefab;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.event.Event;
+import org.terasology.engine.entitySystem.prefab.Prefab;
/**
* Sent to request the destruction of an entity.
diff --git a/engine/src/main/java/org/terasology/logic/health/DoDestroyEvent.java b/engine/src/main/java/org/terasology/logic/health/DoDestroyEvent.java
index 8cbfeabff..2a777581a 100644
--- a/engine/src/main/java/org/terasology/logic/health/DoDestroyEvent.java
+++ b/engine/src/main/java/org/terasology/logic/health/DoDestroyEvent.java
@@ -1,23 +1,10 @@
-/*
- * Copyright 2014 MovingBlocks
- *
- * 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 org.terasology.logic.health;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.health;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.entitySystem.event.Event;
-import org.terasology.entitySystem.prefab.Prefab;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.event.Event;
+import org.terasology.engine.entitySystem.prefab.Prefab;
/**
* Sent when the entity is destroyed.
diff --git a/engine/src/main/java/org/terasology/logic/health/EngineDamageTypes.java b/engine/src/main/java/org/terasology/logic/health/EngineDamageTypes.java
index b438c93f6..bd3f9e223 100644
--- a/engine/src/main/java/org/terasology/logic/health/EngineDamageTypes.java
+++ b/engine/src/main/java/org/terasology/logic/health/EngineDamageTypes.java
@@ -1,22 +1,9 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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 org.terasology.logic.health;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.health;
-import org.terasology.utilities.Assets;
-import org.terasology.entitySystem.prefab.Prefab;
+import org.terasology.engine.utilities.Assets;
+import org.terasology.engine.entitySystem.prefab.Prefab;
/**
* Helper enum for getting engine damage type prefabs.
diff --git a/engine/src/main/java/org/terasology/logic/health/EntityDestructionAuthoritySystem.java b/engine/src/main/java/org/terasology/logic/health/EntityDestructionAuthoritySystem.java
index b17808143..f8a072fc0 100644
--- a/engine/src/main/java/org/terasology/logic/health/EntityDestructionAuthoritySystem.java
+++ b/engine/src/main/java/org/terasology/logic/health/EntityDestructionAuthoritySystem.java
@@ -1,28 +1,15 @@
-/*
- * Copyright 2016 MovingBlocks
- *
- * 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 org.terasology.logic.health;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.health;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.entitySystem.event.ReceiveEvent;
-import org.terasology.entitySystem.systems.BaseComponentSystem;
-import org.terasology.entitySystem.systems.RegisterMode;
-import org.terasology.entitySystem.systems.RegisterSystem;
-import org.terasology.logic.characters.CharacterComponent;
-import org.terasology.telemetry.GamePlayStatsComponent;
-import org.terasology.world.block.BlockComponent;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.event.ReceiveEvent;
+import org.terasology.engine.entitySystem.systems.BaseComponentSystem;
+import org.terasology.engine.entitySystem.systems.RegisterMode;
+import org.terasology.engine.entitySystem.systems.RegisterSystem;
+import org.terasology.engine.logic.characters.CharacterComponent;
+import org.terasology.engine.telemetry.GamePlayStatsComponent;
+import org.terasology.engine.world.block.BlockComponent;
import java.util.Map;
diff --git a/engine/src/main/java/org/terasology/logic/health/package-info.java b/engine/src/main/java/org/terasology/logic/health/package-info.java
index f09923a7a..3cf79c3c1 100644
--- a/engine/src/main/java/org/terasology/logic/health/package-info.java
+++ b/engine/src/main/java/org/terasology/logic/health/package-info.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-@API package org.terasology.logic.health;
+@API package org.terasology.engine.logic.health;
import org.terasology.module.sandbox.API;
diff --git a/engine/src/main/java/org/terasology/logic/inventory/ItemCommonSystem.java b/engine/src/main/java/org/terasology/logic/inventory/ItemCommonSystem.java
index 35283296a..56972e050 100644
--- a/engine/src/main/java/org/terasology/logic/inventory/ItemCommonSystem.java
+++ b/engine/src/main/java/org/terasology/logic/inventory/ItemCommonSystem.java
@@ -1,36 +1,23 @@
-/*
- * Copyright 2015 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.logic.inventory;
+package org.terasology.engine.logic.inventory;
-import org.terasology.entitySystem.MutableComponentContainer;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.entitySystem.entity.lifecycleEvents.OnActivatedComponent;
-import org.terasology.entitySystem.entity.lifecycleEvents.OnChangedComponent;
-import org.terasology.entitySystem.event.ReceiveEvent;
-import org.terasology.entitySystem.systems.BaseComponentSystem;
-import org.terasology.entitySystem.systems.RegisterSystem;
-import org.terasology.rendering.iconmesh.IconMeshFactory;
-import org.terasology.rendering.logic.LightComponent;
-import org.terasology.rendering.logic.MeshComponent;
-import org.terasology.utilities.Assets;
-import org.terasology.utilities.random.FastRandom;
-import org.terasology.utilities.random.Random;
-import org.terasology.world.block.family.BlockFamily;
-import org.terasology.world.block.items.BlockItemComponent;
+import org.terasology.engine.entitySystem.MutableComponentContainer;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.entity.lifecycleEvents.OnActivatedComponent;
+import org.terasology.engine.entitySystem.entity.lifecycleEvents.OnChangedComponent;
+import org.terasology.engine.entitySystem.event.ReceiveEvent;
+import org.terasology.engine.entitySystem.systems.BaseComponentSystem;
+import org.terasology.engine.entitySystem.systems.RegisterSystem;
+import org.terasology.engine.rendering.iconmesh.IconMeshFactory;
+import org.terasology.engine.rendering.logic.LightComponent;
+import org.terasology.engine.rendering.logic.MeshComponent;
+import org.terasology.engine.utilities.Assets;
+import org.terasology.engine.utilities.random.FastRandom;
+import org.terasology.engine.utilities.random.Random;
+import org.terasology.engine.world.block.family.BlockFamily;
+import org.terasology.engine.world.block.items.BlockItemComponent;
/**
* This system adds meshes to items that have RenderItemBlockMeshComponent or RenderItemIconMeshComponent
diff --git a/engine/src/main/java/org/terasology/logic/inventory/ItemComponent.java b/engine/src/main/java/org/terasology/logic/inventory/ItemComponent.java
index 4ffa77daa..711472cc5 100644
--- a/engine/src/main/java/org/terasology/logic/inventory/ItemComponent.java
+++ b/engine/src/main/java/org/terasology/logic/inventory/ItemComponent.java
@@ -1,26 +1,13 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.logic.inventory;
+package org.terasology.engine.logic.inventory;
-import org.terasology.entitySystem.Component;
-import org.terasology.entitySystem.prefab.Prefab;
-import org.terasology.network.FieldReplicateType;
-import org.terasology.network.Replicate;
-import org.terasology.rendering.assets.texture.TextureRegionAsset;
+import org.terasology.engine.entitySystem.Component;
+import org.terasology.engine.entitySystem.prefab.Prefab;
+import org.terasology.engine.network.FieldReplicateType;
+import org.terasology.engine.network.Replicate;
+import org.terasology.engine.rendering.assets.texture.TextureRegionAsset;
/**
* Item data is stored using this component
diff --git a/engine/src/main/java/org/terasology/logic/inventory/ItemPickupAuthoritySystem.java b/engine/src/main/java/org/terasology/logic/inventory/ItemPickupAuthoritySystem.java
index e301e74e2..3ecd04f20 100644
--- a/engine/src/main/java/org/terasology/logic/inventory/ItemPickupAuthoritySystem.java
+++ b/engine/src/main/java/org/terasology/logic/inventory/ItemPickupAuthoritySystem.java
@@ -1,42 +1,29 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.logic.inventory;
+package org.terasology.engine.logic.inventory;
import com.badlogic.gdx.physics.bullet.collision.btBoxShape;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.terasology.engine.Time;
-import org.terasology.entitySystem.Component;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.entitySystem.entity.lifecycleEvents.OnAddedComponent;
-import org.terasology.entitySystem.event.ReceiveEvent;
-import org.terasology.entitySystem.metadata.EntitySystemLibrary;
-import org.terasology.entitySystem.systems.BaseComponentSystem;
-import org.terasology.entitySystem.systems.RegisterMode;
-import org.terasology.entitySystem.systems.RegisterSystem;
-import org.terasology.logic.inventory.events.DropItemEvent;
-import org.terasology.logic.inventory.events.GiveItemEvent;
-import org.terasology.logic.location.LocationComponent;
-import org.terasology.physics.components.RigidBodyComponent;
-import org.terasology.physics.components.shapes.BoxShapeComponent;
-import org.terasology.physics.events.CollideEvent;
-import org.terasology.registry.In;
-import org.terasology.world.block.family.BlockFamily;
-import org.terasology.world.block.items.BlockItemComponent;
+import org.terasology.engine.core.Time;
+import org.terasology.engine.entitySystem.Component;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.entity.lifecycleEvents.OnAddedComponent;
+import org.terasology.engine.entitySystem.event.ReceiveEvent;
+import org.terasology.engine.entitySystem.metadata.EntitySystemLibrary;
+import org.terasology.engine.entitySystem.systems.BaseComponentSystem;
+import org.terasology.engine.entitySystem.systems.RegisterMode;
+import org.terasology.engine.entitySystem.systems.RegisterSystem;
+import org.terasology.engine.logic.inventory.events.DropItemEvent;
+import org.terasology.engine.logic.inventory.events.GiveItemEvent;
+import org.terasology.engine.logic.location.LocationComponent;
+import org.terasology.engine.physics.components.RigidBodyComponent;
+import org.terasology.engine.physics.components.shapes.BoxShapeComponent;
+import org.terasology.engine.physics.events.CollideEvent;
+import org.terasology.engine.registry.In;
+import org.terasology.engine.world.block.family.BlockFamily;
+import org.terasology.engine.world.block.items.BlockItemComponent;
/**
* This system uses the pickup prefab on an item component to add on extra components needed for the item to display in the world.
diff --git a/engine/src/main/java/org/terasology/logic/inventory/PickupComponent.java b/engine/src/main/java/org/terasology/logic/inventory/PickupComponent.java
index ca9070c35..0c5c490fa 100644
--- a/engine/src/main/java/org/terasology/logic/inventory/PickupComponent.java
+++ b/engine/src/main/java/org/terasology/logic/inventory/PickupComponent.java
@@ -1,22 +1,9 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.logic.inventory;
+package org.terasology.engine.logic.inventory;
-import org.terasology.entitySystem.Component;
+import org.terasology.engine.entitySystem.Component;
public class PickupComponent implements Component {
diff --git a/engine/src/main/java/org/terasology/logic/inventory/RenderItemBlockMeshComponent.java b/engine/src/main/java/org/terasology/logic/inventory/RenderItemBlockMeshComponent.java
index c52fb0bf3..9f056c86f 100644
--- a/engine/src/main/java/org/terasology/logic/inventory/RenderItemBlockMeshComponent.java
+++ b/engine/src/main/java/org/terasology/logic/inventory/RenderItemBlockMeshComponent.java
@@ -1,21 +1,8 @@
-/*
- * Copyright 2015 MovingBlocks
- *
- * 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 org.terasology.logic.inventory;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.inventory;
-import org.terasology.entitySystem.Component;
+import org.terasology.engine.entitySystem.Component;
public class RenderItemBlockMeshComponent implements Component {
}
diff --git a/engine/src/main/java/org/terasology/logic/inventory/RenderItemIconMeshComponent.java b/engine/src/main/java/org/terasology/logic/inventory/RenderItemIconMeshComponent.java
index a0b56b057..e2691079b 100644
--- a/engine/src/main/java/org/terasology/logic/inventory/RenderItemIconMeshComponent.java
+++ b/engine/src/main/java/org/terasology/logic/inventory/RenderItemIconMeshComponent.java
@@ -1,21 +1,8 @@
-/*
- * Copyright 2015 MovingBlocks
- *
- * 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 org.terasology.logic.inventory;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.inventory;
-import org.terasology.entitySystem.Component;
+import org.terasology.engine.entitySystem.Component;
public class RenderItemIconMeshComponent implements Component {
}
diff --git a/engine/src/main/java/org/terasology/logic/inventory/events/DropItemEvent.java b/engine/src/main/java/org/terasology/logic/inventory/events/DropItemEvent.java
index de65490a4..9a6b4eafa 100644
--- a/engine/src/main/java/org/terasology/logic/inventory/events/DropItemEvent.java
+++ b/engine/src/main/java/org/terasology/logic/inventory/events/DropItemEvent.java
@@ -1,24 +1,11 @@
-/*
- * Copyright 2015 MovingBlocks
- *
- * 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 org.terasology.logic.inventory.events;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.inventory.events;
import org.joml.Vector3f;
import org.joml.Vector3fc;
-import org.terasology.entitySystem.event.Event;
-import org.terasology.network.ServerEvent;
+import org.terasology.engine.entitySystem.event.Event;
+import org.terasology.engine.network.ServerEvent;
/**
* Fire this event on an item in order for the authority to add the necessary components to put it in the world.
diff --git a/engine/src/main/java/org/terasology/logic/inventory/events/GiveItemEvent.java b/engine/src/main/java/org/terasology/logic/inventory/events/GiveItemEvent.java
index d7f0a6d87..1775bcfae 100644
--- a/engine/src/main/java/org/terasology/logic/inventory/events/GiveItemEvent.java
+++ b/engine/src/main/java/org/terasology/logic/inventory/events/GiveItemEvent.java
@@ -1,23 +1,10 @@
-/*
- * Copyright 2015 MovingBlocks
- *
- * 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 org.terasology.logic.inventory.events;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.inventory.events;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.entitySystem.event.Event;
-import org.terasology.network.ServerEvent;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.event.Event;
+import org.terasology.engine.network.ServerEvent;
/**
* Gives the entity to the target entity
diff --git a/engine/src/main/java/org/terasology/logic/inventory/events/package-info.java b/engine/src/main/java/org/terasology/logic/inventory/events/package-info.java
index c258db0c2..3df20f313 100644
--- a/engine/src/main/java/org/terasology/logic/inventory/events/package-info.java
+++ b/engine/src/main/java/org/terasology/logic/inventory/events/package-info.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-@API package org.terasology.logic.inventory.events;
+@API package org.terasology.engine.logic.inventory.events;
import org.terasology.module.sandbox.API;
diff --git a/engine/src/main/java/org/terasology/logic/inventory/package-info.java b/engine/src/main/java/org/terasology/logic/inventory/package-info.java
index 98da911f9..51535c7ef 100644
--- a/engine/src/main/java/org/terasology/logic/inventory/package-info.java
+++ b/engine/src/main/java/org/terasology/logic/inventory/package-info.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-@API package org.terasology.logic.inventory;
+@API package org.terasology.engine.logic.inventory;
import org.terasology.module.sandbox.API;
diff --git a/engine/src/main/java/org/terasology/logic/location/DistanceComparator.java b/engine/src/main/java/org/terasology/logic/location/DistanceComparator.java
index c7143dbb2..b88844a66 100644
--- a/engine/src/main/java/org/terasology/logic/location/DistanceComparator.java
+++ b/engine/src/main/java/org/terasology/logic/location/DistanceComparator.java
@@ -1,22 +1,9 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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 org.terasology.logic.location;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.location;
import org.joml.Vector3f;
-import org.terasology.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.entity.EntityRef;
import java.util.Comparator;
diff --git a/engine/src/main/java/org/terasology/logic/location/Location.java b/engine/src/main/java/org/terasology/logic/location/Location.java
index e1d50d048..ffc8c2b4f 100644
--- a/engine/src/main/java/org/terasology/logic/location/Location.java
+++ b/engine/src/main/java/org/terasology/logic/location/Location.java
@@ -1,30 +1,17 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.logic.location;
+package org.terasology.engine.logic.location;
import org.joml.Quaternionfc;
import org.joml.Vector3f;
import org.joml.Vector3fc;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.entitySystem.entity.lifecycleEvents.BeforeRemoveComponent;
-import org.terasology.entitySystem.event.ReceiveEvent;
-import org.terasology.entitySystem.systems.BaseComponentSystem;
-import org.terasology.entitySystem.systems.RegisterMode;
-import org.terasology.entitySystem.systems.RegisterSystem;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.entity.lifecycleEvents.BeforeRemoveComponent;
+import org.terasology.engine.entitySystem.event.ReceiveEvent;
+import org.terasology.engine.entitySystem.systems.BaseComponentSystem;
+import org.terasology.engine.entitySystem.systems.RegisterMode;
+import org.terasology.engine.entitySystem.systems.RegisterSystem;
import java.util.Iterator;
diff --git a/engine/src/main/java/org/terasology/logic/location/LocationChangedEvent.java b/engine/src/main/java/org/terasology/logic/location/LocationChangedEvent.java
index 71f5c7dfe..266e2ef43 100644
--- a/engine/src/main/java/org/terasology/logic/location/LocationChangedEvent.java
+++ b/engine/src/main/java/org/terasology/logic/location/LocationChangedEvent.java
@@ -1,25 +1,12 @@
-/*
- * Copyright 2019 MovingBlocks
- *
- * 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 org.terasology.logic.location;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.location;
import org.joml.Quaternionf;
import org.joml.Quaternionfc;
import org.joml.Vector3f;
import org.joml.Vector3fc;
-import org.terasology.entitySystem.event.Event;
+import org.terasology.engine.entitySystem.event.Event;
public class LocationChangedEvent implements Event {
public final LocationComponent component;
diff --git a/engine/src/main/java/org/terasology/logic/location/LocationChangedSystem.java b/engine/src/main/java/org/terasology/logic/location/LocationChangedSystem.java
index 77f8e74b4..9013dbbc6 100644
--- a/engine/src/main/java/org/terasology/logic/location/LocationChangedSystem.java
+++ b/engine/src/main/java/org/terasology/logic/location/LocationChangedSystem.java
@@ -1,26 +1,13 @@
-/*
- * Copyright 2019 MovingBlocks
- *
- * 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 org.terasology.logic.location;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.location;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.entitySystem.entity.lifecycleEvents.OnChangedComponent;
-import org.terasology.entitySystem.event.ReceiveEvent;
-import org.terasology.entitySystem.systems.BaseComponentSystem;
-import org.terasology.entitySystem.systems.RegisterMode;
-import org.terasology.entitySystem.systems.RegisterSystem;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.entity.lifecycleEvents.OnChangedComponent;
+import org.terasology.engine.entitySystem.event.ReceiveEvent;
+import org.terasology.engine.entitySystem.systems.BaseComponentSystem;
+import org.terasology.engine.entitySystem.systems.RegisterMode;
+import org.terasology.engine.entitySystem.systems.RegisterSystem;
@RegisterSystem(RegisterMode.AUTHORITY)
public class LocationChangedSystem extends BaseComponentSystem {
diff --git a/engine/src/main/java/org/terasology/logic/location/LocationComponent.java b/engine/src/main/java/org/terasology/logic/location/LocationComponent.java
index 231b5237a..35dee12db 100644
--- a/engine/src/main/java/org/terasology/logic/location/LocationComponent.java
+++ b/engine/src/main/java/org/terasology/logic/location/LocationComponent.java
@@ -1,6 +1,6 @@
// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.logic.location;
+package org.terasology.engine.logic.location;
import com.google.common.collect.Lists;
import org.joml.Matrix4f;
@@ -8,11 +8,11 @@ import org.joml.Quaternionf;
import org.joml.Quaternionfc;
import org.joml.Vector3f;
import org.joml.Vector3fc;
-import org.terasology.entitySystem.Component;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.math.Direction;
-import org.terasology.network.Replicate;
-import org.terasology.network.ReplicationCheck;
+import org.terasology.engine.entitySystem.Component;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.math.Direction;
+import org.terasology.engine.network.Replicate;
+import org.terasology.engine.network.ReplicationCheck;
import org.terasology.nui.properties.TextField;
import org.terasology.reflection.metadata.FieldMetadata;
diff --git a/engine/src/main/java/org/terasology/logic/location/LocationResynchEvent.java b/engine/src/main/java/org/terasology/logic/location/LocationResynchEvent.java
index 79e8b0b7a..bc7b8db54 100644
--- a/engine/src/main/java/org/terasology/logic/location/LocationResynchEvent.java
+++ b/engine/src/main/java/org/terasology/logic/location/LocationResynchEvent.java
@@ -1,24 +1,11 @@
-/*
- * Copyright 2016 MovingBlocks
- *
- * 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 org.terasology.logic.location;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.location;
import org.joml.Quaternionf;
import org.joml.Vector3f;
-import org.terasology.entitySystem.event.Event;
-import org.terasology.network.BroadcastEvent;
+import org.terasology.engine.entitySystem.event.Event;
+import org.terasology.engine.network.BroadcastEvent;
@BroadcastEvent
public class LocationResynchEvent implements Event {
diff --git a/engine/src/main/java/org/terasology/logic/location/package-info.java b/engine/src/main/java/org/terasology/logic/location/package-info.java
index f22c9852b..f2b136903 100644
--- a/engine/src/main/java/org/terasology/logic/location/package-info.java
+++ b/engine/src/main/java/org/terasology/logic/location/package-info.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-@API package org.terasology.logic.location;
+@API package org.terasology.engine.logic.location;
import org.terasology.module.sandbox.API;
diff --git a/engine/src/main/java/org/terasology/logic/nameTags/NameTagClientSystem.java b/engine/src/main/java/org/terasology/logic/nameTags/NameTagClientSystem.java
index 6eb0facc2..71af4f6a4 100644
--- a/engine/src/main/java/org/terasology/logic/nameTags/NameTagClientSystem.java
+++ b/engine/src/main/java/org/terasology/logic/nameTags/NameTagClientSystem.java
@@ -1,36 +1,23 @@
-/*
- * Copyright 2014 MovingBlocks
- *
- * 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 org.terasology.logic.nameTags;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.nameTags;
import org.joml.Quaternionf;
import org.joml.Vector3f;
-import org.terasology.entitySystem.entity.EntityBuilder;
-import org.terasology.entitySystem.entity.EntityManager;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.entitySystem.entity.lifecycleEvents.BeforeDeactivateComponent;
-import org.terasology.entitySystem.entity.lifecycleEvents.OnActivatedComponent;
-import org.terasology.entitySystem.entity.lifecycleEvents.OnChangedComponent;
-import org.terasology.entitySystem.event.ReceiveEvent;
-import org.terasology.entitySystem.systems.BaseComponentSystem;
-import org.terasology.entitySystem.systems.RegisterMode;
-import org.terasology.entitySystem.systems.RegisterSystem;
-import org.terasology.logic.location.Location;
-import org.terasology.logic.location.LocationComponent;
-import org.terasology.registry.In;
-import org.terasology.rendering.logic.FloatingTextComponent;
+import org.terasology.engine.entitySystem.entity.EntityBuilder;
+import org.terasology.engine.entitySystem.entity.EntityManager;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.entity.lifecycleEvents.BeforeDeactivateComponent;
+import org.terasology.engine.entitySystem.entity.lifecycleEvents.OnActivatedComponent;
+import org.terasology.engine.entitySystem.entity.lifecycleEvents.OnChangedComponent;
+import org.terasology.engine.entitySystem.event.ReceiveEvent;
+import org.terasology.engine.entitySystem.systems.BaseComponentSystem;
+import org.terasology.engine.entitySystem.systems.RegisterMode;
+import org.terasology.engine.entitySystem.systems.RegisterSystem;
+import org.terasology.engine.logic.location.Location;
+import org.terasology.engine.logic.location.LocationComponent;
+import org.terasology.engine.registry.In;
+import org.terasology.engine.rendering.logic.FloatingTextComponent;
import java.util.HashMap;
import java.util.Map;
diff --git a/engine/src/main/java/org/terasology/logic/nameTags/NameTagComponent.java b/engine/src/main/java/org/terasology/logic/nameTags/NameTagComponent.java
index 2da0f406a..30f7781bb 100644
--- a/engine/src/main/java/org/terasology/logic/nameTags/NameTagComponent.java
+++ b/engine/src/main/java/org/terasology/logic/nameTags/NameTagComponent.java
@@ -1,31 +1,19 @@
-/*
- * Copyright 2014 MovingBlocks
- *
- * 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 org.terasology.logic.nameTags;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.nameTags;
-import org.terasology.entitySystem.Component;
+import org.terasology.engine.entitySystem.Component;
+import org.terasology.engine.logic.common.DisplayNameComponent;
import org.terasology.module.sandbox.API;
-import org.terasology.network.Replicate;
+import org.terasology.engine.network.Replicate;
import org.terasology.nui.Color;
/**
* Will make the entity have a name tag overhead in the 3D view.
*
- * The text on name tag is based on the {@link org.terasology.logic.common.DisplayNameComponent} this entity.
+ * The text on name tag is based on the {@link DisplayNameComponent} this entity.
*
- * The color of the name tag is based on the {@link org.terasology.network.ColorComponent} of this entity
+ * The color of the name tag is based on the {@link org.terasology.engine.network.ColorComponent} of this entity
*/
@API
public class NameTagComponent implements Component {
diff --git a/engine/src/main/java/org/terasology/logic/nameTags/PlayerNameTagSystem.java b/engine/src/main/java/org/terasology/logic/nameTags/PlayerNameTagSystem.java
index 05ab8d8d7..571807cde 100644
--- a/engine/src/main/java/org/terasology/logic/nameTags/PlayerNameTagSystem.java
+++ b/engine/src/main/java/org/terasology/logic/nameTags/PlayerNameTagSystem.java
@@ -1,24 +1,25 @@
// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.logic.nameTags;
+package org.terasology.engine.logic.nameTags;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.entitySystem.entity.lifecycleEvents.OnActivatedComponent;
-import org.terasology.entitySystem.entity.lifecycleEvents.OnChangedComponent;
-import org.terasology.entitySystem.event.ReceiveEvent;
-import org.terasology.entitySystem.systems.BaseComponentSystem;
-import org.terasology.entitySystem.systems.RegisterMode;
-import org.terasology.entitySystem.systems.RegisterSystem;
-import org.terasology.logic.characters.CharacterComponent;
-import org.terasology.logic.common.DisplayNameComponent;
-import org.terasology.network.ClientComponent;
-import org.terasology.network.ClientInfoComponent;
-import org.terasology.network.ColorComponent;
-import org.terasology.network.NetworkSystem;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.entity.lifecycleEvents.OnActivatedComponent;
+import org.terasology.engine.entitySystem.entity.lifecycleEvents.OnChangedComponent;
+import org.terasology.engine.entitySystem.event.ReceiveEvent;
+import org.terasology.engine.entitySystem.systems.BaseComponentSystem;
+import org.terasology.engine.entitySystem.systems.RegisterMode;
+import org.terasology.engine.entitySystem.systems.RegisterSystem;
+import org.terasology.engine.logic.characters.CharacterComponent;
+import org.terasology.engine.logic.players.event.OnPlayerSpawnedEvent;
+import org.terasology.engine.logic.common.DisplayNameComponent;
+import org.terasology.engine.network.ClientComponent;
+import org.terasology.engine.network.ClientInfoComponent;
+import org.terasology.engine.network.ColorComponent;
+import org.terasology.engine.network.NetworkSystem;
import org.terasology.nui.Color;
-import org.terasology.registry.In;
+import org.terasology.engine.registry.In;
/**
@@ -35,7 +36,7 @@ public class PlayerNameTagSystem extends BaseComponentSystem {
private NetworkSystem networkSystem;
/**
- * Listening for {@link org.terasology.logic.players.event.OnPlayerSpawnedEvent} does not work, as it is an
+ * Listening for {@link OnPlayerSpawnedEvent} does not work, as it is an
* authority event that does not get processed at clients. That is why we listen for the activation.
*/
@ReceiveEvent(components = CharacterComponent.class)
diff --git a/engine/src/main/java/org/terasology/logic/notifications/NotificationMessageEvent.java b/engine/src/main/java/org/terasology/logic/notifications/NotificationMessageEvent.java
index 342b1abb9..a23e07491 100644
--- a/engine/src/main/java/org/terasology/logic/notifications/NotificationMessageEvent.java
+++ b/engine/src/main/java/org/terasology/logic/notifications/NotificationMessageEvent.java
@@ -1,28 +1,15 @@
-/*
- * Copyright 2014 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.logic.notifications;
+package org.terasology.engine.logic.notifications;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.logic.console.CoreMessageType;
-import org.terasology.logic.console.Message;
-import org.terasology.logic.console.MessageEvent;
-import org.terasology.logic.players.PlayerUtil;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.logic.console.CoreMessageType;
+import org.terasology.engine.logic.console.Message;
+import org.terasology.engine.logic.console.MessageEvent;
+import org.terasology.engine.logic.players.PlayerUtil;
import org.terasology.module.sandbox.API;
-import org.terasology.network.OwnerEvent;
+import org.terasology.engine.network.OwnerEvent;
/**
* A notification message
diff --git a/engine/src/main/java/org/terasology/logic/notifications/NotificationSystem.java b/engine/src/main/java/org/terasology/logic/notifications/NotificationSystem.java
index f3ceeb18c..4231af2f6 100644
--- a/engine/src/main/java/org/terasology/logic/notifications/NotificationSystem.java
+++ b/engine/src/main/java/org/terasology/logic/notifications/NotificationSystem.java
@@ -1,30 +1,17 @@
-/*
- * Copyright 2014 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.logic.notifications;
+package org.terasology.engine.logic.notifications;
-import org.terasology.entitySystem.entity.EntityManager;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.entitySystem.event.ReceiveEvent;
-import org.terasology.entitySystem.systems.BaseComponentSystem;
-import org.terasology.entitySystem.systems.RegisterSystem;
-import org.terasology.network.ClientComponent;
-import org.terasology.network.events.ConnectedEvent;
-import org.terasology.network.events.DisconnectedEvent;
-import org.terasology.registry.In;
+import org.terasology.engine.entitySystem.entity.EntityManager;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.event.ReceiveEvent;
+import org.terasology.engine.entitySystem.systems.BaseComponentSystem;
+import org.terasology.engine.entitySystem.systems.RegisterSystem;
+import org.terasology.engine.network.ClientComponent;
+import org.terasology.engine.network.events.ConnectedEvent;
+import org.terasology.engine.network.events.DisconnectedEvent;
+import org.terasology.engine.registry.In;
/**
* This system provides the ability to notify one or more client about certain events.
diff --git a/engine/src/main/java/org/terasology/logic/permission/PermissionCommands.java b/engine/src/main/java/org/terasology/logic/permission/PermissionCommands.java
index 984503e1a..7bfc6bf9f 100644
--- a/engine/src/main/java/org/terasology/logic/permission/PermissionCommands.java
+++ b/engine/src/main/java/org/terasology/logic/permission/PermissionCommands.java
@@ -1,35 +1,22 @@
-/*
- * Copyright 2014 MovingBlocks
- *
- * 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 org.terasology.logic.permission;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.permission;
-import org.terasology.config.Config;
-import org.terasology.config.PermissionConfig;
-import org.terasology.entitySystem.entity.EntityManager;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.entitySystem.systems.BaseComponentSystem;
-import org.terasology.entitySystem.systems.RegisterSystem;
-import org.terasology.logic.common.DisplayNameComponent;
-import org.terasology.logic.console.Console;
-import org.terasology.logic.console.commandSystem.ConsoleCommand;
-import org.terasology.logic.console.commandSystem.annotations.Command;
-import org.terasology.logic.console.commandSystem.annotations.CommandParam;
-import org.terasology.logic.console.commandSystem.annotations.Sender;
-import org.terasology.logic.console.suggesters.UsernameSuggester;
-import org.terasology.network.ClientComponent;
-import org.terasology.registry.In;
+import org.terasology.engine.config.Config;
+import org.terasology.engine.config.PermissionConfig;
+import org.terasology.engine.entitySystem.entity.EntityManager;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.systems.BaseComponentSystem;
+import org.terasology.engine.entitySystem.systems.RegisterSystem;
+import org.terasology.engine.logic.common.DisplayNameComponent;
+import org.terasology.engine.logic.console.Console;
+import org.terasology.engine.logic.console.commandSystem.ConsoleCommand;
+import org.terasology.engine.logic.console.commandSystem.annotations.Command;
+import org.terasology.engine.logic.console.commandSystem.annotations.CommandParam;
+import org.terasology.engine.logic.console.commandSystem.annotations.Sender;
+import org.terasology.engine.logic.console.suggesters.UsernameSuggester;
+import org.terasology.engine.network.ClientComponent;
+import org.terasology.engine.registry.In;
import java.util.HashSet;
import java.util.Objects;
diff --git a/engine/src/main/java/org/terasology/logic/permission/PermissionManager.java b/engine/src/main/java/org/terasology/logic/permission/PermissionManager.java
index 73ff10a58..de3c8acc2 100644
--- a/engine/src/main/java/org/terasology/logic/permission/PermissionManager.java
+++ b/engine/src/main/java/org/terasology/logic/permission/PermissionManager.java
@@ -1,22 +1,9 @@
-/*
- * Copyright 2014 MovingBlocks
- *
- * 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 org.terasology.logic.permission;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.permission;
import com.google.common.base.Predicate;
-import org.terasology.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.entity.EntityRef;
import org.terasology.module.sandbox.API;
@API
diff --git a/engine/src/main/java/org/terasology/logic/permission/PermissionSetComponent.java b/engine/src/main/java/org/terasology/logic/permission/PermissionSetComponent.java
index d9bcdc5e6..b1a2f631d 100644
--- a/engine/src/main/java/org/terasology/logic/permission/PermissionSetComponent.java
+++ b/engine/src/main/java/org/terasology/logic/permission/PermissionSetComponent.java
@@ -1,21 +1,8 @@
-/*
- * Copyright 2014 MovingBlocks
- *
- * 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 org.terasology.logic.permission;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.permission;
-import org.terasology.entitySystem.Component;
+import org.terasology.engine.entitySystem.Component;
import java.util.Set;
diff --git a/engine/src/main/java/org/terasology/logic/permission/PermissionSystem.java b/engine/src/main/java/org/terasology/logic/permission/PermissionSystem.java
index 7fd593e73..6856f3146 100644
--- a/engine/src/main/java/org/terasology/logic/permission/PermissionSystem.java
+++ b/engine/src/main/java/org/terasology/logic/permission/PermissionSystem.java
@@ -1,28 +1,15 @@
-/*
- * Copyright 2014 MovingBlocks
- *
- * 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 org.terasology.logic.permission;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.permission;
import com.google.common.base.Predicate;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.entitySystem.systems.BaseComponentSystem;
-import org.terasology.entitySystem.systems.RegisterMode;
-import org.terasology.entitySystem.systems.RegisterSystem;
-import org.terasology.logic.players.LocalPlayer;
-import org.terasology.registry.In;
-import org.terasology.registry.Share;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.systems.BaseComponentSystem;
+import org.terasology.engine.entitySystem.systems.RegisterMode;
+import org.terasology.engine.entitySystem.systems.RegisterSystem;
+import org.terasology.engine.logic.players.LocalPlayer;
+import org.terasology.engine.registry.In;
+import org.terasology.engine.registry.Share;
import java.util.Set;
diff --git a/engine/src/main/java/org/terasology/logic/players/AutoMountCameraComponent.java b/engine/src/main/java/org/terasology/logic/players/AutoMountCameraComponent.java
index 4ceb08770..ad0dc87e5 100644
--- a/engine/src/main/java/org/terasology/logic/players/AutoMountCameraComponent.java
+++ b/engine/src/main/java/org/terasology/logic/players/AutoMountCameraComponent.java
@@ -1,21 +1,8 @@
-/*
- * Copyright 2015 MovingBlocks
- *
- * 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 org.terasology.logic.players;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.players;
-import org.terasology.entitySystem.Component;
+import org.terasology.engine.entitySystem.Component;
/**
* Adding this component to a client entity will automatically attempt to link the client's camera entity to the controlled character
diff --git a/engine/src/main/java/org/terasology/logic/players/CameraClientSystem.java b/engine/src/main/java/org/terasology/logic/players/CameraClientSystem.java
index 1711382c8..eb464e2cf 100644
--- a/engine/src/main/java/org/terasology/logic/players/CameraClientSystem.java
+++ b/engine/src/main/java/org/terasology/logic/players/CameraClientSystem.java
@@ -1,28 +1,28 @@
// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.logic.players;
+package org.terasology.engine.logic.players;
import org.joml.Quaternionf;
import org.joml.Vector3f;
-import org.terasology.entitySystem.entity.EntityBuilder;
-import org.terasology.entitySystem.entity.EntityManager;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.entitySystem.entity.internal.EntityScope;
-import org.terasology.entitySystem.entity.lifecycleEvents.OnActivatedComponent;
-import org.terasology.entitySystem.entity.lifecycleEvents.OnChangedComponent;
-import org.terasology.entitySystem.event.ReceiveEvent;
-import org.terasology.entitySystem.systems.BaseComponentSystem;
-import org.terasology.entitySystem.systems.RegisterMode;
-import org.terasology.entitySystem.systems.RegisterSystem;
-import org.terasology.logic.characters.GazeAuthoritySystem;
-import org.terasology.logic.console.commandSystem.annotations.Command;
-import org.terasology.logic.location.Location;
-import org.terasology.logic.location.LocationComponent;
-import org.terasology.logic.permission.PermissionManager;
-import org.terasology.logic.players.event.OnPlayerSpawnedEvent;
-import org.terasology.logic.players.event.ResetCameraEvent;
-import org.terasology.network.ClientComponent;
-import org.terasology.registry.In;
+import org.terasology.engine.entitySystem.entity.EntityBuilder;
+import org.terasology.engine.entitySystem.entity.EntityManager;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.entity.internal.EntityScope;
+import org.terasology.engine.entitySystem.entity.lifecycleEvents.OnActivatedComponent;
+import org.terasology.engine.entitySystem.entity.lifecycleEvents.OnChangedComponent;
+import org.terasology.engine.entitySystem.event.ReceiveEvent;
+import org.terasology.engine.entitySystem.systems.BaseComponentSystem;
+import org.terasology.engine.entitySystem.systems.RegisterMode;
+import org.terasology.engine.entitySystem.systems.RegisterSystem;
+import org.terasology.engine.logic.characters.GazeAuthoritySystem;
+import org.terasology.engine.logic.location.Location;
+import org.terasology.engine.logic.location.LocationComponent;
+import org.terasology.engine.logic.players.event.OnPlayerSpawnedEvent;
+import org.terasology.engine.logic.players.event.ResetCameraEvent;
+import org.terasology.engine.logic.console.commandSystem.annotations.Command;
+import org.terasology.engine.logic.permission.PermissionManager;
+import org.terasology.engine.network.ClientComponent;
+import org.terasology.engine.registry.In;
/**
* This is a system that creates and maintains a client side entity for the camera.
diff --git a/engine/src/main/java/org/terasology/logic/players/DebugControlSystem.java b/engine/src/main/java/org/terasology/logic/players/DebugControlSystem.java
index 1c6e260bc..3db56d1c5 100644
--- a/engine/src/main/java/org/terasology/logic/players/DebugControlSystem.java
+++ b/engine/src/main/java/org/terasology/logic/players/DebugControlSystem.java
@@ -1,28 +1,28 @@
// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.logic.players;
+package org.terasology.engine.logic.players;
-import org.terasology.config.Config;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.entitySystem.event.EventPriority;
-import org.terasology.entitySystem.event.ReceiveEvent;
-import org.terasology.entitySystem.systems.BaseComponentSystem;
-import org.terasology.entitySystem.systems.RegisterMode;
-import org.terasology.entitySystem.systems.RegisterSystem;
+import org.terasology.engine.config.Config;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.event.EventPriority;
+import org.terasology.engine.entitySystem.event.ReceiveEvent;
+import org.terasology.engine.entitySystem.systems.BaseComponentSystem;
+import org.terasology.engine.entitySystem.systems.RegisterMode;
+import org.terasology.engine.entitySystem.systems.RegisterSystem;
+import org.terasology.engine.logic.characters.CharacterComponent;
+import org.terasology.engine.logic.players.event.WorldtimeResetEvent;
import org.terasology.input.Keyboard;
-import org.terasology.input.binds.general.HideHUDButton;
+import org.terasology.engine.input.binds.general.HideHUDButton;
import org.terasology.input.device.MouseDevice;
-import org.terasology.input.events.KeyDownEvent;
-import org.terasology.input.events.KeyEvent;
-import org.terasology.input.events.MouseAxisEvent;
-import org.terasology.logic.characters.CharacterComponent;
-import org.terasology.logic.debug.DebugProperties;
-import org.terasology.logic.players.event.WorldtimeResetEvent;
-import org.terasology.network.ClientComponent;
-import org.terasology.registry.In;
-import org.terasology.rendering.nui.NUIManager;
-import org.terasology.rendering.nui.layers.ingame.metrics.DebugOverlay;
-import org.terasology.world.WorldProvider;
+import org.terasology.engine.input.events.KeyDownEvent;
+import org.terasology.engine.input.events.KeyEvent;
+import org.terasology.engine.input.events.MouseAxisEvent;
+import org.terasology.engine.logic.debug.DebugProperties;
+import org.terasology.engine.network.ClientComponent;
+import org.terasology.engine.registry.In;
+import org.terasology.engine.rendering.nui.NUIManager;
+import org.terasology.engine.rendering.nui.layers.ingame.metrics.DebugOverlay;
+import org.terasology.engine.world.WorldProvider;
@RegisterSystem(RegisterMode.CLIENT)
diff --git a/engine/src/main/java/org/terasology/logic/players/DecreaseViewDistanceButton.java b/engine/src/main/java/org/terasology/logic/players/DecreaseViewDistanceButton.java
index dcfffe9de..2d35b5762 100644
--- a/engine/src/main/java/org/terasology/logic/players/DecreaseViewDistanceButton.java
+++ b/engine/src/main/java/org/terasology/logic/players/DecreaseViewDistanceButton.java
@@ -1,26 +1,13 @@
-/*
- * Copyright 2014 MovingBlocks
- *
- * 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 org.terasology.logic.players;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.players;
import org.terasology.input.ActivateMode;
-import org.terasology.input.BindButtonEvent;
-import org.terasology.input.DefaultBinding;
+import org.terasology.engine.input.BindButtonEvent;
+import org.terasology.engine.input.DefaultBinding;
import org.terasology.input.InputType;
import org.terasology.input.Keyboard;
-import org.terasology.input.RegisterBindButton;
+import org.terasology.engine.input.RegisterBindButton;
/**
*/
diff --git a/engine/src/main/java/org/terasology/logic/players/FirstPersonClientSystem.java b/engine/src/main/java/org/terasology/logic/players/FirstPersonClientSystem.java
index 813025c77..c9c13531c 100644
--- a/engine/src/main/java/org/terasology/logic/players/FirstPersonClientSystem.java
+++ b/engine/src/main/java/org/terasology/logic/players/FirstPersonClientSystem.java
@@ -1,45 +1,32 @@
-/*
- * Copyright 2015 MovingBlocks
- *
- * 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 org.terasology.logic.players;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.players;
import org.joml.Quaternionf;
import org.joml.Vector3f;
-import org.terasology.engine.Time;
-import org.terasology.entitySystem.Component;
-import org.terasology.entitySystem.entity.EntityBuilder;
-import org.terasology.entitySystem.entity.EntityManager;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.entitySystem.entity.lifecycleEvents.OnActivatedComponent;
-import org.terasology.entitySystem.entity.lifecycleEvents.OnChangedComponent;
-import org.terasology.entitySystem.event.ReceiveEvent;
-import org.terasology.entitySystem.systems.BaseComponentSystem;
-import org.terasology.entitySystem.systems.RegisterMode;
-import org.terasology.entitySystem.systems.RegisterSystem;
-import org.terasology.entitySystem.systems.UpdateSubscriberSystem;
-import org.terasology.logic.characters.CharacterComponent;
-import org.terasology.logic.characters.CharacterHeldItemComponent;
-import org.terasology.logic.console.commandSystem.annotations.Command;
-import org.terasology.logic.console.commandSystem.annotations.CommandParam;
-import org.terasology.logic.location.Location;
-import org.terasology.logic.location.LocationComponent;
+import org.terasology.engine.core.Time;
+import org.terasology.engine.entitySystem.Component;
+import org.terasology.engine.entitySystem.entity.EntityBuilder;
+import org.terasology.engine.entitySystem.entity.EntityManager;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.entity.lifecycleEvents.OnActivatedComponent;
+import org.terasology.engine.entitySystem.entity.lifecycleEvents.OnChangedComponent;
+import org.terasology.engine.entitySystem.event.ReceiveEvent;
+import org.terasology.engine.entitySystem.systems.BaseComponentSystem;
+import org.terasology.engine.entitySystem.systems.RegisterMode;
+import org.terasology.engine.entitySystem.systems.RegisterSystem;
+import org.terasology.engine.entitySystem.systems.UpdateSubscriberSystem;
+import org.terasology.engine.logic.characters.CharacterComponent;
+import org.terasology.engine.logic.location.Location;
+import org.terasology.engine.logic.location.LocationComponent;
+import org.terasology.engine.logic.characters.CharacterHeldItemComponent;
+import org.terasology.engine.logic.console.commandSystem.annotations.Command;
+import org.terasology.engine.logic.console.commandSystem.annotations.CommandParam;
import org.terasology.math.TeraMath;
-import org.terasology.network.ClientComponent;
-import org.terasology.registry.In;
-import org.terasology.rendering.logic.VisualComponent;
-import org.terasology.rendering.world.WorldRenderer;
+import org.terasology.engine.network.ClientComponent;
+import org.terasology.engine.registry.In;
+import org.terasology.engine.rendering.logic.VisualComponent;
+import org.terasology.engine.rendering.world.WorldRenderer;
@RegisterSystem(RegisterMode.CLIENT)
public class FirstPersonClientSystem extends BaseComponentSystem implements UpdateSubscriberSystem {
diff --git a/engine/src/main/java/org/terasology/logic/players/FirstPersonHeldItemMountPointComponent.java b/engine/src/main/java/org/terasology/logic/players/FirstPersonHeldItemMountPointComponent.java
index 7f60e8999..b31e0151e 100644
--- a/engine/src/main/java/org/terasology/logic/players/FirstPersonHeldItemMountPointComponent.java
+++ b/engine/src/main/java/org/terasology/logic/players/FirstPersonHeldItemMountPointComponent.java
@@ -1,26 +1,13 @@
-/*
- * Copyright 2015 MovingBlocks
- *
- * 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 org.terasology.logic.players;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.players;
import org.joml.Matrix4f;
import org.joml.Quaternionf;
import org.joml.Vector3f;
-import org.terasology.entitySystem.Component;
-import org.terasology.entitySystem.Owns;
-import org.terasology.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.Component;
+import org.terasology.engine.entitySystem.Owns;
+import org.terasology.engine.entitySystem.entity.EntityRef;
import org.terasology.math.TeraMath;
/**
diff --git a/engine/src/main/java/org/terasology/logic/players/FirstPersonHeldItemTransformComponent.java b/engine/src/main/java/org/terasology/logic/players/FirstPersonHeldItemTransformComponent.java
index d9981017e..6d0fad075 100644
--- a/engine/src/main/java/org/terasology/logic/players/FirstPersonHeldItemTransformComponent.java
+++ b/engine/src/main/java/org/terasology/logic/players/FirstPersonHeldItemTransformComponent.java
@@ -1,22 +1,9 @@
-/*
- * Copyright 2015 MovingBlocks
- *
- * 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 org.terasology.logic.players;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.players;
import org.joml.Vector3f;
-import org.terasology.rendering.logic.VisualComponent;
+import org.terasology.engine.rendering.logic.VisualComponent;
public class FirstPersonHeldItemTransformComponent implements VisualComponent {
public Vector3f rotateDegrees = new Vector3f();
diff --git a/engine/src/main/java/org/terasology/logic/players/IncreaseViewDistanceButton.java b/engine/src/main/java/org/terasology/logic/players/IncreaseViewDistanceButton.java
index 1c8c880a5..0715864c4 100644
--- a/engine/src/main/java/org/terasology/logic/players/IncreaseViewDistanceButton.java
+++ b/engine/src/main/java/org/terasology/logic/players/IncreaseViewDistanceButton.java
@@ -1,26 +1,13 @@
-/*
- * Copyright 2014 MovingBlocks
- *
- * 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 org.terasology.logic.players;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.players;
import org.terasology.input.ActivateMode;
-import org.terasology.input.BindButtonEvent;
-import org.terasology.input.DefaultBinding;
+import org.terasology.engine.input.BindButtonEvent;
+import org.terasology.engine.input.DefaultBinding;
import org.terasology.input.InputType;
import org.terasology.input.Keyboard;
-import org.terasology.input.RegisterBindButton;
+import org.terasology.engine.input.RegisterBindButton;
/**
*/
diff --git a/engine/src/main/java/org/terasology/logic/players/ItemIsHeldComponent.java b/engine/src/main/java/org/terasology/logic/players/ItemIsHeldComponent.java
index 3d8a8044e..46d2d5e6a 100644
--- a/engine/src/main/java/org/terasology/logic/players/ItemIsHeldComponent.java
+++ b/engine/src/main/java/org/terasology/logic/players/ItemIsHeldComponent.java
@@ -1,21 +1,8 @@
-/*
- * Copyright 2016 MovingBlocks
- *
- * 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 org.terasology.logic.players;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.players;
-import org.terasology.entitySystem.Component;
+import org.terasology.engine.entitySystem.Component;
/**
* This is used on the client side to track and clean up items that are no longer held, but are still location linked
diff --git a/engine/src/main/java/org/terasology/logic/players/ItemIsRemotelyHeldComponent.java b/engine/src/main/java/org/terasology/logic/players/ItemIsRemotelyHeldComponent.java
index 08eaf4819..b40a7541f 100644
--- a/engine/src/main/java/org/terasology/logic/players/ItemIsRemotelyHeldComponent.java
+++ b/engine/src/main/java/org/terasology/logic/players/ItemIsRemotelyHeldComponent.java
@@ -1,22 +1,9 @@
-/*
- * Copyright 2017 MovingBlocks
- *
- * 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 org.terasology.logic.players;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.players;
-import org.terasology.entitySystem.Component;
-import org.terasology.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.Component;
+import org.terasology.engine.entitySystem.entity.EntityRef;
/**
* This is used on the client side to track and clean up items that are no longer held by remote players, but are still location linked
diff --git a/engine/src/main/java/org/terasology/logic/players/LocalPlayer.java b/engine/src/main/java/org/terasology/logic/players/LocalPlayer.java
index a0ce3379b..77e77a0c0 100644
--- a/engine/src/main/java/org/terasology/logic/players/LocalPlayer.java
+++ b/engine/src/main/java/org/terasology/logic/players/LocalPlayer.java
@@ -1,25 +1,26 @@
// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.logic.players;
+package org.terasology.engine.logic.players;
import com.google.common.collect.Sets;
import org.joml.Quaternionf;
import org.joml.Vector3f;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.logic.characters.CharacterComponent;
-import org.terasology.logic.characters.CharacterMovementComponent;
-import org.terasology.logic.characters.CharacterSystem;
-import org.terasology.logic.characters.events.ActivationPredicted;
-import org.terasology.logic.characters.events.ActivationRequest;
-import org.terasology.logic.location.LocationComponent;
-import org.terasology.math.Direction;
-import org.terasology.network.ClientComponent;
-import org.terasology.physics.HitResult;
-import org.terasology.physics.Physics;
-import org.terasology.recording.DirectionAndOriginPosRecorderList;
-import org.terasology.recording.RecordAndReplayCurrentStatus;
-import org.terasology.recording.RecordAndReplayStatus;
-import org.terasology.registry.CoreRegistry;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.logic.characters.CharacterComponent;
+import org.terasology.engine.logic.characters.CharacterMovementComponent;
+import org.terasology.engine.logic.characters.CharacterSystem;
+import org.terasology.engine.logic.common.ActivateEvent;
+import org.terasology.engine.logic.location.LocationComponent;
+import org.terasology.engine.logic.characters.events.ActivationPredicted;
+import org.terasology.engine.logic.characters.events.ActivationRequest;
+import org.terasology.engine.math.Direction;
+import org.terasology.engine.network.ClientComponent;
+import org.terasology.engine.physics.HitResult;
+import org.terasology.engine.physics.Physics;
+import org.terasology.engine.recording.DirectionAndOriginPosRecorderList;
+import org.terasology.engine.recording.RecordAndReplayCurrentStatus;
+import org.terasology.engine.recording.RecordAndReplayStatus;
+import org.terasology.engine.registry.CoreRegistry;
public class LocalPlayer {
@@ -191,7 +192,7 @@ public class LocalPlayer {
*
diff --git a/engine/src/main/java/org/terasology/logic/players/PlayerFactory.java b/engine/src/main/java/org/terasology/logic/players/PlayerFactory.java
index 7e6437c4b..0c7eb1488 100644
--- a/engine/src/main/java/org/terasology/logic/players/PlayerFactory.java
+++ b/engine/src/main/java/org/terasology/logic/players/PlayerFactory.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2017 MovingBlocks
- *
- * 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 org.terasology.logic.players;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.players;
import org.joml.Quaternionf;
import org.joml.Vector2i;
@@ -24,17 +11,17 @@ import org.joml.Vector3i;
import org.joml.Vector3ic;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.terasology.entitySystem.ComponentContainer;
-import org.terasology.entitySystem.entity.EntityBuilder;
-import org.terasology.entitySystem.entity.EntityManager;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.logic.characters.CharacterComponent;
-import org.terasology.logic.characters.CharacterMovementComponent;
-import org.terasology.logic.location.Location;
-import org.terasology.logic.location.LocationComponent;
-import org.terasology.math.SpiralIterable;
+import org.terasology.engine.entitySystem.ComponentContainer;
+import org.terasology.engine.entitySystem.entity.EntityBuilder;
+import org.terasology.engine.entitySystem.entity.EntityManager;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.logic.characters.CharacterComponent;
+import org.terasology.engine.logic.characters.CharacterMovementComponent;
+import org.terasology.engine.logic.location.Location;
+import org.terasology.engine.logic.location.LocationComponent;
+import org.terasology.engine.math.SpiralIterable;
import org.terasology.math.TeraMath;
-import org.terasology.world.WorldProvider;
+import org.terasology.engine.world.WorldProvider;
import java.util.Optional;
diff --git a/engine/src/main/java/org/terasology/logic/players/PlayerSystem.java b/engine/src/main/java/org/terasology/logic/players/PlayerSystem.java
index a1c886f62..391f9e0d1 100644
--- a/engine/src/main/java/org/terasology/logic/players/PlayerSystem.java
+++ b/engine/src/main/java/org/terasology/logic/players/PlayerSystem.java
@@ -1,7 +1,7 @@
// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.logic.players;
+package org.terasology.engine.logic.players;
import com.google.common.collect.Lists;
import org.joml.Quaternionf;
@@ -10,35 +10,35 @@ import org.joml.Vector3fc;
import org.joml.Vector3ic;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.terasology.entitySystem.entity.EntityManager;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.entitySystem.event.EventPriority;
-import org.terasology.entitySystem.event.ReceiveEvent;
-import org.terasology.entitySystem.systems.BaseComponentSystem;
-import org.terasology.entitySystem.systems.RegisterMode;
-import org.terasology.entitySystem.systems.RegisterSystem;
-import org.terasology.entitySystem.systems.UpdateSubscriberSystem;
-import org.terasology.logic.characters.AliveCharacterComponent;
-import org.terasology.logic.characters.CharacterComponent;
-import org.terasology.logic.characters.CharacterTeleportEvent;
-import org.terasology.logic.health.BeforeDestroyEvent;
-import org.terasology.logic.location.Location;
-import org.terasology.logic.location.LocationComponent;
-import org.terasology.logic.players.event.OnPlayerRespawnedEvent;
-import org.terasology.logic.players.event.OnPlayerSpawnedEvent;
-import org.terasology.logic.players.event.RespawnRequestEvent;
-import org.terasology.network.Client;
-import org.terasology.network.ClientComponent;
-import org.terasology.network.NetworkSystem;
-import org.terasology.network.events.ConnectedEvent;
-import org.terasology.network.events.DisconnectedEvent;
-import org.terasology.persistence.PlayerStore;
-import org.terasology.registry.In;
-import org.terasology.rendering.world.viewDistance.ViewDistance;
-import org.terasology.world.WorldProvider;
-import org.terasology.world.chunks.ChunkProvider;
-import org.terasology.world.chunks.localChunkProvider.RelevanceSystem;
-import org.terasology.world.generator.WorldGenerator;
+import org.terasology.engine.entitySystem.entity.EntityManager;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.event.EventPriority;
+import org.terasology.engine.entitySystem.event.ReceiveEvent;
+import org.terasology.engine.entitySystem.systems.BaseComponentSystem;
+import org.terasology.engine.entitySystem.systems.RegisterMode;
+import org.terasology.engine.entitySystem.systems.RegisterSystem;
+import org.terasology.engine.entitySystem.systems.UpdateSubscriberSystem;
+import org.terasology.engine.logic.characters.AliveCharacterComponent;
+import org.terasology.engine.logic.characters.CharacterComponent;
+import org.terasology.engine.logic.characters.CharacterTeleportEvent;
+import org.terasology.engine.logic.location.Location;
+import org.terasology.engine.logic.location.LocationComponent;
+import org.terasology.engine.logic.players.event.OnPlayerRespawnedEvent;
+import org.terasology.engine.logic.players.event.OnPlayerSpawnedEvent;
+import org.terasology.engine.logic.players.event.RespawnRequestEvent;
+import org.terasology.engine.logic.health.BeforeDestroyEvent;
+import org.terasology.engine.network.Client;
+import org.terasology.engine.network.ClientComponent;
+import org.terasology.engine.network.NetworkSystem;
+import org.terasology.engine.network.events.ConnectedEvent;
+import org.terasology.engine.network.events.DisconnectedEvent;
+import org.terasology.engine.persistence.PlayerStore;
+import org.terasology.engine.registry.In;
+import org.terasology.engine.rendering.world.viewDistance.ViewDistance;
+import org.terasology.engine.world.WorldProvider;
+import org.terasology.engine.world.chunks.ChunkProvider;
+import org.terasology.engine.world.chunks.localChunkProvider.RelevanceSystem;
+import org.terasology.engine.world.generator.WorldGenerator;
import java.util.Iterator;
import java.util.List;
diff --git a/engine/src/main/java/org/terasology/logic/players/PlayerTargetChangedEvent.java b/engine/src/main/java/org/terasology/logic/players/PlayerTargetChangedEvent.java
index 178b14e41..09b77095b 100644
--- a/engine/src/main/java/org/terasology/logic/players/PlayerTargetChangedEvent.java
+++ b/engine/src/main/java/org/terasology/logic/players/PlayerTargetChangedEvent.java
@@ -1,23 +1,10 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.logic.players;
+package org.terasology.engine.logic.players;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.entitySystem.event.Event;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.event.Event;
/**
* Fired whenever the targeted entity changes (must be within activation range).
diff --git a/engine/src/main/java/org/terasology/logic/players/PlayerUtil.java b/engine/src/main/java/org/terasology/logic/players/PlayerUtil.java
index 8d0ea3b30..b8c32a684 100644
--- a/engine/src/main/java/org/terasology/logic/players/PlayerUtil.java
+++ b/engine/src/main/java/org/terasology/logic/players/PlayerUtil.java
@@ -1,23 +1,10 @@
-/*
- * Copyright 2015 MovingBlocks
- *
- * 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 org.terasology.logic.players;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.players;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.logic.common.DisplayNameComponent;
-import org.terasology.network.ColorComponent;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.logic.common.DisplayNameComponent;
+import org.terasology.engine.network.ColorComponent;
import org.terasology.nui.FontColor;
/**
diff --git a/engine/src/main/java/org/terasology/logic/players/RemotePersonHeldItemMountPointComponent.java b/engine/src/main/java/org/terasology/logic/players/RemotePersonHeldItemMountPointComponent.java
index ae64482bd..bc62714b0 100644
--- a/engine/src/main/java/org/terasology/logic/players/RemotePersonHeldItemMountPointComponent.java
+++ b/engine/src/main/java/org/terasology/logic/players/RemotePersonHeldItemMountPointComponent.java
@@ -1,25 +1,12 @@
-/*
- * Copyright 2017 MovingBlocks
- *
- * 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 org.terasology.logic.players;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.players;
import org.joml.Quaternionf;
import org.joml.Vector3f;
-import org.terasology.entitySystem.Component;
-import org.terasology.entitySystem.Owns;
-import org.terasology.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.Component;
+import org.terasology.engine.entitySystem.Owns;
+import org.terasology.engine.entitySystem.entity.EntityRef;
/**
* Only used by the client side so that held items of other players can be positioned in line with them.
diff --git a/engine/src/main/java/org/terasology/logic/players/RemotePersonHeldItemTransformComponent.java b/engine/src/main/java/org/terasology/logic/players/RemotePersonHeldItemTransformComponent.java
index 7b588592f..ede7d042d 100644
--- a/engine/src/main/java/org/terasology/logic/players/RemotePersonHeldItemTransformComponent.java
+++ b/engine/src/main/java/org/terasology/logic/players/RemotePersonHeldItemTransformComponent.java
@@ -1,22 +1,9 @@
-/*
- * Copyright 2017 MovingBlocks
- *
- * 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 org.terasology.logic.players;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.players;
import org.joml.Vector3f;
-import org.terasology.rendering.logic.VisualComponent;
+import org.terasology.engine.rendering.logic.VisualComponent;
public class RemotePersonHeldItemTransformComponent implements VisualComponent {
public Vector3f rotateDegrees = new Vector3f();
diff --git a/engine/src/main/java/org/terasology/logic/players/StaticSpawnLocationComponent.java b/engine/src/main/java/org/terasology/logic/players/StaticSpawnLocationComponent.java
index 3c146761e..2467e7dae 100644
--- a/engine/src/main/java/org/terasology/logic/players/StaticSpawnLocationComponent.java
+++ b/engine/src/main/java/org/terasology/logic/players/StaticSpawnLocationComponent.java
@@ -1,23 +1,10 @@
-/*
- * Copyright 2017 MovingBlocks
- *
- * 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 org.terasology.logic.players;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.players;
import org.joml.Vector3f;
-import org.terasology.entitySystem.Component;
-import org.terasology.network.Replicate;
+import org.terasology.engine.entitySystem.Component;
+import org.terasology.engine.network.Replicate;
/**
* This is attached to the player entities in order to manually set a custom spawn location.
diff --git a/engine/src/main/java/org/terasology/logic/players/ThirdPersonRemoteClientSystem.java b/engine/src/main/java/org/terasology/logic/players/ThirdPersonRemoteClientSystem.java
index bbf320bdd..3b82cc3df 100644
--- a/engine/src/main/java/org/terasology/logic/players/ThirdPersonRemoteClientSystem.java
+++ b/engine/src/main/java/org/terasology/logic/players/ThirdPersonRemoteClientSystem.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2018 MovingBlocks
- *
- * 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 org.terasology.logic.players;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.players;
import com.google.common.collect.Sets;
import org.joml.Math;
@@ -21,27 +8,27 @@ import org.joml.Quaternionf;
import org.joml.Vector3f;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.terasology.engine.Time;
-import org.terasology.entitySystem.Component;
-import org.terasology.entitySystem.entity.EntityBuilder;
-import org.terasology.entitySystem.entity.EntityManager;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.entitySystem.entity.lifecycleEvents.OnActivatedComponent;
-import org.terasology.entitySystem.entity.lifecycleEvents.OnChangedComponent;
-import org.terasology.entitySystem.event.ReceiveEvent;
-import org.terasology.entitySystem.systems.BaseComponentSystem;
-import org.terasology.entitySystem.systems.RegisterMode;
-import org.terasology.entitySystem.systems.RegisterSystem;
-import org.terasology.entitySystem.systems.UpdateSubscriberSystem;
-import org.terasology.logic.characters.CharacterComponent;
-import org.terasology.logic.characters.CharacterHeldItemComponent;
-import org.terasology.logic.console.commandSystem.annotations.Command;
-import org.terasology.logic.console.commandSystem.annotations.CommandParam;
-import org.terasology.logic.location.Location;
-import org.terasology.logic.location.LocationComponent;
-import org.terasology.network.ClientComponent;
-import org.terasology.registry.In;
-import org.terasology.rendering.logic.VisualComponent;
+import org.terasology.engine.core.Time;
+import org.terasology.engine.entitySystem.Component;
+import org.terasology.engine.entitySystem.entity.EntityBuilder;
+import org.terasology.engine.entitySystem.entity.EntityManager;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.entity.lifecycleEvents.OnActivatedComponent;
+import org.terasology.engine.entitySystem.entity.lifecycleEvents.OnChangedComponent;
+import org.terasology.engine.entitySystem.event.ReceiveEvent;
+import org.terasology.engine.entitySystem.systems.BaseComponentSystem;
+import org.terasology.engine.entitySystem.systems.RegisterMode;
+import org.terasology.engine.entitySystem.systems.RegisterSystem;
+import org.terasology.engine.entitySystem.systems.UpdateSubscriberSystem;
+import org.terasology.engine.logic.characters.CharacterComponent;
+import org.terasology.engine.logic.location.Location;
+import org.terasology.engine.logic.location.LocationComponent;
+import org.terasology.engine.logic.characters.CharacterHeldItemComponent;
+import org.terasology.engine.logic.console.commandSystem.annotations.Command;
+import org.terasology.engine.logic.console.commandSystem.annotations.CommandParam;
+import org.terasology.engine.network.ClientComponent;
+import org.terasology.engine.registry.In;
+import org.terasology.engine.rendering.logic.VisualComponent;
import java.util.Iterator;
import java.util.Set;
diff --git a/engine/src/main/java/org/terasology/logic/players/WorldtimeResyncSystem.java b/engine/src/main/java/org/terasology/logic/players/WorldtimeResyncSystem.java
index e89702a24..c5156b665 100644
--- a/engine/src/main/java/org/terasology/logic/players/WorldtimeResyncSystem.java
+++ b/engine/src/main/java/org/terasology/logic/players/WorldtimeResyncSystem.java
@@ -1,16 +1,16 @@
-// Copyright 2020 The Terasology Foundation
+// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.logic.players;
+package org.terasology.engine.logic.players;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.entitySystem.event.ReceiveEvent;
-import org.terasology.entitySystem.systems.BaseComponentSystem;
-import org.terasology.entitySystem.systems.RegisterMode;
-import org.terasology.entitySystem.systems.RegisterSystem;
-import org.terasology.logic.time.WorldtimeResyncEvent;
-import org.terasology.network.ClientComponent;
-import org.terasology.registry.In;
-import org.terasology.world.WorldProvider;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.event.ReceiveEvent;
+import org.terasology.engine.entitySystem.systems.BaseComponentSystem;
+import org.terasology.engine.entitySystem.systems.RegisterMode;
+import org.terasology.engine.entitySystem.systems.RegisterSystem;
+import org.terasology.engine.logic.time.WorldtimeResyncEvent;
+import org.terasology.engine.network.ClientComponent;
+import org.terasology.engine.registry.In;
+import org.terasology.engine.world.WorldProvider;
@RegisterSystem(RegisterMode.CLIENT)
public class WorldtimeResyncSystem extends BaseComponentSystem {
diff --git a/engine/src/main/java/org/terasology/logic/players/event/LocalPlayerInitializedEvent.java b/engine/src/main/java/org/terasology/logic/players/event/LocalPlayerInitializedEvent.java
index aa88432d0..d49d70835 100644
--- a/engine/src/main/java/org/terasology/logic/players/event/LocalPlayerInitializedEvent.java
+++ b/engine/src/main/java/org/terasology/logic/players/event/LocalPlayerInitializedEvent.java
@@ -1,26 +1,14 @@
-/*
- * Copyright 2020 MovingBlocks
- *
- * 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 org.terasology.logic.players.event;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.players.event;
-import org.terasology.entitySystem.event.Event;
+import org.terasology.engine.entitySystem.event.Event;
+import org.terasology.engine.logic.players.LocalPlayer;
/**
- * This event gets sent when the {@link org.terasology.logic.players.LocalPlayer} object is ready to be used.
+ * This event gets sent when the {@link LocalPlayer} object is ready to be used.
*
- * The object can be injected using {@link org.terasology.registry.In}.
+ * The object can be injected using {@link org.terasology.engine.registry.In}.
* This event corresponds with its isValid() method returning true for the first time.
*/
public class LocalPlayerInitializedEvent implements Event {
diff --git a/engine/src/main/java/org/terasology/logic/players/event/OnPlayerRespawnedEvent.java b/engine/src/main/java/org/terasology/logic/players/event/OnPlayerRespawnedEvent.java
index 988d91265..428cc9e9f 100644
--- a/engine/src/main/java/org/terasology/logic/players/event/OnPlayerRespawnedEvent.java
+++ b/engine/src/main/java/org/terasology/logic/players/event/OnPlayerRespawnedEvent.java
@@ -1,21 +1,8 @@
-/*
- * Copyright 2017 MovingBlocks
- *
- * 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 org.terasology.logic.players.event;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.players.event;
-import org.terasology.entitySystem.event.Event;
+import org.terasology.engine.entitySystem.event.Event;
/**
* This event gets sent when the player respawns.
diff --git a/engine/src/main/java/org/terasology/logic/players/event/OnPlayerSpawnedEvent.java b/engine/src/main/java/org/terasology/logic/players/event/OnPlayerSpawnedEvent.java
index d381f89f1..556957e48 100644
--- a/engine/src/main/java/org/terasology/logic/players/event/OnPlayerSpawnedEvent.java
+++ b/engine/src/main/java/org/terasology/logic/players/event/OnPlayerSpawnedEvent.java
@@ -1,21 +1,8 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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 org.terasology.logic.players.event;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.players.event;
-import org.terasology.entitySystem.event.Event;
+import org.terasology.engine.entitySystem.event.Event;
/**
* This event gets sent when the player spawns.
diff --git a/engine/src/main/java/org/terasology/logic/players/event/ResetCameraEvent.java b/engine/src/main/java/org/terasology/logic/players/event/ResetCameraEvent.java
index dc41d1160..4efd6eb58 100644
--- a/engine/src/main/java/org/terasology/logic/players/event/ResetCameraEvent.java
+++ b/engine/src/main/java/org/terasology/logic/players/event/ResetCameraEvent.java
@@ -1,21 +1,8 @@
-/*
- * Copyright 2015 MovingBlocks
- *
- * 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 org.terasology.logic.players.event;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.players.event;
-import org.terasology.entitySystem.event.Event;
+import org.terasology.engine.entitySystem.event.Event;
public class ResetCameraEvent implements Event {
}
diff --git a/engine/src/main/java/org/terasology/logic/players/event/RespawnRequestEvent.java b/engine/src/main/java/org/terasology/logic/players/event/RespawnRequestEvent.java
index b297dad62..4ce569677 100644
--- a/engine/src/main/java/org/terasology/logic/players/event/RespawnRequestEvent.java
+++ b/engine/src/main/java/org/terasology/logic/players/event/RespawnRequestEvent.java
@@ -1,23 +1,10 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.logic.players.event;
+package org.terasology.engine.logic.players.event;
-import org.terasology.entitySystem.event.Event;
-import org.terasology.network.ServerEvent;
+import org.terasology.engine.entitySystem.event.Event;
+import org.terasology.engine.network.ServerEvent;
/**
*/
diff --git a/engine/src/main/java/org/terasology/logic/players/event/SynchronizeClientTimeSystem.java b/engine/src/main/java/org/terasology/logic/players/event/SynchronizeClientTimeSystem.java
index 1a425144c..78ecb95bb 100644
--- a/engine/src/main/java/org/terasology/logic/players/event/SynchronizeClientTimeSystem.java
+++ b/engine/src/main/java/org/terasology/logic/players/event/SynchronizeClientTimeSystem.java
@@ -1,16 +1,16 @@
-// Copyright 2020 The Terasology Foundation
+// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.logic.players.event;
+package org.terasology.engine.logic.players.event;
-import org.terasology.entitySystem.entity.EntityManager;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.entitySystem.event.ReceiveEvent;
-import org.terasology.entitySystem.systems.BaseComponentSystem;
-import org.terasology.entitySystem.systems.RegisterMode;
-import org.terasology.entitySystem.systems.RegisterSystem;
-import org.terasology.logic.time.WorldtimeResyncEvent;
-import org.terasology.network.ClientComponent;
-import org.terasology.registry.In;
+import org.terasology.engine.entitySystem.entity.EntityManager;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.event.ReceiveEvent;
+import org.terasology.engine.entitySystem.systems.BaseComponentSystem;
+import org.terasology.engine.entitySystem.systems.RegisterMode;
+import org.terasology.engine.entitySystem.systems.RegisterSystem;
+import org.terasology.engine.logic.time.WorldtimeResyncEvent;
+import org.terasology.engine.network.ClientComponent;
+import org.terasology.engine.registry.In;
@RegisterSystem(RegisterMode.AUTHORITY)
public class SynchronizeClientTimeSystem extends BaseComponentSystem {
diff --git a/engine/src/main/java/org/terasology/logic/players/event/WorldtimeResetEvent.java b/engine/src/main/java/org/terasology/logic/players/event/WorldtimeResetEvent.java
index e4fa27c7e..34fc0ae5a 100644
--- a/engine/src/main/java/org/terasology/logic/players/event/WorldtimeResetEvent.java
+++ b/engine/src/main/java/org/terasology/logic/players/event/WorldtimeResetEvent.java
@@ -1,9 +1,9 @@
-// Copyright 2020 The Terasology Foundation
+// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.logic.players.event;
+package org.terasology.engine.logic.players.event;
-import org.terasology.entitySystem.event.Event;
-import org.terasology.network.ServerEvent;
+import org.terasology.engine.entitySystem.event.Event;
+import org.terasology.engine.network.ServerEvent;
@ServerEvent
public class WorldtimeResetEvent implements Event {
diff --git a/engine/src/main/java/org/terasology/logic/players/event/package-info.java b/engine/src/main/java/org/terasology/logic/players/event/package-info.java
index 05f9ccb89..ed2322120 100644
--- a/engine/src/main/java/org/terasology/logic/players/event/package-info.java
+++ b/engine/src/main/java/org/terasology/logic/players/event/package-info.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-@API package org.terasology.logic.players.event;
+@API package org.terasology.engine.logic.players.event;
import org.terasology.module.sandbox.API;
diff --git a/engine/src/main/java/org/terasology/logic/players/package-info.java b/engine/src/main/java/org/terasology/logic/players/package-info.java
index 77886f2ca..eb2e66266 100644
--- a/engine/src/main/java/org/terasology/logic/players/package-info.java
+++ b/engine/src/main/java/org/terasology/logic/players/package-info.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-@API package org.terasology.logic.players;
+@API package org.terasology.engine.logic.players;
import org.terasology.module.sandbox.API;
diff --git a/engine/src/main/java/org/terasology/logic/selection/ApplyBlockSelectionEvent.java b/engine/src/main/java/org/terasology/logic/selection/ApplyBlockSelectionEvent.java
index 22f40b753..4169a9800 100644
--- a/engine/src/main/java/org/terasology/logic/selection/ApplyBlockSelectionEvent.java
+++ b/engine/src/main/java/org/terasology/logic/selection/ApplyBlockSelectionEvent.java
@@ -1,11 +1,11 @@
// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.logic.selection;
+package org.terasology.engine.logic.selection;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.entitySystem.event.Event;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.event.Event;
import org.terasology.module.sandbox.API;
-import org.terasology.world.block.BlockRegion;
+import org.terasology.engine.world.block.BlockRegion;
/**
* This event is fired once a player finished a selection using an item with a BlockSelectionComponent. The item used
diff --git a/engine/src/main/java/org/terasology/logic/selection/LocalPlayerBlockSelectionByItemSystem.java b/engine/src/main/java/org/terasology/logic/selection/LocalPlayerBlockSelectionByItemSystem.java
index 652070327..fb403b935 100644
--- a/engine/src/main/java/org/terasology/logic/selection/LocalPlayerBlockSelectionByItemSystem.java
+++ b/engine/src/main/java/org/terasology/logic/selection/LocalPlayerBlockSelectionByItemSystem.java
@@ -1,38 +1,24 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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 org.terasology.logic.selection;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.selection;
import org.joml.RoundingMode;
import org.joml.Vector3f;
import org.joml.Vector3i;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.entitySystem.event.ReceiveEvent;
-import org.terasology.entitySystem.systems.BaseComponentSystem;
-import org.terasology.entitySystem.systems.RegisterMode;
-import org.terasology.entitySystem.systems.RegisterSystem;
-import org.terasology.input.cameraTarget.CameraTargetChangedEvent;
-import org.terasology.input.events.LeftMouseDownButtonEvent;
-import org.terasology.logic.common.ActivateEvent;
-import org.terasology.logic.location.LocationComponent;
-import org.terasology.logic.players.LocalPlayer;
-import org.terasology.registry.In;
-import org.terasology.world.block.BlockRegion;
-import org.terasology.world.selection.BlockSelectionComponent;
-import org.terasology.world.selection.event.SetBlockSelectionEndingPointEvent;
-import org.terasology.world.selection.event.SetBlockSelectionStartingPointEvent;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.event.ReceiveEvent;
+import org.terasology.engine.entitySystem.systems.BaseComponentSystem;
+import org.terasology.engine.entitySystem.systems.RegisterMode;
+import org.terasology.engine.entitySystem.systems.RegisterSystem;
+import org.terasology.engine.input.cameraTarget.CameraTargetChangedEvent;
+import org.terasology.engine.input.events.LeftMouseDownButtonEvent;
+import org.terasology.engine.logic.common.ActivateEvent;
+import org.terasology.engine.logic.location.LocationComponent;
+import org.terasology.engine.logic.players.LocalPlayer;
+import org.terasology.engine.registry.In;
+import org.terasology.engine.world.selection.BlockSelectionComponent;
+import org.terasology.engine.world.selection.event.SetBlockSelectionEndingPointEvent;
+import org.terasology.engine.world.selection.event.SetBlockSelectionStartingPointEvent;
/**
* System to allow the use of BlockSelectionComponents. This system is a client only system, though no other player
diff --git a/engine/src/main/java/org/terasology/logic/selection/MovableSelectionEndEvent.java b/engine/src/main/java/org/terasology/logic/selection/MovableSelectionEndEvent.java
index 958f5f894..47bca86eb 100644
--- a/engine/src/main/java/org/terasology/logic/selection/MovableSelectionEndEvent.java
+++ b/engine/src/main/java/org/terasology/logic/selection/MovableSelectionEndEvent.java
@@ -1,10 +1,10 @@
// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.logic.selection;
+package org.terasology.engine.logic.selection;
-import org.terasology.entitySystem.event.Event;
+import org.terasology.engine.entitySystem.event.Event;
import org.terasology.module.sandbox.API;
-import org.terasology.world.block.BlockRegion;
+import org.terasology.engine.world.block.BlockRegion;
/**
* This event is sent when the player finalizes the position of a moving selection by clicking the left mouse button.
diff --git a/engine/src/main/java/org/terasology/logic/selection/MovableSelectionStartEvent.java b/engine/src/main/java/org/terasology/logic/selection/MovableSelectionStartEvent.java
index 5acea5bfd..c685557b8 100644
--- a/engine/src/main/java/org/terasology/logic/selection/MovableSelectionStartEvent.java
+++ b/engine/src/main/java/org/terasology/logic/selection/MovableSelectionStartEvent.java
@@ -1,28 +1,16 @@
-/*
- * Copyright 2019 MovingBlocks
- *
- * 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 org.terasology.logic.selection;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.selection;
+import org.terasology.engine.world.selection.BlockSelectionComponent;
import org.terasology.module.sandbox.API;
-import org.terasology.entitySystem.event.Event;
+import org.terasology.engine.entitySystem.event.Event;
/**
* This event should be sent by a system after it receives a {@link ApplyBlockSelectionEvent} which marks the end of a
* region selection. This event marks the start of the binding of the camera position with the selected region.
*
- * The entity used to send this event must have the {@link org.terasology.world.selection.BlockSelectionComponent}
+ * The entity used to send this event must have the {@link BlockSelectionComponent}
*/
@API
public class MovableSelectionStartEvent implements Event {
diff --git a/engine/src/main/java/org/terasology/logic/selection/OnItemActivateSelectionComponent.java b/engine/src/main/java/org/terasology/logic/selection/OnItemActivateSelectionComponent.java
index d1f94dde9..bdf598bff 100644
--- a/engine/src/main/java/org/terasology/logic/selection/OnItemActivateSelectionComponent.java
+++ b/engine/src/main/java/org/terasology/logic/selection/OnItemActivateSelectionComponent.java
@@ -1,21 +1,8 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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 org.terasology.logic.selection;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.selection;
-import org.terasology.entitySystem.Component;
+import org.terasology.engine.entitySystem.Component;
public final class OnItemActivateSelectionComponent implements Component {
diff --git a/engine/src/main/java/org/terasology/logic/spawner/AbstractSpawner.java b/engine/src/main/java/org/terasology/logic/spawner/AbstractSpawner.java
index 661d4131c..f9a5b0fbd 100644
--- a/engine/src/main/java/org/terasology/logic/spawner/AbstractSpawner.java
+++ b/engine/src/main/java/org/terasology/logic/spawner/AbstractSpawner.java
@@ -1,35 +1,22 @@
-/*
- * Copyright 2015 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.logic.spawner;
+package org.terasology.engine.logic.spawner;
import org.joml.Vector2i;
import org.joml.Vector2ic;
import org.joml.Vector3f;
import org.joml.Vector3i;
-import org.terasology.math.SpiralIterable;
+import org.terasology.engine.math.SpiralIterable;
import org.terasology.math.TeraMath;
-import org.terasology.world.block.BlockRegion;
-import org.terasology.world.generation.Region;
-import org.terasology.world.generation.World;
-import org.terasology.world.generation.facets.ElevationFacet;
-import org.terasology.world.generation.facets.SeaLevelFacet;
-import org.terasology.world.generation.facets.SpawnHeightFacet;
-import org.terasology.world.generation.facets.StrictlySparseSeaLevelFacet;
-import org.terasology.world.generation.facets.SurfacesFacet;
+import org.terasology.engine.world.block.BlockRegion;
+import org.terasology.engine.world.generation.Region;
+import org.terasology.engine.world.generation.World;
+import org.terasology.engine.world.generation.facets.ElevationFacet;
+import org.terasology.engine.world.generation.facets.SeaLevelFacet;
+import org.terasology.engine.world.generation.facets.SpawnHeightFacet;
+import org.terasology.engine.world.generation.facets.StrictlySparseSeaLevelFacet;
+import org.terasology.engine.world.generation.facets.SurfacesFacet;
import java.util.Optional;
import java.util.function.Function;
diff --git a/engine/src/main/java/org/terasology/logic/spawner/FixedSpawner.java b/engine/src/main/java/org/terasology/logic/spawner/FixedSpawner.java
index 5d8c1de6e..a555ed7b4 100644
--- a/engine/src/main/java/org/terasology/logic/spawner/FixedSpawner.java
+++ b/engine/src/main/java/org/terasology/logic/spawner/FixedSpawner.java
@@ -1,25 +1,12 @@
-/*
- * Copyright 2015 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.logic.spawner;
+package org.terasology.engine.logic.spawner;
import org.joml.Vector2i;
import org.joml.Vector3f;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.world.generation.World;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.world.generation.World;
/**
* Spawns all entities at a fixed location.
diff --git a/engine/src/main/java/org/terasology/logic/spawner/Spawner.java b/engine/src/main/java/org/terasology/logic/spawner/Spawner.java
index 228b78229..8baec74c3 100644
--- a/engine/src/main/java/org/terasology/logic/spawner/Spawner.java
+++ b/engine/src/main/java/org/terasology/logic/spawner/Spawner.java
@@ -1,24 +1,11 @@
-/*
- * Copyright 2015 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.logic.spawner;
+package org.terasology.engine.logic.spawner;
import org.joml.Vector3f;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.world.generation.World;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.world.generation.World;
/**
* Defines spawning points.
diff --git a/engine/src/main/java/org/terasology/logic/spawner/package-info.java b/engine/src/main/java/org/terasology/logic/spawner/package-info.java
index c179f9944..002476c4e 100644
--- a/engine/src/main/java/org/terasology/logic/spawner/package-info.java
+++ b/engine/src/main/java/org/terasology/logic/spawner/package-info.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2015 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-@API package org.terasology.logic.spawner;
+@API package org.terasology.engine.logic.spawner;
import org.terasology.module.sandbox.API;
diff --git a/engine/src/main/java/org/terasology/logic/time/TimeAuthoritySystem.java b/engine/src/main/java/org/terasology/logic/time/TimeAuthoritySystem.java
index 877f690a2..5107104ca 100644
--- a/engine/src/main/java/org/terasology/logic/time/TimeAuthoritySystem.java
+++ b/engine/src/main/java/org/terasology/logic/time/TimeAuthoritySystem.java
@@ -1,28 +1,15 @@
-/*
- * Copyright 2016 MovingBlocks
- *
- * 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 org.terasology.logic.time;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.time;
-import org.terasology.engine.Time;
-import org.terasology.entitySystem.systems.BaseComponentSystem;
-import org.terasology.entitySystem.systems.RegisterSystem;
-import org.terasology.entitySystem.systems.UpdateSubscriberSystem;
-import org.terasology.logic.console.commandSystem.annotations.Command;
-import org.terasology.logic.permission.PermissionManager;
-import org.terasology.registry.In;
-import org.terasology.world.WorldProvider;
+import org.terasology.engine.core.Time;
+import org.terasology.engine.entitySystem.systems.BaseComponentSystem;
+import org.terasology.engine.entitySystem.systems.RegisterSystem;
+import org.terasology.engine.entitySystem.systems.UpdateSubscriberSystem;
+import org.terasology.engine.logic.console.commandSystem.annotations.Command;
+import org.terasology.engine.logic.permission.PermissionManager;
+import org.terasology.engine.registry.In;
+import org.terasology.engine.world.WorldProvider;
@RegisterSystem
public class TimeAuthoritySystem extends BaseComponentSystem implements UpdateSubscriberSystem {
diff --git a/engine/src/main/java/org/terasology/logic/time/TimeClientSystem.java b/engine/src/main/java/org/terasology/logic/time/TimeClientSystem.java
index ae966632d..09657455e 100644
--- a/engine/src/main/java/org/terasology/logic/time/TimeClientSystem.java
+++ b/engine/src/main/java/org/terasology/logic/time/TimeClientSystem.java
@@ -1,27 +1,14 @@
-/*
- * Copyright 2016 MovingBlocks
- *
- * 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 org.terasology.logic.time;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.time;
-import org.terasology.engine.Time;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.entitySystem.event.ReceiveEvent;
-import org.terasology.entitySystem.systems.BaseComponentSystem;
-import org.terasology.entitySystem.systems.RegisterMode;
-import org.terasology.entitySystem.systems.RegisterSystem;
-import org.terasology.registry.In;
+import org.terasology.engine.core.Time;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.event.ReceiveEvent;
+import org.terasology.engine.entitySystem.systems.BaseComponentSystem;
+import org.terasology.engine.entitySystem.systems.RegisterMode;
+import org.terasology.engine.entitySystem.systems.RegisterSystem;
+import org.terasology.engine.registry.In;
@RegisterSystem(RegisterMode.CLIENT)
public class TimeClientSystem extends BaseComponentSystem {
diff --git a/engine/src/main/java/org/terasology/logic/time/TimeResynchEvent.java b/engine/src/main/java/org/terasology/logic/time/TimeResynchEvent.java
index 280d76d86..febc85382 100644
--- a/engine/src/main/java/org/terasology/logic/time/TimeResynchEvent.java
+++ b/engine/src/main/java/org/terasology/logic/time/TimeResynchEvent.java
@@ -1,22 +1,9 @@
-/*
- * Copyright 2016 MovingBlocks
- *
- * 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 org.terasology.logic.time;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.logic.time;
-import org.terasology.entitySystem.event.Event;
-import org.terasology.network.BroadcastEvent;
+import org.terasology.engine.entitySystem.event.Event;
+import org.terasology.engine.network.BroadcastEvent;
@BroadcastEvent
public class TimeResynchEvent implements Event {
diff --git a/engine/src/main/java/org/terasology/logic/time/WorldtimeResyncEvent.java b/engine/src/main/java/org/terasology/logic/time/WorldtimeResyncEvent.java
index 10f353974..25076a5b9 100644
--- a/engine/src/main/java/org/terasology/logic/time/WorldtimeResyncEvent.java
+++ b/engine/src/main/java/org/terasology/logic/time/WorldtimeResyncEvent.java
@@ -1,9 +1,9 @@
-// Copyright 2020 The Terasology Foundation
+// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.logic.time;
+package org.terasology.engine.logic.time;
-import org.terasology.entitySystem.event.Event;
-import org.terasology.network.OwnerEvent;
+import org.terasology.engine.entitySystem.event.Event;
+import org.terasology.engine.network.OwnerEvent;
@OwnerEvent
public class WorldtimeResyncEvent implements Event {
diff --git a/engine/src/main/java/org/terasology/math/Diamond3iIterable.java b/engine/src/main/java/org/terasology/math/Diamond3iIterable.java
index 07094b1d8..5544ccf02 100644
--- a/engine/src/main/java/org/terasology/math/Diamond3iIterable.java
+++ b/engine/src/main/java/org/terasology/math/Diamond3iIterable.java
@@ -1,24 +1,12 @@
-/*
- * Copyright 2020 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.math;
+package org.terasology.engine.math;
import com.google.common.base.Preconditions;
import org.joml.Vector3i;
import org.joml.Vector3ic;
+import org.terasology.math.TeraMath;
import java.util.Iterator;
diff --git a/engine/src/main/java/org/terasology/math/Direction.java b/engine/src/main/java/org/terasology/math/Direction.java
index b5d635c8d..d9940ac5f 100644
--- a/engine/src/main/java/org/terasology/math/Direction.java
+++ b/engine/src/main/java/org/terasology/math/Direction.java
@@ -1,6 +1,6 @@
-// Copyright 2020 The Terasology Foundation
+// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.math;
+package org.terasology.engine.math;
import com.google.common.collect.Maps;
import org.joml.Math;
diff --git a/engine/src/main/java/org/terasology/math/IntegerRange.java b/engine/src/main/java/org/terasology/math/IntegerRange.java
index ac7bca152..904638ed9 100644
--- a/engine/src/main/java/org/terasology/math/IntegerRange.java
+++ b/engine/src/main/java/org/terasology/math/IntegerRange.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2015 MovingBlocks
- *
- * 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 org.terasology.math;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.math;
import java.util.Iterator;
import java.util.Map;
diff --git a/engine/src/main/java/org/terasology/math/LSystemRule.java b/engine/src/main/java/org/terasology/math/LSystemRule.java
index cb1812114..387f51f1d 100644
--- a/engine/src/main/java/org/terasology/math/LSystemRule.java
+++ b/engine/src/main/java/org/terasology/math/LSystemRule.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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 org.terasology.math;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.math;
public class LSystemRule {
private final String axiom;
diff --git a/engine/src/main/java/org/terasology/math/Pitch.java b/engine/src/main/java/org/terasology/math/Pitch.java
index 39fe7cf89..f9bd881bd 100644
--- a/engine/src/main/java/org/terasology/math/Pitch.java
+++ b/engine/src/main/java/org/terasology/math/Pitch.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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 org.terasology.math;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.math;
/**
* Enumeration for pitch
diff --git a/engine/src/main/java/org/terasology/math/Roll.java b/engine/src/main/java/org/terasology/math/Roll.java
index 4157403ee..bba239c57 100644
--- a/engine/src/main/java/org/terasology/math/Roll.java
+++ b/engine/src/main/java/org/terasology/math/Roll.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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 org.terasology.math;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.math;
/**
* Enumeration for Roll.
diff --git a/engine/src/main/java/org/terasology/math/Rotation.java b/engine/src/main/java/org/terasology/math/Rotation.java
index d03180bc2..65ee3b895 100644
--- a/engine/src/main/java/org/terasology/math/Rotation.java
+++ b/engine/src/main/java/org/terasology/math/Rotation.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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 org.terasology.math;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.math;
import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableList;
diff --git a/engine/src/main/java/org/terasology/math/Side.java b/engine/src/main/java/org/terasology/math/Side.java
index f34c415a5..02c5b64c2 100644
--- a/engine/src/main/java/org/terasology/math/Side.java
+++ b/engine/src/main/java/org/terasology/math/Side.java
@@ -1,25 +1,13 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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 org.terasology.math;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.math;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Maps;
import org.joml.Vector3fc;
import org.joml.Vector3i;
import org.joml.Vector3ic;
+import org.terasology.math.TeraMath;
import java.util.EnumMap;
import java.util.EnumSet;
diff --git a/engine/src/main/java/org/terasology/math/SideBitFlag.java b/engine/src/main/java/org/terasology/math/SideBitFlag.java
index 51303c609..92b00c15c 100644
--- a/engine/src/main/java/org/terasology/math/SideBitFlag.java
+++ b/engine/src/main/java/org/terasology/math/SideBitFlag.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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 org.terasology.math;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.math;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
diff --git a/engine/src/main/java/org/terasology/math/SpiralIterable.java b/engine/src/main/java/org/terasology/math/SpiralIterable.java
index 9b1a588cc..13d00e98b 100644
--- a/engine/src/main/java/org/terasology/math/SpiralIterable.java
+++ b/engine/src/main/java/org/terasology/math/SpiralIterable.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2020 MovingBlocks
- *
- * 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 org.terasology.math;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.math;
import com.google.common.base.Preconditions;
import org.joml.Vector2i;
diff --git a/engine/src/main/java/org/terasology/math/Yaw.java b/engine/src/main/java/org/terasology/math/Yaw.java
index a799bc2a2..4060b48a5 100644
--- a/engine/src/main/java/org/terasology/math/Yaw.java
+++ b/engine/src/main/java/org/terasology/math/Yaw.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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 org.terasology.math;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.math;
/**
* Enumeration for yaw
diff --git a/engine/src/main/java/org/terasology/math/package-info.java b/engine/src/main/java/org/terasology/math/package-info.java
index 7ee378fc8..682049738 100644
--- a/engine/src/main/java/org/terasology/math/package-info.java
+++ b/engine/src/main/java/org/terasology/math/package-info.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-@API package org.terasology.math;
+@API package org.terasology.engine.math;
import org.terasology.module.sandbox.API;
diff --git a/engine/src/main/java/org/terasology/monitoring/Activity.java b/engine/src/main/java/org/terasology/monitoring/Activity.java
index 56eb34cfd..f68801c2e 100644
--- a/engine/src/main/java/org/terasology/monitoring/Activity.java
+++ b/engine/src/main/java/org/terasology/monitoring/Activity.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.monitoring;
+package org.terasology.engine.monitoring;
/**
* Activity allows for the use the use of an activity in a try-with-resources block - when the block ends so too does the activity.
diff --git a/engine/src/main/java/org/terasology/monitoring/PerformanceMonitor.java b/engine/src/main/java/org/terasology/monitoring/PerformanceMonitor.java
index ced0a1a52..8b62a82d2 100644
--- a/engine/src/main/java/org/terasology/monitoring/PerformanceMonitor.java
+++ b/engine/src/main/java/org/terasology/monitoring/PerformanceMonitor.java
@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.monitoring;
+package org.terasology.engine.monitoring;
import gnu.trove.map.TObjectDoubleMap;
-import org.terasology.monitoring.impl.NullPerformanceMonitor;
-import org.terasology.monitoring.impl.PerformanceMonitorImpl;
-import org.terasology.monitoring.impl.PerformanceMonitorInternal;
+import org.terasology.engine.monitoring.impl.NullPerformanceMonitor;
+import org.terasology.engine.monitoring.impl.PerformanceMonitorImpl;
+import org.terasology.engine.monitoring.impl.PerformanceMonitorInternal;
/**
* Maintains a running average of execution times and memory allocated by different activities.
diff --git a/engine/src/main/java/org/terasology/monitoring/ThreadActivity.java b/engine/src/main/java/org/terasology/monitoring/ThreadActivity.java
index 511c3d45d..00a2c8e8f 100644
--- a/engine/src/main/java/org/terasology/monitoring/ThreadActivity.java
+++ b/engine/src/main/java/org/terasology/monitoring/ThreadActivity.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.monitoring;
+package org.terasology.engine.monitoring;
/**
* A token that is used to express a thread working on a task.
diff --git a/engine/src/main/java/org/terasology/monitoring/ThreadMonitor.java b/engine/src/main/java/org/terasology/monitoring/ThreadMonitor.java
index 3e50469f6..416541847 100644
--- a/engine/src/main/java/org/terasology/monitoring/ThreadMonitor.java
+++ b/engine/src/main/java/org/terasology/monitoring/ThreadMonitor.java
@@ -13,16 +13,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.monitoring;
+package org.terasology.engine.monitoring;
import com.google.common.base.Preconditions;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.eventbus.EventBus;
-import org.terasology.monitoring.impl.SingleThreadMonitor;
-import org.terasology.monitoring.impl.SingleThreadMonitorImpl;
-import org.terasology.monitoring.impl.ThreadActivityInternal;
-import org.terasology.monitoring.impl.ThreadMonitorEvent;
+import org.terasology.engine.monitoring.impl.SingleThreadMonitor;
+import org.terasology.engine.monitoring.impl.SingleThreadMonitorImpl;
+import org.terasology.engine.monitoring.impl.ThreadActivityInternal;
+import org.terasology.engine.monitoring.impl.ThreadMonitorEvent;
import java.util.List;
import java.util.Map;
diff --git a/engine/src/main/java/org/terasology/monitoring/chunk/ChunkMeshInfo.java b/engine/src/main/java/org/terasology/monitoring/chunk/ChunkMeshInfo.java
index fcf008dcf..d1270a3cd 100644
--- a/engine/src/main/java/org/terasology/monitoring/chunk/ChunkMeshInfo.java
+++ b/engine/src/main/java/org/terasology/monitoring/chunk/ChunkMeshInfo.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.monitoring.chunk;
+package org.terasology.engine.monitoring.chunk;
-import org.terasology.rendering.primitives.ChunkMesh;
+import org.terasology.engine.rendering.primitives.ChunkMesh;
import static com.google.common.base.Preconditions.checkNotNull;
diff --git a/engine/src/main/java/org/terasology/monitoring/chunk/ChunkMonitor.java b/engine/src/main/java/org/terasology/monitoring/chunk/ChunkMonitor.java
index abb28a543..e4638f0e1 100644
--- a/engine/src/main/java/org/terasology/monitoring/chunk/ChunkMonitor.java
+++ b/engine/src/main/java/org/terasology/monitoring/chunk/ChunkMonitor.java
@@ -13,15 +13,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.monitoring.chunk;
+package org.terasology.engine.monitoring.chunk;
import com.google.common.base.Preconditions;
import com.google.common.collect.Maps;
import com.google.common.eventbus.EventBus;
import org.joml.Vector3i;
-import org.terasology.rendering.primitives.ChunkMesh;
-import org.terasology.world.chunks.Chunk;
-import org.terasology.world.chunks.ChunkProvider;
+import org.terasology.engine.rendering.primitives.ChunkMesh;
+import org.terasology.engine.world.chunks.Chunk;
+import org.terasology.engine.world.chunks.ChunkProvider;
import java.util.List;
import java.util.Map;
diff --git a/engine/src/main/java/org/terasology/monitoring/chunk/ChunkMonitorEntry.java b/engine/src/main/java/org/terasology/monitoring/chunk/ChunkMonitorEntry.java
index d7c60337b..6c3f37dd9 100644
--- a/engine/src/main/java/org/terasology/monitoring/chunk/ChunkMonitorEntry.java
+++ b/engine/src/main/java/org/terasology/monitoring/chunk/ChunkMonitorEntry.java
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.monitoring.chunk;
+package org.terasology.engine.monitoring.chunk;
import com.google.common.base.Preconditions;
import org.joml.Vector3i;
-import org.terasology.world.chunks.Chunk;
+import org.terasology.engine.world.chunks.Chunk;
import java.lang.ref.WeakReference;
import java.util.Deque;
diff --git a/engine/src/main/java/org/terasology/monitoring/chunk/ChunkMonitorEvent.java b/engine/src/main/java/org/terasology/monitoring/chunk/ChunkMonitorEvent.java
index a6fffc969..b9ccb7cf1 100644
--- a/engine/src/main/java/org/terasology/monitoring/chunk/ChunkMonitorEvent.java
+++ b/engine/src/main/java/org/terasology/monitoring/chunk/ChunkMonitorEvent.java
@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.monitoring.chunk;
+package org.terasology.engine.monitoring.chunk;
import com.google.common.base.Preconditions;
import org.joml.Vector3i;
-import org.terasology.rendering.primitives.ChunkMesh;
-import org.terasology.world.chunks.ChunkProvider;
+import org.terasology.engine.rendering.primitives.ChunkMesh;
+import org.terasology.engine.world.chunks.ChunkProvider;
public abstract class ChunkMonitorEvent {
diff --git a/engine/src/main/java/org/terasology/monitoring/gui/AdvancedMonitor.java b/engine/src/main/java/org/terasology/monitoring/gui/AdvancedMonitor.java
index b9f0d7b3d..d17485669 100644
--- a/engine/src/main/java/org/terasology/monitoring/gui/AdvancedMonitor.java
+++ b/engine/src/main/java/org/terasology/monitoring/gui/AdvancedMonitor.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.monitoring.gui;
+package org.terasology.engine.monitoring.gui;
import javax.swing.JTabbedPane;
import javax.swing.JFrame;
diff --git a/engine/src/main/java/org/terasology/monitoring/gui/ChunkMonitorDisplay.java b/engine/src/main/java/org/terasology/monitoring/gui/ChunkMonitorDisplay.java
index 71d3b3f3a..3818445e8 100644
--- a/engine/src/main/java/org/terasology/monitoring/gui/ChunkMonitorDisplay.java
+++ b/engine/src/main/java/org/terasology/monitoring/gui/ChunkMonitorDisplay.java
@@ -1,6 +1,6 @@
// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.monitoring.gui;
+package org.terasology.engine.monitoring.gui;
import com.google.common.base.Preconditions;
import com.google.common.collect.Lists;
@@ -11,15 +11,15 @@ import org.joml.Vector3f;
import org.joml.Vector3i;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.terasology.logic.players.LocalPlayer;
-import org.terasology.monitoring.ThreadActivity;
-import org.terasology.monitoring.ThreadMonitor;
-import org.terasology.monitoring.chunk.ChunkMonitor;
-import org.terasology.monitoring.chunk.ChunkMonitorEntry;
-import org.terasology.monitoring.chunk.ChunkMonitorEvent;
-import org.terasology.registry.CoreRegistry;
-import org.terasology.world.chunks.Chunk;
-import org.terasology.world.chunks.Chunks;
+import org.terasology.engine.logic.players.LocalPlayer;
+import org.terasology.engine.monitoring.ThreadActivity;
+import org.terasology.engine.monitoring.ThreadMonitor;
+import org.terasology.engine.monitoring.chunk.ChunkMonitor;
+import org.terasology.engine.monitoring.chunk.ChunkMonitorEntry;
+import org.terasology.engine.monitoring.chunk.ChunkMonitorEvent;
+import org.terasology.engine.registry.CoreRegistry;
+import org.terasology.engine.world.chunks.Chunk;
+import org.terasology.engine.world.chunks.Chunks;
import javax.swing.JPanel;
import javax.swing.SwingUtilities;
diff --git a/engine/src/main/java/org/terasology/monitoring/gui/ChunkMonitorDisplayEvent.java b/engine/src/main/java/org/terasology/monitoring/gui/ChunkMonitorDisplayEvent.java
index 846fb6946..fdbea3832 100644
--- a/engine/src/main/java/org/terasology/monitoring/gui/ChunkMonitorDisplayEvent.java
+++ b/engine/src/main/java/org/terasology/monitoring/gui/ChunkMonitorDisplayEvent.java
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.monitoring.gui;
+package org.terasology.engine.monitoring.gui;
import com.google.common.base.Preconditions;
import org.joml.Vector3i;
-import org.terasology.monitoring.chunk.ChunkMonitorEntry;
+import org.terasology.engine.monitoring.chunk.ChunkMonitorEntry;
public abstract class ChunkMonitorDisplayEvent {
diff --git a/engine/src/main/java/org/terasology/monitoring/gui/ChunkMonitorPanel.java b/engine/src/main/java/org/terasology/monitoring/gui/ChunkMonitorPanel.java
index c332fcc0f..2ac301b32 100644
--- a/engine/src/main/java/org/terasology/monitoring/gui/ChunkMonitorPanel.java
+++ b/engine/src/main/java/org/terasology/monitoring/gui/ChunkMonitorPanel.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.monitoring.gui;
+package org.terasology.engine.monitoring.gui;
import javax.swing.JPanel;
import java.awt.BorderLayout;
diff --git a/engine/src/main/java/org/terasology/monitoring/gui/PerformanceMonitorPanel.java b/engine/src/main/java/org/terasology/monitoring/gui/PerformanceMonitorPanel.java
index 50dfc365b..e5c7e2c59 100644
--- a/engine/src/main/java/org/terasology/monitoring/gui/PerformanceMonitorPanel.java
+++ b/engine/src/main/java/org/terasology/monitoring/gui/PerformanceMonitorPanel.java
@@ -13,15 +13,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.monitoring.gui;
+package org.terasology.engine.monitoring.gui;
import com.google.common.base.Preconditions;
import gnu.trove.map.TObjectDoubleMap;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.terasology.monitoring.PerformanceMonitor;
-import org.terasology.monitoring.ThreadActivity;
-import org.terasology.monitoring.ThreadMonitor;
+import org.terasology.engine.monitoring.PerformanceMonitor;
+import org.terasology.engine.monitoring.ThreadActivity;
+import org.terasology.engine.monitoring.ThreadMonitor;
import javax.swing.JPanel;
import javax.swing.JList;
diff --git a/engine/src/main/java/org/terasology/monitoring/gui/ThreadMonitorPanel.java b/engine/src/main/java/org/terasology/monitoring/gui/ThreadMonitorPanel.java
index 49b7eff4e..f5903b09e 100644
--- a/engine/src/main/java/org/terasology/monitoring/gui/ThreadMonitorPanel.java
+++ b/engine/src/main/java/org/terasology/monitoring/gui/ThreadMonitorPanel.java
@@ -13,15 +13,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.monitoring.gui;
+package org.terasology.engine.monitoring.gui;
import com.google.common.eventbus.Subscribe;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.terasology.monitoring.ThreadActivity;
-import org.terasology.monitoring.ThreadMonitor;
-import org.terasology.monitoring.impl.SingleThreadMonitor;
-import org.terasology.monitoring.impl.ThreadMonitorEvent;
+import org.terasology.engine.monitoring.ThreadActivity;
+import org.terasology.engine.monitoring.ThreadMonitor;
+import org.terasology.engine.monitoring.impl.SingleThreadMonitor;
+import org.terasology.engine.monitoring.impl.ThreadMonitorEvent;
import javax.swing.JPanel;
import javax.swing.JList;
diff --git a/engine/src/main/java/org/terasology/monitoring/impl/NullActivity.java b/engine/src/main/java/org/terasology/monitoring/impl/NullActivity.java
index bd8f297ac..80ef4719f 100644
--- a/engine/src/main/java/org/terasology/monitoring/impl/NullActivity.java
+++ b/engine/src/main/java/org/terasology/monitoring/impl/NullActivity.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.monitoring.impl;
+package org.terasology.engine.monitoring.impl;
-import org.terasology.monitoring.Activity;
+import org.terasology.engine.monitoring.Activity;
/**
* An activity that does nothing when it is closed.
diff --git a/engine/src/main/java/org/terasology/monitoring/impl/NullPerformanceMonitor.java b/engine/src/main/java/org/terasology/monitoring/impl/NullPerformanceMonitor.java
index bc24e347f..80c43f074 100644
--- a/engine/src/main/java/org/terasology/monitoring/impl/NullPerformanceMonitor.java
+++ b/engine/src/main/java/org/terasology/monitoring/impl/NullPerformanceMonitor.java
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.monitoring.impl;
+package org.terasology.engine.monitoring.impl;
import gnu.trove.map.TObjectDoubleMap;
import gnu.trove.map.hash.TObjectDoubleHashMap;
-import org.terasology.monitoring.Activity;
+import org.terasology.engine.monitoring.Activity;
/**
*/
diff --git a/engine/src/main/java/org/terasology/monitoring/impl/NullThreadActivity.java b/engine/src/main/java/org/terasology/monitoring/impl/NullThreadActivity.java
index b2979b62b..908019d5b 100644
--- a/engine/src/main/java/org/terasology/monitoring/impl/NullThreadActivity.java
+++ b/engine/src/main/java/org/terasology/monitoring/impl/NullThreadActivity.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.monitoring.impl;
+package org.terasology.engine.monitoring.impl;
-import org.terasology.monitoring.ThreadActivity;
+import org.terasology.engine.monitoring.ThreadActivity;
/**
*/
diff --git a/engine/src/main/java/org/terasology/monitoring/impl/PerformanceMonitorImpl.java b/engine/src/main/java/org/terasology/monitoring/impl/PerformanceMonitorImpl.java
index a9abc41fa..23ea49225 100644
--- a/engine/src/main/java/org/terasology/monitoring/impl/PerformanceMonitorImpl.java
+++ b/engine/src/main/java/org/terasology/monitoring/impl/PerformanceMonitorImpl.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.monitoring.impl;
+package org.terasology.engine.monitoring.impl;
import com.google.common.collect.Lists;
import com.google.common.collect.Queues;
@@ -23,10 +23,10 @@ import gnu.trove.map.hash.TObjectDoubleHashMap;
import gnu.trove.map.hash.TObjectLongHashMap;
import gnu.trove.procedure.TObjectDoubleProcedure;
import gnu.trove.procedure.TObjectLongProcedure;
-import org.terasology.engine.EngineTime;
-import org.terasology.engine.Time;
-import org.terasology.monitoring.Activity;
-import org.terasology.registry.CoreRegistry;
+import org.terasology.engine.core.EngineTime;
+import org.terasology.engine.core.Time;
+import org.terasology.engine.monitoring.Activity;
+import org.terasology.engine.registry.CoreRegistry;
import java.util.Deque;
import java.util.List;
diff --git a/engine/src/main/java/org/terasology/monitoring/impl/PerformanceMonitorInternal.java b/engine/src/main/java/org/terasology/monitoring/impl/PerformanceMonitorInternal.java
index c9d4bdcae..c3af7c4f0 100644
--- a/engine/src/main/java/org/terasology/monitoring/impl/PerformanceMonitorInternal.java
+++ b/engine/src/main/java/org/terasology/monitoring/impl/PerformanceMonitorInternal.java
@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.monitoring.impl;
+package org.terasology.engine.monitoring.impl;
import gnu.trove.map.TObjectDoubleMap;
-import org.terasology.monitoring.Activity;
+import org.terasology.engine.monitoring.Activity;
/**
* Base interface for performance monitor implementations.
diff --git a/engine/src/main/java/org/terasology/monitoring/impl/SingleThreadMonitor.java b/engine/src/main/java/org/terasology/monitoring/impl/SingleThreadMonitor.java
index 3cbad7475..247f0319b 100644
--- a/engine/src/main/java/org/terasology/monitoring/impl/SingleThreadMonitor.java
+++ b/engine/src/main/java/org/terasology/monitoring/impl/SingleThreadMonitor.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.monitoring.impl;
+package org.terasology.engine.monitoring.impl;
import java.util.List;
diff --git a/engine/src/main/java/org/terasology/monitoring/impl/SingleThreadMonitorImpl.java b/engine/src/main/java/org/terasology/monitoring/impl/SingleThreadMonitorImpl.java
index a40bc8375..d4b48fd48 100644
--- a/engine/src/main/java/org/terasology/monitoring/impl/SingleThreadMonitorImpl.java
+++ b/engine/src/main/java/org/terasology/monitoring/impl/SingleThreadMonitorImpl.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.monitoring.impl;
+package org.terasology.engine.monitoring.impl;
import com.google.common.base.Objects;
import com.google.common.base.Preconditions;
diff --git a/engine/src/main/java/org/terasology/monitoring/impl/ThreadActivityInternal.java b/engine/src/main/java/org/terasology/monitoring/impl/ThreadActivityInternal.java
index 4aa1b2911..445b77610 100644
--- a/engine/src/main/java/org/terasology/monitoring/impl/ThreadActivityInternal.java
+++ b/engine/src/main/java/org/terasology/monitoring/impl/ThreadActivityInternal.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.monitoring.impl;
+package org.terasology.engine.monitoring.impl;
-import org.terasology.monitoring.ThreadActivity;
+import org.terasology.engine.monitoring.ThreadActivity;
/**
*/
diff --git a/engine/src/main/java/org/terasology/monitoring/impl/ThreadMonitorEvent.java b/engine/src/main/java/org/terasology/monitoring/impl/ThreadMonitorEvent.java
index 0284830f6..b8a346112 100644
--- a/engine/src/main/java/org/terasology/monitoring/impl/ThreadMonitorEvent.java
+++ b/engine/src/main/java/org/terasology/monitoring/impl/ThreadMonitorEvent.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.monitoring.impl;
+package org.terasology.engine.monitoring.impl;
import com.google.common.base.Preconditions;
diff --git a/engine/src/main/java/org/terasology/monitoring/package-info.java b/engine/src/main/java/org/terasology/monitoring/package-info.java
index 4dc6aa2da..39ef8846c 100644
--- a/engine/src/main/java/org/terasology/monitoring/package-info.java
+++ b/engine/src/main/java/org/terasology/monitoring/package-info.java
@@ -14,6 +14,6 @@
* limitations under the License.
*/
-@API package org.terasology.monitoring;
+@API package org.terasology.engine.monitoring;
import org.terasology.module.sandbox.API;
diff --git a/engine/src/main/java/org/terasology/network/BroadcastEvent.java b/engine/src/main/java/org/terasology/network/BroadcastEvent.java
index 74d4bc61f..b664e46d6 100644
--- a/engine/src/main/java/org/terasology/network/BroadcastEvent.java
+++ b/engine/src/main/java/org/terasology/network/BroadcastEvent.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.terasology.network;
+package org.terasology.engine.network;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
diff --git a/engine/src/main/java/org/terasology/network/Client.java b/engine/src/main/java/org/terasology/network/Client.java
index 13f20041d..00d3ae1d8 100644
--- a/engine/src/main/java/org/terasology/network/Client.java
+++ b/engine/src/main/java/org/terasology/network/Client.java
@@ -14,13 +14,13 @@
* limitations under the License.
*/
-package org.terasology.network;
+package org.terasology.engine.network;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.entitySystem.event.Event;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.event.Event;
import org.terasology.nui.Color;
-import org.terasology.rendering.world.viewDistance.ViewDistance;
-import org.terasology.world.chunks.ChunkRegionListener;
+import org.terasology.engine.rendering.world.viewDistance.ViewDistance;
+import org.terasology.engine.world.chunks.ChunkRegionListener;
/**
* A client is the connection between a player (local or remote) and the game.
diff --git a/engine/src/main/java/org/terasology/network/ClientComponent.java b/engine/src/main/java/org/terasology/network/ClientComponent.java
index bf92ba76c..3d0626378 100644
--- a/engine/src/main/java/org/terasology/network/ClientComponent.java
+++ b/engine/src/main/java/org/terasology/network/ClientComponent.java
@@ -14,10 +14,10 @@
* limitations under the License.
*/
-package org.terasology.network;
+package org.terasology.engine.network;
-import org.terasology.entitySystem.Component;
-import org.terasology.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.Component;
+import org.terasology.engine.entitySystem.entity.EntityRef;
/**
* The component that marks an entity as being a Client Entity (essentially, a player) and ties them to a
diff --git a/engine/src/main/java/org/terasology/network/ClientInfoComponent.java b/engine/src/main/java/org/terasology/network/ClientInfoComponent.java
index 5371efb28..4f35adc5b 100644
--- a/engine/src/main/java/org/terasology/network/ClientInfoComponent.java
+++ b/engine/src/main/java/org/terasology/network/ClientInfoComponent.java
@@ -14,10 +14,10 @@
* limitations under the License.
*/
-package org.terasology.network;
+package org.terasology.engine.network;
-import org.terasology.entitySystem.Component;
-import org.terasology.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.Component;
+import org.terasology.engine.entitySystem.entity.EntityRef;
/**
* The component that marks an entity as being a Client Info Entity.
diff --git a/engine/src/main/java/org/terasology/network/ClientPingSystem.java b/engine/src/main/java/org/terasology/network/ClientPingSystem.java
index 81b9b68ce..f1365048b 100644
--- a/engine/src/main/java/org/terasology/network/ClientPingSystem.java
+++ b/engine/src/main/java/org/terasology/network/ClientPingSystem.java
@@ -13,15 +13,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.network;
+package org.terasology.engine.network;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.entitySystem.event.ReceiveEvent;
-import org.terasology.entitySystem.systems.BaseComponentSystem;
-import org.terasology.entitySystem.systems.RegisterMode;
-import org.terasology.entitySystem.systems.RegisterSystem;
-import org.terasology.network.events.PingFromClientEvent;
-import org.terasology.network.events.PingFromServerEvent;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.event.ReceiveEvent;
+import org.terasology.engine.entitySystem.systems.BaseComponentSystem;
+import org.terasology.engine.entitySystem.systems.RegisterMode;
+import org.terasology.engine.entitySystem.systems.RegisterSystem;
+import org.terasology.engine.network.events.PingFromClientEvent;
+import org.terasology.engine.network.events.PingFromServerEvent;
/**
* This system, registered on the client, will respond to the ping event from server.
diff --git a/engine/src/main/java/org/terasology/network/ColorComponent.java b/engine/src/main/java/org/terasology/network/ColorComponent.java
index f82505ec7..741bb5c35 100644
--- a/engine/src/main/java/org/terasology/network/ColorComponent.java
+++ b/engine/src/main/java/org/terasology/network/ColorComponent.java
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-package org.terasology.network;
+package org.terasology.engine.network;
-import org.terasology.entitySystem.Component;
+import org.terasology.engine.entitySystem.Component;
import org.terasology.nui.Color;
/**
diff --git a/engine/src/main/java/org/terasology/network/FieldReplicateType.java b/engine/src/main/java/org/terasology/network/FieldReplicateType.java
index 325c5ab13..0d750bf66 100644
--- a/engine/src/main/java/org/terasology/network/FieldReplicateType.java
+++ b/engine/src/main/java/org/terasology/network/FieldReplicateType.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.terasology.network;
+package org.terasology.engine.network;
/**
*/
diff --git a/engine/src/main/java/org/terasology/network/JoinStatus.java b/engine/src/main/java/org/terasology/network/JoinStatus.java
index a0173aaa5..530acac5f 100644
--- a/engine/src/main/java/org/terasology/network/JoinStatus.java
+++ b/engine/src/main/java/org/terasology/network/JoinStatus.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.network;
+package org.terasology.engine.network;
/**
*/
diff --git a/engine/src/main/java/org/terasology/network/NetMetricSource.java b/engine/src/main/java/org/terasology/network/NetMetricSource.java
index 4581739e2..f10aa6f6f 100644
--- a/engine/src/main/java/org/terasology/network/NetMetricSource.java
+++ b/engine/src/main/java/org/terasology/network/NetMetricSource.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.terasology.network;
+package org.terasology.engine.network;
/**
* Interface for providers of sources of network metric information
diff --git a/engine/src/main/java/org/terasology/network/NetworkComponent.java b/engine/src/main/java/org/terasology/network/NetworkComponent.java
index 060357e4c..5cff99417 100644
--- a/engine/src/main/java/org/terasology/network/NetworkComponent.java
+++ b/engine/src/main/java/org/terasology/network/NetworkComponent.java
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-package org.terasology.network;
+package org.terasology.engine.network;
-import org.terasology.entitySystem.Component;
+import org.terasology.engine.entitySystem.Component;
/**
*/
diff --git a/engine/src/main/java/org/terasology/network/NetworkEvent.java b/engine/src/main/java/org/terasology/network/NetworkEvent.java
index c64bdba74..3cd574ad5 100644
--- a/engine/src/main/java/org/terasology/network/NetworkEvent.java
+++ b/engine/src/main/java/org/terasology/network/NetworkEvent.java
@@ -14,10 +14,10 @@
* limitations under the License.
*/
-package org.terasology.network;
+package org.terasology.engine.network;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.entitySystem.event.Event;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.event.Event;
/**
* Optional parent for events that are replicated over the network. Inherit this to make use of advanced features
diff --git a/engine/src/main/java/org/terasology/network/NetworkMode.java b/engine/src/main/java/org/terasology/network/NetworkMode.java
index 2df312a66..0f061b50c 100644
--- a/engine/src/main/java/org/terasology/network/NetworkMode.java
+++ b/engine/src/main/java/org/terasology/network/NetworkMode.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.terasology.network;
+package org.terasology.engine.network;
/**
* The current multiplayer mode of the game.
diff --git a/engine/src/main/java/org/terasology/network/NetworkSystem.java b/engine/src/main/java/org/terasology/network/NetworkSystem.java
index 98adea412..75b596bde 100644
--- a/engine/src/main/java/org/terasology/network/NetworkSystem.java
+++ b/engine/src/main/java/org/terasology/network/NetworkSystem.java
@@ -14,17 +14,17 @@
* limitations under the License.
*/
-package org.terasology.network;
+package org.terasology.engine.network;
-import org.terasology.context.Context;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.entitySystem.entity.internal.EngineEntityManager;
-import org.terasology.entitySystem.metadata.EventLibrary;
-import org.terasology.network.exceptions.HostingFailedException;
+import org.terasology.engine.context.Context;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.entity.internal.EngineEntityManager;
+import org.terasology.engine.entitySystem.metadata.EventLibrary;
+import org.terasology.engine.network.exceptions.HostingFailedException;
import org.terasology.nui.Color;
-import org.terasology.world.BlockEntityRegistry;
-import org.terasology.world.block.internal.BlockRegistrationListener;
-import org.terasology.world.chunks.remoteChunkProvider.RemoteChunkProvider;
+import org.terasology.engine.world.BlockEntityRegistry;
+import org.terasology.engine.world.block.internal.BlockRegistrationListener;
+import org.terasology.engine.world.chunks.remoteChunkProvider.RemoteChunkProvider;
/**
* Interface for the network system
diff --git a/engine/src/main/java/org/terasology/network/NoReplicate.java b/engine/src/main/java/org/terasology/network/NoReplicate.java
index a20b12188..ba3f1b31c 100644
--- a/engine/src/main/java/org/terasology/network/NoReplicate.java
+++ b/engine/src/main/java/org/terasology/network/NoReplicate.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.terasology.network;
+package org.terasology.engine.network;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
diff --git a/engine/src/main/java/org/terasology/network/OwnerEvent.java b/engine/src/main/java/org/terasology/network/OwnerEvent.java
index c95ab5e8c..3510462dd 100644
--- a/engine/src/main/java/org/terasology/network/OwnerEvent.java
+++ b/engine/src/main/java/org/terasology/network/OwnerEvent.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.terasology.network;
+package org.terasology.engine.network;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
diff --git a/engine/src/main/java/org/terasology/network/PingService.java b/engine/src/main/java/org/terasology/network/PingService.java
index 73b92bcb3..adc77c3af 100644
--- a/engine/src/main/java/org/terasology/network/PingService.java
+++ b/engine/src/main/java/org/terasology/network/PingService.java
@@ -1,7 +1,7 @@
// Copyright 2020 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.network;
+package org.terasology.engine.network;
import java.io.IOException;
import java.net.InetSocketAddress;
diff --git a/engine/src/main/java/org/terasology/network/PingStockComponent.java b/engine/src/main/java/org/terasology/network/PingStockComponent.java
index 37dc6a656..36f602e6e 100644
--- a/engine/src/main/java/org/terasology/network/PingStockComponent.java
+++ b/engine/src/main/java/org/terasology/network/PingStockComponent.java
@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.network;
+package org.terasology.engine.network;
-import org.terasology.entitySystem.Component;
-import org.terasology.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.Component;
+import org.terasology.engine.entitySystem.entity.EntityRef;
import java.util.ArrayList;
import java.util.HashMap;
diff --git a/engine/src/main/java/org/terasology/network/PingSubscriberComponent.java b/engine/src/main/java/org/terasology/network/PingSubscriberComponent.java
index c8dc3ca90..9bc5bed64 100644
--- a/engine/src/main/java/org/terasology/network/PingSubscriberComponent.java
+++ b/engine/src/main/java/org/terasology/network/PingSubscriberComponent.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.network;
+package org.terasology.engine.network;
-import org.terasology.entitySystem.Component;
+import org.terasology.engine.entitySystem.Component;
/**
* PingSubscriberComponent, only on the server system, will be added to a client entity when this client subscribe.
diff --git a/engine/src/main/java/org/terasology/network/Replicate.java b/engine/src/main/java/org/terasology/network/Replicate.java
index 2cc6f36fd..05142a67b 100644
--- a/engine/src/main/java/org/terasology/network/Replicate.java
+++ b/engine/src/main/java/org/terasology/network/Replicate.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.terasology.network;
+package org.terasology.engine.network;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
diff --git a/engine/src/main/java/org/terasology/network/ReplicationCheck.java b/engine/src/main/java/org/terasology/network/ReplicationCheck.java
index cea8a95a0..0199fea23 100644
--- a/engine/src/main/java/org/terasology/network/ReplicationCheck.java
+++ b/engine/src/main/java/org/terasology/network/ReplicationCheck.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.terasology.network;
+package org.terasology.engine.network;
import org.terasology.reflection.metadata.FieldMetadata;
diff --git a/engine/src/main/java/org/terasology/network/Server.java b/engine/src/main/java/org/terasology/network/Server.java
index 1dcb12ae0..21c1898e0 100644
--- a/engine/src/main/java/org/terasology/network/Server.java
+++ b/engine/src/main/java/org/terasology/network/Server.java
@@ -13,13 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.network;
+package org.terasology.engine.network;
-import org.terasology.entitySystem.Component;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.entitySystem.event.Event;
+import org.terasology.engine.entitySystem.Component;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.event.Event;
import org.terasology.protobuf.NetData;
-import org.terasology.world.chunks.remoteChunkProvider.ChunkReadyListener;
+import org.terasology.engine.world.chunks.remoteChunkProvider.ChunkReadyListener;
/**
*/
diff --git a/engine/src/main/java/org/terasology/network/ServerEvent.java b/engine/src/main/java/org/terasology/network/ServerEvent.java
index 815a4b4c6..80c80a392 100644
--- a/engine/src/main/java/org/terasology/network/ServerEvent.java
+++ b/engine/src/main/java/org/terasology/network/ServerEvent.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.terasology.network;
+package org.terasology.engine.network;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
diff --git a/engine/src/main/java/org/terasology/network/ServerInfoMessage.java b/engine/src/main/java/org/terasology/network/ServerInfoMessage.java
index 5d4c8860b..483332d23 100644
--- a/engine/src/main/java/org/terasology/network/ServerInfoMessage.java
+++ b/engine/src/main/java/org/terasology/network/ServerInfoMessage.java
@@ -14,10 +14,10 @@
* limitations under the License.
*/
-package org.terasology.network;
+package org.terasology.engine.network;
import org.terasology.naming.NameVersion;
-import org.terasology.world.internal.WorldInfo;
+import org.terasology.engine.world.internal.WorldInfo;
import java.util.List;
import java.util.Map;
diff --git a/engine/src/main/java/org/terasology/network/ServerInfoService.java b/engine/src/main/java/org/terasology/network/ServerInfoService.java
index ac9cfdbfb..2846d15d7 100644
--- a/engine/src/main/java/org/terasology/network/ServerInfoService.java
+++ b/engine/src/main/java/org/terasology/network/ServerInfoService.java
@@ -1,7 +1,7 @@
// Copyright 2020 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.network;
+package org.terasology.engine.network;
import com.google.common.util.concurrent.SettableFuture;
import io.netty.bootstrap.Bootstrap;
@@ -11,8 +11,8 @@ import io.netty.channel.ChannelOption;
import io.netty.channel.EventLoopGroup;
import io.netty.channel.nio.NioEventLoopGroup;
import io.netty.channel.socket.nio.NioSocketChannel;
-import org.terasology.network.internal.ServerInfoRequestHandler;
-import org.terasology.network.internal.pipelineFactory.InfoRequestPipelineFactory;
+import org.terasology.engine.network.internal.ServerInfoRequestHandler;
+import org.terasology.engine.network.internal.pipelineFactory.InfoRequestPipelineFactory;
import java.net.InetSocketAddress;
import java.util.concurrent.Future;
diff --git a/engine/src/main/java/org/terasology/network/ServerPingSystem.java b/engine/src/main/java/org/terasology/network/ServerPingSystem.java
index 7b8c94094..0365becca 100644
--- a/engine/src/main/java/org/terasology/network/ServerPingSystem.java
+++ b/engine/src/main/java/org/terasology/network/ServerPingSystem.java
@@ -13,22 +13,22 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.network;
+package org.terasology.engine.network;
-import org.terasology.entitySystem.entity.EntityManager;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.entitySystem.event.ReceiveEvent;
-import org.terasology.entitySystem.systems.BaseComponentSystem;
-import org.terasology.entitySystem.systems.RegisterMode;
-import org.terasology.entitySystem.systems.RegisterSystem;
-import org.terasology.entitySystem.systems.UpdateSubscriberSystem;
-import org.terasology.logic.players.LocalPlayer;
-import org.terasology.network.events.DisconnectedEvent;
-import org.terasology.network.events.PingFromClientEvent;
-import org.terasology.network.events.PingFromServerEvent;
-import org.terasology.network.events.SubscribePingEvent;
-import org.terasology.network.events.UnSubscribePingEvent;
-import org.terasology.registry.In;
+import org.terasology.engine.entitySystem.entity.EntityManager;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.event.ReceiveEvent;
+import org.terasology.engine.entitySystem.systems.BaseComponentSystem;
+import org.terasology.engine.entitySystem.systems.RegisterMode;
+import org.terasology.engine.entitySystem.systems.RegisterSystem;
+import org.terasology.engine.entitySystem.systems.UpdateSubscriberSystem;
+import org.terasology.engine.logic.players.LocalPlayer;
+import org.terasology.engine.network.events.DisconnectedEvent;
+import org.terasology.engine.network.events.PingFromClientEvent;
+import org.terasology.engine.network.events.PingFromServerEvent;
+import org.terasology.engine.network.events.SubscribePingEvent;
+import org.terasology.engine.network.events.UnSubscribePingEvent;
+import org.terasology.engine.registry.In;
import java.time.Duration;
import java.time.Instant;
diff --git a/engine/src/main/java/org/terasology/network/events/ConnectedEvent.java b/engine/src/main/java/org/terasology/network/events/ConnectedEvent.java
index 207ceb84a..cf49e4904 100644
--- a/engine/src/main/java/org/terasology/network/events/ConnectedEvent.java
+++ b/engine/src/main/java/org/terasology/network/events/ConnectedEvent.java
@@ -14,10 +14,10 @@
* limitations under the License.
*/
-package org.terasology.network.events;
+package org.terasology.engine.network.events;
-import org.terasology.entitySystem.event.Event;
-import org.terasology.persistence.PlayerStore;
+import org.terasology.engine.entitySystem.event.Event;
+import org.terasology.engine.persistence.PlayerStore;
/**
* Event notifying that a new client has connected - sent against the client by the network system.
diff --git a/engine/src/main/java/org/terasology/network/events/DisconnectedEvent.java b/engine/src/main/java/org/terasology/network/events/DisconnectedEvent.java
index 9073e1ee3..8f2e31b09 100644
--- a/engine/src/main/java/org/terasology/network/events/DisconnectedEvent.java
+++ b/engine/src/main/java/org/terasology/network/events/DisconnectedEvent.java
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-package org.terasology.network.events;
+package org.terasology.engine.network.events;
-import org.terasology.entitySystem.event.Event;
+import org.terasology.engine.entitySystem.event.Event;
/**
* Event notifying of a client disconnecting.
diff --git a/engine/src/main/java/org/terasology/network/events/PingFromClientEvent.java b/engine/src/main/java/org/terasology/network/events/PingFromClientEvent.java
index fc0c85d6e..575d92701 100644
--- a/engine/src/main/java/org/terasology/network/events/PingFromClientEvent.java
+++ b/engine/src/main/java/org/terasology/network/events/PingFromClientEvent.java
@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.network.events;
+package org.terasology.engine.network.events;
-import org.terasology.entitySystem.event.Event;
-import org.terasology.network.ServerEvent;
+import org.terasology.engine.entitySystem.event.Event;
+import org.terasology.engine.network.ServerEvent;
/**
* This event handles the ping from one client to the server.
diff --git a/engine/src/main/java/org/terasology/network/events/PingFromServerEvent.java b/engine/src/main/java/org/terasology/network/events/PingFromServerEvent.java
index b2405fb8c..ea3569207 100644
--- a/engine/src/main/java/org/terasology/network/events/PingFromServerEvent.java
+++ b/engine/src/main/java/org/terasology/network/events/PingFromServerEvent.java
@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.network.events;
+package org.terasology.engine.network.events;
-import org.terasology.entitySystem.event.Event;
-import org.terasology.network.OwnerEvent;
+import org.terasology.engine.entitySystem.event.Event;
+import org.terasology.engine.network.OwnerEvent;
/**
* This event handles the ping from the server to all clients.
diff --git a/engine/src/main/java/org/terasology/network/events/SubscribePingEvent.java b/engine/src/main/java/org/terasology/network/events/SubscribePingEvent.java
index 9fd3fcf10..61b50f7a6 100644
--- a/engine/src/main/java/org/terasology/network/events/SubscribePingEvent.java
+++ b/engine/src/main/java/org/terasology/network/events/SubscribePingEvent.java
@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.network.events;
+package org.terasology.engine.network.events;
-import org.terasology.entitySystem.event.Event;
-import org.terasology.network.ServerEvent;
+import org.terasology.engine.entitySystem.event.Event;
+import org.terasology.engine.network.ServerEvent;
/**
* The client subscribes ping.
diff --git a/engine/src/main/java/org/terasology/network/events/UnSubscribePingEvent.java b/engine/src/main/java/org/terasology/network/events/UnSubscribePingEvent.java
index d262debe7..cae07abdc 100644
--- a/engine/src/main/java/org/terasology/network/events/UnSubscribePingEvent.java
+++ b/engine/src/main/java/org/terasology/network/events/UnSubscribePingEvent.java
@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.network.events;
+package org.terasology.engine.network.events;
-import org.terasology.entitySystem.event.Event;
-import org.terasology.network.ServerEvent;
+import org.terasology.engine.entitySystem.event.Event;
+import org.terasology.engine.network.ServerEvent;
/**
* The client unSubscribes ping.
diff --git a/engine/src/main/java/org/terasology/network/events/package-info.java b/engine/src/main/java/org/terasology/network/events/package-info.java
index f24c0ab73..89d1bf044 100644
--- a/engine/src/main/java/org/terasology/network/events/package-info.java
+++ b/engine/src/main/java/org/terasology/network/events/package-info.java
@@ -14,6 +14,6 @@
* limitations under the License.
*/
-@API package org.terasology.network.events;
+@API package org.terasology.engine.network.events;
import org.terasology.module.sandbox.API;
diff --git a/engine/src/main/java/org/terasology/network/exceptions/HostingFailedException.java b/engine/src/main/java/org/terasology/network/exceptions/HostingFailedException.java
index 78f8b9d84..c49eabe9d 100644
--- a/engine/src/main/java/org/terasology/network/exceptions/HostingFailedException.java
+++ b/engine/src/main/java/org/terasology/network/exceptions/HostingFailedException.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.terasology.network.exceptions;
+package org.terasology.engine.network.exceptions;
/**
* Exception when hosting a game fails.
diff --git a/engine/src/main/java/org/terasology/network/internal/AbstractClient.java b/engine/src/main/java/org/terasology/network/internal/AbstractClient.java
index e751dc0be..009494dc6 100644
--- a/engine/src/main/java/org/terasology/network/internal/AbstractClient.java
+++ b/engine/src/main/java/org/terasology/network/internal/AbstractClient.java
@@ -14,15 +14,15 @@
* limitations under the License.
*/
-package org.terasology.network.internal;
+package org.terasology.engine.network.internal;
-import org.terasology.entitySystem.entity.EntityManager;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.logic.common.DisplayNameComponent;
-import org.terasology.network.Client;
-import org.terasology.network.ClientComponent;
-import org.terasology.network.ClientInfoComponent;
-import org.terasology.network.ColorComponent;
+import org.terasology.engine.entitySystem.entity.EntityManager;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.logic.common.DisplayNameComponent;
+import org.terasology.engine.network.Client;
+import org.terasology.engine.network.ClientComponent;
+import org.terasology.engine.network.ClientInfoComponent;
+import org.terasology.engine.network.ColorComponent;
import org.terasology.nui.Color;
import java.util.HashSet;
diff --git a/engine/src/main/java/org/terasology/network/internal/ClientConnectionHandler.java b/engine/src/main/java/org/terasology/network/internal/ClientConnectionHandler.java
index 48895ea55..c57e548e2 100644
--- a/engine/src/main/java/org/terasology/network/internal/ClientConnectionHandler.java
+++ b/engine/src/main/java/org/terasology/network/internal/ClientConnectionHandler.java
@@ -1,6 +1,6 @@
// Copyright 2020 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.network.internal;
+package org.terasology.engine.network.internal;
import com.google.common.collect.Sets;
import io.netty.channel.Channel;
@@ -8,18 +8,18 @@ import io.netty.channel.ChannelHandlerContext;
import io.netty.channel.ChannelInboundHandlerAdapter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.terasology.config.Config;
-import org.terasology.engine.EngineTime;
-import org.terasology.engine.TerasologyConstants;
-import org.terasology.engine.Time;
-import org.terasology.engine.module.ModuleManager;
-import org.terasology.engine.paths.PathManager;
+import org.terasology.engine.config.Config;
+import org.terasology.engine.core.EngineTime;
+import org.terasology.engine.core.TerasologyConstants;
+import org.terasology.engine.core.Time;
+import org.terasology.engine.core.module.ModuleManager;
+import org.terasology.engine.core.paths.PathManager;
import org.terasology.module.ModuleLoader;
import org.terasology.naming.Name;
import org.terasology.naming.Version;
-import org.terasology.network.JoinStatus;
+import org.terasology.engine.network.JoinStatus;
import org.terasology.protobuf.NetData;
-import org.terasology.registry.CoreRegistry;
+import org.terasology.engine.registry.CoreRegistry;
import java.io.BufferedOutputStream;
import java.io.IOException;
diff --git a/engine/src/main/java/org/terasology/network/internal/ClientHandler.java b/engine/src/main/java/org/terasology/network/internal/ClientHandler.java
index b01b39b18..d56553868 100644
--- a/engine/src/main/java/org/terasology/network/internal/ClientHandler.java
+++ b/engine/src/main/java/org/terasology/network/internal/ClientHandler.java
@@ -14,16 +14,16 @@
* limitations under the License.
*/
-package org.terasology.network.internal;
+package org.terasology.engine.network.internal;
import io.netty.channel.ChannelHandlerContext;
import io.netty.channel.ChannelInboundHandlerAdapter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.terasology.engine.GameEngine;
-import org.terasology.engine.modes.StateMainMenu;
-import org.terasology.registry.CoreRegistry;
+import org.terasology.engine.core.GameEngine;
+import org.terasology.engine.core.modes.StateMainMenu;
+import org.terasology.engine.registry.CoreRegistry;
import static org.terasology.protobuf.NetData.NetMessage;
diff --git a/engine/src/main/java/org/terasology/network/internal/ClientHandshakeHandler.java b/engine/src/main/java/org/terasology/network/internal/ClientHandshakeHandler.java
index 1c490ca84..068ed5495 100644
--- a/engine/src/main/java/org/terasology/network/internal/ClientHandshakeHandler.java
+++ b/engine/src/main/java/org/terasology/network/internal/ClientHandshakeHandler.java
@@ -1,6 +1,6 @@
// Copyright 2020 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.network.internal;
+package org.terasology.engine.network.internal;
import com.google.common.primitives.Bytes;
import com.google.protobuf.ByteString;
@@ -9,15 +9,15 @@ import io.netty.channel.ChannelHandlerContext;
import io.netty.channel.ChannelInboundHandlerAdapter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.terasology.config.Config;
-import org.terasology.identity.ClientIdentity;
-import org.terasology.identity.IdentityConstants;
-import org.terasology.identity.PrivateIdentityCertificate;
-import org.terasology.identity.PublicIdentityCertificate;
-import org.terasology.identity.storageServiceClient.StorageServiceWorker;
-import org.terasology.identity.storageServiceClient.StorageServiceWorkerStatus;
+import org.terasology.engine.config.Config;
+import org.terasology.engine.identity.ClientIdentity;
+import org.terasology.engine.identity.IdentityConstants;
+import org.terasology.engine.identity.PrivateIdentityCertificate;
+import org.terasology.engine.identity.PublicIdentityCertificate;
+import org.terasology.engine.identity.storageServiceClient.StorageServiceWorker;
+import org.terasology.engine.identity.storageServiceClient.StorageServiceWorkerStatus;
import org.terasology.protobuf.NetData;
-import org.terasology.registry.CoreRegistry;
+import org.terasology.engine.registry.CoreRegistry;
import javax.crypto.BadPaddingException;
import javax.crypto.Cipher;
diff --git a/engine/src/main/java/org/terasology/network/internal/HandshakeCommon.java b/engine/src/main/java/org/terasology/network/internal/HandshakeCommon.java
index bc702fb33..820ea5cfe 100644
--- a/engine/src/main/java/org/terasology/network/internal/HandshakeCommon.java
+++ b/engine/src/main/java/org/terasology/network/internal/HandshakeCommon.java
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.network.internal;
+package org.terasology.engine.network.internal;
import com.google.common.primitives.Bytes;
-import org.terasology.identity.IdentityConstants;
-import org.terasology.identity.SecretGenerator;
+import org.terasology.engine.identity.IdentityConstants;
+import org.terasology.engine.identity.SecretGenerator;
import org.terasology.protobuf.NetData;
import javax.crypto.spec.SecretKeySpec;
diff --git a/engine/src/main/java/org/terasology/network/internal/JoinStatusImpl.java b/engine/src/main/java/org/terasology/network/internal/JoinStatusImpl.java
index 50e75e527..af4a1de0e 100644
--- a/engine/src/main/java/org/terasology/network/internal/JoinStatusImpl.java
+++ b/engine/src/main/java/org/terasology/network/internal/JoinStatusImpl.java
@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.network.internal;
+package org.terasology.engine.network.internal;
import com.google.common.util.concurrent.AtomicDouble;
-import org.terasology.network.JoinStatus;
+import org.terasology.engine.network.JoinStatus;
/**
*/
diff --git a/engine/src/main/java/org/terasology/network/internal/LocalClient.java b/engine/src/main/java/org/terasology/network/internal/LocalClient.java
index 741133a28..bece82cf7 100644
--- a/engine/src/main/java/org/terasology/network/internal/LocalClient.java
+++ b/engine/src/main/java/org/terasology/network/internal/LocalClient.java
@@ -1,20 +1,20 @@
// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.network.internal;
+package org.terasology.engine.network.internal;
import org.joml.Vector3ic;
-import org.terasology.config.Config;
-import org.terasology.entitySystem.entity.EntityManager;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.entitySystem.event.Event;
-import org.terasology.logic.common.DisplayNameComponent;
-import org.terasology.network.ClientComponent;
-import org.terasology.network.ColorComponent;
+import org.terasology.engine.config.Config;
+import org.terasology.engine.entitySystem.entity.EntityManager;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.event.Event;
+import org.terasology.engine.logic.common.DisplayNameComponent;
+import org.terasology.engine.network.ClientComponent;
+import org.terasology.engine.network.ColorComponent;
import org.terasology.nui.Color;
-import org.terasology.registry.CoreRegistry;
-import org.terasology.rendering.world.viewDistance.ViewDistance;
-import org.terasology.world.chunks.Chunk;
+import org.terasology.engine.registry.CoreRegistry;
+import org.terasology.engine.rendering.world.viewDistance.ViewDistance;
+import org.terasology.engine.world.chunks.Chunk;
/**
* A local client.
diff --git a/engine/src/main/java/org/terasology/network/internal/MetricRecordingHandler.java b/engine/src/main/java/org/terasology/network/internal/MetricRecordingHandler.java
index aaba11eff..5bafe2dc3 100644
--- a/engine/src/main/java/org/terasology/network/internal/MetricRecordingHandler.java
+++ b/engine/src/main/java/org/terasology/network/internal/MetricRecordingHandler.java
@@ -14,13 +14,13 @@
* limitations under the License.
*/
-package org.terasology.network.internal;
+package org.terasology.engine.network.internal;
import io.netty.buffer.ByteBuf;
import io.netty.channel.ChannelDuplexHandler;
import io.netty.channel.ChannelHandlerContext;
import io.netty.channel.ChannelPromise;
-import org.terasology.network.NetMetricSource;
+import org.terasology.engine.network.NetMetricSource;
import java.util.concurrent.atomic.AtomicInteger;
diff --git a/engine/src/main/java/org/terasology/network/internal/NetClient.java b/engine/src/main/java/org/terasology/network/internal/NetClient.java
index 182de9de7..0d2ff3399 100644
--- a/engine/src/main/java/org/terasology/network/internal/NetClient.java
+++ b/engine/src/main/java/org/terasology/network/internal/NetClient.java
@@ -1,7 +1,7 @@
// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.network.internal;
+package org.terasology.engine.network.internal;
import com.google.common.base.Objects;
import com.google.common.collect.LinkedHashMultimap;
@@ -20,40 +20,40 @@ import org.joml.Vector3i;
import org.joml.Vector3ic;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.terasology.engine.Time;
-import org.terasology.entitySystem.Component;
-import org.terasology.entitySystem.entity.EntityManager;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.entitySystem.event.Event;
-import org.terasology.entitySystem.metadata.EventLibrary;
-import org.terasology.entitySystem.metadata.EventMetadata;
-import org.terasology.entitySystem.metadata.NetworkEventType;
-import org.terasology.identity.PublicIdentityCertificate;
-import org.terasology.logic.characters.PredictionSystem;
-import org.terasology.logic.common.DisplayNameComponent;
-import org.terasology.logic.location.LocationComponent;
-import org.terasology.network.Client;
-import org.terasology.network.ClientComponent;
-import org.terasology.network.ColorComponent;
-import org.terasology.network.NetMetricSource;
-import org.terasology.network.NetworkComponent;
-import org.terasology.network.serialization.ServerComponentFieldCheck;
+import org.terasology.engine.core.Time;
+import org.terasology.engine.entitySystem.Component;
+import org.terasology.engine.entitySystem.entity.EntityManager;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.event.Event;
+import org.terasology.engine.entitySystem.metadata.EventLibrary;
+import org.terasology.engine.entitySystem.metadata.EventMetadata;
+import org.terasology.engine.entitySystem.metadata.NetworkEventType;
+import org.terasology.engine.identity.PublicIdentityCertificate;
+import org.terasology.engine.logic.characters.PredictionSystem;
+import org.terasology.engine.logic.common.DisplayNameComponent;
+import org.terasology.engine.logic.location.LocationComponent;
+import org.terasology.engine.network.Client;
+import org.terasology.engine.network.ClientComponent;
+import org.terasology.engine.network.ColorComponent;
+import org.terasology.engine.network.NetMetricSource;
+import org.terasology.engine.network.NetworkComponent;
+import org.terasology.engine.network.serialization.ServerComponentFieldCheck;
+import org.terasology.engine.persistence.serializers.EventSerializer;
+import org.terasology.engine.persistence.serializers.NetworkEntitySerializer;
+import org.terasology.engine.registry.CoreRegistry;
+import org.terasology.engine.rendering.world.viewDistance.ViewDistance;
+import org.terasology.engine.world.WorldChangeListener;
+import org.terasology.engine.world.WorldProvider;
+import org.terasology.engine.world.block.Block;
+import org.terasology.engine.world.block.BlockComponent;
+import org.terasology.engine.world.block.family.BlockFamily;
+import org.terasology.engine.world.chunks.Chunk;
+import org.terasology.engine.world.chunks.Chunks;
import org.terasology.nui.Color;
-import org.terasology.persistence.serializers.EventSerializer;
-import org.terasology.persistence.serializers.NetworkEntitySerializer;
import org.terasology.persistence.typeHandling.DeserializationException;
import org.terasology.persistence.typeHandling.SerializationException;
import org.terasology.protobuf.EntityData;
import org.terasology.protobuf.NetData;
-import org.terasology.registry.CoreRegistry;
-import org.terasology.rendering.world.viewDistance.ViewDistance;
-import org.terasology.world.WorldChangeListener;
-import org.terasology.world.WorldProvider;
-import org.terasology.world.block.Block;
-import org.terasology.world.block.BlockComponent;
-import org.terasology.world.block.family.BlockFamily;
-import org.terasology.world.chunks.Chunk;
-import org.terasology.world.chunks.Chunks;
import java.util.Arrays;
import java.util.Iterator;
diff --git a/engine/src/main/java/org/terasology/network/internal/NetEntityRef.java b/engine/src/main/java/org/terasology/network/internal/NetEntityRef.java
index 874f5bb84..defff58cc 100644
--- a/engine/src/main/java/org/terasology/network/internal/NetEntityRef.java
+++ b/engine/src/main/java/org/terasology/network/internal/NetEntityRef.java
@@ -14,13 +14,13 @@
* limitations under the License.
*/
-package org.terasology.network.internal;
+package org.terasology.engine.network.internal;
-import org.terasology.entitySystem.Component;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.entitySystem.entity.LowLevelEntityManager;
-import org.terasology.entitySystem.entity.internal.BaseEntityRef;
-import org.terasology.network.NetworkComponent;
+import org.terasology.engine.entitySystem.Component;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.entity.LowLevelEntityManager;
+import org.terasology.engine.entitySystem.entity.internal.BaseEntityRef;
+import org.terasology.engine.network.NetworkComponent;
import java.util.Map;
diff --git a/engine/src/main/java/org/terasology/network/internal/NetMessageUtil.java b/engine/src/main/java/org/terasology/network/internal/NetMessageUtil.java
index 2a884eb00..90866088d 100644
--- a/engine/src/main/java/org/terasology/network/internal/NetMessageUtil.java
+++ b/engine/src/main/java/org/terasology/network/internal/NetMessageUtil.java
@@ -1,11 +1,11 @@
// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.network.internal;
+package org.terasology.engine.network.internal;
import com.google.protobuf.ByteString;
import org.joml.Vector3ic;
-import org.terasology.identity.PublicIdentityCertificate;
+import org.terasology.engine.identity.PublicIdentityCertificate;
import org.terasology.protobuf.NetData;
import java.math.BigInteger;
diff --git a/engine/src/main/java/org/terasology/network/internal/NetworkClientRefStrategy.java b/engine/src/main/java/org/terasology/network/internal/NetworkClientRefStrategy.java
index 25277d795..7d04e4dad 100644
--- a/engine/src/main/java/org/terasology/network/internal/NetworkClientRefStrategy.java
+++ b/engine/src/main/java/org/terasology/network/internal/NetworkClientRefStrategy.java
@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.network.internal;
+package org.terasology.engine.network.internal;
-import org.terasology.entitySystem.entity.LowLevelEntityManager;
-import org.terasology.entitySystem.entity.internal.BaseEntityRef;
-import org.terasology.entitySystem.entity.internal.DefaultRefStrategy;
-import org.terasology.network.NetworkComponent;
+import org.terasology.engine.entitySystem.entity.LowLevelEntityManager;
+import org.terasology.engine.entitySystem.entity.internal.BaseEntityRef;
+import org.terasology.engine.entitySystem.entity.internal.DefaultRefStrategy;
+import org.terasology.engine.network.NetworkComponent;
/**
*/
diff --git a/engine/src/main/java/org/terasology/network/internal/NetworkEntitySystem.java b/engine/src/main/java/org/terasology/network/internal/NetworkEntitySystem.java
index 527d1e75d..ccb7ac48b 100644
--- a/engine/src/main/java/org/terasology/network/internal/NetworkEntitySystem.java
+++ b/engine/src/main/java/org/terasology/network/internal/NetworkEntitySystem.java
@@ -14,21 +14,21 @@
* limitations under the License.
*/
-package org.terasology.network.internal;
+package org.terasology.engine.network.internal;
-import org.terasology.entitySystem.entity.EntityManager;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.entitySystem.entity.internal.EntityInfoComponent;
-import org.terasology.entitySystem.entity.lifecycleEvents.BeforeDeactivateComponent;
-import org.terasology.entitySystem.entity.lifecycleEvents.OnActivatedComponent;
-import org.terasology.entitySystem.entity.lifecycleEvents.OnChangedComponent;
-import org.terasology.entitySystem.event.EventPriority;
-import org.terasology.entitySystem.event.ReceiveEvent;
-import org.terasology.entitySystem.systems.BaseComponentSystem;
-import org.terasology.entitySystem.systems.RegisterMode;
-import org.terasology.network.NetworkComponent;
-import org.terasology.registry.In;
-import org.terasology.rendering.world.WorldRenderer;
+import org.terasology.engine.entitySystem.entity.EntityManager;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.entity.internal.EntityInfoComponent;
+import org.terasology.engine.entitySystem.entity.lifecycleEvents.BeforeDeactivateComponent;
+import org.terasology.engine.entitySystem.entity.lifecycleEvents.OnActivatedComponent;
+import org.terasology.engine.entitySystem.entity.lifecycleEvents.OnChangedComponent;
+import org.terasology.engine.entitySystem.event.EventPriority;
+import org.terasology.engine.entitySystem.event.ReceiveEvent;
+import org.terasology.engine.entitySystem.systems.BaseComponentSystem;
+import org.terasology.engine.entitySystem.systems.RegisterMode;
+import org.terasology.engine.network.NetworkComponent;
+import org.terasology.engine.registry.In;
+import org.terasology.engine.rendering.world.WorldRenderer;
/**
* This system handles a number of events relevant to the Network System:
diff --git a/engine/src/main/java/org/terasology/network/internal/NetworkSystemImpl.java b/engine/src/main/java/org/terasology/network/internal/NetworkSystemImpl.java
index 2efd01daa..a1268875c 100644
--- a/engine/src/main/java/org/terasology/network/internal/NetworkSystemImpl.java
+++ b/engine/src/main/java/org/terasology/network/internal/NetworkSystemImpl.java
@@ -1,7 +1,7 @@
-// Copyright 2020 The Terasology Foundation
+// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.network.internal;
+package org.terasology.engine.network.internal;
import com.google.common.base.Objects;
import com.google.common.collect.HashMultimap;
@@ -29,56 +29,56 @@ import io.netty.util.concurrent.GlobalEventExecutor;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.terasology.assets.ResourceUrn;
-import org.terasology.config.Config;
-import org.terasology.config.NetworkConfig;
-import org.terasology.context.Context;
-import org.terasology.engine.ComponentSystemManager;
-import org.terasology.engine.Time;
-import org.terasology.engine.module.ModuleManager;
-import org.terasology.engine.module.StandardModuleExtension;
-import org.terasology.engine.subsystem.common.hibernation.HibernationManager;
-import org.terasology.entitySystem.Component;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.entitySystem.entity.internal.EngineEntityManager;
-import org.terasology.entitySystem.entity.internal.EntityChangeSubscriber;
-import org.terasology.entitySystem.entity.internal.OwnershipHelper;
-import org.terasology.entitySystem.event.Event;
-import org.terasology.entitySystem.metadata.ComponentLibrary;
-import org.terasology.entitySystem.metadata.ComponentMetadata;
-import org.terasology.entitySystem.metadata.EventLibrary;
-import org.terasology.entitySystem.metadata.EventMetadata;
+import org.terasology.engine.config.Config;
+import org.terasology.engine.config.NetworkConfig;
+import org.terasology.engine.context.Context;
+import org.terasology.engine.core.ComponentSystemManager;
+import org.terasology.engine.core.Time;
+import org.terasology.engine.core.module.ModuleManager;
+import org.terasology.engine.core.module.StandardModuleExtension;
+import org.terasology.engine.core.subsystem.common.hibernation.HibernationManager;
+import org.terasology.engine.entitySystem.Component;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.entity.internal.EngineEntityManager;
+import org.terasology.engine.entitySystem.entity.internal.EntityChangeSubscriber;
+import org.terasology.engine.entitySystem.entity.internal.OwnershipHelper;
+import org.terasology.engine.entitySystem.event.Event;
+import org.terasology.engine.entitySystem.metadata.ComponentLibrary;
+import org.terasology.engine.entitySystem.metadata.ComponentMetadata;
+import org.terasology.engine.entitySystem.metadata.EventLibrary;
+import org.terasology.engine.entitySystem.metadata.EventMetadata;
+import org.terasology.engine.monitoring.PerformanceMonitor;
+import org.terasology.engine.network.Client;
+import org.terasology.engine.network.JoinStatus;
+import org.terasology.engine.network.NetworkComponent;
+import org.terasology.engine.network.NetworkMode;
+import org.terasology.engine.network.NetworkSystem;
+import org.terasology.engine.network.Server;
+import org.terasology.engine.network.events.ConnectedEvent;
+import org.terasology.engine.network.events.DisconnectedEvent;
+import org.terasology.engine.network.exceptions.HostingFailedException;
+import org.terasology.engine.network.internal.pipelineFactory.TerasologyClientPipelineFactory;
+import org.terasology.engine.network.internal.pipelineFactory.TerasologyServerPipelineFactory;
+import org.terasology.engine.network.serialization.NetComponentSerializeCheck;
+import org.terasology.engine.network.serialization.NetEntityRefTypeHandler;
+import org.terasology.engine.persistence.PlayerStore;
+import org.terasology.engine.persistence.StorageManager;
+import org.terasology.engine.persistence.serializers.EventSerializer;
+import org.terasology.engine.persistence.serializers.NetworkEntitySerializer;
+import org.terasology.engine.registry.CoreRegistry;
+import org.terasology.engine.world.BlockEntityRegistry;
+import org.terasology.engine.world.WorldProvider;
+import org.terasology.engine.world.block.BlockManager;
+import org.terasology.engine.world.block.family.BlockFamily;
+import org.terasology.engine.world.chunks.remoteChunkProvider.RemoteChunkProvider;
+import org.terasology.engine.world.generator.WorldGenerator;
import org.terasology.module.Module;
-import org.terasology.monitoring.PerformanceMonitor;
-import org.terasology.network.Client;
-import org.terasology.network.JoinStatus;
-import org.terasology.network.NetworkComponent;
-import org.terasology.network.NetworkMode;
-import org.terasology.network.NetworkSystem;
-import org.terasology.network.Server;
-import org.terasology.network.events.ConnectedEvent;
-import org.terasology.network.events.DisconnectedEvent;
-import org.terasology.network.exceptions.HostingFailedException;
-import org.terasology.network.internal.pipelineFactory.TerasologyClientPipelineFactory;
-import org.terasology.network.internal.pipelineFactory.TerasologyServerPipelineFactory;
-import org.terasology.network.serialization.NetComponentSerializeCheck;
-import org.terasology.network.serialization.NetEntityRefTypeHandler;
import org.terasology.nui.Color;
-import org.terasology.persistence.PlayerStore;
-import org.terasology.persistence.StorageManager;
-import org.terasology.persistence.serializers.EventSerializer;
-import org.terasology.persistence.serializers.NetworkEntitySerializer;
import org.terasology.persistence.typeHandling.TypeHandlerLibrary;
import org.terasology.protobuf.NetData;
import org.terasology.reflection.metadata.ClassLibrary;
import org.terasology.reflection.metadata.ClassMetadata;
import org.terasology.reflection.metadata.FieldMetadata;
-import org.terasology.registry.CoreRegistry;
-import org.terasology.world.BlockEntityRegistry;
-import org.terasology.world.WorldProvider;
-import org.terasology.world.block.BlockManager;
-import org.terasology.world.block.family.BlockFamily;
-import org.terasology.world.chunks.remoteChunkProvider.RemoteChunkProvider;
-import org.terasology.world.generator.WorldGenerator;
import java.net.BindException;
import java.net.InetAddress;
diff --git a/engine/src/main/java/org/terasology/network/internal/ServerConnectListManager.java b/engine/src/main/java/org/terasology/network/internal/ServerConnectListManager.java
index 71392180b..1ec4e207c 100644
--- a/engine/src/main/java/org/terasology/network/internal/ServerConnectListManager.java
+++ b/engine/src/main/java/org/terasology/network/internal/ServerConnectListManager.java
@@ -13,14 +13,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.network.internal;
+package org.terasology.engine.network.internal;
import com.google.gson.Gson;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.terasology.context.Context;
-import org.terasology.engine.paths.PathManager;
-import org.terasology.engine.subsystem.DisplayDevice;
+import org.terasology.engine.context.Context;
+import org.terasology.engine.core.paths.PathManager;
+import org.terasology.engine.core.subsystem.DisplayDevice;
import java.io.IOException;
import java.io.Writer;
diff --git a/engine/src/main/java/org/terasology/network/internal/ServerConnectionHandler.java b/engine/src/main/java/org/terasology/network/internal/ServerConnectionHandler.java
index 6dcc301f9..cc5ac2a17 100644
--- a/engine/src/main/java/org/terasology/network/internal/ServerConnectionHandler.java
+++ b/engine/src/main/java/org/terasology/network/internal/ServerConnectionHandler.java
@@ -1,6 +1,6 @@
// Copyright 2020 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.network.internal;
+package org.terasology.engine.network.internal;
import com.google.common.io.ByteStreams;
import com.google.protobuf.ByteString;
@@ -8,14 +8,14 @@ import io.netty.channel.ChannelHandlerContext;
import io.netty.channel.ChannelInboundHandlerAdapter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.terasology.engine.module.ModuleManager;
-import org.terasology.identity.PublicIdentityCertificate;
+import org.terasology.engine.core.module.ModuleManager;
+import org.terasology.engine.identity.PublicIdentityCertificate;
import org.terasology.module.Module;
import org.terasology.naming.Name;
import org.terasology.nui.Color;
import org.terasology.protobuf.NetData;
-import org.terasology.registry.CoreRegistry;
-import org.terasology.rendering.world.viewDistance.ViewDistance;
+import org.terasology.engine.registry.CoreRegistry;
+import org.terasology.engine.rendering.world.viewDistance.ViewDistance;
import java.io.BufferedInputStream;
import java.io.IOException;
diff --git a/engine/src/main/java/org/terasology/network/internal/ServerHandler.java b/engine/src/main/java/org/terasology/network/internal/ServerHandler.java
index 0ed81a31f..a08739b45 100644
--- a/engine/src/main/java/org/terasology/network/internal/ServerHandler.java
+++ b/engine/src/main/java/org/terasology/network/internal/ServerHandler.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.terasology.network.internal;
+package org.terasology.engine.network.internal;
import io.netty.channel.ChannelHandlerContext;
import io.netty.channel.ChannelInboundHandlerAdapter;
diff --git a/engine/src/main/java/org/terasology/network/internal/ServerHandshakeHandler.java b/engine/src/main/java/org/terasology/network/internal/ServerHandshakeHandler.java
index 37a8e56f3..a1c852929 100644
--- a/engine/src/main/java/org/terasology/network/internal/ServerHandshakeHandler.java
+++ b/engine/src/main/java/org/terasology/network/internal/ServerHandshakeHandler.java
@@ -1,20 +1,20 @@
// Copyright 2020 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.network.internal;
+package org.terasology.engine.network.internal;
import com.google.protobuf.ByteString;
import io.netty.channel.ChannelHandlerContext;
import io.netty.channel.ChannelInboundHandlerAdapter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.terasology.config.Config;
-import org.terasology.identity.BadEncryptedDataException;
-import org.terasology.identity.CertificateGenerator;
-import org.terasology.identity.CertificatePair;
-import org.terasology.identity.IdentityConstants;
-import org.terasology.identity.PublicIdentityCertificate;
+import org.terasology.engine.config.Config;
+import org.terasology.engine.identity.BadEncryptedDataException;
+import org.terasology.engine.identity.CertificateGenerator;
+import org.terasology.engine.identity.CertificatePair;
+import org.terasology.engine.identity.IdentityConstants;
+import org.terasology.engine.identity.PublicIdentityCertificate;
import org.terasology.protobuf.NetData;
-import org.terasology.registry.CoreRegistry;
+import org.terasology.engine.registry.CoreRegistry;
import javax.crypto.BadPaddingException;
import javax.crypto.Cipher;
diff --git a/engine/src/main/java/org/terasology/network/internal/ServerImpl.java b/engine/src/main/java/org/terasology/network/internal/ServerImpl.java
index 17fd4d02e..283522b71 100644
--- a/engine/src/main/java/org/terasology/network/internal/ServerImpl.java
+++ b/engine/src/main/java/org/terasology/network/internal/ServerImpl.java
@@ -1,7 +1,7 @@
// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.network.internal;
+package org.terasology.engine.network.internal;
import com.google.common.collect.ArrayListMultimap;
import com.google.common.collect.HashMultimap;
@@ -18,37 +18,37 @@ import org.joml.Vector3i;
import org.joml.Vector3ic;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.terasology.engine.EngineTime;
-import org.terasology.engine.Time;
-import org.terasology.entitySystem.Component;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.entitySystem.entity.internal.EngineEntityManager;
-import org.terasology.entitySystem.event.Event;
-import org.terasology.network.NetMetricSource;
-import org.terasology.network.NetworkComponent;
-import org.terasology.network.Server;
-import org.terasology.network.ServerInfoMessage;
-import org.terasology.network.serialization.ClientComponentFieldCheck;
-import org.terasology.persistence.serializers.EventSerializer;
-import org.terasology.persistence.serializers.NetworkEntitySerializer;
+import org.terasology.engine.core.EngineTime;
+import org.terasology.engine.core.Time;
+import org.terasology.engine.entitySystem.Component;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.entity.internal.EngineEntityManager;
+import org.terasology.engine.entitySystem.event.Event;
+import org.terasology.engine.network.NetMetricSource;
+import org.terasology.engine.network.NetworkComponent;
+import org.terasology.engine.network.Server;
+import org.terasology.engine.network.ServerInfoMessage;
+import org.terasology.engine.network.serialization.ClientComponentFieldCheck;
+import org.terasology.engine.persistence.serializers.EventSerializer;
+import org.terasology.engine.persistence.serializers.NetworkEntitySerializer;
+import org.terasology.engine.registry.CoreRegistry;
+import org.terasology.engine.world.BlockEntityRegistry;
+import org.terasology.engine.world.WorldProvider;
+import org.terasology.engine.world.block.Block;
+import org.terasology.engine.world.block.BlockComponent;
+import org.terasology.engine.world.block.BlockManager;
+import org.terasology.engine.world.block.BlockUri;
+import org.terasology.engine.world.block.BlockUriParseException;
+import org.terasology.engine.world.block.internal.BlockManagerImpl;
+import org.terasology.engine.world.chunks.Chunk;
+import org.terasology.engine.world.chunks.Chunks;
+import org.terasology.engine.world.chunks.blockdata.ExtraBlockDataManager;
+import org.terasology.engine.world.chunks.internal.ChunkSerializer;
+import org.terasology.engine.world.chunks.remoteChunkProvider.RemoteChunkProvider;
import org.terasology.persistence.typeHandling.DeserializationException;
import org.terasology.persistence.typeHandling.SerializationException;
import org.terasology.protobuf.EntityData;
import org.terasology.protobuf.NetData;
-import org.terasology.registry.CoreRegistry;
-import org.terasology.world.BlockEntityRegistry;
-import org.terasology.world.WorldProvider;
-import org.terasology.world.block.Block;
-import org.terasology.world.block.BlockComponent;
-import org.terasology.world.block.BlockManager;
-import org.terasology.world.block.BlockUri;
-import org.terasology.world.block.BlockUriParseException;
-import org.terasology.world.block.internal.BlockManagerImpl;
-import org.terasology.world.chunks.Chunk;
-import org.terasology.world.chunks.Chunks;
-import org.terasology.world.chunks.blockdata.ExtraBlockDataManager;
-import org.terasology.world.chunks.internal.ChunkSerializer;
-import org.terasology.world.chunks.remoteChunkProvider.RemoteChunkProvider;
import java.net.InetSocketAddress;
import java.net.SocketAddress;
diff --git a/engine/src/main/java/org/terasology/network/internal/ServerInfoMessageImpl.java b/engine/src/main/java/org/terasology/network/internal/ServerInfoMessageImpl.java
index 564076130..1344693d2 100644
--- a/engine/src/main/java/org/terasology/network/internal/ServerInfoMessageImpl.java
+++ b/engine/src/main/java/org/terasology/network/internal/ServerInfoMessageImpl.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.terasology.network.internal;
+package org.terasology.engine.network.internal;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
@@ -23,9 +23,9 @@ import org.slf4j.LoggerFactory;
import org.terasology.naming.Name;
import org.terasology.naming.NameVersion;
import org.terasology.naming.Version;
-import org.terasology.network.ServerInfoMessage;
+import org.terasology.engine.network.ServerInfoMessage;
import org.terasology.protobuf.NetData;
-import org.terasology.world.internal.WorldInfo;
+import org.terasology.engine.world.internal.WorldInfo;
import java.util.Collections;
import java.util.List;
diff --git a/engine/src/main/java/org/terasology/network/internal/ServerInfoRequestHandler.java b/engine/src/main/java/org/terasology/network/internal/ServerInfoRequestHandler.java
index 904ce9431..ba04ef8df 100644
--- a/engine/src/main/java/org/terasology/network/internal/ServerInfoRequestHandler.java
+++ b/engine/src/main/java/org/terasology/network/internal/ServerInfoRequestHandler.java
@@ -13,13 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.network.internal;
+package org.terasology.engine.network.internal;
import io.netty.channel.ChannelHandlerContext;
import io.netty.channel.ChannelInboundHandlerAdapter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.terasology.network.ServerInfoMessage;
+import org.terasology.engine.network.ServerInfoMessage;
import org.terasology.protobuf.NetData;
/**
diff --git a/engine/src/main/java/org/terasology/network/internal/pipelineFactory/InfoRequestPipelineFactory.java b/engine/src/main/java/org/terasology/network/internal/pipelineFactory/InfoRequestPipelineFactory.java
index f849d700a..2bac2d8a1 100644
--- a/engine/src/main/java/org/terasology/network/internal/pipelineFactory/InfoRequestPipelineFactory.java
+++ b/engine/src/main/java/org/terasology/network/internal/pipelineFactory/InfoRequestPipelineFactory.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.terasology.network.internal.pipelineFactory;
+package org.terasology.engine.network.internal.pipelineFactory;
import io.netty.channel.Channel;
import io.netty.channel.ChannelInitializer;
@@ -25,14 +25,14 @@ import io.netty.handler.codec.protobuf.ProtobufDecoder;
import io.netty.handler.codec.protobuf.ProtobufEncoder;
import io.netty.handler.codec.protobuf.ProtobufVarint32FrameDecoder;
import io.netty.handler.codec.protobuf.ProtobufVarint32LengthFieldPrepender;
-import org.terasology.network.internal.ClientHandshakeHandler;
-import org.terasology.network.internal.JoinStatusImpl;
-import org.terasology.network.internal.MetricRecordingHandler;
-import org.terasology.network.internal.ServerInfoRequestHandler;
+import org.terasology.engine.network.internal.ClientHandshakeHandler;
+import org.terasology.engine.network.internal.JoinStatusImpl;
+import org.terasology.engine.network.internal.MetricRecordingHandler;
+import org.terasology.engine.network.internal.ServerInfoRequestHandler;
import org.terasology.protobuf.NetData;
/**
- * A pipeline that requests {@link org.terasology.network.ServerInfoMessage} before it auto-disconnects. This is similar
+ * A pipeline that requests {@link org.terasology.engine.network.ServerInfoMessage} before it auto-disconnects. This is similar
* to {@link TerasologyClientPipelineFactory}.
*/
public class InfoRequestPipelineFactory extends ChannelInitializer {
diff --git a/engine/src/main/java/org/terasology/network/internal/pipelineFactory/TerasologyClientPipelineFactory.java b/engine/src/main/java/org/terasology/network/internal/pipelineFactory/TerasologyClientPipelineFactory.java
index 862a21ef3..6190d9645 100644
--- a/engine/src/main/java/org/terasology/network/internal/pipelineFactory/TerasologyClientPipelineFactory.java
+++ b/engine/src/main/java/org/terasology/network/internal/pipelineFactory/TerasologyClientPipelineFactory.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.terasology.network.internal.pipelineFactory;
+package org.terasology.engine.network.internal.pipelineFactory;
import io.netty.channel.Channel;
import io.netty.channel.ChannelInitializer;
@@ -25,12 +25,12 @@ import io.netty.handler.codec.protobuf.ProtobufDecoder;
import io.netty.handler.codec.protobuf.ProtobufEncoder;
import io.netty.handler.codec.protobuf.ProtobufVarint32FrameDecoder;
import io.netty.handler.codec.protobuf.ProtobufVarint32LengthFieldPrepender;
-import org.terasology.network.internal.ClientConnectionHandler;
-import org.terasology.network.internal.ClientHandler;
-import org.terasology.network.internal.ClientHandshakeHandler;
-import org.terasology.network.internal.JoinStatusImpl;
-import org.terasology.network.internal.MetricRecordingHandler;
-import org.terasology.network.internal.NetworkSystemImpl;
+import org.terasology.engine.network.internal.ClientConnectionHandler;
+import org.terasology.engine.network.internal.ClientHandler;
+import org.terasology.engine.network.internal.ClientHandshakeHandler;
+import org.terasology.engine.network.internal.JoinStatusImpl;
+import org.terasology.engine.network.internal.MetricRecordingHandler;
+import org.terasology.engine.network.internal.NetworkSystemImpl;
import org.terasology.protobuf.NetData;
diff --git a/engine/src/main/java/org/terasology/network/internal/pipelineFactory/TerasologyServerPipelineFactory.java b/engine/src/main/java/org/terasology/network/internal/pipelineFactory/TerasologyServerPipelineFactory.java
index f7356ee00..bd6caf956 100644
--- a/engine/src/main/java/org/terasology/network/internal/pipelineFactory/TerasologyServerPipelineFactory.java
+++ b/engine/src/main/java/org/terasology/network/internal/pipelineFactory/TerasologyServerPipelineFactory.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.terasology.network.internal.pipelineFactory;
+package org.terasology.engine.network.internal.pipelineFactory;
import io.netty.channel.Channel;
import io.netty.channel.ChannelInitializer;
@@ -25,11 +25,11 @@ import io.netty.handler.codec.protobuf.ProtobufDecoder;
import io.netty.handler.codec.protobuf.ProtobufEncoder;
import io.netty.handler.codec.protobuf.ProtobufVarint32FrameDecoder;
import io.netty.handler.codec.protobuf.ProtobufVarint32LengthFieldPrepender;
-import org.terasology.network.internal.MetricRecordingHandler;
-import org.terasology.network.internal.NetworkSystemImpl;
-import org.terasology.network.internal.ServerConnectionHandler;
-import org.terasology.network.internal.ServerHandler;
-import org.terasology.network.internal.ServerHandshakeHandler;
+import org.terasology.engine.network.internal.MetricRecordingHandler;
+import org.terasology.engine.network.internal.NetworkSystemImpl;
+import org.terasology.engine.network.internal.ServerConnectionHandler;
+import org.terasology.engine.network.internal.ServerHandler;
+import org.terasology.engine.network.internal.ServerHandshakeHandler;
import org.terasology.protobuf.NetData;
/**
diff --git a/engine/src/main/java/org/terasology/network/package-info.java b/engine/src/main/java/org/terasology/network/package-info.java
index dcfc0f5e6..96b7f6361 100644
--- a/engine/src/main/java/org/terasology/network/package-info.java
+++ b/engine/src/main/java/org/terasology/network/package-info.java
@@ -14,6 +14,6 @@
* limitations under the License.
*/
-@API package org.terasology.network;
+@API package org.terasology.engine.network;
import org.terasology.module.sandbox.API;
diff --git a/engine/src/main/java/org/terasology/network/serialization/ClientComponentFieldCheck.java b/engine/src/main/java/org/terasology/network/serialization/ClientComponentFieldCheck.java
index 361f7ab8e..16c3415f4 100644
--- a/engine/src/main/java/org/terasology/network/serialization/ClientComponentFieldCheck.java
+++ b/engine/src/main/java/org/terasology/network/serialization/ClientComponentFieldCheck.java
@@ -14,13 +14,13 @@
* limitations under the License.
*/
-package org.terasology.network.serialization;
+package org.terasology.engine.network.serialization;
import org.terasology.reflection.metadata.ClassMetadata;
import org.terasology.reflection.metadata.FieldMetadata;
-import org.terasology.entitySystem.Component;
-import org.terasology.entitySystem.metadata.ReplicatedFieldMetadata;
-import org.terasology.persistence.serializers.FieldSerializeCheck;
+import org.terasology.engine.entitySystem.Component;
+import org.terasology.engine.entitySystem.metadata.ReplicatedFieldMetadata;
+import org.terasology.engine.persistence.serializers.FieldSerializeCheck;
/**
* Determines which fields should be serialized and deserialized by the client.
diff --git a/engine/src/main/java/org/terasology/network/serialization/NetComponentSerializeCheck.java b/engine/src/main/java/org/terasology/network/serialization/NetComponentSerializeCheck.java
index 7f10115f2..dd46ca608 100644
--- a/engine/src/main/java/org/terasology/network/serialization/NetComponentSerializeCheck.java
+++ b/engine/src/main/java/org/terasology/network/serialization/NetComponentSerializeCheck.java
@@ -14,11 +14,11 @@
* limitations under the License.
*/
-package org.terasology.network.serialization;
+package org.terasology.engine.network.serialization;
-import org.terasology.entitySystem.Component;
-import org.terasology.entitySystem.metadata.ComponentMetadata;
-import org.terasology.persistence.serializers.ComponentSerializeCheck;
+import org.terasology.engine.entitySystem.Component;
+import org.terasology.engine.entitySystem.metadata.ComponentMetadata;
+import org.terasology.engine.persistence.serializers.ComponentSerializeCheck;
/**
* Determines which components should be serialized over the network - only replicated components.
diff --git a/engine/src/main/java/org/terasology/network/serialization/NetEntityRefTypeHandler.java b/engine/src/main/java/org/terasology/network/serialization/NetEntityRefTypeHandler.java
index 3ac59ae76..b9d5cb69a 100644
--- a/engine/src/main/java/org/terasology/network/serialization/NetEntityRefTypeHandler.java
+++ b/engine/src/main/java/org/terasology/network/serialization/NetEntityRefTypeHandler.java
@@ -1,20 +1,20 @@
// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.network.serialization;
+package org.terasology.engine.network.serialization;
import gnu.trove.list.TIntList;
import org.joml.Vector3i;
import org.joml.Vector3ic;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.network.NetworkComponent;
-import org.terasology.network.internal.NetworkSystemImpl;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.network.NetworkComponent;
+import org.terasology.engine.network.internal.NetworkSystemImpl;
+import org.terasology.engine.world.BlockEntityRegistry;
+import org.terasology.engine.world.block.BlockComponent;
import org.terasology.persistence.typeHandling.PersistedData;
import org.terasology.persistence.typeHandling.PersistedDataArray;
import org.terasology.persistence.typeHandling.PersistedDataSerializer;
import org.terasology.persistence.typeHandling.TypeHandler;
-import org.terasology.world.BlockEntityRegistry;
-import org.terasology.world.block.BlockComponent;
import java.util.Optional;
diff --git a/engine/src/main/java/org/terasology/network/serialization/ServerComponentFieldCheck.java b/engine/src/main/java/org/terasology/network/serialization/ServerComponentFieldCheck.java
index 99f4cca09..f75f7e1c8 100644
--- a/engine/src/main/java/org/terasology/network/serialization/ServerComponentFieldCheck.java
+++ b/engine/src/main/java/org/terasology/network/serialization/ServerComponentFieldCheck.java
@@ -14,15 +14,15 @@
* limitations under the License.
*/
-package org.terasology.network.serialization;
+package org.terasology.engine.network.serialization;
import org.terasology.reflection.metadata.ClassMetadata;
import org.terasology.reflection.metadata.FieldMetadata;
-import org.terasology.entitySystem.Component;
-import org.terasology.entitySystem.metadata.ReplicatedFieldMetadata;
-import org.terasology.network.FieldReplicateType;
-import org.terasology.network.ReplicationCheck;
-import org.terasology.persistence.serializers.FieldSerializeCheck;
+import org.terasology.engine.entitySystem.Component;
+import org.terasology.engine.entitySystem.metadata.ReplicatedFieldMetadata;
+import org.terasology.engine.network.FieldReplicateType;
+import org.terasology.engine.network.ReplicationCheck;
+import org.terasology.engine.persistence.serializers.FieldSerializeCheck;
/**
* Determines which fields should be sent and received by the server
diff --git a/engine/src/main/java/org/terasology/package-info.java b/engine/src/main/java/org/terasology/package-info.java
new file mode 100644
index 000000000..7b189af22
--- /dev/null
+++ b/engine/src/main/java/org/terasology/package-info.java
@@ -0,0 +1,4 @@
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+package org.terasology.engine;
diff --git a/engine/src/main/java/org/terasology/particles/ParticleData.java b/engine/src/main/java/org/terasology/particles/ParticleData.java
index 44f6e2710..6fb6d2abe 100644
--- a/engine/src/main/java/org/terasology/particles/ParticleData.java
+++ b/engine/src/main/java/org/terasology/particles/ParticleData.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.particles;
+package org.terasology.engine.particles;
import org.joml.Vector2f;
import org.joml.Vector3f;
diff --git a/engine/src/main/java/org/terasology/particles/ParticleDataMask.java b/engine/src/main/java/org/terasology/particles/ParticleDataMask.java
index c0e52d2f6..9f42d008f 100644
--- a/engine/src/main/java/org/terasology/particles/ParticleDataMask.java
+++ b/engine/src/main/java/org/terasology/particles/ParticleDataMask.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.particles;
+package org.terasology.engine.particles;
import org.terasology.module.sandbox.API;
diff --git a/engine/src/main/java/org/terasology/particles/ParticlePool.java b/engine/src/main/java/org/terasology/particles/ParticlePool.java
index 146546fb2..773605187 100644
--- a/engine/src/main/java/org/terasology/particles/ParticlePool.java
+++ b/engine/src/main/java/org/terasology/particles/ParticlePool.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.particles;
+package org.terasology.engine.particles;
import com.google.common.base.Preconditions;
import org.lwjgl.BufferUtils;
diff --git a/engine/src/main/java/org/terasology/particles/ParticleSystemManager.java b/engine/src/main/java/org/terasology/particles/ParticleSystemManager.java
index 10ce82546..8113d7392 100644
--- a/engine/src/main/java/org/terasology/particles/ParticleSystemManager.java
+++ b/engine/src/main/java/org/terasology/particles/ParticleSystemManager.java
@@ -13,16 +13,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.particles;
+package org.terasology.engine.particles;
-import org.terasology.entitySystem.Component;
+import org.terasology.engine.entitySystem.Component;
import org.terasology.module.sandbox.API;
-import org.terasology.particles.rendering.ParticleRenderingData;
+import org.terasology.engine.particles.rendering.ParticleRenderingData;
import java.util.stream.Stream;
/**
- * Component system responsible for keeping track of all {@link org.terasology.particles.components.ParticleEmitterComponent} components and updating them.
+ * Component system responsible for keeping track of all {@link org.terasology.engine.particles.components.ParticleEmitterComponent} components and updating them.
* Also maintains a registry of generator and affector functions to be used when processing generators
* and affectors during a particle system update.
*/
diff --git a/engine/src/main/java/org/terasology/particles/ParticleSystemManagerImpl.java b/engine/src/main/java/org/terasology/particles/ParticleSystemManagerImpl.java
index 4322fa593..74a1f0b45 100644
--- a/engine/src/main/java/org/terasology/particles/ParticleSystemManagerImpl.java
+++ b/engine/src/main/java/org/terasology/particles/ParticleSystemManagerImpl.java
@@ -13,28 +13,28 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.particles;
+package org.terasology.engine.particles;
-import org.terasology.engine.module.ModuleManager;
-import org.terasology.entitySystem.Component;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.entitySystem.entity.lifecycleEvents.BeforeDeactivateComponent;
-import org.terasology.entitySystem.entity.lifecycleEvents.OnActivatedComponent;
-import org.terasology.entitySystem.event.ReceiveEvent;
-import org.terasology.entitySystem.systems.BaseComponentSystem;
-import org.terasology.entitySystem.systems.RegisterMode;
-import org.terasology.entitySystem.systems.RegisterSystem;
-import org.terasology.entitySystem.systems.UpdateSubscriberSystem;
-import org.terasology.logic.location.LocationComponent;
+import org.terasology.engine.core.module.ModuleManager;
+import org.terasology.engine.entitySystem.Component;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.entity.lifecycleEvents.BeforeDeactivateComponent;
+import org.terasology.engine.entitySystem.entity.lifecycleEvents.OnActivatedComponent;
+import org.terasology.engine.entitySystem.event.ReceiveEvent;
+import org.terasology.engine.entitySystem.systems.BaseComponentSystem;
+import org.terasology.engine.entitySystem.systems.RegisterMode;
+import org.terasology.engine.entitySystem.systems.RegisterSystem;
+import org.terasology.engine.entitySystem.systems.UpdateSubscriberSystem;
+import org.terasology.engine.logic.location.LocationComponent;
import org.terasology.module.sandbox.API;
-import org.terasology.particles.components.ParticleEmitterComponent;
-import org.terasology.particles.events.ParticleSystemUpdateEvent;
-import org.terasology.particles.rendering.ParticleRenderingData;
-import org.terasology.particles.updating.ParticleUpdater;
-import org.terasology.particles.updating.ParticleUpdaterImpl;
-import org.terasology.physics.Physics;
-import org.terasology.registry.In;
-import org.terasology.registry.Share;
+import org.terasology.engine.particles.components.ParticleEmitterComponent;
+import org.terasology.engine.particles.events.ParticleSystemUpdateEvent;
+import org.terasology.engine.particles.rendering.ParticleRenderingData;
+import org.terasology.engine.particles.updating.ParticleUpdater;
+import org.terasology.engine.particles.updating.ParticleUpdaterImpl;
+import org.terasology.engine.physics.Physics;
+import org.terasology.engine.registry.In;
+import org.terasology.engine.registry.Share;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
diff --git a/engine/src/main/java/org/terasology/particles/components/ParticleDataSpriteComponent.java b/engine/src/main/java/org/terasology/particles/components/ParticleDataSpriteComponent.java
index da231ca39..68113920c 100644
--- a/engine/src/main/java/org/terasology/particles/components/ParticleDataSpriteComponent.java
+++ b/engine/src/main/java/org/terasology/particles/components/ParticleDataSpriteComponent.java
@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.particles.components;
+package org.terasology.engine.particles.components;
import org.joml.Vector2f;
-import org.terasology.entitySystem.Component;
+import org.terasology.engine.entitySystem.Component;
import org.terasology.module.sandbox.API;
-import org.terasology.rendering.assets.texture.Texture;
+import org.terasology.engine.rendering.assets.texture.Texture;
/**
*
diff --git a/engine/src/main/java/org/terasology/particles/components/ParticleEmitterComponent.java b/engine/src/main/java/org/terasology/particles/components/ParticleEmitterComponent.java
index 212e9006c..ecda1aa09 100644
--- a/engine/src/main/java/org/terasology/particles/components/ParticleEmitterComponent.java
+++ b/engine/src/main/java/org/terasology/particles/components/ParticleEmitterComponent.java
@@ -13,15 +13,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.particles.components;
+package org.terasology.engine.particles.components;
-import org.terasology.entitySystem.Component;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.logic.location.LocationComponent;
+import org.terasology.engine.entitySystem.Component;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.logic.location.LocationComponent;
import org.terasology.module.sandbox.API;
-import org.terasology.particles.ParticlePool;
-import org.terasology.particles.functions.affectors.AffectorFunction;
-import org.terasology.particles.functions.generators.GeneratorFunction;
+import org.terasology.engine.particles.ParticlePool;
+import org.terasology.engine.particles.functions.affectors.AffectorFunction;
+import org.terasology.engine.particles.functions.generators.GeneratorFunction;
import java.util.LinkedHashMap;
import java.util.Map;
diff --git a/engine/src/main/java/org/terasology/particles/components/affectors/AccelerationAffectorComponent.java b/engine/src/main/java/org/terasology/particles/components/affectors/AccelerationAffectorComponent.java
index 12df62b0b..e64e6a21f 100644
--- a/engine/src/main/java/org/terasology/particles/components/affectors/AccelerationAffectorComponent.java
+++ b/engine/src/main/java/org/terasology/particles/components/affectors/AccelerationAffectorComponent.java
@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.particles.components.affectors;
+package org.terasology.engine.particles.components.affectors;
import org.joml.Vector3f;
-import org.terasology.entitySystem.Component;
+import org.terasology.engine.entitySystem.Component;
import org.terasology.module.sandbox.API;
-import org.terasology.network.Replicate;
+import org.terasology.engine.network.Replicate;
/**
*
diff --git a/engine/src/main/java/org/terasology/particles/components/affectors/VelocityAffectorComponent.java b/engine/src/main/java/org/terasology/particles/components/affectors/VelocityAffectorComponent.java
index 85dec7347..39cfe5c65 100644
--- a/engine/src/main/java/org/terasology/particles/components/affectors/VelocityAffectorComponent.java
+++ b/engine/src/main/java/org/terasology/particles/components/affectors/VelocityAffectorComponent.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.particles.components.affectors;
+package org.terasology.engine.particles.components.affectors;
-import org.terasology.entitySystem.Component;
+import org.terasology.engine.entitySystem.Component;
import org.terasology.module.sandbox.API;
/**
diff --git a/engine/src/main/java/org/terasology/particles/components/generators/ColorRangeGeneratorComponent.java b/engine/src/main/java/org/terasology/particles/components/generators/ColorRangeGeneratorComponent.java
index 1b60783af..7c35748bc 100644
--- a/engine/src/main/java/org/terasology/particles/components/generators/ColorRangeGeneratorComponent.java
+++ b/engine/src/main/java/org/terasology/particles/components/generators/ColorRangeGeneratorComponent.java
@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.particles.components.generators;
+package org.terasology.engine.particles.components.generators;
import org.joml.Vector4f;
-import org.terasology.entitySystem.Component;
+import org.terasology.engine.entitySystem.Component;
import org.terasology.module.sandbox.API;
/**
diff --git a/engine/src/main/java/org/terasology/particles/components/generators/EnergyRangeGeneratorComponent.java b/engine/src/main/java/org/terasology/particles/components/generators/EnergyRangeGeneratorComponent.java
index 60f1b235c..7362f3264 100644
--- a/engine/src/main/java/org/terasology/particles/components/generators/EnergyRangeGeneratorComponent.java
+++ b/engine/src/main/java/org/terasology/particles/components/generators/EnergyRangeGeneratorComponent.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.particles.components.generators;
+package org.terasology.engine.particles.components.generators;
-import org.terasology.entitySystem.Component;
+import org.terasology.engine.entitySystem.Component;
import org.terasology.module.sandbox.API;
/**
diff --git a/engine/src/main/java/org/terasology/particles/components/generators/PositionRangeGeneratorComponent.java b/engine/src/main/java/org/terasology/particles/components/generators/PositionRangeGeneratorComponent.java
index 94e37e8fa..c6700647b 100644
--- a/engine/src/main/java/org/terasology/particles/components/generators/PositionRangeGeneratorComponent.java
+++ b/engine/src/main/java/org/terasology/particles/components/generators/PositionRangeGeneratorComponent.java
@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.particles.components.generators;
+package org.terasology.engine.particles.components.generators;
import org.joml.Vector3f;
-import org.terasology.entitySystem.Component;
+import org.terasology.engine.entitySystem.Component;
import org.terasology.module.sandbox.API;
/**
diff --git a/engine/src/main/java/org/terasology/particles/components/generators/ScaleRangeGeneratorComponent.java b/engine/src/main/java/org/terasology/particles/components/generators/ScaleRangeGeneratorComponent.java
index e9f2e3e29..92b915508 100644
--- a/engine/src/main/java/org/terasology/particles/components/generators/ScaleRangeGeneratorComponent.java
+++ b/engine/src/main/java/org/terasology/particles/components/generators/ScaleRangeGeneratorComponent.java
@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.particles.components.generators;
+package org.terasology.engine.particles.components.generators;
import org.joml.Vector3f;
-import org.terasology.entitySystem.Component;
+import org.terasology.engine.entitySystem.Component;
import org.terasology.module.sandbox.API;
/**
diff --git a/engine/src/main/java/org/terasology/particles/components/generators/TextureOffsetGeneratorComponent.java b/engine/src/main/java/org/terasology/particles/components/generators/TextureOffsetGeneratorComponent.java
index f70a32664..0548feb94 100644
--- a/engine/src/main/java/org/terasology/particles/components/generators/TextureOffsetGeneratorComponent.java
+++ b/engine/src/main/java/org/terasology/particles/components/generators/TextureOffsetGeneratorComponent.java
@@ -13,13 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.particles.components.generators;
+package org.terasology.engine.particles.components.generators;
import org.joml.Vector2f;
import org.joml.Vector2i;
-import org.terasology.entitySystem.Component;
+import org.terasology.engine.entitySystem.Component;
import org.terasology.module.sandbox.API;
-import org.terasology.rendering.assets.texture.Texture;
+import org.terasology.engine.rendering.assets.texture.Texture;
import java.util.LinkedList;
import java.util.List;
diff --git a/engine/src/main/java/org/terasology/particles/components/generators/VelocityRangeGeneratorComponent.java b/engine/src/main/java/org/terasology/particles/components/generators/VelocityRangeGeneratorComponent.java
index d7b82ecfc..689378dc5 100644
--- a/engine/src/main/java/org/terasology/particles/components/generators/VelocityRangeGeneratorComponent.java
+++ b/engine/src/main/java/org/terasology/particles/components/generators/VelocityRangeGeneratorComponent.java
@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.particles.components.generators;
+package org.terasology.engine.particles.components.generators;
import org.joml.Vector3f;
-import org.terasology.entitySystem.Component;
+import org.terasology.engine.entitySystem.Component;
import org.terasology.module.sandbox.API;
/**
diff --git a/engine/src/main/java/org/terasology/particles/events/ParticleSystemUpdateEvent.java b/engine/src/main/java/org/terasology/particles/events/ParticleSystemUpdateEvent.java
index a455855a4..e05e645fe 100644
--- a/engine/src/main/java/org/terasology/particles/events/ParticleSystemUpdateEvent.java
+++ b/engine/src/main/java/org/terasology/particles/events/ParticleSystemUpdateEvent.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.particles.events;
+package org.terasology.engine.particles.events;
-import org.terasology.entitySystem.event.Event;
+import org.terasology.engine.entitySystem.event.Event;
import org.terasology.module.sandbox.API;
/**
diff --git a/engine/src/main/java/org/terasology/particles/functions/ParticleSystemFunction.java b/engine/src/main/java/org/terasology/particles/functions/ParticleSystemFunction.java
index 0afaaaa9f..0920c2291 100644
--- a/engine/src/main/java/org/terasology/particles/functions/ParticleSystemFunction.java
+++ b/engine/src/main/java/org/terasology/particles/functions/ParticleSystemFunction.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.particles.functions;
+package org.terasology.engine.particles.functions;
-import org.terasology.particles.ParticleDataMask;
+import org.terasology.engine.particles.ParticleDataMask;
/**
* Base class for GeneratorFunction and AffectorFunction. A particle system function is called on a particle to update its fields.
diff --git a/engine/src/main/java/org/terasology/particles/functions/RegisterParticleSystemFunction.java b/engine/src/main/java/org/terasology/particles/functions/RegisterParticleSystemFunction.java
index 4943cf563..8e99cb2d6 100644
--- a/engine/src/main/java/org/terasology/particles/functions/RegisterParticleSystemFunction.java
+++ b/engine/src/main/java/org/terasology/particles/functions/RegisterParticleSystemFunction.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.particles.functions;
+package org.terasology.engine.particles.functions;
import org.terasology.module.sandbox.API;
@@ -23,7 +23,7 @@ import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
/**
- * This annotation is used to mark a {@link ParticleSystemFunction} to be registered in by the {@link org.terasology.particles.updating.ParticleUpdater}.
+ * This annotation is used to mark a {@link ParticleSystemFunction} to be registered in by the {@link org.terasology.engine.particles.updating.ParticleUpdater}.
*/
@API
@Retention(RetentionPolicy.RUNTIME)
diff --git a/engine/src/main/java/org/terasology/particles/functions/affectors/AccelerationAffectorFunction.java b/engine/src/main/java/org/terasology/particles/functions/affectors/AccelerationAffectorFunction.java
index 64d411701..e4571df87 100644
--- a/engine/src/main/java/org/terasology/particles/functions/affectors/AccelerationAffectorFunction.java
+++ b/engine/src/main/java/org/terasology/particles/functions/affectors/AccelerationAffectorFunction.java
@@ -13,13 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.particles.functions.affectors;
+package org.terasology.engine.particles.functions.affectors;
-import org.terasology.particles.ParticleData;
-import org.terasology.particles.ParticleDataMask;
-import org.terasology.particles.components.affectors.AccelerationAffectorComponent;
-import org.terasology.particles.functions.RegisterParticleSystemFunction;
-import org.terasology.utilities.random.Random;
+import org.terasology.engine.particles.ParticleData;
+import org.terasology.engine.particles.ParticleDataMask;
+import org.terasology.engine.particles.components.affectors.AccelerationAffectorComponent;
+import org.terasology.engine.particles.functions.RegisterParticleSystemFunction;
+import org.terasology.engine.utilities.random.Random;
/**
*
diff --git a/engine/src/main/java/org/terasology/particles/functions/affectors/AffectorFunction.java b/engine/src/main/java/org/terasology/particles/functions/affectors/AffectorFunction.java
index 85d62749d..836eda997 100644
--- a/engine/src/main/java/org/terasology/particles/functions/affectors/AffectorFunction.java
+++ b/engine/src/main/java/org/terasology/particles/functions/affectors/AffectorFunction.java
@@ -13,14 +13,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.particles.functions.affectors;
+package org.terasology.engine.particles.functions.affectors;
-import org.terasology.entitySystem.Component;
+import org.terasology.engine.entitySystem.Component;
import org.terasology.module.sandbox.API;
-import org.terasology.particles.ParticleData;
-import org.terasology.particles.ParticleDataMask;
-import org.terasology.particles.functions.ParticleSystemFunction;
-import org.terasology.utilities.random.Random;
+import org.terasology.engine.particles.ParticleData;
+import org.terasology.engine.particles.ParticleDataMask;
+import org.terasology.engine.particles.functions.ParticleSystemFunction;
+import org.terasology.engine.utilities.random.Random;
/**
* A affector function is called on a particle's data when it is updated to set its fields (Ex. Apply a force to a particle).
diff --git a/engine/src/main/java/org/terasology/particles/functions/affectors/VelocityAffectorFunction.java b/engine/src/main/java/org/terasology/particles/functions/affectors/VelocityAffectorFunction.java
index 38c9472d6..ab7d3a01d 100644
--- a/engine/src/main/java/org/terasology/particles/functions/affectors/VelocityAffectorFunction.java
+++ b/engine/src/main/java/org/terasology/particles/functions/affectors/VelocityAffectorFunction.java
@@ -13,13 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.particles.functions.affectors;
+package org.terasology.engine.particles.functions.affectors;
-import org.terasology.particles.ParticleData;
-import org.terasology.particles.ParticleDataMask;
-import org.terasology.particles.components.affectors.VelocityAffectorComponent;
-import org.terasology.particles.functions.RegisterParticleSystemFunction;
-import org.terasology.utilities.random.Random;
+import org.terasology.engine.particles.ParticleData;
+import org.terasology.engine.particles.ParticleDataMask;
+import org.terasology.engine.particles.components.affectors.VelocityAffectorComponent;
+import org.terasology.engine.particles.functions.RegisterParticleSystemFunction;
+import org.terasology.engine.utilities.random.Random;
/**
*
diff --git a/engine/src/main/java/org/terasology/particles/functions/generators/ColorRangeGeneratorFunction.java b/engine/src/main/java/org/terasology/particles/functions/generators/ColorRangeGeneratorFunction.java
index 578a6c9db..70bbe0461 100644
--- a/engine/src/main/java/org/terasology/particles/functions/generators/ColorRangeGeneratorFunction.java
+++ b/engine/src/main/java/org/terasology/particles/functions/generators/ColorRangeGeneratorFunction.java
@@ -13,13 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.particles.functions.generators;
+package org.terasology.engine.particles.functions.generators;
-import org.terasology.particles.ParticleData;
-import org.terasology.particles.ParticleDataMask;
-import org.terasology.particles.components.generators.ColorRangeGeneratorComponent;
-import org.terasology.particles.functions.RegisterParticleSystemFunction;
-import org.terasology.utilities.random.Random;
+import org.terasology.engine.particles.ParticleData;
+import org.terasology.engine.particles.ParticleDataMask;
+import org.terasology.engine.particles.components.generators.ColorRangeGeneratorComponent;
+import org.terasology.engine.particles.functions.RegisterParticleSystemFunction;
+import org.terasology.engine.utilities.random.Random;
/**
* Created by Linus on 11-3-2015.
diff --git a/engine/src/main/java/org/terasology/particles/functions/generators/EnergyRangeGeneratorFunction.java b/engine/src/main/java/org/terasology/particles/functions/generators/EnergyRangeGeneratorFunction.java
index 247461a2a..271ee109d 100644
--- a/engine/src/main/java/org/terasology/particles/functions/generators/EnergyRangeGeneratorFunction.java
+++ b/engine/src/main/java/org/terasology/particles/functions/generators/EnergyRangeGeneratorFunction.java
@@ -13,13 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.particles.functions.generators;
+package org.terasology.engine.particles.functions.generators;
-import org.terasology.particles.ParticleData;
-import org.terasology.particles.ParticleDataMask;
-import org.terasology.particles.components.generators.EnergyRangeGeneratorComponent;
-import org.terasology.particles.functions.RegisterParticleSystemFunction;
-import org.terasology.utilities.random.Random;
+import org.terasology.engine.particles.ParticleData;
+import org.terasology.engine.particles.ParticleDataMask;
+import org.terasology.engine.particles.components.generators.EnergyRangeGeneratorComponent;
+import org.terasology.engine.particles.functions.RegisterParticleSystemFunction;
+import org.terasology.engine.utilities.random.Random;
/**
* Created by Linus on 11-3-2015.
diff --git a/engine/src/main/java/org/terasology/particles/functions/generators/GeneratorFunction.java b/engine/src/main/java/org/terasology/particles/functions/generators/GeneratorFunction.java
index 460674f26..f68bcd50b 100644
--- a/engine/src/main/java/org/terasology/particles/functions/generators/GeneratorFunction.java
+++ b/engine/src/main/java/org/terasology/particles/functions/generators/GeneratorFunction.java
@@ -13,14 +13,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.particles.functions.generators;
+package org.terasology.engine.particles.functions.generators;
-import org.terasology.entitySystem.Component;
+import org.terasology.engine.entitySystem.Component;
import org.terasology.module.sandbox.API;
-import org.terasology.particles.ParticleData;
-import org.terasology.particles.ParticleDataMask;
-import org.terasology.particles.functions.ParticleSystemFunction;
-import org.terasology.utilities.random.Random;
+import org.terasology.engine.particles.ParticleData;
+import org.terasology.engine.particles.ParticleDataMask;
+import org.terasology.engine.particles.functions.ParticleSystemFunction;
+import org.terasology.engine.utilities.random.Random;
/**
* A generator function is called on a particle's data when it is created to set its fields.
diff --git a/engine/src/main/java/org/terasology/particles/functions/generators/PositionRangeGeneratorFunction.java b/engine/src/main/java/org/terasology/particles/functions/generators/PositionRangeGeneratorFunction.java
index 85177dd78..3421c42a5 100644
--- a/engine/src/main/java/org/terasology/particles/functions/generators/PositionRangeGeneratorFunction.java
+++ b/engine/src/main/java/org/terasology/particles/functions/generators/PositionRangeGeneratorFunction.java
@@ -13,13 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.particles.functions.generators;
+package org.terasology.engine.particles.functions.generators;
-import org.terasology.particles.ParticleData;
-import org.terasology.particles.ParticleDataMask;
-import org.terasology.particles.components.generators.PositionRangeGeneratorComponent;
-import org.terasology.particles.functions.RegisterParticleSystemFunction;
-import org.terasology.utilities.random.Random;
+import org.terasology.engine.particles.ParticleData;
+import org.terasology.engine.particles.ParticleDataMask;
+import org.terasology.engine.particles.components.generators.PositionRangeGeneratorComponent;
+import org.terasology.engine.particles.functions.RegisterParticleSystemFunction;
+import org.terasology.engine.utilities.random.Random;
/**
* Created by Linus on 11-3-2015.
diff --git a/engine/src/main/java/org/terasology/particles/functions/generators/ScaleRangeGeneratorFunction.java b/engine/src/main/java/org/terasology/particles/functions/generators/ScaleRangeGeneratorFunction.java
index 237163982..c771418ed 100644
--- a/engine/src/main/java/org/terasology/particles/functions/generators/ScaleRangeGeneratorFunction.java
+++ b/engine/src/main/java/org/terasology/particles/functions/generators/ScaleRangeGeneratorFunction.java
@@ -13,13 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.particles.functions.generators;
+package org.terasology.engine.particles.functions.generators;
-import org.terasology.particles.ParticleData;
-import org.terasology.particles.ParticleDataMask;
-import org.terasology.particles.components.generators.ScaleRangeGeneratorComponent;
-import org.terasology.particles.functions.RegisterParticleSystemFunction;
-import org.terasology.utilities.random.Random;
+import org.terasology.engine.particles.ParticleData;
+import org.terasology.engine.particles.ParticleDataMask;
+import org.terasology.engine.particles.components.generators.ScaleRangeGeneratorComponent;
+import org.terasology.engine.particles.functions.RegisterParticleSystemFunction;
+import org.terasology.engine.utilities.random.Random;
/**
* Created by Linus on 11-3-2015.
diff --git a/engine/src/main/java/org/terasology/particles/functions/generators/TextureOffsetGeneratorFunction.java b/engine/src/main/java/org/terasology/particles/functions/generators/TextureOffsetGeneratorFunction.java
index 557c516af..ba5fddf7f 100644
--- a/engine/src/main/java/org/terasology/particles/functions/generators/TextureOffsetGeneratorFunction.java
+++ b/engine/src/main/java/org/terasology/particles/functions/generators/TextureOffsetGeneratorFunction.java
@@ -13,14 +13,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.particles.functions.generators;
+package org.terasology.engine.particles.functions.generators;
import org.joml.Vector2f;
-import org.terasology.particles.ParticleData;
-import org.terasology.particles.ParticleDataMask;
-import org.terasology.particles.components.generators.TextureOffsetGeneratorComponent;
-import org.terasology.particles.functions.RegisterParticleSystemFunction;
-import org.terasology.utilities.random.Random;
+import org.terasology.engine.particles.ParticleData;
+import org.terasology.engine.particles.ParticleDataMask;
+import org.terasology.engine.particles.components.generators.TextureOffsetGeneratorComponent;
+import org.terasology.engine.particles.functions.RegisterParticleSystemFunction;
+import org.terasology.engine.utilities.random.Random;
/**
* Created by Linus on 13-4-2015.
diff --git a/engine/src/main/java/org/terasology/particles/functions/generators/VelocityRangeGeneratorFunction.java b/engine/src/main/java/org/terasology/particles/functions/generators/VelocityRangeGeneratorFunction.java
index 710254cb4..0f9ba4924 100644
--- a/engine/src/main/java/org/terasology/particles/functions/generators/VelocityRangeGeneratorFunction.java
+++ b/engine/src/main/java/org/terasology/particles/functions/generators/VelocityRangeGeneratorFunction.java
@@ -13,13 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.particles.functions.generators;
+package org.terasology.engine.particles.functions.generators;
-import org.terasology.particles.ParticleData;
-import org.terasology.particles.ParticleDataMask;
-import org.terasology.particles.components.generators.VelocityRangeGeneratorComponent;
-import org.terasology.particles.functions.RegisterParticleSystemFunction;
-import org.terasology.utilities.random.Random;
+import org.terasology.engine.particles.ParticleData;
+import org.terasology.engine.particles.ParticleDataMask;
+import org.terasology.engine.particles.components.generators.VelocityRangeGeneratorComponent;
+import org.terasology.engine.particles.functions.RegisterParticleSystemFunction;
+import org.terasology.engine.utilities.random.Random;
/**
* Created by Linus on 11-3-2015.
diff --git a/engine/src/main/java/org/terasology/particles/rendering/ParticleRenderingData.java b/engine/src/main/java/org/terasology/particles/rendering/ParticleRenderingData.java
index 22b5e4d54..1f9102bd3 100644
--- a/engine/src/main/java/org/terasology/particles/rendering/ParticleRenderingData.java
+++ b/engine/src/main/java/org/terasology/particles/rendering/ParticleRenderingData.java
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.particles.rendering;
+package org.terasology.engine.particles.rendering;
-import org.terasology.entitySystem.Component;
+import org.terasology.engine.entitySystem.Component;
import org.terasology.module.sandbox.API;
-import org.terasology.particles.ParticlePool;
+import org.terasology.engine.particles.ParticlePool;
/**
*
diff --git a/engine/src/main/java/org/terasology/particles/rendering/SpriteParticleRenderer.java b/engine/src/main/java/org/terasology/particles/rendering/SpriteParticleRenderer.java
index 882ca49c0..00408d7f1 100644
--- a/engine/src/main/java/org/terasology/particles/rendering/SpriteParticleRenderer.java
+++ b/engine/src/main/java/org/terasology/particles/rendering/SpriteParticleRenderer.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.particles.rendering;
+package org.terasology.engine.particles.rendering;
import org.joml.Matrix4f;
import org.joml.Vector3f;
@@ -21,18 +21,18 @@ import org.lwjgl.BufferUtils;
import org.lwjgl.opengl.GL;
import org.lwjgl.opengl.GL11;
import org.lwjgl.opengl.GL13;
-import org.terasology.engine.subsystem.DisplayDevice;
-import org.terasology.engine.subsystem.lwjgl.LwjglDisplayDevice;
-import org.terasology.entitySystem.systems.RegisterMode;
-import org.terasology.entitySystem.systems.RegisterSystem;
-import org.terasology.entitySystem.systems.RenderSystem;
-import org.terasology.particles.ParticleSystemManager;
-import org.terasology.particles.components.ParticleDataSpriteComponent;
-import org.terasology.registry.In;
-import org.terasology.rendering.assets.material.Material;
-import org.terasology.rendering.cameras.PerspectiveCamera;
-import org.terasology.rendering.world.WorldRenderer;
-import org.terasology.utilities.Assets;
+import org.terasology.engine.core.subsystem.DisplayDevice;
+import org.terasology.engine.core.subsystem.lwjgl.LwjglDisplayDevice;
+import org.terasology.engine.entitySystem.systems.RegisterMode;
+import org.terasology.engine.entitySystem.systems.RegisterSystem;
+import org.terasology.engine.entitySystem.systems.RenderSystem;
+import org.terasology.engine.particles.ParticleSystemManager;
+import org.terasology.engine.particles.components.ParticleDataSpriteComponent;
+import org.terasology.engine.registry.In;
+import org.terasology.engine.rendering.assets.material.Material;
+import org.terasology.engine.rendering.cameras.PerspectiveCamera;
+import org.terasology.engine.rendering.world.WorldRenderer;
+import org.terasology.engine.utilities.Assets;
import java.nio.FloatBuffer;
diff --git a/engine/src/main/java/org/terasology/particles/updating/ParticleUpdater.java b/engine/src/main/java/org/terasology/particles/updating/ParticleUpdater.java
index b145eaa69..da90486bb 100644
--- a/engine/src/main/java/org/terasology/particles/updating/ParticleUpdater.java
+++ b/engine/src/main/java/org/terasology/particles/updating/ParticleUpdater.java
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.particles.updating;
+package org.terasology.engine.particles.updating;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.particles.ParticleSystemManager;
-import org.terasology.particles.components.ParticleEmitterComponent;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.particles.ParticleSystemManager;
+import org.terasology.engine.particles.components.ParticleEmitterComponent;
import java.util.Collection;
diff --git a/engine/src/main/java/org/terasology/particles/updating/ParticleUpdaterImpl.java b/engine/src/main/java/org/terasology/particles/updating/ParticleUpdaterImpl.java
index e32f63bdd..ace71dd27 100644
--- a/engine/src/main/java/org/terasology/particles/updating/ParticleUpdaterImpl.java
+++ b/engine/src/main/java/org/terasology/particles/updating/ParticleUpdaterImpl.java
@@ -1,6 +1,6 @@
// Copyright 2020 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.particles.updating;
+package org.terasology.engine.particles.updating;
import com.google.common.base.Preconditions;
import com.google.common.collect.BiMap;
@@ -9,23 +9,23 @@ import com.google.common.collect.ImmutableList;
import org.joml.Vector3f;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.terasology.engine.module.ModuleManager;
-import org.terasology.entitySystem.Component;
-import org.terasology.entitySystem.entity.EntityRef;
+import org.terasology.engine.core.module.ModuleManager;
+import org.terasology.engine.entitySystem.Component;
+import org.terasology.engine.entitySystem.entity.EntityRef;
import org.terasology.math.TeraMath;
import org.terasology.module.ModuleEnvironment;
-import org.terasology.particles.ParticleDataMask;
-import org.terasology.particles.ParticlePool;
-import org.terasology.particles.components.ParticleEmitterComponent;
-import org.terasology.particles.functions.ParticleSystemFunction;
-import org.terasology.particles.functions.RegisterParticleSystemFunction;
-import org.terasology.particles.functions.affectors.AffectorFunction;
-import org.terasology.particles.functions.generators.GeneratorFunction;
-import org.terasology.physics.HitResult;
-import org.terasology.physics.Physics;
-import org.terasology.physics.StandardCollisionGroup;
-import org.terasology.utilities.ReflectionUtil;
-import org.terasology.utilities.random.FastRandom;
+import org.terasology.engine.particles.ParticleDataMask;
+import org.terasology.engine.particles.ParticlePool;
+import org.terasology.engine.particles.components.ParticleEmitterComponent;
+import org.terasology.engine.particles.functions.ParticleSystemFunction;
+import org.terasology.engine.particles.functions.RegisterParticleSystemFunction;
+import org.terasology.engine.particles.functions.affectors.AffectorFunction;
+import org.terasology.engine.particles.functions.generators.GeneratorFunction;
+import org.terasology.engine.physics.HitResult;
+import org.terasology.engine.physics.Physics;
+import org.terasology.engine.physics.StandardCollisionGroup;
+import org.terasology.engine.utilities.ReflectionUtil;
+import org.terasology.engine.utilities.random.FastRandom;
import java.lang.reflect.Type;
import java.util.Collection;
diff --git a/engine/src/main/java/org/terasology/persistence/ChunkStore.java b/engine/src/main/java/org/terasology/persistence/ChunkStore.java
index 1e30de33a..27032e7ab 100644
--- a/engine/src/main/java/org/terasology/persistence/ChunkStore.java
+++ b/engine/src/main/java/org/terasology/persistence/ChunkStore.java
@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.persistence;
+package org.terasology.engine.persistence;
import org.joml.Vector3i;
-import org.terasology.world.chunks.Chunk;
+import org.terasology.engine.world.chunks.Chunk;
/**
* A chunk store is used to save a chunk and its entity contents.
diff --git a/engine/src/main/java/org/terasology/persistence/PlayerStore.java b/engine/src/main/java/org/terasology/persistence/PlayerStore.java
index 4443caa00..4bc76c7e6 100644
--- a/engine/src/main/java/org/terasology/persistence/PlayerStore.java
+++ b/engine/src/main/java/org/terasology/persistence/PlayerStore.java
@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.persistence;
+package org.terasology.engine.persistence;
import org.joml.Vector3fc;
-import org.terasology.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.entity.EntityRef;
/**
*/
diff --git a/engine/src/main/java/org/terasology/persistence/StorageManager.java b/engine/src/main/java/org/terasology/persistence/StorageManager.java
index 2291b8da7..7efe57609 100644
--- a/engine/src/main/java/org/terasology/persistence/StorageManager.java
+++ b/engine/src/main/java/org/terasology/persistence/StorageManager.java
@@ -1,10 +1,10 @@
// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.persistence;
+package org.terasology.engine.persistence;
import org.joml.Vector3ic;
-import org.terasology.network.Client;
-import org.terasology.world.chunks.Chunk;
+import org.terasology.engine.network.Client;
+import org.terasology.engine.world.chunks.Chunk;
import java.io.IOException;
diff --git a/engine/src/main/java/org/terasology/persistence/TemplateEngine.java b/engine/src/main/java/org/terasology/persistence/TemplateEngine.java
index ca0a3fc33..ac3cfb814 100644
--- a/engine/src/main/java/org/terasology/persistence/TemplateEngine.java
+++ b/engine/src/main/java/org/terasology/persistence/TemplateEngine.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.terasology.persistence;
+package org.terasology.engine.persistence;
import org.terasology.module.sandbox.API;
diff --git a/engine/src/main/java/org/terasology/persistence/TemplateEngineImpl.java b/engine/src/main/java/org/terasology/persistence/TemplateEngineImpl.java
index 74032c814..48debb94e 100644
--- a/engine/src/main/java/org/terasology/persistence/TemplateEngineImpl.java
+++ b/engine/src/main/java/org/terasology/persistence/TemplateEngineImpl.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.terasology.persistence;
+package org.terasology.engine.persistence;
import java.util.function.Function;
import java.util.regex.Matcher;
diff --git a/engine/src/main/java/org/terasology/persistence/WorldDumper.java b/engine/src/main/java/org/terasology/persistence/WorldDumper.java
index de76fa309..4a4827202 100644
--- a/engine/src/main/java/org/terasology/persistence/WorldDumper.java
+++ b/engine/src/main/java/org/terasology/persistence/WorldDumper.java
@@ -13,15 +13,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.persistence;
+package org.terasology.engine.persistence;
-import org.terasology.engine.TerasologyConstants;
-import org.terasology.entitySystem.Component;
-import org.terasology.entitySystem.entity.internal.EngineEntityManager;
-import org.terasology.persistence.serializers.EntityDataJSONFormat;
-import org.terasology.persistence.serializers.PrefabSerializer;
-import org.terasology.persistence.serializers.WorldSerializer;
-import org.terasology.persistence.serializers.WorldSerializerImpl;
+import org.terasology.engine.core.TerasologyConstants;
+import org.terasology.engine.entitySystem.Component;
+import org.terasology.engine.entitySystem.entity.internal.EngineEntityManager;
+import org.terasology.engine.persistence.serializers.EntityDataJSONFormat;
+import org.terasology.engine.persistence.serializers.PrefabSerializer;
+import org.terasology.engine.persistence.serializers.WorldSerializer;
+import org.terasology.engine.persistence.serializers.WorldSerializerImpl;
import org.terasology.protobuf.EntityData;
import java.io.BufferedWriter;
diff --git a/engine/src/main/java/org/terasology/persistence/internal/AbstractStorageManager.java b/engine/src/main/java/org/terasology/persistence/internal/AbstractStorageManager.java
index d3b539fc4..477cfac07 100644
--- a/engine/src/main/java/org/terasology/persistence/internal/AbstractStorageManager.java
+++ b/engine/src/main/java/org/terasology/persistence/internal/AbstractStorageManager.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.terasology.persistence.internal;
+package org.terasology.engine.persistence.internal;
import com.google.common.collect.Lists;
import org.joml.Vector3f;
@@ -22,21 +22,21 @@ import org.joml.Vector3i;
import org.joml.Vector3ic;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.entitySystem.entity.internal.EngineEntityManager;
-import org.terasology.entitySystem.entity.internal.OwnershipHelper;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.entity.internal.EngineEntityManager;
+import org.terasology.engine.entitySystem.entity.internal.OwnershipHelper;
import org.terasology.joml.geom.AABBfc;
-import org.terasology.logic.location.LocationComponent;
+import org.terasology.engine.logic.location.LocationComponent;
import org.terasology.module.ModuleEnvironment;
-import org.terasology.network.ClientComponent;
-import org.terasology.persistence.ChunkStore;
-import org.terasology.persistence.PlayerStore;
-import org.terasology.persistence.StorageManager;
-import org.terasology.persistence.serializers.PrefabSerializer;
+import org.terasology.engine.network.ClientComponent;
+import org.terasology.engine.persistence.ChunkStore;
+import org.terasology.engine.persistence.PlayerStore;
+import org.terasology.engine.persistence.StorageManager;
+import org.terasology.engine.persistence.serializers.PrefabSerializer;
import org.terasology.protobuf.EntityData;
-import org.terasology.world.block.BlockManager;
-import org.terasology.world.chunks.Chunk;
-import org.terasology.world.chunks.blockdata.ExtraBlockDataManager;
+import org.terasology.engine.world.block.BlockManager;
+import org.terasology.engine.world.chunks.Chunk;
+import org.terasology.engine.world.chunks.blockdata.ExtraBlockDataManager;
import java.io.BufferedInputStream;
import java.io.ByteArrayInputStream;
diff --git a/engine/src/main/java/org/terasology/persistence/internal/ChunkStoreInternal.java b/engine/src/main/java/org/terasology/persistence/internal/ChunkStoreInternal.java
index 702e86380..e0ac80234 100644
--- a/engine/src/main/java/org/terasology/persistence/internal/ChunkStoreInternal.java
+++ b/engine/src/main/java/org/terasology/persistence/internal/ChunkStoreInternal.java
@@ -13,16 +13,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.persistence.internal;
+package org.terasology.engine.persistence.internal;
-import org.terasology.entitySystem.entity.internal.EngineEntityManager;
+import org.terasology.engine.entitySystem.entity.internal.EngineEntityManager;
import org.joml.Vector3i;
-import org.terasology.persistence.ChunkStore;
+import org.terasology.engine.persistence.ChunkStore;
import org.terasology.protobuf.EntityData;
-import org.terasology.world.block.BlockManager;
-import org.terasology.world.chunks.Chunk;
-import org.terasology.world.chunks.blockdata.ExtraBlockDataManager;
-import org.terasology.world.chunks.internal.ChunkSerializer;
+import org.terasology.engine.world.block.BlockManager;
+import org.terasology.engine.world.chunks.Chunk;
+import org.terasology.engine.world.chunks.blockdata.ExtraBlockDataManager;
+import org.terasology.engine.world.chunks.internal.ChunkSerializer;
/**
*/
diff --git a/engine/src/main/java/org/terasology/persistence/internal/CompressedChunkBuilder.java b/engine/src/main/java/org/terasology/persistence/internal/CompressedChunkBuilder.java
index ff8458936..757e8ae5b 100644
--- a/engine/src/main/java/org/terasology/persistence/internal/CompressedChunkBuilder.java
+++ b/engine/src/main/java/org/terasology/persistence/internal/CompressedChunkBuilder.java
@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.persistence.internal;
+package org.terasology.engine.persistence.internal;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.entitySystem.entity.internal.EngineEntityManager;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.entity.internal.EngineEntityManager;
import org.terasology.protobuf.EntityData;
-import org.terasology.world.chunks.internal.ChunkImpl;
+import org.terasology.engine.world.chunks.internal.ChunkImpl;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
diff --git a/engine/src/main/java/org/terasology/persistence/internal/DelayedEntityRef.java b/engine/src/main/java/org/terasology/persistence/internal/DelayedEntityRef.java
index 3714ae654..b0c117f76 100644
--- a/engine/src/main/java/org/terasology/persistence/internal/DelayedEntityRef.java
+++ b/engine/src/main/java/org/terasology/persistence/internal/DelayedEntityRef.java
@@ -13,13 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.persistence.internal;
+package org.terasology.engine.persistence.internal;
-import org.terasology.entitySystem.Component;
-import org.terasology.entitySystem.entity.EntityManager;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.entitySystem.event.Event;
-import org.terasology.entitySystem.prefab.Prefab;
+import org.terasology.engine.entitySystem.Component;
+import org.terasology.engine.entitySystem.entity.EntityManager;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.event.Event;
+import org.terasology.engine.entitySystem.prefab.Prefab;
import java.util.List;
diff --git a/engine/src/main/java/org/terasology/persistence/internal/DelayedEntityRefCopyStrategy.java b/engine/src/main/java/org/terasology/persistence/internal/DelayedEntityRefCopyStrategy.java
index 04dc20c58..00b3198f7 100644
--- a/engine/src/main/java/org/terasology/persistence/internal/DelayedEntityRefCopyStrategy.java
+++ b/engine/src/main/java/org/terasology/persistence/internal/DelayedEntityRefCopyStrategy.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.persistence.internal;
+package org.terasology.engine.persistence.internal;
-import org.terasology.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.entity.EntityRef;
import org.terasology.reflection.copy.CopyStrategy;
/**
diff --git a/engine/src/main/java/org/terasology/persistence/internal/DelayedEntityRefFactory.java b/engine/src/main/java/org/terasology/persistence/internal/DelayedEntityRefFactory.java
index b49ee9f3f..a4269f555 100644
--- a/engine/src/main/java/org/terasology/persistence/internal/DelayedEntityRefFactory.java
+++ b/engine/src/main/java/org/terasology/persistence/internal/DelayedEntityRefFactory.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.persistence.internal;
+package org.terasology.engine.persistence.internal;
/**
* Creates {@link DelayedEntityRef} objects and may save them to actually bind them later.
diff --git a/engine/src/main/java/org/terasology/persistence/internal/EntityDelta.java b/engine/src/main/java/org/terasology/persistence/internal/EntityDelta.java
index 88d2afeb5..a3e07f307 100644
--- a/engine/src/main/java/org/terasology/persistence/internal/EntityDelta.java
+++ b/engine/src/main/java/org/terasology/persistence/internal/EntityDelta.java
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.persistence.internal;
+package org.terasology.engine.persistence.internal;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
-import org.terasology.entitySystem.Component;
+import org.terasology.engine.entitySystem.Component;
import java.util.Map;
import java.util.Set;
diff --git a/engine/src/main/java/org/terasology/persistence/internal/EntityRestorer.java b/engine/src/main/java/org/terasology/persistence/internal/EntityRestorer.java
index 420d29a57..90198fa3f 100644
--- a/engine/src/main/java/org/terasology/persistence/internal/EntityRestorer.java
+++ b/engine/src/main/java/org/terasology/persistence/internal/EntityRestorer.java
@@ -13,14 +13,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.persistence.internal;
+package org.terasology.engine.persistence.internal;
import com.google.common.collect.Maps;
-import org.terasology.entitySystem.Component;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.entitySystem.entity.internal.EngineEntityManager;
-import org.terasology.entitySystem.metadata.ComponentMetadata;
-import org.terasology.persistence.serializers.EntitySerializer;
+import org.terasology.engine.entitySystem.Component;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.entity.internal.EngineEntityManager;
+import org.terasology.engine.entitySystem.metadata.ComponentMetadata;
+import org.terasology.engine.persistence.serializers.EntitySerializer;
import org.terasology.protobuf.EntityData;
import java.util.Map;
diff --git a/engine/src/main/java/org/terasology/persistence/internal/EntitySetDeltaRecorder.java b/engine/src/main/java/org/terasology/persistence/internal/EntitySetDeltaRecorder.java
index 5686174c0..548beaa0b 100644
--- a/engine/src/main/java/org/terasology/persistence/internal/EntitySetDeltaRecorder.java
+++ b/engine/src/main/java/org/terasology/persistence/internal/EntitySetDeltaRecorder.java
@@ -13,17 +13,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.persistence.internal;
+package org.terasology.engine.persistence.internal;
import com.google.common.collect.MapMaker;
import gnu.trove.map.TLongObjectMap;
import gnu.trove.map.hash.TLongObjectHashMap;
import gnu.trove.set.TLongSet;
import gnu.trove.set.hash.TLongHashSet;
-import org.terasology.entitySystem.Component;
-import org.terasology.entitySystem.entity.EntityManager;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.entitySystem.metadata.ComponentLibrary;
+import org.terasology.engine.entitySystem.Component;
+import org.terasology.engine.entitySystem.entity.EntityManager;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.metadata.ComponentLibrary;
import java.util.Collection;
import java.util.Map;
diff --git a/engine/src/main/java/org/terasology/persistence/internal/EntityStorer.java b/engine/src/main/java/org/terasology/persistence/internal/EntityStorer.java
index ed2d60436..4b8a33071 100644
--- a/engine/src/main/java/org/terasology/persistence/internal/EntityStorer.java
+++ b/engine/src/main/java/org/terasology/persistence/internal/EntityStorer.java
@@ -13,17 +13,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.persistence.internal;
+package org.terasology.engine.persistence.internal;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
-import org.terasology.entitySystem.Component;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.entitySystem.entity.internal.EngineEntityManager;
-import org.terasology.entitySystem.entity.internal.OwnershipHelper;
-import org.terasology.entitySystem.metadata.ComponentMetadata;
-import org.terasology.persistence.serializers.EntitySerializer;
-import org.terasology.persistence.serializers.FieldSerializeCheck;
+import org.terasology.engine.entitySystem.Component;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.entity.internal.EngineEntityManager;
+import org.terasology.engine.entitySystem.entity.internal.OwnershipHelper;
+import org.terasology.engine.entitySystem.metadata.ComponentMetadata;
+import org.terasology.engine.persistence.serializers.EntitySerializer;
+import org.terasology.engine.persistence.serializers.FieldSerializeCheck;
import org.terasology.protobuf.EntityData;
import java.util.Map;
diff --git a/engine/src/main/java/org/terasology/persistence/internal/GamePreviewImageProvider.java b/engine/src/main/java/org/terasology/persistence/internal/GamePreviewImageProvider.java
index 7a5d26b27..617e69506 100644
--- a/engine/src/main/java/org/terasology/persistence/internal/GamePreviewImageProvider.java
+++ b/engine/src/main/java/org/terasology/persistence/internal/GamePreviewImageProvider.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.persistence.internal;
+package org.terasology.engine.persistence.internal;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/engine/src/main/java/org/terasology/persistence/internal/GlobalStoreBuilder.java b/engine/src/main/java/org/terasology/persistence/internal/GlobalStoreBuilder.java
index a2dd67448..82859b5c8 100644
--- a/engine/src/main/java/org/terasology/persistence/internal/GlobalStoreBuilder.java
+++ b/engine/src/main/java/org/terasology/persistence/internal/GlobalStoreBuilder.java
@@ -13,16 +13,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.persistence.internal;
+package org.terasology.engine.persistence.internal;
import com.google.common.collect.Maps;
-import org.terasology.entitySystem.Component;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.entitySystem.entity.internal.EngineEntityManager;
-import org.terasology.entitySystem.metadata.ComponentMetadata;
-import org.terasology.entitySystem.prefab.Prefab;
-import org.terasology.persistence.serializers.EntitySerializer;
-import org.terasology.persistence.serializers.PrefabSerializer;
+import org.terasology.engine.entitySystem.Component;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.entity.internal.EngineEntityManager;
+import org.terasology.engine.entitySystem.metadata.ComponentMetadata;
+import org.terasology.engine.entitySystem.prefab.Prefab;
+import org.terasology.engine.persistence.serializers.EntitySerializer;
+import org.terasology.engine.persistence.serializers.PrefabSerializer;
import org.terasology.protobuf.EntityData;
import java.util.HashSet;
diff --git a/engine/src/main/java/org/terasology/persistence/internal/GlobalStoreLoader.java b/engine/src/main/java/org/terasology/persistence/internal/GlobalStoreLoader.java
index 0a553dffa..9feb6d415 100644
--- a/engine/src/main/java/org/terasology/persistence/internal/GlobalStoreLoader.java
+++ b/engine/src/main/java/org/terasology/persistence/internal/GlobalStoreLoader.java
@@ -13,26 +13,26 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.persistence.internal;
+package org.terasology.engine.persistence.internal;
import com.google.common.collect.Maps;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.terasology.utilities.Assets;
+import org.terasology.engine.utilities.Assets;
import org.terasology.assets.ResourceUrn;
-import org.terasology.engine.SimpleUri;
-import org.terasology.entitySystem.Component;
-import org.terasology.entitySystem.entity.internal.EngineEntityManager;
-import org.terasology.entitySystem.metadata.ComponentLibrary;
-import org.terasology.entitySystem.metadata.ComponentMetadata;
-import org.terasology.entitySystem.prefab.Prefab;
-import org.terasology.entitySystem.prefab.PrefabData;
-import org.terasology.entitySystem.prefab.PrefabManager;
+import org.terasology.engine.core.SimpleUri;
+import org.terasology.engine.entitySystem.Component;
+import org.terasology.engine.entitySystem.entity.internal.EngineEntityManager;
+import org.terasology.engine.entitySystem.metadata.ComponentLibrary;
+import org.terasology.engine.entitySystem.metadata.ComponentMetadata;
+import org.terasology.engine.entitySystem.prefab.Prefab;
+import org.terasology.engine.entitySystem.prefab.PrefabData;
+import org.terasology.engine.entitySystem.prefab.PrefabManager;
import org.terasology.module.Module;
import org.terasology.module.ModuleEnvironment;
-import org.terasology.engine.module.ModuleContext;
-import org.terasology.persistence.serializers.EntitySerializer;
-import org.terasology.persistence.serializers.PrefabSerializer;
+import org.terasology.engine.core.module.ModuleContext;
+import org.terasology.engine.persistence.serializers.EntitySerializer;
+import org.terasology.engine.persistence.serializers.PrefabSerializer;
import org.terasology.protobuf.EntityData;
import java.util.Map;
diff --git a/engine/src/main/java/org/terasology/persistence/internal/PlayerStoreBuilder.java b/engine/src/main/java/org/terasology/persistence/internal/PlayerStoreBuilder.java
index f52168270..0a5658f5a 100644
--- a/engine/src/main/java/org/terasology/persistence/internal/PlayerStoreBuilder.java
+++ b/engine/src/main/java/org/terasology/persistence/internal/PlayerStoreBuilder.java
@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.persistence.internal;
+package org.terasology.engine.persistence.internal;
import com.google.common.collect.Sets;
import org.joml.Vector3fc;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.entitySystem.entity.internal.EngineEntityManager;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.entity.internal.EngineEntityManager;
import org.terasology.protobuf.EntityData;
import java.util.Set;
diff --git a/engine/src/main/java/org/terasology/persistence/internal/PlayerStoreInternal.java b/engine/src/main/java/org/terasology/persistence/internal/PlayerStoreInternal.java
index e1b8dfa1a..14eb73118 100644
--- a/engine/src/main/java/org/terasology/persistence/internal/PlayerStoreInternal.java
+++ b/engine/src/main/java/org/terasology/persistence/internal/PlayerStoreInternal.java
@@ -13,14 +13,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.persistence.internal;
+package org.terasology.engine.persistence.internal;
import org.joml.Vector3f;
import org.joml.Vector3fc;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.entitySystem.entity.internal.EngineEntityManager;
-import org.terasology.logic.location.LocationComponent;
-import org.terasology.persistence.PlayerStore;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.entity.internal.EngineEntityManager;
+import org.terasology.engine.logic.location.LocationComponent;
+import org.terasology.engine.persistence.PlayerStore;
import org.terasology.protobuf.EntityData;
import java.util.Map;
diff --git a/engine/src/main/java/org/terasology/persistence/internal/ReadOnlyStorageManager.java b/engine/src/main/java/org/terasology/persistence/internal/ReadOnlyStorageManager.java
index 059b88c60..bbbb62747 100644
--- a/engine/src/main/java/org/terasology/persistence/internal/ReadOnlyStorageManager.java
+++ b/engine/src/main/java/org/terasology/persistence/internal/ReadOnlyStorageManager.java
@@ -14,23 +14,23 @@
* limitations under the License.
*/
-package org.terasology.persistence.internal;
+package org.terasology.engine.persistence.internal;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.entitySystem.entity.internal.EngineEntityManager;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.entity.internal.EngineEntityManager;
import org.terasology.module.ModuleEnvironment;
-import org.terasology.network.Client;
-import org.terasology.network.ClientComponent;
-import org.terasology.world.block.BlockManager;
-import org.terasology.world.chunks.Chunk;
-import org.terasology.world.chunks.blockdata.ExtraBlockDataManager;
+import org.terasology.engine.network.Client;
+import org.terasology.engine.network.ClientComponent;
+import org.terasology.engine.world.block.BlockManager;
+import org.terasology.engine.world.chunks.Chunk;
+import org.terasology.engine.world.chunks.blockdata.ExtraBlockDataManager;
import java.io.IOException;
import java.nio.file.Path;
import java.util.Collection;
/**
- * A {@link org.terasology.persistence.StorageManager} that performs reading only.
+ * A {@link org.terasology.engine.persistence.StorageManager} that performs reading only.
*/
public final class ReadOnlyStorageManager extends AbstractStorageManager {
diff --git a/engine/src/main/java/org/terasology/persistence/internal/ReadWriteStorageManager.java b/engine/src/main/java/org/terasology/persistence/internal/ReadWriteStorageManager.java
index c673fe9ce..ab5aa77bd 100644
--- a/engine/src/main/java/org/terasology/persistence/internal/ReadWriteStorageManager.java
+++ b/engine/src/main/java/org/terasology/persistence/internal/ReadWriteStorageManager.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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 org.terasology.persistence.internal;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.persistence.internal;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
@@ -22,49 +9,49 @@ import org.joml.Vector3i;
import org.joml.Vector3ic;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.terasology.config.Config;
-import org.terasology.config.UniverseConfig;
-import org.terasology.engine.ComponentSystemManager;
-import org.terasology.engine.Time;
-import org.terasology.engine.module.ModuleManager;
-import org.terasology.engine.paths.PathManager;
-import org.terasology.entitySystem.Component;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.entitySystem.entity.internal.EngineEntityManager;
-import org.terasology.entitySystem.entity.internal.EntityChangeSubscriber;
-import org.terasology.entitySystem.entity.internal.EntityDestroySubscriber;
-import org.terasology.entitySystem.entity.internal.PojoEntityManager;
-import org.terasology.entitySystem.metadata.ComponentLibrary;
-import org.terasology.entitySystem.systems.ComponentSystem;
-import org.terasology.game.Game;
-import org.terasology.game.GameManifest;
-import org.terasology.logic.location.LocationComponent;
+import org.terasology.engine.config.Config;
+import org.terasology.engine.config.UniverseConfig;
+import org.terasology.engine.core.ComponentSystemManager;
+import org.terasology.engine.core.Time;
+import org.terasology.engine.core.module.ModuleManager;
+import org.terasology.engine.core.paths.PathManager;
+import org.terasology.engine.entitySystem.Component;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.entity.internal.EngineEntityManager;
+import org.terasology.engine.entitySystem.entity.internal.EntityChangeSubscriber;
+import org.terasology.engine.entitySystem.entity.internal.EntityDestroySubscriber;
+import org.terasology.engine.entitySystem.entity.internal.PojoEntityManager;
+import org.terasology.engine.entitySystem.metadata.ComponentLibrary;
+import org.terasology.engine.entitySystem.systems.ComponentSystem;
+import org.terasology.engine.game.Game;
+import org.terasology.engine.game.GameManifest;
+import org.terasology.engine.logic.location.LocationComponent;
+import org.terasology.engine.monitoring.PerformanceMonitor;
+import org.terasology.engine.network.Client;
+import org.terasology.engine.network.ClientComponent;
+import org.terasology.engine.network.NetworkSystem;
+import org.terasology.engine.recording.RecordAndReplayCurrentStatus;
+import org.terasology.engine.recording.RecordAndReplaySerializer;
+import org.terasology.engine.recording.RecordAndReplayStatus;
+import org.terasology.engine.recording.RecordAndReplayUtils;
+import org.terasology.engine.registry.CoreRegistry;
+import org.terasology.engine.rendering.opengl.ScreenGrabber;
+import org.terasology.engine.utilities.FilesUtil;
+import org.terasology.engine.utilities.concurrency.ShutdownTask;
+import org.terasology.engine.utilities.concurrency.Task;
+import org.terasology.engine.utilities.concurrency.TaskMaster;
+import org.terasology.engine.world.block.BlockManager;
+import org.terasology.engine.world.block.family.BlockFamily;
+import org.terasology.engine.world.chunks.Chunk;
+import org.terasology.engine.world.chunks.ChunkProvider;
+import org.terasology.engine.world.chunks.ManagedChunk;
+import org.terasology.engine.world.chunks.blockdata.ExtraBlockDataManager;
+import org.terasology.engine.world.chunks.internal.ChunkImpl;
+import org.terasology.engine.world.internal.WorldInfo;
import org.terasology.module.Module;
import org.terasology.module.ModuleEnvironment;
-import org.terasology.monitoring.PerformanceMonitor;
-import org.terasology.network.Client;
-import org.terasology.network.ClientComponent;
-import org.terasology.network.NetworkSystem;
import org.terasology.persistence.typeHandling.TypeHandlerLibrary;
import org.terasology.protobuf.EntityData;
-import org.terasology.recording.RecordAndReplayCurrentStatus;
-import org.terasology.recording.RecordAndReplaySerializer;
-import org.terasology.recording.RecordAndReplayStatus;
-import org.terasology.recording.RecordAndReplayUtils;
-import org.terasology.registry.CoreRegistry;
-import org.terasology.rendering.opengl.ScreenGrabber;
-import org.terasology.utilities.FilesUtil;
-import org.terasology.utilities.concurrency.ShutdownTask;
-import org.terasology.utilities.concurrency.Task;
-import org.terasology.utilities.concurrency.TaskMaster;
-import org.terasology.world.block.BlockManager;
-import org.terasology.world.block.family.BlockFamily;
-import org.terasology.world.chunks.Chunk;
-import org.terasology.world.chunks.ChunkProvider;
-import org.terasology.world.chunks.ManagedChunk;
-import org.terasology.world.chunks.blockdata.ExtraBlockDataManager;
-import org.terasology.world.chunks.internal.ChunkImpl;
-import org.terasology.world.internal.WorldInfo;
import java.io.IOException;
import java.nio.file.Files;
diff --git a/engine/src/main/java/org/terasology/persistence/internal/SaveTransaction.java b/engine/src/main/java/org/terasology/persistence/internal/SaveTransaction.java
index b5291da15..b6be7dea1 100644
--- a/engine/src/main/java/org/terasology/persistence/internal/SaveTransaction.java
+++ b/engine/src/main/java/org/terasology/persistence/internal/SaveTransaction.java
@@ -1,6 +1,6 @@
// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.persistence.internal;
+package org.terasology.engine.persistence.internal;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Lists;
@@ -9,21 +9,21 @@ import org.joml.Vector3f;
import org.joml.Vector3i;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.terasology.engine.paths.PathManager;
-import org.terasology.entitySystem.Component;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.entitySystem.entity.internal.EngineEntityManager;
-import org.terasology.game.GameManifest;
-import org.terasology.logic.location.LocationComponent;
-import org.terasology.network.ClientComponent;
+import org.terasology.engine.core.paths.PathManager;
+import org.terasology.engine.entitySystem.Component;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.entity.internal.EngineEntityManager;
+import org.terasology.engine.game.GameManifest;
+import org.terasology.engine.logic.location.LocationComponent;
+import org.terasology.engine.network.ClientComponent;
import org.terasology.protobuf.EntityData;
-import org.terasology.recording.RecordAndReplayCurrentStatus;
-import org.terasology.recording.RecordAndReplaySerializer;
-import org.terasology.recording.RecordAndReplayStatus;
-import org.terasology.recording.RecordAndReplayUtils;
-import org.terasology.utilities.concurrency.AbstractTask;
-import org.terasology.world.chunks.Chunks;
-import org.terasology.world.chunks.internal.ChunkImpl;
+import org.terasology.engine.recording.RecordAndReplayCurrentStatus;
+import org.terasology.engine.recording.RecordAndReplaySerializer;
+import org.terasology.engine.recording.RecordAndReplayStatus;
+import org.terasology.engine.recording.RecordAndReplayUtils;
+import org.terasology.engine.utilities.concurrency.AbstractTask;
+import org.terasology.engine.world.chunks.Chunks;
+import org.terasology.engine.world.chunks.internal.ChunkImpl;
import java.io.BufferedOutputStream;
import java.io.IOException;
diff --git a/engine/src/main/java/org/terasology/persistence/internal/SaveTransactionBuilder.java b/engine/src/main/java/org/terasology/persistence/internal/SaveTransactionBuilder.java
index 6693e1a3b..e524bdd30 100644
--- a/engine/src/main/java/org/terasology/persistence/internal/SaveTransactionBuilder.java
+++ b/engine/src/main/java/org/terasology/persistence/internal/SaveTransactionBuilder.java
@@ -13,18 +13,18 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.persistence.internal;
+package org.terasology.engine.persistence.internal;
import com.google.common.collect.Maps;
import org.joml.Vector3i;
import org.joml.Vector3ic;
-import org.terasology.entitySystem.entity.internal.EngineEntityManager;
-import org.terasology.game.GameManifest;
+import org.terasology.engine.entitySystem.entity.internal.EngineEntityManager;
+import org.terasology.engine.game.GameManifest;
import org.terasology.protobuf.EntityData;
-import org.terasology.recording.RecordAndReplayCurrentStatus;
-import org.terasology.recording.RecordAndReplaySerializer;
-import org.terasology.recording.RecordAndReplayUtils;
-import org.terasology.world.chunks.internal.ChunkImpl;
+import org.terasology.engine.recording.RecordAndReplayCurrentStatus;
+import org.terasology.engine.recording.RecordAndReplaySerializer;
+import org.terasology.engine.recording.RecordAndReplayUtils;
+import org.terasology.engine.world.chunks.internal.ChunkImpl;
import java.util.Map;
import java.util.concurrent.locks.Lock;
diff --git a/engine/src/main/java/org/terasology/persistence/internal/SaveTransactionHelper.java b/engine/src/main/java/org/terasology/persistence/internal/SaveTransactionHelper.java
index 329f13b70..0d013955f 100644
--- a/engine/src/main/java/org/terasology/persistence/internal/SaveTransactionHelper.java
+++ b/engine/src/main/java/org/terasology/persistence/internal/SaveTransactionHelper.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.persistence.internal;
+package org.terasology.engine.persistence.internal;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/engine/src/main/java/org/terasology/persistence/internal/SaveTransactionResult.java b/engine/src/main/java/org/terasology/persistence/internal/SaveTransactionResult.java
index 54a373bf7..bd60757e6 100644
--- a/engine/src/main/java/org/terasology/persistence/internal/SaveTransactionResult.java
+++ b/engine/src/main/java/org/terasology/persistence/internal/SaveTransactionResult.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.persistence.internal;
+package org.terasology.engine.persistence.internal;
/**
* Represents the result of a {@link SaveTransaction}
diff --git a/engine/src/main/java/org/terasology/persistence/internal/StoragePathProvider.java b/engine/src/main/java/org/terasology/persistence/internal/StoragePathProvider.java
index 9dae1ac19..e8cb4f4a4 100644
--- a/engine/src/main/java/org/terasology/persistence/internal/StoragePathProvider.java
+++ b/engine/src/main/java/org/terasology/persistence/internal/StoragePathProvider.java
@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.persistence.internal;
+package org.terasology.engine.persistence.internal;
import org.joml.Vector3i;
import org.joml.Vector3ic;
-import org.terasology.engine.TerasologyConstants;
-import org.terasology.game.GameManifest;
+import org.terasology.engine.core.TerasologyConstants;
+import org.terasology.engine.game.GameManifest;
import java.nio.file.Path;
diff --git a/engine/src/main/java/org/terasology/persistence/serializers/ComponentSerializeCheck.java b/engine/src/main/java/org/terasology/persistence/serializers/ComponentSerializeCheck.java
index 53dc0a82b..1f10e78d9 100644
--- a/engine/src/main/java/org/terasology/persistence/serializers/ComponentSerializeCheck.java
+++ b/engine/src/main/java/org/terasology/persistence/serializers/ComponentSerializeCheck.java
@@ -14,11 +14,11 @@
* limitations under the License.
*/
-package org.terasology.persistence.serializers;
+package org.terasology.engine.persistence.serializers;
-import org.terasology.entitySystem.Component;
-import org.terasology.entitySystem.entity.internal.EntityInfoComponent;
-import org.terasology.entitySystem.metadata.ComponentMetadata;
+import org.terasology.engine.entitySystem.Component;
+import org.terasology.engine.entitySystem.entity.internal.EntityInfoComponent;
+import org.terasology.engine.entitySystem.metadata.ComponentMetadata;
/**
* Interface for checks as whether a component should be serialized
diff --git a/engine/src/main/java/org/terasology/persistence/serializers/ComponentSerializer.java b/engine/src/main/java/org/terasology/persistence/serializers/ComponentSerializer.java
index 36b1f01c4..5259e314b 100644
--- a/engine/src/main/java/org/terasology/persistence/serializers/ComponentSerializer.java
+++ b/engine/src/main/java/org/terasology/persistence/serializers/ComponentSerializer.java
@@ -1,20 +1,7 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.persistence.serializers;
+package org.terasology.engine.persistence.serializers;
import com.google.common.base.Objects;
import com.google.common.collect.BiMap;
@@ -23,16 +10,16 @@ import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Maps;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.terasology.entitySystem.Component;
-import org.terasology.entitySystem.metadata.ComponentLibrary;
-import org.terasology.entitySystem.metadata.ComponentMetadata;
-import org.terasology.entitySystem.metadata.ReplicatedFieldMetadata;
+import org.terasology.engine.entitySystem.Component;
+import org.terasology.engine.entitySystem.metadata.ComponentLibrary;
+import org.terasology.engine.entitySystem.metadata.ComponentMetadata;
+import org.terasology.engine.entitySystem.metadata.ReplicatedFieldMetadata;
+import org.terasology.engine.persistence.typeHandling.protobuf.ProtobufPersistedData;
+import org.terasology.engine.persistence.typeHandling.protobuf.ProtobufPersistedDataSerializer;
import org.terasology.module.Module;
import org.terasology.persistence.typeHandling.PersistedData;
import org.terasology.persistence.typeHandling.Serializer;
import org.terasology.persistence.typeHandling.TypeHandlerLibrary;
-import org.terasology.persistence.typeHandling.protobuf.ProtobufPersistedData;
-import org.terasology.persistence.typeHandling.protobuf.ProtobufPersistedDataSerializer;
import org.terasology.protobuf.EntityData;
import org.terasology.reflection.metadata.FieldMetadata;
diff --git a/engine/src/main/java/org/terasology/persistence/serializers/EntityDataJSONFormat.java b/engine/src/main/java/org/terasology/persistence/serializers/EntityDataJSONFormat.java
index 7321edcda..b7cc4d8ce 100644
--- a/engine/src/main/java/org/terasology/persistence/serializers/EntityDataJSONFormat.java
+++ b/engine/src/main/java/org/terasology/persistence/serializers/EntityDataJSONFormat.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.persistence.serializers;
+package org.terasology.engine.persistence.serializers;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
diff --git a/engine/src/main/java/org/terasology/persistence/serializers/EntitySerializer.java b/engine/src/main/java/org/terasology/persistence/serializers/EntitySerializer.java
index 90b177af4..c0e32e38b 100644
--- a/engine/src/main/java/org/terasology/persistence/serializers/EntitySerializer.java
+++ b/engine/src/main/java/org/terasology/persistence/serializers/EntitySerializer.java
@@ -1,32 +1,19 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.persistence.serializers;
+package org.terasology.engine.persistence.serializers;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
-import org.terasology.entitySystem.Component;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.entitySystem.entity.internal.EngineEntityManager;
-import org.terasology.entitySystem.entity.internal.EntityInfoComponent;
-import org.terasology.entitySystem.entity.internal.EntityScope;
-import org.terasology.entitySystem.metadata.ComponentLibrary;
-import org.terasology.entitySystem.metadata.ComponentMetadata;
-import org.terasology.entitySystem.prefab.Prefab;
-import org.terasology.entitySystem.prefab.PrefabManager;
+import org.terasology.engine.entitySystem.Component;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.entity.internal.EngineEntityManager;
+import org.terasology.engine.entitySystem.entity.internal.EntityInfoComponent;
+import org.terasology.engine.entitySystem.entity.internal.EntityScope;
+import org.terasology.engine.entitySystem.metadata.ComponentLibrary;
+import org.terasology.engine.entitySystem.metadata.ComponentMetadata;
+import org.terasology.engine.entitySystem.prefab.Prefab;
+import org.terasology.engine.entitySystem.prefab.PrefabManager;
import org.terasology.persistence.typeHandling.TypeHandlerLibrary;
import org.terasology.protobuf.EntityData;
diff --git a/engine/src/main/java/org/terasology/persistence/serializers/EventSerializer.java b/engine/src/main/java/org/terasology/persistence/serializers/EventSerializer.java
index f9b222959..193d2711b 100644
--- a/engine/src/main/java/org/terasology/persistence/serializers/EventSerializer.java
+++ b/engine/src/main/java/org/terasology/persistence/serializers/EventSerializer.java
@@ -1,20 +1,7 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.persistence.serializers;
+package org.terasology.engine.persistence.serializers;
import com.google.common.collect.BiMap;
import com.google.common.collect.ImmutableBiMap;
@@ -22,17 +9,17 @@ import com.google.common.collect.ImmutableMap;
import com.google.protobuf.ByteString;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.terasology.entitySystem.event.Event;
-import org.terasology.entitySystem.metadata.EventLibrary;
-import org.terasology.entitySystem.metadata.EventMetadata;
-import org.terasology.entitySystem.metadata.ReplicatedFieldMetadata;
+import org.terasology.engine.entitySystem.event.Event;
+import org.terasology.engine.entitySystem.metadata.EventLibrary;
+import org.terasology.engine.entitySystem.metadata.EventMetadata;
+import org.terasology.engine.entitySystem.metadata.ReplicatedFieldMetadata;
+import org.terasology.engine.persistence.typeHandling.protobuf.ProtobufPersistedData;
+import org.terasology.engine.persistence.typeHandling.protobuf.ProtobufPersistedDataSerializer;
import org.terasology.persistence.typeHandling.DeserializationException;
import org.terasology.persistence.typeHandling.PersistedDataSerializer;
import org.terasology.persistence.typeHandling.SerializationException;
import org.terasology.persistence.typeHandling.Serializer;
import org.terasology.persistence.typeHandling.TypeHandlerLibrary;
-import org.terasology.persistence.typeHandling.protobuf.ProtobufPersistedData;
-import org.terasology.persistence.typeHandling.protobuf.ProtobufPersistedDataSerializer;
import org.terasology.protobuf.EntityData;
import java.util.Map;
@@ -78,7 +65,7 @@ public class EventSerializer {
/**
* @param eventData
* @return The event described by the eventData
- * @throws org.terasology.persistence.typeHandling.DeserializationException if an error occurs when deserializing
+ * @throws org.terasology.engine.persistence.typeHandling.DeserializationException if an error occurs when deserializing
*/
public Event deserialize(EntityData.Event eventData) {
Class eventClass = getEventClass(eventData);
@@ -117,7 +104,7 @@ public class EventSerializer {
*
* @param event
* @return The serialized event
- * @throws org.terasology.persistence.typeHandling.SerializationException if an error occurs during serialization
+ * @throws org.terasology.engine.persistence.typeHandling.SerializationException if an error occurs during serialization
*/
public EntityData.Event serialize(Event event) {
EventMetadata eventMetadata = eventLibrary.getMetadata(event.getClass());
diff --git a/engine/src/main/java/org/terasology/persistence/serializers/FieldSerializeCheck.java b/engine/src/main/java/org/terasology/persistence/serializers/FieldSerializeCheck.java
index a41526018..fe6452150 100644
--- a/engine/src/main/java/org/terasology/persistence/serializers/FieldSerializeCheck.java
+++ b/engine/src/main/java/org/terasology/persistence/serializers/FieldSerializeCheck.java
@@ -1,24 +1,12 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.persistence.serializers;
+package org.terasology.engine.persistence.serializers;
+import org.terasology.engine.entitySystem.metadata.ReplicatedFieldMetadata;
+import org.terasology.persistence.serializers.DeserializeFieldCheck;
import org.terasology.reflection.metadata.ClassMetadata;
import org.terasology.reflection.metadata.FieldMetadata;
-import org.terasology.entitySystem.metadata.ReplicatedFieldMetadata;
/**
* Interface for providing serializers with a method to check whether a given field should be serialized.
diff --git a/engine/src/main/java/org/terasology/persistence/serializers/GsonSerializer.java b/engine/src/main/java/org/terasology/persistence/serializers/GsonSerializer.java
index 49079bb83..9e1ecfcd8 100644
--- a/engine/src/main/java/org/terasology/persistence/serializers/GsonSerializer.java
+++ b/engine/src/main/java/org/terasology/persistence/serializers/GsonSerializer.java
@@ -1,29 +1,17 @@
-/*
- * Copyright 2018 MovingBlocks
- *
- * 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 org.terasology.persistence.serializers;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.persistence.serializers;
import com.google.gson.Gson;
import com.google.gson.JsonElement;
import com.google.gson.JsonIOException;
import com.google.gson.JsonSyntaxException;
+import org.terasology.engine.persistence.typeHandling.gson.GsonPersistedData;
+import org.terasology.engine.persistence.typeHandling.gson.GsonPersistedDataSerializer;
+import org.terasology.persistence.serializers.AbstractSerializer;
import org.terasology.persistence.typeHandling.PersistedData;
import org.terasology.persistence.typeHandling.SerializationException;
import org.terasology.persistence.typeHandling.TypeHandlerLibrary;
-import org.terasology.persistence.typeHandling.gson.GsonPersistedData;
-import org.terasology.persistence.typeHandling.gson.GsonPersistedDataSerializer;
import org.terasology.reflection.TypeInfo;
import java.io.BufferedWriter;
diff --git a/engine/src/main/java/org/terasology/persistence/serializers/NetworkEntitySerializer.java b/engine/src/main/java/org/terasology/persistence/serializers/NetworkEntitySerializer.java
index 87f473661..3a3a0d387 100644
--- a/engine/src/main/java/org/terasology/persistence/serializers/NetworkEntitySerializer.java
+++ b/engine/src/main/java/org/terasology/persistence/serializers/NetworkEntitySerializer.java
@@ -1,20 +1,7 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.persistence.serializers;
+package org.terasology.engine.persistence.serializers;
import com.google.common.base.Objects;
import com.google.common.collect.BiMap;
@@ -25,20 +12,20 @@ import com.google.common.primitives.UnsignedBytes;
import com.google.protobuf.ByteString;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.terasology.entitySystem.Component;
-import org.terasology.entitySystem.MutableComponentContainer;
-import org.terasology.entitySystem.entity.EntityBuilder;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.entitySystem.entity.internal.EngineEntityManager;
-import org.terasology.entitySystem.metadata.ComponentLibrary;
-import org.terasology.entitySystem.metadata.ComponentMetadata;
-import org.terasology.entitySystem.metadata.ReplicatedFieldMetadata;
-import org.terasology.entitySystem.prefab.Prefab;
+import org.terasology.engine.entitySystem.Component;
+import org.terasology.engine.entitySystem.MutableComponentContainer;
+import org.terasology.engine.entitySystem.entity.EntityBuilder;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.entity.internal.EngineEntityManager;
+import org.terasology.engine.entitySystem.metadata.ComponentLibrary;
+import org.terasology.engine.entitySystem.metadata.ComponentMetadata;
+import org.terasology.engine.entitySystem.metadata.ReplicatedFieldMetadata;
+import org.terasology.engine.entitySystem.prefab.Prefab;
+import org.terasology.engine.persistence.typeHandling.protobuf.ProtobufPersistedData;
+import org.terasology.engine.persistence.typeHandling.protobuf.ProtobufPersistedDataSerializer;
import org.terasology.persistence.typeHandling.PersistedData;
import org.terasology.persistence.typeHandling.Serializer;
import org.terasology.persistence.typeHandling.TypeHandlerLibrary;
-import org.terasology.persistence.typeHandling.protobuf.ProtobufPersistedData;
-import org.terasology.persistence.typeHandling.protobuf.ProtobufPersistedDataSerializer;
import org.terasology.protobuf.EntityData;
import java.util.Map;
diff --git a/engine/src/main/java/org/terasology/persistence/serializers/PrefabSerializer.java b/engine/src/main/java/org/terasology/persistence/serializers/PrefabSerializer.java
index 29f0d7d25..6c96fb581 100644
--- a/engine/src/main/java/org/terasology/persistence/serializers/PrefabSerializer.java
+++ b/engine/src/main/java/org/terasology/persistence/serializers/PrefabSerializer.java
@@ -1,22 +1,21 @@
// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.persistence.serializers;
+package org.terasology.engine.persistence.serializers;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.terasology.engine.module.ModuleContext;
-import org.terasology.entitySystem.Component;
-import org.terasology.entitySystem.metadata.ComponentLibrary;
-import org.terasology.entitySystem.metadata.ComponentMetadata;
-import org.terasology.entitySystem.prefab.Prefab;
-import org.terasology.entitySystem.prefab.PrefabData;
+import org.terasology.engine.core.module.ModuleContext;
+import org.terasology.engine.entitySystem.Component;
+import org.terasology.engine.entitySystem.metadata.ComponentLibrary;
+import org.terasology.engine.entitySystem.metadata.ComponentMetadata;
+import org.terasology.engine.entitySystem.prefab.Prefab;
+import org.terasology.engine.entitySystem.prefab.PrefabData;
+import org.terasology.engine.utilities.Assets;
import org.terasology.module.Module;
import org.terasology.persistence.typeHandling.TypeHandlerLibrary;
import org.terasology.protobuf.EntityData;
-import org.terasology.utilities.Assets;
-import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Map;
diff --git a/engine/src/main/java/org/terasology/persistence/serializers/ProtobufSerializer.java b/engine/src/main/java/org/terasology/persistence/serializers/ProtobufSerializer.java
index 5a689d62b..f11cfa927 100644
--- a/engine/src/main/java/org/terasology/persistence/serializers/ProtobufSerializer.java
+++ b/engine/src/main/java/org/terasology/persistence/serializers/ProtobufSerializer.java
@@ -1,25 +1,13 @@
-/*
- * Copyright 2018 MovingBlocks
- *
- * 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 org.terasology.persistence.serializers;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.persistence.serializers;
+import org.terasology.engine.persistence.typeHandling.protobuf.ProtobufPersistedData;
+import org.terasology.engine.persistence.typeHandling.protobuf.ProtobufPersistedDataSerializer;
+import org.terasology.persistence.serializers.AbstractSerializer;
import org.terasology.persistence.typeHandling.PersistedData;
import org.terasology.persistence.typeHandling.SerializationException;
import org.terasology.persistence.typeHandling.TypeHandlerLibrary;
-import org.terasology.persistence.typeHandling.protobuf.ProtobufPersistedData;
-import org.terasology.persistence.typeHandling.protobuf.ProtobufPersistedDataSerializer;
import org.terasology.protobuf.EntityData;
import org.terasology.reflection.TypeInfo;
diff --git a/engine/src/main/java/org/terasology/persistence/serializers/WorldSerializer.java b/engine/src/main/java/org/terasology/persistence/serializers/WorldSerializer.java
index c59a6faa9..86274e6b0 100644
--- a/engine/src/main/java/org/terasology/persistence/serializers/WorldSerializer.java
+++ b/engine/src/main/java/org/terasology/persistence/serializers/WorldSerializer.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.persistence.serializers;
+package org.terasology.engine.persistence.serializers;
-import org.terasology.entitySystem.Component;
+import org.terasology.engine.entitySystem.Component;
import org.terasology.protobuf.EntityData;
import java.util.List;
diff --git a/engine/src/main/java/org/terasology/persistence/serializers/WorldSerializerImpl.java b/engine/src/main/java/org/terasology/persistence/serializers/WorldSerializerImpl.java
index 35dbc9e8f..489cb90cb 100644
--- a/engine/src/main/java/org/terasology/persistence/serializers/WorldSerializerImpl.java
+++ b/engine/src/main/java/org/terasology/persistence/serializers/WorldSerializerImpl.java
@@ -13,28 +13,28 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.persistence.serializers;
+package org.terasology.engine.persistence.serializers;
import com.google.common.collect.ArrayListMultimap;
import com.google.common.collect.ListMultimap;
import com.google.common.collect.Maps;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.terasology.utilities.Assets;
+import org.terasology.engine.utilities.Assets;
import org.terasology.assets.ResourceUrn;
-import org.terasology.engine.SimpleUri;
-import org.terasology.engine.module.ModuleManager;
-import org.terasology.entitySystem.Component;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.entitySystem.entity.internal.EngineEntityManager;
-import org.terasology.entitySystem.metadata.ComponentLibrary;
-import org.terasology.entitySystem.metadata.ComponentMetadata;
-import org.terasology.entitySystem.prefab.Prefab;
-import org.terasology.entitySystem.prefab.PrefabData;
-import org.terasology.entitySystem.prefab.PrefabManager;
-import org.terasology.engine.module.ModuleContext;
+import org.terasology.engine.core.SimpleUri;
+import org.terasology.engine.core.module.ModuleManager;
+import org.terasology.engine.entitySystem.Component;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.entity.internal.EngineEntityManager;
+import org.terasology.engine.entitySystem.metadata.ComponentLibrary;
+import org.terasology.engine.entitySystem.metadata.ComponentMetadata;
+import org.terasology.engine.entitySystem.prefab.Prefab;
+import org.terasology.engine.entitySystem.prefab.PrefabData;
+import org.terasology.engine.entitySystem.prefab.PrefabManager;
+import org.terasology.engine.core.module.ModuleContext;
import org.terasology.protobuf.EntityData;
-import org.terasology.registry.CoreRegistry;
+import org.terasology.engine.registry.CoreRegistry;
import java.util.Collection;
import java.util.Iterator;
diff --git a/engine/src/main/java/org/terasology/persistence/typeHandling/RegisterTypeHandler.java b/engine/src/main/java/org/terasology/persistence/typeHandling/RegisterTypeHandler.java
index a3a7c15df..f0bd5106d 100644
--- a/engine/src/main/java/org/terasology/persistence/typeHandling/RegisterTypeHandler.java
+++ b/engine/src/main/java/org/terasology/persistence/typeHandling/RegisterTypeHandler.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.terasology.persistence.typeHandling;
+package org.terasology.engine.persistence.typeHandling;
import org.terasology.module.sandbox.API;
diff --git a/engine/src/main/java/org/terasology/persistence/typeHandling/RegisterTypeHandlerFactory.java b/engine/src/main/java/org/terasology/persistence/typeHandling/RegisterTypeHandlerFactory.java
index 9dc866e21..02b719d2d 100644
--- a/engine/src/main/java/org/terasology/persistence/typeHandling/RegisterTypeHandlerFactory.java
+++ b/engine/src/main/java/org/terasology/persistence/typeHandling/RegisterTypeHandlerFactory.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.persistence.typeHandling;
+package org.terasology.engine.persistence.typeHandling;
import org.terasology.module.sandbox.API;
@@ -28,8 +28,8 @@ import java.lang.annotation.Target;
* {@link TypeHandlerLibrary} on environment change.
* This can be used to (de)serialize custom components.
* Record Workflow When the user clicks on the "Record" button on the extras menu, the {@link #status}
* is set to PREPARING_RECORD. When a game is selected to be loaded from the "Record Screen" and the game is completely
- * loaded, the {@link #status} will be set to RECORDING by the {@link org.terasology.engine.modes.loadProcesses.InitialiseRecordAndReplay}
- * load process, which will make the {@link org.terasology.entitySystem.event.internal.EventSystemImpl} call the {@link EventCatcher}
+ * loaded, the {@link #status} will be set to RECORDING by the {@link org.terasology.engine.core.modes.loadProcesses.InitialiseRecordAndReplay}
+ * load process, which will make the {@link org.terasology.engine.entitySystem.event.internal.EventSystemImpl} call the {@link EventCatcher}
* every time an event is sent.
*
* The RECORDING status will also make the {@link DirectionAndOriginPosRecorder} and {@link CharacterStateEventPositionMap}
- * record the data they are supposed to. Every time the game is saved during the recording, {@link org.terasology.persistence.internal.SaveTransaction}'s
+ * record the data they are supposed to. Every time the game is saved during the recording, {@link org.terasology.engine.persistence.internal.SaveTransaction}'s
* saveRecordingData() is called and the events in the {@link RecordedEventStore} are saved in an "event file", reseting
* the store and updating {@link RecordAndReplayUtils}.
*
* When the game shutdowns with the RECORDING status, the {@link RecordAndReplayUtils}'s shutdownRequested is set to true
- * and then every recorded data that was not stored yet will be serialized and stored once {@link org.terasology.persistence.internal.SaveTransaction}'s
+ * and then every recorded data that was not stored yet will be serialized and stored once {@link org.terasology.engine.persistence.internal.SaveTransaction}'s
* saveRecordingData() method is called right after the game is saved. Once this is done, the {@link #status} is set to NOT_ACTIVATED.
*
Replay Workflow When the user clicks on the "Replay" button on the extras menu, the {@link #status}
- * is set to PREPEARING_REPLAY. During the load process of a Replay, the {@link org.terasology.engine.modes.loadProcesses.InitialiseWorld}
- * class gets the game path from the "recordings" folder instead of the "saves" one, and the {@link org.terasology.engine.bootstrap.EntitySystemSetupUtil}
- * creates an {@link EventSystemReplayImpl} instead of {@link org.terasology.entitySystem.event.internal.EventSystemImpl}.
+ * is set to PREPEARING_REPLAY. During the load process of a Replay, the {@link org.terasology.engine.core.modes.loadProcesses.InitialiseWorld}
+ * class gets the game path from the "recordings" folder instead of the "saves" one, and the {@link org.terasology.engine.core.bootstrap.EntitySystemSetupUtil}
+ * creates an {@link EventSystemReplayImpl} instead of {@link org.terasology.engine.entitySystem.event.internal.EventSystemImpl}.
*
* When the game is loading, the InitialiseRecordAndReplay load process will set the {@link #status} to REPLAYING and deserialize
* the recorded data, updating {@link RecordedEventStore},{@link RecordAndReplayUtils}, {@link CharacterStateEventPositionMap}
@@ -49,10 +49,10 @@ package org.terasology.recording;
* If there are, the store is updated and the event system continues to replay the events. It is important to notice that
* the REPLAYING status also makes the {@link DirectionAndOriginPosRecorderList} and {@link CharacterStateEventPositionMap}
* to replace some variables for the recorded ones. Once there is no more events to be replayed, the {@link #status} is set to
- * REPLAY_FINISHED and the {@link EventSystemReplayImpl} will work exactly like {@link org.terasology.entitySystem.event.internal.EventSystemImpl}.
+ * REPLAY_FINISHED and the {@link EventSystemReplayImpl} will work exactly like {@link org.terasology.engine.entitySystem.event.internal.EventSystemImpl}.
*
* When the game is shutdown during this state, {@link RecordAndReplayUtils}'s shutdownRequested variable is set to true,
- * and then when {@link org.terasology.persistence.internal.SaveTransaction}'s run() method is called, the {@link #status} will be
+ * and then when {@link org.terasology.engine.persistence.internal.SaveTransaction}'s run() method is called, the {@link #status} will be
* set to NOT_ACTIVATED and the {@link RecordAndReplayUtils} will be reset. It is important to know that during the
* REPLAYING and REPLAY_FINISHED state the game is not saved since this is blocked by those statuses.
*/
diff --git a/engine/src/main/java/org/terasology/recording/RecordAndReplaySerializer.java b/engine/src/main/java/org/terasology/recording/RecordAndReplaySerializer.java
index 10709738d..a1039d49e 100644
--- a/engine/src/main/java/org/terasology/recording/RecordAndReplaySerializer.java
+++ b/engine/src/main/java/org/terasology/recording/RecordAndReplaySerializer.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.recording;
+package org.terasology.engine.recording;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
@@ -24,9 +24,9 @@ import com.google.gson.stream.JsonWriter;
import org.joml.Vector3f;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.terasology.engine.module.ModuleManager;
-import org.terasology.engine.paths.PathManager;
-import org.terasology.entitySystem.entity.EntityManager;
+import org.terasology.engine.core.module.ModuleManager;
+import org.terasology.engine.core.paths.PathManager;
+import org.terasology.engine.entitySystem.entity.EntityManager;
import org.terasology.reflection.TypeRegistry;
import java.io.FileReader;
diff --git a/engine/src/main/java/org/terasology/recording/RecordAndReplayStatus.java b/engine/src/main/java/org/terasology/recording/RecordAndReplayStatus.java
index 992fbfc26..0bc82aee7 100644
--- a/engine/src/main/java/org/terasology/recording/RecordAndReplayStatus.java
+++ b/engine/src/main/java/org/terasology/recording/RecordAndReplayStatus.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.recording;
+package org.terasology.engine.recording;
/**
* An enum with the status of Record and Replay. There are six statuses:
diff --git a/engine/src/main/java/org/terasology/recording/RecordAndReplayUtils.java b/engine/src/main/java/org/terasology/recording/RecordAndReplayUtils.java
index b81016f07..9f1b59762 100644
--- a/engine/src/main/java/org/terasology/recording/RecordAndReplayUtils.java
+++ b/engine/src/main/java/org/terasology/recording/RecordAndReplayUtils.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.recording;
+package org.terasology.engine.recording;
/**
* Saves some variables important for Record and Replay.
diff --git a/engine/src/main/java/org/terasology/recording/RecordedEntityRef.java b/engine/src/main/java/org/terasology/recording/RecordedEntityRef.java
index 34a5e038d..5aa4a8a12 100644
--- a/engine/src/main/java/org/terasology/recording/RecordedEntityRef.java
+++ b/engine/src/main/java/org/terasology/recording/RecordedEntityRef.java
@@ -13,14 +13,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.recording;
+package org.terasology.engine.recording;
-import org.terasology.entitySystem.Component;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.entitySystem.entity.LowLevelEntityManager;
-import org.terasology.entitySystem.entity.internal.NullEntityRef;
-import org.terasology.entitySystem.event.Event;
-import org.terasology.entitySystem.prefab.Prefab;
+import org.terasology.engine.entitySystem.Component;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.entity.LowLevelEntityManager;
+import org.terasology.engine.entitySystem.entity.internal.NullEntityRef;
+import org.terasology.engine.entitySystem.event.Event;
+import org.terasology.engine.entitySystem.prefab.Prefab;
import java.util.List;
diff --git a/engine/src/main/java/org/terasology/recording/RecordedEvent.java b/engine/src/main/java/org/terasology/recording/RecordedEvent.java
index e830c881e..b39a28bcc 100644
--- a/engine/src/main/java/org/terasology/recording/RecordedEvent.java
+++ b/engine/src/main/java/org/terasology/recording/RecordedEvent.java
@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.recording;
+package org.terasology.engine.recording;
-import org.terasology.entitySystem.Component;
-import org.terasology.entitySystem.event.Event;
+import org.terasology.engine.entitySystem.Component;
+import org.terasology.engine.entitySystem.event.Event;
/**
* Saves a recorded event, the id of the entity it was sent against, the component it was sent with, the timestamp in
diff --git a/engine/src/main/java/org/terasology/recording/RecordedEventSerializer.java b/engine/src/main/java/org/terasology/recording/RecordedEventSerializer.java
index d9d639aca..95fd248b7 100644
--- a/engine/src/main/java/org/terasology/recording/RecordedEventSerializer.java
+++ b/engine/src/main/java/org/terasology/recording/RecordedEventSerializer.java
@@ -1,18 +1,18 @@
-// Copyright 2020 The Terasology Foundation
+// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.recording;
+package org.terasology.engine.recording;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.terasology.engine.module.ModuleManager;
-import org.terasology.entitySystem.entity.EntityManager;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.entitySystem.entity.internal.EngineEntityManager;
-import org.terasology.persistence.serializers.GsonSerializer;
+import org.terasology.engine.core.module.ModuleManager;
+import org.terasology.engine.entitySystem.entity.EntityManager;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.entity.internal.EngineEntityManager;
+import org.terasology.engine.persistence.serializers.GsonSerializer;
+import org.terasology.engine.persistence.typeHandling.TypeHandlerLibraryImpl;
+import org.terasology.engine.persistence.typeHandling.extensionTypes.EntityRefTypeHandler;
import org.terasology.persistence.typeHandling.SerializationException;
import org.terasology.persistence.typeHandling.TypeHandlerLibrary;
-import org.terasology.persistence.typeHandling.TypeHandlerLibraryImpl;
-import org.terasology.persistence.typeHandling.extensionTypes.EntityRefTypeHandler;
import org.terasology.reflection.TypeInfo;
import org.terasology.reflection.TypeRegistry;
diff --git a/engine/src/main/java/org/terasology/recording/RecordedEventStore.java b/engine/src/main/java/org/terasology/recording/RecordedEventStore.java
index 00c4540df..d539f4464 100644
--- a/engine/src/main/java/org/terasology/recording/RecordedEventStore.java
+++ b/engine/src/main/java/org/terasology/recording/RecordedEventStore.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.recording;
+package org.terasology.engine.recording;
import java.util.ArrayList;
import java.util.List;
diff --git a/engine/src/main/java/org/terasology/reflection/copy/strategy/EntityCopyStrategy.java b/engine/src/main/java/org/terasology/reflection/copy/strategy/EntityCopyStrategy.java
index faf714ef0..e1147050d 100644
--- a/engine/src/main/java/org/terasology/reflection/copy/strategy/EntityCopyStrategy.java
+++ b/engine/src/main/java/org/terasology/reflection/copy/strategy/EntityCopyStrategy.java
@@ -1,9 +1,9 @@
-// Copyright 2020 The Terasology Foundation
+// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.reflection.copy.strategy;
+package org.terasology.engine.reflection.copy.strategy;
-import org.terasology.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.entity.EntityRef;
import org.terasology.reflection.copy.CopyStrategy;
/**
diff --git a/engine/src/main/java/org/terasology/reflection/package-info.java b/engine/src/main/java/org/terasology/reflection/package-info.java
index d2ae37900..d72df6a59 100644
--- a/engine/src/main/java/org/terasology/reflection/package-info.java
+++ b/engine/src/main/java/org/terasology/reflection/package-info.java
@@ -1,18 +1,5 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
/**
* This package provides a low-level system for describing classes and fields, with support for construction and field access. Essentially it is a simplified reflection
@@ -27,4 +14,4 @@
*
* Additionally, ReflectFactory is used to provide support for construction and field access, to allow for alternate implementations.
*/
-package org.terasology.reflection;
+package org.terasology.engine.reflection;
diff --git a/engine/src/main/java/org/terasology/reflection/reflect/ByteCodeReflectFactory.java b/engine/src/main/java/org/terasology/reflection/reflect/ByteCodeReflectFactory.java
index 1b5c59e3b..0ebb53b32 100644
--- a/engine/src/main/java/org/terasology/reflection/reflect/ByteCodeReflectFactory.java
+++ b/engine/src/main/java/org/terasology/reflection/reflect/ByteCodeReflectFactory.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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 org.terasology.reflection.reflect;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.reflection.reflect;
import com.esotericsoftware.reflectasm.FieldAccess;
import com.esotericsoftware.reflectasm.MethodAccess;
@@ -25,7 +12,12 @@ import javassist.CtNewMethod;
import javassist.NotFoundException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.terasology.utilities.ReflectionUtil;
+import org.terasology.reflection.reflect.FieldAccessor;
+import org.terasology.reflection.reflect.InaccessibleFieldException;
+import org.terasology.reflection.reflect.ObjectConstructor;
+import org.terasology.reflection.reflect.ReflectFactory;
+import org.terasology.reflection.reflect.ReflectionReflectFactory;
+import org.terasology.engine.utilities.ReflectionUtil;
import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
diff --git a/engine/src/main/java/org/terasology/registry/CoreRegistry.java b/engine/src/main/java/org/terasology/registry/CoreRegistry.java
index d5cb36fd7..77555b8a4 100644
--- a/engine/src/main/java/org/terasology/registry/CoreRegistry.java
+++ b/engine/src/main/java/org/terasology/registry/CoreRegistry.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.registry;
+package org.terasology.engine.registry;
-import org.terasology.context.Context;
+import org.terasology.engine.context.Context;
/**
* Registry giving access to major singleton systems, via the interface they fulfill.
diff --git a/engine/src/main/java/org/terasology/registry/In.java b/engine/src/main/java/org/terasology/registry/In.java
index 80e68c8fd..0a958eb82 100644
--- a/engine/src/main/java/org/terasology/registry/In.java
+++ b/engine/src/main/java/org/terasology/registry/In.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.terasology.registry;
+package org.terasology.engine.registry;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
diff --git a/engine/src/main/java/org/terasology/registry/InjectionHelper.java b/engine/src/main/java/org/terasology/registry/InjectionHelper.java
index c151acd93..330ce9302 100644
--- a/engine/src/main/java/org/terasology/registry/InjectionHelper.java
+++ b/engine/src/main/java/org/terasology/registry/InjectionHelper.java
@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.terasology.registry;
+package org.terasology.engine.registry;
import org.reflections.ReflectionUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.terasology.context.Context;
+import org.terasology.engine.context.Context;
import org.terasology.util.reflection.ParameterProvider;
import org.terasology.util.reflection.SimpleClassFactory;
diff --git a/engine/src/main/java/org/terasology/registry/Share.java b/engine/src/main/java/org/terasology/registry/Share.java
index 948ef08bb..e2cf5aba8 100644
--- a/engine/src/main/java/org/terasology/registry/Share.java
+++ b/engine/src/main/java/org/terasology/registry/Share.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.terasology.registry;
+package org.terasology.engine.registry;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
diff --git a/engine/src/main/java/org/terasology/registry/package-info.java b/engine/src/main/java/org/terasology/registry/package-info.java
index d8dc4379b..2f0c9515b 100644
--- a/engine/src/main/java/org/terasology/registry/package-info.java
+++ b/engine/src/main/java/org/terasology/registry/package-info.java
@@ -14,6 +14,6 @@
* limitations under the License.
*/
-@API package org.terasology.registry;
+@API package org.terasology.engine.registry;
import org.terasology.module.sandbox.API;
diff --git a/engine/src/main/java/org/terasology/rendering/AABBRenderer.java b/engine/src/main/java/org/terasology/rendering/AABBRenderer.java
index a2e90a949..5684878e9 100644
--- a/engine/src/main/java/org/terasology/rendering/AABBRenderer.java
+++ b/engine/src/main/java/org/terasology/rendering/AABBRenderer.java
@@ -1,29 +1,16 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.rendering;
+package org.terasology.engine.rendering;
import org.joml.Vector3f;
import org.joml.Vector4f;
import org.lwjgl.opengl.GL11;
import org.terasology.joml.geom.AABBf;
import org.terasology.joml.geom.AABBfc;
-import org.terasology.logic.players.LocalPlayer;
+import org.terasology.engine.logic.players.LocalPlayer;
import org.terasology.module.sandbox.API;
-import org.terasology.registry.CoreRegistry;
+import org.terasology.engine.registry.CoreRegistry;
import static org.lwjgl.opengl.GL11.GL_BLEND;
import static org.lwjgl.opengl.GL11.GL_LINE_LOOP;
diff --git a/engine/src/main/java/org/terasology/rendering/BlockOverlayRenderer.java b/engine/src/main/java/org/terasology/rendering/BlockOverlayRenderer.java
index e2f4646f5..7e32dde4d 100644
--- a/engine/src/main/java/org/terasology/rendering/BlockOverlayRenderer.java
+++ b/engine/src/main/java/org/terasology/rendering/BlockOverlayRenderer.java
@@ -1,20 +1,7 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.rendering;
+package org.terasology.engine.rendering;
import org.terasology.joml.geom.AABBfc;
diff --git a/engine/src/main/java/org/terasology/rendering/RenderHelper.java b/engine/src/main/java/org/terasology/rendering/RenderHelper.java
index e5a3d96fa..4c932737c 100644
--- a/engine/src/main/java/org/terasology/rendering/RenderHelper.java
+++ b/engine/src/main/java/org/terasology/rendering/RenderHelper.java
@@ -1,23 +1,10 @@
-/*
- * Copyright 2019 MovingBlocks
- *
- * 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 org.terasology.rendering;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.rendering;
import org.joml.Vector2f;
import org.joml.Vector3fc;
-import org.terasology.rendering.dag.nodes.RefractiveReflectiveBlocksNodeProxy;
+import org.terasology.engine.rendering.dag.nodes.RefractiveReflectiveBlocksNodeProxy;
/**
*/
diff --git a/engine/src/main/java/org/terasology/rendering/RenderMath.java b/engine/src/main/java/org/terasology/rendering/RenderMath.java
index 18c61c81d..dae913267 100644
--- a/engine/src/main/java/org/terasology/rendering/RenderMath.java
+++ b/engine/src/main/java/org/terasology/rendering/RenderMath.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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 org.terasology.rendering;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.rendering;
import org.terasology.math.TeraMath;
diff --git a/engine/src/main/java/org/terasology/rendering/ShaderManager.java b/engine/src/main/java/org/terasology/rendering/ShaderManager.java
index 3969d3ab2..64ca2b3ed 100644
--- a/engine/src/main/java/org/terasology/rendering/ShaderManager.java
+++ b/engine/src/main/java/org/terasology/rendering/ShaderManager.java
@@ -1,22 +1,9 @@
-/*
- * Copyright 2014 MovingBlocks
- *
- * 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 org.terasology.rendering;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.rendering;
-import org.terasology.rendering.assets.material.Material;
-import org.terasology.rendering.assets.texture.Texture;
+import org.terasology.engine.rendering.assets.material.Material;
+import org.terasology.engine.rendering.assets.texture.Texture;
public interface ShaderManager {
diff --git a/engine/src/main/java/org/terasology/rendering/ShaderManagerLwjgl.java b/engine/src/main/java/org/terasology/rendering/ShaderManagerLwjgl.java
index ceabf6078..16646f71b 100644
--- a/engine/src/main/java/org/terasology/rendering/ShaderManagerLwjgl.java
+++ b/engine/src/main/java/org/terasology/rendering/ShaderManagerLwjgl.java
@@ -1,6 +1,6 @@
// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.rendering;
+package org.terasology.engine.rendering;
import com.google.common.collect.Sets;
import org.lwjgl.Version;
@@ -13,13 +13,13 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.terasology.assets.ResourceUrn;
import org.terasology.assets.management.AssetManager;
-import org.terasology.registry.CoreRegistry;
-import org.terasology.rendering.assets.material.Material;
-import org.terasology.rendering.assets.material.MaterialData;
-import org.terasology.rendering.assets.shader.Shader;
-import org.terasology.rendering.assets.texture.Texture;
-import org.terasology.rendering.opengl.GLSLMaterial;
-import org.terasology.utilities.Assets;
+import org.terasology.engine.registry.CoreRegistry;
+import org.terasology.engine.rendering.assets.material.Material;
+import org.terasology.engine.rendering.assets.material.MaterialData;
+import org.terasology.engine.rendering.assets.shader.Shader;
+import org.terasology.engine.rendering.assets.texture.Texture;
+import org.terasology.engine.rendering.opengl.GLSLMaterial;
+import org.terasology.engine.utilities.Assets;
import java.util.Optional;
import java.util.Set;
diff --git a/engine/src/main/java/org/terasology/rendering/VertexBufferObjectUtil.java b/engine/src/main/java/org/terasology/rendering/VertexBufferObjectUtil.java
index 50046b1c8..ee8d8fea7 100644
--- a/engine/src/main/java/org/terasology/rendering/VertexBufferObjectUtil.java
+++ b/engine/src/main/java/org/terasology/rendering/VertexBufferObjectUtil.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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 org.terasology.rendering;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.rendering;
import org.lwjgl.opengl.GL15;
diff --git a/engine/src/main/java/org/terasology/rendering/animation/Animation.java b/engine/src/main/java/org/terasology/rendering/animation/Animation.java
index 9a1093af3..1d4cb1559 100644
--- a/engine/src/main/java/org/terasology/rendering/animation/Animation.java
+++ b/engine/src/main/java/org/terasology/rendering/animation/Animation.java
@@ -1,6 +1,6 @@
// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.rendering.animation;
+package org.terasology.engine.rendering.animation;
import com.google.common.base.Preconditions;
diff --git a/engine/src/main/java/org/terasology/rendering/animation/AnimationListener.java b/engine/src/main/java/org/terasology/rendering/animation/AnimationListener.java
index 1577f4055..6e7b1f78d 100644
--- a/engine/src/main/java/org/terasology/rendering/animation/AnimationListener.java
+++ b/engine/src/main/java/org/terasology/rendering/animation/AnimationListener.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2016 MovingBlocks
- *
- * 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 org.terasology.rendering.animation;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.rendering.animation;
/*
* Notified on significant animation events.
diff --git a/engine/src/main/java/org/terasology/rendering/animation/Animator.java b/engine/src/main/java/org/terasology/rendering/animation/Animator.java
index 1631dae9f..786bc3c9d 100644
--- a/engine/src/main/java/org/terasology/rendering/animation/Animator.java
+++ b/engine/src/main/java/org/terasology/rendering/animation/Animator.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2016 MovingBlocks
- *
- * 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 org.terasology.rendering.animation;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.rendering.animation;
/*
* Interface for interpolation equations.
diff --git a/engine/src/main/java/org/terasology/rendering/animation/AnimatorGroup.java b/engine/src/main/java/org/terasology/rendering/animation/AnimatorGroup.java
index 4c960328c..cfbac9c8d 100644
--- a/engine/src/main/java/org/terasology/rendering/animation/AnimatorGroup.java
+++ b/engine/src/main/java/org/terasology/rendering/animation/AnimatorGroup.java
@@ -1,7 +1,7 @@
// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.rendering.animation;
+package org.terasology.engine.rendering.animation;
import com.google.common.base.Preconditions;
diff --git a/engine/src/main/java/org/terasology/rendering/animation/ColorHueAnimator.java b/engine/src/main/java/org/terasology/rendering/animation/ColorHueAnimator.java
index 295975522..767cf316d 100644
--- a/engine/src/main/java/org/terasology/rendering/animation/ColorHueAnimator.java
+++ b/engine/src/main/java/org/terasology/rendering/animation/ColorHueAnimator.java
@@ -1,9 +1,9 @@
// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.rendering.animation;
+package org.terasology.engine.rendering.animation;
import org.terasology.nui.Color;
-import org.terasology.rendering.nui.layers.mainMenu.settings.CieCamColors;
+import org.terasology.engine.rendering.nui.layers.mainMenu.settings.CieCamColors;
import java.util.List;
import java.util.function.Consumer;
diff --git a/engine/src/main/java/org/terasology/rendering/animation/RectanglefAnimator.java b/engine/src/main/java/org/terasology/rendering/animation/RectanglefAnimator.java
index 6c7583d8d..67d9e62b2 100644
--- a/engine/src/main/java/org/terasology/rendering/animation/RectanglefAnimator.java
+++ b/engine/src/main/java/org/terasology/rendering/animation/RectanglefAnimator.java
@@ -1,6 +1,6 @@
// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.rendering.animation;
+package org.terasology.engine.rendering.animation;
import com.google.common.base.Preconditions;
import org.terasology.joml.geom.Rectanglef;
diff --git a/engine/src/main/java/org/terasology/rendering/animation/RectangleiAnimator.java b/engine/src/main/java/org/terasology/rendering/animation/RectangleiAnimator.java
index bde3410ab..fb8e3f888 100644
--- a/engine/src/main/java/org/terasology/rendering/animation/RectangleiAnimator.java
+++ b/engine/src/main/java/org/terasology/rendering/animation/RectangleiAnimator.java
@@ -1,6 +1,6 @@
// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.rendering.animation;
+package org.terasology.engine.rendering.animation;
import com.google.common.base.Preconditions;
import org.terasology.joml.geom.Rectanglei;
diff --git a/engine/src/main/java/org/terasology/rendering/animation/TimeModifier.java b/engine/src/main/java/org/terasology/rendering/animation/TimeModifier.java
index 71869825a..63b202d3c 100644
--- a/engine/src/main/java/org/terasology/rendering/animation/TimeModifier.java
+++ b/engine/src/main/java/org/terasology/rendering/animation/TimeModifier.java
@@ -1,20 +1,7 @@
-/*
- * Copyright 2016 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.rendering.animation;
+package org.terasology.engine.rendering.animation;
import java.util.Objects;
diff --git a/engine/src/main/java/org/terasology/rendering/animation/TimeModifiers.java b/engine/src/main/java/org/terasology/rendering/animation/TimeModifiers.java
index 3c68393bc..b00ccb314 100644
--- a/engine/src/main/java/org/terasology/rendering/animation/TimeModifiers.java
+++ b/engine/src/main/java/org/terasology/rendering/animation/TimeModifiers.java
@@ -1,20 +1,7 @@
-/*
- * Copyright 2016 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.rendering.animation;
+package org.terasology.engine.rendering.animation;
import com.google.common.base.Preconditions;
import org.terasology.math.TeraMath;
diff --git a/engine/src/main/java/org/terasology/rendering/assets/animation/MeshAnimation.java b/engine/src/main/java/org/terasology/rendering/assets/animation/MeshAnimation.java
index 972af1fa9..c3ecceebe 100644
--- a/engine/src/main/java/org/terasology/rendering/assets/animation/MeshAnimation.java
+++ b/engine/src/main/java/org/terasology/rendering/assets/animation/MeshAnimation.java
@@ -1,26 +1,13 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.rendering.assets.animation;
+package org.terasology.engine.rendering.assets.animation;
import org.terasology.assets.Asset;
import org.terasology.assets.AssetType;
import org.terasology.assets.ResourceUrn;
+import org.terasology.engine.rendering.assets.skeletalmesh.SkeletalMesh;
import org.terasology.joml.geom.AABBf;
-import org.terasology.rendering.assets.skeletalmesh.SkeletalMesh;
/**
*/
diff --git a/engine/src/main/java/org/terasology/rendering/assets/animation/MeshAnimationBundle.java b/engine/src/main/java/org/terasology/rendering/assets/animation/MeshAnimationBundle.java
index 7ec79f14f..20f183fac 100644
--- a/engine/src/main/java/org/terasology/rendering/assets/animation/MeshAnimationBundle.java
+++ b/engine/src/main/java/org/terasology/rendering/assets/animation/MeshAnimationBundle.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2019 MovingBlocks
- *
- * 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 org.terasology.rendering.assets.animation;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.rendering.assets.animation;
import org.terasology.assets.Asset;
import org.terasology.assets.AssetType;
diff --git a/engine/src/main/java/org/terasology/rendering/assets/animation/MeshAnimationBundleData.java b/engine/src/main/java/org/terasology/rendering/assets/animation/MeshAnimationBundleData.java
index 77131f837..70cd1dd27 100644
--- a/engine/src/main/java/org/terasology/rendering/assets/animation/MeshAnimationBundleData.java
+++ b/engine/src/main/java/org/terasology/rendering/assets/animation/MeshAnimationBundleData.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2019 MovingBlocks
- *
- * 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 org.terasology.rendering.assets.animation;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.rendering.assets.animation;
import com.google.common.collect.ImmutableMap;
import org.terasology.assets.AssetData;
diff --git a/engine/src/main/java/org/terasology/rendering/assets/animation/MeshAnimationBundleProducer.java b/engine/src/main/java/org/terasology/rendering/assets/animation/MeshAnimationBundleProducer.java
index c03873925..e6494393f 100644
--- a/engine/src/main/java/org/terasology/rendering/assets/animation/MeshAnimationBundleProducer.java
+++ b/engine/src/main/java/org/terasology/rendering/assets/animation/MeshAnimationBundleProducer.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2019 MovingBlocks
- *
- * 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 org.terasology.rendering.assets.animation;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.rendering.assets.animation;
import org.terasology.assets.AbstractFragmentDataProducer;
import org.terasology.assets.ResourceUrn;
diff --git a/engine/src/main/java/org/terasology/rendering/assets/animation/MeshAnimationData.java b/engine/src/main/java/org/terasology/rendering/assets/animation/MeshAnimationData.java
index 582359938..4a2e3bea2 100644
--- a/engine/src/main/java/org/terasology/rendering/assets/animation/MeshAnimationData.java
+++ b/engine/src/main/java/org/terasology/rendering/assets/animation/MeshAnimationData.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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 org.terasology.rendering.assets.animation;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.rendering.assets.animation;
import com.google.common.collect.ImmutableList;
import gnu.trove.list.TIntList;
diff --git a/engine/src/main/java/org/terasology/rendering/assets/animation/MeshAnimationFrame.java b/engine/src/main/java/org/terasology/rendering/assets/animation/MeshAnimationFrame.java
index e4c84817a..7e9673ae5 100644
--- a/engine/src/main/java/org/terasology/rendering/assets/animation/MeshAnimationFrame.java
+++ b/engine/src/main/java/org/terasology/rendering/assets/animation/MeshAnimationFrame.java
@@ -1,20 +1,7 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.rendering.assets.animation;
+package org.terasology.engine.rendering.assets.animation;
import com.google.common.collect.Lists;
import org.joml.Quaternionf;
diff --git a/engine/src/main/java/org/terasology/rendering/assets/animation/MeshAnimationImpl.java b/engine/src/main/java/org/terasology/rendering/assets/animation/MeshAnimationImpl.java
index 0ec029f06..b811093b3 100644
--- a/engine/src/main/java/org/terasology/rendering/assets/animation/MeshAnimationImpl.java
+++ b/engine/src/main/java/org/terasology/rendering/assets/animation/MeshAnimationImpl.java
@@ -1,13 +1,13 @@
// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.rendering.assets.animation;
+package org.terasology.engine.rendering.assets.animation;
import org.terasology.assets.Asset;
import org.terasology.assets.AssetType;
import org.terasology.assets.ResourceUrn;
+import org.terasology.engine.rendering.assets.skeletalmesh.Bone;
+import org.terasology.engine.rendering.assets.skeletalmesh.SkeletalMesh;
import org.terasology.joml.geom.AABBf;
-import org.terasology.rendering.assets.skeletalmesh.Bone;
-import org.terasology.rendering.assets.skeletalmesh.SkeletalMesh;
import java.util.Optional;
diff --git a/engine/src/main/java/org/terasology/rendering/assets/animation/package-info.java b/engine/src/main/java/org/terasology/rendering/assets/animation/package-info.java
index dbfc13001..c94c4d887 100644
--- a/engine/src/main/java/org/terasology/rendering/assets/animation/package-info.java
+++ b/engine/src/main/java/org/terasology/rendering/assets/animation/package-info.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-@API package org.terasology.rendering.assets.animation;
+@API package org.terasology.engine.rendering.assets.animation;
import org.terasology.module.sandbox.API;
diff --git a/engine/src/main/java/org/terasology/rendering/assets/atlas/AltasTileProducer.java b/engine/src/main/java/org/terasology/rendering/assets/atlas/AltasTileProducer.java
index a48c11dae..c645d7776 100644
--- a/engine/src/main/java/org/terasology/rendering/assets/atlas/AltasTileProducer.java
+++ b/engine/src/main/java/org/terasology/rendering/assets/atlas/AltasTileProducer.java
@@ -1,25 +1,12 @@
-/*
- * Copyright 2015 MovingBlocks
- *
- * 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 org.terasology.rendering.assets.atlas;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.rendering.assets.atlas;
import org.terasology.assets.AbstractFragmentDataProducer;
import org.terasology.assets.ResourceUrn;
import org.terasology.assets.management.AssetManager;
import org.terasology.assets.module.annotations.RegisterAssetDataProducer;
-import org.terasology.rendering.assets.texture.subtexture.SubtextureData;
+import org.terasology.engine.rendering.assets.texture.subtexture.SubtextureData;
import java.util.Collections;
import java.util.Optional;
diff --git a/engine/src/main/java/org/terasology/rendering/assets/atlas/Atlas.java b/engine/src/main/java/org/terasology/rendering/assets/atlas/Atlas.java
index d5f849933..b13d166c1 100644
--- a/engine/src/main/java/org/terasology/rendering/assets/atlas/Atlas.java
+++ b/engine/src/main/java/org/terasology/rendering/assets/atlas/Atlas.java
@@ -1,26 +1,13 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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 org.terasology.rendering.assets.atlas;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.rendering.assets.atlas;
import com.google.common.collect.Maps;
import org.terasology.assets.Asset;
import org.terasology.assets.AssetType;
import org.terasology.assets.ResourceUrn;
+import org.terasology.engine.rendering.assets.texture.subtexture.SubtextureData;
import org.terasology.naming.Name;
-import org.terasology.rendering.assets.texture.subtexture.SubtextureData;
import java.util.Map;
import java.util.Optional;
diff --git a/engine/src/main/java/org/terasology/rendering/assets/atlas/AtlasData.java b/engine/src/main/java/org/terasology/rendering/assets/atlas/AtlasData.java
index f32a187a8..bcfb43940 100644
--- a/engine/src/main/java/org/terasology/rendering/assets/atlas/AtlasData.java
+++ b/engine/src/main/java/org/terasology/rendering/assets/atlas/AtlasData.java
@@ -1,23 +1,10 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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 org.terasology.rendering.assets.atlas;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.rendering.assets.atlas;
import org.terasology.assets.AssetData;
+import org.terasology.engine.rendering.assets.texture.subtexture.SubtextureData;
import org.terasology.naming.Name;
-import org.terasology.rendering.assets.texture.subtexture.SubtextureData;
import java.util.Map;
diff --git a/engine/src/main/java/org/terasology/rendering/assets/atlas/AtlasDefinition.java b/engine/src/main/java/org/terasology/rendering/assets/atlas/AtlasDefinition.java
index 4f6f0afac..1ca496060 100644
--- a/engine/src/main/java/org/terasology/rendering/assets/atlas/AtlasDefinition.java
+++ b/engine/src/main/java/org/terasology/rendering/assets/atlas/AtlasDefinition.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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 org.terasology.rendering.assets.atlas;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.rendering.assets.atlas;
import org.joml.Vector2i;
diff --git a/engine/src/main/java/org/terasology/rendering/assets/atlas/AtlasFormat.java b/engine/src/main/java/org/terasology/rendering/assets/atlas/AtlasFormat.java
index e876060e4..1d9f0ab90 100644
--- a/engine/src/main/java/org/terasology/rendering/assets/atlas/AtlasFormat.java
+++ b/engine/src/main/java/org/terasology/rendering/assets/atlas/AtlasFormat.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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 org.terasology.rendering.assets.atlas;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.rendering.assets.atlas;
import com.google.common.base.Charsets;
import com.google.common.collect.Maps;
@@ -29,11 +16,11 @@ import org.terasology.assets.format.AbstractAssetFileFormat;
import org.terasology.assets.format.AssetDataFile;
import org.terasology.assets.management.AssetManager;
import org.terasology.assets.module.annotations.RegisterAssetFileFormat;
+import org.terasology.engine.rendering.assets.texture.Texture;
+import org.terasology.engine.rendering.assets.texture.subtexture.SubtextureData;
import org.terasology.joml.geom.Rectanglef;
import org.terasology.naming.Name;
-import org.terasology.rendering.assets.texture.Texture;
-import org.terasology.rendering.assets.texture.subtexture.SubtextureData;
-import org.terasology.utilities.gson.Vector2iTypeAdapter;
+import org.terasology.engine.utilities.gson.Vector2iTypeAdapter;
import java.io.IOException;
import java.io.InputStreamReader;
diff --git a/engine/src/main/java/org/terasology/rendering/assets/atlas/FreeformDefinition.java b/engine/src/main/java/org/terasology/rendering/assets/atlas/FreeformDefinition.java
index b17d3af04..3db6d0a14 100644
--- a/engine/src/main/java/org/terasology/rendering/assets/atlas/FreeformDefinition.java
+++ b/engine/src/main/java/org/terasology/rendering/assets/atlas/FreeformDefinition.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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 org.terasology.rendering.assets.atlas;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.rendering.assets.atlas;
import org.joml.Vector2i;
diff --git a/engine/src/main/java/org/terasology/rendering/assets/atlas/GridDefinition.java b/engine/src/main/java/org/terasology/rendering/assets/atlas/GridDefinition.java
index 6c52f589b..0ac72a25c 100644
--- a/engine/src/main/java/org/terasology/rendering/assets/atlas/GridDefinition.java
+++ b/engine/src/main/java/org/terasology/rendering/assets/atlas/GridDefinition.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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 org.terasology.rendering.assets.atlas;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.rendering.assets.atlas;
import org.joml.Vector2i;
diff --git a/engine/src/main/java/org/terasology/rendering/assets/font/Font.java b/engine/src/main/java/org/terasology/rendering/assets/font/Font.java
index aef30a589..40659df87 100644
--- a/engine/src/main/java/org/terasology/rendering/assets/font/Font.java
+++ b/engine/src/main/java/org/terasology/rendering/assets/font/Font.java
@@ -1,20 +1,7 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.rendering.assets.font;
+package org.terasology.engine.rendering.assets.font;
import org.joml.Vector2i;
import org.terasology.assets.Asset;
diff --git a/engine/src/main/java/org/terasology/rendering/assets/font/FontCharacter.java b/engine/src/main/java/org/terasology/rendering/assets/font/FontCharacter.java
index e1a9e99c5..60ad26bd0 100644
--- a/engine/src/main/java/org/terasology/rendering/assets/font/FontCharacter.java
+++ b/engine/src/main/java/org/terasology/rendering/assets/font/FontCharacter.java
@@ -1,23 +1,10 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.rendering.assets.font;
+package org.terasology.engine.rendering.assets.font;
-import org.terasology.rendering.assets.material.Material;
-import org.terasology.rendering.assets.texture.Texture;
+import org.terasology.engine.rendering.assets.material.Material;
+import org.terasology.engine.rendering.assets.texture.Texture;
/**
*/
diff --git a/engine/src/main/java/org/terasology/rendering/assets/font/FontData.java b/engine/src/main/java/org/terasology/rendering/assets/font/FontData.java
index 09b4893f3..2621cfb07 100644
--- a/engine/src/main/java/org/terasology/rendering/assets/font/FontData.java
+++ b/engine/src/main/java/org/terasology/rendering/assets/font/FontData.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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 org.terasology.rendering.assets.font;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.rendering.assets.font;
import com.google.common.collect.ImmutableMap;
import org.terasology.assets.AssetData;
diff --git a/engine/src/main/java/org/terasology/rendering/assets/font/FontDataBuilder.java b/engine/src/main/java/org/terasology/rendering/assets/font/FontDataBuilder.java
index ff6bd4e1e..efd564057 100644
--- a/engine/src/main/java/org/terasology/rendering/assets/font/FontDataBuilder.java
+++ b/engine/src/main/java/org/terasology/rendering/assets/font/FontDataBuilder.java
@@ -1,25 +1,12 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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 org.terasology.rendering.assets.font;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.rendering.assets.font;
import com.google.common.collect.Maps;
import gnu.trove.map.TIntObjectMap;
import gnu.trove.map.hash.TIntObjectHashMap;
-import org.terasology.rendering.assets.material.Material;
-import org.terasology.rendering.assets.texture.Texture;
+import org.terasology.engine.rendering.assets.material.Material;
+import org.terasology.engine.rendering.assets.texture.Texture;
import java.util.Map;
diff --git a/engine/src/main/java/org/terasology/rendering/assets/font/FontFormat.java b/engine/src/main/java/org/terasology/rendering/assets/font/FontFormat.java
index 3d2034201..ecbd4f514 100644
--- a/engine/src/main/java/org/terasology/rendering/assets/font/FontFormat.java
+++ b/engine/src/main/java/org/terasology/rendering/assets/font/FontFormat.java
@@ -1,20 +1,7 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.rendering.assets.font;
+package org.terasology.engine.rendering.assets.font;
import com.google.common.base.Charsets;
import org.terasology.assets.ResourceUrn;
@@ -22,9 +9,9 @@ import org.terasology.assets.format.AbstractAssetFileFormat;
import org.terasology.assets.format.AssetDataFile;
import org.terasology.assets.management.AssetManager;
import org.terasology.assets.module.annotations.RegisterAssetFileFormat;
+import org.terasology.engine.rendering.assets.material.Material;
+import org.terasology.engine.rendering.assets.texture.Texture;
import org.terasology.naming.Name;
-import org.terasology.rendering.assets.material.Material;
-import org.terasology.rendering.assets.texture.Texture;
import java.io.BufferedReader;
import java.io.IOException;
diff --git a/engine/src/main/java/org/terasology/rendering/assets/font/FontImpl.java b/engine/src/main/java/org/terasology/rendering/assets/font/FontImpl.java
index 9fca91251..f75cea638 100644
--- a/engine/src/main/java/org/terasology/rendering/assets/font/FontImpl.java
+++ b/engine/src/main/java/org/terasology/rendering/assets/font/FontImpl.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2014 MovingBlocks
- *
- * 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 org.terasology.rendering.assets.font;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.rendering.assets.font;
import org.joml.Vector2i;
import org.terasology.assets.AssetType;
diff --git a/engine/src/main/java/org/terasology/rendering/assets/font/FontMaterialProducer.java b/engine/src/main/java/org/terasology/rendering/assets/font/FontMaterialProducer.java
index 683a5ed73..97448f7f3 100644
--- a/engine/src/main/java/org/terasology/rendering/assets/font/FontMaterialProducer.java
+++ b/engine/src/main/java/org/terasology/rendering/assets/font/FontMaterialProducer.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2015 MovingBlocks
- *
- * 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 org.terasology.rendering.assets.font;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.rendering.assets.font;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -21,10 +8,10 @@ import org.terasology.assets.AssetDataProducer;
import org.terasology.assets.ResourceUrn;
import org.terasology.assets.management.AssetManager;
import org.terasology.assets.module.annotations.RegisterAssetDataProducer;
+import org.terasology.engine.rendering.assets.material.MaterialData;
+import org.terasology.engine.rendering.assets.shader.Shader;
+import org.terasology.engine.rendering.assets.texture.Texture;
import org.terasology.naming.Name;
-import org.terasology.rendering.assets.material.MaterialData;
-import org.terasology.rendering.assets.shader.Shader;
-import org.terasology.rendering.assets.texture.Texture;
import java.io.IOException;
import java.util.Collections;
diff --git a/engine/src/main/java/org/terasology/rendering/assets/font/FontMeshBuilder.java b/engine/src/main/java/org/terasology/rendering/assets/font/FontMeshBuilder.java
index ead6eed4e..47d10c368 100644
--- a/engine/src/main/java/org/terasology/rendering/assets/font/FontMeshBuilder.java
+++ b/engine/src/main/java/org/terasology/rendering/assets/font/FontMeshBuilder.java
@@ -1,16 +1,16 @@
// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.rendering.assets.font;
+package org.terasology.engine.rendering.assets.font;
import com.google.common.collect.Maps;
import org.joml.Vector3f;
+import org.terasology.engine.rendering.assets.material.Material;
+import org.terasology.engine.rendering.assets.mesh.MeshBuilder;
import org.terasology.nui.Colorc;
import org.terasology.nui.FontColor;
import org.terasology.nui.FontUnderline;
import org.terasology.nui.HorizontalAlign;
-import org.terasology.rendering.assets.material.Material;
-import org.terasology.rendering.assets.mesh.Mesh;
-import org.terasology.rendering.assets.mesh.MeshBuilder;
+import org.terasology.engine.rendering.assets.mesh.Mesh;
import java.util.ArrayDeque;
import java.util.Deque;
diff --git a/engine/src/main/java/org/terasology/rendering/assets/font/package-info.java b/engine/src/main/java/org/terasology/rendering/assets/font/package-info.java
index de9320fe5..9136f398f 100644
--- a/engine/src/main/java/org/terasology/rendering/assets/font/package-info.java
+++ b/engine/src/main/java/org/terasology/rendering/assets/font/package-info.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-@API package org.terasology.rendering.assets.font;
+@API package org.terasology.engine.rendering.assets.font;
import org.terasology.module.sandbox.API;
diff --git a/engine/src/main/java/org/terasology/rendering/assets/material/BaseMaterial.java b/engine/src/main/java/org/terasology/rendering/assets/material/BaseMaterial.java
index 918ca68b1..955f6c602 100644
--- a/engine/src/main/java/org/terasology/rendering/assets/material/BaseMaterial.java
+++ b/engine/src/main/java/org/terasology/rendering/assets/material/BaseMaterial.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2014 MovingBlocks
- *
- * 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 org.terasology.rendering.assets.material;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.rendering.assets.material;
import org.joml.Matrix3fc;
import org.joml.Matrix4fc;
@@ -22,9 +9,9 @@ import org.joml.Vector3fc;
import org.joml.Vector4fc;
import org.terasology.assets.AssetType;
import org.terasology.assets.ResourceUrn;
-import org.terasology.rendering.assets.shader.ShaderProgramFeature;
-import org.terasology.rendering.assets.texture.Texture;
-import org.terasology.rendering.cameras.Camera;
+import org.terasology.engine.rendering.assets.shader.ShaderProgramFeature;
+import org.terasology.engine.rendering.assets.texture.Texture;
+import org.terasology.engine.rendering.cameras.Camera;
import java.nio.FloatBuffer;
diff --git a/engine/src/main/java/org/terasology/rendering/assets/material/Material.java b/engine/src/main/java/org/terasology/rendering/assets/material/Material.java
index 47336c7ff..a049a233c 100644
--- a/engine/src/main/java/org/terasology/rendering/assets/material/Material.java
+++ b/engine/src/main/java/org/terasology/rendering/assets/material/Material.java
@@ -1,20 +1,7 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.rendering.assets.material;
+package org.terasology.engine.rendering.assets.material;
import org.joml.Matrix3fc;
import org.joml.Matrix4fc;
@@ -24,9 +11,9 @@ import org.joml.Vector4fc;
import org.terasology.assets.Asset;
import org.terasology.assets.AssetType;
import org.terasology.assets.ResourceUrn;
-import org.terasology.rendering.assets.shader.ShaderProgramFeature;
-import org.terasology.rendering.assets.texture.Texture;
-import org.terasology.rendering.cameras.Camera;
+import org.terasology.engine.rendering.assets.shader.ShaderProgramFeature;
+import org.terasology.engine.rendering.assets.texture.Texture;
+import org.terasology.engine.rendering.cameras.Camera;
import java.nio.FloatBuffer;
diff --git a/engine/src/main/java/org/terasology/rendering/assets/material/MaterialData.java b/engine/src/main/java/org/terasology/rendering/assets/material/MaterialData.java
index f491863ba..6436a473f 100644
--- a/engine/src/main/java/org/terasology/rendering/assets/material/MaterialData.java
+++ b/engine/src/main/java/org/terasology/rendering/assets/material/MaterialData.java
@@ -1,24 +1,11 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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 org.terasology.rendering.assets.material;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.rendering.assets.material;
import com.google.common.collect.Maps;
import org.terasology.assets.AssetData;
-import org.terasology.rendering.assets.shader.Shader;
-import org.terasology.rendering.assets.texture.Texture;
+import org.terasology.engine.rendering.assets.shader.Shader;
+import org.terasology.engine.rendering.assets.texture.Texture;
import java.util.Map;
diff --git a/engine/src/main/java/org/terasology/rendering/assets/material/MaterialFormat.java b/engine/src/main/java/org/terasology/rendering/assets/material/MaterialFormat.java
index dd3937d5f..2f772bcc0 100644
--- a/engine/src/main/java/org/terasology/rendering/assets/material/MaterialFormat.java
+++ b/engine/src/main/java/org/terasology/rendering/assets/material/MaterialFormat.java
@@ -1,20 +1,7 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.rendering.assets.material;
+package org.terasology.engine.rendering.assets.material;
import com.google.common.base.Charsets;
import com.google.common.collect.Maps;
@@ -31,8 +18,8 @@ import org.terasology.assets.format.AbstractAssetFileFormat;
import org.terasology.assets.format.AssetDataFile;
import org.terasology.assets.management.AssetManager;
import org.terasology.assets.module.annotations.RegisterAssetFileFormat;
-import org.terasology.rendering.assets.shader.Shader;
-import org.terasology.rendering.assets.texture.Texture;
+import org.terasology.engine.rendering.assets.shader.Shader;
+import org.terasology.engine.rendering.assets.texture.Texture;
import java.io.IOException;
import java.io.InputStreamReader;
diff --git a/engine/src/main/java/org/terasology/rendering/assets/material/package-info.java b/engine/src/main/java/org/terasology/rendering/assets/material/package-info.java
index e4e1c2ec5..e2547f6f4 100644
--- a/engine/src/main/java/org/terasology/rendering/assets/material/package-info.java
+++ b/engine/src/main/java/org/terasology/rendering/assets/material/package-info.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-@API package org.terasology.rendering.assets.material;
+@API package org.terasology.engine.rendering.assets.material;
import org.terasology.module.sandbox.API;
diff --git a/engine/src/main/java/org/terasology/rendering/assets/mesh/Mesh.java b/engine/src/main/java/org/terasology/rendering/assets/mesh/Mesh.java
index 155ff6b22..1da044a95 100644
--- a/engine/src/main/java/org/terasology/rendering/assets/mesh/Mesh.java
+++ b/engine/src/main/java/org/terasology/rendering/assets/mesh/Mesh.java
@@ -1,6 +1,6 @@
// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.rendering.assets.mesh;
+package org.terasology.engine.rendering.assets.mesh;
import gnu.trove.list.TFloatList;
import org.terasology.assets.Asset;
diff --git a/engine/src/main/java/org/terasology/rendering/assets/mesh/MeshBuilder.java b/engine/src/main/java/org/terasology/rendering/assets/mesh/MeshBuilder.java
index 2848ff66d..ba0f68886 100644
--- a/engine/src/main/java/org/terasology/rendering/assets/mesh/MeshBuilder.java
+++ b/engine/src/main/java/org/terasology/rendering/assets/mesh/MeshBuilder.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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 org.terasology.rendering.assets.mesh;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.rendering.assets.mesh;
import org.joml.Vector2fc;
import org.joml.Vector3f;
@@ -21,7 +8,7 @@ import org.joml.Vector3fc;
import org.terasology.assets.ResourceUrn;
import org.terasology.module.sandbox.API;
import org.terasology.nui.Colorc;
-import org.terasology.utilities.Assets;
+import org.terasology.engine.utilities.Assets;
public class MeshBuilder {
private static final float[] VERTICES = {
diff --git a/engine/src/main/java/org/terasology/rendering/assets/mesh/MeshData.java b/engine/src/main/java/org/terasology/rendering/assets/mesh/MeshData.java
index a30d8a674..c27173940 100644
--- a/engine/src/main/java/org/terasology/rendering/assets/mesh/MeshData.java
+++ b/engine/src/main/java/org/terasology/rendering/assets/mesh/MeshData.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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 org.terasology.rendering.assets.mesh;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.rendering.assets.mesh;
import gnu.trove.list.TFloatList;
import gnu.trove.list.TIntList;
diff --git a/engine/src/main/java/org/terasology/rendering/assets/mesh/ObjMeshFormat.java b/engine/src/main/java/org/terasology/rendering/assets/mesh/ObjMeshFormat.java
index 37053f466..b152e3f7e 100644
--- a/engine/src/main/java/org/terasology/rendering/assets/mesh/ObjMeshFormat.java
+++ b/engine/src/main/java/org/terasology/rendering/assets/mesh/ObjMeshFormat.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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 org.terasology.rendering.assets.mesh;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.rendering.assets.mesh;
import com.google.common.collect.Lists;
import gnu.trove.list.TFloatList;
diff --git a/engine/src/main/java/org/terasology/rendering/assets/mesh/package-info.java b/engine/src/main/java/org/terasology/rendering/assets/mesh/package-info.java
index 7fc088f12..0d1368c10 100644
--- a/engine/src/main/java/org/terasology/rendering/assets/mesh/package-info.java
+++ b/engine/src/main/java/org/terasology/rendering/assets/mesh/package-info.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-@API package org.terasology.rendering.assets.mesh;
+@API package org.terasology.engine.rendering.assets.mesh;
import org.terasology.module.sandbox.API;
diff --git a/engine/src/main/java/org/terasology/rendering/assets/shader/GLSLShaderFormat.java b/engine/src/main/java/org/terasology/rendering/assets/shader/GLSLShaderFormat.java
index c43d04450..487e055c3 100644
--- a/engine/src/main/java/org/terasology/rendering/assets/shader/GLSLShaderFormat.java
+++ b/engine/src/main/java/org/terasology/rendering/assets/shader/GLSLShaderFormat.java
@@ -1,20 +1,7 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.rendering.assets.shader;
+package org.terasology.engine.rendering.assets.shader;
import com.google.common.base.Charsets;
import com.google.common.io.CharStreams;
diff --git a/engine/src/main/java/org/terasology/rendering/assets/shader/ParamType.java b/engine/src/main/java/org/terasology/rendering/assets/shader/ParamType.java
index 82c023604..d5b2973cd 100644
--- a/engine/src/main/java/org/terasology/rendering/assets/shader/ParamType.java
+++ b/engine/src/main/java/org/terasology/rendering/assets/shader/ParamType.java
@@ -1,20 +1,7 @@
-/*
- * Copyright 2016 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.rendering.assets.shader;
+package org.terasology.engine.rendering.assets.shader;
/**
* TODO: write javadoc
diff --git a/engine/src/main/java/org/terasology/rendering/assets/shader/Shader.java b/engine/src/main/java/org/terasology/rendering/assets/shader/Shader.java
index 572897f62..3ebb850d2 100644
--- a/engine/src/main/java/org/terasology/rendering/assets/shader/Shader.java
+++ b/engine/src/main/java/org/terasology/rendering/assets/shader/Shader.java
@@ -1,20 +1,7 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.rendering.assets.shader;
+package org.terasology.engine.rendering.assets.shader;
import org.terasology.assets.Asset;
import org.terasology.assets.AssetType;
diff --git a/engine/src/main/java/org/terasology/rendering/assets/shader/ShaderData.java b/engine/src/main/java/org/terasology/rendering/assets/shader/ShaderData.java
index 040d973b9..e233009fd 100644
--- a/engine/src/main/java/org/terasology/rendering/assets/shader/ShaderData.java
+++ b/engine/src/main/java/org/terasology/rendering/assets/shader/ShaderData.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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 org.terasology.rendering.assets.shader;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.rendering.assets.shader;
import com.google.common.collect.ImmutableList;
import org.terasology.assets.AssetData;
diff --git a/engine/src/main/java/org/terasology/rendering/assets/shader/ShaderMetadata.java b/engine/src/main/java/org/terasology/rendering/assets/shader/ShaderMetadata.java
index f56d729e8..6e827b7a1 100644
--- a/engine/src/main/java/org/terasology/rendering/assets/shader/ShaderMetadata.java
+++ b/engine/src/main/java/org/terasology/rendering/assets/shader/ShaderMetadata.java
@@ -1,20 +1,7 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.rendering.assets.shader;
+package org.terasology.engine.rendering.assets.shader;
import com.google.common.collect.Lists;
diff --git a/engine/src/main/java/org/terasology/rendering/assets/shader/ShaderParameterMetadata.java b/engine/src/main/java/org/terasology/rendering/assets/shader/ShaderParameterMetadata.java
index ee082f20b..05fd5492a 100644
--- a/engine/src/main/java/org/terasology/rendering/assets/shader/ShaderParameterMetadata.java
+++ b/engine/src/main/java/org/terasology/rendering/assets/shader/ShaderParameterMetadata.java
@@ -1,20 +1,7 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.rendering.assets.shader;
+package org.terasology.engine.rendering.assets.shader;
/**
*/
diff --git a/engine/src/main/java/org/terasology/rendering/assets/shader/ShaderProgramFeature.java b/engine/src/main/java/org/terasology/rendering/assets/shader/ShaderProgramFeature.java
index 4f0bc595b..bc51861c7 100644
--- a/engine/src/main/java/org/terasology/rendering/assets/shader/ShaderProgramFeature.java
+++ b/engine/src/main/java/org/terasology/rendering/assets/shader/ShaderProgramFeature.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2016 MovingBlocks
- *
- * 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 org.terasology.rendering.assets.shader;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.rendering.assets.shader;
import java.util.Collection;
diff --git a/engine/src/main/java/org/terasology/rendering/assets/shader/package-info.java b/engine/src/main/java/org/terasology/rendering/assets/shader/package-info.java
index f3a389535..58e42f2ec 100644
--- a/engine/src/main/java/org/terasology/rendering/assets/shader/package-info.java
+++ b/engine/src/main/java/org/terasology/rendering/assets/shader/package-info.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-@API package org.terasology.rendering.assets.shader;
+@API package org.terasology.engine.rendering.assets.shader;
import org.terasology.module.sandbox.API;
diff --git a/engine/src/main/java/org/terasology/rendering/assets/skeletalmesh/Bone.java b/engine/src/main/java/org/terasology/rendering/assets/skeletalmesh/Bone.java
index d1fb4b39f..d90e7c014 100644
--- a/engine/src/main/java/org/terasology/rendering/assets/skeletalmesh/Bone.java
+++ b/engine/src/main/java/org/terasology/rendering/assets/skeletalmesh/Bone.java
@@ -1,20 +1,7 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.rendering.assets.skeletalmesh;
+package org.terasology.engine.rendering.assets.skeletalmesh;
import com.google.common.collect.Lists;
import org.joml.Matrix4f;
diff --git a/engine/src/main/java/org/terasology/rendering/assets/skeletalmesh/BoneWeight.java b/engine/src/main/java/org/terasology/rendering/assets/skeletalmesh/BoneWeight.java
index 27be401a4..17ae4fe11 100644
--- a/engine/src/main/java/org/terasology/rendering/assets/skeletalmesh/BoneWeight.java
+++ b/engine/src/main/java/org/terasology/rendering/assets/skeletalmesh/BoneWeight.java
@@ -1,20 +1,7 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.rendering.assets.skeletalmesh;
+package org.terasology.engine.rendering.assets.skeletalmesh;
import com.google.common.base.Preconditions;
import gnu.trove.list.TFloatList;
diff --git a/engine/src/main/java/org/terasology/rendering/assets/skeletalmesh/SkeletalMesh.java b/engine/src/main/java/org/terasology/rendering/assets/skeletalmesh/SkeletalMesh.java
index af2e65e95..631893ad6 100644
--- a/engine/src/main/java/org/terasology/rendering/assets/skeletalmesh/SkeletalMesh.java
+++ b/engine/src/main/java/org/terasology/rendering/assets/skeletalmesh/SkeletalMesh.java
@@ -1,20 +1,7 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.rendering.assets.skeletalmesh;
+package org.terasology.engine.rendering.assets.skeletalmesh;
import org.terasology.assets.Asset;
import org.terasology.assets.AssetType;
diff --git a/engine/src/main/java/org/terasology/rendering/assets/skeletalmesh/SkeletalMeshData.java b/engine/src/main/java/org/terasology/rendering/assets/skeletalmesh/SkeletalMeshData.java
index a6e1c9b5e..04f8404f2 100644
--- a/engine/src/main/java/org/terasology/rendering/assets/skeletalmesh/SkeletalMeshData.java
+++ b/engine/src/main/java/org/terasology/rendering/assets/skeletalmesh/SkeletalMeshData.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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 org.terasology.rendering.assets.skeletalmesh;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.rendering.assets.skeletalmesh;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Lists;
diff --git a/engine/src/main/java/org/terasology/rendering/assets/skeletalmesh/SkeletalMeshDataBuilder.java b/engine/src/main/java/org/terasology/rendering/assets/skeletalmesh/SkeletalMeshDataBuilder.java
index f73787d8e..3014fa9da 100644
--- a/engine/src/main/java/org/terasology/rendering/assets/skeletalmesh/SkeletalMeshDataBuilder.java
+++ b/engine/src/main/java/org/terasology/rendering/assets/skeletalmesh/SkeletalMeshDataBuilder.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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 org.terasology.rendering.assets.skeletalmesh;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.rendering.assets.skeletalmesh;
import gnu.trove.list.TFloatList;
import gnu.trove.list.TIntList;
@@ -21,8 +8,8 @@ import gnu.trove.list.array.TIntArrayList;
import org.joml.Vector2f;
import org.joml.Vector3f;
import org.terasology.joml.geom.AABBf;
-import org.terasology.rendering.assets.mesh.MeshBuilder;
-import org.terasology.rendering.assets.mesh.MeshData;
+import org.terasology.engine.rendering.assets.mesh.MeshBuilder;
+import org.terasology.engine.rendering.assets.mesh.MeshData;
import java.util.ArrayList;
import java.util.List;
diff --git a/engine/src/main/java/org/terasology/rendering/assets/skeletalmesh/package-info.java b/engine/src/main/java/org/terasology/rendering/assets/skeletalmesh/package-info.java
index 31c86461e..3daa39f95 100644
--- a/engine/src/main/java/org/terasology/rendering/assets/skeletalmesh/package-info.java
+++ b/engine/src/main/java/org/terasology/rendering/assets/skeletalmesh/package-info.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-@API package org.terasology.rendering.assets.skeletalmesh;
+@API package org.terasology.engine.rendering.assets.skeletalmesh;
import org.terasology.module.sandbox.API;
diff --git a/engine/src/main/java/org/terasology/rendering/assets/texture/AWTTextureFormat.java b/engine/src/main/java/org/terasology/rendering/assets/texture/AWTTextureFormat.java
index 0e4528f40..cdab06751 100644
--- a/engine/src/main/java/org/terasology/rendering/assets/texture/AWTTextureFormat.java
+++ b/engine/src/main/java/org/terasology/rendering/assets/texture/AWTTextureFormat.java
@@ -1,7 +1,7 @@
// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.rendering.assets.texture;
+package org.terasology.engine.rendering.assets.texture;
import org.terasology.assets.ResourceUrn;
import org.terasology.assets.format.AbstractAssetFileFormat;
diff --git a/engine/src/main/java/org/terasology/rendering/assets/texture/BasicTextureRegion.java b/engine/src/main/java/org/terasology/rendering/assets/texture/BasicTextureRegion.java
index bd4bf7187..1b7e792f2 100644
--- a/engine/src/main/java/org/terasology/rendering/assets/texture/BasicTextureRegion.java
+++ b/engine/src/main/java/org/terasology/rendering/assets/texture/BasicTextureRegion.java
@@ -1,6 +1,6 @@
// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.rendering.assets.texture;
+package org.terasology.engine.rendering.assets.texture;
import org.joml.RoundingMode;
import org.joml.Vector2fc;
diff --git a/engine/src/main/java/org/terasology/rendering/assets/texture/ColorTextureProducer.java b/engine/src/main/java/org/terasology/rendering/assets/texture/ColorTextureProducer.java
index 7f064fb99..902af8c06 100644
--- a/engine/src/main/java/org/terasology/rendering/assets/texture/ColorTextureProducer.java
+++ b/engine/src/main/java/org/terasology/rendering/assets/texture/ColorTextureProducer.java
@@ -1,26 +1,13 @@
-/*
- * Copyright 2014 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.rendering.assets.texture;
+package org.terasology.engine.rendering.assets.texture;
import com.google.common.collect.ImmutableSet;
import org.terasology.assets.AssetDataProducer;
import org.terasology.assets.ResourceUrn;
import org.terasology.assets.module.annotations.RegisterAssetDataProducer;
-import org.terasology.engine.TerasologyConstants;
+import org.terasology.engine.core.TerasologyConstants;
import org.terasology.naming.Name;
import org.terasology.nui.Color;
diff --git a/engine/src/main/java/org/terasology/rendering/assets/texture/NoiseTextureProducer.java b/engine/src/main/java/org/terasology/rendering/assets/texture/NoiseTextureProducer.java
index 26c5bbdec..64784ab96 100644
--- a/engine/src/main/java/org/terasology/rendering/assets/texture/NoiseTextureProducer.java
+++ b/engine/src/main/java/org/terasology/rendering/assets/texture/NoiseTextureProducer.java
@@ -1,26 +1,13 @@
-/*
- * Copyright 2014 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.rendering.assets.texture;
+package org.terasology.engine.rendering.assets.texture;
import com.google.common.collect.ImmutableSet;
import org.terasology.assets.AssetDataProducer;
import org.terasology.assets.ResourceUrn;
import org.terasology.assets.module.annotations.RegisterAssetDataProducer;
-import org.terasology.engine.TerasologyConstants;
+import org.terasology.engine.core.TerasologyConstants;
import org.terasology.naming.Name;
import java.io.IOException;
diff --git a/engine/src/main/java/org/terasology/rendering/assets/texture/PNGTextureFormat.java b/engine/src/main/java/org/terasology/rendering/assets/texture/PNGTextureFormat.java
index 509ff6ba5..ed33f652b 100644
--- a/engine/src/main/java/org/terasology/rendering/assets/texture/PNGTextureFormat.java
+++ b/engine/src/main/java/org/terasology/rendering/assets/texture/PNGTextureFormat.java
@@ -1,20 +1,7 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.rendering.assets.texture;
+package org.terasology.engine.rendering.assets.texture;
import de.matthiasmann.twl.utils.PNGDecoder;
import org.terasology.assets.ResourceUrn;
diff --git a/engine/src/main/java/org/terasology/rendering/assets/texture/Texture.java b/engine/src/main/java/org/terasology/rendering/assets/texture/Texture.java
index 3a5213f9f..6bc58551d 100644
--- a/engine/src/main/java/org/terasology/rendering/assets/texture/Texture.java
+++ b/engine/src/main/java/org/terasology/rendering/assets/texture/Texture.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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 org.terasology.rendering.assets.texture;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.rendering.assets.texture;
import org.terasology.assets.AssetType;
import org.terasology.assets.ResourceUrn;
diff --git a/engine/src/main/java/org/terasology/rendering/assets/texture/TextureData.java b/engine/src/main/java/org/terasology/rendering/assets/texture/TextureData.java
index 4cedffa30..7174b2911 100644
--- a/engine/src/main/java/org/terasology/rendering/assets/texture/TextureData.java
+++ b/engine/src/main/java/org/terasology/rendering/assets/texture/TextureData.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2014 MovingBlocks
- *
- * 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 org.terasology.rendering.assets.texture;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.rendering.assets.texture;
import com.google.common.math.IntMath;
import org.terasology.assets.AssetData;
diff --git a/engine/src/main/java/org/terasology/rendering/assets/texture/TextureDataFactory.java b/engine/src/main/java/org/terasology/rendering/assets/texture/TextureDataFactory.java
index 1ec9585ce..e240f7720 100644
--- a/engine/src/main/java/org/terasology/rendering/assets/texture/TextureDataFactory.java
+++ b/engine/src/main/java/org/terasology/rendering/assets/texture/TextureDataFactory.java
@@ -1,14 +1,14 @@
// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.rendering.assets.texture;
+package org.terasology.engine.rendering.assets.texture;
import org.terasology.math.TeraMath;
import org.terasology.nui.Color;
-import org.terasology.rendering.assets.texture.Texture.FilterMode;
-import org.terasology.rendering.assets.texture.Texture.WrapMode;
-import org.terasology.utilities.random.FastRandom;
-import org.terasology.utilities.random.Random;
+import org.terasology.engine.rendering.assets.texture.Texture.FilterMode;
+import org.terasology.engine.rendering.assets.texture.Texture.WrapMode;
+import org.terasology.engine.utilities.random.FastRandom;
+import org.terasology.engine.utilities.random.Random;
import java.nio.ByteBuffer;
diff --git a/engine/src/main/java/org/terasology/rendering/assets/texture/TextureInfoFormat.java b/engine/src/main/java/org/terasology/rendering/assets/texture/TextureInfoFormat.java
index 5c707dc44..5aa3f3d28 100644
--- a/engine/src/main/java/org/terasology/rendering/assets/texture/TextureInfoFormat.java
+++ b/engine/src/main/java/org/terasology/rendering/assets/texture/TextureInfoFormat.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2015 MovingBlocks
- *
- * 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 org.terasology.rendering.assets.texture;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.rendering.assets.texture;
import com.google.common.base.Charsets;
import com.google.gson.Gson;
@@ -21,7 +8,7 @@ import com.google.gson.GsonBuilder;
import org.terasology.assets.format.AbstractAssetAlterationFileFormat;
import org.terasology.assets.format.AssetDataFile;
import org.terasology.assets.module.annotations.RegisterAssetSupplementalFileFormat;
-import org.terasology.utilities.gson.CaseInsensitiveEnumTypeAdapterFactory;
+import org.terasology.engine.utilities.gson.CaseInsensitiveEnumTypeAdapterFactory;
import java.io.IOException;
import java.io.InputStreamReader;
diff --git a/engine/src/main/java/org/terasology/rendering/assets/texture/TextureRegion.java b/engine/src/main/java/org/terasology/rendering/assets/texture/TextureRegion.java
index f123404c0..9ca4777d0 100644
--- a/engine/src/main/java/org/terasology/rendering/assets/texture/TextureRegion.java
+++ b/engine/src/main/java/org/terasology/rendering/assets/texture/TextureRegion.java
@@ -1,6 +1,6 @@
// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.rendering.assets.texture;
+package org.terasology.engine.rendering.assets.texture;
import org.joml.Vector2i;
import org.terasology.joml.geom.Rectanglef;
diff --git a/engine/src/main/java/org/terasology/rendering/assets/texture/TextureRegionAsset.java b/engine/src/main/java/org/terasology/rendering/assets/texture/TextureRegionAsset.java
index d5dc23fb0..b6416b952 100644
--- a/engine/src/main/java/org/terasology/rendering/assets/texture/TextureRegionAsset.java
+++ b/engine/src/main/java/org/terasology/rendering/assets/texture/TextureRegionAsset.java
@@ -1,6 +1,6 @@
// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.rendering.assets.texture;
+package org.terasology.engine.rendering.assets.texture;
import org.terasology.assets.Asset;
import org.terasology.assets.AssetData;
diff --git a/engine/src/main/java/org/terasology/rendering/assets/texture/TextureUtil.java b/engine/src/main/java/org/terasology/rendering/assets/texture/TextureUtil.java
index 133fc0970..c9a718c23 100644
--- a/engine/src/main/java/org/terasology/rendering/assets/texture/TextureUtil.java
+++ b/engine/src/main/java/org/terasology/rendering/assets/texture/TextureUtil.java
@@ -1,11 +1,11 @@
// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.rendering.assets.texture;
+package org.terasology.engine.rendering.assets.texture;
import com.google.common.primitives.UnsignedBytes;
import org.terasology.assets.ResourceUrn;
-import org.terasology.engine.TerasologyConstants;
+import org.terasology.engine.core.TerasologyConstants;
import org.terasology.joml.geom.Rectanglei;
import org.terasology.naming.Name;
import org.terasology.nui.Color;
diff --git a/engine/src/main/java/org/terasology/rendering/assets/texture/package-info.java b/engine/src/main/java/org/terasology/rendering/assets/texture/package-info.java
index 44e6689e8..43e75e0bc 100644
--- a/engine/src/main/java/org/terasology/rendering/assets/texture/package-info.java
+++ b/engine/src/main/java/org/terasology/rendering/assets/texture/package-info.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-@API package org.terasology.rendering.assets.texture;
+@API package org.terasology.engine.rendering.assets.texture;
import org.terasology.module.sandbox.API;
diff --git a/engine/src/main/java/org/terasology/rendering/assets/texture/subtexture/Subtexture.java b/engine/src/main/java/org/terasology/rendering/assets/texture/subtexture/Subtexture.java
index 338f6c973..2de60c119 100644
--- a/engine/src/main/java/org/terasology/rendering/assets/texture/subtexture/Subtexture.java
+++ b/engine/src/main/java/org/terasology/rendering/assets/texture/subtexture/Subtexture.java
@@ -1,6 +1,6 @@
// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.rendering.assets.texture.subtexture;
+package org.terasology.engine.rendering.assets.texture.subtexture;
import org.joml.Vector2i;
import org.terasology.assets.Asset;
@@ -9,8 +9,8 @@ import org.terasology.assets.ResourceUrn;
import org.terasology.joml.geom.Rectanglef;
import org.terasology.joml.geom.Rectanglei;
import org.terasology.math.TeraMath;
-import org.terasology.rendering.assets.texture.Texture;
-import org.terasology.rendering.assets.texture.TextureRegionAsset;
+import org.terasology.engine.rendering.assets.texture.Texture;
+import org.terasology.engine.rendering.assets.texture.TextureRegionAsset;
import java.util.Optional;
diff --git a/engine/src/main/java/org/terasology/rendering/assets/texture/subtexture/SubtextureData.java b/engine/src/main/java/org/terasology/rendering/assets/texture/subtexture/SubtextureData.java
index e1b3ffe17..aac3c8500 100644
--- a/engine/src/main/java/org/terasology/rendering/assets/texture/subtexture/SubtextureData.java
+++ b/engine/src/main/java/org/terasology/rendering/assets/texture/subtexture/SubtextureData.java
@@ -1,23 +1,10 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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 org.terasology.rendering.assets.texture.subtexture;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.rendering.assets.texture.subtexture;
import org.terasology.assets.AssetData;
import org.terasology.joml.geom.Rectanglef;
-import org.terasology.rendering.assets.texture.Texture;
+import org.terasology.engine.rendering.assets.texture.Texture;
/**
*/
diff --git a/engine/src/main/java/org/terasology/rendering/assets/texture/subtexture/package-info.java b/engine/src/main/java/org/terasology/rendering/assets/texture/subtexture/package-info.java
index 219012a47..deae3bc5d 100644
--- a/engine/src/main/java/org/terasology/rendering/assets/texture/subtexture/package-info.java
+++ b/engine/src/main/java/org/terasology/rendering/assets/texture/subtexture/package-info.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2014 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-@API package org.terasology.rendering.assets.texture.subtexture;
+@API package org.terasology.engine.rendering.assets.texture.subtexture;
import org.terasology.module.sandbox.API;
diff --git a/engine/src/main/java/org/terasology/rendering/backdrop/BackdropProvider.java b/engine/src/main/java/org/terasology/rendering/backdrop/BackdropProvider.java
index 4f20f06a8..81f7a57e7 100644
--- a/engine/src/main/java/org/terasology/rendering/backdrop/BackdropProvider.java
+++ b/engine/src/main/java/org/terasology/rendering/backdrop/BackdropProvider.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2015 MovingBlocks
- *
- * 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 org.terasology.rendering.backdrop;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.rendering.backdrop;
import org.joml.Vector3f;
diff --git a/engine/src/main/java/org/terasology/rendering/backdrop/BackdropRenderer.java b/engine/src/main/java/org/terasology/rendering/backdrop/BackdropRenderer.java
index 8ae3c4960..35b6bd1eb 100644
--- a/engine/src/main/java/org/terasology/rendering/backdrop/BackdropRenderer.java
+++ b/engine/src/main/java/org/terasology/rendering/backdrop/BackdropRenderer.java
@@ -1,21 +1,8 @@
-/*
- * Copyright 2015 MovingBlocks
- *
- * 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 org.terasology.rendering.backdrop;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.rendering.backdrop;
-import org.terasology.rendering.cameras.Camera;
+import org.terasology.engine.rendering.cameras.Camera;
/**
* Implementations of this interface are responsible for rendering the backdrop of terasology's world,
diff --git a/engine/src/main/java/org/terasology/rendering/backdrop/Skysphere.java b/engine/src/main/java/org/terasology/rendering/backdrop/Skysphere.java
index bf063585c..7efbe0c42 100644
--- a/engine/src/main/java/org/terasology/rendering/backdrop/Skysphere.java
+++ b/engine/src/main/java/org/terasology/rendering/backdrop/Skysphere.java
@@ -1,17 +1,17 @@
// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.rendering.backdrop;
+package org.terasology.engine.rendering.backdrop;
import org.joml.Vector3f;
import org.lwjgl.opengl.GL11;
-import org.terasology.context.Context;
+import org.terasology.engine.context.Context;
+import org.terasology.engine.rendering.primitives.Sphere;
import org.terasology.math.TeraMath;
import org.terasology.nui.properties.Range;
-import org.terasology.rendering.assets.material.Material;
-import org.terasology.rendering.cameras.Camera;
-import org.terasology.rendering.primitives.Sphere;
-import org.terasology.utilities.Assets;
-import org.terasology.world.sun.CelestialSystem;
+import org.terasology.engine.rendering.assets.material.Material;
+import org.terasology.engine.rendering.cameras.Camera;
+import org.terasology.engine.utilities.Assets;
+import org.terasology.engine.world.sun.CelestialSystem;
import static org.lwjgl.opengl.GL11.GL_BACK;
import static org.lwjgl.opengl.GL11.GL_FRONT;
diff --git a/engine/src/main/java/org/terasology/rendering/backdrop/package-info.java b/engine/src/main/java/org/terasology/rendering/backdrop/package-info.java
index a45939d7d..31f1074b3 100644
--- a/engine/src/main/java/org/terasology/rendering/backdrop/package-info.java
+++ b/engine/src/main/java/org/terasology/rendering/backdrop/package-info.java
@@ -1,20 +1,7 @@
-/*
- * Copyright 2019 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
@API
-package org.terasology.rendering.backdrop;
+package org.terasology.engine.rendering.backdrop;
import org.terasology.module.sandbox.API;
diff --git a/engine/src/main/java/org/terasology/rendering/cameras/Camera.java b/engine/src/main/java/org/terasology/rendering/cameras/Camera.java
index 724d2ce37..4daadfd86 100644
--- a/engine/src/main/java/org/terasology/rendering/cameras/Camera.java
+++ b/engine/src/main/java/org/terasology/rendering/cameras/Camera.java
@@ -1,6 +1,6 @@
// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.rendering.cameras;
+package org.terasology.engine.rendering.cameras;
import org.joml.AxisAngle4f;
import org.joml.Matrix4f;
@@ -9,10 +9,10 @@ import org.joml.Quaternionfc;
import org.joml.Vector3f;
import org.joml.Vector3fc;
import org.lwjgl.BufferUtils;
-import org.terasology.config.Config;
+import org.terasology.engine.config.Config;
import org.terasology.joml.geom.AABBfc;
-import org.terasology.math.Direction;
-import org.terasology.registry.CoreRegistry;
+import org.terasology.engine.math.Direction;
+import org.terasology.engine.registry.CoreRegistry;
/**
* Camera base class.
diff --git a/engine/src/main/java/org/terasology/rendering/cameras/OpenVRStereoCamera.java b/engine/src/main/java/org/terasology/rendering/cameras/OpenVRStereoCamera.java
index 1ef8f7884..7ca551c0d 100644
--- a/engine/src/main/java/org/terasology/rendering/cameras/OpenVRStereoCamera.java
+++ b/engine/src/main/java/org/terasology/rendering/cameras/OpenVRStereoCamera.java
@@ -1,19 +1,19 @@
// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.rendering.cameras;
+package org.terasology.engine.rendering.cameras;
import org.joml.Matrix4f;
import org.joml.Quaternionf;
import org.joml.Vector4f;
import org.lwjgl.BufferUtils;
import org.lwjgl.opengl.GL11;
-import org.terasology.config.RenderingConfig;
-import org.terasology.registry.CoreRegistry;
-import org.terasology.rendering.openvrprovider.OpenVRProvider;
-import org.terasology.rendering.openvrprovider.OpenVRUtil;
-import org.terasology.rendering.world.WorldRenderer;
-import org.terasology.rendering.world.WorldRenderer.RenderingStage;
-import org.terasology.world.WorldProvider;
+import org.terasology.engine.config.RenderingConfig;
+import org.terasology.engine.registry.CoreRegistry;
+import org.terasology.engine.rendering.openvrprovider.OpenVRProvider;
+import org.terasology.engine.rendering.openvrprovider.OpenVRUtil;
+import org.terasology.engine.rendering.world.WorldRenderer;
+import org.terasology.engine.rendering.world.WorldRenderer.RenderingStage;
+import org.terasology.engine.world.WorldProvider;
import static org.lwjgl.opengl.GL11.GL_PROJECTION;
import static org.lwjgl.opengl.GL11.glMatrixMode;
diff --git a/engine/src/main/java/org/terasology/rendering/cameras/OrthographicCamera.java b/engine/src/main/java/org/terasology/rendering/cameras/OrthographicCamera.java
index 51c87c25b..2e88edbd0 100644
--- a/engine/src/main/java/org/terasology/rendering/cameras/OrthographicCamera.java
+++ b/engine/src/main/java/org/terasology/rendering/cameras/OrthographicCamera.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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 org.terasology.rendering.cameras;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.rendering.cameras;
import org.lwjgl.BufferUtils;
import org.lwjgl.opengl.GL11;
diff --git a/engine/src/main/java/org/terasology/rendering/cameras/PerspectiveCamera.java b/engine/src/main/java/org/terasology/rendering/cameras/PerspectiveCamera.java
index 4a788418e..66fdd0995 100644
--- a/engine/src/main/java/org/terasology/rendering/cameras/PerspectiveCamera.java
+++ b/engine/src/main/java/org/terasology/rendering/cameras/PerspectiveCamera.java
@@ -1,17 +1,17 @@
-// Copyright 2020 The Terasology Foundation
+// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.rendering.cameras;
+package org.terasology.engine.rendering.cameras;
import org.joml.Vector3f;
import org.joml.Vector4f;
import org.lwjgl.BufferUtils;
import org.lwjgl.opengl.GL11;
-import org.terasology.config.RenderingConfig;
-import org.terasology.engine.subsystem.DisplayDevice;
+import org.terasology.engine.config.RenderingConfig;
+import org.terasology.engine.core.subsystem.DisplayDevice;
import org.terasology.math.TeraMath;
-import org.terasology.rendering.nui.layers.mainMenu.videoSettings.CameraSetting;
-import org.terasology.world.WorldProvider;
-import org.terasology.world.chunks.Chunks;
+import org.terasology.engine.rendering.nui.layers.mainMenu.videoSettings.CameraSetting;
+import org.terasology.engine.world.WorldProvider;
+import org.terasology.engine.world.chunks.Chunks;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
@@ -20,7 +20,7 @@ import java.util.LinkedList;
import static org.lwjgl.opengl.GL11.GL_PROJECTION;
import static org.lwjgl.opengl.GL11.glMatrixMode;
-import static org.terasology.engine.subsystem.lwjgl.LwjglDisplayDevice.DISPLAY_RESOLUTION_CHANGE;
+import static org.terasology.engine.core.subsystem.lwjgl.LwjglDisplayDevice.DISPLAY_RESOLUTION_CHANGE;
/**
* Simple default camera.
diff --git a/engine/src/main/java/org/terasology/rendering/cameras/PerspectiveCameraSettings.java b/engine/src/main/java/org/terasology/rendering/cameras/PerspectiveCameraSettings.java
index d2e00b86a..dfd792148 100644
--- a/engine/src/main/java/org/terasology/rendering/cameras/PerspectiveCameraSettings.java
+++ b/engine/src/main/java/org/terasology/rendering/cameras/PerspectiveCameraSettings.java
@@ -1,21 +1,8 @@
-/*
- * Copyright 2014 MovingBlocks
- *
- * 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 org.terasology.rendering.cameras;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.rendering.cameras;
-import org.terasology.rendering.nui.layers.mainMenu.videoSettings.CameraSetting;
+import org.terasology.engine.rendering.nui.layers.mainMenu.videoSettings.CameraSetting;
public class PerspectiveCameraSettings {
private CameraSetting cameraSetting;
diff --git a/engine/src/main/java/org/terasology/rendering/cameras/SubmersibleCamera.java b/engine/src/main/java/org/terasology/rendering/cameras/SubmersibleCamera.java
index c5c0bffbe..96d5f3898 100644
--- a/engine/src/main/java/org/terasology/rendering/cameras/SubmersibleCamera.java
+++ b/engine/src/main/java/org/terasology/rendering/cameras/SubmersibleCamera.java
@@ -1,24 +1,11 @@
-/*
- * Copyright 2017 MovingBlocks
- *
- * 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 org.terasology.rendering.cameras;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.rendering.cameras;
import org.joml.Vector3f;
-import org.terasology.config.RenderingConfig;
-import org.terasology.rendering.RenderHelper;
-import org.terasology.world.WorldProvider;
+import org.terasology.engine.config.RenderingConfig;
+import org.terasology.engine.rendering.RenderHelper;
+import org.terasology.engine.world.WorldProvider;
public abstract class SubmersibleCamera extends Camera {
diff --git a/engine/src/main/java/org/terasology/rendering/cameras/ViewFrustum.java b/engine/src/main/java/org/terasology/rendering/cameras/ViewFrustum.java
index 582e05831..a79423776 100644
--- a/engine/src/main/java/org/terasology/rendering/cameras/ViewFrustum.java
+++ b/engine/src/main/java/org/terasology/rendering/cameras/ViewFrustum.java
@@ -1,14 +1,14 @@
// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.rendering.cameras;
+package org.terasology.engine.rendering.cameras;
import org.joml.Vector3f;
import org.joml.Vector3fc;
import org.lwjgl.BufferUtils;
import org.terasology.joml.geom.AABBfc;
import org.terasology.joml.geom.Planef;
-import org.terasology.logic.players.LocalPlayer;
-import org.terasology.registry.CoreRegistry;
+import org.terasology.engine.logic.players.LocalPlayer;
+import org.terasology.engine.registry.CoreRegistry;
import java.nio.FloatBuffer;
diff --git a/engine/src/main/java/org/terasology/rendering/cameras/package-info.java b/engine/src/main/java/org/terasology/rendering/cameras/package-info.java
index 63a245d6f..649536a78 100644
--- a/engine/src/main/java/org/terasology/rendering/cameras/package-info.java
+++ b/engine/src/main/java/org/terasology/rendering/cameras/package-info.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-@API package org.terasology.rendering.cameras;
+@API package org.terasology.engine.rendering.cameras;
import org.terasology.module.sandbox.API;
diff --git a/engine/src/main/java/org/terasology/rendering/dag/AbstractNode.java b/engine/src/main/java/org/terasology/rendering/dag/AbstractNode.java
index 3c555789d..68538dce2 100644
--- a/engine/src/main/java/org/terasology/rendering/dag/AbstractNode.java
+++ b/engine/src/main/java/org/terasology/rendering/dag/AbstractNode.java
@@ -1,26 +1,26 @@
// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.rendering.dag;
+package org.terasology.engine.rendering.dag;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.terasology.assets.ResourceUrn;
-import org.terasology.context.Context;
-import org.terasology.engine.SimpleUri;
-import org.terasology.engine.module.ModuleManager;
+import org.terasology.engine.context.Context;
+import org.terasology.engine.core.SimpleUri;
+import org.terasology.engine.core.module.ModuleManager;
+import org.terasology.engine.rendering.assets.material.Material;
+import org.terasology.engine.rendering.dag.dependencyConnections.BufferPair;
+import org.terasology.engine.rendering.dag.dependencyConnections.BufferPairConnection;
+import org.terasology.engine.rendering.dag.dependencyConnections.DependencyConnection;
+import org.terasology.engine.rendering.dag.dependencyConnections.FboConnection;
+import org.terasology.engine.rendering.dag.dependencyConnections.RunOrderConnection;
+import org.terasology.engine.rendering.opengl.BaseFboManager;
+import org.terasology.engine.rendering.opengl.FBO;
+import org.terasology.engine.rendering.opengl.FboConfig;
import org.terasology.naming.Name;
-import org.terasology.rendering.assets.material.Material;
-import org.terasology.rendering.dag.dependencyConnections.BufferPair;
-import org.terasology.rendering.dag.dependencyConnections.BufferPairConnection;
-import org.terasology.rendering.dag.dependencyConnections.DependencyConnection;
-import org.terasology.rendering.dag.dependencyConnections.FboConnection;
-import org.terasology.rendering.dag.dependencyConnections.RunOrderConnection;
-import org.terasology.rendering.opengl.BaseFboManager;
-import org.terasology.rendering.opengl.FBO;
-import org.terasology.rendering.opengl.FboConfig;
-import org.terasology.utilities.Assets;
+import org.terasology.engine.utilities.Assets;
import javax.annotation.Nullable;
import java.util.ArrayList;
diff --git a/engine/src/main/java/org/terasology/rendering/dag/ConditionDependentNode.java b/engine/src/main/java/org/terasology/rendering/dag/ConditionDependentNode.java
index 945383c85..90646db10 100644
--- a/engine/src/main/java/org/terasology/rendering/dag/ConditionDependentNode.java
+++ b/engine/src/main/java/org/terasology/rendering/dag/ConditionDependentNode.java
@@ -1,24 +1,11 @@
-/*
- * Copyright 2017 MovingBlocks
- *
- * 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 org.terasology.rendering.dag;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.rendering.dag;
import com.google.common.collect.Lists;
-import org.terasology.context.Context;
+import org.terasology.engine.context.Context;
+import org.terasology.engine.rendering.world.WorldRenderer;
import org.terasology.naming.Name;
-import org.terasology.rendering.world.WorldRenderer;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
diff --git a/engine/src/main/java/org/terasology/rendering/dag/ModuleRendering.java b/engine/src/main/java/org/terasology/rendering/dag/ModuleRendering.java
index 1829e7e74..e74b2fbf5 100644
--- a/engine/src/main/java/org/terasology/rendering/dag/ModuleRendering.java
+++ b/engine/src/main/java/org/terasology/rendering/dag/ModuleRendering.java
@@ -1,20 +1,20 @@
// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.rendering.dag;
+package org.terasology.engine.rendering.dag;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.terasology.context.Context;
-import org.terasology.engine.SimpleUri;
-import org.terasology.engine.module.ModuleManager;
-import org.terasology.entitySystem.systems.RegisterSystem;
+import org.terasology.engine.context.Context;
+import org.terasology.engine.core.SimpleUri;
+import org.terasology.engine.core.module.ModuleManager;
+import org.terasology.engine.entitySystem.systems.RegisterSystem;
+import org.terasology.engine.rendering.dag.dependencyConnections.BufferPair;
+import org.terasology.engine.rendering.opengl.FBO;
+import org.terasology.engine.rendering.opengl.FboConfig;
+import org.terasology.engine.rendering.opengl.ScalingFactors;
+import org.terasology.engine.rendering.world.WorldRenderer;
import org.terasology.naming.Name;
import org.terasology.nui.properties.Range;
-import org.terasology.rendering.dag.dependencyConnections.BufferPair;
-import org.terasology.rendering.opengl.FBO;
-import org.terasology.rendering.opengl.FboConfig;
-import org.terasology.rendering.opengl.ScalingFactors;
-import org.terasology.rendering.world.WorldRenderer;
@RegisterSystem
public abstract class ModuleRendering {
diff --git a/engine/src/main/java/org/terasology/rendering/dag/Node.java b/engine/src/main/java/org/terasology/rendering/dag/Node.java
index 8dd190ea6..926519758 100644
--- a/engine/src/main/java/org/terasology/rendering/dag/Node.java
+++ b/engine/src/main/java/org/terasology/rendering/dag/Node.java
@@ -1,16 +1,16 @@
// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.rendering.dag;
+package org.terasology.engine.rendering.dag;
//TODO: consider removing the word "Node" from the name of all Node implementations now that they are in the dag.nodes package.
-import org.terasology.context.Context;
-import org.terasology.engine.SimpleUri;
+import org.terasology.engine.context.Context;
+import org.terasology.engine.core.SimpleUri;
+import org.terasology.engine.rendering.dag.dependencyConnections.BufferPair;
+import org.terasology.engine.rendering.dag.dependencyConnections.BufferPairConnection;
+import org.terasology.engine.rendering.dag.dependencyConnections.DependencyConnection;
+import org.terasology.engine.rendering.dag.dependencyConnections.RunOrderConnection;
import org.terasology.naming.Name;
-import org.terasology.rendering.dag.dependencyConnections.BufferPair;
-import org.terasology.rendering.dag.dependencyConnections.BufferPairConnection;
-import org.terasology.rendering.dag.dependencyConnections.DependencyConnection;
-import org.terasology.rendering.dag.dependencyConnections.RunOrderConnection;
import java.util.Map;
import java.util.Set;
diff --git a/engine/src/main/java/org/terasology/rendering/dag/RenderGraph.java b/engine/src/main/java/org/terasology/rendering/dag/RenderGraph.java
index 9e043604e..2dabb205a 100644
--- a/engine/src/main/java/org/terasology/rendering/dag/RenderGraph.java
+++ b/engine/src/main/java/org/terasology/rendering/dag/RenderGraph.java
@@ -1,6 +1,6 @@
// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.rendering.dag;
+package org.terasology.engine.rendering.dag;
import com.google.common.base.Preconditions;
import com.google.common.collect.Lists;
@@ -9,13 +9,13 @@ import com.google.common.graph.GraphBuilder;
import com.google.common.graph.MutableGraph;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.terasology.context.Context;
-import org.terasology.engine.SimpleUri;
+import org.terasology.engine.context.Context;
+import org.terasology.engine.core.SimpleUri;
+import org.terasology.engine.rendering.dag.dependencyConnections.BufferPairConnection;
+import org.terasology.engine.rendering.dag.dependencyConnections.DependencyConnection;
+import org.terasology.engine.rendering.dag.dependencyConnections.FboConnection;
import org.terasology.naming.Name;
-import org.terasology.rendering.ShaderManager;
-import org.terasology.rendering.dag.dependencyConnections.BufferPairConnection;
-import org.terasology.rendering.dag.dependencyConnections.DependencyConnection;
-import org.terasology.rendering.dag.dependencyConnections.FboConnection;
+import org.terasology.engine.rendering.ShaderManager;
import java.util.ArrayList;
import java.util.List;
diff --git a/engine/src/main/java/org/terasology/rendering/dag/RenderPipelineTask.java b/engine/src/main/java/org/terasology/rendering/dag/RenderPipelineTask.java
index a149f02c0..faa0bea20 100644
--- a/engine/src/main/java/org/terasology/rendering/dag/RenderPipelineTask.java
+++ b/engine/src/main/java/org/terasology/rendering/dag/RenderPipelineTask.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2016 MovingBlocks
- *
- * 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 org.terasology.rendering.dag;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.rendering.dag;
/**
* TODO: Add javadocs
diff --git a/engine/src/main/java/org/terasology/rendering/dag/RenderTaskListGenerator.java b/engine/src/main/java/org/terasology/rendering/dag/RenderTaskListGenerator.java
index 837433da5..875400b62 100644
--- a/engine/src/main/java/org/terasology/rendering/dag/RenderTaskListGenerator.java
+++ b/engine/src/main/java/org/terasology/rendering/dag/RenderTaskListGenerator.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2017 MovingBlocks
- *
- * 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 org.terasology.rendering.dag;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.rendering.dag;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
diff --git a/engine/src/main/java/org/terasology/rendering/dag/StateChange.java b/engine/src/main/java/org/terasology/rendering/dag/StateChange.java
index bc2d8103f..162b9ceef 100644
--- a/engine/src/main/java/org/terasology/rendering/dag/StateChange.java
+++ b/engine/src/main/java/org/terasology/rendering/dag/StateChange.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2017 MovingBlocks
- *
- * 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 org.terasology.rendering.dag;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.rendering.dag;
/**
* A StateChange instance encapsulate a change in the OpenGL state that is required by one or more consecutive nodes.
diff --git a/engine/src/main/java/org/terasology/rendering/dag/WireframeCapable.java b/engine/src/main/java/org/terasology/rendering/dag/WireframeCapable.java
index 0660fbdac..afa937673 100644
--- a/engine/src/main/java/org/terasology/rendering/dag/WireframeCapable.java
+++ b/engine/src/main/java/org/terasology/rendering/dag/WireframeCapable.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2016 MovingBlocks
- *
- * 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 org.terasology.rendering.dag;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.rendering.dag;
/**
* Classes implementing this interface are capable of producing
diff --git a/engine/src/main/java/org/terasology/rendering/dag/WireframeTrigger.java b/engine/src/main/java/org/terasology/rendering/dag/WireframeTrigger.java
index 482b659ec..217ae5ab8 100644
--- a/engine/src/main/java/org/terasology/rendering/dag/WireframeTrigger.java
+++ b/engine/src/main/java/org/terasology/rendering/dag/WireframeTrigger.java
@@ -1,21 +1,8 @@
-/*
- * Copyright 2016 MovingBlocks
- *
- * 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 org.terasology.rendering.dag;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.rendering.dag;
-import org.terasology.config.RenderingDebugConfig;
+import org.terasology.engine.config.RenderingDebugConfig;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
diff --git a/engine/src/main/java/org/terasology/rendering/dag/dependencyConnections/BufferPair.java b/engine/src/main/java/org/terasology/rendering/dag/dependencyConnections/BufferPair.java
index 05e5d66e8..6da8d7dad 100644
--- a/engine/src/main/java/org/terasology/rendering/dag/dependencyConnections/BufferPair.java
+++ b/engine/src/main/java/org/terasology/rendering/dag/dependencyConnections/BufferPair.java
@@ -1,21 +1,8 @@
-/*
- * Copyright 2017 MovingBlocks
- *
- * 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 org.terasology.rendering.dag.dependencyConnections;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.rendering.dag.dependencyConnections;
-import org.terasology.rendering.opengl.FBO;
+import org.terasology.engine.rendering.opengl.FBO;
/**
* This class represents BufferPair, a pair of FBO buffers, which represent a main render target.
diff --git a/engine/src/main/java/org/terasology/rendering/dag/dependencyConnections/BufferPairConnection.java b/engine/src/main/java/org/terasology/rendering/dag/dependencyConnections/BufferPairConnection.java
index 9b611fbf1..201a52379 100644
--- a/engine/src/main/java/org/terasology/rendering/dag/dependencyConnections/BufferPairConnection.java
+++ b/engine/src/main/java/org/terasology/rendering/dag/dependencyConnections/BufferPairConnection.java
@@ -1,22 +1,9 @@
-/*
- * Copyright 2019 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.rendering.dag.dependencyConnections;
+package org.terasology.engine.rendering.dag.dependencyConnections;
-import org.terasology.engine.SimpleUri;
+import org.terasology.engine.core.SimpleUri;
public class BufferPairConnection extends DependencyConnection
diff --git a/engine/src/main/java/org/terasology/world/chunks/deflate/TeraVisitingDeflator.java b/engine/src/main/java/org/terasology/world/chunks/deflate/TeraVisitingDeflator.java
index 6ec3f683c..f003f2ad8 100644
--- a/engine/src/main/java/org/terasology/world/chunks/deflate/TeraVisitingDeflator.java
+++ b/engine/src/main/java/org/terasology/world/chunks/deflate/TeraVisitingDeflator.java
@@ -1,23 +1,10 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.world.chunks.deflate;
+package org.terasology.engine.world.chunks.deflate;
import com.google.common.base.Preconditions;
-import org.terasology.world.chunks.blockdata.TeraArray;
+import org.terasology.engine.world.chunks.blockdata.TeraArray;
/**
* TeraVisitingDeflator uses the visitor pattern to gain access to the internal implementation details of specific
diff --git a/engine/src/main/java/org/terasology/world/chunks/event/BeforeChunkUnload.java b/engine/src/main/java/org/terasology/world/chunks/event/BeforeChunkUnload.java
index 1036346d4..52dede49c 100644
--- a/engine/src/main/java/org/terasology/world/chunks/event/BeforeChunkUnload.java
+++ b/engine/src/main/java/org/terasology/world/chunks/event/BeforeChunkUnload.java
@@ -1,24 +1,11 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.world.chunks.event;
+package org.terasology.engine.world.chunks.event;
import org.joml.Vector3i;
import org.joml.Vector3ic;
-import org.terasology.entitySystem.event.Event;
+import org.terasology.engine.entitySystem.event.Event;
/**
*/
diff --git a/engine/src/main/java/org/terasology/world/chunks/event/OnChunkGenerated.java b/engine/src/main/java/org/terasology/world/chunks/event/OnChunkGenerated.java
index 11fff805d..df124907a 100644
--- a/engine/src/main/java/org/terasology/world/chunks/event/OnChunkGenerated.java
+++ b/engine/src/main/java/org/terasology/world/chunks/event/OnChunkGenerated.java
@@ -1,23 +1,10 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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 org.terasology.world.chunks.event;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.world.chunks.event;
import org.joml.Vector3i;
import org.joml.Vector3ic;
-import org.terasology.entitySystem.event.Event;
+import org.terasology.engine.entitySystem.event.Event;
/**
*/
diff --git a/engine/src/main/java/org/terasology/world/chunks/event/OnChunkLoaded.java b/engine/src/main/java/org/terasology/world/chunks/event/OnChunkLoaded.java
index 77ca97543..8b9eebf38 100644
--- a/engine/src/main/java/org/terasology/world/chunks/event/OnChunkLoaded.java
+++ b/engine/src/main/java/org/terasology/world/chunks/event/OnChunkLoaded.java
@@ -1,24 +1,11 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.world.chunks.event;
+package org.terasology.engine.world.chunks.event;
import org.joml.Vector3i;
import org.joml.Vector3ic;
-import org.terasology.entitySystem.event.Event;
+import org.terasology.engine.entitySystem.event.Event;
/**
*/
diff --git a/engine/src/main/java/org/terasology/world/chunks/event/PurgeWorldEvent.java b/engine/src/main/java/org/terasology/world/chunks/event/PurgeWorldEvent.java
index 63d97c768..32d02a31d 100644
--- a/engine/src/main/java/org/terasology/world/chunks/event/PurgeWorldEvent.java
+++ b/engine/src/main/java/org/terasology/world/chunks/event/PurgeWorldEvent.java
@@ -1,22 +1,9 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.world.chunks.event;
+package org.terasology.engine.world.chunks.event;
-import org.terasology.entitySystem.event.Event;
+import org.terasology.engine.entitySystem.event.Event;
/**
* This {@link Event} is fired when the chunk provider purges
diff --git a/engine/src/main/java/org/terasology/world/chunks/event/package-info.java b/engine/src/main/java/org/terasology/world/chunks/event/package-info.java
index dcd912b1c..03c625059 100644
--- a/engine/src/main/java/org/terasology/world/chunks/event/package-info.java
+++ b/engine/src/main/java/org/terasology/world/chunks/event/package-info.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-@API package org.terasology.world.chunks.event;
+@API package org.terasology.engine.world.chunks.event;
import org.terasology.module.sandbox.API;
diff --git a/engine/src/main/java/org/terasology/world/chunks/internal/ChunkBlockIteratorImpl.java b/engine/src/main/java/org/terasology/world/chunks/internal/ChunkBlockIteratorImpl.java
index 8db7e32a7..bef90c15d 100644
--- a/engine/src/main/java/org/terasology/world/chunks/internal/ChunkBlockIteratorImpl.java
+++ b/engine/src/main/java/org/terasology/world/chunks/internal/ChunkBlockIteratorImpl.java
@@ -1,26 +1,13 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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 org.terasology.world.chunks.internal;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.world.chunks.internal;
import org.joml.Vector3i;
import org.joml.Vector3ic;
-import org.terasology.world.block.Block;
-import org.terasology.world.block.BlockManager;
-import org.terasology.world.chunks.ChunkBlockIterator;
-import org.terasology.world.chunks.blockdata.TeraArray;
+import org.terasology.engine.world.chunks.blockdata.TeraArray;
+import org.terasology.engine.world.block.Block;
+import org.terasology.engine.world.block.BlockManager;
+import org.terasology.engine.world.chunks.ChunkBlockIterator;
/**
*/
diff --git a/engine/src/main/java/org/terasology/world/chunks/internal/ChunkImpl.java b/engine/src/main/java/org/terasology/world/chunks/internal/ChunkImpl.java
index 097460874..d9dc7b6bf 100644
--- a/engine/src/main/java/org/terasology/world/chunks/internal/ChunkImpl.java
+++ b/engine/src/main/java/org/terasology/world/chunks/internal/ChunkImpl.java
@@ -1,6 +1,6 @@
// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.world.chunks.internal;
+package org.terasology.engine.world.chunks.internal;
import com.google.common.base.Objects;
import com.google.common.base.Preconditions;
@@ -8,24 +8,24 @@ import org.joml.Vector3i;
import org.joml.Vector3ic;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.terasology.engine.world.chunks.blockdata.ExtraBlockDataManager;
+import org.terasology.engine.world.chunks.blockdata.TeraArray;
+import org.terasology.engine.world.chunks.blockdata.TeraDenseArray16Bit;
+import org.terasology.engine.world.chunks.blockdata.TeraDenseArray8Bit;
+import org.terasology.engine.world.chunks.blockdata.TeraSparseArray8Bit;
import org.terasology.joml.geom.AABBf;
import org.terasology.joml.geom.AABBfc;
-import org.terasology.monitoring.chunk.ChunkMonitor;
+import org.terasology.engine.monitoring.chunk.ChunkMonitor;
import org.terasology.protobuf.EntityData;
-import org.terasology.rendering.primitives.ChunkMesh;
-import org.terasology.world.block.Block;
-import org.terasology.world.block.BlockManager;
-import org.terasology.world.block.BlockRegion;
-import org.terasology.world.chunks.Chunk;
-import org.terasology.world.chunks.ChunkBlockIterator;
-import org.terasology.world.chunks.Chunks;
-import org.terasology.world.chunks.blockdata.ExtraBlockDataManager;
-import org.terasology.world.chunks.blockdata.TeraArray;
-import org.terasology.world.chunks.blockdata.TeraDenseArray16Bit;
-import org.terasology.world.chunks.blockdata.TeraDenseArray8Bit;
-import org.terasology.world.chunks.blockdata.TeraSparseArray8Bit;
-import org.terasology.world.chunks.deflate.TeraDeflator;
-import org.terasology.world.chunks.deflate.TeraStandardDeflator;
+import org.terasology.engine.rendering.primitives.ChunkMesh;
+import org.terasology.engine.world.block.Block;
+import org.terasology.engine.world.block.BlockManager;
+import org.terasology.engine.world.block.BlockRegion;
+import org.terasology.engine.world.chunks.Chunk;
+import org.terasology.engine.world.chunks.ChunkBlockIterator;
+import org.terasology.engine.world.chunks.Chunks;
+import org.terasology.engine.world.chunks.deflate.TeraDeflator;
+import org.terasology.engine.world.chunks.deflate.TeraStandardDeflator;
import java.text.DecimalFormat;
diff --git a/engine/src/main/java/org/terasology/world/chunks/internal/ChunkRelevanceRegion.java b/engine/src/main/java/org/terasology/world/chunks/internal/ChunkRelevanceRegion.java
index afd434bfe..523db0f29 100644
--- a/engine/src/main/java/org/terasology/world/chunks/internal/ChunkRelevanceRegion.java
+++ b/engine/src/main/java/org/terasology/world/chunks/internal/ChunkRelevanceRegion.java
@@ -1,19 +1,19 @@
// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.world.chunks.internal;
+package org.terasology.engine.world.chunks.internal;
import com.google.common.base.Objects;
import com.google.common.collect.Sets;
import org.joml.Vector3f;
import org.joml.Vector3i;
import org.joml.Vector3ic;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.logic.location.LocationComponent;
-import org.terasology.world.block.BlockRegion;
-import org.terasology.world.chunks.Chunk;
-import org.terasology.world.chunks.ChunkRegionListener;
-import org.terasology.world.chunks.Chunks;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.logic.location.LocationComponent;
+import org.terasology.engine.world.block.BlockRegion;
+import org.terasology.engine.world.chunks.Chunk;
+import org.terasology.engine.world.chunks.ChunkRegionListener;
+import org.terasology.engine.world.chunks.Chunks;
import java.util.Iterator;
import java.util.Set;
diff --git a/engine/src/main/java/org/terasology/world/chunks/internal/ChunkSerializer.java b/engine/src/main/java/org/terasology/world/chunks/internal/ChunkSerializer.java
index e03220af2..b17d05922 100644
--- a/engine/src/main/java/org/terasology/world/chunks/internal/ChunkSerializer.java
+++ b/engine/src/main/java/org/terasology/world/chunks/internal/ChunkSerializer.java
@@ -1,6 +1,6 @@
// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.world.chunks.internal;
+package org.terasology.engine.world.chunks.internal;
import com.google.common.base.Preconditions;
import com.google.protobuf.ByteString;
@@ -8,14 +8,14 @@ import gnu.trove.list.TByteList;
import gnu.trove.list.array.TByteArrayList;
import org.joml.Vector3i;
import org.joml.Vector3ic;
+import org.terasology.engine.world.chunks.blockdata.ExtraBlockDataManager;
+import org.terasology.engine.world.chunks.blockdata.TeraArray;
+import org.terasology.engine.world.chunks.blockdata.TeraDenseArray16Bit;
+import org.terasology.engine.world.chunks.blockdata.TeraDenseArray8Bit;
import org.terasology.protobuf.EntityData;
-import org.terasology.world.block.BlockManager;
-import org.terasology.world.chunks.Chunk;
-import org.terasology.world.chunks.Chunks;
-import org.terasology.world.chunks.blockdata.ExtraBlockDataManager;
-import org.terasology.world.chunks.blockdata.TeraArray;
-import org.terasology.world.chunks.blockdata.TeraDenseArray16Bit;
-import org.terasology.world.chunks.blockdata.TeraDenseArray8Bit;
+import org.terasology.engine.world.block.BlockManager;
+import org.terasology.engine.world.chunks.Chunk;
+import org.terasology.engine.world.chunks.Chunks;
/**
*/
diff --git a/engine/src/main/java/org/terasology/world/chunks/internal/PreLodChunk.java b/engine/src/main/java/org/terasology/world/chunks/internal/PreLodChunk.java
index 9e71b3505..a1fb9b1ab 100644
--- a/engine/src/main/java/org/terasology/world/chunks/internal/PreLodChunk.java
+++ b/engine/src/main/java/org/terasology/world/chunks/internal/PreLodChunk.java
@@ -1,13 +1,13 @@
// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.world.chunks.internal;
+package org.terasology.engine.world.chunks.internal;
import org.joml.Vector3i;
-import org.terasology.world.block.BlockManager;
-import org.terasology.world.block.BlockRegion;
-import org.terasology.world.chunks.Chunks;
-import org.terasology.world.chunks.blockdata.ExtraBlockDataManager;
+import org.terasology.engine.world.chunks.blockdata.ExtraBlockDataManager;
+import org.terasology.engine.world.block.BlockManager;
+import org.terasology.engine.world.block.BlockRegion;
+import org.terasology.engine.world.chunks.Chunks;
/**
* A chunk that has a full set of data, but will be turned into
diff --git a/engine/src/main/java/org/terasology/world/chunks/localChunkProvider/ChunkUnloadRequest.java b/engine/src/main/java/org/terasology/world/chunks/localChunkProvider/ChunkUnloadRequest.java
index c51649494..e02263c8f 100644
--- a/engine/src/main/java/org/terasology/world/chunks/localChunkProvider/ChunkUnloadRequest.java
+++ b/engine/src/main/java/org/terasology/world/chunks/localChunkProvider/ChunkUnloadRequest.java
@@ -1,22 +1,9 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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 org.terasology.world.chunks.localChunkProvider;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.world.chunks.localChunkProvider;
-import org.terasology.utilities.concurrency.Task;
-import org.terasology.world.chunks.Chunk;
+import org.terasology.engine.utilities.concurrency.Task;
+import org.terasology.engine.world.chunks.Chunk;
/**
*/
diff --git a/engine/src/main/java/org/terasology/world/chunks/localChunkProvider/LocalChunkProvider.java b/engine/src/main/java/org/terasology/world/chunks/localChunkProvider/LocalChunkProvider.java
index 10d39d823..b3a5e3717 100644
--- a/engine/src/main/java/org/terasology/world/chunks/localChunkProvider/LocalChunkProvider.java
+++ b/engine/src/main/java/org/terasology/world/chunks/localChunkProvider/LocalChunkProvider.java
@@ -1,6 +1,6 @@
// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.world.chunks.localChunkProvider;
+package org.terasology.engine.world.chunks.localChunkProvider;
import com.google.common.collect.Iterators;
import com.google.common.collect.Lists;
@@ -14,44 +14,44 @@ import org.joml.Vector3i;
import org.joml.Vector3ic;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.terasology.entitySystem.Component;
-import org.terasology.entitySystem.entity.EntityManager;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.entitySystem.entity.EntityStore;
-import org.terasology.entitySystem.prefab.Prefab;
-import org.terasology.monitoring.PerformanceMonitor;
-import org.terasology.monitoring.chunk.ChunkMonitor;
-import org.terasology.persistence.ChunkStore;
-import org.terasology.persistence.StorageManager;
-import org.terasology.utilities.concurrency.TaskMaster;
-import org.terasology.world.BlockEntityRegistry;
-import org.terasology.world.block.BeforeDeactivateBlocks;
-import org.terasology.world.block.Block;
-import org.terasology.world.block.BlockManager;
-import org.terasology.world.block.BlockRegion;
-import org.terasology.world.block.BlockRegionc;
-import org.terasology.world.block.OnActivatedBlocks;
-import org.terasology.world.block.OnAddedBlocks;
-import org.terasology.world.chunks.Chunk;
-import org.terasology.world.chunks.ChunkBlockIterator;
-import org.terasology.world.chunks.ChunkProvider;
-import org.terasology.world.chunks.Chunks;
-import org.terasology.world.chunks.ManagedChunk;
-import org.terasology.world.chunks.blockdata.ExtraBlockDataManager;
-import org.terasology.world.chunks.event.BeforeChunkUnload;
-import org.terasology.world.chunks.event.OnChunkGenerated;
-import org.terasology.world.chunks.event.OnChunkLoaded;
-import org.terasology.world.chunks.event.PurgeWorldEvent;
-import org.terasology.world.chunks.internal.ChunkImpl;
-import org.terasology.world.chunks.internal.ChunkRelevanceRegion;
-import org.terasology.world.chunks.pipeline.ChunkProcessingPipeline;
-import org.terasology.world.chunks.pipeline.stages.ChunkTaskProvider;
-import org.terasology.world.generation.impl.EntityBufferImpl;
-import org.terasology.world.generator.WorldGenerator;
-import org.terasology.world.internal.ChunkViewCore;
-import org.terasology.world.internal.ChunkViewCoreImpl;
-import org.terasology.world.propagation.light.InternalLightProcessor;
-import org.terasology.world.propagation.light.LightMerger;
+import org.terasology.engine.entitySystem.Component;
+import org.terasology.engine.entitySystem.entity.EntityManager;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.entity.EntityStore;
+import org.terasology.engine.entitySystem.prefab.Prefab;
+import org.terasology.engine.monitoring.PerformanceMonitor;
+import org.terasology.engine.monitoring.chunk.ChunkMonitor;
+import org.terasology.engine.persistence.ChunkStore;
+import org.terasology.engine.persistence.StorageManager;
+import org.terasology.engine.world.generation.impl.EntityBufferImpl;
+import org.terasology.engine.world.generator.WorldGenerator;
+import org.terasology.engine.world.internal.ChunkViewCore;
+import org.terasology.engine.world.internal.ChunkViewCoreImpl;
+import org.terasology.engine.world.propagation.light.InternalLightProcessor;
+import org.terasology.engine.world.propagation.light.LightMerger;
+import org.terasology.engine.utilities.concurrency.TaskMaster;
+import org.terasology.engine.world.BlockEntityRegistry;
+import org.terasology.engine.world.block.BeforeDeactivateBlocks;
+import org.terasology.engine.world.block.Block;
+import org.terasology.engine.world.block.BlockManager;
+import org.terasology.engine.world.block.BlockRegion;
+import org.terasology.engine.world.block.BlockRegionc;
+import org.terasology.engine.world.block.OnActivatedBlocks;
+import org.terasology.engine.world.block.OnAddedBlocks;
+import org.terasology.engine.world.chunks.Chunk;
+import org.terasology.engine.world.chunks.ChunkBlockIterator;
+import org.terasology.engine.world.chunks.ChunkProvider;
+import org.terasology.engine.world.chunks.Chunks;
+import org.terasology.engine.world.chunks.ManagedChunk;
+import org.terasology.engine.world.chunks.blockdata.ExtraBlockDataManager;
+import org.terasology.engine.world.chunks.event.BeforeChunkUnload;
+import org.terasology.engine.world.chunks.event.OnChunkGenerated;
+import org.terasology.engine.world.chunks.event.OnChunkLoaded;
+import org.terasology.engine.world.chunks.event.PurgeWorldEvent;
+import org.terasology.engine.world.chunks.internal.ChunkImpl;
+import org.terasology.engine.world.chunks.internal.ChunkRelevanceRegion;
+import org.terasology.engine.world.chunks.pipeline.ChunkProcessingPipeline;
+import org.terasology.engine.world.chunks.pipeline.stages.ChunkTaskProvider;
import java.util.Collection;
import java.util.Iterator;
diff --git a/engine/src/main/java/org/terasology/world/chunks/localChunkProvider/RelevanceSystem.java b/engine/src/main/java/org/terasology/world/chunks/localChunkProvider/RelevanceSystem.java
index b674fc219..6108c2c18 100644
--- a/engine/src/main/java/org/terasology/world/chunks/localChunkProvider/RelevanceSystem.java
+++ b/engine/src/main/java/org/terasology/world/chunks/localChunkProvider/RelevanceSystem.java
@@ -1,28 +1,28 @@
// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.world.chunks.localChunkProvider;
+package org.terasology.engine.world.chunks.localChunkProvider;
import com.google.common.collect.Maps;
import org.joml.Vector3i;
import org.joml.Vector3ic;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.entitySystem.entity.lifecycleEvents.BeforeDeactivateComponent;
-import org.terasology.entitySystem.entity.lifecycleEvents.OnActivatedComponent;
-import org.terasology.entitySystem.entity.lifecycleEvents.OnChangedComponent;
-import org.terasology.entitySystem.event.ReceiveEvent;
-import org.terasology.entitySystem.systems.UpdateSubscriberSystem;
-import org.terasology.logic.location.LocationComponent;
-import org.terasology.monitoring.Activity;
-import org.terasology.monitoring.PerformanceMonitor;
-import org.terasology.world.RelevanceRegionComponent;
-import org.terasology.world.WorldComponent;
-import org.terasology.world.block.BlockRegion;
-import org.terasology.world.chunks.Chunk;
-import org.terasology.world.chunks.ChunkRegionListener;
-import org.terasology.world.chunks.event.BeforeChunkUnload;
-import org.terasology.world.chunks.event.OnChunkLoaded;
-import org.terasology.world.chunks.internal.ChunkRelevanceRegion;
-import org.terasology.world.chunks.pipeline.PositionFuture;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.entity.lifecycleEvents.BeforeDeactivateComponent;
+import org.terasology.engine.entitySystem.entity.lifecycleEvents.OnActivatedComponent;
+import org.terasology.engine.entitySystem.entity.lifecycleEvents.OnChangedComponent;
+import org.terasology.engine.entitySystem.event.ReceiveEvent;
+import org.terasology.engine.entitySystem.systems.UpdateSubscriberSystem;
+import org.terasology.engine.logic.location.LocationComponent;
+import org.terasology.engine.monitoring.Activity;
+import org.terasology.engine.monitoring.PerformanceMonitor;
+import org.terasology.engine.world.RelevanceRegionComponent;
+import org.terasology.engine.world.WorldComponent;
+import org.terasology.engine.world.block.BlockRegion;
+import org.terasology.engine.world.chunks.Chunk;
+import org.terasology.engine.world.chunks.ChunkRegionListener;
+import org.terasology.engine.world.chunks.event.BeforeChunkUnload;
+import org.terasology.engine.world.chunks.event.OnChunkLoaded;
+import org.terasology.engine.world.chunks.internal.ChunkRelevanceRegion;
+import org.terasology.engine.world.chunks.pipeline.PositionFuture;
import java.util.Collection;
import java.util.Comparator;
diff --git a/engine/src/main/java/org/terasology/world/chunks/pipeline/ChunkProcessingInfo.java b/engine/src/main/java/org/terasology/world/chunks/pipeline/ChunkProcessingInfo.java
index 8bf515642..c7267da1e 100644
--- a/engine/src/main/java/org/terasology/world/chunks/pipeline/ChunkProcessingInfo.java
+++ b/engine/src/main/java/org/terasology/world/chunks/pipeline/ChunkProcessingInfo.java
@@ -1,13 +1,13 @@
-// Copyright 2020 The Terasology Foundation
+// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.world.chunks.pipeline;
+package org.terasology.engine.world.chunks.pipeline;
import com.google.common.util.concurrent.SettableFuture;
import org.joml.Vector3ic;
-import org.terasology.world.chunks.Chunk;
-import org.terasology.world.chunks.pipeline.stages.ChunkTask;
-import org.terasology.world.chunks.pipeline.stages.ChunkTaskProvider;
+import org.terasology.engine.world.chunks.pipeline.stages.ChunkTask;
+import org.terasology.engine.world.chunks.pipeline.stages.ChunkTaskProvider;
+import org.terasology.engine.world.chunks.Chunk;
import java.util.List;
import java.util.concurrent.Future;
@@ -20,7 +20,7 @@ public final class ChunkProcessingInfo {
private ChunkTaskProvider chunkTaskProvider;
private Future
@@ -57,7 +45,7 @@ public class BlockSelectionComponent implements Component {
/**
* If this is the position of the selected region changes with the camera target. This must be set true for a component
- * before sending the {@link org.terasology.logic.selection.MovableSelectionStartEvent} using the appropriate entity
+ * before sending the {@link MovableSelectionStartEvent} using the appropriate entity
*/
public boolean isMovable = false;
}
diff --git a/engine/src/main/java/org/terasology/world/selection/BlockSelectionSystem.java b/engine/src/main/java/org/terasology/world/selection/BlockSelectionSystem.java
index b9c7073d7..e7a4aaa0c 100644
--- a/engine/src/main/java/org/terasology/world/selection/BlockSelectionSystem.java
+++ b/engine/src/main/java/org/terasology/world/selection/BlockSelectionSystem.java
@@ -1,32 +1,19 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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 org.terasology.world.selection;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.world.selection;
import org.joml.RoundingMode;
import org.joml.Vector3f;
import org.joml.Vector3i;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.entitySystem.event.ReceiveEvent;
-import org.terasology.entitySystem.systems.BaseComponentSystem;
-import org.terasology.entitySystem.systems.RegisterMode;
-import org.terasology.entitySystem.systems.RegisterSystem;
-import org.terasology.logic.location.LocationComponent;
-import org.terasology.world.block.BlockRegion;
-import org.terasology.world.selection.event.SetBlockSelectionEndingPointEvent;
-import org.terasology.world.selection.event.SetBlockSelectionStartingPointEvent;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.event.ReceiveEvent;
+import org.terasology.engine.entitySystem.systems.BaseComponentSystem;
+import org.terasology.engine.entitySystem.systems.RegisterMode;
+import org.terasology.engine.entitySystem.systems.RegisterSystem;
+import org.terasology.engine.logic.location.LocationComponent;
+import org.terasology.engine.world.selection.event.SetBlockSelectionEndingPointEvent;
+import org.terasology.engine.world.selection.event.SetBlockSelectionStartingPointEvent;
+import org.terasology.engine.world.block.BlockRegion;
/**
* This system updates block selections based on the sender's location and the state of the block selection.
diff --git a/engine/src/main/java/org/terasology/world/selection/event/SetBlockSelectionEndingPointEvent.java b/engine/src/main/java/org/terasology/world/selection/event/SetBlockSelectionEndingPointEvent.java
index 90ef15c90..c519c594c 100644
--- a/engine/src/main/java/org/terasology/world/selection/event/SetBlockSelectionEndingPointEvent.java
+++ b/engine/src/main/java/org/terasology/world/selection/event/SetBlockSelectionEndingPointEvent.java
@@ -1,23 +1,10 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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 org.terasology.world.selection.event;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.world.selection.event;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.entitySystem.event.AbstractConsumableEvent;
-import org.terasology.world.selection.BlockSelectionComponent;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.event.AbstractConsumableEvent;
+import org.terasology.engine.world.selection.BlockSelectionComponent;
/**
* Sent to BlockSelectionSystem to indicate that the current sender should be used as the selection ending position
diff --git a/engine/src/main/java/org/terasology/world/selection/event/SetBlockSelectionStartingPointEvent.java b/engine/src/main/java/org/terasology/world/selection/event/SetBlockSelectionStartingPointEvent.java
index 09afdabc6..9a8dcc0be 100644
--- a/engine/src/main/java/org/terasology/world/selection/event/SetBlockSelectionStartingPointEvent.java
+++ b/engine/src/main/java/org/terasology/world/selection/event/SetBlockSelectionStartingPointEvent.java
@@ -1,23 +1,10 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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 org.terasology.world.selection.event;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.world.selection.event;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.entitySystem.event.AbstractConsumableEvent;
-import org.terasology.world.selection.BlockSelectionComponent;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.event.AbstractConsumableEvent;
+import org.terasology.engine.world.selection.BlockSelectionComponent;
/**
* Sent to BlockSelectionSystem to indicate that the current sender should be used as the selection starting position
diff --git a/engine/src/main/java/org/terasology/world/selection/event/package-info.java b/engine/src/main/java/org/terasology/world/selection/event/package-info.java
index 359678f56..4656a61f6 100644
--- a/engine/src/main/java/org/terasology/world/selection/event/package-info.java
+++ b/engine/src/main/java/org/terasology/world/selection/event/package-info.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-@API package org.terasology.world.selection.event;
+@API package org.terasology.engine.world.selection.event;
import org.terasology.module.sandbox.API;
diff --git a/engine/src/main/java/org/terasology/world/sun/BasicCelestialModel.java b/engine/src/main/java/org/terasology/world/sun/BasicCelestialModel.java
index 86b09a85c..09e378e63 100644
--- a/engine/src/main/java/org/terasology/world/sun/BasicCelestialModel.java
+++ b/engine/src/main/java/org/terasology/world/sun/BasicCelestialModel.java
@@ -1,22 +1,9 @@
-/*
- * Copyright 2014 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.world.sun;
+package org.terasology.engine.world.sun;
-import static org.terasology.world.time.WorldTime.DAY_LENGTH;
+import org.terasology.engine.world.time.WorldTime;
/**
* A simple implementations of {@link CelestialSystem} with constant daily events
@@ -24,9 +11,9 @@ import static org.terasology.world.time.WorldTime.DAY_LENGTH;
*/
public class BasicCelestialModel implements CelestialModel {
- private static final long DAWN_TIME = DAY_LENGTH / 4;
- private static final long MIDDAY_TIME = DAY_LENGTH / 2;
- private static final long DUSK_TIME = 3 * DAY_LENGTH / 4;
+ private static final long DAWN_TIME = WorldTime.DAY_LENGTH / 4;
+ private static final long MIDDAY_TIME = WorldTime.DAY_LENGTH / 2;
+ private static final long DUSK_TIME = 3 * WorldTime.DAY_LENGTH / 4;
private static final long MIDNIGHT_TIME = 0;
@Override
diff --git a/engine/src/main/java/org/terasology/world/sun/CelestialModel.java b/engine/src/main/java/org/terasology/world/sun/CelestialModel.java
index 836508a8b..f41c3f681 100644
--- a/engine/src/main/java/org/terasology/world/sun/CelestialModel.java
+++ b/engine/src/main/java/org/terasology/world/sun/CelestialModel.java
@@ -1,20 +1,7 @@
-/*
- * Copyright 2014 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.world.sun;
+package org.terasology.engine.world.sun;
/**
* Describes the movement of celestial bodies.
diff --git a/engine/src/main/java/org/terasology/world/sun/CelestialSystem.java b/engine/src/main/java/org/terasology/world/sun/CelestialSystem.java
index 3e3a8ddb9..4e1c40528 100644
--- a/engine/src/main/java/org/terasology/world/sun/CelestialSystem.java
+++ b/engine/src/main/java/org/terasology/world/sun/CelestialSystem.java
@@ -1,20 +1,7 @@
-/*
- * Copyright 2014 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.world.sun;
+package org.terasology.engine.world.sun;
/**
* An interface for celestial systems (with only one sun)
diff --git a/engine/src/main/java/org/terasology/world/sun/DefaultCelestialSystem.java b/engine/src/main/java/org/terasology/world/sun/DefaultCelestialSystem.java
index c603b489e..90d8f2fed 100644
--- a/engine/src/main/java/org/terasology/world/sun/DefaultCelestialSystem.java
+++ b/engine/src/main/java/org/terasology/world/sun/DefaultCelestialSystem.java
@@ -1,35 +1,20 @@
-/*
- * Copyright 2017 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.world.sun;
+package org.terasology.engine.world.sun;
import com.google.common.math.LongMath;
-import org.terasology.context.Context;
-import org.terasology.entitySystem.entity.EntityManager;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.entitySystem.systems.BaseComponentSystem;
-import org.terasology.entitySystem.systems.UpdateSubscriberSystem;
-import org.terasology.world.WorldComponent;
-import org.terasology.world.WorldProvider;
-import org.terasology.world.time.WorldTime;
+import org.terasology.engine.context.Context;
+import org.terasology.engine.entitySystem.entity.EntityManager;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.systems.BaseComponentSystem;
+import org.terasology.engine.entitySystem.systems.UpdateSubscriberSystem;
+import org.terasology.engine.world.time.WorldTime;
+import org.terasology.engine.world.WorldComponent;
+import org.terasology.engine.world.WorldProvider;
import java.math.RoundingMode;
-import static org.terasology.world.time.WorldTime.DAY_LENGTH;
-
/**
* A base class that fires events at different times of the day.
*/
@@ -90,8 +75,8 @@ public class DefaultCelestialSystem extends BaseComponentSystem implements Celes
long startTime = worldTime.getMilliseconds();
long delta = startTime - lastUpdate;
if (delta > 0) {
- long timeInDay = LongMath.mod(startTime, DAY_LENGTH);
- long day = LongMath.divide(startTime, DAY_LENGTH, RoundingMode.FLOOR);
+ long timeInDay = LongMath.mod(startTime, WorldTime.DAY_LENGTH);
+ long day = LongMath.divide(startTime, WorldTime.DAY_LENGTH, RoundingMode.FLOOR);
long dawn = model.getDawn(day);
long midday = model.getMidday(day);
@@ -99,22 +84,22 @@ public class DefaultCelestialSystem extends BaseComponentSystem implements Celes
long midnight = model.getMidnight(day);
if (timeInDay - delta < midday && timeInDay >= midday) {
- long tick = day * DAY_LENGTH + midday;
+ long tick = day * WorldTime.DAY_LENGTH + midday;
getWorldEntity().send(new OnMiddayEvent(tick));
}
if (timeInDay - delta < dusk && timeInDay >= dusk) {
- long tick = day * DAY_LENGTH + dusk;
+ long tick = day * WorldTime.DAY_LENGTH + dusk;
getWorldEntity().send(new OnDuskEvent(tick));
}
if (timeInDay - delta < midnight && timeInDay >= midnight) {
- long tick = day * DAY_LENGTH + midnight;
+ long tick = day * WorldTime.DAY_LENGTH + midnight;
getWorldEntity().send(new OnMidnightEvent(tick));
}
if (timeInDay - delta < dawn && timeInDay >= dawn) {
- long tick = day * DAY_LENGTH + dawn;
+ long tick = day * WorldTime.DAY_LENGTH + dawn;
getWorldEntity().send(new OnDawnEvent(tick));
}
}
diff --git a/engine/src/main/java/org/terasology/world/sun/OnDawnEvent.java b/engine/src/main/java/org/terasology/world/sun/OnDawnEvent.java
index 04999d66b..9786e93e9 100644
--- a/engine/src/main/java/org/terasology/world/sun/OnDawnEvent.java
+++ b/engine/src/main/java/org/terasology/world/sun/OnDawnEvent.java
@@ -1,21 +1,8 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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 org.terasology.world.sun;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.world.sun;
-import org.terasology.world.time.TimeEventBase;
+import org.terasology.engine.world.time.TimeEventBase;
/**
* Sent to a world on dawn (beginning of a new day)
diff --git a/engine/src/main/java/org/terasology/world/sun/OnDuskEvent.java b/engine/src/main/java/org/terasology/world/sun/OnDuskEvent.java
index bc5b22400..31431a908 100644
--- a/engine/src/main/java/org/terasology/world/sun/OnDuskEvent.java
+++ b/engine/src/main/java/org/terasology/world/sun/OnDuskEvent.java
@@ -1,21 +1,8 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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 org.terasology.world.sun;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.world.sun;
-import org.terasology.world.time.TimeEventBase;
+import org.terasology.engine.world.time.TimeEventBase;
/**
* Sent to the world on dusk (half way through the day, when the sun sets)
diff --git a/engine/src/main/java/org/terasology/world/sun/OnMiddayEvent.java b/engine/src/main/java/org/terasology/world/sun/OnMiddayEvent.java
index e3268ef6d..a5c4d3203 100644
--- a/engine/src/main/java/org/terasology/world/sun/OnMiddayEvent.java
+++ b/engine/src/main/java/org/terasology/world/sun/OnMiddayEvent.java
@@ -1,21 +1,8 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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 org.terasology.world.sun;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.world.sun;
-import org.terasology.world.time.TimeEventBase;
+import org.terasology.engine.world.time.TimeEventBase;
/**
* Sent to a world in the middle of daytime
diff --git a/engine/src/main/java/org/terasology/world/sun/OnMidnightEvent.java b/engine/src/main/java/org/terasology/world/sun/OnMidnightEvent.java
index bece8d8e8..b7c270bcb 100644
--- a/engine/src/main/java/org/terasology/world/sun/OnMidnightEvent.java
+++ b/engine/src/main/java/org/terasology/world/sun/OnMidnightEvent.java
@@ -1,21 +1,8 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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 org.terasology.world.sun;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.world.sun;
-import org.terasology.world.time.TimeEventBase;
+import org.terasology.engine.world.time.TimeEventBase;
/**
* Sent to a world at the middle of the night
diff --git a/engine/src/main/java/org/terasology/world/sun/package-info.java b/engine/src/main/java/org/terasology/world/sun/package-info.java
index 1ccc68faa..7c4235fb8 100644
--- a/engine/src/main/java/org/terasology/world/sun/package-info.java
+++ b/engine/src/main/java/org/terasology/world/sun/package-info.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-@API package org.terasology.world.sun;
+@API package org.terasology.engine.world.sun;
import org.terasology.module.sandbox.API;
diff --git a/engine/src/main/java/org/terasology/world/time/TimeEventBase.java b/engine/src/main/java/org/terasology/world/time/TimeEventBase.java
index 06566d4ad..c448e92c8 100644
--- a/engine/src/main/java/org/terasology/world/time/TimeEventBase.java
+++ b/engine/src/main/java/org/terasology/world/time/TimeEventBase.java
@@ -1,10 +1,10 @@
// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.world.time;
+package org.terasology.engine.world.time;
import com.google.common.math.LongMath;
-import org.terasology.entitySystem.event.Event;
+import org.terasology.engine.entitySystem.event.Event;
/**
* A base class for different timer events
diff --git a/engine/src/main/java/org/terasology/world/time/WorldTime.java b/engine/src/main/java/org/terasology/world/time/WorldTime.java
index 2f59b5274..ec4e92a44 100644
--- a/engine/src/main/java/org/terasology/world/time/WorldTime.java
+++ b/engine/src/main/java/org/terasology/world/time/WorldTime.java
@@ -1,21 +1,8 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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 org.terasology.world.time;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.world.time;
-import org.terasology.entitySystem.systems.ComponentSystem;
+import org.terasology.engine.entitySystem.systems.ComponentSystem;
/**
*/
diff --git a/engine/src/main/java/org/terasology/world/time/WorldTimeEvent.java b/engine/src/main/java/org/terasology/world/time/WorldTimeEvent.java
index 58b5a32ca..3bb2701ea 100644
--- a/engine/src/main/java/org/terasology/world/time/WorldTimeEvent.java
+++ b/engine/src/main/java/org/terasology/world/time/WorldTimeEvent.java
@@ -1,6 +1,6 @@
// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.world.time;
+package org.terasology.engine.world.time;
import com.google.common.base.Preconditions;
import com.google.common.math.DoubleMath;
diff --git a/engine/src/main/java/org/terasology/world/time/WorldTimeImpl.java b/engine/src/main/java/org/terasology/world/time/WorldTimeImpl.java
index 10b902476..d2165a822 100644
--- a/engine/src/main/java/org/terasology/world/time/WorldTimeImpl.java
+++ b/engine/src/main/java/org/terasology/world/time/WorldTimeImpl.java
@@ -1,14 +1,14 @@
// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.world.time;
+package org.terasology.engine.world.time;
-import org.terasology.engine.Time;
-import org.terasology.entitySystem.entity.EntityManager;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.entitySystem.systems.BaseComponentSystem;
-import org.terasology.entitySystem.systems.UpdateSubscriberSystem;
-import org.terasology.registry.In;
-import org.terasology.world.WorldComponent;
+import org.terasology.engine.core.Time;
+import org.terasology.engine.entitySystem.entity.EntityManager;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.systems.BaseComponentSystem;
+import org.terasology.engine.entitySystem.systems.UpdateSubscriberSystem;
+import org.terasology.engine.registry.In;
+import org.terasology.engine.world.WorldComponent;
import java.util.concurrent.atomic.AtomicLong;
diff --git a/engine/src/main/java/org/terasology/world/time/package-info.java b/engine/src/main/java/org/terasology/world/time/package-info.java
index 98c9d3efa..e803393ae 100644
--- a/engine/src/main/java/org/terasology/world/time/package-info.java
+++ b/engine/src/main/java/org/terasology/world/time/package-info.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-@API package org.terasology.world.time;
+@API package org.terasology.engine.world.time;
import org.terasology.module.sandbox.API;
diff --git a/engine/src/main/java/org/terasology/world/viewer/TileThreadFactory.java b/engine/src/main/java/org/terasology/world/viewer/TileThreadFactory.java
index 2db2a96ab..24e9c5d84 100644
--- a/engine/src/main/java/org/terasology/world/viewer/TileThreadFactory.java
+++ b/engine/src/main/java/org/terasology/world/viewer/TileThreadFactory.java
@@ -1,20 +1,7 @@
-/*
- * Copyright 2015 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.world.viewer;
+package org.terasology.engine.world.viewer;
import java.util.concurrent.ThreadFactory;
import java.util.concurrent.atomic.AtomicInteger;
diff --git a/engine/src/main/java/org/terasology/world/viewer/color/ColorBlender.java b/engine/src/main/java/org/terasology/world/viewer/color/ColorBlender.java
index edc899199..bbc9f11b3 100644
--- a/engine/src/main/java/org/terasology/world/viewer/color/ColorBlender.java
+++ b/engine/src/main/java/org/terasology/world/viewer/color/ColorBlender.java
@@ -1,20 +1,7 @@
-/*
- * Copyright 2015 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.world.viewer.color;
+package org.terasology.engine.world.viewer.color;
/**
diff --git a/engine/src/main/java/org/terasology/world/viewer/color/ColorBlenderArgb.java b/engine/src/main/java/org/terasology/world/viewer/color/ColorBlenderArgb.java
index 23d8da390..e51eaaf66 100644
--- a/engine/src/main/java/org/terasology/world/viewer/color/ColorBlenderArgb.java
+++ b/engine/src/main/java/org/terasology/world/viewer/color/ColorBlenderArgb.java
@@ -1,20 +1,7 @@
-/*
- * Copyright 2015 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.world.viewer.color;
+package org.terasology.engine.world.viewer.color;
diff --git a/engine/src/main/java/org/terasology/world/viewer/color/ColorBlenderRgba.java b/engine/src/main/java/org/terasology/world/viewer/color/ColorBlenderRgba.java
index 1dd7a7e16..41134b174 100644
--- a/engine/src/main/java/org/terasology/world/viewer/color/ColorBlenderRgba.java
+++ b/engine/src/main/java/org/terasology/world/viewer/color/ColorBlenderRgba.java
@@ -1,20 +1,7 @@
-/*
- * Copyright 2015 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.world.viewer.color;
+package org.terasology.engine.world.viewer.color;
diff --git a/engine/src/main/java/org/terasology/world/viewer/color/ColorBlenders.java b/engine/src/main/java/org/terasology/world/viewer/color/ColorBlenders.java
index a711831a8..76a7ee5b7 100644
--- a/engine/src/main/java/org/terasology/world/viewer/color/ColorBlenders.java
+++ b/engine/src/main/java/org/terasology/world/viewer/color/ColorBlenders.java
@@ -1,20 +1,7 @@
-/*
- * Copyright 2015 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.world.viewer.color;
+package org.terasology.engine.world.viewer.color;
import java.awt.image.ColorModel;
diff --git a/engine/src/main/java/org/terasology/world/viewer/color/ColorModels.java b/engine/src/main/java/org/terasology/world/viewer/color/ColorModels.java
index 08d5d49e1..5530cd30b 100644
--- a/engine/src/main/java/org/terasology/world/viewer/color/ColorModels.java
+++ b/engine/src/main/java/org/terasology/world/viewer/color/ColorModels.java
@@ -1,20 +1,7 @@
-/*
- * Copyright 2015 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.world.viewer.color;
+package org.terasology.engine.world.viewer.color;
import java.awt.image.DirectColorModel;
diff --git a/engine/src/main/java/org/terasology/world/viewer/color/package-info.java b/engine/src/main/java/org/terasology/world/viewer/color/package-info.java
index 4fe3c6934..944cc6fa3 100644
--- a/engine/src/main/java/org/terasology/world/viewer/color/package-info.java
+++ b/engine/src/main/java/org/terasology/world/viewer/color/package-info.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2015 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-@API package org.terasology.world.viewer.color;
+@API package org.terasology.engine.world.viewer.color;
import org.terasology.module.sandbox.API;
diff --git a/engine/src/main/java/org/terasology/world/viewer/layers/AbstractFacetLayer.java b/engine/src/main/java/org/terasology/world/viewer/layers/AbstractFacetLayer.java
index 7f7d4c24d..020cea1b5 100644
--- a/engine/src/main/java/org/terasology/world/viewer/layers/AbstractFacetLayer.java
+++ b/engine/src/main/java/org/terasology/world/viewer/layers/AbstractFacetLayer.java
@@ -1,10 +1,10 @@
// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.world.viewer.layers;
+package org.terasology.engine.world.viewer.layers;
-import org.terasology.engine.Observer;
-import org.terasology.world.generation.WorldFacet;
+import org.terasology.engine.core.Observer;
+import org.terasology.engine.world.generation.WorldFacet;
import java.util.Collection;
import java.util.concurrent.CopyOnWriteArrayList;
diff --git a/engine/src/main/java/org/terasology/world/viewer/layers/FacetLayer.java b/engine/src/main/java/org/terasology/world/viewer/layers/FacetLayer.java
index 40598094d..4a9059d42 100644
--- a/engine/src/main/java/org/terasology/world/viewer/layers/FacetLayer.java
+++ b/engine/src/main/java/org/terasology/world/viewer/layers/FacetLayer.java
@@ -1,11 +1,11 @@
// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.world.viewer.layers;
+package org.terasology.engine.world.viewer.layers;
-import org.terasology.engine.Observer;
+import org.terasology.engine.core.Observer;
+import org.terasology.engine.world.generation.Region;
import org.terasology.nui.Color;
-import org.terasology.world.generation.Region;
import java.awt.image.BufferedImage;
diff --git a/engine/src/main/java/org/terasology/world/viewer/layers/FacetLayerConfig.java b/engine/src/main/java/org/terasology/world/viewer/layers/FacetLayerConfig.java
index 3b9e4872c..7d78b05c1 100644
--- a/engine/src/main/java/org/terasology/world/viewer/layers/FacetLayerConfig.java
+++ b/engine/src/main/java/org/terasology/world/viewer/layers/FacetLayerConfig.java
@@ -1,20 +1,7 @@
-/*
- * Copyright 2015 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.world.viewer.layers;
+package org.terasology.engine.world.viewer.layers;
import org.terasology.module.sandbox.API;
diff --git a/engine/src/main/java/org/terasology/world/viewer/layers/FacetLayers.java b/engine/src/main/java/org/terasology/world/viewer/layers/FacetLayers.java
index cbda8c77a..3027401ed 100644
--- a/engine/src/main/java/org/terasology/world/viewer/layers/FacetLayers.java
+++ b/engine/src/main/java/org/terasology/world/viewer/layers/FacetLayers.java
@@ -1,12 +1,12 @@
// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.world.viewer.layers;
+package org.terasology.engine.world.viewer.layers;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.terasology.engine.world.generation.WorldFacet;
import org.terasology.module.ModuleEnvironment;
-import org.terasology.world.generation.WorldFacet;
import java.lang.reflect.Modifier;
import java.util.ArrayList;
diff --git a/engine/src/main/java/org/terasology/world/viewer/layers/FieldFacetLayer.java b/engine/src/main/java/org/terasology/world/viewer/layers/FieldFacetLayer.java
index 18ff79a22..6d65aae7b 100644
--- a/engine/src/main/java/org/terasology/world/viewer/layers/FieldFacetLayer.java
+++ b/engine/src/main/java/org/terasology/world/viewer/layers/FieldFacetLayer.java
@@ -1,17 +1,17 @@
// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.world.viewer.layers;
+package org.terasology.engine.world.viewer.layers;
import com.google.common.base.Preconditions;
import com.google.common.math.DoubleMath;
+import org.terasology.engine.world.generation.Region;
+import org.terasology.engine.world.generation.facets.base.FieldFacet2D;
import org.terasology.math.TeraMath;
import org.terasology.nui.Color;
-import org.terasology.world.generation.Region;
-import org.terasology.world.generation.facets.base.FieldFacet2D;
-import org.terasology.world.viewer.color.ColorBlender;
-import org.terasology.world.viewer.color.ColorBlenders;
-import org.terasology.world.viewer.color.ColorModels;
+import org.terasology.engine.world.viewer.color.ColorBlender;
+import org.terasology.engine.world.viewer.color.ColorBlenders;
+import org.terasology.engine.world.viewer.color.ColorModels;
import java.awt.image.BufferedImage;
import java.awt.image.ColorModel;
diff --git a/engine/src/main/java/org/terasology/world/viewer/layers/NominalFacetLayer.java b/engine/src/main/java/org/terasology/world/viewer/layers/NominalFacetLayer.java
index 29a33738a..7755f7626 100644
--- a/engine/src/main/java/org/terasology/world/viewer/layers/NominalFacetLayer.java
+++ b/engine/src/main/java/org/terasology/world/viewer/layers/NominalFacetLayer.java
@@ -1,27 +1,14 @@
-/*
- * Copyright 2014 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.world.viewer.layers;
+package org.terasology.engine.world.viewer.layers;
+import org.terasology.engine.world.generation.Region;
+import org.terasology.engine.world.generation.facets.base.ObjectFacet2D;
import org.terasology.nui.Color;
-import org.terasology.world.generation.Region;
-import org.terasology.world.generation.facets.base.ObjectFacet2D;
-import org.terasology.world.viewer.color.ColorBlender;
-import org.terasology.world.viewer.color.ColorBlenders;
-import org.terasology.world.viewer.color.ColorModels;
+import org.terasology.engine.world.viewer.color.ColorBlender;
+import org.terasology.engine.world.viewer.color.ColorBlenders;
+import org.terasology.engine.world.viewer.color.ColorModels;
import java.awt.image.BufferedImage;
import java.awt.image.ColorModel;
diff --git a/engine/src/main/java/org/terasology/world/viewer/layers/Renders.java b/engine/src/main/java/org/terasology/world/viewer/layers/Renders.java
index c338b3721..1210d3d89 100644
--- a/engine/src/main/java/org/terasology/world/viewer/layers/Renders.java
+++ b/engine/src/main/java/org/terasology/world/viewer/layers/Renders.java
@@ -1,8 +1,8 @@
// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.world.viewer.layers;
+package org.terasology.engine.world.viewer.layers;
-import org.terasology.world.generation.WorldFacet;
+import org.terasology.engine.world.generation.WorldFacet;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
diff --git a/engine/src/main/java/org/terasology/world/viewer/layers/ZOrder.java b/engine/src/main/java/org/terasology/world/viewer/layers/ZOrder.java
index c2a42da44..c7480f8ed 100644
--- a/engine/src/main/java/org/terasology/world/viewer/layers/ZOrder.java
+++ b/engine/src/main/java/org/terasology/world/viewer/layers/ZOrder.java
@@ -1,20 +1,7 @@
-/*
- * Copyright 2015 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.world.viewer.layers;
+package org.terasology.engine.world.viewer.layers;
/**
* Rendering hint that is used in Painter's algorithm.
diff --git a/engine/src/main/java/org/terasology/world/viewer/layers/engine/ElevationFacetLayer.java b/engine/src/main/java/org/terasology/world/viewer/layers/engine/ElevationFacetLayer.java
index 38d0b96f0..c37d0b380 100644
--- a/engine/src/main/java/org/terasology/world/viewer/layers/engine/ElevationFacetLayer.java
+++ b/engine/src/main/java/org/terasology/world/viewer/layers/engine/ElevationFacetLayer.java
@@ -1,25 +1,12 @@
-/*
- * Copyright 2015 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.world.viewer.layers.engine;
+package org.terasology.engine.world.viewer.layers.engine;
-import org.terasology.world.generation.facets.ElevationFacet;
-import org.terasology.world.viewer.layers.FieldFacetLayer;
-import org.terasology.world.viewer.layers.Renders;
-import org.terasology.world.viewer.layers.ZOrder;
+import org.terasology.engine.world.generation.facets.ElevationFacet;
+import org.terasology.engine.world.viewer.layers.FieldFacetLayer;
+import org.terasology.engine.world.viewer.layers.Renders;
+import org.terasology.engine.world.viewer.layers.ZOrder;
/**
* Provides information about the surface height level.
diff --git a/engine/src/main/java/org/terasology/world/viewer/layers/engine/SeaLevelFacetLayer.java b/engine/src/main/java/org/terasology/world/viewer/layers/engine/SeaLevelFacetLayer.java
index c52044328..02e1bc98f 100644
--- a/engine/src/main/java/org/terasology/world/viewer/layers/engine/SeaLevelFacetLayer.java
+++ b/engine/src/main/java/org/terasology/world/viewer/layers/engine/SeaLevelFacetLayer.java
@@ -1,12 +1,12 @@
// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.world.viewer.layers.engine;
+package org.terasology.engine.world.viewer.layers.engine;
-import org.terasology.world.generation.Region;
-import org.terasology.world.generation.facets.SeaLevelFacet;
-import org.terasology.world.viewer.layers.AbstractFacetLayer;
-import org.terasology.world.viewer.layers.Renders;
+import org.terasology.engine.world.generation.Region;
+import org.terasology.engine.world.generation.facets.SeaLevelFacet;
+import org.terasology.engine.world.viewer.layers.AbstractFacetLayer;
+import org.terasology.engine.world.viewer.layers.Renders;
import java.awt.image.BufferedImage;
diff --git a/engine/src/main/java/org/terasology/world/viewer/layers/engine/SurfaceHumidityFacetLayer.java b/engine/src/main/java/org/terasology/world/viewer/layers/engine/SurfaceHumidityFacetLayer.java
index 49ae63484..124eb6908 100644
--- a/engine/src/main/java/org/terasology/world/viewer/layers/engine/SurfaceHumidityFacetLayer.java
+++ b/engine/src/main/java/org/terasology/world/viewer/layers/engine/SurfaceHumidityFacetLayer.java
@@ -1,25 +1,12 @@
-/*
- * Copyright 2015 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.world.viewer.layers.engine;
+package org.terasology.engine.world.viewer.layers.engine;
-import org.terasology.world.generation.facets.SurfaceHumidityFacet;
-import org.terasology.world.viewer.layers.FieldFacetLayer;
-import org.terasology.world.viewer.layers.Renders;
-import org.terasology.world.viewer.layers.ZOrder;
+import org.terasology.engine.world.generation.facets.SurfaceHumidityFacet;
+import org.terasology.engine.world.viewer.layers.FieldFacetLayer;
+import org.terasology.engine.world.viewer.layers.Renders;
+import org.terasology.engine.world.viewer.layers.ZOrder;
/**
* Provides information about the surface humidity.
diff --git a/engine/src/main/java/org/terasology/world/viewer/layers/engine/SurfaceTemperatureFacetLayer.java b/engine/src/main/java/org/terasology/world/viewer/layers/engine/SurfaceTemperatureFacetLayer.java
index 1fe266b83..a039d04e7 100644
--- a/engine/src/main/java/org/terasology/world/viewer/layers/engine/SurfaceTemperatureFacetLayer.java
+++ b/engine/src/main/java/org/terasology/world/viewer/layers/engine/SurfaceTemperatureFacetLayer.java
@@ -1,25 +1,12 @@
-/*
- * Copyright 2015 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-package org.terasology.world.viewer.layers.engine;
+package org.terasology.engine.world.viewer.layers.engine;
-import org.terasology.world.generation.facets.SurfaceTemperatureFacet;
-import org.terasology.world.viewer.layers.FieldFacetLayer;
-import org.terasology.world.viewer.layers.Renders;
-import org.terasology.world.viewer.layers.ZOrder;
+import org.terasology.engine.world.generation.facets.SurfaceTemperatureFacet;
+import org.terasology.engine.world.viewer.layers.FieldFacetLayer;
+import org.terasology.engine.world.viewer.layers.Renders;
+import org.terasology.engine.world.viewer.layers.ZOrder;
/**
* Provides information about the surface temperature.
diff --git a/engine/src/main/java/org/terasology/world/viewer/layers/engine/package-info.java b/engine/src/main/java/org/terasology/world/viewer/layers/engine/package-info.java
index 07c19386d..8e2189d69 100644
--- a/engine/src/main/java/org/terasology/world/viewer/layers/engine/package-info.java
+++ b/engine/src/main/java/org/terasology/world/viewer/layers/engine/package-info.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2015 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-@API package org.terasology.world.viewer.layers.engine;
+@API package org.terasology.engine.world.viewer.layers.engine;
import org.terasology.module.sandbox.API;
diff --git a/engine/src/main/java/org/terasology/world/viewer/layers/package-info.java b/engine/src/main/java/org/terasology/world/viewer/layers/package-info.java
index e615f6fa5..7fc02af3c 100644
--- a/engine/src/main/java/org/terasology/world/viewer/layers/package-info.java
+++ b/engine/src/main/java/org/terasology/world/viewer/layers/package-info.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2015 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
-@API package org.terasology.world.viewer.layers;
+@API package org.terasology.engine.world.viewer.layers;
import org.terasology.module.sandbox.API;
diff --git a/engine/src/main/java/org/terasology/world/viewer/picker/CirclePicker.java b/engine/src/main/java/org/terasology/world/viewer/picker/CirclePicker.java
index 7edd78310..81555ee6b 100644
--- a/engine/src/main/java/org/terasology/world/viewer/picker/CirclePicker.java
+++ b/engine/src/main/java/org/terasology/world/viewer/picker/CirclePicker.java
@@ -1,7 +1,7 @@
// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.world.viewer.picker;
+package org.terasology.engine.world.viewer.picker;
import org.joml.Vector2fc;
diff --git a/engine/src/main/java/org/terasology/world/viewer/picker/CirclePickerAll.java b/engine/src/main/java/org/terasology/world/viewer/picker/CirclePickerAll.java
index 2b2ab0dfa..22fb644dd 100644
--- a/engine/src/main/java/org/terasology/world/viewer/picker/CirclePickerAll.java
+++ b/engine/src/main/java/org/terasology/world/viewer/picker/CirclePickerAll.java
@@ -1,7 +1,7 @@
// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.world.viewer.picker;
+package org.terasology.engine.world.viewer.picker;
import org.joml.Vector2fc;
diff --git a/engine/src/main/java/org/terasology/world/viewer/picker/CirclePickerClosest.java b/engine/src/main/java/org/terasology/world/viewer/picker/CirclePickerClosest.java
index 2c047a971..c3c375896 100644
--- a/engine/src/main/java/org/terasology/world/viewer/picker/CirclePickerClosest.java
+++ b/engine/src/main/java/org/terasology/world/viewer/picker/CirclePickerClosest.java
@@ -1,7 +1,7 @@
// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.world.viewer.picker;
+package org.terasology.engine.world.viewer.picker;
import org.joml.Vector2fc;
diff --git a/engine/src/main/java/org/terasology/world/viewer/picker/package-info.java b/engine/src/main/java/org/terasology/world/viewer/picker/package-info.java
index 34b7dec53..70ca627f8 100644
--- a/engine/src/main/java/org/terasology/world/viewer/picker/package-info.java
+++ b/engine/src/main/java/org/terasology/world/viewer/picker/package-info.java
@@ -1,6 +1,6 @@
// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-@API package org.terasology.world.viewer.picker;
+@API package org.terasology.engine.world.viewer.picker;
import org.terasology.module.sandbox.API;
diff --git a/engine/src/main/java/org/terasology/world/zones/ConstantLayerThickness.java b/engine/src/main/java/org/terasology/world/zones/ConstantLayerThickness.java
index 34b5953d8..0aac3520b 100644
--- a/engine/src/main/java/org/terasology/world/zones/ConstantLayerThickness.java
+++ b/engine/src/main/java/org/terasology/world/zones/ConstantLayerThickness.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2017 MovingBlocks
- *
- * 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 org.terasology.world.zones;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.world.zones;
import org.terasology.module.sandbox.API;
diff --git a/engine/src/main/java/org/terasology/world/zones/LayerThickness.java b/engine/src/main/java/org/terasology/world/zones/LayerThickness.java
index 5399dcd95..c41e6e5dc 100644
--- a/engine/src/main/java/org/terasology/world/zones/LayerThickness.java
+++ b/engine/src/main/java/org/terasology/world/zones/LayerThickness.java
@@ -1,19 +1,6 @@
-/*
- * Copyright 2017 MovingBlocks
- *
- * 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 org.terasology.world.zones;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.world.zones;
import org.terasology.module.sandbox.API;
diff --git a/engine/src/main/java/org/terasology/world/zones/LayeredZoneRegionFunction.java b/engine/src/main/java/org/terasology/world/zones/LayeredZoneRegionFunction.java
index ea0663ae7..05c1b708b 100644
--- a/engine/src/main/java/org/terasology/world/zones/LayeredZoneRegionFunction.java
+++ b/engine/src/main/java/org/terasology/world/zones/LayeredZoneRegionFunction.java
@@ -1,12 +1,12 @@
// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
-package org.terasology.world.zones;
+package org.terasology.engine.world.zones;
import org.joml.Vector2i;
+import org.terasology.engine.world.chunks.Chunks;
+import org.terasology.engine.world.generation.Region;
+import org.terasology.engine.world.generation.facets.ElevationFacet;
import org.terasology.module.sandbox.API;
-import org.terasology.world.chunks.Chunks;
-import org.terasology.world.generation.Region;
-import org.terasology.world.generation.facets.ElevationFacet;
import java.util.Comparator;
import java.util.List;
diff --git a/engine/src/main/java/org/terasology/world/zones/MinMaxLayerThickness.java b/engine/src/main/java/org/terasology/world/zones/MinMaxLayerThickness.java
index 1f4253456..5327cc2b6 100644
--- a/engine/src/main/java/org/terasology/world/zones/MinMaxLayerThickness.java
+++ b/engine/src/main/java/org/terasology/world/zones/MinMaxLayerThickness.java
@@ -1,23 +1,10 @@
-/*
- * Copyright 2017 MovingBlocks
- *
- * 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 org.terasology.world.zones;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.world.zones;
import org.terasology.module.sandbox.API;
-import org.terasology.utilities.procedural.BrownianNoise;
-import org.terasology.utilities.procedural.SimplexNoise;
+import org.terasology.engine.utilities.procedural.BrownianNoise;
+import org.terasology.engine.utilities.procedural.SimplexNoise;
/**
* A {@link LayerThickness} that picks the thickness at each point by selecting a value between the minimum and maximum.
diff --git a/engine/src/main/java/org/terasology/world/zones/ProviderStore.java b/engine/src/main/java/org/terasology/world/zones/ProviderStore.java
index 6d2f3237a..47d66e3ab 100644
--- a/engine/src/main/java/org/terasology/world/zones/ProviderStore.java
+++ b/engine/src/main/java/org/terasology/world/zones/ProviderStore.java
@@ -1,25 +1,12 @@
-/*
- * Copyright 2017 MovingBlocks
- *
- * 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 org.terasology.world.zones;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.world.zones;
import com.google.common.collect.ImmutableList;
-import org.terasology.world.generation.EntityProvider;
-import org.terasology.world.generation.FacetProvider;
-import org.terasology.world.generation.WorldBuilder;
-import org.terasology.world.generation.WorldRasterizer;
+import org.terasology.engine.world.generation.EntityProvider;
+import org.terasology.engine.world.generation.FacetProvider;
+import org.terasology.engine.world.generation.WorldBuilder;
+import org.terasology.engine.world.generation.WorldRasterizer;
import java.util.ArrayList;
import java.util.List;
diff --git a/engine/src/main/java/org/terasology/world/zones/SeededNoiseLayerThickness.java b/engine/src/main/java/org/terasology/world/zones/SeededNoiseLayerThickness.java
index 796c4f5c0..559a1c6e2 100644
--- a/engine/src/main/java/org/terasology/world/zones/SeededNoiseLayerThickness.java
+++ b/engine/src/main/java/org/terasology/world/zones/SeededNoiseLayerThickness.java
@@ -1,22 +1,9 @@
-/*
- * Copyright 2017 MovingBlocks
- *
- * 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 org.terasology.world.zones;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.world.zones;
import org.terasology.module.sandbox.API;
-import org.terasology.utilities.procedural.Noise;
+import org.terasology.engine.utilities.procedural.Noise;
import java.util.function.LongFunction;
diff --git a/engine/src/main/java/org/terasology/world/zones/SingleBlockRasterizer.java b/engine/src/main/java/org/terasology/world/zones/SingleBlockRasterizer.java
index 04a8cefa9..1b575ec44 100644
--- a/engine/src/main/java/org/terasology/world/zones/SingleBlockRasterizer.java
+++ b/engine/src/main/java/org/terasology/world/zones/SingleBlockRasterizer.java
@@ -1,27 +1,14 @@
-/*
- * Copyright 2017 MovingBlocks
- *
- * 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 org.terasology.world.zones;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.world.zones;
+import org.terasology.engine.world.chunks.CoreChunk;
+import org.terasology.engine.world.generation.Region;
+import org.terasology.engine.world.generation.WorldRasterizer;
import org.terasology.module.sandbox.API;
-import org.terasology.registry.CoreRegistry;
-import org.terasology.world.block.Block;
-import org.terasology.world.block.BlockManager;
-import org.terasology.world.chunks.CoreChunk;
-import org.terasology.world.generation.Region;
-import org.terasology.world.generation.WorldRasterizer;
+import org.terasology.engine.registry.CoreRegistry;
+import org.terasology.engine.world.block.Block;
+import org.terasology.engine.world.block.BlockManager;
/**
* A rasterizer that will fill the whole area with the given block.
diff --git a/engine/src/main/java/org/terasology/world/zones/Zone.java b/engine/src/main/java/org/terasology/world/zones/Zone.java
index dc4d8636f..ceb18c7d8 100644
--- a/engine/src/main/java/org/terasology/world/zones/Zone.java
+++ b/engine/src/main/java/org/terasology/world/zones/Zone.java
@@ -1,36 +1,23 @@
-/*
- * Copyright 2017 MovingBlocks
- *
- * 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 org.terasology.world.zones;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.world.zones;
import org.joml.Vector3i;
import org.joml.Vector3ic;
+import org.terasology.engine.world.chunks.Chunks;
+import org.terasology.engine.world.chunks.CoreChunk;
+import org.terasology.engine.world.generation.EntityBuffer;
+import org.terasology.engine.world.generation.EntityProvider;
+import org.terasology.engine.world.generation.FacetProvider;
+import org.terasology.engine.world.generation.Region;
+import org.terasology.engine.world.generation.WorldBuilder;
+import org.terasology.engine.world.generation.WorldRasterizer;
+import org.terasology.engine.world.generator.WorldGenerator;
+import org.terasology.engine.world.viewer.layers.FacetLayer;
import org.terasology.module.sandbox.API;
-import org.terasology.rendering.nui.layers.mainMenu.preview.FacetLayerPreview;
-import org.terasology.rendering.nui.layers.mainMenu.preview.PreviewGenerator;
-import org.terasology.world.block.Block;
-import org.terasology.world.chunks.Chunks;
-import org.terasology.world.chunks.CoreChunk;
-import org.terasology.world.generation.EntityBuffer;
-import org.terasology.world.generation.EntityProvider;
-import org.terasology.world.generation.FacetProvider;
-import org.terasology.world.generation.Region;
-import org.terasology.world.generation.WorldBuilder;
-import org.terasology.world.generation.WorldRasterizer;
-import org.terasology.world.generator.WorldGenerator;
-import org.terasology.world.viewer.layers.FacetLayer;
+import org.terasology.engine.rendering.nui.layers.mainMenu.preview.FacetLayerPreview;
+import org.terasology.engine.rendering.nui.layers.mainMenu.preview.PreviewGenerator;
+import org.terasology.engine.world.block.Block;
import java.util.ArrayList;
import java.util.List;
diff --git a/engine/src/main/java/org/terasology/world/zones/ZonePlugin.java b/engine/src/main/java/org/terasology/world/zones/ZonePlugin.java
index 7c8c6e93d..289afe1e3 100644
--- a/engine/src/main/java/org/terasology/world/zones/ZonePlugin.java
+++ b/engine/src/main/java/org/terasology/world/zones/ZonePlugin.java
@@ -1,24 +1,11 @@
-/*
- * Copyright 2017 MovingBlocks
- *
- * 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 org.terasology.world.zones;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.world.zones;
import org.joml.Vector3ic;
+import org.terasology.engine.world.generation.Region;
+import org.terasology.engine.world.generator.plugin.WorldGeneratorPlugin;
import org.terasology.module.sandbox.API;
-import org.terasology.world.generation.Region;
-import org.terasology.world.generator.plugin.WorldGeneratorPlugin;
import java.util.function.BiPredicate;
import java.util.function.BooleanSupplier;
diff --git a/engine/src/main/java/org/terasology/world/zones/ZoneRegionFunction.java b/engine/src/main/java/org/terasology/world/zones/ZoneRegionFunction.java
index 5d811ed66..6b7608c60 100644
--- a/engine/src/main/java/org/terasology/world/zones/ZoneRegionFunction.java
+++ b/engine/src/main/java/org/terasology/world/zones/ZoneRegionFunction.java
@@ -1,22 +1,9 @@
-/*
- * Copyright 2017 MovingBlocks
- *
- * 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 org.terasology.world.zones;
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+package org.terasology.engine.world.zones;
+import org.terasology.engine.world.generation.Region;
import org.terasology.module.sandbox.API;
-import org.terasology.world.generation.Region;
/**
* The ZoneRegionFunction determines which blocks are part of a given region.
diff --git a/facades/PC/src/main/java/org/terasology/engine/GLFWSplashScreen.java b/facades/PC/src/main/java/org/terasology/engine/GLFWSplashScreen.java
index 9a67046a8..d2a2ffa51 100644
--- a/facades/PC/src/main/java/org/terasology/engine/GLFWSplashScreen.java
+++ b/facades/PC/src/main/java/org/terasology/engine/GLFWSplashScreen.java
@@ -6,6 +6,7 @@ package org.terasology.engine;
import org.lwjgl.BufferUtils;
import org.lwjgl.glfw.GLFW;
import org.lwjgl.opengl.GL11;
+import org.terasology.engine.core.TerasologyEngineStatus;
import org.terasology.splash.SplashScreen;
import org.terasology.splash.glfw.graphics.Color;
import org.terasology.splash.glfw.graphics.Renderer;
diff --git a/facades/PC/src/main/java/org/terasology/engine/Terasology.java b/facades/PC/src/main/java/org/terasology/engine/Terasology.java
index 608b9fd22..a0f311cfc 100644
--- a/facades/PC/src/main/java/org/terasology/engine/Terasology.java
+++ b/facades/PC/src/main/java/org/terasology/engine/Terasology.java
@@ -7,33 +7,38 @@ import com.google.common.base.Joiner;
import com.google.common.collect.ImmutableList;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.terasology.config.Config;
-import org.terasology.config.SystemConfig;
import org.terasology.crashreporter.CrashReporter;
-import org.terasology.engine.modes.StateLoading;
-import org.terasology.engine.modes.StateMainMenu;
-import org.terasology.engine.paths.PathManager;
-import org.terasology.engine.subsystem.EngineSubsystem;
-import org.terasology.engine.subsystem.common.ConfigurationSubsystem;
-import org.terasology.engine.subsystem.common.ThreadManager;
-import org.terasology.engine.subsystem.common.hibernation.HibernationSubsystem;
-import org.terasology.engine.subsystem.config.BindsSubsystem;
+import org.terasology.engine.config.Config;
+import org.terasology.engine.config.SystemConfig;
+import org.terasology.engine.core.LoggingContext;
+import org.terasology.engine.core.StandardGameStatus;
+import org.terasology.engine.core.TerasologyConstants;
+import org.terasology.engine.core.TerasologyEngine;
+import org.terasology.engine.core.TerasologyEngineBuilder;
+import org.terasology.engine.core.modes.StateLoading;
+import org.terasology.engine.core.modes.StateMainMenu;
+import org.terasology.engine.core.paths.PathManager;
+import org.terasology.engine.core.subsystem.EngineSubsystem;
+import org.terasology.engine.core.subsystem.common.ConfigurationSubsystem;
+import org.terasology.engine.core.subsystem.common.ThreadManager;
+import org.terasology.engine.core.subsystem.common.hibernation.HibernationSubsystem;
+import org.terasology.engine.core.subsystem.config.BindsSubsystem;
+import org.terasology.engine.core.subsystem.headless.HeadlessAudio;
+import org.terasology.engine.core.subsystem.headless.HeadlessGraphics;
+import org.terasology.engine.core.subsystem.headless.HeadlessInput;
+import org.terasology.engine.core.subsystem.headless.HeadlessTimer;
+import org.terasology.engine.core.subsystem.headless.mode.HeadlessStateChangeListener;
+import org.terasology.engine.core.subsystem.headless.mode.StateHeadlessSetup;
+import org.terasology.engine.core.subsystem.lwjgl.LwjglAudio;
+import org.terasology.engine.core.subsystem.lwjgl.LwjglGraphics;
+import org.terasology.engine.core.subsystem.lwjgl.LwjglInput;
+import org.terasology.engine.core.subsystem.lwjgl.LwjglTimer;
+import org.terasology.engine.core.subsystem.openvr.OpenVRInput;
+import org.terasology.engine.game.GameManifest;
+import org.terasology.engine.network.NetworkMode;
+import org.terasology.engine.rendering.nui.layers.mainMenu.savedGames.GameInfo;
+import org.terasology.engine.rendering.nui.layers.mainMenu.savedGames.GameProvider;
import org.terasology.engine.subsystem.discordrpc.DiscordRPCSubSystem;
-import org.terasology.engine.subsystem.headless.HeadlessAudio;
-import org.terasology.engine.subsystem.headless.HeadlessGraphics;
-import org.terasology.engine.subsystem.headless.HeadlessInput;
-import org.terasology.engine.subsystem.headless.HeadlessTimer;
-import org.terasology.engine.subsystem.headless.mode.HeadlessStateChangeListener;
-import org.terasology.engine.subsystem.headless.mode.StateHeadlessSetup;
-import org.terasology.engine.subsystem.lwjgl.LwjglAudio;
-import org.terasology.engine.subsystem.lwjgl.LwjglGraphics;
-import org.terasology.engine.subsystem.lwjgl.LwjglInput;
-import org.terasology.engine.subsystem.lwjgl.LwjglTimer;
-import org.terasology.engine.subsystem.openvr.OpenVRInput;
-import org.terasology.game.GameManifest;
-import org.terasology.network.NetworkMode;
-import org.terasology.rendering.nui.layers.mainMenu.savedGames.GameInfo;
-import org.terasology.rendering.nui.layers.mainMenu.savedGames.GameProvider;
import org.terasology.splash.SplashScreen;
import org.terasology.splash.SplashScreenBuilder;
diff --git a/facades/TeraEd/src/main/java/org/terasology/editor/TeraEd.java b/facades/TeraEd/src/main/java/org/terasology/editor/TeraEd.java
index 361140854..31c3f0c27 100644
--- a/facades/TeraEd/src/main/java/org/terasology/editor/TeraEd.java
+++ b/facades/TeraEd/src/main/java/org/terasology/editor/TeraEd.java
@@ -11,15 +11,15 @@ import org.terasology.editor.properties.SceneProperties;
import org.terasology.editor.subsystem.AwtInput;
import org.terasology.editor.subsystem.LwjglPortlet;
import org.terasology.editor.ui.MainWindow;
-import org.terasology.engine.GameEngine;
-import org.terasology.engine.TerasologyEngine;
-import org.terasology.engine.TerasologyEngineBuilder;
-import org.terasology.engine.modes.StateMainMenu;
-import org.terasology.engine.paths.PathManager;
-import org.terasology.engine.subsystem.config.BindsSubsystem;
-import org.terasology.engine.subsystem.lwjgl.LwjglAudio;
-import org.terasology.engine.subsystem.lwjgl.LwjglTimer;
-import org.terasology.monitoring.PerformanceMonitor;
+import org.terasology.engine.core.GameEngine;
+import org.terasology.engine.core.TerasologyEngine;
+import org.terasology.engine.core.TerasologyEngineBuilder;
+import org.terasology.engine.core.modes.StateMainMenu;
+import org.terasology.engine.core.paths.PathManager;
+import org.terasology.engine.core.subsystem.config.BindsSubsystem;
+import org.terasology.engine.core.subsystem.lwjgl.LwjglAudio;
+import org.terasology.engine.core.subsystem.lwjgl.LwjglTimer;
+import org.terasology.engine.monitoring.PerformanceMonitor;
import javax.swing.JPopupMenu;
import javax.swing.JWindow;
diff --git a/facades/TeraEd/src/main/java/org/terasology/editor/input/AwtMouseDevice.java b/facades/TeraEd/src/main/java/org/terasology/editor/input/AwtMouseDevice.java
index 482bbd195..1f4fee500 100644
--- a/facades/TeraEd/src/main/java/org/terasology/editor/input/AwtMouseDevice.java
+++ b/facades/TeraEd/src/main/java/org/terasology/editor/input/AwtMouseDevice.java
@@ -9,7 +9,7 @@ import gnu.trove.set.hash.TIntHashSet;
import org.joml.Vector2d;
import org.joml.Vector2i;
import org.lwjgl.opengl.awt.AWTGLCanvas;
-import org.terasology.config.RenderingConfig;
+import org.terasology.engine.config.RenderingConfig;
import org.terasology.input.ButtonState;
import org.terasology.input.InputType;
import org.terasology.input.MouseInput;
diff --git a/facades/TeraEd/src/main/java/org/terasology/editor/properties/ReflectionProvider.java b/facades/TeraEd/src/main/java/org/terasology/editor/properties/ReflectionProvider.java
index da443e9ee..b24e08212 100644
--- a/facades/TeraEd/src/main/java/org/terasology/editor/properties/ReflectionProvider.java
+++ b/facades/TeraEd/src/main/java/org/terasology/editor/properties/ReflectionProvider.java
@@ -19,8 +19,7 @@ import com.google.common.collect.Lists;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.terasology.assets.ResourceUrn;
-import org.terasology.context.Context;
-import org.terasology.engine.SimpleUri;
+import org.terasology.engine.context.Context;
import org.terasology.nui.properties.Range;
import org.terasology.reflection.copy.CopyStrategyLibrary;
import org.terasology.reflection.metadata.ClassMetadata;
diff --git a/facades/TeraEd/src/main/java/org/terasology/editor/properties/SceneProperties.java b/facades/TeraEd/src/main/java/org/terasology/editor/properties/SceneProperties.java
index 542f2253a..e770537af 100644
--- a/facades/TeraEd/src/main/java/org/terasology/editor/properties/SceneProperties.java
+++ b/facades/TeraEd/src/main/java/org/terasology/editor/properties/SceneProperties.java
@@ -16,12 +16,12 @@
package org.terasology.editor.properties;
import com.google.common.collect.Lists;
-import org.terasology.context.Context;
-import org.terasology.engine.TerasologyEngine;
-import org.terasology.engine.modes.GameState;
-import org.terasology.engine.modes.StateIngame;
-import org.terasology.rendering.backdrop.BackdropProvider;
-import org.terasology.rendering.backdrop.BackdropRenderer;
+import org.terasology.engine.context.Context;
+import org.terasology.engine.core.TerasologyEngine;
+import org.terasology.engine.core.modes.GameState;
+import org.terasology.engine.core.modes.StateIngame;
+import org.terasology.engine.rendering.backdrop.BackdropProvider;
+import org.terasology.engine.rendering.backdrop.BackdropRenderer;
import java.util.List;
diff --git a/facades/TeraEd/src/main/java/org/terasology/editor/subsystem/AwtInput.java b/facades/TeraEd/src/main/java/org/terasology/editor/subsystem/AwtInput.java
index 33c745015..a542dca5d 100644
--- a/facades/TeraEd/src/main/java/org/terasology/editor/subsystem/AwtInput.java
+++ b/facades/TeraEd/src/main/java/org/terasology/editor/subsystem/AwtInput.java
@@ -3,16 +3,16 @@
package org.terasology.editor.subsystem;
import org.terasology.assets.module.ModuleAwareAssetTypeManager;
-import org.terasology.config.Config;
-import org.terasology.config.ControllerConfig;
-import org.terasology.context.Context;
+import org.terasology.engine.config.Config;
+import org.terasology.engine.config.ControllerConfig;
+import org.terasology.engine.context.Context;
import org.terasology.editor.input.AwtKeyboardDevice;
import org.terasology.editor.input.AwtMouseDevice;
-import org.terasology.engine.modes.GameState;
-import org.terasology.engine.subsystem.config.BindsManager;
-import org.terasology.engine.subsystem.lwjgl.BaseLwjglSubsystem;
-import org.terasology.input.InputSystem;
-import org.terasology.input.lwjgl.LwjglControllerDevice;
+import org.terasology.engine.core.modes.GameState;
+import org.terasology.engine.core.subsystem.config.BindsManager;
+import org.terasology.engine.core.subsystem.lwjgl.BaseLwjglSubsystem;
+import org.terasology.engine.input.InputSystem;
+import org.terasology.engine.input.lwjgl.LwjglControllerDevice;
public class AwtInput extends BaseLwjglSubsystem {
diff --git a/facades/TeraEd/src/main/java/org/terasology/editor/subsystem/LwjglPortlet.java b/facades/TeraEd/src/main/java/org/terasology/editor/subsystem/LwjglPortlet.java
index e247966dd..c2eddd687 100644
--- a/facades/TeraEd/src/main/java/org/terasology/editor/subsystem/LwjglPortlet.java
+++ b/facades/TeraEd/src/main/java/org/terasology/editor/subsystem/LwjglPortlet.java
@@ -12,29 +12,28 @@ import org.lwjgl.system.MemoryUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.terasology.assets.module.ModuleAwareAssetTypeManager;
-import org.terasology.config.Config;
-import org.terasology.config.RenderingConfig;
-import org.terasology.context.Context;
+import org.terasology.engine.config.Config;
+import org.terasology.engine.config.RenderingConfig;
+import org.terasology.engine.context.Context;
import org.terasology.editor.input.AwtKeyboardDevice;
import org.terasology.editor.input.AwtMouseDevice;
-import org.terasology.engine.GameEngine;
-import org.terasology.engine.GameThread;
-import org.terasology.engine.TerasologyEngine;
-import org.terasology.engine.modes.GameState;
-import org.terasology.engine.subsystem.DisplayDevice;
-import org.terasology.engine.subsystem.lwjgl.BaseLwjglSubsystem;
-import org.terasology.engine.subsystem.lwjgl.DebugCallback;
-import org.terasology.engine.subsystem.lwjgl.GLFWErrorCallback;
-import org.terasology.engine.subsystem.lwjgl.LwjglGraphicsManager;
-import org.terasology.engine.subsystem.lwjgl.LwjglGraphicsUtil;
-import org.terasology.entitySystem.event.internal.EventSystem;
-import org.terasology.input.InputSystem;
+import org.terasology.engine.core.GameEngine;
+import org.terasology.engine.core.GameThread;
+import org.terasology.engine.core.TerasologyEngine;
+import org.terasology.engine.core.modes.GameState;
+import org.terasology.engine.core.subsystem.DisplayDevice;
+import org.terasology.engine.core.subsystem.lwjgl.BaseLwjglSubsystem;
+import org.terasology.engine.core.subsystem.lwjgl.DebugCallback;
+import org.terasology.engine.core.subsystem.lwjgl.GLFWErrorCallback;
+import org.terasology.engine.core.subsystem.lwjgl.LwjglGraphicsManager;
+import org.terasology.engine.core.subsystem.lwjgl.LwjglGraphicsUtil;
+import org.terasology.engine.entitySystem.event.internal.EventSystem;
+import org.terasology.engine.input.InputSystem;
import org.terasology.nui.canvas.CanvasRenderer;
-import org.terasology.registry.CoreRegistry;
-import org.terasology.rendering.ShaderManager;
-import org.terasology.rendering.ShaderManagerLwjgl;
-import org.terasology.rendering.nui.internal.LwjglCanvasRenderer;
-import org.terasology.rendering.world.WorldRenderer;
+import org.terasology.engine.registry.CoreRegistry;
+import org.terasology.engine.rendering.ShaderManager;
+import org.terasology.engine.rendering.ShaderManagerLwjgl;
+import org.terasology.engine.rendering.nui.internal.LwjglCanvasRenderer;
import javax.imageio.ImageIO;
import java.awt.image.BufferedImage;
diff --git a/facades/TeraEd/src/main/java/org/terasology/editor/subsystem/LwjglPortletDisplayDevice.java b/facades/TeraEd/src/main/java/org/terasology/editor/subsystem/LwjglPortletDisplayDevice.java
index b0bc69f2b..cd78fcc9d 100644
--- a/facades/TeraEd/src/main/java/org/terasology/editor/subsystem/LwjglPortletDisplayDevice.java
+++ b/facades/TeraEd/src/main/java/org/terasology/editor/subsystem/LwjglPortletDisplayDevice.java
@@ -5,14 +5,14 @@ package org.terasology.editor.subsystem;
import org.lwjgl.opengl.GL11;
import org.lwjgl.opengl.awt.AWTGLCanvas;
-import org.terasology.engine.subsystem.DisplayDevice;
-import org.terasology.engine.subsystem.DisplayDeviceInfo;
-import org.terasology.engine.subsystem.Resolution;
-import org.terasology.engine.subsystem.lwjgl.LwjglDisplayDevice;
-import org.terasology.engine.subsystem.lwjgl.LwjglGraphicsManager;
-import org.terasology.engine.subsystem.lwjgl.LwjglResolution;
-import org.terasology.rendering.nui.layers.mainMenu.videoSettings.DisplayModeSetting;
-import org.terasology.utilities.subscribables.AbstractSubscribable;
+import org.terasology.engine.core.subsystem.DisplayDevice;
+import org.terasology.engine.core.subsystem.DisplayDeviceInfo;
+import org.terasology.engine.core.subsystem.Resolution;
+import org.terasology.engine.core.subsystem.lwjgl.LwjglDisplayDevice;
+import org.terasology.engine.core.subsystem.lwjgl.LwjglGraphicsManager;
+import org.terasology.engine.core.subsystem.lwjgl.LwjglResolution;
+import org.terasology.engine.rendering.nui.layers.mainMenu.videoSettings.DisplayModeSetting;
+import org.terasology.engine.utilities.subscribables.AbstractSubscribable;
import java.awt.GraphicsEnvironment;
import java.awt.event.ComponentAdapter;
diff --git a/facades/TeraEd/src/main/java/org/terasology/editor/ui/MainWindow.java b/facades/TeraEd/src/main/java/org/terasology/editor/ui/MainWindow.java
index c2f40f15e..958a2a180 100644
--- a/facades/TeraEd/src/main/java/org/terasology/editor/ui/MainWindow.java
+++ b/facades/TeraEd/src/main/java/org/terasology/editor/ui/MainWindow.java
@@ -18,8 +18,8 @@ package org.terasology.editor.ui;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.terasology.editor.TeraEd;
-import org.terasology.engine.StateChangeSubscriber;
-import org.terasology.engine.TerasologyEngine;
+import org.terasology.engine.core.StateChangeSubscriber;
+import org.terasology.engine.core.TerasologyEngine;
import javax.swing.JFrame;
import javax.swing.JMenu;
diff --git a/fileTemplates/System.java b/fileTemplates/System.java
index 35fd1346d..12e04aea5 100644
--- a/fileTemplates/System.java
+++ b/fileTemplates/System.java
@@ -1,8 +1,8 @@
#if (${PACKAGE_NAME} && ${PACKAGE_NAME} != "")package ${PACKAGE_NAME};#end
#parse("File Header.java")
-import org.terasology.entitySystem.systems.BaseComponentSystem;
-import org.terasology.entitySystem.systems.RegisterSystem;
+import org.terasology.engine.entitySystem.systems.BaseComponentSystem;
+import org.terasology.engine.entitySystem.systems.RegisterSystem;
/**
*
diff --git a/subsystems/DiscordRPC/src/main/java/org/terasology/engine/subsystem/discordrpc/DiscordRPCSubSystem.java b/subsystems/DiscordRPC/src/main/java/org/terasology/engine/subsystem/discordrpc/DiscordRPCSubSystem.java
index 0e98ec752..8a76aa520 100644
--- a/subsystems/DiscordRPC/src/main/java/org/terasology/engine/subsystem/discordrpc/DiscordRPCSubSystem.java
+++ b/subsystems/DiscordRPC/src/main/java/org/terasology/engine/subsystem/discordrpc/DiscordRPCSubSystem.java
@@ -24,11 +24,11 @@ import com.jagrosh.discordipc.entities.pipe.Pipe;
import com.jagrosh.discordipc.entities.pipe.WindowsPipe;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.terasology.config.Config;
-import org.terasology.config.PlayerConfig;
-import org.terasology.context.Context;
-import org.terasology.engine.GameEngine;
-import org.terasology.engine.subsystem.EngineSubsystem;
+import org.terasology.engine.config.Config;
+import org.terasology.engine.config.PlayerConfig;
+import org.terasology.engine.context.Context;
+import org.terasology.engine.core.GameEngine;
+import org.terasology.engine.core.subsystem.EngineSubsystem;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
diff --git a/subsystems/DiscordRPC/src/main/java/org/terasology/engine/subsystem/discordrpc/DiscordRPCSystem.java b/subsystems/DiscordRPC/src/main/java/org/terasology/engine/subsystem/discordrpc/DiscordRPCSystem.java
index 5a6dd8d1a..660a0253e 100644
--- a/subsystems/DiscordRPC/src/main/java/org/terasology/engine/subsystem/discordrpc/DiscordRPCSystem.java
+++ b/subsystems/DiscordRPC/src/main/java/org/terasology/engine/subsystem/discordrpc/DiscordRPCSystem.java
@@ -2,17 +2,17 @@
// SPDX-License-Identifier: Apache-2.0
package org.terasology.engine.subsystem.discordrpc;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.entitySystem.event.ReceiveEvent;
-import org.terasology.entitySystem.systems.BaseComponentSystem;
-import org.terasology.entitySystem.systems.RegisterMode;
-import org.terasology.entitySystem.systems.RegisterSystem;
-import org.terasology.game.Game;
-import org.terasology.logic.afk.AfkEvent;
-import org.terasology.logic.players.LocalPlayer;
-import org.terasology.network.NetworkMode;
-import org.terasology.network.NetworkSystem;
-import org.terasology.registry.In;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.event.ReceiveEvent;
+import org.terasology.engine.entitySystem.systems.BaseComponentSystem;
+import org.terasology.engine.entitySystem.systems.RegisterMode;
+import org.terasology.engine.entitySystem.systems.RegisterSystem;
+import org.terasology.engine.game.Game;
+import org.terasology.engine.logic.afk.AfkEvent;
+import org.terasology.engine.logic.players.LocalPlayer;
+import org.terasology.engine.network.NetworkMode;
+import org.terasology.engine.network.NetworkSystem;
+import org.terasology.engine.registry.In;
/**
* It's a system that runs when a single player or multi player game has been started to process some stuff throw the
diff --git a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/serializers/AbstractSerializer.java b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/serializers/AbstractSerializer.java
index 256f3c3cb..77eb51385 100644
--- a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/serializers/AbstractSerializer.java
+++ b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/serializers/AbstractSerializer.java
@@ -1,18 +1,5 @@
-/*
- * Copyright 2019 MovingBlocks
- *
- * 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.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
package org.terasology.persistence.serializers;
import org.terasology.persistence.typeHandling.PersistedData;
@@ -43,7 +30,7 @@ public abstract class AbstractSerializer {
/**
* Serializes the given object to a {@link PersistedData} using the stored
* {@link #persistedDataSerializer} by loading a
- * {@link org.terasology.persistence.typeHandling.TypeHandler TypeHandler} from the
+ * {@link org.terasology.engine.persistence.typeHandling.TypeHandler TypeHandler} from the
* {@link #typeHandlerLibrary}.
*
* @param object The object to serialize.
@@ -61,7 +48,7 @@ public abstract class AbstractSerializer {
/**
* Deserializes an object of the given type from a {@link PersistedData} using the stored
* {@link #persistedDataSerializer} by loading a
- * {@link org.terasology.persistence.typeHandling.TypeHandler TypeHandler} from the
+ * {@link org.terasology.engine.persistence.typeHandling.TypeHandler TypeHandler} from the
* {@link #typeHandlerLibrary}.
*
* @param data The {@link PersistedData} containing the serialized representation of the object.
diff --git a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/PersistedDataMap.java b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/PersistedDataMap.java
index c9de234b0..f467939ec 100644
--- a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/PersistedDataMap.java
+++ b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/PersistedDataMap.java
@@ -1,4 +1,4 @@
-// Copyright 2020 The Terasology Foundation
+// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
package org.terasology.persistence.typeHandling;
diff --git a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/Serializer.java b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/Serializer.java
index 2ee17a81b..3ab1706e2 100644
--- a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/Serializer.java
+++ b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/Serializer.java
@@ -1,4 +1,4 @@
-// Copyright 2020 The Terasology Foundation
+// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
package org.terasology.persistence.typeHandling;
diff --git a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/TypeHandlerContext.java b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/TypeHandlerContext.java
index 93dbdcd53..69a173a89 100644
--- a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/TypeHandlerContext.java
+++ b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/TypeHandlerContext.java
@@ -1,4 +1,4 @@
-// Copyright 2020 The Terasology Foundation
+// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
package org.terasology.persistence.typeHandling;
diff --git a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/TypeHandlerLibrary.java b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/TypeHandlerLibrary.java
index 0bcf80f3d..69c72d2c6 100644
--- a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/TypeHandlerLibrary.java
+++ b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/TypeHandlerLibrary.java
@@ -1,4 +1,4 @@
-// Copyright 2020 The Terasology Foundation
+// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
package org.terasology.persistence.typeHandling;
@@ -22,8 +22,8 @@ import org.terasology.persistence.typeHandling.coreTypes.StringTypeHandler;
import org.terasology.persistence.typeHandling.coreTypes.factories.ArrayTypeHandlerFactory;
import org.terasology.persistence.typeHandling.coreTypes.factories.CollectionTypeHandlerFactory;
import org.terasology.persistence.typeHandling.coreTypes.factories.EnumTypeHandlerFactory;
-import org.terasology.persistence.typeHandling.coreTypes.factories.ObjectFieldMapTypeHandlerFactory;
import org.terasology.persistence.typeHandling.coreTypes.factories.MapTypeHandlerFactory;
+import org.terasology.persistence.typeHandling.coreTypes.factories.ObjectFieldMapTypeHandlerFactory;
import org.terasology.persistence.typeHandling.reflection.ReflectionsSandbox;
import org.terasology.persistence.typeHandling.reflection.SerializationSandbox;
import org.terasology.reflection.TypeInfo;
diff --git a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/ArrayTypeHandler.java b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/ArrayTypeHandler.java
index 88fe82ea5..5ae552a3d 100644
--- a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/ArrayTypeHandler.java
+++ b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/ArrayTypeHandler.java
@@ -1,4 +1,4 @@
-// Copyright 2020 The Terasology Foundation
+// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
package org.terasology.persistence.typeHandling.coreTypes;
diff --git a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/BooleanTypeHandler.java b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/BooleanTypeHandler.java
index cdd4b1f42..863250db6 100644
--- a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/BooleanTypeHandler.java
+++ b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/BooleanTypeHandler.java
@@ -1,4 +1,4 @@
-// Copyright 2020 The Terasology Foundation
+// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
package org.terasology.persistence.typeHandling.coreTypes;
diff --git a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/ByteArrayTypeHandler.java b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/ByteArrayTypeHandler.java
index b3003ba56..e3dceb783 100644
--- a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/ByteArrayTypeHandler.java
+++ b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/ByteArrayTypeHandler.java
@@ -1,4 +1,4 @@
-// Copyright 2020 The Terasology Foundation
+// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
package org.terasology.persistence.typeHandling.coreTypes;
diff --git a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/ByteTypeHandler.java b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/ByteTypeHandler.java
index 95cba9ffd..0bd9c3f81 100644
--- a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/ByteTypeHandler.java
+++ b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/ByteTypeHandler.java
@@ -1,4 +1,4 @@
-// Copyright 2020 The Terasology Foundation
+// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
package org.terasology.persistence.typeHandling.coreTypes;
diff --git a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/CharacterTypeHandler.java b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/CharacterTypeHandler.java
index 5ce84041f..a47dd82fb 100644
--- a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/CharacterTypeHandler.java
+++ b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/CharacterTypeHandler.java
@@ -1,4 +1,4 @@
-// Copyright 2020 The Terasology Foundation
+// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
package org.terasology.persistence.typeHandling.coreTypes;
diff --git a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/CollectionTypeHandler.java b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/CollectionTypeHandler.java
index 531927026..44b4aa76e 100644
--- a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/CollectionTypeHandler.java
+++ b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/CollectionTypeHandler.java
@@ -1,4 +1,4 @@
-// Copyright 2020 The Terasology Foundation
+// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
package org.terasology.persistence.typeHandling.coreTypes;
@@ -9,7 +9,6 @@ import org.terasology.persistence.typeHandling.TypeHandler;
import org.terasology.reflection.reflect.CollectionCopyConstructor;
import java.util.Collection;
-import java.util.Collections;
import java.util.List;
import java.util.Optional;
diff --git a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/DoubleTypeHandler.java b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/DoubleTypeHandler.java
index 2de4cb89b..2e38349dc 100644
--- a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/DoubleTypeHandler.java
+++ b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/DoubleTypeHandler.java
@@ -1,4 +1,4 @@
-// Copyright 2020 The Terasology Foundation
+// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
package org.terasology.persistence.typeHandling.coreTypes;
diff --git a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/EnumTypeHandler.java b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/EnumTypeHandler.java
index 92cc05cf1..1ba03c336 100644
--- a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/EnumTypeHandler.java
+++ b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/EnumTypeHandler.java
@@ -1,4 +1,4 @@
-// Copyright 2020 The Terasology Foundation
+// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
package org.terasology.persistence.typeHandling.coreTypes;
diff --git a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/FloatTypeHandler.java b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/FloatTypeHandler.java
index 2599de7ed..e5787c873 100644
--- a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/FloatTypeHandler.java
+++ b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/FloatTypeHandler.java
@@ -1,4 +1,4 @@
-// Copyright 2020 The Terasology Foundation
+// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
package org.terasology.persistence.typeHandling.coreTypes;
diff --git a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/IntTypeHandler.java b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/IntTypeHandler.java
index f68b6ce2a..8b25701e7 100644
--- a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/IntTypeHandler.java
+++ b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/IntTypeHandler.java
@@ -1,4 +1,4 @@
-// Copyright 2020 The Terasology Foundation
+// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
package org.terasology.persistence.typeHandling.coreTypes;
diff --git a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/LongTypeHandler.java b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/LongTypeHandler.java
index 993d9c878..9dac8fd99 100644
--- a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/LongTypeHandler.java
+++ b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/LongTypeHandler.java
@@ -1,4 +1,4 @@
-// Copyright 2020 The Terasology Foundation
+// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
package org.terasology.persistence.typeHandling.coreTypes;
diff --git a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/NumberTypeHandler.java b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/NumberTypeHandler.java
index be2daae2e..24950c1e5 100644
--- a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/NumberTypeHandler.java
+++ b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/NumberTypeHandler.java
@@ -1,4 +1,4 @@
-// Copyright 2020 The Terasology Foundation
+// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
package org.terasology.persistence.typeHandling.coreTypes;
diff --git a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/ObjectFieldMapTypeHandler.java b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/ObjectFieldMapTypeHandler.java
index 8fee0d85c..08301be91 100644
--- a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/ObjectFieldMapTypeHandler.java
+++ b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/ObjectFieldMapTypeHandler.java
@@ -1,4 +1,4 @@
-// Copyright 2020 The Terasology Foundation
+// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
package org.terasology.persistence.typeHandling.coreTypes;
diff --git a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/RuntimeDelegatingTypeHandler.java b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/RuntimeDelegatingTypeHandler.java
index c8995948e..eb1a4d738 100644
--- a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/RuntimeDelegatingTypeHandler.java
+++ b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/RuntimeDelegatingTypeHandler.java
@@ -1,4 +1,4 @@
-// Copyright 2020 The Terasology Foundation
+// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
package org.terasology.persistence.typeHandling.coreTypes;
diff --git a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/StringMapTypeHandler.java b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/StringMapTypeHandler.java
index 97f50b187..cc7436566 100644
--- a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/StringMapTypeHandler.java
+++ b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/StringMapTypeHandler.java
@@ -1,4 +1,4 @@
-// Copyright 2020 The Terasology Foundation
+// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
package org.terasology.persistence.typeHandling.coreTypes;
diff --git a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/StringTypeHandler.java b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/StringTypeHandler.java
index 5cfb0189e..6b6e81728 100644
--- a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/StringTypeHandler.java
+++ b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/StringTypeHandler.java
@@ -1,4 +1,4 @@
-// Copyright 2020 The Terasology Foundation
+// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
package org.terasology.persistence.typeHandling.coreTypes;
diff --git a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/factories/ArrayTypeHandlerFactory.java b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/factories/ArrayTypeHandlerFactory.java
index 77aaacd01..3d72d5ffe 100644
--- a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/factories/ArrayTypeHandlerFactory.java
+++ b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/factories/ArrayTypeHandlerFactory.java
@@ -1,4 +1,4 @@
-// Copyright 2020 The Terasology Foundation
+// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
package org.terasology.persistence.typeHandling.coreTypes.factories;
diff --git a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/factories/CollectionTypeHandlerFactory.java b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/factories/CollectionTypeHandlerFactory.java
index 7dce6f731..0f06a95ef 100644
--- a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/factories/CollectionTypeHandlerFactory.java
+++ b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/factories/CollectionTypeHandlerFactory.java
@@ -1,4 +1,4 @@
-// Copyright 2020 The Terasology Foundation
+// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
package org.terasology.persistence.typeHandling.coreTypes.factories;
@@ -13,7 +13,6 @@ import org.terasology.reflection.ReflectionUtil;
import org.terasology.reflection.TypeInfo;
import org.terasology.reflection.reflect.CollectionCopyConstructor;
import org.terasology.reflection.reflect.ConstructorLibrary;
-import org.terasology.reflection.reflect.ObjectConstructor;
import java.lang.reflect.Type;
import java.util.Collection;
diff --git a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/factories/EnumTypeHandlerFactory.java b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/factories/EnumTypeHandlerFactory.java
index 0d1ab0cd0..949983745 100644
--- a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/factories/EnumTypeHandlerFactory.java
+++ b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/factories/EnumTypeHandlerFactory.java
@@ -1,4 +1,4 @@
-// Copyright 2020 The Terasology Foundation
+// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
package org.terasology.persistence.typeHandling.coreTypes.factories;
diff --git a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/factories/MapTypeHandlerFactory.java b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/factories/MapTypeHandlerFactory.java
index 2011ff021..a0baba1c1 100644
--- a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/factories/MapTypeHandlerFactory.java
+++ b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/factories/MapTypeHandlerFactory.java
@@ -1,4 +1,4 @@
-// Copyright 2020 The Terasology Foundation
+// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
package org.terasology.persistence.typeHandling.coreTypes.factories;
diff --git a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/factories/ObjectFieldMapTypeHandlerFactory.java b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/factories/ObjectFieldMapTypeHandlerFactory.java
index ec865ccd0..7da6f3f48 100644
--- a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/factories/ObjectFieldMapTypeHandlerFactory.java
+++ b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/factories/ObjectFieldMapTypeHandlerFactory.java
@@ -1,4 +1,4 @@
-// Copyright 2020 The Terasology Foundation
+// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
package org.terasology.persistence.typeHandling.coreTypes.factories;
diff --git a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/AbstractPersistedData.java b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/AbstractPersistedData.java
index c1319389e..f30762962 100644
--- a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/AbstractPersistedData.java
+++ b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/AbstractPersistedData.java
@@ -1,4 +1,4 @@
-// Copyright 2020 The Terasology Foundation
+// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
package org.terasology.persistence.typeHandling.inMemory;
diff --git a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/InMemoryPersistedDataSerializer.java b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/InMemoryPersistedDataSerializer.java
index cc33386ee..be640bbb7 100644
--- a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/InMemoryPersistedDataSerializer.java
+++ b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/InMemoryPersistedDataSerializer.java
@@ -1,4 +1,4 @@
-// Copyright 2020 The Terasology Foundation
+// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
package org.terasology.persistence.typeHandling.inMemory;
diff --git a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/PersistedMap.java b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/PersistedMap.java
index d61afd3d1..821e173f1 100644
--- a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/PersistedMap.java
+++ b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/PersistedMap.java
@@ -1,4 +1,4 @@
-// Copyright 2020 The Terasology Foundation
+// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
package org.terasology.persistence.typeHandling.inMemory;
diff --git a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/arrays/AbstractPersistedArray.java b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/arrays/AbstractPersistedArray.java
index 0c86902e7..71a63970b 100644
--- a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/arrays/AbstractPersistedArray.java
+++ b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/arrays/AbstractPersistedArray.java
@@ -1,4 +1,4 @@
-// Copyright 2020 The Terasology Foundation
+// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
package org.terasology.persistence.typeHandling.inMemory.arrays;
diff --git a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/arrays/PersistedBooleanArray.java b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/arrays/PersistedBooleanArray.java
index 3c5193eac..214308cbf 100644
--- a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/arrays/PersistedBooleanArray.java
+++ b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/arrays/PersistedBooleanArray.java
@@ -1,4 +1,4 @@
-// Copyright 2020 The Terasology Foundation
+// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
package org.terasology.persistence.typeHandling.inMemory.arrays;
diff --git a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/arrays/PersistedDoubleArray.java b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/arrays/PersistedDoubleArray.java
index e3bd7f8e8..b88e2d7a6 100644
--- a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/arrays/PersistedDoubleArray.java
+++ b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/arrays/PersistedDoubleArray.java
@@ -1,4 +1,4 @@
-// Copyright 2020 The Terasology Foundation
+// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
package org.terasology.persistence.typeHandling.inMemory.arrays;
diff --git a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/arrays/PersistedFloatArray.java b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/arrays/PersistedFloatArray.java
index ab8b1a67d..591b2b205 100644
--- a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/arrays/PersistedFloatArray.java
+++ b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/arrays/PersistedFloatArray.java
@@ -1,4 +1,4 @@
-// Copyright 2020 The Terasology Foundation
+// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
package org.terasology.persistence.typeHandling.inMemory.arrays;
diff --git a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/arrays/PersistedIntegerArray.java b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/arrays/PersistedIntegerArray.java
index 656a48242..75899902d 100644
--- a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/arrays/PersistedIntegerArray.java
+++ b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/arrays/PersistedIntegerArray.java
@@ -1,4 +1,4 @@
-// Copyright 2020 The Terasology Foundation
+// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
package org.terasology.persistence.typeHandling.inMemory.arrays;
diff --git a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/arrays/PersistedLongArray.java b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/arrays/PersistedLongArray.java
index 0cfc8ebd6..824aa9b63 100644
--- a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/arrays/PersistedLongArray.java
+++ b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/arrays/PersistedLongArray.java
@@ -1,4 +1,4 @@
-// Copyright 2020 The Terasology Foundation
+// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
package org.terasology.persistence.typeHandling.inMemory.arrays;
diff --git a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/arrays/PersistedStringArray.java b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/arrays/PersistedStringArray.java
index ccaf9cc0d..6e3e7b202 100644
--- a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/arrays/PersistedStringArray.java
+++ b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/arrays/PersistedStringArray.java
@@ -1,4 +1,4 @@
-// Copyright 2020 The Terasology Foundation
+// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
package org.terasology.persistence.typeHandling.inMemory.arrays;
diff --git a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/arrays/PersistedValueArray.java b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/arrays/PersistedValueArray.java
index 9619e71ca..32a41d107 100644
--- a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/arrays/PersistedValueArray.java
+++ b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/arrays/PersistedValueArray.java
@@ -1,4 +1,4 @@
-// Copyright 2020 The Terasology Foundation
+// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
package org.terasology.persistence.typeHandling.inMemory.arrays;
diff --git a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/arrays/TroveUtils.java b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/arrays/TroveUtils.java
index 87570d607..65d97b597 100644
--- a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/arrays/TroveUtils.java
+++ b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/arrays/TroveUtils.java
@@ -1,4 +1,4 @@
-// Copyright 2020 The Terasology Foundation
+// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
package org.terasology.persistence.typeHandling.inMemory.arrays;
diff --git a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/reflection/ReflectionsSandbox.java b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/reflection/ReflectionsSandbox.java
index 32c77bf31..d8da7f012 100644
--- a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/reflection/ReflectionsSandbox.java
+++ b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/reflection/ReflectionsSandbox.java
@@ -1,4 +1,4 @@
-// Copyright 2020 The Terasology Foundation
+// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
package org.terasology.persistence.typeHandling.reflection;
diff --git a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/reflection/SerializationSandbox.java b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/reflection/SerializationSandbox.java
index e6c8af87a..2b7e5193d 100644
--- a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/reflection/SerializationSandbox.java
+++ b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/reflection/SerializationSandbox.java
@@ -1,4 +1,4 @@
-// Copyright 2020 The Terasology Foundation
+// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
package org.terasology.persistence.typeHandling.reflection;
diff --git a/subsystems/TypeHandlerLibrary/src/test/java/org/terasology/persistence/typeHandling/FutureTypeHandlerTest.java b/subsystems/TypeHandlerLibrary/src/test/java/org/terasology/persistence/typeHandling/FutureTypeHandlerTest.java
index ea12facf8..238e772c2 100644
--- a/subsystems/TypeHandlerLibrary/src/test/java/org/terasology/persistence/typeHandling/FutureTypeHandlerTest.java
+++ b/subsystems/TypeHandlerLibrary/src/test/java/org/terasology/persistence/typeHandling/FutureTypeHandlerTest.java
@@ -1,4 +1,4 @@
-// Copyright 2020 The Terasology Foundation
+// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
package org.terasology.persistence.typeHandling;
diff --git a/subsystems/TypeHandlerLibrary/src/test/java/org/terasology/persistence/typeHandling/InMemorySerializerTest.java b/subsystems/TypeHandlerLibrary/src/test/java/org/terasology/persistence/typeHandling/InMemorySerializerTest.java
index cddcbc07f..8d77751f9 100644
--- a/subsystems/TypeHandlerLibrary/src/test/java/org/terasology/persistence/typeHandling/InMemorySerializerTest.java
+++ b/subsystems/TypeHandlerLibrary/src/test/java/org/terasology/persistence/typeHandling/InMemorySerializerTest.java
@@ -1,4 +1,4 @@
-// Copyright 2020 The Terasology Foundation
+// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
package org.terasology.persistence.typeHandling;
diff --git a/subsystems/TypeHandlerLibrary/src/test/java/org/terasology/persistence/typeHandling/TypeHandlerLibraryTest.java b/subsystems/TypeHandlerLibrary/src/test/java/org/terasology/persistence/typeHandling/TypeHandlerLibraryTest.java
index 44db9eeb9..5e8eb3deb 100644
--- a/subsystems/TypeHandlerLibrary/src/test/java/org/terasology/persistence/typeHandling/TypeHandlerLibraryTest.java
+++ b/subsystems/TypeHandlerLibrary/src/test/java/org/terasology/persistence/typeHandling/TypeHandlerLibraryTest.java
@@ -1,4 +1,4 @@
-// Copyright 2020 The Terasology Foundation
+// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
package org.terasology.persistence.typeHandling;
@@ -16,11 +16,9 @@ import org.terasology.reflection.TypeInfo;
import java.util.List;
import java.util.Map;
-import java.util.Optional;
import java.util.Queue;
import java.util.Set;
-import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
class TypeHandlerLibraryTest {
diff --git a/subsystems/TypeHandlerLibrary/src/test/java/org/terasology/persistence/typeHandling/coreTypes/ArrayTypeHandlerTest.java b/subsystems/TypeHandlerLibrary/src/test/java/org/terasology/persistence/typeHandling/coreTypes/ArrayTypeHandlerTest.java
index 115c3e787..7f3d0cbd1 100644
--- a/subsystems/TypeHandlerLibrary/src/test/java/org/terasology/persistence/typeHandling/coreTypes/ArrayTypeHandlerTest.java
+++ b/subsystems/TypeHandlerLibrary/src/test/java/org/terasology/persistence/typeHandling/coreTypes/ArrayTypeHandlerTest.java
@@ -1,4 +1,4 @@
-// Copyright 2020 The Terasology Foundation
+// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
package org.terasology.persistence.typeHandling.coreTypes;
diff --git a/subsystems/TypeHandlerLibrary/src/test/java/org/terasology/persistence/typeHandling/coreTypes/CharacterTypeHandlerTest.java b/subsystems/TypeHandlerLibrary/src/test/java/org/terasology/persistence/typeHandling/coreTypes/CharacterTypeHandlerTest.java
index 2936f4b33..bfc5fda3f 100644
--- a/subsystems/TypeHandlerLibrary/src/test/java/org/terasology/persistence/typeHandling/coreTypes/CharacterTypeHandlerTest.java
+++ b/subsystems/TypeHandlerLibrary/src/test/java/org/terasology/persistence/typeHandling/coreTypes/CharacterTypeHandlerTest.java
@@ -1,4 +1,4 @@
-// Copyright 2020 The Terasology Foundation
+// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
package org.terasology.persistence.typeHandling.coreTypes;
diff --git a/subsystems/TypeHandlerLibrary/src/test/java/org/terasology/persistence/typeHandling/coreTypes/EnumTypeHandlerSerializerTest.java b/subsystems/TypeHandlerLibrary/src/test/java/org/terasology/persistence/typeHandling/coreTypes/EnumTypeHandlerSerializerTest.java
index 6cf7e1619..c2d41057e 100644
--- a/subsystems/TypeHandlerLibrary/src/test/java/org/terasology/persistence/typeHandling/coreTypes/EnumTypeHandlerSerializerTest.java
+++ b/subsystems/TypeHandlerLibrary/src/test/java/org/terasology/persistence/typeHandling/coreTypes/EnumTypeHandlerSerializerTest.java
@@ -1,4 +1,4 @@
-// Copyright 2020 The Terasology Foundation
+// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
package org.terasology.persistence.typeHandling.coreTypes;
diff --git a/subsystems/TypeHandlerLibrary/src/test/java/org/terasology/persistence/typeHandling/coreTypes/RuntimeDelegatingTypeHandlerTest.java b/subsystems/TypeHandlerLibrary/src/test/java/org/terasology/persistence/typeHandling/coreTypes/RuntimeDelegatingTypeHandlerTest.java
index db895615b..7640d1f58 100644
--- a/subsystems/TypeHandlerLibrary/src/test/java/org/terasology/persistence/typeHandling/coreTypes/RuntimeDelegatingTypeHandlerTest.java
+++ b/subsystems/TypeHandlerLibrary/src/test/java/org/terasology/persistence/typeHandling/coreTypes/RuntimeDelegatingTypeHandlerTest.java
@@ -1,4 +1,4 @@
-// Copyright 2020 The Terasology Foundation
+// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
package org.terasology.persistence.typeHandling.coreTypes;
diff --git a/subsystems/TypeHandlerLibrary/src/test/java/org/terasology/persistence/typeHandling/coreTypes/SimpleCoreHandlerTest.java b/subsystems/TypeHandlerLibrary/src/test/java/org/terasology/persistence/typeHandling/coreTypes/SimpleCoreHandlerTest.java
index 02052c9e5..e4cf6a8fa 100644
--- a/subsystems/TypeHandlerLibrary/src/test/java/org/terasology/persistence/typeHandling/coreTypes/SimpleCoreHandlerTest.java
+++ b/subsystems/TypeHandlerLibrary/src/test/java/org/terasology/persistence/typeHandling/coreTypes/SimpleCoreHandlerTest.java
@@ -1,4 +1,4 @@
-// Copyright 2020 The Terasology Foundation
+// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
package org.terasology.persistence.typeHandling.coreTypes;
diff --git a/subsystems/TypeHandlerLibrary/src/test/java/org/terasology/persistence/typeHandling/coreTypes/factories/ArrayTypeHandlerFactoryTest.java b/subsystems/TypeHandlerLibrary/src/test/java/org/terasology/persistence/typeHandling/coreTypes/factories/ArrayTypeHandlerFactoryTest.java
index cbce33cd6..d7c3352c5 100644
--- a/subsystems/TypeHandlerLibrary/src/test/java/org/terasology/persistence/typeHandling/coreTypes/factories/ArrayTypeHandlerFactoryTest.java
+++ b/subsystems/TypeHandlerLibrary/src/test/java/org/terasology/persistence/typeHandling/coreTypes/factories/ArrayTypeHandlerFactoryTest.java
@@ -1,4 +1,4 @@
-// Copyright 2020 The Terasology Foundation
+// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
package org.terasology.persistence.typeHandling.coreTypes.factories;
diff --git a/subsystems/TypeHandlerLibrary/src/test/java/org/terasology/persistence/typeHandling/coreTypes/factories/BytesTypeHandlerTest.java b/subsystems/TypeHandlerLibrary/src/test/java/org/terasology/persistence/typeHandling/coreTypes/factories/BytesTypeHandlerTest.java
index 0e9748f14..f0d9690bb 100644
--- a/subsystems/TypeHandlerLibrary/src/test/java/org/terasology/persistence/typeHandling/coreTypes/factories/BytesTypeHandlerTest.java
+++ b/subsystems/TypeHandlerLibrary/src/test/java/org/terasology/persistence/typeHandling/coreTypes/factories/BytesTypeHandlerTest.java
@@ -1,4 +1,4 @@
-// Copyright 2020 The Terasology Foundation
+// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
package org.terasology.persistence.typeHandling.coreTypes.factories;
diff --git a/subsystems/TypeHandlerLibrary/src/test/java/org/terasology/persistence/typeHandling/coreTypes/factories/CollectionTypeHandlerFactoryTest.java b/subsystems/TypeHandlerLibrary/src/test/java/org/terasology/persistence/typeHandling/coreTypes/factories/CollectionTypeHandlerFactoryTest.java
index 29cf3f900..16fefdd04 100644
--- a/subsystems/TypeHandlerLibrary/src/test/java/org/terasology/persistence/typeHandling/coreTypes/factories/CollectionTypeHandlerFactoryTest.java
+++ b/subsystems/TypeHandlerLibrary/src/test/java/org/terasology/persistence/typeHandling/coreTypes/factories/CollectionTypeHandlerFactoryTest.java
@@ -1,4 +1,4 @@
-// Copyright 2020 The Terasology Foundation
+// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
package org.terasology.persistence.typeHandling.coreTypes.factories;
diff --git a/subsystems/TypeHandlerLibrary/src/test/java/org/terasology/persistence/typeHandling/coreTypes/factories/EnumTypeHandlerFactoryTest.java b/subsystems/TypeHandlerLibrary/src/test/java/org/terasology/persistence/typeHandling/coreTypes/factories/EnumTypeHandlerFactoryTest.java
index c21b39c6d..fd64204a4 100644
--- a/subsystems/TypeHandlerLibrary/src/test/java/org/terasology/persistence/typeHandling/coreTypes/factories/EnumTypeHandlerFactoryTest.java
+++ b/subsystems/TypeHandlerLibrary/src/test/java/org/terasology/persistence/typeHandling/coreTypes/factories/EnumTypeHandlerFactoryTest.java
@@ -1,4 +1,4 @@
-// Copyright 2020 The Terasology Foundation
+// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
package org.terasology.persistence.typeHandling.coreTypes.factories;
diff --git a/subsystems/TypeHandlerLibrary/src/test/java/org/terasology/persistence/typeHandling/coreTypes/factories/MapTypeHandlerFactoryTest.java b/subsystems/TypeHandlerLibrary/src/test/java/org/terasology/persistence/typeHandling/coreTypes/factories/MapTypeHandlerFactoryTest.java
index c66e0da4e..f2b73d4a0 100644
--- a/subsystems/TypeHandlerLibrary/src/test/java/org/terasology/persistence/typeHandling/coreTypes/factories/MapTypeHandlerFactoryTest.java
+++ b/subsystems/TypeHandlerLibrary/src/test/java/org/terasology/persistence/typeHandling/coreTypes/factories/MapTypeHandlerFactoryTest.java
@@ -1,4 +1,4 @@
-// Copyright 2020 The Terasology Foundation
+// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
package org.terasology.persistence.typeHandling.coreTypes.factories;
diff --git a/subsystems/TypeHandlerLibrary/src/test/java/org/terasology/persistence/typeHandling/coreTypes/factories/ObjectFieldMapTypeHandlerFactoryTest.java b/subsystems/TypeHandlerLibrary/src/test/java/org/terasology/persistence/typeHandling/coreTypes/factories/ObjectFieldMapTypeHandlerFactoryTest.java
index 1c01157bf..5c180ac50 100644
--- a/subsystems/TypeHandlerLibrary/src/test/java/org/terasology/persistence/typeHandling/coreTypes/factories/ObjectFieldMapTypeHandlerFactoryTest.java
+++ b/subsystems/TypeHandlerLibrary/src/test/java/org/terasology/persistence/typeHandling/coreTypes/factories/ObjectFieldMapTypeHandlerFactoryTest.java
@@ -1,4 +1,4 @@
-// Copyright 2020 The Terasology Foundation
+// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
package org.terasology.persistence.typeHandling.coreTypes.factories;