chore: update core (spring cleanup) (#34)

Terasology · May 19, 2020 · 9b276c6 · 9b276c6
1 parent a91a47d
commit 9b276c6
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 28 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,5 @@
+* text=auto eol=lf
+
+*.png  binary
+
+gradlew text eol=lf
diff --git a/module.txt b/module.txt
@@ -1,30 +1,30 @@
 {
-    "id" : "JoshariasSurvival",
-    "version" : "1.0.2-SNAPSHOT",
-    "author" : "Josharias",
-    "displayName" : "Josharias Survival",
-    "description" : "Survival with an emphasis on technology",
-    "dependencies" :
-    [
-        {"id": "CoreBlocks", "minVersion": "1.0.0"},
-        {"id": "ManualLabor", "minVersion": "1.0.0"},
-        {"id": "IRLCorp", "minVersion": "1.0.0"},
-        {"id": "Hunger", "minVersion": "1.0.0"},
-        {"id": "Thirst", "minVersion": "1.0.0"},
-        {"id": "EdibleSubstance", "minVersion": "1.0.0"},
-        {"id": "SimpleFarming", "minVersion": "2.0.0"},
-        {"id": "PlantPack", "minVersion": "1.0.0"},
-        {"id": "AdditionalFruits", "minVersion": "0.1.0"},
-        {"id": "WorldlyTooltip", "minVersion": "1.0.0"},
-        {"id": "EventualSkills", "minVersion": "1.0.0"},
-        {"id": "ManualLaborEventualSkills", "minVersion": "1.0.0"},
-        {"id": "InGameHelp", "minVersion": "1.0.0"},
-        {"id": "WorkstationInGameHelp", "minVersion": "1.0.0"},
-        {"id": "Caves", "minVersion": "1.0.0"},
-        {"id": "OreGeneration", "minVersion": "1.0.0"},
-        {"id": "BiomesAPI", "minVersion": "3.0.0"}
+    "id": "JoshariasSurvival",
+    "version": "1.0.2",
+    "author": "Josharias",
+    "displayName": "Josharias Survival",
+    "description": "Survival with an emphasis on technology",
+    "dependencies": [
+        { "id": "AdditionalFruits", "minVersion": "1.0.0" },
+        { "id": "BiomesAPI", "minVersion": "4.0.0" },
+        { "id": "Caves", "minVersion": "1.1.0" },
+        { "id": "CoreAdvancedAssets", "minVersion": "1.1.0" },
+        { "id": "CoreWorlds", "minVersion": "1.1.0" },
+        { "id": "EdibleSubstance", "minVersion": "1.0.0" },
+        { "id": "EventualSkills", "minVersion": "1.0.0" },
+        { "id": "Hunger", "minVersion": "1.1.0" },
+        { "id": "InGameHelp", "minVersion": "1.1.0" },
+        { "id": "IRLCorp", "minVersion": "1.1.3" },
+        { "id": "ManualLabor", "minVersion": "1.3.0" },
+        { "id": "ManualLaborEventualSkills", "minVersion": "1.0.0" },
+        { "id": "OreGeneration", "minVersion": "1.0.0" },
+        { "id": "PlantPack", "minVersion": "1.1.0" },
+        { "id": "SimpleFarming", "minVersion": "2.1.0" },
+        { "id": "Thirst", "minVersion": "1.0.0" },
+        { "id": "WorkstationInGameHelp", "minVersion": "1.0.0" },
+        { "id": "WorldlyTooltip", "minVersion": "1.2.0" }
     ],
-    "isGameplay" : true,
+    "isGameplay": true,
     "isWorld": true,
-    "defaultWorldGenerator" : "Core:FacetedPerlin"
+    "defaultWorldGenerator": "CoreWorlds:FacetedPerlin"
 }
diff --git a/src/main/java/org/terasology/joshariasSurvival/systems/DemoSystem.java b/src/main/java/org/terasology/joshariasSurvival/systems/DemoSystem.java
@@ -133,7 +133,7 @@ public String jsStarterPack(@CommandParam(value = "module", required = false) St
     private EntityRef createSupplyChest(EntityRef... items) {
         BlockItemFactory blockFactory = new BlockItemFactory(entityManager);
 
-        EntityRef chest = blockFactory.newInstance(blockManager.getBlockFamily("CoreBlocks:Chest"), 1);
+        EntityRef chest = blockFactory.newInstance(blockManager.getBlockFamily("CoreAdvancedAssets:Chest"), 1);
         chest.addComponent(new InventoryComponent(items.length));
 
         for (EntityRef item : items) {
@@ -155,7 +155,7 @@ public String jsPlaceInventory(@Sender EntityRef client) {
             BlockItemComponent blockItemComponent = item.getComponent(BlockItemComponent.class);
             if (blockItemComponent != null) {
                 Vector3i pos = new Vector3i(characterPos.x + itemsPlaced * 2 + 2, characterPos.y, characterPos.z);
-                if (blockItemComponent.blockFamily.getURI().equals(new BlockUri("CoreBlocks:Chest"))) {
+                if (blockItemComponent.blockFamily.getURI().equals(new BlockUri("CoreAdvancedAssets:Chest"))) {
                     pos = new Vector3i(pos.x - 2, pos.y, pos.z + 2);
                     supplyChestsPlaced++;
                 } else {