Add tin raw, tin smelting/blasting

src/main/java/net/k4510471/ic2/block/ModBlocks.java

@@ -2,11 +2,14 @@
 
 import net.k4510471.ic2.IndustrialCraft2;
 import net.k4510471.ic2.item.ModItems;
+import net.minecraft.util.valueproviders.ConstantInt;
 import net.minecraft.world.item.BlockItem;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.DropExperienceBlock;
 import net.minecraft.world.level.block.SoundType;
 import net.minecraft.world.level.block.state.BlockBehaviour;
+import net.minecraft.world.level.block.state.properties.NoteBlockInstrument;
 import net.neoforged.bus.api.IEventBus;
 import net.neoforged.neoforge.registries.DeferredBlock;
 import net.neoforged.neoforge.registries.DeferredRegister;
@@ -19,6 +22,16 @@ public class ModBlocks {
     public static final DeferredBlock<Block> TIN_BLOCK = registerBlock("tin_block",
             () -> new Block(BlockBehaviour.Properties.of()
                     .strength(4F,20F)
+                    .sound(SoundType.METAL)
+                    .requiresCorrectToolForDrops()
+            ));
+
+    public static final DeferredBlock<Block> TIN_ORE = registerBlock("tin_ore",
+            () -> new DropExperienceBlock(ConstantInt.of(1),
+                    BlockBehaviour.Properties.of()
+                    .instrument(NoteBlockInstrument.BASEDRUM)
+                    //.requiresCorrectToolForDrops()
+                    .strength(1F,3f)
                     .sound(SoundType.STONE)
             ));
 

src/main/java/net/k4510471/ic2/item/ModCreativeModeTabs.java

@@ -13,6 +13,7 @@
 import java.util.function.Supplier;
 
 public class ModCreativeModeTabs {
+
     public static final DeferredRegister<CreativeModeTab> CREATIVE_MODE_TABS =
             DeferredRegister.create(Registries.CREATIVE_MODE_TAB, IndustrialCraft2.MOD_ID);
 
@@ -24,16 +25,27 @@ public class ModCreativeModeTabs {
                     })
                     .build());
 
+    public static final Supplier<CreativeModeTab> IC2_ORES_TAB = CREATIVE_MODE_TABS.register("ic2_ores_tab",
+            () -> CreativeModeTab.builder().icon(() -> new ItemStack(ModBlocks.TIN_ORE))
+                    .withTabsBefore(ResourceLocation.fromNamespaceAndPath(IndustrialCraft2.MOD_ID, "ic2_blocks_tab"))
+                    .title(Component.translatable("creativetab.ic2.ores"))
+                    .displayItems((parameters, output) -> {
+                        output.accept(ModBlocks.TIN_ORE);
+                    })
+                    .build());
+
     public static final Supplier<CreativeModeTab> IC2_ITEMS_TAB = CREATIVE_MODE_TABS.register("ic2_items_tab",
             () -> CreativeModeTab.builder().icon(() -> new ItemStack(ModItems.TIN_INGOT.get()))
-                    .withTabsBefore(ResourceLocation.fromNamespaceAndPath(IndustrialCraft2.MOD_ID, "ic2_blocks_tab"))
+                    .withTabsBefore(ResourceLocation.fromNamespaceAndPath(IndustrialCraft2.MOD_ID, "ic2_ores_tab"))
                     .title(Component.translatable("creativetab.ic2.items"))
                     .displayItems((parameters, output) -> {
                         output.accept(ModItems.TIN_INGOT);
+                        output.accept(ModItems.TIN_RAW);
                     })
                     .build());
 
     public static void register(IEventBus eventBus) {
         CREATIVE_MODE_TABS.register(eventBus);
     }
+
 }

src/main/java/net/k4510471/ic2/item/ModItems.java

@@ -12,6 +12,9 @@ public class ModItems {
     public static final DeferredItem<Item> TIN_INGOT = ITEMS.register("tin_ingot",
             () -> new Item(new Item.Properties()));
 
+    public static final DeferredItem<Item> TIN_RAW = ITEMS.register("tin_raw",
+            () -> new Item(new Item.Properties()));
+
     public static void register(IEventBus eventBus) {
         ITEMS.register(eventBus);
     }

src/main/resources/assets/industrialcraft2/blockstates/tin_ore.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "industrialcraft2:block/tin_ore"
+    }
+  }
+}

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

@@ -1,7 +1,11 @@
 {
-  "item.industrialcraft2.tin_ingot": "Tin Ingot",
   "block.industrialcraft2.tin_block": "Tin Block",
+  "block.industrialcraft2.tin_ore": "Tin Ore",
+
+  "item.industrialcraft2.tin_ingot": "Tin Ingot",
+  "item.industrialcraft2.tin_raw": "Raw Tin",
 
-  "creativetab.ic2.items": "Industrial Craft 2 Items",
-  "creativetab.ic2.blocks": "Industrial Craft 2 Blocks"
+  "creativetab.ic2.blocks": "Industrial Craft 2 Blocks",
+  "creativetab.ic2.ores": "Industrial Craft 2 Ores",
+  "creativetab.ic2.items": "Industrial Craft 2 Items"
 }

src/main/resources/assets/industrialcraft2/models/block/tin_ore.json

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

src/main/resources/assets/industrialcraft2/models/item/tin_ore.json

@@ -0,0 +1,3 @@
+{
+  "parent": "industrialcraft2:block/tin_ore"
+}

src/main/resources/assets/industrialcraft2/models/item/tin_raw.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "industrialcraft2:item/tin_raw"
+  }
+}

src/main/resources/data/industrialcraft2/recipe/tin_from_blasting_tin_ore.json

@@ -0,0 +1,14 @@
+{
+  "type": "minecraft:blasting",
+  "category": "misc",
+  "cookingtime": 100,
+  "experience": 0.25,
+  "group": "tin",
+  "ingredient": {
+    "item": "industrialcraft2:tin_ore"
+  },
+  "result": {
+    "count": 1,
+    "id": "industrialcraft2:tin_ingot"
+  }
+}

src/main/resources/data/industrialcraft2/recipe/tin_from_blasting_tin_raw.json

@@ -0,0 +1,14 @@
+{
+  "type": "minecraft:blasting",
+  "category": "misc",
+  "cookingtime": 100,
+  "experience": 0.25,
+  "group": "tin",
+  "ingredient": {
+    "item": "industrialcraft2:tin_raw"
+  },
+  "result": {
+    "count": 1,
+    "id": "industrialcraft2:tin_ingot"
+  }
+}

src/main/resources/data/industrialcraft2/recipe/tin_from_smelting_tin_ore.json

@@ -0,0 +1,14 @@
+{
+  "type": "minecraft:smelting",
+  "category": "misc",
+  "cookingtime": 200,
+  "experience": 0.25,
+  "group": "tin",
+  "ingredient": {
+    "item": "industrialcraft2:tin_ore"
+  },
+  "result": {
+    "count": 1,
+    "id": "industrialcraft2:tin_ingot"
+  }
+}

src/main/resources/data/industrialcraft2/recipe/tin_from_smelting_tin_raw.json

@@ -0,0 +1,14 @@
+{
+  "type": "minecraft:smelting",
+  "category": "misc",
+  "cookingtime": 200,
+  "experience": 0.25,
+  "group": "tin",
+  "ingredient": {
+    "item": "industrialcraft2:tin_raw"
+  },
+  "result": {
+    "count": 1,
+    "id": "industrialcraft2:tin_ingot"
+  }
+}