Changes(real)

- Fixed bug which caused the Monarch's solar energy to not be functional.
- Changed texture of the cotton crop.
- Changed texture of the cotton ball.
- Added Item "Ghostly Cloth".
- Renamed java class "sun_totem" to "sunTotem" to fit convention.

src/main/resources/assets/terraoriginum/blockstates/cotton_crop_block.json

@@ -4,25 +4,25 @@
         "model": "terraoriginum:block/cotton_crop_stage0"
       },
       "age=1": {
-        "model": "terraoriginum:block/cotton_crop_stage0"
+        "model": "terraoriginum:block/cotton_crop_stage1"
       },
       "age=2": {
         "model": "terraoriginum:block/cotton_crop_stage1"
       },
       "age=3": {
-        "model": "terraoriginum:block/cotton_crop_stage1"
+        "model": "terraoriginum:block/cotton_crop_stage2"
       },
       "age=4": {
-        "model": "terraoriginum:block/cotton_crop_stage2"
+        "model": "terraoriginum:block/cotton_crop_stage3"
       },
       "age=5": {
-        "model": "terraoriginum:block/cotton_crop_stage2"
+        "model": "terraoriginum:block/cotton_crop_stage3"
       },
       "age=6": {
-        "model": "terraoriginum:block/cotton_crop_stage2"
+        "model": "terraoriginum:block/cotton_crop_stage4"
       },
       "age=7": {
-        "model": "terraoriginum:block/cotton_crop_stage3"
+        "model": "terraoriginum:block/cotton_crop_stage5"
       }
     }
   }

src/main/resources/assets/terraoriginum/lang/en_us.json

@@ -8,6 +8,8 @@
   "item.terraoriginum.cotton_seeds": "Cotton Seeds",
   "item.terraoriginum.cotton_ball": "Cotton ball",
 
+  "item.terraoriginum.ghostly_cloth": "Ghostly Cloth",
+
   "item.terraoriginum.sun_totem": "Sun Totem",
 
   "death.attack.lack_of_ectoplasm": "%1$s faded away",

src/main/resources/assets/terraoriginum/models/block/cotton_crop_stage0.json

@@ -1,7 +1,7 @@
 {
-    "parent": "minecraft:block/crop",
+    "parent": "minecraft:block/cross",
     "textures": {
-      "crop": "terraoriginum:block/cotton_crop_block_stage0"
+      "cross": "terraoriginum:block/crop_cotton_0"
     }
   }
 

src/main/resources/assets/terraoriginum/models/block/cotton_crop_stage1.json

@@ -1,7 +1,7 @@
 {
-    "parent": "minecraft:block/crop",
+    "parent": "minecraft:block/cross",
     "textures": {
-      "crop": "terraoriginum:block/cotton_crop_block_stage1"
+      "cross": "terraoriginum:block/crop_cotton_1"
     }
   }
 

src/main/resources/assets/terraoriginum/models/block/cotton_crop_stage2.json

@@ -1,7 +1,7 @@
 {
-    "parent": "minecraft:block/crop",
+    "parent": "minecraft:block/cross",
     "textures": {
-      "crop": "terraoriginum:block/cotton_crop_block_stage2"
+      "cross": "terraoriginum:block/crop_cotton_2"
     }
   }
 

src/main/resources/assets/terraoriginum/models/block/cotton_crop_stage3.json

@@ -1,7 +1,7 @@
 {
-    "parent": "minecraft:block/crop",
+    "parent": "minecraft:block/cross",
     "textures": {
-      "crop": "terraoriginum:block/cotton_crop_block_stage3"
+      "cross": "terraoriginum:block/crop_cotton_3"
     }
   }
 

src/main/resources/assets/terraoriginum/models/block/cotton_crop_stage4.json

@@ -0,0 +1,7 @@
+{
+    "parent": "minecraft:block/cross",
+    "textures": {
+      "cross": "terraoriginum:block/crop_cotton_4"
+    }
+  }
+

src/main/resources/assets/terraoriginum/models/block/cotton_crop_stage5.json

