diff --git a/src/generated/resources/assets/cosmiccore/lang/en_ud.json b/src/generated/resources/assets/cosmiccore/lang/en_ud.json index 947afd08d..4eb63c754 100644 --- a/src/generated/resources/assets/cosmiccore/lang/en_ud.json +++ b/src/generated/resources/assets/cosmiccore/lang/en_ud.json @@ -509,6 +509,8 @@ "cosmiccore.armor.sanguinewarptech.hud.LP": "%sɔ§ :ǝɔɹoℲ ǝɟıꞀㄣ§", "cosmiccore.armor.sanguinewarptech.hud.shieldstate": "%s :pןǝıɥS ǝuınbuɐS", "cosmiccore.armor.sanguinewarptech.message.death_defiance": "¡ɥʇɐǝp ɯoɹɟ noʎ pǝʇɔǝʇoɹd ɹoɯɹɐ ǝuınbuɐs ɹnoʎ", + "cosmiccore.booster.tooltip.prefix": "%s ɹǝı⟘ ɹ§:ɹǝʇsooᗺq§", + "cosmiccore.calorific.tooltip.prefix": "%s ɹ§:ɔıɟıɹoןɐƆϛ§", "cosmiccore.calx_reactor.desc": "ǝuɐɔɹⱯ ǝɥʇ ɥʇıʍ sɹǝpuoʍ buıʞɹoM", "cosmiccore.circuit.lore.tier.max.0": "ʇınɔɹıƆ ɹǝı⟘ XⱯW", "cosmiccore.circuit.lore.tier.max.1": "˙ʎɹɐnʇıqO uɐ ʇnq -ɹossǝɔoɹd ɐ ʇoN", @@ -546,6 +548,7 @@ "cosmiccore.lore.shard_large.1": "˙ǝʇɐɟ ǝʇıɹʍǝɹ oʇ soɥɔǝ ʇıɐ§", "cosmiccore.lore.shard_small.0": "ʎʇıuɹǝʇǝ ʇsɐd ɐ ɯoɹɟ pɹɐɥs Ɐ9§", "cosmiccore.lore.shard_small.1": "˙ǝʇɐɟ ǝʇıɹʍǝɹ oʇ soɥɔǝ ʎןʇqns ʇı9§", + "cosmiccore.lubricant.tooltip.prefix": "%s ɹǝı⟘ ɹ§:ʇuɐɔıɹqnꞀ9§", "cosmiccore.machine.capacitor_array.tooltip.0": "ɹ§ǝbɐɹoʇS ɹǝʍoԀ ǝsuǝᗡ ןɐɔoꞀㄥ§", "cosmiccore.machine.capacitor_array.tooltip.1": "ɹ§sǝɯıʇ 8Ɩ oʇ dn ʎןןɐɔıʇɹǝʌ pǝpuɐdxǝ ǝq puɐ ɹoʇıɔɐdɐɔ ʎuɐ ǝsn uɐƆㄥ§", "cosmiccore.machine.capacitor_array.tooltip.2": "ɹ§sǝɥɔʇɐH ɹǝsɐꞀ9§ sʇdǝɔɔⱯㄥ§", @@ -578,6 +581,12 @@ "cosmiccore.multiblock.drone_station_machine.current_tier": "%s :ɹǝıʇ ʇuǝɹɹnƆ", "cosmiccore.multiblock.drone_station_machine.drone_amount": "sǝuoɹp %s buıʌɹǝs ʎןʇuǝɹɹnƆ", "cosmiccore.multiblock.drone_station_machine.no_drones": "pǝʇɔǝuuoɔ sǝuoɹp oN", + "cosmiccore.multiblock.drone_station_machine.tier.0": "ɔıʇɐɯsɐןԀ", + "cosmiccore.multiblock.drone_station_machine.tier.1": "ǝuınbuɐS", + "cosmiccore.multiblock.drone_station_machine.tier.2": "ןɐıɹʇsnpuI", + "cosmiccore.multiblock.drone_station_machine.tier.3": "ʇsnqoᴚ", + "cosmiccore.multiblock.drone_station_machine.tier.4": "ʎʇsnᴚ", + "cosmiccore.multiblock.drone_station_machine.tier.5": "ǝuoN", "cosmiccore.multiblock.fuel_star": "ǝɹoƆ ɹɐʇS ןǝnℲן§ɐ§", "cosmiccore.multiblock.heat_capacity": "%s :ʇɐǝH xɐWɔ§", "cosmiccore.multiblock.heat_value": "%s :ʇɐǝH ʇuǝɹɹnƆ9§", diff --git a/src/generated/resources/assets/cosmiccore/lang/en_us.json b/src/generated/resources/assets/cosmiccore/lang/en_us.json index 8a61e5b43..357f252f1 100644 --- a/src/generated/resources/assets/cosmiccore/lang/en_us.json +++ b/src/generated/resources/assets/cosmiccore/lang/en_us.json @@ -509,6 +509,8 @@ "cosmiccore.armor.sanguinewarptech.hud.LP": "§4Life Force: §c%s", "cosmiccore.armor.sanguinewarptech.hud.shieldstate": "Sanguine Shield: %s", "cosmiccore.armor.sanguinewarptech.message.death_defiance": "Your sanguine armor protected you from death!", + "cosmiccore.booster.tooltip.prefix": "§bBooster:§r Tier %s", + "cosmiccore.calorific.tooltip.prefix": "§5Calorific:§r %s", "cosmiccore.calx_reactor.desc": "Working wonders with the Arcane", "cosmiccore.circuit.lore.tier.max.0": "MAX Tier Circuit", "cosmiccore.circuit.lore.tier.max.1": "Not a processor- but an Obituary.", @@ -546,6 +548,7 @@ "cosmiccore.lore.shard_large.1": "§ait echos to rewrite fate.", "cosmiccore.lore.shard_small.0": "§6A shard from a past eternity", "cosmiccore.lore.shard_small.1": "§6it subtly echos to rewrite fate.", + "cosmiccore.lubricant.tooltip.prefix": "§6Lubricant:§r Tier %s", "cosmiccore.machine.capacitor_array.tooltip.0": "§7Local Dense Power Storage§r", "cosmiccore.machine.capacitor_array.tooltip.1": "§7Can use any capacitor and be expanded vertically up to 18 times§r", "cosmiccore.machine.capacitor_array.tooltip.2": "§7Accepts §6Laser Hatches§r", @@ -578,6 +581,12 @@ "cosmiccore.multiblock.drone_station_machine.current_tier": "Current tier: %s", "cosmiccore.multiblock.drone_station_machine.drone_amount": "Currently serving %s drones", "cosmiccore.multiblock.drone_station_machine.no_drones": "No drones connected", + "cosmiccore.multiblock.drone_station_machine.tier.0": "Plasmatic", + "cosmiccore.multiblock.drone_station_machine.tier.1": "Sanguine", + "cosmiccore.multiblock.drone_station_machine.tier.2": "Industrial", + "cosmiccore.multiblock.drone_station_machine.tier.3": "Robust", + "cosmiccore.multiblock.drone_station_machine.tier.4": "Rusty", + "cosmiccore.multiblock.drone_station_machine.tier.5": "None", "cosmiccore.multiblock.fuel_star": "§a§lFuel Star Core", "cosmiccore.multiblock.heat_capacity": "§cMax Heat: %s", "cosmiccore.multiblock.heat_value": "§6Current Heat: %s", @@ -1135,14 +1144,5 @@ "tooltip.cosmiccore.thermia_hatch_limit": "§cTemp. Limit: %sK", "tooltip.gt_scythe.energy": "Energy: %s / %s EU", "tooltip.gt_scythe.no_energy": "§cNot enough energy.", - "tooltip.gt_scythe.per_hit": "Cost: %s EU / hit", - "cosmiccore.multiblock.drone_station_machine.tier.0": "Plasmatic", - "cosmiccore.multiblock.drone_station_machine.tier.1": "Sanguine", - "cosmiccore.multiblock.drone_station_machine.tier.2": "Industrial", - "cosmiccore.multiblock.drone_station_machine.tier.3": "Robust", - "cosmiccore.multiblock.drone_station_machine.tier.4": "Rusty", - "cosmiccore.multiblock.drone_station_machine.tier.5": "None" - "cosmiccore.calorific.tooltip.prefix": "§6Calorific:§r %s", - "cosmiccore.lubricant.tooltip.prefix": "§eLubricant:§r Tier %s", - "cosmiccore.booster.tooltip.prefix": "§bBooster:§r Tier %s" + "tooltip.gt_scythe.per_hit": "Cost: %s EU / hit" } \ No newline at end of file diff --git a/src/main/java/com/ghostipedia/cosmiccore/common/machine/multiblock/multi/DawnForge.java b/src/main/java/com/ghostipedia/cosmiccore/common/machine/multiblock/multi/DawnForge.java index 9b59a19b0..8d1f9e923 100644 --- a/src/main/java/com/ghostipedia/cosmiccore/common/machine/multiblock/multi/DawnForge.java +++ b/src/main/java/com/ghostipedia/cosmiccore/common/machine/multiblock/multi/DawnForge.java @@ -10,7 +10,6 @@ import com.gregtechceu.gtceu.api.machine.multiblock.PartAbility; import com.gregtechceu.gtceu.api.pattern.FactoryBlockPattern; import com.gregtechceu.gtceu.api.pattern.Predicates; -import com.gregtechceu.gtceu.api.recipe.OverclockingLogic; import static com.ghostipedia.cosmiccore.api.machine.part.CosmicPartAbility.IMPORT_EMBER; import static com.ghostipedia.cosmiccore.api.registries.CosmicRegistration.REGISTRATE; @@ -18,7 +17,6 @@ import static com.gregtechceu.gtceu.api.machine.multiblock.PartAbility.EXPORT_FLUIDS; import static com.gregtechceu.gtceu.api.pattern.Predicates.*; import static com.gregtechceu.gtceu.api.pattern.util.RelativeDirection.*; -import static com.gregtechceu.gtceu.common.data.GTRecipeModifiers.ELECTRIC_OVERCLOCK; import static com.rekindled.embers.RegistryManager.DAWNSTONE_ANVIL; public class DawnForge { @@ -29,7 +27,7 @@ public class DawnForge { .recipeType(CosmicRecipeTypes.DAWN_FORGE) .appearanceBlock(LIGHT_DAWNSTONE_CASING) .partAppearance((controller, part, side) -> LIGHT_DAWNSTONE_CASING.getDefaultState()) - .recipeModifier(ELECTRIC_OVERCLOCK.apply(OverclockingLogic.NON_PERFECT_OVERCLOCK)) + .recipeModifier(WeakSteamParallelMultiBlockMachine::recipeModifier) .pattern(definition -> FactoryBlockPattern.start() .aisle("ABBBA", "A A", "AA AA", " BBB ", " ") .aisle("BAAAB", " ", "A A", "BABAB", " B ")