Merge branch 'dev' into 1.18.X

src/generated/resources/assets/rankine/blockstates/battery_charger.json

@@ -0,0 +1,30 @@
+{
+  "variants": {
+    "facing=down": {
+      "model": "rankine:block/battery_charger",
+      "x": 180
+    },
+    "facing=up": {
+      "model": "rankine:block/battery_charger"
+    },
+    "facing=north": {
+      "model": "rankine:block/battery_charger",
+      "x": 90
+    },
+    "facing=south": {
+      "model": "rankine:block/battery_charger",
+      "x": 90,
+      "y": 180
+    },
+    "facing=west": {
+      "model": "rankine:block/battery_charger",
+      "x": 90,
+      "y": 270
+    },
+    "facing=east": {
+      "model": "rankine:block/battery_charger",
+      "x": 90,
+      "y": 90
+    }
+  }
+}

src/generated/resources/assets/rankine/blockstates/neptunium_alloy_bars.json

@@ -0,0 +1,100 @@
+{
+  "multipart": [
+    {
+      "apply": {
+        "model": "rankine:block/neptunium_alloy_bars_post_ends"
+      }
+    },
+    {
+      "when": {
+        "north": "false",
+        "east": "false",
+        "west": "false",
+        "south": "false"
+      },
+      "apply": {
+        "model": "rankine:block/neptunium_alloy_bars_post"
+      }
+    },
+    {
+      "when": {
+        "north": "true",
+        "east": "false",
+        "west": "false",
+        "south": "false"
+      },
+      "apply": {
+        "model": "rankine:block/neptunium_alloy_bars_cap"
+      }
+    },
+    {
+      "when": {
+        "north": "false",
+        "east": "true",
+        "west": "false",
+        "south": "false"
+      },
+      "apply": {
+        "model": "rankine:block/neptunium_alloy_bars_cap",
+        "y": 90
+      }
+    },
+    {
+      "when": {
+        "north": "false",
+        "east": "false",
+        "west": "false",
+        "south": "true"
+      },
+      "apply": {
+        "model": "rankine:block/neptunium_alloy_bars_cap_alt"
+      }
+    },
+    {
+      "when": {
+        "north": "false",
+        "east": "false",
+        "west": "true",
+        "south": "false"
+      },
+      "apply": {
+        "model": "rankine:block/neptunium_alloy_bars_cap_alt",
+        "y": 90
+      }
+    },
+    {
+      "when": {
+        "north": "true"
+      },
+      "apply": {
+        "model": "rankine:block/neptunium_alloy_bars_side"
+      }
+    },
+    {
+      "when": {
+        "south": "true"
+      },
+      "apply": {
+        "model": "rankine:block/neptunium_alloy_bars_side_alt"
+      }
+    },
+    {
+      "when": {
+        "west": "true"
+      },
+      "apply": {
+        "model": "rankine:block/neptunium_alloy_bars_side_alt",
+        "y": 90
+      }
+    },
+    {
+      "when": {
+        "east": "true"
+      },
+      "apply": {
+        "model": "rankine:block/neptunium_alloy_bars_side",
+        "y": 90
+      }
+    }
+  ]
+}

src/generated/resources/assets/rankine/blockstates/neptunium_alloy_block.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "rankine:block/neptunium_alloy_block"
+    }
+  }
+}

src/generated/resources/assets/rankine/blockstates/neptunium_alloy_pedestal.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "rankine:block/neptunium_alloy_pedestal"
+    }
+  }
+}

src/generated/resources/assets/rankine/blockstates/neptunium_alloy_pole.json

@@ -0,0 +1,28 @@
+{
+  "variants": {
+    "style=0": {
+      "model": "rankine:block/neptunium_alloy_pole0"
+    },
+    "style=1": {
+      "model": "rankine:block/neptunium_alloy_pole1"
+    },
+    "style=2": {
+      "model": "rankine:block/neptunium_alloy_pole2"
+    },
+    "style=3": {
+      "model": "rankine:block/neptunium_alloy_pole3"
+    },
+    "style=4": {
+      "model": "rankine:block/neptunium_alloy_pole4"
+    },
+    "style=5": {
+      "model": "rankine:block/neptunium_alloy_pole5"
+    },
+    "style=6": {
+      "model": "rankine:block/neptunium_alloy_pole6"
+    },
+    "style=7": {
+      "model": "rankine:block/neptunium_alloy_pole7"
+    }
+  }
+}

