Several retextures and proper ore block tags

* Remodeled transport tubes and fallen meteor
* Textured all nugget items and glass pipe item
* Gave proper pickaxe mining tags to ore blocks
* Removed iron shard item
* Fixed some block names

src/main/generated/assets/galacticraft/lang/en_us.json

@@ -32,15 +32,15 @@
   "block.galacticraft.asteroid_rock_block_2": "Asteroid Rock",
   "block.galacticraft.basic_solar_panel": "Basic Solar Panel",
   "block.galacticraft.basic_solar_panel.description": "Basic Solar Panels collect energy from the sun, and store it for further use. Collects most energy at mid-day (non-adjustable).",
-  "block.galacticraft.black_candle_moon_cheese_wheel": "Block of Cheese with Black Candle",
-  "block.galacticraft.blue_candle_moon_cheese_wheel": "Block of Cheese with Blue Candle",
+  "block.galacticraft.black_candle_moon_cheese_wheel": "Moon Cheese Wheel with Black Candle",
+  "block.galacticraft.blue_candle_moon_cheese_wheel": "Moon Cheese Wheel with Blue Candle",
   "block.galacticraft.boss_spawner": "Boss Spawner",
   "block.galacticraft.bronze_decoration": "Bronze Decoration",
   "block.galacticraft.bronze_decoration_slab": "Bronze Decoration Slab",
   "block.galacticraft.bronze_decoration_stairs": "Bronze Decoration Stairs",
   "block.galacticraft.bronze_decoration_wall": "Bronze Decoration Wall",
-  "block.galacticraft.brown_candle_moon_cheese_wheel": "Block of Cheese with Brown Candle",
-  "block.galacticraft.candle_moon_cheese_wheel": "Block of Cheese with Candle",
+  "block.galacticraft.brown_candle_moon_cheese_wheel": "Moon Cheese Wheel with Brown Candle",
+  "block.galacticraft.candle_moon_cheese_wheel": "Moon Cheese Wheel with Candle",
   "block.galacticraft.cavernous_vines": "Cavernous Vines",
   "block.galacticraft.cavernous_vines_plant": "Cavernous Vines Plant",
   "block.galacticraft.chiseled_moon_rock_brick": "Chiseled Moon Rock Brick",
@@ -73,7 +73,7 @@
   "block.galacticraft.crude_oil": "Crude Oil",
   "block.galacticraft.cryogenic_chamber": "Cryogenic Chamber",
   "block.galacticraft.cryogenic_chamber_part": "Cryogenic Chamber Part",
-  "block.galacticraft.cyan_candle_moon_cheese_wheel": "Block of Cheese with Cyan Candle",
+  "block.galacticraft.cyan_candle_moon_cheese_wheel": "Moon Cheese Wheel with Cyan Candle",
   "block.galacticraft.dark_decoration": "Dark Decoration",
   "block.galacticraft.dark_decoration_slab": "Dark Decoration Slab",
   "block.galacticraft.dark_decoration_stairs": "Dark Decoration Stairs",
@@ -137,8 +137,8 @@
   "block.galacticraft.glowstone_lantern": "Glowstone Lantern",
   "block.galacticraft.glowstone_torch": "Glowstone Torch",
   "block.galacticraft.iron_grating": "Iron Grating",
-  "block.galacticraft.gray_candle_moon_cheese_wheel": "Block of Cheese with Gray Candle",
-  "block.galacticraft.green_candle_moon_cheese_wheel": "Block of Cheese with Green Candle",
+  "block.galacticraft.gray_candle_moon_cheese_wheel": "Moon Cheese Wheel with Gray Candle",
+  "block.galacticraft.green_candle_moon_cheese_wheel": "Moon Cheese Wheel with Green Candle",
   "block.galacticraft.hard_venus_rock": "Hard Venus Rock",
   "block.galacticraft.heavy_sealable_aluminum_wire": "Heavy Sealable Aluminum Wire",
   "block.galacticraft.ilmenite_ore": "Ilmenite Ore",
@@ -147,9 +147,9 @@
   "block.galacticraft.iron_decoration_stairs": "Iron Decoration Stairs",
   "block.galacticraft.iron_decoration_wall": "Iron Decoration Wall",
   "block.galacticraft.lead_block": "Block of Lead",