@@ -0,0 +1,7 @@
+{
+    "parent": "minecraft:block/cross",
+    "textures": {
+      "cross": "terraoriginum:block/crop_cotton_5"
+    }
+  }
+

src/main/resources/assets/terraoriginum/models/item/ghostly_cloth.json

@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "terraoriginum:item/ghostly_cloth"
+  }
+}

src/main/resources/data/terraoriginum/powers/monarch-powers/instant_transmission.json

@@ -1,7 +1,7 @@
 {
     "condition": {
         "type": "origins:resource",
-        "resource": "terraoriginum:monarchpowers/solar_energy",
+        "resource": "terraoriginum:monarch-powers/solar_energy",
         "comparison": ">=",
         "compare_to": 50
     },
@@ -48,7 +48,7 @@
             },
             {
                 "type": "origins:change_resource",
-                "resource": "terraoriginum:monarchpowers/solar_energy",
+                "resource": "terraoriginum:monarch-powers/solar_energy",
                 "change": -50,
                 "operation": "add"
               }

src/main/resources/data/terraoriginum/powers/monarch-powers/lackofsundamage.json

@@ -8,7 +8,7 @@
             {
                 "condition": {
                     "type": "origins:resource",
-                    "resource": "terraoriginum:monarchpowers/solar_energy",
+                    "resource": "terraoriginum:monarch-powers/solar_energy",
                     "comparison": "<",
                     "compare_to": 50
                 },

src/main/resources/data/terraoriginum/powers/monarch-powers/nuclear_rush.json

@@ -1,7 +1,7 @@
 {
     "condition": {
         "type": "origins:resource",
-        "resource": "terraoriginum:monarchpowers/solar_energy",
+        "resource": "terraoriginum:monarch-powers/solar_energy",
         "comparison": ">=",
         "compare_to": 100
     },
@@ -35,7 +35,7 @@
         },
         {
           "type": "origins:change_resource",
-          "resource": "terraoriginum:monarchpowers/solar_energy",
+          "resource": "terraoriginum:monarch-powers/solar_energy",
           "change": -100,
           "operation": "add"
         },

src/main/resources/data/terraoriginum/powers/monarch-powers/sun_fueled.json

@@ -6,7 +6,7 @@
   "interval": 40,
   "entity_action": {
 	  "type": "origins:change_resource",
-	  "resource": "terraoriginum:monarchpowers/solar_energy",
+	  "resource": "terraoriginum:monarch-powers/solar_energy",
 	  "change": 10,
 	  "operation": "add"
   }

src/main/resources/data/terraoriginum/powers/monarch-powers/super_dash.json

@@ -21,7 +21,7 @@
             },
             {
                 "type": "origins:change_resource",
-                "resource": "terraoriginum:monarchpowers/solar_energy",
+                "resource": "terraoriginum:monarch-powers/solar_energy",
                 "change": -300
             }
         ]
@@ -31,7 +31,7 @@
     },
     "condition": {
         "type": "origins:resource",
-        "resource": "terraoriginum:monarchpowers/solar_energy",
+        "resource": "terraoriginum:monarch-powers/solar_energy",
         "comparison": ">=",
         "compare_to": 200
     },

src/main/resources/data/terraoriginum/powers/monarch-powers/totem_fueled.json

@@ -17,7 +17,7 @@
       "interval": 40,
       "entity_action": {
           "type": "origins:change_resource",
-          "resource": "terraoriginum:monarchpowers/solar_energy",
+          "resource": "terraoriginum:monarch-powers/solar_energy",
           "change": 4,
           "operation": "add"
       }

src/main/resources/data/terraoriginum/recipes/ghostly_cloth.json

@@ -0,0 +1,20 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "pattern": [
+    " # ",
+    "#E#",
+    " # "
+  ],
+  "key": {
+    "#": {
+      "item": "terraoriginum:cotton_ball"
+    },
+    "E": {
+      "item": "minecraft:echo_shard"
+    }
+  },
+  "result": {
+    "item": "terraoriginum:ghostly_cloth",
+    "count": 1
+  }
+}