src/generated/resources/assets/rankine/blockstates/neptunium_alloy_sheetmetal.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "rankine:block/neptunium_alloy_sheetmetal"
+    }
+  }
+}

src/generated/resources/assets/rankine/lang/en_us.json

@@ -146,6 +146,7 @@
   "block.rankine.basalt_bricks_stairs": "Basalt Bricks Stairs",
   "block.rankine.basalt_bricks_wall": "Basalt Bricks Wall",
   "block.rankine.basaltic_tuff": "Basaltic Tuff",
+  "block.rankine.battery_charger": "Battery Charger",
   "block.rankine.bauxite_block": "Block Of Bauxite",
   "block.rankine.bauxite_ore": "Bauxite Ore",
   "block.rankine.beehive_oven_pit": "Beehive Oven Pit",
@@ -1742,6 +1743,11 @@
   "block.rankine.nepheline_syenite_slab": "Nepheline Syenite Slab",
   "block.rankine.nepheline_syenite_stairs": "Nepheline Syenite Stairs",
   "block.rankine.nepheline_syenite_wall": "Nepheline Syenite Wall",
+  "block.rankine.neptunium_alloy_bars": "Neptunium Alloy Bars",
+  "block.rankine.neptunium_alloy_block": "Block of %1$s",
+  "block.rankine.neptunium_alloy_pedestal": "Neptunium Alloy Pedestal",
+  "block.rankine.neptunium_alloy_pole": "Neptunium Alloy Pole",
+  "block.rankine.neptunium_alloy_sheetmetal": "Neptunium Alloy Sheetmetal",
   "block.rankine.neptunium_block": "Block Of Neptunium",
   "block.rankine.nether_gold_ore": "Nether Gold Ore",
   "block.rankine.nether_quartz_ore": "Nether Quartz Ore",
@@ -3199,7 +3205,6 @@
   "item.rankine.alloy_rod_steel": "Steel Rod",
   "item.rankine.alloy_shovel": "%1$s Shovel",
   "item.rankine.alloy_spear": "%1$s Spear",
-  "item.rankine.alloy_surf_rod": "%1$s Surf Rod",
   "item.rankine.alloy_sword": "%1$s Sword",
   "item.rankine.alloy_template": "Alloy Template",
   "item.rankine.alloy_wire": "%1$s Wire",
@@ -3555,6 +3560,8 @@
   "item.rankine.gallium_nugget": "Gallium Nugget",
   "item.rankine.garland": "Garland",
   "item.rankine.garnet": "Garnet",
+  "item.rankine.gas_detector": "Gas Detector",
+  "item.rankine.gas_detector.message": "%1$s was detected at x:%2$s y:%3$s z:%4$s",
   "item.rankine.gas_mask": "Gas Mask",
   "item.rankine.germanium": "Germanium",
   "item.rankine.germanium_nugget": "Germanium Nugget",
@@ -3720,6 +3727,9 @@
   "item.rankine.neon_ingot": "Neon Ingot",
   "item.rankine.neon_nugget": "Neon Nugget",
   "item.rankine.nepheline": "Nepheline",
+  "item.rankine.neptunium_alloy_alloying": "Neptunium Alloy",
+  "item.rankine.neptunium_alloy_ingot": "%1$s Ingot",
+  "item.rankine.neptunium_alloy_nugget": "%1$s Nugget",
   "item.rankine.neptunium_ingot": "Neptunium Ingot",
   "item.rankine.neptunium_nugget": "Neptunium Nugget",
   "item.rankine.netherite_nugget": "Netherite Nugget",
@@ -4106,6 +4116,8 @@
   "item.rankine.totem_of_levitating": "Totem Of Levitating",
   "item.rankine.totem_of_levitating.tooltip": "For keeping your feet clean",
   "item.rankine.totem_of_mending.tooltip": "Regenerate your losses",
+  "item.rankine.totem_of_powering": "Totem Of Powering",
+  "item.rankine.totem_of_powering.tooltip": "The sea heart calls and infuses",
   "item.rankine.totem_of_promising": "Totem Of Promising",
   "item.rankine.totem_of_promising.tooltip": "Fortune is on your side",
   "item.rankine.totem_of_repulsing": "Totem Of Repulsing",
