Updated API reference for recipes.

src/main/java/techreborn/api/Reference.java

@@ -28,14 +28,11 @@ import net.minecraft.init.SoundEvents;
 import net.minecraft.item.Item.ToolMaterial;
 import net.minecraft.item.ItemArmor.ArmorMaterial;
 import net.minecraft.util.SoundEvent;
-import net.minecraft.util.text.translation.I18n;
 import net.minecraftforge.common.util.EnumHelper;
 
 /**
  * This contains some static stuff used in recipes and other things
  */
-//TODO move this out of the api, and make it nicer
-@SuppressWarnings("deprecation")
 public class Reference {
 
 	private static final Class<?>[] ARMOR_PARAMETERS = { String.class, int.class, int[].class, int.class, SoundEvent.class, float.class };
@@ -55,22 +52,20 @@ public class Reference {
 	public static ToolMaterial SAPPHIRE = EnumHelper.addToolMaterial("SAPPHIRE", 2, 620, 5.0F, 2F, 8);
 	public static ToolMaterial PERIDOT = EnumHelper.addToolMaterial("PERIDOT", 2, 400, 7.0F, 2.4F, 16);
 
-	public static String alloySmelterRecipe = I18n.translateToLocal("techreborn.recipe.alloysmelter");
+	public static String ALLOY_SMELTER_RECIPE = "ALLOY_SMELTER_RECIPE";
-	public static String assemblingMachineRecipe = I18n.translateToLocal("techreborn.recipe.assemblingmachine");
+	public static String ASSEMBLING_MACHINE_RECIPE = "ASSEMBLING_MACHINE_RECIPE";
-	public static String blastFurnaceRecipe = I18n.translateToLocal("techreborn.recipe.blastfurnace");
+	public static String BLAST_FURNACE_RECIPE = "BLAST_FURNACE_RECIPE";
-	public static String centrifugeRecipe = I18n.translateToLocal("techreborn.recipe.centrifuge");
+	public static String CENTRIFUGE_RECIPE = "CENTRIFUGE_RECIPE";
-	public static String chemicalReactorRecipe = I18n.translateToLocal("techreborn.recipe.chemicalReactor");
+	public static String CHEMICAL_REACTOR_RECIPE = "CHEMICAL_REACTOR_RECIPE";
-	public static String industrialGrinderRecipe = I18n.translateToLocal("techreborn.recipe.grinder");
+	public static String COMPRESSOR_RECIPE = "COMPRESSOR_RECIPE";
-	public static String implosionCompressorRecipe = I18n.translateToLocal("techreborn.recipe.implosioncompressor");
+	public static String DISTILLATION_TOWER_RECIPE = "DISTILLATION_TOWER_RECIPE";
-	public static String industrialElectrolyzerRecipe = I18n.translateToLocal("techreborn.recipe.industrialelectrolyzer");
+	public static String EXTRACTOR_RECIPE = "EXTRACTOR_RECIPE";
-	public static String industrialSawmillRecipe = I18n.translateToLocal("techreborn.recipe.industrialsawmill");
+	public static String GRINDER_RECIPE = "GRINDER_RECIPE";
-	public static String latheRecipe = I18n.translateToLocal("techreborn.recipe.lathe");
+	public static String IMPLOSION_COMPRESSOR_RECIPE = "IMPLOSION_COMPRESSOR_RECIPE";
-	public static String plateCuttingMachineRecipe = I18n.translateToLocal("techreborn.recipe.platecuttingmachine");
+	public static String INDUSTRIAL_ELECTROLYZER_RECIPE = "INDUSTRIAL_ELECTROLYZER_RECIPE";
-	public static String vacuumFreezerRecipe = I18n.translateToLocal("tile.techreborn.vacuumfreezer.name");
+	public static String INDUSTRIAL_GRINDER_RECIPE = "INDUSTRIAL_GRINDER_RECIPE"; 
-	public static String grinderRecipe = I18n.translateToLocal("tile.techreborn.grinder.name");
+	public static String INDUSTRIAL_SAWMILL_RECIPE = "INDUSTRIAL_SAWMILL_RECIPE";
-	public static String extractorRecipe = I18n.translateToLocal("tile.techreborn.extractor.name");
+	public static String RECYCLER_RECIPE = "RECYCLER_RECIPE"; 
-	public static String compressorRecipe = I18n.translateToLocal("tile.techreborn.compressor.name");
+	public static String SCRAPBOX_RECIPE = "SCRAPBOX_RECIPE";
-	public static String recyclerRecipe = I18n.translateToLocal("tile.techreborn.recycler.name");
+	public static String VACUUM_FREEZER_RECIPE = "VACUUM_FREEZER_RECIPE";
-	public static String scrapboxRecipe = I18n.translateToLocal("techreborn.recipe.scrapbox");
-	public static String distillationTowerRecipe = I18n.translateToLocal("techreborn.recipe.distillationtower");
 }

src/main/java/techreborn/api/recipe/ScrapboxRecipeCrafter.java

@@ -46,12 +46,12 @@ public class ScrapboxRecipeCrafter extends RecipeCrafter {
 	 * @param outputSlots Slot IDs for output
 	 */
 	public ScrapboxRecipeCrafter(TileEntity parentTile, Inventory inventory, int[] inputSlots, int[] outputSlots) {
-		super(Reference.scrapboxRecipe, parentTile, 1, 1, inventory, inputSlots, outputSlots);
+		super(Reference.SCRAPBOX_RECIPE, parentTile, 1, 1, inventory, inputSlots, outputSlots);
 	}
 
 	@Override
 	public void updateCurrentRecipe(){
-		List<IBaseRecipeType> scrapboxRecipeList = RecipeHandler.getRecipeClassFromName(Reference.scrapboxRecipe);
+		List<IBaseRecipeType> scrapboxRecipeList = RecipeHandler.getRecipeClassFromName(Reference.SCRAPBOX_RECIPE);
 		int random = parentTile.getWorld().rand.nextInt(scrapboxRecipeList.size());
 		// Sets the current recipe then syncs
 		setCurrentRecipe(scrapboxRecipeList.get(random));

src/main/java/techreborn/api/recipe/machines/AlloySmelterRecipe.java

@@ -31,7 +31,7 @@ import techreborn.api.recipe.BaseRecipe;
 public class AlloySmelterRecipe extends BaseRecipe {
 
 	public AlloySmelterRecipe(ItemStack input1, ItemStack input2, ItemStack output1, int tickTime, int euPerTick) {
-		super(Reference.alloySmelterRecipe, tickTime, euPerTick);
+		super(Reference.ALLOY_SMELTER_RECIPE, tickTime, euPerTick);
 		if (input1 != null)
 			addInput(input1);
 		if (input2 != null)

src/main/java/techreborn/api/recipe/machines/AssemblingMachineRecipe.java

@@ -31,7 +31,7 @@ import techreborn.api.recipe.BaseRecipe;
 public class AssemblingMachineRecipe extends BaseRecipe {
 
 	public AssemblingMachineRecipe(ItemStack input1, ItemStack input2, ItemStack output1, int tickTime, int euPerTick) {
-		super(Reference.assemblingMachineRecipe, tickTime, euPerTick);
+		super(Reference.ASSEMBLING_MACHINE_RECIPE, tickTime, euPerTick);
 		if (input1 != null)
 			addInput(input1);
 		if (input2 != null)

src/main/java/techreborn/api/recipe/machines/BlastFurnaceRecipe.java

@@ -34,7 +34,7 @@ public class BlastFurnaceRecipe extends BaseRecipe {
 
 	public BlastFurnaceRecipe(ItemStack input1, ItemStack input2, ItemStack output1, ItemStack output2, int tickTime,
 	                          int euPerTick, int neededHeat) {
-		super(Reference.blastFurnaceRecipe, tickTime, euPerTick);
+		super(Reference.BLAST_FURNACE_RECIPE, tickTime, euPerTick);
 		if (input1 != null)
 			addInput(input1);
 		if (input2 != null)

src/main/java/techreborn/api/recipe/machines/CentrifugeRecipe.java

@@ -34,7 +34,7 @@ public class CentrifugeRecipe extends BaseRecipe {
 
 	public CentrifugeRecipe(Object input1, ItemStack input2, ItemStack output1, ItemStack output2, ItemStack output3,
 	                        ItemStack output4, int tickTime, int euPerTick) {
-		super(Reference.centrifugeRecipe, tickTime, euPerTick);
+		super(Reference.CENTRIFUGE_RECIPE, tickTime, euPerTick);
 		if (input1 != null)
 			addInput(input1);
 		if (input2 != null)

src/main/java/techreborn/api/recipe/machines/ChemicalReactorRecipe.java

@@ -31,7 +31,7 @@ import techreborn.api.recipe.BaseRecipe;
 public class ChemicalReactorRecipe extends BaseRecipe {
 
 	public ChemicalReactorRecipe(ItemStack input1, ItemStack input2, ItemStack output1, int tickTime, int euPerTick) {
-		super(Reference.chemicalReactorRecipe, tickTime, euPerTick);
+		super(Reference.CHEMICAL_REACTOR_RECIPE, tickTime, euPerTick);
 		if (input1 != null)
 			addInput(input1);
 		if (input2 != null)

src/main/java/techreborn/api/recipe/machines/CompressorRecipe.java

@@ -31,7 +31,7 @@ import techreborn.api.recipe.BaseRecipe;
 public class CompressorRecipe extends BaseRecipe {
 
 	public CompressorRecipe(ItemStack input1, ItemStack output1, int tickTime, int euPerTick) {
-		super(Reference.compressorRecipe, tickTime, euPerTick);
+		super(Reference.COMPRESSOR_RECIPE, tickTime, euPerTick);
 		if (input1 != null)
 			addInput(input1);
 		if (output1 != null)

src/main/java/techreborn/api/recipe/machines/DistillationTowerRecipe.java

@@ -48,7 +48,7 @@ public class DistillationTowerRecipe extends BaseRecipe {
 	 */
 	public DistillationTowerRecipe(ItemStack inputCells, ItemStack input2, ItemStack output1, ItemStack output2,
             ItemStack output3, ItemStack output4, int tickTime, int euPerTick) {
-		super(Reference.distillationTowerRecipe, tickTime, euPerTick);
+		super(Reference.DISTILLATION_TOWER_RECIPE, tickTime, euPerTick);
 		if (inputCells != null)
 			addInput(inputCells);
 		if (input2 != null)

src/main/java/techreborn/api/recipe/machines/ExtractorRecipe.java

@@ -33,7 +33,7 @@ public class ExtractorRecipe extends BaseRecipe {
 	boolean useOreDic = true;
 
 	public ExtractorRecipe(ItemStack input1, ItemStack output1, int tickTime, int euPerTick) {
-		super(Reference.extractorRecipe, tickTime, euPerTick);
+		super(Reference.EXTRACTOR_RECIPE, tickTime, euPerTick);
 		if (input1 != null)
 			addInput(input1);
 		if (output1 != null)

src/main/java/techreborn/api/recipe/machines/GrinderRecipe.java

@@ -33,7 +33,7 @@ public class GrinderRecipe extends BaseRecipe {
 	public boolean useOreDict = true;
 
 	public GrinderRecipe(ItemStack input1, ItemStack output1, int tickTime, int euPerTick) {
-		super(Reference.grinderRecipe, tickTime, euPerTick / 10); //Done to buff energy usage to be more in line with ic2
+		super(Reference.GRINDER_RECIPE, tickTime, euPerTick / 10); //Done to buff energy usage to be more in line with ic2
 		if (input1 != null)
 			addInput(input1);
 		if (output1 != null)
@@ -41,7 +41,7 @@ public class GrinderRecipe extends BaseRecipe {
 	}
 
 	public GrinderRecipe(ItemStack input1, ItemStack output1, int tickTime, int euPerTick, boolean useOreDict) {
-		super(Reference.grinderRecipe, tickTime, euPerTick / 10); //Done to buff energy usage to be more in line with ic2
+		super(Reference.GRINDER_RECIPE, tickTime, euPerTick / 10); //Done to buff energy usage to be more in line with ic2
 		this.useOreDict = useOreDict;
 		if (input1 != null)
 			addInput(input1);

src/main/java/techreborn/api/recipe/machines/ImplosionCompressorRecipe.java

@@ -32,7 +32,7 @@ public class ImplosionCompressorRecipe extends BaseRecipe {
 
 	public ImplosionCompressorRecipe(ItemStack input1, ItemStack input2, ItemStack output1, ItemStack output2,
 	                                 int tickTime, int euPerTick) {
-		super(Reference.implosionCompressorRecipe, tickTime, euPerTick);
+		super(Reference.IMPLOSION_COMPRESSOR_RECIPE, tickTime, euPerTick);
 		if (input1 != null)
 			addInput(input1);
 		if (input2 != null)

src/main/java/techreborn/api/recipe/machines/IndustrialElectrolyzerRecipe.java

@@ -34,7 +34,7 @@ public class IndustrialElectrolyzerRecipe extends BaseRecipe {
 
 	public IndustrialElectrolyzerRecipe(ItemStack inputCells, ItemStack input2, ItemStack output1, ItemStack output2,
 	                                    ItemStack output3, ItemStack output4, int tickTime, int euPerTick) {
-		super(Reference.industrialElectrolyzerRecipe, tickTime, euPerTick);
+		super(Reference.INDUSTRIAL_ELECTROLYZER_RECIPE, tickTime, euPerTick);
 		if (inputCells != null)
 			addInput(inputCells);
 		if (input2 != null)

src/main/java/techreborn/api/recipe/machines/IndustrialGrinderRecipe.java

@@ -36,7 +36,7 @@ public class IndustrialGrinderRecipe extends BaseRecipe {
 
 	public IndustrialGrinderRecipe(ItemStack input1, FluidStack fluidStack, ItemStack output1,
 	                               ItemStack output2, ItemStack output3, ItemStack output4, int tickTime, int euPerTick) {
-		super(Reference.industrialGrinderRecipe, tickTime, euPerTick);
+		super(Reference.INDUSTRIAL_GRINDER_RECIPE, tickTime, euPerTick);
 		if (input1 != null)
 			addInput(input1);
 		if (output1 != null)

src/main/java/techreborn/api/recipe/machines/IndustrialSawmillRecipe.java

@@ -36,7 +36,7 @@ public class IndustrialSawmillRecipe extends BaseRecipe {
 
 	public IndustrialSawmillRecipe(ItemStack input1, FluidStack fluidStack, ItemStack output1,
 	                               ItemStack output2, ItemStack output3, int tickTime, int euPerTick) {
-		super(Reference.industrialSawmillRecipe, tickTime, euPerTick);
+		super(Reference.INDUSTRIAL_SAWMILL_RECIPE, tickTime, euPerTick);
 		if (input1 != null)
 			addInput(input1);
 		if (output1 != null)
@@ -50,7 +50,7 @@ public class IndustrialSawmillRecipe extends BaseRecipe {
 
 	public IndustrialSawmillRecipe(ItemStack input1, FluidStack fluidStack, ItemStack output1,
 	                               ItemStack output2, ItemStack output3, int tickTime, int euPerTick, boolean canUseOreDict) {
-		super(Reference.industrialSawmillRecipe, tickTime, euPerTick);
+		super(Reference.INDUSTRIAL_SAWMILL_RECIPE, tickTime, euPerTick);
 		if (input1 != null)
 			addInput(input1);
 		if (output1 != null)

src/main/java/techreborn/api/recipe/machines/RecyclerRecipe.java

@@ -33,7 +33,7 @@ import techreborn.api.recipe.BaseRecipe;
 public class RecyclerRecipe extends BaseRecipe {
 
 	public RecyclerRecipe(ItemStack input) {
-		super(Reference.recyclerRecipe, 0, 0);
+		super(Reference.RECYCLER_RECIPE, 0, 0);
 		addInput(input);
 		addOutput(TechRebornAPI.subItemRetriever.getPartByName("scrap"));
 	}

src/main/java/techreborn/api/recipe/machines/ScrapboxRecipe.java

@@ -32,7 +32,7 @@ import techreborn.api.recipe.BaseRecipe;
 public class ScrapboxRecipe extends BaseRecipe {
 
 	public ScrapboxRecipe(ItemStack output, int tickTime, int euPerTick) {
-		super(Reference.scrapboxRecipe, tickTime, euPerTick);
+		super(Reference.SCRAPBOX_RECIPE, tickTime, euPerTick);
 		if (output != null) {
 			addInput(new ItemStack(TechRebornAPI.getItem("SCRAP_BOX")));
 			addOutput(output);

src/main/java/techreborn/api/recipe/machines/VacuumFreezerRecipe.java

@@ -31,7 +31,7 @@ import techreborn.api.recipe.BaseRecipe;
 public class VacuumFreezerRecipe extends BaseRecipe {
 
 	public VacuumFreezerRecipe(ItemStack input, ItemStack output, int tickTime, int euPerTick) {
-		super(Reference.vacuumFreezerRecipe, tickTime, euPerTick);
+		super(Reference.VACUUM_FREEZER_RECIPE, tickTime, euPerTick);
 		if (input != null)
 			addInput(input);
 		if (output != null)

src/main/java/techreborn/blocks/BlockAlarm.java

@@ -140,6 +140,7 @@ public class BlockAlarm extends BaseTileBlock {
 		return new TileAlarm();
 	}
 
+	@Override
 	public IBlockState getStateForPlacement(World world, BlockPos pos, EnumFacing facing, float hitX, float hitY,
 	                                        float hitZ, int meta, EntityLivingBase placer, EnumHand hand) {
 		return this.getDefaultState().withProperty(FACING, facing);

src/main/java/techreborn/client/gui/slot/elements/ConfigSlotElement.java

@@ -32,7 +32,6 @@ import net.minecraft.inventory.IInventory;
 import net.minecraft.item.ItemStack;
 import reborncore.api.recipe.IRecipeCrafterProvider;
 import reborncore.common.recipes.RecipeCrafter;
-import reborncore.common.tile.SlotConfiguration;
 import techreborn.client.gui.GuiBase;
 import techreborn.client.gui.slot.GuiSlotConfiguration;
 
@@ -62,8 +61,6 @@ public class ConfigSlotElement extends ElementBase {
 			return true;
 		}));
 
-		SlotConfiguration.SlotConfigHolder slotConfigHolder = gui.getMachine().slotConfiguration.getSlotDetails(id);
-
 		elements.add(new CheckBoxElement("Auto Input", 0xFFFFFFFF, x - 26, y + 42, "input", slotId, Sprite.LIGHT_CHECK_BOX, gui.getMachine()).addPressAction((element, gui12, provider, mouseX, mouseY) -> {
 			popupElement.updateCheckBox((CheckBoxElement) element, "input", gui12);
 			return true;

src/main/java/techreborn/client/gui/slot/elements/SlotConfigPopupElement.java

@@ -169,10 +169,8 @@ public class SlotConfigPopupElement extends ElementBase {
 	private boolean isInBox(int rectX, int rectY, int rectWidth, int rectHeight, int pointX, int pointY, GuiBase guiBase){
 		rectX += getX();
 		rectY += getY();
-		if(true){
+		return isInRect(guiBase, rectX, rectY, rectWidth, rectHeight, pointX, pointY);
-			return isInRect(guiBase, rectX, rectY, rectWidth, rectHeight, pointX, pointY);
+		//return (pointX - guiBase.getGuiLeft()) >= rectX - 1 && (pointX - guiBase.getGuiLeft()) < rectX + rectWidth + 1 && (pointY - guiBase.getGuiTop()) >= rectY - 1 && (pointY - guiBase.getGuiTop()) < rectY + rectHeight + 1;
-		}
-		return (pointX - guiBase.getGuiLeft()) >= rectX - 1 && (pointX - guiBase.getGuiLeft()) < rectX + rectWidth + 1 && (pointY - guiBase.getGuiTop()) >= rectY - 1 && (pointY - guiBase.getGuiTop()) < rectY + rectHeight + 1;
 	}
 
 	public void drawState(GuiBase gui,

src/main/java/techreborn/compat/crafttweaker/CTAlloySmelter.java

@@ -66,6 +66,6 @@ public class CTAlloySmelter extends CTGeneric {
 	}
 
 	public static String getMachineName() {
-		return Reference.alloySmelterRecipe;
+		return Reference.ALLOY_SMELTER_RECIPE;
 	}
 }

src/main/java/techreborn/compat/crafttweaker/CTAssemblingMachine.java

@@ -62,7 +62,7 @@ public class CTAssemblingMachine extends CTGeneric {
 	}
 
 	public static String getMachineName() {
-		return Reference.assemblingMachineRecipe;
+		return Reference.ASSEMBLING_MACHINE_RECIPE;
 	}
 
 }

src/main/java/techreborn/compat/crafttweaker/CTBlastFurnace.java

@@ -62,6 +62,6 @@ public class CTBlastFurnace extends CTGeneric {
 	}
 
 	public static String getMachineName() {
-		return Reference.blastFurnaceRecipe;
+		return Reference.BLAST_FURNACE_RECIPE;
 	}
 }

src/main/java/techreborn/compat/crafttweaker/CTCentrifuge.java

@@ -62,6 +62,6 @@ public class CTCentrifuge extends CTGeneric {
 	}
 
 	public static String getMachineName() {
-		return Reference.centrifugeRecipe;
+		return Reference.CENTRIFUGE_RECIPE;
 	}
 }

src/main/java/techreborn/compat/crafttweaker/CTChemicalReactor.java

@@ -62,6 +62,6 @@ public class CTChemicalReactor extends CTGeneric {
 	}
 
 	public static String getMachineName() {
-		return Reference.chemicalReactorRecipe;
+		return Reference.CHEMICAL_REACTOR_RECIPE;
 	}
 }

src/main/java/techreborn/compat/crafttweaker/CTCompressor.java

@@ -63,6 +63,6 @@ public class CTCompressor extends CTGeneric {
 	}
 
 	public static String getMachineName() {
-		return Reference.compressorRecipe;
+		return Reference.COMPRESSOR_RECIPE;
 	}
 }

src/main/java/techreborn/compat/crafttweaker/CTDistillationTower.java

@@ -66,7 +66,7 @@ public class CTDistillationTower extends CTGeneric {
 	}
 
 	public static String getMachineName() {
-		return Reference.distillationTowerRecipe;
+		return Reference.DISTILLATION_TOWER_RECIPE;
 	}
 
 }

src/main/java/techreborn/compat/crafttweaker/CTGrinder.java

@@ -65,6 +65,6 @@ public class CTGrinder extends CTGeneric {
 	}
 
 	public static String getMachineName() {
-		return Reference.grinderRecipe;
+		return Reference.GRINDER_RECIPE;
 	}
 }

src/main/java/techreborn/compat/crafttweaker/CTImplosionCompressor.java

@@ -62,6 +62,6 @@ public class CTImplosionCompressor extends CTGeneric {
 	}
 	
 	public static String getMachineName() {
-		return Reference.implosionCompressorRecipe;
+		return Reference.IMPLOSION_COMPRESSOR_RECIPE;
 	}
 }

src/main/java/techreborn/compat/crafttweaker/CTIndustrialElectrolyzer.java

@@ -62,6 +62,6 @@ public class CTIndustrialElectrolyzer extends CTGeneric {
 	}
 
 	public static String getMachineName() {
-		return Reference.industrialElectrolyzerRecipe;
+		return Reference.INDUSTRIAL_ELECTROLYZER_RECIPE;
 	}
 }

src/main/java/techreborn/compat/crafttweaker/CTIndustrialGrinder.java

@@ -111,6 +111,6 @@ public class CTIndustrialGrinder extends CTGeneric {
 	 *  @return String Reference name for Industrial Grinder
 	 */
 	public static String getMachineName() {
-		return Reference.industrialGrinderRecipe;
+		return Reference.INDUSTRIAL_GRINDER_RECIPE;
 	}
 }

src/main/java/techreborn/compat/crafttweaker/CTIndustrialSawmill.java

@@ -83,6 +83,6 @@ public class CTIndustrialSawmill extends CTGeneric {
 	}
 
 	public static String getMachineName() {
-		return Reference.industrialSawmillRecipe;
+		return Reference.INDUSTRIAL_SAWMILL_RECIPE;
 	}
 }

src/main/java/techreborn/compat/crafttweaker/CTScrapbox.java

@@ -58,14 +58,14 @@ public class CTScrapbox {
 	}
 	
 	public static String getMachineName() {
-		return Reference.scrapboxRecipe;
+		return Reference.SCRAPBOX_RECIPE;
 	}
 
 	public static class RemoveAll implements IAction {
 
 		@Override
 		public void apply() {
-			RecipeHandler.recipeList.removeAll(RecipeHandler.getRecipeClassFromName(Reference.scrapboxRecipe));
+			RecipeHandler.recipeList.removeAll(RecipeHandler.getRecipeClassFromName(Reference.SCRAPBOX_RECIPE));
 		}
 
 		@Override

src/main/java/techreborn/compat/crafttweaker/CTVacuumFreezer.java

@@ -60,6 +60,6 @@ public class CTVacuumFreezer extends CTGeneric {
 	}
 
 	public static String getMachineName() {
-		return Reference.vacuumFreezerRecipe;
+		return Reference.VACUUM_FREEZER_RECIPE;
 	}
 }

src/main/java/techreborn/compat/theoneprobe/ProbeProvider.java

@@ -52,6 +52,7 @@ import java.util.stream.Collectors;
 /**
  * Created by Mark on 04/06/2016.
  */
+@SuppressWarnings("deprecation")
 public class ProbeProvider implements IProbeInfoProvider {
 
 	ProgressStyle euStyle = new ProgressStyle().backgroundColor(0xFF8B8B8B).borderColor(0xFF373737).alternateFilledColor(PowerSystem.getDisplayPower().altColour).filledColor(PowerSystem.getDisplayPower().colour);
@@ -79,7 +80,6 @@ public class ProbeProvider implements IProbeInfoProvider {
 		return "TechReborn";
 	}
 
-	@SuppressWarnings("deprecation")
 	@Override
 	public void addProbeInfo(ProbeMode mode, IProbeInfo probeInfo, EntityPlayer player, World world, IBlockState blockState, IProbeHitData data) {
 		euStyle = new ProgressStyle().backgroundColor(0xFF8B8B8B).borderColor(0xFF373737).alternateFilledColor(PowerSystem.getDisplayPower().altColour).filledColor(PowerSystem.getDisplayPower().colour);

src/main/java/techreborn/dispenser/BehaviorDispenseScrapbox.java

@@ -51,7 +51,7 @@ public class BehaviorDispenseScrapbox extends BehaviorDefaultDispenseItem {
 	@Override
 	protected ItemStack dispenseStack(IBlockSource source, ItemStack stack) {
 		if (dispenseScrapboxes) {
-			List<IBaseRecipeType> scrapboxRecipeList = RecipeHandler.getRecipeClassFromName(Reference.scrapboxRecipe);
+			List<IBaseRecipeType> scrapboxRecipeList = RecipeHandler.getRecipeClassFromName(Reference.SCRAPBOX_RECIPE);
 			int random = new Random().nextInt(scrapboxRecipeList.size());
 			ItemStack out = scrapboxRecipeList.get(random).getOutput(0);
 			stack.splitStack(1);

src/main/java/techreborn/items/DynamicCell.java

@@ -54,6 +54,7 @@ import techreborn.init.ModItems;
 /**
  * Created by modmuss50 on 17/05/2016.
  */
+@SuppressWarnings("deprecation")
 public class DynamicCell extends Item {
 
 	public static final int CAPACITY = Fluid.BUCKET_VOLUME;
@@ -158,7 +159,6 @@ public class DynamicCell extends Item {
 		}
 	}
 
-	@SuppressWarnings("deprecation")
 	@Override
 	public String getItemStackDisplayName(ItemStack stack) {
 		FluidStack fluidStack = getFluidHandler(stack).getFluid();

src/main/java/techreborn/items/ItemScrapBox.java

@@ -49,7 +49,7 @@ public class ItemScrapBox extends ItemTR {
 	public ActionResult<ItemStack> onItemRightClick(World world, EntityPlayer player, EnumHand hand) {
 		ItemStack stack = player.getHeldItemMainhand();
 		if (!world.isRemote) {
-			List<IBaseRecipeType> scrapboxRecipeList = RecipeHandler.getRecipeClassFromName(Reference.scrapboxRecipe);
+			List<IBaseRecipeType> scrapboxRecipeList = RecipeHandler.getRecipeClassFromName(Reference.SCRAPBOX_RECIPE);
 			int random = world.rand.nextInt(scrapboxRecipeList.size());
 			ItemStack out = scrapboxRecipeList.get(random).getOutput(0);
 			WorldUtils.dropItem(out, world, player.getPosition());

src/main/java/techreborn/tiles/TileAssemblingMachine.java

@@ -65,7 +65,7 @@ public class TileAssemblingMachine extends TilePowerAcceptor
 		inputs[1] = 1;
 		final int[] outputs = new int[1];
 		outputs[0] = 2;
-		this.crafter = new RecipeCrafter(Reference.assemblingMachineRecipe, this, 2, 2, this.inventory, inputs, outputs);
+		this.crafter = new RecipeCrafter(Reference.ASSEMBLING_MACHINE_RECIPE, this, 2, 2, this.inventory, inputs, outputs);
 	}
 
 	@Override

src/main/java/techreborn/tiles/TileChemicalReactor.java

@@ -63,7 +63,7 @@ public class TileChemicalReactor extends TilePowerAcceptor
 		inputs[1] = 1;
 		final int[] outputs = new int[1];
 		outputs[0] = 2;
-		this.crafter = new RecipeCrafter(Reference.chemicalReactorRecipe, this, 2, 2, this.inventory, inputs, outputs);
+		this.crafter = new RecipeCrafter(Reference.CHEMICAL_REACTOR_RECIPE, this, 2, 2, this.inventory, inputs, outputs);
 	}
 
 	@Override

src/main/java/techreborn/tiles/TileIndustrialCentrifuge.java

@@ -71,7 +71,7 @@ public class TileIndustrialCentrifuge extends TilePowerAcceptor
 		outputs[2] = 4;
 		outputs[3] = 5;
 
-		this.crafter = new RecipeCrafter(Reference.centrifugeRecipe, this, 2, 4, this.inventory, inputs, outputs);
+		this.crafter = new RecipeCrafter(Reference.CENTRIFUGE_RECIPE, this, 2, 4, this.inventory, inputs, outputs);
 	}
 
 	@Override

src/main/java/techreborn/tiles/TileIndustrialElectrolyzer.java

@@ -72,7 +72,7 @@ public class TileIndustrialElectrolyzer extends TilePowerAcceptor
 		outputs[1] = 3;
 		outputs[2] = 4;
 		outputs[3] = 5;
-		this.crafter = new RecipeCrafter(Reference.industrialElectrolyzerRecipe, this, 2, 4, this.inventory, inputs, outputs);
+		this.crafter = new RecipeCrafter(Reference.INDUSTRIAL_ELECTROLYZER_RECIPE, this, 2, 4, this.inventory, inputs, outputs);
 	}
 
 	@Override

src/main/java/techreborn/tiles/TileIronAlloyFurnace.java

@@ -198,7 +198,7 @@ public class TileIronAlloyFurnace extends TileLegacyMachineBase
 			return false;
 		} else {
 			ItemStack itemstack = null;
-			for (final IBaseRecipeType recipeType : RecipeHandler.getRecipeClassFromName(Reference.alloySmelterRecipe)) {
+			for (final IBaseRecipeType recipeType : RecipeHandler.getRecipeClassFromName(Reference.ALLOY_SMELTER_RECIPE)) {
 				if (this.hasAllInputs(recipeType)) {
 					itemstack = recipeType.getOutput(0);
 					break;
@@ -230,7 +230,7 @@ public class TileIronAlloyFurnace extends TileLegacyMachineBase
 	public void smeltItem() {
 		if (this.canSmelt()) {
 			ItemStack itemstack = ItemStack.EMPTY;
-			for (final IBaseRecipeType recipeType : RecipeHandler.getRecipeClassFromName(Reference.alloySmelterRecipe)) {
+			for (final IBaseRecipeType recipeType : RecipeHandler.getRecipeClassFromName(Reference.ALLOY_SMELTER_RECIPE)) {
 				if (this.hasAllInputs(recipeType)) {
 					itemstack = recipeType.getOutput(0);
 					break;
@@ -246,7 +246,7 @@ public class TileIronAlloyFurnace extends TileLegacyMachineBase
 				this.decrStackSize(this.output, -itemstack.getCount());
 			}
 
-			for (final IBaseRecipeType recipeType : RecipeHandler.getRecipeClassFromName(Reference.alloySmelterRecipe)) {
+			for (final IBaseRecipeType recipeType : RecipeHandler.getRecipeClassFromName(Reference.ALLOY_SMELTER_RECIPE)) {
 				boolean hasAllRecipes = true;
 				if (this.hasAllInputs(recipeType)) {
 

src/main/java/techreborn/tiles/cable/TileCable.java

@@ -49,6 +49,7 @@ import java.util.List;
 /**
  * Created by modmuss50 on 19/05/2017.
  */
+@SuppressWarnings("deprecation")
 public class TileCable extends TileEntity implements ITickable, IEnergyStorage, IListInfoProvider {
 	public int power = 0;
 	private int transferRate = 0;
@@ -233,7 +234,6 @@ public class TileCable extends TileEntity implements ITickable, IEnergyStorage,
         return compound;
     }
 
-	@SuppressWarnings("deprecation")
 	@Override
 	public void addInfo(List<String> info, boolean isRealTile) {
 		if (isRealTile) {

src/main/java/techreborn/tiles/multiblock/TileDistillationTower.java

@@ -64,7 +64,7 @@ public class TileDistillationTower extends TilePowerAcceptor
 		super();
 		final int[] inputs = new int[] { 0, 1 };
 		final int[] outputs = new int[] { 2, 3, 4, 5 };
-		this.crafter = new RecipeCrafter(Reference.distillationTowerRecipe, this, 2, 4, this.inventory, inputs, outputs);
+		this.crafter = new RecipeCrafter(Reference.DISTILLATION_TOWER_RECIPE, this, 2, 4, this.inventory, inputs, outputs);
 	}
 	
 	public boolean getMutliBlock() {

src/main/java/techreborn/tiles/multiblock/TileImplosionCompressor.java

@@ -61,7 +61,7 @@ public class TileImplosionCompressor extends TilePowerAcceptor
 		super();
 		final int[] inputs = new int[] { 0, 1 };
 		final int[] outputs = new int[] { 2, 3 };
-		this.crafter = new RecipeCrafter(Reference.implosionCompressorRecipe, this, 2, 2, this.inventory, inputs, outputs);
+		this.crafter = new RecipeCrafter(Reference.IMPLOSION_COMPRESSOR_RECIPE, this, 2, 2, this.inventory, inputs, outputs);
 	}
 
 	@Override

src/main/java/techreborn/tiles/multiblock/TileIndustrialBlastFurnace.java

@@ -74,7 +74,7 @@ public class TileIndustrialBlastFurnace extends TilePowerAcceptor implements ITo
 		this.inventory = new Inventory(5, "TileIndustrialBlastFurnace", 64, this);
 		final int[] inputs = new int[] { 0, 1 };
 		final int[] outputs = new int[] { 2, 3 };
-		this.crafter = new RecipeCrafter(Reference.blastFurnaceRecipe, this, 2, 2, this.inventory, inputs, outputs);
+		this.crafter = new RecipeCrafter(Reference.BLAST_FURNACE_RECIPE, this, 2, 2, this.inventory, inputs, outputs);
 	}
 	
 	public boolean getMutliBlock() {

src/main/java/techreborn/tiles/multiblock/TileIndustrialGrinder.java

@@ -79,7 +79,7 @@ public class TileIndustrialGrinder extends TilePowerAcceptor implements IToolDro
 		this.ticksSinceLastChange = 0;
 		final int[] inputs = new int[] { 0, 1 };
 		final int[] outputs = new int[] {2, 3, 4, 5};
-		this.crafter = new RecipeCrafter(Reference.industrialGrinderRecipe, this, 1, 4, this.inventory, inputs,
+		this.crafter = new RecipeCrafter(Reference.INDUSTRIAL_GRINDER_RECIPE, this, 1, 4, this.inventory, inputs,
 			outputs);
 	}
 

src/main/java/techreborn/tiles/multiblock/TileIndustrialSawmill.java

@@ -82,7 +82,7 @@ public class TileIndustrialSawmill extends TilePowerAcceptor implements IToolDro
 		this.ticksSinceLastChange = 0;
 		final int[] inputs = new int[] { 0, 1 };
 		final int[] outputs = new int[] { 2, 3, 4 };
-		this.crafter = new RecipeCrafter(Reference.industrialSawmillRecipe, this, 1, 3, this.inventory, inputs,
+		this.crafter = new RecipeCrafter(Reference.INDUSTRIAL_SAWMILL_RECIPE, this, 1, 3, this.inventory, inputs,
 				outputs);
 	}
 

src/main/java/techreborn/tiles/multiblock/TileVacuumFreezer.java

@@ -51,7 +51,7 @@ public class TileVacuumFreezer extends TilePowerAcceptor
 		super();
 		final int[] inputs = new int[] { 0 };
 		final int[] outputs = new int[] { 1 };
-		this.crafter = new RecipeCrafter(Reference.vacuumFreezerRecipe, this, 2, 1, this.inventory, inputs, outputs);
+		this.crafter = new RecipeCrafter(Reference.VACUUM_FREEZER_RECIPE, this, 2, 1, this.inventory, inputs, outputs);
 	}
 
 	@Override

src/main/java/techreborn/tiles/teir1/TileAlloySmelter.java

@@ -69,7 +69,7 @@ public class TileAlloySmelter extends TilePowerAcceptor
 		inputs[1] = 1;
 		final int[] outputs = new int[1];
 		outputs[0] = 2;
-		this.crafter = new RecipeCrafter(Reference.alloySmelterRecipe, this, 2, 1, this.inventory, inputs, outputs);
+		this.crafter = new RecipeCrafter(Reference.ALLOY_SMELTER_RECIPE, this, 2, 1, this.inventory, inputs, outputs);
 	}
 
 	@Override

src/main/java/techreborn/tiles/teir1/TileCompressor.java

@@ -51,7 +51,7 @@ public class TileCompressor extends TilePowerAcceptor implements IToolDrop, IInv
 		super();
 		final int[] inputs = new int[] { 0 };
 		final int[] outputs = new int[] { 1 };
-		this.crafter = new RecipeCrafter(Reference.compressorRecipe, this, 2, 1, this.inventory, inputs, outputs);
+		this.crafter = new RecipeCrafter(Reference.COMPRESSOR_RECIPE, this, 2, 1, this.inventory, inputs, outputs);
 
 	}
 

src/main/java/techreborn/tiles/teir1/TileExtractor.java

@@ -55,7 +55,7 @@ public class TileExtractor extends TilePowerAcceptor
 		inputs[0] = 0;
 		final int[] outputs = new int[1];
 		outputs[0] = 1;
-		this.crafter = new RecipeCrafter(Reference.extractorRecipe, this, 2, 1, this.inventory, inputs, outputs);
+		this.crafter = new RecipeCrafter(Reference.EXTRACTOR_RECIPE, this, 2, 1, this.inventory, inputs, outputs);
 	}
 
 	@Override

src/main/java/techreborn/tiles/teir1/TileGrinder.java

@@ -55,7 +55,7 @@ public class TileGrinder extends TilePowerAcceptor
 		inputs[0] = 0;
 		final int[] outputs = new int[1];
 		outputs[0] = 1;
-		this.crafter = new RecipeCrafter(Reference.grinderRecipe, this, 2, 1, this.inventory, inputs, outputs);
+		this.crafter = new RecipeCrafter(Reference.GRINDER_RECIPE, this, 2, 1, this.inventory, inputs, outputs);
 	}
 
 	@Override

src/main/resources/assets/techreborn/lang/en_us.lang

@@ -631,21 +631,6 @@ item.techreborn.uuMatter.name=UU-Matter
 item.techreborn.manual.name=Tech Manual
 item.techreborn.debug.name=Debug Tool
 
-#Recipe Handlers
-techreborn.recipe.alloysmelter=Alloy Furnace Recipe
-techreborn.recipe.ironalloysmelter=Iron Alloy Furnace Recipe
-techreborn.recipe.assemblingmachine=Assembling Machine Recipe
-techreborn.recipe.blastfurnace=Blast Furnace Recipe
-techreborn.recipe.centrifuge=Centrifuge Recipe
-techreborn.recipe.grinder=Industrial Grinder Recipe
-techreborn.recipe.industrialelectrolyzer=Industrial Electrolyzer Recipe
-techreborn.recipe.industrialsawmill=Industrial Sawmill Recipe
-techreborn.recipe.lathe=Lathe Recipe
-techreborn.recipe.platecuttingmachine=Plate Cutting Machine Recipe
-techreborn.recipe.chemicalReactor=Chemical Reactor Recipe
-techreborn.recipe.implosioncompressor=Implosion Compressor
-techreborn.recipe.distillationtower=Distillation Tower Recipe
-
 #Message
 techreborn.message.missingmultiblock=Incomplete Multiblock
 techreborn.message.setTo=Set to

src/main/resources/assets/techreborn/lang/fr_fr.lang

@@ -848,18 +848,7 @@ tr.configgui.category.tremc.tooltip=EMC
 tr.configgui.category.treinter.tooltip=Intégration de mod
 
 #Recipe Handlers
-techreborn.recipe.alloysmelter=Recette de four électrique d'alliage
 techreborn.recipe.ironalloysmelter=Recette de four en fer d'alliage
-techreborn.recipe.assemblingmachine=Recette d'assembleur
-techreborn.recipe.blastfurnace=Recette de haut fourneau ind.
-techreborn.recipe.centrifuge=Recette de centrifugeuse
-techreborn.recipe.grinder=Recette de broyeur ind.
-techreborn.recipe.industrialelectrolyzer=Recette d'électrolyseur ind.
-techreborn.recipe.industrialsawmill=Recette de scierie
-techreborn.recipe.lathe=Recette de tour ind.
-techreborn.recipe.platecuttingmachine=Recette de guillotine ind.
-techreborn.recipe.chemicalReactor=Recette de réacteur chimique
-techreborn.recipe.implosioncompressor=Recette de compresseur à implosion
 
 #Message
 techreborn.message.missingmultiblock=MULTIBLOC MANQUANT

src/main/resources/assets/techreborn/lang/pt_br.lang

@@ -631,21 +631,6 @@ item.techreborn.uuMatter.name=Matéria UU
 item.techreborn.manual.name=Manual Tech Reborn
 item.techreborn.debug.name=Ferramenta de Debug
 
-#Recipe Handlers
-techreborn.recipe.alloysmelter=Receita de Fundidora de Ligas
-techreborn.recipe.ironalloysmelter=Receita de Fundidora de Ligas de Ferro
-techreborn.recipe.assemblingmachine=Receita de Máquina de Montagem
-techreborn.recipe.blastfurnace=Receita de Fornalha Industrial
-techreborn.recipe.centrifuge=Receita de Centrífuga
-techreborn.recipe.grinder=Receita de Triturador Industrial
-techreborn.recipe.industrialelectrolyzer=Receita de Eletrolizador Industrial
-techreborn.recipe.industrialsawmill=Receita de Serraria Industrial
-techreborn.recipe.lathe=Receita de Torneador
-techreborn.recipe.platecuttingmachine=Receita de Máquina de Cortar Placas
-techreborn.recipe.chemicalReactor=Receita de Reator Químico
-techreborn.recipe.implosioncompressor=Receita de Compressor à Implosão
-techreborn.recipe.distillationtower=Receita de Torre de Destilação
-
 #Message
 techreborn.message.missingmultiblock=Estrutura Incompleta
 techreborn.message.setTo=Marcado em

src/main/resources/assets/techreborn/lang/ru_ru.lang

@@ -640,21 +640,6 @@ item.techreborn.uuMatter.name=Материя
 item.techreborn.manual.name=Техническое руководство
 item.techreborn.debug.name=Инструмент отладки
 
-#Recipe Handlers
-techreborn.recipe.alloysmelter=Рецепт электрической плавильной печи
-techreborn.recipe.ironalloysmelter=Рецепт железной плавильной печи
-techreborn.recipe.assemblingmachine=Рецепт сборочной машины
-techreborn.recipe.blastfurnace=Рецепт доменной печи
-techreborn.recipe.centrifuge=Рецепт центрифуги
-techreborn.recipe.grinder=Рецепт промышленной дробилки
-techreborn.recipe.industrialelectrolyzer=Рецепт промышленного электролизера
-techreborn.recipe.industrialsawmill=Рецепт промышленной лесопилки
-techreborn.recipe.lathe=Рецепт токарного станка
-techreborn.recipe.platecuttingmachine=Рецепт резака для резки пластин
-techreborn.recipe.chemicalReactor=Рецепт химического реактора
-techreborn.recipe.implosioncompressor=Рецепт компрессора внутреннего взрыва
-techreborn.recipe.distillationtower=Рецепт дистиляционной колонны
-
 #Message
 techreborn.message.missingmultiblock=Мультиблочная структура не закончена
 techreborn.message.setTo=Set to

src/main/resources/assets/techreborn/lang/zh_cn.lang

@@ -631,21 +631,6 @@ item.techreborn.uuMatter.name=UU-物质
 item.techreborn.manual.name=科技手册
 item.techreborn.debug.name=调试工具
 
-#Recipe Handlers
-techreborn.recipe.alloysmelter=合金炉
-techreborn.recipe.ironalloysmelter=铁质合金炉
-techreborn.recipe.assemblingmachine=装配机
-techreborn.recipe.blastfurnace=高炉
-techreborn.recipe.centrifuge=离心机
-techreborn.recipe.grinder=工业磨粉机
-techreborn.recipe.industrialelectrolyzer=工业电解器
-techreborn.recipe.industrialsawmill=工业锯木机
-techreborn.recipe.lathe=车床
-techreborn.recipe.platecuttingmachine=板材切割机
-techreborn.recipe.chemicalReactor=化学反应器
-techreborn.recipe.implosioncompressor=聚爆压缩机
-techreborn.recipe.distillationtower=蒸馏塔
-
 #Message
 techreborn.message.missingmultiblock=多方块结构缺失
 techreborn.message.setTo=设置为