diff --git a/src/generated/resources/assets/gtceu/lang/en_ud.json b/src/generated/resources/assets/gtceu/lang/en_ud.json index 56e170dce8..8b38d4c810 100644 --- a/src/generated/resources/assets/gtceu/lang/en_ud.json +++ b/src/generated/resources/assets/gtceu/lang/en_ud.json @@ -2253,9 +2253,9 @@ "config.gtceu.option.dumpRecipes": "sǝdıɔǝᴚdɯnp", "config.gtceu.option.enableCleanroom": "ɯooɹuɐǝןƆǝןqɐuǝ", "config.gtceu.option.enableCompass": "ssɐdɯoƆǝןqɐuǝ", + "config.gtceu.option.enableFEConverters": "sɹǝʇɹǝʌuoƆƎℲǝןqɐuǝ", "config.gtceu.option.enableMaintenance": "ǝɔuɐuǝʇuıɐWǝןqɐuǝ", "config.gtceu.option.enableMoreDualHatchAbility": "ʎʇıןıqⱯɥɔʇɐHןɐnᗡǝɹoWǝןqɐuǝ", - "config.gtceu.option.enablePlatformConverters": "sɹǝʇɹǝʌuoƆɯɹoɟʇɐןԀǝןqɐuǝ", "config.gtceu.option.enableResearch": "ɥɔɹɐǝsǝᴚǝןqɐuǝ", "config.gtceu.option.enableTieredCasings": "sbuısɐƆpǝɹǝı⟘ǝןqɐuǝ", "config.gtceu.option.enableWorldAccelerators": "sɹoʇɐɹǝןǝɔɔⱯpןɹoMǝןqɐuǝ", @@ -2265,7 +2265,8 @@ "config.gtceu.option.energyUsageMultiplier": "ɹǝıןdıʇןnWǝbɐs∩ʎbɹǝuǝ", "config.gtceu.option.environmentalHazardDecayRate": "ǝʇɐᴚʎɐɔǝᗡpɹɐzɐHןɐʇuǝɯuoɹıʌuǝ", "config.gtceu.option.environmentalHazards": "spɹɐzɐHןɐʇuǝɯuoɹıʌuǝ", - "config.gtceu.option.euToPlatformRatio": "oıʇɐᴚɯɹoɟʇɐןԀo⟘nǝ", + "config.gtceu.option.euToFeRatio": "oıʇɐᴚǝℲo⟘nǝ", + "config.gtceu.option.feToEuRatio": "oıʇɐᴚnƎo⟘ǝɟ", "config.gtceu.option.flintAndSteelRequireSteel": "ןǝǝʇSǝɹınbǝᴚןǝǝʇSpuⱯʇuıןɟ", "config.gtceu.option.gameplay": "ʎɐןdǝɯɐb", "config.gtceu.option.generateLowQualityGems": "sɯǝ⅁ʎʇıןɐnὉʍoꞀǝʇɐɹǝuǝb", @@ -2286,8 +2287,8 @@ "config.gtceu.option.harderRods": "spoᴚɹǝpɹɐɥ", "config.gtceu.option.harmlessActiveTransformers": "sɹǝɯɹoɟsuɐɹ⟘ǝʌıʇɔⱯssǝןɯɹɐɥ", "config.gtceu.option.hazardsEnabled": "pǝןqɐuƎspɹɐzɐɥ", - "config.gtceu.option.hideFacadesInJEI": "IƎſuIsǝpɐɔɐℲǝpıɥ", - "config.gtceu.option.hideFilledCellsInJEI": "IƎſuIsןןǝƆpǝןןıℲǝpıɥ", + "config.gtceu.option.hideFacadesInRecipeViewer": "ɹǝʍǝıΛǝdıɔǝᴚuIsǝpɐɔɐℲǝpıɥ", + "config.gtceu.option.hideFilledCellsInRecipeViewer": "ɹǝʍǝıΛǝdıɔǝᴚuIsןןǝƆpǝןןıℲǝpıɥ", "config.gtceu.option.hideOreProcessingDiagrams": "sɯɐɹbɐıᗡbuıssǝɔoɹԀǝɹOǝpıɥ", "config.gtceu.option.highTierContent": "ʇuǝʇuoƆɹǝı⟘ɥbıɥ", "config.gtceu.option.hpLiquidBoilerBaseOutput": "ʇndʇnOǝsɐᗺɹǝןıoᗺpınbıꞀdɥ", @@ -2311,7 +2312,7 @@ "config.gtceu.option.nanoSaber": "ɹǝqɐSouɐu", "config.gtceu.option.nanoSaberBaseDamage": "ǝbɐɯɐᗡǝsɐᗺɹǝqɐSouɐu", "config.gtceu.option.nanoSaberDamageBoost": "ʇsooᗺǝbɐɯɐᗡɹǝqɐSouɐu", - "config.gtceu.option.nativeEUToPlatformNative": "ǝʌıʇɐNɯɹoɟʇɐןԀo⟘∩Ǝǝʌıʇɐu", + "config.gtceu.option.nativeEUToFE": "ƎℲo⟘∩Ǝǝʌıʇɐu", "config.gtceu.option.nerfPaperCrafting": "buıʇɟɐɹƆɹǝdɐԀɟɹǝu", "config.gtceu.option.nerfWoodCrafting": "buıʇɟɐɹƆpooMɟɹǝu", "config.gtceu.option.onlyOwnerBreak": "ʞɐǝɹᗺɹǝuʍOʎןuo", @@ -2329,7 +2330,6 @@ "config.gtceu.option.oreVeins": "suıǝΛǝɹo", "config.gtceu.option.overclockDivisor": "ɹosıʌıᗡʞɔoןɔɹǝʌo", "config.gtceu.option.ownerOPBypass": "ssɐdʎᗺԀOɹǝuʍo", - "config.gtceu.option.platformToEuRatio": "oıʇɐᴚnƎo⟘ɯɹoɟʇɐןd", "config.gtceu.option.prospectorEnergyUseMultiplier": "ɹǝıןdıʇןnWǝs∩ʎbɹǝuƎɹoʇɔǝdsoɹd", "config.gtceu.option.recipeProgressLowEnergy": "ʎbɹǝuƎʍoꞀssǝɹboɹԀǝdıɔǝɹ", "config.gtceu.option.recipes": "sǝdıɔǝɹ", diff --git a/src/generated/resources/assets/gtceu/lang/en_us.json b/src/generated/resources/assets/gtceu/lang/en_us.json index 05764ca722..9f668b10ec 100644 --- a/src/generated/resources/assets/gtceu/lang/en_us.json +++ b/src/generated/resources/assets/gtceu/lang/en_us.json @@ -2253,9 +2253,9 @@ "config.gtceu.option.dumpRecipes": "dumpRecipes", "config.gtceu.option.enableCleanroom": "enableCleanroom", "config.gtceu.option.enableCompass": "enableCompass", + "config.gtceu.option.enableFEConverters": "enableFEConverters", "config.gtceu.option.enableMaintenance": "enableMaintenance", "config.gtceu.option.enableMoreDualHatchAbility": "enableMoreDualHatchAbility", - "config.gtceu.option.enablePlatformConverters": "enablePlatformConverters", "config.gtceu.option.enableResearch": "enableResearch", "config.gtceu.option.enableTieredCasings": "enableTieredCasings", "config.gtceu.option.enableWorldAccelerators": "enableWorldAccelerators", @@ -2265,7 +2265,8 @@ "config.gtceu.option.energyUsageMultiplier": "energyUsageMultiplier", "config.gtceu.option.environmentalHazardDecayRate": "environmentalHazardDecayRate", "config.gtceu.option.environmentalHazards": "environmentalHazards", - "config.gtceu.option.euToPlatformRatio": "euToPlatformRatio", + "config.gtceu.option.euToFeRatio": "euToFeRatio", + "config.gtceu.option.feToEuRatio": "feToEuRatio", "config.gtceu.option.flintAndSteelRequireSteel": "flintAndSteelRequireSteel", "config.gtceu.option.gameplay": "gameplay", "config.gtceu.option.generateLowQualityGems": "generateLowQualityGems", @@ -2286,8 +2287,8 @@ "config.gtceu.option.harderRods": "harderRods", "config.gtceu.option.harmlessActiveTransformers": "harmlessActiveTransformers", "config.gtceu.option.hazardsEnabled": "hazardsEnabled", - "config.gtceu.option.hideFacadesInJEI": "hideFacadesInJEI", - "config.gtceu.option.hideFilledCellsInJEI": "hideFilledCellsInJEI", + "config.gtceu.option.hideFacadesInRecipeViewer": "hideFacadesInRecipeViewer", + "config.gtceu.option.hideFilledCellsInRecipeViewer": "hideFilledCellsInRecipeViewer", "config.gtceu.option.hideOreProcessingDiagrams": "hideOreProcessingDiagrams", "config.gtceu.option.highTierContent": "highTierContent", "config.gtceu.option.hpLiquidBoilerBaseOutput": "hpLiquidBoilerBaseOutput", @@ -2311,7 +2312,7 @@ "config.gtceu.option.nanoSaber": "nanoSaber", "config.gtceu.option.nanoSaberBaseDamage": "nanoSaberBaseDamage", "config.gtceu.option.nanoSaberDamageBoost": "nanoSaberDamageBoost", - "config.gtceu.option.nativeEUToPlatformNative": "nativeEUToPlatformNative", + "config.gtceu.option.nativeEUToFE": "nativeEUToFE", "config.gtceu.option.nerfPaperCrafting": "nerfPaperCrafting", "config.gtceu.option.nerfWoodCrafting": "nerfWoodCrafting", "config.gtceu.option.onlyOwnerBreak": "onlyOwnerBreak", @@ -2329,7 +2330,6 @@ "config.gtceu.option.oreVeins": "oreVeins", "config.gtceu.option.overclockDivisor": "overclockDivisor", "config.gtceu.option.ownerOPBypass": "ownerOPBypass", - "config.gtceu.option.platformToEuRatio": "platformToEuRatio", "config.gtceu.option.prospectorEnergyUseMultiplier": "prospectorEnergyUseMultiplier", "config.gtceu.option.recipeProgressLowEnergy": "recipeProgressLowEnergy", "config.gtceu.option.recipes": "recipes", diff --git a/src/main/java/com/gregtechceu/gtceu/api/capability/compat/EUToFEProvider.java b/src/main/java/com/gregtechceu/gtceu/api/capability/compat/EUToFEProvider.java index c14b7f7291..c5203fce0a 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/capability/compat/EUToFEProvider.java +++ b/src/main/java/com/gregtechceu/gtceu/api/capability/compat/EUToFEProvider.java @@ -31,7 +31,7 @@ public EUToFEProvider(BlockEntity tileEntity) { @Override public LazyOptional getCapability(@NotNull Capability capability, Direction facing) { - if (!ConfigHolder.INSTANCE.compat.energy.nativeEUToPlatformNative || + if (!ConfigHolder.INSTANCE.compat.energy.nativeEUToFE || capability != GTCapability.CAPABILITY_ENERGY_CONTAINER) return LazyOptional.empty(); diff --git a/src/main/java/com/gregtechceu/gtceu/api/capability/compat/FeCompat.java b/src/main/java/com/gregtechceu/gtceu/api/capability/compat/FeCompat.java index c838d60762..1357ca0819 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/capability/compat/FeCompat.java +++ b/src/main/java/com/gregtechceu/gtceu/api/capability/compat/FeCompat.java @@ -10,8 +10,8 @@ public class FeCompat { * Conversion ratio used by energy converters */ public static int ratio(boolean feToEu) { - return feToEu ? ConfigHolder.INSTANCE.compat.energy.platformToEuRatio : - ConfigHolder.INSTANCE.compat.energy.euToPlatformRatio; + return feToEu ? ConfigHolder.INSTANCE.compat.energy.feToEuRatio : + ConfigHolder.INSTANCE.compat.energy.euToFeRatio; } /** diff --git a/src/main/java/com/gregtechceu/gtceu/api/item/component/ElectricStats.java b/src/main/java/com/gregtechceu/gtceu/api/item/component/ElectricStats.java index e2f2a08a00..f761d775da 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/item/component/ElectricStats.java +++ b/src/main/java/com/gregtechceu/gtceu/api/item/component/ElectricStats.java @@ -109,7 +109,7 @@ public void inventoryTick(ItemStack stack, Level level, Entity entity, int slotI transferLimit -= chargedAmount; if (transferLimit == 0L) break; } - } else if (ConfigHolder.INSTANCE.compat.energy.nativeEUToPlatformNative) { + } else if (ConfigHolder.INSTANCE.compat.energy.nativeEUToFE) { var feEnergyItem = GTCapabilityHelper.getForgeEnergyItem(itemInSlot); if (feEnergyItem != null && feEnergyItem.canReceive() && feEnergyItem.getEnergyStored() < feEnergyItem.getMaxEnergyStored()) { diff --git a/src/main/java/com/gregtechceu/gtceu/api/machine/SimpleTieredMachine.java b/src/main/java/com/gregtechceu/gtceu/api/machine/SimpleTieredMachine.java index 34db2b9775..9bf1be500e 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/machine/SimpleTieredMachine.java +++ b/src/main/java/com/gregtechceu/gtceu/api/machine/SimpleTieredMachine.java @@ -126,7 +126,7 @@ public ManagedFieldHolder getFieldHolder() { protected CustomItemStackHandler createChargerItemHandler(Object... args) { var handler = new CustomItemStackHandler(); handler.setFilter(item -> GTCapabilityHelper.getElectricItem(item) != null || - (ConfigHolder.INSTANCE.compat.energy.nativeEUToPlatformNative && + (ConfigHolder.INSTANCE.compat.energy.nativeEUToFE && GTCapabilityHelper.getForgeEnergyItem(item) != null)); return handler; } diff --git a/src/main/java/com/gregtechceu/gtceu/api/machine/trait/NotifiableEnergyContainer.java b/src/main/java/com/gregtechceu/gtceu/api/machine/trait/NotifiableEnergyContainer.java index 6040893924..3ccf38e7c8 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/machine/trait/NotifiableEnergyContainer.java +++ b/src/main/java/com/gregtechceu/gtceu/api/machine/trait/NotifiableEnergyContainer.java @@ -197,7 +197,7 @@ public boolean dischargeOrRechargeEnergyContainers(IItemHandlerModifiable itemHa } return true; } - } else if (ConfigHolder.INSTANCE.compat.energy.nativeEUToPlatformNative) { + } else if (ConfigHolder.INSTANCE.compat.energy.nativeEUToFE) { IEnergyStorage energyStorage = GTCapabilityHelper.getForgeEnergyItem(stackInSlot); if (energyStorage != null && handleForgeEnergyItem(energyStorage, simulate)) { if (!simulate) { diff --git a/src/main/java/com/gregtechceu/gtceu/common/CommonProxy.java b/src/main/java/com/gregtechceu/gtceu/common/CommonProxy.java index c7f09428d9..d45f3f0515 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/CommonProxy.java +++ b/src/main/java/com/gregtechceu/gtceu/common/CommonProxy.java @@ -93,7 +93,7 @@ public CommonProxy() { GTCEuAPI.initializeHighTier(); if (Platform.isDevEnv()) { ConfigHolder.INSTANCE.recipes.generateLowQualityGems = true; - ConfigHolder.INSTANCE.compat.energy.enablePlatformConverters = true; + ConfigHolder.INSTANCE.compat.energy.enableFEConverters = true; } GTValueProviderTypes.init(eventBus); diff --git a/src/main/java/com/gregtechceu/gtceu/common/data/GTMachines.java b/src/main/java/com/gregtechceu/gtceu/common/data/GTMachines.java index 58eb1404f9..e2bc51be1d 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/data/GTMachines.java +++ b/src/main/java/com/gregtechceu/gtceu/common/data/GTMachines.java @@ -2707,7 +2707,7 @@ public static MachineDefinition registerDrum(Material material, int capacity, St } public static MachineDefinition[] registerConverter(int amperage) { - if (!ConfigHolder.INSTANCE.compat.energy.enablePlatformConverters) { + if (!ConfigHolder.INSTANCE.compat.energy.enableFEConverters) { REGISTRATE.creativeModeTab(() -> null); } @@ -2731,7 +2731,7 @@ public static MachineDefinition[] registerConverter(int amperage) { .register(), ALL_TIERS); - if (!ConfigHolder.INSTANCE.compat.energy.enablePlatformConverters) { + if (!ConfigHolder.INSTANCE.compat.energy.enableFEConverters) { REGISTRATE.creativeModeTab(() -> MACHINE); } diff --git a/src/main/java/com/gregtechceu/gtceu/common/machine/electric/BatteryBufferMachine.java b/src/main/java/com/gregtechceu/gtceu/common/machine/electric/BatteryBufferMachine.java index 2b039604c9..81a0033b9e 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/machine/electric/BatteryBufferMachine.java +++ b/src/main/java/com/gregtechceu/gtceu/common/machine/electric/BatteryBufferMachine.java @@ -91,7 +91,7 @@ public int getSlotLimit(int slot) { } }; handler.setFilter(item -> GTCapabilityHelper.getElectricItem(item) != null || - (ConfigHolder.INSTANCE.compat.energy.nativeEUToPlatformNative && + (ConfigHolder.INSTANCE.compat.energy.nativeEUToFE && GTCapabilityHelper.getForgeEnergyItem(item) != null)); return handler; } @@ -157,7 +157,7 @@ private List getNonFullBatteries() { if (electricItem.getCharge() < electricItem.getMaxCharge()) { batteries.add(electricItem); } - } else if (ConfigHolder.INSTANCE.compat.energy.nativeEUToPlatformNative) { + } else if (ConfigHolder.INSTANCE.compat.energy.nativeEUToFE) { IEnergyStorage energyStorage = GTCapabilityHelper.getForgeEnergyItem(batteryStack); if (energyStorage != null) { if (energyStorage.getEnergyStored() < energyStorage.getMaxEnergyStored()) { @@ -190,7 +190,7 @@ private List getAllBatteries() { var electricItem = GTCapabilityHelper.getElectricItem(batteryStack); if (electricItem != null) { batteries.add(electricItem); - } else if (ConfigHolder.INSTANCE.compat.energy.nativeEUToPlatformNative) { + } else if (ConfigHolder.INSTANCE.compat.energy.nativeEUToFE) { IEnergyStorage energyStorage = GTCapabilityHelper.getForgeEnergyItem(batteryStack); if (energyStorage != null) { batteries.add(energyStorage); diff --git a/src/main/java/com/gregtechceu/gtceu/common/machine/electric/BlockBreakerMachine.java b/src/main/java/com/gregtechceu/gtceu/common/machine/electric/BlockBreakerMachine.java index e9dfd6aaf5..5e732b33e5 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/machine/electric/BlockBreakerMachine.java +++ b/src/main/java/com/gregtechceu/gtceu/common/machine/electric/BlockBreakerMachine.java @@ -136,7 +136,7 @@ public ManagedFieldHolder getFieldHolder() { protected CustomItemStackHandler createChargerItemHandler() { var handler = new CustomItemStackHandler(); handler.setFilter(item -> GTCapabilityHelper.getElectricItem(item) != null || - (ConfigHolder.INSTANCE.compat.energy.nativeEUToPlatformNative && + (ConfigHolder.INSTANCE.compat.energy.nativeEUToFE && GTCapabilityHelper.getForgeEnergyItem(item) != null)); return handler; } diff --git a/src/main/java/com/gregtechceu/gtceu/common/machine/electric/ChargerMachine.java b/src/main/java/com/gregtechceu/gtceu/common/machine/electric/ChargerMachine.java index 1464cb24e7..d8a52218e2 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/machine/electric/ChargerMachine.java +++ b/src/main/java/com/gregtechceu/gtceu/common/machine/electric/ChargerMachine.java @@ -95,7 +95,7 @@ protected NotifiableEnergyContainer createEnergyContainer(Object... args) { protected CustomItemStackHandler createChargerInventory(Object... args) { var handler = new CustomItemStackHandler(this.inventorySize); handler.setFilter(item -> GTCapabilityHelper.getElectricItem(item) != null || - (ConfigHolder.INSTANCE.compat.energy.nativeEUToPlatformNative && + (ConfigHolder.INSTANCE.compat.energy.nativeEUToFE && GTCapabilityHelper.getForgeEnergyItem(item) != null)); return handler; } @@ -166,7 +166,7 @@ private List getNonFullElectricItem() { if (electricItem.getCharge() < electricItem.getMaxCharge()) { electricItems.add(electricItem); } - } else if (ConfigHolder.INSTANCE.compat.energy.nativeEUToPlatformNative) { + } else if (ConfigHolder.INSTANCE.compat.energy.nativeEUToFE) { var energyStorage = GTCapabilityHelper.getForgeEnergyItem(electricItemStack); if (energyStorage != null) { if (energyStorage.getEnergyStored() < energyStorage.getMaxEnergyStored()) { @@ -263,7 +263,7 @@ public long getEnergyCapacity() { var electricItem = GTCapabilityHelper.getElectricItem(electricItemStack); if (electricItem != null) { energyCapacity += electricItem.getMaxCharge(); - } else if (ConfigHolder.INSTANCE.compat.energy.nativeEUToPlatformNative) { + } else if (ConfigHolder.INSTANCE.compat.energy.nativeEUToFE) { var energyStorage = GTCapabilityHelper.getForgeEnergyItem(electricItemStack); if (energyStorage != null) { energyCapacity += FeCompat.toEu(energyStorage.getMaxEnergyStored(), @@ -287,7 +287,7 @@ public long getEnergyStored() { var electricItem = GTCapabilityHelper.getElectricItem(electricItemStack); if (electricItem != null) { energyStored += electricItem.getCharge(); - } else if (ConfigHolder.INSTANCE.compat.energy.nativeEUToPlatformNative) { + } else if (ConfigHolder.INSTANCE.compat.energy.nativeEUToFE) { var energyStorage = GTCapabilityHelper.getForgeEnergyItem(electricItemStack); if (energyStorage != null) { energyStored += FeCompat.toEu(energyStorage.getEnergyStored(), diff --git a/src/main/java/com/gregtechceu/gtceu/common/machine/electric/FisherMachine.java b/src/main/java/com/gregtechceu/gtceu/common/machine/electric/FisherMachine.java index 4a78bb2f88..3dbd0a8248 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/machine/electric/FisherMachine.java +++ b/src/main/java/com/gregtechceu/gtceu/common/machine/electric/FisherMachine.java @@ -154,7 +154,7 @@ public FisherMachine(IMachineBlockEntity holder, int tier, Object... ignoredArgs protected CustomItemStackHandler createChargerItemHandler() { var handler = new CustomItemStackHandler(); handler.setFilter(item -> GTCapabilityHelper.getElectricItem(item) != null || - (ConfigHolder.INSTANCE.compat.energy.nativeEUToPlatformNative && + (ConfigHolder.INSTANCE.compat.energy.nativeEUToFE && GTCapabilityHelper.getForgeEnergyItem(item) != null)); return handler; } diff --git a/src/main/java/com/gregtechceu/gtceu/common/machine/electric/ItemCollectorMachine.java b/src/main/java/com/gregtechceu/gtceu/common/machine/electric/ItemCollectorMachine.java index a6a795d447..ba1d1b7dc8 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/machine/electric/ItemCollectorMachine.java +++ b/src/main/java/com/gregtechceu/gtceu/common/machine/electric/ItemCollectorMachine.java @@ -152,7 +152,7 @@ public ItemCollectorMachine(IMachineBlockEntity holder, int tier, Object... igno protected CustomItemStackHandler createChargerItemHandler() { var handler = new CustomItemStackHandler(); handler.setFilter(item -> GTCapabilityHelper.getElectricItem(item) != null || - (ConfigHolder.INSTANCE.compat.energy.nativeEUToPlatformNative && + (ConfigHolder.INSTANCE.compat.energy.nativeEUToFE && GTCapabilityHelper.getForgeEnergyItem(item) != null)); return handler; } diff --git a/src/main/java/com/gregtechceu/gtceu/common/machine/electric/MinerMachine.java b/src/main/java/com/gregtechceu/gtceu/common/machine/electric/MinerMachine.java index ef8e9ddc05..14b7c21f21 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/machine/electric/MinerMachine.java +++ b/src/main/java/com/gregtechceu/gtceu/common/machine/electric/MinerMachine.java @@ -99,7 +99,7 @@ public ManagedFieldHolder getFieldHolder() { protected CustomItemStackHandler createChargerItemHandler(Object... args) { var handler = new CustomItemStackHandler(); handler.setFilter(item -> GTCapabilityHelper.getElectricItem(item) != null || - (ConfigHolder.INSTANCE.compat.energy.nativeEUToPlatformNative && + (ConfigHolder.INSTANCE.compat.energy.nativeEUToFE && GTCapabilityHelper.getForgeEnergyItem(item) != null)); return handler; } diff --git a/src/main/java/com/gregtechceu/gtceu/config/ConfigHolder.java b/src/main/java/com/gregtechceu/gtceu/config/ConfigHolder.java index 52f2bc31aa..1c28705895 100644 --- a/src/main/java/com/gregtechceu/gtceu/config/ConfigHolder.java +++ b/src/main/java/com/gregtechceu/gtceu/config/ConfigHolder.java @@ -151,11 +151,11 @@ public static class CompatibilityConfigs { @Configurable @Configurable.Comment({ "Whether to hide facades of all blocks in JEI and creative search menu.", "Default: true" }) - public boolean hideFacadesInJEI = true; + public boolean hideFacadesInRecipeViewer = true; @Configurable @Configurable.Comment({ "Whether to hide filled cells in JEI and creative search menu.", "Default: true" }) - public boolean hideFilledCellsInJEI = true; + public boolean hideFilledCellsInRecipeViewer = true; @Configurable @Configurable.Comment({ "Whether to hide the ore processing diagrams in JEI", "Default: false" }) @@ -168,32 +168,31 @@ public static class CompatibilityConfigs { public boolean removeSmeltingForEBFMetals = true; @Configurable - @Configurable.Comment({ "Whether dimension marker should show dimension tier.", "Default: false" }) + @Configurable.Comment({ "Whether dimension markers should show the dimension tier value.", "Default: false" }) public boolean showDimensionTier = false; public static class EnergyCompatConfig { @Configurable - @Configurable.Comment({ - "Enable Native GTEU to Platform native Energy (RF and alike) on GT Cables and Wires.", + @Configurable.Comment({ "Enable Native GTEU to Forge Energy (RF and alike) on GT Cables and Wires.", "This does not enable nor disable Converters.", "Default: true" }) - public boolean nativeEUToPlatformNative = true; + public boolean nativeEUToFE = true; @Configurable - @Configurable.Comment({ "Enable GTEU to Platform native (and vice versa) Converters.", "Default: false" }) - public boolean enablePlatformConverters = false; + @Configurable.Comment({ "Enable GTEU to FE (and vice versa) Converters.", "Default: false" }) + public boolean enableFEConverters = false; @Configurable - @Configurable.Comment({ "Platform native Energy to GTEU ratio for converting FE to EU.", - "Only affects converters.", "Default: 4 FE/Energy == 1 EU" }) + @Configurable.Comment({ "Forge Energy to GTEU ratio for converting FE to EU.", "Only affects converters.", + "Default: 4 FE == 1 EU" }) @Configurable.Range(min = 1, max = 16) - public int platformToEuRatio = 4; + public int feToEuRatio = 4; @Configurable - @Configurable.Comment({ "GTEU to Platform native Energy ratio for converting EU to FE.", - "Affects native conversion and Converters.", "Default: 4 FE/Energy == 1 EU" }) + @Configurable.Comment({ "GTEU to Forge Energy ratio for converting EU to FE.", + "Affects native conversion and Converters.", "Default: 4 FE == 1 EU" }) @Configurable.Range(min = 1, max = 16) - public int euToPlatformRatio = 4; + public int euToFeRatio = 4; } public static class AE2CompatConfig { diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/MetaTileEntityLoader.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/MetaTileEntityLoader.java index 7c68550b5c..e07e53f6c0 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/MetaTileEntityLoader.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/MetaTileEntityLoader.java @@ -1165,7 +1165,7 @@ public static void init(Consumer provider) { new UnificationEntry(TagPrefix.rotor, GTMaterials.StainlessSteel), 'H', HULL.getIngredient(HV), 'M', GTItems.ELECTRIC_MOTOR_HV.asStack(), 'C', CustomTags.HV_CIRCUITS); - if (ConfigHolder.INSTANCE.compat.energy.enablePlatformConverters) { + if (ConfigHolder.INSTANCE.compat.energy.enableFEConverters) { registerMachineRecipe(provider, true, GTMachines.ENERGY_CONVERTER_1A, " WW", "RMC", " WW", 'C', CIRCUIT, 'M', HULL, 'W', CABLE, 'R', new UnificationEntry(TagPrefix.cableGtSingle, GTMaterials.RedAlloy)); registerMachineRecipe(provider, true, GTMachines.ENERGY_CONVERTER_4A, " WW", "RMC", " WW", 'C', CIRCUIT,