Merge pull request #124 from Chainmail-Studios/shnup

Shnup
Mixinors · Jun 29, 2020 · 4e52489 · 4e52489
2 parents 78f2843 + e465626
commit 4e52489
Show file tree

Hide file tree

Showing 38 changed files with 39 additions and 36 deletions.
diff --git a/src/main/java/com/github/chainmailstudios/astromine/registry/AstromineBreathables.java b/src/main/java/com/github/chainmailstudios/astromine/registry/AstromineBreathables.java
@@ -7,6 +7,7 @@
 public class AstromineBreathables {
 	public static void initialize() {
 		BreathableRegistry.INSTANCE.register(EntityType.COD, AstromineTags.WATER_BREATHABLE);
+		BreathableRegistry.INSTANCE.register(EntityType.DOLPHIN, AstromineTags.NORMAL_BREATHABLE, AstromineTags.WATER_BREATHABLE);
 		BreathableRegistry.INSTANCE.register(EntityType.DROWNED, AstromineTags.NORMAL_BREATHABLE, AstromineTags.WATER_BREATHABLE);
 		BreathableRegistry.INSTANCE.register(EntityType.ELDER_GUARDIAN, AstromineTags.WATER_BREATHABLE);
 		BreathableRegistry.INSTANCE.register(EntityType.GUARDIAN, AstromineTags.WATER_BREATHABLE);

diff --git a/src/main/resources/data/astromine/recipes/asterite_axe.json b/src/main/resources/data/astromine/recipes/asterite_axe.json
@@ -1,6 +1,6 @@
 {
   "type": "minecraft:crafting_shaped",
-  "pattern": ["## ", "#$ ", " $ "],
+  "pattern": ["##", "#$", " $"],
   "key": {
     "#": {
       "item": "astromine:asterite"

diff --git a/src/main/resources/data/astromine/recipes/asterite_boots.json b/src/main/resources/data/astromine/recipes/asterite_boots.json
@@ -1,6 +1,6 @@
 {
   "type": "minecraft:crafting_shaped",
-  "pattern": ["   ", "# #", "# #"],
+  "pattern": ["# #", "# #"],
   "key": {
     "#": {
       "item": "astromine:asterite"

diff --git a/src/main/resources/data/astromine/recipes/asterite_helmet.json b/src/main/resources/data/astromine/recipes/asterite_helmet.json
@@ -1,6 +1,6 @@
 {
   "type": "minecraft:crafting_shaped",
-  "pattern": ["###", "# #", "   "],
+  "pattern": ["###", "# #"],
   "key": {
     "#": {
       "item": "astromine:asterite"

diff --git a/src/main/resources/data/astromine/recipes/asterite_hoe.json b/src/main/resources/data/astromine/recipes/asterite_hoe.json
@@ -1,6 +1,6 @@
 {
   "type": "minecraft:crafting_shaped",
-  "pattern": ["## ", " $ ", " $ "],
+  "pattern": ["##", " $", " $"],
   "key": {
     "#": {
       "item": "astromine:asterite"

diff --git a/src/main/resources/data/astromine/recipes/asterite_shovel.json b/src/main/resources/data/astromine/recipes/asterite_shovel.json
@@ -1,6 +1,6 @@
 {
   "type": "minecraft:crafting_shaped",
-  "pattern": [" # ", " $ ", " $ "],
+  "pattern": ["#", "$", "$"],
   "key": {
     "#": {
       "item": "astromine:asterite"

diff --git a/src/main/resources/data/astromine/recipes/asterite_sword.json b/src/main/resources/data/astromine/recipes/asterite_sword.json
@@ -1,6 +1,6 @@
 {
   "type": "minecraft:crafting_shaped",
-  "pattern": [" # ", " # ", " $ "],
+  "pattern": ["#", "#", "$"],
   "key": {
     "#": {
       "item": "astromine:asterite"

diff --git a/src/main/resources/data/astromine/recipes/galaxium_axe.json b/src/main/resources/data/astromine/recipes/galaxium_axe.json
@@ -1,6 +1,6 @@
 {
   "type": "minecraft:crafting_shaped",
-  "pattern": ["## ", "#$ ", " $ "],
+  "pattern": ["##", "#$", " $"],
   "key": {
     "#": {
       "item": "astromine:galaxium"

diff --git a/src/main/resources/data/astromine/recipes/galaxium_boots.json b/src/main/resources/data/astromine/recipes/galaxium_boots.json
@@ -1,6 +1,6 @@
 {
   "type": "minecraft:crafting_shaped",
-  "pattern": ["   ", "# #", "# #"],
+  "pattern": ["# #", "# #"],
   "key": {
     "#": {
       "item": "astromine:galaxium"

diff --git a/src/main/resources/data/astromine/recipes/galaxium_helmet.json b/src/main/resources/data/astromine/recipes/galaxium_helmet.json
@@ -1,6 +1,6 @@
 {
   "type": "minecraft:crafting_shaped",
-  "pattern": ["###", "# #", "   "],
+  "pattern": ["###", "# #"],
   "key": {
     "#": {
       "item": "astromine:galaxium"

diff --git a/src/main/resources/data/astromine/recipes/galaxium_hoe.json b/src/main/resources/data/astromine/recipes/galaxium_hoe.json
@@ -1,6 +1,6 @@
 {
   "type": "minecraft:crafting_shaped",
-  "pattern": ["## ", " $ ", " $ "],
+  "pattern": ["##", " $", " $"],
   "key": {
     "#": {
       "item": "astromine:galaxium"

diff --git a/src/main/resources/data/astromine/recipes/galaxium_shovel.json b/src/main/resources/data/astromine/recipes/galaxium_shovel.json
@@ -1,6 +1,6 @@
 {
   "type": "minecraft:crafting_shaped",
-  "pattern": [" # ", " $ ", " $ "],
+  "pattern": ["#", "$", "$"],
   "key": {
     "#": {
       "item": "astromine:galaxium"

diff --git a/src/main/resources/data/astromine/recipes/galaxium_sword.json b/src/main/resources/data/astromine/recipes/galaxium_sword.json
@@ -1,6 +1,6 @@
 {
   "type": "minecraft:crafting_shaped",
-  "pattern": [" # ", " # ", " $ "],
+  "pattern": ["#", "#", "$"],
   "key": {
     "#": {
       "item": "astromine:galaxium"

diff --git a/src/main/resources/data/astromine/recipes/gold_plates_from_ingot.json b/src/main/resources/data/astromine/recipes/gold_plates_from_ingot.json
@@ -1,6 +1,6 @@
 {
   "type": "minecraft:crafting_shaped",
-  "pattern": [" # ", " # ", "   "],
+  "pattern": ["#", "#"],
   "key": {
     "#": {
       "item": "minecraft:gold_ingot"

diff --git a/src/main/resources/data/astromine/recipes/iron_plates_from_ingot.json b/src/main/resources/data/astromine/recipes/iron_plates_from_ingot.json
@@ -1,6 +1,6 @@
 {
   "type": "minecraft:crafting_shaped",
-  "pattern": [" # ", " # ", "   "],
+  "pattern": ["#", "#"],
   "key": {
     "#": {
       "item": "minecraft:iron_ingot"

diff --git a/src/main/resources/data/astromine/recipes/metite_axe.json b/src/main/resources/data/astromine/recipes/metite_axe.json
@@ -1,6 +1,6 @@
 {
   "type": "minecraft:crafting_shaped",
-  "pattern": ["## ", "#$ ", " $ "],
+  "pattern": ["##", "#$", " $"],
   "key": {
     "#": {
       "item": "astromine:metite_ingot"

diff --git a/src/main/resources/data/astromine/recipes/metite_boots.json b/src/main/resources/data/astromine/recipes/metite_boots.json
@@ -1,6 +1,6 @@
 {
   "type": "minecraft:crafting_shaped",
-  "pattern": ["   ", "# #", "# #"],
+  "pattern": ["# #", "# #"],
   "key": {
     "#": {
       "item": "astromine:metite_ingot"

diff --git a/src/main/resources/data/astromine/recipes/metite_helmet.json b/src/main/resources/data/astromine/recipes/metite_helmet.json
@@ -1,6 +1,6 @@
 {
   "type": "minecraft:crafting_shaped",
-  "pattern": ["###", "# #", "   "],
+  "pattern": ["###", "# #"],
   "key": {
     "#": {
       "item": "astromine:metite_ingot"

diff --git a/src/main/resources/data/astromine/recipes/metite_hoe.json b/src/main/resources/data/astromine/recipes/metite_hoe.json
@@ -1,6 +1,6 @@
 {
   "type": "minecraft:crafting_shaped",
-  "pattern": ["## ", " $ ", " $ "],
+  "pattern": ["##", " $", " $"],
   "key": {
     "#": {
       "item": "astromine:metite_ingot"

diff --git a/src/main/resources/data/astromine/recipes/metite_plates_from_ingot.json b/src/main/resources/data/astromine/recipes/metite_plates_from_ingot.json
@@ -1,6 +1,6 @@
 {
   "type": "minecraft:crafting_shaped",
-  "pattern": [" # ", " # ", "   "],
+  "pattern": ["#", "#"],
   "key": {
     "#": {
       "item": "astromine:metite_ingot"

diff --git a/src/main/resources/data/astromine/recipes/metite_shovel.json b/src/main/resources/data/astromine/recipes/metite_shovel.json
@@ -1,6 +1,6 @@
 {
   "type": "minecraft:crafting_shaped",
-  "pattern": [" # ", " $ ", " $ "],
+  "pattern": ["#", "$", "$"],
   "key": {
     "#": {
       "item": "astromine:metite_ingot"

diff --git a/src/main/resources/data/astromine/recipes/metite_sword.json b/src/main/resources/data/astromine/recipes/metite_sword.json
@@ -1,6 +1,6 @@
 {
   "type": "minecraft:crafting_shaped",
-  "pattern": [" # ", " # ", " $ "],
+  "pattern": ["#", "#", "$"],
   "key": {
     "#": {
       "item": "astromine:metite_ingot"

diff --git a/src/main/resources/data/astromine/recipes/netherite_plates_from_ingot.json b/src/main/resources/data/astromine/recipes/netherite_plates_from_ingot.json
@@ -1,6 +1,6 @@
 {
   "type": "minecraft:crafting_shaped",
-  "pattern": [" # ", " # ", "   "],
+  "pattern": ["#", "#"],
   "key": {
     "#": {
       "item": "minecraft:netherite_ingot"

diff --git a/...es/oxygen_from_water_in_electrolyzer.json → ...ipes/oxygen_from_electrolyzing_water.json b/...es/oxygen_from_water_in_electrolyzer.json → ...ipes/oxygen_from_electrolyzing_water.json
diff --git a/...l_from_oxygen_and_lava_in_fuel_mixer.json → ...ket_fuel_from_mixing_oxygen_and_lava.json b/...l_from_oxygen_and_lava_in_fuel_mixer.json → ...ket_fuel_from_mixing_oxygen_and_lava.json
diff --git a/src/main/resources/data/astromine/recipes/space_suit_boots.json b/src/main/resources/data/astromine/recipes/space_suit_boots.json
@@ -1,12 +1,12 @@
 {
   "type": "minecraft:crafting_shaped",
-  "pattern": ["   ", "121", "3 3"],
+  "pattern": ["121", "3 3"],
   "key": {
     "1": {
       "item": "minecraft:white_wool"
     },
     "2": {
-      "item": "astromine:diamond_dust"
+      "item": "astromine:metite_dust"
     },
     "3": {
       "item": "minecraft:black_wool"

diff --git a/src/main/resources/data/astromine/recipes/space_suit_chestplate.json b/src/main/resources/data/astromine/recipes/space_suit_chestplate.json
@@ -6,7 +6,7 @@
       "item": "minecraft:white_wool"
     },
     "2": {
-      "item": "astromine:diamond_dust"
+      "item": "astromine:metite_dust"
     },
     "3": {
       "item": "minecraft:black_wool"

diff --git a/src/main/resources/data/astromine/recipes/space_suit_helmet.json b/src/main/resources/data/astromine/recipes/space_suit_helmet.json
@@ -6,7 +6,7 @@
       "item": "minecraft:white_wool"
     },
     "2": {
-      "item": "astromine:diamond_dust"
+      "item": "astromine:metite_dust"
     },
     "3": {
       "item": "minecraft:black_wool"

diff --git a/src/main/resources/data/astromine/recipes/space_suit_leggings.json b/src/main/resources/data/astromine/recipes/space_suit_leggings.json
@@ -6,7 +6,7 @@
       "item": "minecraft:white_wool"
     },
     "2": {
-      "item": "astromine:diamond_dust"
+      "item": "astromine:metite_dust"
     },
     "3": {
       "item": "minecraft:black_wool"

diff --git a/src/main/resources/data/astromine/recipes/stellum_axe.json b/src/main/resources/data/astromine/recipes/stellum_axe.json
@@ -1,6 +1,6 @@
 {
   "type": "minecraft:crafting_shaped",
-  "pattern": ["## ", "#$ ", " $ "],
+  "pattern": ["##", "#$", " $"],
   "key": {
     "#": {
       "item": "astromine:stellum_ingot"

diff --git a/src/main/resources/data/astromine/recipes/stellum_boots.json b/src/main/resources/data/astromine/recipes/stellum_boots.json
@@ -1,6 +1,6 @@
 {
   "type": "minecraft:crafting_shaped",
-  "pattern": ["   ", "# #", "# #"],
+  "pattern": ["# #", "# #"],
   "key": {
     "#": {
       "item": "astromine:stellum_ingot"

diff --git a/src/main/resources/data/astromine/recipes/stellum_helmet.json b/src/main/resources/data/astromine/recipes/stellum_helmet.json
@@ -1,6 +1,6 @@
 {
   "type": "minecraft:crafting_shaped",
-  "pattern": ["###", "# #", "   "],
+  "pattern": ["###", "# #"],
   "key": {
     "#": {
       "item": "astromine:stellum_ingot"

diff --git a/src/main/resources/data/astromine/recipes/stellum_hoe.json b/src/main/resources/data/astromine/recipes/stellum_hoe.json
@@ -1,6 +1,6 @@
 {
   "type": "minecraft:crafting_shaped",
-  "pattern": ["## ", " $ ", " $ "],
+  "pattern": ["##", " $", " $"],
   "key": {
     "#": {
       "item": "astromine:stellum_ingot"

diff --git a/src/main/resources/data/astromine/recipes/stellum_plates_from_ingot.json b/src/main/resources/data/astromine/recipes/stellum_plates_from_ingot.json
@@ -1,6 +1,6 @@
 {
   "type": "minecraft:crafting_shaped",
-  "pattern": [" # ", " # ", "   "],
+  "pattern": ["#", "#"],
   "key": {
     "#": {
       "item": "astromine:stellum_ingot"

diff --git a/src/main/resources/data/astromine/recipes/stellum_shovel.json b/src/main/resources/data/astromine/recipes/stellum_shovel.json
@@ -1,6 +1,6 @@
 {
   "type": "minecraft:crafting_shaped",
-  "pattern": [" # ", " $ ", " $ "],
+  "pattern": ["#", "$", "$"],
   "key": {
     "#": {
       "item": "astromine:stellum_ingot"

diff --git a/src/main/resources/data/astromine/recipes/stellum_sword.json b/src/main/resources/data/astromine/recipes/stellum_sword.json
@@ -1,6 +1,6 @@
 {
   "type": "minecraft:crafting_shaped",
-  "pattern": [" # ", " # ", " $ "],
+  "pattern": ["#", "#", "$"],
   "key": {
     "#": {
       "item": "astromine:stellum_ingot"

diff --git a/src/main/resources/data/astromine/recipes/univite_plates_from_ingot.json b/src/main/resources/data/astromine/recipes/univite_plates_from_ingot.json
@@ -1,6 +1,6 @@
 {
   "type": "minecraft:crafting_shaped",
-  "pattern": [" # ", " # ", "   "],
+  "pattern": ["#", "#"],
   "key": {
     "#": {
       "item": "astromine:univite_ingot"

diff --git a/src/main/resources/data/astromine/tags/entity_types/does_not_breathe.json b/src/main/resources/data/astromine/tags/entity_types/does_not_breathe.json
@@ -2,6 +2,8 @@
 	"replace": false,
 	"values": [
 		"minecraft:iron_golem",
-		"minecraft:armor_stand"
+		"minecraft:armor_stand",
+		"astromine:space_slime",
+		"astromine:super_space_slime"
 	]
 }