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

Fix various Stone Type Entry Material issues #2680

Merged
merged 1 commit into from
Jan 4, 2025
Merged

Fix various Stone Type Entry Material issues #2680

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 8 additions & 0 deletions src/main/java/com/gregtechceu/gtceu/data/recipe/configurable/RecipeAddition.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1252,6 +1252,14 @@ private static void hardGlassRecipes(Consumer<FinishedRecipe> provider) {
VanillaRecipeHelper.addShapedRecipe(provider, "glass_pane", new ItemStack(Blocks.GLASS_PANE, 2), "sG", 'G',
new ItemStack(Blocks.GLASS));

for (DyeColor color : DyeColor.values()) {
String dyeName = color.getName();
VanillaRecipeHelper.addShapedRecipe(provider, dyeName + "_glass_pane",
new ItemStack(BuiltInRegistries.ITEM.get(new ResourceLocation(dyeName + "_stained_glass_pane")), 2),
"sG",
'G', BuiltInRegistries.ITEM.get(new ResourceLocation(dyeName + "_stained_glass")));
}

ALLOY_SMELTER_RECIPES.recipeBuilder("tinted_glass")
.inputItems(new ItemStack(Blocks.GLASS))
.inputItems(new ItemStack(Items.AMETHYST_SHARD, 4))
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/com/gregtechceu/gtceu/data/recipe/misc/StoneMachineRecipes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ private static List<StoneTypeEntry> getDefaultEntries() {
.slab(Items.BRICK_SLAB)
.stair(Items.BRICK_STAIRS)
.wall(Items.BRICK_WALL)
.material(GTMaterials.Brick)
.material(GTMaterials.Brick, 4 * GTValues.M)
.registerAllUnificationInfo()
.build(),
new StoneTypeEntry.Builder(mcModID, "mud_brick")
Expand All @@ -238,7 +238,7 @@ private static List<StoneTypeEntry> getDefaultEntries() {
.slab(Items.NETHER_BRICK_SLAB)
.stair(Items.NETHER_BRICK_STAIRS)
.wall(Items.NETHER_BRICK_WALL)
.material(GTMaterials.Netherrack)
.material(GTMaterials.Netherrack, 4 * GTValues.M)
.registerAllUnificationInfo()
.build(),
new StoneTypeEntry.Builder(mcModID, "red_nether_brick")
Expand All @@ -255,14 +255,14 @@ private static List<StoneTypeEntry> getDefaultEntries() {
.chiselStone(Items.CHISELED_QUARTZ_BLOCK)
.slab(Items.QUARTZ_SLAB)
.stair(Items.QUARTZ_STAIRS)
.material(GTMaterials.NetherQuartz)
.material(GTMaterials.NetherQuartz, 4 * GTValues.M)
.registerAllUnificationInfo()
.build(),
new StoneTypeEntry.Builder(mcModID, "smooth_quartz")
.stone(Items.SMOOTH_QUARTZ)
.slab(Items.SMOOTH_QUARTZ_SLAB)
.stair(Items.SMOOTH_QUARTZ_STAIRS)
.material(GTMaterials.NetherQuartz)
.material(GTMaterials.NetherQuartz, 4 * GTValues.M)
.registerAllUnificationInfo()
.build(),
new StoneTypeEntry.Builder(mcModID, "cut_copper")
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/com/gregtechceu/gtceu/data/recipe/misc/VanillaStandardRecipes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,12 @@ private static void compressingRecipes(Consumer<FinishedRecipe> provider) {
.save(provider);

COMPRESSOR_RECIPES.recipeBuilder("sandstone").duration(300).EUt(2)
.inputItems(new ItemStack(Blocks.SAND, 2))
.inputItems(new ItemStack(Blocks.SAND, 4))
.outputItems(new ItemStack(Blocks.SANDSTONE))
.save(provider);

COMPRESSOR_RECIPES.recipeBuilder("red_sandstone").duration(300).EUt(2)
.inputItems(new ItemStack(Blocks.RED_SAND), 2)
.inputItems(new ItemStack(Blocks.RED_SAND), 4)
.outputItems(new ItemStack(Blocks.RED_SANDSTONE))
.save(provider);

Expand Down Expand Up @@ -587,8 +587,8 @@ private static void dyingCleaningRecipes(Consumer<FinishedRecipe> provider) {
.save(provider);

CUTTER_RECIPES.recipeBuilder("cut_" + dyeName + "_glass_to_pane").duration(20).EUt(VA[ULV])
.inputItems(BuiltInRegistries.ITEM.get(new ResourceLocation(dyeName + "_stained_glass")))
.outputItems(BuiltInRegistries.ITEM.get(new ResourceLocation(dyeName + "_stained_glass_pane")))
.inputItems(BuiltInRegistries.ITEM.get(new ResourceLocation(dyeName + "_stained_glass")), 3)
.outputItems(BuiltInRegistries.ITEM.get(new ResourceLocation(dyeName + "_stained_glass_pane")), 8)
.save(provider);

CHEMICAL_BATH_RECIPES.recipeBuilder("dye_candle_to_" + dyeName).duration(20).EUt(VA[ULV])
Expand Down
Loading