From 22bf688fbd3d46771983b305c6ef893f002ccb27 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Tue, 2 Feb 2016 22:55:26 -0500 Subject: [PATCH] Muffling Upgrades! Mute individual machine volumes. --- .../java/mekanism/client/sound/TileSound.java | 5 +++ src/main/java/mekanism/common/Mekanism.java | 7 ++-- .../java/mekanism/common/MekanismItems.java | 2 ++ src/main/java/mekanism/common/Upgrade.java | 10 +++--- .../TileEntityAdvancedElectricMachine.java | 2 ++ .../common/tile/TileEntityBasicMachine.java | 1 + .../common/tile/TileEntityChargepad.java | 15 ++++---- .../tile/TileEntityChemicalCrystallizer.java | 23 +++++++++--- .../TileEntityChemicalDissolutionChamber.java | 4 ++- .../tile/TileEntityChemicalInfuser.java | 6 ++-- .../tile/TileEntityChemicalOxidizer.java | 2 ++ .../common/tile/TileEntityChemicalWasher.java | 33 ++++++++++++++---- .../common/tile/TileEntityCrusher.java | 2 +- .../tile/TileEntityElectricMachine.java | 8 ++--- .../tile/TileEntityEnrichmentChamber.java | 3 +- .../common/tile/TileEntityFactory.java | 2 ++ .../tile/TileEntityMetallurgicInfuser.java | 2 ++ .../tile/TileEntityNoisyElectricBlock.java | 7 ++++ .../tile/TileEntityPrecisionSawmill.java | 2 +- .../TileEntitySolarEvaporationController.java | 12 +++---- .../tile/component/TileComponentUpgrade.java | 10 ++++-- .../common/tile/TileEntitySolarGenerator.java | 2 +- .../common/tile/TileEntityWindGenerator.java | 2 +- .../resources/assets/mekanism/lang/en_US.lang | 5 +-- .../textures/items/MufflingUpgrade.png | Bin 0 -> 1395 bytes 25 files changed, 112 insertions(+), 55 deletions(-) create mode 100644 src/main/resources/assets/mekanism/textures/items/MufflingUpgrade.png diff --git a/src/main/java/mekanism/client/sound/TileSound.java b/src/main/java/mekanism/client/sound/TileSound.java index 261fcb359..f1fa3a7e9 100644 --- a/src/main/java/mekanism/client/sound/TileSound.java +++ b/src/main/java/mekanism/client/sound/TileSound.java @@ -82,6 +82,11 @@ public class TileSound extends Sound implements IResettableSound @Override public void update() { + if(source instanceof ISoundSource) + { + baseVolume = ((ISoundSource)source).getVolume(); + } + if(!beginFadeOut) { if(ticks < fadeIn) diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index b4f31caeb..410263534 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -300,11 +300,14 @@ public class Mekanism CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.EnergyUpgrade), new Object[] { " G ", "ADA", " G ", Character.valueOf('G'), "blockGlass", Character.valueOf('A'), MekanismItems.EnrichedAlloy, Character.valueOf('D'), "dustGold" })); + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.GasUpgrade), new Object[] { + " G ", "ADA", " G ", Character.valueOf('G'), "blockGlass", Character.valueOf('A'), MekanismItems.EnrichedAlloy, Character.valueOf('D'), "dustIron" + })); CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.FilterUpgrade), new Object[] { " G ", "ADA", " G ", Character.valueOf('G'), "blockGlass", Character.valueOf('A'), MekanismItems.EnrichedAlloy, Character.valueOf('D'), "dustTin" })); - CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.GasUpgrade), new Object[] { - " G ", "ADA", " G ", Character.valueOf('G'), "blockGlass", Character.valueOf('A'), MekanismItems.EnrichedAlloy, Character.valueOf('D'), "dustIron" + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.FilterUpgrade), new Object[] { + " G ", "ADA", " G ", Character.valueOf('G'), "blockGlass", Character.valueOf('A'), MekanismItems.EnrichedAlloy, Character.valueOf('D'), "dustSteel" })); CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismItems.AtomicDisassembler.getUnchargedItem(), new Object[] { "AEA", "ACA", " O ", Character.valueOf('A'), MekanismItems.EnrichedAlloy, Character.valueOf('E'), MekanismItems.EnergyTablet.getUnchargedItem(), Character.valueOf('C'), MekanismItems.AtomicAlloy, Character.valueOf('O'), "ingotRefinedObsidian" diff --git a/src/main/java/mekanism/common/MekanismItems.java b/src/main/java/mekanism/common/MekanismItems.java index a2c58a570..920f522c4 100644 --- a/src/main/java/mekanism/common/MekanismItems.java +++ b/src/main/java/mekanism/common/MekanismItems.java @@ -66,6 +66,7 @@ public class MekanismItems public static final Item SpeedUpgrade = new ItemUpgrade(Upgrade.SPEED).setUnlocalizedName("SpeedUpgrade"); public static final Item EnergyUpgrade = new ItemUpgrade(Upgrade.ENERGY).setUnlocalizedName("EnergyUpgrade"); public static final Item FilterUpgrade = new ItemUpgrade(Upgrade.FILTER).setUnlocalizedName("FilterUpgrade"); + public static final Item MufflingUpgrade = new ItemUpgrade(Upgrade.MUFFLING).setUnlocalizedName("MufflingUpgrade"); public static final Item GasUpgrade = new ItemUpgrade(Upgrade.GAS).setUnlocalizedName("GasUpgrade"); public static final Item FactoryInstaller = new ItemFactoryInstaller().setUnlocalizedName("FactoryInstaller"); public static final ItemEnergized EnergyTablet = (ItemEnergized)new ItemEnergized(1000000).setUnlocalizedName("EnergyTablet"); @@ -115,6 +116,7 @@ public class MekanismItems GameRegistry.registerItem(SpeedUpgrade, "SpeedUpgrade"); GameRegistry.registerItem(EnergyUpgrade, "EnergyUpgrade"); GameRegistry.registerItem(FilterUpgrade, "FilterUpgrade"); + GameRegistry.registerItem(MufflingUpgrade, "MufflingUpgrade"); GameRegistry.registerItem(GasUpgrade, "GasUpgrade"); GameRegistry.registerItem(Robit, "Robit"); GameRegistry.registerItem(AtomicDisassembler, "AtomicDisassembler"); diff --git a/src/main/java/mekanism/common/Upgrade.java b/src/main/java/mekanism/common/Upgrade.java index c7ff4eec9..cd8f18689 100644 --- a/src/main/java/mekanism/common/Upgrade.java +++ b/src/main/java/mekanism/common/Upgrade.java @@ -20,7 +20,8 @@ public enum Upgrade SPEED("speed", 8, EnumColor.RED), ENERGY("energy", 8, EnumColor.BRIGHT_GREEN), FILTER("filter", 1, EnumColor.DARK_AQUA), - GAS("gas", 8, EnumColor.YELLOW); + GAS("gas", 8, EnumColor.YELLOW), + MUFFLING("muffling", 4, EnumColor.DARK_GREY); private String name; private int maxStack; @@ -68,6 +69,8 @@ public enum Upgrade return new ItemStack(MekanismItems.EnergyUpgrade); case FILTER: return new ItemStack(MekanismItems.FilterUpgrade); + case MUFFLING: + return new ItemStack(MekanismItems.MufflingUpgrade); case GAS: return new ItemStack(MekanismItems.GasUpgrade); } @@ -139,11 +142,6 @@ public enum Upgrade upgrades.put(upgrade, compound.getInteger("amount")); } } - else if(nbtTags.hasKey("energyMultiplier") && nbtTags.hasKey("speedMultiplier")) //TODO remove soon - { - upgrades.put(Upgrade.ENERGY, nbtTags.getInteger("energyMultiplier")); - upgrades.put(Upgrade.SPEED, nbtTags.getInteger("speedMultiplier")); - } } return upgrades; diff --git a/src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java b/src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java index caae5abb4..60c219017 100644 --- a/src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java +++ b/src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java @@ -83,6 +83,8 @@ public abstract class TileEntityAdvancedElectricMachine, public TileEntityBasicMachine(String soundPath, String name, ResourceLocation location, double perTick, int baseTicksRequired, double maxEnergy) { super("machine." + soundPath, name, maxEnergy); + BASE_ENERGY_PER_TICK = perTick; energyPerTick = perTick; BASE_TICKS_REQUIRED = baseTicksRequired; diff --git a/src/main/java/mekanism/common/tile/TileEntityChargepad.java b/src/main/java/mekanism/common/tile/TileEntityChargepad.java index d8fb06bc7..dc94fb3f2 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChargepad.java +++ b/src/main/java/mekanism/common/tile/TileEntityChargepad.java @@ -1,5 +1,9 @@ package mekanism.common.tile; +import ic2.api.item.ElectricItem; +import ic2.api.item.IElectricItem; +import io.netty.buffer.ByteBuf; + import java.util.ArrayList; import java.util.EnumSet; import java.util.List; @@ -15,23 +19,16 @@ import mekanism.common.block.BlockMachine.MachineType; import mekanism.common.entity.EntityRobit; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.util.MekanismUtils; - import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.AxisAlignedBB; import net.minecraftforge.common.util.ForgeDirection; - +import cofh.api.energy.IEnergyContainerItem; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import io.netty.buffer.ByteBuf; - -import cofh.api.energy.IEnergyContainerItem; -import ic2.api.item.ElectricItem; -import ic2.api.item.IElectricItem; - public class TileEntityChargepad extends TileEntityNoisyElectricBlock { public boolean isActive; @@ -208,7 +205,7 @@ public class TileEntityChargepad extends TileEntityNoisyElectricBlock @SideOnly(Side.CLIENT) public float getVolume() { - return 0.4F; + return 0.4F*super.getVolume(); } @Override diff --git a/src/main/java/mekanism/common/tile/TileEntityChemicalCrystallizer.java b/src/main/java/mekanism/common/tile/TileEntityChemicalCrystallizer.java index 1132d4213..6241c8d16 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChemicalCrystallizer.java +++ b/src/main/java/mekanism/common/tile/TileEntityChemicalCrystallizer.java @@ -1,16 +1,31 @@ package mekanism.common.tile; import io.netty.buffer.ByteBuf; + +import java.util.ArrayList; + import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.api.MekanismConfig.usage; import mekanism.api.Range4D; -import mekanism.api.gas.*; +import mekanism.api.gas.Gas; +import mekanism.api.gas.GasRegistry; +import mekanism.api.gas.GasStack; +import mekanism.api.gas.GasTank; +import mekanism.api.gas.GasTransmission; +import mekanism.api.gas.IGasHandler; +import mekanism.api.gas.IGasItem; +import mekanism.api.gas.ITubeConnection; import mekanism.api.transmitters.TransmissionType; import mekanism.common.Mekanism; import mekanism.common.SideData; import mekanism.common.Upgrade; -import mekanism.common.base.*; +import mekanism.common.base.IEjector; +import mekanism.common.base.IRedstoneControl; +import mekanism.common.base.ISideConfiguration; +import mekanism.common.base.ISustainedData; +import mekanism.common.base.ITankManager; +import mekanism.common.base.IUpgradeTile; import mekanism.common.block.BlockMachine.MachineType; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.recipe.RecipeHandler; @@ -26,8 +41,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.util.ForgeDirection; -import java.util.ArrayList; - public class TileEntityChemicalCrystallizer extends TileEntityNoisyElectricBlock implements IGasHandler, ITubeConnection, IRedstoneControl, ISideConfiguration, IUpgradeTile, ISustainedData, ITankManager { public static final int MAX_GAS = 10000; @@ -87,6 +100,8 @@ public class TileEntityChemicalCrystallizer extends TileEntityNoisyElectricBlock inventory = new ItemStack[4]; upgradeComponent = new TileComponentUpgrade(this, 3); + upgradeComponent.setSupported(Upgrade.MUFFLING); + ejectorComponent = new TileComponentEjector(this); ejectorComponent.setOutputData(TransmissionType.ITEM, configComponent.getOutputs(TransmissionType.ITEM).get(2)); } diff --git a/src/main/java/mekanism/common/tile/TileEntityChemicalDissolutionChamber.java b/src/main/java/mekanism/common/tile/TileEntityChemicalDissolutionChamber.java index a2bd0b951..f519a4b09 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChemicalDissolutionChamber.java +++ b/src/main/java/mekanism/common/tile/TileEntityChemicalDissolutionChamber.java @@ -17,9 +17,9 @@ import mekanism.api.gas.IGasItem; import mekanism.api.gas.ITubeConnection; import mekanism.common.Mekanism; import mekanism.common.Upgrade; -import mekanism.common.base.ITankManager; import mekanism.common.base.IRedstoneControl; import mekanism.common.base.ISustainedData; +import mekanism.common.base.ITankManager; import mekanism.common.base.IUpgradeTile; import mekanism.common.block.BlockMachine.MachineType; import mekanism.common.network.PacketTileEntity.TileEntityMessage; @@ -79,7 +79,9 @@ public class TileEntityChemicalDissolutionChamber extends TileEntityNoisyElectri public TileEntityChemicalDissolutionChamber() { super("machine.dissolution", "ChemicalDissolutionChamber", MachineType.CHEMICAL_DISSOLUTION_CHAMBER.baseEnergy); + inventory = new ItemStack[5]; + upgradeComponent.setSupported(Upgrade.MUFFLING); } @Override diff --git a/src/main/java/mekanism/common/tile/TileEntityChemicalInfuser.java b/src/main/java/mekanism/common/tile/TileEntityChemicalInfuser.java index 31f0e4847..6a4bbe940 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChemicalInfuser.java +++ b/src/main/java/mekanism/common/tile/TileEntityChemicalInfuser.java @@ -19,9 +19,9 @@ import mekanism.api.gas.ITubeConnection; import mekanism.common.Mekanism; import mekanism.common.Upgrade; import mekanism.common.Upgrade.IUpgradeInfoHandler; -import mekanism.common.base.ITankManager; import mekanism.common.base.IRedstoneControl; import mekanism.common.base.ISustainedData; +import mekanism.common.base.ITankManager; import mekanism.common.base.IUpgradeTile; import mekanism.common.block.BlockMachine.MachineType; import mekanism.common.network.PacketTileEntity.TileEntityMessage; @@ -32,8 +32,6 @@ import mekanism.common.tile.component.TileComponentUpgrade; import mekanism.common.util.ChargeUtils; import mekanism.common.util.InventoryUtils; import mekanism.common.util.MekanismUtils; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; @@ -73,7 +71,9 @@ public class TileEntityChemicalInfuser extends TileEntityNoisyElectricBlock impl public TileEntityChemicalInfuser() { super("machine.cheminfuser", "ChemicalInfuser", MachineType.CHEMICAL_INFUSER.baseEnergy); + inventory = new ItemStack[5]; + upgradeComponent.setSupported(Upgrade.MUFFLING); } @Override diff --git a/src/main/java/mekanism/common/tile/TileEntityChemicalOxidizer.java b/src/main/java/mekanism/common/tile/TileEntityChemicalOxidizer.java index 0f734119a..ff3ddd77e 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChemicalOxidizer.java +++ b/src/main/java/mekanism/common/tile/TileEntityChemicalOxidizer.java @@ -69,7 +69,9 @@ public class TileEntityChemicalOxidizer extends TileEntityNoisyElectricBlock imp public TileEntityChemicalOxidizer() { super("machine.oxidizer", "ChemicalOxidizer", MachineType.CHEMICAL_OXIDIZER.baseEnergy); + inventory = new ItemStack[4]; + upgradeComponent.setSupported(Upgrade.MUFFLING); } @Override diff --git a/src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java b/src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java index 5b3409a6a..186132e2d 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java +++ b/src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java @@ -1,10 +1,21 @@ package mekanism.common.tile; import io.netty.buffer.ByteBuf; + +import java.util.ArrayList; +import java.util.List; + import mekanism.api.Coord4D; import mekanism.api.MekanismConfig.usage; import mekanism.api.Range4D; -import mekanism.api.gas.*; +import mekanism.api.gas.Gas; +import mekanism.api.gas.GasRegistry; +import mekanism.api.gas.GasStack; +import mekanism.api.gas.GasTank; +import mekanism.api.gas.GasTransmission; +import mekanism.api.gas.IGasHandler; +import mekanism.api.gas.IGasItem; +import mekanism.api.gas.ITubeConnection; import mekanism.common.Mekanism; import mekanism.common.Upgrade; import mekanism.common.Upgrade.IUpgradeInfoHandler; @@ -18,15 +29,23 @@ import mekanism.common.recipe.RecipeHandler; import mekanism.common.recipe.inputs.GasInput; import mekanism.common.recipe.machines.WasherRecipe; import mekanism.common.tile.component.TileComponentUpgrade; -import mekanism.common.util.*; +import mekanism.common.util.ChargeUtils; +import mekanism.common.util.FluidContainerUtils; +import mekanism.common.util.InventoryUtils; +import mekanism.common.util.MekanismUtils; +import mekanism.common.util.PipeUtils; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.*; - -import java.util.ArrayList; -import java.util.List; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidContainerRegistry; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTank; +import net.minecraftforge.fluids.FluidTankInfo; +import net.minecraftforge.fluids.IFluidContainerItem; +import net.minecraftforge.fluids.IFluidHandler; public class TileEntityChemicalWasher extends TileEntityNoisyElectricBlock implements IGasHandler, ITubeConnection, IRedstoneControl, IFluidHandler, IUpgradeTile, ISustainedData, IUpgradeInfoHandler, ITankManager { @@ -65,7 +84,9 @@ public class TileEntityChemicalWasher extends TileEntityNoisyElectricBlock imple public TileEntityChemicalWasher() { super("machine.washer", "ChemicalWasher", MachineType.CHEMICAL_WASHER.baseEnergy); + inventory = new ItemStack[5]; + upgradeComponent.setSupported(Upgrade.MUFFLING); } @Override diff --git a/src/main/java/mekanism/common/tile/TileEntityCrusher.java b/src/main/java/mekanism/common/tile/TileEntityCrusher.java index ce2f4b68b..dfac8af21 100644 --- a/src/main/java/mekanism/common/tile/TileEntityCrusher.java +++ b/src/main/java/mekanism/common/tile/TileEntityCrusher.java @@ -27,6 +27,6 @@ public class TileEntityCrusher extends TileEntityElectricMachine @SideOnly(Side.CLIENT) public float getVolume() { - return 0.5F; + return 0.5F*super.getVolume(); } } diff --git a/src/main/java/mekanism/common/tile/TileEntityElectricMachine.java b/src/main/java/mekanism/common/tile/TileEntityElectricMachine.java index acaf8e6b7..16b61c0ef 100644 --- a/src/main/java/mekanism/common/tile/TileEntityElectricMachine.java +++ b/src/main/java/mekanism/common/tile/TileEntityElectricMachine.java @@ -1,18 +1,12 @@ package mekanism.common.tile; -import java.util.ArrayList; - -import mekanism.api.Coord4D; import mekanism.api.EnumColor; -import mekanism.api.Range4D; import mekanism.api.transmitters.TransmissionType; -import mekanism.common.Mekanism; import mekanism.common.MekanismBlocks; import mekanism.common.MekanismItems; import mekanism.common.SideData; import mekanism.common.Upgrade; import mekanism.common.base.IFactory.RecipeType; -import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.recipe.RecipeHandler; import mekanism.common.recipe.inputs.ItemStackInput; import mekanism.common.recipe.machines.BasicMachineRecipe; @@ -55,6 +49,8 @@ public abstract class TileEntityElectricMachine 0 ? biome*20 : biomeTemp*40; - float incr = (float)Math.sqrt(Math.abs(temperature-base))*(float)general.evaporationHeatDissipation.getDouble(); + float incr = (float)Math.sqrt(Math.abs(temperature-base))*(float)general.evaporationHeatDissipation; if(temperature > base) { incr = -incr; } - System.out.println(incr + " " + biome + " " + base); - - temperature = (float)Math.min(general.evaporationMaxTemp.getDouble(), temperature + incr/(float)height); + temperature = (float)Math.min(general.evaporationMaxTemp, temperature + incr/(float)height); tempToAdd = 0; @@ -594,7 +592,7 @@ public class TileEntitySolarEvaporationController extends TileEntitySolarEvapora public int getScaledTempLevel(int i) { - return (int)(i*Math.min(1, getTemperature()/general.evaporationMaxTemp.getDouble())); + return (int)(i*Math.min(1, getTemperature()/general.evaporationMaxTemp)); } public Coord4D getRenderLocation() diff --git a/src/main/java/mekanism/common/tile/component/TileComponentUpgrade.java b/src/main/java/mekanism/common/tile/component/TileComponentUpgrade.java index 71aded2d2..94f1662de 100644 --- a/src/main/java/mekanism/common/tile/component/TileComponentUpgrade.java +++ b/src/main/java/mekanism/common/tile/component/TileComponentUpgrade.java @@ -1,20 +1,23 @@ package mekanism.common.tile.component; +import io.netty.buffer.ByteBuf; + import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; import java.util.Map; import java.util.Set; +import mekanism.api.Coord4D; +import mekanism.api.Range4D; +import mekanism.common.Mekanism; import mekanism.common.Upgrade; import mekanism.common.base.ITileComponent; import mekanism.common.base.IUpgradeItem; +import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.TileEntityContainerBlock; - import net.minecraft.nbt.NBTTagCompound; -import io.netty.buffer.ByteBuf; - public class TileComponentUpgrade implements ITileComponent { /** How long it takes this machine to install an upgrade. */ @@ -79,6 +82,7 @@ public class TileComponentUpgrade implements ITileComponent tileEntity.inventory[upgradeSlot] = null; } + Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(tileEntity), tileEntity.getNetworkedData(new ArrayList())), new Range4D(Coord4D.get(tileEntity))); tileEntity.markDirty(); } } diff --git a/src/main/java/mekanism/generators/common/tile/TileEntitySolarGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntitySolarGenerator.java index c6d4996ca..85116c129 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntitySolarGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntitySolarGenerator.java @@ -45,7 +45,7 @@ public class TileEntitySolarGenerator extends TileEntityGenerator @SideOnly(Side.CLIENT) public float getVolume() { - return 0.05F; + return 0.05F*super.getVolume(); } @Override diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityWindGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityWindGenerator.java index a9d8d415f..f1ef89e4c 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityWindGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityWindGenerator.java @@ -68,7 +68,7 @@ public class TileEntityWindGenerator extends TileEntityGenerator implements IBou @SideOnly(Side.CLIENT) public float getVolume() { - return 1.5F; + return 1.5F*super.getVolume(); } private static final String[] methods = new String[] {"getStored", "getOutput", "getMaxEnergy", "getEnergyNeeded", "getMultiplier"}; diff --git a/src/main/resources/assets/mekanism/lang/en_US.lang b/src/main/resources/assets/mekanism/lang/en_US.lang index a9292d522..ed9397f13 100644 --- a/src/main/resources/assets/mekanism/lang/en_US.lang +++ b/src/main/resources/assets/mekanism/lang/en_US.lang @@ -11,6 +11,7 @@ item.EnergyTablet.name=Energy Tablet item.SpeedUpgrade.name=Speed Upgrade item.EnergyUpgrade.name=Energy Upgrade item.FilterUpgrade.name=Filter Upgrade +item.MufflingUpgrade.name=Muffling Upgrade item.GasUpgrade.name=Gas Upgrade item.Robit.name=Robit item.AtomicDisassembler.name=Atomic Disassembler @@ -355,6 +356,8 @@ upgrade.filter=Filter upgrade.filter.desc=A filter that separates !nheavy water from regular water. upgrade.gas=Gas upgrade.gas.desc=Increases the efficiency !nof gas-using machinery. +upgrade.muffling=Muffling +upgrade.muffling.desc=Reduces noise generated !nby machinery. //Key description text key.mode=Item Mode Switch @@ -380,8 +383,6 @@ mekanism.configgui.ctgy.usage.tooltip=Settings regarding machinery and their ene mekanism.configgui.ctgy.client.tooltip=Client-specific settings regarding Mekanism and all its modules //Gui text -gui.removeSpeedUpgrade=Remove speed upgrade -gui.removeEnergyUpgrade=Remove energy upgrade gui.condensentrating=Condensentrating gui.decondensentrating=Decondensentrating gui.power=Power diff --git a/src/main/resources/assets/mekanism/textures/items/MufflingUpgrade.png b/src/main/resources/assets/mekanism/textures/items/MufflingUpgrade.png new file mode 100644 index 0000000000000000000000000000000000000000..f3a5037d08e8bf6cf6f5d4948cdaf446f8e0b6f0 GIT binary patch literal 1395 zcmV-(1&sQMP)4Tx062|}Rb6NtRTMtEb7vzY&QokOg>Hg1+lHrgWS zWcKdPn90sKGrRqvPeo9CG3uKX#J{(IASm?@+di}}l?o-=)F3E6wD^Ni=!>T7nL9I? zX}YoAW$t|Qo$sD|?zw001?ah|SeB6#0T!CBEf+H4bBB+JJu8rehoBb*p;u8ID_yBf z0ya+zcePvJL&AGs+11_tpRKn>9TgyPA7ZoSs0)aX0r00)%XR^J`jH<$>RKN5V(7Oq zK*TS4xZz{h!*f1C3ECFkK$#7nA@pGN!$;%jYvwjAKwmYb0gKL(K8 z-kPtb5${A?tlI~wzMrJ6wTdBr=Y%%%EaEMQ&o}4FQ^DA)s*}Z>!FI&AHCpoWI|RUq zx?7s@$8!5^Q=anY%X@i5{QA6kNcMelpE>R6eCYFpmMsVTrI(b06~u#xf1yS} z_UGdMvD``!0~u->P=lA4?YN`hilQ|3tHka)7T{2CGqw zjZfMwx$5irQN_*|e4l)UHmiYuz74Yp1t^#>hrJ3-SOXDcC_o0^7T9R1gAN8V6s;5) zieI5-7aQlmJn}lUna#nz!j%5V$X|o`xX!dHWQRV27P1=rj;t2bW$~+pTw@bIek?Zv zKPDL<64`^#UNTAck#RBsB6*5DP4<%UA_FqU$I>2EH_cM;u)Q~SI+rg`Rn{L_AC5qq~L$#SMj%U z$6Cz0vP{G5Y*=%5RT^yu;}-DInZ=349rJPVM6C3K^oO)8y(fJr{l>k`ead~!ea?NsT>_Ci%bnxC;Vy6=b6>{xYV#Ue-+LB$ z7`JEXmTRm^AtP)R9u{)KHsMiWGV&)32xCG~*nyU<>-!d;FP=Re4r3qYr~6#KE>;1F z`>_J_P5xC?ROxV(DIHdCO*p$HRQI@7^PwV@Pvuf+5K}u-6REM(K@W$s zrgorh0{i?O)v0c>QtHxU-hBdD(>iYJ4b2sIOVX2K8m~4gmYVA5h^QEb$V`rCQ-|7Z zS{nuL-t>?3n=-o(6I(7vocj#GzCZEo`!3>+v;dYIfPu#&ZWzzX2i^rZ^Mu;6+rb@? zNPG+6)c5T6zxpzGe*M(x+{AON=PiJ>H#?ob-|uwRK0yDg0B4PV0id6JRZw95ZvX%R zAxT6*R9Fe^Rxu8PFbqtqj(mj=@Bjv$%merU8xtcEjO=Y))m3m~YR;8fwOB$pj^jID zf=CFv{ksAOO@KVl&)OUkZ`(GBbwrB2bInN>86V6oLJCUh|(m z!&IW&XOdnT1JiqpnFvt96zCQpEf?AXtr!yD37F0R?f*Q_4~4TVd-z_*L_nVGx~_vH zL7$$?vyg+%Kv|XxMF@z&w-SK}taZjj)^g%Gm_SN}xUkhXodK;Fk?@*IfbRjX{^wo- z@D_N1dHv#k#=-lW?{Fdv50h9QR{(BjU-&Z$TmY^DR^@lTHCzAy002ovPDHLkV1kq% Br4j%D literal 0 HcmV?d00001