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

add raw osmium and efr support

Browse Source
This commit is contained in:
maggi373 committed 2024-10-17 21:59:08 +02:00
1 parent 5368fd4fb8
commit 6dafdec5ef
4 files changed
+8
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/mekanism/common/Mekanism.java
+3
View File
@@ -997,6 +997,7 @@ public class Mekanism
FurnaceRecipes.smelting().func_151394_a(new ItemStack(MekanismItems.OtherDust, 1, 1), new ItemStack(MekanismItems.Ingot, 1, 4), 0.0F);
FurnaceRecipes.smelting().func_151394_a(new ItemStack(MekanismItems.Dust, 1, Resource.COPPER.ordinal()), new ItemStack(MekanismItems.Ingot, 1, 5), 0.0F);
FurnaceRecipes.smelting().func_151394_a(new ItemStack(MekanismItems.Dust, 1, Resource.TIN.ordinal()), new ItemStack(MekanismItems.Ingot, 1, 6), 0.0F);
FurnaceRecipes.smelting().func_151394_a(new ItemStack(MekanismItems.RawOsmiumOre), new ItemStack(MekanismItems.Ingot, 1, 1), 1.0F);
//Enrichment Chamber Recipes
RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(Blocks.redstone_ore), new ItemStack(Items.redstone, 12));
@@ -1230,6 +1231,8 @@ public class Mekanism
OreDictionary.registerOre("pulpWood", MekanismItems.Sawdust);
OreDictionary.registerOre("dustWood", MekanismItems.Sawdust);
OreDictionary.registerOre("blockSalt", MekanismBlocks.SaltBlock);
OreDictionary.registerOre("rawOsmium", MekanismItems.RawOsmiumOre);
OreDictionary.registerOre("oreOsmium", MekanismItems.RawOsmiumOre);
//Alloys!
src/main/java/mekanism/common/MekanismItems.java
+2
View File
@@ -63,6 +63,7 @@ public class MekanismItems
public static final ItemJetpack ArmoredJetpack = (ItemJetpack)new ItemJetpack().setUnlocalizedName("ArmoredJetpack");
public static final ItemFreeRunners FreeRunners = (ItemFreeRunners)new ItemFreeRunners().setUnlocalizedName("FreeRunners");
public static final Item Balloon = new ItemBalloon().setUnlocalizedName("Balloon");
public static final Item RawOsmiumOre = new ItemMekanism().setUnlocalizedName("RawOsmiumOre");
//Multi-ID Items
public static final Item OtherDust = new ItemOtherDust();
@@ -141,6 +142,7 @@ public class MekanismItems
GameRegistry.registerItem(GaugeDropper, "GaugeDropper");
GameRegistry.registerItem(TierInstaller, "FactoryInstaller");
GameRegistry.registerItem(OtherDust, "OtherDust");
GameRegistry.registerItem(RawOsmiumOre, "RawOsmiumOre");
FluidContainerRegistry.registerFluidContainer(FluidRegistry.getFluid("brine"), new ItemStack(BrineBucket), FluidContainerRegistry.EMPTY_BUCKET);
FluidContainerRegistry.registerFluidContainer(FluidRegistry.getFluid("lithium"), new ItemStack(LithiumBucket), FluidContainerRegistry.EMPTY_BUCKET);
src/main/java/mekanism/common/integration/MekanismHooks.java
+2
View File
@@ -26,6 +26,7 @@ import cpw.mods.fml.common.Optional.Method;
import cpw.mods.fml.common.event.FMLInterModComms;
import dan200.computercraft.api.ComputerCraftAPI;
import ganymedes01.etfuturum.api.DeepslateOreRegistry;
import ganymedes01.etfuturum.api.RawOreRegistry;
import mekanism.api.MekanismConfig.mekce;
/**
@@ -80,6 +81,7 @@ public final class MekanismHooks
@Method(modid = "etfuturum")
public void hookEFRRecipes() {
DeepslateOreRegistry.addOre(MekanismBlocks.OreBlock, 0, MekanismBlocks.DeepslateOreBlock, 0);
RawOreRegistry.addOre("oreOsmium", MekanismItems.RawOsmiumOre);
}
@Method(modid = "IC2")
public void hookIC2Recipes()
src/main/resources/assets/mekanism/lang/en_US.lang
+1
View File
@@ -51,6 +51,7 @@ item.Flamethrower.name=Flamethrower
item.GaugeDropper.name=Gauge Dropper
item.BioFuel.name=Biomass
item.CraftingFormula.name=Crafting Formula
item.RawOsmiumOre.name=Raw Osmium
//Control Circuits
item.BasicControlCircuit.name=Basic Control Circuit