From 7977a8e73b5b21f64e87248d370ef5faf2bb82f5 Mon Sep 17 00:00:00 2001
From: drcrazy <hcb@wowhcb.ru>
Date: Thu, 18 Jul 2019 01:32:37 +0300
Subject: [PATCH] Few warnings and moar recipes

---
 src/main/java/techreborn/TechReborn.java      |  3 --
 src/main/java/techreborn/blocks/BlockOre.java |  9 ------
 .../init/recipes/CraftingTableRecipes.java    | 12 --------
 .../techreborn/items/armor/ItemTRArmour.java  | 11 --------
 .../crafting_shaped/advanced_chainsaw.json    | 25 +++++++++++++++++
 .../crafting_shaped/advanced_jackhammer.json  | 25 +++++++++++++++++
 .../crafting_shaped/basic_chainsaw.json       | 22 +++++++++++++++
 .../crafting_shaped/basic_jackhammer.json     | 22 +++++++++++++++
 .../crafting_shaped/cloaking_device.json      | 22 +++++++++++++++
 .../crafting_shaped/industrial_chainsaw.json  | 28 +++++++++++++++++++
 .../crafting_shaped/industrial_drill.json     | 28 +++++++++++++++++++
 .../industrial_jackhammer.json                | 28 +++++++++++++++++++
 .../crafting_shaped/lapotronic_orbpack.json   | 28 +++++++++++++++++++
 13 files changed, 228 insertions(+), 35 deletions(-)
 create mode 100644 src/main/resources/data/techreborn/recipes/crafting_shaped/advanced_chainsaw.json
 create mode 100644 src/main/resources/data/techreborn/recipes/crafting_shaped/advanced_jackhammer.json
 create mode 100644 src/main/resources/data/techreborn/recipes/crafting_shaped/basic_chainsaw.json
 create mode 100644 src/main/resources/data/techreborn/recipes/crafting_shaped/basic_jackhammer.json
 create mode 100644 src/main/resources/data/techreborn/recipes/crafting_shaped/cloaking_device.json
 create mode 100644 src/main/resources/data/techreborn/recipes/crafting_shaped/industrial_chainsaw.json
 create mode 100644 src/main/resources/data/techreborn/recipes/crafting_shaped/industrial_drill.json
 create mode 100644 src/main/resources/data/techreborn/recipes/crafting_shaped/industrial_jackhammer.json
 create mode 100644 src/main/resources/data/techreborn/recipes/crafting_shaped/lapotronic_orbpack.json

diff --git a/src/main/java/techreborn/TechReborn.java b/src/main/java/techreborn/TechReborn.java
index 569c42c7f..a8dab58cf 100644
--- a/src/main/java/techreborn/TechReborn.java
+++ b/src/main/java/techreborn/TechReborn.java
@@ -29,13 +29,10 @@ import net.fabricmc.fabric.api.client.itemgroup.FabricItemGroupBuilder;
 import net.minecraft.block.DispenserBlock;
 import net.minecraft.item.ItemGroup;
 import net.minecraft.item.ItemStack;
-import net.minecraft.item.Items;
 import net.minecraft.util.Identifier;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import reborncore.common.registration.RegistrationManager;
 import reborncore.common.util.Torus;
-import techreborn.api.TechRebornAPI;
 import techreborn.client.GuiHandler;
 import techreborn.events.ModRegistry;
 import techreborn.events.StackToolTipHandler;
diff --git a/src/main/java/techreborn/blocks/BlockOre.java b/src/main/java/techreborn/blocks/BlockOre.java
index 19aab47f2..87b4bc3e9 100644
--- a/src/main/java/techreborn/blocks/BlockOre.java
+++ b/src/main/java/techreborn/blocks/BlockOre.java
@@ -26,19 +26,10 @@ package techreborn.blocks;
 
 import net.fabricmc.fabric.api.block.FabricBlockSettings;
 import net.minecraft.block.Block;
-import net.minecraft.block.BlockState;
 import net.minecraft.block.Material;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.DefaultedList;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.World;
 import reborncore.common.registration.RebornRegister;
 import reborncore.common.registration.config.ConfigRegistry;
-import reborncore.common.util.OreDrop;
 import techreborn.TechReborn;
