Fix Sleeping in Void Dimension not Resetting Weather (#916)

[BUG]

[IGNORE]
checks = { compareBefore = "1.7-beta-6" }
[IGNORE]
This commit is contained in:
Integer Limit 2024-08-16 21:54:28 +10:00 committed by GitHub
parent 01b0fdd9bb
commit f8400587b2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 26 additions and 27 deletions

View File

@ -720,7 +720,7 @@
}, },
{ {
"projectID": 932060, "projectID": 932060,
"fileID": 5624443, "fileID": 5634690,
"required": true "required": true
}, },
{ {

View File

@ -1,6 +1,7 @@
import com.nomiceu.nomilabs.groovy.ChangeRecipeBuilder import com.nomiceu.nomilabs.groovy.ChangeRecipeBuilder
import com.nomiceu.nomilabs.util.LabsModeHelper import com.nomiceu.nomilabs.util.LabsModeHelper
import gregtech.api.recipes.RecipeBuilder import gregtech.api.recipes.RecipeBuilder
import net.minecraft.item.ItemStack
import net.minecraftforge.fluids.FluidStack import net.minecraftforge.fluids.FluidStack
import java.util.stream.Stream import java.util.stream.Stream
@ -283,40 +284,38 @@ for (FluidStack joiningFluid : [fluid('tin') * 576, fluid('soldering_alloy') * 2
} }
// Add Circuits to Quartz and Certus Quartz Autoclave Recipes (So Doesn't Conflict with Purified Shortcut) // Add Circuits to Quartz and Certus Quartz Autoclave Recipes (So Doesn't Conflict with Purified Shortcut)
var getCertusRecipes = { List<Stream<ChangeRecipeBuilder>> input ->
input.add(mods.gregtech.autoclave.changeByOutput(null, null, [chanced(metaitem('gemCertusQuartz'), 7000, 1000)], null)) // 2D List of Recipes, Each List is Seperate Quartz Type
input.add(mods.gregtech.autoclave.changeByOutput([metaitem('gemCertusQuartz')], null)) List<List<ChangeRecipeBuilder>> quartzRecipes = []
for (ItemStack quartz : [item('minecraft:quartz'), metaitem('gemCertusQuartz')]) {
List<ChangeRecipeBuilder> toAdd = []
toAdd.addAll(mods.gregtech.autoclave.changeByOutput(null, null, [chanced(quartz, 7000, 1000)], null).iterator())
toAdd.addAll(mods.gregtech.autoclave.changeByOutput([quartz], null).iterator())
quartzRecipes.add(toAdd)
} }
List<Stream<ChangeRecipeBuilder>> toAddCircuit = [] quartzRecipes.forEach { List<ChangeRecipeBuilder> builders ->
toAddCircuit.add(mods.gregtech.autoclave.changeByOutput(null, null, [chanced(item('minecraft:quartz'), 7000, 1000)], null)) builders.forEach { ChangeRecipeBuilder builder ->
toAddCircuit.add(mods.gregtech.autoclave.changeByOutput([item('minecraft:quartz')], null))
getCertusRecipes(toAddCircuit)
toAddCircuit.forEach { Stream<ChangeRecipeBuilder> stream ->
stream.forEach { ChangeRecipeBuilder builder ->
builder.builder { RecipeBuilder recipe -> builder.builder { RecipeBuilder recipe ->
recipe.circuitMeta(1) recipe.circuitMeta(1)
}.replaceAndRegister() }.replaceAndRegister()
} }
} }
// Copy Certus Quartz Recipe for Fluix // Copy a Quartz Recipe for Fluix
List<Stream<ChangeRecipeBuilder>> certusRecipes = [] quartzRecipes[0].forEach { builder ->
getCertusRecipes(certusRecipes) builder.copyOriginal()
.builder { RecipeBuilder recipe ->
certusRecipes.forEach { stream -> recipe.clearInputs()
stream.forEach { builder -> .inputs(item('appliedenergistics2:material', 8))
builder.builder { RecipeBuilder recipe -> .circuitMeta(1)
recipe.clearInputs() }.changeEachOutput { output ->
.inputs(item('appliedenergistics2:material', 8)) return item('appliedenergistics2:material', 7) * output.count
.circuitMeta(1) }.changeEachChancedOutput { output ->
}.changeEachOutput { output -> return chanced(item('appliedenergistics2:material', 7), output.chance, output.chanceBoost)
return item('appliedenergistics2:material', 7) * output.count }.buildAndRegister()
}.changeEachChancedOutput { output ->
return chanced(item('appliedenergistics2:material', 7), output.chance, output.chanceBoost)
}.buildAndRegister()
}
} }
// Purified AE2 Crystal Shortcut // Purified AE2 Crystal Shortcut