upstream/Mekanism-Community-Edition
1
0 Fork 0
mirror of https://github.com/Thorfusion/Mekanism-Community-Edition.git synced 2026-11-08 19:04:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #190 from Thorfusion/continue-efr-support

Browse Source 
Continue efr support
This commit is contained in:
maggi373 authored and GitHub committed 2024-10-18 04:17:09 +02:00
2 parents 9b7907a6c1 178a2fe281
commit 7962902f5a
5 files changed
+25 -5
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/mekanism/api/MekanismConfig.java
+1
View File
@@ -197,6 +197,7 @@ public class MekanismConfig
{
public static boolean enableOsmiumBlock = true;
public static boolean enableRawOsmiumBlock = true;
public static boolean enableRawOsmiumOreDictOreOsmium = true;
public static boolean enableBronzeBlock = true;
public static boolean enableRefinedObsidianBlock = true;
public static boolean enableCharcoalBlock = true;
src/main/java/mekanism/common/CommonProxy.java
+5 -4
View File
@@ -251,7 +251,7 @@ public class CommonProxy implements IGuiProvider
public void loadConfiguration()
{
general.updateNotifications = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "UpdateNotificationsv2", true).getBoolean();
mekce.enableoregen = Mekanism.configuration.get("mekce", "EnableOreGen", true, "disables completely the oregen").getBoolean();
mekce.enableoregen = Mekanism.configurationce.get("mekce", "EnableOreGen", true, "disables completely the oregen").getBoolean();
general.controlCircuitOreDict = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "ControlCircuitOreDict", true).getBoolean();
general.logPackets = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "LogPackets", false).getBoolean();
general.dynamicTankEasterEgg = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "DynamicTankEasterEgg", false).getBoolean();
@@ -263,7 +263,7 @@ public class CommonProxy implements IGuiProvider
general.obsidianTNTBlastRadius = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "ObsidianTNTBlastRadius", 12).getInt();
general.UPDATE_DELAY = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "ClientUpdateDelay", 10).getInt();
general.osmiumPerChunk = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "OsmiumPerChunk", 12).getInt();
mekce.enabledeepslateosmium = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "EnableDeepslateOsmiumOreInEFR", true, "adds deepslate osmium ore entry to efr if et futurum requiem is present").getBoolean();
mekce.enabledeepslateosmium = Mekanism.configurationce.get("mekce", "EnableDeepslateOsmiumOreInEFR", true, "adds deepslate osmium ore entry to efr if et futurum requiem is present").getBoolean();
general.copperPerChunk = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "CopperPerChunk", 16).getInt();
general.tinPerChunk = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "TinPerChunk", 14).getInt();
general.saltPerChunk = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "SaltPerChunk", 2).getInt();
@@ -303,8 +303,8 @@ public class CommonProxy implements IGuiProvider
general.heatPerFuelTick = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "HeatPerFuelTick", 4D).getDouble();
general.allowTransmitterAlloyUpgrade = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "AllowTransmitterAlloyUpgrade", true).getBoolean();
general.allowProtection = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "AllowProtection", true).getBoolean();
mekce.accurateHeavyWaterCapture = Mekanism.configuration.get("mekce", "AccurateHeavyWater", false).getBoolean();
mekce.heavyWaterChance = Mekanism.configuration.get("mekce", "AccurateHeavyWaterGen", 5).getInt();
mekce.accurateHeavyWaterCapture = Mekanism.configurationce.get("mekce", "AccurateHeavyWater", false).getBoolean();
mekce.heavyWaterChance = Mekanism.configurationce.get("mekce", "AccurateHeavyWaterGen", 5).getInt();
general.blacklistIC2 = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "BlacklistIC2Power", false).getBoolean();
@@ -413,6 +413,7 @@ public class CommonProxy implements IGuiProvider
recipes.enableOsmiumBlock = Mekanism.configurationrecipes.get("recipes","enableOsmiumBlock", true).getBoolean();
recipes.enableRawOsmiumBlock = Mekanism.configurationrecipes.get("recipes","enableRawOsmiumBlock", true).getBoolean();
recipes.enableRawOsmiumOreDictOreOsmium = Mekanism.configurationrecipes.get("recipes","enableRawOsmiumOreDictOreOsmium", true, "Adds oredict oreOsmium on Raw osmium").getBoolean();
recipes.enableBronzeBlock = Mekanism.configurationrecipes.get("recipes","enableBronzeBlock", true).getBoolean();
recipes.enableRefinedObsidianBlock = Mekanism.configurationrecipes.get("recipes","enableRefinedObsidianBlock", true).getBoolean();
recipes.enableCharcoalBlock = Mekanism.configurationrecipes.get("recipes","enableCharcoalBlock", true).getBoolean();
src/main/java/mekanism/common/Mekanism.java
+3 -1
View File
@@ -1238,7 +1238,9 @@ public class Mekanism
OreDictionary.registerOre("dustWood", MekanismItems.Sawdust);
OreDictionary.registerOre("blockSalt", MekanismBlocks.SaltBlock);
OreDictionary.registerOre("rawOsmium", MekanismItems.RawOsmiumOre);
OreDictionary.registerOre("oreOsmium", MekanismItems.RawOsmiumOre);
if (MekanismConfig.recipes.enableRawOsmiumOreDictOreOsmium){
OreDictionary.registerOre("oreOsmium", MekanismItems.RawOsmiumOre);
}
//Alloys!
src/main/java/mekanism/common/integration/OreDictManager.java
+14
View File
@@ -107,6 +107,13 @@ public final class OreDictManager
RecipeHandler.addChemicalDissolutionChamberRecipe(StackUtils.size(ore, 1), new GasStack(GasRegistry.getGas(resource.getOredictName().toLowerCase()), 1000));
}
for (ItemStack ore : OreDictionary.getOres("raw" + resource.getOredictName())) {
RecipeHandler.addEnrichmentChamberRecipe(StackUtils.size(ore, 1), new ItemStack(MekanismItems.Dust, 2, resource.ordinal()));
RecipeHandler.addPurificationChamberRecipe(StackUtils.size(ore, 1), new ItemStack(MekanismItems.Clump, 3, resource.ordinal()));
RecipeHandler.addChemicalInjectionChamberRecipe(StackUtils.size(ore, 1), "hydrogenChloride", new ItemStack(MekanismItems.Shard, 4, resource.ordinal()));
RecipeHandler.addChemicalDissolutionChamberRecipe(StackUtils.size(ore, 1), new GasStack(GasRegistry.getGas(resource.getOredictName().toLowerCase()), 1000));
}
for (ItemStack ore : OreDictionary.getOres("ingot" + resource.getOredictName())) {
RecipeHandler.addCrusherRecipe(StackUtils.size(ore, 1), new ItemStack(MekanismItems.Dust, 1, resource.ordinal()));
}
@@ -227,6 +234,13 @@ public final class OreDictManager
}
}
for (ItemStack ore : OreDictionary.getOres("raw" + s)) {
try {
RecipeHandler.addEnrichmentChamberRecipe(StackUtils.size(ore, 1), StackUtils.size(OreDictionary.getOres("dust" + s).get(0), 2));
} catch (Exception e) {
}
}
for (ItemStack ore : OreDictionary.getOres("ingot" + s)) {
try {
RecipeHandler.addCrusherRecipe(StackUtils.size(ore, 1), StackUtils.size(OreDictionary.getOres("dust" + s).get(0), 1));
src/main/java/mekanism/common/network/PacketConfigSync.java
+2
View File
@@ -121,6 +121,7 @@ public class PacketConfigSync implements IMessageHandler<ConfigSyncMessage, IMes
dataStream.writeDouble(usage.formulaicAssemblicatorUsage);
dataStream.writeBoolean(recipes.enableOsmiumBlock);
dataStream.writeBoolean(recipes.enableRawOsmiumBlock);
dataStream.writeBoolean(recipes.enableRawOsmiumOreDictOreOsmium);
dataStream.writeBoolean(recipes.enableBronzeBlock);
dataStream.writeBoolean(recipes.enableRefinedObsidianBlock);
dataStream.writeBoolean(recipes.enableCharcoalBlock);
@@ -321,6 +322,7 @@ public class PacketConfigSync implements IMessageHandler<ConfigSyncMessage, IMes
usage.formulaicAssemblicatorUsage = dataStream.readDouble();
recipes.enableOsmiumBlock = dataStream.readBoolean();
recipes.enableRawOsmiumBlock = dataStream.readBoolean();
recipes.enableRawOsmiumOreDictOreOsmium = dataStream.readBoolean();
recipes.enableBronzeBlock = dataStream.readBoolean();
recipes.enableRefinedObsidianBlock = dataStream.readBoolean();
recipes.enableCharcoalBlock = dataStream.readBoolean();