Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Clean Up Integration Modules #140

Merged
merged 5 commits into from
Sep 17, 2023
Merged

Clean Up Integration Modules #140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ab9b666
Clean Up Integration Modules
DrParadox7 Sep 14, 2023
d4f0f9e
Restore missing oredict for SiliconCompat
DrParadox7 Sep 16, 2023
3155541
Move Silicon Checks
DrParadox7 Sep 16, 2023
bf65b71
Bump Version
DrParadox7 Sep 16, 2023
ca17e3b
Rework SiliconCompat Checks
DrParadox7 Sep 16, 2023
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: 2 additions & 2 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ FMP_version=1.2.0.345
CCLIB_version=1.1.3.141
NEI_version=1.0.5.120
CCC_version=1.0.7.48
mod_version=9.10.30
alt_version=9, 10, 30
mod_version=9.10.31
alt_version=9, 10, 31
3 changes: 1 addition & 2 deletions src/main/java/mekanism/api/MekanismConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,7 @@ public static class mekce {
public static boolean EnableQuartzCompat;
public static boolean EnableDiamondCompat;
public static boolean EnablePoorOresCompat;
public static boolean OreDictOsmium;
public static boolean OreDictPlatinum;
public static boolean PlatReplacement;
public static boolean enableSiliconCompat;
public static int IC2SinkTier;
public static int IC2SourceTier;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/mekanism/client/render/MekanismRenderer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import mekanism.api.transmitters.TransmissionType;
import mekanism.client.render.tileentity.*;
import mekanism.common.ObfuscatedNames;
import mekanism.common.Resource;
import mekanism.common.base.ISpecialBounds;
import mekanism.common.util.MekanismUtils;
import net.minecraft.block.Block;
Expand Down Expand Up @@ -99,8 +100,7 @@ public void onStitch(TextureStitchEvent.Pre event)
GasRegistry.getGas("sulfurTrioxideGas").setIcon(event.map.registerIcon("mekanism:liquid/LiquidSulfurTrioxide"));
GasRegistry.getGas("sulfuricAcid").setIcon(event.map.registerIcon("mekanism:liquid/LiquidSulfuricAcid"));
GasRegistry.getGas("hydrogenChloride").setIcon(event.map.registerIcon("mekanism:liquid/LiquidHydrogenChloride"));
GasRegistry.getGas("liquidOsmium").setIcon(event.map.registerIcon("mekanism:liquid/LiquidOsmium"));
GasRegistry.getGas("liquidPlatinum").setIcon(event.map.registerIcon("mekanism:liquid/LiquidOsmium"));
GasRegistry.getGas("liquid" + Resource.OSMIUM.getName()).setIcon(event.map.registerIcon("mekanism:liquid/LiquidOsmium"));
GasRegistry.getGas("liquidStone").setIcon(event.map.registerIcon("mekanism:liquid/LiquidStone"));
GasRegistry.getGas("ethene").setIcon(event.map.registerIcon("mekanism:liquid/LiquidEthene"));
GasRegistry.getGas("brine").setIcon(event.map.registerIcon("mekanism:liquid/LiquidBrine"));
Expand Down
4 changes: 1 addition & 3 deletions src/main/java/mekanism/common/CommonProxy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@

import mekanism.api.Coord4D;
import mekanism.api.MekanismAPI;
import mekanism.api.MekanismConfig;
import mekanism.api.MekanismConfig.general;
import mekanism.api.MekanismConfig.recipes;
import mekanism.api.MekanismConfig.machines;
Expand Down Expand Up @@ -312,8 +311,7 @@ public void loadConfiguration()
mekce.EnableQuartzCompat = Mekanism.configurationce.get("mekce", "EnableQuartzCompat", true, "Allows quartz dust to be enriched into quartz Also allows quartz ore to be enriched into quartz dust").getBoolean();
mekce.EnableDiamondCompat = Mekanism.configurationce.get("mekce", "EnableDiamondCompat", true, "Allows oredict'ed diamonds to be used in the enrichment chamber, like synthetic diamonds.").getBoolean();
mekce.EnablePoorOresCompat = Mekanism.configurationce.get("mekce", "EnablePoorOresCompat", true, "Allows poor ores from railcraft to be used in the purification chamber and gives one clump ie one ingot.").getBoolean();
mekce.OreDictOsmium = Mekanism.configurationce.get("mekce", "OreDictOsmium", true, "Adds the oredict (osmium) to osmium").getBoolean();
mekce.OreDictPlatinum = Mekanism.configurationce.get("mekce", "OreDictPlatinum", false, "Adds the oredict (platinum) to osmium").getBoolean();
mekce.PlatReplacement = Mekanism.configurationce.get("mekce", "PlatReplacement", false, "Replaces Mekanism Osmium to Platinum").getBoolean();
mekce.enableSiliconCompat = Mekanism.configurationce.get("mekce", "EnableSiliconCompat", true, "When a mod that adds silicon (galacticraft, enderio and projectred) is detected, recipe for control circuit is changed from using iron to silicon in the metalurgic infuser").getBoolean();
mekce.digitalMinerMaxRadius = Mekanism.configurationce.get("mekce", "DigitalMinerMaxRadius", 32, "Select range from 1 to 64, we do not recommend going over 32", 1, 64).getInt();
mekce.enableSingleUseCardboxes = Mekanism.configurationce.get("mekce", "EnableSingleUseCardboxes", true, "This allows to force single use on cardboxes or not").getBoolean();
Expand Down
207 changes: 78 additions & 129 deletions src/main/java/mekanism/common/Mekanism.java
View file
Open in desktop

Large diffs are not rendered by default.

5 changes: 4 additions & 1 deletion src/main/java/mekanism/common/MekanismItems.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package mekanism.common;

import cpw.mods.fml.common.Loader;
import mekanism.api.MekanismConfig;
import mekanism.common.item.*;
import mekanism.common.multipart.ItemGlowPanel;
import mekanism.common.multipart.ItemPartTransmitter;
Expand Down Expand Up @@ -103,7 +105,8 @@ public static void register()
GameRegistry.registerItem(CompressedRedstone, "CompressedRedstone");
GameRegistry.registerItem(CompressedDiamond, "CompressedDiamond");
GameRegistry.registerItem(CompressedObsidian, "CompressedObsidian");
GameRegistry.registerItem(CompressedEnder, "CompressedEnder");
if (MekanismConfig.mekce.enableBoPProgression && Loader.isModLoaded("BiomesOPlenty"))
GameRegistry.registerItem(CompressedEnder, "CompressedEnder");
GameRegistry.registerItem(PortableTeleporter, "PortableTeleporter");
GameRegistry.registerItem(TeleportationCore, "TeleportationCore");
GameRegistry.registerItem(Clump, "Clump");
Expand Down
4 changes: 3 additions & 1 deletion src/main/java/mekanism/common/Resource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
package mekanism.common;

import static mekanism.api.MekanismConfig.mekce.PlatReplacement;

public enum Resource
{
IRON("Iron"),
GOLD("Gold"),
OSMIUM("Osmium"),
OSMIUM(PlatReplacement ? "Platinum" : "Osmium"),
COPPER("Copper"),
TIN("Tin"),
SILVER("Silver"),
Expand Down
15 changes: 0 additions & 15 deletions src/main/java/mekanism/common/integration/MekanismHooks.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,21 +95,6 @@ public void hookIC2Recipes()
}

try {
if(MekanismConfig.mekce.OreDictOsmium) {
Recipes.macerator.addRecipe(new RecipeInputOreDict("oreOsmium"), null, new ItemStack(MekanismItems.Dust, 2, Resource.OSMIUM.ordinal()));
}
if(MekanismConfig.mekce.OreDictPlatinum) {
Recipes.macerator.addRecipe(new RecipeInputOreDict("orePlatinum"), null, new ItemStack(MekanismItems.Dust, 2, Resource.OSMIUM.ordinal()));
}
} catch(Exception e) {}

try {
if(MekanismConfig.mekce.OreDictOsmium) {
Recipes.macerator.addRecipe(new RecipeInputOreDict("ingotOsmium"), null, new ItemStack(MekanismItems.Dust, 1, Resource.OSMIUM.ordinal()));
}
if(MekanismConfig.mekce.OreDictPlatinum) {
Recipes.macerator.addRecipe(new RecipeInputOreDict("ingotPlatinum"), null, new ItemStack(MekanismItems.Dust, 1, Resource.OSMIUM.ordinal()));
}
Recipes.macerator.addRecipe(new RecipeInputOreDict("ingotRefinedObsidian"), null, new ItemStack(MekanismItems.OtherDust, 1, 5));
Recipes.macerator.addRecipe(new RecipeInputOreDict("ingotRefinedGlowstone"), null, new ItemStack(Items.glowstone_dust));
Recipes.macerator.addRecipe(new RecipeInputOreDict("ingotSteel"), null, new ItemStack(MekanismItems.OtherDust, 1, 1));
Expand Down
Loading
Loading