@@ -4206,7 +4218,6 @@
   "itemGroup.rankine_misc": "Project Rankine: Miscellaneous",
   "itemGroup.rankine_world": "Project Rankine Building",
   "jei.description.crushing_basic": "Can be obtained by crushing ores using a machine or a Bronze Hammer.",
-  "multiblocks.modonomicon.blockentity": "Blockentity Multiblock.",
   "rankine.advancements.challenges.alloy_collector.description": "Create all of the different types of alloys",
   "rankine.advancements.challenges.alloy_collector.title": "Worldmoulder",
   "rankine.advancements.challenges.bronze_harvest.description": "Make a Bronze Pickaxe with a Harvest Level of 3 (or Steel equivalent)",
@@ -4361,19 +4372,34 @@
   "rankine.advancements.story.treads.description": "Aquire boots with the four enchantments from feet equipment",
   "rankine.advancements.story.treads.title": "Don't Tread On Me",
   "rankine.alloys": "Alloys",
+  "rankine.battery.charge": "Charge: %1$s/%2$s",
   "rankine.jei.air_distillation": "Air Distillation",
   "rankine.jei.alloying": "Alloying",
   "rankine.jei.alloying_bonus_stats": "Bonus Stats",
   "rankine.jei.alloying_enchantments": "Bonus Enchantments",
+  "rankine.jei.battery": "Battery",
   "rankine.jei.beeoven": "Beehive Oven",
   "rankine.jei.crucible": "Crucible",
+  "rankine.jei.crucible_tooltip_additional": "Additional (Pick %s Unique Ingredients)",
   "rankine.jei.crushing": "Crushing",
   "rankine.jei.element": "Elements",
   "rankine.jei.evaporation": "Evaporation",
   "rankine.jei.extrusive_igneous": "Extrusive Igneous Rock Generator",
   "rankine.jei.foraging": "Foraging",
   "rankine.jei.fusion_furnace": "Fusion Furnace",
   "rankine.jei.induction_alloying": "Advanced Alloying",
+  "rankine.jei.info_amber": "Resin can be placed in a cauldron. If a heat source is placed adjacent to the cauldron, Resin is turned into Amber.",
+  "rankine.jei.info_battery_energy": "Total Charge: %1$s [?]",
+  "rankine.jei.info_battery_fusion": "%1$s Fusion Furnace processes",
+  "rankine.jei.info_battery_induction": "%1$s Induction Furnace processes",
+  "rankine.jei.info_battery_rechargeable": "Rechargeable",
+  "rankine.jei.info_battery_rtg": "Single-use",
+  "rankine.jei.info_dry_rubber": "Latex can be placed in a cauldron. If a heat source is placed adjacent to the cauldron, Latex is turned into Dry Rubber.",
+  "rankine.jei.info_juglone": "Can be placed in a cauldron. If a heat source is placed adjacent to the cauldron, the fluid is turned into Brown Dye.",
+  "rankine.jei.info_latex": "Can be placed in a cauldron. If a heat source is placed adjacent to the cauldron, the fluid is turned into Dry Rubber.",
+  "rankine.jei.info_maple_sap": "Can be placed in a cauldron. If a heat source is placed adjacent to the cauldron, the fluid is turned into Maple Syrup, which can be bottled out.",
+  "rankine.jei.info_resin": "Can be placed in a cauldron. If a heat source is placed adjacent to the cauldron, the fluid is turned into Amber.",
+  "rankine.jei.info_sap": "Can be placed in a cauldron. If a heat source is placed adjacent to the cauldron, the fluid is turned into Sugar.",
   "rankine.jei.intrusive_igneous": "Intrusive Igneous Rock Generator",
   "rankine.jei.metamorphic": "Metamorphic Rock Generator",
   "rankine.jei.mixing": "Mixing",
@@ -4385,19 +4411,26 @@
   "rankine.jei.tooltip_biomes_info": "Biomes: ",
   "rankine.jei.tooltip_biomes_tags_info": "Biome Tags: ",
   "rankine.jei.tooltip_chance": "Chance: ",
+  "rankine.jei.tooltip_dimension_info": "Dimension: ",
   "rankine.jei.tooltip_enchantability_interval": "Gains a level every %s enchantability",
   "rankine.jei.tooltip_enchantment_required": "Requires Foraging enchantment",
   "rankine.jei.tooltip_failure_chance": "Failure Chance: ",
   "rankine.jei.tooltip_guaranteed": "Guaranteed",
