Skip to content

Commit 52561ba

Browse files
authored
rename converter configs back to euToFE from euToPlatformNative (GregTechCEu#2387)
1 parent bcd85b4 commit 52561ba

File tree

17 files changed

+46
-47
lines changed

17 files changed

+46
-47
lines changed

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2253,9 +2253,9 @@
22532253
"config.gtceu.option.dumpRecipes": "sǝdıɔǝᴚdɯnp",
22542254
"config.gtceu.option.enableCleanroom": "ɯooɹuɐǝןƆǝןqɐuǝ",
22552255
"config.gtceu.option.enableCompass": "ssɐdɯoƆǝןqɐuǝ",
2256+
"config.gtceu.option.enableFEConverters": "sɹǝʇɹǝʌuoƆƎℲǝןqɐuǝ",
22562257
"config.gtceu.option.enableMaintenance": "ǝɔuɐuǝʇuıɐWǝןqɐuǝ",
22572258
"config.gtceu.option.enableMoreDualHatchAbility": "ʎʇıןıqⱯɥɔʇɐHןɐnᗡǝɹoWǝןqɐuǝ",
2258-
"config.gtceu.option.enablePlatformConverters": "sɹǝʇɹǝʌuoƆɯɹoɟʇɐןԀǝןqɐuǝ",
22592259
"config.gtceu.option.enableResearch": "ɥɔɹɐǝsǝᴚǝןqɐuǝ",
22602260
"config.gtceu.option.enableTieredCasings": "sbuısɐƆpǝɹǝı⟘ǝןqɐuǝ",
22612261
"config.gtceu.option.enableWorldAccelerators": "sɹoʇɐɹǝןǝɔɔⱯpןɹoMǝןqɐuǝ",
@@ -2265,7 +2265,8 @@
22652265
"config.gtceu.option.energyUsageMultiplier": "ɹǝıןdıʇןnWǝbɐs∩ʎbɹǝuǝ",
22662266
"config.gtceu.option.environmentalHazardDecayRate": "ǝʇɐᴚʎɐɔǝᗡpɹɐzɐHןɐʇuǝɯuoɹıʌuǝ",
22672267
"config.gtceu.option.environmentalHazards": "spɹɐzɐHןɐʇuǝɯuoɹıʌuǝ",
2268-
"config.gtceu.option.euToPlatformRatio": "oıʇɐᴚɯɹoɟʇɐןԀo⟘nǝ",
2268+
"config.gtceu.option.euToFeRatio": "oıʇɐᴚǝℲo⟘nǝ",
2269+
"config.gtceu.option.feToEuRatio": "oıʇɐᴚnƎo⟘ǝɟ",
22692270
"config.gtceu.option.flintAndSteelRequireSteel": "ןǝǝʇSǝɹınbǝᴚןǝǝʇSpuⱯʇuıןɟ",
22702271
"config.gtceu.option.gameplay": "ʎɐןdǝɯɐb",
22712272
"config.gtceu.option.generateLowQualityGems": "sɯǝ⅁ʎʇıןɐnὉʍoꞀǝʇɐɹǝuǝb",
@@ -2286,8 +2287,8 @@
22862287
"config.gtceu.option.harderRods": "spoᴚɹǝpɹɐɥ",
22872288
"config.gtceu.option.harmlessActiveTransformers": "sɹǝɯɹoɟsuɐɹ⟘ǝʌıʇɔⱯssǝןɯɹɐɥ",
22882289
"config.gtceu.option.hazardsEnabled": "pǝןqɐuƎspɹɐzɐɥ",
2289-
"config.gtceu.option.hideFacadesInJEI": "IƎſuIsǝpɐɔɐℲǝpıɥ",
2290-
"config.gtceu.option.hideFilledCellsInJEI": "IƎſuIsןןǝƆpǝןןıℲǝpıɥ",
2290+
"config.gtceu.option.hideFacadesInRecipeViewer": "ɹǝʍǝıΛǝdıɔǝᴚuIsǝpɐɔɐℲǝpıɥ",
2291+
"config.gtceu.option.hideFilledCellsInRecipeViewer": "ɹǝʍǝıΛǝdıɔǝᴚuIsןןǝƆpǝןןıℲǝpıɥ",
22912292
"config.gtceu.option.hideOreProcessingDiagrams": "sɯɐɹbɐıᗡbuıssǝɔoɹԀǝɹOǝpıɥ",
22922293
"config.gtceu.option.highTierContent": "ʇuǝʇuoƆɹǝı⟘ɥbıɥ",
22932294
"config.gtceu.option.hpLiquidBoilerBaseOutput": "ʇndʇnOǝsɐᗺɹǝןıoᗺpınbıꞀdɥ",
@@ -2311,7 +2312,7 @@
23112312
"config.gtceu.option.nanoSaber": "ɹǝqɐSouɐu",
23122313
"config.gtceu.option.nanoSaberBaseDamage": "ǝbɐɯɐᗡǝsɐᗺɹǝqɐSouɐu",
23132314
"config.gtceu.option.nanoSaberDamageBoost": "ʇsooᗺǝbɐɯɐᗡɹǝqɐSouɐu",
2314-
"config.gtceu.option.nativeEUToPlatformNative": "ǝʌıʇɐNɯɹoɟʇɐןԀo⟘∩Ǝǝʌıʇɐu",
2315+
"config.gtceu.option.nativeEUToFE": "ƎℲo⟘∩Ǝǝʌıʇɐu",
23152316
"config.gtceu.option.nerfPaperCrafting": "buıʇɟɐɹƆɹǝdɐԀɟɹǝu",
23162317
"config.gtceu.option.nerfWoodCrafting": "buıʇɟɐɹƆpooMɟɹǝu",
23172318
"config.gtceu.option.onlyOwnerBreak": "ʞɐǝɹᗺɹǝuʍOʎןuo",
@@ -2329,7 +2330,6 @@
23292330
"config.gtceu.option.oreVeins": "suıǝΛǝɹo",
23302331
"config.gtceu.option.overclockDivisor": "ɹosıʌıᗡʞɔoןɔɹǝʌo",
23312332
"config.gtceu.option.ownerOPBypass": "ssɐdʎᗺԀOɹǝuʍo",
2332-
"config.gtceu.option.platformToEuRatio": "oıʇɐᴚnƎo⟘ɯɹoɟʇɐןd",
23332333
"config.gtceu.option.prospectorEnergyUseMultiplier": "ɹǝıןdıʇןnWǝs∩ʎbɹǝuƎɹoʇɔǝdsoɹd",
23342334
"config.gtceu.option.recipeProgressLowEnergy": "ʎbɹǝuƎʍoꞀssǝɹboɹԀǝdıɔǝɹ",
23352335
"config.gtceu.option.recipes": "sǝdıɔǝɹ",

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2253,9 +2253,9 @@
22532253
"config.gtceu.option.dumpRecipes": "dumpRecipes",
22542254
"config.gtceu.option.enableCleanroom": "enableCleanroom",
22552255
"config.gtceu.option.enableCompass": "enableCompass",
2256+
"config.gtceu.option.enableFEConverters": "enableFEConverters",
22562257
"config.gtceu.option.enableMaintenance": "enableMaintenance",
22572258
"config.gtceu.option.enableMoreDualHatchAbility": "enableMoreDualHatchAbility",
2258-
"config.gtceu.option.enablePlatformConverters": "enablePlatformConverters",
22592259
"config.gtceu.option.enableResearch": "enableResearch",
22602260
"config.gtceu.option.enableTieredCasings": "enableTieredCasings",
22612261
"config.gtceu.option.enableWorldAccelerators": "enableWorldAccelerators",
@@ -2265,7 +2265,8 @@
22652265
"config.gtceu.option.energyUsageMultiplier": "energyUsageMultiplier",
22662266
"config.gtceu.option.environmentalHazardDecayRate": "environmentalHazardDecayRate",
22672267
"config.gtceu.option.environmentalHazards": "environmentalHazards",
2268-
"config.gtceu.option.euToPlatformRatio": "euToPlatformRatio",
2268+
"config.gtceu.option.euToFeRatio": "euToFeRatio",
2269+
"config.gtceu.option.feToEuRatio": "feToEuRatio",
22692270
"config.gtceu.option.flintAndSteelRequireSteel": "flintAndSteelRequireSteel",
22702271
"config.gtceu.option.gameplay": "gameplay",
22712272
"config.gtceu.option.generateLowQualityGems": "generateLowQualityGems",
@@ -2286,8 +2287,8 @@
22862287
"config.gtceu.option.harderRods": "harderRods",
22872288
"config.gtceu.option.harmlessActiveTransformers": "harmlessActiveTransformers",
22882289
"config.gtceu.option.hazardsEnabled": "hazardsEnabled",
2289-
"config.gtceu.option.hideFacadesInJEI": "hideFacadesInJEI",
2290-
"config.gtceu.option.hideFilledCellsInJEI": "hideFilledCellsInJEI",
2290+
"config.gtceu.option.hideFacadesInRecipeViewer": "hideFacadesInRecipeViewer",
2291+
"config.gtceu.option.hideFilledCellsInRecipeViewer": "hideFilledCellsInRecipeViewer",
22912292
"config.gtceu.option.hideOreProcessingDiagrams": "hideOreProcessingDiagrams",
22922293
"config.gtceu.option.highTierContent": "highTierContent",
22932294
"config.gtceu.option.hpLiquidBoilerBaseOutput": "hpLiquidBoilerBaseOutput",
@@ -2311,7 +2312,7 @@
23112312
"config.gtceu.option.nanoSaber": "nanoSaber",
23122313
"config.gtceu.option.nanoSaberBaseDamage": "nanoSaberBaseDamage",
23132314
"config.gtceu.option.nanoSaberDamageBoost": "nanoSaberDamageBoost",
2314-
"config.gtceu.option.nativeEUToPlatformNative": "nativeEUToPlatformNative",
2315+
"config.gtceu.option.nativeEUToFE": "nativeEUToFE",
23152316
"config.gtceu.option.nerfPaperCrafting": "nerfPaperCrafting",
23162317
"config.gtceu.option.nerfWoodCrafting": "nerfWoodCrafting",
23172318
"config.gtceu.option.onlyOwnerBreak": "onlyOwnerBreak",
@@ -2329,7 +2330,6 @@
23292330
"config.gtceu.option.oreVeins": "oreVeins",
23302331
"config.gtceu.option.overclockDivisor": "overclockDivisor",
23312332
"config.gtceu.option.ownerOPBypass": "ownerOPBypass",
2332-
"config.gtceu.option.platformToEuRatio": "platformToEuRatio",
23332333
"config.gtceu.option.prospectorEnergyUseMultiplier": "prospectorEnergyUseMultiplier",
23342334
"config.gtceu.option.recipeProgressLowEnergy": "recipeProgressLowEnergy",
23352335
"config.gtceu.option.recipes": "recipes",

src/main/java/com/gregtechceu/gtceu/api/capability/compat/EUToFEProvider.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public EUToFEProvider(BlockEntity tileEntity) {
3131

3232
@Override
3333
public <T> LazyOptional<T> getCapability(@NotNull Capability<T> capability, Direction facing) {
34-
if (!ConfigHolder.INSTANCE.compat.energy.nativeEUToPlatformNative ||
34+
if (!ConfigHolder.INSTANCE.compat.energy.nativeEUToFE ||
3535
capability != GTCapability.CAPABILITY_ENERGY_CONTAINER)
3636
return LazyOptional.empty();
3737

src/main/java/com/gregtechceu/gtceu/api/capability/compat/FeCompat.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ public class FeCompat {
1010
* Conversion ratio used by energy converters
1111
*/
1212
public static int ratio(boolean feToEu) {
13-
return feToEu ? ConfigHolder.INSTANCE.compat.energy.platformToEuRatio :
14-
ConfigHolder.INSTANCE.compat.energy.euToPlatformRatio;
13+
return feToEu ? ConfigHolder.INSTANCE.compat.energy.feToEuRatio :
14+
ConfigHolder.INSTANCE.compat.energy.euToFeRatio;
1515
}
1616

1717
/**

src/main/java/com/gregtechceu/gtceu/api/item/component/ElectricStats.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ public void inventoryTick(ItemStack stack, Level level, Entity entity, int slotI
109109
transferLimit -= chargedAmount;
110110
if (transferLimit == 0L) break;
111111
}
112-
} else if (ConfigHolder.INSTANCE.compat.energy.nativeEUToPlatformNative) {
112+
} else if (ConfigHolder.INSTANCE.compat.energy.nativeEUToFE) {
113113
var feEnergyItem = GTCapabilityHelper.getForgeEnergyItem(itemInSlot);
114114
if (feEnergyItem != null && feEnergyItem.canReceive() &&
115115
feEnergyItem.getEnergyStored() < feEnergyItem.getMaxEnergyStored()) {

src/main/java/com/gregtechceu/gtceu/api/machine/SimpleTieredMachine.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ public ManagedFieldHolder getFieldHolder() {
126126
protected CustomItemStackHandler createChargerItemHandler(Object... args) {
127127
var handler = new CustomItemStackHandler();
128128
handler.setFilter(item -> GTCapabilityHelper.getElectricItem(item) != null ||
129-
(ConfigHolder.INSTANCE.compat.energy.nativeEUToPlatformNative &&
129+
(ConfigHolder.INSTANCE.compat.energy.nativeEUToFE &&
130130
GTCapabilityHelper.getForgeEnergyItem(item) != null));
131131
return handler;
132132
}

src/main/java/com/gregtechceu/gtceu/api/machine/trait/NotifiableEnergyContainer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ public boolean dischargeOrRechargeEnergyContainers(IItemHandlerModifiable itemHa
197197
}
198198
return true;
199199
}
200-
} else if (ConfigHolder.INSTANCE.compat.energy.nativeEUToPlatformNative) {
200+
} else if (ConfigHolder.INSTANCE.compat.energy.nativeEUToFE) {
201201
IEnergyStorage energyStorage = GTCapabilityHelper.getForgeEnergyItem(stackInSlot);
202202
if (energyStorage != null && handleForgeEnergyItem(energyStorage, simulate)) {
203203
if (!simulate) {

src/main/java/com/gregtechceu/gtceu/common/CommonProxy.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ public CommonProxy() {
9393
GTCEuAPI.initializeHighTier();
9494
if (Platform.isDevEnv()) {
9595
ConfigHolder.INSTANCE.recipes.generateLowQualityGems = true;
96-
ConfigHolder.INSTANCE.compat.energy.enablePlatformConverters = true;
96+
ConfigHolder.INSTANCE.compat.energy.enableFEConverters = true;
9797
}
9898

9999
GTValueProviderTypes.init(eventBus);

src/main/java/com/gregtechceu/gtceu/common/data/GTMachines.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2707,7 +2707,7 @@ public static MachineDefinition registerDrum(Material material, int capacity, St
27072707
}
27082708

27092709
public static MachineDefinition[] registerConverter(int amperage) {
2710-
if (!ConfigHolder.INSTANCE.compat.energy.enablePlatformConverters) {
2710+
if (!ConfigHolder.INSTANCE.compat.energy.enableFEConverters) {
27112711
REGISTRATE.creativeModeTab(() -> null);
27122712
}
27132713

@@ -2731,7 +2731,7 @@ public static MachineDefinition[] registerConverter(int amperage) {
27312731
.register(),
27322732
ALL_TIERS);
27332733

2734-
if (!ConfigHolder.INSTANCE.compat.energy.enablePlatformConverters) {
2734+
if (!ConfigHolder.INSTANCE.compat.energy.enableFEConverters) {
27352735
REGISTRATE.creativeModeTab(() -> MACHINE);
27362736
}
27372737

src/main/java/com/gregtechceu/gtceu/common/machine/electric/BatteryBufferMachine.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ public int getSlotLimit(int slot) {
9191
}
9292
};
9393
handler.setFilter(item -> GTCapabilityHelper.getElectricItem(item) != null ||
94-
(ConfigHolder.INSTANCE.compat.energy.nativeEUToPlatformNative &&
94+
(ConfigHolder.INSTANCE.compat.energy.nativeEUToFE &&
9595
GTCapabilityHelper.getForgeEnergyItem(item) != null));
9696
return handler;
9797
}
@@ -157,7 +157,7 @@ private List<Object> getNonFullBatteries() {
157157
if (electricItem.getCharge() < electricItem.getMaxCharge()) {
158158
batteries.add(electricItem);
159159
}
160-
} else if (ConfigHolder.INSTANCE.compat.energy.nativeEUToPlatformNative) {
160+
} else if (ConfigHolder.INSTANCE.compat.energy.nativeEUToFE) {
161161
IEnergyStorage energyStorage = GTCapabilityHelper.getForgeEnergyItem(batteryStack);
162162
if (energyStorage != null) {
163163
if (energyStorage.getEnergyStored() < energyStorage.getMaxEnergyStored()) {
@@ -190,7 +190,7 @@ private List<Object> getAllBatteries() {
190190
var electricItem = GTCapabilityHelper.getElectricItem(batteryStack);
191191
if (electricItem != null) {
192192
batteries.add(electricItem);
193-
} else if (ConfigHolder.INSTANCE.compat.energy.nativeEUToPlatformNative) {
193+
} else if (ConfigHolder.INSTANCE.compat.energy.nativeEUToFE) {
194194
IEnergyStorage energyStorage = GTCapabilityHelper.getForgeEnergyItem(batteryStack);
195195
if (energyStorage != null) {
196196
batteries.add(energyStorage);

0 commit comments

Comments
 (0)