xircon/Hbm-s-Nuclear-Tech-GIT
1
0
Fork 0
mirror of https://github.com/HbmMods/Hbm-s-Nuclear-Tech-GIT.git synced 2026-01-25 10:32:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

muffler 2: the remufflering

Browse Source
This commit is contained in:
Boblet 2024-01-22 14:43:00 +01:00
parent 52825d9d9e
commit a67faa99df
98 changed files with 268 additions and 128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
changelog
View File

@ -1,51 +1,9 @@
## Added
* Silo hatch
* The final missing door from 1.12, remade from scratch
* Comes with a brand-new model that fits perfectly over 3x3 missile launch tubes
* Has a 5x5 frame
* Can be opened and closed with a detonator
* Molysite
* Found in basalt from volcanos
* Can be combination-smelted into iron and chlorine
* Don't make me pull another chlorocalcite
* Rad volcanos
* Created when fallout affects a volcano core
* Uses a new volcanic lava type that produces sellafite, as well as sellafite gem ores
* Radioactive gem
* Created when fallout affects diamond ore, or if radioactive volcanic lava touches diamond ore
* Currenly only used in the radiation powered engine as powerful long-lasting fuel
* When depleted, turns back into a regular diamond
## Changed
* Simplified door recipes
* Fissure bombs now require tantalium
* Removed the "nerve agent" hazard class because no gas used it
* Fissures now continuously spawn volcanic lava, making basalt renewable without having an entire volcano
* Volcanic lava now turns diamond ore into gem-rich basalt
* Mushroom clouds have been tweaked
* Their scale no longer scales linearly, but rather with a square root function, this prevents tsar clouds from being so huge that the top fails to render due to clipping through the skybox
* Their default scale is now somewhat larger
* The flash scale has been increased
* Their general scaling is now consistent, larger clouds will no longer be chubby with a comically small ring
* Shockwave particles now have momentum, making them sweep over the landscape, as well as being 1.5x denser and slightly larger
* Effect shamelessly stolen from NTM-EE
* Outer condensation rings' spawning is no longer fixed, the time now scales with the size
* The inner condensation ring's spawn time is also now based on scale, which means larger clouds will no longer end up with comically thin rings due to not spawning enough cloudlets
* Muffler
* An upgrade-like item that replaces the old muffler block
* Creates 16 when crafted, however it is not returned when the muffled machine is broken
* Should work with pretty much all machines that use looped sounds, as well as a few other noisy ones (copressors, diesel generators, presses)
* Simply right-click to install, doesn't need to be inserted into an upgrade slot, in fact it works on a few machines that have no GUI at all
## Fixed
* Fixed sellafite emerald ore being oredicted as emerald dust
* Fixed fire replacing petrified wood, creating tons of dead trees with holes in them
* Fixed inconsistent scaling with nuclear missiles
* Fixed BFB rods being called ZFB in hot and depleted variants
* Fixed infinite water barrels voiding water completely after the chemplant's input buffer runs full, infinite barrels can no longer void water in chemplants
* Fixed fallout affecting things on Y:0 like bedrock ores and oil
* Fixed projectiles not being able to pass through open doors
* Fixed material dupe caused by strand caster overflowing
* Fixed rampant mode glyphid scout spawn ignoring light level
* Fixed glyphid diggers' debris attack being able to break concrete
* Fixed `canLaunch` function of custom missile launch pads demanding a designator, preventing launch pads without designator from working even when the position is supplied by a radar
* Fixed none of the helmets or filters protecting against corrosive gasses (blistering agents) like mustard gas
* Fixed fallout layers being able to generate below roofs
* Fixed exposure chamber not saving anything to NBT besides slots
* Fixed crash caused by wearing the full PaA set and then putting on an HEV helmet (why would anyone ever do this??)
* Fixed large doors only being lockable by clicking on the core block
* Fixed basalt ores dropping their items with invalid metadata

7
src/main/java/com/hbm/blocks/ModBlocks.java
View File

@ -632,8 +632,6 @@ public class ModBlocks {
public static Block tesla;
public static Block muffler;
public static Block sat_mapper;
public static Block sat_scanner;
public static Block sat_radar;
@ -2148,8 +2146,6 @@ public class ModBlocks {
tesla = new MachineTesla(Material.iron).setBlockName("tesla").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.blockTab).setBlockTextureName(RefStrings.MODID + ":tesla");
muffler = new BlockGeneric(Material.cloth).setBlockName("muffler").setHardness(0.8F).setStepSound(Block.soundTypeCloth).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":muffler");
launch_pad = new LaunchPad(Material.iron).setBlockName("launch_pad").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.missileTab).setBlockTextureName(RefStrings.MODID + ":launch_pad");
machine_radar = new MachineRadar(Material.iron).setBlockName("machine_radar").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.missileTab).setBlockTextureName(RefStrings.MODID + ":machine_radar");
machine_radar_large = new MachineRadarLarge(Material.iron).setBlockName("machine_radar_large").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.missileTab).setBlockTextureName(RefStrings.MODID + ":block_steel");
@ -3389,9 +3385,6 @@ public class ModBlocks {
GameRegistry.registerBlock(radiorec, radiorec.getUnlocalizedName());
GameRegistry.registerBlock(radiobox, radiobox.getUnlocalizedName());
//The muffler
GameRegistry.registerBlock(muffler, muffler.getUnlocalizedName());
//Multiblock Parts
GameRegistry.registerBlock(struct_launcher, struct_launcher.getUnlocalizedName());
GameRegistry.registerBlock(struct_scaffold, struct_scaffold.getUnlocalizedName());

1
src/main/java/com/hbm/blocks/generic/BlockMush.java
View File

@ -4,7 +4,6 @@ import java.util.HashSet;
import java.util.Random;
import java.util.Set;
import com.google.common.collect.Sets;
import com.hbm.blocks.ModBlocks;
import com.hbm.config.GeneralConfig;
import com.hbm.world.feature.HugeMush;

5
src/main/java/com/hbm/blocks/generic/BlockOreBasalt.java
View File

@ -47,6 +47,11 @@ public class BlockOreBasalt extends BlockEnumMulti {
return super.getItemDropped(meta, rand, fortune);
}
@Override
public int damageDropped(int meta) {
return 0;
}
@Override
public void onEntityWalking(World world, int x, int y, int z, Entity entity) {
int meta = world.getBlockMetadata(x, y, z);

9
src/main/java/com/hbm/items/ModItems.java
View File

@ -1855,6 +1855,8 @@ public class ModItems {
/*public static Item factory_core_titanium;
public static Item factory_core_advanced;*/
public static Item upgrade_muffler;
public static Item upgrade_template;
public static Item upgrade_speed_1;
public static Item upgrade_speed_2;
@ -3454,8 +3456,8 @@ public class ModItems {
defuser_gold = new ItemModDefuser().setUnlocalizedName("defuser_gold").setTextureName(RefStrings.MODID + ":defuser_gold");
ballistic_gauntlet = new ItemModTwoKick().setUnlocalizedName("ballistic_gauntlet").setTextureName(RefStrings.MODID + ":ballistic_gauntlet");
night_vision = new ItemModNightVision().setUnlocalizedName("night_vision").setTextureName(RefStrings.MODID + ":night_vision");
card_aos = new ItemModCard().setUnlocalizedName(null).setTextureName(RefStrings.MODID + ":card_aos");
card_qos = new ItemModCard().setUnlocalizedName(null).setTextureName(RefStrings.MODID + ":card_qos");
card_aos = new ItemModCard().setUnlocalizedName("card_aos").setTextureName(RefStrings.MODID + ":card_aos");
card_qos = new ItemModCard().setUnlocalizedName("card_qos").setTextureName(RefStrings.MODID + ":card_qos");
cap_nuka = new Item().setUnlocalizedName("cap_nuka").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":cap_nuka");
cap_quantum = new Item().setUnlocalizedName("cap_quantum").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":cap_quantum");
@ -4488,6 +4490,8 @@ public class ModItems {
fusion_shield_chlorophyte = new ItemFusionShield(60 * 60 * 60 * 15, 9000).setUnlocalizedName("fusion_shield_chlorophyte").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":fusion_shield_chlorophyte");
fusion_shield_vaporwave = new ItemFusionShield(60 * 60 * 60 * 10, 1916169).setUnlocalizedName("fusion_shield_vaporwave").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":fusion_shield_vaporwave");
upgrade_muffler = new ItemMuffler().setUnlocalizedName("upgrade_muffler").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":upgrade_muffler");
upgrade_template = new ItemCustomLore().setUnlocalizedName("upgrade_template").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":upgrade_template");
upgrade_speed_1 = new ItemMachineUpgrade(UpgradeType.SPEED, 1).setUnlocalizedName("upgrade_speed_1").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":upgrade_speed_1");
upgrade_speed_2 = new ItemMachineUpgrade(UpgradeType.SPEED, 2).setUnlocalizedName("upgrade_speed_2").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":upgrade_speed_2");
@ -6517,6 +6521,7 @@ public class ModItems {
GameRegistry.registerItem(scraps, scraps.getUnlocalizedName());
//Machine Upgrades
GameRegistry.registerItem(upgrade_muffler, upgrade_muffler.getUnlocalizedName());
GameRegistry.registerItem(upgrade_template, upgrade_template.getUnlocalizedName());
GameRegistry.registerItem(upgrade_speed_1, upgrade_speed_1.getUnlocalizedName());
GameRegistry.registerItem(upgrade_speed_2, upgrade_speed_2.getUnlocalizedName());

31
src/main/java/com/hbm/items/machine/ItemMuffler.java Normal file
View File

@ -0,0 +1,31 @@
package com.hbm.items.machine;
import com.hbm.tileentity.TileEntityMachineBase;
import com.hbm.util.CompatExternal;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
public class ItemMuffler extends Item {
@Override
public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int i, float f0, float f1, float f2) {
TileEntity te = CompatExternal.getCoreFromPos(world, x, y, z);
if(te != null && te instanceof TileEntityMachineBase) {
TileEntityMachineBase tile = (TileEntityMachineBase) te;
if(!tile.muffled) {
tile.muffled = true;
world.playSoundAtEntity(player, "hbm:item.upgradePlug", 1.0F, 1.0F);
stack.stackSize--;
tile.markDirty();
return true;
}
}
return false;
}
}