-import techreborn.init.TRContent;
-
-import java.util.Random;
 
 @RebornRegister(TechReborn.MOD_ID)
 public class BlockOre extends Block {
diff --git a/src/main/java/techreborn/init/recipes/CraftingTableRecipes.java b/src/main/java/techreborn/init/recipes/CraftingTableRecipes.java
index fe5b9fbf4..458901921 100644
--- a/src/main/java/techreborn/init/recipes/CraftingTableRecipes.java
+++ b/src/main/java/techreborn/init/recipes/CraftingTableRecipes.java
@@ -45,18 +45,6 @@ public class CraftingTableRecipes extends RecipeMethods {
 		registerShaped(getStack(TRContent.REINFORCED_GLASS, 7), "GGG", "AGA", "GGG", 'A', "plateAdvancedAlloy", 'G', "blockGlass");
 //		registerShaped(getMaterial("iridium_alloy", Type.INGOT), "IAI", "ADA", "IAI", 'I', "ingotIridium", 'D', "dustDiamond", 'A', "plateAdvancedAlloy");
 
-		// Tools and devices		
-
-		registerShaped(getStack(TRContent.INDUSTRIAL_DRILL), " I ", "NCN", "OAO", 'I', "plateIridiumAlloy", 'N', "nuggetIridium", 'A', getStack(TRContent.ADVANCED_DRILL, 1, OreDictionary.WILDCARD_VALUE), 'C', "circuitMaster", 'O', getMaterial("overclock", Type.UPGRADE));
-		registerShaped(getStack(TRContent.BASIC_CHAINSAW), " SS", "SCS", "BS ", 'S', "ingotSteel", 'C', "circuitBasic", 'B', "reBattery");
-		registerShaped(getStack(TRContent.ADVANCED_CHAINSAW), " DD", "TCD", "ST ", 'D', "gemDiamond", 'C', "circuitAdvanced", 'S', getStack(TRContent.BASIC_CHAINSAW, 1, OreDictionary.WILDCARD_VALUE), 'T', "ingotTitanium");
-		registerShaped(getStack(TRContent.INDUSTRIAL_CHAINSAW), " NI", "OCN", "DO ", 'I', "plateIridiumAlloy", 'N', "nuggetIridium", 'D', getStack(TRContent.ADVANCED_CHAINSAW, 1, OreDictionary.WILDCARD_VALUE), 'C', "circuitMaster", 'O', getMaterial("overclock", Type.UPGRADE));
-		registerShaped(getStack(TRContent.BASIC_JACKHAMMER), "SBS", "SCS", " S ", 'S', "ingotSteel", 'C', "circuitBasic", 'B', "reBattery");
-		registerShaped(getStack(TRContent.ADVANCED_JACKHAMMER), "DSD", "TCT", " D ", 'D', "gemDiamond", 'C', "circuitAdvanced", 'S', getStack(TRContent.BASIC_JACKHAMMER, 1, OreDictionary.WILDCARD_VALUE), 'T', "ingotTitanium");
-		registerShaped(getStack(TRContent.INDUSTRIAL_JACKHAMMER), "NDN", "OCO", " I ", 'I', "plateIridiumAlloy", 'N', "nuggetIridium", 'D', getStack(TRContent.ADVANCED_JACKHAMMER, 1, OreDictionary.WILDCARD_VALUE), 'C', "circuitMaster", 'O', getMaterial("overclock", Type.UPGRADE));
-		registerShaped(getStack(TRContent.CLOAKING_DEVICE), "CIC", "IOI", "CIC", 'C', "ingotChrome", 'I', "plateIridiumAlloy", 'O', getStack(TRContent.LAPOTRONIC_ORB));
-		registerShaped(getStack(TRContent.LAPOTRONIC_ORBPACK), "FOF", "SPS", "FIF", 'F', "circuitMaster", 'O', getStack(TRContent.LAPOTRONIC_ORB), 'S', "craftingSuperconductor", 'I', "ingotIridium", 'P', getStack(TRContent.LITHIUM_ION_BATPACK));
-
 
 		//Upgrades
 //		registerShaped(ItemUpgrades.getUpgradeByName("energy_storage"), "PPP", "WBW", "PCP", 'P', "plankWood", 'W', EnumCableType.ICOPPER.getStack(), 'C', "circuitBasic", 'B', "reBattery");
diff --git a/src/main/java/techreborn/items/armor/ItemTRArmour.java b/src/main/java/techreborn/items/armor/ItemTRArmour.java
index c22f65e98..25efb34fe 100644
--- a/src/main/java/techreborn/items/armor/ItemTRArmour.java
+++ b/src/main/java/techreborn/items/armor/ItemTRArmour.java
@@ -32,7 +32,6 @@ import net.minecraft.item.ItemStack;
 import reborncore.common.util.ItemDurabilityExtensions;
 import reborncore.common.util.ItemUtils;
 import techreborn.TechReborn;
-import techreborn.events.TRRecipeHandler;
 
 /**
  * Created by modmuss50 on 26/02/2016.
@@ -48,16 +47,6 @@ public class ItemTRArmour extends ArmorItem implements ItemDurabilityExtensions
 	public ItemTRArmour(ArmorMaterial material, EquipmentSlot slot, String repairOreDict) {
 		super(material, slot, (new Item.Settings()).group(TechReborn.ITEMGROUP).maxCount(1));
 		this.repairOreDict = repairOreDict;
-		if (slot == EquipmentSlot.HEAD)
-			//setTranslationKey(material.name().toLowerCase() + "Helmet");
-		if (slot == EquipmentSlot.CHEST)
-			//setTranslationKey(material.name().toLowerCase() + "Chestplate");
-		if (slot == EquipmentSlot.LEGS)
-			//setTranslationKey(material.name().toLowerCase() + "Leggings");
-		if (slot == EquipmentSlot.FEET) {
-
-		}
-			//setTranslationKey(material.name().toLowerCase() + "Boots");
 	}
 
 	@Override
diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/advanced_chainsaw.json b/src/main/resources/data/techreborn/recipes/crafting_shaped/advanced_chainsaw.json
new file mode 100644
index 000000000..905335ed0
--- /dev/null
+++ b/src/main/resources/data/techreborn/recipes/crafting_shaped/advanced_chainsaw.json
@@ -0,0 +1,25 @@
+{
+	"type": "minecraft:crafting_shaped",
+	"pattern": [
+		" DD",
+		"TCD",
+		"ST "
+	],
+	"key": {
+		"D": {
+			"item": "minecraft:diamond"
+		},
+		"C": {
+			"item": "techreborn:advanced_circuit"
+		},
+		"T": {
+			"item": "techreborn:titanium_ingot"
+		},
+		"S": {
+			"item": "techreborn:basic_chainsaw"
+		}
+	},
+	"result": {
+		"item": "techreborn:advanced_chainsaw"
+	}
+}
diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/advanced_jackhammer.json b/src/main/resources/data/techreborn/recipes/crafting_shaped/advanced_jackhammer.json
new file mode 100644
index 000000000..c1b20f472
--- /dev/null
+++ b/src/main/resources/data/techreborn/recipes/crafting_shaped/advanced_jackhammer.json
@@ -0,0 +1,25 @@
+{
+	"type": "minecraft:crafting_shaped",
+	"pattern": [
+		"DSD",
+		"TCT",
+		" D "
+	],
+	"key": {
+		"D": {
+			"item": "minecraft:diamond"
+		},
+		"C": {
+			"item": "techreborn:advanced_circuit"
+		},
+		"T": {
+			"item": "techreborn:titanium_ingot"
+		},
+		"S": {
+			"item": "techreborn:basic_jackhammer"
+		}
+	},
+	"result": {
+		"item": "techreborn:advanced_jackhammer"
+	}
+}
diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/basic_chainsaw.json b/src/main/resources/data/techreborn/recipes/crafting_shaped/basic_chainsaw.json
new file mode 100644
index 000000000..a38a95d9c
--- /dev/null
+++ b/src/main/resources/data/techreborn/recipes/crafting_shaped/basic_chainsaw.json
@@ -0,0 +1,22 @@
+{
+	"type": "minecraft:crafting_shaped",
+	"pattern": [
+		" SS",
+		"SCS",
+		"BS "
+	],
+	"key": {
+		"S": {
+			"item": "techreborn:steel_ingot"
+		},
+		"C": {
+			"item": "techreborn:electronic_circuit"
+		},
+		"B": {
+			"item": "techreborn:red_cell_battery"
+		}
+	},
+	"result": {
+		"item": "techreborn:basic_chainsaw"
+	}
+}
diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/basic_jackhammer.json b/src/main/resources/data/techreborn/recipes/crafting_shaped/basic_jackhammer.json
new file mode 100644
index 000000000..02c5caafe
--- /dev/null
+++ b/src/main/resources/data/techreborn/recipes/crafting_shaped/basic_jackhammer.json
@@ -0,0 +1,22 @@
+{
+	"type": "minecraft:crafting_shaped",
+	"pattern": [
+		"SBS",
+		"SCS",
+		" S "
+	],
+	"key": {
+		"S": {
+			"item": "techreborn:steel_ingot"
+		},
+		"C": {
+			"item": "techreborn:electronic_circuit"
+		},
+		"B": {
+			"item": "techreborn:red_cell_battery"
+		}
+	},
+	"result": {
+		"item": "techreborn:basic_jackhammer"
+	}
+}
diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/cloaking_device.json b/src/main/resources/data/techreborn/recipes/crafting_shaped/cloaking_device.json
new file mode 100644
index 000000000..77e77b2c4
--- /dev/null
+++ b/src/main/resources/data/techreborn/recipes/crafting_shaped/cloaking_device.json
@@ -0,0 +1,22 @@
+{
+	"type": "minecraft:crafting_shaped",
+	"pattern": [
+		"CIC",
+		"IOI",
+		"CIC"
+	],
+	"key": {
+		"C": {
+			"item": "techreborn:chrome_ingot"
+		},
+		"I": {
+			"item": "techreborn:iridium_alloy_plate"
+		},
+		"O": {
+			"item": "techreborn:lapotronic_orb"
+		}
+	},
+	"result": {
+		"item": "techreborn:cloaking_device"
+	}
+}
diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/industrial_chainsaw.json b/src/main/resources/data/techreborn/recipes/crafting_shaped/industrial_chainsaw.json
new file mode 100644
index 000000000..5530abd8d
--- /dev/null
+++ b/src/main/resources/data/techreborn/recipes/crafting_shaped/industrial_chainsaw.json
@@ -0,0 +1,28 @@
+{
+	"type": "minecraft:crafting_shaped",
+	"pattern": [
+		" NI",
+		"OCN",
+		"DO "
+	],
+	"key": {
+		"I": {
+			"item": "techreborn:iridium_alloy_plate"
+		},
+		"N": {
+			"item": "techreborn:iridium_nugget"
+		},
+		"C": {
+			"item": "techreborn:energy_flow_chip"
+		},
+		"O": {
+			"item": "techreborn:overclocker_upgrade"
+		},
+		"D": {
+			"item": "techreborn:advanced_chainsaw"
+		}
+	},
+	"result": {
+		"item": "techreborn:industrial_chainsaw"
+	}
+}
diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/industrial_drill.json b/src/main/resources/data/techreborn/recipes/crafting_shaped/industrial_drill.json
new file mode 100644
index 000000000..2552b54c7
--- /dev/null
+++ b/src/main/resources/data/techreborn/recipes/crafting_shaped/industrial_drill.json
@@ -0,0 +1,28 @@
+{
+	"type": "minecraft:crafting_shaped",
+	"pattern": [
+		" I ",
+		"NCN",
+		"OAO"
+	],
+	"key": {
+		"I": {
+			"item": "techreborn:iridium_alloy_plate"
+		},
+		"N": {
+			"item": "techreborn:iridium_nugget"
+		},
+		"C": {
+			"item": "techreborn:energy_flow_chip"
+		},
+		"O": {
+			"item": "techreborn:overclocker_upgrade"
+		},
+		"A": {
+			"item": "techreborn:advanced_drill"
+		}
+	},
+	"result": {
+		"item": "techreborn:industrial_drill"
+	}
+}
diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/industrial_jackhammer.json b/src/main/resources/data/techreborn/recipes/crafting_shaped/industrial_jackhammer.json
new file mode 100644
index 000000000..60aab0014
--- /dev/null
+++ b/src/main/resources/data/techreborn/recipes/crafting_shaped/industrial_jackhammer.json
@@ -0,0 +1,28 @@
+{
+	"type": "minecraft:crafting_shaped",
+	"pattern": [
+		"NDN",
+		"OCO",
+		" I "
+	],
+	"key": {
+		"I": {
+			"item": "techreborn:iridium_alloy_plate"
+		},
+		"N": {
+			"item": "techreborn:iridium_nugget"
+		},
+		"C": {
+			"item": "techreborn:energy_flow_chip"
+		},
+		"O": {
+			"item": "techreborn:overclocker_upgrade"
+		},
+		"D": {
+			"item": "techreborn:advanced_jackhammer"
+		}
+	},
+	"result": {
+		"item": "techreborn:industrial_jackhammer"
+	}
+}
diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/lapotronic_orbpack.json b/src/main/resources/data/techreborn/recipes/crafting_shaped/lapotronic_orbpack.json
new file mode 100644
index 000000000..397982357
--- /dev/null
+++ b/src/main/resources/data/techreborn/recipes/crafting_shaped/lapotronic_orbpack.json
@@ -0,0 +1,28 @@
+{
+	"type": "minecraft:crafting_shaped",
+	"pattern": [
+		"FOF",
+		"SPS",
+		"FIF"
+	],
+	"key": {
+		"F": {
+			"item": "techreborn:energy_flow_chip"
+		},
+		"O": {
+			"item": "techreborn:lapotronic_orb"
+		},
+		"S": {
+			"item": "techreborn:superconductor"
+		},
+		"P": {
+			"item": "techreborn:lithium_ion_batpack"
+		},
+		"I": {
+			"item": "techreborn:iridium_ingot"
+		}
+	},
+	"result": {
+		"item": "techreborn:lapotronic_orbpack"
+	}
+}