Raw tin, silver, lead, tungsten and iridium

This commit is contained in:
drcrazy 2021-06-21 13:57:49 +03:00
parent ecff51d498
commit 78a9a61bb4
63 changed files with 100 additions and 76 deletions

View file

@ -112,6 +112,7 @@ public class ModRegistry {
Arrays.stream(Nuggets.values()).forEach(value -> RebornRegistry.registerItem(value.item));
Arrays.stream(Gems.values()).forEach(value -> RebornRegistry.registerItem(value.item));
Arrays.stream(Dusts.values()).forEach(value -> RebornRegistry.registerItem(value.item));
Arrays.stream(RawMetals.values()).forEach(value -> RebornRegistry.registerItem(value.item));
Arrays.stream(SmallDusts.values()).forEach(value -> RebornRegistry.registerItem(value.item));
Arrays.stream(Plates.values()).forEach(value -> RebornRegistry.registerItem(value.item));
Arrays.stream(Parts.values()).forEach(value -> RebornRegistry.registerItem(value.item));

View file

@ -588,10 +588,9 @@ public class TRContent {
public enum Dusts implements ItemConvertible {
ALMANDINE, ALUMINUM, ANDESITE, ANDRADITE, ASHES, BASALT, BAUXITE, BRASS, BRONZE, CALCITE, CHARCOAL, CHROME,
CINNABAR, CLAY, COAL, DARK_ASHES, DIAMOND, DIORITE, ELECTRUM, EMERALD, ENDER_EYE, ENDER_PEARL, ENDSTONE,
FLINT, GALENA, GRANITE, GROSSULAR, INVAR, LAZURITE, LEAD, MAGNESIUM, MANGANESE, MARBLE, NETHERRACK,
FLINT, GALENA, GRANITE, GROSSULAR, INVAR, LAZURITE, MAGNESIUM, MANGANESE, MARBLE, NETHERRACK,
NICKEL, OBSIDIAN, OLIVINE, PERIDOT, PHOSPHOROUS, PLATINUM, PYRITE, PYROPE, QUARTZ, RED_GARNET, RUBY, SALTPETER,
SAPPHIRE, SAW, SILVER, SODALITE, SPESSARTINE, SPHALERITE, STEEL, SULFUR, TIN, TITANIUM, TUNGSTEN, UVAROVITE,
YELLOW_GARNET, ZINC;
SAPPHIRE, SAW, SODALITE, SPESSARTINE, SPHALERITE, STEEL, SULFUR, TITANIUM, UVAROVITE, YELLOW_GARNET, ZINC;
public final String name;
public final Item item;
@ -616,6 +615,25 @@ public class TRContent {
}
}
public enum RawMetals implements ItemConvertible{
IRIDIUM, LEAD, SILVER, TIN, TUNGSTEN;
public final String name;
public final Item item;
RawMetals() {
name = this.toString().toLowerCase(Locale.ROOT);
item = new Item(new Item.Settings().group(TechReborn.ITEMGROUP));
InitUtils.setup(item, "raw_" + name);
}
@Override
public Item asItem() {
return item;
}
}
public enum SmallDusts implements ItemConvertible {
ALMANDINE, ALUMINUM, ANDESITE, ANDRADITE, ASHES, BASALT, BAUXITE, BRASS, BRONZE, CALCITE, CHARCOAL, CHROME,
CINNABAR, CLAY, COAL, COPPER, DARK_ASHES, DIAMOND, DIORITE, ELECTRUM, EMERALD, ENDER_EYE, ENDER_PEARL, ENDSTONE,

View file

@ -350,7 +350,6 @@
"item.techreborn.cinnabar_dust": "Cinnabar Dust",
"item.techreborn.clay_dust": "Clay Dust",
"item.techreborn.coal_dust": "Coal Dust",
"item.techreborn.copper_dust": "Copper Dust",
"item.techreborn.dark_ashes_dust": "Dark Ashes",
"item.techreborn.diamond_dust": "Diamond Dust",
"item.techreborn.diorite_dust": "Diorite Dust",
@ -361,13 +360,10 @@
"item.techreborn.endstone_dust": "Endstone Dust",
"item.techreborn.flint_dust": "Flint Dust",
"item.techreborn.galena_dust": "Galena Dust",
"item.techreborn.gold_dust": "Gold Dust",
"item.techreborn.granite_dust": "Granite Dust",
"item.techreborn.grossular_dust": "Grossular Dust",
"item.techreborn.invar_dust": "Invar Dust",
"item.techreborn.iron_dust": "Iron Dust",
"item.techreborn.lazurite_dust": "Lazurite Dust",
"item.techreborn.lead_dust": "Lead Dust",
"item.techreborn.magnesium_dust": "Magnesium Dust",
"item.techreborn.manganese_dust": "Manganese Dust",
"item.techreborn.marble_dust": "Marble Dust",
@ -386,19 +382,22 @@
"item.techreborn.saltpeter_dust": "Saltpeter Dust",
"item.techreborn.sapphire_dust": "Sapphire Dust",
"item.techreborn.saw_dust": "Saw Dust",
"item.techreborn.silver_dust": "Silver Dust",
"item.techreborn.sodalite_dust": "Sodalite Dust",
"item.techreborn.spessartine_dust": "Spessartine Dust",
"item.techreborn.sphalerite_dust": "Sphalerite Dust",
"item.techreborn.steel_dust": "Steel Dust",
"item.techreborn.sulfur_dust": "Sulfur Dust",
"item.techreborn.tin_dust": "Tin Dust",
"item.techreborn.titanium_dust": "Titanium Dust",
"item.techreborn.tungsten_dust": "Tungsten Dust",
"item.techreborn.uvarovite_dust": "Uvarovite Dust",
"item.techreborn.yellow_garnet_dust": "Yellow Garnet Dust",
"item.techreborn.zinc_dust": "Zinc Dust",
"item.techreborn.raw_iridium": "Raw Iridium",
"item.techreborn.raw_lead": "Raw Lead",
"item.techreborn.raw_silver": "Raw Silver",
"item.techreborn.raw_tin": "Raw Tin",
"item.techreborn.raw_tungsten": "Raw Tungsten",
"_comment8": "Small Dusts",
"item.techreborn.almandine_small_dust": "Small Pile of Almandine Dust",
"item.techreborn.aluminum_small_dust": "Small Pile of Aluminium Dust",

View file

@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "techreborn:item/rawmetal/raw_iridium"
}
}

View file

@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "techreborn:item/rawmetal/raw_lead"
}
}

