Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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/cosmiccore/lang/en_ud.json
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,7 @@
"cosmiccore.conjuct_valkruth.1": "buıɯןǝɥʍɹǝʌO - ןɐΛ9§",
"cosmiccore.conjuct_valkruth.2": "uoıʇɐpunoℲ - ɥʇnᴚ9§",
"cosmiccore.conjuct_valkruth_emotion.1": "ǝɔuǝbɹǝʌuoƆ - Ɐ˙ᴚ˙Ǝq§",
"cosmiccore.errors.bad_fuel": "ʇıun ɹǝd ןɐʇoʇ ∩Ǝ 0ᄅㄥ> ǝq ʇsnW ʇndʇnO ןǝnℲ \n ¡ʎʇıןɐnὉ ןǝnℲ ʇuǝıɔıɟɟnsuIɐ§",
"cosmiccore.gravpack.1": "˙ɥʇɹɐƎ ɥɔʇɐW oʇ ʎʇıʌɐɹ⅁ sǝzıןɐɯɹoNɐ§",
"cosmiccore.khoruth.1": "ǝɔɐdS - ɹoɥʞ9§",
"cosmiccore.khoruth.2": "uoıʇɐpunoℲ - ɥʇnᴚ9§",
Expand Down Expand Up @@ -340,6 +341,7 @@
"material.cosmiccore.temmerite": "ǝʇıɹǝɯɯǝ⟘",
"material.cosmiccore.trinavine": "ǝuıʌɐuıɹ⟘",
"material.cosmiccore.trinium_naqide": "ǝpıbɐN ɯnıuıɹ⟘",
"material.cosmiccore.triphenylphosphine": "ǝuıɥdsoɥdןʎuǝɥdıɹ⟘",
"material.cosmiccore.universe_tears": "sɹɐǝ⟘ ǝsɹǝʌıu∩",
"material.cosmiccore.virtue_meld": "pןǝW ǝnʇɹıΛ",
"tagprefix.leached_ore": "ǝɹO %s pǝɥɔɐǝꞀ",
Expand Down
2 changes: 2 additions & 0 deletions src/generated/resources/assets/cosmiccore/lang/en_us.json
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,7 @@
"cosmiccore.conjuct_valkruth.1": "§6Val - Overwhelming",
"cosmiccore.conjuct_valkruth.2": "§6Ruth - Foundation",
"cosmiccore.conjuct_valkruth_emotion.1": "§bE.R.A - Convergence",
"cosmiccore.errors.bad_fuel": "§aInsufficient Fuel Quality! \n Fuel Output Must be >720 EU total per unit",
"cosmiccore.gravpack.1": "§aNormalizes Gravity to Match Earth.",
"cosmiccore.khoruth.1": "§6Khor - Space",
"cosmiccore.khoruth.2": "§6Ruth - Foundation",
Expand Down Expand Up @@ -340,6 +341,7 @@
"material.cosmiccore.temmerite": "Temmerite",
"material.cosmiccore.trinavine": "Trinavine",
"material.cosmiccore.trinium_naqide": "Trinium Naqide",
"material.cosmiccore.triphenylphosphine": "Triphenylphosphine",
"material.cosmiccore.universe_tears": "Universe Tears",
"material.cosmiccore.virtue_meld": "Virtue Meld",
"tagprefix.leached_ore": "Leached %s Ore",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
"cosmiccore:programmable_matter_bucket",
"cosmiccore:shimmering_neutronium_bucket",
"cosmiccore:causal_fabric_bucket",
"cosmiccore:triphenylphosphine_bucket",
"cosmiccore:potential_bucket",
"cosmiccore:false_infinity_bucket",
"cosmiccore:suitable_infinity_bucket",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,9 @@ public static void init(RegistrateLangProvider provider) {
"§eTears of the Universe§f: §c2x §fEU total @ 250mb/hr");

