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.

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

Add Day/night Recipe Condition #2885

Merged
merged 5 commits into from
Feb 21, 2025
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
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: 2 additions & 0 deletions src/generated/resources/assets/gtceu/lang/en_ud.json
Original file line number Diff line number Diff line change
Expand Up @@ -5418,6 +5418,8 @@
"recipe.capability.item.name": "ɯǝʇI",
"recipe.condition.adjacent_block.tooltip": "punoɹɐ sʞɔoןᗺ",
"recipe.condition.biome.tooltip": "%s :ǝɯoıᗺ",
"recipe.condition.daytime.day.tooltip": "ʞɹoʍ oʇ ǝɯıʇ ʎɐp sǝɹınbǝᴚ",
"recipe.condition.daytime.night.tooltip": "ʞɹoʍ oʇ ǝɯıʇ ʇɥbıu sǝɹınbǝᴚ",
"recipe.condition.dimension.tooltip": "%s :uoısuǝɯıᗡ",
"recipe.condition.dimension_marker.tooltip": ":uoısuǝɯıᗡ",
"recipe.condition.eu_to_start.tooltip": "%d%s :ʇɹɐʇS oʇ ∩Ǝ",
Expand Down
2 changes: 2 additions & 0 deletions src/generated/resources/assets/gtceu/lang/en_us.json
Original file line number Diff line number Diff line change
Expand Up @@ -5418,6 +5418,8 @@
"recipe.capability.item.name": "Item",
"recipe.condition.adjacent_block.tooltip": "Blocks around",
"recipe.condition.biome.tooltip": "Biome: %s",
"recipe.condition.daytime.day.tooltip": "Requires day time to work",
"recipe.condition.daytime.night.tooltip": "Requires night time to work",
"recipe.condition.dimension.tooltip": "Dimension: %s",
"recipe.condition.dimension_marker.tooltip": "Dimension:",
"recipe.condition.eu_to_start.tooltip": "EU to Start: %d%s",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ private GTRecipeConditions() {}
public static final RecipeConditionType<EnvironmentalHazardCondition> ENVIRONMENTAL_HAZARD = GTRegistries.RECIPE_CONDITIONS
.register("environmental_hazard",
new RecipeConditionType<>(EnvironmentalHazardCondition::new, EnvironmentalHazardCondition.CODEC));
public static final RecipeConditionType<DaytimeCondition> DAYTIME = GTRegistries.RECIPE_CONDITIONS
.register("daytime", new RecipeConditionType<>(DaytimeCondition::new, DaytimeCondition.CODEC));

public static void init() {
// noinspection unchecked
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
package com.gregtechceu.gtceu.common.recipe.condition;

import com.gregtechceu.gtceu.api.machine.trait.RecipeLogic;
import com.gregtechceu.gtceu.api.recipe.GTRecipe;
import com.gregtechceu.gtceu.api.recipe.RecipeCondition;
import com.gregtechceu.gtceu.api.recipe.condition.RecipeConditionType;
import com.gregtechceu.gtceu.common.data.GTRecipeConditions;

import net.minecraft.network.FriendlyByteBuf;
import net.minecraft.network.chat.Component;
import net.minecraft.util.GsonHelper;
import net.minecraft.world.level.Level;

import com.google.gson.JsonObject;
import com.mojang.serialization.Codec;
import com.mojang.serialization.codecs.RecordCodecBuilder;
import lombok.Getter;
import lombok.NoArgsConstructor;
import org.jetbrains.annotations.NotNull;

@Getter
@NoArgsConstructor
public class DaytimeCondition extends RecipeCondition {

public static final Codec<DaytimeCondition> CODEC = RecordCodecBuilder
.create(instance -> RecipeCondition.isReverse(instance)
.apply(instance, DaytimeCondition::new));

public final static DaytimeCondition INSTANCE = new DaytimeCondition();
private float level;

public DaytimeCondition(boolean isReverse) {
super(isReverse);
}

@Override
public RecipeConditionType<?> getType() {
return GTRecipeConditions.DAYTIME;
}

@Override
public Component getTooltips() {
if (isReverse) {
return Component.translatable("recipe.condition.daytime.night.tooltip");
} else {
return Component.translatable("recipe.condition.daytime.day.tooltip");
}
}

@Override
public boolean test(@NotNull GTRecipe recipe, @NotNull RecipeLogic recipeLogic) {
Level level = recipeLogic.machine.self().getLevel();
return level != null && !level.isNight();
}

@Override
public RecipeCondition createTemplate() {
return new DaytimeCondition();
}

@NotNull
@Override
public JsonObject serialize() {
JsonObject config = super.serialize();
config.addProperty("level", level);
return config;
}

@Override
public RecipeCondition deserialize(@NotNull JsonObject config) {
super.deserialize(config);
level = GsonHelper.getAsFloat(config, "level", 0);
return this;
}

@Override
public RecipeCondition fromNetwork(FriendlyByteBuf buf) {
super.fromNetwork(buf);
level = buf.readFloat();
return this;
}

@Override
public void toNetwork(FriendlyByteBuf buf) {
super.toNetwork(buf);
buf.writeFloat(level);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,8 @@ public static void init(RegistrateLangProvider provider) {
provider.add("recipe.condition.rock_breaker.tooltip", "Fluid blocks around");
provider.add("recipe.condition.adjacent_block.tooltip", "Blocks around");
provider.add("recipe.condition.eu_to_start.tooltip", "EU to Start: %d%s");
provider.add("recipe.condition.daytime.day.tooltip", "Requires day time to work");
provider.add("recipe.condition.daytime.night.tooltip", "Requires night time to work");

provider.add("gtceu.io.import", "Import");
provider.add("gtceu.io.export", "Export");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1056,6 +1056,14 @@ public GTRecipeBuilder environmentalHazard(MedicalCondition condition) {
return environmentalHazard(condition, false);
}

public GTRecipeBuilder daytime(boolean isNight) {
return addCondition(new DaytimeCondition().setReverse(isNight));
}

public GTRecipeBuilder daytime() {
return daytime(false);
}

private boolean applyResearchProperty(ResearchData.ResearchEntry researchEntry) {
if (!ConfigHolder.INSTANCE.machines.enableResearch) return false;
if (researchEntry == null) {
Expand Down