diff --git a/src/main/java/mekanism/api/MekanismConfig.java b/src/main/java/mekanism/api/MekanismConfig.java index 742c53703..94c444e3e 100644 --- a/src/main/java/mekanism/api/MekanismConfig.java +++ b/src/main/java/mekanism/api/MekanismConfig.java @@ -77,6 +77,7 @@ public class MekanismConfig public static int IC2SinkTier; public static int IC2SourceTier; public static int digitalMinerMaxRadius; + public static boolean enableSingleUseCardboxes; } public static class client diff --git a/src/main/java/mekanism/common/CommonProxy.java b/src/main/java/mekanism/common/CommonProxy.java index 09190c4de..393361e06 100644 --- a/src/main/java/mekanism/common/CommonProxy.java +++ b/src/main/java/mekanism/common/CommonProxy.java @@ -311,6 +311,8 @@ public class CommonProxy implements IGuiProvider general.OreDictPlatinum = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "OreDictPlatinum", false).getBoolean(); general.enableSiliconCompat = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "EnableSiliconCompat", true).getBoolean(); general.digitalMinerMaxRadius = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "DigitalMinerMaxRadius", 32, "Select range from 1 to 64, we do not recommend going over 32", 1, 64).getInt(); + general.enableSingleUseCardboxes = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "EnableSingleUseCardboxes", true).getBoolean(); + general.IC2SinkTier = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "IC2SinkTier", 4, "Tier level for machines, we recommend setting it to tier 2 for ic2 classic", 1, 4).getInt(); general.IC2SourceTier = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "IC2SourceTier", 4, "Tier level for generators, we recommend setting it to tier 2 for ic2 classic", 1, 4).getInt(); diff --git a/src/main/java/mekanism/common/block/BlockCardboardBox.java b/src/main/java/mekanism/common/block/BlockCardboardBox.java index 0509b0ab3..6b69cf493 100644 --- a/src/main/java/mekanism/common/block/BlockCardboardBox.java +++ b/src/main/java/mekanism/common/block/BlockCardboardBox.java @@ -2,6 +2,7 @@ package mekanism.common.block; import java.util.Random; +import mekanism.api.MekanismConfig; import mekanism.common.Mekanism; import mekanism.common.MekanismBlocks; import mekanism.common.item.ItemBlockCardboardBox; @@ -105,15 +106,16 @@ public class BlockCardboardBox extends BlockContainer data.block.onBlockPlacedBy(world, x, y, z, entityplayer, new ItemStack(data.block, 1, data.meta)); data.block.onPostBlockPlaced(world, x, y, z, data.meta); } - - // float motion = 0.7F; - // double motionX = (world.rand.nextFloat() * motion) + (1.0F - motion) * 0.5D; - // double motionY = (world.rand.nextFloat() * motion) + (1.0F - motion) * 0.5D; - // double motionZ = (world.rand.nextFloat() * motion) + (1.0F - motion) * 0.5D; + if(!MekanismConfig.general.enableSingleUseCardboxes) { + float motion = 0.7F; + double motionX = (world.rand.nextFloat() * motion) + (1.0F - motion) * 0.5D; + double motionY = (world.rand.nextFloat() * motion) + (1.0F - motion) * 0.5D; + double motionZ = (world.rand.nextFloat() * motion) + (1.0F - motion) * 0.5D; - // EntityItem entityItem = new EntityItem(world, x + motionX, y + motionY, z + motionZ, itemStack); + EntityItem entityItem = new EntityItem(world, x + motionX, y + motionY, z + motionZ, itemStack); - // world.spawnEntityInWorld(entityItem); + world.spawnEntityInWorld(entityItem); + } } } diff --git a/src/main/java/mekanism/common/network/PacketConfigSync.java b/src/main/java/mekanism/common/network/PacketConfigSync.java index 5c30058ae..919a8961c 100644 --- a/src/main/java/mekanism/common/network/PacketConfigSync.java +++ b/src/main/java/mekanism/common/network/PacketConfigSync.java @@ -83,6 +83,7 @@ public class PacketConfigSync implements IMessageHandler