replace(provider, "cosmiccore.universal.boosting_agents.0",
"§aCan consume various boosters to increase EU/t multiplier");
"§aCan consume various boosters to increase EU/t multiplier")
;replace(provider, "cosmiccore.errors.bad_fuel",
"§aInsufficient Fuel Quality! \n Fuel Output Must be >720 EU total per unit");
replace(provider, "cosmiccore.universal.boosting_agents.1", "§6Oxygen §ffor §a3x §fEu/t @ §b20mb/s ");
replace(provider, "cosmiccore.universal.boosting_agents.2", "§6Liquid Oxygen §ffor §a6x §fEu/t @ §b80mb/s ");
replace(provider, "cosmiccore.universal.boosting_agents.3", "§6Ichor §ffor §a9x §fEu/t @ §b10mb/s ");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
import com.gregtechceu.gtceu.api.machine.multiblock.MultiblockDisplayText;
import com.gregtechceu.gtceu.api.machine.multiblock.WorkableElectricMultiblockMachine;
import com.gregtechceu.gtceu.api.machine.multiblock.WorkableMultiblockMachine;
import com.gregtechceu.gtceu.api.machine.trait.RecipeLogic;
import com.gregtechceu.gtceu.api.recipe.GTRecipe;
import com.gregtechceu.gtceu.api.recipe.RecipeHelper;
import com.gregtechceu.gtceu.api.recipe.content.ContentModifier;
Expand Down Expand Up @@ -104,13 +105,14 @@ private boolean isIntakesObstructed() {
public long getOverclockVoltage() {
return GTValues.V[tier];
}

public static ModifierFunction recipeModifier(@NotNull MetaMachine machine, @NotNull GTRecipe recipe) {
if (!(machine instanceof ExoticCombustionEngineMachine engineMachine)) {
return RecipeModifier.nullWrongType(ExoticCombustionEngineMachine.class, machine);
}
long EUt = RecipeHelper.getOutputEUt(recipe);

if (EUt * recipe.duration < 720) {
return ModifierFunction.NULL;
}
var fluidHolders = Objects
.requireNonNullElseGet(((ExoticCombustionEngineMachine) machine).getCapabilitiesProxy()
.get(IO.IN, FluidRecipeCapability.CAP), Collections::<IRecipeHandler<?>>emptyList)
Expand Down Expand Up @@ -166,7 +168,15 @@ public static ModifierFunction recipeModifier(@NotNull MetaMachine machine, @Not
@Override
public boolean onWorking() {
boolean value = super.onWorking();
var recipe = recipeLogic.getLastRecipe();
if (recipe != null){
long EUt = RecipeHelper.getOutputEUt(recipe);
int duration = recipe.duration;
if ((EUt/recipe.parallels) * duration < 720){
this.getRecipeLogic().setWaiting(Component.translatable("cosmiccore.errors.bad_fuel"));

}
}
if (currentBooster != null) {
int consumptionRate = 1;
int tickCycle = 1;
Expand Down Expand Up @@ -224,9 +234,13 @@ public void addDisplayText(List<Component> textList) {
MultiblockDisplayText.Builder builder = MultiblockDisplayText.builder(textList, isFormed())
.setWorkingStatus(recipeLogic.isWorkingEnabled(), recipeLogic.isActive());
var voltageName = Component.literal(GTValues.VNF[GTUtil.getFloorTierByVoltage(getOverclockVoltage())]);
var amperageName = boostingTiers.getInt(currentBooster) * 3;
var amperageName = currentBooster != null ? boostingTiers.getInt(currentBooster) * 3 : 1;
if (recipeLogic.isSuspend() && !recipeLogic.getFancyTooltip().isEmpty()){
builder.addCustom(t-> t.add(recipeLogic.getFancyTooltip().get(0)));
return;
}
builder.addCustom(t -> t.add(Component.translatable("gtceu.multiblock.max_energy_per_tick_amps",
FormattingUtil.formatNumbers(getOverclockVoltage() * boostingTiers.getInt(currentBooster) * 3L),
FormattingUtil.formatNumbers(getOverclockVoltage() * amperageName),
amperageName, voltageName).withStyle(ChatFormatting.GRAY)));
if (isActive() && isWorkingEnabled()) {
builder.addCurrentEnergyProductionLine(
Expand All @@ -249,6 +263,9 @@ public void addDisplayText(List<Component> textList) {
.withStyle(ChatFormatting.YELLOW)));
}




builder.addWorkingStatusLine();
}

Expand Down
Loading