Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Buff Thaumium Reinforced Jar recipe #3125

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open

Buff Thaumium Reinforced Jar recipe #3125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
387b639
buff thaumium reinforced jar recipe
Gofer2x Sep 6, 2024
19d0213
Merge branch 'GTNewHorizons:master' into master
Gofer2x Sep 6, 2024
76dbb8d
Merge branch 'GTNewHorizons:master' into master
Gofer2x Sep 7, 2024
2ce6976
Merge branch 'GTNewHorizons:master' into master
Gofer2x Sep 8, 2024
c554fa8
Merge branch 'GTNewHorizons:master' into master
Gofer2x Sep 8, 2024
2403e70
fix " ' difference
Gofer2x Sep 8, 2024
bed2bdd
Merge branch 'master' into master
Gofer2x Sep 8, 2024
eb02134
Merge branch 'master' into master
Ethryan Sep 20, 2024
20c6a5e
Merge branch 'master' into master
Dream-Master Sep 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 20 additions & 27 deletions src/main/java/kekztech/common/Recipes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
package kekztech.common;

import static gregtech.api.enums.Mods.ThaumicTinkerer;
import static gregtech.api.enums.Mods.*;
import static gregtech.api.util.GTModHandler.getModItem;
import static thaumcraft.api.ThaumcraftApi.addArcaneCraftingRecipe;

import java.util.HashMap;

import net.minecraft.item.ItemStack;

import cpw.mods.fml.common.registry.GameRegistry;
import gregtech.api.enums.Materials;
import gregtech.api.enums.Mods;
import gregtech.api.enums.OrePrefixes;
import gregtech.api.util.GTModHandler;
import gregtech.api.util.GTOreDictUnificator;
import kekztech.KekzCore;
import kekztech.common.recipeLoaders.AlloySmelter;
Expand All @@ -27,10 +27,12 @@
import thaumcraft.api.aspects.Aspect;
import thaumcraft.api.aspects.AspectList;
import thaumcraft.api.crafting.InfusionRecipe;
import thaumcraft.api.crafting.ShapedArcaneRecipe;

public class Recipes {

public static final HashMap<String, InfusionRecipe> infusionRecipes = new HashMap<>();
public static final HashMap<String, ShapedArcaneRecipe> shapedArcaneRecipes = new HashMap<>();

public static void postInit() {
KekzCore.LOGGER.info("Registering recipes...");
Expand All @@ -55,32 +57,23 @@ public static void postInit() {
private static void registerRecipes_Jars() {

// Thaumium Reinforced Jar
final ItemStack[] recipe_jarthaumiumreinforced = {
GameRegistry.makeItemStack("Thaumcraft:ItemResource", 15, 1, null),
GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.Thaumium, 1),
new ItemStack(net.minecraft.init.Blocks.glass_pane),
GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.Thaumium, 1),
new ItemStack(net.minecraft.init.Blocks.glass_pane),
GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Titanium, 1),
GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.Thaumium, 1),
new ItemStack(net.minecraft.init.Blocks.glass_pane),
GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.Thaumium, 1),
new ItemStack(net.minecraft.init.Blocks.glass_pane), };
final AspectList aspects_jarthaumiumreinforced = new AspectList().add(Aspect.ARMOR, 64)
.add(Aspect.ORDER, 32)
.add(Aspect.WATER, 32)
.add(Aspect.GREED, 16)
.add(Aspect.VOID, 16)
.add(Aspect.AIR, 8);
infusionRecipes.put(
shapedArcaneRecipes.put(
"THAUMIUMREINFORCEDJAR",
ThaumcraftApi.addInfusionCraftingRecipe(
addArcaneCraftingRecipe(
"THAUMIUMREINFORCEDJAR",
new ItemStack(Blocks.jarThaumiumReinforced, 1, 0),
5,
aspects_jarthaumiumreinforced,
ItemApi.getBlock("blockJar", 0),
recipe_jarthaumiumreinforced));
new AspectList().add(Aspect.WATER, 30),
"MTM",
"TJT",
"GGG",
'M',
getModItem(Botania.ID, "manaGlass", 1, 0),
'T',
GTOreDictUnificator.get(OrePrefixes.block, Materials.Thaumium, 1L),
'J',
getModItem(Thaumcraft.ID, "blockJar", 1, 0),
'G',
getModItem(Minecraft.ID, "glass", 1, 0)));
// Thaumium Reinforced Void Jar
final ItemStack[] recipe_voidjarupgrade = {
GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.Obsidian, 1),
Expand All @@ -100,7 +93,7 @@ private static void registerRecipes_Jars() {
new ItemStack(Blocks.jarThaumiumReinforced, 1, 0),
recipe_voidjarupgrade));

final ItemStack[] recipe_jarichor = { GTModHandler.getModItem(ThaumicTinkerer.ID, "kamiResource", 1, 0),
final ItemStack[] recipe_jarichor = { getModItem(ThaumicTinkerer.ID, "kamiResource", 1, 0),
GTOreDictUnificator.get(OrePrefixes.plate, Materials.Diamond, 1),
new ItemStack(net.minecraft.init.Blocks.glass_pane),
GTOreDictUnificator.get(OrePrefixes.foil, Materials.Osmiridium, 1),
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/kekztech/common/Researches.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public static void postInit() {
new ItemStack(Blocks.jarThaumiumReinforced, 1))
.setPages(
new ResearchPage("kekztech.research_page.THAUMIUMREINFORCEDJAR.0"),
new ResearchPage(Recipes.infusionRecipes.get("THAUMIUMREINFORCEDJAR")),
new ResearchPage(Recipes.shapedArcaneRecipes.get("THAUMIUMREINFORCEDJAR")),
new ResearchPage(Recipes.infusionRecipes.get("THAUMIUMREINFORCEDVOIDJAR")),
new ResearchPage("kekztech.research_page.THAUMIUMREINFORCEDJAR.1"))
.setConcealed()
Expand Down
Loading