-  "block.galacticraft.light_blue_candle_moon_cheese_wheel": "Block of Cheese with Light Blue Candle",
-  "block.galacticraft.light_gray_candle_moon_cheese_wheel": "Block of Cheese with Light Gray Candle",
-  "block.galacticraft.lime_candle_moon_cheese_wheel": "Block of Cheese with Lime Candle",
+  "block.galacticraft.light_blue_candle_moon_cheese_wheel": "Moon Cheese Wheel with Light Blue Candle",
+  "block.galacticraft.light_gray_candle_moon_cheese_wheel": "Moon Cheese Wheel with Light Gray Candle",
+  "block.galacticraft.lime_candle_moon_cheese_wheel": "Moon Cheese Wheel with Lime Candle",
   "block.galacticraft.linear_light_panel": "Light Panel (Linear)",
   "block.galacticraft.lunar_cartography_table": "Lunar Cartography Table",
   "block.galacticraft.lunar_sapphire_block": "Block of Lunar Sapphire",
@@ -159,7 +159,7 @@
   "block.galacticraft.lunaslate_stairs": "Lunaslate Stairs",
   "block.galacticraft.lunaslate_tin_ore": "Lunaslate Tin Ore",
   "block.galacticraft.lunaslate_wall": "Lunaslate Wall",
-  "block.galacticraft.magenta_candle_moon_cheese_wheel": "Block of Cheese with Magenta Candle",
+  "block.galacticraft.magenta_candle_moon_cheese_wheel": "Moon Cheese Wheel with Magenta Candle",
   "block.galacticraft.mars_cobblestone": "Mars Cobblestone",
   "block.galacticraft.mars_cobblestone_slab": "Mars Cobblestone Slab",
   "block.galacticraft.mars_cobblestone_stairs": "Mars Cobblestone Stairs",
@@ -184,7 +184,7 @@
   "block.galacticraft.moon_basalt_stairs": "Moon Basalt Stairs",
   "block.galacticraft.moon_basalt_wall": "Moon Basalt Wall",
   "block.galacticraft.moon_cheese_wheel": "Moon Cheese Wheel",
-  "block.galacticraft.moon_cheese_wheel.description": "Cheese Blocks are created from the cheeses of the Moon, place-able and edible.",
+  "block.galacticraft.moon_cheese_wheel.description": "Moon Cheese Wheels are created from the cheeses of the Moon, place-able and edible.",
   "block.galacticraft.moon_copper_ore": "Moon Copper Ore",
   "block.galacticraft.moon_dirt": "Moon Dirt",
   "block.galacticraft.moon_dirt_path": "Moon Dirt Path",
@@ -204,7 +204,7 @@
   "block.galacticraft.olivine_basalt": "Olivine Basalt",
   "block.galacticraft.olivine_block": "Block of Olivine",
   "block.galacticraft.olivine_cluster": "Olivine Cluster",
-  "block.galacticraft.orange_candle_moon_cheese_wheel": "Block of Cheese with Orange Candle",
+  "block.galacticraft.orange_candle_moon_cheese_wheel": "Moon Cheese Wheel with Orange Candle",
   "block.galacticraft.oxygen_bubble_distributor": "Bubble Distributor",
   "block.galacticraft.oxygen_bubble_distributor.description": "Oxygen Bubble Distributor creates a bubble of air around itself. Requires oxygen and electricity.",
   "block.galacticraft.oxygen_collector": "Oxygen Collector",
@@ -215,21 +215,21 @@
   "block.galacticraft.oxygen_storage_module": "Oxygen Storage Module",
   "block.galacticraft.parachest": "Parachest",
   "block.galacticraft.parachest.description": "Parachests will fall from the sky after landing on certain planets/moons, such as Earth. Contains rocket, fuel, and cargo from previous launch.",
-  "block.galacticraft.pink_candle_moon_cheese_wheel": "Block of Cheese with Pink Candle",
+  "block.galacticraft.pink_candle_moon_cheese_wheel": "Moon Cheese Wheel with Pink Candle",
   "block.galacticraft.player_transport_tube": "Player Transport Tube",
   "block.galacticraft.polished_moon_rock": "Polished Moon Rock",
   "block.galacticraft.polished_moon_rock_slab": "Polished Moon Rock Slab",
   "block.galacticraft.polished_moon_rock_stairs": "Polished Moon Rock Stairs",
   "block.galacticraft.polished_moon_rock_wall": "Polished Moon Rock Wall",
   "block.galacticraft.pumice": "Pumice",
