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

Fix Lens decomposition recipes #2358

Merged
merged 1 commit into from
Nov 15, 2024
Merged

Fix Lens decomposition recipes #2358

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
2 changes: 1 addition & 1 deletion src/generated/resources/assets/gtceu/lang/en_ud.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5999,4 +5999,4 @@
"tile.gtceu.reinforced_foam.name": "ɯɐoℲ pǝɔɹoɟuıǝᴚ",
"tile.gtceu.reinforced_stone.name": "ǝuoʇS pǝɔɹoɟuıǝᴚ",
"tile.gtceu.seal.name": "ʞɔoןᗺ pǝןɐǝS"
}
}
2 changes: 1 addition & 1 deletion src/generated/resources/assets/gtceu/lang/en_us.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5999,4 +5999,4 @@
"tile.gtceu.reinforced_foam.name": "Reinforced Foam",
"tile.gtceu.reinforced_stone.name": "Reinforced Stone",
"tile.gtceu.seal.name": "Sealed Block"
}
}
2 changes: 1 addition & 1 deletion src/main/java/com/gregtechceu/gtceu/data/recipe/misc/MiscRecipeLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,7 +386,7 @@ public static void init(Consumer<FinishedRecipe> provider) {
.outputFluids(Glass.getFluid(108))
.save(provider);

MACERATOR_RECIPES.recipeBuilder("macerate_" + item.get()).duration(15)
MACERATOR_RECIPES.recipeBuilder("macerate_" + item.get()).EUt(VA[LV]).duration(15)
.inputItems(item)
.outputItems(dustSmall, Glass, 3)
.save(provider);
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/gregtechceu/gtceu/data/tags/ItemTagLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ public static void init(RegistrateTagsProvider<Item> provider) {
Items.LIGHT_GRAY_CONCRETE_POWDER, Items.CYAN_CONCRETE_POWDER, Items.PURPLE_CONCRETE_POWDER,
Items.BLUE_CONCRETE_POWDER, Items.BROWN_CONCRETE_POWDER, Items.GREEN_CONCRETE_POWDER,
Items.RED_CONCRETE_POWDER, Items.BLACK_CONCRETE_POWDER);
create(provider, lens, Color.White, GTItems.MATERIAL_ITEMS.get(lens, Glass).get(),
GTItems.MATERIAL_ITEMS.get(lens, NetherStar).get());
create(provider, lens, Color.White, GTItems.MATERIAL_ITEMS.get(lens, Glass).get());
create(provider, lens, Color.White, GTItems.MATERIAL_ITEMS.get(lens, NetherStar).get());
create(provider, lens, Color.LightBlue, GTItems.MATERIAL_ITEMS.get(lens, Diamond).get());
create(provider, lens, Color.Red, GTItems.MATERIAL_ITEMS.get(lens, Ruby).get());
create(provider, lens, Color.Green, GTItems.MATERIAL_ITEMS.get(lens, Emerald).get());
Expand Down
15 changes: 0 additions & 15 deletions src/main/java/com/gregtechceu/gtceu/data/tags/TagsHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,15 @@
package com.gregtechceu.gtceu.data.tags;

import com.gregtechceu.gtceu.api.data.chemical.material.MarkerMaterials.Color;
import com.gregtechceu.gtceu.common.data.GTItems;

import net.minecraft.world.entity.EntityType;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.Items;
import net.minecraft.world.level.ItemLike;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.material.Fluid;

import com.tterrag.registrate.providers.RegistrateTagsProvider;

import java.util.function.Supplier;

import static com.gregtechceu.gtceu.api.data.chemical.ChemicalHelper.registerUnificationItems;
import static com.gregtechceu.gtceu.api.data.tag.TagPrefix.*;
import static com.gregtechceu.gtceu.common.data.GTMaterials.*;
Expand Down Expand Up @@ -44,17 +40,6 @@ public static void initEntity(RegistrateTagsProvider<EntityType<?>> provider) {
public static void initExtraUnificationEntries() {
registerUnificationItems(ingot, Clay, Items.CLAY_BALL);

registerUnificationItems(lens, Color.White, new Supplier[] { GTItems.MATERIAL_ITEMS.get(lens, Glass),
GTItems.MATERIAL_ITEMS.get(lens, NetherStar) });
registerUnificationItems(lens, Color.LightBlue,
(Supplier<? extends ItemLike>) GTItems.MATERIAL_ITEMS.get(lens, Diamond));
registerUnificationItems(lens, Color.Red,
(Supplier<? extends ItemLike>) GTItems.MATERIAL_ITEMS.get(lens, Ruby));
registerUnificationItems(lens, Color.Green,
(Supplier<? extends ItemLike>) GTItems.MATERIAL_ITEMS.get(lens, Emerald));
registerUnificationItems(lens, Color.Blue,
(Supplier<? extends ItemLike>) GTItems.MATERIAL_ITEMS.get(lens, Sapphire));

registerUnificationItems(dye, Color.Black, Items.BLACK_DYE);
registerUnificationItems(dye, Color.Red, Items.RED_DYE);
registerUnificationItems(dye, Color.Green, Items.GREEN_DYE);
Expand Down
Loading