Skip to content

Commit

Permalink
Tin ore consistency
Browse files Browse the repository at this point in the history
+Added raw tin ore block, and associated recipes
*Changed deepslate tin ore to make the deepslate noises instead of regular stone noises
  • Loading branch information
Da-Technomancer committed Jan 30, 2022
1 parent 7849be4 commit ac432c4
Show file tree
Hide file tree
Showing 11 changed files with 71 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
import net.minecraft.world.item.TooltipFlag;
import net.minecraft.world.level.Level;
import net.minecraft.world.level.block.Blocks;
import net.minecraft.world.level.block.SoundType;
import net.minecraft.world.level.block.state.BlockState;

import javax.annotation.Nullable;
Expand All @@ -28,6 +29,7 @@ public final class OreSetup{
public static Item nuggetTin;
public static Item rawTin;
public static BasicBlock blockTin;
public static BasicBlock blockRawTin;
public static BasicBlock oreTin;
public static BasicBlock oreTinDeep;

Expand Down Expand Up @@ -82,12 +84,13 @@ protected static void init(){
ingotTin = new Item(new Item.Properties().tab(CRItems.TAB_CROSSROADS)).setRegistryName("ingot_tin");
CRItems.toRegister.add(ingotTin);
blockTin = new BasicBlock("block_tin", CRBlocks.getMetalProperty());
blockRawTin = new BasicBlock("block_raw_tin", CRBlocks.getRockProperty());
nuggetTin = new Item(new Item.Properties().tab(CRItems.TAB_CROSSROADS)).setRegistryName("nugget_tin");
CRItems.toRegister.add(nuggetTin);
rawTin = new Item(new Item.Properties().tab(CRItems.TAB_CROSSROADS)).setRegistryName("raw_tin");
CRItems.toRegister.add(rawTin);
oreTin = new BasicBlock("ore_tin", CRBlocks.getRockProperty().strength(3));
oreTinDeep = new BasicBlock("ore_tin_deep", CRBlocks.getRockProperty().strength(4.5F, 3));
oreTinDeep = new BasicBlock("ore_tin_deep", CRBlocks.getRockProperty().strength(4.5F, 3).sound(SoundType.DEEPSLATE));

ingotCopper = new Item(new Item.Properties().tab(CRItems.TAB_CROSSROADS)).setRegistryName("ingot_copper");
CRItems.toRegister.add(ingotCopper);
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"variants": {
"": { "model": "crossroads:block/block_raw_tin" }
}
}
1 change: 1 addition & 0 deletions src/main/resources/assets/crossroads/lang/en_us.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
"item.crossroads.raw_tin": "Raw Tin",
"block.crossroads.block_copper": "Block of Copper [This item is being removed]",
"block.crossroads.block_tin": "Block of Tin",
"block.crossroads.block_raw_tin": "Block of Raw Tin",
"block.crossroads.block_ruby": "Block of Ruby",
"block.crossroads.ore_copper": "Copper Ore [This item is being removed]",
"block.crossroads.ore_tin": "Tin Ore",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "block/cube_all",
"textures": {
"all": "crossroads:block/block_raw_tin"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"parent": "crossroads:block/block_raw_tin",
"display": {
"thirdperson": {
"rotation": [ 10, -45, 170],
"translation": [ 0, 1.5, -2.75],
"scale": [ 0.375, 0.375, 0.375]
}
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"type": "minecraft:crafting_shaped",
"result": {
"item": "crossroads:block_raw_tin",
"count": 1
},
"pattern": [
"***",
"***",
"***"
],
"key": {
"*": {
"tag": "forge:raw_materials/tin"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"type": "minecraft:crafting_shaped",
"result": {
"item": "crossroads:raw_tin",
"count": 9
},
"pattern": [
"*"
],
"key": {
"*": {
"tag": "forge:storage_blocks/raw_tin"
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"replace": false,
"values": [
"#forge:storage_blocks/tin",
"#forge:storage_blocks/raw_tin",
"#forge:storage_blocks/bronze",
"#forge:storage_blocks/ruby",
"#forge:storage_blocks/salt",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"crossroads:block_raw_tin"
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"crossroads:block_raw_tin"
]
}

0 comments on commit ac432c4

Please sign in to comment.