-  "block.galacticraft.purple_candle_moon_cheese_wheel": "Block of Cheese with Purple Candle",
-  "block.galacticraft.red_candle_moon_cheese_wheel": "Block of Cheese with Red Candle",
+  "block.galacticraft.purple_candle_moon_cheese_wheel": "Moon Cheese Wheel with Purple Candle",
+  "block.galacticraft.red_candle_moon_cheese_wheel": "Moon Cheese Wheel with Red Candle",
   "block.galacticraft.refinery": "Refinery",
   "block.galacticraft.refinery.description": "Refinery will take an input of oil and energy, and output fuel used for rockets and vehicles.",
   "block.galacticraft.rich_olivine_basalt": "Rich Olivine Basalt",
   "block.galacticraft.rocket_launch_pad": "Rocket Launch Pad",
   "block.galacticraft.rocket_workbench": "Rocket Workbench",
-  "block.galacticraft.scorched_venus_rock": "Scorched Rock",
+  "block.galacticraft.scorched_venus_rock": "Scorched Venus Rock",
   "block.galacticraft.sealable_aluminum_wire": "Sealable Aluminum Wire",
   "block.galacticraft.silicon_block": "Block of Silicon",
   "block.galacticraft.silicon_ore": "Silicon Ore",
@@ -262,9 +262,9 @@
   "block.galacticraft.vapor_spout": "Vapor Spout",
   "block.galacticraft.volcanic_rock": "Volcanic Rock",
   "block.galacticraft.walkway": "Walkway",
-  "block.galacticraft.white_candle_moon_cheese_wheel": "Block of Cheese with White Candle",
+  "block.galacticraft.white_candle_moon_cheese_wheel": "Moon Cheese Wheel with White Candle",
   "block.galacticraft.wire_walkway": "Wire Walkway",
-  "block.galacticraft.yellow_candle_moon_cheese_wheel": "Block of Cheese with Yellow Candle",
+  "block.galacticraft.yellow_candle_moon_cheese_wheel": "Moon Cheese Wheel with Yellow Candle",
   "category.recipe_viewer.circuit_fabricator": "Circuit Fabricating",
   "category.recipe_viewer.compressing": "Compressing",
   "chat.galacticraft.bed_fail": "Uh oh, what if the oxygen runs out when I am asleep?  I'll need a Cryogenic Chamber to sleep in space!",
@@ -434,7 +434,6 @@
   "item.galacticraft.hot_throwable_meteor_chunk": "Hot Throwable Meteor Chunk",
   "item.galacticraft.infinite_battery": "Infinite Battery",
   "item.galacticraft.infinite_oxygen_tank": "Infinite Oxygen Tank",
-  "item.galacticraft.iron_shard": "Iron Shard",
   "item.galacticraft.isothermal_fabric": "Isothermal Fabric",
   "item.galacticraft.large_oxygen_tank": "Large Oxygen Tank",
   "item.galacticraft.lead_ingot": "Lead Ingot",

src/main/generated/data/minecraft/tags/block/needs_diamond_tool.json

@@ -1,6 +1,10 @@
 {
   "values": [
     "galacticraft:desh_ore",
-    "galacticraft:ilmenite_ore"
+    "galacticraft:raw_desh_block",
+    "galacticraft:desh_block",
+    "galacticraft:ilmenite_ore",
+    "galacticraft:raw_titanium_block",
+    "galacticraft:titanium_block"
   ]
 }

src/main/generated/data/minecraft/tags/block/needs_iron_tool.json

@@ -2,6 +2,7 @@
   "values": [
     "galacticraft:silicon_ore",
     "galacticraft:deepslate_silicon_ore",
+    "galacticraft:silicon_block",
     "galacticraft:fallen_meteor"
   ]
 }

src/main/generated/data/minecraft/tags/block/needs_stone_tool.json

@@ -10,8 +10,16 @@
     "galacticraft:deepslate_tin_ore",
     "galacticraft:moon_tin_ore",
     "galacticraft:lunaslate_tin_ore",
+    "galacticraft:raw_tin_block",
+    "galacticraft:tin_block",
     "galacticraft:aluminum_ore",
     "galacticraft:deepslate_aluminum_ore",
-    "galacticraft:galena_ore"
+    "galacticraft:raw_aluminum_block",
+    "galacticraft:aluminum_block",
+    "galacticraft:galena_ore",
+    "galacticraft:raw_lead_block",
+    "galacticraft:lead_block",
+    "galacticraft:raw_meteoric_iron_block",
+    "galacticraft:meteoric_iron_block"
   ]
 }

