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

Nerf glass loop #1113

Merged
merged 5 commits into from
Dec 22, 2024
+9 −13
Merged

Nerf glass loop #1113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
05edff8
remove clear glass ebfing
GDCloudstrike Dec 22, 2024
9d2038d
add fluid extraction
GDCloudstrike Dec 22, 2024
e4e0492
wrong duration
GDCloudstrike Dec 22, 2024
5c3e840
spotless
GDCloudstrike Dec 22, 2024
2f7844e
Spotless apply for branch nerf_glass_loop for #1113 (#1114)
github-actions[bot] Dec 22, 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
9 changes: 9 additions & 0 deletions src/main/java/com/dreammaster/gthandler/recipes/FluidExtractorRecipes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
import gregtech.api.enums.ItemList;
import gregtech.api.enums.Materials;
import gregtech.api.enums.TierEU;
import gregtech.api.recipe.RecipeCategories;
import gregtech.api.util.GTModHandler;

public class FluidExtractorRecipes implements Runnable {
Expand Down Expand Up @@ -68,6 +69,14 @@ public void run() {
.fluidOutputs(new FluidStack(FluidRegistry.getFluid("glue"), 144)).duration(5 * SECONDS).eut(16)
.addTo(fluidExtractionRecipes);

GTValues.RA.stdBuilder().itemInputs(GTModHandler.getModItem(TinkerConstruct.ID, "GlassBlock", 1L, 0))
.fluidOutputs(Materials.Glass.getMolten(144L)).duration(24 * TICKS).eut(54)
.recipeCategory(RecipeCategories.fluidExtractorRecycling).addTo(fluidExtractionRecipes);

GTValues.RA.stdBuilder().itemInputs(GTModHandler.getModItem(TinkerConstruct.ID, "GlassPane", 1L, 0))
.fluidOutputs(Materials.Glass.getMolten(54L)).duration(9 * TICKS).eut(54)
.recipeCategory(RecipeCategories.fluidExtractorRecycling).addTo(fluidExtractionRecipes);

}
}
}
13 changes: 0 additions & 13 deletions src/main/java/com/dreammaster/scripts/ScriptMinecraft.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
import static gregtech.api.enums.Mods.Witchery;
import static gregtech.api.recipe.RecipeMaps.alloySmelterRecipes;
import static gregtech.api.recipe.RecipeMaps.assemblerRecipes;
import static gregtech.api.recipe.RecipeMaps.blastFurnaceRecipes;
import static gregtech.api.recipe.RecipeMaps.cutterRecipes;
import static gregtech.api.recipe.RecipeMaps.extractorRecipes;
import static gregtech.api.recipe.RecipeMaps.fluidExtractionRecipes;
Expand Down Expand Up @@ -2167,18 +2166,6 @@ public void loadRecipes() {
GTUtility.getIntegratedCircuit(1))
.itemOutputs(getModItem(Minecraft.ID, "saddle", 1, 0, missing)).duration(5 * SECONDS).eut(24)
.addTo(assemblerRecipes);
GTValues.RA.stdBuilder()
.itemInputs(
getModItem(TinkerConstruct.ID, "GlassBlock", 1, 0, missing),
GTUtility.getIntegratedCircuit(1))
.itemOutputs(getModItem(Minecraft.ID, "glass", 1, 0, missing)).duration(5 * SECONDS)
.eut(TierEU.RECIPE_MV).specialValue(1000).addTo(blastFurnaceRecipes);
GTValues.RA.stdBuilder()
.itemInputs(
getModItem(TinkerConstruct.ID, "GlassPane", 1, 0, missing),
GTUtility.getIntegratedCircuit(1))
.itemOutputs(getModItem(Minecraft.ID, "glass_pane", 1, 0, missing)).duration(5 * SECONDS)
.eut(TierEU.RECIPE_MV).specialValue(1000).addTo(blastFurnaceRecipes);
GTValues.RA.stdBuilder().itemInputs(getModItem(Minecraft.ID, "wooden_pressure_plate", 1, 0, missing))
.itemOutputs(getModItem(Minecraft.ID, "wooden_button", 2, 0, missing))
.fluidInputs(Materials.Water.getFluid(4)).duration(2 * SECONDS + 10 * TICKS).eut(4)
Expand Down
Loading