-  "rankine.jei.tooltip_limited": "Can obtain once",
+  "rankine.jei.tooltip_limited": "Can only drop once per block",
+  "rankine.jei.tooltip_material_info": "Material Count: ",
   "rankine.jei.tooltip_max_level": "Max Level: ",
   "rankine.jei.tooltip_max_rolls": "Max outputs: ",
+  "rankine.jei.tooltip_mixing_time": "Base Mixing Time: %s redstone power per ingredient total",
   "rankine.jei.tooltip_none": "None",
-  "rankine.jei.tooltip_nonlimited": "Can obtain multiple times",
+  "rankine.jei.tooltip_nonlimited": "Can drop multiple times per block",
   "rankine.jei.tooltip_nothing": "Skip Output",
   "rankine.jei.tooltip_required": "Required",
   "rankine.jei.tooltip_starting_enchantability": "Obtained at %s enchantability",
   "rankine.jei.tooltip_tier": "Tier: ",
+  "rankine.jei.tooltip_total_button_lever": "(%s button presses or lever flicks)",
+  "rankine.jei.tooltip_total_ingredients": "%s total ingredients",
+  "rankine.jei.tooltip_total_mixing_time": "Total Mixing Time: %s redstone power",
+  "rankine.jei.tooltip_total_output": "%s total output",
   "rankine.jei.treetapping": "Treetap",
   "rankine.jei.volcanic": "Volcanic Rock Generator",
   "rankine.journal.cat_biota.crops.aloe": "",

src/generated/resources/assets/rankine/models/block/battery_charger.json

@@ -0,0 +1,8 @@
+{
+  "parent": "minecraft:block/orientable",
+  "textures": {
+    "side": "rankine:block/battery_charger_side",
+    "front": "rankine:block/battery_charger_front",
+    "top": "rankine:block/battery_charger_top"
+  }
+}

src/generated/resources/assets/rankine/models/block/neptunium_alloy_bars_cap.json

@@ -0,0 +1,6 @@
+{
+  "parent": "rankine:block/template_tinted_bars_cap",
+  "textures": {
+    "bars": "rankine:block/alloy_bars1"
+  }
+}

src/generated/resources/assets/rankine/models/block/neptunium_alloy_bars_cap_alt.json

@@ -0,0 +1,6 @@
+{
+  "parent": "rankine:block/template_tinted_bars_cap_alt",
+  "textures": {
+    "bars": "rankine:block/alloy_bars1"
+  }
+}

src/generated/resources/assets/rankine/models/block/neptunium_alloy_bars_post.json

@@ -0,0 +1,6 @@
+{
+  "parent": "rankine:block/template_tinted_bars_post",
+  "textures": {
+    "bars": "rankine:block/alloy_bars1"
+  }
+}

src/generated/resources/assets/rankine/models/block/neptunium_alloy_bars_post_ends.json

@@ -0,0 +1,6 @@
+{
+  "parent": "rankine:block/template_tinted_bars_post_ends",
+  "textures": {
+    "edge": "rankine:block/alloy_bars_edge"
+  }
+}

src/generated/resources/assets/rankine/models/block/neptunium_alloy_bars_side.json

@@ -0,0 +1,7 @@
+{
+  "parent": "rankine:block/template_tinted_bars_side",
+  "textures": {
+    "bars": "rankine:block/alloy_bars1",
+    "edge": "rankine:block/alloy_bars_edge"
+  }
+}

src/generated/resources/assets/rankine/models/block/neptunium_alloy_bars_side_alt.json

@@ -0,0 +1,7 @@
+{
+  "parent": "rankine:block/template_tinted_bars_side_alt",
+  "textures": {
+    "bars": "rankine:block/alloy_bars1",
+    "edge": "rankine:block/alloy_bars_edge"
+  }
+}

src/generated/resources/assets/rankine/models/block/neptunium_alloy_block.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cube_all",
+  "textures": {
+    "all": "rankine:block/neptunium_alloy_block"
+  }
+}

src/generated/resources/assets/rankine/models/block/neptunium_alloy_pedestal.json

@@ -0,0 +1,6 @@
+{
+  "parent": "rankine:block/template_pedestal",
+  "textures": {
+    "all": "rankine:block/neptunium_alloy_block"
+  }
+}