src/main/java/dev/galacticraft/mod/Constant.java

@@ -363,7 +363,6 @@ interface Item {
         String OLIVINE_SHARD = "olivine_shard";
         String DESH_STICK = "desh_stick";
         String CARBON_FRAGMENTS = "carbon_fragments";
-        String IRON_SHARD = "iron_shard";
         String SOLAR_DUST = "solar_dust";
         String BASIC_WAFER = "basic_wafer";
         String ADVANCED_WAFER = "advanced_wafer";

src/main/java/dev/galacticraft/mod/content/item/GCCreativeModeTabs.java

@@ -130,7 +130,6 @@ public class GCCreativeModeTabs {
 
                 output.accept(DESH_STICK);
                 output.accept(CARBON_FRAGMENTS);
-                output.accept(IRON_SHARD);
                 output.accept(SOLAR_DUST);
                 output.accept(BASIC_WAFER);
                 output.accept(ADVANCED_WAFER);

src/main/java/dev/galacticraft/mod/content/item/GCItems.java

@@ -276,7 +276,6 @@ public class GCItems {
     public static final Item LUNAR_SAPPHIRE = new Item(new Item.Properties());
     public static final Item DESH_STICK = new Item(new Item.Properties());
     public static final Item CARBON_FRAGMENTS = new Item(new Item.Properties());
-    public static final Item IRON_SHARD = new Item(new Item.Properties());
     public static final Item SOLAR_DUST = new Item(new Item.Properties());
     public static final Item BASIC_WAFER = new Item(new Item.Properties());
     public static final Item ADVANCED_WAFER = new Item(new Item.Properties());
@@ -664,7 +663,6 @@ public static void register() {
         Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Item.LUNAR_SAPPHIRE), LUNAR_SAPPHIRE);
         Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Item.DESH_STICK), DESH_STICK);
         Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Item.CARBON_FRAGMENTS), CARBON_FRAGMENTS);
-        Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Item.IRON_SHARD), IRON_SHARD);
         Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Item.SOLAR_DUST), SOLAR_DUST);
         Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Item.BASIC_WAFER), BASIC_WAFER);
         Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Item.ADVANCED_WAFER), ADVANCED_WAFER);

src/main/java/dev/galacticraft/mod/data/model/GCModelProvider.java

@@ -382,7 +382,6 @@ public void generateItemModels(ItemModelGenerators generator) {
         generator.generateFlatItem(GCItems.OLIVINE_SHARD, ModelTemplates.FLAT_ITEM);
         generator.generateFlatItem(GCItems.DESH_STICK, ModelTemplates.FLAT_HANDHELD_ITEM);
         generator.generateFlatItem(GCItems.CARBON_FRAGMENTS, ModelTemplates.FLAT_ITEM);
-        generator.generateFlatItem(GCItems.IRON_SHARD, ModelTemplates.FLAT_ITEM);
         generator.generateFlatItem(GCItems.SOLAR_DUST, ModelTemplates.FLAT_ITEM);
         generator.generateFlatItem(GCItems.BASIC_WAFER, ModelTemplates.FLAT_ITEM);
         generator.generateFlatItem(GCItems.ADVANCED_WAFER, ModelTemplates.FLAT_ITEM);

src/main/java/dev/galacticraft/mod/data/recipes/GCOreRecipeProvider.java

@@ -60,7 +60,6 @@ public void buildRecipes(RecipeOutput output) {
         oreSmeltingAndBlasting(output, List.of(GCItems.RAW_LEAD, GCItems.GALENA_ORE), GCItems.LEAD_INGOT, 0.7f, 100);
 
         oreSmeltingAndBlasting(output, List.of(GCItems.MOON_COPPER_ORE, GCItems.LUNASLATE_COPPER_ORE), Items.COPPER_INGOT, 0.7f, 100);
-        oreSmeltingAndBlasting(output, List.of(GCItems.IRON_SHARD), Items.IRON_INGOT, 0.7f, 100);
 
         // Nuggets <-> Ingots
         nineBlockStoragePackingRecipe(output, RecipeCategory.MISC, GCItems.METEORIC_IRON_NUGGET, RecipeCategory.MISC, GCItems.METEORIC_IRON_INGOT, "meteoric_iron_ingot_from_nuggets", "meteoric_iron_ingot");