View file

@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "techreborn:item/rawmetal/raw_silver"
}
}

View file

@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "techreborn:item/rawmetal/raw_tin"
}
}

View file

@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "techreborn:item/rawmetal/raw_tungsten"
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 468 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 386 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 428 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 475 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 399 B

View file

@ -1,6 +0,0 @@
{
"replace": false,
"values": [
"techreborn:lead_dust"
]
}

View file

@ -1,6 +0,0 @@
{
"replace": false,
"values": [
"techreborn:silver_dust"
]
}

View file

@ -1,6 +0,0 @@
{
"replace": false,
"values": [
"techreborn:tin_dust"
]
}

View file

@ -1,6 +0,0 @@
{
"replace": false,
"values": [
"techreborn:tungsten_dust"
]
}

View file

@ -4,7 +4,7 @@
"time": 200,
"ingredients": [
{
"tag": "c:tin_dusts"
"item": "techreborn:raw_tin"
},
{
"count": 3,

View file

@ -4,7 +4,7 @@
"time": 200,
"ingredients": [
{
"tag": "c:tin_dusts"
"item": "techreborn:raw_tin"
},
{
"count": 3,

View file

@ -7,7 +7,7 @@
"item": "minecraft:raw_gold"
},
{
"tag": "c:silver_dusts"
"item": "techreborn:raw_silver"
}
],
"results": [

View file

@ -7,7 +7,7 @@
"item": "minecraft:gold_ingot"
},
{
"tag": "c:silver_dusts"
"item": "techreborn:raw_silver"
}
],
"results": [

View file

@ -5,7 +5,7 @@
"heat": 2500,
"ingredients": [
{
"tag": "c:tungsten_dusts"
"item": "techreborn:raw_tungsten"
}
],
"results": [

View file

@ -5,7 +5,7 @@
"ingredients": [
{
"count": 2,
"tag": "c:lead_dusts"
"item": "techreborn:raw_lead"
}
],
"results": [

View file

@ -5,7 +5,7 @@
"ingredients": [
{
"count": 2,
"tag": "c:silver_dusts"
"item": "techreborn:raw_silver"
}
],
"results": [

View file

@ -5,7 +5,7 @@
"ingredients": [
{
"count": 2,
"tag": "c:tin_dusts"
"item": "techreborn:raw_tin"
}
],
"results": [

View file

@ -10,7 +10,7 @@
"item": "minecraft:glass"
},
"S": {
"tag": "c:silver_dusts"
"item": "techreborn:raw_silver"
},
"D": {
"tag": "c:diamond_dusts"

View file

@ -15,6 +15,6 @@
}
],
"result": {
"item": "techreborn:lead_dust"
"item": "techreborn:raw_lead"
}
}

View file

@ -15,6 +15,6 @@
}
],
"result": {
"item": "techreborn:silver_dust"
"item": "techreborn:raw_silver"
}
}

View file

@ -15,6 +15,6 @@
}
],
"result": {
"item": "techreborn:tin_dust"
"item": "techreborn:raw_tin"
}
}

View file

@ -15,6 +15,6 @@
}
],
"result": {
"item": "techreborn:tungsten_dust"
"item": "techreborn:raw_tungsten"
}
}

View file

