Skip to content

Commit 0c460ce

Browse files
Removed antimatter manip stuff (#29)
* Removed useless obsolete stuff - That's it. * Somehow missed a line in committing??? * Fixed my silly :3 * I think I'm done now? * attempted mobile spotless manually --------- Co-authored-by: NegaNote <neganote43@gmail.com>
1 parent 5bc6ae3 commit 0c460ce

File tree

5 files changed

+0
-38
lines changed

5 files changed

+0
-38
lines changed

src/generated/resources/assets/monilabs/lang/en_ud.json

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@
3232
"config.jade.plugin_monilabs.microverse_info": "oɟuI ɹoʇɔǝظoɹԀ ǝsɹǝʌoɹɔıW",
3333
"config.jade.plugin_monilabs.omnic_synth_info": "oɟuI ɹǝzısǝɥʇuʎS ɔıuɯO",
3434
"config.jade.plugin_monilabs.sculk_vat_xp_info": "oɟuI ɹǝɟɟnᗺ ԀX ʇɐΛ ʞןnɔS",
35-
"config.monilabs.option.antimatterRandomMaxExclusive": "ǝʌısnןɔxƎxɐWɯopuɐᴚɹǝʇʇɐɯıʇuɐ",
36-
"config.monilabs.option.antimatterRandomMinInclusive": "ǝʌısnןɔuIuıWɯopuɐᴚɹǝʇʇɐɯıʇuɐ",
3735
"config.monilabs.option.forcePrideMonth": "ɥʇuoWǝpıɹԀǝɔɹoɟ",
3836
"config.monilabs.option.hostileMicroverseTooltip": "dıʇןoo⟘ǝsɹǝʌoɹɔıWǝןıʇsoɥ",
3937
"config.monilabs.option.microminerReturnedOnZeroIntegrity": "ʎʇıɹbǝʇuIoɹǝZuOpǝuɹnʇǝᴚɹǝuıɯoɹɔıɯ",
@@ -56,7 +54,6 @@
5654
"emi_info.monilabs.new_microverse": "%s :ǝdʎʇ ʍǝN",
5755
"emi_info.monilabs.projector_info": "%d :ɹǝıʇ ɹoʇɔǝظoɹԀ",
5856
"emi_info.monilabs.required_microverse": "%s :ǝdʎʇ pǝɹınbǝᴚ",
59-
"gtceu.antimatter_manipulator": "uoıʇɐןndıuɐW ɹǝʇʇɐɯıʇuⱯ",
6057
"gtceu.chromatic_processing": "buıssǝɔoɹԀ ɔıʇɐɯoɹɥƆ",
6158
"gtceu.chromatic_transcendence": "ǝɔuǝpuǝɔsuɐɹ⟘ ɔıʇɐɯoɹɥƆ",
6259
"gtceu.creative_data_multi": "uoɔɐǝᗺ ɥɔɹɐǝsǝᴚ ǝɔuǝıɔsıuɯO",
@@ -121,7 +118,6 @@
121118
"monilabs.prismatic.color_name.yellow": "ɹ§ʍoןןǝʎǝ§",
122119
"monilabs.prismatic.current_color": "%s :ɹoןoɔ ʇuǝɹɹnƆ",
123120
"monilabs.recipe.accepted_colors": " :sɹoןoƆ ןɐıʇıuI pǝʇdǝɔɔⱯ",
124-
"monilabs.recipe.antimatter_random_range": "x%s-x%s ʎq ʎɹɐʌ\nsʇndʇno puɐ ʇnduI",
125121
"monilabs.recipe.any_input_color": "ʎNⱯ",
126122
"monilabs.recipe.basic_input": "ʎɹɐpuoɔǝS | ʎɹɐɯıɹԀ",
127123
"monilabs.recipe.color_list_random_start": "\n :sɹoןoƆ buıʇןnsǝᴚ ǝןqıssoԀ",

src/generated/resources/assets/monilabs/lang/en_us.json

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@
3232
"config.jade.plugin_monilabs.microverse_info": "Microverse Projector Info",
3333
"config.jade.plugin_monilabs.omnic_synth_info": "Omnic Synthesizer Info",
3434
"config.jade.plugin_monilabs.sculk_vat_xp_info": "Sculk Vat XP Buffer Info",
35-
"config.monilabs.option.antimatterRandomMaxExclusive": "antimatterRandomMaxExclusive",
36-
"config.monilabs.option.antimatterRandomMinInclusive": "antimatterRandomMinInclusive",
3735
"config.monilabs.option.forcePrideMonth": "forcePrideMonth",
3836
"config.monilabs.option.hostileMicroverseTooltip": "hostileMicroverseTooltip",
3937
"config.monilabs.option.microminerReturnedOnZeroIntegrity": "microminerReturnedOnZeroIntegrity",
@@ -56,7 +54,6 @@
5654
"emi_info.monilabs.new_microverse": "New type: %s",
5755
"emi_info.monilabs.projector_info": "Projector tier: %d",
5856
"emi_info.monilabs.required_microverse": "Required type: %s",
59-
"gtceu.antimatter_manipulator": "Antimatter Manipulation",
6057
"gtceu.chromatic_processing": "Chromatic Processing",
6158
"gtceu.chromatic_transcendence": "Chromatic Transcendence",
6259
"gtceu.creative_data_multi": "Omniscience Research Beacon",
@@ -121,7 +118,6 @@
121118
"monilabs.prismatic.color_name.yellow": "§eYellow§r",
122119
"monilabs.prismatic.current_color": "Current color: %s",
123120
"monilabs.recipe.accepted_colors": "Accepted Initial Colors: ",
124-
"monilabs.recipe.antimatter_random_range": "Input and outputs\nvary by %sx-%sx",
125121
"monilabs.recipe.any_input_color": "ANY",
126122
"monilabs.recipe.basic_input": "Primary | Secondary",
127123
"monilabs.recipe.color_list_random_start": "Possible Resulting Colors: \n",

src/main/java/net/neganote/monilabs/config/MoniConfig.java

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,6 @@ public static class ValueConfigs {
2929
@Configurable.Comment({ "The exponent used each time the Omnic Synthesizer performs an operation." })
3030
public double omnicSynthesizerExponent = 1.557;
3131

32-
@Configurable
33-
@Configurable.Comment({ "Minimum multiplier to antimatter generation (inclusive)." })
34-
public float antimatterRandomMinInclusive = 0.5f;
35-
@Configurable
36-
@Configurable.Comment({ "Maximum multiplier to antimatter generation (exclusive)." })
37-
public float antimatterRandomMaxExclusive = 2.0f;
38-
3932
@Configurable
4033
@Configurable.Comment({ "Whether the microminer is returned upon a microverse reaching zero integrity." })
4134
public boolean microminerReturnedOnZeroIntegrity = true;

src/main/java/net/neganote/monilabs/data/lang/MoniLangHandler.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,6 @@ public static void init(RegistrateLangProvider provider) {
5353
provider.add("monilabs.recipe.mistake_input_colors", "You made a mistake defining this recipe's input colors.");
5454
provider.add("monilabs.recipe.mistake_output_colors",
5555
"You made a mistake defining this recipe's output colors.");
56-
57-
provider.add("monilabs.recipe.antimatter_random_range", "Input and outputs\nvary by %sx-%sx");
58-
59-
provider.add("gtceu.antimatter_manipulator", "Antimatter Manipulation");
6056
provider.add("gtceu.chromatic_processing", "Chromatic Processing");
6157
provider.add("gtceu.chromatic_transcendence", "Chromatic Transcendence");
6258
provider.add("gtceu.microverse", "Microverse Mission");

src/main/java/net/neganote/monilabs/gtbridge/MoniRecipeTypes.java

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import com.gregtechceu.gtceu.api.recipe.GTRecipeType;
66
import com.gregtechceu.gtceu.common.data.GTRecipeTypes;
77
import com.gregtechceu.gtceu.common.data.GTSoundEntries;
8-
import com.gregtechceu.gtceu.utils.FormattingUtil;
98

109
import com.lowdragmc.lowdraglib.gui.texture.ProgressTexture;
1110
import com.lowdragmc.lowdraglib.utils.LocalizationUtils;
@@ -16,7 +15,6 @@
1615
import net.neganote.monilabs.common.machine.multiblock.Color;
1716
import net.neganote.monilabs.common.machine.multiblock.Microverse;
1817
import net.neganote.monilabs.common.machine.multiblock.MicroverseProjectorMachine;
19-
import net.neganote.monilabs.config.MoniConfig;
2018

2119
@SuppressWarnings("unused")
2220
public class MoniRecipeTypes {
@@ -96,23 +94,6 @@ public static GTRecipeType createPrismaCRecipeType(String name) {
9694
public static GTRecipeType CHROMATIC_PROCESSING = createPrismaCRecipeType("chromatic_processing");
9795
public static GTRecipeType CHROMATIC_TRANSCENDENCE = createPrismaCRecipeType("chromatic_transcendence");
9896

99-
public static GTRecipeType ANTIMATTER_MANIPULATOR_RECIPES = GTRecipeTypes
100-
.register("antimatter_manipulator", GTRecipeTypes.MULTIBLOCK)
101-
.setMaxIOSize(1, 1, 3, 1)
102-
.setEUIO(IO.IN)
103-
.addDataInfo(data -> {
104-
if (data.contains("antimatterRandom") && data.getBoolean("antimatterRandom")) {
105-
float minInclusive = MoniConfig.INSTANCE.values.antimatterRandomMinInclusive;
106-
float maxExclusive = MoniConfig.INSTANCE.values.antimatterRandomMaxExclusive;
107-
return LocalizationUtils.format("monilabs.recipe.antimatter_random_range",
108-
FormattingUtil.formatNumber2Places(minInclusive),
109-
FormattingUtil.formatNumber2Places(maxExclusive));
110-
} else {
111-
return "";
112-
}
113-
})
114-
.addDataInfo(data -> "");
115-
11697
public static GTRecipeType MICROVERSE_RECIPES = GTRecipeTypes
11798
.register("microverse", GTRecipeTypes.MULTIBLOCK)
11899
.setEUIO(IO.IN)

0 commit comments

Comments
 (0)