Skip to content

Commit

Permalink
Use direct method (#660)
Browse files Browse the repository at this point in the history
Co-authored-by: Martin Robertz <dream-master@gmx.net>
  • Loading branch information
kuba6000 and Dream-Master committed Jul 5, 2023
1 parent 293cd5d commit 57cd054
Show file tree
Hide file tree
Showing 9 changed files with 67 additions and 47 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@
import java.util.Arrays;
import java.util.List;

import net.minecraft.item.crafting.FurnaceRecipes;
import net.minecraftforge.fluids.FluidRegistry;

import gregtech.api.enums.GT_Values;
import gregtech.api.util.GT_ModHandler;

public class ScriptBiomesOPlenty implements IScriptLoader {

Expand Down Expand Up @@ -159,9 +159,10 @@ public void loadRecipes() {
getModItem(GregTech.ID, "gt.metaitem.02", 1, 32417, missing),
getModItem(BiomesOPlenty.ID, "plants", 1, 7, missing));

GT_ModHandler.addSmeltingRecipe(
FurnaceRecipes.smelting().func_151394_a(
getModItem(BiomesOPlenty.ID, "driedDirt", 1, 0, missing),
getModItem(Minecraft.ID, "dirt", 1, 0, missing));
getModItem(Minecraft.ID, "dirt", 1, 0, missing),
0f);
Module_CustomFuels.registerCustomFuelValue(getModItem(BiomesOPlenty.ID, "bamboo", 1, 0, missing), (short) 100);
GT_Values.RA.stdBuilder().itemInputs(getModItem(Minecraft.ID, "packed_ice", 16, 0, missing))
.itemOutputs(getModItem(BiomesOPlenty.ID, "hardIce", 1, 0, missing)).noFluidInputs().noFluidOutputs()
Expand Down
7 changes: 4 additions & 3 deletions src/main/java/com/dreammaster/scripts/ScriptCoreMod.java
Original file line number Diff line number Diff line change
Expand Up @@ -42,14 +42,14 @@
import java.util.Arrays;
import java.util.List;

import net.minecraft.item.crafting.FurnaceRecipes;
import net.minecraftforge.fluids.FluidRegistry;

import cpw.mods.fml.common.registry.GameRegistry;
import forestry.api.recipes.RecipeManagers;
import gregtech.api.enums.GT_Values;
import gregtech.api.enums.Materials;
import gregtech.api.enums.OrePrefixes;
import gregtech.api.util.GT_ModHandler;
import gregtech.api.util.GT_OreDictUnificator;
import tconstruct.library.TConstructRegistry;
import tconstruct.library.crafting.Smeltery;
Expand Down Expand Up @@ -583,9 +583,10 @@ public void loadRecipes() {
"craftingToolWireCutter",
null);

GT_ModHandler.addSmeltingRecipe(
FurnaceRecipes.smelting().func_151394_a(
getModItem(NewHorizonsCoreMod.ID, "item.UnfiredCokeOvenBrick", 1, 0, missing),
getModItem(NewHorizonsCoreMod.ID, "item.CokeOvenBrick", 1, 0, missing));
getModItem(NewHorizonsCoreMod.ID, "item.CokeOvenBrick", 1, 0, missing),
0f);

Smeltery.addMelting(
getModItem(NewHorizonsCoreMod.ID, "item.ShapeBolt", 1, 0, missing),
Expand Down
12 changes: 7 additions & 5 deletions src/main/java/com/dreammaster/scripts/ScriptGendustry.java
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@
import java.util.Arrays;
import java.util.List;

import net.minecraft.item.crafting.FurnaceRecipes;
import net.minecraftforge.fluids.FluidRegistry;

import fox.spiteful.avaritia.crafting.ExtremeCraftingManager;
import gregtech.api.enums.GT_Values;
import gregtech.api.util.GT_ModHandler;

public class ScriptGendustry implements IScriptLoader {

Expand Down Expand Up @@ -256,12 +256,14 @@ public void loadRecipes() {
'm',
getModItem(Gendustry.ID, "Extractor", 1, 0, missing));

GT_ModHandler.addSmeltingRecipe(
FurnaceRecipes.smelting().func_151394_a(
getModItem(Gendustry.ID, "GeneSample", 1, 0, missing),
getModItem(Gendustry.ID, "GeneSampleBlank", 1, 0, missing));
GT_ModHandler.addSmeltingRecipe(
getModItem(Gendustry.ID, "GeneSampleBlank", 1, 0, missing),
0f);
FurnaceRecipes.smelting().func_151394_a(
getModItem(Gendustry.ID, "GeneTemplate", 1, 0, missing),
getModItem(Gendustry.ID, "GeneTemplate", 1, 0, missing));
getModItem(Gendustry.ID, "GeneTemplate", 1, 0, missing),
0f);
GT_Values.RA.stdBuilder()
.itemInputs(
getModItem(GregTech.ID, "gt.metaitem.01", 1, 17500, missing),
Expand Down
32 changes: 19 additions & 13 deletions src/main/java/com/dreammaster/scripts/ScriptGregtech.java
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,11 @@
import java.util.Arrays;
import java.util.List;

import net.minecraft.item.crafting.FurnaceRecipes;
import net.minecraftforge.fluids.FluidRegistry;

import fox.spiteful.avaritia.crafting.ExtremeCraftingManager;
import gregtech.api.enums.GT_Values;
import gregtech.api.util.GT_ModHandler;
import tconstruct.library.TConstructRegistry;

public class ScriptGregtech implements IScriptLoader {
Expand Down Expand Up @@ -1169,9 +1169,10 @@ public void loadRecipes() {
true,
100);

GT_ModHandler.addSmeltingRecipe(
FurnaceRecipes.smelting().func_151394_a(
getModItem(GregTech.ID, "gt.metaitem.01", 1, 2892, missing),
getModItem(GregTech.ID, "gt.metaitem.01", 1, 2893, missing));
getModItem(GregTech.ID, "gt.metaitem.01", 1, 2893, missing),
0f);
GT_Values.RA.stdBuilder()
.itemInputs(
getModItem(IndustrialCraft2.ID, "blockElectric", 1, 3, missing),
Expand Down Expand Up @@ -1589,20 +1590,25 @@ public void loadRecipes() {
GT_Values.RA.stdBuilder().itemInputs(getModItem(GregTech.ID, "gt.blockores", 1, 937, missing))
.itemOutputs(getModItem(GregTech.ID, "gt.metaitem.01", 4, 5937, missing)).outputChances(10000)
.noFluidInputs().noFluidOutputs().duration(300).eut(2).addTo(sMaceratorRecipes);
GT_ModHandler.addSmeltingRecipe(
FurnaceRecipes.smelting().func_151394_a(
getModItem(GregTech.ID, "gt.blockores", 1, 870, missing),
getModItem(Minecraft.ID, "iron_ingot", 1, 0, missing));
GT_ModHandler.addSmeltingRecipe(
getModItem(Minecraft.ID, "iron_ingot", 1, 0, missing),
0f);
FurnaceRecipes.smelting().func_151394_a(
getModItem(GregTech.ID, "gt.blockores", 1, 1870, missing),
getModItem(Minecraft.ID, "iron_ingot", 1, 0, missing));
GT_ModHandler.addSmeltingRecipe(
getModItem(Minecraft.ID, "iron_ingot", 1, 0, missing),
0f);
FurnaceRecipes.smelting().func_151394_a(
getModItem(GregTech.ID, "gt.blockores", 1, 2870, missing),
getModItem(Minecraft.ID, "iron_ingot", 1, 0, missing));
GT_ModHandler.addSmeltingRecipe(
getModItem(Minecraft.ID, "iron_ingot", 1, 0, missing),
0f);
FurnaceRecipes.smelting().func_151394_a(
getModItem(GregTech.ID, "gt.blockores", 1, 3870, missing),
getModItem(Minecraft.ID, "iron_ingot", 1, 0, missing));
GT_ModHandler.addSmeltingRecipe(
getModItem(Minecraft.ID, "iron_ingot", 1, 0, missing),
0f);
FurnaceRecipes.smelting().func_151394_a(
getModItem(GregTech.ID, "gt.blockores", 1, 4870, missing),
getModItem(Minecraft.ID, "iron_ingot", 1, 0, missing));
getModItem(Minecraft.ID, "iron_ingot", 1, 0, missing),
0f);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@
import java.util.Arrays;
import java.util.List;

import net.minecraft.item.crafting.FurnaceRecipes;
import net.minecraftforge.fluids.FluidRegistry;

import gregtech.api.enums.GT_Values;
import gregtech.api.enums.Materials;
import gregtech.api.enums.OrePrefixes;
import gregtech.api.enums.TierEU;
import gregtech.api.util.GT_ModHandler;
import gregtech.api.util.GT_OreDictUnificator;

public class ScriptHardcoreEnderExpansion implements IScriptLoader {
Expand Down Expand Up @@ -439,9 +439,10 @@ public void loadRecipes() {
getModItem(HardcoreEnderExpansion.ID, "arcane_shard", 1, 0, missing),
null);

GT_ModHandler.addSmeltingRecipe(
FurnaceRecipes.smelting().func_151394_a(
getModItem(HardcoreEnderExpansion.ID, "sphalerite", 1, 0, missing),
getModItem(GregTech.ID, "gt.metaitem.01", 1, 11036, missing));
getModItem(GregTech.ID, "gt.metaitem.01", 1, 11036, missing),
0f);
GT_Values.RA.stdBuilder().itemInputs(getModItem(HardcoreEnderExpansion.ID, "endium_ingot", 9, 0, missing))
.itemOutputs(getModItem(HardcoreEnderExpansion.ID, "endium_block", 1, 0, missing)).noFluidInputs()
.noFluidOutputs().duration(300).eut(2).addTo(sCompressorRecipes);
Expand Down
17 changes: 10 additions & 7 deletions src/main/java/com/dreammaster/scripts/ScriptHarvestcraft.java
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@
import java.util.Arrays;
import java.util.List;

import net.minecraft.item.crafting.FurnaceRecipes;
import net.minecraftforge.oredict.OreDictionary;

import gregtech.api.enums.GT_Values;
import gregtech.api.enums.Mods;
import gregtech.api.util.GT_ModHandler;

public class ScriptHarvestcraft implements IScriptLoader {

Expand Down Expand Up @@ -965,15 +965,18 @@ public void loadRecipes() {
.itemOutputs(getModItem(PamsHarvestCraft.ID, "pistachiobutterItem", 1, 0, missing)).noFluidInputs()
.noFluidOutputs().duration(300).eut(2).addTo(sExtractorRecipes);

GT_ModHandler.addSmeltingRecipe(
FurnaceRecipes.smelting().func_151394_a(
getModItem(PamsHarvestCraft.ID, "venisonrawItem", 1, 0, missing),
getModItem(PamsHarvestCraft.ID, "venisoncookedItem", 1, 0, missing));
GT_ModHandler.addSmeltingRecipe(
getModItem(PamsHarvestCraft.ID, "venisoncookedItem", 1, 0, missing),
0f);
FurnaceRecipes.smelting().func_151394_a(
getModItem(PamsHarvestCraft.ID, "turkeyrawItem", 1, 0, missing),
getModItem(PamsHarvestCraft.ID, "turkeycookedItem", 1, 0, missing));
GT_ModHandler.addSmeltingRecipe(
getModItem(PamsHarvestCraft.ID, "turkeycookedItem", 1, 0, missing),
0f);
FurnaceRecipes.smelting().func_151394_a(
getModItem(PamsHarvestCraft.ID, "rabbitrawItem", 1, 0, missing),
getModItem(PamsHarvestCraft.ID, "rabbitcookedItem", 1, 0, missing));
getModItem(PamsHarvestCraft.ID, "rabbitcookedItem", 1, 0, missing),
0f);
GT_Values.RA.stdBuilder().itemInputs(getModItem(NewHorizonsCoreMod.ID, "item.WetTofu", 1, 0, missing))
.itemOutputs(
getModItem(PamsHarvestCraft.ID, "silkentofuItem", 1, 0, missing),
Expand Down
13 changes: 8 additions & 5 deletions src/main/java/com/dreammaster/scripts/ScriptMinecraft.java
Original file line number Diff line number Diff line change
Expand Up @@ -45,14 +45,15 @@
import java.util.Arrays;
import java.util.List;

import net.minecraft.item.crafting.FurnaceRecipes;

import com.dreammaster.gthandler.CustomItemList;

import gregtech.api.enums.GT_Values;
import gregtech.api.enums.ItemList;
import gregtech.api.enums.Materials;
import gregtech.api.enums.OrePrefixes;
import gregtech.api.enums.TierEU;
import gregtech.api.util.GT_ModHandler;
import gregtech.api.util.GT_OreDictUnificator;
import gregtech.api.util.GT_Utility;

Expand Down Expand Up @@ -97,12 +98,14 @@ public List<String> getDependencies() {
public void loadRecipes() {
craftingRecipes();

GT_ModHandler.addSmeltingRecipe(
FurnaceRecipes.smelting().func_151394_a(
CustomItemList.UnfiredClayBrick.get(1L),
getModItem(Minecraft.ID, "brick", 1, 0, missing));
GT_ModHandler.addSmeltingRecipe(
getModItem(Minecraft.ID, "brick", 1, 0, missing),
0f);
FurnaceRecipes.smelting().func_151394_a(
getModItem(GregTech.ID, "gt.metaitem.02", 1, 32561, missing),
getModItem(Minecraft.ID, "bread", 1, 0, missing));
getModItem(Minecraft.ID, "bread", 1, 0, missing),
0f);
GT_Values.RA.stdBuilder().itemInputs(getModItem(Thaumcraft.ID, "blockCustomPlant", 1, 3, missing))
.itemOutputs(getModItem(Minecraft.ID, "blaze_powder", 1, 0, missing)).noFluidInputs().noFluidOutputs()
.duration(15 * SECONDS).eut(2).addTo(sExtractorRecipes);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@
import java.util.List;

import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.FurnaceRecipes;
import net.minecraftforge.fluids.FluidRegistry;

import com.dreammaster.thaumcraft.TCHelper;

import gregtech.api.enums.GT_Values;
import gregtech.api.enums.Materials;
import gregtech.api.enums.OrePrefixes;
import gregtech.api.util.GT_ModHandler;
import gregtech.api.util.GT_OreDictUnificator;
import thaumcraft.api.ThaumcraftApi;
import thaumcraft.api.aspects.Aspect;
Expand Down Expand Up @@ -69,9 +69,10 @@ public void loadRecipes() {
"craftingToolSaw",
getModItem(ThaumicTinkerer.ID, "darkQuartz", 1, 0, missing));

GT_ModHandler.addSmeltingRecipe(
FurnaceRecipes.smelting().func_151394_a(
getModItem(GregTech.ID, "gt.blockmetal8", 1, 13, missing),
getModItem(GregTech.ID, "gt.metaitem.01", 2, 11978, missing));
getModItem(GregTech.ID, "gt.metaitem.01", 2, 11978, missing),
0f);

GT_Values.RA.stdBuilder().itemInputs(getModItem(ThaumicTinkerer.ID, "darkQuartzItem", 4, 0, missing))
.itemOutputs(getModItem(ThaumicTinkerer.ID, "darkQuartz", 1, 0, missing)).noFluidInputs()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
import java.util.Arrays;
import java.util.List;

import net.minecraft.item.crafting.FurnaceRecipes;
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.oredict.OreDictionary;

Expand All @@ -36,7 +37,6 @@

import cpw.mods.fml.common.registry.GameRegistry;
import gregtech.api.enums.GT_Values;
import gregtech.api.util.GT_ModHandler;
import tconstruct.library.TConstructRegistry;
import tconstruct.library.crafting.DryingRackRecipes;
import tconstruct.library.crafting.Smeltery;
Expand Down Expand Up @@ -3420,12 +3420,14 @@ public void loadRecipes() {
12000,
getModItem(TinkerConstruct.ID, "jerky", 1, 3, missing));

GT_ModHandler.addSmeltingRecipe(
FurnaceRecipes.smelting().func_151394_a(
getModItem(NewHorizonsCoreMod.ID, "item.UnfiredSearedBrick", 1, 0, missing),
getModItem(TinkerConstruct.ID, "materials", 1, 2, missing));
GT_ModHandler.addSmeltingRecipe(
getModItem(TinkerConstruct.ID, "materials", 1, 2, missing),
0f);
FurnaceRecipes.smelting().func_151394_a(
getModItem(NewHorizonsCoreMod.ID, "item.UnfiredSlimeSoulBrick", 1, 0, missing),
getModItem(TinkerConstruct.ID, "materials", 1, 37, missing));
getModItem(TinkerConstruct.ID, "materials", 1, 37, missing),
0f);
GT_Values.RA.stdBuilder()
.itemInputs(
getModItem(TinkerConstruct.ID, "CraftedSoil", 2, 0, missing),
Expand Down

0 comments on commit 57cd054

Please sign in to comment.