diff --git a/src/main/java/com/github/chainmailstudios/astromine/registry/AstromineBreathables.java b/src/main/java/com/github/chainmailstudios/astromine/registry/AstromineBreathables.java index a6304ba1c..48065c9eb 100644 --- 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 index f3179c934..e7b252db4 100644 --- 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 index b1089185f..3844493de 100644 --- 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 index b55d3899a..86cf98ad0 100644 --- 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 index 2675d6ae4..df7ac5cc6 100644 --- 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 index 1b30be5b5..aed42015b 100644 --- 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 index c2ca8adc1..54f3cb51b 100644 --- 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 index 8a5498f3f..a274f895a 100644 --- 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 index b832d9a32..a2e7aaa72 100644 --- 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 index 68fa97531..eb049ba4c 100644 --- 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 index 8fe0a657e..9c2ae37a4 100644 --- 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 index b468fcdcc..4f2b8cd5c 100644 --- 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 index 580834146..bbbfc790a 100644 --- 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 index 78e8e38ea..eda9922b8 100644 --- 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 index 6d5019dda..b50fdcda1 100644 --- 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 index 2ccb666db..ce89bd2c0 100644 --- 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 index cd71100f5..6b1b6987a 100644 --- 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 index 8a5b512ff..4f896a92d 100644 --- 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 index 39f95bad9..fd75365ee 100644 --- 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 index 846491523..9fdbfa0fd 100644 --- 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 index db05dd701..65d5c23e1 100644 --- 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 index 5291f2af2..09fe004f1 100644 --- 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 index cec4108d6..93883f5f3 100644 --- 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/src/main/resources/data/astromine/recipes/oxygen_from_water_in_electrolyzer.json b/src/main/resources/data/astromine/recipes/oxygen_from_electrolyzing_water.json similarity index 100% rename from src/main/resources/data/astromine/recipes/oxygen_from_water_in_electrolyzer.json rename to src/main/resources/data/astromine/recipes/oxygen_from_electrolyzing_water.json diff --git a/src/main/resources/data/astromine/recipes/rocket_fuel_from_oxygen_and_lava_in_fuel_mixer.json b/src/main/resources/data/astromine/recipes/rocket_fuel_from_mixing_oxygen_and_lava.json similarity index 100% rename from src/main/resources/data/astromine/recipes/rocket_fuel_from_oxygen_and_lava_in_fuel_mixer.json rename to src/main/resources/data/astromine/recipes/rocket_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 index 658cebcd0..ac5ebe359 100644 --- 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 index 063bb95c9..89d5a14c0 100644 --- 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 index 4cfb17fab..5f25851db 100644 --- 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 index 8fcbbdb7f..58c5331b7 100644 --- 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 index b713ec0e7..ad6fe2df7 100644 --- 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 index 3f4ee11b0..cc981d701 100644 --- 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 index 2c995cca3..38ebac80a 100644 --- 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 index 7572f9a56..07749b498 100644 --- 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 index 8cc2e5b59..6295c2a88 100644 --- 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 index c42dcef68..146d6e7a6 100644 --- 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 index 6f9affede..2710eeea5 100644 --- 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 index 75f7e4da9..46b86418c 100644 --- 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 index 51903323b..ecdc4c9b9 100644 --- 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" ] } \ No newline at end of file