4
src/main/java/com/hbm/main/CraftingManager.java
View File

@ -329,7 +329,7 @@ public class CraftingManager {
addRecipeAuto(new ItemStack(ModBlocks.fan), new Object[] { "BPB", "PRP", "BPB", 'B', STEEL.bolt(), 'P', IRON.plate(), 'R', REDSTONE.dust() });
addRecipeAuto(new ItemStack(ModBlocks.piston_inserter), new Object[] { "ITI", "TPT", "ITI", 'P', DictFrame.fromOne(ModItems.part_generic, EnumPartType.PISTON_PNEUMATIC), 'I', IRON.plate(), 'T', STEEL.bolt() });
addRecipeAuto(new ItemStack(ModBlocks.muffler, 1), new Object[] { "III", "IWI", "III", 'I', ANY_RUBBER.ingot(), 'W', Blocks.wool });
addRecipeAuto(new ItemStack(ModItems.upgrade_muffler, 16), new Object[] { "III", "IWI", "III", 'I', ANY_RUBBER.ingot(), 'W', Blocks.wool });
addRecipeAuto(new ItemStack(Item.getItemFromBlock(ModBlocks.factory_titanium_hull), 8), new Object[] { "PIP", "I I", "PIP", 'P', TI.plate(), 'I', TI.ingot() });
addRecipeAuto(new ItemStack(Item.getItemFromBlock(ModBlocks.factory_advanced_hull), 8), new Object[] { "PIP", "I I", "PIP", 'P', ALLOY.plate(), 'I', ALLOY.ingot() });
@ -988,7 +988,7 @@ public class CraftingManager {
addRecipeAuto(new ItemStack(ModBlocks.field_disturber), new Object[] { "ICI", "CAC", "ICI", 'I', STAR.ingot(), 'C', KEY_CIRCUIT_BISMUTH, 'A', ModItems.gem_alexandrite });
addShapelessAuto(new ItemStack(ModItems.holotape_image, 1, EnumHoloImage.HOLO_RESTORED.ordinal()), new Object[] { new ItemStack(ModItems.holotape_image, 1, EnumHoloImage.HOLO_DIGAMMA.ordinal()), KEY_TOOL_SCREWDRIVER, ModItems.ducttape, ModItems.armor_polish });
addShapelessAuto(new ItemStack(ModItems.holotape_damaged), new Object[] { DictFrame.fromOne(ModItems.holotape_image, EnumHoloImage.HOLO_RESTORED), ModBlocks.muffler, ModItems.crt_display, ModItems.gem_alexandrite /* placeholder for amplifier */ });
addShapelessAuto(new ItemStack(ModItems.holotape_damaged), new Object[] { DictFrame.fromOne(ModItems.holotape_image, EnumHoloImage.HOLO_RESTORED), ModItems.upgrade_muffler, ModItems.crt_display, ModItems.gem_alexandrite /* placeholder for amplifier */ });
addRecipeAuto(DictFrame.fromOne(ModItems.part_generic, EnumPartType.PISTON_PNEUMATIC, 4), new Object[] { " I ", "CPC", " I ", 'I', IRON.ingot(), 'C', CU.ingot(), 'P', IRON.plate() });
addRecipeAuto(DictFrame.fromOne(ModItems.part_generic, EnumPartType.PISTON_HYDRAULIC, 4), new Object[] { " I ", "CPC", " I ", 'I', STEEL.ingot(), 'C', TI.ingot(), 'P', Fluids.LUBRICANT.getDict(1000) });

1
src/main/java/com/hbm/main/MainRegistry.java
View File

@ -1210,6 +1210,7 @@ public class MainRegistry {
ignoreMappings.add("hbm:tile.reactor_conductor");
ignoreMappings.add("hbm:tile.reactor_computer");
ignoreMappings.add("hbm:tile.ff");
ignoreMappings.add("hbm:tile.muffler");
/// REMAP ///
remapItems.put("hbm:item.gadget_explosive8", ModItems.early_explosive_lenses);

18
src/main/java/com/hbm/tileentity/TileEntityLoadedBase.java
View File

@ -3,11 +3,13 @@ package com.hbm.tileentity;
import com.hbm.sound.AudioWrapper;
import api.hbm.energy.ILoadedTile;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
public class TileEntityLoadedBase extends TileEntity implements ILoadedTile {
public boolean isLoaded = true;
public boolean muffled = false;
@Override
public boolean isLoaded() {
@ -28,4 +30,20 @@ public class TileEntityLoadedBase extends TileEntity implements ILoadedTile {
audio.startSound();
return audio;
}
@Override
public void readFromNBT(NBTTagCompound nbt) {
super.readFromNBT(nbt);
this.muffled = nbt.getBoolean("muffled");
}
@Override
public void writeToNBT(NBTTagCompound nbt) {
super.writeToNBT(nbt);
nbt.setBoolean("muffled", muffled);
}
public float getVolume(float baseVolume) {
return muffled ? baseVolume * 0.1F : baseVolume;
}
}

36
src/main/java/com/hbm/tileentity/TileEntityMachineBase.java
View File

@ -1,6 +1,5 @@
package com.hbm.tileentity;
import com.hbm.blocks.ModBlocks;
import com.hbm.packet.AuxGaugePacket;
import com.hbm.packet.BufPacket;
import com.hbm.packet.NBTPacket;
@ -157,17 +156,28 @@ public abstract class TileEntityMachineBase extends TileEntityLoadedBase impleme
@Deprecated public void processGauge(int val, int id) { }
@Deprecated public void networkPack(NBTTagCompound nbt, int range) {
nbt.setBoolean("muffled", muffled);
if(!worldObj.isRemote) PacketDispatcher.wrapper.sendToAllAround(new NBTPacket(nbt, xCoord, yCoord, zCoord), new TargetPoint(this.worldObj.provider.dimensionId, xCoord, yCoord, zCoord, range));
}
@Deprecated public void networkUnpack(NBTTagCompound nbt) { }
@Deprecated
public void networkUnpack(NBTTagCompound nbt) {
this.muffled = nbt.getBoolean("muffled");
}
/** Sends a sync packet that uses ByteBuf for efficient information-cramming */
public void networkPackNT(int range) {
if(!worldObj.isRemote) PacketDispatcher.wrapper.sendToAllAround(new BufPacket(xCoord, yCoord, zCoord, this), new TargetPoint(this.worldObj.provider.dimensionId, xCoord, yCoord, zCoord, range));
}
@Override public void serialize(ByteBuf buf) { }
@Override public void deserialize(ByteBuf buf) { }
@Override
public void serialize(ByteBuf buf) {
buf.writeBoolean(muffled);
}
@Override public void deserialize(ByteBuf buf) {
this.muffled = buf.readBoolean();
}
@Deprecated
public void handleButtonPacket(int value, int meta) { }
@ -206,24 +216,6 @@ public abstract class TileEntityMachineBase extends TileEntityLoadedBase impleme
nbt.setTag("items", list);
}
public int countMufflers() {
int count = 0;
for(ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS)
if(worldObj.getBlock(xCoord + dir.offsetX, yCoord + dir.offsetY, zCoord + dir.offsetZ) == ModBlocks.muffler)
count++;
return count;
}
public float getVolume(int toSilence) {
float volume = 1 - (countMufflers() / (float)toSilence);
return Math.max(volume, 0);
}
public void updateRedstoneConnection(DirPos pos) {
int x = pos.getX();

2
src/main/java/com/hbm/tileentity/bomb/TileEntityNukeBalefire.java
View File

@ -64,7 +64,7 @@ public class TileEntityNukeBalefire extends TileEntityMachineBase implements IGU
}
public void networkUnpack(NBTTagCompound data) {
super.networkUnpack(data);
timer = data.getInteger("timer");
started = data.getBoolean("started");
loaded = data.getBoolean("loaded");

1
src/main/java/com/hbm/tileentity/machine/TileEntityAshpit.java
View File

@ -109,6 +109,7 @@ public class TileEntityAshpit extends TileEntityMachineBase implements IGUIProvi
@Override
public void networkUnpack(NBTTagCompound nbt) {
super.networkUnpack(nbt);
this.playersUsing = nbt.getInteger("playersUsing");
this.isFull = nbt.getBoolean("isFull");
}

3
src/main/java/com/hbm/tileentity/machine/TileEntityConveyorPress.java
View File

@ -163,7 +163,7 @@ public class TileEntityConveyorPress extends TileEntityMachineBase implements IE
}
}
this.worldObj.playSoundEffect(this.xCoord, this.yCoord, this.zCoord, "hbm:block.pressOperate", 1.5F, 1.0F);
this.worldObj.playSoundEffect(this.xCoord, this.yCoord, this.zCoord, "hbm:block.pressOperate", getVolume(1.5F), 1.0F);
if(slots[0].getMaxDamage() != 0) {
slots[0].setItemDamage(slots[0].getItemDamage() + 1);
@ -180,6 +180,7 @@ public class TileEntityConveyorPress extends TileEntityMachineBase implements IE
@Override
public void networkUnpack(NBTTagCompound nbt) {
super.networkUnpack(nbt);
this.power = nbt.getLong("power");
this.syncPress = nbt.getInteger("press");

3
src/main/java/com/hbm/tileentity/machine/TileEntityCore.java
View File

@ -156,8 +156,9 @@ public class TileEntityCore extends TileEntityMachineBase implements IGUIProvide
}
}
public void networkUnpack(NBTTagCompound data) {
super.networkUnpack(data);
tanks[0].setTankType(Fluids.fromID(data.getInteger("tank0")));
tanks[1].setTankType(Fluids.fromID(data.getInteger("tank1")));

1
src/main/java/com/hbm/tileentity/machine/TileEntityCoreEmitter.java
View File

@ -177,6 +177,7 @@ public class TileEntityCoreEmitter extends TileEntityMachineBase implements IEne
}
public void networkUnpack(NBTTagCompound data) {
super.networkUnpack(data);
power = data.getLong("power");
watts = data.getInteger("watts");

3
src/main/java/com/hbm/tileentity/machine/TileEntityCoreInjector.java
View File

@ -110,8 +110,9 @@ public class TileEntityCoreInjector extends TileEntityMachineBase implements IFl
this.networkPack(data, 250);
}
}
public void networkUnpack(NBTTagCompound data) {
super.networkUnpack(data);
beam = data.getInteger("beam");
}

1
src/main/java/com/hbm/tileentity/machine/TileEntityCoreReceiver.java
View File

@ -78,6 +78,7 @@ public class TileEntityCoreReceiver extends TileEntityMachineBase implements IEn
}
public void networkUnpack(NBTTagCompound data) {
super.networkUnpack(data);
joules = data.getLong("joules");
}