@ -13,7 +13,7 @@
"tag": "c:coal_dusts"
},
"T": {
"tag": "c:tin_dusts"
"item": "techreborn:raw_tin"
}
},
"result": {

View file

@ -2,7 +2,7 @@
"type": "minecraft:crafting_shapeless",
"ingredients": [
{
"tag": "c:lead_dusts"
"item": "techreborn:raw_lead"
}
],
"result": {

View file

@ -2,7 +2,7 @@
"type": "minecraft:crafting_shapeless",
"ingredients": [
{
"tag": "c:silver_dusts"
"item": "techreborn:raw_silver"
}
],
"result": {

View file

@ -2,7 +2,7 @@
"type": "minecraft:crafting_shapeless",
"ingredients": [
{
"tag": "c:tin_dusts"
"item": "techreborn:raw_tin"
}
],
"result": {

View file

@ -2,7 +2,7 @@
"type": "minecraft:crafting_shapeless",
"ingredients": [
{
"tag": "c:tungsten_dusts"
"item": "techreborn:raw_tungsten"
}
],
"result": {

View file

@ -11,6 +11,6 @@
}
},
"result": {
"item": "techreborn:lead_dust"
"item": "techreborn:raw_lead"
}
}

View file

@ -11,6 +11,6 @@
}
},
"result": {
"item": "techreborn:tin_dust"
"item": "techreborn:raw_tin"
}
}

View file

@ -11,6 +11,6 @@
}
},
"result": {
"item": "techreborn:tungsten_dust"
"item": "techreborn:raw_tungsten"
}
}

View file

@ -9,7 +9,7 @@
],
"results": [
{
"item": "techreborn:lead_dust"
"item": "techreborn:raw_lead"
}
]
}

View file

@ -9,7 +9,7 @@
],
"results": [
{
"item": "techreborn:lead_dust",
"item": "techreborn:raw_lead",
"count": 2
}
]

View file

@ -9,7 +9,7 @@
],
"results": [
{
"item": "techreborn:silver_dust"
"item": "techreborn:raw_silver"
}
]
}

View file

@ -9,7 +9,7 @@
],
"results": [
{
"item": "techreborn:silver_dust",
"item": "techreborn:raw_silver",
"count": 2
}
]

View file

@ -9,7 +9,7 @@
],
"results": [
{
"item": "techreborn:tin_dust"
"item": "techreborn:raw_tin"
}
]
}

View file

@ -9,7 +9,7 @@
],
"results": [
{
"item": "techreborn:tin_dust",
"item": "techreborn:raw_tin",
"count": 2
}
]

View file

@ -9,7 +9,7 @@
],
"results": [
{
"item": "techreborn:tungsten_dust"
"item": "techreborn:raw_tungsten"
}
]
}

View file

@ -4,7 +4,7 @@
"time": 1200,
"ingredients": [
{
"tag": "c:tungsten_dusts"
"item": "techreborn:raw_tungsten"
},
{
"item": "techreborn:cell",

View file

@ -20,7 +20,7 @@
"item": "techreborn:sulfur_dust"
},
{
"item": "techreborn:silver_dust"
"item": "techreborn:raw_silver"
}
]
}

View file

@ -13,7 +13,7 @@
],
"results": [
{
"item": "techreborn:lead_dust",
"item": "techreborn:raw_lead",
"count": 2
},
{

View file

@ -13,7 +13,7 @@
],
"results": [
{
"item": "techreborn:silver_dust",
"item": "techreborn:raw_silver",
"count": 2
},
{

View file

@ -13,7 +13,7 @@
],
"results": [
{
"item": "techreborn:tin_dust",
"item": "techreborn:raw_tin",
"count": 2
},
{

View file

@ -13,7 +13,7 @@
],
"results": [
{
"item": "techreborn:tin_dust",
"item": "techreborn:raw_tin",
"count": 2
},
{

View file

@ -13,7 +13,7 @@
],
"results": [
{
"item": "techreborn:tungsten_dust",
"item": "techreborn:raw_tungsten",
"count": 2
},
{

View file

@ -8,7 +8,7 @@
],
"results": [
{
"item": "techreborn:tin_dust"
"item": "techreborn:raw_lead"
}
],
"type": "techreborn:scrapbox"

View file

@ -8,7 +8,7 @@
],
"results": [
{
"item": "techreborn:silver_dust"
"item": "techreborn:raw_silver"
}
],
"type": "techreborn:scrapbox"

View file

@ -8,7 +8,7 @@
],
"results": [
{
"item": "techreborn:lead_dust"
"item": "techreborn:raw_tin"
}
],
"type": "techreborn:scrapbox"

View file

@ -8,7 +8,7 @@
],
"results": [
{
"item": "techreborn:tungsten_dust"
"item": "techreborn:raw_tungsten"
}
],
"type": "techreborn:scrapbox"

View file

@ -1,7 +1,7 @@
{
"type": "minecraft:smelting",
"ingredient": {
"tag": "c:lead_dusts"
"item": "techreborn:raw_lead"
},
"result": "techreborn:lead_ingot",
"experience": 0.5,

View file

@ -1,7 +1,7 @@
{
"type": "minecraft:smelting",
"ingredient": {
"tag": "c:silver_dusts"
"item": "techreborn:raw_silver"
},
"result": "techreborn:silver_ingot",
"experience": 0.5,

View file

@ -1,7 +1,7 @@
{
"type": "minecraft:smelting",
"ingredient": {
"tag": "c:tin_dusts"
"item": "techreborn:raw_tin"
},
"result": "techreborn:tin_ingot",
"experience": 0.5,