Use tags in some recipes. Closes #2245 and #2247

This commit is contained in:
drcrazy 2020-10-14 14:14:51 +03:00
parent 7ddb035ef6
commit 1aea09d7c9
73 changed files with 86 additions and 86 deletions

View file

@ -33,7 +33,7 @@ import net.minecraft.text.Text;
import net.minecraft.text.TranslatableText;
import net.minecraft.util.Formatting;
import org.apache.commons.lang3.text.WordUtils;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import reborncore.api.IListInfoProvider;
import reborncore.api.IToolDrop;
import reborncore.api.blockentity.InventoryProvider;
@ -175,7 +175,7 @@ public class TankUnitBaseBlockEntity extends MachineBaseBlockEntity implements I
.sync(tank).addInventory().create(this, syncID);
}
@NotNull
@Nullable
@Override
public Tank getTank() {
return tank;

View file

@ -8,7 +8,7 @@
"count": 2
},
{
"item": "techreborn:nickel_ingot"
"tag": "c:nickel_ingots"
}
],
"results" : [

View file

@ -8,7 +8,7 @@
"tag": "c:iron_dusts"
},
{
"item": "techreborn:nickel_ingot"
"tag": "c:nickel_ingots"
}
],
"results": [

View file

@ -4,7 +4,7 @@
"time": 300,
"ingredients": [
{
"item": "techreborn:bronze_ingot"
"tag": "c:bronze_ingots"
}
],
"results": [

View file

@ -4,7 +4,7 @@
"time": 300,
"ingredients": [
{
"item": "techreborn:chrome_ingot"
"tag": "c:chrome_ingots"
}
],
"results": [

View file

@ -4,7 +4,7 @@
"time": 250,
"ingredients": [
{
"item": "techreborn:coal_dust"
"tag": "c:coal_dusts"
}
],
"results": [

View file

@ -4,7 +4,7 @@
"time": 250,
"ingredients": [
{
"item": "techreborn:emerald_dust"
"tag": "c:emerald_dusts"
}
],
"results": [

View file

@ -4,7 +4,7 @@
"time": 300,
"ingredients": [
{
"item": "techreborn:invar_ingot"
"tag": "c:invar_ingots"
}
],
"results": [

View file

@ -4,7 +4,7 @@
"time": 250,
"ingredients": [
{
"item": "techreborn:lazurite_dust"
"tag": "c:lazurite_dusts"
}
],
"results": [

View file

@ -4,7 +4,7 @@
"time": 300,
"ingredients": [
{
"item": "techreborn:nickel_ingot"
"tag": "c:nickel_ingots"
}
],
"results": [

View file

@ -4,7 +4,7 @@
"time": 250,
"ingredients": [
{
"item": "techreborn:obsidian_dust"
"tag": "c:obsidian_dusts"
}
],
"results": [

View file

@ -4,7 +4,7 @@
"time": 250,
"ingredients": [
{
"item": "techreborn:quartz_dust"
"tag": "c:quartz_dusts"
}
],
"results": [

View file

@ -4,7 +4,7 @@
"time": 250,
"ingredients": [
{
"item": "techreborn:red_garnet_dust"
"tag": "c:red_garnet_dusts"
}
],
"results": [

View file

@ -4,7 +4,7 @@
"time": 300,
"ingredients": [
{
"item": "techreborn:refined_iron_ingot"
"tag": "c:refined_iron_ingots"
}
],
"results": [

View file

@ -4,7 +4,7 @@
"time": 300,
"ingredients": [
{
"item": "techreborn:tungstensteel_ingot"
"tag": "c:tungstensteel_ingots"
}
],
"results": [

View file

@ -4,7 +4,7 @@
"time": 250,
"ingredients": [
{
"item": "techreborn:yellow_garnet_dust"
"tag": "c:yellow_garnet_dusts"
}
],
"results": [

View file

@ -10,7 +10,7 @@
"item": "minecraft:stick"
},
"X": {
"item": "techreborn:bronze_ingot"
"tag": "c:bronze_ingots"
}
},
"result": {

View file

@ -6,7 +6,7 @@
],
"key": {
"X": {
"item": "techreborn:bronze_ingot"
"tag": "c:bronze_ingots"
}
},
"result": {

View file

@ -7,7 +7,7 @@
],
"key": {
"X": {
"item": "techreborn:bronze_ingot"
"tag": "c:bronze_ingots"
}
},
"result": {

View file

@ -6,7 +6,7 @@
],
"key": {
"X": {
"item": "techreborn:bronze_ingot"
"tag": "c:bronze_ingots"
}
},
"result": {

View file

@ -10,7 +10,7 @@
"item": "minecraft:stick"
},
"X": {
"item": "techreborn:bronze_ingot"
"tag": "c:bronze_ingots"
}
},
"result": {

View file

@ -7,7 +7,7 @@
],
"key": {
"X": {
"item": "techreborn:bronze_ingot"
"tag": "c:bronze_ingots"
}
},
"result": {

View file

@ -10,7 +10,7 @@
"item": "minecraft:stick"
},
"X": {
"item": "techreborn:bronze_ingot"
"tag": "c:bronze_ingots"
}
},
"result": {

View file

@ -10,7 +10,7 @@
"item": "minecraft:stick"
},
"X": {
"item": "techreborn:bronze_ingot"
"tag": "c:bronze_ingots"
}
},
"result": {

View file

@ -10,7 +10,7 @@
"item": "minecraft:stick"
},
"X": {
"item": "techreborn:bronze_ingot"
"tag": "c:bronze_ingots"
}
},
"result": {

View file

@ -10,10 +10,10 @@
"tag": "c:tin_ingots"
},
"T": {
"item": "techreborn:refined_iron_ingot"
"tag": "c:refined_iron_ingots"
},
"M": {
"item": "techreborn:bronze_ingot"
"tag": "c:bronze_ingots"
}
},
"result": {

View file

@ -10,7 +10,7 @@
"tag": "c:tin_ingots"
},
"T": {
"item": "techreborn:refined_iron_ingot"
"tag": "c:refined_iron_ingots"
},
"M": {
"tag": "c:brass_ingots"

View file

@ -10,10 +10,10 @@
"tag": "c:aluminum_ingots"
},
"T": {
"item": "techreborn:invar_ingot"
"tag": "c:invar_ingots"
},
"M": {
"item": "techreborn:bronze_ingot"
"tag": "c:bronze_ingots"
}
},
"result": {

View file

@ -10,7 +10,7 @@
"tag": "c:aluminum_ingots"
},
"T": {
"item": "techreborn:nickel_ingot"
"tag": "c:nickel_ingots"
},
"M": {
"tag": "c:brass_ingots"

View file

@ -10,10 +10,10 @@
"tag": "c:aluminum_ingots"
},
"T": {
"item": "techreborn:nickel_ingot"
"tag": "c:nickel_ingots"
},
"M": {
"item": "techreborn:bronze_ingot"
"tag": "c:bronze_ingots"
}
},
"result": {

View file

@ -13,7 +13,7 @@
"tag": "c:titanium_ingots"
},
"M": {
"item": "techreborn:bronze_ingot"
"tag": "c:bronze_ingots"
}
},
"result": {

View file

@ -13,7 +13,7 @@
"tag": "c:tungsten_ingots"
},
"M": {
"item": "techreborn:bronze_ingot"
"tag": "c:bronze_ingots"
}
},
"result": {

View file

@ -10,7 +10,7 @@
"tag": "c:aluminum_ingots"
},
"T": {
"item": "techreborn:tungstensteel_ingot"
"tag": "c:tungstensteel_ingots"
},
"M": {
"tag": "c:brass_ingots"

View file

@ -10,10 +10,10 @@
"tag": "c:aluminum_ingots"
},
"T": {
"item": "techreborn:tungstensteel_ingot"
"tag": "c:tungstensteel_ingots"
},
"M": {
"item": "techreborn:bronze_ingot"
"tag": "c:bronze_ingots"
}
},
"result": {

View file

@ -10,7 +10,7 @@
"tag": "c:aluminum_ingots"
},
"T": {
"item": "techreborn:invar_ingot"
"tag": "c:invar_ingots"
},
"M": {
"tag": "c:brass_ingots"

View file

@ -13,7 +13,7 @@
"tag": "c:titanium_ingots"
},
"M": {
"item": "techreborn:bronze_ingot"
"tag": "c:bronze_ingots"
}
},
"result": {

View file

@ -10,10 +10,10 @@
"tag": "c:zinc_ingots"
},
"T": {
"item": "techreborn:invar_ingot"
"tag": "c:invar_ingots"
},
"M": {
"item": "techreborn:bronze_ingot"
"tag": "c:bronze_ingots"
}
},
"result": {

View file

@ -10,7 +10,7 @@
"tag": "c:tin_ingots"
},
"T": {
"item": "techreborn:invar_ingot"
"tag": "c:invar_ingots"
},
"M": {
"tag": "c:brass_ingots"

View file

@ -10,10 +10,10 @@
"tag": "c:tin_ingots"
},
"T": {
"item": "techreborn:invar_ingot"
"tag": "c:invar_ingots"
},
"M": {
"item": "techreborn:bronze_ingot"
"tag": "c:bronze_ingots"
}
},
"result": {

View file

@ -10,7 +10,7 @@
"tag": "c:tin_ingots"
},
"T": {
"item": "techreborn:nickel_ingot"
"tag": "c:nickel_ingots"
},
"M": {
"tag": "c:brass_ingots"

View file

@ -10,10 +10,10 @@
"tag": "c:tin_ingots"
},
"T": {
"item": "techreborn:nickel_ingot"
"tag": "c:nickel_ingots"
},
"M": {
"item": "techreborn:bronze_ingot"
"tag": "c:bronze_ingots"
}
},
"result": {

View file

@ -13,7 +13,7 @@
"tag": "c:tungsten_ingots"
},
"M": {
"item": "techreborn:bronze_ingot"
"tag": "c:bronze_ingots"
}
},
"result": {

View file

@ -10,7 +10,7 @@
"tag": "c:tin_ingots"
},
"T": {
"item": "techreborn:tungstensteel_ingot"
"tag": "c:tungstensteel_ingots"
},
"M": {
"tag": "c:brass_ingots"

View file

@ -10,10 +10,10 @@
"tag": "c:tin_ingots"
},
"T": {
"item": "techreborn:tungstensteel_ingot"
"tag": "c:tungstensteel_ingots"
},
"M": {
"item": "techreborn:bronze_ingot"
"tag": "c:bronze_ingots"
}
},
"result": {

View file

@ -10,7 +10,7 @@
"tag": "c:zinc_ingots"
},
"T": {
"item": "techreborn:invar_ingot"
"tag": "c:invar_ingots"
},
"M": {
"tag": "c:brass_ingots"

View file

@ -10,7 +10,7 @@
"tag": "c:zinc_ingots"
},
"T": {
"item": "techreborn:refined_iron_ingot"
"tag": "c:refined_iron_ingots"
},
"M": {
"tag": "c:brass_ingots"

View file

@ -10,10 +10,10 @@
"tag": "c:zinc_ingots"
},
"T": {
"item": "techreborn:refined_iron_ingot"
"tag": "c:refined_iron_ingots"
},
"M": {
"item": "techreborn:bronze_ingot"
"tag": "c:bronze_ingots"
}
},
"result": {

View file

@ -10,7 +10,7 @@
"tag": "c:zinc_ingots"
},
"T": {
"item": "techreborn:nickel_ingot"
"tag": "c:nickel_ingots"
},
"M": {
"tag": "c:brass_ingots"

View file

@ -10,10 +10,10 @@
"tag": "c:zinc_ingots"
},
"T": {
"item": "techreborn:nickel_ingot"
"tag": "c:nickel_ingots"
},
"M": {
"item": "techreborn:bronze_ingot"
"tag": "c:bronze_ingots"
}
},
"result": {

View file

@ -13,7 +13,7 @@
"tag": "c:titanium_ingots"
},
"M": {
"item": "techreborn:bronze_ingot"
"tag": "c:bronze_ingots"
}
},
"result": {

View file

@ -13,7 +13,7 @@
"tag": "c:tungsten_ingots"
},
"M": {
"item": "techreborn:bronze_ingot"
"tag": "c:bronze_ingots"
}
},
"result": {

View file

@ -10,7 +10,7 @@
"tag": "c:zinc_ingots"
},
"T": {
"item": "techreborn:tungstensteel_ingot"
"tag": "c:tungstensteel_ingots"
},
"M": {
"tag": "c:brass_ingots"

View file

@ -10,10 +10,10 @@
"tag": "c:zinc_ingots"
},
"T": {
"item": "techreborn:tungstensteel_ingot"
"tag": "c:tungstensteel_ingots"
},
"M": {
"item": "techreborn:bronze_ingot"
"tag": "c:bronze_ingots"
}
},
"result": {

View file

@ -7,7 +7,7 @@
],
"key": {
"N": {
"item": "techreborn:nickel_nugget"
"tag": "c:nickel_nuggets"
}
},
"result": {

View file

@ -10,7 +10,7 @@
"item": "techreborn:basic_machine_frame"
},
"R": {
"item": "techreborn:refined_iron_ingot"
"tag": "c:refined_iron_ingots"
},
"C": {
"item": "techreborn:electronic_circuit"

View file

@ -7,7 +7,7 @@
],
"key": {
"A": {
"item": "techreborn:refined_iron_ingot"
"tag": "c:refined_iron_ingots"
}
},
"result": {

View file

@ -10,7 +10,7 @@
"item": "techreborn:industrial_machine_frame"
},
"R": {
"item": "techreborn:chrome_plate"
"tag": "c:chrome_plates"
},
"C": {
"item": "techreborn:data_storage_core"

View file

@ -10,7 +10,7 @@
"item": "techreborn:advanced_machine_casing"
},
"R": {
"item": "techreborn:chrome_plate"
"tag": "c:chrome_plates"
},
"C": {
"item": "techreborn:data_storage_core"

View file

@ -10,7 +10,7 @@
"item": "techreborn:advanced_machine_frame"
},
"C": {
"item": "techreborn:chrome_plate"
"tag": "c:chrome_plates"
},
"T": {
"tag": "c:titanium_plates"

View file

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

View file

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

View file

@ -7,7 +7,7 @@
],
"key": {
"A": {
"item": "techreborn:refined_iron_plate"
"tag": "c:refined_iron_plates"
},
"D": {
"item": "minecraft:black_dye"

View file

@ -7,7 +7,7 @@
],
"key": {
"C": {
"item": "techreborn:coal_dust"
"tag": "c:coal_dusts"
}
},
"result": {

View file

@ -10,7 +10,7 @@
"tag": "c:copper_plates"
},
"C": {
"item": "techreborn:coal_dust"
"tag": "c:coal_dusts"
},
"T": {
"tag": "c:tin_dusts"

View file

@ -7,7 +7,7 @@
],
"key": {
"A": {
"item": "techreborn:bronze_ingot"
"tag": "c:bronze_ingots"
}
},
"result": {

View file

@ -7,7 +7,7 @@
],
"key": {
"A": {
"item": "techreborn:nickel_ingot"
"tag": "c:nickel_ingots"
}
},
"result": {

View file

@ -7,10 +7,10 @@
],
"key": {
"B": {
"item": "techreborn:bronze_ingot"
"tag": "c:bronze_ingots"
},
"N": {
"item": "techreborn:bronze_nugget"
"tag": "c:bronze_nuggets"
},
"W": {
"tag": "minecraft:wool"

View file

@ -13,7 +13,7 @@
"item": "techreborn:basic_machine_frame"
},
"P": {
"item": "techreborn:refined_iron_plate"
"tag": "c:refined_iron_plates"
},
"D": {
"item": "techreborn:basic_display"

View file

@ -4,7 +4,7 @@
"time": 200,
"ingredients": [
{
"item": "techreborn:bronze_ingot"
"tag": "c:bronze_ingots"
}
],
"results": [

View file

@ -4,7 +4,7 @@
"time": 250,
"ingredients": [
{
"item": "techreborn:chrome_ingot"
"tag": "c:chrome_ingots"
}
],
"results": [

View file

@ -4,7 +4,7 @@
"time": 200,
"ingredients": [
{
"item": "techreborn:nickel_ingot"
"tag": "c:nickel_ingots"
}
],
"results": [

View file

@ -8,7 +8,7 @@
],
"key": {
"N": {
"item": "techreborn:nickel_ingot"
"tag": "c:nickel_ingots"
},
"C": {
"tag": "c:copper_ingots"

View file

@ -8,7 +8,7 @@
],
"key": {
"N": {
"item": "techreborn:nickel_ingot"
"tag": "c:nickel_ingots"
},
"C": {
"item": "techreborn:chrome_ingot"