diff --git a/src/main/java/com/gregtechceu/gtceu/api/registry/registrate/forge/GTClientFluidTypeExtensions.java b/src/main/java/com/gregtechceu/gtceu/api/registry/registrate/forge/GTClientFluidTypeExtensions.java index 439e3002a6..575eee1edc 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/registry/registrate/forge/GTClientFluidTypeExtensions.java +++ b/src/main/java/com/gregtechceu/gtceu/api/registry/registrate/forge/GTClientFluidTypeExtensions.java @@ -4,10 +4,10 @@ import net.minecraft.client.Minecraft; import net.minecraft.resources.ResourceLocation; +import net.neoforged.neoforge.client.extensions.common.IClientFluidTypeExtensions; import lombok.Getter; import lombok.Setter; -import net.neoforged.neoforge.client.extensions.common.IClientFluidTypeExtensions; public class GTClientFluidTypeExtensions implements IClientFluidTypeExtensions { diff --git a/src/main/java/com/gregtechceu/gtceu/data/forge/GTBiomeModifiers.java b/src/main/java/com/gregtechceu/gtceu/data/forge/GTBiomeModifiers.java index d7f83d0bb4..cd4b3160c3 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/forge/GTBiomeModifiers.java +++ b/src/main/java/com/gregtechceu/gtceu/data/forge/GTBiomeModifiers.java @@ -20,7 +20,8 @@ public class GTBiomeModifiers { public static final ResourceKey RUBBER = ResourceKey.create(NeoForgeRegistries.Keys.BIOME_MODIFIERS, GTCEu.id("rubber_tree")); - public static final ResourceKey STONE_BLOB = ResourceKey.create(NeoForgeRegistries.Keys.BIOME_MODIFIERS, + public static final ResourceKey STONE_BLOB = ResourceKey.create( + NeoForgeRegistries.Keys.BIOME_MODIFIERS, GTCEu.id("stone_blob")); public static final ResourceKey RAW_OIL_SPROUT = ResourceKey .create(NeoForgeRegistries.Keys.BIOME_MODIFIERS, GTCEu.id("raw_oil_sprout")); diff --git a/src/main/java/com/gregtechceu/gtceu/data/worldgen/GTConfiguredFeatures.java b/src/main/java/com/gregtechceu/gtceu/data/worldgen/GTConfiguredFeatures.java index a795a9be69..5e30329359 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/worldgen/GTConfiguredFeatures.java +++ b/src/main/java/com/gregtechceu/gtceu/data/worldgen/GTConfiguredFeatures.java @@ -4,8 +4,8 @@ import com.gregtechceu.gtceu.common.worldgen.feature.configurations.FluidSproutConfiguration; import com.gregtechceu.gtceu.common.worldgen.feature.configurations.StoneBlobConfiguration; import com.gregtechceu.gtceu.data.block.GTBlocks; - import com.gregtechceu.gtceu.data.material.GTMaterials; + import net.minecraft.core.registries.Registries; import net.minecraft.data.worldgen.BootstrapContext; import net.minecraft.data.worldgen.features.FeatureUtils; diff --git a/src/main/java/com/gregtechceu/gtceu/integration/kjs/recipe/GTRecipeSchema.java b/src/main/java/com/gregtechceu/gtceu/integration/kjs/recipe/GTRecipeSchema.java index 37b80cc46c..d726f62984 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/kjs/recipe/GTRecipeSchema.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/kjs/recipe/GTRecipeSchema.java @@ -3,18 +3,13 @@ import com.gregtechceu.gtceu.GTCEu; import com.gregtechceu.gtceu.api.capability.recipe.*; import com.gregtechceu.gtceu.api.item.component.IDataItem; -import com.gregtechceu.gtceu.api.machine.MachineDefinition; import com.gregtechceu.gtceu.api.machine.multiblock.CleanroomType; -import com.gregtechceu.gtceu.api.material.ChemicalHelper; -import com.gregtechceu.gtceu.api.material.material.Material; -import com.gregtechceu.gtceu.api.material.material.stack.UnificationEntry; import com.gregtechceu.gtceu.api.recipe.ResearchData; import com.gregtechceu.gtceu.api.recipe.ResearchRecipeBuilder; import com.gregtechceu.gtceu.api.recipe.condition.RecipeCondition; import com.gregtechceu.gtceu.api.recipe.content.Content; import com.gregtechceu.gtceu.api.recipe.ingredient.FluidIngredient; import com.gregtechceu.gtceu.api.recipe.ingredient.IntCircuitIngredient; -import com.gregtechceu.gtceu.api.tag.TagPrefix; import com.gregtechceu.gtceu.common.recipe.*; import com.gregtechceu.gtceu.config.ConfigHolder; import com.gregtechceu.gtceu.data.recipe.builder.GTRecipeBuilder; @@ -22,14 +17,11 @@ import com.gregtechceu.gtceu.integration.kjs.recipe.components.GTRecipeComponents; import com.gregtechceu.gtceu.utils.ResearchManager; -import com.lowdragmc.lowdraglib.LDLib; import com.lowdragmc.lowdraglib.Platform; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.Tag; import net.minecraft.resources.ResourceLocation; -import net.minecraft.tags.TagKey; -import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.crafting.Ingredient; import net.minecraft.world.item.crafting.RecipeHolder; @@ -60,7 +52,6 @@ import java.util.Arrays; import java.util.Collection; import java.util.function.Consumer; -import java.util.function.Supplier; import java.util.function.UnaryOperator; public interface GTRecipeSchema { @@ -186,129 +177,31 @@ public GTRecipeJS outputCWU(int cwu) { return output(CWURecipeCapability.CAP, cwu); } - public GTRecipeJS itemInputs(InputItem... inputs) { - return inputItems(inputs); - } - - public GTRecipeJS itemInput(UnificationEntry input) { - return inputItems(input); - } - - public GTRecipeJS itemInput(UnificationEntry input, int count) { - return inputItems(input, count); - } - public GTRecipeJS inputItems(InputItem... inputs) { return input(ItemRecipeCapability.CAP, (Object[]) inputs); } - public GTRecipeJS inputItems(ItemStack... inputs) { - for (ItemStack itemStack : inputs) { - if (itemStack.isEmpty()) { - GTCEu.LOGGER.error("gt recipe {} input items is empty", id); - throw new IllegalArgumentException(id + ": input items is empty"); - } - } - // TODO remove `.ingredient()` - return input(ItemRecipeCapability.CAP, - Arrays.stream(inputs) - .map(stack -> InputItem.of(new SizedIngredient(!stack.getComponents().isEmpty() ? - DataComponentIngredient.of(true, stack) : Ingredient.of(stack), stack.getCount()) - .ingredient(), stack.getCount())) - .toArray()); - } - - public GTRecipeJS inputItems(TagKey tag, int amount) { - return inputItems(InputItem.of(SizedIngredient.of(tag, amount))); - } - - public GTRecipeJS inputItems(Item input, int amount) { - return inputItems(new ItemStack(input, amount)); - } - - public GTRecipeJS inputItems(Item input) { - return inputItems(InputItem.of(Ingredient.of(input), 1)); - } - - public GTRecipeJS inputItems(Supplier input) { - return inputItems(InputItem.of(Ingredient.of(input.get()), 1)); - } - - public GTRecipeJS inputItems(Supplier input, int amount) { - return inputItems(new ItemStack(input.get(), amount)); - } - - public GTRecipeJS inputItems(TagPrefix orePrefix, Material material) { - return inputItems(orePrefix, material, 1); - } - - public GTRecipeJS inputItems(UnificationEntry input) { - return inputItems(input.tagPrefix, input.material, 1); - } - - public GTRecipeJS inputItems(UnificationEntry input, int count) { - return inputItems(input.tagPrefix, input.material, count); - } - - public GTRecipeJS inputItems(TagPrefix orePrefix, Material material, int count) { - return inputItems(ChemicalHelper.getTag(orePrefix, material), count); - } - - public GTRecipeJS inputItems(MachineDefinition machine) { - return inputItems(machine, 1); - } - - public GTRecipeJS inputItems(MachineDefinition machine, int count) { - return inputItems(machine.asStack(count)); - } - - public GTRecipeJS itemOutputs(OutputItem... outputs) { - return outputItems(outputs); - } - - public GTRecipeJS itemOutput(UnificationEntry unificationEntry) { - return outputItems(unificationEntry.tagPrefix, unificationEntry.material); - } - - public GTRecipeJS itemOutput(UnificationEntry unificationEntry, int count) { - return outputItems(unificationEntry.tagPrefix, unificationEntry.material, count); - } - public GTRecipeJS outputItems(OutputItem... outputs) { - for (OutputItem itemStack : outputs) { - if (itemStack.isEmpty()) { - LDLib.LOGGER.error("gt recipe {} output items is empty", id); - throw new IllegalArgumentException(id + ": output items is empty"); - } - } return output(ItemRecipeCapability.CAP, (Object[]) outputs); } - public GTRecipeJS outputItems(Item input, int amount) { - return outputItems(OutputItem.of(new ItemStack(input, amount))); - } - - public GTRecipeJS outputItems(Item input) { - return outputItems(OutputItem.of(new ItemStack(input))); - } - - public GTRecipeJS outputItems(TagPrefix orePrefix, Material material) { - return outputItems(orePrefix, material, 1); + public GTRecipeJS inputFluids(GTRecipeComponents.FluidIngredientJS... inputs) { + return input(FluidRecipeCapability.CAP, (Object[]) inputs); } - public GTRecipeJS outputItems(TagPrefix orePrefix, Material material, int count) { - return outputItems(OutputItem.of(ChemicalHelper.get(orePrefix, material, count))); + public GTRecipeJS outputFluids(FluidStackJS... outputs) { + return output(FluidRecipeCapability.CAP, (Object[]) outputs); } - public GTRecipeJS outputItems(MachineDefinition machine) { - return outputItems(machine, 1); + public GTRecipeJS inputStress(float stress) { + return input(StressRecipeCapability.CAP, stress); } - public GTRecipeJS outputItems(MachineDefinition machine, int count) { - return outputItems(OutputItem.of(machine.asStack(count))); + public GTRecipeJS outputStress(float stress) { + return output(StressRecipeCapability.CAP, stress); } - public GTRecipeJS notConsumable(InputItem itemStack) { + public GTRecipeJS notConsumableItem(InputItem itemStack) { float lastChance = this.chance; this.chance = 0; inputItems(itemStack); @@ -316,29 +209,13 @@ public GTRecipeJS notConsumable(InputItem itemStack) { return this; } - public GTRecipeJS notConsumable(Supplier item) { - float lastChance = this.chance; - this.chance = 0; - inputItems(item); - this.chance = lastChance; - return this; - } - - public GTRecipeJS notConsumable(TagPrefix orePrefix, Material material) { - float lastChance = this.chance; - this.chance = 0; - inputItems(orePrefix, material); - this.chance = lastChance; - return this; - } - public GTRecipeJS notConsumableFluid(GTRecipeComponents.FluidIngredientJS fluid) { chancedFluidInput(fluid, 0, 0); return this; } public GTRecipeJS circuit(int configuration) { - return notConsumable(InputItem.of(IntCircuitIngredient.circuitInput(configuration).toVanilla(), 1)); + return notConsumableItem(InputItem.of(IntCircuitIngredient.circuitInput(configuration).toVanilla(), 1)); } public GTRecipeJS chancedInput(InputItem stack, int chance, int tierChanceBoost) { @@ -387,30 +264,6 @@ public GTRecipeJS chancedFluidOutput(FluidStackJS stack, int chance, int tierCha return this; } - public GTRecipeJS chancedOutput(TagPrefix tag, Material mat, int chance, int tierChanceBoost) { - return chancedOutput(OutputItem.of(ChemicalHelper.get(tag, mat), chance), chance, tierChanceBoost); - } - - public GTRecipeJS chancedOutput(TagPrefix tag, Material mat, int count, int chance, int tierChanceBoost) { - return chancedOutput(OutputItem.of(ChemicalHelper.get(tag, mat, count), chance), chance, tierChanceBoost); - } - - public GTRecipeJS inputFluids(GTRecipeComponents.FluidIngredientJS... inputs) { - return input(FluidRecipeCapability.CAP, (Object[]) inputs); - } - - public GTRecipeJS outputFluids(FluidStackJS... outputs) { - return output(FluidRecipeCapability.CAP, (Object[]) outputs); - } - - public GTRecipeJS inputStress(float stress) { - return input(StressRecipeCapability.CAP, stress); - } - - public GTRecipeJS outputStress(float stress) { - return output(StressRecipeCapability.CAP, stress); - } - ////////////////////////////////////// // ********** DATA ***********// ////////////////////////////////////// @@ -610,16 +463,6 @@ public GTRecipeJS scannerResearch(UnaryOperator b.researchStack(researchStack)); - } - /** * Generates a research recipe for the Research Station. */