[Breaking all] Gestalt v7 re-integration....

build.gradle

@@ -11,9 +11,6 @@ buildscript {
     }
 
     dependencies {
-        // Needed for caching reflected data during builds
-        classpath 'org.reflections:reflections:0.9.10'
-        classpath 'dom4j:dom4j:1.6.1'
 
         //Spotbugs
         classpath "gradle.plugin.com.github.spotbugs.snom:spotbugs-gradle-plugin:4.0.0"

buildSrc/build.gradle.kts

@@ -13,4 +13,5 @@ dependencies {
     // Needed for caching reflected data during builds
     implementation("org.reflections:reflections:0.9.10")
     implementation("dom4j:dom4j:1.6.1")
+    implementation("com.google.code.gson:gson:2.8.5")
 }

buildSrc/src/main/kotlin/terasology-module.gradle.kts

@@ -1,18 +1,5 @@
-/*
- * 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
- *
- *     https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT 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 2020 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
 
 // Simple build file for modules - the one under the Core module is the template, will be copied as needed to modules
 
@@ -22,6 +9,7 @@ import org.gradle.plugins.ide.idea.model.IdeaModel
 import org.reflections.Reflections
 import org.reflections.scanners.SubTypesScanner
 import org.reflections.scanners.TypeAnnotationsScanner
+import org.reflections.serializers.JsonSerializer
 import org.reflections.util.ConfigurationBuilder
 import org.reflections.util.FilterBuilder
 
@@ -134,8 +122,6 @@ if (project.name == "ModuleTestingEnvironment") {
         implementation("org.junit.jupiter:junit-jupiter-api:5.6.2")
         implementation("org.mockito:mockito-junit-jupiter:3.2.0")
         implementation("junit:junit:4.12")
-        //TODO: Remove shrinkwrap from code, you have FileSystem in java 8
-        implementation("org.jboss.shrinkwrap:shrinkwrap-depchain-java7:1.2.1")
     }
 }
 
@@ -171,7 +157,7 @@ tasks.register("createSkeleton") {
 tasks.register("cacheReflections") {
     description = "Caches reflection output to make regular startup faster. May go stale and need cleanup at times."
     inputs.files(mainSourceSet.output.classesDirs)
-    outputs.file(File(mainSourceSet.output.classesDirs.first(), "reflections.cache"))
+    outputs.file(File(mainSourceSet.output.classesDirs.first(), "manifest.json"))
     dependsOn(tasks.named("classes"))
 
     doFirst {
@@ -180,7 +166,7 @@ tasks.register("cacheReflections") {
                     .filterInputsBy(FilterBuilder.parsePackages("+org"))
                     .addUrls(inputs.getFiles().getSingleFile().toURI().toURL())
                     .setScanners(TypeAnnotationsScanner(), SubTypesScanner()))
-            reflections.save(outputs.getFiles().getAsPath())
+            reflections.save(outputs.getFiles().getAsPath(), JsonSerializer())
         } catch (e: java.net.MalformedURLException) {
             getLogger().error("Cannot parse input to url", e);
         }
@@ -208,10 +194,13 @@ tasks.register<Sync>("syncDeltas") {
     into("${mainSourceSet.output.classesDirs.first()}/deltas")
 }
 
+tasks.named("compileJava") {
+    finalizedBy("cacheReflections")
+}
+
 // Instructions for packaging a jar file - is a manifest even needed for modules?
 tasks.named("jar") {
     // Make sure the assets directory is included
-    dependsOn("cacheReflections")
     dependsOn("syncAssets")
     dependsOn("syncOverrides")
     dependsOn("syncDeltas")
@@ -224,7 +213,7 @@ tasks.named("jar") {
         }
     }
 
-    finalizedBy("cleanReflections")
+//    finalizedBy("cleanReflections")
 }
 
 // Prep an IntelliJ module for the Terasology module - yes, might want to read that twice :D

config/eclipse/Terasology.launch

@@ -10,7 +10,7 @@
 <listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
 <listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
 </listAttribute>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.terasology.engine.Terasology"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.terasology.engine.core.Terasology"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="PC"/>
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms256m -Xmx1024m"/>
 <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:PC}/../.."/>

config/eclipse/TerasologyAWT.launch

@@ -10,7 +10,7 @@
 <listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
 <listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
 </listAttribute>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.terasology.engine.TerasologyAwt"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.terasology.engine.core.TerasologyAwt"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="AWT"/>
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms256m -Xmx1024m"/>
 <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:AWT}/../.."/>

config/gradle/common.gradle

@@ -1,18 +1,5 @@
-/*
- * 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
- *
- *     https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT 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 2020 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
 
 // language
 apply plugin: 'java'
@@ -70,6 +57,10 @@ repositories {
         url "http://maven.snplow.com/releases"
         allowInsecureProtocol true  // 😱
     }
+    google()
+    maven {
+        url 'https://heisluft.tk/maven'
+    }
 }
 
 dependencies {
@@ -111,7 +102,7 @@ test {
     }
 
     jacoco {
-        excludes = ["org.terasology.protobuf.*",
+        excludes = ["org.terasology.engine.protobuf.*",
                     "*MethodAccess","*FieldAccess"]
     }
 }

engine-tests/build.gradle

@@ -1,18 +1,5 @@
-/*
- * 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
- *
- *     https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT 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 2020 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
 
 // Engine tests are split out due to otherwise quirky project dependency issues with module tests extending engine tests
 
@@ -32,7 +19,7 @@ ext {
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 // Read the internal version out of the engine-tests module.txt
-def moduleFile = file('src/main/resources/module.txt')
+def moduleFile = file('src/main/resources/org/terasology/unittest/module.txt')
 
 if (!moduleFile.exists()) {
     println "Failed to find module.txt for engine-tests"
@@ -68,12 +55,12 @@ dependencies {
     implementation project(':engine')
 
     // Dependency not provided for modules, but required for module-tests
-    implementation group: 'com.google.code.gson', name: 'gson', version: '2.6.2'
+    implementation group: 'com.google.code.gson', name: 'gson', version: '2.8.5'
     implementation group: 'org.codehaus.plexus', name: 'plexus-utils', version: '1.5.6'
     implementation group: 'com.google.protobuf', name: 'protobuf-java', version: '2.6.1'
     implementation group: 'ch.qos.logback', name: 'logback-classic', version: '1.2.3'
     runtimeOnly group: 'org.slf4j', name: 'jul-to-slf4j', version: '1.7.21'
-    implementation group: 'org.reflections', name: 'reflections', version: '0.9.10'
+    implementation group: 'org.terasology', name: 'reflections', version: '0.9.12-MB'
 
     // Test lib dependencies
     implementation("org.junit.jupiter:junit-jupiter-api:5.5.2")
@@ -83,9 +70,6 @@ dependencies {
     testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.5.2")
 
     implementation group: 'junit', name: 'junit', version: '4.12'
-
-    //TODO: Remove shrinkwrap from code, you have FileSystem in java 8
-    implementation group: 'org.jboss.shrinkwrap', name: 'shrinkwrap-depchain-java7', version: '1.2.1'
 }
 
 task copyResourcesToClasses(type:Copy) {

engine-tests/src/main/java/org/terasology/Environment.java

@@ -1,37 +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.
- */
+// Copyright 2020 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
 
 package org.terasology;
 
 import com.google.common.collect.Sets;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.terasology.assets.management.AssetManager;
-import org.terasology.context.Context;
-import org.terasology.context.internal.ContextImpl;
-import org.terasology.naming.Name;
-import org.terasology.recording.RecordAndReplayCurrentStatus;
-import org.terasology.registry.CoreRegistry;
+import org.terasology.engine.context.Context;
+import org.terasology.engine.context.internal.ContextImpl;
+import org.terasology.engine.recording.RecordAndReplayCurrentStatus;
+import org.terasology.engine.registry.CoreRegistry;
+import org.terasology.gestalt.assets.management.AssetManager;
+import org.terasology.gestalt.naming.Name;
 
 import java.io.IOException;
 import java.util.Set;
 
 /**
  * Setup an empty Terasology environment
- *
  */
 public class Environment {
 
@@ -72,7 +58,7 @@ protected void reset(Set<Name> moduleNames) throws Exception {
         AssetManager assetManager = setupAssetManager();
 
         setupBlockManager(assetManager);
-        
+
         setupExtraDataManager(context);
 
         setupCollisionManager();
@@ -133,7 +119,7 @@ protected AssetManager setupEmptyAssetManager() {
     protected void setupBlockManager(AssetManager assetManager) {
         // empty
     }
-    
+
     protected void setupExtraDataManager(Context context) {
         // empty
     }