1
src/main/java/com/hbm/tileentity/machine/TileEntityCoreStabilizer.java
View File

@ -105,6 +105,7 @@ public class TileEntityCoreStabilizer extends TileEntityMachineBase implements I
}
public void networkUnpack(NBTTagCompound data) {
super.networkUnpack(data);
power = data.getLong("power");
watts = data.getInteger("watts");

1
src/main/java/com/hbm/tileentity/machine/TileEntityCrucible.java
View File

@ -235,6 +235,7 @@ public class TileEntityCrucible extends TileEntityMachineBase implements IGUIPro
@Override
public void networkUnpack(NBTTagCompound nbt) {
super.networkUnpack(nbt);
this.recipeStack.clear();
this.wasteStack.clear();

2
src/main/java/com/hbm/tileentity/machine/TileEntityCustomMachine.java
View File

@ -364,6 +364,8 @@ public class TileEntityCustomMachine extends TileEntityMachineBase implements IF
@Override
public void networkUnpack(NBTTagCompound nbt) {
super.networkUnpack(nbt);
this.machineType = nbt.getString("type");
if(this.config == null) this.init();

2
src/main/java/com/hbm/tileentity/machine/TileEntityDeuteriumExtractor.java
View File

@ -61,6 +61,8 @@ public class TileEntityDeuteriumExtractor extends TileEntityMachineBase implemen
}
public void networkUnpack(NBTTagCompound data) {
super.networkUnpack(data);
this.power = data.getLong("power");
tanks[0].readFromNBT(data, "water");
tanks[1].readFromNBT(data, "heavyWater");

2
src/main/java/com/hbm/tileentity/machine/TileEntityDiFurnaceRTG.java
View File

@ -79,6 +79,8 @@ public class TileEntityDiFurnaceRTG extends TileEntityMachineBase implements IGU
@Override
public void networkUnpack(NBTTagCompound nbt) {
super.networkUnpack(nbt);
progress = nbt.getShort("progress");
processSpeed = nbt.getShort("speed");
byte[] modes = nbt.getByteArray("modes");

2
src/main/java/com/hbm/tileentity/machine/TileEntityElectrolyser.java
View File

@ -242,6 +242,8 @@ public class TileEntityElectrolyser extends TileEntityMachineBase implements IEn
@Override
public void networkUnpack(NBTTagCompound nbt) {
super.networkUnpack(nbt);
this.power = nbt.getLong("power");
this.progressFluid = nbt.getInteger("progressFluid");
this.progressOre = nbt.getInteger("progressOre");

3
src/main/java/com/hbm/tileentity/machine/TileEntityFEL.java
View File

@ -202,6 +202,7 @@ public class TileEntityFEL extends TileEntityMachineBase implements IEnergyUser,
audio = rebootAudio(audio);
}
audio.updateVolume(getVolume(2F));
audio.updatePitch((audioDuration - 10) / 100F + 0.5F);
} else {
@ -226,6 +227,8 @@ public class TileEntityFEL extends TileEntityMachineBase implements IEnergyUser,
@Override
public void networkUnpack(NBTTagCompound nbt) {
super.networkUnpack(nbt);
this.power = nbt.getLong("power");
this.mode = EnumWavelengths.valueOf(nbt.getString("mode"));
this.isOn = nbt.getBoolean("isOn");

4
src/main/java/com/hbm/tileentity/machine/TileEntityFireboxBase.java
View File

@ -109,7 +109,7 @@ public abstract class TileEntityFireboxBase extends TileEntityMachinePolluting i
}
this.wasOn = true;
if(worldObj.rand.nextInt(15) == 0) {
if(worldObj.rand.nextInt(15) == 0 && !this.muffled) {
worldObj.playSoundEffect(xCoord, yCoord, zCoord, "fire.fire", 1.0F, 0.5F + worldObj.rand.nextFloat() * 0.5F);
}
}
@ -184,6 +184,8 @@ public abstract class TileEntityFireboxBase extends TileEntityMachinePolluting i
@Override
public void networkUnpack(NBTTagCompound nbt) {
super.networkUnpack(nbt);
this.maxBurnTime = nbt.getInteger("maxBurnTime");
this.burnTime = nbt.getInteger("burnTime");
this.burnHeat = nbt.getInteger("burnHeat");

2
src/main/java/com/hbm/tileentity/machine/TileEntityFurnaceCombination.java
View File

@ -168,6 +168,8 @@ public class TileEntityFurnaceCombination extends TileEntityMachinePolluting imp
@Override
public void networkUnpack(NBTTagCompound nbt) {
super.networkUnpack(nbt);
this.wasOn = nbt.getBoolean("wasOn");
this.heat = nbt.getInteger("heat");
this.progress = nbt.getInteger("progress");

4
src/main/java/com/hbm/tileentity/machine/TileEntityFurnaceIron.java
View File

@ -93,7 +93,7 @@ public class TileEntityFurnaceIron extends TileEntityMachineBase implements IGUI
this.progress++;
this.burnTime--;
if(this.progress % 15 == 0) {
if(this.progress % 15 == 0 && !this.muffled) {
worldObj.playSoundEffect(xCoord, yCoord, zCoord, "fire.fire", 1.0F, 0.5F + worldObj.rand.nextFloat() * 0.5F);
}
@ -142,6 +142,8 @@ public class TileEntityFurnaceIron extends TileEntityMachineBase implements IGUI
@Override
public void networkUnpack(NBTTagCompound nbt) {
super.networkUnpack(nbt);
this.maxBurnTime = nbt.getInteger("maxBurnTime");
this.burnTime = nbt.getInteger("burnTime");
this.progress = nbt.getInteger("progress");

2
src/main/java/com/hbm/tileentity/machine/TileEntityFurnaceSteel.java
View File

@ -123,6 +123,8 @@ public class TileEntityFurnaceSteel extends TileEntityMachineBase implements IGU
@Override
public void networkUnpack(NBTTagCompound nbt) {
super.networkUnpack(nbt);
this.progress = nbt.getIntArray("progress");
this.bonus = nbt.getIntArray("bonus");
this.heat = nbt.getInteger("heat");

2
src/main/java/com/hbm/tileentity/machine/TileEntityHadron.java
View File

@ -193,6 +193,8 @@ public class TileEntityHadron extends TileEntityMachineBase implements IEnergyUs
@Override
public void networkUnpack(NBTTagCompound data) {
super.networkUnpack(data);
this.isOn = data.getBoolean("isOn");
this.power = data.getLong("power");
this.analysisOnly = data.getBoolean("analysis");

5
src/main/java/com/hbm/tileentity/machine/TileEntityHeatBoiler.java
View File

@ -94,6 +94,7 @@ public class TileEntityHeatBoiler extends TileEntityLoadedBase implements IFluid
data.setBoolean("exploded", this.hasExploded);
data.setBoolean("isOn", this.isOn);
data.setBoolean("muffled", this.muffled);
INBTPacketReceiver.networkPack(this, data, 25);
} else {
@ -109,7 +110,8 @@ public class TileEntityHeatBoiler extends TileEntityLoadedBase implements IFluid
} else if(!audio.isPlaying()) {
audio = rebootAudio(audio);
}
audio.updateVolume(getVolume(1F));
audio.keepAlive();
} else {
@ -150,6 +152,7 @@ public class TileEntityHeatBoiler extends TileEntityLoadedBase implements IFluid
@Override
public void networkUnpack(NBTTagCompound nbt) {
this.hasExploded = nbt.getBoolean("exploded");
this.muffled = nbt.getBoolean("muffled");
this.heat = nbt.getInteger("heat");
this.tanks[0].readFromNBT(nbt, "0");
this.tanks[1].readFromNBT(nbt, "1");

5
src/main/java/com/hbm/tileentity/machine/TileEntityHeatBoilerIndustrial.java
View File

@ -75,6 +75,7 @@ public class TileEntityHeatBoilerIndustrial extends TileEntityLoadedBase impleme
}
data.setBoolean("isOn", this.isOn);
data.setBoolean("muffled", this.muffled);
INBTPacketReceiver.networkPack(this, data, 25);
} else {
@ -90,7 +91,8 @@ public class TileEntityHeatBoilerIndustrial extends TileEntityLoadedBase impleme
} else if(!audio.isPlaying()) {
audio = rebootAudio(audio);
}
audio.updateVolume(getVolume(1F));
audio.keepAlive();
} else {
@ -134,6 +136,7 @@ public class TileEntityHeatBoilerIndustrial extends TileEntityLoadedBase impleme
this.tanks[0].readFromNBT(nbt, "0");
this.tanks[1].readFromNBT(nbt, "1");
this.isOn = nbt.getBoolean("isOn");
this.muffled = nbt.getBoolean("muffled");
}
protected void tryPullHeat() {

5
src/main/java/com/hbm/tileentity/machine/TileEntityHeaterElectric.java
View File

@ -49,6 +49,7 @@ public class TileEntityHeaterElectric extends TileEntityLoadedBase implements IH
data.setByte("s", (byte) this.setting);
data.setInteger("h", this.heatEnergy);
data.setBoolean("o", isOn);
data.setBoolean("muffled", muffled);
INBTPacketReceiver.networkPack(this, data, 25);
} else {
@ -60,7 +61,8 @@ public class TileEntityHeaterElectric extends TileEntityLoadedBase implements IH
} else if(!audio.isPlaying()) {
audio = rebootAudio(audio);
}
audio.updateVolume(getVolume(1F));
audio.keepAlive();
} else {
@ -103,6 +105,7 @@ public class TileEntityHeaterElectric extends TileEntityLoadedBase implements IH
this.setting = nbt.getByte("s");
this.heatEnergy = nbt.getInteger("h");
this.isOn = nbt.getBoolean("o");
this.muffled = nbt.getBoolean("muffled");
}
@Override

2
src/main/java/com/hbm/tileentity/machine/TileEntityHeaterOilburner.java
View File

@ -108,6 +108,8 @@ public class TileEntityHeaterOilburner extends TileEntityMachinePolluting implem
@Override
public void networkUnpack(NBTTagCompound nbt) {
super.networkUnpack(nbt);
tank.readFromNBT(nbt, "tank");
isOn = nbt.getBoolean("isOn");
heatEnergy = nbt.getInteger("h");

2
src/main/java/com/hbm/tileentity/machine/TileEntityITER.java
View File

@ -356,6 +356,8 @@ public class TileEntityITER extends TileEntityMachineBase implements IEnergyUser
@Override
public void networkUnpack(NBTTagCompound data) {
super.networkUnpack(data);
this.isOn = data.getBoolean("isOn");
this.power = data.getLong("power");
this.blanket = data.getInteger("blanket");

2
src/main/java/com/hbm/tileentity/machine/TileEntityMachineArcWelder.java
View File

@ -197,6 +197,8 @@ public class TileEntityMachineArcWelder extends TileEntityMachineBase implements
@Override
public void networkUnpack(NBTTagCompound nbt) {
super.networkUnpack(nbt);
this.power = nbt.getLong("power");
this.maxPower = nbt.getLong("maxPower");
this.consumption = nbt.getLong("consumption");

16
src/main/java/com/hbm/tileentity/machine/TileEntityMachineAssembler.java
View File

@ -120,7 +120,7 @@ public class TileEntityMachineAssembler extends TileEntityMachineAssemblerBase i
this.networkPack(data, 150);
} else {
float volume = this.getVolume(2);
float volume = this.getVolume(2F);
if(isProgressing && volume > 0) {
@ -145,6 +145,8 @@ public class TileEntityMachineAssembler extends TileEntityMachineAssemblerBase i
@Override
public void networkUnpack(NBTTagCompound nbt) {
super.networkUnpack(nbt);
this.power = nbt.getLong("power");
this.progress = nbt.getIntArray("progress");
this.maxProgress = nbt.getIntArray("maxProgress");
@ -247,18 +249,6 @@ public class TileEntityMachineAssembler extends TileEntityMachineAssemblerBase i
public double getMaxRenderDistanceSquared() {
return 65536.0D;
}
public int countMufflers() {
int count = 0;
for(int x = xCoord - 1; x <= xCoord + 1; x++)
for(int z = zCoord - 1; z <= zCoord + 1; z++)
if(worldObj.getBlock(x, yCoord - 1, z) == ModBlocks.muffler)
count++;
return count;
}
@Override
public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) {

2
src/main/java/com/hbm/tileentity/machine/TileEntityMachineAssemfac.java
View File

@ -117,6 +117,8 @@ public class TileEntityMachineAssemfac extends TileEntityMachineAssemblerBase im
@Override
public void networkUnpack(NBTTagCompound nbt) {
super.networkUnpack(nbt);
this.power = nbt.getLong("power");
this.progress = nbt.getIntArray("progress");
this.maxProgress = nbt.getIntArray("maxProgress");

2
src/main/java/com/hbm/tileentity/machine/TileEntityMachineAutocrafter.java
View File

@ -207,6 +207,8 @@ public class TileEntityMachineAutocrafter extends TileEntityMachineBase implemen
@Override
public void networkUnpack(NBTTagCompound data) {
super.networkUnpack(data);
this.power = data.getLong("power");
modes = new String[9];

5
src/main/java/com/hbm/tileentity/machine/TileEntityMachineCentrifuge.java
View File

@ -218,7 +218,8 @@ public class TileEntityMachineCentrifuge extends TileEntityMachineBase implement
} else if(!audio.isPlaying()) {
audio = rebootAudio(audio);
}
audio.updateVolume(getVolume(1F));
audio.updatePitch((audioDuration - 10) / 100F + 0.5F);
} else {
@ -233,6 +234,8 @@ public class TileEntityMachineCentrifuge extends TileEntityMachineBase implement
@Override
public void networkUnpack(NBTTagCompound data) {
super.networkUnpack(data);
this.power = data.getLong("power");
this.progress = data.getInteger("progress");
this.isProgressing = data.getBoolean("isProgressing");

2
src/main/java/com/hbm/tileentity/machine/TileEntityMachineChemfac.java
View File

@ -159,6 +159,8 @@ public class TileEntityMachineChemfac extends TileEntityMachineChemplantBase imp
@Override
public void networkUnpack(NBTTagCompound nbt) {
super.networkUnpack(nbt);
this.power = nbt.getLong("power");
this.progress = nbt.getIntArray("progress");
this.maxProgress = nbt.getIntArray("maxProgress");

4
src/main/java/com/hbm/tileentity/machine/TileEntityMachineChemplant.java
View File

@ -183,7 +183,7 @@ public class TileEntityMachineChemplant extends TileEntityMachineBase implements
worldObj.spawnParticle("cloud", x, y, z, 0.0, 0.1, 0.0);
}
float volume = 1;//this.getVolume(2);
float volume = this.getVolume(1F);
if(isProgressing && volume > 0) {
@ -213,6 +213,8 @@ public class TileEntityMachineChemplant extends TileEntityMachineBase implements
@Override
public void networkUnpack(NBTTagCompound nbt) {
super.networkUnpack(nbt);
this.power = nbt.getLong("power");
this.progress = nbt.getInteger("progress");
this.maxProgress = nbt.getInteger("maxProgress");

2
src/main/java/com/hbm/tileentity/machine/TileEntityMachineCombustionEngine.java
View File

@ -144,6 +144,7 @@ public class TileEntityMachineCombustionEngine extends TileEntityMachinePollutin
}
audio.keepAlive();
audio.updateVolume(this.getVolume(1F));
} else {
@ -203,6 +204,7 @@ public class TileEntityMachineCombustionEngine extends TileEntityMachinePollutin
@Override
public void networkUnpack(NBTTagCompound nbt) {
super.networkUnpack(nbt);
this.playersUsing = nbt.getInteger("playersUsing");
this.setting = nbt.getInteger("setting");
this.power = nbt.getLong("power");

4
src/main/java/com/hbm/tileentity/machine/TileEntityMachineCompressor.java
View File

@ -146,7 +146,7 @@ public class TileEntityMachineCompressor extends TileEntityMachineBase implement
if(this.pistonDir) {
this.piston -= randSpeed;
if(this.piston <= 0) {
MainRegistry.proxy.playSoundClient(xCoord, yCoord, zCoord, "hbm:item.boltgun", 0.5F, 0.75F);
MainRegistry.proxy.playSoundClient(xCoord, yCoord, zCoord, "hbm:item.boltgun", this.getVolume(0.5F), 0.75F);
this.pistonDir = !this.pistonDir;
}
} else {
@ -165,6 +165,8 @@ public class TileEntityMachineCompressor extends TileEntityMachineBase implement
private float randSpeed = 0.1F;
public void networkUnpack(NBTTagCompound nbt) {
super.networkUnpack(nbt);
this.progress = nbt.getInteger("progress");
this.processTime = nbt.getInteger("processTime");
this.powerRequirement = nbt.getInteger("powerRequirement");

1
src/main/java/com/hbm/tileentity/machine/TileEntityMachineCrystallizer.java
View File

@ -155,6 +155,7 @@ public class TileEntityMachineCrystallizer extends TileEntityMachineBase impleme
}
public void networkUnpack(NBTTagCompound data) {
super.networkUnpack(data);
this.power = data.getLong("power");
this.progress = data.getShort("progress");

2
src/main/java/com/hbm/tileentity/machine/TileEntityMachineCyclotron.java
View File

@ -201,6 +201,8 @@ public class TileEntityMachineCyclotron extends TileEntityMachineBase implements
}
public void networkUnpack(NBTTagCompound data) {
super.networkUnpack(data);
this.isOn = data.getBoolean("isOn");
this.power = data.getLong("power");
this.progress = data.getInteger("progress");

3
src/main/java/com/hbm/tileentity/machine/TileEntityMachineDiesel.java
View File

@ -162,6 +162,7 @@ public class TileEntityMachineDiesel extends TileEntityMachinePolluting implemen
}
public void networkUnpack(NBTTagCompound data) {
super.networkUnpack(data);
power = data.getInteger("power");
powerCap = data.getInteger("powerCap");
@ -197,7 +198,7 @@ public class TileEntityMachineDiesel extends TileEntityMachinePolluting implemen
if(!shutUp) {
if (soundCycle == 0) {
this.worldObj.playSoundEffect(this.xCoord, this.yCoord, this.zCoord, "fireworks.blast", 0.75F * this.getVolume(3), 0.5F);
this.worldObj.playSoundEffect(this.xCoord, this.yCoord, this.zCoord, "fireworks.blast", this.getVolume(0.75F), 0.5F);
}
soundCycle++;
}

4
src/main/java/com/hbm/tileentity/machine/TileEntityMachineEPress.java
View File

@ -86,7 +86,7 @@ public class TileEntityMachineEPress extends TileEntityMachineBase implements IE
this.press += stampSpeed;
if(this.press >= this.maxPress) {
this.worldObj.playSoundEffect(this.xCoord, this.yCoord, this.zCoord, "hbm:block.pressOperate", 1.5F, 1.0F);
this.worldObj.playSoundEffect(this.xCoord, this.yCoord, this.zCoord, "hbm:block.pressOperate", getVolume(1.5F), 1.0F);
ItemStack output = PressRecipes.getOutput(slots[2], slots[1]);
if(slots[3] == null) {
slots[3] = output.copy();
@ -142,6 +142,8 @@ public class TileEntityMachineEPress extends TileEntityMachineBase implements IE
@Override
public void networkUnpack(NBTTagCompound nbt) {
super.networkUnpack(nbt);
this.power = nbt.getLong("power");
this.syncPress = nbt.getInteger("press");

2
src/main/java/com/hbm/tileentity/machine/TileEntityMachineElectricFurnace.java
View File

@ -236,6 +236,8 @@ public class TileEntityMachineElectricFurnace extends TileEntityMachineBase impl
}
public void networkUnpack(NBTTagCompound nbt) {
super.networkUnpack(nbt);
this.power = nbt.getLong("power");
this.maxProgress = nbt.getInteger("MaxProgress");
this.progress = nbt.getInteger("progress");

2
src/main/java/com/hbm/tileentity/machine/TileEntityMachineExcavator.java
View File

@ -214,6 +214,8 @@ public class TileEntityMachineExcavator extends TileEntityMachineBase implements
}
public void networkUnpack(NBTTagCompound nbt) {
super.networkUnpack(nbt);
this.enableDrill = nbt.getBoolean("d");
this.enableCrusher = nbt.getBoolean("c");
this.enableWalling = nbt.getBoolean("w");

1
src/main/java/com/hbm/tileentity/machine/TileEntityMachineExposureChamber.java
View File

@ -26,7 +26,6 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.Container;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList;
import net.minecraft.util.AxisAlignedBB;
import net.minecraft.util.EnumChatFormatting;
import net.minecraft.world.World;

2
src/main/java/com/hbm/tileentity/machine/TileEntityMachineFunnel.java
View File

@ -69,11 +69,13 @@ public class TileEntityMachineFunnel extends TileEntityMachineBase implements IG
@Override
public void serialize(ByteBuf buf) {
super.serialize(buf);
buf.writeInt(this.mode);
}
@Override
public void deserialize(ByteBuf buf) {
super.deserialize(buf);
this.mode = buf.readInt();
}

2
src/main/java/com/hbm/tileentity/machine/TileEntityMachineGasCent.java
View File

@ -167,6 +167,8 @@ public class TileEntityMachineGasCent extends TileEntityMachineBase implements I
}
public void networkUnpack(NBTTagCompound data) {
super.networkUnpack(data);
this.power = data.getLong("power");
this.progress = data.getInteger("progress");
this.isProgressing = data.getBoolean("isProgressing");

2
src/main/java/com/hbm/tileentity/machine/TileEntityMachineIGenerator.java
View File

@ -262,6 +262,8 @@ public class TileEntityMachineIGenerator extends TileEntityMachineBase implement
@Override
public void networkUnpack(NBTTagCompound nbt) {
super.networkUnpack(nbt);
this.power = nbt.getLong("power");
this.spin = nbt.getInteger("spin");
this.burn = nbt.getIntArray("burn");

2
src/main/java/com/hbm/tileentity/machine/TileEntityMachineLargeTurbine.java
View File

@ -149,6 +149,8 @@ public class TileEntityMachineLargeTurbine extends TileEntityMachineBase impleme
}
public void networkUnpack(NBTTagCompound data) {
super.networkUnpack(data);
this.power = data.getLong("power");
this.shouldTurn = data.getBoolean("operational");
}

1
src/main/java/com/hbm/tileentity/machine/TileEntityMachineMiningLaser.java
View File

@ -202,6 +202,7 @@ public class TileEntityMachineMiningLaser extends TileEntityMachineBase implemen
}
public void networkUnpack(NBTTagCompound data) {
super.networkUnpack(data);
this.power = data.getLong("power");
this.lastTargetX = data.getInteger("lastX");

2
src/main/java/com/hbm/tileentity/machine/TileEntityMachineMixer.java
View File

@ -140,6 +140,8 @@ public class TileEntityMachineMixer extends TileEntityMachineBase implements INB
@Override
public void networkUnpack(NBTTagCompound nbt) {
super.networkUnpack(nbt);
this.power = nbt.getLong("power");
this.processTime = nbt.getInteger("processTime");
this.progress = nbt.getInteger("progress");

2
src/main/java/com/hbm/tileentity/machine/TileEntityMachinePlasmaHeater.java
View File

@ -151,6 +151,8 @@ public class TileEntityMachinePlasmaHeater extends TileEntityMachineBase impleme
}
public void networkUnpack(NBTTagCompound nbt) {
super.networkUnpack(nbt);
this.power = nbt.getLong("power");
}

4
src/main/java/com/hbm/tileentity/machine/TileEntityMachinePress.java
View File

@ -91,7 +91,7 @@ public class TileEntityMachinePress extends TileEntityMachineBase implements IGU
this.press += stampSpeed;
if(this.press >= this.maxPress) {
this.worldObj.playSoundEffect(this.xCoord, this.yCoord, this.zCoord, "hbm:block.pressOperate", 1.5F, 1.0F);
this.worldObj.playSoundEffect(this.xCoord, this.yCoord, this.zCoord, "hbm:block.pressOperate", getVolume(1.5F), 1.0F);
ItemStack output = PressRecipes.getOutput(slots[2], slots[1]);
if(slots[3] == null) {
slots[3] = output.copy();
@ -161,6 +161,8 @@ public class TileEntityMachinePress extends TileEntityMachineBase implements IGU
@Override
public void networkUnpack(NBTTagCompound nbt) {
super.networkUnpack(nbt);
this.speed = nbt.getInteger("speed");
this.burnTime = nbt.getInteger("burnTime");
this.syncPress = nbt.getInteger("press");

2
src/main/java/com/hbm/tileentity/machine/TileEntityMachineRadGen.java
View File

@ -118,6 +118,8 @@ public class TileEntityMachineRadGen extends TileEntityMachineBase implements IE
@Override
public void networkUnpack(NBTTagCompound nbt) {
super.networkUnpack(nbt);
this.progress = nbt.getIntArray("progress");
this.maxProgress = nbt.getIntArray("maxProgress");
this.production = nbt.getIntArray("production");

5
src/main/java/com/hbm/tileentity/machine/TileEntityMachineRadarNT.java
View File

@ -7,7 +7,6 @@ import java.util.function.Function;
import com.google.gson.JsonObject;
import com.google.gson.stream.JsonWriter;
import com.hbm.blocks.ModBlocks;
import com.hbm.extprop.HbmLivingProps;
import com.hbm.interfaces.IControlReceiver;
import com.hbm.inventory.container.ContainerMachineRadarNT;
@ -155,7 +154,7 @@ public class TileEntityMachineRadarNT extends TileEntityMachineBase implements I
}
lastPower = getRedPower();
if(worldObj.getBlock(xCoord, yCoord - 1, zCoord) != ModBlocks.muffler) {
if(!this.muffled) {
pingTimer++;
@ -237,6 +236,7 @@ public class TileEntityMachineRadarNT extends TileEntityMachineBase implements I
@Override
public void serialize(ByteBuf buf) {
super.serialize(buf);
buf.writeLong(this.power);
buf.writeBoolean(this.scanMissiles);
buf.writeBoolean(this.scanShells);
@ -266,6 +266,7 @@ public class TileEntityMachineRadarNT extends TileEntityMachineBase implements I
@Override
public void deserialize(ByteBuf buf) {
super.deserialize(buf);
this.power = buf.readLong();
this.scanMissiles = buf.readBoolean();
this.scanShells = buf.readBoolean();

2
src/main/java/com/hbm/tileentity/machine/TileEntityMachineRadiolysis.java
View File

@ -105,6 +105,8 @@ public class TileEntityMachineRadiolysis extends TileEntityMachineBase implement
}
public void networkUnpack(NBTTagCompound data) {
super.networkUnpack(data);
this.power = data.getLong("power");
this.heat = data.getInteger("heat");
}

2
src/main/java/com/hbm/tileentity/machine/TileEntityMachineReactorBreeding.java
View File

@ -72,6 +72,8 @@ public class TileEntityMachineReactorBreeding extends TileEntityMachineBase impl
}
public void networkUnpack(NBTTagCompound data) {
super.networkUnpack(data);
flux = data.getInteger("flux");
progress = data.getFloat("progress");
}

2
src/main/java/com/hbm/tileentity/machine/TileEntityMachineSchrabidiumTransmutator.java
View File

@ -183,6 +183,7 @@ public class TileEntityMachineSchrabidiumTransmutator extends TileEntityMachineB
} else if(!audio.isPlaying()) {
audio = rebootAudio(audio);
}
audio.updateVolume(getVolume(1F));
} else {
if(audio != null) {
@ -226,6 +227,7 @@ public class TileEntityMachineSchrabidiumTransmutator extends TileEntityMachineB
@Override
public void networkUnpack(NBTTagCompound data) {
super.networkUnpack(data);
this.power = data.getLong("power");
this.process = data.getInteger("progress");

2
src/main/java/com/hbm/tileentity/machine/TileEntityMachineSeleniumEngine.java
View File

@ -305,7 +305,7 @@ public class TileEntityMachineSeleniumEngine extends TileEntityLoadedBase implem
if(!shutUp) {
if (soundCycle == 0) {
this.worldObj.playSoundEffect(this.xCoord, this.yCoord, this.zCoord, "fireworks.blast", 1.0F, 0.5F);
this.worldObj.playSoundEffect(this.xCoord, this.yCoord, this.zCoord, "fireworks.blast", this.getVolume(1.0F), 0.5F);
}
soundCycle++;

2
src/main/java/com/hbm/tileentity/machine/TileEntityMachineShredder.java
View File

@ -249,7 +249,7 @@ public class TileEntityMachineShredder extends TileEntityLoadedBase implements I
flag1 = true;
}
if(soundCycle == 0)
this.worldObj.playSoundEffect(this.xCoord, this.yCoord, this.zCoord, "minecart.base", 1.0F, 0.75F);
this.worldObj.playSoundEffect(this.xCoord, this.yCoord, this.zCoord, "minecart.base", getVolume(1.0F), 0.75F);
soundCycle++;
if(soundCycle >= 50)

7
src/main/java/com/hbm/tileentity/machine/TileEntityMachineTurbineGas.java
View File

@ -176,17 +176,17 @@ public class TileEntityMachineTurbineGas extends TileEntityMachineBase implement
if(audio == null) { //if there is no sound playing, start it
audio = MainRegistry.proxy.getLoopedSound("hbm:block.turbinegasRunning", xCoord, yCoord, zCoord, 1.0F, 20F, 1.0F);
audio = MainRegistry.proxy.getLoopedSound("hbm:block.turbinegasRunning", xCoord, yCoord, zCoord, 1.0F, 20F, 2.0F);
audio.startSound();
} else if(!audio.isPlaying()) {
audio.stopSound();
audio = MainRegistry.proxy.getLoopedSound("hbm:block.turbinegasRunning", xCoord, yCoord, zCoord, 1.0F, 20F, 1.0F);
audio = MainRegistry.proxy.getLoopedSound("hbm:block.turbinegasRunning", xCoord, yCoord, zCoord, 1.0F, 20F, 2.0F);
audio.startSound();
}
audio.updatePitch((float) (0.55 + 0.1 * rpm / 10)); //dynamic pitch update based on rpm
audio.updateVolume(100F); //yeah i need this
audio.updateVolume(getVolume(2F)); //yeah i need this
} else {
@ -378,6 +378,7 @@ public class TileEntityMachineTurbineGas extends TileEntityMachineBase implement
@Override
public void networkUnpack(NBTTagCompound nbt) {
super.networkUnpack(nbt);
this.power = nbt.getLong("power");
this.rpm = nbt.getInteger("rpm");

4
src/main/java/com/hbm/tileentity/machine/TileEntityMachineTurbofan.java
View File

@ -318,7 +318,7 @@ public class TileEntityMachineTurbofan extends TileEntityMachinePolluting implem
}
audio.keepAlive();
audio.updateVolume(momentum);
audio.updateVolume(getVolume(momentum));
audio.updatePitch(momentum / 200F + 0.5F + this.afterburner * 0.16F);
} else {
@ -382,6 +382,8 @@ public class TileEntityMachineTurbofan extends TileEntityMachinePolluting implem
}
public void networkUnpack(NBTTagCompound nbt) {
super.networkUnpack(nbt);
this.power = nbt.getLong("power");
this.afterburner = nbt.getByte("after");
this.wasOn = nbt.getBoolean("wasOn");

2
src/main/java/com/hbm/tileentity/machine/TileEntityMachineWoodBurner.java
View File

@ -150,6 +150,8 @@ public class TileEntityMachineWoodBurner extends TileEntityMachineBase implement
@Override
public void networkUnpack(NBTTagCompound nbt) {
super.networkUnpack(nbt);
this.power = nbt.getLong("power");
this.burnTime = nbt.getInteger("burnTime");
this.maxBurnTime = nbt.getInteger("maxBurnTime");

2
src/main/java/com/hbm/tileentity/machine/TileEntityMicrowave.java
View File

@ -81,6 +81,8 @@ public class TileEntityMicrowave extends TileEntityMachineBase implements IEnerg
}
public void networkUnpack(NBTTagCompound data) {
super.networkUnpack(data);
power = data.getLong("power");
time = data.getInteger("time");
speed = data.getInteger("speed");

5
src/main/java/com/hbm/tileentity/machine/TileEntityPWRController.java
View File

@ -292,7 +292,8 @@ public class TileEntityPWRController extends TileEntityMachineBase implements IG
} else if(!audio.isPlaying()) {
audio = rebootAudio(audio);
}
audio.updateVolume(getVolume(1F));
audio.keepAlive();
} else {
@ -376,6 +377,8 @@ public class TileEntityPWRController extends TileEntityMachineBase implements IG
}
public void networkUnpack(NBTTagCompound nbt) {
super.networkUnpack(nbt);
tanks[0].readFromNBT(nbt, "t0");
tanks[1].readFromNBT(nbt, "t1");
rodCount = nbt.getInteger("rodCount");

2
src/main/java/com/hbm/tileentity/machine/TileEntityReactorControl.java
View File

@ -151,6 +151,8 @@ public class TileEntityReactorControl extends TileEntityMachineBase implements I
}
public void networkUnpack(NBTTagCompound data) {
super.networkUnpack(data);
this.heat = data.getInteger("heat");
this.level = data.getDouble("level");
this.flux = data.getInteger("flux");

2
src/main/java/com/hbm/tileentity/machine/TileEntityReactorResearch.java
View File

@ -161,6 +161,8 @@ public class TileEntityReactorResearch extends TileEntityMachineBase implements
}
public void networkUnpack(NBTTagCompound data) {
super.networkUnpack(data);
this.heat = data.getInteger("heat");
this.water = data.getByte("water");
this.level = data.getDouble("level");

2
src/main/java/com/hbm/tileentity/machine/TileEntityReactorZirnox.java
View File

@ -133,6 +133,8 @@ public class TileEntityReactorZirnox extends TileEntityMachineBase implements IF
}
public void networkUnpack(NBTTagCompound data) {
super.networkUnpack(data);
this.heat = data.getInteger("heat");
this.pressure = data.getInteger("pressure");
this.isOn = data.getBoolean("isOn");

1
src/main/java/com/hbm/tileentity/machine/TileEntitySILEX.java
View File

@ -101,6 +101,7 @@ public class TileEntitySILEX extends TileEntityMachineBase implements IFluidAcce
}
public void networkUnpack(NBTTagCompound nbt) {
super.networkUnpack(nbt);
this.currentFill = nbt.getInteger("fill");
this.progress = nbt.getInteger("progress");

2
src/main/java/com/hbm/tileentity/machine/TileEntitySoyuzLauncher.java
View File

@ -193,6 +193,8 @@ public class TileEntitySoyuzLauncher extends TileEntityMachineBase implements IS
}
public void networkUnpack(NBTTagCompound data) {
super.networkUnpack(data);
power = data.getLong("power");
mode = data.getByte("mode");
starting = data.getBoolean("starting");

2
src/main/java/com/hbm/tileentity/machine/TileEntitySteamEngine.java
View File

@ -109,7 +109,7 @@ public class TileEntitySteamEngine extends TileEntityLoadedBase implements IFlui
if(this.rotor >= 360D) {
this.rotor -= 360D;
this.worldObj.playSoundEffect(xCoord, yCoord, zCoord, "hbm:block.steamEngineOperate", 1.0F, 0.5F + (acceleration / 80F));
this.worldObj.playSoundEffect(xCoord, yCoord, zCoord, "hbm:block.steamEngineOperate", getVolume(1.0F), 0.5F + (acceleration / 80F));
}
data.setLong("power", this.powerBuffer);

1
src/main/java/com/hbm/tileentity/machine/TileEntityTesla.java
View File

@ -147,6 +147,7 @@ public class TileEntityTesla extends TileEntityMachineBase implements IEnergyUse
}
public void networkUnpack(NBTTagCompound data) {
super.networkUnpack(data);
int s = data.getShort("length");

2
src/main/java/com/hbm/tileentity/machine/TileEntityWatz.java
View File

@ -293,6 +293,8 @@ public class TileEntityWatz extends TileEntityMachineBase implements IFluidStand
@Override
public void networkUnpack(NBTTagCompound nbt) {
super.networkUnpack(nbt);
this.heat = nbt.getInteger("heat");
this.isOn = nbt.getBoolean("isOn");
this.isLocked = nbt.getBoolean("lock");

2
src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachineCatalyticReformer.java
View File

@ -83,6 +83,8 @@ public class TileEntityMachineCatalyticReformer extends TileEntityMachineBase im
@Override
public void networkUnpack(NBTTagCompound nbt) {
super.networkUnpack(nbt);
this.power = nbt.getLong("power");
for(int i = 0; i < 4; i++) tanks[i].readFromNBT(nbt, "" + i);
}

2
src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachineCoker.java
View File

@ -175,6 +175,8 @@ public class TileEntityMachineCoker extends TileEntityMachineBase implements IFl
@Override
public void networkUnpack(NBTTagCompound nbt) {
super.networkUnpack(nbt);
this.wasOn = nbt.getBoolean("wasOn");
this.heat = nbt.getInteger("heat");
this.progress = nbt.getInteger("progress");

6
src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachineGasFlare.java
View File

@ -129,7 +129,7 @@ public class TileEntityMachineGasFlare extends TileEntityMachineBase implements
tank.getTankType().onFluidRelease(this, tank, eject);
if(worldObj.getTotalWorldTime() % 7 == 0)
this.worldObj.playSoundEffect(this.xCoord, this.yCoord + 11, this.zCoord, "random.fizz", 1.5F, 0.5F);
this.worldObj.playSoundEffect(this.xCoord, this.yCoord + 11, this.zCoord, "random.fizz", getVolume(1.5F), 0.5F);
}
} else {
@ -159,7 +159,7 @@ public class TileEntityMachineGasFlare extends TileEntityMachineBase implements
}
if(worldObj.getTotalWorldTime() % 3 == 0)
this.worldObj.playSoundEffect(this.xCoord, this.yCoord + 11, this.zCoord, "hbm:weapon.flamethrowerShoot", 1.5F, 0.75F);
this.worldObj.playSoundEffect(this.xCoord, this.yCoord + 11, this.zCoord, "hbm:weapon.flamethrowerShoot", getVolume(1.5F), 0.75F);
if(worldObj.getTotalWorldTime() % 20 == 0) {
PollutionHandler.incrementPollution(worldObj, xCoord, yCoord, zCoord, PollutionType.SOOT, PollutionHandler.SOOT_PER_SECOND * 5);
@ -234,6 +234,8 @@ public class TileEntityMachineGasFlare extends TileEntityMachineBase implements
@Override
public void networkUnpack(NBTTagCompound nbt) {
super.networkUnpack(nbt);
this.power = nbt.getLong("power");
this.isOn = nbt.getBoolean("isOn");
this.doesBurn = nbt.getBoolean("doesBurn");

2
src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachineLiquefactor.java
View File

@ -169,6 +169,8 @@ public class TileEntityMachineLiquefactor extends TileEntityMachineBase implemen
@Override
public void networkUnpack(NBTTagCompound nbt) {
super.networkUnpack(nbt);
this.power = nbt.getLong("power");
this.progress = nbt.getInteger("progress");
this.usage = nbt.getInteger("usage");

4
src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachinePumpjack.java
View File

@ -123,8 +123,8 @@ public class TileEntityMachinePumpjack extends TileEntityOilDrillBase {
@Override
public void networkUnpack(NBTTagCompound nbt) {
this.power = nbt.getLong("power");
this.indicator = nbt.getInteger("indicator");
super.networkUnpack(nbt);
this.speed = nbt.getFloat("speed");
}

5
src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachineRefinery.java
View File

@ -231,7 +231,8 @@ public class TileEntityMachineRefinery extends TileEntityMachineBase implements
} else if(!audio.isPlaying()) {
audio = rebootAudio(audio);
}
audio.updateVolume(getVolume(1F));
audio.keepAlive();
} else {
@ -271,6 +272,8 @@ public class TileEntityMachineRefinery extends TileEntityMachineBase implements
@Override
public void networkUnpack(NBTTagCompound nbt) {
super.networkUnpack(nbt);
this.power = nbt.getLong("power");
for(int i = 0; i < 5; i++) tanks[i].readFromNBT(nbt, "" + i);
this.hasExploded = nbt.getBoolean("exploded");

2
src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachineSolidifier.java
View File

@ -172,6 +172,8 @@ public class TileEntityMachineSolidifier extends TileEntityMachineBase implement
@Override
public void networkUnpack(NBTTagCompound nbt) {
super.networkUnpack(nbt);
this.power = nbt.getLong("power");
this.progress = nbt.getInteger("progress");
this.usage = nbt.getInteger("usage");

5
src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachineVacuumDistill.java
View File

@ -98,7 +98,8 @@ public class TileEntityMachineVacuumDistill extends TileEntityMachineBase implem
} else if(!audio.isPlaying()) {
audio = rebootAudio(audio);
}
audio.updateVolume(getVolume(1F));
audio.keepAlive();
} else {
@ -138,6 +139,8 @@ public class TileEntityMachineVacuumDistill extends TileEntityMachineBase implem
@Override
public void networkUnpack(NBTTagCompound nbt) {
super.networkUnpack(nbt);
this.power = nbt.getLong("power");
this.isOn = nbt.getBoolean("isOn");
for(int i = 0; i < 5; i++) tanks[i].readFromNBT(nbt, "" + i);

2
src/main/java/com/hbm/tileentity/machine/oil/TileEntityOilDrillBase.java
View File

@ -177,6 +177,8 @@ public abstract class TileEntityOilDrillBase extends TileEntityMachineBase imple
}
public void networkUnpack(NBTTagCompound nbt) {
super.networkUnpack(nbt);
this.power = nbt.getLong("power");
this.indicator = nbt.getInteger("indicator");
}

2
src/main/java/com/hbm/tileentity/machine/storage/TileEntityBarrel.java
View File

@ -261,6 +261,8 @@ public class TileEntityBarrel extends TileEntityMachineBase implements IFluidAcc
}
public void networkUnpack(NBTTagCompound data) {
super.networkUnpack(data);
mode = data.getShort("mode");
}

3
src/main/java/com/hbm/tileentity/machine/storage/TileEntityMachineBattery.java
View File

@ -322,7 +322,8 @@ public class TileEntityMachineBattery extends TileEntityMachineBase implements I
}
@Override
public void networkUnpack(NBTTagCompound nbt) {
public void networkUnpack(NBTTagCompound nbt) {
super.networkUnpack(nbt);
this.power = nbt.getLong("power");
this.delta = nbt.getLong("delta");

2
src/main/java/com/hbm/tileentity/network/TileEntityCraneBoxer.java
View File

@ -151,6 +151,8 @@ public class TileEntityCraneBoxer extends TileEntityCraneBase implements IGUIPro
}
public void networkUnpack(NBTTagCompound nbt) {
super.networkUnpack(nbt);
this.mode = nbt.getByte("mode");
}

2
src/main/java/com/hbm/tileentity/network/TileEntityCraneExtractor.java
View File

@ -172,6 +172,8 @@ public class TileEntityCraneExtractor extends TileEntityCraneBase implements IGU
}
public void networkUnpack(NBTTagCompound nbt) {
super.networkUnpack(nbt);
this.isWhitelist = nbt.getBoolean("isWhitelist");
this.matcher.modes = new String[this.matcher.modes.length];
this.matcher.readFromNBT(nbt);

2
src/main/java/com/hbm/tileentity/network/TileEntityCraneGrabber.java
View File

@ -137,6 +137,8 @@ public class TileEntityCraneGrabber extends TileEntityCraneBase implements IGUIP
}
public void networkUnpack(NBTTagCompound nbt) {
super.networkUnpack(nbt);
this.isWhitelist = nbt.getBoolean("isWhitelist");
this.matcher.modes = new String[this.matcher.modes.length];
this.matcher.readFromNBT(nbt);

2
src/main/java/com/hbm/tileentity/network/TileEntityCraneRouter.java
View File

@ -57,6 +57,8 @@ public class TileEntityCraneRouter extends TileEntityMachineBase implements IGUI
@Override
public void networkUnpack(NBTTagCompound data) {
super.networkUnpack(data);
for(int i = 0; i < patterns.length; i++) {
NBTTagCompound compound = data.getCompoundTag("pattern" + i);
patterns[i].readFromNBT(compound);

2
src/main/java/com/hbm/tileentity/network/TileEntityRadioTorchCounter.java
View File

@ -75,6 +75,8 @@ public class TileEntityRadioTorchCounter extends TileEntityMachineBase implement
}
public void networkUnpack(NBTTagCompound nbt) {
super.networkUnpack(nbt);
this.polling = nbt.getBoolean("polling");
this.lastCount = nbt.getIntArray("last");
this.matcher.modes = new String[this.matcher.modes.length];

1
src/main/java/com/hbm/tileentity/turret/TileEntityTurretBaseNT.java
View File

@ -291,6 +291,7 @@ public abstract class TileEntityTurretBaseNT extends TileEntityMachineBase imple
@Override
public void networkUnpack(NBTTagCompound nbt) {
super.networkUnpack(nbt);
this.power = nbt.getLong("power");
this.isOn = nbt.getBoolean("isOn");

1
src/main/resources/assets/hbm/lang/de_DE.lang
View File

@ -3337,6 +3337,7 @@ item.upgrade_fortune_2.name=Glückupgrade Mk.II
item.upgrade_fortune_3.name=Glückupgrade Mk.III
item.upgrade_gc_speed.name=Gaszentrifugen-Geschwindigkeitsupgrade
item.upgrade_health.name=Kraftfeld-Resistenzupgrade
item.upgrade_muffler.name=Schalldämpfer
item.upgrade_nullifier.name=Müllvernichter-Upgrade
item.upgrade_overdrive_1.name=Overdrive-Upgrade Mk.I
item.upgrade_overdrive_2.name=Overdrive-Upgrade Mk.II

1
src/main/resources/assets/hbm/lang/en_US.lang
View File

@ -4261,6 +4261,7 @@ item.upgrade_fortune_2.name=Fortune Upgrade Mk.II
item.upgrade_fortune_3.name=Fortune Upgrade Mk.III
item.upgrade_gc_speed.name=Gas Centrifuge Overclocking Upgrade
item.upgrade_health.name=Emitter Health Upgrade
item.upgrade_muffler.name=Muffler
item.upgrade_nullifier.name=Scrap Destroyer Upgrade
item.upgrade_overdrive_1.name=Overdrive Upgrade Mk.I
item.upgrade_overdrive_2.name=Overdrive Upgrade Mk.II

BIN
src/main/resources/assets/hbm/textures/items/upgrade_muffler.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 438 B