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
4 changes: 0 additions & 4 deletions src/generated/resources/assets/monilabs/lang/en_ud.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@
"config.jade.plugin_monilabs.color_info": "oɟuI ɹoןoƆ ǝןqıɔnɹƆ ɔıʇɐɯsıɹԀ",
"config.jade.plugin_monilabs.microverse_info": "oɟuI ɹoʇɔǝظoɹԀ ǝsɹǝʌoɹɔıW",
"config.jade.plugin_monilabs.sculk_vat_xp_info": "oɟuI ɹǝɟɟnᗺ ԀX ʇɐΛ ʞןnɔS",
"config.monilabs.option.antimatterRandomMaxExclusive": "ǝʌısnןɔxƎxɐWɯopuɐᴚɹǝʇʇɐɯıʇuɐ",
"config.monilabs.option.antimatterRandomMinInclusive": "ǝʌısnןɔuIuıWɯopuɐᴚɹǝʇʇɐɯıʇuɐ",
"config.monilabs.option.forcePrideMonth": "ɥʇuoWǝpıɹԀǝɔɹoɟ",
"config.monilabs.option.hostileMicroverseTooltip": "dıʇןoo⟘ǝsɹǝʌoɹɔıWǝןıʇsoɥ",
"config.monilabs.option.microminerReturnedOnZeroIntegrity": "ʎʇıɹbǝʇuIoɹǝZuOpǝuɹnʇǝᴚɹǝuıɯoɹɔıɯ",
Expand All @@ -55,7 +53,6 @@
"emi_info.monilabs.new_microverse": "%s :ǝdʎʇ ʍǝN",
"emi_info.monilabs.projector_info": "%d :ɹǝıʇ ɹoʇɔǝظoɹԀ",
"emi_info.monilabs.required_microverse": "%s :ǝdʎʇ pǝɹınbǝᴚ",
"gtceu.antimatter_manipulator": "uoıʇɐןndıuɐW ɹǝʇʇɐɯıʇuⱯ",
"gtceu.chromatic_processing": "buıssǝɔoɹԀ ɔıʇɐɯoɹɥƆ",
"gtceu.chromatic_transcendence": "ǝɔuǝpuǝɔsuɐɹ⟘ ɔıʇɐɯoɹɥƆ",
"gtceu.creative_data_multi": "uoɔɐǝᗺ ɥɔɹɐǝsǝᴚ ǝɔuǝıɔsıuɯO",
Expand Down Expand Up @@ -120,7 +117,6 @@
"monilabs.prismatic.color_name.yellow": "ɹ§ʍoןןǝʎǝ§",
"monilabs.prismatic.current_color": "%s :ɹoןoɔ ʇuǝɹɹnƆ",
"monilabs.recipe.accepted_colors": " :sɹoןoƆ ןɐıʇıuI pǝʇdǝɔɔⱯ",
"monilabs.recipe.antimatter_random_range": "x%s-x%s ʎq ʎɹɐʌ\nsʇndʇno puɐ ʇnduI",
"monilabs.recipe.any_input_color": "ʎNⱯ",
"monilabs.recipe.basic_input": "ʎɹɐpuoɔǝS | ʎɹɐɯıɹԀ",
"monilabs.recipe.color_list_random_start": "\n :sɹoןoƆ buıʇןnsǝᴚ ǝןqıssoԀ",
Expand Down
4 changes: 0 additions & 4 deletions src/generated/resources/assets/monilabs/lang/en_us.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@
"config.jade.plugin_monilabs.color_info": "Prismatic Crucible Color Info",
"config.jade.plugin_monilabs.microverse_info": "Microverse Projector Info",
"config.jade.plugin_monilabs.sculk_vat_xp_info": "Sculk Vat XP Buffer Info",
"config.monilabs.option.antimatterRandomMaxExclusive": "antimatterRandomMaxExclusive",
"config.monilabs.option.antimatterRandomMinInclusive": "antimatterRandomMinInclusive",
"config.monilabs.option.forcePrideMonth": "forcePrideMonth",
"config.monilabs.option.hostileMicroverseTooltip": "hostileMicroverseTooltip",
"config.monilabs.option.microminerReturnedOnZeroIntegrity": "microminerReturnedOnZeroIntegrity",
Expand All @@ -55,7 +53,6 @@
"emi_info.monilabs.new_microverse": "New type: %s",
"emi_info.monilabs.projector_info": "Projector tier: %d",
"emi_info.monilabs.required_microverse": "Required type: %s",
"gtceu.antimatter_manipulator": "Antimatter Manipulation",
"gtceu.chromatic_processing": "Chromatic Processing",
"gtceu.chromatic_transcendence": "Chromatic Transcendence",
"gtceu.creative_data_multi": "Omniscience Research Beacon",
Expand Down Expand Up @@ -120,7 +117,6 @@
"monilabs.prismatic.color_name.yellow": "§eYellow§r",
"monilabs.prismatic.current_color": "Current color: %s",
"monilabs.recipe.accepted_colors": "Accepted Initial Colors: ",
"monilabs.recipe.antimatter_random_range": "Input and outputs\nvary by %sx-%sx",
"monilabs.recipe.any_input_color": "ANY",
"monilabs.recipe.basic_input": "Primary | Secondary",
"monilabs.recipe.color_list_random_start": "Possible Resulting Colors: \n",
Expand Down
7 changes: 0 additions & 7 deletions src/main/java/net/neganote/monilabs/config/MoniConfig.java
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,6 @@ public static class ValueConfigs {
@Configurable.Comment({ "The exponent used each time the Omnic Synthesizer performs an operation." })
public double omnicSynthesizerExponent = 1.557;

@Configurable
@Configurable.Comment({ "Minimum multiplier to antimatter generation (inclusive)." })
public float antimatterRandomMinInclusive = 0.5f;
@Configurable
@Configurable.Comment({ "Maximum multiplier to antimatter generation (exclusive)." })
public float antimatterRandomMaxExclusive = 2.0f;

@Configurable
@Configurable.Comment({ "Whether the microminer is returned upon a microverse reaching zero integrity." })
public boolean microminerReturnedOnZeroIntegrity = true;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,6 @@ public static void init(RegistrateLangProvider provider) {
provider.add("monilabs.recipe.mistake_input_colors", "You made a mistake defining this recipe's input colors.");
provider.add("monilabs.recipe.mistake_output_colors",
"You made a mistake defining this recipe's output colors.");

provider.add("monilabs.recipe.antimatter_random_range", "Input and outputs\nvary by %sx-%sx");

provider.add("gtceu.antimatter_manipulator", "Antimatter Manipulation");
provider.add("gtceu.chromatic_processing", "Chromatic Processing");
provider.add("gtceu.chromatic_transcendence", "Chromatic Transcendence");
provider.add("gtceu.microverse", "Microverse Mission");
Expand Down
19 changes: 0 additions & 19 deletions src/main/java/net/neganote/monilabs/gtbridge/MoniRecipeTypes.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
import com.gregtechceu.gtceu.api.recipe.GTRecipeType;
import com.gregtechceu.gtceu.common.data.GTRecipeTypes;
import com.gregtechceu.gtceu.common.data.GTSoundEntries;
import com.gregtechceu.gtceu.utils.FormattingUtil;

import com.lowdragmc.lowdraglib.gui.texture.ProgressTexture;
import com.lowdragmc.lowdraglib.utils.LocalizationUtils;
Expand All @@ -16,7 +15,6 @@
import net.neganote.monilabs.common.machine.multiblock.Color;
import net.neganote.monilabs.common.machine.multiblock.Microverse;
import net.neganote.monilabs.common.machine.multiblock.MicroverseProjectorMachine;
import net.neganote.monilabs.config.MoniConfig;

@SuppressWarnings("unused")
public class MoniRecipeTypes {
Expand Down Expand Up @@ -96,23 +94,6 @@ public static GTRecipeType createPrismaCRecipeType(String name) {
public static GTRecipeType CHROMATIC_PROCESSING = createPrismaCRecipeType("chromatic_processing");
public static GTRecipeType CHROMATIC_TRANSCENDENCE = createPrismaCRecipeType("chromatic_transcendence");

public static GTRecipeType ANTIMATTER_MANIPULATOR_RECIPES = GTRecipeTypes
.register("antimatter_manipulator", GTRecipeTypes.MULTIBLOCK)
.setMaxIOSize(1, 1, 3, 1)
.setEUIO(IO.IN)
.addDataInfo(data -> {
if (data.contains("antimatterRandom") && data.getBoolean("antimatterRandom")) {
float minInclusive = MoniConfig.INSTANCE.values.antimatterRandomMinInclusive;
float maxExclusive = MoniConfig.INSTANCE.values.antimatterRandomMaxExclusive;
return LocalizationUtils.format("monilabs.recipe.antimatter_random_range",
FormattingUtil.formatNumber2Places(minInclusive),
FormattingUtil.formatNumber2Places(maxExclusive));
} else {
return "";
}
})
.addDataInfo(data -> "");

public static GTRecipeType MICROVERSE_RECIPES = GTRecipeTypes
.register("microverse", GTRecipeTypes.MULTIBLOCK)
.setEUIO(IO.IN)
Expand Down