Skip to content

Commit

Permalink
brick related recipe changes
Browse files Browse the repository at this point in the history
  • Loading branch information
TechLord22 committed Sep 7, 2021
1 parent c8fa004 commit e732cce
Show file tree
Hide file tree
Showing 11 changed files with 35 additions and 6 deletions.
10 changes: 7 additions & 3 deletions src/main/java/gregtech/common/items/MetaItem1.java
Original file line number Diff line number Diff line change
Expand Up @@ -334,9 +334,13 @@ public void registerSubItems() {
WOODEN_FORM_EMPTY = addItem(347, "wooden_form.empty");
WOODEN_FORM_BRICK = addItem(348, "wooden_form.brick").addComponents(selfContainerItemProvider);
COMPRESSED_CLAY = addItem(349, "compressed.clay");
COMPRESSED_FIRECLAY = addItem(350, "compressed.fireclay");
FIRECLAY_BRICK = addItem(351, "brick.fireclay");
COKE_OVEN_BRICK = addItem(352, "brick.coke");
COMPRESSED_COKE_CLAY = addItem(350, "compressed.coke_clay");
COMPRESSED_FIRECLAY = addItem(351, "compressed.fireclay");
FIRECLAY_BRICK = addItem(352, "brick.fireclay");
COKE_OVEN_BRICK = addItem(353, "brick.coke");

if (!ConfigHolder.vanillaRecipes.hardMiscRecipes)
COMPRESSED_CLAY.setInvisible();

// Boules: ID 361-370
SILICON_BOULE = addItem(361, "boule.silicon");
Expand Down
1 change: 1 addition & 0 deletions src/main/java/gregtech/common/items/MetaItems.java
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ private MetaItems() {
public static MetaItem<?>.MetaValueItem COIN_CHOCOLATE;

public static MetaItem<?>.MetaValueItem COMPRESSED_CLAY;
public static MetaItem<?>.MetaValueItem COMPRESSED_COKE_CLAY;
public static MetaItem<?>.MetaValueItem COMPRESSED_FIRECLAY;
public static MetaItem<?>.MetaValueItem FIRECLAY_BRICK;
public static MetaItem<?>.MetaValueItem COKE_OVEN_BRICK;
Expand Down
11 changes: 9 additions & 2 deletions src/main/java/gregtech/loaders/recipe/CraftingRecipeLoader.java
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import gregtech.api.unification.ore.OrePrefix;
import gregtech.api.unification.stack.UnificationEntry;
import gregtech.api.util.GTLog;
import gregtech.common.ConfigHolder;
import gregtech.common.blocks.BlockTransparentCasing;
import gregtech.common.blocks.MetaBlocks;
import gregtech.common.blocks.wood.BlockGregLog.LogVariant;
Expand Down Expand Up @@ -56,9 +57,15 @@ private static void loadCraftingRecipes() {

ModHandler.addShapedRecipe("plank_to_wooden_shape", MetaItems.WOODEN_FORM_EMPTY.getStackForm(), " ", " X ", "s ", 'X', new UnificationEntry(OrePrefix.plank, Materials.Wood));
ModHandler.addShapedRecipe("wooden_shape_brick", MetaItems.WOODEN_FORM_BRICK.getStackForm(), "k ", " X", 'X', MetaItems.WOODEN_FORM_EMPTY.getStackForm());
ModHandler.addShapedRecipe("compressed_clay", MetaItems.COMPRESSED_CLAY.getStackForm(8), "XXX", "XYX", "XXX", 'Y', MetaItems.WOODEN_FORM_BRICK.getStackForm(), 'X', Items.CLAY_BALL);

if (ConfigHolder.vanillaRecipes.hardMiscRecipes) {
ModHandler.addShapelessRecipe("compressed_clay", MetaItems.COMPRESSED_CLAY.getStackForm(), MetaItems.WOODEN_FORM_BRICK.getStackForm(), new ItemStack(Items.CLAY_BALL));
ModHandler.addSmeltingRecipe(MetaItems.COMPRESSED_CLAY.getStackForm(), new ItemStack(Items.BRICK));
}

ModHandler.addShapedRecipe("compressed_coke_clay", MetaItems.COMPRESSED_COKE_CLAY.getStackForm(3), "XXX", "SYS", "SSS", 'Y', MetaItems.WOODEN_FORM_BRICK.getStackForm(), 'X', new ItemStack(Items.CLAY_BALL), 'S', "sand");
ModHandler.addShapelessRecipe("fireclay_dust", OreDictUnifier.get(OrePrefix.dust, Materials.Fireclay, 2), new UnificationEntry(OrePrefix.dust, Materials.Brick), new UnificationEntry(OrePrefix.dust, Materials.Clay));
ModHandler.addSmeltingRecipe(MetaItems.COMPRESSED_CLAY.getStackForm(), MetaItems.COKE_OVEN_BRICK.getStackForm());
ModHandler.addSmeltingRecipe(MetaItems.COMPRESSED_COKE_CLAY.getStackForm(), MetaItems.COKE_OVEN_BRICK.getStackForm());
ModHandler.addSmeltingRecipe(MetaItems.COMPRESSED_FIRECLAY.getStackForm(), MetaItems.FIRECLAY_BRICK.getStackForm());

ModHandler.addSmeltingRecipe(new UnificationEntry(OrePrefix.nugget, Materials.Iron), OreDictUnifier.get(OrePrefix.nugget, Materials.WroughtIron));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -584,6 +584,7 @@ private static void metalRecipes() {
* - Removes Vanilla Golden Carrot Recipe
* - Removes Vanilla Magma Cream Recipe
* - Removes Vanilla Polished Stone Variant Recipes
* - Removes Vanilla Brick Smelting Recipe
*/
private static void miscRecipes() {
ModHandler.removeRecipeByName(new ResourceLocation("minecraft:tnt"));
Expand Down Expand Up @@ -689,6 +690,9 @@ private static void miscRecipes() {
ModHandler.removeRecipeByName(new ResourceLocation("minecraft:polished_granite"));
ModHandler.removeRecipeByName(new ResourceLocation("minecraft:polished_diorite"));
ModHandler.removeRecipeByName(new ResourceLocation("minecraft:polished_andesite"));

//todo this doesn't work
ModHandler.removeFurnaceSmelting(new ItemStack(Items.CLAY_BALL));
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -813,6 +813,12 @@ private static void miscRecipes() {
.outputs(new ItemStack(Items.NETHERBRICK))
.duration(200).EUt(2).buildAndRegister();

ALLOY_SMELTER_RECIPES.recipeBuilder()
.inputs(new ItemStack(Items.CLAY_BALL))
.notConsumable(MetaItems.SHAPE_MOLD_INGOT)
.outputs(new ItemStack(Items.BRICK))
.duration(200).EUt(2).buildAndRegister();

ASSEMBLER_RECIPES.recipeBuilder()
.inputs(new ItemStack(Items.STRING, 4, GTValues.W))
.inputs(new ItemStack(Items.SLIME_BALL, 1, GTValues.W))
Expand Down
3 changes: 2 additions & 1 deletion src/main/resources/assets/gregtech/lang/en_us.lang
Original file line number Diff line number Diff line change
Expand Up @@ -791,8 +791,9 @@ metaitem.tool_parts_box.tooltip=Contains some tool parts/nRight click to open
metaitem.foam_sprayer.name=Foam Sprayer
metaitem.foam_sprayer.tooltip=Sprays Construction Foam/nUse on a frame to foam connected frames/nUse iron metal to create reinforced stone/nFoam can be colored
metaitem.energium_dust.name=Energium Dust
metaitem.compressed.fireclay.name=Compressed Fireclay
metaitem.compressed.clay.name=Compressed Clay
metaitem.compressed.fireclay.name=Compressed Fireclay
metaitem.compressed.coke_clay.name=Compressed Coke Clay
metaitem.brick.fireclay.name=Firebrick
metaitem.brick.fireclay.tooltip=Heat resistant
metaitem.brick.coke.name=Coke Oven Brick
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "gregtech:items/metaitems/compressed.coke_clay"
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit e732cce

Please sign in to comment.