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

finish deepslate support

Browse Source
This commit is contained in:
maggi373 committed 2024-10-17 16:15:39 +02:00
1 parent 7875d45c57
commit 86d1b0052f
6 files changed
+31 -15
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/mekanism/common/CommonProxy.java
+1 -1
View File
@@ -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, "DeepslateOsmiumPerChunk", true, "adds deepslate osmium ore if et futurum requiem is present").getBoolean();
mekce.enabledeepslateosmium = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "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();
src/main/java/mekanism/common/Mekanism.java
+9 -3
View File
@@ -988,7 +988,9 @@ public class Mekanism
FurnaceRecipes.smelting().func_151394_a(new ItemStack(MekanismBlocks.OreBlock, 1, 0), new ItemStack(MekanismItems.Ingot, 1, 1), 1.0F);
FurnaceRecipes.smelting().func_151394_a(new ItemStack(MekanismBlocks.OreBlock, 1, 1), new ItemStack(MekanismItems.Ingot, 1, 5), 1.0F);
FurnaceRecipes.smelting().func_151394_a(new ItemStack(MekanismBlocks.OreBlock, 1, 2), new ItemStack(MekanismItems.Ingot, 1, 6), 1.0F);
FurnaceRecipes.smelting().func_151394_a(new ItemStack(MekanismBlocks.OreBlock, 1, 3), new ItemStack(MekanismItems.Ingot, 1, 1), 1.0F);
FurnaceRecipes.smelting().func_151394_a(new ItemStack(MekanismBlocks.DeepslateOreBlock, 1, 0), new ItemStack(MekanismItems.Ingot, 1, 1), 1.0F);
FurnaceRecipes.smelting().func_151394_a(new ItemStack(MekanismBlocks.DeepslateOreBlock, 1, 1), new ItemStack(MekanismItems.Ingot, 1, 5), 1.0F);
FurnaceRecipes.smelting().func_151394_a(new ItemStack(MekanismBlocks.DeepslateOreBlock, 1, 2), new ItemStack(MekanismItems.Ingot, 1, 6), 1.0F);
FurnaceRecipes.smelting().func_151394_a(new ItemStack(MekanismItems.Dust, 1, Resource.OSMIUM.ordinal()), new ItemStack(MekanismItems.Ingot, 1, 1), 0.0F);
FurnaceRecipes.smelting().func_151394_a(new ItemStack(MekanismItems.Dust, 1, Resource.IRON.ordinal()), new ItemStack(Items.iron_ingot), 0.0F);
FurnaceRecipes.smelting().func_151394_a(new ItemStack(MekanismItems.Dust, 1, Resource.GOLD.ordinal()), new ItemStack(Items.gold_ingot), 0.0F);
@@ -1281,8 +1283,12 @@ public class Mekanism
OreDictionary.registerOre("ore" + mekanismMaterial, new ItemStack(MekanismBlocks.OreBlock, 1, 0));
OreDictionary.registerOre("oreCopper", new ItemStack(MekanismBlocks.OreBlock, 1, 1));
OreDictionary.registerOre("oreTin", new ItemStack(MekanismBlocks.OreBlock, 1, 2));
OreDictionary.registerOre("ore" + mekanismMaterial, new ItemStack(MekanismBlocks.OreBlock, 1, 3));
OreDictionary.registerOre("oreDeepslateOsmium", new ItemStack(MekanismBlocks.OreBlock, 1, 3));
OreDictionary.registerOre("ore" + mekanismMaterial, new ItemStack(MekanismBlocks.DeepslateOreBlock, 1, 0));
OreDictionary.registerOre("oreDeepslateOsmium", new ItemStack(MekanismBlocks.DeepslateOreBlock, 1, 0));
OreDictionary.registerOre("oreCopper", new ItemStack(MekanismBlocks.DeepslateOreBlock, 1, 1));
OreDictionary.registerOre("oreDeepslateCopper", new ItemStack(MekanismBlocks.DeepslateOreBlock, 1, 1));
OreDictionary.registerOre("oreTin", new ItemStack(MekanismBlocks.DeepslateOreBlock, 1, 2));
OreDictionary.registerOre("oreDeepslateTin", new ItemStack(MekanismBlocks.DeepslateOreBlock, 1, 2));
if(general.controlCircuitOreDict)
{
src/main/java/mekanism/common/MekanismBlocks.java
+3 -1
View File
@@ -35,7 +35,8 @@ public class MekanismBlocks
public static final Block MachineBlock = new BlockMachine(MACHINE_BLOCK_1).setBlockName("MachineBlock");
public static final Block MachineBlock2 = new BlockMachine(MACHINE_BLOCK_2).setBlockName("MachineBlock2");
public static final Block MachineBlock3 = new BlockMachine(MACHINE_BLOCK_3).setBlockName("MachineBlock3");
public static final Block OreBlock = new BlockOre().setBlockName("OreBlock");
public static final Block OreBlock = new BlockOre("stone").setBlockName("OreBlock");
public static final Block DeepslateOreBlock = new BlockOre("deepslate").setBlockName("DeepslateOreBlock");
public static final Block ObsidianTNT = new BlockObsidianTNT().setBlockName("ObsidianTNT").setCreativeTab(Mekanism.tabMekanism);
public static final Block EnergyCube = new BlockEnergyCube().setBlockName("EnergyCube");
public static final Block BoundingBlock = (BlockBounding)new BlockBounding().setBlockName("BoundingBlock");
@@ -60,6 +61,7 @@ public class MekanismBlocks
GameRegistry.registerBlock(MachineBlock2, ItemBlockMachine.class, "MachineBlock2");
GameRegistry.registerBlock(MachineBlock3, ItemBlockMachine.class, "MachineBlock3");
GameRegistry.registerBlock(OreBlock, ItemBlockOre.class, "OreBlock");
GameRegistry.registerBlock(DeepslateOreBlock, ItemBlockOre.class, "DeepslateOreBlock");
GameRegistry.registerBlock(EnergyCube, ItemBlockEnergyCube.class, "EnergyCube");
GameRegistry.registerBlock(ObsidianTNT, "ObsidianTNT");
GameRegistry.registerBlock(BoundingBlock, "BoundingBlock");
src/main/java/mekanism/common/block/BlockOre.java
+14 -8
View File
@@ -3,6 +3,7 @@ package mekanism.common.block;
import java.util.List;
import mekanism.common.Mekanism;
import mekanism.common.MekanismBlocks;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IIconRegister;
@@ -18,7 +19,6 @@ import cpw.mods.fml.relauncher.SideOnly;
* 0: Osmium Ore
* 1: Copper Ore
* 2: Tin Ore
* 3: Deepslate Osmium Ore
* @author AidanBrady
*
*/
@@ -26,10 +26,10 @@ public class BlockOre extends Block
{
public IIcon[] icons = new IIcon[256];
public BlockOre()
public BlockOre(String type)
{
super(Material.rock);
setHardness(3F);
setHardness(type == "deepslate" ? 4.5F : 3F);
setResistance(5F);
setCreativeTab(Mekanism.tabMekanism);
}
@@ -38,10 +38,17 @@ public class BlockOre extends Block
@SideOnly(Side.CLIENT)
public void registerBlockIcons(IIconRegister register)
{
icons[0] = register.registerIcon("mekanism:OsmiumOre");
icons[1] = register.registerIcon("mekanism:CopperOre");
icons[2] = register.registerIcon("mekanism:TinOre");
icons[3] = register.registerIcon("mekanism:DeepslateOsmiumOre");
if(this == MekanismBlocks.OreBlock)
{
icons[0] = register.registerIcon("mekanism:OsmiumOre");
icons[1] = register.registerIcon("mekanism:CopperOre");
icons[2] = register.registerIcon("mekanism:TinOre");
}
if(this == MekanismBlocks.DeepslateOreBlock) {
icons[0] = register.registerIcon("mekanism:DeepslateOsmiumOre");
icons[1] = register.registerIcon("mekanism:DeepslateCopperOre");
icons[2] = register.registerIcon("mekanism:DeepslateTinOre");
}
}
@Override
@@ -64,6 +71,5 @@ public class BlockOre extends Block
list.add(new ItemStack(item, 1, 0));
list.add(new ItemStack(item, 1, 1));
list.add(new ItemStack(item, 1, 2));
list.add(new ItemStack(item, 1, 3));
}
}
src/main/java/mekanism/common/integration/MekanismHooks.java
+1 -1
View File
@@ -79,7 +79,7 @@ public final class MekanismHooks
@Method(modid = "etfuturum")
public void hookEFRRecipes() {
DeepslateOreRegistry.addOre(MekanismBlocks.OreBlock, 0, MekanismBlocks.OreBlock, 3);
DeepslateOreRegistry.addOre(MekanismBlocks.OreBlock, 0, MekanismBlocks.DeepslateOreBlock, 0);
}
@Method(modid = "IC2")
public void hookIC2Recipes()
src/main/resources/assets/mekanism/lang/en_US.lang
+3 -1
View File
@@ -185,7 +185,9 @@ infuse.lead=Lead
tile.OreBlock.OsmiumOre.name=Osmium Ore
tile.OreBlock.CopperOre.name=Copper Ore
tile.OreBlock.TinOre.name=Tin Ore
tile.OreBlock.DeepslateOsmiumOre.name=Deepslate Osmium Ore
tile.DeepslateOreBlock.OsmiumOre.name=Deepslate Osmium Ore
tile.DeepslateOreBlock.CopperOre.name=Deepslate Copper Ore
tile.DeepslateOreBlock.TinOre.name=Deepslate Tin Ore
//Transmitters
item.MultipartTransmitter.BasicPressurizedTube.name=Basic Pressurized Tube